diff --git a/.eslintrc.js b/.eslintrc.js
index 26865d55ec..7f8d0adb9c 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,8 +1,16 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
 module.exports = {
     plugins: ["matrix-org", "eslint-plugin-react-compiler"],
     extends: ["plugin:matrix-org/babel", "plugin:matrix-org/react", "plugin:matrix-org/a11y"],
     parserOptions: {
         project: ["./tsconfig.json"],
+        tsconfigRootDir: __dirname,
     },
     env: {
         browser: true,
@@ -160,6 +168,10 @@ module.exports = {
                         group: ["@vector-im/compound-design-tokens/icons/*"],
                         message: "Please use @vector-im/compound-design-tokens/assets/web/icons/* instead",
                     },
+                    {
+                        group: ["**/packages/shared-components/**", "../packages/shared-components/**"],
+                        message: "Please use @element-hq/web-shared-components",
+                    },
                 ],
             },
         ],
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 34431799f4..ae2cf6294d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -17,9 +17,16 @@
 /playwright/e2e/crypto/                                                 @element-hq/element-crypto-web-reviewers
 /playwright/e2e/settings/encryption-user-tab/                           @element-hq/element-crypto-web-reviewers
 
+
+/src/models/Call.ts                       @element-hq/element-call-reviewers
+/src/call-types.ts                        @element-hq/element-call-reviewers
+/src/components/views/voip                @element-hq/element-call-reviewers
+/playwright/e2e/voip/element-call.spec.ts @element-hq/element-call-reviewers
+
 # Ignore translations as those will be updated by GHA for Localazy download
 /src/i18n/strings
 /src/i18n/strings/en_EN.json  @element-hq/element-web-reviewers
-# Ignore the synapse plugin as this is updated by GHA for docker image updating
+# Ignore the synapse & mas plugins as this is updated by GHA for docker image updating
 /playwright/testcontainers/synapse.ts
+/playwright/testcontainers/mas.ts
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ebde627fde..759266d4e0 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,6 +2,7 @@
 
 ## Checklist
 
+- [ ] I have read through [review guidelines](../docs/review.md) and [CONTRIBUTING.md](../CONTRIBUTING.md).
 - [ ] Tests written for new code (and old code if feasible).
 - [ ] New or updated `public`/`exported` symbols have accurate [TSDoc](https://tsdoc.org/) documentation.
 - [ ] Linter and other CI checks pass.
diff --git a/.github/labels.yml b/.github/labels.yml
index f8adbe8e53..649e1a7407 100644
--- a/.github/labels.yml
+++ b/.github/labels.yml
@@ -279,3 +279,6 @@
 - name: "Z-Flaky-Test-Disabled"
   description: "The flaking test has been disabled"
   color: "ededed"
+- name: "Z-Skip-Coverage"
+  description: "Skip SonarQube coverage for this PR"
+  color: "ededed"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 68b9f4e703..74425f25b4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,8 +10,7 @@ concurrency:
     cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 # develop pushes and repository_dispatch handled in build_develop.yaml
 env:
-    # These must be set for fetchdep.sh to get the right branch
-    REPOSITORY: ${{ github.repository }}
+    # This must be set for fetchdep.sh to get the right branch
     PR_NUMBER: ${{ github.event.pull_request.number }}
 permissions: {} # No permissions required
 jobs:
@@ -43,9 +42,9 @@ jobs:
             run:
                 shell: bash
         steps:
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
-            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   # Disable cache on Windows as it is slower than not caching
                   # https://github.com/actions/setup-node/issues/975
@@ -56,15 +55,7 @@ jobs:
             - run: yarn config set network-timeout 300000
 
             - name: Fetch layered build
-              id: layered_build
-              env:
-                  # tell layered.sh to check out the right sha of the JS-SDK & EW, if they were given one
-                  JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
-              run: |
-                  scripts/layered.sh
-                  JSSDK_SHA=$(git -C matrix-js-sdk rev-parse --short=12 HEAD)
-                  VECTOR_SHA=$(git rev-parse --short=12 HEAD)
-                  echo "VERSION=$VECTOR_SHA--js-$JSSDK_SHA" >> $GITHUB_OUTPUT
+              run: ./scripts/layered.sh
 
             - name: Copy config
               run: cp element.io/develop/config.json config.json
@@ -72,12 +63,10 @@ jobs:
             - name: Build
               env:
                   CI_PACKAGE: true
-                  VERSION: "${{ steps.layered_build.outputs.VERSION }}"
-              run: |
-                  yarn build
+              run: VERSION=$(scripts/get-version-from-git.sh) yarn build
 
             - name: Upload Artifact
-              uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+              uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
               with:
                   name: webapp-${{ matrix.image }}
                   path: webapp
diff --git a/.github/workflows/build_debian.yaml b/.github/workflows/build_debian.yaml
index 247e5604ee..48c21c9dc5 100644
--- a/.github/workflows/build_debian.yaml
+++ b/.github/workflows/build_debian.yaml
@@ -14,7 +14,7 @@ jobs:
             R2_URL: ${{ vars.CF_R2_S3_API }}
             VERSION: ${{ github.ref_name }}
         steps:
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
             - name: Download package
               run: |
@@ -62,7 +62,7 @@ jobs:
                   dpkg-gencontrol -v"$VERSION" -ldebian/tmp/DEBIAN/changelog
                   dpkg-deb -Zxz --root-owner-group --build debian/tmp element-web.deb
 
-            - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+            - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
               with:
                   name: element-web.deb
                   path: element-web.deb
diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
index 9550bf9139..a923e1db1d 100644
--- a/.github/workflows/build_develop.yml
+++ b/.github/workflows/build_develop.yml
@@ -26,9 +26,9 @@ jobs:
             R2_URL: ${{ vars.CF_R2_S3_API }}
             R2_PUBLIC_URL: "https://element-web-develop.element.io"
         steps:
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
-            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   cache: "yarn"
                   node-version: "lts/*"
@@ -53,7 +53,7 @@ jobs:
 
             - run: mv dist/element-*.tar.gz dist/develop.tar.gz
 
-            - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+            - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
               with:
                   name: webapp
                   path: dist/develop.tar.gz
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 8b52e6764c..7abba47247 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -34,7 +34,7 @@ jobs:
         env:
             SITE: ${{ inputs.site || 'staging.element.io' }}
         steps:
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
             - name: Load GPG key
               run: |
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 75a00af7aa..5c2e989e28 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -20,31 +20,31 @@ jobs:
         env:
             TEST_TAG: vectorim/element-web:test
         steps:
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
               with:
                   fetch-depth: 0 # needed for docker-package to be able to calculate the version
 
             - name: Install Cosign
-              uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3
+              uses: sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # v3
               if: github.event_name != 'pull_request'
 
             - name: Set up QEMU
-              uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3
+              uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3
 
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
+              uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
               with:
                   install: true
 
             - name: Login to Docker Hub
-              uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
+              uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
               if: github.event_name != 'pull_request'
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
             - name: Login to GitHub Container Registry
-              uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
+              uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
               if: github.event_name != 'pull_request'
               with:
                   registry: ghcr.io
@@ -53,7 +53,7 @@ jobs:
 
             - name: Build and load
               id: test-build
-              uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6
+              uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
               with:
                   context: .
                   load: true
@@ -96,7 +96,7 @@ jobs:
 
             - name: Docker meta
               id: meta
-              uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5
+              uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5
               if: github.event_name != 'pull_request'
               with:
                   images: |
@@ -110,7 +110,7 @@ jobs:
 
             - name: Build and push
               id: build-and-push
-              uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6
+              uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
               if: github.event_name != 'pull_request'
               with:
                   context: .
@@ -132,10 +132,23 @@ jobs:
                   cosign sign --yes ${images}
 
             - name: Update repo description
-              uses: peter-evans/dockerhub-description@432a30c9e07499fd01da9f8a49f0faf9e0ca5b77 # v4
+              uses: peter-evans/dockerhub-description@1b9a80c056b620d92cedb9d9b5a223409c68ddfa # v5
               if: github.event_name != 'pull_request'
               continue-on-error: true
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
                   repository: vectorim/element-web
+
+            - name: Repository Dispatch
+              uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697 # v4
+              if: github.event_name != 'pull_request'
+              with:
+                  repository: element-hq/element-web-pro
+                  token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+                  event-type: image-built
+                  # Stable way to determine the :version
+                  client-payload: |-
+                      {
+                          "base-ref": "${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}"
+                      }
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index e7d69cf477..9020f7914b 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -17,23 +17,23 @@ jobs:
         runs-on: ubuntu-24.04
         steps:
             - name: Fetch element-desktop
-              uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+              uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
               with:
                   repository: element-hq/element-desktop
                   path: element-desktop
 
             - name: Fetch element-web
-              uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+              uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
               with:
                   path: element-web
 
             - name: Fetch matrix-js-sdk
-              uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+              uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
               with:
                   repository: matrix-org/matrix-js-sdk
                   path: matrix-js-sdk
 
-            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   cache: "yarn"
                   cache-dependency-path: element-web/yarn.lock
@@ -43,13 +43,13 @@ jobs:
               working-directory: element-web
               run: |
                   yarn install --frozen-lockfile
-                  yarn ts-node ./scripts/gen-workflow-mermaid.ts ../element-desktop ../element-web ../matrix-js-sdk > docs/automations.md
+                  yarn node ./scripts/gen-workflow-mermaid.ts ../element-desktop ../element-web ../matrix-js-sdk > docs/automations.md
                   echo "-   [Automations](automations.md)" >> docs/SUMMARY.md
 
             - name: Setup mdBook
               uses: peaceiris/actions-mdbook@ee69d230fe19748b7abf22df32acaa93833fad08 # v2
               with:
-                  mdbook-version: "0.4.10"
+                  mdbook-version: "0.5.1"
 
             - name: Install mdbook extensions
               run: cargo install mdbook-combiner mdbook-mermaid
@@ -88,7 +88,7 @@ jobs:
               run: mdbook build
 
             - name: Upload artifact
-              uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3
+              uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4
               with:
                   path: ./book
 
diff --git a/.github/workflows/end-to-end-tests-netlify.yaml b/.github/workflows/end-to-end-tests-netlify.yaml
index 90a8c3d24b..049f4ea343 100644
--- a/.github/workflows/end-to-end-tests-netlify.yaml
+++ b/.github/workflows/end-to-end-tests-netlify.yaml
@@ -25,7 +25,7 @@ jobs:
             actions: read
         steps:
             - name: Download HTML report
-              uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+              uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
               with:
                   github-token: ${{ secrets.GITHUB_TOKEN }}
                   run-id: ${{ github.event.workflow_run.id }}
diff --git a/.github/workflows/end-to-end-tests.yaml b/.github/workflows/end-to-end-tests.yaml
index b2d49d7703..1b366333b6 100644
--- a/.github/workflows/end-to-end-tests.yaml
+++ b/.github/workflows/end-to-end-tests.yaml
@@ -50,25 +50,20 @@ jobs:
             runners-matrix: ${{ steps.runner-vars.outputs.matrix }}
         steps:
             - name: Checkout code
-              uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+              uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
               with:
                   repository: element-hq/element-web
 
-            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   cache: "yarn"
                   node-version: "lts/*"
 
             - name: Fetch layered build
-              id: layered_build
               env:
                   # tell layered.sh to check out the right sha of the JS-SDK & EW, if they were given one
                   JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
-              run: |
-                  scripts/layered.sh
-                  JSSDK_SHA=$(git -C matrix-js-sdk rev-parse --short=12 HEAD)
-                  VECTOR_SHA=$(git rev-parse --short=12 HEAD)
-                  echo "VERSION=$VECTOR_SHA--js-$JSSDK_SHA" >> $GITHUB_OUTPUT
+              run: scripts/layered.sh
 
             - name: Copy config
               run: cp element.io/develop/config.json config.json
@@ -76,12 +71,10 @@ jobs:
             - name: Build
               env:
                   CI_PACKAGE: true
-                  VERSION: "${{ steps.layered_build.outputs.VERSION }}"
-              run: |
-                  yarn build
+              run: VERSION=$(scripts/get-version-from-git.sh) yarn build
 
             - name: Upload Artifact
-              uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+              uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
               with:
                   name: webapp
                   path: webapp
@@ -89,7 +82,7 @@ jobs:
 
             - name: Calculate runner variables
               id: runner-vars
-              uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
+              uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
               with:
                   script: |
                       const numRunners = parseInt(process.env.NUM_RUNNERS, 10);
@@ -129,18 +122,18 @@ jobs:
                     - runAllTests: false
                       project: Pinecone
         steps:
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
               with:
                   persist-credentials: false
                   repository: element-hq/element-web
 
             - name: 📥 Download artifact
-              uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+              uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
               with:
                   name: webapp
                   path: webapp
 
-            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   cache: "yarn"
                   cache-dependency-path: yarn.lock
@@ -154,7 +147,7 @@ jobs:
               run: echo "version=$(yarn list --pattern @playwright/test --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name')" >> $GITHUB_OUTPUT
 
             - name: Cache playwright binaries
-              uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+              uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
               id: playwright-cache
               with:
                   path: ~/.cache/ms-playwright
@@ -179,7 +172,7 @@ jobs:
 
             - name: Upload blob report to GitHub Actions Artifacts
               if: always()
-              uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+              uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
               with:
                   name: all-blob-reports-${{ matrix.project }}-${{ matrix.runner }}
                   path: blob-report
@@ -201,13 +194,13 @@ jobs:
         if: always()
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
               if: inputs.skip != true
               with:
                   persist-credentials: false
                   repository: element-hq/element-web
 
-            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               if: inputs.skip != true
               with:
                   cache: "yarn"
@@ -219,7 +212,7 @@ jobs:
 
             - name: Download blob reports from GitHub Actions Artifacts
               if: inputs.skip != true
-              uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+              uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
               with:
                   pattern: all-blob-reports-*
                   path: all-blob-reports
@@ -227,7 +220,7 @@ jobs:
 
             - name: Merge into HTML Report
               if: inputs.skip != true
-              run: yarn playwright merge-reports --reporter=html,./playwright/flaky-reporter.ts,./playwright/stale-screenshot-reporter.ts ./all-blob-reports
+              run: yarn playwright merge-reports --reporter=html,./playwright/flaky-reporter.ts,@element-hq/element-web-playwright-common/lib/stale-screenshot-reporter.js ./all-blob-reports
               env:
                   # Only pass creds to the flaky-reporter on main branch runs
                   GITHUB_TOKEN: ${{ github.ref_name == 'develop' && secrets.ELEMENT_BOT_TOKEN || '' }}
@@ -235,7 +228,7 @@ jobs:
             # Upload the HTML report even if one of our reporters fails, this can happen when stale screenshots are detected
             - name: Upload HTML report
               if: always() && inputs.skip != true
-              uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+              uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
               with:
                   name: html-report
                   path: playwright-report
diff --git a/.github/workflows/issue_closed.yml b/.github/workflows/issue_closed.yml
index 249f1eb342..375c2e7184 100644
--- a/.github/workflows/issue_closed.yml
+++ b/.github/workflows/issue_closed.yml
@@ -10,7 +10,7 @@ jobs:
         name: Tidy closed issues
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
+            - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
               id: main
               with:
                   # PAT needed as the GITHUB_TOKEN won't be able to see cross-references from other orgs (matrix-org)
@@ -142,7 +142,7 @@ jobs:
                           });
                         }
                       }
-            - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
+            - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
               name: Close duplicate as Not Planned
               if: steps.main.outputs.closeAsNotPlanned
               with:
diff --git a/.github/workflows/netlify.yaml b/.github/workflows/netlify.yaml
index a7909265c7..ab2433c267 100644
--- a/.github/workflows/netlify.yaml
+++ b/.github/workflows/netlify.yaml
@@ -28,7 +28,7 @@ jobs:
                       Exercise caution. Use test accounts.
 
             - name: 📥 Download artifact
-              uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+              uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
               with:
                   github-token: ${{ secrets.GITHUB_TOKEN }}
                   run-id: ${{ github.event.workflow_run.id }}
diff --git a/.github/workflows/pending-reviews.yaml b/.github/workflows/pending-reviews.yaml
index 199eb60daa..0474e60aa0 100644
--- a/.github/workflows/pending-reviews.yaml
+++ b/.github/workflows/pending-reviews.yaml
@@ -16,7 +16,7 @@ jobs:
             URL: "https://github.com/pulls?q=is%3Apr+is%3Aopen+repo%3Amatrix-org%2Fmatrix-js-sdk+repo%3Amatrix-org%2Fmatrix-react-sdk+repo%3Aelement-hq%2Felement-web+repo%3Aelement-hq%2Felement-desktop+review-requested%3A%40me+sort%3Aupdated-desc+"
             RELEASE_BLOCKERS_URL: "https://github.com/pulls?q=is%3Aopen+repo%3Amatrix-org%2Fmatrix-js-sdk+repo%3Amatrix-org%2Fmatrix-react-sdk+repo%3Aelement-hq%2Felement-web+repo%3Aelement-hq%2Felement-desktop+sort%3Aupdated-desc+label%3AX-Release-Blocker+"
         steps:
-            - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
+            - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
               env:
                   HS_URL: ${{ secrets.BETABOT_HS_URL }}
                   ROOM_ID: ${{ secrets.ROOM_ID }}
diff --git a/.github/workflows/playwright-image-updates.yaml b/.github/workflows/playwright-image-updates.yaml
index 4cbdb17bbd..1ce3d767a7 100644
--- a/.github/workflows/playwright-image-updates.yaml
+++ b/.github/workflows/playwright-image-updates.yaml
@@ -10,7 +10,7 @@ jobs:
         permissions:
             pull-requests: write
         steps:
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
             - name: Update synapse image
               run: |
@@ -21,9 +21,18 @@ jobs:
               env:
                   IMAGE: ghcr.io/element-hq/synapse:develop
 
+            - name: Update MAS image
+              run: |
+                  docker pull "$IMAGE"
+                  INSPECT=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE")
+                  DIGEST=${INSPECT#*@}
+                  sed -i "s/const TAG.*/const TAG = \"main@$DIGEST\";/" playwright/testcontainers/mas.ts
+              env:
+                  IMAGE: ghcr.io/element-hq/matrix-authentication-service:main
+
             - name: Create Pull Request
               id: cpr
-              uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7
+              uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 # v7
               with:
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                   branch: actions/playwright-image-updates
diff --git a/.github/workflows/pull_request_base_branch.yaml b/.github/workflows/pull_request_base_branch.yaml
index fbdebfbed0..e79c37783b 100644
--- a/.github/workflows/pull_request_base_branch.yaml
+++ b/.github/workflows/pull_request_base_branch.yaml
@@ -8,7 +8,7 @@ jobs:
         name: Check PR base branch
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
+            - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
               with:
                   script: |
                       const baseBranch = context.payload.pull_request.base.ref;
diff --git a/.github/workflows/release_prepare.yml b/.github/workflows/release_prepare.yml
index 2f36644c2e..7be70e6b00 100644
--- a/.github/workflows/release_prepare.yml
+++ b/.github/workflows/release_prepare.yml
@@ -41,7 +41,7 @@ jobs:
             REPOS: matrix-js-sdk element-web element-desktop
         steps:
             - name: Checkout Element Desktop
-              uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+              uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
               if: inputs.element-desktop
               with:
                   repository: element-hq/element-desktop
@@ -51,7 +51,7 @@ jobs:
                   fetch-tags: true
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
             - name: Checkout Element Web
-              uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+              uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
               if: inputs.element-web
               with:
                   repository: element-hq/element-web
@@ -61,7 +61,7 @@ jobs:
                   fetch-tags: true
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
             - name: Checkout Matrix JS SDK
-              uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+              uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
               if: inputs.matrix-js-sdk
               with:
                   repository: matrix-org/matrix-js-sdk
diff --git a/.github/workflows/shared-component-publish.yaml b/.github/workflows/shared-component-publish.yaml
new file mode 100644
index 0000000000..6869c17660
--- /dev/null
+++ b/.github/workflows/shared-component-publish.yaml
@@ -0,0 +1,40 @@
+name: Publish shared component npm package
+on:
+    workflow_dispatch: {}
+
+concurrency: release
+jobs:
+    publish:
+        name: "Publish"
+        runs-on: ubuntu-latest
+        permissions:
+            contents: write
+            id-token: write
+
+        steps:
+            - name: 🧮 Checkout code
+              uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+
+            - name: 🔧 Set up node environment
+              uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+              with:
+                  cache: "yarn"
+                  node-version-file: ".node-version"
+                  registry-url: "https://registry.npmjs.org"
+
+            # Ensure npm 11.5.1 or later is installed
+            - name: Update npm
+              run: npm install -g npm@latest
+
+            # Need to setup element web too as it needs the translations
+            - name: 🛠️ Setup EW
+              run: yarn install --pure-lockfile
+
+            - name: 🛠️ Setup
+              # When running `install` it also calls the `prepare` step which generates
+              # a build
+              run: yarn --cwd packages/shared-components install --pure-lockfile
+
+            - name: 🚀 Publish to npm
+              working-directory: packages/shared-components
+              run: npm publish --access public --tag test --provenance
diff --git a/.github/workflows/shared-component-visual-tests-netlify.yaml b/.github/workflows/shared-component-visual-tests-netlify.yaml
new file mode 100644
index 0000000000..816d899836
--- /dev/null
+++ b/.github/workflows/shared-component-visual-tests-netlify.yaml
@@ -0,0 +1,51 @@
+# Triggers after the shared component tests have finished,
+# It uploads the received images and diffs to netlify, printing the URLs to the console
+name: Upload Shared Component Visual Test Diffs
+on:
+    workflow_run:
+        workflows: ["Shared Component Visual Tests"]
+        types:
+            - completed
+
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch || github.run_id }}
+    cancel-in-progress: ${{ github.event.workflow_run.event == 'pull_request' }}
+
+permissions: {}
+
+jobs:
+    report:
+        if: github.event.workflow_run.conclusion == 'failure'
+        name: Upload Diffs
+        runs-on: ubuntu-24.04
+        environment: Netlify
+        permissions:
+            actions: read
+            deployments: write
+        steps:
+            - name: Install tree
+              run: "sudo apt-get install -y tree"
+
+            - name: Download Diffs
+              uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
+              with:
+                  github-token: ${{ secrets.GITHUB_TOKEN }}
+                  run-id: ${{ github.event.workflow_run.id }}
+                  name: received-images
+                  path: received-images
+
+            - name: Generate Index
+              run: "cd received-images && tree -L 1 --noreport -H '' -o index.html ."
+
+            - name: 📤 Deploy to Netlify
+              uses: matrix-org/netlify-pr-preview@9805cd123fc9a7e421e35340a05e1ebc5dee46b5 # v3
+              with:
+                  path: received-images
+                  owner: ${{ github.event.workflow_run.head_repository.owner.login }}
+                  branch: ${{ github.event.workflow_run.head_branch }}
+                  revision: ${{ github.event.workflow_run.head_sha }}
+                  token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+                  site_id: ${{ vars.NETLIFY_SITE_ID }}
+                  desc: Shared Component Visual Diffs
+                  deployment_env: SharedComponentDiffs
+                  prefix: "diffs-"
diff --git a/.github/workflows/shared-component-visual-tests.yaml b/.github/workflows/shared-component-visual-tests.yaml
new file mode 100644
index 0000000000..8f9cbdae31
--- /dev/null
+++ b/.github/workflows/shared-component-visual-tests.yaml
@@ -0,0 +1,66 @@
+name: Shared Component Visual Tests
+on:
+    pull_request: {}
+    merge_group:
+        types: [checks_requested]
+    push:
+        branches: [develop, master]
+
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+    cancel-in-progress: true
+
+permissions: {} # No permissions required
+
+jobs:
+    testStorybook:
+        name: "Run Visual Tests"
+        runs-on: ubuntu-24.04
+        permissions:
+            actions: read
+            issues: read
+            pull-requests: read
+        steps:
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+              with:
+                  persist-credentials: false
+                  repository: element-hq/element-web
+
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+              with:
+                  cache: "yarn"
+                  node-version: "lts/*"
+
+            - name: Install element web dependencies
+              run: yarn install --frozen-lockfile
+
+            - name: Install dependencies
+              working-directory: packages/shared-components
+              run: yarn install --frozen-lockfile
+
+            - name: Get installed Playwright version
+              working-directory: packages/shared-components
+              id: playwright
+              run: echo "version=$(yarn list --pattern @playwright/test --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name')" >> $GITHUB_OUTPUT
+
+            - name: Cache playwright binaries
+              uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+              id: playwright-cache
+              with:
+                  path: ~/.cache/ms-playwright
+                  key: ${{ runner.os }}-${{ runner.arch }}-playwright-${{ steps.playwright.outputs.version }}-onlyshell
+
+            - name: Install Playwright browsers
+              working-directory: packages/shared-components
+              if: steps.playwright-cache.outputs.cache-hit != 'true'
+              run: "yarn playwright install --with-deps --only-shell"
+
+            - name: Run Visual tests
+              run: "yarn --cwd packages/shared-components test:storybook:ci"
+
+            - name: Upload received images & diffs
+              if: always()
+              uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+              with:
+                  name: received-images
+                  path: packages/shared-components/playwright/shared-component-received
diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
index d63e0da8ed..9f90572371 100644
--- a/.github/workflows/static_analysis.yaml
+++ b/.github/workflows/static_analysis.yaml
@@ -12,8 +12,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    # These must be set for fetchdep.sh to get the right branch
-    REPOSITORY: ${{ github.repository }}
+    # This must be set for fetchdep.sh to get the right branch
     PR_NUMBER: ${{ github.event.pull_request.number }}
 
 permissions: {} # No permissions required
@@ -23,9 +22,9 @@ jobs:
         name: "Typescript Syntax Check"
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
-            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   cache: "yarn"
                   node-version: "lts/*"
@@ -36,6 +35,12 @@ jobs:
             - name: Typecheck
               run: "yarn run lint:types"
 
+            - name: Install Shared Component Dependencies
+              run: "yarn --cwd packages/shared-components install"
+
+            - name: Typecheck Shared Components
+              run: "yarn --cwd packages/shared-components run lint:types"
+
     i18n_lint:
         name: "i18n Check"
         uses: matrix-org/matrix-web-i18n/.github/workflows/i18n_check.yml@main
@@ -52,12 +57,13 @@ jobs:
                 error|misconfigured
                 welcome_to_element
                 devtools|settings|elementCallUrl
+                labs|sliding_sync_description
 
     rethemendex_lint:
         name: "Rethemendex Check"
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
             - run: ./res/css/rethemendex.sh
 
@@ -67,9 +73,9 @@ jobs:
         name: "ESLint"
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
-            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   cache: "yarn"
                   node-version: "lts/*"
@@ -81,13 +87,19 @@ jobs:
             - name: Run Linter
               run: "yarn run lint:js"
 
+            - name: Install Shared Component Deps
+              run: "yarn --cwd packages/shared-components install --frozen-lockfile"
+
+            - name: Run Linter
+              run: "yarn --cwd packages/shared-components run lint:js"
+
     style_lint:
         name: "Style Lint"
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
-            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   cache: "yarn"
                   node-version: "lts/*"
@@ -103,9 +115,9 @@ jobs:
         name: "Workflow Lint"
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
-            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   cache: "yarn"
                   node-version: "lts/*"
@@ -121,9 +133,9 @@ jobs:
         name: "Analyse Dead Code"
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
-            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   cache: "yarn"
                   node-version: "lts/*"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 276c53c098..95382b180c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -29,8 +29,8 @@ env:
 permissions: {}
 
 jobs:
-    jest:
-        name: Jest
+    jest_ew:
+        name: Jest (Element Web)
         runs-on: ubuntu-24.04
         strategy:
             fail-fast: false
@@ -39,12 +39,12 @@ jobs:
                 runner: [1, 2]
         steps:
             - name: Checkout code
-              uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+              uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
               with:
                   repository: ${{ inputs.matrix-js-sdk-sha && 'element-hq/element-web' || github.repository }}
 
             - name: Yarn cache
-              uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+              uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   node-version: "lts/*"
                   cache: "yarn"
@@ -55,7 +55,7 @@ jobs:
                   JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
 
             - name: Jest Cache
-              uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+              uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
               with:
                   path: /tmp/jest_cache
                   key: ${{ hashFiles('**/yarn.lock') }}
@@ -84,7 +84,7 @@ jobs:
 
             - name: Upload Artifact
               if: env.ENABLE_COVERAGE == 'true'
-              uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+              uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
               with:
                   name: coverage-${{ matrix.runner }}
                   path: |
@@ -93,18 +93,18 @@ jobs:
 
     complete:
         name: jest-tests
-        needs: jest
+        needs: jest_ew
         if: always()
         runs-on: ubuntu-24.04
         permissions:
             statuses: write
         steps:
-            - if: needs.jest.result != 'skipped' && needs.jest.result != 'success'
+            - if: needs.jest_ew.result != 'skipped' && needs.jest_ew.result != 'success'
               run: exit 1
 
             - name: Skip SonarCloud in merge queue
               if: github.event_name == 'merge_group' || inputs.disable_coverage == 'true'
-              uses: guibranco/github-status-action-v2@5f2b01ce1394109f70954ae6b69ef41cf7928e63
+              uses: guibranco/github-status-action-v2@5530c593759f489bba08272e96986ffc571c1ea1
               with:
                   authToken: ${{ secrets.GITHUB_TOKEN }}
                   state: success
@@ -112,3 +112,56 @@ jobs:
                   context: SonarCloud Code Analysis
                   sha: ${{ github.sha }}
                   target_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+    jest_sc:
+        name: Jest (Shared Components)
+        runs-on: ubuntu-24.04
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+              with:
+                  repository: ${{ inputs.matrix-js-sdk-sha && 'element-hq/element-web' || github.repository }}
+
+            - name: Yarn cache
+              uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+              with:
+                  node-version: "lts/*"
+                  cache: "yarn"
+
+            - name: Install EW Deps
+              run: "yarn install"
+
+            - name: Install Shared Component Deps
+              working-directory: "packages/shared-components"
+              run: "yarn install"
+
+            - name: Jest Cache
+              uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+              with:
+                  path: /tmp/jest_cache
+                  key: ${{ hashFiles('**/yarn.lock') }}
+
+            - name: Get number of CPU cores
+              id: cpu-cores
+              uses: SimenB/github-actions-cpu-cores@97ba232459a8e02ff6121db9362b09661c875ab8 # v2
+
+            - name: Run tests
+              working-directory: "packages/shared-components"
+              run: |
+                  yarn test \
+                      --coverage=${{ env.ENABLE_COVERAGE }} \
+                      --ci \
+                      --max-workers ${{ steps.cpu-cores.outputs.count }} \
+                      --cacheDirectory /tmp/jest_cache
+              env:
+                  # tell jest to use coloured output
+                  FORCE_COLOR: true
+
+            - name: Upload Artifact
+              if: env.ENABLE_COVERAGE == 'true'
+              uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+              with:
+                  name: coverage-sharedcomponents
+                  path: |
+                      packages/shared-components/coverage
+                      !packages/shared-components/coverage/lcov-report
diff --git a/.github/workflows/triage-assigned.yml b/.github/workflows/triage-assigned.yml
index f190122a1c..b16f626c15 100644
--- a/.github/workflows/triage-assigned.yml
+++ b/.github/workflows/triage-assigned.yml
@@ -15,7 +15,7 @@ jobs:
             contains(github.event.issue.assignees.*.login, 'dbkr') ||
             contains(github.event.issue.assignees.*.login, 'MidhunSureshR')
         steps:
-            - uses: actions/add-to-project@main
+            - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
               with:
                   project-url: https://github.com/orgs/element-hq/projects/67
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/triage-incoming.yml b/.github/workflows/triage-incoming.yml
index b084b4d55e..d81322bc8c 100644
--- a/.github/workflows/triage-incoming.yml
+++ b/.github/workflows/triage-incoming.yml
@@ -10,7 +10,7 @@ jobs:
     automate-project-columns:
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/add-to-project@main
+            - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
               with:
                   project-url: https://github.com/orgs/element-hq/projects/120
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
index e1849e0efc..496cfd53df 100644
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -27,7 +27,7 @@ jobs:
             contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor') ||
             contains(github.event.issue.labels.*.name, 'A-Element-Call')
         steps:
-            - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
+            - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
               with:
                   script: |
                       github.rest.issues.addLabels({
@@ -44,7 +44,7 @@ jobs:
             contains(github.event.issue.labels.*.name, 'good first issue') ||
             contains(github.event.issue.labels.*.name, 'Hacktoberfest')
         steps:
-            - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
+            - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
               with:
                   script: |
                       github.rest.issues.addLabels({
@@ -112,7 +112,7 @@ jobs:
              contains(github.event.issue.labels.*.name, 'O-Frequent') ||
              contains(github.event.issue.labels.*.name, 'A11y'))
         steps:
-            - uses: actions/add-to-project@main
+            - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
               with:
                   project-url: https://github.com/orgs/element-hq/projects/18
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -123,7 +123,7 @@ jobs:
         if: >
             contains(github.event.issue.labels.*.name, 'X-Needs-Product')
         steps:
-            - uses: actions/add-to-project@main
+            - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
               with:
                   project-url: https://github.com/orgs/element-hq/projects/28
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -134,7 +134,7 @@ jobs:
         if: >
             contains(github.event.issue.labels.*.name, 'A-New-Search-Experience')
         steps:
-            - uses: actions/add-to-project@main
+            - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
               with:
                   project-url: https://github.com/orgs/element-hq/projects/48
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -145,7 +145,7 @@ jobs:
         if: >
             contains(github.event.issue.labels.*.name, 'Team: VoIP')
         steps:
-            - uses: actions/add-to-project@main
+            - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
               with:
                   project-url: https://github.com/orgs/element-hq/projects/41
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -156,7 +156,7 @@ jobs:
         if: >
             contains(github.event.issue.labels.*.name, 'Team: Crypto')
         steps:
-            - uses: actions/add-to-project@main
+            - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
               with:
                   project-url: https://github.com/orgs/element-hq/projects/76
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -172,7 +172,7 @@ jobs:
             contains(github.event.issue.labels.*.name, 'A-Testing') ||
             contains(github.event.issue.labels.*.name, 'Z-Flaky-Test')
         steps:
-            - uses: actions/add-to-project@main
+            - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
               with:
                   project-url: https://github.com/orgs/element-hq/projects/101
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/triage-move-review-requests.yml b/.github/workflows/triage-move-review-requests.yml
index d3bcda270b..4d8745f4bd 100644
--- a/.github/workflows/triage-move-review-requests.yml
+++ b/.github/workflows/triage-move-review-requests.yml
@@ -9,7 +9,7 @@ jobs:
         name: Move PRs asking for design review to the design board
         runs-on: ubuntu-24.04
         steps:
-            - uses: octokit/graphql-action@v2.x
+            - uses: octokit/graphql-action@abaeca7ba4f0325d63b8de7ef943c2418d161b93 # v3.0.0
               id: find_team_members
               with:
                   headers: '{"GraphQL-Features": "projects_next_graphql"}'
@@ -52,7 +52,7 @@ jobs:
                   fi
               env:
                   TEAM: "design"
-            - uses: octokit/graphql-action@v2.x
+            - uses: octokit/graphql-action@abaeca7ba4f0325d63b8de7ef943c2418d161b93 # v3.0.0
               id: add_to_project
               if: steps.any_matching_reviewers.outputs.match == 'true'
               with:
@@ -76,7 +76,7 @@ jobs:
         name: Move PRs asking for design review to the design board
         runs-on: ubuntu-24.04
         steps:
-            - uses: octokit/graphql-action@v2.x
+            - uses: octokit/graphql-action@abaeca7ba4f0325d63b8de7ef943c2418d161b93 # v3.0.0
               id: find_team_members
               with:
                   headers: '{"GraphQL-Features": "projects_next_graphql"}'
@@ -119,7 +119,7 @@ jobs:
                   fi
               env:
                   TEAM: "product"
-            - uses: octokit/graphql-action@v2.x
+            - uses: octokit/graphql-action@abaeca7ba4f0325d63b8de7ef943c2418d161b93 # v3.0.0
               id: add_to_project
               if: steps.any_matching_reviewers.outputs.match == 'true'
               with:
diff --git a/.github/workflows/triage-stale.yml b/.github/workflows/triage-stale.yml
index f76cd299cc..c7a9d1ba31 100644
--- a/.github/workflows/triage-stale.yml
+++ b/.github/workflows/triage-stale.yml
@@ -12,15 +12,17 @@ jobs:
             issues: write
             pull-requests: write
         steps:
-            - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9
+            - uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10
               with:
                   operations-per-run: 100
+
                   # Flaky test issue closing
-                  only-issue-labels: "Z-Flaky-Test"
+                  any-of-issue-labels: "Z-Flaky-Test-Chrome,Z-Flaky-Test-Firefox,Z-Flaky-Test-Webkit"
                   days-before-issue-stale: 14
                   days-before-issue-close: 0
                   close-issue-message: "This flaky test issue has not been updated in 14 days. It is being closed as presumed resolved."
                   exempt-issue-labels: "Z-Flaky-Test-Disabled"
+
                   # Stale PR closing
                   days-before-pr-stale: 180
                   days-before-pr-close: 0
diff --git a/.github/workflows/triage-unlabelled.yml b/.github/workflows/triage-unlabelled.yml
index d3bda6df1f..71396be804 100644
--- a/.github/workflows/triage-unlabelled.yml
+++ b/.github/workflows/triage-unlabelled.yml
@@ -5,44 +5,25 @@ on:
         types: [unlabeled]
 permissions: {}
 jobs:
-    Move_Unabeled_Issue_On_Project_Board:
+    move_no_longer_needs_info_issues:
         name: Move no longer X-Needs-Info issues to Triaged
         runs-on: ubuntu-24.04
-        permissions:
-            repository-projects: read
         if: >
-            ${{
-            !contains(github.event.issue.labels.*.name, 'X-Needs-Info') }}
-        env:
-            BOARD_NAME: "Issue triage"
-            OWNER: ${{ github.repository_owner }}
-            REPO: ${{ github.event.repository.name }}
-            ISSUE: ${{ github.event.issue.number }}
+            !contains(github.event.issue.labels.*.name, 'X-Needs-Info')
         steps:
-            - name: Check if issue is already in "${{ env.BOARD_NAME }}"
-              run: |
-                  json=$(curl -s -H 'Content-Type: application/json' -H "Authorization: bearer ${{ secrets.GITHUB_TOKEN }}" -X POST -d '{"query": "query($issue: Int!, $owner: String!, $repo: String!) { repository(owner: $owner, name: $repo) { issue(number: $issue) { projectCards { nodes { project { name } isArchived } } } } } ", "variables" : "{ \"issue\": '${ISSUE}', \"owner\": \"'${OWNER}'\", \"repo\": \"'${REPO}'\" }" }' https://api.github.com/graphql)
-                  if echo $json | jq '.data.repository.issue.projectCards.nodes | length'; then
-                    if [[ $(echo $json | jq '.data.repository.issue.projectCards.nodes[0].project.name') =~ "${BOARD_NAME}" ]]; then
-                      if [[ $(echo $json | jq '.data.repository.issue.projectCards.nodes[0].isArchived') == 'true' ]]; then
-                        echo "Issue is already in Project '$BOARD_NAME', but is archived - skipping workflow";
-                        echo "SKIP_ACTION=true" >> $GITHUB_ENV
-                      else
-                        echo "Issue is already in Project '$BOARD_NAME', proceeding";
-                        echo "ALREADY_IN_BOARD=true" >> $GITHUB_ENV
-                      fi
-                    else
-                      echo "Issue is not in project '$BOARD_NAME', cancelling this workflow"
-                      echo "ALREADY_IN_BOARD=false" >> $GITHUB_ENV
-                    fi
-                  fi
-            - name: Move issue
-              uses: alex-page/github-project-automation-plus@303f24a24c67ce7adf565a07e96720faf126fe36
-              if: ${{ env.ALREADY_IN_BOARD == 'true' && env.SKIP_ACTION != 'true' }}
+            - id: set_fields
+              uses: nipe0324/update-project-v2-item-field@c4af58452d1c5a788c1ea4f20e073fa722ec4a6b #v2.0.2
               with:
-                  project: Issue triage
-                  column: Triaged
-                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+                  project-url: ${{ env.PROJECT_URL }}
+                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+                  skip-update-script: |
+                      const isIssue = item.type === 'ISSUE'
+                      const status = item.fieldValues['Status']
+                      return !isIssue || status !== 'Needs info'
+                  field-name: Status
+                  field-value: "Triaged"
+        env:
+            PROJECT_URL: https://github.com/orgs/element-hq/projects/120
 
     remove_Z-Labs_label:
         name: Remove Z-Labs label when features behind labs flags are removed
@@ -62,7 +43,7 @@ jobs:
             contains(github.event.issue.labels.*.name, 'A-Element-Call')) &&
             contains(github.event.issue.labels.*.name, 'Z-Labs')
         steps:
-            - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
+            - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
               with:
                   script: |
                       github.rest.issues.removeLabel({
diff --git a/.github/workflows/update-jitsi.yml b/.github/workflows/update-jitsi.yml
index da386c544d..67e3fb19c5 100644
--- a/.github/workflows/update-jitsi.yml
+++ b/.github/workflows/update-jitsi.yml
@@ -9,9 +9,9 @@ jobs:
     update:
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
-            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   cache: "yarn"
                   node-version: "lts/*"
@@ -23,7 +23,7 @@ jobs:
               run: "yarn update:jitsi"
 
             - name: Create Pull Request
-              uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7
+              uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 # v7
               with:
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                   branch: actions/jitsi-update
diff --git a/.github/workflows/update-topics.yaml b/.github/workflows/update-topics.yaml
index 5ee9f2b608..c1fb78e3b8 100644
--- a/.github/workflows/update-topics.yaml
+++ b/.github/workflows/update-topics.yaml
@@ -22,17 +22,17 @@ jobs:
         runs-on: ubuntu-24.04
         environment: Matrix
         steps:
-            - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
+            - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
               env:
                   HS_URL: ${{ secrets.BETABOT_HS_URL }}
                   LOBBY_ROOM_ID: ${{ secrets.ROOM_ID }}
-                  PUBLIC_ROOM_ID: "!YTvKGNlinIzlkMTVRl:matrix.org"
-                  ANNOUNCEMENT_ROOM_ID: "!bijaLdadorKgNGtHdA:matrix.org"
+                  PUBLIC_DISCUSSION_ROOM_ID: "!xUW4PpAe1CmThA3r2wI8IrgwwsK006-zqWdJCljpd10"
+                  ANNOUNCEMENT_ROOM_ID: "!ars5ndgI6IIYZXECiJ-u8YljHNzShJn3nHdB-3rYI2M"
                   TOKEN: ${{ secrets.BETABOT_ACCESS_TOKEN }}
                   RELEASE_STATUS: "Release status: ${{ inputs.expected_status }} expected ${{ inputs.expected_date }}"
               with:
                   script: |
-                      const { HS_URL, TOKEN, RELEASE_STATUS, LOBBY_ROOM_ID, PUBLIC_ROOM_ID, ANNOUNCEMENT_ROOM_ID } = process.env;
+                      const { HS_URL, TOKEN, RELEASE_STATUS, LOBBY_ROOM_ID, PUBLIC_DISCUSSION_ROOM_ID, ANNOUNCEMENT_ROOM_ID } = process.env;
 
                       const repo = context.repo;
                       const { data } = await github.rest.repos.getLatestRelease({
@@ -71,13 +71,23 @@ jobs:
                           const data = await res.json();
                           console.log(roomId, "got event", data);
 
+                          if (!regex.test(data.topic)) {
+                              core.setFailed("Topic format is incorrect for room " + roomId);
+                              return;
+                          }
+
                           const topic = data.topic.replace(regex, releaseTopic);
                           if (topic === data.topic) {
                               console.log(roomId, "nothing to do");
                               return;
                           }
                           if (data["org.matrix.msc3765.topic"]) {
-                              data["org.matrix.msc3765.topic"].forEach(d => {
+                              data["org.matrix.msc3765.topic"]?.["m.text"].forEach(d => {
+                                  d.body = d.body.replace(regex, releaseTopic);
+                              });
+                          }
+                          if (data["m.topic"]) {
+                              data["m.topic"]?.["m.text"].forEach(d => {
                                   d.body = d.body.replace(regex, releaseTopic);
                               });
                           }
@@ -92,12 +102,18 @@ jobs:
                           });
 
                           if (res.ok) {
-                              console.log(roomId, "topic updated:", topic);
+                              const resJson = res.json();
+                              if (resJson.errcode) {
+                                  core.setFailed(`Error updating ${roomId}: ${resJson.error}`);
+                              } else {
+                                  console.log(roomId, "topic updated:", topic);
+                              }
                           } else {
-                              console.log(roomId, await res.text());
+                              const errText = await res.text();
+                              core.setFailed(`Error updating ${roomId}: ${errText}`);
                           }
                       }
 
                       await updateReleaseInTopic(LOBBY_ROOM_ID);
-                      await updateReleaseInTopic(PUBLIC_ROOM_ID);
+                      await updateReleaseInTopic(PUBLIC_DISCUSSION_ROOM_ID);
                       await updateReleaseInTopic(ANNOUNCEMENT_ROOM_ID);
diff --git a/.gitignore b/.gitignore
index 429b317a4f..3d6d723ac3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 /key.pem
 /lib
 /node_modules
-/packages/
 /webapp
 /.npmrc
 /*.log
@@ -31,3 +30,10 @@ electron/pub
 /index.html
 # version file and tarball created by `npm pack` / `yarn pack`
 /git-revision.txt
+
+*storybook.log
+storybook-static
+
+/packages/shared-components/node_modules
+/packages/shared-components/dist
+/packages/shared-components/src/i18nKeys.d.ts
diff --git a/.node-version b/.node-version
index 2bd5a0a98a..a45fd52cc5 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-22
+24
diff --git a/.prettierignore b/.prettierignore
index 46b1ac5b54..abaa4d3df3 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -2,7 +2,6 @@
 /dist
 /lib
 /node_modules
-/packages/
 /webapp
 /*.log
 yarn.lock
diff --git a/.stylelintrc.js b/.stylelintrc.js
index ffc6c345b9..3244d122c5 100644
--- a/.stylelintrc.js
+++ b/.stylelintrc.js
@@ -70,5 +70,13 @@ module.exports = {
                 ],
             },
         ],
+        "property-no-deprecated": [
+            true,
+            {
+                ignoreProperties: ["-webkit-box-orient", "word-wrap"],
+            },
+        ],
+        "nesting-selector-no-missing-scoping-root": null,
+        "no-invalid-position-declaration": null,
     },
 };
diff --git a/AUTHORS.rst b/AUTHORS.rst
index d027b59c99..a3f3be6586 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -19,3 +19,6 @@ include:
 
 * Thom Cleary (https://github.com/thomcatdotrocks)
   Small update for tarball deployment
+
+* Alexander (https://github.com/ioalexander)
+  Save image on CTRL + S shortcut
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48a721c013..43546c1817 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,444 @@
+Changes in [1.12.7](https://github.com/element-hq/element-web/releases/tag/v1.12.7) (2025-12-16)
+================================================================================================
+## ✨ Features
+
+* Replace legacy icons with compound ([#31424](https://github.com/element-hq/element-web/pull/31424)). Contributed by @t3chguy.
+* Update polls UX to match EX Mobile and improve accessibility ([#31245](https://github.com/element-hq/element-web/pull/31245)). Contributed by @langleyd.
+* Add option to enable read receipt and marker when user interact with UI ([#31353](https://github.com/element-hq/element-web/pull/31353)). Contributed by @florianduros.
+* Introduce a hook to auto dispose view models ([#31178](https://github.com/element-hq/element-web/pull/31178)). Contributed by @MidhunSureshR.
+* Update settings toggles to use consistent design across app. ([#30169](https://github.com/element-hq/element-web/pull/30169)). Contributed by @Half-Shot.
+* Add ability to the room view to hide widgets ([#31400](https://github.com/element-hq/element-web/pull/31400)). Contributed by @langleyd.
+* call: Pass the echo cancellation and noise suppression settings to EC ([#31317](https://github.com/element-hq/element-web/pull/31317)). Contributed by @BillCarsonFr.
+* Tweak rendering of icons for a11y ([#31358](https://github.com/element-hq/element-web/pull/31358)). Contributed by @t3chguy.
+* Implement new `renderNotificationDecoration` from module API  ([#31389](https://github.com/element-hq/element-web/pull/31389)). Contributed by @MidhunSureshR.
+* Replace more icons with compound ([#31381](https://github.com/element-hq/element-web/pull/31381)). Contributed by @t3chguy.
+* Replace more icons with compound ([#31378](https://github.com/element-hq/element-web/pull/31378)). Contributed by @t3chguy.
+* `<Banner/>`: Hide `Dismiss` button if `onClose` handler is not provided. ([#31362](https://github.com/element-hq/element-web/pull/31362)). Contributed by @kaylendog.
+* Replace batch of legacy icons with compound design tokens ([#31360](https://github.com/element-hq/element-web/pull/31360)). Contributed by @t3chguy.
+* MSC4380: Invite blocking ([#31268](https://github.com/element-hq/element-web/pull/31268)). Contributed by @richvdh.
+* Tweak rendering of icons for accessibility ([#31346](https://github.com/element-hq/element-web/pull/31346)). Contributed by @t3chguy.
+* Implement a shared `Banner` component. ([#31266](https://github.com/element-hq/element-web/pull/31266)). Contributed by @kaylendog.
+* Allow the Login screen to use the dark theme ([#31293](https://github.com/element-hq/element-web/pull/31293)). Contributed by @richvdh.
+
+## 🐛 Bug Fixes
+
+* [Backport staging] Amend e2e normal icon from lock-solid to info ([#31559](https://github.com/element-hq/element-web/pull/31559)). Contributed by @t3chguy.
+* [Backport staging] Fix CSS specificity causing icon issues in e2e verification ([#31548](https://github.com/element-hq/element-web/pull/31548)). Contributed by @RiotRobot.
+* [Backport staging] Fix e2e icons in CompleteSecurity \& SetupEncryptionBody ([#31522](https://github.com/element-hq/element-web/pull/31522)). Contributed by @RiotRobot.
+* [Backport staging] Remove an extra paragraph in advanced room settings ([#31511](https://github.com/element-hq/element-web/pull/31511)). Contributed by @RiotRobot.
+* [Backport staging] Don't show the key storage out of sync toast when backup disabled ([#31507](https://github.com/element-hq/element-web/pull/31507)). Contributed by @RiotRobot.
+* Fix composer button visibility in contrast colour mode ([#31255](https://github.com/element-hq/element-web/pull/31255)). Contributed by @t3chguy.
+* Ensure correct room version is used and permissions are appropriately sert when creating rooms ([#31464](https://github.com/element-hq/element-web/pull/31464)). Contributed by @Half-Shot.
+* Fix e2e icon rendering ([#31454](https://github.com/element-hq/element-web/pull/31454)). Contributed by @t3chguy.
+* EventIndexer: ensure we add initial checkpoints when the db is first opened ([#31448](https://github.com/element-hq/element-web/pull/31448)). Contributed by @richvdh.
+* Fix `/join <alias>` command failing due to race condition ([#31433](https://github.com/element-hq/element-web/pull/31433)). Contributed by @MidhunSureshR.
+* MessageEventIndexDialog: distinguish indexed rooms ([#31436](https://github.com/element-hq/element-web/pull/31436)). Contributed by @richvdh.
+* Move `EditInPlace` out of `Form` (Fixes: reloading EW on EC url update) ([#31434](https://github.com/element-hq/element-web/pull/31434)). Contributed by @toger5.
+* Fixes issue where cursor would jump to the beginning of the input field after converting Japanese text and pressing Tab ([#31432](https://github.com/element-hq/element-web/pull/31432)). Contributed by @shinaoka.
+* Fix widgets getting stuck in loading states ([#31314](https://github.com/element-hq/element-web/pull/31314)). Contributed by @robintown.
+* Room list: fix room options remaining on room item after mouse leaving ([#31414](https://github.com/element-hq/element-web/pull/31414)). Contributed by @florianduros.
+* Make `RoomList.showMessagePreview` configurable by `config.json` ([#31419](https://github.com/element-hq/element-web/pull/31419)). Contributed by @florianduros.
+* Fix bug which caused app not to load correctly when `force_verification` is enabled ([#31265](https://github.com/element-hq/element-web/pull/31265)). Contributed by @richvdh.
+* Room list: display the menu option on the room list item when clicked/opened ([#31380](https://github.com/element-hq/element-web/pull/31380)). Contributed by @florianduros.
+* Fix handling of SVGs ([#31359](https://github.com/element-hq/element-web/pull/31359)). Contributed by @t3chguy.
+* Fix word wrapping in expanded left panel buttons ([#31377](https://github.com/element-hq/element-web/pull/31377)). Contributed by @t3chguy.
+* Fix aspect ratio on error view background ([#31361](https://github.com/element-hq/element-web/pull/31361)). Contributed by @t3chguy.
+* Fix failure to request persistent storage perms ([#31299](https://github.com/element-hq/element-web/pull/31299)). Contributed by @richvdh.
+* Fix calls sometimes not knowing that they're presented ([#31313](https://github.com/element-hq/element-web/pull/31313)). Contributed by @robintown.
+
+
+Changes in [1.12.6](https://github.com/element-hq/element-web/releases/tag/v1.12.6) (2025-12-03)
+================================================================================================
+This release fixes a bug where 1:1 calling was incorrectly not available if no Element Call focus was set.
+
+## 🐛 Bug Fixes
+
+* Add option to pick call options for voice calls. ([#31413](https://github.com/element-hq/element-web/pull/31413)).
+
+Changes in [1.12.5](https://github.com/element-hq/element-web/releases/tag/v1.12.5) (2025-12-02)
+================================================================================================
+## ✨ Features
+
+* Update Emojibase to v17 ([#31307](https://github.com/element-hq/element-web/pull/31307)). Contributed by @t3chguy.
+* Adds tooltip for compose menu ([#31122](https://github.com/element-hq/element-web/pull/31122)). Contributed by @byteplow.
+* Add option to hide pinned message banner in room view ([#31296](https://github.com/element-hq/element-web/pull/31296)). Contributed by @florianduros.
+* update twemoji to not monochromise emoji with BLACK in their name ([#31281](https://github.com/element-hq/element-web/pull/31281)). Contributed by @ara4n.
+* upgrade to twemoji 17.0.2 and fix #14695 ([#31267](https://github.com/element-hq/element-web/pull/31267)). Contributed by @ara4n.
+* Add options to hide right panel in room view ([#31252](https://github.com/element-hq/element-web/pull/31252)). Contributed by @florianduros.
+* Delayed event management: split endpoints, no auth  ([#31183](https://github.com/element-hq/element-web/pull/31183)). Contributed by @AndrewFerr.
+* Support using Element Call for voice calls in DMs ([#30817](https://github.com/element-hq/element-web/pull/30817)). Contributed by @Half-Shot.
+* Improve screen reader accessibility of auth pages ([#31236](https://github.com/element-hq/element-web/pull/31236)). Contributed by @t3chguy.
+* Add posthog tracking for key backup toasts ([#31195](https://github.com/element-hq/element-web/pull/31195)). Contributed by @Half-Shot.
+
+## 🐛 Bug Fixes
+
+* Return to using Fira Code as the default monospace font ([#31302](https://github.com/element-hq/element-web/pull/31302)). Contributed by @ara4n.
+* Fix case of home screen being displayed erroneously  ([#31301](https://github.com/element-hq/element-web/pull/31301)). Contributed by @langleyd.
+* Fix message edition and reply when multiple rooms at displayed the same moment ([#31280](https://github.com/element-hq/element-web/pull/31280)). Contributed by @florianduros.
+* Key storage out of sync: reset key backup when needed ([#31279](https://github.com/element-hq/element-web/pull/31279)). Contributed by @uhoreg.
+* Fix invalid events crashing entire room rather than just their tile ([#31256](https://github.com/element-hq/element-web/pull/31256)). Contributed by @t3chguy.
+* Fix expand button of space panel getting cut off at the edges ([#31259](https://github.com/element-hq/element-web/pull/31259)). Contributed by @MidhunSureshR.
+* Fix pill buttons in dialogs ([#31246](https://github.com/element-hq/element-web/pull/31246)). Contributed by @dbkr.
+* Fix blank sections at the top and bottom of the member list when scrolling ([#31198](https://github.com/element-hq/element-web/pull/31198)). Contributed by @langleyd.
+* Fix emoji category selection with keyboard ([#31162](https://github.com/element-hq/element-web/pull/31162)). Contributed by @langleyd.
+
+
+Changes in [1.12.4](https://github.com/element-hq/element-web/releases/tag/v1.12.4) (2025-11-18)
+================================================================================================
+## ✨ Features
+
+* Apply aria-hidden to emoji in SAS verification ([#31204](https://github.com/element-hq/element-web/pull/31204)). Contributed by @t3chguy.
+* Add options to hide header and composer of room view for the module api ([#31095](https://github.com/element-hq/element-web/pull/31095)). Contributed by @florianduros.
+* Experimental Module API Additions ([#30863](https://github.com/element-hq/element-web/pull/30863)). Contributed by @dbkr.
+* Change polls to use fieldset/legend markup ([#31160](https://github.com/element-hq/element-web/pull/31160)). Contributed by @langleyd.
+* Use compound Button styles for Jitsi button ([#31159](https://github.com/element-hq/element-web/pull/31159)). Contributed by @Half-Shot.
+* Add FocusLock to emoji picker ([#31146](https://github.com/element-hq/element-web/pull/31146)). Contributed by @langleyd.
+* Move room name, avatar, and topic to IOpts. ([#30981](https://github.com/element-hq/element-web/pull/30981)). Contributed by @kaylendog.
+* Add a devtool for looking at users and their devices ([#30983](https://github.com/element-hq/element-web/pull/30983)). Contributed by @uhoreg.
+
+## 🐛 Bug Fixes
+
+* Fix room list handling of membership changes ([#31197](https://github.com/element-hq/element-web/pull/31197)). Contributed by @t3chguy.
+* Fix room list unable to be resized when displayed after a module ([#31186](https://github.com/element-hq/element-web/pull/31186)). Contributed by @florianduros.
+* Inhibit keyboard highlights in dialogs when effector is not in focus ([#31181](https://github.com/element-hq/element-web/pull/31181)). Contributed by @t3chguy.
+* Strip mentions from forwarded messages ([#30884](https://github.com/element-hq/element-web/pull/30884)). Contributed by @twassman.
+* Don't allow pin or edit of messages with a send status ([#31158](https://github.com/element-hq/element-web/pull/31158)). Contributed by @langleyd.
+* Hide room header buttons if the room hasn't been created yet. ([#31092](https://github.com/element-hq/element-web/pull/31092)). Contributed by @Half-Shot.
+* Fix screen readers not indicating the emoji picker search field is focused. ([#31128](https://github.com/element-hq/element-web/pull/31128)). Contributed by @langleyd.
+* Fix emoji picker highlight missing when not active element ([#31148](https://github.com/element-hq/element-web/pull/31148)). Contributed by @t3chguy.
+* Add relevant aria attribute for selected emoji in the emoji picker ([#31125](https://github.com/element-hq/element-web/pull/31125)). Contributed by @t3chguy.
+* Fix tooltips within context menu portals being unreliable ([#31129](https://github.com/element-hq/element-web/pull/31129)). Contributed by @t3chguy.
+* Avoid excessive re-render of room list and member list ([#31131](https://github.com/element-hq/element-web/pull/31131)). Contributed by @florianduros.
+* Make emoji picker height responsive. ([#31130](https://github.com/element-hq/element-web/pull/31130)). Contributed by @langleyd.
+* Emoji Picker: Focused emoji does not move with the arrow keys ([#30893](https://github.com/element-hq/element-web/pull/30893)). Contributed by @langleyd.
+* Fix audio player seek bar position  ([#31127](https://github.com/element-hq/element-web/pull/31127)). Contributed by @florianduros.
+* Add aria label to emoji picker search ([#31126](https://github.com/element-hq/element-web/pull/31126)). Contributed by @langleyd.
+
+
+Changes in [1.12.3](https://github.com/element-hq/element-web/releases/tag/v1.12.3) (2025-11-04)
+================================================================================================
+## 🦖 Deprecations
+
+* Remove allowVoipWithNoMedia feature flag ([#31087](https://github.com/element-hq/element-web/pull/31087)). Contributed by @Half-Shot.
+
+## ✨ Features
+
+* Change module API to be an instance getter ([#31025](https://github.com/element-hq/element-web/pull/31025)). Contributed by @dbkr.
+
+## 🐛 Bug Fixes
+
+* Show hover elements when keyboard focus is within an event tile ([#31078](https://github.com/element-hq/element-web/pull/31078)). Contributed by @t3chguy.
+* Ensure toolbar navigation pattern works in MessageActionBar ([#31080](https://github.com/element-hq/element-web/pull/31080)). Contributed by @t3chguy.
+* Ensure sent markers are hidden when showing thread summary. ([#31076](https://github.com/element-hq/element-web/pull/31076)). Contributed by @Half-Shot.
+* Fix translation in dev mode ([#31045](https://github.com/element-hq/element-web/pull/31045)). Contributed by @florianduros.
+* Fix sort order in space hierarchy ([#30975](https://github.com/element-hq/element-web/pull/30975)). Contributed by @t3chguy.
+* New Room list: don't display message preview of thread ([#31043](https://github.com/element-hq/element-web/pull/31043)). Contributed by @florianduros.
+* Revert "A11y: move focus to right panel when opened" ([#30999](https://github.com/element-hq/element-web/pull/30999)). Contributed by @florianduros.
+* Fix highlights in messages (or search results) breaking links ([#30264](https://github.com/element-hq/element-web/pull/30264)). Contributed by @bojidar-bg.
+* Add prepare script ([#31030](https://github.com/element-hq/element-web/pull/31030)). Contributed by @dbkr.
+* Fix html exports by adding SDKContext ([#30987](https://github.com/element-hq/element-web/pull/30987)). Contributed by @t3chguy.
+
+
+Changes in [1.12.2](https://github.com/element-hq/element-web/releases/tag/v1.12.2) (2025-10-21)
+================================================================================================
+## ✨ Features
+
+* Room List: Extend the viewport to avoid so many black spots when scrolling the room list ([#30867](https://github.com/element-hq/element-web/pull/30867)). Contributed by @langleyd.
+* Hide calling buttons in room header before a room is created ([#30816](https://github.com/element-hq/element-web/pull/30816)). Contributed by @Half-Shot.
+* Improve invite dialog ui - Part 2 ([#30836](https://github.com/element-hq/element-web/pull/30836)). Contributed by @florianduros.
+
+## 🐛 Bug Fixes
+
+* Fix platform settings race condition and make auto-launch tri-state ([#30977](https://github.com/element-hq/element-web/pull/30977)). Contributed by @t3chguy.
+* Fix: member count in header and member list ([#30982](https://github.com/element-hq/element-web/pull/30982)). Contributed by @florianduros.
+* Fix duration of voice message in timeline ([#30973](https://github.com/element-hq/element-web/pull/30973)). Contributed by @florianduros.
+* Fix voice notes rendering at 00:00 when playback had not begun. ([#30961](https://github.com/element-hq/element-web/pull/30961)). Contributed by @Half-Shot.
+* Improve handling of animated images, add support for AVIF animations ([#30932](https://github.com/element-hq/element-web/pull/30932)). Contributed by @t3chguy.
+* Update key storage toggle when key storage status changes ([#30934](https://github.com/element-hq/element-web/pull/30934)). Contributed by @uhoreg.
+* Fix jitsi widget popout ([#30908](https://github.com/element-hq/element-web/pull/30908)). Contributed by @dbkr.
+* Improve keyboard navigation on invite dialog ([#30930](https://github.com/element-hq/element-web/pull/30930)). Contributed by @florianduros.
+* Prefer UIA flows with supported UIA stages ([#30926](https://github.com/element-hq/element-web/pull/30926)). Contributed by @richvdh.
+* Enhance accessibility of dropdown ([#30928](https://github.com/element-hq/element-web/pull/30928)). Contributed by @florianduros.
+* Improve accessibility of the `\<AvatarSetting> component ([#30907](https://github.com/element-hq/element-web/pull/30907)). Contributed by @MidhunSureshR.
+
+
+Changes in [1.12.1](https://github.com/element-hq/element-web/releases/tag/v1.12.1) (2025-10-07)
+================================================================================================
+## ✨ Features
+
+* New Room List: Change the order of filters to match those on mobile ([#30905](https://github.com/element-hq/element-web/pull/30905)). Contributed by @langleyd.
+* New Room List: Don't clear filters on space change ([#30903](https://github.com/element-hq/element-web/pull/30903)). Contributed by @langleyd.
+* Add release announcement for the sounds ([#30900](https://github.com/element-hq/element-web/pull/30900)). Contributed by @langleyd.
+* Rich Text Editor: Add emoji suggestion support ([#30873](https://github.com/element-hq/element-web/pull/30873)). Contributed by @langleyd.
+* feat: Disable session lock when running in element-desktop ([#30643](https://github.com/element-hq/element-web/pull/30643)). Contributed by @kaylendog.
+* Improve invite dialog ui - Part 1 ([#30764](https://github.com/element-hq/element-web/pull/30764)). Contributed by @florianduros.
+* Update Message Sound for Element ([#30804](https://github.com/element-hq/element-web/pull/30804)). Contributed by @beatdemon.
+* Add new and improved ringtone ([#30761](https://github.com/element-hq/element-web/pull/30761)). Contributed by @Half-Shot.
+* Disable RTE formatting buttons when the content contains a slash command ([#30802](https://github.com/element-hq/element-web/pull/30802)). Contributed by @langleyd.
+
+## 🐛 Bug Fixes
+
+* New Room List: Improve robustness of keyboard navigation ([#30888](https://github.com/element-hq/element-web/pull/30888)). Contributed by @langleyd.
+* Fix a11y issue on list in invite dialog ([#30878](https://github.com/element-hq/element-web/pull/30878)). Contributed by @florianduros.
+* Switch Export and Import Icons to match intuition ([#30805](https://github.com/element-hq/element-web/pull/30805)). Contributed by @micartey.
+* Hide breadcrumb option when new room list is enabled ([#30869](https://github.com/element-hq/element-web/pull/30869)). Contributed by @florianduros.
+* Avoid creating multiple call objects for the same widget ([#30839](https://github.com/element-hq/element-web/pull/30839)). Contributed by @robintown.
+* Add a test for #29882, which is fixed by matrix-org/matrix-js-sdk#5016 ([#30835](https://github.com/element-hq/element-web/pull/30835)). Contributed by @andybalaam.
+* fix: use `help_encryption_url` of config instead of hardcoded `https://element.io/help#encryption5` ([#30746](https://github.com/element-hq/element-web/pull/30746)). Contributed by @florianduros.
+* Fix html export when feature\_jump\_to\_date is enabled ([#30828](https://github.com/element-hq/element-web/pull/30828)). Contributed by @langleyd.
+* Fix #30439: "Forgot recovery key" should go to "reset" ([#30771](https://github.com/element-hq/element-web/pull/30771)). Contributed by @andybalaam.
+
+
+Changes in [1.12.0](https://github.com/element-hq/element-web/releases/tag/v1.12.0) (2025-09-23)
+================================================================================================
+## 🦖 Deprecations
+
+* Remove remaining support for outdated .well-known settings ([#30702](https://github.com/element-hq/element-web/pull/30702)). Contributed by @richvdh.
+
+## ✨ Features
+
+* Add decline button to call notification toast (use new notification event) ([#30729](https://github.com/element-hq/element-web/pull/30729)). Contributed by @toger5.
+* Use the new room list by default ([#30640](https://github.com/element-hq/element-web/pull/30640)). Contributed by @langleyd.
+* "Verify this device" redesign ([#30596](https://github.com/element-hq/element-web/pull/30596)). Contributed by @uhoreg.
+* Set Element Call "intents" when starting and answering DM calls. ([#30730](https://github.com/element-hq/element-web/pull/30730)). Contributed by @Half-Shot.
+* Add axe compliance for new room list ([#30700](https://github.com/element-hq/element-web/pull/30700)). Contributed by @langleyd.
+* Stop ringing and remove toast if another device answers a RTC call. ([#30728](https://github.com/element-hq/element-web/pull/30728)). Contributed by @Half-Shot.
+* Automatically adjust history visibility when making a room private ([#30713](https://github.com/element-hq/element-web/pull/30713)). Contributed by @Half-Shot.
+* Release announcement for new room list ([#30675](https://github.com/element-hq/element-web/pull/30675)). Contributed by @dbkr.
+
+## 🐛 Bug Fixes
+
+* [Backport staging] Room list: make the filter resize correctly ([#30795](https://github.com/element-hq/element-web/pull/30795)). Contributed by @RiotRobot.
+* [Backport staging] Avoid flicker of the room list filter on resize ([#30794](https://github.com/element-hq/element-web/pull/30794)). Contributed by @RiotRobot.
+* Don't show release announcements while toasts are displayed ([#30770](https://github.com/element-hq/element-web/pull/30770)). Contributed by @dbkr.
+* Fix enabling key backup not working if there is an untrusted key backup ([#30707](https://github.com/element-hq/element-web/pull/30707)). Contributed by @Half-Shot.
+* Force `preload` to be false when setting an intent on an Element Call. ([#30759](https://github.com/element-hq/element-web/pull/30759)). Contributed by @Half-Shot.
+* Fix handling of 413 server response when uploading media ([#30737](https://github.com/element-hq/element-web/pull/30737)). Contributed by @hughns.
+* Make landmark navigation work with new room list ([#30747](https://github.com/element-hq/element-web/pull/30747)). Contributed by @dbkr.
+* Prevent voice message from displaying spurious errors ([#30736](https://github.com/element-hq/element-web/pull/30736)). Contributed by @florianduros.
+* Align default avatar and fix colors in composer pills ([#30739](https://github.com/element-hq/element-web/pull/30739)). Contributed by @florianduros.
+* Use configured URL for link to desktop app in message search settings ([#30742](https://github.com/element-hq/element-web/pull/30742)). Contributed by @t3chguy.
+* Fix history visibility when creating space rooms ([#30745](https://github.com/element-hq/element-web/pull/30745)). Contributed by @dbkr.
+* Check HTML-encoded quotes when handling translations for embedded pages (such as welcome.html) ([#30743](https://github.com/element-hq/element-web/pull/30743)). Contributed by @Half-Shot.
+* Fix local room encryption status always not enabled ([#30461](https://github.com/element-hq/element-web/pull/30461)). Contributed by @BillCarsonFr.
+* fix: make url in topic in room intro clickable ([#30686](https://github.com/element-hq/element-web/pull/30686)). Contributed by @florianduros.
+* Block change recovery key button while a change is ongoing. ([#30664](https://github.com/element-hq/element-web/pull/30664)). Contributed by @Half-Shot.
+* Hide advanced settings during room creation when `UIFeature.advancedSettings=false` ([#30684](https://github.com/element-hq/element-web/pull/30684)). Contributed by @florianduros.
+* A11y: improve accessibility of pinned messages ([#30558](https://github.com/element-hq/element-web/pull/30558)). Contributed by @florianduros.
+
+
+Changes in [1.11.112](https://github.com/element-hq/element-web/releases/tag/v1.11.112) (2025-09-16)
+====================================================================================================
+Fix [CVE-2025-59161](https://www.cve.org/CVERecord?id=CVE-2025-59161) / [GHSA-m6c8-98f4-75rr](https://github.com/element-hq/element-web/security/advisories/GHSA-m6c8-98f4-75rr)
+
+
+Changes in [1.11.111](https://github.com/element-hq/element-web/releases/tag/v1.11.111) (2025-09-10)
+====================================================================================================
+## ✨ Features
+
+* Do not hide media from your own user by default ([#29797](https://github.com/element-hq/element-web/pull/29797)). Contributed by @Half-Shot.
+* Remember whether sidebar is shown for calls when switching rooms ([#30262](https://github.com/element-hq/element-web/pull/30262)). Contributed by @bojidar-bg.
+* Open the proper integration settings on integrations disabled error ([#30538](https://github.com/element-hq/element-web/pull/30538)). Contributed by @Half-Shot.
+* Show a "progress" dialog while invites are being sent ([#30561](https://github.com/element-hq/element-web/pull/30561)). Contributed by @richvdh.
+* Move the room list to the new ListView(backed by react-virtuoso)  ([#30515](https://github.com/element-hq/element-web/pull/30515)). Contributed by @langleyd.
+
+## 🐛 Bug Fixes
+
+* [Backport staging] Ensure container starts if it is mounted with an empty /modules directory. ([#30705](https://github.com/element-hq/element-web/pull/30705)). Contributed by @RiotRobot.
+* Fix room joining over federation not specifying vias or using aliases ([#30641](https://github.com/element-hq/element-web/pull/30641)). Contributed by @t3chguy.
+* Fix stable-suffixed MSC4133 support ([#30649](https://github.com/element-hq/element-web/pull/30649)). Contributed by @dbkr.
+* Fix i18n of message when a setting is disabled ([#30646](https://github.com/element-hq/element-web/pull/30646)). Contributed by @dbkr.
+* ListView should not handle the arrow keys if there is a modifier applied ([#30633](https://github.com/element-hq/element-web/pull/30633)). Contributed by @langleyd.
+* Make BaseDialog's div keyboard focusable and fix test. ([#30631](https://github.com/element-hq/element-web/pull/30631)). Contributed by @langleyd.
+* Fix: Allow triple-click text selection to flow around pills ([#30349](https://github.com/element-hq/element-web/pull/30349)). Contributed by @AlirezaMrtz.
+* Watch for a 'join' action to know when the call is connected ([#29492](https://github.com/element-hq/element-web/pull/29492)). Contributed by @robintown.
+* Fix: add missing tooltip and aria-label to lock icon next to composer ([#30623](https://github.com/element-hq/element-web/pull/30623)). Contributed by @florianduros.
+* Don't render context menu when scrolling ([#30613](https://github.com/element-hq/element-web/pull/30613)). Contributed by @langleyd.
+
+
+Changes in [1.11.110](https://github.com/element-hq/element-web/releases/tag/v1.11.110) (2025-08-27)
+====================================================================================================
+## ✨ Features
+
+* Hide recovery key when re-entering it while creating or changing it ([#30499](https://github.com/element-hq/element-web/pull/30499)). Contributed by @andybalaam.
+* Add `?no_universal_links=true` to OIDC url so EX doesn't try to handle it ([#29439](https://github.com/element-hq/element-web/pull/29439)). Contributed by @t3chguy.
+* Show a blue lock for unencrypted rooms and hide the grey shield for encrypted rooms ([#30440](https://github.com/element-hq/element-web/pull/30440)). Contributed by @langleyd.
+* Add support for Module API 1.4 ([#30185](https://github.com/element-hq/element-web/pull/30185)). Contributed by @t3chguy.
+* MVVM - Introduce some helpers for snapshot management ([#30398](https://github.com/element-hq/element-web/pull/30398)). Contributed by @MidhunSureshR.
+
+## 🐛 Bug Fixes
+
+* A11y: move focus to right panel when opened ([#30553](https://github.com/element-hq/element-web/pull/30553)). Contributed by @florianduros.
+* Fix e2e warning icon should be white ([#30539](https://github.com/element-hq/element-web/pull/30539)). Contributed by @florianduros.
+* Remove NoOneHere disabled reason. ([#30524](https://github.com/element-hq/element-web/pull/30524)). Contributed by @toger5.
+* Fix downloading files with authenticated media API ([#30520](https://github.com/element-hq/element-web/pull/30520)). Contributed by @t3chguy.
+* Fix call permissions check confusion around element call ([#30521](https://github.com/element-hq/element-web/pull/30521)). Contributed by @t3chguy.
+* Fix line wrap around emoji verification ([#30523](https://github.com/element-hq/element-web/pull/30523)). Contributed by @t3chguy.
+* Don't highlight redacted events ([#30519](https://github.com/element-hq/element-web/pull/30519)). Contributed by @t3chguy.
+* Fix matrix.to links not being handled in the app ([#30522](https://github.com/element-hq/element-web/pull/30522)). Contributed by @t3chguy.
+* Fix issue of new room list taking up the full width ([#30459](https://github.com/element-hq/element-web/pull/30459)). Contributed by @langleyd.
+* Fix widget persistence in React development mode ([#30509](https://github.com/element-hq/element-web/pull/30509)). Contributed by @robintown.
+* Fix widget initialization in React development mode ([#30463](https://github.com/element-hq/element-web/pull/30463)). Contributed by @robintown.
+
+
+Changes in [1.11.109](https://github.com/element-hq/element-web/releases/tag/v1.11.109) (2025-08-11)
+====================================================================================================
+This release supports the upcoming v12 ("hydra") Matrix room version and is necessary to view and participate in these rooms.
+
+## ✨ Features
+
+* [Backport staging] Allow /upgraderoom command without developer mode enabled ([#30529](https://github.com/element-hq/element-web/pull/30529)). Contributed by @RiotRobot.
+* [Backport staging] Support for creator/owner power level ([#30526](https://github.com/element-hq/element-web/pull/30526)). Contributed by @RiotRobot.
+* New room list: change icon and label of menu item for to start a DM ([#30470](https://github.com/element-hq/element-web/pull/30470)). Contributed by @florianduros.
+* Implement the member list with virtuoso ([#29869](https://github.com/element-hq/element-web/pull/29869)). Contributed by @langleyd.
+* Add labs option for history sharing on invite ([#30313](https://github.com/element-hq/element-web/pull/30313)). Contributed by @richvdh.
+* Bump wysiwyg to 2.39.0 adding support for pasting rich text content in the Rich Text Edtior ([#30421](https://github.com/element-hq/element-web/pull/30421)). Contributed by @langleyd.
+* Support `EventShieldReason.MISMATCHED_SENDER` ([#30403](https://github.com/element-hq/element-web/pull/30403)). Contributed by @richvdh.
+* Change unencrypted and public pills to blue ([#30399](https://github.com/element-hq/element-web/pull/30399)). Contributed by @florianduros.
+* Change color of public room icon ([#30390](https://github.com/element-hq/element-web/pull/30390)). Contributed by @florianduros.
+* Script for updating storybook screenshots ([#30340](https://github.com/element-hq/element-web/pull/30340)). Contributed by @dbkr.
+* Add toggle to hide empty state in devtools ([#30352](https://github.com/element-hq/element-web/pull/30352)). Contributed by @toger5.
+
+## 🐛 Bug Fixes
+
+* [Backport staging] Use userId to filter users in non-federated rooms when showing the InviteDialog ([#30537](https://github.com/element-hq/element-web/pull/30537)). Contributed by @RiotRobot.
+* [Backport staging] Catch error when encountering invalid m.room.pinned\_events event ([#30536](https://github.com/element-hq/element-web/pull/30536)). Contributed by @RiotRobot.
+* Update for compatibility with v12 rooms ([#30452](https://github.com/element-hq/element-web/pull/30452)). Contributed by @dbkr.
+* New room list: fix tooltip on presence ([#30474](https://github.com/element-hq/element-web/pull/30474)). Contributed by @florianduros.
+* New room list: add tooltip for presence and room status ([#30472](https://github.com/element-hq/element-web/pull/30472)). Contributed by @florianduros.
+* Fix: Clicking on an item in the member list causes it to scroll to the top rather than show the profile view ([#30455](https://github.com/element-hq/element-web/pull/30455)). Contributed by @langleyd.
+* Put the 'decrypting' tooltip back ([#30446](https://github.com/element-hq/element-web/pull/30446)). Contributed by @dbkr.
+* Use server name explicitly for via. ([#30362](https://github.com/element-hq/element-web/pull/30362)). Contributed by @Half-Shot.
+* fix: replace hardcoded string in poll history dialog ([#30402](https://github.com/element-hq/element-web/pull/30402)). Contributed by @florianduros.
+* fix: replace hardcoded string on qr code back button ([#30401](https://github.com/element-hq/element-web/pull/30401)). Contributed by @florianduros.
+* Fix color of icon button with outline ([#30361](https://github.com/element-hq/element-web/pull/30361)). Contributed by @florianduros.
+
+
+Changes in [1.11.108](https://github.com/element-hq/element-web/releases/tag/v1.11.108) (2025-07-30)
+====================================================================================================
+## 🐛 Bug Fixes
+
+* [Backport staging] Fix downloaded attachments not being decrypted ([#30434](https://github.com/element-hq/element-web/pull/30434)). Contributed by @RiotRobot.
+
+
+Changes in [1.11.107](https://github.com/element-hq/element-web/releases/tag/v1.11.107) (2025-07-29)
+====================================================================================================
+## ✨ Features
+
+* Message preview should show tooltip with the full message on hover ([#30265](https://github.com/element-hq/element-web/pull/30265)). Contributed by @MidhunSureshR.
+* Support rendering notification badges on platforms that do their own icon overlays ([#30315](https://github.com/element-hq/element-web/pull/30315)). Contributed by @Half-Shot.
+* Add SubscriptionViewModel base class ([#30297](https://github.com/element-hq/element-web/pull/30297)). Contributed by @dbkr.
+* Enhancement: Save image on CTRL+S ([#30330](https://github.com/element-hq/element-web/pull/30330)). Contributed by @ioalexander.
+* Add quote functionality to MessageContextMenu (#29893) ([#30323](https://github.com/element-hq/element-web/pull/30323)). Contributed by @AlirezaMrtz.
+* Initial structure for shared component views ([#30216](https://github.com/element-hq/element-web/pull/30216)). Contributed by @dbkr.
+
+## 🐛 Bug Fixes
+
+* [Backport staging] Fix e2e shield being invisible in white mode for encrypted room ([#30411](https://github.com/element-hq/element-web/pull/30411)). Contributed by @RiotRobot.
+* Force ED titlebar color for new room list ([#30332](https://github.com/element-hq/element-web/pull/30332)). Contributed by @florianduros.
+* Add a background color to left panel for macos titlebar in element desktop ([#30328](https://github.com/element-hq/element-web/pull/30328)). Contributed by @florianduros.
+* Fix: Prevent page refresh on Enter key in right panel member search ([#30312](https://github.com/element-hq/element-web/pull/30312)). Contributed by @AlirezaMrtz.
+
+
+Changes in [1.11.106](https://github.com/element-hq/element-web/releases/tag/v1.11.106) (2025-07-15)
+====================================================================================================
+## ✨ Features
+
+* [Backport staging] Fix e2e icon colour ([#30304](https://github.com/element-hq/element-web/pull/30304)). Contributed by @RiotRobot.
+* Add support for module message hint `allowDownloadingMedia` ([#30252](https://github.com/element-hq/element-web/pull/30252)). Contributed by @Half-Shot.
+* Update the mobile\_guide page to the new design and link out to Element X by default. ([#30172](https://github.com/element-hq/element-web/pull/30172)). Contributed by @pixlwave.
+* Filter settings exported when rageshaking ([#30236](https://github.com/element-hq/element-web/pull/30236)). Contributed by @Half-Shot.
+* Allow Element Call to learn the room name ([#30213](https://github.com/element-hq/element-web/pull/30213)). Contributed by @robintown.
+
+## 🐛 Bug Fixes
+
+* [Backport staging] Fix missing image download button ([#30322](https://github.com/element-hq/element-web/pull/30322)). Contributed by @RiotRobot.
+* Fix transparent verification checkmark in dark mode ([#30235](https://github.com/element-hq/element-web/pull/30235)). Contributed by @Banbuii.
+* Fix logic in DeviceListener ([#30230](https://github.com/element-hq/element-web/pull/30230)). Contributed by @uhoreg.
+* Disable file drag-and-drop if insufficient permissions ([#30186](https://github.com/element-hq/element-web/pull/30186)). Contributed by @t3chguy.
+
+
+Changes in [1.11.105](https://github.com/element-hq/element-web/releases/tag/v1.11.105) (2025-07-01)
+====================================================================================================
+## ✨ Features
+
+* New room list: add context menu to room list item ([#29952](https://github.com/element-hq/element-web/pull/29952)). Contributed by @florianduros.
+* Support for custom message components via Module API ([#30074](https://github.com/element-hq/element-web/pull/30074)). Contributed by @Half-Shot.
+* Prompt users to set up recovery ([#30075](https://github.com/element-hq/element-web/pull/30075)). Contributed by @uhoreg.
+* Update `IconButton` colors ([#30124](https://github.com/element-hq/element-web/pull/30124)). Contributed by @florianduros.
+* New room list: filter list can be collapsed  ([#29992](https://github.com/element-hq/element-web/pull/29992)). Contributed by @florianduros.
+* Show `EmptyRoomListView` when low priority filter matches zero rooms ([#30122](https://github.com/element-hq/element-web/pull/30122)). Contributed by @MidhunSureshR.
+
+## 🐛 Bug Fixes
+
+* Fix untranslatable string "People" in notifications beta ([#30165](https://github.com/element-hq/element-web/pull/30165)). Contributed by @t3chguy.
+* Force verification even after logging in via delegate ([#30141](https://github.com/element-hq/element-web/pull/30141)). Contributed by @andybalaam.
+* Hide add integrations button based on UIComponent.AddIntegrations ([#30140](https://github.com/element-hq/element-web/pull/30140)). Contributed by @t3chguy.
+* Use nav for new room list and label sections ([#30134](https://github.com/element-hq/element-web/pull/30134)). Contributed by @dbkr.
+* Spacestore should emit event after rebuilding home space ([#30132](https://github.com/element-hq/element-web/pull/30132)). Contributed by @MidhunSureshR.
+* Handle m.room.pinned\_events being invalid ([#30129](https://github.com/element-hq/element-web/pull/30129)). Contributed by @t3chguy.
+
+
+Changes in [1.11.104](https://github.com/element-hq/element-web/releases/tag/v1.11.104) (2025-06-17)
+====================================================================================================
+## ✨ Features
+
+* Update the mobile\_guide page to the new design. ([#30006](https://github.com/element-hq/element-web/pull/30006)). Contributed by @pixlwave.
+* Provide a devtool for manually verifying other devices ([#30094](https://github.com/element-hq/element-web/pull/30094)). Contributed by @andybalaam.
+* Implement MSC4155: Invite filtering ([#29603](https://github.com/element-hq/element-web/pull/29603)). Contributed by @Half-Shot.
+* Add low priority avatar decoration to room tile ([#30065](https://github.com/element-hq/element-web/pull/30065)). Contributed by @MidhunSureshR.
+* Add ability to prevent window content being captured by other apps (Desktop) ([#30098](https://github.com/element-hq/element-web/pull/30098)). Contributed by @t3chguy.
+* New room list: move message preview in user settings ([#30023](https://github.com/element-hq/element-web/pull/30023)). Contributed by @florianduros.
+* New room list: change room options icon ([#30029](https://github.com/element-hq/element-web/pull/30029)). Contributed by @florianduros.
+* RoomListStore: Sort low priority rooms to the bottom of the list ([#30070](https://github.com/element-hq/element-web/pull/30070)). Contributed by @MidhunSureshR.
+* Add low priority filter pill to the room list UI ([#30060](https://github.com/element-hq/element-web/pull/30060)). Contributed by @MidhunSureshR.
+* New room list: remove color gradient in space panel ([#29721](https://github.com/element-hq/element-web/pull/29721)). Contributed by @florianduros.
+* /share?msg=foo endpoint using forward message dialog ([#29874](https://github.com/element-hq/element-web/pull/29874)). Contributed by @ara4n.
+
+## 🐛 Bug Fixes
+
+* Do not send empty auth when setting up cross-signing keys ([#29914](https://github.com/element-hq/element-web/pull/29914)). Contributed by @gnieto.
+* Settings: flip local video feed by default ([#29501](https://github.com/element-hq/element-web/pull/29501)). Contributed by @jbtrystram.
+* AccessSecretStorageDialog: various fixes ([#30093](https://github.com/element-hq/element-web/pull/30093)). Contributed by @richvdh.
+* AccessSecretStorageDialog: fix inability to enter recovery key ([#30090](https://github.com/element-hq/element-web/pull/30090)). Contributed by @richvdh.
+* Fix failure to upload thumbnail causing image to send as file ([#30086](https://github.com/element-hq/element-web/pull/30086)). Contributed by @t3chguy.
+* Low priority menu item should be a toggle ([#30071](https://github.com/element-hq/element-web/pull/30071)). Contributed by @MidhunSureshR.
+* Add sanity checks to prevent users from ignoring themselves ([#30079](https://github.com/element-hq/element-web/pull/30079)). Contributed by @MidhunSureshR.
+* Fix issue with duplicate images ([#30073](https://github.com/element-hq/element-web/pull/30073)). Contributed by @fatlewis.
+* Handle errors returned from Seshat ([#30083](https://github.com/element-hq/element-web/pull/30083)). Contributed by @richvdh.
+
+
+Changes in [1.11.103](https://github.com/element-hq/element-web/releases/tag/v1.11.103) (2025-06-10)
+====================================================================================================
+## 🐛 Bug Fixes
+
++ Check the sender of an event matches owner of session, preventing sender spoofing by homeserver owners.
+[13c1d20](https://github.com/matrix-org/matrix-rust-sdk/commit/13c1d2048286bbabf5e7bc6b015aafee98f04d55) (High, [GHSA-x958-rvg6-956w](https://github.com/matrix-org/matrix-rust-sdk/security/advisories/GHSA-x958-rvg6-956w)).
+
+Changes in [1.11.102](https://github.com/element-hq/element-web/releases/tag/v1.11.102) (2025-06-03)
+====================================================================================================
+## ✨ Features
+
+* EW: Modernize the recovery key input modal ([#29819](https://github.com/element-hq/element-web/pull/29819)). Contributed by @uhoreg.
+* New room list: move secondary filters into primary filters ([#29972](https://github.com/element-hq/element-web/pull/29972)). Contributed by @florianduros.
+* Prompt the user when key storage is unexpectedly off ([#29912](https://github.com/element-hq/element-web/pull/29912)). Contributed by @andybalaam.
+* New room list: move sort menu in room list header ([#29983](https://github.com/element-hq/element-web/pull/29983)). Contributed by @florianduros.
+* New room list: rework spacing of room list item ([#29965](https://github.com/element-hq/element-web/pull/29965)). Contributed by @florianduros.
+* RLS: Remove forgotten room from skiplist ([#29933](https://github.com/element-hq/element-web/pull/29933)). Contributed by @MidhunSureshR.
+* Add room list sorting ([#29951](https://github.com/element-hq/element-web/pull/29951)). Contributed by @dbkr.
+* Don't use the minimised width(68px) on the new room list ([#29778](https://github.com/element-hq/element-web/pull/29778)). Contributed by @langleyd.
+
+## 🐛 Bug Fixes
+
+* [Backport staging] Close call options popup menu when option has been selected ([#30054](https://github.com/element-hq/element-web/pull/30054)). Contributed by @RiotRobot.
+* RoomListStoreV3: Only add new rooms that pass `VisibilityProvider` check ([#29974](https://github.com/element-hq/element-web/pull/29974)). Contributed by @MidhunSureshR.
+* Re-order primary filters ([#29957](https://github.com/element-hq/element-web/pull/29957)). Contributed by @dbkr.
+* Fix leaky CSS adding `!` to all H1 elements ([#29964](https://github.com/element-hq/element-web/pull/29964)). Contributed by @t3chguy.
+* Fix extensions panel style ([#29273](https://github.com/element-hq/element-web/pull/29273)). Contributed by @langleyd.
+* Fix state events being hidden from widgets in read\_events actions ([#29954](https://github.com/element-hq/element-web/pull/29954)). Contributed by @robintown.
+* Remove old filter test ([#29963](https://github.com/element-hq/element-web/pull/29963)). Contributed by @dbkr.
+
+
 Changes in [1.11.101](https://github.com/element-hq/element-web/releases/tag/v1.11.101) (2025-05-20)
 ====================================================================================================
 ## ✨ Features
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fd94f18f85..3ec59b2eff 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,6 +2,11 @@
 
 Everyone is welcome to contribute code to Element Web, provided that they are willing to license their contributions to Element under a [Contributor License Agreement](https://cla-assistant.io/element-hq/element-web) (CLA). This ensures that their contribution will be made available under an OSI-approved open-source license, currently licensed under Affero General Public License v3 (AGPLv3) or General Public License v3 (GPLv3) at your choice.
 
+If you're contributing, or thinking about contributing, please come & chat to
+us in our development room, [#element-dev](https://matrix.to/#/#element-dev:matrix.org).
+This is the best place to ask questions about the code, how to work on the project
+or whether a change is likely to be accepted.
+
 ## How to contribute
 
 The preferred and easiest way to contribute changes to the project is to fork
diff --git a/Dockerfile b/Dockerfile
index a1813cf66d..5ce43a7c4f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-# syntax=docker.io/docker/dockerfile:1.16-labs@sha256:bb5e2b225985193779991f3256d1901a0b3e6a0b284c7bffa0972064f4a6d458
+# syntax=docker.io/docker/dockerfile:1.20-labs@sha256:dbcde2ebc4abc8bb5c3c499b9c9a6876842bf5da243951cd2697f921a7aeb6a9
 
 # Builder
-FROM --platform=$BUILDPLATFORM node:22-bullseye@sha256:f16d8e8af67bb6361231e932b8b3e7afa040cbfed181719a450b02c3821b26c1 AS builder
+FROM --platform=$BUILDPLATFORM node:24-bullseye@sha256:5583cbe5d3347db372d9a9100eba272b548ca1f53246b9b769334bcd0eef2c26 AS builder
 
 # Support custom branch of the js-sdk. This also helps us build images of element-web develop.
 ARG USE_CUSTOM_SDKS=false
@@ -19,7 +19,7 @@ RUN /src/scripts/docker-package.sh
 RUN cp /src/config.sample.json /src/webapp/config.json
 
 # App
-FROM nginxinc/nginx-unprivileged:alpine-slim@sha256:2acffd86b1bdefb8fa6b48b6e9aadf75430e8ab9c43c54c515ea7df77897f987
+FROM nginxinc/nginx-unprivileged:alpine-slim@sha256:a6bec37058b9047ece799c01d98dc6d5aa0542b6583cc69f187652f91331a752
 
 # Need root user to install packages & manipulate the usr directory
 USER root
diff --git a/README.md b/README.md
index 0f8a721f90..6f6e3172fa 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Element has several tiers of support for different environments:
 - Best effort
     - Definition:
         - Issues **accepted**, regressions **do not block** the release
-        - The wider Element Products(including Element Call and the Enterprise Server Suite) do still not officially support these browsers.
+        - The wider Element Products (including Element Call and the Enterprise Server Suite) do still not officially support these browsers.
         - The element web project and its contributors should keep the client functioning and gracefully degrade where other sibling features (E.g. Element Call) may not function.
     - Last major release of Firefox ESR and Chrome/Edge Extended Stable
 - Community Supported
diff --git a/book.toml b/book.toml
index 77fa4bfd5d..5139a801fb 100644
--- a/book.toml
+++ b/book.toml
@@ -4,7 +4,6 @@
 title = "Element Web & Desktop"
 authors = ["New Vector Ltd.", "The Matrix.org Foundation C.I.C."]
 language = "en"
-multilingual = false
 
 # The directory that documentation files are stored in
 src = "docs"
diff --git a/code_style.md b/code_style.md
index 9f0501ccd8..6e7289d22e 100644
--- a/code_style.md
+++ b/code_style.md
@@ -79,7 +79,7 @@ Unless otherwise specified, the following applies to all code:
 11. If a variable is not receiving a value on declaration, its type must be defined.
 
     ```typescript
-    let errorMessage: Optional<string>;
+    let errorMessage: string;
     ```
 
 12. Objects can use shorthand declarations, including mixing of types.
@@ -127,7 +127,6 @@ Unless otherwise specified, the following applies to all code:
     2. "Conflicted" typically refers to a getter which wants the same name as the underlying variable.
 20. Prefer readonly members over getters backed by a variable, unless an internal setter is required.
 21. Prefer Interfaces for object definitions, and types for parameter-value-only declarations.
-
     1. Note that an explicit type is optional if not expected to be used outside of the function call,
        unlike in this example:
 
@@ -161,7 +160,6 @@ Unless otherwise specified, the following applies to all code:
 28. Export only what can be reused.
 29. Prefer a type like `Optional<X>` (`type Optional<T> = T | null | undefined`) instead
     of truly optional parameters.
-
     1. A notable exception is when the likelihood of a bug is minimal, such as when a function
        takes an argument that is more often not required than required. An example where the
        `?` operator is inappropriate is when taking a room ID: typically the caller should
@@ -260,7 +258,6 @@ Inheriting all the rules of TypeScript, the following additionally apply:
 12. Interdependence between stores should be kept to a minimum. Break functions and constants out to utilities
     if at all possible.
 13. A component should only use CSS class names in line with the component name.
-
     1. When knowingly using a class name from another component, document it with a [comment](#comments).
 
 14. Curly braces within JSX should be padded with a space, however properties on those components should not.
@@ -388,7 +385,6 @@ Note: We use PostCSS + some plugins to process our styles. It looks like SCSS, b
    properties should be clearly documented.
 
 4. Inside a function, there is no need to comment every line, but consider:
-
     - before a particular multiline section of code within the function, give an overview of what it does,
       to make it easier for a reader to follow the flow through the function as a whole.
     - if it is anything less than obvious, explain _why_ we are doing a particular operation, with particular emphasis
diff --git a/config.sample.json b/config.sample.json
index 973bb67a02..1f8030080d 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -20,8 +20,7 @@
         "https://scalar.vector.im/_matrix/integrations/v1",
         "https://scalar.vector.im/api",
         "https://scalar-staging.vector.im/_matrix/integrations/v1",
-        "https://scalar-staging.vector.im/api",
-        "https://scalar-staging.riot.im/scalar/api"
+        "https://scalar-staging.vector.im/api"
     ],
     "default_widget_container_height": 280,
     "default_country_code": "GB",
diff --git a/declaration.d.ts b/declaration.d.ts
new file mode 100644
index 0000000000..928c567c31
--- /dev/null
+++ b/declaration.d.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+declare module "*.module.css";
diff --git a/developer_guide.md b/developer_guide.md
index fa4bb9a239..2185a43a63 100644
--- a/developer_guide.md
+++ b/developer_guide.md
@@ -109,7 +109,7 @@ yarn test
 
 ### End-to-End tests
 
-See [matrix-react-sdk](https://github.com/matrix-org/matrix-react-sdk/#end-to-end-tests) for how to run the end-to-end tests.
+See [`docs/playwright.md`](./docs/playwright.md) for how to run the end-to-end tests.
 
 ## General github guidelines
 
diff --git a/docker/docker-entrypoint.d/18-load-element-modules.sh b/docker/docker-entrypoint.d/18-load-element-modules.sh
index 235c4edcf2..2230fea33e 100755
--- a/docker/docker-entrypoint.d/18-load-element-modules.sh
+++ b/docker/docker-entrypoint.d/18-load-element-modules.sh
@@ -14,10 +14,9 @@ entrypoint_log() {
 mkdir -p /tmp/element-web-config
 cp /app/config*.json /tmp/element-web-config/
 
-# If there are modules to be loaded
-if [ -d "/modules" ]; then
+# If the module directory exists AND the module directory has modules in it
+if [ -d "/modules" ] && [ "$( ls -A '/modules' )" ]; then
     cd /modules
-
     for MODULE in *
     do
         # If the module has a package.json, use its main field as the entrypoint
diff --git a/docs/MVVM-v1.md b/docs/MVVM-v1.md
new file mode 100644
index 0000000000..bbd02ccb06
--- /dev/null
+++ b/docs/MVVM-v1.md
@@ -0,0 +1,69 @@
+# MVVM
+
+_Deprecated_, see [MVVM.md](./MVVM.md) for the current version.
+
+General description of the pattern can be found [here](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93viewmodel). But the gist of it is that you divide your code into three sections:
+
+1. Model: This is where the business logic and data resides.
+2. View Model: This code exists to provide the logic necessary for the UI. It directly uses the Model code.
+3. View: This is the UI code itself and depends on the view model.
+
+If you do MVVM right, your view should be dumb i.e it gets data from the view model and merely displays it.
+
+### Practical guidelines for MVVM in element-web
+
+#### Model
+
+This is anywhere your data or business logic comes from. If your view model is accessing something simple exposed from `matrix-js-sdk`, then the sdk is your model. If you're using something more high level in element-web to get your data/logic (eg: `MemberListStore`), then that becomes your model.
+
+#### View Model
+
+1. View model is always a custom react hook named like `useFooViewModel()`.
+2. The return type of your view model (known as view state) must be defined as a typescript interface:
+    ```ts
+    inteface FooViewState {
+    	somethingUseful: string;
+    	somethingElse: BarType;
+    	update: () => Promise<void>
+    	...
+    }
+    ```
+3. Any react state that your UI needs must be in the view model.
+
+#### View
+
+1. Views are simple react components (eg: `FooView`).
+2. Views usually start by calling the view model hook, eg:
+    ```tsx
+    const FooView: React.FC<IProps> = (props: IProps) => {
+    	const vm = useFooViewModel();
+    	....
+    	return(
+    		<div>
+    			{vm.somethingUseful}
+    		</div>
+    	);
+    }
+    ```
+3. Views are also allowed to accept the view model as a prop, eg:
+    ```tsx
+    const FooView: React.FC<IProps> = ({ vm }: IProps) => {
+    	....
+    	return(
+    		<div>
+    			{vm.somethingUseful}
+    		</div>
+    	);
+    }
+    ```
+4. Multiple views can share the same view model if necessary.
+
+### Benefits
+
+1. MVVM forces a separation of concern i.e we will no longer have large react components that have a lot of state and rendering code mixed together. This improves code readability and makes it easier to introduce changes.
+2. Introduces the possibility of code reuse. You can reuse an old view model with a new view or vice versa.
+3. Adding to the point above, in future you could import element-web view models to your project and supply your own views thus creating something similar to the [hydrogen sdk](https://github.com/element-hq/hydrogen-web/blob/master/doc/SDK.md).
+
+### Example
+
+We started experimenting with MVVM in the redesigned memberlist, you can see the code [here](https://github.com/vector-im/element-web/blob/develop/src/components/views/rooms/MemberList/MemberListView.tsx).
diff --git a/docs/MVVM.md b/docs/MVVM.md
index 9dfb8e4776..6175e21853 100644
--- a/docs/MVVM.md
+++ b/docs/MVVM.md
@@ -10,58 +10,80 @@ If you do MVVM right, your view should be dumb i.e it gets data from the view mo
 
 ### Practical guidelines for MVVM in element-web
 
+A first documentation and implementation of MVVM was done in [MVVM-v1.md](MVVM-v1.md). This v1 version is now deprecated and this document describes the current implementation.
+
 #### Model
 
 This is anywhere your data or business logic comes from. If your view model is accessing something simple exposed from `matrix-js-sdk`, then the sdk is your model. If you're using something more high level in element-web to get your data/logic (eg: `MemberListStore`), then that becomes your model.
 
-#### View Model
-
-1. View model is always a custom react hook named like `useFooViewModel()`.
-2. The return type of your view model (known as view state) must be defined as a typescript interface:
-    ```ts
-    inteface FooViewState {
-    	somethingUseful: string;
-    	somethingElse: BarType;
-    	update: () => Promise<void>
-    	...
-    }
-    ```
-3. Any react state that your UI needs must be in the view model.
-
 #### View
 
-1. Views are simple react components (eg: `FooView`).
-2. Views usually start by calling the view model hook, eg:
+1. Located in [`shared-components`](https://github.com/element-hq/element-web/tree/develop/packages/shared-components). Develop it in storybook!
+2. Views are simple react components (eg: `FooView`).
+3. Views use [useSyncExternalStore](https://react.dev/reference/react/useSyncExternalStore) internally where the view model is the external store.
+4. Views should define the interface of the view model they expect:
+
     ```tsx
-    const FooView: React.FC<IProps> = (props: IProps) => {
-    	const vm = useFooViewModel();
-    	....
-    	return(
-    		<div>
-    			{vm.somethingUseful}
-    		</div>
-    	);
+    // Snapshot is the return type of your view model
+    interface FooViewSnapshot {
+        value: string;
+    }
+
+    // To call function on the view model
+    interface FooViewActions {
+        doSomething: () => void;
+    }
+
+    // ViewModel is a type defining the methods needed for `useSyncExternalStore`
+    // https://github.com/element-hq/element-web/blob/develop/packages/shared-components/src/ViewModel.ts
+    type FooViewModel = ViewModel<FooViewSnapshot> & FooViewActions;
+
+    interface FooViewProps {
+        vm: FooViewModel;
+    }
+
+    function FooView({ vm }: FooViewProps) {
+        // useViewModel is a helper function that uses useSyncExternalStore under the hood
+        const { value } = useViewModel(vm);
+        return (
+            <button type="button" onClick={() => vm.doSomething()}>
+                {value}
+            </button>
+        );
     }
     ```
-3. Views are also allowed to accept the view model as a prop, eg:
-    ```tsx
-    const FooView: React.FC<IProps> = ({ vm }: IProps) => {
-    	....
-    	return(
-    		<div>
-    			{vm.somethingUseful}
-    		</div>
-    	);
+
+5. Multiple views can share the same view model if necessary.
+6. A full example is available [here](https://github.com/element-hq/element-web/blob/develop/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.tsx)
+
+#### View Model
+
+1. A View model is a class extending [`BaseViewModel`](https://github.com/element-hq/element-web/blob/develop/src/viewmodels/base/BaseViewModel.ts).
+2. Implements the interface defined in the view (e.g `FooViewModel` in the example above).
+3. View models define a snapshot type that defines the data the view will consume. The snapshot is immutable and can only be changed by calling `this.snapshot.set(...)` in the view model. This will trigger a re-render in the view.
+
+    ```ts
+    interface Props {
+        propsValue: string;
+    }
+
+    class FooViewModel extends BaseViewModel<FooViewSnapshot, Props> implements FooViewModel {
+        constructor(props: Props) {
+            // Call super with initial snapshot
+            super(props, { value: "initial" });
+        }
+
+        public doSomething() {
+            // Call this.snapshot.set to update the snapshot
+            this.snapshot.set({ value: "changed" });
+        }
     }
     ```
-4. Multiple views can share the same view model if necessary.
+
+4. A full example is available [here](https://github.com/element-hq/element-web/blob/develop/src/viewmodels/audio/AudioPlayerViewModel.ts)
 
 ### Benefits
 
 1. MVVM forces a separation of concern i.e we will no longer have large react components that have a lot of state and rendering code mixed together. This improves code readability and makes it easier to introduce changes.
 2. Introduces the possibility of code reuse. You can reuse an old view model with a new view or vice versa.
 3. Adding to the point above, in future you could import element-web view models to your project and supply your own views thus creating something similar to the [hydrogen sdk](https://github.com/element-hq/hydrogen-web/blob/master/doc/SDK.md).
-
-### Example
-
-We started experimenting with MVVM in the redesigned memberlist, you can see the code [here](https://github.com/vector-im/element-web/blob/develop/src/components/views/rooms/MemberList/MemberListView.tsx).
diff --git a/docs/config.md b/docs/config.md
index f1ced14fd2..6f5315d257 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -130,32 +130,37 @@ complete re-branding/private labeling, a more personalised experience can be ach
 6. `mobile_builds`: Optional. Like `desktop_builds`, except for the mobile apps. Also described in more detail down below.
 7. `mobile_guide_toast`: When `true` (default), users accessing the Element Web instance from a mobile device will be prompted to
    download the app instead.
-8. `update_base_url`: For the desktop app only, the URL where to acquire update packages. If specified, must be a path to a directory
+8. `mobile_guide_app_variant`: Optional. The mobile app that the user is prompted to download from the `/mobile_guide` page. When omitted
+   the mobile guide will be configured for the new Element X apps. Allowed values are as follows:
+    1. `element`: Element X Android/iOS.
+    2. `element-classic`: Element Classic Android/iOS.
+    3. `element-pro`: Element Pro Android/iOS.
+9. `update_base_url`: For the desktop app only, the URL where to acquire update packages. If specified, must be a path to a directory
    containing `macos` and `win32` directories, with the update packages within. Defaults to `https://packages.element.io/desktop/update/`
    in production.
-9. `map_style_url`: Map tile server style URL for location sharing. e.g. `https://api.maptiler.com/maps/streets/style.json?key=YOUR_KEY_GOES_HERE`
-   This setting is ignored if your homeserver provides `/.well-known/matrix/client` in its well-known location, and the JSON file
-   at that location has a key `m.tile_server` (or the unstable version `org.matrix.msc3488.tile_server`). In this case, the
-   configuration found in the well-known location is used instead.
-10. `welcome_user_id`: **DEPRECATED** An optional user ID to start a DM with after creating an account. Defaults to nothing (no DM created).
-11. `custom_translations_url`: An optional URL to allow overriding of translatable strings. The JSON file must be in a format of
+10. `map_style_url`: Map tile server style URL for location sharing. e.g. `https://api.maptiler.com/maps/streets/style.json?key=YOUR_KEY_GOES_HERE`
+    This setting is ignored if your homeserver provides `/.well-known/matrix/client` in its well-known location, and the JSON file
+    at that location has a key `m.tile_server` (or the unstable version `org.matrix.msc3488.tile_server`). In this case, the
+    configuration found in the well-known location is used instead.
+11. `welcome_user_id`: **DEPRECATED** An optional user ID to start a DM with after creating an account. Defaults to nothing (no DM created).
+12. `custom_translations_url`: An optional URL to allow overriding of translatable strings. The JSON file must be in a format of
     `{"affected|translation|key": {"languageCode": "new string"}}`. See https://github.com/matrix-org/matrix-react-sdk/pull/7886 for details.
-12. `branding`: Options for configuring various assets used within the app. Described in more detail down below.
-13. `embedded_pages`: Further optional URLs for various assets used within the app. Described in more detail down below.
-14. `disable_3pid_login`: When `false` (default), **enables** the options to log in with email address or phone number. Set to
+13. `branding`: Options for configuring various assets used within the app. Described in more detail down below.
+14. `embedded_pages`: Further optional URLs for various assets used within the app. Described in more detail down below.
+15. `disable_3pid_login`: When `false` (default), **enables** the options to log in with email address or phone number. Set to
     `true` to hide these options.
-15. `disable_login_language_selector`: When `false` (default), **enables** the language selector on the login pages. Set to `true`
+16. `disable_login_language_selector`: When `false` (default), **enables** the language selector on the login pages. Set to `true`
     to hide this dropdown.
-16. `disable_guests`: When `false` (default), **enable** guest-related functionality (peeking/previewing rooms, etc) for unregistered
+17. `disable_guests`: When `false` (default), **enable** guest-related functionality (peeking/previewing rooms, etc) for unregistered
     users. Set to `true` to disable this functionality.
-17. `user_notice`: Optional notice to show to the user, e.g. for sunsetting a deployment and pushing users to move in their own time.
+18. `user_notice`: Optional notice to show to the user, e.g. for sunsetting a deployment and pushing users to move in their own time.
     Takes a configuration object as below:
     1. `title`: Required. Title to show at the top of the notice.
     2. `description`: Required. The description to use for the notice.
     3. `show_once`: Optional. If true then the notice will only be shown once per device.
-18. `help_url`: The URL to point users to for help with the app, defaults to `https://element.io/help`.
-19. `help_encryption_url`: The URL to point users to for help with encryption, defaults to `https://element.io/help#encryption`.
-20. `force_verification`: If true, users must verify new logins (eg. with another device / their recovery key)
+19. `help_url`: The URL to point users to for help with the app, defaults to `https://element.io/help`.
+20. `help_encryption_url`: The URL to point users to for help with encryption, defaults to `https://element.io/help#encryption`.
+21. `force_verification`: If true, users must verify new logins (eg. with another device / their recovery key)
 
 ### `desktop_builds` and `mobile_builds`
 
@@ -402,7 +407,7 @@ The VoIP and Jitsi options are:
 If you run your own rageshake server to collect bug reports, the following options may be of interest:
 
 1. `bug_report_endpoint_url`: URL for where to submit rageshake logs to. Rageshakes include feedback submissions and bug reports. When
-   not present in the config, the app will disable all rageshake functionality. Set to `https://element.io/bugreports/submit` to submit
+   not present in the config, the app will disable all rageshake functionality. Set to `https://rageshakes.element.io/api/submit` to submit
    rageshakes to us, or use your own rageshake server.
 2. `uisi_autorageshake_app`: If a user has enabled the "automatically send debug logs on decryption errors" flag, this option will be sent
    alongside the rageshake so the rageshake server can filter them by app name. By default, this will be `element-auto-uisi`
@@ -445,8 +450,7 @@ If you would like to use Scalar, the integration manager maintained by Element,
         "https://scalar.vector.im/_matrix/integrations/v1",
         "https://scalar.vector.im/api",
         "https://scalar-staging.vector.im/_matrix/integrations/v1",
-        "https://scalar-staging.vector.im/api",
-        "https://scalar-staging.riot.im/scalar/api"
+        "https://scalar-staging.vector.im/api"
     ]
 }
 ```
@@ -581,6 +585,8 @@ Currently, the following UI feature flags are supported:
 - `UIFeature.BulkUnverifiedSessionsReminder` - Display popup reminders to verify or remove unverified sessions. Defaults
   to true.
 - `UIFeature.locationSharing` - Whether or not location sharing menus will be shown.
+- `UIFeature.allowCreatingPublicRooms` - Whether or not public rooms can be created.
+- `UIFeature.allowCreatingPublicSpaces` - Whether or not public spaces can be created.
 
 ## Undocumented / developer options
 
diff --git a/docs/e2ee.md b/docs/e2ee.md
index 835c38a1d5..2f960416b8 100644
--- a/docs/e2ee.md
+++ b/docs/e2ee.md
@@ -38,45 +38,20 @@ When `force_disable` is true:
 Note: If the server is configured to forcibly enable encryption for some or all rooms,
 this behaviour will be overridden.
 
-# Secure backup
+# Setting up recovery
 
 By default, Element strongly encourages (but does not require) users to set up
-Secure Backup so that cross-signing identity key and message keys can be
-recovered in case of a disaster where you lose access to all active devices.
+recovery so that you can access history on your new devices as well as retain access to your message history and cryptographic identity when you lose all of your devices.
 
-## Requiring secure backup
+## Removal of old settings
 
-To require Secure Backup to be configured before Element can be used, set the
-following on your homeserver's `/.well-known/matrix/client` config:
+Support for the configuration options `secure_backup_required` and `secure_backup_setup_methods`
+in the `/.well-known/matrix/client` config has been removed.
 
-```json
-{
-    "io.element.e2ee": {
-        "secure_backup_required": true
-    }
-}
-```
-
-## Preferring setup methods
-
-By default, Element offers users a choice of a random key or user-chosen
-passphrase when setting up Secure Backup. If a homeserver admin would like to
-only offer one of these, you can signal this via the
-`/.well-known/matrix/client` config, for example:
-
-```json
-{
-    "io.element.e2ee": {
-        "secure_backup_setup_methods": ["passphrase"]
-    }
-}
-```
-
-The field `secure_backup_setup_methods` is an array listing the methods the
-client should display. Supported values currently include `key` and
-`passphrase`. If the `secure_backup_setup_methods` field is not present or
-exists but does not contain any supported methods, Element will fallback to the
-default value of: `["key", "passphrase"]`.
+Setting up recovery is now always recommended to all users by showing a one-off toast and a
+permanent red dot on the _Encryption_ tab in the _Settings_ dialog. When creating a new
+recovery key, the UI only supports auto-generated keys. Using an existing (custom) passphrase
+still works, but is not exposed in the UI when setting up recovery.
 
 # Compatibility
 
diff --git a/docs/install.md b/docs/install.md
index 5f9e6ddd2e..d80a844778 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -11,7 +11,7 @@ There are some exceptions like when using localhost, which is considered a [secu
 1. Download the latest version from <https://github.com/element-hq/element-web/releases>
 1. Untar the tarball on your web server
 1. Move (or symlink) the `element-x.x.x` directory to an appropriate name
-1. Configure the correct caching headers in your webserver (see below)
+1. Configure the correct caching headers in your webserver (see [README.md](../README.md#caching-requirements))
 1. Configure the app by copying `config.sample.json` to `config.json` and
    modifying it. See the [configuration docs](config.md) for details.
 1. Enter the URL into your browser and log into Element!
diff --git a/docs/kubernetes.md b/docs/kubernetes.md
index cae8526e9c..39c10d330b 100644
--- a/docs/kubernetes.md
+++ b/docs/kubernetes.md
@@ -55,10 +55,9 @@ Then you can deploy it to your cluster with something like `kubectl apply -f my-
                     "https://scalar.vector.im/_matrix/integrations/v1",
                     "https://scalar.vector.im/api",
                     "https://scalar-staging.vector.im/_matrix/integrations/v1",
-                    "https://scalar-staging.vector.im/api",
-                    "https://scalar-staging.riot.im/scalar/api"
+                    "https://scalar-staging.vector.im/api"
             ],
-            "bug_report_endpoint_url": "https://element.io/bugreports/submit",
+            "bug_report_endpoint_url": "https://rageshakes.element.io/api/submit",
             "defaultCountryCode": "GB",
             "show_labs_settings": false,
             "features": { },
diff --git a/docs/labs.md b/docs/labs.md
index 60f35dd4a4..a4ab78b08b 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -112,3 +112,25 @@ Enables knock feature for rooms. This allows users to ask to join a room.
 ## New room list (`feature_new_room_list`) [In Development]
 
 Enable the new room list that is currently in development.
+
+## Exclude insecure devices when sending/receiving messages (`feature_exclude_insecure_devices`)
+
+Do not send or receive messages to/from devices that are not properly verified. Users with unverified devices will not
+receive your messages at all on those devices, and if they send messages, you will not be able to read them, but you
+will be aware that a message exists.
+
+## Share encrypted history with new members (`feature_share_history_on_invite`) [In Development]
+
+When inviting users to an encrypted room with shared history (i.e. a room with the "Who can read history?" setting set
+to "Members only (since the point in time of selecting this option)"), send the keys for previous messages to the
+invitee so they can read them.
+
+Both the inviter and the invitee must set this labs flag, before the invitation is sent.
+
+## Encrypted state events (MSC4362) (`feature_msc4362_encrypted_state_events`)
+
+Encrypt most of the state events in the room, including the room name and topic.
+
+WARNING: this means that users joining a room who do not have access to its history will not be able to see the name or
+topic of the room, or any other room state information. It also means the room name and topic are not available before
+joining a room.
diff --git a/element.io/app/config.json b/element.io/app/config.json
index 771df35091..4f7bde39fb 100644
--- a/element.io/app/config.json
+++ b/element.io/app/config.json
@@ -15,10 +15,9 @@
         "https://scalar.vector.im/_matrix/integrations/v1",
         "https://scalar.vector.im/api",
         "https://scalar-staging.vector.im/_matrix/integrations/v1",
-        "https://scalar-staging.vector.im/api",
-        "https://scalar-staging.riot.im/scalar/api"
+        "https://scalar-staging.vector.im/api"
     ],
-    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
+    "bug_report_endpoint_url": "https://rageshakes.element.io/api/submit",
     "uisi_autorageshake_app": "element-auto-uisi",
     "show_labs_settings": false,
     "room_directory": {
diff --git a/element.io/develop/config.json b/element.io/develop/config.json
index aaee51afd0..7cfe544478 100644
--- a/element.io/develop/config.json
+++ b/element.io/develop/config.json
@@ -15,10 +15,9 @@
         "https://scalar.vector.im/_matrix/integrations/v1",
         "https://scalar.vector.im/api",
         "https://scalar-staging.vector.im/_matrix/integrations/v1",
-        "https://scalar-staging.vector.im/api",
-        "https://scalar-staging.riot.im/scalar/api"
+        "https://scalar-staging.vector.im/api"
     ],
-    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
+    "bug_report_endpoint_url": "https://rageshakes.element.io/api/submit",
     "uisi_autorageshake_app": "element-auto-uisi",
     "show_labs_settings": true,
     "room_directory": {
diff --git a/jest.config.ts b/jest.config.ts
index ad31f2fecc..148d55c94c 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -22,6 +22,8 @@ const config: Config = {
     setupFiles: ["jest-canvas-mock", "web-streams-polyfill/polyfill"],
     setupFilesAfterEnv: ["<rootDir>/test/setupTests.ts"],
     moduleNameMapper: {
+        // Support CSS module
+        "\\.(module.css)$": "identity-obj-proxy",
         "\\.(css|scss|pcss)$": "<rootDir>/__mocks__/cssMock.js",
         "\\.(gif|png|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js",
         "\\.svg$": "<rootDir>/__mocks__/svg.js",
@@ -38,12 +40,14 @@ const config: Config = {
         "^!!raw-loader!.*": "jest-raw-loader",
         "recorderWorkletFactory": "<rootDir>/__mocks__/empty.js",
         "^fetch-mock$": "<rootDir>/node_modules/fetch-mock",
-        // Requires ESM which is incompatible with our current Jest setup
-        "^@element-hq/element-web-module-api$": "<rootDir>/__mocks__/empty.js",
+        "counterpart": "<rootDir>/node_modules/counterpart",
     },
-    transformIgnorePatterns: ["/node_modules/(?!(mime|matrix-js-sdk)).+$"],
+    transformIgnorePatterns: [
+        "/node_modules/(?!(mime|matrix-js-sdk|uuid|p-retry|is-network-error|react-merge-refs|is-ip|ip-regex|super-regex|function-timeout|time-span|convert-hrtime|clone-regexp|is-regexp)).+$",
+    ],
     collectCoverageFrom: [
         "<rootDir>/src/**/*.{js,ts,tsx}",
+        "<rootDir>/packages/**/*.{js,ts,tsx}",
         // getSessionLock is piped into a different JS context via stringification, and the coverage functionality is
         // not available in that contest. So, turn off coverage instrumentation for it.
         "!<rootDir>/src/utils/SessionLock.ts",
diff --git a/knip.ts b/knip.ts
index e129c11481..24f8b97343 100644
--- a/knip.ts
+++ b/knip.ts
@@ -2,18 +2,16 @@ import { KnipConfig } from "knip";
 
 export default {
     entry: [
-        "src/vector/index.ts",
         "src/serviceworker/index.ts",
         "src/workers/*.worker.ts",
         "src/utils/exportUtils/exportJS.js",
+        "src/vector/localstorage-fix.ts",
         "scripts/**",
         "playwright/**",
         "test/**",
         "res/decoder-ring/**",
         "res/jitsi_external_api.min.js",
         "docs/**",
-        // Used by jest
-        "__mocks__/maplibre-gl.js",
     ],
     project: ["**/*.{js,ts,jsx,tsx}"],
     ignore: [
@@ -22,6 +20,8 @@ export default {
         "src/hooks/useTimeout.ts",
         "src/components/views/elements/InfoTooltip.tsx",
         "src/components/views/elements/StyledCheckbox.tsx",
+
+        "packages/**/*",
     ],
     ignoreDependencies: [
         // Required for `action-validator`
@@ -42,6 +42,18 @@ export default {
         "util",
         // Embedded into webapp
         "@element-hq/element-call-embedded",
+        // Transitive dep of jest
+        "jsdom",
+
+        // Used by matrix-js-sdk, which means we have to include them as a
+        // dependency so that // we can run `tsc` (since we import the typescript
+        // source of js-sdk, rather than the transpiled and annotated JS like you
+        // would with a normal library).
+        "@types/content-type",
+        "@types/sdp-transform",
+
+        // Used in EW but failed because of "link:"
+        "@element-hq/web-shared-components",
     ],
     ignoreBinaries: [
         // Used in scripts & workflows
diff --git a/module_system/BuildConfig.ts b/module_system/BuildConfig.ts
index cfb805840d..b9454e8418 100644
--- a/module_system/BuildConfig.ts
+++ b/module_system/BuildConfig.ts
@@ -6,7 +6,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import * as YAML from "yaml";
-import * as fs from "fs";
+import * as fs from "node:fs";
 
 export type BuildConfig = {
     // Dev note: make everything here optional for user safety. Invalid
diff --git a/module_system/installer.ts b/module_system/installer.ts
index 66df4e92b6..dad65459f4 100644
--- a/module_system/installer.ts
+++ b/module_system/installer.ts
@@ -5,11 +5,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import * as fs from "fs";
-import * as childProcess from "child_process";
+import * as fs from "node:fs";
+import * as childProcess from "node:child_process";
 import * as semver from "semver";
 
-import { type BuildConfig } from "./BuildConfig";
+import { type BuildConfig } from "./BuildConfig.ts";
 
 // This expects to be run from ./scripts/install.ts
 
diff --git a/module_system/scripts/install.ts b/module_system/scripts/install.ts
index 0b6d2e1c29..5f96af1cd3 100644
--- a/module_system/scripts/install.ts
+++ b/module_system/scripts/install.ts
@@ -5,8 +5,8 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { readBuildConfig } from "../BuildConfig";
-import { installer } from "../installer";
+import { readBuildConfig } from "../BuildConfig.ts";
+import { installer } from "../installer.ts";
 
 const buildConf = readBuildConfig();
 installer(buildConf);
diff --git a/package.json b/package.json
index f5ff367e3d..0bbd0283dd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.101",
+    "version": "1.12.7",
     "description": "Element: the future of secure communication",
     "author": "New Vector Ltd.",
     "repository": {
@@ -29,7 +29,7 @@
         "UserFriendlyError"
     ],
     "scripts": {
-        "i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint",
+        "i18n": "matrix-gen-i18n src res packages/shared-components/src && yarn i18n:sort && yarn i18n:lint",
         "i18n:sort": "jq --sort-keys '.' src/i18n/strings/en_EN.json > src/i18n/strings/en_EN.json.tmp && mv src/i18n/strings/en_EN.json.tmp src/i18n/strings/en_EN.json",
         "i18n:lint": "matrix-i18n-lint && prettier --log-level=silent --write src/i18n/strings/ --ignore-path /dev/null",
         "i18n:diff": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
@@ -38,16 +38,16 @@
         "clean": "rimraf lib webapp",
         "build": "yarn clean && yarn build:genfiles && yarn build:bundle",
         "build-stats": "yarn clean && yarn build:genfiles && yarn build:bundle-stats",
-        "build:res": "ts-node scripts/copy-res.ts",
+        "build:res": "node scripts/copy-res.ts",
         "build:genfiles": "yarn build:res && yarn build:module_system",
         "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
         "build:bundle": "webpack --progress --mode production",
         "build:bundle-stats": "webpack --progress --mode production --json > webpack-stats.json",
-        "build:module_system": "ts-node --project ./tsconfig.module_system.json module_system/scripts/install.ts",
+        "build:module_system": "node module_system/scripts/install.ts",
         "dist": "./scripts/package.sh",
         "start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n modules,res \"yarn build:module_system\" \"yarn build:res\" && concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js\"",
         "start:https": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js --server-type https\"",
-        "start:res": "ts-node scripts/copy-res.ts -w",
+        "start:res": "node scripts/copy-res.ts -w",
         "start:js": "webpack serve --output-path webapp --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js --mode development",
         "lint": "yarn lint:types && yarn lint:js && yarn lint:style && yarn lint:workflows",
         "lint:js": "eslint --max-warnings 0 src test playwright module_system && prettier --check .",
@@ -65,38 +65,36 @@
         "coverage": "yarn test --coverage",
         "analyse:webpack-bundles": "webpack-bundle-analyzer webpack-stats.json webapp",
         "update:jitsi": "curl -s https://meet.element.io/libs/external_api.min.js > ./res/jitsi_external_api.min.js",
+        "install": "yarn --cwd packages/shared-components install --frozen-lockfile",
         "postinstall": "patch-package"
     },
     "resolutions": {
-        "**/pretty-format/react-is": "19.1.0",
-        "@playwright/test": "1.52.0",
-        "@types/react": "19.1.6",
-        "@types/react-dom": "19.1.5",
-        "oidc-client-ts": "3.2.1",
+        "**/pretty-format/react-is": "19.2.1",
+        "@types/react": "19.2.7",
+        "@types/react-dom": "19.2.3",
+        "oidc-client-ts": "3.4.1",
         "jwt-decode": "4.0.0",
-        "caniuse-lite": "1.0.30001720",
+        "caniuse-lite": "1.0.30001759",
         "testcontainers": "^11.0.0",
         "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0",
         "wrap-ansi": "npm:wrap-ansi@^7.0.0"
     },
     "dependencies": {
         "@babel/runtime": "^7.12.5",
-        "@element-hq/element-web-module-api": "1.0.0",
-        "@fontsource/inconsolata": "^5",
+        "@element-hq/element-web-module-api": "1.9.0",
+        "@element-hq/web-shared-components": "link:packages/shared-components",
+        "@fontsource/fira-code": "^5",
         "@fontsource/inter": "^5",
         "@formatjs/intl-segmenter": "^11.5.7",
-        "@giphy/js-fetch-api": "^5.6.0",
-        "@giphy/react-components": "^10.0.1",
-        "@matrix-org/analytics-events": "^0.29.2",
-        "@matrix-org/emojibase-bindings": "^1.3.4",
+        "@matrix-org/analytics-events": "^0.30.0",
+        "@matrix-org/emojibase-bindings": "^1.5.0",
         "@matrix-org/react-sdk-module-api": "^2.4.0",
         "@matrix-org/spec": "^1.7.0",
-        "@sentry/browser": "^9.0.0",
+        "@sentry/browser": "^10.0.0",
         "@types/png-chunks-extract": "^1.0.2",
-        "@types/react-virtualized": "^9.21.30",
-        "@vector-im/compound-design-tokens": "^4.0.0",
-        "@vector-im/compound-web": "^7.11.0",
-        "@vector-im/matrix-wysiwyg": "2.38.3",
+        "@vector-im/compound-design-tokens": "6.4.3",
+        "@vector-im/compound-web": "^8.3.1",
+        "@vector-im/matrix-wysiwyg": "2.40.0",
         "@zxcvbn-ts/core": "^3.0.4",
         "@zxcvbn-ts/language-common": "^3.0.4",
         "@zxcvbn-ts/language-en": "^3.0.2",
@@ -106,41 +104,40 @@
         "browserslist": "^4.23.2",
         "classnames": "^2.2.6",
         "commonmark": "^0.31.0",
-        "counterpart": "^0.18.6",
         "css-tree": "^3.0.0",
         "diff-dom": "^5.0.0",
         "diff-match-patch": "^1.0.5",
         "domutils": "^3.2.2",
-        "emojibase-regex": "15.3.2",
+        "emojibase-regex": "^17.0.0",
         "escape-html": "^1.0.3",
         "file-saver": "^2.0.5",
-        "filesize": "10.1.6",
+        "filesize": "11.0.13",
         "github-markdown-css": "^5.5.1",
         "glob-to-regexp": "^0.4.1",
         "highlight.js": "^11.3.1",
         "html-entities": "^2.0.0",
         "html-react-parser": "^5.2.2",
-        "is-ip": "^3.1.0",
-        "js-xxhash": "^4.0.0",
+        "is-ip": "^5.0.0",
+        "js-xxhash": "^5.0.0",
         "jsrsasign": "^11.0.0",
         "jszip": "^3.7.0",
         "katex": "^0.16.0",
-        "linkify-react": "4.3.1",
-        "linkify-string": "4.3.1",
-        "linkifyjs": "4.3.1",
+        "linkify-html": "4.3.2",
+        "linkify-react": "4.3.2",
+        "linkify-string": "4.3.2",
+        "linkifyjs": "4.3.2",
         "lodash": "^4.17.21",
         "maplibre-gl": "^5.0.0",
         "matrix-encrypt-attachment": "^1.0.3",
-        "matrix-events-sdk": "0.0.1",
         "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-        "matrix-widget-api": "^1.10.0",
+        "matrix-widget-api": "^1.15.0",
         "memoize-one": "^6.0.0",
         "mime": "^4.0.4",
         "oidc-client-ts": "^3.0.1",
         "opus-recorder": "^8.0.3",
         "pako": "^2.0.3",
         "png-chunks-extract": "^1.0.0",
-        "posthog-js": "1.248.1",
+        "posthog-js": "1.302.2",
         "qrcode": "1.5.4",
         "re-resizable": "6.11.2",
         "react": "^19.0.0",
@@ -148,17 +145,17 @@
         "react-blurhash": "^0.3.0",
         "react-dom": "^19.0.0",
         "react-focus-lock": "^2.5.1",
+        "react-merge-refs": "^3.0.2",
         "react-string-replace": "^1.1.1",
         "react-transition-group": "^4.4.1",
-        "react-virtualized": "^9.22.5",
+        "react-virtuoso": "^4.14.0",
         "rfc4648": "^1.4.0",
         "sanitize-filename": "^1.6.3",
         "sanitize-html": "2.17.0",
-        "styled-components": "^6.1.17",
         "tar-js": "^0.3.0",
         "temporal-polyfill": "^0.3.0",
-        "ua-parser-js": "^1.0.2",
-        "uuid": "^11.0.0",
+        "ua-parser-js": "1.0.40",
+        "uuid": "^13.0.0",
         "what-input": "^5.2.10"
     },
     "devDependencies": {
@@ -182,21 +179,22 @@
         "@babel/preset-react": "^7.12.10",
         "@babel/preset-typescript": "^7.12.7",
         "@babel/runtime": "^7.12.5",
-        "@casualbot/jest-sonar-reporter": "2.2.7",
-        "@element-hq/element-call-embedded": "0.12.0",
-        "@element-hq/element-web-playwright-common": "^1.1.5",
+        "@casualbot/jest-sonar-reporter": "2.5.0",
+        "@element-hq/element-call-embedded": "0.16.3",
+        "@element-hq/element-web-playwright-common": "^2.0.0",
         "@peculiar/webcrypto": "^1.4.3",
-        "@playwright/test": "^1.50.1",
+        "@playwright/test": "1.57.0",
         "@principalstudio/html-webpack-inject-preload": "^1.2.7",
-        "@rrweb/types": "^2.0.0-alpha.18",
-        "@sentry/webpack-plugin": "^3.0.0",
-        "@stylistic/eslint-plugin": "^4.0.0",
+        "@sentry/webpack-plugin": "^4.0.0",
+        "@storybook/react-vite": "^10.0.7",
+        "@stylistic/eslint-plugin": "^5.0.0",
         "@svgr/webpack": "^8.0.0",
         "@testing-library/dom": "^10.4.0",
         "@testing-library/jest-dom": "^6.4.8",
         "@testing-library/react": "^16.0.0",
         "@testing-library/user-event": "^14.5.2",
         "@types/commonmark": "^0.27.4",
+        "@types/content-type": "^1.1.9",
         "@types/counterpart": "^0.18.1",
         "@types/css-tree": "^2.3.8",
         "@types/diff-match-patch": "^1.0.32",
@@ -204,7 +202,7 @@
         "@types/express": "^5.0.0",
         "@types/file-saver": "^2.0.3",
         "@types/glob-to-regexp": "^0.4.1",
-        "@types/jest": "29.5.12",
+        "@types/jest": "30.0.0",
         "@types/jitsi-meet": "^2.0.2",
         "@types/jsrsasign": "^10.5.4",
         "@types/katex": "^0.16.0",
@@ -215,53 +213,53 @@
         "@types/node-fetch": "^2.6.2",
         "@types/pako": "^2.0.0",
         "@types/qrcode": "^1.3.5",
-        "@types/react": "19.1.6",
+        "@types/react": "19.2.7",
         "@types/react-beautiful-dnd": "^13.0.0",
-        "@types/react-dom": "19.1.5",
+        "@types/react-dom": "19.2.3",
         "@types/react-transition-group": "^4.4.0",
         "@types/sanitize-html": "2.16.0",
+        "@types/sdp-transform": "^2.4.10",
         "@types/semver": "^7.5.8",
         "@types/tar-js": "^0.3.5",
         "@types/ua-parser-js": "^0.7.36",
-        "@types/uuid": "^10.0.0",
         "@typescript-eslint/eslint-plugin": "^8.19.0",
         "@typescript-eslint/parser": "^8.19.0",
-        "babel-jest": "^29.0.0",
+        "babel-jest": "^30.0.0",
         "babel-loader": "^10.0.0",
         "babel-plugin-jsx-remove-data-test-id": "^3.0.0",
         "blob-polyfill": "^9.0.0",
-        "chokidar": "^4.0.0",
+        "chokidar": "^5.0.0",
         "concurrently": "^9.0.0",
         "copy-webpack-plugin": "^13.0.0",
         "core-js": "^3.38.1",
-        "cronstrue": "^2.41.0",
+        "cronstrue": "^3.0.0",
         "css-loader": "^7.0.0",
         "css-minimizer-webpack-plugin": "^7.0.0",
-        "dotenv": "^16.0.2",
+        "dotenv": "^17.0.0",
         "eslint": "8.57.1",
         "eslint-config-google": "^0.14.0",
         "eslint-config-prettier": "^10.0.0",
-        "eslint-plugin-deprecate": "0.8.5",
+        "eslint-plugin-deprecate": "0.8.7",
         "eslint-plugin-import": "^2.25.4",
-        "eslint-plugin-jest": "^28.0.0",
+        "eslint-plugin-jest": "^29.0.0",
         "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-matrix-org": "^2.0.2",
+        "eslint-plugin-matrix-org": "^3.0.0",
         "eslint-plugin-react": "^7.28.0",
         "eslint-plugin-react-compiler": "^19.0.0-beta-df7b47d-20241124",
-        "eslint-plugin-react-hooks": "^5.0.0",
+        "eslint-plugin-react-hooks": "^7.0.0",
         "eslint-plugin-unicorn": "^56.0.0",
         "express": "^5.0.0",
         "fake-indexeddb": "^6.0.0",
         "fetch-mock": "9.11.0",
         "fetch-mock-jest": "^1.5.1",
         "file-loader": "^6.0.0",
-        "glob": "^11.0.0",
         "html-webpack-plugin": "^5.5.3",
         "husky": "^9.0.0",
-        "jest": "^29.6.2",
+        "identity-obj-proxy": "^3.0.0",
+        "jest": "^30.0.0",
         "jest-canvas-mock": "^2.5.2",
-        "jest-environment-jsdom": "^29.7.0",
-        "jest-mock": "^29.6.2",
+        "jest-environment-jsdom": "^30.0.0",
+        "jest-mock": "^30.0.0",
         "jest-raw-loader": "^1.0.1",
         "jsqr": "^1.4.0",
         "knip": "^5.36.2",
@@ -278,29 +276,29 @@
         "postcss-hexrgba": "2.1.0",
         "postcss-import": "16.1.0",
         "postcss-loader": "8.1.1",
-        "postcss-mixins": "^11.0.0",
+        "postcss-mixins": "^12.0.0",
         "postcss-nested": "^7.0.0",
         "postcss-preset-env": "^10.0.0",
         "postcss-scss": "^4.0.4",
         "postcss-simple-vars": "^7.0.1",
-        "prettier": "3.5.3",
+        "prettier": "3.7.4",
         "process": "^0.11.10",
         "raw-loader": "^4.0.2",
         "rimraf": "^6.0.0",
         "semver": "^7.5.2",
         "source-map-loader": "^5.0.0",
-        "stylelint": "^16.13.0",
-        "stylelint-config-standard": "^38.0.0",
+        "storybook": "^10.0.7",
+        "stylelint": "^16.23.0",
+        "stylelint-config-standard": "^39.0.0",
         "stylelint-scss": "^6.0.0",
         "stylelint-value-no-unknown-custom-properties": "^6.0.1",
         "terser-webpack-plugin": "^5.3.9",
         "testcontainers": "^11.0.0",
-        "ts-node": "^10.9.1",
         "typescript": "5.8.3",
         "util": "^0.12.5",
         "web-streams-polyfill": "^4.0.0",
         "webpack": "^5.89.0",
-        "webpack-bundle-analyzer": "^4.8.0",
+        "webpack-bundle-analyzer": "^5.0.0",
         "webpack-cli": "^6.0.0",
         "webpack-dev-server": "^5.0.0",
         "webpack-retry-chunk-load-plugin": "^3.1.1",
@@ -313,7 +311,7 @@
         "relativePaths": true
     },
     "engines": {
-        "node": ">=20.0.0"
+        "node": ">=22.18"
     },
     "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
diff --git a/packages/shared-components/.eslintrc.js b/packages/shared-components/.eslintrc.js
new file mode 100644
index 0000000000..3cff936e9c
--- /dev/null
+++ b/packages/shared-components/.eslintrc.js
@@ -0,0 +1,72 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+module.exports = {
+    root: true,
+    plugins: ["matrix-org", "eslint-plugin-react-compiler"],
+    extends: [
+        "plugin:matrix-org/babel",
+        "plugin:matrix-org/react",
+        "plugin:matrix-org/a11y",
+        "plugin:storybook/recommended",
+    ],
+    parserOptions: {
+        project: ["./tsconfig.json"],
+        tsconfigRootDir: __dirname,
+    },
+    env: {
+        browser: true,
+        node: true,
+    },
+    rules: {
+        // Bind or arrow functions in props causes performance issues (but we
+        // currently use them in some places).
+        // It's disabled here, but we should using it sparingly.
+        "react/jsx-no-bind": "off",
+        "react/jsx-key": ["error"],
+        "matrix-org/require-copyright-header": "error",
+        "react-compiler/react-compiler": "error",
+    },
+    overrides: [
+        {
+            files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}"],
+            extends: ["plugin:matrix-org/typescript", "plugin:matrix-org/react"],
+            rules: {
+                "@typescript-eslint/explicit-function-return-type": [
+                    "error",
+                    {
+                        allowExpressions: true,
+                    },
+                ],
+
+                // Remove Babel things manually due to override limitations
+                "@babel/no-invalid-this": ["off"],
+
+                // We're okay being explicit at the moment
+                "@typescript-eslint/no-empty-interface": "off",
+                // We disable this while we're transitioning
+                "@typescript-eslint/no-explicit-any": "off",
+                // We'd rather not do this but we do
+                "@typescript-eslint/ban-ts-comment": "off",
+                // We're okay with assertion errors when we ask for them
+                "@typescript-eslint/no-non-null-assertion": "off",
+                "@typescript-eslint/no-empty-object-type": [
+                    "error",
+                    {
+                        // We do this sometimes to brand interfaces
+                        allowInterfaces: "with-single-extends",
+                    },
+                ],
+            },
+        },
+    ],
+    settings: {
+        react: {
+            version: "detect",
+        },
+    },
+};
diff --git a/packages/shared-components/.prettierignore b/packages/shared-components/.prettierignore
new file mode 100644
index 0000000000..bbb6b1ef7f
--- /dev/null
+++ b/packages/shared-components/.prettierignore
@@ -0,0 +1,2 @@
+dist/
+i18n/i18nKeys.d.ts
diff --git a/packages/shared-components/.storybook/ElementTheme.ts b/packages/shared-components/.storybook/ElementTheme.ts
new file mode 100644
index 0000000000..0967697621
--- /dev/null
+++ b/packages/shared-components/.storybook/ElementTheme.ts
@@ -0,0 +1,28 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { create } from "storybook/theming";
+
+export default create({
+    base: "light",
+
+    // Colors
+    textColor: "#1b1d22",
+    colorSecondary: "#111111",
+
+    // UI
+    appBg: "#ffffff",
+    appContentBg: "#ffffff",
+
+    // Toolbar
+    barBg: "#ffffff",
+
+    brandTitle: "Element Web",
+    brandUrl: "https://github.com/element-hq/element-web",
+    brandImage: "https://element.io/images/logo-ele-secondary.svg",
+    brandTarget: "_self",
+});
diff --git a/packages/shared-components/.storybook/languageAddon.tsx b/packages/shared-components/.storybook/languageAddon.tsx
new file mode 100644
index 0000000000..e1483738f5
--- /dev/null
+++ b/packages/shared-components/.storybook/languageAddon.tsx
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { Addon, types, useGlobals } from "storybook/manager-api";
+import { WithTooltip, IconButton, TooltipLinkList } from "storybook/internal/components";
+import React from "react";
+import { GlobeIcon } from "@storybook/icons";
+
+// We can't import `shared/i18n.tsx` directly here.
+// The storybook addon doesn't seem to benefit the vite config of storybook and we can't resolve the alias in i18n.tsx.
+import json from "../../../webapp/i18n/languages.json";
+const languages = Object.keys(json).filter((lang) => lang !== "default");
+
+/**
+ * Returns the title of a language in the user's locale.
+ */
+function languageTitle(language: string): string {
+    return new Intl.DisplayNames([language], { type: "language", style: "short" }).of(language) || language;
+}
+
+export const languageAddon: Addon = {
+    title: "Language Selector",
+    type: types.TOOL,
+    render: ({ active }) => {
+        const [globals, updateGlobals] = useGlobals();
+        const selectedLanguage = globals.language || "en";
+
+        return (
+            <WithTooltip
+                placement="top"
+                trigger="click"
+                closeOnOutsideClick
+                tooltip={({ onHide }) => {
+                    return (
+                        <TooltipLinkList
+                            links={languages.map((language) => ({
+                                id: language,
+                                title: languageTitle(language),
+                                active: selectedLanguage === language,
+                                onClick: async () => {
+                                    // Update the global state with the selected language
+                                    updateGlobals({ language });
+                                    onHide();
+                                },
+                            }))}
+                        />
+                    );
+                }}
+            >
+                <IconButton title="Language">
+                    <GlobeIcon />
+                    {languageTitle(selectedLanguage)}
+                </IconButton>
+            </WithTooltip>
+        );
+    },
+};
diff --git a/packages/shared-components/.storybook/main.ts b/packages/shared-components/.storybook/main.ts
new file mode 100644
index 0000000000..efc35752b5
--- /dev/null
+++ b/packages/shared-components/.storybook/main.ts
@@ -0,0 +1,46 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import type { StorybookConfig } from "@storybook/react-vite";
+import path from "node:path";
+import { nodePolyfills } from "vite-plugin-node-polyfills";
+import { mergeConfig } from "vite";
+
+const config: StorybookConfig = {
+    stories: ["../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
+    staticDirs: ["../../../webapp"],
+    addons: ["@storybook/addon-docs", "@storybook/addon-designs", "@storybook/addon-a11y"],
+    framework: "@storybook/react-vite",
+    core: {
+        disableTelemetry: true,
+    },
+    typescript: {
+        reactDocgen: "react-docgen-typescript",
+    },
+    async viteFinal(config) {
+        return mergeConfig(config, {
+            resolve: {
+                alias: {
+                    // Alias used by i18n.tsx
+                    $webapp: path.resolve("../../webapp"),
+                },
+            },
+            // Needed for counterpart to work
+            plugins: [nodePolyfills({ include: ["process", "util"] })],
+            server: {
+                allowedHosts: ["localhost", ".docker.internal"],
+            },
+        });
+    },
+    refs: {
+        "compound-web": {
+            title: "Compound Web",
+            url: "https://element-hq.github.io/compound-web/",
+        },
+    },
+};
+export default config;
diff --git a/packages/shared-components/.storybook/manager.js b/packages/shared-components/.storybook/manager.js
new file mode 100644
index 0000000000..1b08ef7825
--- /dev/null
+++ b/packages/shared-components/.storybook/manager.js
@@ -0,0 +1,18 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+
+import { addons } from "storybook/manager-api";
+import ElementTheme from "./ElementTheme";
+import { languageAddon } from "./languageAddon";
+
+addons.setConfig({
+    theme: ElementTheme,
+});
+
+addons.register("elementhq/language", () => addons.add("language", languageAddon));
diff --git a/packages/shared-components/.storybook/preview.css b/packages/shared-components/.storybook/preview.css
new file mode 100644
index 0000000000..9f49585937
--- /dev/null
+++ b/packages/shared-components/.storybook/preview.css
@@ -0,0 +1,10 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+.docs-story {
+    background: var(--cpd-color-bg-canvas-default);
+}
diff --git a/packages/shared-components/.storybook/preview.tsx b/packages/shared-components/.storybook/preview.tsx
new file mode 100644
index 0000000000..91a6df646e
--- /dev/null
+++ b/packages/shared-components/.storybook/preview.tsx
@@ -0,0 +1,102 @@
+import type { ArgTypes, Preview, Decorator, ReactRenderer, StrictArgs } from "@storybook/react-vite";
+
+import "../../../res/css/shared.pcss";
+import "./preview.css";
+import React, { useLayoutEffect } from "react";
+import { setLanguage } from "../src/utils/i18n";
+import { TooltipProvider } from "@vector-im/compound-web";
+import { StoryContext } from "storybook/internal/csf";
+import { I18nApi, I18nContext } from "../src";
+
+export const globalTypes = {
+    theme: {
+        name: "Theme",
+        description: "Global theme for components",
+        toolbar: {
+            icon: "circlehollow",
+            title: "Theme",
+            items: [
+                { title: "System", value: "system", icon: "browser" },
+                { title: "Light", value: "light", icon: "sun" },
+                { title: "Light (high contrast)", value: "light-hc", icon: "sun" },
+                { title: "Dark", value: "dark", icon: "moon" },
+                { title: "Dark (high contrast)", value: "dark-hc", icon: "moon" },
+            ],
+        },
+    },
+    language: {
+        name: "Language",
+        description: "Global language for components",
+    },
+    initialGlobals: {
+        theme: "system",
+        language: "en",
+    },
+} satisfies ArgTypes;
+
+const allThemesClasses = globalTypes.theme.toolbar.items.map(({ value }) => `cpd-theme-${value}`);
+
+const ThemeSwitcher: React.FC<{
+    theme: string;
+}> = ({ theme }) => {
+    useLayoutEffect(() => {
+        document.documentElement.classList.remove(...allThemesClasses);
+        if (theme !== "system") {
+            document.documentElement.classList.add(`cpd-theme-${theme}`);
+        }
+        return () => document.documentElement.classList.remove(...allThemesClasses);
+    }, [theme]);
+
+    return null;
+};
+
+const withThemeProvider: Decorator = (Story, context) => {
+    return (
+        <>
+            <ThemeSwitcher theme={context.globals.theme} />
+            <Story />
+        </>
+    );
+};
+
+async function languageLoader(context: StoryContext<ReactRenderer, StrictArgs>): Promise<void> {
+    await setLanguage(context.globals.language);
+}
+
+const withTooltipProvider: Decorator = (Story) => {
+    return (
+        <TooltipProvider>
+            <Story />
+        </TooltipProvider>
+    );
+};
+
+const withI18nProvider: Decorator = (Story) => {
+    return (
+        <I18nContext.Provider value={new I18nApi()}>
+            <Story />
+        </I18nContext.Provider>
+    );
+};
+
+const preview: Preview = {
+    tags: ["autodocs"],
+    decorators: [withThemeProvider, withTooltipProvider, withI18nProvider],
+    parameters: {
+        options: {
+            storySort: {
+                method: "alphabetical",
+            },
+        },
+        a11y: {
+            /*
+             * Configure test behavior
+             * See: https://storybook.js.org/docs/next/writing-tests/accessibility-testing#test-behavior
+             */
+            test: "error",
+        },
+    },
+    loaders: [languageLoader],
+};
+
+export default preview;
diff --git a/packages/shared-components/.storybook/test-runner.ts b/packages/shared-components/.storybook/test-runner.ts
new file mode 100644
index 0000000000..5f0748115a
--- /dev/null
+++ b/packages/shared-components/.storybook/test-runner.ts
@@ -0,0 +1,34 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { waitForPageReady, TestRunnerConfig } from "@storybook/test-runner";
+import { toMatchImageSnapshot } from "jest-image-snapshot";
+
+const customSnapshotsDir = `${process.cwd()}/playwright/snapshots/`;
+const customReceivedDir = `${process.cwd()}/playwright/received/`;
+
+const config: TestRunnerConfig = {
+    setup() {
+        expect.extend({ toMatchImageSnapshot });
+    },
+    async postVisit(page, context) {
+        await waitForPageReady(page);
+
+        // If you want to take screenshot of multiple browsers, use
+        // page.context().browser().browserType().name() to get the browser name to prefix the file name
+        const image = await page.screenshot();
+        expect(image).toMatchImageSnapshot({
+            customSnapshotsDir,
+            customSnapshotIdentifier: `${context.id}-${process.platform}`,
+            storeReceivedOnFailure: true,
+            customReceivedDir,
+            customDiffDir: customReceivedDir,
+        });
+    },
+};
+
+export default config;
diff --git a/packages/shared-components/babel.config.js b/packages/shared-components/babel.config.js
new file mode 100644
index 0000000000..02ff2e43fe
--- /dev/null
+++ b/packages/shared-components/babel.config.js
@@ -0,0 +1,21 @@
+module.exports = {
+    sourceMaps: true,
+    presets: [
+        [
+            "@babel/preset-env",
+            {
+                include: ["@babel/plugin-transform-class-properties"],
+            },
+        ],
+        ["@babel/preset-typescript", { allowDeclareFields: true }],
+        "@babel/preset-react",
+    ],
+    plugins: [
+        "@babel/plugin-proposal-export-default-from",
+        "@babel/plugin-transform-numeric-separator",
+        "@babel/plugin-transform-object-rest-spread",
+        "@babel/plugin-transform-optional-chaining",
+        "@babel/plugin-transform-nullish-coalescing-operator",
+        "@babel/plugin-transform-runtime",
+    ],
+};
diff --git a/packages/shared-components/jest.config.ts b/packages/shared-components/jest.config.ts
new file mode 100644
index 0000000000..30a96a6cb1
--- /dev/null
+++ b/packages/shared-components/jest.config.ts
@@ -0,0 +1,58 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { env } from "process";
+
+import type { Config } from "jest";
+
+const config: Config = {
+    testEnvironment: "jsdom",
+    testEnvironmentOptions: {
+        url: "http://localhost/",
+    },
+    testMatch: ["<rootDir>/src/**/*.test.[tj]s?(x)"],
+    setupFilesAfterEnv: ["<rootDir>/src/test/setupTests.ts"],
+    moduleNameMapper: {
+        // Support CSS module
+        "\\.(module.css)$": "identity-obj-proxy",
+        "\\.(css|scss|pcss)$": "<rootDir>/__mocks__/cssMock.js",
+        "\\.(gif|png|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js",
+        "\\.svg$": "<rootDir>/__mocks__/svg.js",
+        "\\$webapp/i18n/languages.json": "<rootDir>/../../__mocks__/languages.json",
+        "^react$": "<rootDir>/node_modules/react",
+        "^react-dom$": "<rootDir>/node_modules/react-dom",
+        "waveWorker\\.min\\.js": "<rootDir>/__mocks__/empty.js",
+        "context-filter-polyfill": "<rootDir>/__mocks__/empty.js",
+        "workers/(.+)Factory": "<rootDir>/__mocks__/workerFactoryMock.js",
+    },
+    transformIgnorePatterns: [
+        "/node_modules/(?!(mime|matrix-js-sdk|uuid|p-retry|is-network-error|react-merge-refs|@storybook|storybook)).+$",
+    ],
+    collectCoverageFrom: [
+        "<rootDir>/src/**/*.{js,ts,tsx}",
+        "<rootDir>/packages/**/*.{js,ts,tsx}",
+        // Coverage chokes on type definition files
+        "!<rootDir>/src/**/*.d.ts",
+    ],
+    coverageReporters: ["text-summary", "lcov"],
+    testResultsProcessor: "@casualbot/jest-sonar-reporter",
+    prettierPath: null,
+    moduleDirectories: ["node_modules", "./src/test/utils"],
+};
+
+// if we're running under GHA, enable the GHA reporter
+if (env["GITHUB_ACTIONS"] !== undefined) {
+    const reporters: Config["reporters"] = [["github-actions", { silent: false }], "summary"];
+
+    // if we're running against the develop branch, also enable the slow test reporter
+    if (env["GITHUB_REF"] == "refs/heads/develop") {
+        reporters.push("<rootDir>/../../test/slowReporter.cjs");
+    }
+    config.reporters = reporters;
+}
+
+export default config;
diff --git a/packages/shared-components/package.json b/packages/shared-components/package.json
new file mode 100644
index 0000000000..38c186a243
--- /dev/null
+++ b/packages/shared-components/package.json
@@ -0,0 +1,98 @@
+{
+    "name": "@element-hq/web-shared-components",
+    "version": "0.0.0-test.12",
+    "description": "Shared components for Element",
+    "author": "New Vector Ltd.",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/element-hq/element-web"
+    },
+    "exports": {
+        ".": {
+            "require": {
+                "style": "./dist/element-web-shared-components.css",
+                "types": "./dist/element-web-shared-components.d.ts",
+                "default": "./dist/element-web-shared-components.umd.js"
+            },
+            "import": {
+                "style": "./dist/element-web-shared-components.css",
+                "types": "./dist/element-web-shared-components.d.ts",
+                "default": "./dist/element-web-shared-components.mjs"
+            }
+        },
+        "./dist/element-web-shared-components.css": {
+            "require": "./dist/element-web-shared-components.css",
+            "import": "./dist/element-web-shared-components.css"
+        }
+    },
+    "types": "dist/element-web-shared-components.d.ts",
+    "files": [
+        "dist",
+        "src",
+        "LICENSE",
+        "README.md",
+        "package.json"
+    ],
+    "scripts": {
+        "test": "jest",
+        "prepare": "patch-package && yarn --cwd ../.. build:res && node scripts/gatherTranslationKeys.ts && vite build",
+        "storybook": "storybook dev -p 6007",
+        "build-storybook": "storybook build",
+        "lint": "yarn lint:types && yarn lint:js",
+        "lint:js": "eslint --max-warnings 0 src && prettier --check .",
+        "lint:types": "tsc --noEmit --jsx react",
+        "test:storybook": "test-storybook --url http://localhost:6007/",
+        "test:storybook:ci": "concurrently -k -s first -n \"SB,TEST\" \"yarn storybook --no-open\" \"wait-on tcp:6007 && yarn test-storybook --url http://localhost:6007/ --ci --maxWorkers=2\"",
+        "test:storybook:update": "playwright-screenshots --entrypoint /work/scripts/storybook-screenshot-update.sh --with-node-modules"
+    },
+    "resolutions": {
+        "playwright": "1.57.0"
+    },
+    "dependencies": {
+        "@element-hq/element-web-module-api": "^1.8.0",
+        "@vector-im/compound-design-tokens": "^6.3.0",
+        "classnames": "^2.5.1",
+        "counterpart": "^0.18.6",
+        "lodash": "^4.17.21",
+        "matrix-web-i18n": "^3.4.0",
+        "patch-package": "^8.0.1",
+        "react-merge-refs": "^3.0.2",
+        "temporal-polyfill": "^0.3.0"
+    },
+    "devDependencies": {
+        "@element-hq/element-web-playwright-common": "^2.0.0",
+        "@playwright/test": "1.57.0",
+        "@storybook/addon-a11y": "^10.0.7",
+        "@storybook/addon-designs": "^11.0.1",
+        "@storybook/addon-docs": "^10.0.7",
+        "@storybook/icons": "^2.0.0",
+        "@storybook/react-vite": "^10.0.7",
+        "@storybook/test-runner": "^0.24.1",
+        "@testing-library/dom": "^10.4.1",
+        "@testing-library/react": "^16.3.0",
+        "@types/counterpart": "^0.18.4",
+        "@types/jest-image-snapshot": "^6.4.0",
+        "@types/lodash": "^4.17.20",
+        "@types/react": "^19.2.2",
+        "concurrently": "^9.2.1",
+        "eslint": "8",
+        "eslint-plugin-matrix-org": "^3.0.0",
+        "eslint-plugin-storybook": "^10.0.7",
+        "jest": "^30.2.0",
+        "jest-image-snapshot": "^6.5.1",
+        "patch-package": "^8.0.1",
+        "prettier": "^3.6.2",
+        "storybook": "^10.0.7",
+        "typescript": "^5.9.3",
+        "vite": "^7.1.9",
+        "vite-plugin-dts": "^4.5.4",
+        "vite-plugin-node-polyfills": "^0.24.0"
+    },
+    "engines": {
+        "node": ">=20.0.0"
+    },
+    "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e",
+    "peerDependencies": {
+        "@vector-im/compound-web": "^8.2.5"
+    }
+}
diff --git a/packages/shared-components/patches/@types+mdx+2.0.13.patch b/packages/shared-components/patches/@types+mdx+2.0.13.patch
new file mode 100644
index 0000000000..d3d02974f7
--- /dev/null
+++ b/packages/shared-components/patches/@types+mdx+2.0.13.patch
@@ -0,0 +1,46 @@
+diff --git a/node_modules/@types/mdx/types.d.ts b/node_modules/@types/mdx/types.d.ts
+index 498bb69..4e89216 100644
+--- a/node_modules/@types/mdx/types.d.ts
++++ b/node_modules/@types/mdx/types.d.ts
+@@ -5,7 +5,7 @@
+  */
+ // @ts-ignore JSX runtimes may optionally define JSX.ElementType. The MDX types need to work regardless whether this is
+ // defined or not.
+-type ElementType = any extends JSX.ElementType ? never : JSX.ElementType;
++type ElementType = any extends JSX.ElementType ? never : React.JSX.ElementType;
+ 
+ /**
+  * This matches any function component types that ar part of `ElementType`.
+@@ -20,12 +20,12 @@ type ClassElementType = Extract<ElementType, new(props: Record<string, any>) =>
+ /**
+  * A valid JSX string component.
+  */
+-type StringComponent = Extract<keyof JSX.IntrinsicElements, ElementType extends never ? string : ElementType>;
++type StringComponent = Extract<keyof React.JSX.IntrinsicElements, ElementType extends never ? string : ElementType>;
+ 
+ /**
+  * A JSX element returned by MDX content.
+  */
+-export type Element = JSX.Element;
++export type Element = React.JSX.Element;
+ 
+ /**
+  * A valid JSX function component.
+@@ -44,7 +44,7 @@ type FunctionComponent<Props> = ElementType extends never
+  */
+ type ClassComponent<Props> = ElementType extends never
+     // If JSX.ElementType isn’t defined, the valid return type is a constructor that returns JSX.ElementClass
+-    ? new(props: Props) => JSX.ElementClass
++    ? new(props: Props) => React.JSX.ElementClass
+     : ClassElementType extends never
+     // If JSX.ElementType is defined, but doesn’t allow constructors, function components are disallowed.
+         ? never
+@@ -70,7 +70,7 @@ interface NestedMDXComponents {
+ export type MDXComponents =
+     & NestedMDXComponents
+     & {
+-        [Key in StringComponent]?: Component<JSX.IntrinsicElements[Key]>;
++        [Key in StringComponent]?: Component<React.JSX.IntrinsicElements[Key]>;
+     }
+     & {
+         /**
diff --git a/packages/shared-components/playwright/snapshots/audio-audioplayerview--default-linux.png b/packages/shared-components/playwright/snapshots/audio-audioplayerview--default-linux.png
new file mode 100644
index 0000000000..e4d6a84d23
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/audio-audioplayerview--default-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/audio-audioplayerview--has-error-linux.png b/packages/shared-components/playwright/snapshots/audio-audioplayerview--has-error-linux.png
new file mode 100644
index 0000000000..36684675f7
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/audio-audioplayerview--has-error-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/audio-audioplayerview--no-media-name-linux.png b/packages/shared-components/playwright/snapshots/audio-audioplayerview--no-media-name-linux.png
new file mode 100644
index 0000000000..c46e59ac21
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/audio-audioplayerview--no-media-name-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/audio-audioplayerview--no-size-linux.png b/packages/shared-components/playwright/snapshots/audio-audioplayerview--no-size-linux.png
new file mode 100644
index 0000000000..928f6f0197
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/audio-audioplayerview--no-size-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/audio-clock--default-linux.png b/packages/shared-components/playwright/snapshots/audio-clock--default-linux.png
new file mode 100644
index 0000000000..be66f4b70c
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/audio-clock--default-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/audio-clock--lot-of-seconds-linux.png b/packages/shared-components/playwright/snapshots/audio-clock--lot-of-seconds-linux.png
new file mode 100644
index 0000000000..b4879e1a0c
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/audio-clock--lot-of-seconds-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/audio-playpausebutton--default-linux.png b/packages/shared-components/playwright/snapshots/audio-playpausebutton--default-linux.png
new file mode 100644
index 0000000000..8c8baa7a65
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/audio-playpausebutton--default-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/audio-playpausebutton--playing-linux.png b/packages/shared-components/playwright/snapshots/audio-playpausebutton--playing-linux.png
new file mode 100644
index 0000000000..53d58a4c2f
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/audio-playpausebutton--playing-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/audio-seekbar--default-linux.png b/packages/shared-components/playwright/snapshots/audio-seekbar--default-linux.png
new file mode 100644
index 0000000000..60e51020cf
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/audio-seekbar--default-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/audio-seekbar--disabled-linux.png b/packages/shared-components/playwright/snapshots/audio-seekbar--disabled-linux.png
new file mode 100644
index 0000000000..128f7e2ee5
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/audio-seekbar--disabled-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/avatar-avatarwithdetails--default-linux.png b/packages/shared-components/playwright/snapshots/avatar-avatarwithdetails--default-linux.png
new file mode 100644
index 0000000000..ae339219e5
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/avatar-avatarwithdetails--default-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/composer-historyvisiblebannerview--default-linux.png b/packages/shared-components/playwright/snapshots/composer-historyvisiblebannerview--default-linux.png
new file mode 100644
index 0000000000..7ab93a0cb8
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/composer-historyvisiblebannerview--default-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/event-textualevent--default-linux.png b/packages/shared-components/playwright/snapshots/event-textualevent--default-linux.png
new file mode 100644
index 0000000000..16855e8448
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/event-textualevent--default-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/messagebody-mediabody--default-linux.png b/packages/shared-components/playwright/snapshots/messagebody-mediabody--default-linux.png
new file mode 100644
index 0000000000..56b8072d2d
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/messagebody-mediabody--default-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/pillinput-pill--default-linux.png b/packages/shared-components/playwright/snapshots/pillinput-pill--default-linux.png
new file mode 100644
index 0000000000..cd8eb65ba1
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/pillinput-pill--default-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/pillinput-pill--without-close-button-linux.png b/packages/shared-components/playwright/snapshots/pillinput-pill--without-close-button-linux.png
new file mode 100644
index 0000000000..451de895dc
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/pillinput-pill--without-close-button-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/pillinput-pillinput--default-linux.png b/packages/shared-components/playwright/snapshots/pillinput-pillinput--default-linux.png
new file mode 100644
index 0000000000..93bf6317a9
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/pillinput-pillinput--default-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/pillinput-pillinput--no-child-linux.png b/packages/shared-components/playwright/snapshots/pillinput-pillinput--no-child-linux.png
new file mode 100644
index 0000000000..a303e726b5
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/pillinput-pillinput--no-child-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/richlist-richitem--default-linux.png b/packages/shared-components/playwright/snapshots/richlist-richitem--default-linux.png
new file mode 100644
index 0000000000..9a5ad9eb0f
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/richlist-richitem--default-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/richlist-richitem--hover-linux.png b/packages/shared-components/playwright/snapshots/richlist-richitem--hover-linux.png
new file mode 100644
index 0000000000..9a5ad9eb0f
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/richlist-richitem--hover-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/richlist-richitem--selected-linux.png b/packages/shared-components/playwright/snapshots/richlist-richitem--selected-linux.png
new file mode 100644
index 0000000000..f9c92b066f
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/richlist-richitem--selected-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/richlist-richitem--separator-linux.png b/packages/shared-components/playwright/snapshots/richlist-richitem--separator-linux.png
new file mode 100644
index 0000000000..a405f35902
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/richlist-richitem--separator-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/richlist-richitem--without-timestamp-linux.png b/packages/shared-components/playwright/snapshots/richlist-richitem--without-timestamp-linux.png
new file mode 100644
index 0000000000..de5ecda7c3
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/richlist-richitem--without-timestamp-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/richlist-richlist--default-linux.png b/packages/shared-components/playwright/snapshots/richlist-richlist--default-linux.png
new file mode 100644
index 0000000000..7919f356df
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/richlist-richlist--default-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/richlist-richlist--empty-linux.png b/packages/shared-components/playwright/snapshots/richlist-richlist--empty-linux.png
new file mode 100644
index 0000000000..f655ecab96
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/richlist-richlist--empty-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/room-banner--critical-linux.png b/packages/shared-components/playwright/snapshots/room-banner--critical-linux.png
new file mode 100644
index 0000000000..d920c59664
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/room-banner--critical-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/room-banner--default-linux.png b/packages/shared-components/playwright/snapshots/room-banner--default-linux.png
new file mode 100644
index 0000000000..39079994d2
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/room-banner--default-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/room-banner--info-linux.png b/packages/shared-components/playwright/snapshots/room-banner--info-linux.png
new file mode 100644
index 0000000000..7d93288e42
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/room-banner--info-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/room-banner--success-linux.png b/packages/shared-components/playwright/snapshots/room-banner--success-linux.png
new file mode 100644
index 0000000000..8417f0aee3
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/room-banner--success-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/room-banner--with-action-linux.png b/packages/shared-components/playwright/snapshots/room-banner--with-action-linux.png
new file mode 100644
index 0000000000..b3968f9db7
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/room-banner--with-action-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/room-banner--with-avatar-image-linux.png b/packages/shared-components/playwright/snapshots/room-banner--with-avatar-image-linux.png
new file mode 100644
index 0000000000..d015a12a00
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/room-banner--with-avatar-image-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/room-banner--with-loads-of-content-linux.png b/packages/shared-components/playwright/snapshots/room-banner--with-loads-of-content-linux.png
new file mode 100644
index 0000000000..85372e48fa
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/room-banner--with-loads-of-content-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/room-banner--without-close-linux.png b/packages/shared-components/playwright/snapshots/room-banner--without-close-linux.png
new file mode 100644
index 0000000000..9645bd1d8a
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/room-banner--without-close-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/room-list-roomlistsearchview--all-buttons-linux.png b/packages/shared-components/playwright/snapshots/room-list-roomlistsearchview--all-buttons-linux.png
new file mode 100644
index 0000000000..0d7f17d511
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/room-list-roomlistsearchview--all-buttons-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/room-list-roomlistsearchview--default-linux.png b/packages/shared-components/playwright/snapshots/room-list-roomlistsearchview--default-linux.png
new file mode 100644
index 0000000000..2f41682551
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/room-list-roomlistsearchview--default-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/room-list-roomlistsearchview--with-dial-pad-linux.png b/packages/shared-components/playwright/snapshots/room-list-roomlistsearchview--with-dial-pad-linux.png
new file mode 100644
index 0000000000..0d7f17d511
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/room-list-roomlistsearchview--with-dial-pad-linux.png differ
diff --git a/packages/shared-components/playwright/snapshots/room-list-roomlistsearchview--without-explore-linux.png b/packages/shared-components/playwright/snapshots/room-list-roomlistsearchview--without-explore-linux.png
new file mode 100644
index 0000000000..e3e14ccfb4
Binary files /dev/null and b/packages/shared-components/playwright/snapshots/room-list-roomlistsearchview--without-explore-linux.png differ
diff --git a/packages/shared-components/scripts/gatherTranslationKeys.ts b/packages/shared-components/scripts/gatherTranslationKeys.ts
new file mode 100644
index 0000000000..37812df33b
--- /dev/null
+++ b/packages/shared-components/scripts/gatherTranslationKeys.ts
@@ -0,0 +1,67 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+// Gathers all the translation keys from element-web's en_EN.json into a TypeScript type definition file
+// that exports a type `TranslationKey` which is a union of all supported translation keys.
+// This prevents having to import the json file and make typescript do the work as this results in vite-dts
+// generating an import to the json file in the .d.ts which doesn't work at runtime: this way, the type
+// gets put into the bundle.
+// XXX: It should *not* be in the 'src' directory, being a generated file, but if it isn't then the type
+// bundler won't bundle the types and will leave the file as a relative import, which will break.
+
+import * as fs from "fs";
+import * as path from "path";
+import { dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const i18nStringsPath = path.resolve(__dirname, "../../../src/i18n/strings/en_EN.json");
+const outPath = path.resolve(__dirname, "../src/i18nKeys.d.ts");
+
+function gatherKeys(obj: any, prefix: string[] = []): string[] {
+    if (typeof obj !== "object" || obj === null) return [];
+    let keys: string[] = [];
+    for (const key of Object.keys(obj)) {
+        const value = obj[key];
+
+        // add the path (for both leaves and intermediates as then we include plurals)
+        keys.push([...prefix, key].join("|"));
+        if (typeof value === "object" && value !== null) {
+            // If the value is an object, recurse
+            keys = keys.concat(gatherKeys(value, [...prefix, key]));
+        }
+    }
+    return keys;
+}
+
+function main() {
+    const json = JSON.parse(fs.readFileSync(i18nStringsPath, "utf8"));
+    const keys = gatherKeys(json);
+    const typeDef =
+        "/*\n" +
+        " * Copyright 2025 Element Creations Ltd.\n" +
+        " *\n" +
+        " * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial\n" +
+        " * Please see LICENSE files in the repository root for full details.\n" +
+        " */\n" +
+        "\n" +
+        "// This file is auto-generated by gatherTranslationKeys.ts\n" +
+        "// Do not edit manually.\n\n" +
+        "export type TranslationKey =\n" +
+        keys.map((k) => `    | \"${k}\"`).join("\n") +
+        ";\n";
+    fs.mkdirSync(path.dirname(outPath), { recursive: true });
+    fs.writeFileSync(outPath, typeDef, "utf8");
+    console.log(`Wrote ${keys.length} keys to ${outPath}`);
+}
+
+if (import.meta.url.startsWith("file:")) {
+    const modulePath = fileURLToPath(import.meta.url);
+    if (process.argv[1] === modulePath) {
+        main();
+    }
+}
diff --git a/packages/shared-components/scripts/storybook-screenshot-update.sh b/packages/shared-components/scripts/storybook-screenshot-update.sh
new file mode 100755
index 0000000000..6310d6887f
--- /dev/null
+++ b/packages/shared-components/scripts/storybook-screenshot-update.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+#
+# Update storybook screenshots
+#
+# This script should be used as the entrypoint parameter of the `playwright-screenshots` script. It
+# installs the yarn dependencies, and then runs `test-storybook` to update the storybook screenshots.
+#
+# It expects to find a storybook instance running at :6007 on the host machine. It also requires that
+# `playwright-screenshots` is given the `--with-node-modules` parameter.
+#
+# Example:
+#
+#        test-storybook --url http://localhost:6007/
+#        playwright-screenshots --entrypoint /work/scripts/storybook-screenshot-update.sh --with-node-modules
+#
+#
+# Note: even though this script is small, it is important because the alternative is running
+# `playwright-screenshots` twice in quick succession (once to do `yarn install`, a second to do the
+# actual updates): and that fails, because running `playwright-screenshots` without actually starting
+# Testcontainers leaves a ryuk container hanging around for up to 60s, which will block the second
+# invocation.
+
+set -e
+
+# First install dependencies. We have to do this within the playwright container rather than the host,
+# because we have which must be built for the right architecture (and some environments use a VM
+# to run docker containers, meaning that things inside a container use a different architecture than
+# those on the host).
+yarn
+
+# Now run the screenshot update
+/work/node_modules/.bin/test-storybook --url http://host.docker.internal:6007/ --updateSnapshot
diff --git a/packages/shared-components/src/@types/global.d.ts b/packages/shared-components/src/@types/global.d.ts
new file mode 100644
index 0000000000..1334c41737
--- /dev/null
+++ b/packages/shared-components/src/@types/global.d.ts
@@ -0,0 +1,8 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+declare module "*.css";
diff --git a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.module.css b/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.module.css
new file mode 100644
index 0000000000..fc8c26aef7
--- /dev/null
+++ b/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.module.css
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+.audioPlayer {
+    padding: var(--cpd-space-4x) var(--cpd-space-3x) var(--cpd-space-3x) var(--cpd-space-3x) !important;
+}
+
+.mediaInfo {
+    /* Makes the ellipsis on the file name work */
+    overflow: hidden;
+}
+
+.mediaName {
+    color: var(--cpd-color-text-primary);
+    font: var(--cpd-font-body-md-regular);
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    max-width: 100%;
+}
+
+.byline {
+    font: var(--cpd-font-body-xs-regular);
+}
+
+.clock {
+    white-space: nowrap;
+}
+
+.error {
+    color: var(--cpd-color-text-critical-primary);
+}
diff --git a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.stories.tsx b/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.stories.tsx
new file mode 100644
index 0000000000..18782f25cb
--- /dev/null
+++ b/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.stories.tsx
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React, { type JSX } from "react";
+import { fn } from "storybook/test";
+
+import type { Meta, StoryFn } from "@storybook/react-vite";
+import { AudioPlayerView, type AudioPlayerViewActions, type AudioPlayerViewSnapshot } from "./AudioPlayerView";
+import { useMockedViewModel } from "../../useMockedViewModel";
+
+type AudioPlayerProps = AudioPlayerViewSnapshot & AudioPlayerViewActions;
+const AudioPlayerViewWrapper = ({ togglePlay, onKeyDown, onSeekbarChange, ...rest }: AudioPlayerProps): JSX.Element => {
+    const vm = useMockedViewModel(rest, {
+        togglePlay,
+        onKeyDown,
+        onSeekbarChange,
+    });
+    return <AudioPlayerView vm={vm} />;
+};
+
+export default {
+    title: "Audio/AudioPlayerView",
+    component: AudioPlayerViewWrapper,
+    tags: ["autodocs"],
+    argTypes: {
+        playbackState: {
+            options: ["stopped", "playing", "paused", "decoding"],
+            control: { type: "select" },
+        },
+    },
+    args: {
+        mediaName: "Sample Audio",
+        durationSeconds: 300,
+        playedSeconds: 120,
+        percentComplete: 30,
+        playbackState: "stopped",
+        sizeBytes: 3500,
+        error: false,
+        togglePlay: fn(),
+        onKeyDown: fn(),
+        onSeekbarChange: fn(),
+    },
+} as Meta<typeof AudioPlayerViewWrapper>;
+
+const Template: StoryFn<typeof AudioPlayerViewWrapper> = (args) => <AudioPlayerViewWrapper {...args} />;
+
+export const Default = Template.bind({});
+
+export const NoMediaName = Template.bind({});
+NoMediaName.args = {
+    mediaName: undefined,
+};
+
+export const NoSize = Template.bind({});
+NoSize.args = {
+    sizeBytes: undefined,
+};
+
+export const HasError = Template.bind({});
+HasError.args = {
+    error: true,
+};
diff --git a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.test.tsx b/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.test.tsx
new file mode 100644
index 0000000000..55e159f110
--- /dev/null
+++ b/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.test.tsx
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { render, screen } from "jest-matrix-react";
+import { composeStories } from "@storybook/react-vite";
+import React from "react";
+import userEvent from "@testing-library/user-event";
+import { fireEvent } from "@testing-library/dom";
+
+import * as stories from "./AudioPlayerView.stories.tsx";
+import { AudioPlayerView, type AudioPlayerViewActions, type AudioPlayerViewSnapshot } from "./AudioPlayerView";
+import { MockViewModel } from "../../viewmodel/MockViewModel.ts";
+import { I18nContext } from "../../utils/i18nContext.ts";
+import { I18nApi } from "../../index.ts";
+
+const { Default, NoMediaName, NoSize, HasError } = composeStories(stories);
+
+describe("AudioPlayerView", () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it("renders the audio player in default state", () => {
+        const { container } = render(<Default />);
+        expect(container).toMatchSnapshot();
+    });
+
+    it("renders the audio player without media name", () => {
+        const { container } = render(<NoMediaName />);
+        expect(container).toMatchSnapshot();
+    });
+
+    it("renders the audio player without size", () => {
+        const { container } = render(<NoSize />);
+        expect(container).toMatchSnapshot();
+    });
+
+    it("renders the audio player in error state", () => {
+        const { container } = render(<HasError />);
+        expect(container).toMatchSnapshot();
+    });
+
+    const onKeyDown = jest.fn();
+    const togglePlay = jest.fn();
+    const onSeekbarChange = jest.fn();
+
+    class AudioPlayerViewModel extends MockViewModel<AudioPlayerViewSnapshot> implements AudioPlayerViewActions {
+        public onKeyDown = onKeyDown;
+        public togglePlay = togglePlay;
+        public onSeekbarChange = onSeekbarChange;
+    }
+
+    it("should attach vm methods", async () => {
+        const user = userEvent.setup();
+        const vm = new AudioPlayerViewModel({
+            playbackState: "stopped",
+            mediaName: "Test Audio",
+            durationSeconds: 300,
+            playedSeconds: 120,
+            percentComplete: 30,
+            sizeBytes: 3500,
+            error: false,
+        });
+
+        render(<AudioPlayerView vm={vm} />, {
+            wrapper: ({ children }) => <I18nContext.Provider value={new I18nApi()}>{children}</I18nContext.Provider>,
+        });
+        await user.click(screen.getByRole("button", { name: "Play" }));
+        expect(togglePlay).toHaveBeenCalled();
+
+        // user event doesn't support change events on sliders, so we use fireEvent
+        fireEvent.change(screen.getByRole("slider", { name: "Audio seek bar" }), { target: { value: "50" } });
+        expect(onSeekbarChange).toHaveBeenCalled();
+
+        await user.type(screen.getByLabelText("Audio player"), "{arrowup}");
+        expect(onKeyDown).toHaveBeenCalledWith(expect.objectContaining({ key: "ArrowUp" }));
+    });
+});
diff --git a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.tsx b/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.tsx
new file mode 100644
index 0000000000..d3c9fb87ee
--- /dev/null
+++ b/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.tsx
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React, { type ChangeEventHandler, type JSX, type KeyboardEventHandler, type MouseEventHandler } from "react";
+
+import { type ViewModel } from "../../viewmodel/ViewModel";
+import { useViewModel } from "../../useViewModel";
+import { MediaBody } from "../../message-body/MediaBody";
+import { Flex } from "../../utils/Flex";
+import styles from "./AudioPlayerView.module.css";
+import { PlayPauseButton } from "../PlayPauseButton";
+import { type PlaybackState } from "../playback";
+import { useI18n } from "../../utils/i18nContext";
+import { formatBytes } from "../../utils/FormattingUtils";
+import { Clock } from "../Clock";
+import { SeekBar } from "../SeekBar";
+
+export interface AudioPlayerViewSnapshot {
+    /**
+     * The playback state of the audio player.
+     */
+    playbackState: PlaybackState;
+    /**
+     * Name of the media being played.
+     * @default Fallback to "timeline|m.audio|unnamed_audio" string if not provided.
+     */
+    mediaName?: string;
+    /**
+     * Size of the audio file in bytes.
+     * Hided if not provided.
+     */
+    sizeBytes?: number;
+    /**
+     * The duration of the audio clip in seconds.
+     */
+    durationSeconds: number;
+    /**
+     * The percentage of the audio that has been played.
+     * Ranges from 0 to 100.
+     */
+    percentComplete: number;
+    /**
+     * The number of seconds that have been played.
+     */
+    playedSeconds: number;
+    /**
+     * Indicates if there was an error downloading the audio.
+     */
+    error: boolean;
+}
+
+export interface AudioPlayerViewActions {
+    /**
+     * Handles key down events for the audio player.
+     */
+    onKeyDown: KeyboardEventHandler<HTMLDivElement>;
+    /**
+     * Toggles the play/pause state of the audio player.
+     */
+    togglePlay: MouseEventHandler<HTMLButtonElement>;
+    /**
+     * Handles changes to the seek bar.
+     */
+    onSeekbarChange: ChangeEventHandler<HTMLInputElement>;
+}
+
+/**
+ * The view model for the audio player.
+ */
+export type AudioPlayerViewModel = ViewModel<AudioPlayerViewSnapshot> & AudioPlayerViewActions;
+
+interface AudioPlayerViewProps {
+    /**
+     * The view model for the audio player.
+     */
+    vm: AudioPlayerViewModel;
+}
+
+/**
+ * AudioPlayer component displays an audio player with play/pause controls, seek bar, and media information.
+ * The component expects a view model that provides the current state of the audio playback,
+ *
+ * @example
+ * ```tsx
+ * <AudioPlayerView vm={audioPlayerViewModel} />
+ * ```
+ */
+export function AudioPlayerView({ vm }: Readonly<AudioPlayerViewProps>): JSX.Element {
+    const { translate: _t } = useI18n();
+
+    const {
+        playbackState,
+        mediaName = _t("timeline|m.audio|unnamed_audio"),
+        sizeBytes,
+        durationSeconds,
+        playedSeconds,
+        percentComplete,
+        error,
+    } = useViewModel(vm);
+    const fileSize = sizeBytes ? `(${formatBytes(sizeBytes)})` : null;
+    const disabled = playbackState === "decoding";
+
+    // tabIndex=0 to ensure that the whole component becomes a tab stop, where we handle keyboard
+    // events for accessibility
+    return (
+        <>
+            <MediaBody
+                className={styles.audioPlayer}
+                tabIndex={0}
+                onKeyDown={vm.onKeyDown}
+                aria-label={_t("timeline|m.audio|audio_player")}
+                role="region"
+            >
+                <Flex gap="var(--cpd-space-2x)" align="center">
+                    <PlayPauseButton
+                        // Prevent tabbing into the button
+                        // Keyboard navigation is handled at the MediaBody level
+                        tabIndex={-1}
+                        disabled={disabled}
+                        playing={playbackState === "playing"}
+                        togglePlay={vm.togglePlay}
+                    />
+                    <Flex direction="column" className={styles.mediaInfo}>
+                        <span className={styles.mediaName} data-testid="audio-player-name">
+                            {mediaName}
+                        </span>
+                        <Flex className={styles.byline} gap="var(--cpd-space-1-5x)">
+                            <Clock seconds={durationSeconds} />
+                            {fileSize}
+                        </Flex>
+                    </Flex>
+                </Flex>
+                <Flex align="center" gap="var(--cpd-space-1x)" data-testid="audio-player-seek">
+                    <SeekBar tabIndex={-1} disabled={disabled} value={percentComplete} onChange={vm.onSeekbarChange} />
+                    <Clock className={styles.clock} seconds={playedSeconds} role="timer" />
+                </Flex>
+            </MediaBody>
+            {error && <span className={styles.error}>{_t("timeline|m.audio|error_downloading_audio")}</span>}
+        </>
+    );
+}
diff --git a/packages/shared-components/src/audio/AudioPlayerView/__snapshots__/AudioPlayerView.test.tsx.snap b/packages/shared-components/src/audio/AudioPlayerView/__snapshots__/AudioPlayerView.test.tsx.snap
new file mode 100644
index 0000000000..85004e4ba5
--- /dev/null
+++ b/packages/shared-components/src/audio/AudioPlayerView/__snapshots__/AudioPlayerView.test.tsx.snap
@@ -0,0 +1,369 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`AudioPlayerView renders the audio player in default state 1`] = `
+<div>
+  <div
+    aria-label="Audio player"
+    class="mx_MediaBody mediaBody audioPlayer"
+    role="region"
+    tabindex="0"
+  >
+    <div
+      class="flex"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+    >
+      <button
+        aria-disabled="false"
+        aria-label="Play"
+        aria-labelledby="_r_0_"
+        class="_icon-button_1pz9o_8 button"
+        data-kind="primary"
+        role="button"
+        style="--cpd-icon-button-size: 32px;"
+        tabindex="-1"
+      >
+        <div
+          class="_indicator-icon_147l5_17"
+          style="--cpd-icon-button-size: 100%;"
+        >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="m8.98 4.677 9.921 5.58c1.36.764 1.36 2.722 0 3.486l-9.92 5.58C7.647 20.073 6 19.11 6 17.58V6.42c0-1.53 1.647-2.493 2.98-1.743"
+            />
+          </svg>
+        </div>
+      </button>
+      <div
+        class="flex mediaInfo"
+        style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+      >
+        <span
+          class="mediaName"
+          data-testid="audio-player-name"
+        >
+          Sample Audio
+        </span>
+        <div
+          class="flex byline"
+          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1-5x); --mx-flex-wrap: nowrap;"
+        >
+          <time
+            class="mx_Clock"
+            datetime="PT5M"
+          >
+            05:00
+          </time>
+          (3.42 KB)
+        </div>
+      </div>
+    </div>
+    <div
+      class="flex"
+      data-testid="audio-player-seek"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+    >
+      <input
+        aria-label="Audio seek bar"
+        class="seekBar"
+        max="100"
+        min="0"
+        step="1"
+        style="--fillTo: 0.3;"
+        tabindex="-1"
+        type="range"
+        value="30"
+      />
+      <time
+        class="mx_Clock clock"
+        datetime="PT2M"
+        role="timer"
+      >
+        02:00
+      </time>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`AudioPlayerView renders the audio player in error state 1`] = `
+<div>
+  <div
+    aria-label="Audio player"
+    class="mx_MediaBody mediaBody audioPlayer"
+    role="region"
+    tabindex="0"
+  >
+    <div
+      class="flex"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+    >
+      <button
+        aria-disabled="false"
+        aria-label="Play"
+        aria-labelledby="_r_i_"
+        class="_icon-button_1pz9o_8 button"
+        data-kind="primary"
+        role="button"
+        style="--cpd-icon-button-size: 32px;"
+        tabindex="-1"
+      >
+        <div
+          class="_indicator-icon_147l5_17"
+          style="--cpd-icon-button-size: 100%;"
+        >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="m8.98 4.677 9.921 5.58c1.36.764 1.36 2.722 0 3.486l-9.92 5.58C7.647 20.073 6 19.11 6 17.58V6.42c0-1.53 1.647-2.493 2.98-1.743"
+            />
+          </svg>
+        </div>
+      </button>
+      <div
+        class="flex mediaInfo"
+        style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+      >
+        <span
+          class="mediaName"
+          data-testid="audio-player-name"
+        >
+          Sample Audio
+        </span>
+        <div
+          class="flex byline"
+          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1-5x); --mx-flex-wrap: nowrap;"
+        >
+          <time
+            class="mx_Clock"
+            datetime="PT5M"
+          >
+            05:00
+          </time>
+          (3.42 KB)
+        </div>
+      </div>
+    </div>
+    <div
+      class="flex"
+      data-testid="audio-player-seek"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+    >
+      <input
+        aria-label="Audio seek bar"
+        class="seekBar"
+        max="100"
+        min="0"
+        step="1"
+        style="--fillTo: 0.3;"
+        tabindex="-1"
+        type="range"
+        value="30"
+      />
+      <time
+        class="mx_Clock clock"
+        datetime="PT2M"
+        role="timer"
+      >
+        02:00
+      </time>
+    </div>
+  </div>
+  <span
+    class="error"
+  >
+    Error downloading audio
+  </span>
+</div>
+`;
+
+exports[`AudioPlayerView renders the audio player without media name 1`] = `
+<div>
+  <div
+    aria-label="Audio player"
+    class="mx_MediaBody mediaBody audioPlayer"
+    role="region"
+    tabindex="0"
+  >
+    <div
+      class="flex"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+    >
+      <button
+        aria-disabled="false"
+        aria-label="Play"
+        aria-labelledby="_r_6_"
+        class="_icon-button_1pz9o_8 button"
+        data-kind="primary"
+        role="button"
+        style="--cpd-icon-button-size: 32px;"
+        tabindex="-1"
+      >
+        <div
+          class="_indicator-icon_147l5_17"
+          style="--cpd-icon-button-size: 100%;"
+        >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="m8.98 4.677 9.921 5.58c1.36.764 1.36 2.722 0 3.486l-9.92 5.58C7.647 20.073 6 19.11 6 17.58V6.42c0-1.53 1.647-2.493 2.98-1.743"
+            />
+          </svg>
+        </div>
+      </button>
+      <div
+        class="flex mediaInfo"
+        style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+      >
+        <span
+          class="mediaName"
+          data-testid="audio-player-name"
+        >
+          Unnamed audio
+        </span>
+        <div
+          class="flex byline"
+          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1-5x); --mx-flex-wrap: nowrap;"
+        >
+          <time
+            class="mx_Clock"
+            datetime="PT5M"
+          >
+            05:00
+          </time>
+          (3.42 KB)
+        </div>
+      </div>
+    </div>
+    <div
+      class="flex"
+      data-testid="audio-player-seek"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+    >
+      <input
+        aria-label="Audio seek bar"
+        class="seekBar"
+        max="100"
+        min="0"
+        step="1"
+        style="--fillTo: 0.3;"
+        tabindex="-1"
+        type="range"
+        value="30"
+      />
+      <time
+        class="mx_Clock clock"
+        datetime="PT2M"
+        role="timer"
+      >
+        02:00
+      </time>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`AudioPlayerView renders the audio player without size 1`] = `
+<div>
+  <div
+    aria-label="Audio player"
+    class="mx_MediaBody mediaBody audioPlayer"
+    role="region"
+    tabindex="0"
+  >
+    <div
+      class="flex"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+    >
+      <button
+        aria-disabled="false"
+        aria-label="Play"
+        aria-labelledby="_r_c_"
+        class="_icon-button_1pz9o_8 button"
+        data-kind="primary"
+        role="button"
+        style="--cpd-icon-button-size: 32px;"
+        tabindex="-1"
+      >
+        <div
+          class="_indicator-icon_147l5_17"
+          style="--cpd-icon-button-size: 100%;"
+        >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="m8.98 4.677 9.921 5.58c1.36.764 1.36 2.722 0 3.486l-9.92 5.58C7.647 20.073 6 19.11 6 17.58V6.42c0-1.53 1.647-2.493 2.98-1.743"
+            />
+          </svg>
+        </div>
+      </button>
+      <div
+        class="flex mediaInfo"
+        style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+      >
+        <span
+          class="mediaName"
+          data-testid="audio-player-name"
+        >
+          Sample Audio
+        </span>
+        <div
+          class="flex byline"
+          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1-5x); --mx-flex-wrap: nowrap;"
+        >
+          <time
+            class="mx_Clock"
+            datetime="PT5M"
+          >
+            05:00
+          </time>
+        </div>
+      </div>
+    </div>
+    <div
+      class="flex"
+      data-testid="audio-player-seek"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+    >
+      <input
+        aria-label="Audio seek bar"
+        class="seekBar"
+        max="100"
+        min="0"
+        step="1"
+        style="--fillTo: 0.3;"
+        tabindex="-1"
+        type="range"
+        value="30"
+      />
+      <time
+        class="mx_Clock clock"
+        datetime="PT2M"
+        role="timer"
+      >
+        02:00
+      </time>
+    </div>
+  </div>
+</div>
+`;
diff --git a/packages/shared-components/src/audio/AudioPlayerView/index.ts b/packages/shared-components/src/audio/AudioPlayerView/index.ts
new file mode 100644
index 0000000000..4075f81dde
--- /dev/null
+++ b/packages/shared-components/src/audio/AudioPlayerView/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+export type { AudioPlayerViewModel, AudioPlayerViewSnapshot } from "./AudioPlayerView";
+export { AudioPlayerView } from "./AudioPlayerView";
diff --git a/packages/shared-components/src/audio/Clock/Clock.stories.tsx b/packages/shared-components/src/audio/Clock/Clock.stories.tsx
new file mode 100644
index 0000000000..e05ee086d9
--- /dev/null
+++ b/packages/shared-components/src/audio/Clock/Clock.stories.tsx
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React from "react";
+
+import type { Meta, StoryFn } from "@storybook/react-vite";
+import { Clock } from "./Clock";
+
+export default {
+    title: "Audio/Clock",
+    component: Clock,
+    tags: ["autodocs"],
+    args: {
+        seconds: 20,
+    },
+} as Meta<typeof Clock>;
+
+const Template: StoryFn<typeof Clock> = (args) => <Clock {...args} />;
+
+export const Default = Template.bind({});
+
+export const LotOfSeconds = Template.bind({});
+LotOfSeconds.args = {
+    seconds: 99999999999999,
+};
diff --git a/packages/shared-components/src/audio/Clock/Clock.test.tsx b/packages/shared-components/src/audio/Clock/Clock.test.tsx
new file mode 100644
index 0000000000..fdbbf49518
--- /dev/null
+++ b/packages/shared-components/src/audio/Clock/Clock.test.tsx
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { composeStories } from "@storybook/react-vite";
+import { render } from "jest-matrix-react";
+import React from "react";
+
+import * as stories from "./Clock.stories.tsx";
+
+const { Default, LotOfSeconds } = composeStories(stories);
+
+describe("Clock", () => {
+    it("renders the clock", () => {
+        const { container } = render(<Default />);
+        expect(container).toMatchSnapshot();
+    });
+
+    it("renders the clock with a lot of seconds", () => {
+        const { container } = render(<LotOfSeconds />);
+        expect(container).toMatchSnapshot();
+    });
+});
diff --git a/src/components/views/audio_messages/Clock.tsx b/packages/shared-components/src/audio/Clock/Clock.tsx
similarity index 73%
rename from src/components/views/audio_messages/Clock.tsx
rename to packages/shared-components/src/audio/Clock/Clock.tsx
index d9f1a3d6c5..176044269d 100644
--- a/src/components/views/audio_messages/Clock.tsx
+++ b/packages/shared-components/src/audio/Clock/Clock.tsx
@@ -1,32 +1,26 @@
 /*
 Copyright 2024 New Vector Ltd.
 Copyright 2021-2023 The Matrix.org Foundation C.I.C.
-
 SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type HTMLProps } from "react";
 import { Temporal } from "temporal-polyfill";
+import classNames from "classnames";
 
-import { formatSeconds } from "../../../DateUtils";
+import { formatSeconds } from "../../utils/DateUtils";
 
-interface Props extends Pick<HTMLProps<HTMLSpanElement>, "aria-live" | "role"> {
+export interface Props extends Pick<HTMLProps<HTMLSpanElement>, "aria-live" | "role" | "className"> {
     seconds: number;
-    formatFn: (seconds: number) => string;
 }
 
 /**
  * Clock which represents time periods rather than absolute time.
- * Simply converts seconds using formatFn.
- * Defaulting to formatSeconds().
+ * Simply converts seconds using formatSeconds().
  * Note that in this case hours will not be displayed, making it possible to see "82:29".
  */
-export default class Clock extends React.Component<Props> {
-    public static defaultProps = {
-        formatFn: formatSeconds,
-    };
-
+export class Clock extends React.Component<Props> {
     public shouldComponentUpdate(nextProps: Readonly<Props>): boolean {
         const currentFloor = Math.floor(this.props.seconds);
         const nextFloor = Math.floor(nextProps.seconds);
@@ -47,9 +41,10 @@ export default class Clock extends React.Component<Props> {
                 dateTime={this.calculateDuration(seconds)}
                 aria-live={this.props["aria-live"]}
                 role={role}
-                className="mx_Clock"
+                /* Keep class for backward compatibility with parent component */
+                className={classNames("mx_Clock", this.props.className)}
             >
-                {this.props.formatFn(seconds)}
+                {formatSeconds(seconds)}
             </time>
         );
     }
diff --git a/packages/shared-components/src/audio/Clock/__snapshots__/Clock.test.tsx.snap b/packages/shared-components/src/audio/Clock/__snapshots__/Clock.test.tsx.snap
new file mode 100644
index 0000000000..5ab0799d28
--- /dev/null
+++ b/packages/shared-components/src/audio/Clock/__snapshots__/Clock.test.tsx.snap
@@ -0,0 +1,23 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`Clock renders the clock 1`] = `
+<div>
+  <time
+    class="mx_Clock"
+    datetime="PT20S"
+  >
+    00:20
+  </time>
+</div>
+`;
+
+exports[`Clock renders the clock with a lot of seconds 1`] = `
+<div>
+  <time
+    class="mx_Clock"
+    datetime="PT27777777777H46M39S"
+  >
+    27777777777:46:39
+  </time>
+</div>
+`;
diff --git a/packages/shared-components/src/audio/Clock/index.tsx b/packages/shared-components/src/audio/Clock/index.tsx
new file mode 100644
index 0000000000..bc261bb283
--- /dev/null
+++ b/packages/shared-components/src/audio/Clock/index.tsx
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+export { Clock } from "./Clock";
diff --git a/packages/shared-components/src/audio/PlayPauseButton/PlayPauseButton.module.css b/packages/shared-components/src/audio/PlayPauseButton/PlayPauseButton.module.css
new file mode 100644
index 0000000000..859f84bba9
--- /dev/null
+++ b/packages/shared-components/src/audio/PlayPauseButton/PlayPauseButton.module.css
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+.button {
+    border-radius: 32px !important;
+    background-color: var(--cpd-color-bg-subtle-primary) !important;
+}
diff --git a/packages/shared-components/src/audio/PlayPauseButton/PlayPauseButton.stories.tsx b/packages/shared-components/src/audio/PlayPauseButton/PlayPauseButton.stories.tsx
new file mode 100644
index 0000000000..5bbcfbbf39
--- /dev/null
+++ b/packages/shared-components/src/audio/PlayPauseButton/PlayPauseButton.stories.tsx
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { fn } from "storybook/test";
+
+import { PlayPauseButton } from "./PlayPauseButton";
+import type { Meta, StoryObj } from "@storybook/react-vite";
+
+const meta = {
+    title: "Audio/PlayPauseButton",
+    component: PlayPauseButton,
+    tags: ["autodocs"],
+    args: {
+        togglePlay: fn(),
+    },
+} satisfies Meta<typeof PlayPauseButton>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};
+export const Playing: Story = { args: { playing: true } };
diff --git a/packages/shared-components/src/audio/PlayPauseButton/PlayPauseButton.test.tsx b/packages/shared-components/src/audio/PlayPauseButton/PlayPauseButton.test.tsx
new file mode 100644
index 0000000000..3a032f5e02
--- /dev/null
+++ b/packages/shared-components/src/audio/PlayPauseButton/PlayPauseButton.test.tsx
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { composeStories } from "@storybook/react-vite";
+import { render } from "jest-matrix-react";
+import React from "react";
+import userEvent from "@testing-library/user-event";
+import { fn } from "storybook/test";
+
+import * as stories from "./PlayPauseButton.stories.tsx";
+
+const { Default, Playing } = composeStories(stories);
+
+describe("PlayPauseButton", () => {
+    it("renders the button in default state", () => {
+        const { container } = render(<Default />);
+        expect(container).toMatchSnapshot();
+    });
+
+    it("renders the button in playing state", () => {
+        const { container } = render(<Playing />);
+        expect(container).toMatchSnapshot();
+    });
+
+    it("calls togglePlay when clicked", async () => {
+        const user = userEvent.setup();
+        const togglePlay = fn();
+
+        const { getByRole } = render(<Default togglePlay={togglePlay} />);
+        await user.click(getByRole("button"));
+        expect(togglePlay).toHaveBeenCalled();
+    });
+});
diff --git a/packages/shared-components/src/audio/PlayPauseButton/PlayPauseButton.tsx b/packages/shared-components/src/audio/PlayPauseButton/PlayPauseButton.tsx
new file mode 100644
index 0000000000..cc2ab5bb65
--- /dev/null
+++ b/packages/shared-components/src/audio/PlayPauseButton/PlayPauseButton.tsx
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React, { type HTMLAttributes, type JSX, type MouseEventHandler } from "react";
+import { IconButton } from "@vector-im/compound-web";
+import Play from "@vector-im/compound-design-tokens/assets/web/icons/play-solid";
+import Pause from "@vector-im/compound-design-tokens/assets/web/icons/pause-solid";
+
+import styles from "./PlayPauseButton.module.css";
+import { useI18n } from "../../utils/i18nContext";
+
+export interface PlayPauseButtonProps extends HTMLAttributes<HTMLButtonElement> {
+    /**
+     * Whether the button is disabled.
+     * @default false
+     */
+    disabled?: boolean;
+
+    /**
+     * Whether the audio is currently playing.
+     * @default false
+     */
+    playing?: boolean;
+
+    /**
+     * Function to toggle play/pause state.
+     */
+    togglePlay: MouseEventHandler<HTMLButtonElement>;
+}
+
+/**
+ * A button component that toggles between play and pause states for audio playback.
+ *
+ * @example
+ * ```tsx
+ * <PlayPauseButton playing={true} togglePlay={() => {}} />
+ * ```
+ */
+export function PlayPauseButton({
+    disabled = false,
+    playing = false,
+    togglePlay,
+    ...rest
+}: Readonly<PlayPauseButtonProps>): JSX.Element {
+    const { translate: _t } = useI18n();
+
+    const label = playing ? _t("action|pause") : _t("action|play");
+
+    return (
+        <IconButton
+            size="32px"
+            aria-label={label}
+            tooltip={label}
+            onClick={togglePlay}
+            className={styles.button}
+            disabled={disabled}
+            {...rest}
+        >
+            {playing ? <Pause /> : <Play />}
+        </IconButton>
+    );
+}
diff --git a/packages/shared-components/src/audio/PlayPauseButton/__snapshots__/PlayPauseButton.test.tsx.snap b/packages/shared-components/src/audio/PlayPauseButton/__snapshots__/PlayPauseButton.test.tsx.snap
new file mode 100644
index 0000000000..3b98652cd1
--- /dev/null
+++ b/packages/shared-components/src/audio/PlayPauseButton/__snapshots__/PlayPauseButton.test.tsx.snap
@@ -0,0 +1,65 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`PlayPauseButton renders the button in default state 1`] = `
+<div>
+  <button
+    aria-disabled="false"
+    aria-label="Play"
+    aria-labelledby="_r_0_"
+    class="_icon-button_1pz9o_8 button"
+    data-kind="primary"
+    role="button"
+    style="--cpd-icon-button-size: 32px;"
+    tabindex="0"
+  >
+    <div
+      class="_indicator-icon_147l5_17"
+      style="--cpd-icon-button-size: 100%;"
+    >
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="m8.98 4.677 9.921 5.58c1.36.764 1.36 2.722 0 3.486l-9.92 5.58C7.647 20.073 6 19.11 6 17.58V6.42c0-1.53 1.647-2.493 2.98-1.743"
+        />
+      </svg>
+    </div>
+  </button>
+</div>
+`;
+
+exports[`PlayPauseButton renders the button in playing state 1`] = `
+<div>
+  <button
+    aria-disabled="false"
+    aria-label="Pause"
+    aria-labelledby="_r_6_"
+    class="_icon-button_1pz9o_8 button"
+    data-kind="primary"
+    role="button"
+    style="--cpd-icon-button-size: 32px;"
+    tabindex="0"
+  >
+    <div
+      class="_indicator-icon_147l5_17"
+      style="--cpd-icon-button-size: 100%;"
+    >
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M8 4a2 2 0 0 0-2 2v12a2 2 0 1 0 4 0V6a2 2 0 0 0-2-2m8 0a2 2 0 0 0-2 2v12a2 2 0 1 0 4 0V6a2 2 0 0 0-2-2"
+        />
+      </svg>
+    </div>
+  </button>
+</div>
+`;
diff --git a/packages/shared-components/src/audio/PlayPauseButton/index.ts b/packages/shared-components/src/audio/PlayPauseButton/index.ts
new file mode 100644
index 0000000000..93a71cd739
--- /dev/null
+++ b/packages/shared-components/src/audio/PlayPauseButton/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+export { PlayPauseButton } from "./PlayPauseButton";
diff --git a/packages/shared-components/src/audio/SeekBar/SeekBar.module.css b/packages/shared-components/src/audio/SeekBar/SeekBar.module.css
new file mode 100644
index 0000000000..54e3b7479f
--- /dev/null
+++ b/packages/shared-components/src/audio/SeekBar/SeekBar.module.css
@@ -0,0 +1,99 @@
+/*
+Copyright 2024 New Vector Ltd.
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+/* CSS inspiration from: */
+/* * https://www.w3schools.com/howto/howto_js_rangeslider.asp */
+/* * https://stackoverflow.com/a/28283806 */
+/* * https://css-tricks.com/styling-cross-browser-compatible-range-inputs-css/ */
+
+.seekBar {
+    /* default, overridden in JS */
+    --fillTo: 1;
+
+    /* Dev note: we deliberately do not have the -ms-track (and friends) selectors because we don't */
+    /* need to support IE. */
+
+    appearance: none; /* default style override */
+
+    width: 100%;
+    height: 1px;
+    background: var(--cpd-color-gray-600);
+    outline: none; /* remove blue selection border */
+    position: relative; /* for before+after pseudo elements later on */
+
+    cursor: pointer;
+
+    &::-webkit-slider-thumb {
+        appearance: none; /* default style override */
+
+        /* Dev note: This needs to be duplicated with the -moz-range-thumb selector */
+        /* because otherwise Edge (webkit) will fail to see the styles and just refuse */
+        /* to apply them. */
+        width: 8px;
+        height: 8px;
+        border-radius: 8px;
+        background-color: var(--cpd-color-gray-800);
+        cursor: pointer;
+    }
+
+    &::-moz-range-thumb {
+        width: 8px;
+        height: 8px;
+        border-radius: 8px;
+        background-color: var(--cpd-color-gray-800);
+        cursor: pointer;
+
+        /* Firefox adds a border on the thumb */
+        border: none;
+    }
+
+    /* This is for webkit support, but we can't limit the functionality of it to just webkit */
+    /* browsers. Firefox responds to webkit-prefixed values now, which means we can't use media */
+    /* or support queries to selectively apply the rule. An upside is that this CSS doesn't work */
+    /* in firefox, so it's just wasted CPU/GPU time. */
+    &::before {
+        /* ::before to ensure it ends up under the thumb */
+        content: "";
+        background-color: var(--cpd-color-gray-800);
+
+        /* Absolute positioning to ensure it overlaps with the existing bar */
+        position: absolute;
+        top: 0;
+        left: 0;
+
+        /* Sizing to match the bar */
+        width: 100%;
+        height: 1px;
+
+        /* And finally dynamic width without overly hurting the rendering engine. */
+        transform-origin: 0 100%;
+        transform: scaleX(var(--fillTo));
+    }
+
+    /* This is firefox's built-in support for the above, with 100% less hacks. */
+    &::-moz-range-progress {
+        background-color: var(--cpd-color-gray-800);
+        height: 1px;
+    }
+
+    &:disabled {
+        opacity: 0.5;
+    }
+
+    /* Increase clickable area for the slider (approximately same size as browser default) */
+    /* We do it this way to keep the same padding and margins of the element, avoiding margin math. */
+    /* Source: https://front-back.com/expand-clickable-areas-for-a-better-touch-experience/ */
+    &::after {
+        content: "";
+        position: absolute;
+        top: -6px;
+        bottom: -6px;
+        left: 0;
+        right: 0;
+    }
+}
diff --git a/packages/shared-components/src/audio/SeekBar/SeekBar.stories.tsx b/packages/shared-components/src/audio/SeekBar/SeekBar.stories.tsx
new file mode 100644
index 0000000000..6a3ec48666
--- /dev/null
+++ b/packages/shared-components/src/audio/SeekBar/SeekBar.stories.tsx
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React from "react";
+import { useArgs } from "storybook/preview-api";
+
+import { SeekBar } from "./SeekBar";
+import type { Meta, StoryFn } from "@storybook/react-vite";
+
+export default {
+    title: "Audio/SeekBar",
+    component: SeekBar,
+    tags: ["autodocs"],
+    argTypes: {
+        value: {
+            control: { type: "range", min: 0, max: 100, step: 1 },
+        },
+    },
+    args: {
+        value: 50,
+    },
+} as Meta<typeof SeekBar>;
+
+const Template: StoryFn<typeof SeekBar> = (args) => {
+    const [, updateArgs] = useArgs();
+    return <SeekBar onChange={(evt) => updateArgs({ value: parseInt(evt.target.value, 10) })} {...args} />;
+};
+
+export const Default = Template.bind({});
+
+export const Disabled = Template.bind({});
+Disabled.args = {
+    disabled: true,
+};
diff --git a/packages/shared-components/src/audio/SeekBar/SeekBar.test.tsx b/packages/shared-components/src/audio/SeekBar/SeekBar.test.tsx
new file mode 100644
index 0000000000..0d52ab3993
--- /dev/null
+++ b/packages/shared-components/src/audio/SeekBar/SeekBar.test.tsx
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { render } from "jest-matrix-react";
+import React from "react";
+import { composeStories } from "@storybook/react-vite";
+
+import * as stories from "./SeekBar.stories.tsx";
+const { Default } = composeStories(stories);
+
+describe("Seekbar", () => {
+    it("renders the clock", () => {
+        const { container } = render(<Default />);
+        expect(container).toMatchSnapshot();
+    });
+});
diff --git a/packages/shared-components/src/audio/SeekBar/SeekBar.tsx b/packages/shared-components/src/audio/SeekBar/SeekBar.tsx
new file mode 100644
index 0000000000..a30e527eee
--- /dev/null
+++ b/packages/shared-components/src/audio/SeekBar/SeekBar.tsx
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React, { type CSSProperties, type JSX, useEffect, useMemo, useState } from "react";
+import { throttle } from "lodash";
+import classNames from "classnames";
+
+import style from "./SeekBar.module.css";
+import { useI18n } from "../../utils/i18nContext";
+
+export interface SeekBarProps extends React.InputHTMLAttributes<HTMLInputElement> {
+    /**
+     * The current value of the seek bar, between 0 and 100.
+     * @default 0
+     */
+    value?: number;
+}
+
+interface ISeekCSS extends CSSProperties {
+    "--fillTo": number;
+}
+
+/**
+ * A seek bar component for audio playback.
+ *
+ * @example
+ * ```tsx
+ * <SeekBar value={50} onChange={(e) => console.log("New value", e.target.value)} />
+ * ```
+ */
+export function SeekBar({ value = 0, className, ...rest }: Readonly<SeekBarProps>): JSX.Element {
+    const { translate: _t } = useI18n();
+
+    const [newValue, setNewValue] = useState(value);
+    // Throttle the value setting to avoid excessive re-renders
+    const setThrottledValue = useMemo(() => throttle(setNewValue, 10), []);
+
+    useEffect(() => {
+        setThrottledValue(value);
+    }, [value, setThrottledValue]);
+
+    return (
+        <input
+            type="range"
+            className={classNames(style.seekBar, className)}
+            onMouseDown={(e) => e.stopPropagation()}
+            min={0}
+            max={100}
+            value={newValue}
+            step={1}
+            style={{ "--fillTo": newValue / 100 } as ISeekCSS}
+            aria-label={_t("a11y|seek_bar_label")}
+            {...rest}
+        />
+    );
+}
diff --git a/packages/shared-components/src/audio/SeekBar/__snapshots__/SeekBar.test.tsx.snap b/packages/shared-components/src/audio/SeekBar/__snapshots__/SeekBar.test.tsx.snap
new file mode 100644
index 0000000000..e3cc92279e
--- /dev/null
+++ b/packages/shared-components/src/audio/SeekBar/__snapshots__/SeekBar.test.tsx.snap
@@ -0,0 +1,16 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`Seekbar renders the clock 1`] = `
+<div>
+  <input
+    aria-label="Audio seek bar"
+    class="seekBar"
+    max="100"
+    min="0"
+    step="1"
+    style="--fillTo: 0.5;"
+    type="range"
+    value="50"
+  />
+</div>
+`;
diff --git a/packages/shared-components/src/audio/SeekBar/index.ts b/packages/shared-components/src/audio/SeekBar/index.ts
new file mode 100644
index 0000000000..710310198e
--- /dev/null
+++ b/packages/shared-components/src/audio/SeekBar/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+export { SeekBar } from "./SeekBar";
diff --git a/packages/shared-components/src/audio/playback.ts b/packages/shared-components/src/audio/playback.ts
new file mode 100644
index 0000000000..d7b0fa7634
--- /dev/null
+++ b/packages/shared-components/src/audio/playback.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+/**
+ * Represents the possible states of playback.
+ * - "preparing": The audio is being prepared for playback (e.g., loading or buffering).
+ * - "decoding": The audio is being decoded and is not ready for playback.
+ * - "stopped": The playback has been stopped, with no progress on the timeline.
+ * - "paused": The playback is paused, with some progress on the timeline.
+ * - "playing": The playback is actively progressing through the timeline.
+ */
+export type PlaybackState = "decoding" | "stopped" | "paused" | "playing" | "preparing";
diff --git a/packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.module.css b/packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.module.css
new file mode 100644
index 0000000000..62e7a569bf
--- /dev/null
+++ b/packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.module.css
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+.avatarWithDetails {
+    display: flex;
+    align-items: center;
+
+    border-radius: 12px;
+    background-color: var(--cpd-color-gray-200);
+    padding: var(--cpd-space-2x);
+    gap: var(--cpd-space-2x);
+
+    .title {
+        display: inline-block;
+
+        font-weight: var(--cpd-font-weight-semibold);
+        font-size: var(--cpd-font-size-body-md);
+
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    .details {
+        font-size: var(--cpd-font-size-body-sm);
+    }
+}
diff --git a/packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.stories.tsx b/packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.stories.tsx
new file mode 100644
index 0000000000..9d8a7f5c30
--- /dev/null
+++ b/packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.stories.tsx
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React from "react";
+import { type Meta, type StoryObj } from "@storybook/react-vite";
+
+import { AvatarWithDetails } from "./AvatarWithDetails";
+
+const meta = {
+    title: "Avatar/AvatarWithDetails",
+    component: AvatarWithDetails,
+    tags: ["autodocs"],
+    args: {
+        avatar: <div style={{ width: 40, height: 40, backgroundColor: "#888", borderRadius: "50%" }} />,
+        details: "Details about the avatar go here",
+        title: "Room Name",
+    },
+} satisfies Meta<typeof AvatarWithDetails>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+export const Default: Story = {};
diff --git a/packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.test.tsx b/packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.test.tsx
new file mode 100644
index 0000000000..f5d482613f
--- /dev/null
+++ b/packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.test.tsx
@@ -0,0 +1,21 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { composeStories } from "@storybook/react-vite";
+import { render } from "jest-matrix-react";
+import React from "react";
+
+import * as stories from "./AvatarWithDetails.stories.tsx";
+
+const { Default } = composeStories(stories);
+
+describe("AvatarWithDetails", () => {
+    it("renders a textual event", () => {
+        const { container } = render(<Default />);
+        expect(container).toMatchSnapshot();
+    });
+});
diff --git a/packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.tsx b/packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.tsx
new file mode 100644
index 0000000000..aab5729d5f
--- /dev/null
+++ b/packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.tsx
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { type ComponentProps, type ElementType, type JSX, type PropsWithChildren } from "react";
+import React from "react";
+import classNames from "classnames";
+
+import styles from "./AvatarWithDetails.module.css";
+import { Flex } from "../../utils/Flex";
+
+export type AvatarWithDetailsProps<C extends ElementType> = {
+    /**
+     * The HTML tag.
+     * @default "div"
+     */
+    as?: C;
+    /**
+     * The CSS class name.
+     */
+    className?: string;
+    /**
+     * The title/label next to the avatar. Usually the user or room name.
+     */
+    title: string;
+    /**
+     * A label with details to display under the avatar title.
+     * Commonly used to display the number of participants in a room.
+     */
+    details: React.ReactNode;
+    /** The avatar to display. */
+    avatar: React.ReactNode;
+} & ComponentProps<C>;
+
+/**
+ * A component to display an avatar with a title next to it in a grey box.
+ *
+ * @example
+ * ```tsx
+ * <AvatarWithDetails title="Room Name" details="10 participants" className="custom-class" />
+ * ```
+ */
+export function AvatarWithDetails<C extends React.ElementType = "div">({
+    as,
+    className,
+    details,
+    avatar,
+    title,
+    ...props
+}: PropsWithChildren<AvatarWithDetailsProps<C>>): JSX.Element {
+    const Component = as || "div";
+
+    return (
+        <Component className={classNames(styles.avatarWithDetails, className)} {...props}>
+            {avatar}
+            <Flex direction="column">
+                <span className={styles.title}>{title}</span>
+                <span className={styles.details}>{details}</span>
+            </Flex>
+        </Component>
+    );
+}
diff --git a/packages/shared-components/src/avatar/AvatarWithDetails/__snapshots__/AvatarWithDetails.test.tsx.snap b/packages/shared-components/src/avatar/AvatarWithDetails/__snapshots__/AvatarWithDetails.test.tsx.snap
new file mode 100644
index 0000000000..7b927f2c3b
--- /dev/null
+++ b/packages/shared-components/src/avatar/AvatarWithDetails/__snapshots__/AvatarWithDetails.test.tsx.snap
@@ -0,0 +1,28 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`AvatarWithDetails renders a textual event 1`] = `
+<div>
+  <div
+    class="avatarWithDetails"
+  >
+    <div
+      style="width: 40px; height: 40px; background-color: rgb(136, 136, 136); border-radius: 50%;"
+    />
+    <div
+      class="flex"
+      style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+    >
+      <span
+        class="title"
+      >
+        Room Name
+      </span>
+      <span
+        class="details"
+      >
+        Details about the avatar go here
+      </span>
+    </div>
+  </div>
+</div>
+`;
diff --git a/packages/shared-components/src/avatar/AvatarWithDetails/index.tsx b/packages/shared-components/src/avatar/AvatarWithDetails/index.tsx
new file mode 100644
index 0000000000..a54f416d82
--- /dev/null
+++ b/packages/shared-components/src/avatar/AvatarWithDetails/index.tsx
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+export { AvatarWithDetails } from "./AvatarWithDetails";
diff --git a/packages/shared-components/src/composer/Banner/Banner.module.css b/packages/shared-components/src/composer/Banner/Banner.module.css
new file mode 100644
index 0000000000..7bb48a9cc2
--- /dev/null
+++ b/packages/shared-components/src/composer/Banner/Banner.module.css
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+:root {
+    --cpd-color-gradient-critical-linear: linear-gradient(
+        180deg,
+        var(--cpd-color-alpha-red-500) 0%,
+        var(--cpd-color-alpha-red-400) 20%,
+        var(--cpd-color-alpha-red-300) 40%,
+        var(--cpd-color-alpha-red-200) 60%,
+        var(--cpd-color-alpha-red-100) 80%,
+        var(--cpd-color-transparent) 100%
+    );
+}
+
+.banner {
+    container-type: inline-size;
+    container-name: banner;
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    gap: var(--cpd-space-3x);
+    padding: var(--cpd-space-4x);
+
+    border-top: 1px solid var(--cpd-color-gray-400);
+}
+
+.banner[data-type="success"] {
+    background: var(--cpd-color-gradient-subtle-linear);
+    border-color: var(--cpd-color-green-900);
+}
+
+.banner[data-type="critical"] {
+    background: var(--cpd-color-gradient-critical-linear);
+    border-color: var(--cpd-color-border-critical-primary);
+}
+
+.banner[data-type="info"] {
+    background: var(--cpd-color-gradient-info-linear);
+    border-color: var(--cpd-color-blue-900);
+}
+
+.banner[data-type="info"] :is(svg) {
+    color: var(--cpd-color-blue-900);
+}
+
+.banner[data-type="success"] :is(.content, svg) {
+    color: var(--cpd-color-green-900);
+}
+
+.banner[data-type="critical"] :is(.content, svg) {
+    color: var(--cpd-color-red-900);
+}
+
+.banner p {
+    margin: 0;
+}
+
+.icon {
+    /* lock icon dimensions */
+    min-width: 32px;
+    min-height: 32px;
+    max-width: 32px;
+    max-height: 32px;
+
+    margin: 4px;
+
+    /* centre svg icons, as they are not full width */
+    flex: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.icon img {
+    border-radius: 50%;
+}
+
+.actions {
+    margin-left: auto;
+
+    flex: 0;
+    display: flex;
+    flex-direction: row;
+    gap: var(--cpd-space-1x);
+    align-self: center;
+
+    white-space: nowrap;
+}
diff --git a/packages/shared-components/src/composer/Banner/Banner.stories.tsx b/packages/shared-components/src/composer/Banner/Banner.stories.tsx
new file mode 100644
index 0000000000..e1e3e110fb
--- /dev/null
+++ b/packages/shared-components/src/composer/Banner/Banner.stories.tsx
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React from "react";
+import { fn } from "storybook/test";
+import { type Meta, type StoryObj } from "@storybook/react-vite";
+import { Button } from "@vector-im/compound-web";
+
+import { Banner } from "./Banner";
+
+const meta = {
+    title: "room/Banner",
+    component: Banner,
+    tags: ["autodocs"],
+    args: {
+        children: <p>Hello! This is a status banner.</p>,
+        onClose: fn(),
+    },
+} satisfies Meta<typeof Banner>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};
+export const Info: Story = {
+    args: {
+        type: "info",
+    },
+};
+export const Success: Story = {
+    args: {
+        type: "success",
+    },
+};
+export const Critical: Story = {
+    args: {
+        type: "critical",
+    },
+};
+export const WithAction: Story = {
+    args: {
+        children: (
+            <p>
+                Alice's (<b>@alice:example.com</b>) identity was reset. <a href="https://example.org">Learn more</a>
+            </p>
+        ),
+        actions: (
+            <Button kind="primary" size="sm">
+                Withdraw verification
+            </Button>
+        ),
+    },
+};
+
+export const WithAvatarImage: Story = {
+    args: {
+        avatar: <img alt="Example" src="https://picsum.photos/32/32" />,
+    },
+};
+
+export const WithoutClose: Story = {
+    args: {
+        onClose: undefined,
+    },
+};
+
+export const WithLoadsOfContent: Story = {
+    args: {
+        type: "info",
+        children: (
+            <p>
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed quis massa facilisis, venenatis risus
+                consectetur, sagittis libero. Aenean et scelerisque justo. Nunc luctus, mi sed facilisis suscipit, magna
+                ante pharetra sem, eu rutrum purus quam quis arcu. Sed eleifend arcu vitae magna sodales, sit amet
+                fermentum urna dictum. Mauris vel velit pulvinar enim mollis tincidunt. Vivamus egestas rhoncus
+                sagittis. Curabitur auctor vehicula massa, et cursus lacus laoreet a. Maecenas et sollicitudin lectus,
+                in ligula.
+            </p>
+        ),
+    },
+};
diff --git a/packages/shared-components/src/composer/Banner/Banner.test.tsx b/packages/shared-components/src/composer/Banner/Banner.test.tsx
new file mode 100644
index 0000000000..0f33fb452b
--- /dev/null
+++ b/packages/shared-components/src/composer/Banner/Banner.test.tsx
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React from "react";
+import { render } from "jest-matrix-react";
+import { composeStories } from "@storybook/react-vite";
+
+import * as stories from "./Banner.stories.tsx";
+
+const { Default, Info, Success, WithAction, WithAvatarImage, Critical } = composeStories(stories);
+
+describe("AvatarWithDetails", () => {
+    it("renders a default banner", () => {
+        const { container } = render(<Default />);
+        expect(container).toMatchSnapshot();
+    });
+    it("renders a info banner", () => {
+        const { container } = render(<Info />);
+        expect(container).toMatchSnapshot();
+    });
+    it("renders a success banner", () => {
+        const { container } = render(<Success />);
+        expect(container).toMatchSnapshot();
+    });
+    it("renders a critical banner", () => {
+        const { container } = render(<Critical />);
+        expect(container).toMatchSnapshot();
+    });
+    it("renders a banner with an action", () => {
+        const { container } = render(<WithAction />);
+        expect(container).toMatchSnapshot();
+    });
+    it("renders a banner with an avatar iamge", () => {
+        const { container } = render(<WithAvatarImage />);
+        expect(container).toMatchSnapshot();
+    });
+});
diff --git a/packages/shared-components/src/composer/Banner/Banner.tsx b/packages/shared-components/src/composer/Banner/Banner.tsx
new file mode 100644
index 0000000000..7781442ed9
--- /dev/null
+++ b/packages/shared-components/src/composer/Banner/Banner.tsx
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import classNames from "classnames";
+import React, {
+    type MouseEventHandler,
+    type ReactElement,
+    type ReactNode,
+    type PropsWithChildren,
+    useMemo,
+} from "react";
+import { Button } from "@vector-im/compound-web";
+import CheckCircleIcon from "@vector-im/compound-design-tokens/assets/web/icons/check-circle";
+import ErrorIcon from "@vector-im/compound-design-tokens/assets/web/icons/error-solid";
+import InfoIcon from "@vector-im/compound-design-tokens/assets/web/icons/info";
+
+import styles from "./Banner.module.css";
+import { _t } from "../../utils/i18n";
+
+interface BannerProps {
+    /**
+     * The type of the status banner.
+     */
+    type?: "success" | "info" | "critical";
+
+    /**
+     * The banner avatar.
+     */
+    avatar?: React.ReactNode;
+
+    className?: string;
+
+    /**
+     * Actions presented to the user in the right-hand side of the banner alongside the dismiss button.
+     */
+    actions?: ReactNode;
+    /**
+     * Called when the user presses the "dismiss" button.
+     */
+    onClose?: MouseEventHandler<HTMLButtonElement>;
+}
+
+/**
+ * A banner component used for displaying user-facing information above the message composer.
+ *
+ * @example
+ * ```tsx
+ *   <Banner  onClose={onCloseHandler} />
+ * ```
+ */
+export function Banner({
+    type,
+    children,
+    avatar,
+    className,
+    actions,
+    onClose,
+    ...props
+}: PropsWithChildren<BannerProps>): ReactElement {
+    const classes = classNames(styles.banner, className);
+
+    const icon = useMemo(() => {
+        switch (type) {
+            case "critical":
+                return <ErrorIcon fontSize={24} {...props} />;
+            case "info":
+                return <InfoIcon fontSize={24} {...props} />;
+            case "success":
+                return <CheckCircleIcon fontSize={24} {...props} />;
+            default:
+                return <InfoIcon fontSize={24} {...props} />;
+        }
+    }, [type, props]);
+
+    return (
+        <div {...props} className={classes} data-type={type}>
+            <div className={styles.icon}>{avatar ?? icon}</div>
+            <div className={styles.content}>{children}</div>
+            <div className={styles.actions}>
+                {actions}
+                {onClose && (
+                    <Button kind="secondary" size="sm" onClick={onClose}>
+                        {_t("action|dismiss")}
+                    </Button>
+                )}
+            </div>
+        </div>
+    );
+}
diff --git a/packages/shared-components/src/composer/Banner/__snapshots__/Banner.test.tsx.snap b/packages/shared-components/src/composer/Banner/__snapshots__/Banner.test.tsx.snap
new file mode 100644
index 0000000000..ebb8df0a3d
--- /dev/null
+++ b/packages/shared-components/src/composer/Banner/__snapshots__/Banner.test.tsx.snap
@@ -0,0 +1,299 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`AvatarWithDetails renders a banner with an action 1`] = `
+<div>
+  <div
+    class="banner"
+  >
+    <div
+      class="icon"
+    >
+      <svg
+        fill="currentColor"
+        font-size="24"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M11.288 7.288A.97.97 0 0 1 12 7q.424 0 .713.287Q13 7.576 13 8t-.287.713A.97.97 0 0 1 12 9a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 8q0-.424.287-.713m.001 4.001A.97.97 0 0 1 12 11q.424 0 .713.287.287.288.287.713v4q0 .424-.287.712A.97.97 0 0 1 12 17a.97.97 0 0 1-.713-.288A.97.97 0 0 1 11 16v-4q0-.424.287-.713"
+        />
+        <path
+          clip-rule="evenodd"
+          d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10m-2 0a8 8 0 1 1-16 0 8 8 0 0 1 16 0"
+          fill-rule="evenodd"
+        />
+      </svg>
+    </div>
+    <div
+      class="content"
+    >
+      <p>
+        Alice's (
+        <b>
+          @alice:example.com
+        </b>
+        ) identity was reset. 
+        <a
+          href="https://example.org"
+        >
+          Learn more
+        </a>
+      </p>
+    </div>
+    <div
+      class="actions"
+    >
+      <button
+        class="_button_187yx_8"
+        data-kind="primary"
+        data-size="sm"
+        role="button"
+        tabindex="0"
+      >
+        Withdraw verification
+      </button>
+      <button
+        class="_button_187yx_8"
+        data-kind="secondary"
+        data-size="sm"
+        role="button"
+        tabindex="0"
+      >
+        Dismiss
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`AvatarWithDetails renders a banner with an avatar iamge 1`] = `
+<div>
+  <div
+    class="banner"
+  >
+    <div
+      class="icon"
+    >
+      <img
+        alt="Example"
+        src="https://picsum.photos/32/32"
+      />
+    </div>
+    <div
+      class="content"
+    >
+      <p>
+        Hello! This is a status banner.
+      </p>
+    </div>
+    <div
+      class="actions"
+    >
+      <button
+        class="_button_187yx_8"
+        data-kind="secondary"
+        data-size="sm"
+        role="button"
+        tabindex="0"
+      >
+        Dismiss
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`AvatarWithDetails renders a critical banner 1`] = `
+<div>
+  <div
+    class="banner"
+    data-type="critical"
+  >
+    <div
+      class="icon"
+    >
+      <svg
+        fill="currentColor"
+        font-size="24"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+        />
+      </svg>
+    </div>
+    <div
+      class="content"
+    >
+      <p>
+        Hello! This is a status banner.
+      </p>
+    </div>
+    <div
+      class="actions"
+    >
+      <button
+        class="_button_187yx_8"
+        data-kind="secondary"
+        data-size="sm"
+        role="button"
+        tabindex="0"
+      >
+        Dismiss
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`AvatarWithDetails renders a default banner 1`] = `
+<div>
+  <div
+    class="banner"
+  >
+    <div
+      class="icon"
+    >
+      <svg
+        fill="currentColor"
+        font-size="24"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M11.288 7.288A.97.97 0 0 1 12 7q.424 0 .713.287Q13 7.576 13 8t-.287.713A.97.97 0 0 1 12 9a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 8q0-.424.287-.713m.001 4.001A.97.97 0 0 1 12 11q.424 0 .713.287.287.288.287.713v4q0 .424-.287.712A.97.97 0 0 1 12 17a.97.97 0 0 1-.713-.288A.97.97 0 0 1 11 16v-4q0-.424.287-.713"
+        />
+        <path
+          clip-rule="evenodd"
+          d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10m-2 0a8 8 0 1 1-16 0 8 8 0 0 1 16 0"
+          fill-rule="evenodd"
+        />
+      </svg>
+    </div>
+    <div
+      class="content"
+    >
+      <p>
+        Hello! This is a status banner.
+      </p>
+    </div>
+    <div
+      class="actions"
+    >
+      <button
+        class="_button_187yx_8"
+        data-kind="secondary"
+        data-size="sm"
+        role="button"
+        tabindex="0"
+      >
+        Dismiss
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`AvatarWithDetails renders a info banner 1`] = `
+<div>
+  <div
+    class="banner"
+    data-type="info"
+  >
+    <div
+      class="icon"
+    >
+      <svg
+        fill="currentColor"
+        font-size="24"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M11.288 7.288A.97.97 0 0 1 12 7q.424 0 .713.287Q13 7.576 13 8t-.287.713A.97.97 0 0 1 12 9a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 8q0-.424.287-.713m.001 4.001A.97.97 0 0 1 12 11q.424 0 .713.287.287.288.287.713v4q0 .424-.287.712A.97.97 0 0 1 12 17a.97.97 0 0 1-.713-.288A.97.97 0 0 1 11 16v-4q0-.424.287-.713"
+        />
+        <path
+          clip-rule="evenodd"
+          d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10m-2 0a8 8 0 1 1-16 0 8 8 0 0 1 16 0"
+          fill-rule="evenodd"
+        />
+      </svg>
+    </div>
+    <div
+      class="content"
+    >
+      <p>
+        Hello! This is a status banner.
+      </p>
+    </div>
+    <div
+      class="actions"
+    >
+      <button
+        class="_button_187yx_8"
+        data-kind="secondary"
+        data-size="sm"
+        role="button"
+        tabindex="0"
+      >
+        Dismiss
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`AvatarWithDetails renders a success banner 1`] = `
+<div>
+  <div
+    class="banner"
+    data-type="success"
+  >
+    <div
+      class="icon"
+    >
+      <svg
+        fill="currentColor"
+        font-size="24"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="m10.6 13.8-2.15-2.15a.95.95 0 0 0-.7-.275.95.95 0 0 0-.7.275.95.95 0 0 0-.275.7q0 .425.275.7L9.9 15.9q.3.3.7.3t.7-.3l5.65-5.65a.95.95 0 0 0 .275-.7.95.95 0 0 0-.275-.7.95.95 0 0 0-.7-.275.95.95 0 0 0-.7.275zM12 22a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22m0-2q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4 6.325 6.325 4 12t2.325 5.675T12 20"
+        />
+      </svg>
+    </div>
+    <div
+      class="content"
+    >
+      <p>
+        Hello! This is a status banner.
+      </p>
+    </div>
+    <div
+      class="actions"
+    >
+      <button
+        class="_button_187yx_8"
+        data-kind="secondary"
+        data-size="sm"
+        role="button"
+        tabindex="0"
+      >
+        Dismiss
+      </button>
+    </div>
+  </div>
+</div>
+`;
diff --git a/packages/shared-components/src/composer/Banner/index.ts b/packages/shared-components/src/composer/Banner/index.ts
new file mode 100644
index 0000000000..5945ff8fd1
--- /dev/null
+++ b/packages/shared-components/src/composer/Banner/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+export * from "./Banner";
diff --git a/packages/shared-components/src/composer/HistoryVisibleBannerView/HistoryVisibleBannerView.stories.tsx b/packages/shared-components/src/composer/HistoryVisibleBannerView/HistoryVisibleBannerView.stories.tsx
new file mode 100644
index 0000000000..5bd95e0113
--- /dev/null
+++ b/packages/shared-components/src/composer/HistoryVisibleBannerView/HistoryVisibleBannerView.stories.tsx
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+import { type Meta, type StoryFn } from "@storybook/react-vite";
+import React, { type JSX } from "react";
+import { fn } from "storybook/test";
+
+import { useMockedViewModel } from "../../useMockedViewModel";
+import {
+    HistoryVisibleBannerView,
+    type HistoryVisibleBannerViewActions,
+    type HistoryVisibleBannerViewSnapshot,
+} from "./HistoryVisibleBannerView";
+
+type HistoryVisibleBannerProps = HistoryVisibleBannerViewSnapshot & HistoryVisibleBannerViewActions;
+
+const HistoryVisibleBannerViewWrapper = ({ onClose, ...rest }: HistoryVisibleBannerProps): JSX.Element => {
+    const vm = useMockedViewModel(rest, {
+        onClose,
+    });
+    return <HistoryVisibleBannerView vm={vm} />;
+};
+
+export default {
+    title: "composer/HistoryVisibleBannerView",
+    component: HistoryVisibleBannerViewWrapper,
+    tags: ["autodocs"],
+    argTypes: {},
+    args: {
+        visible: true,
+        onClose: fn(),
+    },
+} as Meta<typeof HistoryVisibleBannerViewWrapper>;
+
+const Template: StoryFn<typeof HistoryVisibleBannerViewWrapper> = (args) => (
+    <HistoryVisibleBannerViewWrapper {...args} />
+);
+
+export const Default = Template.bind({});
diff --git a/packages/shared-components/src/composer/HistoryVisibleBannerView/HistoryVisibleBannerView.test.tsx b/packages/shared-components/src/composer/HistoryVisibleBannerView/HistoryVisibleBannerView.test.tsx
new file mode 100644
index 0000000000..04d1ca40e6
--- /dev/null
+++ b/packages/shared-components/src/composer/HistoryVisibleBannerView/HistoryVisibleBannerView.test.tsx
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React from "react";
+import { render } from "jest-matrix-react";
+import { composeStories } from "@storybook/react-vite";
+
+import * as stories from "./HistoryVisibleBannerView.stories.tsx";
+
+const { Default } = composeStories(stories);
+
+describe("HistoryVisibleBannerView", () => {
+    it("renders a history visible banner", () => {
+        const dismissFn = jest.fn();
+
+        const { container } = render(<Default onClose={dismissFn} />);
+        expect(container).toMatchSnapshot();
+
+        const button = container.querySelector("button");
+        expect(button).not.toBeNull();
+        button?.click();
+        expect(dismissFn).toHaveBeenCalled();
+    });
+});
diff --git a/packages/shared-components/src/composer/HistoryVisibleBannerView/HistoryVisibleBannerView.tsx b/packages/shared-components/src/composer/HistoryVisibleBannerView/HistoryVisibleBannerView.tsx
new file mode 100644
index 0000000000..fcd00327d6
--- /dev/null
+++ b/packages/shared-components/src/composer/HistoryVisibleBannerView/HistoryVisibleBannerView.tsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { Link } from "@vector-im/compound-web";
+import React, { type JSX } from "react";
+
+import { useViewModel } from "../../useViewModel";
+import { _t } from "../../utils/i18n";
+import { type ViewModel } from "../../viewmodel";
+import { Banner } from "../Banner";
+
+export interface HistoryVisibleBannerViewActions {
+    /**
+     * Called when the user dismisses the banner.
+     */
+    onClose: () => void;
+}
+
+export interface HistoryVisibleBannerViewSnapshot {
+    /**
+     * Whether the banner is currently visible.
+     */
+    visible: boolean;
+}
+
+/**
+ * The view model for the banner.
+ */
+export type HistoryVisibleBannerViewModel = ViewModel<HistoryVisibleBannerViewSnapshot> &
+    HistoryVisibleBannerViewActions;
+
+interface HistoryVisibleBannerViewProps {
+    /**
+     * The view model for the banner.
+     */
+    vm: HistoryVisibleBannerViewModel;
+}
+
+/**
+ * A component to alert that history is shared to new members of the room.
+ *
+ * @example
+ * ```tsx
+ * <HistoryVisibleBannerView vm={historyVisibleBannerViewModel} />
+ * ```
+ */
+export function HistoryVisibleBannerView({ vm }: Readonly<HistoryVisibleBannerViewProps>): JSX.Element {
+    const { visible } = useViewModel(vm);
+
+    const contents = _t(
+        "room|status_bar|history_visible",
+        {},
+        {
+            a: substituteATag,
+        },
+    );
+
+    return (
+        <>
+            {visible && (
+                <Banner type="info" onClose={() => vm.onClose()}>
+                    {contents}
+                </Banner>
+            )}
+        </>
+    );
+}
+
+function substituteATag(sub: string): JSX.Element {
+    return (
+        <Link href="https://element.io/en/help#e2ee-history-sharing" target="_blank">
+            {sub}
+        </Link>
+    );
+}
diff --git a/packages/shared-components/src/composer/HistoryVisibleBannerView/__snapshots__/HistoryVisibleBannerView.test.tsx.snap b/packages/shared-components/src/composer/HistoryVisibleBannerView/__snapshots__/HistoryVisibleBannerView.test.tsx.snap
new file mode 100644
index 0000000000..1ee67f9a37
--- /dev/null
+++ b/packages/shared-components/src/composer/HistoryVisibleBannerView/__snapshots__/HistoryVisibleBannerView.test.tsx.snap
@@ -0,0 +1,62 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`HistoryVisibleBannerView renders a history visible banner 1`] = `
+<div>
+  <div
+    class="banner"
+    data-type="info"
+  >
+    <div
+      class="icon"
+    >
+      <svg
+        fill="currentColor"
+        font-size="24"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M11.288 7.288A.97.97 0 0 1 12 7q.424 0 .713.287Q13 7.576 13 8t-.287.713A.97.97 0 0 1 12 9a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 8q0-.424.287-.713m.001 4.001A.97.97 0 0 1 12 11q.424 0 .713.287.287.288.287.713v4q0 .424-.287.712A.97.97 0 0 1 12 17a.97.97 0 0 1-.713-.288A.97.97 0 0 1 11 16v-4q0-.424.287-.713"
+        />
+        <path
+          clip-rule="evenodd"
+          d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10m-2 0a8 8 0 1 1-16 0 8 8 0 0 1 16 0"
+          fill-rule="evenodd"
+        />
+      </svg>
+    </div>
+    <div
+      class="content"
+    >
+      <span>
+        This room has been configured so that new members can read history. 
+        <a
+          class="_link_1v5rz_8"
+          data-kind="primary"
+          data-size="medium"
+          href="https://element.io/en/help#e2ee-history-sharing"
+          rel="noreferrer noopener"
+          target="_blank"
+        >
+          Learn More
+        </a>
+      </span>
+    </div>
+    <div
+      class="actions"
+    >
+      <button
+        class="_button_187yx_8"
+        data-kind="secondary"
+        data-size="sm"
+        role="button"
+        tabindex="0"
+      >
+        Dismiss
+      </button>
+    </div>
+  </div>
+</div>
+`;
diff --git a/packages/shared-components/src/composer/HistoryVisibleBannerView/index.ts b/packages/shared-components/src/composer/HistoryVisibleBannerView/index.ts
new file mode 100644
index 0000000000..96bf208bea
--- /dev/null
+++ b/packages/shared-components/src/composer/HistoryVisibleBannerView/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+export * from "./HistoryVisibleBannerView";
diff --git a/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.stories.tsx b/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.stories.tsx
new file mode 100644
index 0000000000..0c89ce24d6
--- /dev/null
+++ b/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.stories.tsx
@@ -0,0 +1,25 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { type Meta, type StoryFn } from "@storybook/react-vite";
+
+import { TextualEventView as TextualEventComponent } from "./TextualEventView";
+import { MockViewModel } from "../../viewmodel/MockViewModel";
+
+export default {
+    title: "Event/TextualEvent",
+    component: TextualEventComponent,
+    tags: ["autodocs"],
+    args: {
+        vm: new MockViewModel({ content: "Dummy textual event text" }),
+    },
+} as Meta<typeof TextualEventComponent>;
+
+const Template: StoryFn<typeof TextualEventComponent> = (args) => <TextualEventComponent {...args} />;
+
+export const Default = Template.bind({});
diff --git a/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.test.tsx b/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.test.tsx
new file mode 100644
index 0000000000..5d2dd912ef
--- /dev/null
+++ b/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.test.tsx
@@ -0,0 +1,21 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { composeStories } from "@storybook/react-vite";
+import { render } from "jest-matrix-react";
+import React from "react";
+
+import * as stories from "./TextualEventView.stories.tsx";
+
+const { Default } = composeStories(stories);
+
+describe("TextualEventView", () => {
+    it("renders a textual event", () => {
+        const { container } = render(<Default />);
+        expect(container).toMatchSnapshot();
+    });
+});
diff --git a/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.tsx b/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.tsx
new file mode 100644
index 0000000000..3d9e4ac109
--- /dev/null
+++ b/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.tsx
@@ -0,0 +1,24 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React, { type ReactNode, type JSX } from "react";
+
+import { type ViewModel } from "../../viewmodel/ViewModel";
+import { useViewModel } from "../../useViewModel";
+
+export type TextualEventViewSnapshot = {
+    content: string | ReactNode;
+};
+
+export interface Props {
+    vm: ViewModel<TextualEventViewSnapshot>;
+}
+
+export function TextualEventView({ vm }: Props): JSX.Element {
+    const snapshot = useViewModel(vm);
+    return <div className="mx_TextualEvent">{snapshot.content}</div>;
+}
diff --git a/packages/shared-components/src/event-tiles/TextualEventView/__snapshots__/TextualEventView.test.tsx.snap b/packages/shared-components/src/event-tiles/TextualEventView/__snapshots__/TextualEventView.test.tsx.snap
new file mode 100644
index 0000000000..37c53e56bd
--- /dev/null
+++ b/packages/shared-components/src/event-tiles/TextualEventView/__snapshots__/TextualEventView.test.tsx.snap
@@ -0,0 +1,11 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`TextualEventView renders a textual event 1`] = `
+<div>
+  <div
+    class="mx_TextualEvent"
+  >
+    Dummy textual event text
+  </div>
+</div>
+`;
diff --git a/packages/shared-components/src/event-tiles/TextualEventView/index.ts b/packages/shared-components/src/event-tiles/TextualEventView/index.ts
new file mode 100644
index 0000000000..589130bd28
--- /dev/null
+++ b/packages/shared-components/src/event-tiles/TextualEventView/index.ts
@@ -0,0 +1,8 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+export { TextualEventView, type TextualEventViewSnapshot } from "./TextualEventView";
diff --git a/packages/shared-components/src/hooks/useListKeyboardNavigation.test.ts b/packages/shared-components/src/hooks/useListKeyboardNavigation.test.ts
new file mode 100644
index 0000000000..9381619edc
--- /dev/null
+++ b/packages/shared-components/src/hooks/useListKeyboardNavigation.test.ts
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { type KeyboardEvent } from "react";
+import { renderHook } from "jest-matrix-react";
+
+import { useListKeyboardNavigation } from "./useListKeyboardNavigation";
+
+describe("useListKeyDown", () => {
+    let mockList: HTMLUListElement;
+    let mockItems: HTMLElement[];
+    let mockEvent: Partial<KeyboardEvent<HTMLUListElement>>;
+
+    beforeEach(() => {
+        // Create mock DOM elements
+        mockList = document.createElement("ul");
+        mockItems = [document.createElement("li"), document.createElement("li"), document.createElement("li")];
+
+        // Set up the DOM structure
+        mockItems.forEach((item, index) => {
+            item.setAttribute("tabindex", "0");
+            item.setAttribute("data-testid", `item-${index}`);
+            mockList.appendChild(item);
+        });
+
+        document.body.appendChild(mockList);
+
+        // Mock event object
+        mockEvent = {
+            preventDefault: jest.fn(),
+            key: "",
+        };
+
+        // Mock focus methods
+        mockItems.forEach((item) => {
+            item.focus = jest.fn();
+            item.click = jest.fn();
+        });
+    });
+
+    afterEach(() => {
+        document.body.removeChild(mockList);
+        jest.clearAllMocks();
+    });
+
+    function render(): {
+        current: {
+            listRef: React.RefObject<HTMLUListElement | null>;
+            onKeyDown: React.KeyboardEventHandler<HTMLUListElement>;
+            onFocus: React.FocusEventHandler<HTMLUListElement>;
+        };
+    } {
+        const { result } = renderHook(() => useListKeyboardNavigation());
+        result.current.listRef.current = mockList;
+        return result;
+    }
+
+    it.each([
+        ["Enter", "Enter"],
+        ["Space", " "],
+    ])("should handle %s key to click active element", (name, key) => {
+        const result = render();
+
+        // Mock document.activeElement
+        Object.defineProperty(document, "activeElement", {
+            value: mockItems[1],
+            configurable: true,
+        });
+
+        // Simulate key press
+        result.current.onKeyDown({
+            ...mockEvent,
+            key,
+        } as KeyboardEvent<HTMLUListElement>);
+
+        expect(mockItems[1].click).toHaveBeenCalledTimes(1);
+        expect(mockEvent.preventDefault).toHaveBeenCalledTimes(1);
+    });
+
+    it.each(
+        // key, finalPosition, startPosition
+        [
+            ["ArrowDown", 1, 0],
+            ["ArrowUp", 1, 2],
+            ["Home", 0, 1],
+            ["End", 2, 1],
+        ],
+    )("should handle %s to focus the %inth element", (key, finalPosition, startPosition) => {
+        const result = render();
+        mockList.contains = jest.fn().mockReturnValue(true);
+
+        Object.defineProperty(document, "activeElement", {
+            value: mockItems[startPosition],
+            configurable: true,
+        });
+
+        result.current.onKeyDown({
+            ...mockEvent,
+            key,
+        } as KeyboardEvent<HTMLUListElement>);
+
+        expect(mockItems[finalPosition].focus).toHaveBeenCalledTimes(1);
+        expect(mockEvent.preventDefault).toHaveBeenCalledTimes(1);
+    });
+
+    it.each([["ArrowDown"], ["ArrowUp"]])("should not handle %s when active element is not in list", (key) => {
+        const result = render();
+        mockList.contains = jest.fn().mockReturnValue(false);
+
+        const outsideElement = document.createElement("button");
+
+        Object.defineProperty(document, "activeElement", {
+            value: outsideElement,
+            configurable: true,
+        });
+
+        result.current.onKeyDown({
+            ...mockEvent,
+            key,
+        } as KeyboardEvent<HTMLUListElement>);
+
+        // No item should be focused
+        mockItems.forEach((item) => expect(item.focus).not.toHaveBeenCalled());
+        expect(mockEvent.preventDefault).toHaveBeenCalledTimes(1);
+    });
+
+    it("should not prevent default for unhandled keys", () => {
+        const result = render();
+
+        result.current.onKeyDown({
+            ...mockEvent,
+            key: "Tab",
+        } as KeyboardEvent<HTMLUListElement>);
+
+        expect(mockEvent.preventDefault).not.toHaveBeenCalled();
+    });
+
+    it("should focus the first item if list itself is focused", () => {
+        const result = render();
+        result.current.onFocus({ target: mockList } as React.FocusEvent<HTMLUListElement>);
+        expect(mockItems[0].focus).toHaveBeenCalledTimes(1);
+    });
+
+    it("should focus the selected item if list itself is focused", () => {
+        mockItems[1].setAttribute("aria-selected", "true");
+        const result = render();
+
+        result.current.onFocus({ target: mockList } as React.FocusEvent<HTMLUListElement>);
+        expect(mockItems[1].focus).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/packages/shared-components/src/hooks/useListKeyboardNavigation.ts b/packages/shared-components/src/hooks/useListKeyboardNavigation.ts
new file mode 100644
index 0000000000..71d87aa12a
--- /dev/null
+++ b/packages/shared-components/src/hooks/useListKeyboardNavigation.ts
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import {
+    useCallback,
+    useRef,
+    type RefObject,
+    type KeyboardEvent,
+    type KeyboardEventHandler,
+    type FocusEventHandler,
+    type FocusEvent,
+} from "react";
+
+/**
+ * A hook that provides keyboard navigation for a list of options.
+ */
+export function useListKeyboardNavigation(): {
+    listRef: RefObject<HTMLUListElement | null>;
+    onKeyDown: KeyboardEventHandler<HTMLUListElement>;
+    onFocus: FocusEventHandler<HTMLUListElement>;
+} {
+    const listRef = useRef<HTMLUListElement>(null);
+
+    const onFocus = useCallback((evt: FocusEvent<HTMLUListElement>) => {
+        if (!listRef.current) return;
+
+        if (evt.target === listRef.current) {
+            // By default, focus the selected item
+            let selectedChild = listRef.current?.firstElementChild;
+
+            // If there is a selected item, focus that instead
+            for (const child of listRef.current.children) {
+                if (child.getAttribute("aria-selected") === "true") {
+                    selectedChild = child;
+                    break;
+                }
+            }
+
+            (selectedChild as HTMLElement)?.focus();
+        }
+    }, []);
+
+    const onKeyDown = useCallback((evt: KeyboardEvent<HTMLUListElement>) => {
+        const { key } = evt;
+
+        let handled = false;
+
+        switch (key) {
+            case "Enter":
+            case " ": {
+                handled = true;
+                (document.activeElement as HTMLElement).click();
+                break;
+            }
+            case "ArrowDown": {
+                handled = true;
+                const currentFocus = document.activeElement;
+                if (listRef.current?.contains(currentFocus) && currentFocus) {
+                    (currentFocus.nextElementSibling as HTMLElement)?.focus();
+                }
+                break;
+            }
+            case "ArrowUp": {
+                handled = true;
+                const currentFocus = document.activeElement;
+                if (listRef.current?.contains(currentFocus) && currentFocus) {
+                    (currentFocus.previousElementSibling as HTMLElement)?.focus();
+                }
+                break;
+            }
+            case "Home": {
+                handled = true;
+                (listRef.current?.firstElementChild as HTMLElement)?.focus();
+                break;
+            }
+            case "End": {
+                handled = true;
+                (listRef.current?.lastElementChild as HTMLElement)?.focus();
+                break;
+            }
+        }
+
+        if (handled) {
+            evt.preventDefault();
+        }
+    }, []);
+    return { listRef, onKeyDown, onFocus };
+}
diff --git a/packages/shared-components/src/index.ts b/packages/shared-components/src/index.ts
new file mode 100644
index 0000000000..849634e9da
--- /dev/null
+++ b/packages/shared-components/src/index.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+// Components
+export * from "./audio/AudioPlayerView";
+export * from "./audio/Clock";
+export * from "./audio/PlayPauseButton";
+export * from "./audio/SeekBar";
+export * from "./avatar/AvatarWithDetails";
+export * from "./composer/Banner";
+export * from "./composer/HistoryVisibleBannerView";
+export * from "./event-tiles/TextualEventView";
+export * from "./message-body/MediaBody";
+export * from "./pill-input/Pill";
+export * from "./pill-input/PillInput";
+export * from "./rich-list/RichItem";
+export * from "./rich-list/RichList";
+export * from "./room-list/RoomListSearchView";
+export * from "./utils/Box";
+export * from "./utils/Flex";
+
+// Utils
+export * from "./utils/i18n";
+export * from "./utils/i18nContext";
+export * from "./utils/humanize";
+export * from "./utils/DateUtils";
+export * from "./utils/numbers";
+export * from "./utils/FormattingUtils";
+export * from "./utils/I18nApi";
+
+// MVVM
+export * from "./viewmodel";
+export * from "./useMockedViewModel";
+export * from "./useViewModel";
+
+// i18n (we must export this directly in order to not confuse the type bundler, it seems,
+// otherwise it will leave it as a relative import rather than bundling it)
+export type * from "./i18nKeys.d.ts";
diff --git a/packages/shared-components/src/message-body/MediaBody/MediaBody.module.css b/packages/shared-components/src/message-body/MediaBody/MediaBody.module.css
new file mode 100644
index 0000000000..49d8ed8f4a
--- /dev/null
+++ b/packages/shared-components/src/message-body/MediaBody/MediaBody.module.css
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+.mediaBody {
+    background-color: var(--cpd-color-bg-subtle-secondary);
+    border-radius: var(--cpd-space-2x) !important;
+    max-width: 243px; /* use max-width instead of width so it fits within right panels */
+
+    font: var(--cpd-font-body-md-regular);
+    color: var(--cpd-color-text-secondary);
+
+    padding: var(--cpd-space-1-5x) var(--cpd-space-3x);
+}
diff --git a/packages/shared-components/src/message-body/MediaBody/MediaBody.stories.tsx b/packages/shared-components/src/message-body/MediaBody/MediaBody.stories.tsx
new file mode 100644
index 0000000000..ee90a37943
--- /dev/null
+++ b/packages/shared-components/src/message-body/MediaBody/MediaBody.stories.tsx
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React from "react";
+
+import { MediaBody } from "./MediaBody";
+import type { Meta, StoryFn } from "@storybook/react-vite";
+
+export default {
+    title: "MessageBody/MediaBody",
+    component: MediaBody,
+    tags: ["autodocs"],
+    args: {
+        children: "Media content goes here",
+    },
+} as Meta<typeof MediaBody>;
+
+const Template: StoryFn<typeof MediaBody> = (args) => <MediaBody {...args} />;
+
+export const Default = Template.bind({});
diff --git a/packages/shared-components/src/message-body/MediaBody/MediaBody.test.tsx b/packages/shared-components/src/message-body/MediaBody/MediaBody.test.tsx
new file mode 100644
index 0000000000..9d405e1af3
--- /dev/null
+++ b/packages/shared-components/src/message-body/MediaBody/MediaBody.test.tsx
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { composeStories } from "@storybook/react-vite";
+import { render } from "jest-matrix-react";
+import React from "react";
+
+import * as stories from "./MediaBody.stories";
+
+const { Default } = composeStories(stories);
+
+describe("MediaBody", () => {
+    it("renders the media body", () => {
+        const { container } = render(<Default />);
+        expect(container).toMatchSnapshot();
+    });
+});
diff --git a/packages/shared-components/src/message-body/MediaBody/MediaBody.tsx b/packages/shared-components/src/message-body/MediaBody/MediaBody.tsx
new file mode 100644
index 0000000000..86545db67a
--- /dev/null
+++ b/packages/shared-components/src/message-body/MediaBody/MediaBody.tsx
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { type ComponentProps, type ElementType, type JSX, type PropsWithChildren } from "react";
+import React from "react";
+import classNames from "classnames";
+
+import styles from "./MediaBody.module.css";
+
+export type MediaBodyProps<C extends ElementType> = {
+    /**
+     * The HTML tag.
+     * @default "div"
+     */
+    as?: C;
+    /**
+     * The CSS class name.
+     */
+    className?: string;
+} & ComponentProps<C>;
+
+/**
+ * A component to display the body of a media message.
+ *
+ * @example
+ * ```tsx
+ * <MediaBody as="p" className="custom-class">Media body content</MediaBody>
+ * ```
+ */
+export function MediaBody<C extends React.ElementType = "div">({
+    as,
+    className,
+    children,
+    ...props
+}: PropsWithChildren<MediaBodyProps<C>>): JSX.Element {
+    const Component = as || "div";
+
+    // Keep Mx_MediaBody to support the compatibility with existing timeline and the all the layout
+    return (
+        <Component className={classNames("mx_MediaBody", styles.mediaBody, className)} {...props}>
+            {children}
+        </Component>
+    );
+}
diff --git a/packages/shared-components/src/message-body/MediaBody/__snapshots__/MediaBody.test.tsx.snap b/packages/shared-components/src/message-body/MediaBody/__snapshots__/MediaBody.test.tsx.snap
new file mode 100644
index 0000000000..d86c677390
--- /dev/null
+++ b/packages/shared-components/src/message-body/MediaBody/__snapshots__/MediaBody.test.tsx.snap
@@ -0,0 +1,11 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`MediaBody renders the media body 1`] = `
+<div>
+  <div
+    class="mx_MediaBody mediaBody"
+  >
+    Media content goes here
+  </div>
+</div>
+`;
diff --git a/packages/shared-components/src/message-body/MediaBody/index.tsx b/packages/shared-components/src/message-body/MediaBody/index.tsx
new file mode 100644
index 0000000000..e90b1756d3
--- /dev/null
+++ b/packages/shared-components/src/message-body/MediaBody/index.tsx
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+export { MediaBody } from "./MediaBody";
diff --git a/packages/shared-components/src/pill-input/Pill/Pill.module.css b/packages/shared-components/src/pill-input/Pill/Pill.module.css
new file mode 100644
index 0000000000..59df489e06
--- /dev/null
+++ b/packages/shared-components/src/pill-input/Pill/Pill.module.css
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+.pill {
+    background-color: var(--cpd-color-bg-action-primary-rest);
+    padding: var(--cpd-space-1x) var(--cpd-space-1-5x) var(--cpd-space-1x) var(--cpd-space-1x);
+    border-radius: 99px;
+}
+
+.label {
+    color: var(--cpd-color-text-on-solid-primary);
+    font: var(--cpd-font-body-sm-medium);
+}
diff --git a/packages/shared-components/src/pill-input/Pill/Pill.stories.tsx b/packages/shared-components/src/pill-input/Pill/Pill.stories.tsx
new file mode 100644
index 0000000000..1ed233adf8
--- /dev/null
+++ b/packages/shared-components/src/pill-input/Pill/Pill.stories.tsx
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React from "react";
+import { fn } from "storybook/test";
+
+import type { Meta, StoryObj } from "@storybook/react-vite";
+import { Pill } from "./Pill";
+
+const meta = {
+    title: "PillInput/Pill",
+    component: Pill,
+    tags: ["autodocs"],
+    args: {
+        label: "Pill",
+        children: <div style={{ width: 20, height: 20, borderRadius: "100%", backgroundColor: "#ccc" }} />,
+        onClick: fn(),
+    },
+} satisfies Meta<typeof Pill>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};
+export const WithoutCloseButton: Story = {
+    args: {
+        onClick: undefined,
+    },
+};
diff --git a/packages/shared-components/src/pill-input/Pill/Pill.test.tsx b/packages/shared-components/src/pill-input/Pill/Pill.test.tsx
new file mode 100644
index 0000000000..a539f6c295
--- /dev/null
+++ b/packages/shared-components/src/pill-input/Pill/Pill.test.tsx
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { composeStories } from "@storybook/react-vite";
+import { render } from "jest-matrix-react";
+import React from "react";
+
+import * as stories from "./Pill.stories";
+
+const { Default, WithoutCloseButton } = composeStories(stories);
+
+describe("Pill", () => {
+    it("renders the pill", () => {
+        const { container } = render(<Default />);
+        expect(container).toMatchSnapshot();
+    });
+
+    it("renders the pill without close button", () => {
+        const { container } = render(<WithoutCloseButton />);
+        expect(container).toMatchSnapshot();
+    });
+});
diff --git a/packages/shared-components/src/pill-input/Pill/Pill.tsx b/packages/shared-components/src/pill-input/Pill/Pill.tsx
new file mode 100644
index 0000000000..64fdac3d2d
--- /dev/null
+++ b/packages/shared-components/src/pill-input/Pill/Pill.tsx
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React, { type MouseEventHandler, type JSX, type PropsWithChildren, type HTMLAttributes, useId } from "react";
+import classNames from "classnames";
+import { IconButton } from "@vector-im/compound-web";
+import CloseIcon from "@vector-im/compound-design-tokens/assets/web/icons/close";
+
+import { Flex } from "../../utils/Flex";
+import styles from "./Pill.module.css";
+import { useI18n } from "../../utils/i18nContext";
+
+export interface PillProps extends Omit<HTMLAttributes<HTMLDivElement>, "onClick"> {
+    /**
+     * The text label to display inside the pill.
+     */
+    label: string;
+    /**
+     * Optional click handler for a close button.
+     * If provided, a close button will be rendered.
+     */
+    onClick?: MouseEventHandler<HTMLButtonElement>;
+}
+
+/**
+ * A pill component that can display a label and an optional close button.
+ * The badge can also contain child elements, such as icons or avatars.
+ *
+ * @example
+ * ```tsx
+ * <Pill label="New" onClick={() => console.log("Closed")}>
+ *     <SomeIcon />
+ * </Pill>
+ * ```
+ */
+export function Pill({ className, children, label, onClick, ...props }: PropsWithChildren<PillProps>): JSX.Element {
+    const id = useId();
+    const { translate: _t } = useI18n();
+
+    return (
+        <Flex
+            display="inline-flex"
+            gap="var(--cpd-space-1-5x)"
+            align="center"
+            className={classNames(styles.pill, className)}
+            {...props}
+        >
+            {children}
+            <span id={id} className={styles.label}>
+                {label}
+            </span>
+            {onClick && (
+                <IconButton
+                    aria-describedby={id}
+                    size="16px"
+                    onClick={onClick}
+                    aria-label={_t("action|delete")}
+                    className="mx_Dialog_nonDialogButton"
+                >
+                    <CloseIcon color="var(--cpd-color-icon-tertiary)" />
+                </IconButton>
+            )}
+        </Flex>
+    );
+}
diff --git a/packages/shared-components/src/pill-input/Pill/__snapshots__/Pill.test.tsx.snap b/packages/shared-components/src/pill-input/Pill/__snapshots__/Pill.test.tsx.snap
new file mode 100644
index 0000000000..2ef6575b20
--- /dev/null
+++ b/packages/shared-components/src/pill-input/Pill/__snapshots__/Pill.test.tsx.snap
@@ -0,0 +1,66 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`Pill renders the pill 1`] = `
+<div>
+  <div
+    class="flex pill"
+    style="--mx-flex-display: inline-flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1-5x); --mx-flex-wrap: nowrap;"
+  >
+    <div
+      style="width: 20px; height: 20px; border-radius: 100%; background-color: rgb(204, 204, 204);"
+    />
+    <span
+      class="label"
+      id="_r_0_"
+    >
+      Pill
+    </span>
+    <button
+      aria-describedby="_r_0_"
+      aria-label="Delete"
+      class="_icon-button_1pz9o_8 mx_Dialog_nonDialogButton"
+      data-kind="primary"
+      role="button"
+      style="--cpd-icon-button-size: 16px;"
+      tabindex="0"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          color="var(--cpd-color-icon-tertiary)"
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
+          />
+        </svg>
+      </div>
+    </button>
+  </div>
+</div>
+`;
+
+exports[`Pill renders the pill without close button 1`] = `
+<div>
+  <div
+    class="flex pill"
+    style="--mx-flex-display: inline-flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1-5x); --mx-flex-wrap: nowrap;"
+  >
+    <div
+      style="width: 20px; height: 20px; border-radius: 100%; background-color: rgb(204, 204, 204);"
+    />
+    <span
+      class="label"
+      id="_r_1_"
+    >
+      Pill
+    </span>
+  </div>
+</div>
+`;
diff --git a/packages/shared-components/src/pill-input/Pill/index.ts b/packages/shared-components/src/pill-input/Pill/index.ts
new file mode 100644
index 0000000000..1e0a4b6b66
--- /dev/null
+++ b/packages/shared-components/src/pill-input/Pill/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+export { Pill } from "./Pill";
diff --git a/packages/shared-components/src/pill-input/PillInput/PillInput.module.css b/packages/shared-components/src/pill-input/PillInput/PillInput.module.css
new file mode 100644
index 0000000000..888da57746
--- /dev/null
+++ b/packages/shared-components/src/pill-input/PillInput/PillInput.module.css
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+.pillInput {
+    background-color: var(--cpd-color-bg-subtle-secondary);
+    border-radius: 20px;
+    padding: var(--cpd-space-2x) var(--cpd-space-3x) var(--cpd-space-2x) var(--cpd-space-3x);
+    /* To match pill height in order to avoid the PillInput to grow when a pill is inserted */
+    min-height: 28px;
+}
+
+.pillInput:has(.input:focus) {
+    outline: var(--cpd-border-width-1) solid var(--cpd-color-gray-1400);
+}
+
+.input {
+    all: unset;
+    width: 100%;
+    flex: 1;
+    color: var(--cpd-color-text-primary);
+}
+
+.input::placeholder {
+    color: var(--cpd-color-text-secondary);
+    font: var(--cpd-font-body-md-regular);
+}
+
+.largerInput {
+    padding: var(--cpd-space-2x) 0;
+}
diff --git a/packages/shared-components/src/pill-input/PillInput/PillInput.stories.tsx b/packages/shared-components/src/pill-input/PillInput/PillInput.stories.tsx
new file mode 100644
index 0000000000..3bb119dc75
--- /dev/null
+++ b/packages/shared-components/src/pill-input/PillInput/PillInput.stories.tsx
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React from "react";
+import { fn } from "storybook/test";
+
+import type { Meta, StoryObj } from "@storybook/react-vite";
+import { PillInput } from "./PillInput";
+
+const meta = {
+    title: "PillInput/PillInput",
+    component: PillInput,
+    tags: ["autodocs"],
+    args: {
+        children: (
+            <>
+                <div style={{ minWidth: 162, height: 28, backgroundColor: "#ccc", borderRadius: "99px" }} />
+                <div style={{ minWidth: 162, height: 28, backgroundColor: "#ccc", borderRadius: "99px" }} />
+            </>
+        ),
+        onChange: fn(),
+        onRemoveChildren: fn(),
+        inputProps: {
+            "placeholder": "Type something...",
+            "aria-label": "pill input",
+        },
+    },
+} satisfies Meta<typeof PillInput>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};
+export const NoChild: Story = { args: { children: undefined } };
diff --git a/packages/shared-components/src/pill-input/PillInput/PillInput.test.tsx b/packages/shared-components/src/pill-input/PillInput/PillInput.test.tsx
new file mode 100644
index 0000000000..b20b53c6e4
--- /dev/null
+++ b/packages/shared-components/src/pill-input/PillInput/PillInput.test.tsx
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { render, screen } from "jest-matrix-react";
+import React from "react";
+import { composeStories } from "@storybook/react-vite";
+import userEvent from "@testing-library/user-event";
+
+import * as stories from "./PillInput.stories";
+import { PillInput } from "./PillInput";
+
+const { Default, NoChild } = composeStories(stories);
+
+describe("PillInput", () => {
+    it("renders the pill input", () => {
+        const { container } = render(<Default />);
+        expect(container).toMatchSnapshot();
+    });
+
+    it("renders only the input without children", () => {
+        const { container } = render(<NoChild />);
+        expect(container).toMatchSnapshot();
+    });
+
+    it("calls onRemoveChildren when backspace is pressed and input is empty", async () => {
+        const user = userEvent.setup();
+        const mockOnRemoveChildren = jest.fn();
+
+        render(<PillInput onRemoveChildren={mockOnRemoveChildren} />);
+
+        const input = screen.getByRole("textbox");
+
+        // Focus the input and press backspace (input should be empty by default)
+        await user.click(input);
+        await user.keyboard("{Backspace}");
+
+        expect(mockOnRemoveChildren).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/packages/shared-components/src/pill-input/PillInput/PillInput.tsx b/packages/shared-components/src/pill-input/PillInput/PillInput.tsx
new file mode 100644
index 0000000000..bcb2cb1932
--- /dev/null
+++ b/packages/shared-components/src/pill-input/PillInput/PillInput.tsx
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React, {
+    type PropsWithChildren,
+    type JSX,
+    useRef,
+    type KeyboardEventHandler,
+    type HTMLAttributes,
+    type HTMLProps,
+    Children,
+} from "react";
+import classNames from "classnames";
+import { omit } from "lodash";
+import { useMergeRefs } from "react-merge-refs";
+
+import styles from "./PillInput.module.css";
+import { Flex } from "../../utils/Flex";
+
+export interface PillInputProps extends HTMLAttributes<HTMLDivElement> {
+    /**
+     * Callback for when the user presses backspace on an empty input.
+     */
+    onRemoveChildren?: KeyboardEventHandler;
+    /**
+     * Props to pass to the input element.
+     */
+    inputProps?: HTMLProps<HTMLInputElement> & { "data-testid"?: string };
+}
+
+/**
+ * An input component that can contain multiple child elements and an input field.
+ *
+ * @example
+ * ```tsx
+ * <PillInput>
+ *   <div>Child 1</div>
+ *   <div>Child 2</div>
+ * </PillInput>
+ * ```
+ */
+export function PillInput({
+    className,
+    children,
+    onRemoveChildren,
+    inputProps,
+    ...props
+}: PropsWithChildren<PillInputProps>): JSX.Element {
+    const inputRef = useRef<HTMLInputElement>(null);
+    const inputAttributes = omit(inputProps, ["onKeyDown", "ref"]);
+    const ref = useMergeRefs([inputRef, inputProps?.ref]);
+
+    const hasChildren = Children.toArray(children).length > 0;
+
+    return (
+        <Flex
+            {...props}
+            gap="var(--cpd-space-1x)"
+            direction="column"
+            className={classNames(styles.pillInput, className)}
+            onClick={(evt) => {
+                evt.preventDefault();
+                evt.stopPropagation();
+                inputRef.current?.focus();
+            }}
+        >
+            {hasChildren && (
+                <Flex gap="var(--cpd-space-1x)" wrap="wrap" align="center">
+                    {children}
+                </Flex>
+            )}
+            <input
+                ref={ref}
+                autoComplete="off"
+                className={classNames(styles.input, { [styles.largerInput]: hasChildren })}
+                onKeyDown={(evt) => {
+                    const value = evt.currentTarget.value.trim();
+
+                    // If the input is empty and the user presses backspace, we call the onRemoveChildren handler
+                    if (evt.key === "Backspace" && !value) {
+                        evt.preventDefault();
+                        onRemoveChildren?.(evt);
+                        return;
+                    }
+
+                    inputProps?.onKeyDown?.(evt);
+                }}
+                {...inputAttributes}
+            />
+        </Flex>
+    );
+}
diff --git a/packages/shared-components/src/pill-input/PillInput/__snapshots__/PillInput.test.tsx.snap b/packages/shared-components/src/pill-input/PillInput/__snapshots__/PillInput.test.tsx.snap
new file mode 100644
index 0000000000..37a1d08c8b
--- /dev/null
+++ b/packages/shared-components/src/pill-input/PillInput/__snapshots__/PillInput.test.tsx.snap
@@ -0,0 +1,44 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`PillInput renders only the input without children 1`] = `
+<div>
+  <div
+    class="flex pillInput"
+    style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+  >
+    <input
+      aria-label="pill input"
+      autocomplete="off"
+      class="input"
+      placeholder="Type something..."
+    />
+  </div>
+</div>
+`;
+
+exports[`PillInput renders the pill input 1`] = `
+<div>
+  <div
+    class="flex pillInput"
+    style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+  >
+    <div
+      class="flex"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: wrap;"
+    >
+      <div
+        style="min-width: 162px; height: 28px; background-color: rgb(204, 204, 204); border-radius: 99px;"
+      />
+      <div
+        style="min-width: 162px; height: 28px; background-color: rgb(204, 204, 204); border-radius: 99px;"
+      />
+    </div>
+    <input
+      aria-label="pill input"
+      autocomplete="off"
+      class="input largerInput"
+      placeholder="Type something..."
+    />
+  </div>
+</div>
+`;
diff --git a/packages/shared-components/src/pill-input/PillInput/index.ts b/packages/shared-components/src/pill-input/PillInput/index.ts
new file mode 100644
index 0000000000..76cb6e4625
--- /dev/null
+++ b/packages/shared-components/src/pill-input/PillInput/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+export { PillInput } from "./PillInput";
diff --git a/packages/shared-components/src/rich-list/RichItem/RichItem.module.css b/packages/shared-components/src/rich-list/RichItem/RichItem.module.css
new file mode 100644
index 0000000000..d1028f33e4
--- /dev/null
+++ b/packages/shared-components/src/rich-list/RichItem/RichItem.module.css
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+.richItem {
+    /* Remove browser button style */
+    background: transparent;
+    border: none;
+    padding: var(--cpd-space-2x) var(--cpd-space-4x) var(--cpd-space-2x) var(--cpd-space-4x);
+    width: 100%;
+    box-sizing: border-box;
+    cursor: pointer;
+    text-align: start;
+
+    display: grid;
+    column-gap: var(--cpd-space-3x);
+    grid-template-columns: max-content 1fr max-content;
+    grid-template-areas:
+        "avatar title time"
+        "avatar description time";
+}
+
+.richItem:hover,
+.richItem:focus {
+    background-color: var(--cpd-color-bg-subtle-secondary);
+    border-radius: 12px;
+}
+
+.richItem:not(:last-child) {
+    border-bottom: var(--cpd-border-width-1) solid var(--cpd-color-gray-300);
+}
+
+.avatar {
+    grid-area: avatar;
+    align-self: center;
+}
+
+.title {
+    grid-area: title;
+    font: var(--cpd-font-body-sm-semibold);
+    color: var(--cpd-color-text-primary);
+}
+
+.description {
+    grid-area: description;
+}
+
+.timestamp {
+    grid-area: time;
+    align-self: center;
+}
+
+.title,
+.description {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+}
+
+.description,
+.timestamp {
+    font: var(--cpd-font-body-sm-regular);
+    color: var(--cpd-color-text-secondary);
+}
+
+.checkmark {
+    grid-area: avatar;
+    align-self: center;
+    background-color: var(--cpd-color-icon-accent-primary);
+    width: 32px;
+    height: 32px;
+    border-radius: 100%;
+}
diff --git a/packages/shared-components/src/rich-list/RichItem/RichItem.stories.tsx b/packages/shared-components/src/rich-list/RichItem/RichItem.stories.tsx
new file mode 100644
index 0000000000..11834bf6c4
--- /dev/null
+++ b/packages/shared-components/src/rich-list/RichItem/RichItem.stories.tsx
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React from "react";
+import { fn } from "storybook/test";
+
+import type { Meta, StoryFn } from "@storybook/react-vite";
+import { RichItem } from "./RichItem";
+
+const currentTimestamp = new Date("2025-03-09T12:00:00Z").getTime();
+
+export default {
+    title: "RichList/RichItem",
+    component: RichItem,
+    tags: ["autodocs"],
+    args: {
+        avatar: <div style={{ width: 32, height: 32, backgroundColor: "#ccc", borderRadius: "50%" }} />,
+        title: "Rich Item Title",
+        description: "This is a description of the rich item.",
+        timestamp: currentTimestamp,
+        onClick: fn(),
+    },
+    beforeEach: () => {
+        Date.now = () => new Date("2025-08-01T12:00:00Z").getTime();
+    },
+    parameters: {
+        a11y: {
+            context: "button",
+        },
+    },
+} as Meta<typeof RichItem>;
+
+const Template: StoryFn<typeof RichItem> = (args) => (
+    <ul role="listbox" style={{ all: "unset", listStyle: "none" }}>
+        <RichItem {...args} />
+    </ul>
+);
+
+export const Default = Template.bind({});
+
+export const Selected = Template.bind({});
+Selected.args = {
+    selected: true,
+};
+
+export const WithoutTimestamp = Template.bind({});
+WithoutTimestamp.args = {
+    timestamp: undefined,
+};
+
+export const Hover = Template.bind({});
+Hover.parameters = { pseudo: { hover: true } };
+
+const TemplateSeparator: StoryFn<typeof RichItem> = (args) => (
+    <ul role="listbox" style={{ all: "unset", listStyle: "none" }}>
+        <RichItem {...args} />
+        <RichItem {...args} />
+    </ul>
+);
+export const Separator = TemplateSeparator.bind({});
diff --git a/packages/shared-components/src/rich-list/RichItem/RichItem.test.tsx b/packages/shared-components/src/rich-list/RichItem/RichItem.test.tsx
new file mode 100644
index 0000000000..b5322d1fa5
--- /dev/null
+++ b/packages/shared-components/src/rich-list/RichItem/RichItem.test.tsx
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { composeStories } from "@storybook/react-vite";
+import { render } from "jest-matrix-react";
+import React from "react";
+
+import * as stories from "./RichItem.stories";
+
+const { Default, Selected, WithoutTimestamp } = composeStories(stories);
+
+describe("RichItem", () => {
+    beforeAll(() => {
+        jest.useFakeTimers().setSystemTime(new Date("2025-08-01T12:00:00Z"));
+    });
+
+    it("renders the item in default state", () => {
+        const { container } = render(<Default />);
+        expect(container).toMatchSnapshot();
+    });
+
+    it("renders the item in selected state", () => {
+        const { container } = render(<Selected />);
+        expect(container).toMatchSnapshot();
+    });
+
+    it("renders the item without timestamp", () => {
+        const { container } = render(<WithoutTimestamp />);
+        expect(container).toMatchSnapshot();
+    });
+});
diff --git a/packages/shared-components/src/rich-list/RichItem/RichItem.tsx b/packages/shared-components/src/rich-list/RichItem/RichItem.tsx
new file mode 100644
index 0000000000..9aeff4c924
--- /dev/null
+++ b/packages/shared-components/src/rich-list/RichItem/RichItem.tsx
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React, { type HTMLAttributes, type JSX, memo } from "react";
+import CheckIcon from "@vector-im/compound-design-tokens/assets/web/icons/check";
+
+import styles from "./RichItem.module.css";
+import { Flex } from "../../utils/Flex";
+import { useI18n } from "../../utils/i18nContext";
+
+export interface RichItemProps extends HTMLAttributes<HTMLLIElement> {
+    /**
+     * Avatar to display at the start of the item
+     */
+    avatar: React.ReactNode;
+    /**
+     * Title to display at the top of the item
+     */
+    title: string;
+    /**
+     * Description to display below the title
+     */
+    description: string;
+    /**
+     * Timestamp to display at the end of the item
+     * The value is humanized (e.g. "5 minutes ago")
+     */
+    timestamp?: number;
+    /**
+     * Whether the item is selected
+     * This will replace the avatar with a checkmark
+     * @default false
+     */
+    selected?: boolean;
+}
+
+/**
+ * A rich item to display in a list, with an avatar, title, description and optional timestamp.
+ * If selected, the avatar is replaced with a checkmark.
+ * A separator is added between items in a list.
+ *
+ * @example
+ * ```tsx
+ *   <RichItem
+ *     avatar={<AvatarComponent />}
+ *     title="Rich Item Title"
+ *     description="This is a description of the rich item."
+ *     timestamp={Date.now() - 5 * 60 * 1000} // 5 minutes ago
+ *     selected={true}
+ *     onClick={() => console.log("Item clicked")}
+ *   />
+ * ```
+ */
+export const RichItem = memo(function RichItem({
+    avatar,
+    title,
+    description,
+    timestamp,
+    selected,
+    ...props
+}: RichItemProps): JSX.Element {
+    const i18n = useI18n();
+
+    return (
+        <li
+            className={styles.richItem}
+            role="option"
+            tabIndex={-1}
+            aria-selected={selected}
+            aria-label={title}
+            {...props}
+        >
+            {selected ? <Checkmark /> : <Flex className={styles.avatar}>{avatar}</Flex>}
+            <span className={styles.title}>{title}</span>
+            <span className={styles.description}>{description}</span>
+            {timestamp && (
+                <span role="timer" className={styles.timestamp}>
+                    {i18n.humanizeTime(timestamp)}
+                </span>
+            )}
+        </li>
+    );
+});
+
+/**
+ * A checkmark icon inside a circle, used to indicate selection.
+ */
+function Checkmark(): JSX.Element {
+    return (
+        <Flex align="center" justify="center" aria-hidden="true" className={styles.checkmark}>
+            <CheckIcon width="24px" height="24px" color="var(--cpd-color-icon-on-solid-primary)" />
+        </Flex>
+    );
+}
diff --git a/packages/shared-components/src/rich-list/RichItem/__snapshots__/RichItem.test.tsx.snap b/packages/shared-components/src/rich-list/RichItem/__snapshots__/RichItem.test.tsx.snap
new file mode 100644
index 0000000000..6ccc190d8c
--- /dev/null
+++ b/packages/shared-components/src/rich-list/RichItem/__snapshots__/RichItem.test.tsx.snap
@@ -0,0 +1,129 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`RichItem renders the item in default state 1`] = `
+<div>
+  <ul
+    role="listbox"
+    style="all: unset; list-style: none;"
+  >
+    <li
+      aria-label="Rich Item Title"
+      class="richItem"
+      role="option"
+      tabindex="-1"
+    >
+      <div
+        class="flex avatar"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+      >
+        <div
+          style="width: 32px; height: 32px; background-color: rgb(204, 204, 204); border-radius: 50%;"
+        />
+      </div>
+      <span
+        class="title"
+      >
+        Rich Item Title
+      </span>
+      <span
+        class="description"
+      >
+        This is a description of the rich item.
+      </span>
+      <span
+        class="timestamp"
+        role="timer"
+      >
+        145 days ago
+      </span>
+    </li>
+  </ul>
+</div>
+`;
+
+exports[`RichItem renders the item in selected state 1`] = `
+<div>
+  <ul
+    role="listbox"
+    style="all: unset; list-style: none;"
+  >
+    <li
+      aria-label="Rich Item Title"
+      aria-selected="true"
+      class="richItem"
+      role="option"
+      tabindex="-1"
+    >
+      <div
+        aria-hidden="true"
+        class="flex checkmark"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+      >
+        <svg
+          color="var(--cpd-color-icon-on-solid-primary)"
+          fill="currentColor"
+          height="24px"
+          viewBox="0 0 24 24"
+          width="24px"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+          />
+        </svg>
+      </div>
+      <span
+        class="title"
+      >
+        Rich Item Title
+      </span>
+      <span
+        class="description"
+      >
+        This is a description of the rich item.
+      </span>
+      <span
+        class="timestamp"
+        role="timer"
+      >
+        145 days ago
+      </span>
+    </li>
+  </ul>
+</div>
+`;
+
+exports[`RichItem renders the item without timestamp 1`] = `
+<div>
+  <ul
+    role="listbox"
+    style="all: unset; list-style: none;"
+  >
+    <li
+      aria-label="Rich Item Title"
+      class="richItem"
+      role="option"
+      tabindex="-1"
+    >
+      <div
+        class="flex avatar"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+      >
+        <div
+          style="width: 32px; height: 32px; background-color: rgb(204, 204, 204); border-radius: 50%;"
+        />
+      </div>
+      <span
+        class="title"
+      >
+        Rich Item Title
+      </span>
+      <span
+        class="description"
+      >
+        This is a description of the rich item.
+      </span>
+    </li>
+  </ul>
+</div>
+`;
diff --git a/packages/shared-components/src/rich-list/RichItem/index.ts b/packages/shared-components/src/rich-list/RichItem/index.ts
new file mode 100644
index 0000000000..0301144246
--- /dev/null
+++ b/packages/shared-components/src/rich-list/RichItem/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+export { RichItem } from "./RichItem";
diff --git a/packages/shared-components/src/rich-list/RichList/RichList.module.css b/packages/shared-components/src/rich-list/RichList/RichList.module.css
new file mode 100644
index 0000000000..9fd59ef103
--- /dev/null
+++ b/packages/shared-components/src/rich-list/RichList/RichList.module.css
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+.richList {
+    height: inherit;
+}
+
+.title {
+    font: var(--cpd-font-body-sm-semibold);
+    color: var(--cpd-color-text-secondary);
+    padding: var(--cpd-space-2x) var(--cpd-space-4x) var(--cpd-space-2x) var(--cpd-space-4x);
+}
+
+.content {
+    width: 100%;
+    overflow: auto;
+    /* remove browser default ul padding/margin */
+    padding: 0;
+    margin: 0;
+}
+
+.empty {
+    margin-left: var(--cpd-space-6x);
+    font: var(--cpd-font-body-sm-regular);
+    color: var(--cpd-color-text-secondary);
+}
diff --git a/packages/shared-components/src/rich-list/RichList/RichList.stories.tsx b/packages/shared-components/src/rich-list/RichList/RichList.stories.tsx
new file mode 100644
index 0000000000..e4a9406e71
--- /dev/null
+++ b/packages/shared-components/src/rich-list/RichList/RichList.stories.tsx
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React from "react";
+
+import { RichList } from "./RichList";
+import type { Meta, StoryObj } from "@storybook/react-vite";
+import { RichItem } from "../RichItem";
+
+const avatar = <div style={{ width: 32, height: 32, backgroundColor: "#ccc", borderRadius: "50%" }} />;
+
+const meta = {
+    title: "RichList/RichList",
+    component: RichList,
+    tags: ["autodocs"],
+    decorators: [
+        (Story) => (
+            <div style={{ height: "220px", overflow: "hidden" }}>
+                <Story />
+            </div>
+        ),
+    ],
+    args: {
+        title: "Rich List Title",
+        children: (
+            <>
+                <RichItem avatar={avatar} title="First Item" description="description" />
+                <RichItem selected={true} avatar={avatar} title="Second Item" description="description" />
+                <RichItem avatar={avatar} title="Third Item" description="description" />
+                <RichItem avatar={avatar} title="Fourth Item" description="description" />
+                <RichItem avatar={avatar} title="Fifth Item" description="description" />
+            </>
+        ),
+    },
+} satisfies Meta<typeof RichList>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};
+export const Empty: Story = {
+    args: {
+        isEmpty: true,
+        children: "No items available",
+    },
+};
diff --git a/packages/shared-components/src/rich-list/RichList/RichList.test.tsx b/packages/shared-components/src/rich-list/RichList/RichList.test.tsx
new file mode 100644
index 0000000000..625511f68e
--- /dev/null
+++ b/packages/shared-components/src/rich-list/RichList/RichList.test.tsx
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { composeStories } from "@storybook/react-vite";
+import { render } from "jest-matrix-react";
+import React from "react";
+
+import * as stories from "./RichList.stories";
+
+const { Default, Empty } = composeStories(stories);
+
+describe("RichItem", () => {
+    it("renders the list", () => {
+        const { container } = render(<Default />);
+        expect(container).toMatchSnapshot();
+    });
+
+    it("renders the list with isEmpty=true", () => {
+        const { container } = render(<Empty />);
+        expect(container).toMatchSnapshot();
+    });
+});
diff --git a/packages/shared-components/src/rich-list/RichList/RichList.tsx b/packages/shared-components/src/rich-list/RichList/RichList.tsx
new file mode 100644
index 0000000000..549491e299
--- /dev/null
+++ b/packages/shared-components/src/rich-list/RichList/RichList.tsx
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React, { type HTMLProps, type JSX, type PropsWithChildren, useId } from "react";
+import classNames from "classnames";
+
+import styles from "./RichList.module.css";
+import { Flex } from "../../utils/Flex";
+import { useListKeyboardNavigation } from "../../hooks/useListKeyboardNavigation";
+
+export interface RichListProps extends HTMLProps<HTMLDivElement> {
+    /**
+     * Title to display at the top of the list
+     */
+    title: string;
+    /**
+     * Attributes to pass to the title element
+     * This can be used to set accessibility attributes like `aria-level` or `role`
+     * @example
+     * ```tsx
+     * <RichList title="My List" titleAttributes={{ role: "heading", "aria-level": 2 }}>
+     * ```
+     */
+    titleAttributes?: HTMLProps<HTMLSpanElement>;
+    /**
+     * Indicates if the list should show an empty state.
+     * The list renders its children in a span instead of an ul.
+     */
+    isEmpty?: boolean;
+}
+
+/**
+ * A list component with a title and children.
+ *
+ * @example
+ * ```tsx
+ * <RichList title="My List">
+ *   <RichItem ... />
+ *   <RichItem ... />
+ * </RichList>
+ * ```
+ */
+export function RichList({
+    children,
+    title,
+    className,
+    titleAttributes,
+    isEmpty = false,
+    ...props
+}: PropsWithChildren<RichListProps>): JSX.Element {
+    const id = useId();
+    const { listRef, onKeyDown, onFocus } = useListKeyboardNavigation();
+
+    return (
+        <Flex className={classNames(styles.richList, className)} direction="column" {...props}>
+            <span id={id} className={styles.title} {...titleAttributes}>
+                {title}
+            </span>
+            {isEmpty ? (
+                <span className={styles.empty}>{children}</span>
+            ) : (
+                <ul
+                    ref={listRef}
+                    role="listbox"
+                    className={styles.content}
+                    aria-labelledby={id}
+                    tabIndex={0}
+                    onKeyDown={onKeyDown}
+                    onFocus={onFocus}
+                >
+                    {children}
+                </ul>
+            )}
+        </Flex>
+    );
+}
diff --git a/packages/shared-components/src/rich-list/RichList/__snapshots__/RichList.test.tsx.snap b/packages/shared-components/src/rich-list/RichList/__snapshots__/RichList.test.tsx.snap
new file mode 100644
index 0000000000..41f5407d3c
--- /dev/null
+++ b/packages/shared-components/src/rich-list/RichList/__snapshots__/RichList.test.tsx.snap
@@ -0,0 +1,189 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`RichItem renders the list 1`] = `
+<div>
+  <div
+    style="height: 220px; overflow: hidden;"
+  >
+    <div
+      class="flex richList"
+      style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+    >
+      <span
+        class="title"
+        id="_r_0_"
+      >
+        Rich List Title
+      </span>
+      <ul
+        aria-labelledby="_r_0_"
+        class="content"
+        role="listbox"
+        tabindex="0"
+      >
+        <li
+          aria-label="First Item"
+          class="richItem"
+          role="option"
+          tabindex="-1"
+        >
+          <div
+            class="flex avatar"
+            style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+          >
+            <div
+              style="width: 32px; height: 32px; background-color: rgb(204, 204, 204); border-radius: 50%;"
+            />
+          </div>
+          <span
+            class="title"
+          >
+            First Item
+          </span>
+          <span
+            class="description"
+          >
+            description
+          </span>
+        </li>
+        <li
+          aria-label="Second Item"
+          aria-selected="true"
+          class="richItem"
+          role="option"
+          tabindex="-1"
+        >
+          <div
+            aria-hidden="true"
+            class="flex checkmark"
+            style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+          >
+            <svg
+              color="var(--cpd-color-icon-on-solid-primary)"
+              fill="currentColor"
+              height="24px"
+              viewBox="0 0 24 24"
+              width="24px"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+              />
+            </svg>
+          </div>
+          <span
+            class="title"
+          >
+            Second Item
+          </span>
+          <span
+            class="description"
+          >
+            description
+          </span>
+        </li>
+        <li
+          aria-label="Third Item"
+          class="richItem"
+          role="option"
+          tabindex="-1"
+        >
+          <div
+            class="flex avatar"
+            style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+          >
+            <div
+              style="width: 32px; height: 32px; background-color: rgb(204, 204, 204); border-radius: 50%;"
+            />
+          </div>
+          <span
+            class="title"
+          >
+            Third Item
+          </span>
+          <span
+            class="description"
+          >
+            description
+          </span>
+        </li>
+        <li
+          aria-label="Fourth Item"
+          class="richItem"
+          role="option"
+          tabindex="-1"
+        >
+          <div
+            class="flex avatar"
+            style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+          >
+            <div
+              style="width: 32px; height: 32px; background-color: rgb(204, 204, 204); border-radius: 50%;"
+            />
+          </div>
+          <span
+            class="title"
+          >
+            Fourth Item
+          </span>
+          <span
+            class="description"
+          >
+            description
+          </span>
+        </li>
+        <li
+          aria-label="Fifth Item"
+          class="richItem"
+          role="option"
+          tabindex="-1"
+        >
+          <div
+            class="flex avatar"
+            style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+          >
+            <div
+              style="width: 32px; height: 32px; background-color: rgb(204, 204, 204); border-radius: 50%;"
+            />
+          </div>
+          <span
+            class="title"
+          >
+            Fifth Item
+          </span>
+          <span
+            class="description"
+          >
+            description
+          </span>
+        </li>
+      </ul>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`RichItem renders the list with isEmpty=true 1`] = `
+<div>
+  <div
+    style="height: 220px; overflow: hidden;"
+  >
+    <div
+      class="flex richList"
+      style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+    >
+      <span
+        class="title"
+        id="_r_1_"
+      >
+        Rich List Title
+      </span>
+      <span
+        class="empty"
+      >
+        No items available
+      </span>
+    </div>
+  </div>
+</div>
+`;
diff --git a/packages/shared-components/src/rich-list/RichList/index.ts b/packages/shared-components/src/rich-list/RichList/index.ts
new file mode 100644
index 0000000000..88999fed3f
--- /dev/null
+++ b/packages/shared-components/src/rich-list/RichList/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+export { RichList } from "./RichList";
diff --git a/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.module.css b/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.module.css
new file mode 100644
index 0000000000..9b7097373c
--- /dev/null
+++ b/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.module.css
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+.view {
+    /* From figma, this should be aligned with the room header */
+    min-height: 64px;
+    box-sizing: border-box;
+    border-bottom: var(--cpd-border-width-1) solid var(--cpd-color-bg-subtle-primary);
+    padding: 0 var(--cpd-space-3x);
+}
+
+.search {
+    /* The search button should take all the remaining space */
+    flex: 1;
+    /* !important is needed to override compound button in EW */
+    font: var(--cpd-font-body-md-regular) !important;
+    color: var(--cpd-color-text-secondary) !important;
+    min-width: 0;
+
+    svg {
+        fill: var(--cpd-color-icon-secondary);
+    }
+}
+
+.search_container {
+    flex: 1;
+
+    /* Shrink and truncate the search text */
+    white-space: nowrap;
+    overflow: hidden;
+
+    kbd {
+        font-family: inherit;
+    }
+}
+
+.search_text {
+    min-width: 0;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    text-align: start;
+}
diff --git a/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.stories.tsx b/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.stories.tsx
new file mode 100644
index 0000000000..66f5af461c
--- /dev/null
+++ b/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.stories.tsx
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React, { type JSX } from "react";
+import { fn } from "storybook/test";
+
+import type { Meta, StoryFn } from "@storybook/react-vite";
+import {
+    RoomListSearchView,
+    type RoomListSearchViewActions,
+    type RoomListSearchViewSnapshot,
+} from "./RoomListSearchView";
+import { useMockedViewModel } from "../../useMockedViewModel";
+
+type RoomListSearchProps = RoomListSearchViewSnapshot & RoomListSearchViewActions;
+
+const RoomListSearchViewWrapper = ({
+    onSearchClick,
+    onDialPadClick,
+    onExploreClick,
+    ...rest
+}: RoomListSearchProps): JSX.Element => {
+    const vm = useMockedViewModel(rest, {
+        onSearchClick,
+        onDialPadClick,
+        onExploreClick,
+    });
+    return <RoomListSearchView vm={vm} />;
+};
+
+export default {
+    title: "Room List/RoomListSearchView",
+    component: RoomListSearchViewWrapper,
+    tags: ["autodocs"],
+    args: {
+        displayExploreButton: true,
+        displayDialButton: false,
+        searchShortcut: "⌘ K",
+        onSearchClick: fn(),
+        onDialPadClick: fn(),
+        onExploreClick: fn(),
+    },
+    parameters: {
+        design: {
+            type: "figma",
+            url: "https://www.figma.com/design/vlmt46QDdE4dgXDiyBJXqp/ER-33-Left-Panel-2025?node-id=98-1979&t=vafb4zoYMNLRuAbh-4",
+        },
+    },
+} as Meta<typeof RoomListSearchViewWrapper>;
+
+const Template: StoryFn<typeof RoomListSearchViewWrapper> = (args) => <RoomListSearchViewWrapper {...args} />;
+
+export const Default = Template.bind({});
+
+export const WithDialPad = Template.bind({});
+WithDialPad.args = {
+    displayDialButton: true,
+};
+
+export const WithoutExplore = Template.bind({});
+WithoutExplore.args = {
+    displayExploreButton: false,
+};
+
+export const AllButtons = Template.bind({});
+AllButtons.args = {
+    displayExploreButton: true,
+    displayDialButton: true,
+    searchShortcut: "⌘ K",
+};
diff --git a/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.test.tsx b/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.test.tsx
new file mode 100644
index 0000000000..1a256d63b1
--- /dev/null
+++ b/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.test.tsx
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { render, screen } from "jest-matrix-react";
+import { composeStories } from "@storybook/react-vite";
+import React from "react";
+import userEvent from "@testing-library/user-event";
+
+import * as stories from "./RoomListSearchView.stories";
+import {
+    RoomListSearchView,
+    type RoomListSearchViewActions,
+    type RoomListSearchViewSnapshot,
+} from "./RoomListSearchView";
+import { MockViewModel } from "../../viewmodel/MockViewModel";
+
+const { Default, WithDialPad, WithoutExplore, AllButtons } = composeStories(stories);
+
+describe("RoomListSearchView", () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    describe("Storybook snapshots", () => {
+        it("renders the default state", () => {
+            const { container } = render(<Default />);
+            expect(container).toMatchSnapshot();
+        });
+
+        it("renders with dial pad button", () => {
+            const { container } = render(<WithDialPad />);
+            expect(container).toMatchSnapshot();
+        });
+
+        it("renders without explore button", () => {
+            const { container } = render(<WithoutExplore />);
+            expect(container).toMatchSnapshot();
+        });
+
+        it("renders with all buttons visible", () => {
+            const { container } = render(<AllButtons />);
+            expect(container).toMatchSnapshot();
+        });
+    });
+
+    describe("User interactions", () => {
+        const onSearchClick = jest.fn();
+        const onDialPadClick = jest.fn();
+        const onExploreClick = jest.fn();
+
+        class TestViewModel extends MockViewModel<RoomListSearchViewSnapshot> implements RoomListSearchViewActions {
+            public onSearchClick = onSearchClick;
+            public onDialPadClick = onDialPadClick;
+            public onExploreClick = onExploreClick;
+        }
+
+        it("should call onSearchClick when search button is clicked", async () => {
+            const user = userEvent.setup();
+            const vm = new TestViewModel({
+                displayExploreButton: false,
+                displayDialButton: false,
+                searchShortcut: "⌘ K",
+            });
+
+            render(<RoomListSearchView vm={vm} />);
+
+            await user.click(screen.getByRole("button", { name: "Search ⌘ K" }));
+            expect(onSearchClick).toHaveBeenCalledTimes(1);
+        });
+
+        it("should call onDialPadClick when dial pad button is clicked", async () => {
+            const user = userEvent.setup();
+            const vm = new TestViewModel({
+                displayExploreButton: false,
+                displayDialButton: true,
+                searchShortcut: "⌘ K",
+            });
+
+            render(<RoomListSearchView vm={vm} />);
+
+            await user.click(screen.getByRole("button", { name: "Open dial pad" }));
+            expect(onDialPadClick).toHaveBeenCalledTimes(1);
+        });
+
+        it("should call onExploreClick when explore button is clicked", async () => {
+            const user = userEvent.setup();
+            const vm = new TestViewModel({
+                displayExploreButton: true,
+                displayDialButton: false,
+                searchShortcut: "⌘ K",
+            });
+
+            render(<RoomListSearchView vm={vm} />);
+
+            await user.click(screen.getByRole("button", { name: "Explore rooms" }));
+            expect(onExploreClick).toHaveBeenCalledTimes(1);
+        });
+    });
+});
diff --git a/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.tsx b/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.tsx
new file mode 100644
index 0000000000..0c652328ec
--- /dev/null
+++ b/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.tsx
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React, { type JSX, type MouseEventHandler } from "react";
+import { Button } from "@vector-im/compound-web";
+import ExploreIcon from "@vector-im/compound-design-tokens/assets/web/icons/explore";
+import SearchIcon from "@vector-im/compound-design-tokens/assets/web/icons/search";
+import DialPadIcon from "@vector-im/compound-design-tokens/assets/web/icons/dial-pad";
+
+import styles from "./RoomListSearchView.module.css";
+import { type ViewModel } from "../../viewmodel/ViewModel";
+import { useViewModel } from "../../useViewModel";
+import { Flex } from "../../utils/Flex";
+import { useI18n } from "../../utils/i18nContext";
+
+export interface RoomListSearchViewSnapshot {
+    /**
+     * Whether to display the explore button.
+     */
+    displayExploreButton: boolean;
+    /**
+     * Whether to display the dial pad button.
+     */
+    displayDialButton: boolean;
+    /**
+     * The keyboard shortcut text to display for the search action.
+     * For example: "⌘ K" on macOS or "Ctrl K" on other platforms.
+     */
+    searchShortcut: string;
+}
+
+export interface RoomListSearchViewActions {
+    /**
+     * Handles the click event on the search button.
+     */
+    onSearchClick: MouseEventHandler<HTMLButtonElement>;
+    /**
+     * Handles the click event on the dial pad button.
+     */
+    onDialPadClick: MouseEventHandler<HTMLButtonElement>;
+    /**
+     * Handles the click event on the explore button.
+     */
+    onExploreClick: MouseEventHandler<HTMLButtonElement>;
+}
+
+/**
+ * The view model for the room list search component.
+ */
+export type RoomListSearchViewModel = ViewModel<RoomListSearchViewSnapshot> & RoomListSearchViewActions;
+
+interface RoomListSearchViewProps {
+    /**
+     * The view model for the room list search component.
+     */
+    vm: RoomListSearchViewModel;
+}
+
+/**
+ * A search component to be displayed at the top of the room list.
+ * The component provides search functionality, optional dial pad access, and optional room exploration.
+ *
+ * @example
+ * ```tsx
+ * <RoomListSearchView vm={roomListSearchViewModel} />
+ * ```
+ */
+export function RoomListSearchView({ vm }: Readonly<RoomListSearchViewProps>): JSX.Element {
+    const { translate: _t } = useI18n();
+    const { displayExploreButton, displayDialButton, searchShortcut } = useViewModel(vm);
+
+    return (
+        <Flex
+            data-testid="room-list-search"
+            className={styles.view}
+            role="search"
+            gap="var(--cpd-space-2x)"
+            align="center"
+        >
+            <Button
+                id="room-list-search-button"
+                className={styles.search}
+                kind="secondary"
+                size="sm"
+                Icon={SearchIcon}
+                onClick={vm.onSearchClick}
+            >
+                <Flex className={styles["search_container"]} as="span" justify="space-between">
+                    <span className={styles["search_text"]}>{_t("action|search")}</span>
+                    <kbd>{searchShortcut}</kbd>
+                </Flex>
+            </Button>
+            {displayDialButton && (
+                <Button
+                    kind="secondary"
+                    size="sm"
+                    Icon={DialPadIcon}
+                    iconOnly={true}
+                    aria-label={_t("left_panel|open_dial_pad")}
+                    onClick={vm.onDialPadClick}
+                />
+            )}
+            {displayExploreButton && (
+                <Button
+                    kind="secondary"
+                    size="sm"
+                    Icon={ExploreIcon}
+                    iconOnly={true}
+                    aria-label={_t("action|explore_rooms")}
+                    onClick={vm.onExploreClick}
+                />
+            )}
+        </Flex>
+    );
+}
diff --git a/packages/shared-components/src/room-list/RoomListSearchView/__snapshots__/RoomListSearchView.test.tsx.snap b/packages/shared-components/src/room-list/RoomListSearchView/__snapshots__/RoomListSearchView.test.tsx.snap
new file mode 100644
index 0000000000..689ea2ad8d
--- /dev/null
+++ b/packages/shared-components/src/room-list/RoomListSearchView/__snapshots__/RoomListSearchView.test.tsx.snap
@@ -0,0 +1,290 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`RoomListSearchView Storybook snapshots renders the default state 1`] = `
+<div>
+  <div
+    class="flex view"
+    data-testid="room-list-search"
+    role="search"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+  >
+    <button
+      class="_button_187yx_8 search _has-icon_187yx_57"
+      data-kind="secondary"
+      data-size="sm"
+      id="room-list-search-button"
+      role="button"
+      tabindex="0"
+    >
+      <svg
+        aria-hidden="true"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M15.05 16.463a7.5 7.5 0 1 1 1.414-1.414l3.243 3.244a1 1 0 0 1-1.414 1.414zM16 10.5a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0"
+        />
+      </svg>
+      <span
+        class="flex search_container"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: space-between; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+      >
+        <span
+          class="search_text"
+        >
+          Search
+        </span>
+        <kbd>
+          ⌘ K
+        </kbd>
+      </span>
+    </button>
+    <button
+      aria-label="Explore rooms"
+      class="_button_187yx_8 _has-icon_187yx_57 _icon-only_187yx_50"
+      data-kind="secondary"
+      data-size="sm"
+      role="button"
+      tabindex="0"
+    >
+      <svg
+        aria-hidden="true"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 13a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 12q0-.424.287-.713A.97.97 0 0 1 12 11q.424 0 .713.287.287.288.287.713 0 .424-.287.713A.97.97 0 0 1 12 13m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22m0-2q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4 6.325 6.325 4 12t2.325 5.675T12 20m0 0q-3.35 0-5.675-2.325T4 12t2.325-5.675T12 4t5.675 2.325T20 12t-2.325 5.675T12 20m1.675-5.85q.15-.075.275-.2t.2-.275l2.925-6.25q.125-.25-.062-.437-.188-.188-.438-.063l-6.25 2.925q-.15.075-.275.2t-.2.275l-2.925 6.25q-.125.25.063.438.186.186.437.062z"
+        />
+      </svg>
+    </button>
+  </div>
+</div>
+`;
+
+exports[`RoomListSearchView Storybook snapshots renders with all buttons visible 1`] = `
+<div>
+  <div
+    class="flex view"
+    data-testid="room-list-search"
+    role="search"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+  >
+    <button
+      class="_button_187yx_8 search _has-icon_187yx_57"
+      data-kind="secondary"
+      data-size="sm"
+      id="room-list-search-button"
+      role="button"
+      tabindex="0"
+    >
+      <svg
+        aria-hidden="true"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M15.05 16.463a7.5 7.5 0 1 1 1.414-1.414l3.243 3.244a1 1 0 0 1-1.414 1.414zM16 10.5a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0"
+        />
+      </svg>
+      <span
+        class="flex search_container"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: space-between; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+      >
+        <span
+          class="search_text"
+        >
+          Search
+        </span>
+        <kbd>
+          ⌘ K
+        </kbd>
+      </span>
+    </button>
+    <button
+      aria-label="Open dial pad"
+      class="_button_187yx_8 _has-icon_187yx_57 _icon-only_187yx_50"
+      data-kind="secondary"
+      data-size="sm"
+      role="button"
+      tabindex="0"
+    >
+      <svg
+        aria-hidden="true"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 18.6c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8M6.6 2.4c-.99 0-1.8.81-1.8 1.8S5.61 6 6.6 6s1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m0 5.4c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m0 5.4c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8M17.4 6c.99 0 1.8-.81 1.8-1.8s-.81-1.8-1.8-1.8-1.8.81-1.8 1.8.81 1.8 1.8 1.8M12 13.2c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m5.4 0c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m0-5.4c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m-5.4 0c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m0-5.4c-.99 0-1.8.81-1.8 1.8S11.01 6 12 6s1.8-.81 1.8-1.8-.81-1.8-1.8-1.8"
+        />
+      </svg>
+    </button>
+    <button
+      aria-label="Explore rooms"
+      class="_button_187yx_8 _has-icon_187yx_57 _icon-only_187yx_50"
+      data-kind="secondary"
+      data-size="sm"
+      role="button"
+      tabindex="0"
+    >
+      <svg
+        aria-hidden="true"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 13a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 12q0-.424.287-.713A.97.97 0 0 1 12 11q.424 0 .713.287.287.288.287.713 0 .424-.287.713A.97.97 0 0 1 12 13m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22m0-2q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4 6.325 6.325 4 12t2.325 5.675T12 20m0 0q-3.35 0-5.675-2.325T4 12t2.325-5.675T12 4t5.675 2.325T20 12t-2.325 5.675T12 20m1.675-5.85q.15-.075.275-.2t.2-.275l2.925-6.25q.125-.25-.062-.437-.188-.188-.438-.063l-6.25 2.925q-.15.075-.275.2t-.2.275l-2.925 6.25q-.125.25.063.438.186.186.437.062z"
+        />
+      </svg>
+    </button>
+  </div>
+</div>
+`;
+
+exports[`RoomListSearchView Storybook snapshots renders with dial pad button 1`] = `
+<div>
+  <div
+    class="flex view"
+    data-testid="room-list-search"
+    role="search"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+  >
+    <button
+      class="_button_187yx_8 search _has-icon_187yx_57"
+      data-kind="secondary"
+      data-size="sm"
+      id="room-list-search-button"
+      role="button"
+      tabindex="0"
+    >
+      <svg
+        aria-hidden="true"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M15.05 16.463a7.5 7.5 0 1 1 1.414-1.414l3.243 3.244a1 1 0 0 1-1.414 1.414zM16 10.5a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0"
+        />
+      </svg>
+      <span
+        class="flex search_container"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: space-between; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+      >
+        <span
+          class="search_text"
+        >
+          Search
+        </span>
+        <kbd>
+          ⌘ K
+        </kbd>
+      </span>
+    </button>
+    <button
+      aria-label="Open dial pad"
+      class="_button_187yx_8 _has-icon_187yx_57 _icon-only_187yx_50"
+      data-kind="secondary"
+      data-size="sm"
+      role="button"
+      tabindex="0"
+    >
+      <svg
+        aria-hidden="true"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 18.6c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8M6.6 2.4c-.99 0-1.8.81-1.8 1.8S5.61 6 6.6 6s1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m0 5.4c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m0 5.4c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8M17.4 6c.99 0 1.8-.81 1.8-1.8s-.81-1.8-1.8-1.8-1.8.81-1.8 1.8.81 1.8 1.8 1.8M12 13.2c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m5.4 0c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m0-5.4c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m-5.4 0c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m0-5.4c-.99 0-1.8.81-1.8 1.8S11.01 6 12 6s1.8-.81 1.8-1.8-.81-1.8-1.8-1.8"
+        />
+      </svg>
+    </button>
+    <button
+      aria-label="Explore rooms"
+      class="_button_187yx_8 _has-icon_187yx_57 _icon-only_187yx_50"
+      data-kind="secondary"
+      data-size="sm"
+      role="button"
+      tabindex="0"
+    >
+      <svg
+        aria-hidden="true"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 13a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 12q0-.424.287-.713A.97.97 0 0 1 12 11q.424 0 .713.287.287.288.287.713 0 .424-.287.713A.97.97 0 0 1 12 13m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22m0-2q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4 6.325 6.325 4 12t2.325 5.675T12 20m0 0q-3.35 0-5.675-2.325T4 12t2.325-5.675T12 4t5.675 2.325T20 12t-2.325 5.675T12 20m1.675-5.85q.15-.075.275-.2t.2-.275l2.925-6.25q.125-.25-.062-.437-.188-.188-.438-.063l-6.25 2.925q-.15.075-.275.2t-.2.275l-2.925 6.25q-.125.25.063.438.186.186.437.062z"
+        />
+      </svg>
+    </button>
+  </div>
+</div>
+`;
+
+exports[`RoomListSearchView Storybook snapshots renders without explore button 1`] = `
+<div>
+  <div
+    class="flex view"
+    data-testid="room-list-search"
+    role="search"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+  >
+    <button
+      class="_button_187yx_8 search _has-icon_187yx_57"
+      data-kind="secondary"
+      data-size="sm"
+      id="room-list-search-button"
+      role="button"
+      tabindex="0"
+    >
+      <svg
+        aria-hidden="true"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M15.05 16.463a7.5 7.5 0 1 1 1.414-1.414l3.243 3.244a1 1 0 0 1-1.414 1.414zM16 10.5a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0"
+        />
+      </svg>
+      <span
+        class="flex search_container"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: space-between; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+      >
+        <span
+          class="search_text"
+        >
+          Search
+        </span>
+        <kbd>
+          ⌘ K
+        </kbd>
+      </span>
+    </button>
+  </div>
+</div>
+`;
diff --git a/packages/shared-components/src/room-list/RoomListSearchView/index.ts b/packages/shared-components/src/room-list/RoomListSearchView/index.ts
new file mode 100644
index 0000000000..a750dca7db
--- /dev/null
+++ b/packages/shared-components/src/room-list/RoomListSearchView/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+export type { RoomListSearchViewModel, RoomListSearchViewSnapshot } from "./RoomListSearchView";
+export { RoomListSearchView } from "./RoomListSearchView";
diff --git a/packages/shared-components/src/test/setupTests.ts b/packages/shared-components/src/test/setupTests.ts
new file mode 100644
index 0000000000..43ffc0c071
--- /dev/null
+++ b/packages/shared-components/src/test/setupTests.ts
@@ -0,0 +1,22 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import fetchMock from "fetch-mock-jest";
+
+import { setLanguage } from "../../src/utils/i18n";
+import en from "../../../../src/i18n/strings/en_EN.json";
+
+export function setupLanguageMock(): void {
+    fetchMock
+        .get("/i18n/languages.json", {
+            en: "en_EN.json",
+        })
+        .get("end:en_EN.json", en);
+}
+setupLanguageMock();
+
+setLanguage("en");
diff --git a/packages/shared-components/src/test/utils/jest-matrix-react.tsx b/packages/shared-components/src/test/utils/jest-matrix-react.tsx
new file mode 100644
index 0000000000..d610d87211
--- /dev/null
+++ b/packages/shared-components/src/test/utils/jest-matrix-react.tsx
@@ -0,0 +1,55 @@
+/*
+Copyright 2025 Element Creations Ltd.
+Copyright 2024 New Vector Ltd.
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+// Copied from element-web/test/test-utils because, seemingly, if we
+// set that as the modules directory to use it directly, it fails to
+// actually put the right thing in the context somehow.
+
+import React, { type ReactElement } from "react";
+// eslint-disable-next-line no-restricted-imports
+import { render, type RenderOptions } from "@testing-library/react";
+import { TooltipProvider } from "@vector-im/compound-web";
+
+import { I18nApi, I18nContext } from "../..";
+
+const wrapWithTooltipProvider = (Wrapper: RenderOptions["wrapper"]) => {
+    return ({ children }: { children: React.ReactNode }) => {
+        if (Wrapper) {
+            return (
+                <I18nContext.Provider value={new I18nApi()}>
+                    <Wrapper>
+                        <TooltipProvider>{children}</TooltipProvider>
+                    </Wrapper>
+                </I18nContext.Provider>
+            );
+        } else {
+            return (
+                <I18nContext.Provider value={new I18nApi()}>
+                    <TooltipProvider>{children}</TooltipProvider>
+                </I18nContext.Provider>
+            );
+        }
+    };
+};
+
+const customRender = (ui: ReactElement, options: RenderOptions = {}): ReturnType<typeof render> => {
+    return render(ui, {
+        ...options,
+        wrapper: wrapWithTooltipProvider(options?.wrapper) as RenderOptions["wrapper"],
+    }) as ReturnType<typeof render>;
+};
+
+// eslint-disable-next-line no-restricted-imports
+export * from "@testing-library/react";
+
+/**
+ * This custom render function wraps your component with a TooltipProvider.
+ * See https://testing-library.com/docs/react-testing-library/setup/#custom-render
+ */
+export { customRender as render };
diff --git a/packages/shared-components/src/useMockedViewModel.ts b/packages/shared-components/src/useMockedViewModel.ts
new file mode 100644
index 0000000000..6f13075351
--- /dev/null
+++ b/packages/shared-components/src/useMockedViewModel.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { useMemo } from "react";
+
+import { MockViewModel, type ViewModel } from "./viewmodel";
+
+/**
+ * Hook helper to return a mocked view model created with the given snapshot and actions.
+ * This is useful for testing components in isolation with a mocked view model and allows to use primitive types in stories.
+ *
+ * @param snapshot
+ * @param actions
+ */
+export function useMockedViewModel<S, A>(snapshot: S, actions: A): ViewModel<S> & A {
+    return useMemo(() => {
+        const vm = new MockViewModel<S>(snapshot);
+        Object.assign(vm, actions);
+        return vm as unknown as ViewModel<S> & A;
+    }, [snapshot, actions]);
+}
diff --git a/packages/shared-components/src/useViewModel.ts b/packages/shared-components/src/useViewModel.ts
new file mode 100644
index 0000000000..20c7070bff
--- /dev/null
+++ b/packages/shared-components/src/useViewModel.ts
@@ -0,0 +1,21 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { useSyncExternalStore } from "react";
+
+import { type ViewModel } from "./viewmodel/ViewModel";
+
+/**
+ * A small wrapper around useSyncExternalStore to use a view model in a shared component view
+ * @param vm The view model to use
+ * @returns The current snapshot
+ */
+export function useViewModel<T>(vm: ViewModel<T>): T {
+    // We need to pass the same getSnapshot function as getServerSnapshot as this
+    // is used when making the HTML chat export.
+    return useSyncExternalStore(vm.subscribe, vm.getSnapshot, vm.getSnapshot);
+}
diff --git a/res/css/components/views/utils/_Box.pcss b/packages/shared-components/src/utils/Box/Box.module.css
similarity index 88%
rename from res/css/components/views/utils/_Box.pcss
rename to packages/shared-components/src/utils/Box/Box.module.css
index 5721e32633..7daf7889b7 100644
--- a/res/css/components/views/utils/_Box.pcss
+++ b/packages/shared-components/src/utils/Box/Box.module.css
@@ -6,14 +6,14 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-.mx_Box--flex {
+.box-flex {
     flex: var(--mx-box-flex, unset);
 }
 
-.mx_Box--shrink {
+.box-shrink {
     flex-shrink: var(--mx-box-shrink, unset);
 }
 
-.mx_Box--grow {
+.box-grow {
     flex-grow: var(--mx-box-grow, unset);
 }
diff --git a/src/components/utils/Box.tsx b/packages/shared-components/src/utils/Box/Box.tsx
similarity index 82%
rename from src/components/utils/Box.tsx
rename to packages/shared-components/src/utils/Box/Box.tsx
index 2c5dfa56d2..8f31984664 100644
--- a/src/components/utils/Box.tsx
+++ b/packages/shared-components/src/utils/Box/Box.tsx
@@ -9,7 +9,9 @@ Please see LICENSE files in the repository root for full details.
 import classNames from "classnames";
 import React, { type JSX, useMemo } from "react";
 
-type FlexProps = {
+import styles from "./Box.module.css";
+
+type BoxProps = {
     /**
      * The type of the HTML element
      * @default div
@@ -51,7 +53,7 @@ export function Box({
     className,
     children,
     ...props
-}: React.PropsWithChildren<FlexProps>): JSX.Element {
+}: React.PropsWithChildren<BoxProps>): JSX.Element {
     const style = useMemo(() => {
         const style: Record<string, any> = {};
         if (flex) style["--mx-box-flex"] = flex;
@@ -64,10 +66,10 @@ export function Box({
         as,
         {
             ...props,
-            className: classNames("mx_Box", className, {
-                "mx_Box--flex": !!flex,
-                "mx_Box--shrink": !!shrink,
-                "mx_Box--grow": !!grow,
+            className: classNames(className, {
+                [styles["box-flex"]]: !!flex,
+                [styles["box-shrink"]]: !!shrink,
+                [styles["box-grow"]]: !!grow,
             }),
             style,
         },
diff --git a/packages/shared-components/src/utils/Box/index.ts b/packages/shared-components/src/utils/Box/index.ts
new file mode 100644
index 0000000000..ad4f27e89d
--- /dev/null
+++ b/packages/shared-components/src/utils/Box/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+export { Box } from "./Box";
diff --git a/packages/shared-components/src/utils/DateUtils.ts b/packages/shared-components/src/utils/DateUtils.ts
new file mode 100644
index 0000000000..146aeecbd2
--- /dev/null
+++ b/packages/shared-components/src/utils/DateUtils.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+/**
+ * Formats a number of seconds into a human-readable string.
+ * @param inSeconds
+ */
+export function formatSeconds(inSeconds: number): string {
+    const isNegative = inSeconds < 0;
+    inSeconds = Math.abs(inSeconds);
+
+    const hours = Math.floor(inSeconds / (60 * 60))
+        .toFixed(0)
+        .padStart(2, "0");
+    const minutes = Math.floor((inSeconds % (60 * 60)) / 60)
+        .toFixed(0)
+        .padStart(2, "0");
+    const seconds = Math.floor((inSeconds % (60 * 60)) % 60)
+        .toFixed(0)
+        .padStart(2, "0");
+
+    let output = "";
+    if (hours !== "00") output += `${hours}:`;
+    output += `${minutes}:${seconds}`;
+
+    if (isNegative) {
+        output = "-" + output;
+    }
+
+    return output;
+}
diff --git a/res/css/components/views/utils/_Flex.pcss b/packages/shared-components/src/utils/Flex/Flex.module.css
similarity index 97%
rename from res/css/components/views/utils/_Flex.pcss
rename to packages/shared-components/src/utils/Flex/Flex.module.css
index 9cfa6424f0..dba85c1faa 100644
--- a/res/css/components/views/utils/_Flex.pcss
+++ b/packages/shared-components/src/utils/Flex/Flex.module.css
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-.mx_Flex {
+.flex {
     display: var(--mx-flex-display, unset);
     flex-direction: var(--mx-flex-direction, unset);
     align-items: var(--mx-flex-align, unset);
diff --git a/src/components/utils/Flex.tsx b/packages/shared-components/src/utils/Flex/Flex.tsx
similarity index 96%
rename from src/components/utils/Flex.tsx
rename to packages/shared-components/src/utils/Flex/Flex.tsx
index 0a8c3c2fa4..7404bf1874 100644
--- a/src/components/utils/Flex.tsx
+++ b/packages/shared-components/src/utils/Flex/Flex.tsx
@@ -9,6 +9,8 @@ Please see LICENSE files in the repository root for full details.
 import classNames from "classnames";
 import React, { type JSX, type ComponentProps, type JSXElementConstructor, useMemo } from "react";
 
+import styles from "./Flex.module.css";
+
 type FlexProps<T extends keyof JSX.IntrinsicElements | JSXElementConstructor<any>> = {
     /**
      * The type of the HTML element
@@ -82,5 +84,5 @@ export function Flex<T extends keyof JSX.IntrinsicElements | JSXElementConstruct
         [align, direction, display, gap, justify, wrap],
     );
 
-    return React.createElement(as, { ...props, className: classNames("mx_Flex", className), style }, children);
+    return React.createElement(as, { ...props, className: classNames(styles.flex, className), style }, children);
 }
diff --git a/packages/shared-components/src/utils/Flex/index.ts b/packages/shared-components/src/utils/Flex/index.ts
new file mode 100644
index 0000000000..bea76c841f
--- /dev/null
+++ b/packages/shared-components/src/utils/Flex/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+export { Flex } from "./Flex";
diff --git a/packages/shared-components/src/utils/FormattingUtils.ts b/packages/shared-components/src/utils/FormattingUtils.ts
new file mode 100644
index 0000000000..851d88aa8c
--- /dev/null
+++ b/packages/shared-components/src/utils/FormattingUtils.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+/**
+ * format a size in bytes into a human readable form
+ * e.g: 1024 -> 1.00 KB
+ */
+export function formatBytes(bytes: number, decimals = 2): string {
+    if (bytes === 0) return "0 Bytes";
+
+    const k = 1024;
+    const dm = decimals < 0 ? 0 : decimals;
+    const sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+
+    const i = Math.floor(Math.log(bytes) / Math.log(k));
+
+    return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + " " + sizes[i];
+}
diff --git a/packages/shared-components/src/utils/I18nApi.test.ts b/packages/shared-components/src/utils/I18nApi.test.ts
new file mode 100644
index 0000000000..2b3431f07c
--- /dev/null
+++ b/packages/shared-components/src/utils/I18nApi.test.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { type TranslationKey } from "../i18nKeys";
+import { I18nApi } from "./I18nApi";
+
+describe("I18nApi", () => {
+    it("can register a translation and use it", () => {
+        const i18n = new I18nApi();
+        i18n.register({
+            "hello.world": {
+                en: "Hello, World!",
+            },
+        });
+
+        expect(i18n.translate("hello.world" as TranslationKey)).toBe("Hello, World!");
+    });
+});
diff --git a/src/modules/I18nApi.ts b/packages/shared-components/src/utils/I18nApi.ts
similarity index 79%
rename from src/modules/I18nApi.ts
rename to packages/shared-components/src/utils/I18nApi.ts
index 43c101eca6..20d641f5ce 100644
--- a/src/modules/I18nApi.ts
+++ b/packages/shared-components/src/utils/I18nApi.ts
@@ -6,16 +6,17 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { type I18nApi as II18nApi, type Variables, type Translations } from "@element-hq/element-web-module-api";
-import counterpart from "counterpart";
 
-import { _t, getCurrentLanguage, type TranslationKey } from "../languageHandler.tsx";
+import { humanizeTime } from "./humanize";
+import { _t, getLocale, registerTranslations } from "./i18n";
+import { type TranslationKey } from "../i18nKeys";
 
 export class I18nApi implements II18nApi {
     /**
      * Read the current language of the user in IETF Language Tag format
      */
     public get language(): string {
-        return getCurrentLanguage();
+        return getLocale();
     }
 
     /**
@@ -32,7 +33,7 @@ export class I18nApi implements II18nApi {
 
         // Finally, tell counterpart about our translations
         for (const lang in langs) {
-            counterpart.registerTranslations(lang, langs[lang]);
+            registerTranslations(lang, langs[lang]);
         }
     }
 
@@ -44,4 +45,8 @@ export class I18nApi implements II18nApi {
     public translate(key: TranslationKey, variables?: Variables): string {
         return _t(key, variables);
     }
+
+    public humanizeTime(timeMillis: number): string {
+        return humanizeTime(timeMillis, this);
+    }
 }
diff --git a/packages/shared-components/src/utils/humanize.test.ts b/packages/shared-components/src/utils/humanize.test.ts
new file mode 100644
index 0000000000..1c07dd3d04
--- /dev/null
+++ b/packages/shared-components/src/utils/humanize.test.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { humanizeTime } from "./humanize";
+
+describe("humanizeTime", () => {
+    const now = new Date("2025-08-01T12:00:00Z").getTime();
+
+    beforeAll(() => {
+        jest.useFakeTimers().setSystemTime(now);
+    });
+
+    it.each([
+        // Past
+        ["returns 'a few seconds ago' for <15s ago", now - 5000, "a few seconds ago"],
+        ["returns 'about a minute ago' for <75s ago", now - 60000, "about a minute ago"],
+        ["returns '20 minutes ago' for <45min ago", now - 20 * 60000, "20 minutes ago"],
+        ["returns 'about an hour ago' for <75min ago", now - 70 * 60000, "about an hour ago"],
+        ["returns '5 hours ago' for <23h ago", now - 5 * 3600000, "5 hours ago"],
+        ["returns 'about a day ago' for <26h ago", now - 25 * 3600000, "about a day ago"],
+        ["returns '3 days ago' for >26h ago", now - 3 * 24 * 3600000, "3 days ago"],
+        // Future
+        ["returns 'a few seconds from now' for <15s ahead", now + 5000, "a few seconds from now"],
+        ["returns 'about a minute from now' for <75s ahead", now + 60000, "about a minute from now"],
+        ["returns '20 minutes from now' for <45min ahead", now + 20 * 60000, "20 minutes from now"],
+        ["returns 'about an hour from now' for <75min ahead", now + 70 * 60000, "about an hour from now"],
+        ["returns '5 hours from now' for <23h ahead", now + 5 * 3600000, "5 hours from now"],
+        ["returns 'about a day from now' for <26h ahead", now + 25 * 3600000, "about a day from now"],
+        ["returns '3 days from now' for >26h ahead", now + 3 * 24 * 3600000, "3 days from now"],
+    ])("%s", (_, date, expected) => {
+        expect(humanizeTime(date)).toBe(expected);
+    });
+});
diff --git a/src/utils/humanize.ts b/packages/shared-components/src/utils/humanize.ts
similarity index 89%
rename from src/utils/humanize.ts
rename to packages/shared-components/src/utils/humanize.ts
index 616ee93781..1e00e69a9d 100644
--- a/src/utils/humanize.ts
+++ b/packages/shared-components/src/utils/humanize.ts
@@ -6,7 +6,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { _t } from "../languageHandler";
+import { type I18nApi } from "@element-hq/element-web-module-api";
+
+import { _t as _tFromModule } from "./i18n";
 
 // These are the constants we use for when to break the text
 const MILLISECONDS_RECENT = 15000;
@@ -21,13 +23,15 @@ const HOURS_1_DAY = 26;
  * @param {number} timeMillis The time in millis to compare against.
  * @returns {string} The humanized time.
  */
-export function humanizeTime(timeMillis: number): string {
+export function humanizeTime(timeMillis: number, i18nApi?: I18nApi): string {
     const now = Date.now();
     let msAgo = now - timeMillis;
     const minutes = Math.abs(Math.ceil(msAgo / 60000));
     const hours = Math.ceil(minutes / 60);
     const days = Math.ceil(hours / 24);
 
+    const _t = i18nApi?.translate ?? _tFromModule;
+
     if (msAgo >= 0) {
         // Past
         if (msAgo <= MILLISECONDS_RECENT) return _t("time|few_seconds_ago");
diff --git a/packages/shared-components/src/utils/i18n.test.ts b/packages/shared-components/src/utils/i18n.test.ts
new file mode 100644
index 0000000000..a578f7bcfe
--- /dev/null
+++ b/packages/shared-components/src/utils/i18n.test.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import counterpart from "counterpart";
+
+import { registerTranslations, setMissingEntryGenerator, getLocale, setLocale } from "./i18n";
+
+describe("i18n utils", () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it("should wrap registerTranslations", () => {
+        jest.spyOn(counterpart, "registerTranslations");
+
+        registerTranslations("en", { test: "This is a test" });
+        expect(counterpart.registerTranslations).toHaveBeenCalledWith("en", { test: "This is a test" });
+    });
+
+    it("should wrap setMissingEntryGenerator", () => {
+        jest.spyOn(counterpart, "setMissingEntryGenerator");
+
+        const dummyFn = jest.fn();
+
+        setMissingEntryGenerator(dummyFn);
+        expect(counterpart.setMissingEntryGenerator).toHaveBeenCalledWith(dummyFn);
+    });
+
+    it("should wrap getLocale", () => {
+        jest.spyOn(counterpart, "getLocale");
+
+        getLocale();
+        expect(counterpart.getLocale).toHaveBeenCalled();
+    });
+
+    it("should wrap setLocale", () => {
+        jest.spyOn(counterpart, "setLocale");
+
+        setLocale("en");
+        expect(counterpart.setLocale).toHaveBeenCalledWith("en");
+    });
+});
diff --git a/packages/shared-components/src/utils/i18n.tsx b/packages/shared-components/src/utils/i18n.tsx
new file mode 100644
index 0000000000..2ce1f78005
--- /dev/null
+++ b/packages/shared-components/src/utils/i18n.tsx
@@ -0,0 +1,439 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+/*
+ * Translates text and optionally also replaces XML-ish elements in the text with e.g. React components
+ * @param {string} text The untranslated text, e.g "click <a>here</a> now to %(foo)s".
+ * @param {object} variables Variable substitutions, e.g { foo: 'bar' }
+ * @param {object} tags Tag substitutions e.g. { 'a': (sub) => <a>{sub}</a> }
+ *
+ * In both variables and tags, the values to substitute with can be either simple strings, React components,
+ * or functions that return the value to use in the substitution (e.g. return a React component). In case of
+ * a tag replacement, the function receives as the argument the text inside the element corresponding to the tag.
+ *
+ * Use tag substitutions if you need to translate text between tags (e.g. "<a>Click here!</a>"), otherwise
+ * you will end up with literal "<a>" in your output, rather than HTML. Note that you can also use variable
+ * substitution to insert React components, but you can't use it to translate text between tags.
+ *
+ * @return a React <span> component if any non-strings were used in substitutions, otherwise a string
+ */
+import React from "react";
+import { KEY_SEPARATOR } from "matrix-web-i18n";
+import counterpart from "counterpart";
+
+import type { TranslationKey } from "../index";
+
+// @ts-ignore - $webapp is a webpack resolve alias pointing to the output directory, see webpack config
+import webpackLangJsonUrl from "$webapp/i18n/languages.json";
+
+export { KEY_SEPARATOR, normalizeLanguageKey, getNormalizedLanguageKeys } from "matrix-web-i18n";
+
+const i18nFolder = "i18n/";
+
+// Control whether to also return original, untranslated strings
+// Useful for debugging and testing
+const ANNOTATE_STRINGS = false;
+
+// We use english strings as keys, some of which contain full stops
+counterpart.setSeparator(KEY_SEPARATOR);
+
+// see `translateWithFallback` for an explanation of fallback handling
+const FALLBACK_LOCALE = "en";
+counterpart.setFallbackLocale(FALLBACK_LOCALE);
+
+// export wrappers around these functions because if we used counterpart directly from
+// element-web, it operates on a different instance of counterpart
+export function registerTranslations(locale: string, data: object): void {
+    counterpart.registerTranslations(locale, data);
+}
+
+export function setMissingEntryGenerator(callback: (value: string) => void): void {
+    counterpart.setMissingEntryGenerator(callback);
+}
+
+export function getLocale(): string {
+    return counterpart.getLocale();
+}
+
+export function setLocale(value: string): string {
+    return counterpart.setLocale(value);
+}
+
+// Function which only purpose is to mark that a string is translatable
+// Does not actually do anything. It's helpful for automatic extraction of translatable strings
+export function _td(s: TranslationKey): TranslationKey {
+    return s;
+}
+
+function isValidTranslation(translated: string): boolean {
+    return typeof translated === "string" && !translated.startsWith("missing translation:");
+}
+
+/**
+ * to improve screen reader experience translations that are not in the main page language
+ * eg a translation that fell back to english from another language
+ * should be wrapped with an appropriate `lang='en'` attribute
+ * counterpart's `translate` doesn't expose a way to determine if the resulting translation
+ * is in the target locale or a fallback locale
+ * for this reason, force fallbackLocale === locale in the first call to translate
+ * and fallback 'manually' so we can mark fallback strings appropriately
+ * */
+const translateWithFallback = (text: string, options?: IVariables): { translated: string; isFallback?: boolean } => {
+    const translated = counterpart.translate(text, { ...options, fallbackLocale: counterpart.getLocale() });
+    if (isValidTranslation(translated)) {
+        return { translated };
+    }
+
+    const fallbackTranslated = counterpart.translate(text, { ...options, locale: FALLBACK_LOCALE });
+    if (isValidTranslation(fallbackTranslated)) {
+        return { translated: fallbackTranslated, isFallback: true };
+    }
+
+    // Even the translation via FALLBACK_LOCALE failed; this can happen if
+    //
+    // 1. The string isn't in the translations dictionary, usually because you're in develop
+    // and haven't run yarn i18n
+    // 2. Loading the translation resources over the network failed, which can happen due to
+    // to network or if the client tried to load a translation that's been removed from the
+    // server.
+    //
+    // At this point, its the lesser evil to show the i18n key which will be in English but not human-friendly,
+    // so the user can still make out *something*, rather than an opaque possibly-untranslated "missing translation" error.
+    return { translated: text, isFallback: true };
+};
+
+// Wrapper for counterpart's translation function so that it handles nulls and undefineds properly
+// Takes the same arguments as counterpart.translate()
+function safeCounterpartTranslate(text: string, variables?: IVariables): { translated: string; isFallback?: boolean } {
+    // Don't do substitutions in counterpart. We handle it ourselves so we can replace with React components
+    // However, still pass the variables to counterpart so that it can choose the correct plural if count is given
+    // It is enough to pass the count variable, but in the future counterpart might make use of other information too
+    const options: IVariables & {
+        interpolate: boolean;
+    } = { ...variables, interpolate: false };
+
+    // Horrible hack to avoid https://github.com/vector-im/element-web/issues/4191
+    // The interpolation library that counterpart uses does not support undefined/null
+    // values and instead will throw an error. This is a problem since everywhere else
+    // in JS land passing undefined/null will simply stringify instead, and when converting
+    // valid ES6 template strings to i18n strings it's extremely easy to pass undefined/null
+    // if there are no existing null guards. To avoid this making the app completely inoperable,
+    // we'll check all the values for undefined/null and stringify them here.
+    if (options && typeof options === "object") {
+        Object.keys(options).forEach((k) => {
+            if (options[k] === undefined) {
+                console.warn("safeCounterpartTranslate called with undefined interpolation name: " + k);
+                options[k] = "undefined";
+            }
+            if (options[k] === null) {
+                console.warn("safeCounterpartTranslate called with null interpolation name: " + k);
+                options[k] = "null";
+            }
+        });
+    }
+    return translateWithFallback(text, options);
+}
+
+/**
+ * The value a variable or tag can take for a translation interpolation.
+ */
+type SubstitutionValue = number | string | React.ReactNode | ((sub: string) => React.ReactNode);
+
+export interface IVariables {
+    count?: number;
+    [key: string]: SubstitutionValue;
+}
+
+export type Tags = Record<string, SubstitutionValue>;
+
+export type TranslatedString = string | React.ReactNode;
+
+// For development/testing purposes it is useful to also output the original string
+// Don't do that for release versions
+const annotateStrings = (result: TranslatedString, translationKey: TranslationKey): TranslatedString => {
+    if (!ANNOTATE_STRINGS) {
+        return result;
+    }
+
+    if (typeof result === "string") {
+        return `@@${translationKey}##${result}@@`;
+    } else {
+        return (
+            <span className="translated-string" data-orig-string={translationKey}>
+                {result}
+            </span>
+        );
+    }
+};
+
+export function _t(text: TranslationKey, variables?: IVariables): string;
+export function _t(text: TranslationKey, variables: IVariables | undefined, tags: Tags): React.ReactNode;
+export function _t(text: TranslationKey, variables?: IVariables, tags?: Tags): TranslatedString {
+    // The translation returns text so there's no XSS vector here (no unsafe HTML, no code execution)
+    const { translated } = safeCounterpartTranslate(text, variables);
+    const substituted = substitute(translated, variables, tags);
+
+    return annotateStrings(substituted, text);
+}
+
+/**
+ * Utility function to look up a string by its translation key without resolving variables & tags
+ * @param key - the translation key to return the value for
+ */
+export function lookupString(key: TranslationKey): string {
+    return safeCounterpartTranslate(key, {}).translated;
+}
+
+/*
+ * Wraps normal _t function and adds atttribution for translations that used a fallback locale
+ * Wraps translations that fell back from active locale to fallback locale with a `<span lang=<fallback locale>>`
+ * @param {string} text The untranslated text, e.g "click <a>here</a> now to %(foo)s".
+ * @param {object} variables Variable substitutions, e.g { foo: 'bar' }
+ * @param {object} tags Tag substitutions e.g. { 'a': (sub) => <a>{sub}</a> }
+ *
+ * @return a React <span> component if any non-strings were used in substitutions
+ * or translation used a fallback locale, otherwise a string
+ */
+// eslint-next-line @typescript-eslint/naming-convention
+export function _tDom(text: TranslationKey, variables?: IVariables): TranslatedString;
+export function _tDom(text: TranslationKey, variables: IVariables, tags: Tags): React.ReactNode;
+export function _tDom(text: TranslationKey, variables?: IVariables, tags?: Tags): TranslatedString {
+    // The translation returns text so there's no XSS vector here (no unsafe HTML, no code execution)
+    const { translated, isFallback } = safeCounterpartTranslate(text, variables);
+    const substituted = substitute(translated, variables, tags);
+
+    // wrap en fallback translation with lang attribute for screen readers
+    const result = isFallback ? <span lang="en">{substituted}</span> : substituted;
+
+    return annotateStrings(result, text);
+}
+
+/**
+ * Sanitizes unsafe text for the sanitizer, ensuring references to variables will not be considered
+ * replaceable by the translation functions.
+ * @param {string} text The text to sanitize.
+ * @returns {string} The sanitized text.
+ */
+export function sanitizeForTranslation(text: string): string {
+    // Add a non-breaking space so the regex doesn't trigger when translating.
+    return text.replace(/%\(([^)]*)\)/g, "%\xa0($1)");
+}
+
+/*
+ * Similar to _t(), except only does substitutions, and no translation
+ * @param {string} text The text, e.g "click <a>here</a> now to %(foo)s".
+ * @param {object} variables Variable substitutions, e.g { foo: 'bar' }
+ * @param {object} tags Tag substitutions e.g. { 'a': (sub) => <a>{sub}</a> }
+ *
+ * The values to substitute with can be either simple strings, or functions that return the value to use in
+ * the substitution (e.g. return a React component). In case of a tag replacement, the function receives as
+ * the argument the text inside the element corresponding to the tag.
+ *
+ * @return a React <span> component if any non-strings were used in substitutions, otherwise a string
+ */
+export function substitute(text: string, variables?: IVariables): string;
+export function substitute(text: string, variables: IVariables | undefined, tags: Tags | undefined): string;
+export function substitute(text: string, variables?: IVariables, tags?: Tags): string | React.ReactNode {
+    let result: React.ReactNode | string = text;
+
+    if (variables !== undefined) {
+        const regexpMapping: IVariables = {};
+        for (const variable in variables) {
+            regexpMapping[`%\\(${variable}\\)s`] = variables[variable];
+        }
+        result = replaceByRegexes(result as string, regexpMapping);
+    }
+
+    if (tags !== undefined) {
+        const regexpMapping: Tags = {};
+        for (const tag in tags) {
+            regexpMapping[`(<${tag}>(.*?)<\\/${tag}>|<${tag}>|<${tag}\\s*\\/>)`] = tags[tag];
+        }
+        result = replaceByRegexes(result as string, regexpMapping);
+    }
+
+    return result;
+}
+
+/**
+ * Replace parts of a text using regular expressions
+ * @param text - The text on which to perform substitutions
+ * @param mapping - A mapping from regular expressions in string form to replacement string or a
+ * function which will receive as the argument the capture groups defined in the regexp. E.g.
+ * { 'Hello (.?) World': (sub) => sub.toUpperCase() }
+ *
+ * @return a React <span> component if any non-strings were used in substitutions, otherwise a string
+ */
+export function replaceByRegexes(text: string, mapping: IVariables): string;
+export function replaceByRegexes(text: string, mapping: Tags): React.ReactNode;
+export function replaceByRegexes(text: string, mapping: IVariables | Tags): string | React.ReactNode {
+    // We initially store our output as an array of strings and objects (e.g. React components).
+    // This will then be converted to a string or a <span> at the end
+    const output: SubstitutionValue[] = [text];
+
+    // If we insert any components we need to wrap the output in a span. React doesn't like just an array of components.
+    let shouldWrapInSpan = false;
+
+    for (const regexpString in mapping) {
+        // TODO: Cache regexps
+        const regexp = new RegExp(regexpString, "g");
+
+        // Loop over what output we have so far and perform replacements
+        // We look for matches: if we find one, we get three parts: everything before the match, the replaced part,
+        // and everything after the match. Insert all three into the output. We need to do this because we can insert objects.
+        // Otherwise there would be no need for the splitting and we could do simple replacement.
+        let matchFoundSomewhere = false; // If we don't find a match anywhere we want to log it
+        for (let outputIndex = 0; outputIndex < output.length; outputIndex++) {
+            const inputText = output[outputIndex];
+            if (typeof inputText !== "string") {
+                // We might have inserted objects earlier, don't try to replace them
+                continue;
+            }
+
+            // process every match in the string
+            // starting with the first
+            let match = regexp.exec(inputText);
+
+            if (!match) continue;
+            matchFoundSomewhere = true;
+
+            // The textual part before the first match
+            const head = inputText.slice(0, match.index);
+
+            const parts: SubstitutionValue[] = [];
+            // keep track of prevMatch
+            let prevMatch;
+            while (match) {
+                // store prevMatch
+                prevMatch = match;
+                const capturedGroups = match.slice(2);
+
+                let replaced: SubstitutionValue;
+                // If substitution is a function, call it
+                if (mapping[regexpString] instanceof Function) {
+                    replaced = ((mapping as Tags)[regexpString] as (...subs: string[]) => string)(...capturedGroups);
+                } else {
+                    replaced = mapping[regexpString];
+                }
+
+                if (typeof replaced === "object") {
+                    shouldWrapInSpan = true;
+                }
+
+                // Here we also need to check that it actually is a string before comparing against one
+                // The head and tail are always strings
+                if (typeof replaced !== "string" || replaced !== "") {
+                    parts.push(replaced);
+                }
+
+                // try the next match
+                match = regexp.exec(inputText);
+
+                // add the text between prevMatch and this one
+                // or the end of the string if prevMatch is the last match
+                let tail;
+                if (match) {
+                    const startIndex = prevMatch.index + prevMatch[0].length;
+                    tail = inputText.slice(startIndex, match.index);
+                } else {
+                    tail = inputText.slice(prevMatch.index + prevMatch[0].length);
+                }
+                if (tail) {
+                    parts.push(tail);
+                }
+            }
+
+            // Insert in reverse order as splice does insert-before and this way we get the final order correct
+            // remove the old element at the same time
+            output.splice(outputIndex, 1, ...parts);
+
+            if (head !== "") {
+                // Don't push empty nodes, they are of no use
+                output.splice(outputIndex, 0, head);
+            }
+        }
+        if (!matchFoundSomewhere) {
+            if (
+                // The current regexp did not match anything in the input. Missing
+                // matches is entirely possible because you might choose to show some
+                // variables only in the case of e.g. plurals. It's still a bit
+                // suspicious, and could be due to an error, so log it. However, not
+                // showing count is so common that it's not worth logging. And other
+                // commonly unused variables here, if there are any.
+                regexpString !== "%\\(count\\)s" &&
+                // Ignore the `locale` option which can be used to override the locale
+                // in counterpart
+                regexpString !== "%\\(locale\\)s"
+            ) {
+                console.log(`Could not find ${regexp} in ${text}`);
+            }
+        }
+    }
+
+    if (shouldWrapInSpan) {
+        return React.createElement("span", null, ...(output as Array<number | string | React.ReactNode>));
+    } else {
+        // eslint-disable-next-line @typescript-eslint/no-base-to-string
+        return output.join("");
+    }
+}
+
+type Languages = {
+    [lang: string]: string;
+};
+
+/**
+ * Sets the language for the application.
+ * In Element web,`languageHandler.setLanguage` should be used instead.
+ * @param language
+ */
+export async function setLanguage(language: string): Promise<void> {
+    const availableLanguages = await getLangsJson();
+    const chosenLanguage = language in availableLanguages ? language : "en";
+
+    const languageData = await getLanguage(i18nFolder + availableLanguages[chosenLanguage]);
+
+    counterpart.registerTranslations(chosenLanguage, languageData);
+    counterpart.setLocale(chosenLanguage);
+}
+
+interface ICounterpartTranslation {
+    [key: string]:
+        | string
+        | {
+              [pluralisation: string]: string;
+          };
+}
+
+async function getLanguage(langPath: string): Promise<ICounterpartTranslation> {
+    console.log("Loading language from", langPath);
+    const res = await fetch(langPath, { method: "GET" });
+
+    if (!res.ok) {
+        throw new Error(`Failed to load ${langPath}, got ${res.status}`);
+    }
+
+    return res.json();
+}
+
+export async function getLangsJson(): Promise<Languages> {
+    let url: string;
+    if (typeof webpackLangJsonUrl === "string") {
+        // in Jest this 'url' isn't a URL, so just fall through
+        url = webpackLangJsonUrl;
+    } else {
+        url = i18nFolder + "languages.json";
+    }
+
+    const res = await fetch(url, { method: "GET" });
+
+    if (!res.ok) {
+        throw new Error(`Failed to load ${url}, got ${res.status}`);
+    }
+
+    return res.json();
+}
diff --git a/packages/shared-components/src/utils/i18nContext.ts b/packages/shared-components/src/utils/i18nContext.ts
new file mode 100644
index 0000000000..46c4185329
--- /dev/null
+++ b/packages/shared-components/src/utils/i18nContext.ts
@@ -0,0 +1,27 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { createContext, useContext } from "react";
+import { type I18nApi } from "@element-hq/element-web-module-api";
+
+export const I18nContext = createContext<I18nApi | null>(null);
+I18nContext.displayName = "I18nContext";
+
+/**
+ * A hook to get the i18n API from the context. Will throw if no i18n context is found.
+ * @throws If no i18n context is found
+ * @returns The i18n API from the context
+ */
+export function useI18n(): I18nApi {
+    const i18n = useContext(I18nContext);
+
+    if (!i18n) {
+        throw new Error("useI18n must be used within an I18nContext.Provider");
+    }
+
+    return i18n;
+}
diff --git a/test/unit-tests/utils/numbers-test.ts b/packages/shared-components/src/utils/numbers.test.ts
similarity index 99%
rename from test/unit-tests/utils/numbers-test.ts
rename to packages/shared-components/src/utils/numbers.test.ts
index 1de68ce499..928fd67ae0 100644
--- a/test/unit-tests/utils/numbers-test.ts
+++ b/packages/shared-components/src/utils/numbers.test.ts
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { clamp, defaultNumber, percentageOf, percentageWithin, sum } from "../../../src/utils/numbers";
+import { clamp, defaultNumber, percentageOf, percentageWithin, sum } from "./numbers";
 
 describe("numbers", () => {
     describe("defaultNumber", () => {
diff --git a/src/utils/numbers.ts b/packages/shared-components/src/utils/numbers.ts
similarity index 100%
rename from src/utils/numbers.ts
rename to packages/shared-components/src/utils/numbers.ts
diff --git a/packages/shared-components/src/viewmodel/BaseViewModel.ts b/packages/shared-components/src/viewmodel/BaseViewModel.ts
new file mode 100644
index 0000000000..ffb961d8e0
--- /dev/null
+++ b/packages/shared-components/src/viewmodel/BaseViewModel.ts
@@ -0,0 +1,51 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type ViewModel } from "./ViewModel";
+import { Disposables } from "./Disposables";
+import { Snapshot } from "./Snapshot";
+import { ViewModelSubscriptions } from "./ViewModelSubscriptions";
+
+export abstract class BaseViewModel<T, P> implements ViewModel<T> {
+    protected subs: ViewModelSubscriptions;
+    protected snapshot: Snapshot<T>;
+    protected props: P;
+    protected disposables = new Disposables();
+
+    protected constructor(props: P, initialSnapshot: T) {
+        this.props = props;
+        this.subs = new ViewModelSubscriptions();
+        this.snapshot = new Snapshot(initialSnapshot, () => {
+            this.subs.emit();
+        });
+    }
+
+    public subscribe = (listener: () => void): (() => void) => {
+        return this.subs.add(listener);
+    };
+
+    /**
+     * Returns the current snapshot of the view model.
+     */
+    public getSnapshot = (): T => {
+        return this.snapshot.current;
+    };
+
+    /**
+     * Relinquish any resources held by this view-model.
+     */
+    public dispose(): void {
+        this.disposables.dispose();
+    }
+
+    /**
+     * Whether this view-model has been disposed.
+     */
+    public get isDisposed(): boolean {
+        return this.disposables.isDisposed;
+    }
+}
diff --git a/packages/shared-components/src/viewmodel/Disposables.ts b/packages/shared-components/src/viewmodel/Disposables.ts
new file mode 100644
index 0000000000..77df53d097
--- /dev/null
+++ b/packages/shared-components/src/viewmodel/Disposables.ts
@@ -0,0 +1,70 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import type { EventEmitter } from "events";
+
+/**
+ * Something that needs to be eventually disposed. This can be:
+ * - A function that does the disposing
+ * - An object containing a dispose method which does the disposing
+ */
+export type DisposableItem = { dispose: () => void } | (() => void);
+
+/**
+ * This class provides a way for the view-model to track any resource
+ * that it needs to eventually relinquish.
+ */
+export class Disposables {
+    private readonly disposables: DisposableItem[] = [];
+    private _isDisposed: boolean = false;
+
+    /**
+     * Relinquish all tracked disposable values
+     */
+    public dispose(): void {
+        if (this.isDisposed) return;
+        this._isDisposed = true;
+        for (const disposable of this.disposables) {
+            if (typeof disposable === "function") {
+                disposable();
+            } else {
+                disposable.dispose();
+            }
+        }
+    }
+
+    /**
+     * Track a value that needs to be eventually relinquished
+     */
+    public track<T extends DisposableItem>(disposable: T): T {
+        this.throwIfDisposed();
+        this.disposables.push(disposable);
+        return disposable;
+    }
+
+    /**
+     * Add an event listener that will be removed on dispose
+     */
+    public trackListener(emitter: EventEmitter, event: string, callback: (...args: unknown[]) => void): void {
+        this.throwIfDisposed();
+        emitter.on(event, callback);
+        this.track(() => {
+            emitter.off(event, callback);
+        });
+    }
+
+    private throwIfDisposed(): void {
+        if (this.isDisposed) throw new Error("Disposable is already disposed");
+    }
+
+    /**
+     * Whether this disposable has been disposed
+     */
+    public get isDisposed(): boolean {
+        return this._isDisposed;
+    }
+}
diff --git a/packages/shared-components/src/viewmodel/MockViewModel.ts b/packages/shared-components/src/viewmodel/MockViewModel.ts
new file mode 100644
index 0000000000..28a1456a5d
--- /dev/null
+++ b/packages/shared-components/src/viewmodel/MockViewModel.ts
@@ -0,0 +1,23 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type ViewModel } from "./ViewModel";
+
+/**
+ * A mock view model that returns a static snapshot passed in the constructor, with no updates.
+ */
+export class MockViewModel<T> implements ViewModel<T> {
+    public constructor(private snapshot: T) {}
+
+    public getSnapshot = (): T => {
+        return this.snapshot;
+    };
+
+    public subscribe(listener: () => void): () => void {
+        return () => undefined;
+    }
+}
diff --git a/packages/shared-components/src/viewmodel/Snapshot.ts b/packages/shared-components/src/viewmodel/Snapshot.ts
new file mode 100644
index 0000000000..e8d0b7412c
--- /dev/null
+++ b/packages/shared-components/src/viewmodel/Snapshot.ts
@@ -0,0 +1,43 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+/**
+ * This is the output of the viewmodel that the view consumes.
+ * Updating snapshot through this object will make react re-render
+ * components.
+ */
+export class Snapshot<T> {
+    public constructor(
+        private snapshot: T,
+        private emit: () => void,
+    ) {}
+
+    /**
+     * Replace current snapshot with a new snapshot value.
+     * @param snapshot New snapshot value
+     */
+    public set(snapshot: T): void {
+        this.snapshot = snapshot;
+        this.emit();
+    }
+
+    /**
+     * Update a part of the current snapshot by merging into the existing snapshot.
+     * @param snapshot A subset of the snapshot to merge into the current snapshot.
+     */
+    public merge(snapshot: Partial<T>): void {
+        this.snapshot = { ...this.snapshot, ...snapshot };
+        this.emit();
+    }
+
+    /**
+     * The current value of the snapshot.
+     */
+    public get current(): T {
+        return this.snapshot;
+    }
+}
diff --git a/packages/shared-components/src/viewmodel/ViewModel.ts b/packages/shared-components/src/viewmodel/ViewModel.ts
new file mode 100644
index 0000000000..9f088c4300
--- /dev/null
+++ b/packages/shared-components/src/viewmodel/ViewModel.ts
@@ -0,0 +1,23 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+/**
+ * The interface for a generic View Model passed to the shared components.
+ * The snapshot is of type T which is a type specifying a snapshot for the view in question.
+ */
+export interface ViewModel<T> {
+    /**
+     * The current snapshot of the view model.
+     */
+    getSnapshot: () => T;
+
+    /**
+     * Subscribes to changes in the view model.
+     * The listener will be called whenever the snapshot changes.
+     */
+    subscribe: (listener: () => void) => () => void;
+}
diff --git a/packages/shared-components/src/viewmodel/ViewModelSubscriptions.ts b/packages/shared-components/src/viewmodel/ViewModelSubscriptions.ts
new file mode 100644
index 0000000000..a713782aec
--- /dev/null
+++ b/packages/shared-components/src/viewmodel/ViewModelSubscriptions.ts
@@ -0,0 +1,34 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+/**
+ * Utility class for view models to manage subscriptions to their updates
+ */
+export class ViewModelSubscriptions {
+    private listeners = new Set<() => void>();
+
+    /**
+     * Subscribe to changes in the view model.
+     * @param listener Will be called whenever the snapshot changes.
+     * @returns A function to unsubscribe from the view model updates.
+     */
+    public add = (listener: () => void): (() => void) => {
+        this.listeners.add(listener);
+        return () => {
+            this.listeners.delete(listener);
+        };
+    };
+
+    /**
+     * Emit an update to all subscribed listeners.
+     */
+    public emit = (): void => {
+        for (const listener of this.listeners) {
+            listener();
+        }
+    };
+}
diff --git a/packages/shared-components/src/viewmodel/index.ts b/packages/shared-components/src/viewmodel/index.ts
new file mode 100644
index 0000000000..0267f7934d
--- /dev/null
+++ b/packages/shared-components/src/viewmodel/index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+export * from "./BaseViewModel";
+export * from "./Disposables";
+export * from "./Snapshot";
+export * from "./ViewModelSubscriptions";
+export type * from "./ViewModel";
+export * from "./MockViewModel";
+export * from "./useCreateAutoDisposedViewModel";
diff --git a/packages/shared-components/src/viewmodel/tests/Disposables.test.ts b/packages/shared-components/src/viewmodel/tests/Disposables.test.ts
new file mode 100644
index 0000000000..5b71f1871d
--- /dev/null
+++ b/packages/shared-components/src/viewmodel/tests/Disposables.test.ts
@@ -0,0 +1,57 @@
+/*
+Copyright 2025 New Vector Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { EventEmitter } from "events";
+
+import { Disposables } from "..";
+
+describe("Disposable", () => {
+    it("isDisposed is true after dispose() is called", () => {
+        const disposables = new Disposables();
+        expect(disposables.isDisposed).toEqual(false);
+        disposables.dispose();
+        expect(disposables.isDisposed).toEqual(true);
+    });
+
+    it("dispose() calls the correct disposing function", () => {
+        const disposables = new Disposables();
+
+        const item1 = {
+            foo: 5,
+            dispose: jest.fn(),
+        };
+        disposables.track(item1);
+
+        const item2 = jest.fn();
+        disposables.track(item2);
+
+        disposables.dispose();
+
+        expect(item1.dispose).toHaveBeenCalledTimes(1);
+        expect(item2).toHaveBeenCalledTimes(1);
+    });
+
+    it("Throws error if acting on already disposed disposables", () => {
+        const disposables = new Disposables();
+        disposables.dispose();
+        expect(() => {
+            disposables.track(jest.fn);
+        }).toThrow();
+    });
+
+    it("Removes tracked event listeners on dispose", () => {
+        const disposables = new Disposables();
+        const emitter = new EventEmitter();
+
+        const fn = jest.fn();
+        disposables.trackListener(emitter, "FooEvent", fn);
+        emitter.emit("FooEvent");
+        expect(fn).toHaveBeenCalled();
+
+        disposables.dispose();
+        expect(emitter.listenerCount("FooEvent", fn)).toEqual(0);
+    });
+});
diff --git a/packages/shared-components/src/viewmodel/tests/Snapshot.test.ts b/packages/shared-components/src/viewmodel/tests/Snapshot.test.ts
new file mode 100644
index 0000000000..82cacfc02e
--- /dev/null
+++ b/packages/shared-components/src/viewmodel/tests/Snapshot.test.ts
@@ -0,0 +1,41 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { Snapshot } from "..";
+
+interface TestSnapshot {
+    key1: string;
+    key2: number;
+    key3: boolean;
+}
+
+describe("Snapshot", () => {
+    it("should accept an initial value", () => {
+        const snapshot = new Snapshot<TestSnapshot>({ key1: "foo", key2: 5, key3: false }, jest.fn());
+        expect(snapshot.current).toStrictEqual({ key1: "foo", key2: 5, key3: false });
+    });
+
+    it("should call emit callback when state changes", () => {
+        const emit = jest.fn();
+        const snapshot = new Snapshot<TestSnapshot>({ key1: "foo", key2: 5, key3: false }, emit);
+        snapshot.merge({ key3: true });
+        expect(emit).toHaveBeenCalledTimes(1);
+    });
+
+    it("should swap out entire snapshot on set call", () => {
+        const snapshot = new Snapshot<TestSnapshot>({ key1: "foo", key2: 5, key3: false }, jest.fn());
+        const newValue = { key1: "bar", key2: 8, key3: true };
+        snapshot.set(newValue);
+        expect(snapshot.current).toStrictEqual(newValue);
+    });
+
+    it("should merge partial snapshot on merge call", () => {
+        const snapshot = new Snapshot<TestSnapshot>({ key1: "foo", key2: 5, key3: false }, jest.fn());
+        snapshot.merge({ key2: 10 });
+        expect(snapshot.current).toStrictEqual({ key1: "foo", key2: 10, key3: false });
+    });
+});
diff --git a/packages/shared-components/src/viewmodel/tests/useCreateAutoDisposedViewModel.test.ts b/packages/shared-components/src/viewmodel/tests/useCreateAutoDisposedViewModel.test.ts
new file mode 100644
index 0000000000..867ee56825
--- /dev/null
+++ b/packages/shared-components/src/viewmodel/tests/useCreateAutoDisposedViewModel.test.ts
@@ -0,0 +1,47 @@
+/*
+Copyright 2025 Element Creations Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { renderHook } from "jest-matrix-react";
+
+import { BaseViewModel } from "../BaseViewModel";
+import { useCreateAutoDisposedViewModel } from "../useCreateAutoDisposedViewModel";
+
+class TestViewModel extends BaseViewModel<{ count: number }, { initial: number }> {
+    public constructor(props: { initial: number }) {
+        super(props, { count: props.initial });
+    }
+
+    public increment(): void {
+        const newCount = this.getSnapshot().count + 1;
+        this.snapshot.set({ count: newCount });
+    }
+}
+
+describe("useAutoDisposedViewModel", () => {
+    it("should return view-model", () => {
+        const vmCreator = (): TestViewModel => new TestViewModel({ initial: 0 });
+        const { result } = renderHook(() => useCreateAutoDisposedViewModel(vmCreator));
+        const vm = result.current;
+        expect(vm).toBeInstanceOf(TestViewModel);
+        expect(vm.isDisposed).toStrictEqual(false);
+    });
+
+    it("should dispose view-model on unmount", () => {
+        const vmCreator = (): TestViewModel => new TestViewModel({ initial: 0 });
+        const { result, unmount } = renderHook(() => useCreateAutoDisposedViewModel(vmCreator));
+        const vm = result.current;
+        vm.increment();
+        unmount();
+        expect(vm.isDisposed).toStrictEqual(true);
+    });
+
+    it("should recreate view-model on react strict mode", async () => {
+        const vmCreator = (): TestViewModel => new TestViewModel({ initial: 0 });
+        const output = renderHook(() => useCreateAutoDisposedViewModel(vmCreator), { reactStrictMode: true });
+        const vm = output.result.current;
+        expect(vm.isDisposed).toStrictEqual(false);
+    });
+});
diff --git a/packages/shared-components/src/viewmodel/useCreateAutoDisposedViewModel.ts b/packages/shared-components/src/viewmodel/useCreateAutoDisposedViewModel.ts
new file mode 100644
index 0000000000..a3b4fce3eb
--- /dev/null
+++ b/packages/shared-components/src/viewmodel/useCreateAutoDisposedViewModel.ts
@@ -0,0 +1,68 @@
+/*
+Copyright 2025 Element Creations Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { useEffect, useState } from "react";
+
+import type { BaseViewModel } from "./BaseViewModel";
+
+type VmCreator<B extends BaseViewModel<unknown, unknown>> = () => B;
+
+/**
+ * Instantiate a view-model that gets disposed when the calling react component unmounts.
+ * In other words, this hook ties the lifecycle of a view-model to the lifecycle of a
+ * react component.
+ *
+ * @param vmCreator A function that returns a view-model instance
+ * @returns view-model instance from vmCreator
+ * @example
+ * const vm = useCreateAutoDisposedViewModel(() => new FooViewModel({prop1, prop2, ...});
+ */
+export function useCreateAutoDisposedViewModel<B extends BaseViewModel<unknown, unknown>>(vmCreator: VmCreator<B>): B {
+    /**
+     * The view-model instance may be replaced by a different instance in some scenarios.
+     * We want to be sure that whichever react component called this hook gets re-rendered
+     * when this happens, hence the state.
+     */
+    const [viewModel, setViewModel] = useState<B>(vmCreator);
+
+    /**
+     * Our intention here is to ensure that the dispose method of the view-model gets called
+     * when the component that uses this hook unmounts.
+     * We can do that by combining a useEffect cleanup with an empty dependency array.
+     */
+    useEffect(() => {
+        let toDispose = viewModel;
+
+        /**
+         * Because we use react strict mode, react will run our effects twice in dev mode to make
+         * sure that they are pure.
+         * This presents a complication - the vm instance that we created in our state initializer
+         * will get disposed on the first cleanup.
+         * So we'll recreate the view-model if it's already disposed.
+         */
+        if (viewModel.isDisposed) {
+            const newViewModel = vmCreator();
+            // Change toDispose so that we don't end up disposing the already disposed vm.
+            toDispose = newViewModel;
+            setViewModel(newViewModel);
+        }
+        return () => {
+            // Dispose the view-model when this component unmounts
+            toDispose.dispose();
+        };
+
+        /**
+         * We explicitly provide an empty dependency array as we don't expect the viewModel/viewCreator to
+         * change.
+         * Or to put it in another way, the only reason to use this hook is to create/dispose the view-model
+         * and that is something that should only happen at the start/end of the lifecycle of this component.
+         */
+        // eslint-disable-next-line react-compiler/react-compiler
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    return viewModel;
+}
diff --git a/packages/shared-components/tsconfig.json b/packages/shared-components/tsconfig.json
new file mode 100644
index 0000000000..025901c97d
--- /dev/null
+++ b/packages/shared-components/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "allowImportingTsExtensions": true,
+        "experimentalDecorators": false,
+        "emitDecoratorMetadata": false,
+        "resolveJsonModule": true,
+        "esModuleInterop": true,
+        "useDefineForClassFields": true,
+        "module": "es2022",
+        "moduleResolution": "bundler",
+        "target": "es2022",
+        "noUnusedLocals": true,
+        "sourceMap": false,
+        "outDir": "./lib",
+        "declaration": true,
+        "jsx": "react",
+        "lib": ["es2022", "es2024.promise", "dom", "dom.iterable"],
+        "strict": true,
+        "paths": {
+            "jest-matrix-react": ["./src/test/utils/jest-matrix-react"],
+            "rollup/parseAst": ["./node_modules/rollup/dist/parseAst"]
+        }
+    },
+    "include": ["./src/**/*.ts", "./src/**/*.tsx"]
+}
diff --git a/packages/shared-components/vite.config.js b/packages/shared-components/vite.config.js
new file mode 100644
index 0000000000..83c999d87f
--- /dev/null
+++ b/packages/shared-components/vite.config.js
@@ -0,0 +1,54 @@
+/*
+ *
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ * /
+ */
+
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { defineConfig } from "vite";
+import dts from "vite-plugin-dts";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+export default defineConfig({
+    build: {
+        lib: {
+            entry: resolve(__dirname, "src/index.ts"),
+            name: "Element Web Shared Components",
+            // the proper extensions will be added
+            fileName: "element-web-shared-components",
+        },
+        outDir: "dist",
+        rollupOptions: {
+            // make sure to externalize deps that shouldn't be bundled
+            // into your library
+            external: ["react", "react-dom", "@vector-im/compound-design-tokens", "@vector-im/compound-web"],
+            output: {
+                // Provide global variables to use in the UMD build
+                // for externalized deps
+                globals: {
+                    "react": "react",
+                    "react-dom": "ReactDom",
+                },
+            },
+        },
+    },
+    resolve: {
+        alias: {
+            // Alias used by i18n.tsx
+            $webapp: resolve(__dirname, "..", "..", "webapp"),
+        },
+    },
+    plugins: [
+        dts({
+            rollupTypes: true,
+            include: ["src/**/*.{ts,tsx}"],
+            exclude: ["src/**/*.test.{ts,tsx}"],
+            copyDtsFiles: true,
+        }),
+    ],
+});
diff --git a/packages/shared-components/yarn.lock b/packages/shared-components/yarn.lock
new file mode 100644
index 0000000000..ceeb5ab89e
--- /dev/null
+++ b/packages/shared-components/yarn.lock
@@ -0,0 +1,7411 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@adobe/css-tools@^4.4.0":
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.4.4.tgz#2856c55443d3d461693f32d2b96fb6ea92e1ffa9"
+  integrity sha512-Elp+iwUx5rN5+Y8xLt5/GRoG20WGoDCQ/1Fb+1LiGtvwbDavuSk0jhD/eZdckHAuzcDzccnkv+rEjyWfRx18gg==
+
+"@axe-core/playwright@^4.10.1":
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/@axe-core/playwright/-/playwright-4.11.0.tgz#64beab80764c1f3f0ec4ac21f9b2c2d7df508958"
+  integrity sha512-70vBT/Ylqpm65RQz2iCG2o0JJCEG/WCNyefTr2xcOcr1CoSee60gNQYUMZZ7YukoKkFLv26I/jjlsvwwp532oQ==
+  dependencies:
+    axe-core "~4.11.0"
+
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.27.1.tgz#200f715e66d52a23b221a9435534a91cc13ad5be"
+  integrity sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.27.1"
+    js-tokens "^4.0.0"
+    picocolors "^1.1.1"
+
+"@babel/compat-data@^7.27.2":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.28.5.tgz#a8a4962e1567121ac0b3b487f52107443b455c7f"
+  integrity sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==
+
+"@babel/core@^7.22.5", "@babel/core@^7.23.9", "@babel/core@^7.27.4", "@babel/core@^7.28.0", "@babel/core@^7.7.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.5.tgz#4c81b35e51e1b734f510c99b07dfbc7bbbb48f7e"
+  integrity sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.28.5"
+    "@babel/helper-compilation-targets" "^7.27.2"
+    "@babel/helper-module-transforms" "^7.28.3"
+    "@babel/helpers" "^7.28.4"
+    "@babel/parser" "^7.28.5"
+    "@babel/template" "^7.27.2"
+    "@babel/traverse" "^7.28.5"
+    "@babel/types" "^7.28.5"
+    "@jridgewell/remapping" "^2.3.5"
+    convert-source-map "^2.0.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.3"
+    semver "^6.3.1"
+
+"@babel/generator@^7.22.5", "@babel/generator@^7.27.5", "@babel/generator@^7.28.3", "@babel/generator@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.5.tgz#712722d5e50f44d07bc7ac9fe84438742dd61298"
+  integrity sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==
+  dependencies:
+    "@babel/parser" "^7.28.5"
+    "@babel/types" "^7.28.5"
+    "@jridgewell/gen-mapping" "^0.3.12"
+    "@jridgewell/trace-mapping" "^0.3.28"
+    jsesc "^3.0.2"
+
+"@babel/helper-compilation-targets@^7.27.2":
+  version "7.27.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz#46a0f6efab808d51d29ce96858dd10ce8732733d"
+  integrity sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==
+  dependencies:
+    "@babel/compat-data" "^7.27.2"
+    "@babel/helper-validator-option" "^7.27.1"
+    browserslist "^4.24.0"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
+
+"@babel/helper-globals@^7.28.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.28.0.tgz#b9430df2aa4e17bc28665eadeae8aa1d985e6674"
+  integrity sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==
+
+"@babel/helper-module-imports@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz#7ef769a323e2655e126673bb6d2d6913bbead204"
+  integrity sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==
+  dependencies:
+    "@babel/traverse" "^7.27.1"
+    "@babel/types" "^7.27.1"
+
+"@babel/helper-module-transforms@^7.28.3":
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz#a2b37d3da3b2344fe085dab234426f2b9a2fa5f6"
+  integrity sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.27.1"
+    "@babel/traverse" "^7.28.3"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.27.1", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz#ddb2f876534ff8013e6c2b299bf4d39b3c51d44c"
+  integrity sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==
+
+"@babel/helper-string-parser@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687"
+  integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==
+
+"@babel/helper-validator-identifier@^7.27.1", "@babel/helper-validator-identifier@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4"
+  integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==
+
+"@babel/helper-validator-option@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz#fa52f5b1e7db1ab049445b421c4471303897702f"
+  integrity sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==
+
+"@babel/helpers@^7.28.4":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.28.4.tgz#fe07274742e95bdf7cf1443593eeb8926ab63827"
+  integrity sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==
+  dependencies:
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.28.4"
+
+"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.27.2", "@babel/parser@^7.28.4", "@babel/parser@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.5.tgz#0b0225ee90362f030efd644e8034c99468893b08"
+  integrity sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==
+  dependencies:
+    "@babel/types" "^7.28.5"
+
+"@babel/parser@^7.18.5":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.4.tgz#da25d4643532890932cc03f7705fe19637e03fa8"
+  integrity sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==
+  dependencies:
+    "@babel/types" "^7.28.4"
+
+"@babel/plugin-syntax-async-generators@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-bigint@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
+  integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-class-properties@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-syntax-class-static-block@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-import-attributes@^7.24.7":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz#34c017d54496f9b11b61474e7ea3dfd5563ffe07"
+  integrity sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.27.1"
+
+"@babel/plugin-syntax-import-meta@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-jsx@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz#2f9beb5eff30fa507c5532d107daac7b888fa34c"
+  integrity sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.27.1"
+
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-private-property-in-object@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-top-level-await@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-typescript@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz#5147d29066a793450f220c63fa3a9431b7e6dd18"
+  integrity sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.27.1"
+
+"@babel/runtime@^7.12.5":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326"
+  integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==
+
+"@babel/template@^7.22.5", "@babel/template@^7.27.2":
+  version "7.27.2"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
+  integrity sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@babel/parser" "^7.27.2"
+    "@babel/types" "^7.27.1"
+
+"@babel/traverse@^7.18.5":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.4.tgz#8d456101b96ab175d487249f60680221692b958b"
+  integrity sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.28.3"
+    "@babel/helper-globals" "^7.28.0"
+    "@babel/parser" "^7.28.4"
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.28.4"
+    debug "^4.3.1"
+
+"@babel/traverse@^7.27.1", "@babel/traverse@^7.28.0", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.5.tgz#450cab9135d21a7a2ca9d2d35aa05c20e68c360b"
+  integrity sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.28.5"
+    "@babel/helper-globals" "^7.28.0"
+    "@babel/parser" "^7.28.5"
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.28.5"
+    debug "^4.3.1"
+
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.28.2", "@babel/types@^7.28.4", "@babel/types@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.5.tgz#10fc405f60897c35f07e85493c932c7b5ca0592b"
+  integrity sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==
+  dependencies:
+    "@babel/helper-string-parser" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.28.5"
+
+"@balena/dockerignore@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@balena/dockerignore/-/dockerignore-1.0.2.tgz#9ffe4726915251e8eb69f44ef3547e0da2c03e0d"
+  integrity sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==
+
+"@bcoe/v8-coverage@^0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
+  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
+
+"@element-hq/element-web-module-api@^1.8.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@element-hq/element-web-module-api/-/element-web-module-api-1.9.0.tgz#2e4fcc8809418c8670d4f0576bc4a9a235bc6c50"
+  integrity sha512-Ao/V9w+wysZK4bh61LlKlznF10n2ZbD6KcUI46/zUMttXbmJn3ahvbzhEpwYcD+Cjy3ag5ycxLIIGkKV/fncXg==
+
+"@element-hq/element-web-playwright-common@^2.0.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@element-hq/element-web-playwright-common/-/element-web-playwright-common-2.1.0.tgz#86e8a5632f8cc8bb393a1ec1b793a6278cd5b2c7"
+  integrity sha512-Ah9aioownR5OxAX7IDzys7wqyFmojruqgiRr2oUTLbPA5Y6jUSKWdAu5AqGvi+PYr0kG6zQfdsruhe5FXW9YuQ==
+  dependencies:
+    "@axe-core/playwright" "^4.10.1"
+    "@testcontainers/postgresql" "^11.0.0"
+    glob "^11.1.0"
+    lodash-es "^4.17.21"
+    mailpit-api "^1.2.0"
+    strip-ansi "^7.1.0"
+    testcontainers "^11.0.0"
+    yaml "^2.7.0"
+
+"@emnapi/core@^1.4.3":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.7.1.tgz#3a79a02dbc84f45884a1806ebb98e5746bdfaac4"
+  integrity sha512-o1uhUASyo921r2XtHYOHy7gdkGLge8ghBEQHMWmyJFoXlpU58kIrhhN3w26lpQb6dspetweapMn2CSNwQ8I4wg==
+  dependencies:
+    "@emnapi/wasi-threads" "1.1.0"
+    tslib "^2.4.0"
+
+"@emnapi/runtime@^1.4.3":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.7.1.tgz#a73784e23f5d57287369c808197288b52276b791"
+  integrity sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA==
+  dependencies:
+    tslib "^2.4.0"
+
+"@emnapi/wasi-threads@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz#60b2102fddc9ccb78607e4a3cf8403ea69be41bf"
+  integrity sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==
+  dependencies:
+    tslib "^2.4.0"
+
+"@esbuild/aix-ppc64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz#80fcbe36130e58b7670511e888b8e88a259ed76c"
+  integrity sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==
+
+"@esbuild/aix-ppc64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz#521cbd968dcf362094034947f76fa1b18d2d403c"
+  integrity sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==
+
+"@esbuild/android-arm64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz#8aa4965f8d0a7982dc21734bf6601323a66da752"
+  integrity sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==
+
+"@esbuild/android-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz#61ea550962d8aa12a9b33194394e007657a6df57"
+  integrity sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==
+
+"@esbuild/android-arm@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.12.tgz#300712101f7f50f1d2627a162e6e09b109b6767a"
+  integrity sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==
+
+"@esbuild/android-arm@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.27.2.tgz#554887821e009dd6d853f972fde6c5143f1de142"
+  integrity sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==
+
+"@esbuild/android-x64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.12.tgz#87dfb27161202bdc958ef48bb61b09c758faee16"
+  integrity sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==
+
+"@esbuild/android-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.27.2.tgz#a7ce9d0721825fc578f9292a76d9e53334480ba2"
+  integrity sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==
+
+"@esbuild/darwin-arm64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz#79197898ec1ff745d21c071e1c7cc3c802f0c1fd"
+  integrity sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==
+
+"@esbuild/darwin-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz#2cb7659bd5d109803c593cfc414450d5430c8256"
+  integrity sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==
+
+"@esbuild/darwin-x64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz#146400a8562133f45c4d2eadcf37ddd09718079e"
+  integrity sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==
+
+"@esbuild/darwin-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz#e741fa6b1abb0cd0364126ba34ca17fd5e7bf509"
+  integrity sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==
+
+"@esbuild/freebsd-arm64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz#1c5f9ba7206e158fd2b24c59fa2d2c8bb47ca0fe"
+  integrity sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==
+
+"@esbuild/freebsd-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz#2b64e7116865ca172d4ce034114c21f3c93e397c"
+  integrity sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==
+
+"@esbuild/freebsd-x64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz#ea631f4a36beaac4b9279fa0fcc6ca29eaeeb2b3"
+  integrity sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==
+
+"@esbuild/freebsd-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz#e5252551e66f499e4934efb611812f3820e990bb"
+  integrity sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==
+
+"@esbuild/linux-arm64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz#e1066bce58394f1b1141deec8557a5f0a22f5977"
+  integrity sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==
+
+"@esbuild/linux-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz#dc4acf235531cd6984f5d6c3b13dbfb7ddb303cb"
+  integrity sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==
+
+"@esbuild/linux-arm@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz#452cd66b20932d08bdc53a8b61c0e30baf4348b9"
+  integrity sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==
+
+"@esbuild/linux-arm@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz#56a900e39240d7d5d1d273bc053daa295c92e322"
+  integrity sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==
+
+"@esbuild/linux-ia32@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz#b24f8acc45bcf54192c7f2f3be1b53e6551eafe0"
+  integrity sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==
+
+"@esbuild/linux-ia32@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz#d4a36d473360f6870efcd19d52bbfff59a2ed1cc"
+  integrity sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==
+
+"@esbuild/linux-loong64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz#f9cfffa7fc8322571fbc4c8b3268caf15bd81ad0"
+  integrity sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==
+
+"@esbuild/linux-loong64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz#fcf0ab8c3eaaf45891d0195d4961cb18b579716a"
+  integrity sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==
+
+"@esbuild/linux-mips64el@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz#575a14bd74644ffab891adc7d7e60d275296f2cd"
+  integrity sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==
+
+"@esbuild/linux-mips64el@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz#598b67d34048bb7ee1901cb12e2a0a434c381c10"
+  integrity sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==
+
+"@esbuild/linux-ppc64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz#75b99c70a95fbd5f7739d7692befe60601591869"
+  integrity sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==
+
+"@esbuild/linux-ppc64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz#3846c5df6b2016dab9bc95dde26c40f11e43b4c0"
+  integrity sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==
+
+"@esbuild/linux-riscv64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz#2e3259440321a44e79ddf7535c325057da875cd6"
+  integrity sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==
+
+"@esbuild/linux-riscv64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz#173d4475b37c8d2c3e1707e068c174bb3f53d07d"
+  integrity sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==
+
+"@esbuild/linux-s390x@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz#17676cabbfe5928da5b2a0d6df5d58cd08db2663"
+  integrity sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==
+
+"@esbuild/linux-s390x@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz#f7a4790105edcab8a5a31df26fbfac1aa3dacfab"
+  integrity sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==
+
+"@esbuild/linux-x64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz#0583775685ca82066d04c3507f09524d3cd7a306"
+  integrity sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==
+
+"@esbuild/linux-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz#2ecc1284b1904aeb41e54c9ddc7fcd349b18f650"
+  integrity sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==
+
+"@esbuild/netbsd-arm64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz#f04c4049cb2e252fe96b16fed90f70746b13f4a4"
+  integrity sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==
+
+"@esbuild/netbsd-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz#e2863c2cd1501845995cb11adf26f7fe4be527b0"
+  integrity sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==
+
+"@esbuild/netbsd-x64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz#77da0d0a0d826d7c921eea3d40292548b258a076"
+  integrity sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==
+
+"@esbuild/netbsd-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz#93f7609e2885d1c0b5a1417885fba8d1fcc41272"
+  integrity sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==
+
+"@esbuild/openbsd-arm64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz#6296f5867aedef28a81b22ab2009c786a952dccd"
+  integrity sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==
+
+"@esbuild/openbsd-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz#a1985604a203cdc325fd47542e106fafd698f02e"
+  integrity sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==
+
+"@esbuild/openbsd-x64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz#f8d23303360e27b16cf065b23bbff43c14142679"
+  integrity sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==
+
+"@esbuild/openbsd-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz#8209e46c42f1ffbe6e4ef77a32e1f47d404ad42a"
+  integrity sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==
+
+"@esbuild/openharmony-arm64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz#49e0b768744a3924be0d7fd97dd6ce9b2923d88d"
+  integrity sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==
+
+"@esbuild/openharmony-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz#8fade4441893d9cc44cbd7dcf3776f508ab6fb2f"
+  integrity sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==
+
+"@esbuild/sunos-x64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz#a6ed7d6778d67e528c81fb165b23f4911b9b13d6"
+  integrity sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==
+
+"@esbuild/sunos-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz#980d4b9703a16f0f07016632424fc6d9a789dfc2"
+  integrity sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==
+
+"@esbuild/win32-arm64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz#9ac14c378e1b653af17d08e7d3ce34caef587323"
+  integrity sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==
+
+"@esbuild/win32-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz#1c09a3633c949ead3d808ba37276883e71f6111a"
+  integrity sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==
+
+"@esbuild/win32-ia32@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz#918942dcbbb35cc14fca39afb91b5e6a3d127267"
+  integrity sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==
+
+"@esbuild/win32-ia32@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz#1b1e3a63ad4bef82200fef4e369e0fff7009eee5"
+  integrity sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==
+
+"@esbuild/win32-x64@0.25.12":
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz#9bdad8176be7811ad148d1f8772359041f46c6c5"
+  integrity sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==
+
+"@esbuild/win32-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz#9e585ab6086bef994c6e8a5b3a0481219ada862b"
+  integrity sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==
+
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.7.0":
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz#7308df158e064f0dd8b8fdb58aa14fa2a7f913b3"
+  integrity sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==
+  dependencies:
+    eslint-visitor-keys "^3.4.3"
+
+"@eslint-community/regexpp@^4.6.1":
+  version "4.12.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
+  integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
+
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.3.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"
+
+"@eslint/js@8.57.1":
+  version "8.57.1"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
+  integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
+
+"@figspec/components@^2.0.1":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@figspec/components/-/components-2.0.5.tgz#0c953e367b2b9d7661cb3507fef61d371313d7a4"
+  integrity sha512-nJ2Ms3Ua8r3f18fWVC6GEAN1qchJ0KheZIV+lPaDjZa4KJW9FXi2Ora2tuPkp8SMFl6uaqibYk7/VwTq+zNQ7A==
+
+"@figspec/react@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@figspec/react/-/react-2.0.1.tgz#f5fb5126b3983df810a457e6497704740db977e3"
+  integrity sha512-xflqJ3XQZVzm8+7dsm8OFxVAmBNNA3Mg65sqwNHiq7VRSMSD7qwH4BPsBy07ZaX+9nHeaacBpFZd3Q0aIsISqw==
+  dependencies:
+    "@figspec/components" "^2.0.1"
+    "@lit-labs/react" "^2.0.0"
+
+"@grpc/grpc-js@^1.11.1":
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.14.2.tgz#d245069181a1a8057abd35522d6052482730cf19"
+  integrity sha512-QzVUtEFyu05UNx2xr0fCQmStUO17uVQhGNowtxs00IgTZT6/W2PBLfUkj30s0FKJ29VtTa3ArVNIhNP6akQhqA==
+  dependencies:
+    "@grpc/proto-loader" "^0.8.0"
+    "@js-sdsl/ordered-map" "^4.4.2"
+
+"@grpc/proto-loader@^0.7.13":
+  version "0.7.15"
+  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.15.tgz#4cdfbf35a35461fc843abe8b9e2c0770b5095e60"
+  integrity sha512-tMXdRCfYVixjuFK+Hk0Q1s38gV9zDiDJfWL3h1rv4Qc39oILCu1TRTDt7+fGUI8K4G1Fj125Hx/ru3azECWTyQ==
+  dependencies:
+    lodash.camelcase "^4.3.0"
+    long "^5.0.0"
+    protobufjs "^7.2.5"
+    yargs "^17.7.2"
+
+"@grpc/proto-loader@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.8.0.tgz#b6c324dd909c458a0e4aa9bfd3d69cf78a4b9bd8"
+  integrity sha512-rc1hOQtjIWGxcxpb9aHAfLpIctjEnsDehj0DAiVfBlmT84uvR0uUtN2hEi/ecvWVjXUGf5qPF4qEgiLOx1YIMQ==
+  dependencies:
+    lodash.camelcase "^4.3.0"
+    long "^5.0.0"
+    protobufjs "^7.5.3"
+    yargs "^17.7.2"
+
+"@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0":
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
+  integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==
+
+"@hapi/topo@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012"
+  integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==
+  dependencies:
+    "@hapi/hoek" "^9.0.0"
+
+"@humanwhocodes/config-array@^0.13.0":
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
+  integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==
+  dependencies:
+    "@humanwhocodes/object-schema" "^2.0.3"
+    debug "^4.3.1"
+    minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
+
+"@isaacs/balanced-match@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz#3081dadbc3460661b751e7591d7faea5df39dd29"
+  integrity sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==
+
+"@isaacs/brace-expansion@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz#4b3dabab7d8e75a429414a96bd67bf4c1d13e0f3"
+  integrity sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==
+  dependencies:
+    "@isaacs/balanced-match" "^4.0.1"
+
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
+  dependencies:
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
+
+"@istanbuljs/load-nyc-config@^1.0.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
+  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
+  dependencies:
+    camelcase "^5.3.1"
+    find-up "^4.1.0"
+    get-package-type "^0.1.0"
+    js-yaml "^3.13.1"
+    resolve-from "^5.0.0"
+
+"@istanbuljs/schema@^0.1.2", "@istanbuljs/schema@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
+  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
+
+"@jest/console@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-30.2.0.tgz#c52fcd5b58fdd2e8eb66b2fd8ae56f2f64d05b28"
+  integrity sha512-+O1ifRjkvYIkBqASKWgLxrpEhQAAE7hY77ALLUufSk5717KfOShg6IbqLmdsLMPdUiFvA2kTs0R7YZy+l0IzZQ==
+  dependencies:
+    "@jest/types" "30.2.0"
+    "@types/node" "*"
+    chalk "^4.1.2"
+    jest-message-util "30.2.0"
+    jest-util "30.2.0"
+    slash "^3.0.0"
+
+"@jest/core@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-30.2.0.tgz#813d59faa5abd5510964a8b3a7b17cc77b775275"
+  integrity sha512-03W6IhuhjqTlpzh/ojut/pDB2LPRygyWX8ExpgHtQA8H/3K7+1vKmcINx5UzeOX1se6YEsBsOHQ1CRzf3fOwTQ==
+  dependencies:
+    "@jest/console" "30.2.0"
+    "@jest/pattern" "30.0.1"
+    "@jest/reporters" "30.2.0"
+    "@jest/test-result" "30.2.0"
+    "@jest/transform" "30.2.0"
+    "@jest/types" "30.2.0"
+    "@types/node" "*"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
+    ci-info "^4.2.0"
+    exit-x "^0.2.2"
+    graceful-fs "^4.2.11"
+    jest-changed-files "30.2.0"
+    jest-config "30.2.0"
+    jest-haste-map "30.2.0"
+    jest-message-util "30.2.0"
+    jest-regex-util "30.0.1"
+    jest-resolve "30.2.0"
+    jest-resolve-dependencies "30.2.0"
+    jest-runner "30.2.0"
+    jest-runtime "30.2.0"
+    jest-snapshot "30.2.0"
+    jest-util "30.2.0"
+    jest-validate "30.2.0"
+    jest-watcher "30.2.0"
+    micromatch "^4.0.8"
+    pretty-format "30.2.0"
+    slash "^3.0.0"
+
+"@jest/create-cache-key-function@^30.0.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/create-cache-key-function/-/create-cache-key-function-30.2.0.tgz#86dbaf8cce43e8a0266180a5236b6f0b3be9d09b"
+  integrity sha512-44F4l4Enf+MirJN8X/NhdGkl71k5rBYiwdVlo4HxOwbu0sHV8QKrGEedb1VUU4K3W7fBKE0HGfbn7eZm0Ti3zg==
+  dependencies:
+    "@jest/types" "30.2.0"
+
+"@jest/diff-sequences@30.0.1":
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/diff-sequences/-/diff-sequences-30.0.1.tgz#0ededeae4d071f5c8ffe3678d15f3a1be09156be"
+  integrity sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==
+
+"@jest/environment@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-30.2.0.tgz#1e673cdb8b93ded707cf6631b8353011460831fa"
+  integrity sha512-/QPTL7OBJQ5ac09UDRa3EQes4gt1FTEG/8jZ/4v5IVzx+Cv7dLxlVIvfvSVRiiX2drWyXeBjkMSR8hvOWSog5g==
+  dependencies:
+    "@jest/fake-timers" "30.2.0"
+    "@jest/types" "30.2.0"
+    "@types/node" "*"
+    jest-mock "30.2.0"
+
+"@jest/expect-utils@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-30.2.0.tgz#4f95413d4748454fdb17404bf1141827d15e6011"
+  integrity sha512-1JnRfhqpD8HGpOmQp180Fo9Zt69zNtC+9lR+kT7NVL05tNXIi+QC8Csz7lfidMoVLPD3FnOtcmp0CEFnxExGEA==
+  dependencies:
+    "@jest/get-type" "30.1.0"
+
+"@jest/expect@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-30.2.0.tgz#9a5968499bb8add2bbb09136f69f7df5ddbf3185"
+  integrity sha512-V9yxQK5erfzx99Sf+7LbhBwNWEZ9eZay8qQ9+JSC0TrMR1pMDHLMY+BnVPacWU6Jamrh252/IKo4F1Xn/zfiqA==
+  dependencies:
+    expect "30.2.0"
+    jest-snapshot "30.2.0"
+
+"@jest/fake-timers@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-30.2.0.tgz#0941ddc28a339b9819542495b5408622dc9e94ec"
+  integrity sha512-HI3tRLjRxAbBy0VO8dqqm7Hb2mIa8d5bg/NJkyQcOk7V118ObQML8RC5luTF/Zsg4474a+gDvhce7eTnP4GhYw==
+  dependencies:
+    "@jest/types" "30.2.0"
+    "@sinonjs/fake-timers" "^13.0.0"
+    "@types/node" "*"
+    jest-message-util "30.2.0"
+    jest-mock "30.2.0"
+    jest-util "30.2.0"
+
+"@jest/get-type@30.1.0":
+  version "30.1.0"
+  resolved "https://registry.yarnpkg.com/@jest/get-type/-/get-type-30.1.0.tgz#4fcb4dc2ebcf0811be1c04fd1cb79c2dba431cbc"
+  integrity sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==
+
+"@jest/globals@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-30.2.0.tgz#2f4b696d5862664b89c4ee2e49ae24d2bb7e0988"
+  integrity sha512-b63wmnKPaK+6ZZfpYhz9K61oybvbI1aMcIs80++JI1O1rR1vaxHUCNqo3ITu6NU0d4V34yZFoHMn/uoKr/Rwfw==
+  dependencies:
+    "@jest/environment" "30.2.0"
+    "@jest/expect" "30.2.0"
+    "@jest/types" "30.2.0"
+    jest-mock "30.2.0"
+
+"@jest/pattern@30.0.1":
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/pattern/-/pattern-30.0.1.tgz#d5304147f49a052900b4b853dedb111d080e199f"
+  integrity sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==
+  dependencies:
+    "@types/node" "*"
+    jest-regex-util "30.0.1"
+
+"@jest/reporters@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-30.2.0.tgz#a36b28fcbaf0c4595250b108e6f20e363348fd91"
+  integrity sha512-DRyW6baWPqKMa9CzeiBjHwjd8XeAyco2Vt8XbcLFjiwCOEKOvy82GJ8QQnJE9ofsxCMPjH4MfH8fCWIHHDKpAQ==
+  dependencies:
+    "@bcoe/v8-coverage" "^0.2.3"
+    "@jest/console" "30.2.0"
+    "@jest/test-result" "30.2.0"
+    "@jest/transform" "30.2.0"
+    "@jest/types" "30.2.0"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    "@types/node" "*"
+    chalk "^4.1.2"
+    collect-v8-coverage "^1.0.2"
+    exit-x "^0.2.2"
+    glob "^10.3.10"
+    graceful-fs "^4.2.11"
+    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-instrument "^6.0.0"
+    istanbul-lib-report "^3.0.0"
+    istanbul-lib-source-maps "^5.0.0"
+    istanbul-reports "^3.1.3"
+    jest-message-util "30.2.0"
+    jest-util "30.2.0"
+    jest-worker "30.2.0"
+    slash "^3.0.0"
+    string-length "^4.0.2"
+    v8-to-istanbul "^9.0.1"
+
+"@jest/schemas@30.0.5":
+  version "30.0.5"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-30.0.5.tgz#7bdf69fc5a368a5abdb49fd91036c55225846473"
+  integrity sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==
+  dependencies:
+    "@sinclair/typebox" "^0.34.0"
+
+"@jest/snapshot-utils@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/snapshot-utils/-/snapshot-utils-30.2.0.tgz#387858eb90c2f98f67bff327435a532ac5309fbe"
+  integrity sha512-0aVxM3RH6DaiLcjj/b0KrIBZhSX1373Xci4l3cW5xiUWPctZ59zQ7jj4rqcJQ/Z8JuN/4wX3FpJSa3RssVvCug==
+  dependencies:
+    "@jest/types" "30.2.0"
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
+    natural-compare "^1.4.0"
+
+"@jest/source-map@30.0.1":
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-30.0.1.tgz#305ebec50468f13e658b3d5c26f85107a5620aaa"
+  integrity sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.25"
+    callsites "^3.1.0"
+    graceful-fs "^4.2.11"
+
+"@jest/test-result@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-30.2.0.tgz#9c0124377fb7996cdffb86eda3dbc56eacab363d"
+  integrity sha512-RF+Z+0CCHkARz5HT9mcQCBulb1wgCP3FBvl9VFokMX27acKphwyQsNuWH3c+ojd1LeWBLoTYoxF0zm6S/66mjg==
+  dependencies:
+    "@jest/console" "30.2.0"
+    "@jest/types" "30.2.0"
+    "@types/istanbul-lib-coverage" "^2.0.6"
+    collect-v8-coverage "^1.0.2"
+
+"@jest/test-sequencer@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-30.2.0.tgz#bf0066bc72e176d58f5dfa7f212b6e7eee44f221"
+  integrity sha512-wXKgU/lk8fKXMu/l5Hog1R61bL4q5GCdT6OJvdAFz1P+QrpoFuLU68eoKuVc4RbrTtNnTL5FByhWdLgOPSph+Q==
+  dependencies:
+    "@jest/test-result" "30.2.0"
+    graceful-fs "^4.2.11"
+    jest-haste-map "30.2.0"
+    slash "^3.0.0"
+
+"@jest/transform@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-30.2.0.tgz#54bef1a4510dcbd58d5d4de4fe2980a63077ef2a"
+  integrity sha512-XsauDV82o5qXbhalKxD7p4TZYYdwcaEXC77PPD2HixEFF+6YGppjrAAQurTl2ECWcEomHBMMNS9AH3kcCFx8jA==
+  dependencies:
+    "@babel/core" "^7.27.4"
+    "@jest/types" "30.2.0"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    babel-plugin-istanbul "^7.0.1"
+    chalk "^4.1.2"
+    convert-source-map "^2.0.0"
+    fast-json-stable-stringify "^2.1.0"
+    graceful-fs "^4.2.11"
+    jest-haste-map "30.2.0"
+    jest-regex-util "30.0.1"
+    jest-util "30.2.0"
+    micromatch "^4.0.8"
+    pirates "^4.0.7"
+    slash "^3.0.0"
+    write-file-atomic "^5.0.1"
+
+"@jest/types@30.2.0", "@jest/types@^30.0.1":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-30.2.0.tgz#1c678a7924b8f59eafd4c77d56b6d0ba976d62b8"
+  integrity sha512-H9xg1/sfVvyfU7o3zMfBEjQ1gcsdeTMgqHoYdN79tuLqfTtuu7WckRA1R5whDwOzxaZAeMKTYWqP+WCAi0CHsg==
+  dependencies:
+    "@jest/pattern" "30.0.1"
+    "@jest/schemas" "30.0.5"
+    "@types/istanbul-lib-coverage" "^2.0.6"
+    "@types/istanbul-reports" "^3.0.4"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.33"
+    chalk "^4.1.2"
+
+"@joshwooding/vite-plugin-react-docgen-typescript@0.6.1":
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/@joshwooding/vite-plugin-react-docgen-typescript/-/vite-plugin-react-docgen-typescript-0.6.1.tgz#f630b93ed13d5d07483c0ead42db793053b364a9"
+  integrity sha512-J4BaTocTOYFkMHIra1JDWrMWpNmBl4EkplIwHEsV8aeUOtdWjwSnln9U7twjMFTAEB7mptNtSKyVi1Y2W9sDJw==
+  dependencies:
+    glob "^10.0.0"
+    magic-string "^0.30.0"
+    react-docgen-typescript "^2.2.2"
+
+"@jridgewell/gen-mapping@^0.3.12", "@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.13"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f"
+  integrity sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.5.0"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
+"@jridgewell/remapping@^2.3.5":
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/remapping/-/remapping-2.3.5.tgz#375c476d1972947851ba1e15ae8f123047445aa1"
+  integrity sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
+"@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+
+"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0", "@jridgewell/sourcemap-codec@^1.5.5":
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba"
+  integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==
+
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.23", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.28":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0"
+  integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
+"@js-sdsl/ordered-map@^4.4.2":
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz#9299f82874bab9e4c7f9c48d865becbfe8d6907c"
+  integrity sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==
+
+"@lit-labs/react@^2.0.0":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@lit-labs/react/-/react-2.1.3.tgz#5fca408c435f0b6297fc1314471dc2426206d413"
+  integrity sha512-OD9h2JynerBQUMNzb563jiVpxfvPF0HjQkKY2mx0lpVYvD7F+rtJpOGz6ek+6ufMidV3i+MPT9SX62OKWHFrQg==
+  dependencies:
+    "@lit/react" "^1.0.3"
+
+"@lit/react@^1.0.3":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@lit/react/-/react-1.0.8.tgz#b3e229173b7b57d550909bf95d8f3da1a9510557"
+  integrity sha512-p2+YcF+JE67SRX3mMlJ1TKCSTsgyOVdAwd/nxp3NuV1+Cb6MWALbN6nT7Ld4tpmYofcE5kcaSY1YBB9erY+6fw==
+
+"@mdx-js/react@^3.0.0":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-3.1.1.tgz#24bda7fffceb2fe256f954482123cda1be5f5fef"
+  integrity sha512-f++rKLQgUVYDAtECQ6fn/is15GkEH9+nZPM3MS0RcxVqoTfawHvDlSCH7JbMhAM6uJ32v3eXLvLmLvjGu7PTQw==
+  dependencies:
+    "@types/mdx" "^2.0.0"
+
+"@microsoft/api-extractor-model@7.31.1":
+  version "7.31.1"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.31.1.tgz#b7667c0e4a842121fdbbf226498c5d4070ba3e33"
+  integrity sha512-Dhnip5OFKbl85rq/ICHBFGhV4RA5UQSl8AC/P/zoGvs+CBudPkatt5kIhMGiYgVPnUWmfR6fcp38+1AFLYNtUw==
+  dependencies:
+    "@microsoft/tsdoc" "~0.15.1"
+    "@microsoft/tsdoc-config" "~0.17.1"
+    "@rushstack/node-core-library" "5.17.0"
+
+"@microsoft/api-extractor@^7.50.1":
+  version "7.53.1"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.53.1.tgz#896cbee189a0a3e9f302d5061a761d0205592e65"
+  integrity sha512-bul5eTNxijLdDBqLye74u9494sRmf+9QULtec9Od0uHnifahGeNt8CC4/xCdn7mVyEBrXIQyQ5+sc4Uc0QfBSA==
+  dependencies:
+    "@microsoft/api-extractor-model" "7.31.1"
+    "@microsoft/tsdoc" "~0.15.1"
+    "@microsoft/tsdoc-config" "~0.17.1"
+    "@rushstack/node-core-library" "5.17.0"
+    "@rushstack/rig-package" "0.6.0"
+    "@rushstack/terminal" "0.19.1"
+    "@rushstack/ts-command-line" "5.1.1"
+    lodash "~4.17.15"
+    minimatch "10.0.3"
+    resolve "~1.22.1"
+    semver "~7.5.4"
+    source-map "~0.6.1"
+    typescript "5.8.2"
+
+"@microsoft/tsdoc-config@~0.17.1":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc-config/-/tsdoc-config-0.17.1.tgz#e0f0b50628f4ad7fe121ca616beacfe6a25b9335"
+  integrity sha512-UtjIFe0C6oYgTnad4q1QP4qXwLhe6tIpNTRStJ2RZEPIkqQPREAwE5spzVxsdn9UaEMUqhh0AqSx3X4nWAKXWw==
+  dependencies:
+    "@microsoft/tsdoc" "0.15.1"
+    ajv "~8.12.0"
+    jju "~1.4.0"
+    resolve "~1.22.2"
+
+"@microsoft/tsdoc@0.15.1", "@microsoft/tsdoc@~0.15.1":
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.15.1.tgz#d4f6937353bc4568292654efb0a0e0532adbcba2"
+  integrity sha512-4aErSrCR/On/e5G2hDP0wjooqDdauzEbIq8hIkIe5pXV0rtWJZvdCEKL0ykZxex+IxIwBp0eGeV48hQN07dXtw==
+
+"@napi-rs/wasm-runtime@^0.2.11":
+  version "0.2.12"
+  resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz#3e78a8b96e6c33a6c517e1894efbd5385a7cb6f2"
+  integrity sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==
+  dependencies:
+    "@emnapi/core" "^1.4.3"
+    "@emnapi/runtime" "^1.4.3"
+    "@tybys/wasm-util" "^0.10.0"
+
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
+"@nodelib/fs.walk@^1.2.8":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.5"
+    fastq "^1.6.0"
+
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
+
+"@pkgr/core@^0.2.9":
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.2.9.tgz#d229a7b7f9dac167a156992ef23c7f023653f53b"
+  integrity sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==
+
+"@playwright/test@1.57.0":
+  version "1.57.0"
+  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.57.0.tgz#a14720ffa9ed7ef7edbc1f60784fc6134acbb003"
+  integrity sha512-6TyEnHgd6SArQO8UO2OMTxshln3QMWBtPGrOCgs3wVEmQmwyuNtB10IZMfmYDE0riwNR1cu4q+pPcxMVtaG3TA==
+  dependencies:
+    playwright "1.57.0"
+
+"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
+  integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==
+
+"@protobufjs/base64@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735"
+  integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==
+
+"@protobufjs/codegen@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb"
+  integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==
+
+"@protobufjs/eventemitter@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
+  integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==
+
+"@protobufjs/fetch@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
+  integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.1"
+    "@protobufjs/inquire" "^1.1.0"
+
+"@protobufjs/float@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
+  integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==
+
+"@protobufjs/inquire@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
+  integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==
+
+"@protobufjs/path@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
+  integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==
+
+"@protobufjs/pool@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
+  integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==
+
+"@protobufjs/utf8@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
+  integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
+
+"@rollup/plugin-inject@^5.0.5":
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-inject/-/plugin-inject-5.0.5.tgz#616f3a73fe075765f91c5bec90176608bed277a3"
+  integrity sha512-2+DEJbNBoPROPkgTDNe8/1YXWcqxbN5DTjASVIOx8HS+pITXushyNiBV56RB08zuptzz8gT3YfkqriTBVycepg==
+  dependencies:
+    "@rollup/pluginutils" "^5.0.1"
+    estree-walker "^2.0.2"
+    magic-string "^0.30.3"
+
+"@rollup/pluginutils@^5.0.1", "@rollup/pluginutils@^5.0.2", "@rollup/pluginutils@^5.1.4":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.3.0.tgz#57ba1b0cbda8e7a3c597a4853c807b156e21a7b4"
+  integrity sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    estree-walker "^2.0.2"
+    picomatch "^4.0.2"
+
+"@rollup/rollup-android-arm-eabi@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.53.3.tgz#7e478b66180c5330429dd161bf84dad66b59c8eb"
+  integrity sha512-mRSi+4cBjrRLoaal2PnqH82Wqyb+d3HsPUN/W+WslCXsZsyHa9ZeQQX/pQsZaVIWDkPcpV6jJ+3KLbTbgnwv8w==
+
+"@rollup/rollup-android-arm64@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.53.3.tgz#2b025510c53a5e3962d3edade91fba9368c9d71c"
+  integrity sha512-CbDGaMpdE9sh7sCmTrTUyllhrg65t6SwhjlMJsLr+J8YjFuPmCEjbBSx4Z/e4SmDyH3aB5hGaJUP2ltV/vcs4w==
+
+"@rollup/rollup-darwin-arm64@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.53.3.tgz#3577c38af68ccf34c03e84f476bfd526abca10a0"
+  integrity sha512-Nr7SlQeqIBpOV6BHHGZgYBuSdanCXuw09hon14MGOLGmXAFYjx1wNvquVPmpZnl0tLjg25dEdr4IQ6GgyToCUA==
+
+"@rollup/rollup-darwin-x64@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.53.3.tgz#2bf5f2520a1f3b551723d274b9669ba5b75ed69c"
+  integrity sha512-DZ8N4CSNfl965CmPktJ8oBnfYr3F8dTTNBQkRlffnUarJ2ohudQD17sZBa097J8xhQ26AwhHJ5mvUyQW8ddTsQ==
+
+"@rollup/rollup-freebsd-arm64@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.53.3.tgz#4bb9cc80252564c158efc0710153c71633f1927c"
+  integrity sha512-yMTrCrK92aGyi7GuDNtGn2sNW+Gdb4vErx4t3Gv/Tr+1zRb8ax4z8GWVRfr3Jw8zJWvpGHNpss3vVlbF58DZ4w==
+
+"@rollup/rollup-freebsd-x64@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.53.3.tgz#2301289094d49415a380cf942219ae9d8b127440"
+  integrity sha512-lMfF8X7QhdQzseM6XaX0vbno2m3hlyZFhwcndRMw8fbAGUGL3WFMBdK0hbUBIUYcEcMhVLr1SIamDeuLBnXS+Q==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.53.3.tgz#1d03d776f2065e09fc141df7d143476e94acca88"
+  integrity sha512-k9oD15soC/Ln6d2Wv/JOFPzZXIAIFLp6B+i14KhxAfnq76ajt0EhYc5YPeX6W1xJkAdItcVT+JhKl1QZh44/qw==
+
+"@rollup/rollup-linux-arm-musleabihf@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.53.3.tgz#8623de0e040b2fd52a541c602688228f51f96701"
+  integrity sha512-vTNlKq+N6CK/8UktsrFuc+/7NlEYVxgaEgRXVUVK258Z5ymho29skzW1sutgYjqNnquGwVUObAaxae8rZ6YMhg==
+
+"@rollup/rollup-linux-arm64-gnu@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.53.3.tgz#ce2d1999bc166277935dde0301cde3dd0417fb6e"
+  integrity sha512-RGrFLWgMhSxRs/EWJMIFM1O5Mzuz3Xy3/mnxJp/5cVhZ2XoCAxJnmNsEyeMJtpK+wu0FJFWz+QF4mjCA7AUQ3w==
+
+"@rollup/rollup-linux-arm64-musl@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.53.3.tgz#88c2523778444da952651a2219026416564a4899"
+  integrity sha512-kASyvfBEWYPEwe0Qv4nfu6pNkITLTb32p4yTgzFCocHnJLAHs+9LjUu9ONIhvfT/5lv4YS5muBHyuV84epBo/A==
+
+"@rollup/rollup-linux-loong64-gnu@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.53.3.tgz#578ca2220a200ac4226c536c10c8cc6e4f276714"
+  integrity sha512-JiuKcp2teLJwQ7vkJ95EwESWkNRFJD7TQgYmCnrPtlu50b4XvT5MOmurWNrCj3IFdyjBQ5p9vnrX4JM6I8OE7g==
+
+"@rollup/rollup-linux-ppc64-gnu@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.53.3.tgz#aa338d3effd4168a20a5023834a74ba2c3081293"
+  integrity sha512-EoGSa8nd6d3T7zLuqdojxC20oBfNT8nexBbB/rkxgKj5T5vhpAQKKnD+h3UkoMuTyXkP5jTjK/ccNRmQrPNDuw==
+
+"@rollup/rollup-linux-riscv64-gnu@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.53.3.tgz#16ba582f9f6cff58119aa242782209b1557a1508"
+  integrity sha512-4s+Wped2IHXHPnAEbIB0YWBv7SDohqxobiiPA1FIWZpX+w9o2i4LezzH/NkFUl8LRci/8udci6cLq+jJQlh+0g==
+
+"@rollup/rollup-linux-riscv64-musl@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.53.3.tgz#e404a77ebd6378483888b8064c703adb011340ab"
+  integrity sha512-68k2g7+0vs2u9CxDt5ktXTngsxOQkSEV/xBbwlqYcUrAVh6P9EgMZvFsnHy4SEiUl46Xf0IObWVbMvPrr2gw8A==
+
+"@rollup/rollup-linux-s390x-gnu@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.53.3.tgz#92ad52d306227c56bec43d96ad2164495437ffe6"
+  integrity sha512-VYsFMpULAz87ZW6BVYw3I6sWesGpsP9OPcyKe8ofdg9LHxSbRMd7zrVrr5xi/3kMZtpWL/wC+UIJWJYVX5uTKg==
+
+"@rollup/rollup-linux-x64-gnu@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.53.3.tgz#fd0dea3bb9aa07e7083579f25e1c2285a46cb9fa"
+  integrity sha512-3EhFi1FU6YL8HTUJZ51imGJWEX//ajQPfqWLI3BQq4TlvHy4X0MOr5q3D2Zof/ka0d5FNdPwZXm3Yyib/UEd+w==
+
+"@rollup/rollup-linux-x64-musl@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.53.3.tgz#37a3efb09f18d555f8afc490e1f0444885de8951"
+  integrity sha512-eoROhjcc6HbZCJr+tvVT8X4fW3/5g/WkGvvmwz/88sDtSJzO7r/blvoBDgISDiCjDRZmHpwud7h+6Q9JxFwq1Q==
+
+"@rollup/rollup-openharmony-arm64@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.53.3.tgz#c489bec9f4f8320d42c9b324cca220c90091c1f7"
+  integrity sha512-OueLAWgrNSPGAdUdIjSWXw+u/02BRTcnfw9PN41D2vq/JSEPnJnVuBgw18VkN8wcd4fjUs+jFHVM4t9+kBSNLw==
+
+"@rollup/rollup-win32-arm64-msvc@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.53.3.tgz#152832b5f79dc22d1606fac3db946283601b7080"
+  integrity sha512-GOFuKpsxR/whszbF/bzydebLiXIHSgsEUp6M0JI8dWvi+fFa1TD6YQa4aSZHtpmh2/uAlj/Dy+nmby3TJ3pkTw==
+
+"@rollup/rollup-win32-ia32-msvc@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.53.3.tgz#54d91b2bb3bf3e9f30d32b72065a4e52b3a172a5"
+  integrity sha512-iah+THLcBJdpfZ1TstDFbKNznlzoxa8fmnFYK4V67HvmuNYkVdAywJSoteUszvBQ9/HqN2+9AZghbajMsFT+oA==
+
+"@rollup/rollup-win32-x64-gnu@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.53.3.tgz#df9df03e61a003873efec8decd2034e7f135c71e"
+  integrity sha512-J9QDiOIZlZLdcot5NXEepDkstocktoVjkaKUtqzgzpt2yWjGlbYiKyp05rWwk4nypbYUNoFAztEgixoLaSETkg==
+
+"@rollup/rollup-win32-x64-msvc@4.53.3":
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.53.3.tgz#38ae84f4c04226c1d56a3b17296ef1e0460ecdfe"
+  integrity sha512-UhTd8u31dXadv0MopwGgNOBpUVROFKWVQgAg5N1ESyCz8AuBcMqm4AuTjrwgQKGDfoFuz02EuMRHQIw/frmYKQ==
+
+"@rushstack/node-core-library@5.17.0":
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-5.17.0.tgz#30b9c7b1fe01f79e6448d0433d163ef4d3b290c9"
+  integrity sha512-24vt1GbHN6kyIglRMTVpyEiNRRRJK8uZHc1XoGAhmnTDKnrWet8OmOpImMswJIe6gM78eV8cMg1HXwuUHkSSgg==
+  dependencies:
+    ajv "~8.13.0"
+    ajv-draft-04 "~1.0.0"
+    ajv-formats "~3.0.1"
+    fs-extra "~11.3.0"
+    import-lazy "~4.0.0"
+    jju "~1.4.0"
+    resolve "~1.22.1"
+    semver "~7.5.4"
+
+"@rushstack/problem-matcher@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@rushstack/problem-matcher/-/problem-matcher-0.1.1.tgz#db9303ef3c47010c8aba5841e8c9511e091159df"
+  integrity sha512-Fm5XtS7+G8HLcJHCWpES5VmeMyjAKaWeyZU5qPzZC+22mPlJzAsOxymHiWIfuirtPckX3aptWws+K2d0BzniJA==
+
+"@rushstack/rig-package@0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.6.0.tgz#c80f93fe2c0d9d4977fc925ed9ce9decb75047a5"
+  integrity sha512-ZQmfzsLE2+Y91GF15c65L/slMRVhF6Hycq04D4TwtdGaUAbIXXg9c5pKA5KFU7M4QMaihoobp9JJYpYcaY3zOw==
+  dependencies:
+    resolve "~1.22.1"
+    strip-json-comments "~3.1.1"
+
+"@rushstack/terminal@0.19.1":
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/@rushstack/terminal/-/terminal-0.19.1.tgz#56969818ee6511b4607a230db343cf0602c7389e"
+  integrity sha512-jsBuSad67IDVMO2yp0hDfs0OdE4z3mDIjIL2pclDT3aEJboeZXE85e1HjuD0F6JoW3XgHvDwoX+WOV+AVTDQeA==
+  dependencies:
+    "@rushstack/node-core-library" "5.17.0"
+    "@rushstack/problem-matcher" "0.1.1"
+    supports-color "~8.1.1"
+
+"@rushstack/ts-command-line@5.1.1":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-5.1.1.tgz#b7804bbe425e3baf8edf60bbd446db7ba13f3269"
+  integrity sha512-HPzFsUcr+wZ3oQI08Ec/E6cuiAVHKzrXZGHhwiwIGygAFiqN5QzX+ff30n70NU2WyE26CykgMwBZZSSyHCJrzA==
+  dependencies:
+    "@rushstack/terminal" "0.19.1"
+    "@types/argparse" "1.0.38"
+    argparse "~1.0.9"
+    string-argv "~0.3.1"
+
+"@sideway/address@^4.1.5":
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.5.tgz#4bc149a0076623ced99ca8208ba780d65a99b9d5"
+  integrity sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==
+  dependencies:
+    "@hapi/hoek" "^9.0.0"
+
+"@sideway/formula@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
+  integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
+
+"@sideway/pinpoint@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
+  integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
+
+"@sinclair/typebox@^0.34.0":
+  version "0.34.41"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.34.41.tgz#aa51a6c1946df2c5a11494a2cdb9318e026db16c"
+  integrity sha512-6gS8pZzSXdyRHTIqoqSVknxolr1kzfy4/CeDnrzsVz8TTIWUbOBr6gnzOmTYJ3eXQNh4IYHIGi5aIL7sOZ2G/g==
+
+"@sinonjs/commons@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd"
+  integrity sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==
+  dependencies:
+    type-detect "4.0.8"
+
+"@sinonjs/fake-timers@^13.0.0":
+  version "13.0.5"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz#36b9dbc21ad5546486ea9173d6bea063eb1717d5"
+  integrity sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==
+  dependencies:
+    "@sinonjs/commons" "^3.0.1"
+
+"@storybook/addon-a11y@^10.0.7":
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-10.1.5.tgz#9fc95df597243d0617a4d6f36d4534f949474988"
+  integrity sha512-dMUrkuQyvDfD6SdvV7F7cbjRrhHN0kqCNhRfg1i1IJuLuck6kiALpx8176KhWBcAkN/0J/1V75n7+F9YU/JlPA==
+  dependencies:
+    "@storybook/global" "^5.0.0"
+    axe-core "^4.2.0"
+
+"@storybook/addon-designs@^11.0.1":
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-designs/-/addon-designs-11.1.0.tgz#c5d363d43b386a4fd6d9c1745b13e95a89a08761"
+  integrity sha512-i9lnUJ9x+UwThUpIjgg7QWvadhwmQ1ZuqcrTFe12giqyyYJKM6hdrUEuxGgSOrz3pkmDV/Bypq3G5ehwIDdKiw==
+  dependencies:
+    "@figspec/react" "^2.0.0"
+
+"@storybook/addon-docs@^10.0.7":
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-10.1.5.tgz#52bce4eed90240fc2b133caec1131962697c865a"
+  integrity sha512-2FfqFrfEeaKv8OerZCWt1b+dm7N/nizv1G2CnTZfWJ0TKxbPDH6kffAqC9lMnT3xAZjDWiBLdnVx2oouKdmSvw==
+  dependencies:
+    "@mdx-js/react" "^3.0.0"
+    "@storybook/csf-plugin" "10.1.5"
+    "@storybook/icons" "^2.0.0"
+    "@storybook/react-dom-shim" "10.1.5"
+    react "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+    react-dom "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+    ts-dedent "^2.0.0"
+
+"@storybook/builder-vite@10.1.5":
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/@storybook/builder-vite/-/builder-vite-10.1.5.tgz#27b11a0fb583e342cd041ea1eded7d012a0c278a"
+  integrity sha512-5alpNa+TQXK1zp9MeovUK/yIUkZqpIFUScUer6cYgidI96Boovn7OXt5oXQ8CqqpzuEtgCvz44TzCmgZoGv41g==
+  dependencies:
+    "@storybook/csf-plugin" "10.1.5"
+    "@vitest/mocker" "3.2.4"
+    ts-dedent "^2.0.0"
+
+"@storybook/csf-plugin@10.1.5":
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-10.1.5.tgz#8d147fa82c19e348991bbad88c1af8ef56a9d2a3"
+  integrity sha512-v+D7PVRkNUHznfoQg8yqpLWZIIbPddqHDSi1oBGdegF0Kv/lVsGqTZGRLroApsMu7BLwLhpcMID6ofxlfftWKg==
+  dependencies:
+    unplugin "^2.3.5"
+
+"@storybook/global@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@storybook/global/-/global-5.0.0.tgz#b793d34b94f572c1d7d9e0f44fac4e0dbc9572ed"
+  integrity sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==
+
+"@storybook/icons@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@storybook/icons/-/icons-2.0.1.tgz#1bd351db1d33bfccbbafa7b64fb413168f1a6616"
+  integrity sha512-/smVjw88yK3CKsiuR71vNgWQ9+NuY2L+e8X7IMrFjexjm6ZR8ULrV2DRkTA61aV6ryefslzHEGDInGpnNeIocg==
+
+"@storybook/react-dom-shim@10.1.5":
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-10.1.5.tgz#e39c169b093594de88dcb0c59b797ec23028ef0c"
+  integrity sha512-CsXcq26wINUgYP8KnfSuS60B10/Ag34YdcnWIEl9hM5UtTQ65WYJ9fVFqpzfnQrkpgRMd7iQjtmUhCe+4umnHg==
+
+"@storybook/react-vite@^10.0.7":
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/@storybook/react-vite/-/react-vite-10.1.5.tgz#9da7bbb0b860526da51fa3d50993934b593588b3"
+  integrity sha512-27RiCVw5QZ/f9fXS8sGaPHuWkbHSoS66ifeakxHgbkbIXjVI4M6pWB7NUj49MwU1YUMOpB0T8KasvyMZzv/UPA==
+  dependencies:
+    "@joshwooding/vite-plugin-react-docgen-typescript" "0.6.1"
+    "@rollup/pluginutils" "^5.0.2"
+    "@storybook/builder-vite" "10.1.5"
+    "@storybook/react" "10.1.5"
+    empathic "^2.0.0"
+    magic-string "^0.30.0"
+    react-docgen "^8.0.0"
+    resolve "^1.22.8"
+    tsconfig-paths "^4.2.0"
+
+"@storybook/react@10.1.5":
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-10.1.5.tgz#0f6a1ec5c4338d3604d6e957d0f53f7ddf9a2e6a"
+  integrity sha512-M8fR7WVs79fPJHwRZxkz4XzIfzs/bN0heWdZX0D4iRjeIcY4nLM/tyalCcQDrGgrSJbgAAf4xd7KXaZzaZSAqA==
+  dependencies:
+    "@storybook/global" "^5.0.0"
+    "@storybook/react-dom-shim" "10.1.5"
+    react-docgen "^8.0.2"
+
+"@storybook/test-runner@^0.24.1":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@storybook/test-runner/-/test-runner-0.24.2.tgz#59deba0619f7b896f92e186ac108244014859716"
+  integrity sha512-76DbflDTGAKq8Af6uHbWTGnKzKHhjLbJaZXRFhVnKqFocoXcej58C9DpM0BJ3addu7fSDJmPwfR97OINg16XFQ==
+  dependencies:
+    "@babel/core" "^7.22.5"
+    "@babel/generator" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/types" "^7.22.5"
+    "@jest/types" "^30.0.1"
+    "@swc/core" "^1.5.22"
+    "@swc/jest" "^0.2.38"
+    expect-playwright "^0.8.0"
+    jest "^30.0.4"
+    jest-circus "^30.0.4"
+    jest-environment-node "^30.0.4"
+    jest-junit "^16.0.0"
+    jest-process-manager "^0.4.0"
+    jest-runner "^30.0.4"
+    jest-serializer-html "^7.1.0"
+    jest-watch-typeahead "^3.0.1"
+    nyc "^15.1.0"
+    playwright "^1.14.0"
+    playwright-core ">=1.2.0"
+    rimraf "^3.0.2"
+    uuid "^8.3.2"
+
+"@swc/core-darwin-arm64@1.15.3":
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.3.tgz#bd0bd3ab7730e3ffa64cf200c0ed7c572cbaba97"
+  integrity sha512-AXfeQn0CvcQ4cndlIshETx6jrAM45oeUrK8YeEY6oUZU/qzz0Id0CyvlEywxkWVC81Ajpd8TQQ1fW5yx6zQWkQ==
+
+"@swc/core-darwin-x64@1.15.3":
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.15.3.tgz#502b1e1c680df6b962265ca81a0c1a23e6ff070f"
+  integrity sha512-p68OeCz1ui+MZYG4wmfJGvcsAcFYb6Sl25H9TxWl+GkBgmNimIiRdnypK9nBGlqMZAcxngNPtnG3kEMNnvoJ2A==
+
+"@swc/core-linux-arm-gnueabihf@1.15.3":
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.3.tgz#e32cc6a2e06a75060d6f598ba2ca6f96c5c0cc43"
+  integrity sha512-Nuj5iF4JteFgwrai97mUX+xUOl+rQRHqTvnvHMATL/l9xE6/TJfPBpd3hk/PVpClMXG3Uvk1MxUFOEzM1JrMYg==
+
+"@swc/core-linux-arm64-gnu@1.15.3":
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.3.tgz#9b9861bc44059e393d4baf98b3cd3d6c4ea6f521"
+  integrity sha512-2Nc/s8jE6mW2EjXWxO/lyQuLKShcmTrym2LRf5Ayp3ICEMX6HwFqB1EzDhwoMa2DcUgmnZIalesq2lG3krrUNw==
+
+"@swc/core-linux-arm64-musl@1.15.3":
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.3.tgz#f6388743e5a159018bd468e8f710940b2614384b"
+  integrity sha512-j4SJniZ/qaZ5g8op+p1G9K1z22s/EYGg1UXIb3+Cg4nsxEpF5uSIGEE4mHUfA70L0BR9wKT2QF/zv3vkhfpX4g==
+
+"@swc/core-linux-x64-gnu@1.15.3":
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.3.tgz#15fea551c7a3aeb1bdc3ad5c652d73c9321ddba8"
+  integrity sha512-aKttAZnz8YB1VJwPQZtyU8Uk0BfMP63iDMkvjhJzRZVgySmqt/apWSdnoIcZlUoGheBrcqbMC17GGUmur7OT5A==
+
+"@swc/core-linux-x64-musl@1.15.3":
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.3.tgz#d3f17bab4ffcadbb47f135e6a14d6f3e401af289"
+  integrity sha512-oe8FctPu1gnUsdtGJRO2rvOUIkkIIaHqsO9xxN0bTR7dFTlPTGi2Fhk1tnvXeyAvCPxLIcwD8phzKg6wLv9yug==
+
+"@swc/core-win32-arm64-msvc@1.15.3":
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.3.tgz#9da386df7fed00b3473bcf4281ff3fcd14726d2c"
+  integrity sha512-L9AjzP2ZQ/Xh58e0lTRMLvEDrcJpR7GwZqAtIeNLcTK7JVE+QineSyHp0kLkO1rttCHyCy0U74kDTj0dRz6raA==
+
+"@swc/core-win32-ia32-msvc@1.15.3":
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.3.tgz#c398d4f0f10ffec2151a79733ee1ce86a945a1ea"
+  integrity sha512-B8UtogMzErUPDWUoKONSVBdsgKYd58rRyv2sHJWKOIMCHfZ22FVXICR4O/VwIYtlnZ7ahERcjayBHDlBZpR0aw==
+
+"@swc/core-win32-x64-msvc@1.15.3":
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.3.tgz#715596b034a654c82b03ef734a9b44c29bcd3a68"
+  integrity sha512-SpZKMR9QBTecHeqpzJdYEfgw30Oo8b/Xl6rjSzBt1g0ZsXyy60KLXrp6IagQyfTYqNYE/caDvwtF2FPn7pomog==
+
+"@swc/core@^1.5.22":
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.15.3.tgz#2d0a5c4ac4c180c3dbf2f6d5d958b9fcbaa9755f"
+  integrity sha512-Qd8eBPkUFL4eAONgGjycZXj1jFCBW8Fd+xF0PzdTlBCWQIV1xnUT7B93wUANtW3KGjl3TRcOyxwSx/u/jyKw/Q==
+  dependencies:
+    "@swc/counter" "^0.1.3"
+    "@swc/types" "^0.1.25"
+  optionalDependencies:
+    "@swc/core-darwin-arm64" "1.15.3"
+    "@swc/core-darwin-x64" "1.15.3"
+    "@swc/core-linux-arm-gnueabihf" "1.15.3"
+    "@swc/core-linux-arm64-gnu" "1.15.3"
+    "@swc/core-linux-arm64-musl" "1.15.3"
+    "@swc/core-linux-x64-gnu" "1.15.3"
+    "@swc/core-linux-x64-musl" "1.15.3"
+    "@swc/core-win32-arm64-msvc" "1.15.3"
+    "@swc/core-win32-ia32-msvc" "1.15.3"
+    "@swc/core-win32-x64-msvc" "1.15.3"
+
+"@swc/counter@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9"
+  integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==
+
+"@swc/jest@^0.2.38":
+  version "0.2.39"
+  resolved "https://registry.yarnpkg.com/@swc/jest/-/jest-0.2.39.tgz#482bee0adb0726fab1487a4f902a278ec563a6b7"
+  integrity sha512-eyokjOwYd0Q8RnMHri+8/FS1HIrIUKK/sRrFp8c1dThUOfNeCWbLmBP1P5VsKdvmkd25JaH+OKYwEYiAYg9YAA==
+  dependencies:
+    "@jest/create-cache-key-function" "^30.0.0"
+    "@swc/counter" "^0.1.3"
+    jsonc-parser "^3.2.0"
+
+"@swc/types@^0.1.25":
+  version "0.1.25"
+  resolved "https://registry.yarnpkg.com/@swc/types/-/types-0.1.25.tgz#b517b2a60feb37dd933e542d93093719e4cf1078"
+  integrity sha512-iAoY/qRhNH8a/hBvm3zKj9qQ4oc2+3w1unPJa2XvTK3XjeLXtzcCingVPw/9e5mn1+0yPqxcBGp9Jf0pkfMb1g==
+  dependencies:
+    "@swc/counter" "^0.1.3"
+
+"@testcontainers/postgresql@^11.0.0":
+  version "11.9.0"
+  resolved "https://registry.yarnpkg.com/@testcontainers/postgresql/-/postgresql-11.9.0.tgz#9009e28208c4134c4cd6614827fa98614ea1d494"
+  integrity sha512-beLyLdLygFllktviM132Xd6tQ4i5FnuyZP+4BQEjUb5sJYHYnIrV/ZBzRRflIlF8gugt1GXgudkmr/HxM9vtKw==
+  dependencies:
+    testcontainers "^11.9.0"
+
+"@testing-library/dom@^10.4.1":
+  version "10.4.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-10.4.1.tgz#d444f8a889e9a46e9a3b4f3b88e0fcb3efb6cf95"
+  integrity sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/runtime" "^7.12.5"
+    "@types/aria-query" "^5.0.1"
+    aria-query "5.3.0"
+    dom-accessibility-api "^0.5.9"
+    lz-string "^1.5.0"
+    picocolors "1.1.1"
+    pretty-format "^27.0.2"
+
+"@testing-library/jest-dom@^6.6.3":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-6.9.1.tgz#7613a04e146dd2976d24ddf019730d57a89d56c2"
+  integrity sha512-zIcONa+hVtVSSep9UT3jZ5rizo2BsxgyDYU7WFD5eICBE7no3881HGeb/QkGfsJs6JTkY1aQhT7rIPC7e+0nnA==
+  dependencies:
+    "@adobe/css-tools" "^4.4.0"
+    aria-query "^5.0.0"
+    css.escape "^1.5.1"
+    dom-accessibility-api "^0.6.3"
+    picocolors "^1.1.1"
+    redent "^3.0.0"
+
+"@testing-library/react@^16.3.0":
+  version "16.3.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-16.3.0.tgz#3a85bb9bdebf180cd76dba16454e242564d598a6"
+  integrity sha512-kFSyxiEDwv1WLl2fgsq6pPBbw5aWKrsY2/noi1Id0TK0UParSF62oFQFGHXIyaG4pp2tEub/Zlel+fjjZILDsw==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+
+"@testing-library/user-event@^14.6.1":
+  version "14.6.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.6.1.tgz#13e09a32d7a8b7060fe38304788ebf4197cd2149"
+  integrity sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw==
+
+"@tybys/wasm-util@^0.10.0":
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.1.tgz#ecddd3205cf1e2d5274649ff0eedd2991ed7f414"
+  integrity sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==
+  dependencies:
+    tslib "^2.4.0"
+
+"@types/argparse@1.0.38":
+  version "1.0.38"
+  resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.38.tgz#a81fd8606d481f873a3800c6ebae4f1d768a56a9"
+  integrity sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==
+
+"@types/aria-query@^5.0.1":
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.4.tgz#1a31c3d378850d2778dabb6374d036dcba4ba708"
+  integrity sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==
+
+"@types/babel__core@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
+  integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==
+  dependencies:
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
+"@types/babel__generator@*":
+  version "7.27.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.27.0.tgz#b5819294c51179957afaec341442f9341e4108a9"
+  integrity sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@types/babel__template@*":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.4.tgz#5672513701c1b2199bc6dad636a9d7491586766f"
+  integrity sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@types/babel__traverse@*", "@types/babel__traverse@^7.20.7":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.28.0.tgz#07d713d6cce0d265c9849db0cbe62d3f61f36f74"
+  integrity sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==
+  dependencies:
+    "@babel/types" "^7.28.2"
+
+"@types/chai@^5.2.2":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-5.2.3.tgz#8e9cd9e1c3581fa6b341a5aed5588eb285be0b4a"
+  integrity sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==
+  dependencies:
+    "@types/deep-eql" "*"
+    assertion-error "^2.0.1"
+
+"@types/counterpart@^0.18.4":
+  version "0.18.4"
+  resolved "https://registry.yarnpkg.com/@types/counterpart/-/counterpart-0.18.4.tgz#e3e331b7e0d5496873d417839f3b2bbcf555bb73"
+  integrity sha512-aqBg5oAGo/qh/+wxUfuMadDu2WO0MEWOblyzwaM1Ske2xilUxBfgPqapAFVAfrVTDMVwa0UMarzGot8m64IAzA==
+
+"@types/deep-eql@*":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/deep-eql/-/deep-eql-4.0.2.tgz#334311971d3a07121e7eb91b684a605e7eea9cbd"
+  integrity sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==
+
+"@types/docker-modem@*":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@types/docker-modem/-/docker-modem-3.0.6.tgz#1f9262fcf85425b158ca725699a03eb23cddbf87"
+  integrity sha512-yKpAGEuKRSS8wwx0joknWxsmLha78wNMe9R2S3UNsVOkZded8UqOrV8KoeDXoXsjndxwyF3eIhyClGbO1SEhEg==
+  dependencies:
+    "@types/node" "*"
+    "@types/ssh2" "*"
+
+"@types/dockerode@^3.3.47":
+  version "3.3.47"
+  resolved "https://registry.yarnpkg.com/@types/dockerode/-/dockerode-3.3.47.tgz#cf8c6b4efcd0bb28b0e6009e613e7faab1b96e75"
+  integrity sha512-ShM1mz7rCjdssXt7Xz0u1/R2BJC7piWa3SJpUBiVjCf2A3XNn4cP6pUVaD8bLanpPVVn4IKzJuw3dOvkJ8IbYw==
+  dependencies:
+    "@types/docker-modem" "*"
+    "@types/node" "*"
+    "@types/ssh2" "*"
+
+"@types/doctrine@^0.0.9":
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/@types/doctrine/-/doctrine-0.0.9.tgz#d86a5f452a15e3e3113b99e39616a9baa0f9863f"
+  integrity sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==
+
+"@types/estree@1.0.8", "@types/estree@^1.0.0":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.8.tgz#958b91c991b1867ced318bedea0e215ee050726e"
+  integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==
+
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.1", "@types/istanbul-lib-coverage@^2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
+  integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
+
+"@types/istanbul-lib-report@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz#53047614ae72e19fc0401d872de3ae2b4ce350bf"
+  integrity sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+
+"@types/istanbul-reports@^3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54"
+  integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==
+  dependencies:
+    "@types/istanbul-lib-report" "*"
+
+"@types/jest-image-snapshot@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@types/jest-image-snapshot/-/jest-image-snapshot-6.4.0.tgz#641054d2fa2ff130a49c844ee7a9a68f281b6017"
+  integrity sha512-8TQ/EgqFCX0UWSpH488zAc21fCkJNpZPnnp3xWFMqElxApoJV5QOoqajnVRV7AhfF0rbQWTVyc04KG7tXnzCPA==
+  dependencies:
+    "@types/jest" "*"
+    "@types/pixelmatch" "*"
+    ssim.js "^3.1.1"
+
+"@types/jest@*":
+  version "30.0.0"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-30.0.0.tgz#5e85ae568006712e4ad66f25433e9bdac8801f1d"
+  integrity sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA==
+  dependencies:
+    expect "^30.0.0"
+    pretty-format "^30.0.0"
+
+"@types/lodash@^4.17.20":
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.21.tgz#b806831543d696b14f8112db600ea9d3a1df6ea4"
+  integrity sha512-FOvQ0YPD5NOfPgMzJihoT+Za5pdkDJWcbpuj1DjaKZIr/gxodQjY/uWEFlTNqW2ugXHUiL8lRQgw63dzKHZdeQ==
+
+"@types/mdx@^2.0.0":
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/@types/mdx/-/mdx-2.0.13.tgz#68f6877043d377092890ff5b298152b0a21671bd"
+  integrity sha512-+OWZQfAYyio6YkJb3HLxDrvnx6SWWDbC0zVPfBRzUk0/nqoDyf6dNxQi3eArPe8rJ473nobTMQ/8Zk+LxJ+Yuw==
+
+"@types/node@*", "@types/node@>=13.7.0":
+  version "24.10.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.10.2.tgz#82a57476a19647d8f2c7750d0924788245e39b26"
+  integrity sha512-WOhQTZ4G8xZ1tjJTvKOpyEVSGgOTvJAfDK3FNFgELyaTpzhdgHVHeqW8V+UJvzF5BT+/B54T/1S2K6gd9c7bbA==
+  dependencies:
+    undici-types "~7.16.0"
+
+"@types/node@^18.11.18":
+  version "18.19.130"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.130.tgz#da4c6324793a79defb7a62cba3947ec5add00d59"
+  integrity sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==
+  dependencies:
+    undici-types "~5.26.4"
+
+"@types/pixelmatch@*":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@types/pixelmatch/-/pixelmatch-5.2.6.tgz#fba6de304ac958495f27d85989f5c6bb7499a686"
+  integrity sha512-wC83uexE5KGuUODn6zkm9gMzTwdY5L0chiK+VrKcDfEjzxh1uadlWTvOmAbCpnM9zx/Ww3f8uKlYQVnO/TrqVg==
+  dependencies:
+    "@types/node" "*"
+
+"@types/react@^19.2.2":
+  version "19.2.7"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.2.7.tgz#84e62c0f23e8e4e5ac2cadcea1ffeacccae7f62f"
+  integrity sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==
+  dependencies:
+    csstype "^3.2.2"
+
+"@types/resolve@^1.20.2":
+  version "1.20.6"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.6.tgz#e6e60dad29c2c8c206c026e6dd8d6d1bdda850b8"
+  integrity sha512-A4STmOXPhMUtHH+S6ymgE2GiBSMqf4oTvcQZMcHzokuTLVYzXTB8ttjcgxOVaAp2lGwEdzZ0J+cRbbeevQj1UQ==
+
+"@types/ssh2-streams@*":
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/@types/ssh2-streams/-/ssh2-streams-0.1.13.tgz#f8d34a22be50fb8dbafbb2bbc289add0d22daa51"
+  integrity sha512-faHyY3brO9oLEA0QlcO8N2wT7R0+1sHWZvQ+y3rMLwdY1ZyS1z0W3t65j9PqT4HmQ6ALzNe7RZlNuCNE0wBSWA==
+  dependencies:
+    "@types/node" "*"
+
+"@types/ssh2@*":
+  version "1.15.5"
+  resolved "https://registry.yarnpkg.com/@types/ssh2/-/ssh2-1.15.5.tgz#6d8f45db2f39519b8d9377268fa71ed77d969686"
+  integrity sha512-N1ASjp/nXH3ovBHddRJpli4ozpk6UdDYIX4RJWFa9L1YKnzdhTlVmiGHm4DZnj/jLbqZpes4aeR30EFGQtvhQQ==
+  dependencies:
+    "@types/node" "^18.11.18"
+
+"@types/ssh2@^0.5.48":
+  version "0.5.52"
+  resolved "https://registry.yarnpkg.com/@types/ssh2/-/ssh2-0.5.52.tgz#9dbd8084e2a976e551d5e5e70b978ed8b5965741"
+  integrity sha512-lbLLlXxdCZOSJMCInKH2+9V/77ET2J6NPQHpFI0kda61Dd1KglJs+fPQBchizmzYSOJBgdTajhPqBO1xxLywvg==
+  dependencies:
+    "@types/node" "*"
+    "@types/ssh2-streams" "*"
+
+"@types/stack-utils@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
+  integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
+
+"@types/wait-on@^5.2.0":
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/@types/wait-on/-/wait-on-5.3.4.tgz#5ee270b3e073fb01073f9f044922c6893de8c4d2"
+  integrity sha512-EBsPjFMrFlMbbUFf9D1Fp+PAB2TwmUn7a3YtHyD9RLuTIk1jDd8SxXVAoez2Ciy+8Jsceo2MYEYZzJ/DvorOKw==
+  dependencies:
+    "@types/node" "*"
+
+"@types/yargs-parser@*":
+  version "21.0.3"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
+  integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
+
+"@types/yargs@^17.0.33":
+  version "17.0.35"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.35.tgz#07013e46aa4d7d7d50a49e15604c1c5340d4eb24"
+  integrity sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==
+  dependencies:
+    "@types/yargs-parser" "*"
+
+"@typescript-eslint/project-service@8.49.0":
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.49.0.tgz#ce220525c88cb2d23792b391c07e14cb9697651a"
+  integrity sha512-/wJN0/DKkmRUMXjZUXYZpD1NEQzQAAn9QWfGwo+Ai8gnzqH7tvqS7oNVdTjKqOcPyVIdZdyCMoqN66Ia789e7g==
+  dependencies:
+    "@typescript-eslint/tsconfig-utils" "^8.49.0"
+    "@typescript-eslint/types" "^8.49.0"
+    debug "^4.3.4"
+
+"@typescript-eslint/scope-manager@8.49.0":
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.49.0.tgz#a3496765b57fb48035d671174552e462e5bffa63"
+  integrity sha512-npgS3zi+/30KSOkXNs0LQXtsg9ekZ8OISAOLGWA/ZOEn0ZH74Ginfl7foziV8DT+D98WfQ5Kopwqb/PZOaIJGg==
+  dependencies:
+    "@typescript-eslint/types" "8.49.0"
+    "@typescript-eslint/visitor-keys" "8.49.0"
+
+"@typescript-eslint/tsconfig-utils@8.49.0", "@typescript-eslint/tsconfig-utils@^8.49.0":
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.49.0.tgz#857777c8e35dd1e564505833d8043f544442fbf4"
+  integrity sha512-8prixNi1/6nawsRYxet4YOhnbW+W9FK/bQPxsGB1D3ZrDzbJ5FXw5XmzxZv82X3B+ZccuSxo/X8q9nQ+mFecWA==
+
+"@typescript-eslint/types@8.49.0", "@typescript-eslint/types@^8.49.0":
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.49.0.tgz#c1bd3ebf956d9e5216396349ca23c58d74f06aee"
+  integrity sha512-e9k/fneezorUo6WShlQpMxXh8/8wfyc+biu6tnAqA81oWrEic0k21RHzP9uqqpyBBeBKu4T+Bsjy9/b8u7obXQ==
+
+"@typescript-eslint/typescript-estree@8.49.0":
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.49.0.tgz#99c5a53275197ccb4e849786dad68344e9924135"
+  integrity sha512-jrLdRuAbPfPIdYNppHJ/D0wN+wwNfJ32YTAm10eJVsFmrVpXQnDWBn8niCSMlWjvml8jsce5E/O+86IQtTbJWA==
+  dependencies:
+    "@typescript-eslint/project-service" "8.49.0"
+    "@typescript-eslint/tsconfig-utils" "8.49.0"
+    "@typescript-eslint/types" "8.49.0"
+    "@typescript-eslint/visitor-keys" "8.49.0"
+    debug "^4.3.4"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    tinyglobby "^0.2.15"
+    ts-api-utils "^2.1.0"
+
+"@typescript-eslint/utils@^8.8.1":
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.49.0.tgz#43b3b91d30afd6f6114532cf0b228f1790f43aff"
+  integrity sha512-N3W7rJw7Rw+z1tRsHZbK395TWSYvufBXumYtEGzypgMUthlg0/hmCImeA8hgO2d2G4pd7ftpxxul2J8OdtdaFA==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.7.0"
+    "@typescript-eslint/scope-manager" "8.49.0"
+    "@typescript-eslint/types" "8.49.0"
+    "@typescript-eslint/typescript-estree" "8.49.0"
+
+"@typescript-eslint/visitor-keys@8.49.0":
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.49.0.tgz#8e450cc502c0d285cad9e84d400cf349a85ced6c"
+  integrity sha512-LlKaciDe3GmZFphXIc79THF/YYBugZ7FS1pO581E/edlVVNbZKDy93evqmrfQ9/Y4uN0vVhX4iuchq26mK/iiA==
+  dependencies:
+    "@typescript-eslint/types" "8.49.0"
+    eslint-visitor-keys "^4.2.1"
+
+"@ungap/structured-clone@^1.2.0", "@ungap/structured-clone@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8"
+  integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==
+
+"@unrs/resolver-binding-android-arm-eabi@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz#9f5b04503088e6a354295e8ea8fe3cb99e43af81"
+  integrity sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==
+
+"@unrs/resolver-binding-android-arm64@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz#7414885431bd7178b989aedc4d25cccb3865bc9f"
+  integrity sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==
+
+"@unrs/resolver-binding-darwin-arm64@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz#b4a8556f42171fb9c9f7bac8235045e82aa0cbdf"
+  integrity sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==
+
+"@unrs/resolver-binding-darwin-x64@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz#fd4d81257b13f4d1a083890a6a17c00de571f0dc"
+  integrity sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==
+
+"@unrs/resolver-binding-freebsd-x64@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz#d2513084d0f37c407757e22f32bd924a78cfd99b"
+  integrity sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==
+
+"@unrs/resolver-binding-linux-arm-gnueabihf@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz#844d2605d057488d77fab09705f2866b86164e0a"
+  integrity sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==
+
+"@unrs/resolver-binding-linux-arm-musleabihf@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz#204892995cefb6bd1d017d52d097193bc61ddad3"
+  integrity sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==
+
+"@unrs/resolver-binding-linux-arm64-gnu@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz#023eb0c3aac46066a10be7a3f362e7b34f3bdf9d"
+  integrity sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==
+
+"@unrs/resolver-binding-linux-arm64-musl@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz#9e6f9abb06424e3140a60ac996139786f5d99be0"
+  integrity sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==
+
+"@unrs/resolver-binding-linux-ppc64-gnu@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz#b111417f17c9d1b02efbec8e08398f0c5527bb44"
+  integrity sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==
+
+"@unrs/resolver-binding-linux-riscv64-gnu@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz#92ffbf02748af3e99873945c9a8a5ead01d508a9"
+  integrity sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==
+
+"@unrs/resolver-binding-linux-riscv64-musl@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz#0bec6f1258fc390e6b305e9ff44256cb207de165"
+  integrity sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==
+
+"@unrs/resolver-binding-linux-s390x-gnu@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz#577843a084c5952f5906770633ccfb89dac9bc94"
+  integrity sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==
+
+"@unrs/resolver-binding-linux-x64-gnu@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz#36fb318eebdd690f6da32ac5e0499a76fa881935"
+  integrity sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==
+
+"@unrs/resolver-binding-linux-x64-musl@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz#bfb9af75f783f98f6a22c4244214efe4df1853d6"
+  integrity sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==
+
+"@unrs/resolver-binding-wasm32-wasi@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz#752c359dd875684b27429500d88226d7cc72f71d"
+  integrity sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==
+  dependencies:
+    "@napi-rs/wasm-runtime" "^0.2.11"
+
+"@unrs/resolver-binding-win32-arm64-msvc@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz#ce5735e600e4c2fbb409cd051b3b7da4a399af35"
+  integrity sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==
+
+"@unrs/resolver-binding-win32-ia32-msvc@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz#72fc57bc7c64ec5c3de0d64ee0d1810317bc60a6"
+  integrity sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==
+
+"@unrs/resolver-binding-win32-x64-msvc@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz#538b1e103bf8d9864e7b85cc96fa8d6fb6c40777"
+  integrity sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==
+
+"@vector-im/compound-design-tokens@^6.3.0":
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-6.4.2.tgz#29189d6480c8ccf09ce143cb4618fb13a56a7583"
+  integrity sha512-LHLGZgnatH3mQXn9TF+m/SUinPS2nKvuCT/r2AQ7HAgEIG/S/Ck6e/iV4IFQLSZnd9gU0RlMsLkP2UQ/AKUEBA==
+
+"@vitest/expect@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-3.2.4.tgz#8362124cd811a5ee11c5768207b9df53d34f2433"
+  integrity sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==
+  dependencies:
+    "@types/chai" "^5.2.2"
+    "@vitest/spy" "3.2.4"
+    "@vitest/utils" "3.2.4"
+    chai "^5.2.0"
+    tinyrainbow "^2.0.0"
+
+"@vitest/mocker@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/mocker/-/mocker-3.2.4.tgz#4471c4efbd62db0d4fa203e65cc6b058a85cabd3"
+  integrity sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==
+  dependencies:
+    "@vitest/spy" "3.2.4"
+    estree-walker "^3.0.3"
+    magic-string "^0.30.17"
+
+"@vitest/pretty-format@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/pretty-format/-/pretty-format-3.2.4.tgz#3c102f79e82b204a26c7a5921bf47d534919d3b4"
+  integrity sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==
+  dependencies:
+    tinyrainbow "^2.0.0"
+
+"@vitest/spy@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-3.2.4.tgz#cc18f26f40f3f028da6620046881f4e4518c2599"
+  integrity sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==
+  dependencies:
+    tinyspy "^4.0.3"
+
+"@vitest/utils@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-3.2.4.tgz#c0813bc42d99527fb8c5b138c7a88516bca46fea"
+  integrity sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==
+  dependencies:
+    "@vitest/pretty-format" "3.2.4"
+    loupe "^3.1.4"
+    tinyrainbow "^2.0.0"
+
+"@volar/language-core@2.4.23", "@volar/language-core@~2.4.11":
+  version "2.4.23"
+  resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-2.4.23.tgz#deb6dbc5fdbafa9bb7ba691fc59cb196cdb856d3"
+  integrity sha512-hEEd5ET/oSmBC6pi1j6NaNYRWoAiDhINbT8rmwtINugR39loROSlufGdYMF9TaKGfz+ViGs1Idi3mAhnuPcoGQ==
+  dependencies:
+    "@volar/source-map" "2.4.23"
+
+"@volar/source-map@2.4.23":
+  version "2.4.23"
+  resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-2.4.23.tgz#d476e11a3a669d89858a5eb38b02342be39b0e44"
+  integrity sha512-Z1Uc8IB57Lm6k7q6KIDu/p+JWtf3xsXJqAX/5r18hYOTpJyBn0KXUR8oTJ4WFYOcDzWC9n3IflGgHowx6U6z9Q==
+
+"@volar/typescript@^2.4.11":
+  version "2.4.23"
+  resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-2.4.23.tgz#b9b114ea01ad0ad977139edda0239fdafdb21ad7"
+  integrity sha512-lAB5zJghWxVPqfcStmAP1ZqQacMpe90UrP5RJ3arDyrhy4aCUQqmxPPLB2PWDKugvylmO41ljK7vZ+t6INMTag==
+  dependencies:
+    "@volar/language-core" "2.4.23"
+    path-browserify "^1.0.1"
+    vscode-uri "^3.0.8"
+
+"@vue/compiler-core@3.5.22":
+  version "3.5.22"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.5.22.tgz#bb8294a0dd31df540563cc6ffa0456f1f7687b97"
+  integrity sha512-jQ0pFPmZwTEiRNSb+i9Ow/I/cHv2tXYqsnHKKyCQ08irI2kdF5qmYedmF8si8mA7zepUFmJ2hqzS8CQmNOWOkQ==
+  dependencies:
+    "@babel/parser" "^7.28.4"
+    "@vue/shared" "3.5.22"
+    entities "^4.5.0"
+    estree-walker "^2.0.2"
+    source-map-js "^1.2.1"
+
+"@vue/compiler-dom@^3.5.0":
+  version "3.5.22"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.5.22.tgz#6c9c2c9843520f6d3dbc685e5d0e1e12a2c04c56"
+  integrity sha512-W8RknzUM1BLkypvdz10OVsGxnMAuSIZs9Wdx1vzA3mL5fNMN15rhrSCLiTm6blWeACwUwizzPVqGJgOGBEN/hA==
+  dependencies:
+    "@vue/compiler-core" "3.5.22"
+    "@vue/shared" "3.5.22"
+
+"@vue/compiler-vue2@^2.7.16":
+  version "2.7.16"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-vue2/-/compiler-vue2-2.7.16.tgz#2ba837cbd3f1b33c2bc865fbe1a3b53fb611e249"
+  integrity sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==
+  dependencies:
+    de-indent "^1.0.2"
+    he "^1.2.0"
+
+"@vue/language-core@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-2.2.0.tgz#e48c54584f889f78b120ce10a050dfb316c7fcdf"
+  integrity sha512-O1ZZFaaBGkKbsRfnVH1ifOK1/1BUkyK+3SQsfnh6PmMmD4qJcTU8godCeA96jjDRTL6zgnK7YzCHfaUlH2r0Mw==
+  dependencies:
+    "@volar/language-core" "~2.4.11"
+    "@vue/compiler-dom" "^3.5.0"
+    "@vue/compiler-vue2" "^2.7.16"
+    "@vue/shared" "^3.5.0"
+    alien-signals "^0.4.9"
+    minimatch "^9.0.3"
+    muggle-string "^0.4.1"
+    path-browserify "^1.0.1"
+
+"@vue/shared@3.5.22", "@vue/shared@^3.5.0":
+  version "3.5.22"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.22.tgz#9d56a1644a3becb8af1e34655928b0e288d827f8"
+  integrity sha512-F4yc6palwq3TT0u+FYf0Ns4Tfl9GRFURDN2gWG7L1ecIaS/4fCIuFOjMTnCyjsu/OK6vaDKLCrGAa+KvvH+h4w==
+
+"@yarnpkg/lockfile@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
+  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
+
+abort-controller@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
+  dependencies:
+    event-target-shim "^5.0.0"
+
+acorn-jsx@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
+
+acorn@^8.15.0, acorn@^8.9.0:
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
+  integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
+
+aggregate-error@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+  dependencies:
+    clean-stack "^2.0.0"
+    indent-string "^4.0.0"
+
+ajv-draft-04@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz#3b64761b268ba0b9e668f0b41ba53fce0ad77fc8"
+  integrity sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==
+
+ajv-formats@~3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-3.0.1.tgz#3d5dc762bca17679c3c2ea7e90ad6b7532309578"
+  integrity sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==
+  dependencies:
+    ajv "^8.0.0"
+
+ajv@^6.12.4:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ajv@^8.0.0:
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6"
+  integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+    fast-uri "^3.0.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+
+ajv@~8.12.0:
+  version "8.12.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
+  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
+ajv@~8.13.0:
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.13.0.tgz#a3939eaec9fb80d217ddf0c3376948c023f28c91"
+  integrity sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.4.1"
+
+alien-signals@^0.4.9:
+  version "0.4.14"
+  resolved "https://registry.yarnpkg.com/alien-signals/-/alien-signals-0.4.14.tgz#9ff8f72a272300a51692f54bd9bbbada78fbf539"
+  integrity sha512-itUAVzhczTmP2U5yX67xVpsbbOiquusbWVyA9N+sy6+r6YVbFkahXvNCeEPWEOMhwDYwbVbGHFkVL03N9I5g+Q==
+
+ansi-escapes@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
+  dependencies:
+    type-fest "^0.21.3"
+
+ansi-escapes@^7.0.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-7.2.0.tgz#31b25afa3edd3efc09d98c2fee831d460ff06b49"
+  integrity sha512-g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw==
+  dependencies:
+    environment "^1.0.0"
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-regex@^6.0.1:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1"
+  integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+ansi-styles@^5.0.0, ansi-styles@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
+  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
+
+ansi-styles@^6.1.0:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041"
+  integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==
+
+anymatch@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
+append-transform@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-2.0.0.tgz#99d9d29c7b38391e6f428d28ce136551f0b77e12"
+  integrity sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==
+  dependencies:
+    default-require-extensions "^3.0.0"
+
+archiver-utils@^5.0.0, archiver-utils@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-5.0.2.tgz#63bc719d951803efc72cf961a56ef810760dd14d"
+  integrity sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==
+  dependencies:
+    glob "^10.0.0"
+    graceful-fs "^4.2.0"
+    is-stream "^2.0.1"
+    lazystream "^1.0.0"
+    lodash "^4.17.15"
+    normalize-path "^3.0.0"
+    readable-stream "^4.0.0"
+
+archiver@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/archiver/-/archiver-7.0.1.tgz#c9d91c350362040b8927379c7aa69c0655122f61"
+  integrity sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==
+  dependencies:
+    archiver-utils "^5.0.2"
+    async "^3.2.4"
+    buffer-crc32 "^1.0.0"
+    readable-stream "^4.0.0"
+    readdir-glob "^1.1.2"
+    tar-stream "^3.0.0"
+    zip-stream "^6.0.1"
+
+archy@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+  integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
+
+argparse@^1.0.7, argparse@~1.0.9:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
+aria-query@5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e"
+  integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==
+  dependencies:
+    dequal "^2.0.3"
+
+aria-query@^5.0.0:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.2.tgz#93f81a43480e33a338f19163a3d10a50c01dcd59"
+  integrity sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==
+
+asn1.js@^4.10.1:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+asn1@^0.2.6:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
+  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-2.1.0.tgz#6d92a238d05dc02e7427c881fb8be81c8448b2dd"
+  integrity sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==
+  dependencies:
+    call-bind "^1.0.2"
+    is-nan "^1.3.2"
+    object-is "^1.1.5"
+    object.assign "^4.1.4"
+    util "^0.12.5"
+
+assertion-error@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-2.0.1.tgz#f641a196b335690b1070bf00b6e7593fec190bf7"
+  integrity sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==
+
+ast-types@^0.16.1:
+  version "0.16.1"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.16.1.tgz#7a9da1617c9081bc121faafe91711b4c8bb81da2"
+  integrity sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==
+  dependencies:
+    tslib "^2.0.1"
+
+async-lock@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/async-lock/-/async-lock-1.4.1.tgz#56b8718915a9b68b10fce2f2a9a3dddf765ef53f"
+  integrity sha512-Az2ZTpuytrtqENulXwO3GGv1Bztugx6TT37NIo7imr/Qo0gsYiGtSdBa2B6fsXhTpVZDNfu1Qn3pk531e3q+nQ==
+
+async@^3.2.4:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
+  integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
+
+available-typed-arrays@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
+  integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
+  dependencies:
+    possible-typed-array-names "^1.0.0"
+
+axe-core@^4.2.0, axe-core@~4.11.0:
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.11.0.tgz#16f74d6482e343ff263d4f4503829e9ee91a86b6"
+  integrity sha512-ilYanEU8vxxBexpJd8cWM4ElSQq4QctCLKih0TSfjIfCQTeyH/6zVrmIJfLPrKTKJRbiG+cfnZbQIjAlJmF1jQ==
+
+axios@^1.12.1, axios@^1.6.1:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.13.2.tgz#9ada120b7b5ab24509553ec3e40123521117f687"
+  integrity sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==
+  dependencies:
+    follow-redirects "^1.15.6"
+    form-data "^4.0.4"
+    proxy-from-env "^1.1.0"
+
+b4a@^1.6.4:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.7.3.tgz#24cf7ccda28f5465b66aec2bac69e32809bf112f"
+  integrity sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q==
+
+babel-jest@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-30.2.0.tgz#fd44a1ec9552be35ead881f7381faa7d8f3b95ac"
+  integrity sha512-0YiBEOxWqKkSQWL9nNGGEgndoeL0ZpWrbLMNL5u/Kaxrli3Eaxlt3ZtIDktEvXt4L/R9r3ODr2zKwGM/2BjxVw==
+  dependencies:
+    "@jest/transform" "30.2.0"
+    "@types/babel__core" "^7.20.5"
+    babel-plugin-istanbul "^7.0.1"
+    babel-preset-jest "30.2.0"
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
+    slash "^3.0.0"
+
+babel-plugin-istanbul@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.1.tgz#d8b518c8ea199364cf84ccc82de89740236daf92"
+  integrity sha512-D8Z6Qm8jCvVXtIRkBnqNHX0zJ37rQcFJ9u8WOS6tkYOsRdHBzypCstaxWiu5ZIlqQtviRYbgnRLSoCEvjqcqbA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@istanbuljs/load-nyc-config" "^1.0.0"
+    "@istanbuljs/schema" "^0.1.3"
+    istanbul-lib-instrument "^6.0.2"
+    test-exclude "^6.0.0"
+
+babel-plugin-jest-hoist@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.2.0.tgz#94c250d36b43f95900f3a219241e0f4648191ce2"
+  integrity sha512-ftzhzSGMUnOzcCXd6WHdBGMyuwy15Wnn0iyyWGKgBDLxf9/s5ABuraCSpBX2uG0jUg4rqJnxsLc5+oYBqoxVaA==
+  dependencies:
+    "@types/babel__core" "^7.20.5"
+
+babel-preset-current-node-syntax@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz#20730d6cdc7dda5d89401cab10ac6a32067acde6"
+  integrity sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==
+  dependencies:
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-bigint" "^7.8.3"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+    "@babel/plugin-syntax-import-attributes" "^7.24.7"
+    "@babel/plugin-syntax-import-meta" "^7.10.4"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@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-preset-jest@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-30.2.0.tgz#04717843e561347781d6d7f69c81e6bcc3ed11ce"
+  integrity sha512-US4Z3NOieAQumwFnYdUWKvUKh8+YSnS/gB3t6YBiz0bskpu7Pine8pPCheNxlPEW4wnUkma2a94YuW2q3guvCQ==
+  dependencies:
+    babel-plugin-jest-hoist "30.2.0"
+    babel-preset-current-node-syntax "^1.2.0"
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+bare-events@^2.5.4, bare-events@^2.7.0:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.8.2.tgz#7b3e10bd8e1fc80daf38bb516921678f566ab89f"
+  integrity sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==
+
+bare-fs@^4.0.1:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-4.5.2.tgz#d80ff8a9177e0db4818e7ba44b9302c0cf0788af"
+  integrity sha512-veTnRzkb6aPHOvSKIOy60KzURfBdUflr5VReI+NSaPL6xf+XLdONQgZgpYvUuZLVQ8dCqxpBAudaOM1+KpAUxw==
+  dependencies:
+    bare-events "^2.5.4"
+    bare-path "^3.0.0"
+    bare-stream "^2.6.4"
+    bare-url "^2.2.2"
+    fast-fifo "^1.3.2"
+
+bare-os@^3.0.1:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/bare-os/-/bare-os-3.6.2.tgz#b3c4f5ad5e322c0fd0f3c29fc97d19009e2796e5"
+  integrity sha512-T+V1+1srU2qYNBmJCXZkUY5vQ0B4FSlL3QDROnKQYOqeiQR8UbjNHlPa+TIbM4cuidiN9GaTaOZgSEgsvPbh5A==
+
+bare-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bare-path/-/bare-path-3.0.0.tgz#b59d18130ba52a6af9276db3e96a2e3d3ea52178"
+  integrity sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==
+  dependencies:
+    bare-os "^3.0.1"
+
+bare-stream@^2.6.4:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/bare-stream/-/bare-stream-2.7.0.tgz#5b9e7dd0a354d06e82d6460c426728536c35d789"
+  integrity sha512-oyXQNicV1y8nc2aKffH+BUHFRXmx6VrPzlnaEvMhram0nPBrKcEdcyBg5r08D0i8VxngHFAiVyn1QKXpSG0B8A==
+  dependencies:
+    streamx "^2.21.0"
+
+bare-url@^2.2.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/bare-url/-/bare-url-2.3.2.tgz#4aef382efa662b2180a6fe4ca07a71b39bdf7ca3"
+  integrity sha512-ZMq4gd9ngV5aTMa5p9+UfY0b3skwhHELaDkhEHetMdX0LRkW9kzaym4oo/Eh+Ghm0CCDuMTsRIGM/ytUc1ZYmw==
+  dependencies:
+    bare-path "^3.0.0"
+
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
+baseline-browser-mapping@^2.9.0:
+  version "2.9.5"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.9.5.tgz#47f9549e0be1a84cd16651ac4c3b7d87a71408e6"
+  integrity sha512-D5vIoztZOq1XM54LUdttJVc96ggEsIfju2JBvht06pSzpckp3C7HReun67Bghzrtdsq9XdMGbSSB3v3GhMNmAA==
+
+bcrypt-pbkdf@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
+  dependencies:
+    tweetnacl "^0.14.3"
+
+bl@^4.0.3:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
+  version "4.12.2"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.2.tgz#3d8fed6796c24e177737f7cc5172ee04ef39ec99"
+  integrity sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==
+
+bn.js@^5.2.1, bn.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.2.tgz#82c09f9ebbb17107cd72cb7fd39bd1f9d0aaa566"
+  integrity sha512-v2YAxEmKaBLahNwE1mjp4WON6huMNeuDvagFZW+ASCuA/ku0bXR9hSMw0XpiqMoA3+rmnyck/tPRSFQkoC9Cuw==
+
+brace-expansion@^1.1.7:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
+  integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+brace-expansion@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
+  integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==
+  dependencies:
+    balanced-match "^1.0.0"
+
+braces@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
+  dependencies:
+    fill-range "^7.1.1"
+
+brorand@^1.0.1, brorand@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==
+
+browser-resolve@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-2.0.0.tgz#99b7304cb392f8d73dba741bb2d7da28c6d7842b"
+  integrity sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==
+  dependencies:
+    resolve "^1.17.0"
+
+browserify-aes@^1.0.4, browserify-aes@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+browserify-rsa@^4.0.0, browserify-rsa@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.1.tgz#06e530907fe2949dc21fc3c2e2302e10b1437238"
+  integrity sha512-YBjSAiTqM04ZVei6sXighu679a3SqWORA3qZTEqZImnlkDIFtKc6pNutpjyZ8RJTjQtuYfeetkxM11GwoYXMIQ==
+  dependencies:
+    bn.js "^5.2.1"
+    randombytes "^2.1.0"
+    safe-buffer "^5.2.1"
+
+browserify-sign@^4.2.3:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.5.tgz#3979269fa8af55ba18aac35deef11b45515cd27d"
+  integrity sha512-C2AUdAJg6rlM2W5QMp2Q4KGQMVBwR1lIimTsUnutJ8bMpW5B52pGpR2gEnNBNwijumDo5FojQ0L9JrXA8m4YEw==
+  dependencies:
+    bn.js "^5.2.2"
+    browserify-rsa "^4.1.1"
+    create-hash "^1.2.0"
+    create-hmac "^1.1.7"
+    elliptic "^6.6.1"
+    inherits "^2.0.4"
+    parse-asn1 "^5.1.9"
+    readable-stream "^2.3.8"
+    safe-buffer "^5.2.1"
+
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
+  dependencies:
+    pako "~1.0.5"
+
+browserslist@^4.24.0:
+  version "4.28.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.1.tgz#7f534594628c53c63101079e27e40de490456a95"
+  integrity sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==
+  dependencies:
+    baseline-browser-mapping "^2.9.0"
+    caniuse-lite "^1.0.30001759"
+    electron-to-chromium "^1.5.263"
+    node-releases "^2.0.27"
+    update-browserslist-db "^1.2.0"
+
+bser@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
+  dependencies:
+    node-int64 "^0.4.0"
+
+buffer-crc32@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-1.0.0.tgz#a10993b9055081d55304bd9feb4a072de179f405"
+  integrity sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==
+
+buffer-from@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
+
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==
+
+buffer@^5.5.0, buffer@^5.7.1:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
+buffer@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.2.1"
+
+buildcheck@~0.0.6:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.7.tgz#07a5e76c10ead8fa67d9e4c587b68f49e8f29d61"
+  integrity sha512-lHblz4ahamxpTmnsk+MNTRWsjYKv965MwOrSJyeD588rR3Jcu7swE+0wN5F+PbL5cjgu/9ObkhfzEPuofEMwLA==
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==
+
+bundle-name@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-4.1.0.tgz#f3b96b34160d6431a19d7688135af7cfb8797889"
+  integrity sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==
+  dependencies:
+    run-applescript "^7.0.0"
+
+byline@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
+  integrity sha512-s6webAy+R4SR8XVuJWt2V2rGvhnrhxN+9S15GNuTK3wKPOXFF6RNc+8ug2XhH+2s4f+uudG4kUVYmYOQWL2g0Q==
+
+caching-transform@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-4.0.0.tgz#00d297a4206d71e2163c39eaffa8157ac0651f0f"
+  integrity sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==
+  dependencies:
+    hasha "^5.0.0"
+    make-dir "^3.0.0"
+    package-hash "^4.0.0"
+    write-file-atomic "^3.0.0"
+
+call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
+  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
+  dependencies:
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+
+call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.7, call-bind@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
+  integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==
+  dependencies:
+    call-bind-apply-helpers "^1.0.0"
+    es-define-property "^1.0.0"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.2"
+
+call-bound@^1.0.2, call-bound@^1.0.3, call-bound@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
+  integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
+  dependencies:
+    call-bind-apply-helpers "^1.0.2"
+    get-intrinsic "^1.3.0"
+
+callsites@^3.0.0, callsites@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+camelcase@^5.0.0, camelcase@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
+camelcase@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
+
+caniuse-lite@^1.0.30001759:
+  version "1.0.30001760"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001760.tgz#bdd1960fafedf8d5f04ff16e81460506ff9b798f"
+  integrity sha512-7AAMPcueWELt1p3mi13HR/LHH0TJLT11cnwDJEs3xA4+CK/PLKeO9Kl1oru24htkyUKtkGCvAx4ohB0Ttry8Dw==
+
+chai@^5.2.0:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-5.3.3.tgz#dd3da955e270916a4bd3f625f4b919996ada7e06"
+  integrity sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==
+  dependencies:
+    assertion-error "^2.0.1"
+    check-error "^2.1.1"
+    deep-eql "^5.0.1"
+    loupe "^3.1.0"
+    pathval "^2.0.0"
+
+chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2, chalk@~4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chalk@^5.2.0:
+  version "5.6.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.6.2.tgz#b1238b6e23ea337af71c7f8a295db5af0c158aea"
+  integrity sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==
+
+char-regex@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
+  integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
+
+check-error@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-2.1.1.tgz#87eb876ae71ee388fa0471fe423f494be1d96ccc"
+  integrity sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==
+
+chownr@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+
+ci-info@^3.7.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
+  integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
+
+ci-info@^4.2.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.3.1.tgz#355ad571920810b5623e11d40232f443f16f1daa"
+  integrity sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==
+
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.7.tgz#bd094bfef42634ccfd9e13b9fc73274997111e39"
+  integrity sha512-Mz9QMT5fJe7bKI7MH31UilT5cEK5EHHRCccw/YRFsRY47AuNgaV6HY3rscp0/I4Q+tTW/5zoqpSeRRI54TkDWA==
+  dependencies:
+    inherits "^2.0.4"
+    safe-buffer "^5.2.1"
+    to-buffer "^1.2.2"
+
+cjs-module-lexer@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-2.1.1.tgz#bff23b0609cc9afa428bd35f1918f7d03b448562"
+  integrity sha512-+CmxIZ/L2vNcEfvNtLdU0ZQ6mbq3FZnwAP2PPTiKP+1QOoKwlKlPgb8UKV0Dds7QVaMnHm+FwSft2VB0s/SLjQ==
+
+classnames@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b"
+  integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
+
+clean-stack@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
+
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
+
+collect-v8-coverage@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.3.tgz#cc1f01eb8d02298cbc9a437c74c70ab4e5210b80"
+  integrity sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+combined-stream@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@^12.1.0:
+  version "12.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3"
+  integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==
+
+commander@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
+  integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
+
+compare-versions@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-6.1.1.tgz#7af3cc1099ba37d244b3145a9af5201b629148a9"
+  integrity sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==
+
+compress-commons@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-6.0.2.tgz#26d31251a66b9d6ba23a84064ecd3a6a71d2609e"
+  integrity sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==
+  dependencies:
+    crc-32 "^1.2.0"
+    crc32-stream "^6.0.0"
+    is-stream "^2.0.1"
+    normalize-path "^3.0.0"
+    readable-stream "^4.0.0"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+
+concurrently@^9.2.1:
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-9.2.1.tgz#248ea21b95754947be2dad9c3e4b60f18ca4e44f"
+  integrity sha512-fsfrO0MxV64Znoy8/l1vVIjjHa29SZyyqPgQBwhiDcaW8wJc2W3XWVOGx4M3oJBnv/zdUZIIp1gDeS98GzP8Ng==
+  dependencies:
+    chalk "4.1.2"
+    rxjs "7.8.2"
+    shell-quote "1.8.3"
+    supports-color "8.1.1"
+    tree-kill "1.2.2"
+    yargs "17.7.2"
+
+confbox@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.1.8.tgz#820d73d3b3c82d9bd910652c5d4d599ef8ff8b06"
+  integrity sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==
+
+confbox@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.2.2.tgz#8652f53961c74d9e081784beed78555974a9c110"
+  integrity sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==
+
+console-browserify@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
+  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
+
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==
+
+convert-source-map@^1.7.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
+  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
+
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
+
+core-util-is@~1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+
+counterpart@^0.18.6:
+  version "0.18.6"
+  resolved "https://registry.yarnpkg.com/counterpart/-/counterpart-0.18.6.tgz#cf6b60d8ef99a4b44b8bf6445fa99b4bd1b2f9dd"
+  integrity sha512-cAIDAYbC3x8S2DDbvFEJ4TzPtPYXma25/kfAkfmprNLlkPWeX4SdUp1c2xklfphqCU3HnDaivR4R3BrAYf5OMA==
+  dependencies:
+    date-names "^0.1.11"
+    except "^0.1.3"
+    extend "^3.0.0"
+    pluralizers "^0.1.7"
+    sprintf-js "^1.0.3"
+
+cpu-features@~0.0.10:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.10.tgz#9aae536db2710c7254d7ed67cb3cbc7d29ad79c5"
+  integrity sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==
+  dependencies:
+    buildcheck "~0.0.6"
+    nan "^2.19.0"
+
+crc-32@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff"
+  integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==
+
+crc32-stream@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-6.0.0.tgz#8529a3868f8b27abb915f6c3617c0fadedbf9430"
+  integrity sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==
+  dependencies:
+    crc-32 "^1.2.0"
+    readable-stream "^4.0.0"
+
+create-ecdh@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
+  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.5.3"
+
+create-hash@^1.1.0, create-hash@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+create-require@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
+cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3, cross-spawn@^7.0.6:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+crypto-browserify@^3.12.1:
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.1.tgz#bb8921bec9acc81633379aa8f52d69b0b69e0dac"
+  integrity sha512-r4ESw/IlusD17lgQi1O20Fa3qNnsckR126TdUuBgAu7GBYSIPvdNyONd3Zrxh0xCwA4+6w/TDArBPsMvhur+KQ==
+  dependencies:
+    browserify-cipher "^1.0.1"
+    browserify-sign "^4.2.3"
+    create-ecdh "^4.0.4"
+    create-hash "^1.2.0"
+    create-hmac "^1.1.7"
+    diffie-hellman "^5.0.3"
+    hash-base "~3.0.4"
+    inherits "^2.0.4"
+    pbkdf2 "^3.1.2"
+    public-encrypt "^4.0.3"
+    randombytes "^2.1.0"
+    randomfill "^1.0.4"
+
+css.escape@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
+  integrity sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==
+
+csstype@^3.2.2:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.2.3.tgz#ec48c0f3e993e50648c86da559e2610995cf989a"
+  integrity sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==
+
+cwd@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/cwd/-/cwd-0.10.0.tgz#172400694057c22a13b0cf16162c7e4b7a7fe567"
+  integrity sha512-YGZxdTTL9lmLkCUTpg4j0zQ7IhRB5ZmqNBbGCl3Tg6MP/d5/6sY7L5mmTjzbc6JKgVZYiqTQTNhPFsbXNGlRaA==
+  dependencies:
+    find-pkg "^0.1.2"
+    fs-exists-sync "^0.1.0"
+
+date-names@^0.1.11:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/date-names/-/date-names-0.1.13.tgz#c4358f6f77c8056e2f5ea68fdbb05f0bf1e53bd0"
+  integrity sha512-IxxoeD9tdx8pXVcmqaRlPvrXIsSrSrIZzfzlOkm9u+hyzKp5Wk/odt9O/gd7Ockzy8n/WHeEpTVJ2bF3mMV4LA==
+
+de-indent@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
+  integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==
+
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.4.0, debug@^4.4.3:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
+  integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
+  dependencies:
+    ms "^2.1.3"
+
+decamelize@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
+
+dedent@^1.6.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.7.0.tgz#c1f9445335f0175a96587be245a282ff451446ca"
+  integrity sha512-HGFtf8yhuhGhqO07SV79tRp+br4MnbdjeVxotpn1QBl30pcLLCQjX5b2295ll0fv8RKDKsmWYrl05usHM9CewQ==
+
+deep-eql@^5.0.1:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-5.0.2.tgz#4b756d8d770a9257300825d52a2c2cff99c3a341"
+  integrity sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==
+
+deep-is@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
+
+deepmerge@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
+
+default-browser-id@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-5.0.1.tgz#f7a7ccb8f5104bf8e0f71ba3b1ccfa5eafdb21e8"
+  integrity sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==
+
+default-browser@^5.2.1:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-5.4.0.tgz#b55cf335bb0b465dd7c961a02cd24246aa434287"
+  integrity sha512-XDuvSq38Hr1MdN47EDvYtx3U0MTqpCEn+F6ft8z2vYDzMrvQhVp0ui9oQdqW3MvK3vqUETglt1tVGgjLuJ5izg==
+  dependencies:
+    bundle-name "^4.1.0"
+    default-browser-id "^5.0.0"
+
+default-require-extensions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-3.0.1.tgz#bfae00feeaeada68c2ae256c62540f60b80625bd"
+  integrity sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==
+  dependencies:
+    strip-bom "^4.0.0"
+
+define-data-property@^1.0.1, define-data-property@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
+  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    gopd "^1.0.1"
+
+define-lazy-prop@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f"
+  integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==
+
+define-properties@^1.1.3, define-properties@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
+  dependencies:
+    define-data-property "^1.0.1"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
+
+dequal@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
+  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
+
+des.js@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.1.0.tgz#1d37f5766f3bbff4ee9638e871a8768c173b81da"
+  integrity sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+detect-newline@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
+  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
+
+diffable-html@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/diffable-html/-/diffable-html-4.1.0.tgz#e7a2d1de187c4e23a59751b4e4c17483a058c696"
+  integrity sha512-++kyNek+YBLH8cLXS+iTj/Hiy2s5qkRJEJ8kgu/WHbFrVY2vz9xPFUT+fii2zGF0m1CaojDlQJjkfrCt7YWM1g==
+  dependencies:
+    htmlparser2 "^3.9.2"
+
+diffie-hellman@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+docker-compose@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-1.3.0.tgz#6da4bb9d542b4cce6474aa3146a909eda5d23623"
+  integrity sha512-7Gevk/5eGD50+eMD+XDnFnOrruFkL0kSd7jEG4cjmqweDSUhB7i0g8is/nBdVpl+Bx338SqIB2GLKm32M+Vs6g==
+  dependencies:
+    yaml "^2.2.2"
+
+docker-modem@^5.0.6:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/docker-modem/-/docker-modem-5.0.6.tgz#cbe9d86a1fe66d7a072ac7fb99a9fc390a3e8b9a"
+  integrity sha512-ens7BiayssQz/uAxGzH8zGXCtiV24rRWXdjNha5V4zSOcxmAZsfGVm/PPFbwQdqEkDnhG+SyR9E3zSHUbOKXBQ==
+  dependencies:
+    debug "^4.1.1"
+    readable-stream "^3.5.0"
+    split-ca "^1.0.1"
+    ssh2 "^1.15.0"
+
+dockerode@^4.0.9:
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/dockerode/-/dockerode-4.0.9.tgz#15b32000edad25520be6fafa9ad6bc4529b06be7"
+  integrity sha512-iND4mcOWhPaCNh54WmK/KoSb35AFqPAUWFMffTQcp52uQt36b5uNwEJTSXntJZBbeGad72Crbi/hvDIv6us/6Q==
+  dependencies:
+    "@balena/dockerignore" "^1.0.2"
+    "@grpc/grpc-js" "^1.11.1"
+    "@grpc/proto-loader" "^0.7.13"
+    docker-modem "^5.0.6"
+    protobufjs "^7.3.2"
+    tar-fs "^2.1.4"
+    uuid "^10.0.0"
+
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
+dom-accessibility-api@^0.5.9:
+  version "0.5.16"
+  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz#5a7429e6066eb3664d911e33fb0e45de8eb08453"
+  integrity sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==
+
+dom-accessibility-api@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz#993e925cc1d73f2c662e7d75dd5a5445259a8fd8"
+  integrity sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==
+
+dom-serializer@0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
+  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
+  dependencies:
+    domelementtype "^2.0.1"
+    entities "^2.0.0"
+
+domain-browser@4.22.0:
+  version "4.22.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-4.22.0.tgz#6ddd34220ec281f9a65d3386d267ddd35c491f9f"
+  integrity sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==
+
+domelementtype@1, domelementtype@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
+
+domelementtype@^2.0.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
+
+domhandler@^2.3.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
+  dependencies:
+    domelementtype "1"
+
+domutils@^1.5.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+dunder-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
+  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
+  dependencies:
+    call-bind-apply-helpers "^1.0.1"
+    es-errors "^1.3.0"
+    gopd "^1.2.0"
+
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
+
+electron-to-chromium@^1.5.263:
+  version "1.5.267"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.267.tgz#5d84f2df8cdb6bfe7e873706bb21bd4bfb574dc7"
+  integrity sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==
+
+elliptic@^6.5.3, elliptic@^6.6.1:
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.6.1.tgz#3b8ffb02670bf69e382c7f65bf524c97c5405c06"
+  integrity sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==
+  dependencies:
+    bn.js "^4.11.9"
+    brorand "^1.1.0"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.1"
+    inherits "^2.0.4"
+    minimalistic-assert "^1.0.1"
+    minimalistic-crypto-utils "^1.0.1"
+
+emittery@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
+  integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
+
+empathic@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/empathic/-/empathic-2.0.0.tgz#71d3c2b94fad49532ef98a6c34be0386659f6131"
+  integrity sha512-i6UzDscO/XfAcNYD75CfICkmfLedpyPDdozrLMmQc5ORaQcdMoc21OnlEylMIqI7U8eniKrPMxxtj8k0vhmJhA==
+
+end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.5.tgz#7344d711dea40e0b74abc2ed49778743ccedb08c"
+  integrity sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==
+  dependencies:
+    once "^1.4.0"
+
+entities@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+
+entities@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
+
+entities@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
+environment@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/environment/-/environment-1.1.0.tgz#8e86c66b180f363c7ab311787e0259665f45a9f1"
+  integrity sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==
+
+error-ex@^1.3.1:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.4.tgz#b3a8d8bb6f92eecc1629e3e27d3c8607a8a32414"
+  integrity sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==
+  dependencies:
+    is-arrayish "^0.2.1"
+
+es-define-property@^1.0.0, es-define-property@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
+  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
+
+es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
+
+es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
+  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
+  dependencies:
+    es-errors "^1.3.0"
+
+es-set-tostringtag@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
+  integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
+  dependencies:
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.6"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.2"
+
+es6-error@^4.0.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
+  integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
+
+"esbuild@^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0 || ^0.26.0 || ^0.27.0":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.27.2.tgz#d83ed2154d5813a5367376bb2292a9296fc83717"
+  integrity sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==
+  optionalDependencies:
+    "@esbuild/aix-ppc64" "0.27.2"
+    "@esbuild/android-arm" "0.27.2"
+    "@esbuild/android-arm64" "0.27.2"
+    "@esbuild/android-x64" "0.27.2"
+    "@esbuild/darwin-arm64" "0.27.2"
+    "@esbuild/darwin-x64" "0.27.2"
+    "@esbuild/freebsd-arm64" "0.27.2"
+    "@esbuild/freebsd-x64" "0.27.2"
+    "@esbuild/linux-arm" "0.27.2"
+    "@esbuild/linux-arm64" "0.27.2"
+    "@esbuild/linux-ia32" "0.27.2"
+    "@esbuild/linux-loong64" "0.27.2"
+    "@esbuild/linux-mips64el" "0.27.2"
+    "@esbuild/linux-ppc64" "0.27.2"
+    "@esbuild/linux-riscv64" "0.27.2"
+    "@esbuild/linux-s390x" "0.27.2"
+    "@esbuild/linux-x64" "0.27.2"
+    "@esbuild/netbsd-arm64" "0.27.2"
+    "@esbuild/netbsd-x64" "0.27.2"
+    "@esbuild/openbsd-arm64" "0.27.2"
+    "@esbuild/openbsd-x64" "0.27.2"
+    "@esbuild/openharmony-arm64" "0.27.2"
+    "@esbuild/sunos-x64" "0.27.2"
+    "@esbuild/win32-arm64" "0.27.2"
+    "@esbuild/win32-ia32" "0.27.2"
+    "@esbuild/win32-x64" "0.27.2"
+
+esbuild@^0.25.0:
+  version "0.25.12"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.12.tgz#97a1d041f4ab00c2fce2f838d2b9969a2d2a97a5"
+  integrity sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==
+  optionalDependencies:
+    "@esbuild/aix-ppc64" "0.25.12"
+    "@esbuild/android-arm" "0.25.12"
+    "@esbuild/android-arm64" "0.25.12"
+    "@esbuild/android-x64" "0.25.12"
+    "@esbuild/darwin-arm64" "0.25.12"
+    "@esbuild/darwin-x64" "0.25.12"
+    "@esbuild/freebsd-arm64" "0.25.12"
+    "@esbuild/freebsd-x64" "0.25.12"
+    "@esbuild/linux-arm" "0.25.12"
+    "@esbuild/linux-arm64" "0.25.12"
+    "@esbuild/linux-ia32" "0.25.12"
+    "@esbuild/linux-loong64" "0.25.12"
+    "@esbuild/linux-mips64el" "0.25.12"
+    "@esbuild/linux-ppc64" "0.25.12"
+    "@esbuild/linux-riscv64" "0.25.12"
+    "@esbuild/linux-s390x" "0.25.12"
+    "@esbuild/linux-x64" "0.25.12"
+    "@esbuild/netbsd-arm64" "0.25.12"
+    "@esbuild/netbsd-x64" "0.25.12"
+    "@esbuild/openbsd-arm64" "0.25.12"
+    "@esbuild/openbsd-x64" "0.25.12"
+    "@esbuild/openharmony-arm64" "0.25.12"
+    "@esbuild/sunos-x64" "0.25.12"
+    "@esbuild/win32-arm64" "0.25.12"
+    "@esbuild/win32-ia32" "0.25.12"
+    "@esbuild/win32-x64" "0.25.12"
+
+escalade@^3.1.1, escalade@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
+  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
+
+escape-string-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
+eslint-plugin-matrix-org@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-matrix-org/-/eslint-plugin-matrix-org-3.0.0.tgz#0e5eaa556b6780dcd616b1381baec252df78b56d"
+  integrity sha512-xOPMeyLxOgoB2SsPhJmIc+drorZmXozSBo3X9whk/62DvbVpJcnththOCGx8ljYScADLb+baNOeN+wKZqwkldw==
+
+eslint-plugin-storybook@^10.0.7:
+  version "10.1.10"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-storybook/-/eslint-plugin-storybook-10.1.10.tgz#030a55e58a5e96a513cbf873434a840abdaf6a7d"
+  integrity sha512-ITr6Aq3buR/DuDATkq1BafUVJLybyo676fY+tj9Zjd1Ak+UXBAMQcQ++tiBVVHm1RqADwM3b1o6bnWHK2fPPKw==
+  dependencies:
+    "@typescript-eslint/utils" "^8.8.1"
+
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
+eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
+
+eslint-visitor-keys@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz#4cfea60fe7dd0ad8e816e1ed026c1d5251b512c1"
+  integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==
+
+eslint@8:
+  version "8.57.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz#7df109654aba7e3bbe5c8eae533c5e461d3c6ca9"
+  integrity sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.57.1"
+    "@humanwhocodes/config-array" "^0.13.0"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
+    "@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.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"
+
+espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
+  dependencies:
+    acorn "^8.9.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
+
+esprima@^4.0.0, esprima@~4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+esquery@^1.4.2:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
+  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
+  dependencies:
+    estraverse "^5.1.0"
+
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
+estree-walker@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
+
+estree-walker@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.3.tgz#67c3e549ec402a487b4fc193d1953a524752340d"
+  integrity sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==
+  dependencies:
+    "@types/estree" "^1.0.0"
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+event-target-shim@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
+
+events-universal@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/events-universal/-/events-universal-1.0.1.tgz#b56a84fd611b6610e0a2d0f09f80fdf931e2dfe6"
+  integrity sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==
+  dependencies:
+    bare-events "^2.7.0"
+
+events@^3.0.0, events@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
+except@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/except/-/except-0.1.3.tgz#98261c91958551536b44482238e9783fb73d292a"
+  integrity sha512-ouwgJavvMOTOfy0RE8NGQFAIoWh8ehJhkuxDyXxngMVTxTq7HGE7gZopZhqKFnu5lZLI+qQdtvJ8n03ehp7RJg==
+  dependencies:
+    indexof "0.0.1"
+
+execa@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
+    strip-final-newline "^2.0.0"
+
+exit-x@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/exit-x/-/exit-x-0.2.2.tgz#1f9052de3b8d99a696b10dad5bced9bdd5c3aa64"
+  integrity sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==
+
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
+
+expand-tilde@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449"
+  integrity sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q==
+  dependencies:
+    os-homedir "^1.0.1"
+
+expect-playwright@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/expect-playwright/-/expect-playwright-0.8.0.tgz#6d4ebe0bdbdd3c1693d880d97153b96a129ae4e8"
+  integrity sha512-+kn8561vHAY+dt+0gMqqj1oY+g5xWrsuGMk4QGxotT2WS545nVqqjs37z6hrYfIuucwqthzwJfCJUEYqixyljg==
+
+expect@30.2.0, expect@^30.0.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-30.2.0.tgz#d4013bed267013c14bc1199cec8aa57cee9b5869"
+  integrity sha512-u/feCi0GPsI+988gU2FLcsHyAHTU0MX1Wg68NhAnN7z/+C5wqG+CY8J53N9ioe8RXgaoz0nBR/TYMf3AycUuPw==
+  dependencies:
+    "@jest/expect-utils" "30.2.0"
+    "@jest/get-type" "30.1.0"
+    jest-matcher-utils "30.2.0"
+    jest-message-util "30.2.0"
+    jest-mock "30.2.0"
+    jest-util "30.2.0"
+
+exsolve@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/exsolve/-/exsolve-1.0.7.tgz#3b74e4c7ca5c5f9a19c3626ca857309fa99f9e9e"
+  integrity sha512-VO5fQUzZtI6C+vx4w/4BWJpg3s/5l+6pRQEHzFRM8WFi4XffSP1Z+4qi7GbjWbvRQEbdIco5mIMq+zX4rPuLrw==
+
+extend@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-fifo@^1.2.0, fast-fifo@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
+  integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
+
+fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
+
+fast-uri@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.0.tgz#66eecff6c764c0df9b762e62ca7edcfb53b4edfa"
+  integrity sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==
+
+fastq@^1.6.0:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.19.1.tgz#d50eaba803c8846a883c16492821ebcd2cda55f5"
+  integrity sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==
+  dependencies:
+    reusify "^1.0.4"
+
+fb-watchman@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
+  integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
+  dependencies:
+    bser "2.1.1"
+
+fdir@^6.5.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350"
+  integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==
+
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+  dependencies:
+    flat-cache "^3.0.4"
+
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+find-cache-dir@^3.2.0:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
+  integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^3.0.2"
+    pkg-dir "^4.1.0"
+
+find-file-up@^0.1.2:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/find-file-up/-/find-file-up-0.1.3.tgz#cf68091bcf9f300a40da411b37da5cce5a2fbea0"
+  integrity sha512-mBxmNbVyjg1LQIIpgO8hN+ybWBgDQK8qjht+EbrTCGmmPV/sc7RF1i9stPTD6bpvXZywBdrwRYxhSdJv867L6A==
+  dependencies:
+    fs-exists-sync "^0.1.0"
+    resolve-dir "^0.1.0"
+
+find-pkg@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/find-pkg/-/find-pkg-0.1.2.tgz#1bdc22c06e36365532e2a248046854b9788da557"
+  integrity sha512-0rnQWcFwZr7eO0513HahrWafsc3CTFioEB7DRiEYCUM/70QXSY8f3mCST17HXLcPvEhzH/Ty/Bxd72ZZsr/yvw==
+  dependencies:
+    find-file-up "^0.1.2"
+
+find-process@^1.4.4:
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/find-process/-/find-process-1.4.11.tgz#f7246251d396b35b9ae41fff7b87137673567fcc"
+  integrity sha512-mAOh9gGk9WZ4ip5UjV0o6Vb4SrfnAmtsFNzkMRH9HQiFXVQnDyQFrSHTK5UoG6E+KV+s+cIznbtwpfN41l2nFA==
+  dependencies:
+    chalk "~4.1.2"
+    commander "^12.1.0"
+    loglevel "^1.9.2"
+
+find-up@^4.0.0, find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
+find-yarn-workspace-root@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
+  integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==
+  dependencies:
+    micromatch "^4.0.2"
+
+flat-cache@^3.0.4:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
+  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
+  dependencies:
+    flatted "^3.2.9"
+    keyv "^4.5.3"
+    rimraf "^3.0.2"
+
+flatted@^3.2.9:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.3.tgz#67c8fad95454a7c7abebf74bb78ee74a44023358"
+  integrity sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==
+
+follow-redirects@^1.15.6:
+  version "1.15.11"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
+  integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
+
+for-each@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.5.tgz#d650688027826920feeb0af747ee7b9421a41d47"
+  integrity sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==
+  dependencies:
+    is-callable "^1.2.7"
+
+foreachasync@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/foreachasync/-/foreachasync-3.0.0.tgz#5502987dc8714be3392097f32e0071c9dee07cf6"
+  integrity sha512-J+ler7Ta54FwwNcx6wQRDhTIbNeyDcARMkOcguEqnEdtm0jKvN3Li3PDAb2Du3ubJYEWfYL83XMROXdsXAXycw==
+
+foreground-child@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-2.0.0.tgz#71b32800c9f15aa8f2f83f4a6bd9bff35d861a53"
+  integrity sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==
+  dependencies:
+    cross-spawn "^7.0.0"
+    signal-exit "^3.0.2"
+
+foreground-child@^3.1.0, foreground-child@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
+  integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==
+  dependencies:
+    cross-spawn "^7.0.6"
+    signal-exit "^4.0.1"
+
+form-data@^4.0.4:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053"
+  integrity sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    es-set-tostringtag "^2.1.0"
+    hasown "^2.0.2"
+    mime-types "^2.1.12"
+
+fromentries@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/fromentries/-/fromentries-1.3.2.tgz#e4bca6808816bf8f93b52750f1127f5a6fd86e3a"
+  integrity sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==
+
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
+fs-exists-sync@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
+  integrity sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==
+
+fs-extra@^10.0.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+fs-extra@~11.3.0:
+  version "11.3.2"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.3.2.tgz#c838aeddc6f4a8c74dd15f85e11fe5511bfe02a4"
+  integrity sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+
+fsevents@2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
+fsevents@^2.3.3, fsevents@~2.3.2, fsevents@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
+generator-function@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/generator-function/-/generator-function-2.0.1.tgz#0e75dd410d1243687a0ba2e951b94eedb8f737a2"
+  integrity sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==
+
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
+  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
+  dependencies:
+    call-bind-apply-helpers "^1.0.2"
+    es-define-property "^1.0.1"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.1.1"
+    function-bind "^1.1.2"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
+    has-symbols "^1.1.0"
+    hasown "^2.0.2"
+    math-intrinsics "^1.1.0"
+
+get-package-type@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
+
+get-port@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-7.1.0.tgz#d5a500ebfc7aa705294ec2b83cc38c5d0e364fec"
+  integrity sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==
+
+get-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
+  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
+  dependencies:
+    dunder-proto "^1.0.1"
+    es-object-atoms "^1.0.0"
+
+get-stdin@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
+  integrity sha512-jZV7n6jGE3Gt7fgSTJoz91Ak5MuTLwMwkoYdjxuJ/AmjIsE1UC03y/IWkZCQGEvVNS9qoRNwy5BCqxImv0FVeA==
+
+get-stream@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
+
+glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
+glob@^10.0.0, glob@^10.3.10:
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.5.0.tgz#8ec0355919cd3338c28428a23d4f24ecc5fe738c"
+  integrity sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
+    path-scurry "^1.11.1"
+
+glob@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-11.1.0.tgz#4f826576e4eb99c7dad383793d2f9f08f67e50a6"
+  integrity sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==
+  dependencies:
+    foreground-child "^3.3.1"
+    jackspeak "^4.1.1"
+    minimatch "^10.1.1"
+    minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
+    path-scurry "^2.0.0"
+
+glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+global-modules@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
+  integrity sha512-JeXuCbvYzYXcwE6acL9V2bAOeSIGl4dD+iwLY9iUx2VBJJ80R18HCn+JCwHM9Oegdfya3lEkGCdaRkSyc10hDA==
+  dependencies:
+    global-prefix "^0.1.4"
+    is-windows "^0.2.0"
+
+global-prefix@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"
+  integrity sha512-gOPiyxcD9dJGCEArAhF4Hd0BAqvAe/JzERP7tYumE4yIkmIedPUVXcJFWbV3/p/ovIIvKjkrTk+f1UVkq7vvbw==
+  dependencies:
+    homedir-polyfill "^1.0.0"
+    ini "^1.3.4"
+    is-windows "^0.2.0"
+    which "^1.2.12"
+
+globals@^13.19.0:
+  version "13.24.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
+  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
+  dependencies:
+    type-fest "^0.20.2"
+
+glur@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/glur/-/glur-1.1.2.tgz#f20ea36db103bfc292343921f1f91e83c3467689"
+  integrity sha512-l+8esYHTKOx2G/Aao4lEQ0bnHWg4fWtJbVoZZT9Knxi01pB8C80BR85nONLFwkkQoFRCmXY+BUcGZN3yZ2QsRA==
+
+gopd@^1.0.1, gopd@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
+  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
+  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
+  dependencies:
+    es-define-property "^1.0.0"
+
+has-symbols@^1.0.3, has-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
+  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
+
+has-tostringtag@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
+  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
+  dependencies:
+    has-symbols "^1.0.3"
+
+hash-base@^3.0.0, hash-base@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.2.tgz#79d72def7611c3f6e3c3b5730652638001b10a74"
+  integrity sha512-Bb33KbowVTIj5s7Ked1OsqHUeCpz//tPwR+E2zJgJKo9Z5XolZ9b6bdUgjmYlwnWhoOQKoTd1TYToZGn5mAYOg==
+  dependencies:
+    inherits "^2.0.4"
+    readable-stream "^2.3.8"
+    safe-buffer "^5.2.1"
+    to-buffer "^1.2.1"
+
+hash-base@~3.0.4:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.5.tgz#52480e285395cf7fba17dc4c9e47acdc7f248a8a"
+  integrity sha512-vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg==
+  dependencies:
+    inherits "^2.0.4"
+    safe-buffer "^5.2.1"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.1"
+
+hasha@^5.0.0:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.2.2.tgz#a48477989b3b327aea3c04f53096d816d97522a1"
+  integrity sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==
+  dependencies:
+    is-stream "^2.0.0"
+    type-fest "^0.8.0"
+
+hasown@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
+  dependencies:
+    function-bind "^1.1.2"
+
+he@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
+
+hmac-drbg@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
+homedir-polyfill@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
+  dependencies:
+    parse-passwd "^1.0.0"
+
+html-escaper@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
+
+htmlparser2@^3.9.2:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
+  dependencies:
+    domelementtype "^1.3.1"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^3.1.1"
+
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==
+
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
+
+ieee754@^1.1.13, ieee754@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
+ignore@^5.2.0:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
+  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
+
+import-fresh@^3.2.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.1.tgz#9cecb56503c0ada1f2741dbbd6546e4b13b57ccf"
+  integrity sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
+import-lazy@~4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
+  integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
+
+import-local@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.2.0.tgz#c3d5c745798c02a6f8b897726aba5100186ee260"
+  integrity sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==
+  dependencies:
+    pkg-dir "^4.2.0"
+    resolve-cwd "^3.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
+
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+ini@^1.3.4:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
+is-arguments@^1.0.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.2.0.tgz#ad58c6aecf563b78ef2bf04df540da8f5d7d8e1b"
+  integrity sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==
+  dependencies:
+    call-bound "^1.0.2"
+    has-tostringtag "^1.0.2"
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
+
+is-callable@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
+
+is-core-module@^2.16.0, is-core-module@^2.16.1:
+  version "2.16.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
+  integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
+  dependencies:
+    hasown "^2.0.2"
+
+is-docker@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
+
+is-docker@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200"
+  integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-generator-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
+
+is-generator-function@^1.0.7:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.2.tgz#ae3b61e3d5ea4e4839b90bad22b02335051a17d5"
+  integrity sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==
+  dependencies:
+    call-bound "^1.0.4"
+    generator-function "^2.0.0"
+    get-proto "^1.0.1"
+    has-tostringtag "^1.0.2"
+    safe-regex-test "^1.1.0"
+
+is-glob@^4.0.0, is-glob@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-inside-container@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4"
+  integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==
+  dependencies:
+    is-docker "^3.0.0"
+
+is-nan@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
+  integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
+is-regex@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22"
+  integrity sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==
+  dependencies:
+    call-bound "^1.0.2"
+    gopd "^1.2.0"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.2"
+
+is-stream@^2.0.0, is-stream@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+
+is-typed-array@^1.1.14, is-typed-array@^1.1.3:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b"
+  integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==
+  dependencies:
+    which-typed-array "^1.1.16"
+
+is-typedarray@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
+
+is-windows@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
+  integrity sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==
+
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
+is-wsl@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+  dependencies:
+    is-docker "^2.0.0"
+
+is-wsl@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.0.tgz#e1c657e39c10090afcbedec61720f6b924c3cbd2"
+  integrity sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==
+  dependencies:
+    is-inside-container "^1.0.0"
+
+isarray@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
+  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
+
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
+
+isomorphic-timers-promises@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/isomorphic-timers-promises/-/isomorphic-timers-promises-1.0.1.tgz#e4137c24dbc54892de8abae3a4b5c1ffff381598"
+  integrity sha512-u4sej9B1LPSxTGKB/HiuzvEQnXH0ECYkSVQU39koSwmFAxhlEAFl9RdTvLv4TOTQUgBS5O3O5fwUxk6byBZ+IQ==
+
+istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
+  integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
+
+istanbul-lib-hook@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz#8f84c9434888cc6b1d0a9d7092a76d239ebf0cc6"
+  integrity sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==
+  dependencies:
+    append-transform "^2.0.0"
+
+istanbul-lib-instrument@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
+  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
+  dependencies:
+    "@babel/core" "^7.7.5"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.0.0"
+    semver "^6.3.0"
+
+istanbul-lib-instrument@^6.0.0, istanbul-lib-instrument@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz#fa15401df6c15874bcb2105f773325d78c666765"
+  integrity sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==
+  dependencies:
+    "@babel/core" "^7.23.9"
+    "@babel/parser" "^7.23.9"
+    "@istanbuljs/schema" "^0.1.3"
+    istanbul-lib-coverage "^3.2.0"
+    semver "^7.5.4"
+
+istanbul-lib-processinfo@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz#366d454cd0dcb7eb6e0e419378e60072c8626169"
+  integrity sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==
+  dependencies:
+    archy "^1.0.0"
+    cross-spawn "^7.0.3"
+    istanbul-lib-coverage "^3.2.0"
+    p-map "^3.0.0"
+    rimraf "^3.0.0"
+    uuid "^8.3.2"
+
+istanbul-lib-report@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
+  integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
+  dependencies:
+    istanbul-lib-coverage "^3.0.0"
+    make-dir "^4.0.0"
+    supports-color "^7.1.0"
+
+istanbul-lib-source-maps@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
+  integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
+  dependencies:
+    debug "^4.1.1"
+    istanbul-lib-coverage "^3.0.0"
+    source-map "^0.6.1"
+
+istanbul-lib-source-maps@^5.0.0:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz#acaef948df7747c8eb5fbf1265cb980f6353a441"
+  integrity sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.23"
+    debug "^4.1.1"
+    istanbul-lib-coverage "^3.0.0"
+
+istanbul-reports@^3.0.2, istanbul-reports@^3.1.3:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.2.0.tgz#cb4535162b5784aa623cee21a7252cf2c807ac93"
+  integrity sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==
+  dependencies:
+    html-escaper "^2.0.0"
+    istanbul-lib-report "^3.0.0"
+
+jackspeak@^3.1.2:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
+  integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
+jackspeak@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-4.1.1.tgz#96876030f450502047fc7e8c7fcf8ce8124e43ae"
+  integrity sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+
+jest-changed-files@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-30.2.0.tgz#602266e478ed554e1e1469944faa7efd37cee61c"
+  integrity sha512-L8lR1ChrRnSdfeOvTrwZMlnWV8G/LLjQ0nG9MBclwWZidA2N5FviRki0Bvh20WRMOX31/JYvzdqTJrk5oBdydQ==
+  dependencies:
+    execa "^5.1.1"
+    jest-util "30.2.0"
+    p-limit "^3.1.0"
+
+jest-circus@30.2.0, jest-circus@^30.0.4:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-30.2.0.tgz#98b8198b958748a2f322354311023d1d02e7603f"
+  integrity sha512-Fh0096NC3ZkFx05EP2OXCxJAREVxj1BcW/i6EWqqymcgYKWjyyDpral3fMxVcHXg6oZM7iULer9wGRFvfpl+Tg==
+  dependencies:
+    "@jest/environment" "30.2.0"
+    "@jest/expect" "30.2.0"
+    "@jest/test-result" "30.2.0"
+    "@jest/types" "30.2.0"
+    "@types/node" "*"
+    chalk "^4.1.2"
+    co "^4.6.0"
+    dedent "^1.6.0"
+    is-generator-fn "^2.1.0"
+    jest-each "30.2.0"
+    jest-matcher-utils "30.2.0"
+    jest-message-util "30.2.0"
+    jest-runtime "30.2.0"
+    jest-snapshot "30.2.0"
+    jest-util "30.2.0"
+    p-limit "^3.1.0"
+    pretty-format "30.2.0"
+    pure-rand "^7.0.0"
+    slash "^3.0.0"
+    stack-utils "^2.0.6"
+
+jest-cli@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-30.2.0.tgz#1780f8e9d66bf84a10b369aea60aeda7697dcc67"
+  integrity sha512-Os9ukIvADX/A9sLt6Zse3+nmHtHaE6hqOsjQtNiugFTbKRHYIYtZXNGNK9NChseXy7djFPjndX1tL0sCTlfpAA==
+  dependencies:
+    "@jest/core" "30.2.0"
+    "@jest/test-result" "30.2.0"
+    "@jest/types" "30.2.0"
+    chalk "^4.1.2"
+    exit-x "^0.2.2"
+    import-local "^3.2.0"
+    jest-config "30.2.0"
+    jest-util "30.2.0"
+    jest-validate "30.2.0"
+    yargs "^17.7.2"
+
+jest-config@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-30.2.0.tgz#29df8c50e2ad801cc59c406b50176c18c362a90b"
+  integrity sha512-g4WkyzFQVWHtu6uqGmQR4CQxz/CH3yDSlhzXMWzNjDx843gYjReZnMRanjRCq5XZFuQrGDxgUaiYWE8BRfVckA==
+  dependencies:
+    "@babel/core" "^7.27.4"
+    "@jest/get-type" "30.1.0"
+    "@jest/pattern" "30.0.1"
+    "@jest/test-sequencer" "30.2.0"
+    "@jest/types" "30.2.0"
+    babel-jest "30.2.0"
+    chalk "^4.1.2"
+    ci-info "^4.2.0"
+    deepmerge "^4.3.1"
+    glob "^10.3.10"
+    graceful-fs "^4.2.11"
+    jest-circus "30.2.0"
+    jest-docblock "30.2.0"
+    jest-environment-node "30.2.0"
+    jest-regex-util "30.0.1"
+    jest-resolve "30.2.0"
+    jest-runner "30.2.0"
+    jest-util "30.2.0"
+    jest-validate "30.2.0"
+    micromatch "^4.0.8"
+    parse-json "^5.2.0"
+    pretty-format "30.2.0"
+    slash "^3.0.0"
+    strip-json-comments "^3.1.1"
+
+jest-diff@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-30.2.0.tgz#e3ec3a6ea5c5747f605c9e874f83d756cba36825"
+  integrity sha512-dQHFo3Pt4/NLlG5z4PxZ/3yZTZ1C7s9hveiOj+GCN+uT109NC2QgsoVZsVOAvbJ3RgKkvyLGXZV9+piDpWbm6A==
+  dependencies:
+    "@jest/diff-sequences" "30.0.1"
+    "@jest/get-type" "30.1.0"
+    chalk "^4.1.2"
+    pretty-format "30.2.0"
+
+jest-docblock@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-30.2.0.tgz#42cd98d69f887e531c7352309542b1ce4ee10256"
+  integrity sha512-tR/FFgZKS1CXluOQzZvNH3+0z9jXr3ldGSD8bhyuxvlVUwbeLOGynkunvlTMxchC5urrKndYiwCFC0DLVjpOCA==
+  dependencies:
+    detect-newline "^3.1.0"
+
+jest-each@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-30.2.0.tgz#39e623ae71641c2ac3ee69b3ba3d258fce8e768d"
+  integrity sha512-lpWlJlM7bCUf1mfmuqTA8+j2lNURW9eNafOy99knBM01i5CQeY5UH1vZjgT9071nDJac1M4XsbyI44oNOdhlDQ==
+  dependencies:
+    "@jest/get-type" "30.1.0"
+    "@jest/types" "30.2.0"
+    chalk "^4.1.2"
+    jest-util "30.2.0"
+    pretty-format "30.2.0"
+
+jest-environment-node@30.2.0, jest-environment-node@^30.0.4:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-30.2.0.tgz#3def7980ebd2fd86e74efd4d2e681f55ab38da0f"
+  integrity sha512-ElU8v92QJ9UrYsKrxDIKCxu6PfNj4Hdcktcn0JX12zqNdqWHB0N+hwOnnBBXvjLd2vApZtuLUGs1QSY+MsXoNA==
+  dependencies:
+    "@jest/environment" "30.2.0"
+    "@jest/fake-timers" "30.2.0"
+    "@jest/types" "30.2.0"
+    "@types/node" "*"
+    jest-mock "30.2.0"
+    jest-util "30.2.0"
+    jest-validate "30.2.0"
+
+jest-haste-map@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-30.2.0.tgz#808e3889f288603ac70ff0ac047598345a66022e"
+  integrity sha512-sQA/jCb9kNt+neM0anSj6eZhLZUIhQgwDt7cPGjumgLM4rXsfb9kpnlacmvZz3Q5tb80nS+oG/if+NBKrHC+Xw==
+  dependencies:
+    "@jest/types" "30.2.0"
+    "@types/node" "*"
+    anymatch "^3.1.3"
+    fb-watchman "^2.0.2"
+    graceful-fs "^4.2.11"
+    jest-regex-util "30.0.1"
+    jest-util "30.2.0"
+    jest-worker "30.2.0"
+    micromatch "^4.0.8"
+    walker "^1.0.8"
+  optionalDependencies:
+    fsevents "^2.3.3"
+
+jest-image-snapshot@^6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/jest-image-snapshot/-/jest-image-snapshot-6.5.1.tgz#cc714aff86187ecf38f90c506b443769aff87499"
+  integrity sha512-xlJFufgfY2Z4DsRsjcnTwxuynvo1bKdhf4OfcEftNuUAK+BwSCUtPmwlBGJhQ0XJXfm9JMAi/4BhQiHbaV8HrA==
+  dependencies:
+    chalk "^4.0.0"
+    get-stdin "^5.0.1"
+    glur "^1.1.2"
+    lodash "^4.17.4"
+    pixelmatch "^5.1.0"
+    pngjs "^3.4.0"
+    ssim.js "^3.1.1"
+
+jest-junit@^16.0.0:
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-16.0.0.tgz#d838e8c561cf9fdd7eb54f63020777eee4136785"
+  integrity sha512-A94mmw6NfJab4Fg/BlvVOUXzXgF0XIH6EmTgJ5NDPp4xoKq0Kr7sErb+4Xs9nZvu58pJojz5RFGpqnZYJTrRfQ==
+  dependencies:
+    mkdirp "^1.0.4"
+    strip-ansi "^6.0.1"
+    uuid "^8.3.2"
+    xml "^1.0.1"
+
+jest-leak-detector@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-30.2.0.tgz#292fdca7b7c9cf594e1e570ace140b01d8beb736"
+  integrity sha512-M6jKAjyzjHG0SrQgwhgZGy9hFazcudwCNovY/9HPIicmNSBuockPSedAP9vlPK6ONFJ1zfyH/M2/YYJxOz5cdQ==
+  dependencies:
+    "@jest/get-type" "30.1.0"
+    pretty-format "30.2.0"
+
+jest-matcher-utils@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-30.2.0.tgz#69a0d4c271066559ec8b0d8174829adc3f23a783"
+  integrity sha512-dQ94Nq4dbzmUWkQ0ANAWS9tBRfqCrn0bV9AMYdOi/MHW726xn7eQmMeRTpX2ViC00bpNaWXq+7o4lIQ3AX13Hg==
+  dependencies:
+    "@jest/get-type" "30.1.0"
+    chalk "^4.1.2"
+    jest-diff "30.2.0"
+    pretty-format "30.2.0"
+
+jest-message-util@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-30.2.0.tgz#fc97bf90d11f118b31e6131e2b67fc4f39f92152"
+  integrity sha512-y4DKFLZ2y6DxTWD4cDe07RglV88ZiNEdlRfGtqahfbIjfsw1nMCPx49Uev4IA/hWn3sDKyAnSPwoYSsAEdcimw==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@jest/types" "30.2.0"
+    "@types/stack-utils" "^2.0.3"
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
+    micromatch "^4.0.8"
+    pretty-format "30.2.0"
+    slash "^3.0.0"
+    stack-utils "^2.0.6"
+
+jest-mock@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-30.2.0.tgz#69f991614eeb4060189459d3584f710845bff45e"
+  integrity sha512-JNNNl2rj4b5ICpmAcq+WbLH83XswjPbjH4T7yvGzfAGCPh1rw+xVNbtk+FnRslvt9lkCcdn9i1oAoKUuFsOxRw==
+  dependencies:
+    "@jest/types" "30.2.0"
+    "@types/node" "*"
+    jest-util "30.2.0"
+
+jest-pnp-resolver@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
+  integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
+
+jest-process-manager@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/jest-process-manager/-/jest-process-manager-0.4.0.tgz#fb05c8e09ad400fd038436004815653bb98f4e8b"
+  integrity sha512-80Y6snDyb0p8GG83pDxGI/kQzwVTkCxc7ep5FPe/F6JYdvRDhwr6RzRmPSP7SEwuLhxo80lBS/NqOdUIbHIfhw==
+  dependencies:
+    "@types/wait-on" "^5.2.0"
+    chalk "^4.1.0"
+    cwd "^0.10.0"
+    exit "^0.1.2"
+    find-process "^1.4.4"
+    prompts "^2.4.1"
+    signal-exit "^3.0.3"
+    spawnd "^5.0.0"
+    tree-kill "^1.2.2"
+    wait-on "^7.0.0"
+
+jest-regex-util@30.0.1, jest-regex-util@^30.0.0:
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-30.0.1.tgz#f17c1de3958b67dfe485354f5a10093298f2a49b"
+  integrity sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==
+
+jest-resolve-dependencies@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-30.2.0.tgz#3370e2c0b49cc560f6a7e8ec3a59dd99525e1a55"
+  integrity sha512-xTOIGug/0RmIe3mmCqCT95yO0vj6JURrn1TKWlNbhiAefJRWINNPgwVkrVgt/YaerPzY3iItufd80v3lOrFJ2w==
+  dependencies:
+    jest-regex-util "30.0.1"
+    jest-snapshot "30.2.0"
+
+jest-resolve@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-30.2.0.tgz#2e2009cbd61e8f1f003355d5ec87225412cebcd7"
+  integrity sha512-TCrHSxPlx3tBY3hWNtRQKbtgLhsXa1WmbJEqBlTBrGafd5fiQFByy2GNCEoGR+Tns8d15GaL9cxEzKOO3GEb2A==
+  dependencies:
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
+    jest-haste-map "30.2.0"
+    jest-pnp-resolver "^1.2.3"
+    jest-util "30.2.0"
+    jest-validate "30.2.0"
+    slash "^3.0.0"
+    unrs-resolver "^1.7.11"
+
+jest-runner@30.2.0, jest-runner@^30.0.4:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-30.2.0.tgz#c62b4c3130afa661789705e13a07bdbcec26a114"
+  integrity sha512-PqvZ2B2XEyPEbclp+gV6KO/F1FIFSbIwewRgmROCMBo/aZ6J1w8Qypoj2pEOcg3G2HzLlaP6VUtvwCI8dM3oqQ==
+  dependencies:
+    "@jest/console" "30.2.0"
+    "@jest/environment" "30.2.0"
+    "@jest/test-result" "30.2.0"
+    "@jest/transform" "30.2.0"
+    "@jest/types" "30.2.0"
+    "@types/node" "*"
+    chalk "^4.1.2"
+    emittery "^0.13.1"
+    exit-x "^0.2.2"
+    graceful-fs "^4.2.11"
+    jest-docblock "30.2.0"
+    jest-environment-node "30.2.0"
+    jest-haste-map "30.2.0"
+    jest-leak-detector "30.2.0"
+    jest-message-util "30.2.0"
+    jest-resolve "30.2.0"
+    jest-runtime "30.2.0"
+    jest-util "30.2.0"
+    jest-watcher "30.2.0"
+    jest-worker "30.2.0"
+    p-limit "^3.1.0"
+    source-map-support "0.5.13"
+
+jest-runtime@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-30.2.0.tgz#395ea792cde048db1b0cd1a92dc9cb9f1921bf8a"
+  integrity sha512-p1+GVX/PJqTucvsmERPMgCPvQJpFt4hFbM+VN3n8TMo47decMUcJbt+rgzwrEme0MQUA/R+1de2axftTHkKckg==
+  dependencies:
+    "@jest/environment" "30.2.0"
+    "@jest/fake-timers" "30.2.0"
+    "@jest/globals" "30.2.0"
+    "@jest/source-map" "30.0.1"
+    "@jest/test-result" "30.2.0"
+    "@jest/transform" "30.2.0"
+    "@jest/types" "30.2.0"
+    "@types/node" "*"
+    chalk "^4.1.2"
+    cjs-module-lexer "^2.1.0"
+    collect-v8-coverage "^1.0.2"
+    glob "^10.3.10"
+    graceful-fs "^4.2.11"
+    jest-haste-map "30.2.0"
+    jest-message-util "30.2.0"
+    jest-mock "30.2.0"
+    jest-regex-util "30.0.1"
+    jest-resolve "30.2.0"
+    jest-snapshot "30.2.0"
+    jest-util "30.2.0"
+    slash "^3.0.0"
+    strip-bom "^4.0.0"
+
+jest-serializer-html@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer-html/-/jest-serializer-html-7.1.0.tgz#0cfea8a03b9b82bc420fd2cb969bd76713a87c08"
+  integrity sha512-xYL2qC7kmoYHJo8MYqJkzrl/Fdlx+fat4U1AqYg+kafqwcKPiMkOcjWHPKhueuNEgr+uemhGc+jqXYiwCyRyLA==
+  dependencies:
+    diffable-html "^4.1.0"
+
+jest-snapshot@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-30.2.0.tgz#266fbbb4b95fc4665ce6f32f1f38eeb39f4e26d0"
+  integrity sha512-5WEtTy2jXPFypadKNpbNkZ72puZCa6UjSr/7djeecHWOu7iYhSXSnHScT8wBz3Rn8Ena5d5RYRcsyKIeqG1IyA==
+  dependencies:
+    "@babel/core" "^7.27.4"
+    "@babel/generator" "^7.27.5"
+    "@babel/plugin-syntax-jsx" "^7.27.1"
+    "@babel/plugin-syntax-typescript" "^7.27.1"
+    "@babel/types" "^7.27.3"
+    "@jest/expect-utils" "30.2.0"
+    "@jest/get-type" "30.1.0"
+    "@jest/snapshot-utils" "30.2.0"
+    "@jest/transform" "30.2.0"
+    "@jest/types" "30.2.0"
+    babel-preset-current-node-syntax "^1.2.0"
+    chalk "^4.1.2"
+    expect "30.2.0"
+    graceful-fs "^4.2.11"
+    jest-diff "30.2.0"
+    jest-matcher-utils "30.2.0"
+    jest-message-util "30.2.0"
+    jest-util "30.2.0"
+    pretty-format "30.2.0"
+    semver "^7.7.2"
+    synckit "^0.11.8"
+
+jest-util@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-30.2.0.tgz#5142adbcad6f4e53c2776c067a4db3c14f913705"
+  integrity sha512-QKNsM0o3Xe6ISQU869e+DhG+4CK/48aHYdJZGlFQVTjnbvgpcKyxpzk29fGiO7i/J8VENZ+d2iGnSsvmuHywlA==
+  dependencies:
+    "@jest/types" "30.2.0"
+    "@types/node" "*"
+    chalk "^4.1.2"
+    ci-info "^4.2.0"
+    graceful-fs "^4.2.11"
+    picomatch "^4.0.2"
+
+jest-validate@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-30.2.0.tgz#273eaaed4c0963b934b5b31e96289edda6e0a2ef"
+  integrity sha512-FBGWi7dP2hpdi8nBoWxSsLvBFewKAg0+uSQwBaof4Y4DPgBabXgpSYC5/lR7VmnIlSpASmCi/ntRWPbv7089Pw==
+  dependencies:
+    "@jest/get-type" "30.1.0"
+    "@jest/types" "30.2.0"
+    camelcase "^6.3.0"
+    chalk "^4.1.2"
+    leven "^3.1.0"
+    pretty-format "30.2.0"
+
+jest-watch-typeahead@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-3.0.1.tgz#50cb9653190228b8ebd489b37645067ee0bb7584"
+  integrity sha512-SFmHcvdueTswZlVhPCWfLXMazvwZlA2UZTrcE7MC3NwEVeWvEcOx6HUe+igMbnmA6qowuBSW4in8iC6J2EYsgQ==
+  dependencies:
+    ansi-escapes "^7.0.0"
+    chalk "^5.2.0"
+    jest-regex-util "^30.0.0"
+    jest-watcher "^30.0.0"
+    slash "^5.0.0"
+    string-length "^6.0.0"
+    strip-ansi "^7.0.1"
+
+jest-watcher@30.2.0, jest-watcher@^30.0.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-30.2.0.tgz#f9c055de48e18c979e7756a3917e596e2d69b07b"
+  integrity sha512-PYxa28dxJ9g777pGm/7PrbnMeA0Jr7osHP9bS7eJy9DuAjMgdGtxgf0uKMyoIsTWAkIbUW5hSDdJ3urmgXBqxg==
+  dependencies:
+    "@jest/test-result" "30.2.0"
+    "@jest/types" "30.2.0"
+    "@types/node" "*"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
+    emittery "^0.13.1"
+    jest-util "30.2.0"
+    string-length "^4.0.2"
+
+jest-worker@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-30.2.0.tgz#fd5c2a36ff6058ec8f74366ec89538cc99539d26"
+  integrity sha512-0Q4Uk8WF7BUwqXHuAjc23vmopWJw5WH7w2tqBoUOZpOjW/ZnR44GXXd1r82RvnmI2GZge3ivrYXk/BE2+VtW2g==
+  dependencies:
+    "@types/node" "*"
+    "@ungap/structured-clone" "^1.3.0"
+    jest-util "30.2.0"
+    merge-stream "^2.0.0"
+    supports-color "^8.1.1"
+
+jest@^30.0.4, jest@^30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-30.2.0.tgz#9f0a71e734af968f26952b5ae4b724af82681630"
+  integrity sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==
+  dependencies:
+    "@jest/core" "30.2.0"
+    "@jest/types" "30.2.0"
+    import-local "^3.2.0"
+    jest-cli "30.2.0"
+
+jju@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a"
+  integrity sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==
+
+joi@^17.11.0:
+  version "17.13.3"
+  resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.3.tgz#0f5cc1169c999b30d344366d384b12d92558bcec"
+  integrity sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==
+  dependencies:
+    "@hapi/hoek" "^9.3.0"
+    "@hapi/topo" "^5.1.0"
+    "@sideway/address" "^4.1.5"
+    "@sideway/formula" "^3.0.1"
+    "@sideway/pinpoint" "^2.0.0"
+
+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+js-yaml@^3.13.1:
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.2.tgz#77485ce1dd7f33c061fd1b16ecea23b55fcb04b0"
+  integrity sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
+jsesc@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d"
+  integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==
+
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
+
+json-stable-stringify@^1.0.2:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.3.0.tgz#8903cfac42ea1a0f97f35d63a4ce0518f0cc6a70"
+  integrity sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg==
+  dependencies:
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
+    isarray "^2.0.5"
+    jsonify "^0.0.1"
+    object-keys "^1.1.1"
+
+json5@^2.2.2, json5@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
+
+jsonc-parser@^3.2.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.3.1.tgz#f2a524b4f7fd11e3d791e559977ad60b98b798b4"
+  integrity sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==
+
+jsonfile@^6.0.1:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.2.0.tgz#7c265bd1b65de6977478300087c99f1c84383f62"
+  integrity sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonify@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978"
+  integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==
+
+keyv@^4.5.3:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
+  dependencies:
+    json-buffer "3.0.1"
+
+klaw-sync@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c"
+  integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+
+kleur@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
+
+kolorist@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/kolorist/-/kolorist-1.8.0.tgz#edddbbbc7894bc13302cdf740af6374d4a04743c"
+  integrity sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==
+
+lazystream@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638"
+  integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==
+  dependencies:
+    readable-stream "^2.0.5"
+
+leven@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
+lines-and-columns@^1.1.6:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
+
+local-pkg@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-1.1.2.tgz#c03d208787126445303f8161619dc701afa4abb5"
+  integrity sha512-arhlxbFRmoQHl33a0Zkle/YWlmNwoyt6QNZEIJcqNbdrsix5Lvc4HyyI3EnwxTYlZYc32EbYrQ8SzEZ7dqgg9A==
+  dependencies:
+    mlly "^1.7.4"
+    pkg-types "^2.3.0"
+    quansync "^0.2.11"
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
+lodash-es@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
+  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
+
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
+
+lodash.flattendeep@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
+  integrity sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==
+
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.4, lodash@~4.17.15:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+loglevel@^1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.9.2.tgz#c2e028d6c757720107df4e64508530db6621ba08"
+  integrity sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==
+
+long@^5.0.0:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/long/-/long-5.3.2.tgz#1d84463095999262d7d7b7f8bfd4a8cc55167f83"
+  integrity sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==
+
+loupe@^3.1.0, loupe@^3.1.4:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/loupe/-/loupe-3.2.1.tgz#0095cf56dc5b7a9a7c08ff5b1a8796ec8ad17e76"
+  integrity sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==
+
+lru-cache@^10.2.0:
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
+  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
+
+lru-cache@^11.0.0:
+  version "11.2.4"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.2.4.tgz#ecb523ebb0e6f4d837c807ad1abaea8e0619770d"
+  integrity sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==
+
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+lz-string@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941"
+  integrity sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==
+
+magic-string@^0.30.0, magic-string@^0.30.17:
+  version "0.30.21"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.21.tgz#56763ec09a0fa8091df27879fd94d19078c00d91"
+  integrity sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.5.5"
+
+magic-string@^0.30.3:
+  version "0.30.19"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.19.tgz#cebe9f104e565602e5d2098c5f2e79a77cc86da9"
+  integrity sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.5.5"
+
+mailpit-api@^1.2.0:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/mailpit-api/-/mailpit-api-1.5.4.tgz#b53e0d437c3a2dcd22a20db9dcadc99ffb3b789d"
+  integrity sha512-Zz7qrNHF7p67sDn7VzBmP3Djk7eJNcBRiwCKeiWl5ADRou14++wvP1Mq9XD6sLyU5sQ/tgo3rXbmwTbNx1uY0A==
+  dependencies:
+    axios "^1.12.1"
+
+make-dir@^3.0.0, make-dir@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
+make-dir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
+  integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
+  dependencies:
+    semver "^7.5.3"
+
+makeerror@1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
+  integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
+  dependencies:
+    tmpl "1.0.5"
+
+math-intrinsics@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
+  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
+
+matrix-web-i18n@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/matrix-web-i18n/-/matrix-web-i18n-3.4.0.tgz#2f088a2ec2cb4598092b7e9dd2f24f65d820df0e"
+  integrity sha512-8Bftf3LkACR6oy0iXYuIsDuvHjoJoOCWA+gDuy/lvyPwEpwViMs3XP5mJsXla+51SZEULZRUUtTreufH6xVA8g==
+  dependencies:
+    "@babel/parser" "^7.18.5"
+    "@babel/traverse" "^7.18.5"
+    lodash "^4.17.21"
+    minimist "^1.2.8"
+    walk "^2.3.15"
+
+md5.js@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
+micromatch@^4.0.2, micromatch@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
+  dependencies:
+    braces "^3.0.3"
+    picomatch "^2.3.1"
+
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+
+mime-types@^2.1.12:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  dependencies:
+    mime-db "1.52.0"
+
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+min-indent@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
+  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
+
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
+minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
+
+minimatch@10.0.3:
+  version "10.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.3.tgz#cf7a0314a16c4d9ab73a7730a0e8e3c3502d47aa"
+  integrity sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==
+  dependencies:
+    "@isaacs/brace-expansion" "^5.0.0"
+
+minimatch@^10.1.1:
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.1.1.tgz#e6e61b9b0c1dcab116b5a7d1458e8b6ae9e73a55"
+  integrity sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==
+  dependencies:
+    "@isaacs/brace-expansion" "^5.0.0"
+
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimatch@^5.1.0:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minimatch@^9.0.3, minimatch@^9.0.4:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
+  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minimist@^1.2.6, minimist@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
+  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
+
+mkdirp-classic@^0.5.2:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
+  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
+
+mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+mlly@^1.7.4:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.8.0.tgz#e074612b938af8eba1eaf43299cbc89cb72d824e"
+  integrity sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==
+  dependencies:
+    acorn "^8.15.0"
+    pathe "^2.0.3"
+    pkg-types "^1.3.1"
+    ufo "^1.6.1"
+
+ms@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
+muggle-string@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.4.1.tgz#3b366bd43b32f809dc20659534dd30e7c8a0d328"
+  integrity sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==
+
+nan@^2.19.0, nan@^2.23.0:
+  version "2.24.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.24.0.tgz#a8919b36e692aa5b260831910e4f81419fc0a283"
+  integrity sha512-Vpf9qnVW1RaDkoNKFUvfxqAbtI8ncb8OJlqZ9wwpXzWPEsvsB1nvdUi6oYrHIkQ1Y/tMDnr1h4nczS0VB9Xykg==
+
+nanoid@^3.3.11:
+  version "3.3.11"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
+  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
+
+napi-postinstall@^0.3.0:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/napi-postinstall/-/napi-postinstall-0.3.4.tgz#7af256d6588b5f8e952b9190965d6b019653bbb9"
+  integrity sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
+
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
+
+node-preload@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/node-preload/-/node-preload-0.2.1.tgz#c03043bb327f417a18fee7ab7ee57b408a144301"
+  integrity sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==
+  dependencies:
+    process-on-spawn "^1.0.0"
+
+node-releases@^2.0.27:
+  version "2.0.27"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.27.tgz#eedca519205cf20f650f61d56b070db111231e4e"
+  integrity sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==
+
+node-stdlib-browser@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/node-stdlib-browser/-/node-stdlib-browser-1.3.1.tgz#f41fa554f720a3df951e40339f4d92ac512222ac"
+  integrity sha512-X75ZN8DCLftGM5iKwoYLA3rjnrAEs97MkzvSd4q2746Tgpg8b8XWiBGiBG4ZpgcAqBgtgPHTiAc8ZMCvZuikDw==
+  dependencies:
+    assert "^2.0.0"
+    browser-resolve "^2.0.0"
+    browserify-zlib "^0.2.0"
+    buffer "^5.7.1"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    create-require "^1.1.1"
+    crypto-browserify "^3.12.1"
+    domain-browser "4.22.0"
+    events "^3.0.0"
+    https-browserify "^1.0.0"
+    isomorphic-timers-promises "^1.0.1"
+    os-browserify "^0.3.0"
+    path-browserify "^1.0.1"
+    pkg-dir "^5.0.0"
+    process "^0.11.10"
+    punycode "^1.4.1"
+    querystring-es3 "^0.2.1"
+    readable-stream "^3.6.0"
+    stream-browserify "^3.0.0"
+    stream-http "^3.2.0"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.1"
+    url "^0.11.4"
+    util "^0.12.4"
+    vm-browserify "^1.0.1"
+
+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+npm-run-path@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+  dependencies:
+    path-key "^3.0.0"
+
+nyc@^15.1.0:
+  version "15.1.0"
+  resolved "https://registry.yarnpkg.com/nyc/-/nyc-15.1.0.tgz#1335dae12ddc87b6e249d5a1994ca4bdaea75f02"
+  integrity sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==
+  dependencies:
+    "@istanbuljs/load-nyc-config" "^1.0.0"
+    "@istanbuljs/schema" "^0.1.2"
+    caching-transform "^4.0.0"
+    convert-source-map "^1.7.0"
+    decamelize "^1.2.0"
+    find-cache-dir "^3.2.0"
+    find-up "^4.1.0"
+    foreground-child "^2.0.0"
+    get-package-type "^0.1.0"
+    glob "^7.1.6"
+    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-hook "^3.0.0"
+    istanbul-lib-instrument "^4.0.0"
+    istanbul-lib-processinfo "^2.0.2"
+    istanbul-lib-report "^3.0.0"
+    istanbul-lib-source-maps "^4.0.0"
+    istanbul-reports "^3.0.2"
+    make-dir "^3.0.0"
+    node-preload "^0.2.1"
+    p-map "^3.0.0"
+    process-on-spawn "^1.0.0"
+    resolve-from "^5.0.0"
+    rimraf "^3.0.0"
+    signal-exit "^3.0.2"
+    spawn-wrap "^2.0.0"
+    test-exclude "^6.0.0"
+    yargs "^15.0.2"
+
+object-inspect@^1.13.3:
+  version "1.13.4"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
+  integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
+
+object-is@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.6.tgz#1a6a53aed2dd8f7e6775ff870bea58545956ab07"
+  integrity sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+
+object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+object.assign@^4.1.4:
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.7.tgz#8c14ca1a424c6a561b0bb2a22f66f5049a945d3d"
+  integrity sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==
+  dependencies:
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
+    has-symbols "^1.1.0"
+    object-keys "^1.1.1"
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  dependencies:
+    wrappy "1"
+
+onetime@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+  dependencies:
+    mimic-fn "^2.1.0"
+
+open@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-10.2.0.tgz#b9d855be007620e80b6fb05fac98141fe62db73c"
+  integrity sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==
+  dependencies:
+    default-browser "^5.2.1"
+    define-lazy-prop "^3.0.0"
+    is-inside-container "^1.0.0"
+    wsl-utils "^0.1.0"
+
+open@^7.4.2:
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
+  integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
+  dependencies:
+    is-docker "^2.0.0"
+    is-wsl "^2.1.1"
+
+optionator@^0.9.3:
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
+  integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
+  dependencies:
+    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.5"
+
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==
+
+os-homedir@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==
+
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-limit@^3.0.2, p-limit@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
+p-map@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
+  integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
+  dependencies:
+    aggregate-error "^3.0.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+package-hash@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-4.0.0.tgz#3537f654665ec3cc38827387fc904c163c54f506"
+  integrity sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==
+  dependencies:
+    graceful-fs "^4.1.15"
+    hasha "^5.0.0"
+    lodash.flattendeep "^4.4.0"
+    release-zalgo "^1.0.0"
+
+package-json-from-dist@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505"
+  integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==
+
+pako@~1.0.5:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
+
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
+parse-asn1@^5.0.0, parse-asn1@^5.1.9:
+  version "5.1.9"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.9.tgz#8dd24c3ea8da77dffbc708d94eaf232fd6156e95"
+  integrity sha512-fIYNuZ/HastSb80baGOuPRo1O9cf4baWw5WsAp7dBuUzeTD/BoaG8sVTdlPFksBE2lF21dN+A1AnrpIjSWqHHg==
+  dependencies:
+    asn1.js "^4.10.1"
+    browserify-aes "^1.2.0"
+    evp_bytestokey "^1.0.3"
+    pbkdf2 "^3.1.5"
+    safe-buffer "^5.2.1"
+
+parse-json@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
+
+parse-passwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
+
+patch-package@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-8.0.1.tgz#79d02f953f711e06d1f8949c8a13e5d3d7ba1a60"
+  integrity sha512-VsKRIA8f5uqHQ7NGhwIna6Bx6D9s/1iXlA1hthBVBEbkq+t4kXD0HHt+rJhf/Z+Ci0F/HCB2hvn0qLdLG+Qxlw==
+  dependencies:
+    "@yarnpkg/lockfile" "^1.1.0"
+    chalk "^4.1.2"
+    ci-info "^3.7.0"
+    cross-spawn "^7.0.3"
+    find-yarn-workspace-root "^2.0.0"
+    fs-extra "^10.0.0"
+    json-stable-stringify "^1.0.2"
+    klaw-sync "^6.0.0"
+    minimist "^1.2.6"
+    open "^7.4.2"
+    semver "^7.5.3"
+    slash "^2.0.0"
+    tmp "^0.2.4"
+    yaml "^2.2.2"
+
+path-browserify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
+  integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+
+path-key@^3.0.0, path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-parse@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
+
+path-scurry@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
+  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
+  dependencies:
+    lru-cache "^10.2.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
+path-scurry@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-2.0.1.tgz#4b6572376cfd8b811fca9cd1f5c24b3cbac0fe10"
+  integrity sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==
+  dependencies:
+    lru-cache "^11.0.0"
+    minipass "^7.1.2"
+
+pathe@^2.0.1, pathe@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pathe/-/pathe-2.0.3.tgz#3ecbec55421685b70a9da872b2cff3e1cbed1716"
+  integrity sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==
+
+pathval@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-2.0.1.tgz#8855c5a2899af072d6ac05d11e46045ad0dc605d"
+  integrity sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==
+
+pbkdf2@^3.1.2, pbkdf2@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.5.tgz#444a59d7a259a95536c56e80c89de31cc01ed366"
+  integrity sha512-Q3CG/cYvCO1ye4QKkuH7EXxs3VC/rI1/trd+qX2+PolbaKG0H+bgcZzrTt96mMyRtejk+JMCiLUn3y29W8qmFQ==
+  dependencies:
+    create-hash "^1.2.0"
+    create-hmac "^1.1.7"
+    ripemd160 "^2.0.3"
+    safe-buffer "^5.2.1"
+    sha.js "^2.4.12"
+    to-buffer "^1.2.1"
+
+picocolors@1.1.1, picocolors@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
+
+picomatch@^2.0.4, picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
+picomatch@^4.0.2, picomatch@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.3.tgz#796c76136d1eead715db1e7bad785dedd695a042"
+  integrity sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==
+
+pirates@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.7.tgz#643b4a18c4257c8a65104b73f3049ce9a0a15e22"
+  integrity sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==
+
+pixelmatch@^5.1.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-5.3.0.tgz#5e5321a7abedfb7962d60dbf345deda87cb9560a"
+  integrity sha512-o8mkY4E/+LNUf6LzX96ht6k6CEDi65k9G2rjMtBe9Oo+VPKSvl+0GKHuH/AlG+GA5LPG/i5hrekkxUc3s2HU+Q==
+  dependencies:
+    pngjs "^6.0.0"
+
+pkg-dir@^4.1.0, pkg-dir@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
+pkg-dir@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760"
+  integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==
+  dependencies:
+    find-up "^5.0.0"
+
+pkg-types@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.3.1.tgz#bd7cc70881192777eef5326c19deb46e890917df"
+  integrity sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==
+  dependencies:
+    confbox "^0.1.8"
+    mlly "^1.7.4"
+    pathe "^2.0.1"
+
+pkg-types@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-2.3.0.tgz#037f2c19bd5402966ff6810e32706558cb5b5726"
+  integrity sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==
+  dependencies:
+    confbox "^0.2.2"
+    exsolve "^1.0.7"
+    pathe "^2.0.3"
+
+playwright-core@1.57.0, playwright-core@>=1.2.0:
+  version "1.57.0"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.57.0.tgz#3dcc9a865af256fa9f0af0d67fc8dd54eecaebf5"
+  integrity sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==
+
+playwright@1.57.0, playwright@^1.14.0:
+  version "1.57.0"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.57.0.tgz#74d1dacff5048dc40bf4676940b1901e18ad0f46"
+  integrity sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==
+  dependencies:
+    playwright-core "1.57.0"
+  optionalDependencies:
+    fsevents "2.3.2"
+
+pluralizers@^0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/pluralizers/-/pluralizers-0.1.7.tgz#8d38dd0a1b660e739b10ab2eab10b684c9d50142"
+  integrity sha512-mw6AejUiCaMQ6uPN9ObjJDTnR5AnBSmnHHy3uVTbxrSFSxO5scfwpTs8Dxyb6T2v7GSulhvOq+pm9y+hXUvtOA==
+
+pngjs@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
+  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
+
+pngjs@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-6.0.0.tgz#ca9e5d2aa48db0228a52c419c3308e87720da821"
+  integrity sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==
+
+possible-typed-array-names@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae"
+  integrity sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==
+
+postcss@^8.5.6:
+  version "8.5.6"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.6.tgz#2825006615a619b4f62a9e7426cc120b349a8f3c"
+  integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==
+  dependencies:
+    nanoid "^3.3.11"
+    picocolors "^1.1.1"
+    source-map-js "^1.2.1"
+
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
+prettier@^3.6.2:
+  version "3.7.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.7.4.tgz#d2f8335d4b1cec47e1c8098645411b0c9dff9c0f"
+  integrity sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==
+
+pretty-format@30.2.0, pretty-format@^30.0.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-30.2.0.tgz#2d44fe6134529aed18506f6d11509d8a62775ebe"
+  integrity sha512-9uBdv/B4EefsuAL+pWqueZyZS2Ba+LxfFeQ9DN14HU4bN8bhaxKdkpjpB6fs9+pSjIBu+FXQHImEg8j/Lw0+vA==
+  dependencies:
+    "@jest/schemas" "30.0.5"
+    ansi-styles "^5.2.0"
+    react-is "^18.3.1"
+
+pretty-format@^27.0.2:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
+  integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==
+  dependencies:
+    ansi-regex "^5.0.1"
+    ansi-styles "^5.0.0"
+    react-is "^17.0.1"
+
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+process-on-spawn@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/process-on-spawn/-/process-on-spawn-1.1.0.tgz#9d5999ba87b3bf0a8acb05322d69f2f5aa4fb763"
+  integrity sha512-JOnOPQ/8TZgjs1JIH/m9ni7FfimjNa/PRx7y/Wb5qdItsnhO0jE4AT7fC0HjC28DUQWDr50dwSYZLdRMlqDq3Q==
+  dependencies:
+    fromentries "^1.2.0"
+
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
+
+prompts@^2.4.1:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
+  integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
+  dependencies:
+    kleur "^3.0.3"
+    sisteransi "^1.0.5"
+
+proper-lockfile@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f"
+  integrity sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==
+  dependencies:
+    graceful-fs "^4.2.4"
+    retry "^0.12.0"
+    signal-exit "^3.0.2"
+
+properties-reader@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/properties-reader/-/properties-reader-2.3.0.tgz#f3ab84224c9535a7a36e011ae489a79a13b472b2"
+  integrity sha512-z597WicA7nDZxK12kZqHr2TcvwNU1GCfA5UwfDY/HDp3hXPoPlb5rlEx9bwGTiJnc0OqbBTkU975jDToth8Gxw==
+  dependencies:
+    mkdirp "^1.0.4"
+
+protobufjs@^7.2.5, protobufjs@^7.3.2, protobufjs@^7.5.3:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.5.4.tgz#885d31fe9c4b37f25d1bb600da30b1c5b37d286a"
+  integrity sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/node" ">=13.7.0"
+    long "^5.0.0"
+
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
+public-encrypt@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
+
+pump@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.3.tgz#151d979f1a29668dc0025ec589a455b53282268d"
+  integrity sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
+
+punycode@^2.1.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
+
+pure-rand@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-7.0.1.tgz#6f53a5a9e3e4a47445822af96821ca509ed37566"
+  integrity sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==
+
+qs@^6.12.3:
+  version "6.14.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930"
+  integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==
+  dependencies:
+    side-channel "^1.1.0"
+
+quansync@^0.2.11:
+  version "0.2.11"
+  resolved "https://registry.yarnpkg.com/quansync/-/quansync-0.2.11.tgz#f9c3adda2e1272e4f8cf3f1457b04cbdb4ee692a"
+  integrity sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==
+
+querystring-es3@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==
+
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
+react-docgen-typescript@^2.2.2:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/react-docgen-typescript/-/react-docgen-typescript-2.4.0.tgz#033428b4a6a639d050ac8baf2a5195c596521713"
+  integrity sha512-ZtAp5XTO5HRzQctjPU0ybY0RRCQO19X/8fxn3w7y2VVTUbGHDKULPTL4ky3vB05euSgG5NpALhEhDPvQ56wvXg==
+
+react-docgen@^8.0.0, react-docgen@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-8.0.2.tgz#450efcac75813e3d614d7bd15eb4066e2e7bcbf5"
+  integrity sha512-+NRMYs2DyTP4/tqWz371Oo50JqmWltR1h2gcdgUMAWZJIAvrd0/SqlCfx7tpzpl/s36rzw6qH2MjoNrxtRNYhA==
+  dependencies:
+    "@babel/core" "^7.28.0"
+    "@babel/traverse" "^7.28.0"
+    "@babel/types" "^7.28.2"
+    "@types/babel__core" "^7.20.5"
+    "@types/babel__traverse" "^7.20.7"
+    "@types/doctrine" "^0.0.9"
+    "@types/resolve" "^1.20.2"
+    doctrine "^3.0.0"
+    resolve "^1.22.1"
+    strip-indent "^4.0.0"
+
+"react-dom@^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0":
+  version "19.2.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.2.1.tgz#ce3527560bda4f997e47d10dab754825b3061f59"
+  integrity sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg==
+  dependencies:
+    scheduler "^0.27.0"
+
+react-is@^17.0.1:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
+  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
+
+react-is@^18.3.1:
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
+  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
+
+react-merge-refs@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/react-merge-refs/-/react-merge-refs-3.0.2.tgz#483b4e8029f89d805c4e55c8d22e9b8f77e3b58e"
+  integrity sha512-MSZAfwFfdbEvwkKWP5EI5chuLYnNUxNS7vyS0i1Jp+wtd8J4Ga2ddzhaE68aMol2Z4vCnRM/oGOo1a3V75UPlw==
+
+"react@^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0":
+  version "19.2.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-19.2.1.tgz#8600fa205e58e2e807f6ef431c9f6492591a2700"
+  integrity sha512-DGrYcCWK7tvYMnWh79yrPHt+vdx9tY+1gPZa7nJQtO/p8bLTDaHp4dzwEhQB7pZ4Xe3ok4XKuEPrVuc+wlpkmw==
+
+readable-stream@^2.0.5, readable-stream@^2.3.8:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
+  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+readable-stream@^4.0.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.7.0.tgz#cedbd8a1146c13dfff8dab14068028d58c15ac91"
+  integrity sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==
+  dependencies:
+    abort-controller "^3.0.0"
+    buffer "^6.0.3"
+    events "^3.3.0"
+    process "^0.11.10"
+    string_decoder "^1.3.0"
+
+readdir-glob@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.3.tgz#c3d831f51f5e7bfa62fa2ffbe4b508c640f09584"
+  integrity sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==
+  dependencies:
+    minimatch "^5.1.0"
+
+recast@^0.23.5:
+  version "0.23.11"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.11.tgz#8885570bb28cf773ba1dc600da7f502f7883f73f"
+  integrity sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==
+  dependencies:
+    ast-types "^0.16.1"
+    esprima "~4.0.0"
+    source-map "~0.6.1"
+    tiny-invariant "^1.3.3"
+    tslib "^2.0.1"
+
+redent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
+  integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
+  dependencies:
+    indent-string "^4.0.0"
+    strip-indent "^3.0.0"
+
+release-zalgo@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/release-zalgo/-/release-zalgo-1.0.0.tgz#09700b7e5074329739330e535c5a90fb67851730"
+  integrity sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==
+  dependencies:
+    es6-error "^4.0.1"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
+
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
+resolve-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
+  dependencies:
+    resolve-from "^5.0.0"
+
+resolve-dir@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e"
+  integrity sha512-QxMPqI6le2u0dCLyiGzgy92kjkkL6zO0XyvHzjdTNH3zM6e5Hz3BwG6+aEyNgiQ5Xz6PwTwgQEj3U50dByPKIA==
+  dependencies:
+    expand-tilde "^1.2.2"
+    global-modules "^0.2.3"
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
+resolve@^1.17.0, resolve@~1.22.1, resolve@~1.22.2:
+  version "1.22.10"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39"
+  integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==
+  dependencies:
+    is-core-module "^2.16.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+resolve@^1.22.1, resolve@^1.22.8:
+  version "1.22.11"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262"
+  integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==
+  dependencies:
+    is-core-module "^2.16.1"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
+
+reusify@^1.0.4:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.1.0.tgz#0fe13b9522e1473f51b558ee796e08f11f9b489f"
+  integrity sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==
+
+rimraf@^3.0.0, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+ripemd160@^2.0.0, ripemd160@^2.0.1, ripemd160@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.3.tgz#9be54e4ba5e3559c8eee06a25cd7648bbccdf5a8"
+  integrity sha512-5Di9UC0+8h1L6ZD2d7awM7E/T4uA1fJRlx6zk/NvdCCVEoAnFqvHmCuNeIKoCeIixBX/q8uM+6ycDvF8woqosA==
+  dependencies:
+    hash-base "^3.1.2"
+    inherits "^2.0.4"
+
+rollup@^4.43.0:
+  version "4.53.3"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.53.3.tgz#dbc8cd8743b38710019fb8297e8d7a76e3faa406"
+  integrity sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==
+  dependencies:
+    "@types/estree" "1.0.8"
+  optionalDependencies:
+    "@rollup/rollup-android-arm-eabi" "4.53.3"
+    "@rollup/rollup-android-arm64" "4.53.3"
+    "@rollup/rollup-darwin-arm64" "4.53.3"
+    "@rollup/rollup-darwin-x64" "4.53.3"
+    "@rollup/rollup-freebsd-arm64" "4.53.3"
+    "@rollup/rollup-freebsd-x64" "4.53.3"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.53.3"
+    "@rollup/rollup-linux-arm-musleabihf" "4.53.3"
+    "@rollup/rollup-linux-arm64-gnu" "4.53.3"
+    "@rollup/rollup-linux-arm64-musl" "4.53.3"
+    "@rollup/rollup-linux-loong64-gnu" "4.53.3"
+    "@rollup/rollup-linux-ppc64-gnu" "4.53.3"
+    "@rollup/rollup-linux-riscv64-gnu" "4.53.3"
+    "@rollup/rollup-linux-riscv64-musl" "4.53.3"
+    "@rollup/rollup-linux-s390x-gnu" "4.53.3"
+    "@rollup/rollup-linux-x64-gnu" "4.53.3"
+    "@rollup/rollup-linux-x64-musl" "4.53.3"
+    "@rollup/rollup-openharmony-arm64" "4.53.3"
+    "@rollup/rollup-win32-arm64-msvc" "4.53.3"
+    "@rollup/rollup-win32-ia32-msvc" "4.53.3"
+    "@rollup/rollup-win32-x64-gnu" "4.53.3"
+    "@rollup/rollup-win32-x64-msvc" "4.53.3"
+    fsevents "~2.3.2"
+
+run-applescript@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-7.1.0.tgz#2e9e54c4664ec3106c5b5630e249d3d6595c4911"
+  integrity sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==
+
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
+rxjs@7.8.2, rxjs@^7.8.1:
+  version "7.8.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.2.tgz#955bc473ed8af11a002a2be52071bf475638607b"
+  integrity sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==
+  dependencies:
+    tslib "^2.1.0"
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-regex-test@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz#7f87dfb67a3150782eaaf18583ff5d1711ac10c1"
+  integrity sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==
+  dependencies:
+    call-bound "^1.0.2"
+    es-errors "^1.3.0"
+    is-regex "^1.2.1"
+
+safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+scheduler@^0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.27.0.tgz#0c4ef82d67d1e5c1e359e8fc76d3a87f045fe5bd"
+  integrity sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==
+
+semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
+semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2, semver@^7.7.2:
+  version "7.7.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
+  integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
+
+semver@~7.5.4:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
+
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
+
+set-function-length@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
+  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.2"
+
+setimmediate@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
+
+sha.js@^2.4.0, sha.js@^2.4.12, sha.js@^2.4.8:
+  version "2.4.12"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.12.tgz#eb8b568bf383dfd1867a32c3f2b74eb52bdbf23f"
+  integrity sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==
+  dependencies:
+    inherits "^2.0.4"
+    safe-buffer "^5.2.1"
+    to-buffer "^1.2.0"
+
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+shell-quote@1.8.3:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.3.tgz#55e40ef33cf5c689902353a3d8cd1a6725f08b4b"
+  integrity sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==
+
+side-channel-list@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
+  integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
+  dependencies:
+    es-errors "^1.3.0"
+    object-inspect "^1.13.3"
+
+side-channel-map@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42"
+  integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==
+  dependencies:
+    call-bound "^1.0.2"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.5"
+    object-inspect "^1.13.3"
+
+side-channel-weakmap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea"
+  integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==
+  dependencies:
+    call-bound "^1.0.2"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.5"
+    object-inspect "^1.13.3"
+    side-channel-map "^1.0.1"
+
+side-channel@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
+  integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
+  dependencies:
+    es-errors "^1.3.0"
+    object-inspect "^1.13.3"
+    side-channel-list "^1.0.0"
+    side-channel-map "^1.0.1"
+    side-channel-weakmap "^1.0.2"
+
+signal-exit@^3.0.2, signal-exit@^3.0.3:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+
+signal-exit@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
+sisteransi@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
+  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
+
+slash@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+slash@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-5.1.0.tgz#be3adddcdf09ac38eebe8dcdc7b1a57a75b095ce"
+  integrity sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==
+
+source-map-js@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
+  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
+
+source-map-support@0.5.13:
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+spawn-wrap@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-2.0.0.tgz#103685b8b8f9b79771318827aa78650a610d457e"
+  integrity sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==
+  dependencies:
+    foreground-child "^2.0.0"
+    is-windows "^1.0.2"
+    make-dir "^3.0.0"
+    rimraf "^3.0.0"
+    signal-exit "^3.0.2"
+    which "^2.0.1"
+
+spawnd@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/spawnd/-/spawnd-5.0.0.tgz#ea72200bdc468998e84e1c3e7b914ce85fc1c32c"
+  integrity sha512-28+AJr82moMVWolQvlAIv3JcYDkjkFTEmfDc503wxrF5l2rQ3dFz6DpbXp3kD4zmgGGldfM4xM4v1sFj/ZaIOA==
+  dependencies:
+    exit "^0.1.2"
+    signal-exit "^3.0.3"
+    tree-kill "^1.2.2"
+    wait-port "^0.2.9"
+
+split-ca@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/split-ca/-/split-ca-1.0.1.tgz#6c83aff3692fa61256e0cd197e05e9de157691a6"
+  integrity sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==
+
+sprintf-js@^1.0.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
+  integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
+
+ssh-remote-port-forward@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/ssh-remote-port-forward/-/ssh-remote-port-forward-1.0.4.tgz#72b0c5df8ec27ca300c75805cc6b266dee07e298"
+  integrity sha512-x0LV1eVDwjf1gmG7TTnfqIzf+3VPRz7vrNIjX6oYLbeCrf/PeVY6hkT68Mg+q02qXxQhrLjB0jfgvhevoCRmLQ==
+  dependencies:
+    "@types/ssh2" "^0.5.48"
+    ssh2 "^1.4.0"
+
+ssh2@^1.15.0, ssh2@^1.4.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.17.0.tgz#dc686e8e3abdbd4ad95d46fa139615903c12258c"
+  integrity sha512-wPldCk3asibAjQ/kziWQQt1Wh3PgDFpC0XpwclzKcdT1vql6KeYxf5LIt4nlFkUeR8WuphYMKqUA56X4rjbfgQ==
+  dependencies:
+    asn1 "^0.2.6"
+    bcrypt-pbkdf "^1.0.2"
+  optionalDependencies:
+    cpu-features "~0.0.10"
+    nan "^2.23.0"
+
+ssim.js@^3.1.1:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/ssim.js/-/ssim.js-3.5.0.tgz#d7276b9ee99b57a5ff0db34035f02f35197e62df"
+  integrity sha512-Aj6Jl2z6oDmgYFFbQqK7fght19bXdOxY7Tj03nF+03M9gCBAjeIiO8/PlEGMfKDwYpw4q6iBqVq2YuREorGg/g==
+
+stack-utils@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
+  integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
+  dependencies:
+    escape-string-regexp "^2.0.0"
+
+storybook@^10.0.7:
+  version "10.1.10"
+  resolved "https://registry.yarnpkg.com/storybook/-/storybook-10.1.10.tgz#9023e063f97cb2c38b4520e03d49336bcbf6661f"
+  integrity sha512-oK0t0jEogiKKfv5Z1ao4Of99+xWw1TMUGuGRYDQS4kp2yyBsJQEgu7NI7OLYsCDI6gzt5p3RPtl1lqdeVLUi8A==
+  dependencies:
+    "@storybook/global" "^5.0.0"
+    "@storybook/icons" "^2.0.0"
+    "@testing-library/jest-dom" "^6.6.3"
+    "@testing-library/user-event" "^14.6.1"
+    "@vitest/expect" "3.2.4"
+    "@vitest/spy" "3.2.4"
+    esbuild "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0 || ^0.26.0 || ^0.27.0"
+    open "^10.2.0"
+    recast "^0.23.5"
+    semver "^7.6.2"
+    use-sync-external-store "^1.5.0"
+    ws "^8.18.0"
+
+stream-browserify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-3.0.0.tgz#22b0a2850cdf6503e73085da1fc7b7d0c2122f2f"
+  integrity sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==
+  dependencies:
+    inherits "~2.0.4"
+    readable-stream "^3.5.0"
+
+stream-http@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-3.2.0.tgz#1872dfcf24cb15752677e40e5c3f9cc1926028b5"
+  integrity sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    xtend "^4.0.2"
+
+streamx@^2.15.0, streamx@^2.21.0:
+  version "2.23.0"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.23.0.tgz#7d0f3d00d4a6c5de5728aecd6422b4008d66fd0b"
+  integrity sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==
+  dependencies:
+    events-universal "^1.0.0"
+    fast-fifo "^1.3.2"
+    text-decoder "^1.1.0"
+
+string-argv@~0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
+  integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
+
+string-length@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
+  integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
+  dependencies:
+    char-regex "^1.0.2"
+    strip-ansi "^6.0.0"
+
+string-length@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-6.0.0.tgz#1c7342bbf032129b2f80003e69f889c70231d791"
+  integrity sha512-1U361pxZHEQ+FeSjzqRpV+cu2vTzYeWeafXFLykiFlv4Vc0n3njgU8HrMbyik5uwm77naWMuVG8fhEF+Ovb1Kg==
+  dependencies:
+    strip-ansi "^7.1.0"
+
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^5.0.1, string-width@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
+  dependencies:
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
+
+string_decoder@^1.0.0, string_decoder@^1.1.1, string_decoder@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^7.0.1, strip-ansi@^7.1.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba"
+  integrity sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==
+  dependencies:
+    ansi-regex "^6.0.1"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
+
+strip-bom@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
+  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
+
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
+strip-indent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
+  integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
+  dependencies:
+    min-indent "^1.0.0"
+
+strip-indent@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-4.1.1.tgz#aba13de189d4ad9a17f6050e76554ac27585c7af"
+  integrity sha512-SlyRoSkdh1dYP0PzclLE7r0M9sgbFKKMFXpFRUMNuKhQSbC6VQIGzq3E0qsfvGJaUFJPGv6Ws1NZ/haTAjfbMA==
+
+strip-json-comments@^3.1.1, strip-json-comments@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
+supports-color@8.1.1, supports-color@^8.1.1, supports-color@~8.1.1:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+  dependencies:
+    has-flag "^4.0.0"
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
+synckit@^0.11.8:
+  version "0.11.11"
+  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.11.tgz#c0b619cf258a97faa209155d9cd1699b5c998cb0"
+  integrity sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==
+  dependencies:
+    "@pkgr/core" "^0.2.9"
+
+tar-fs@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.4.tgz#800824dbf4ef06ded9afea4acafe71c67c76b930"
+  integrity sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==
+  dependencies:
+    chownr "^1.1.1"
+    mkdirp-classic "^0.5.2"
+    pump "^3.0.0"
+    tar-stream "^2.1.4"
+
+tar-fs@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.1.1.tgz#4f164e59fb60f103d472360731e8c6bb4a7fe9ef"
+  integrity sha512-LZA0oaPOc2fVo82Txf3gw+AkEd38szODlptMYejQUhndHMLQ9M059uXR+AfS7DNo0NpINvSqDsvyaCrBVkptWg==
+  dependencies:
+    pump "^3.0.0"
+    tar-stream "^3.1.5"
+  optionalDependencies:
+    bare-fs "^4.0.1"
+    bare-path "^3.0.0"
+
+tar-stream@^2.1.4:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
+  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"
+
+tar-stream@^3.0.0, tar-stream@^3.1.5:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-3.1.7.tgz#24b3fb5eabada19fe7338ed6d26e5f7c482e792b"
+  integrity sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==
+  dependencies:
+    b4a "^1.6.4"
+    fast-fifo "^1.2.0"
+    streamx "^2.15.0"
+
+temporal-polyfill@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/temporal-polyfill/-/temporal-polyfill-0.3.0.tgz#7fe90e913ac5ec8e0d508fb50d04dd7a74cec23e"
+  integrity sha512-qNsTkX9K8hi+FHDfHmf22e/OGuXmfBm9RqNismxBrnSmZVJKegQ+HYYXT+R7Ha8F/YSm2Y34vmzD4cxMu2u95g==
+  dependencies:
+    temporal-spec "0.3.0"
+
+temporal-spec@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/temporal-spec/-/temporal-spec-0.3.0.tgz#8c4210c575fb28ba0a1c2e02ad68d1be5956a11f"
+  integrity sha512-n+noVpIqz4hYgFSMOSiINNOUOMFtV5cZQNCmmszA6GiVFVRt3G7AqVyhXjhCSmowvQn+NsGn+jMDMKJYHd3bSQ==
+
+test-exclude@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
+  dependencies:
+    "@istanbuljs/schema" "^0.1.2"
+    glob "^7.1.4"
+    minimatch "^3.0.4"
+
+testcontainers@^11.0.0, testcontainers@^11.9.0:
+  version "11.9.0"
+  resolved "https://registry.yarnpkg.com/testcontainers/-/testcontainers-11.9.0.tgz#464c2feb31b56ef594563349048efeaf0af2bd1e"
+  integrity sha512-SQ6OqQUig7HcGVF72i+ZVIMvxPSpEz8cgC/B63ekqMzgf98DnveoBbOmqux/Wa5wQAQCt4mEPNMa/Jz7vMg9fQ==
+  dependencies:
+    "@balena/dockerignore" "^1.0.2"
+    "@types/dockerode" "^3.3.47"
+    archiver "^7.0.1"
+    async-lock "^1.4.1"
+    byline "^5.0.0"
+    debug "^4.4.3"
+    docker-compose "^1.3.0"
+    dockerode "^4.0.9"
+    get-port "^7.1.0"
+    proper-lockfile "^4.1.2"
+    properties-reader "^2.3.0"
+    ssh-remote-port-forward "^1.0.4"
+    tar-fs "^3.1.1"
+    tmp "^0.2.5"
+    undici "^7.16.0"
+
+text-decoder@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.2.3.tgz#b19da364d981b2326d5f43099c310cc80d770c65"
+  integrity sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==
+  dependencies:
+    b4a "^1.6.4"
+
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
+
+timers-browserify@^2.0.4:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
+  integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
+  dependencies:
+    setimmediate "^1.0.4"
+
+tiny-invariant@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
+  integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==
+
+tinyglobby@^0.2.15:
+  version "0.2.15"
+  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.15.tgz#e228dd1e638cea993d2fdb4fcd2d4602a79951c2"
+  integrity sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==
+  dependencies:
+    fdir "^6.5.0"
+    picomatch "^4.0.3"
+
+tinyrainbow@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tinyrainbow/-/tinyrainbow-2.0.0.tgz#9509b2162436315e80e3eee0fcce4474d2444294"
+  integrity sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==
+
+tinyspy@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-4.0.4.tgz#d77a002fb53a88aa1429b419c1c92492e0c81f78"
+  integrity sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==
+
+tmp@^0.2.4, tmp@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.5.tgz#b06bcd23f0f3c8357b426891726d16015abfd8f8"
+  integrity sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==
+
+tmpl@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
+
+to-buffer@^1.2.0, to-buffer@^1.2.1, to-buffer@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.2.2.tgz#ffe59ef7522ada0a2d1cb5dfe03bb8abc3cdc133"
+  integrity sha512-db0E3UJjcFhpDhAF4tLo03oli3pwl3dbnzXOUIlRKrp+ldk/VUxzpWYZENsw2SZiuBjHAk7DfB0VU7NKdpb6sw==
+  dependencies:
+    isarray "^2.0.5"
+    safe-buffer "^5.2.1"
+    typed-array-buffer "^1.0.3"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+tree-kill@1.2.2, tree-kill@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
+  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
+
+ts-api-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.1.0.tgz#595f7094e46eed364c13fd23e75f9513d29baf91"
+  integrity sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==
+
+ts-dedent@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.2.0.tgz#39e4bd297cd036292ae2394eb3412be63f563bb5"
+  integrity sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==
+
+tsconfig-paths@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
+  integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
+  dependencies:
+    json5 "^2.2.2"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
+tslib@^2.0.1, tslib@^2.1.0, tslib@^2.4.0:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
+  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
+
+tty-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"
+  integrity sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==
+
+tweetnacl@^0.14.3:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
+
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
+
+type-detect@4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+
+type-fest@^0.8.0:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
+typed-array-buffer@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536"
+  integrity sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==
+  dependencies:
+    call-bound "^1.0.3"
+    es-errors "^1.3.0"
+    is-typed-array "^1.1.14"
+
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
+typescript@5.8.2:
+  version "5.8.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.2.tgz#8170b3702f74b79db2e5a96207c15e65807999e4"
+  integrity sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==
+
+typescript@^5.9.3:
+  version "5.9.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"
+  integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==
+
+ufo@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.6.1.tgz#ac2db1d54614d1b22c1d603e3aef44a85d8f146b"
+  integrity sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==
+
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
+undici-types@~7.16.0:
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46"
+  integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==
+
+undici@^7.16.0:
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-7.16.0.tgz#cb2a1e957726d458b536e3f076bf51f066901c1a"
+  integrity sha512-QEg3HPMll0o3t2ourKwOeUAZ159Kn9mx5pnzHRQO8+Wixmh88YdZRiIwat0iNzNNXn0yoEtXJqFpyW7eM8BV7g==
+
+universalify@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
+  integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
+
+unplugin@^2.3.5:
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-2.3.11.tgz#411e020dd2ba90e2fbe1e7bd63a5a399e6ee3b54"
+  integrity sha512-5uKD0nqiYVzlmCRs01Fhs2BdkEgBS3SAVP6ndrBsuK42iC2+JHyxM05Rm9G8+5mkmRtzMZGY8Ct5+mliZxU/Ww==
+  dependencies:
+    "@jridgewell/remapping" "^2.3.5"
+    acorn "^8.15.0"
+    picomatch "^4.0.3"
+    webpack-virtual-modules "^0.6.2"
+
+unrs-resolver@^1.7.11:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/unrs-resolver/-/unrs-resolver-1.11.1.tgz#be9cd8686c99ef53ecb96df2a473c64d304048a9"
+  integrity sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==
+  dependencies:
+    napi-postinstall "^0.3.0"
+  optionalDependencies:
+    "@unrs/resolver-binding-android-arm-eabi" "1.11.1"
+    "@unrs/resolver-binding-android-arm64" "1.11.1"
+    "@unrs/resolver-binding-darwin-arm64" "1.11.1"
+    "@unrs/resolver-binding-darwin-x64" "1.11.1"
+    "@unrs/resolver-binding-freebsd-x64" "1.11.1"
+    "@unrs/resolver-binding-linux-arm-gnueabihf" "1.11.1"
+    "@unrs/resolver-binding-linux-arm-musleabihf" "1.11.1"
+    "@unrs/resolver-binding-linux-arm64-gnu" "1.11.1"
+    "@unrs/resolver-binding-linux-arm64-musl" "1.11.1"
+    "@unrs/resolver-binding-linux-ppc64-gnu" "1.11.1"
+    "@unrs/resolver-binding-linux-riscv64-gnu" "1.11.1"
+    "@unrs/resolver-binding-linux-riscv64-musl" "1.11.1"
+    "@unrs/resolver-binding-linux-s390x-gnu" "1.11.1"
+    "@unrs/resolver-binding-linux-x64-gnu" "1.11.1"
+    "@unrs/resolver-binding-linux-x64-musl" "1.11.1"
+    "@unrs/resolver-binding-wasm32-wasi" "1.11.1"
+    "@unrs/resolver-binding-win32-arm64-msvc" "1.11.1"
+    "@unrs/resolver-binding-win32-ia32-msvc" "1.11.1"
+    "@unrs/resolver-binding-win32-x64-msvc" "1.11.1"
+
+update-browserslist-db@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.2.2.tgz#cfb4358afa08b3d5731a2ecd95eebf4ddef8033e"
+  integrity sha512-E85pfNzMQ9jpKkA7+TJAi4TJN+tBCuWh5rUcS/sv6cFi+1q9LYDwDI5dpUL0u/73EElyQ8d3TEaeW4sPedBqYA==
+  dependencies:
+    escalade "^3.2.0"
+    picocolors "^1.1.1"
+
+uri-js@^4.2.2, uri-js@^4.4.1:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
+url@^0.11.4:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.4.tgz#adca77b3562d56b72746e76b330b7f27b6721f3c"
+  integrity sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==
+  dependencies:
+    punycode "^1.4.1"
+    qs "^6.12.3"
+
+use-sync-external-store@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz#b174bfa65cb2b526732d9f2ac0a408027876f32d"
+  integrity sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==
+
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
+
+util@^0.12.4, util@^0.12.5:
+  version "0.12.5"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc"
+  integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==
+  dependencies:
+    inherits "^2.0.3"
+    is-arguments "^1.0.4"
+    is-generator-function "^1.0.7"
+    is-typed-array "^1.1.3"
+    which-typed-array "^1.1.2"
+
+uuid@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-10.0.0.tgz#5a95aa454e6e002725c79055fd42aaba30ca6294"
+  integrity sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==
+
+uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
+v8-to-istanbul@^9.0.1:
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz#b9572abfa62bd556c16d75fdebc1a411d5ff3175"
+  integrity sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.12"
+    "@types/istanbul-lib-coverage" "^2.0.1"
+    convert-source-map "^2.0.0"
+
+vite-plugin-dts@^4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/vite-plugin-dts/-/vite-plugin-dts-4.5.4.tgz#51b60aaaa760d9cf5c2bb3676c69d81910d6b08c"
+  integrity sha512-d4sOM8M/8z7vRXHHq/ebbblfaxENjogAAekcfcDCCwAyvGqnPrc7f4NZbvItS+g4WTgerW0xDwSz5qz11JT3vg==
+  dependencies:
+    "@microsoft/api-extractor" "^7.50.1"
+    "@rollup/pluginutils" "^5.1.4"
+    "@volar/typescript" "^2.4.11"
+    "@vue/language-core" "2.2.0"
+    compare-versions "^6.1.1"
+    debug "^4.4.0"
+    kolorist "^1.8.0"
+    local-pkg "^1.0.0"
+    magic-string "^0.30.17"
+
+vite-plugin-node-polyfills@^0.24.0:
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/vite-plugin-node-polyfills/-/vite-plugin-node-polyfills-0.24.0.tgz#4a2e984bba134017fc88cace0149cf8afdb50b54"
+  integrity sha512-GA9QKLH+vIM8NPaGA+o2t8PDfFUl32J8rUp1zQfMKVJQiNkOX4unE51tR6ppl6iKw5yOrDAdSH7r/UIFLCVhLw==
+  dependencies:
+    "@rollup/plugin-inject" "^5.0.5"
+    node-stdlib-browser "^1.2.0"
+
+vite@^7.1.9:
+  version "7.2.7"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-7.2.7.tgz#0789a4c3206081699f34a9ecca2dda594a07478e"
+  integrity sha512-ITcnkFeR3+fI8P1wMgItjGrR10170d8auB4EpMLPqmx6uxElH3a/hHGQabSHKdqd4FXWO1nFIp9rRn7JQ34ACQ==
+  dependencies:
+    esbuild "^0.25.0"
+    fdir "^6.5.0"
+    picomatch "^4.0.3"
+    postcss "^8.5.6"
+    rollup "^4.43.0"
+    tinyglobby "^0.2.15"
+  optionalDependencies:
+    fsevents "~2.3.3"
+
+vm-browserify@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
+  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
+
+vscode-uri@^3.0.8:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.1.0.tgz#dd09ec5a66a38b5c3fffc774015713496d14e09c"
+  integrity sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==
+
+wait-on@^7.0.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-7.2.0.tgz#d76b20ed3fc1e2bebc051fae5c1ff93be7892928"
+  integrity sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==
+  dependencies:
+    axios "^1.6.1"
+    joi "^17.11.0"
+    lodash "^4.17.21"
+    minimist "^1.2.8"
+    rxjs "^7.8.1"
+
+wait-port@^0.2.9:
+  version "0.2.14"
+  resolved "https://registry.yarnpkg.com/wait-port/-/wait-port-0.2.14.tgz#6df40629be2c95aa4073ceb895abef7d872b28c6"
+  integrity sha512-kIzjWcr6ykl7WFbZd0TMae8xovwqcqbx6FM9l+7agOgUByhzdjfzZBPK2CPufldTOMxbUivss//Sh9MFawmPRQ==
+  dependencies:
+    chalk "^2.4.2"
+    commander "^3.0.2"
+    debug "^4.1.1"
+
+walk@^2.3.15:
+  version "2.3.15"
+  resolved "https://registry.yarnpkg.com/walk/-/walk-2.3.15.tgz#1b4611e959d656426bc521e2da5db3acecae2424"
+  integrity sha512-4eRTBZljBfIISK1Vnt69Gvr2w/wc3U6Vtrw7qiN5iqYJPH7LElcYh/iU4XWhdCy2dZqv1ToMyYlybDylfG/5Vg==
+  dependencies:
+    foreachasync "^3.0.0"
+
+walker@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
+  integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
+  dependencies:
+    makeerror "1.0.12"
+
+webpack-virtual-modules@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz#057faa9065c8acf48f24cb57ac0e77739ab9a7e8"
+  integrity sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==
+
+which-module@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
+  integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
+
+which-typed-array@^1.1.16, which-typed-array@^1.1.2:
+  version "1.1.19"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz#df03842e870b6b88e117524a4b364b6fc689f956"
+  integrity sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==
+  dependencies:
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
+    for-each "^0.3.5"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
+    has-tostringtag "^1.0.2"
+
+which@^1.2.12:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+word-wrap@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
+
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+  dependencies:
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+
+write-file-atomic@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
+  dependencies:
+    imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
+    signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
+
+write-file-atomic@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7"
+  integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^4.0.1"
+
+ws@^8.18.0:
+  version "8.18.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472"
+  integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==
+
+wsl-utils@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/wsl-utils/-/wsl-utils-0.1.0.tgz#8783d4df671d4d50365be2ee4c71917a0557baab"
+  integrity sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==
+  dependencies:
+    is-wsl "^3.1.0"
+
+xml@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
+  integrity sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==
+
+xtend@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+
+y18n@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yaml@^2.2.2, yaml@^2.7.0:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.2.tgz#5694f25eca0ce9c3e7a9d9e00ce0ddabbd9e35c5"
+  integrity sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==
+
+yargs-parser@^18.1.2:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
+yargs@17.7.2, yargs@^17.7.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
+yargs@^15.0.2:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.2"
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+zip-stream@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-6.0.1.tgz#e141b930ed60ccaf5d7fa9c8260e0d1748a2bbfb"
+  integrity sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==
+  dependencies:
+    archiver-utils "^5.0.0"
+    compress-commons "^6.0.2"
+    readable-stream "^4.0.0"
diff --git a/patches/@matrix-org+react-sdk-module-api+2.5.0.patch b/patches/@matrix-org+react-sdk-module-api+2.5.0.patch
index 5b17244da0..89cbca457f 100644
--- a/patches/@matrix-org+react-sdk-module-api+2.5.0.patch
+++ b/patches/@matrix-org+react-sdk-module-api+2.5.0.patch
@@ -11,3 +11,42 @@ index 917a7fc..a2710c6 100644
          didOkOrSubmit: boolean;
          model: M;
      }>;
+diff --git a/node_modules/@matrix-org/react-sdk-module-api/lib/lifecycles/CryptoSetupExtensions.js b/node_modules/@matrix-org/react-sdk-module-api/lib/lifecycles/CryptoSetupExtensions.js
+index 5d422ed..b823add 100644
+--- a/node_modules/@matrix-org/react-sdk-module-api/lib/lifecycles/CryptoSetupExtensions.js
++++ b/node_modules/@matrix-org/react-sdk-module-api/lib/lifecycles/CryptoSetupExtensions.js
+@@ -124,34 +124,28 @@ var DefaultCryptoSetupExtensions = /*#__PURE__*/function (_CryptoSetupExtension)
+   (0, _createClass2["default"])(DefaultCryptoSetupExtensions, [{
+     key: "examineLoginResponse",
+     value: function examineLoginResponse(response, credentials) {
+-      console.log("Default empty examineLoginResponse() => void");
+     }
+   }, {
+     key: "persistCredentials",
+     value: function persistCredentials(credentials) {
+-      console.log("Default empty persistCredentials() => void");
+     }
+   }, {
+     key: "getSecretStorageKey",
+     value: function getSecretStorageKey() {
+-      console.log("Default empty getSecretStorageKey() => null");
+       return null;
+     }
+   }, {
+     key: "createSecretStorageKey",
+     value: function createSecretStorageKey() {
+-      console.log("Default empty createSecretStorageKey() => null");
+       return null;
+     }
+   }, {
+     key: "catchAccessSecretStorageError",
+     value: function catchAccessSecretStorageError(e) {
+-      console.log("Default catchAccessSecretStorageError() => void");
+     }
+   }, {
+     key: "setupEncryptionNeeded",
+     value: function setupEncryptionNeeded(args) {
+-      console.log("Default setupEncryptionNeeded() => false");
+       return false;
+     }
+   }, {
diff --git a/patches/@types+react+19.1.4.patch b/patches/@types+react+19.1.4.patch
deleted file mode 100644
index ceba85b000..0000000000
--- a/patches/@types+react+19.1.4.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/node_modules/@types/react/index.d.ts b/node_modules/@types/react/index.d.ts
-index d3318dc..c2b2c77 100644
---- a/node_modules/@types/react/index.d.ts
-+++ b/node_modules/@types/react/index.d.ts
-@@ -134,7 +134,7 @@ declare namespace React {
-             props: P,
-         ) => ReactNode | Promise<ReactNode>)
-         // constructor signature must match React.Component
--        | (new(props: P) => Component<any, any>);
-+        | (new(props: P, context?: any) => Component<any, any>);
- 
-     /**
-      * Created by {@link createRef}, or {@link useRef} when passed `null`.
-@@ -945,7 +945,7 @@ declare namespace React {
-         context: unknown;
- 
-         // Keep in sync with constructor signature of JSXElementConstructor and ComponentClass.
--        constructor(props: P);
-+        constructor(props: P, context?: unknown);
- 
-         // We MUST keep setState() as a unified signature because it allows proper checking of the method return type.
-         // See: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/18365#issuecomment-351013257
-@@ -1117,7 +1117,7 @@ declare namespace React {
-      */
-     interface ComponentClass<P = {}, S = ComponentState> extends StaticLifecycle<P, S> {
-         // constructor signature must match React.Component
--        new(props: P): Component<P, S>;
-+        new(props: P, context?: any): Component<P, S>;
-         /**
-          * Ignored by React.
-          * @deprecated Only kept in types for backwards compatibility. Will be removed in a future major release.
diff --git a/patches/jsdom+26.1.0.patch b/patches/jsdom+26.1.0.patch
new file mode 100644
index 0000000000..95922328cc
--- /dev/null
+++ b/patches/jsdom+26.1.0.patch
@@ -0,0 +1,56 @@
+diff --git a/node_modules/jsdom/lib/jsdom/browser/Window.js b/node_modules/jsdom/lib/jsdom/browser/Window.js
+index 52d011c..f62f6d6 100644
+--- a/node_modules/jsdom/lib/jsdom/browser/Window.js
++++ b/node_modules/jsdom/lib/jsdom/browser/Window.js
+@@ -505,10 +505,10 @@ function installOwnProperties(window, options) {
+     event: makeReplaceablePropertyDescriptor("event", window),
+ 
+     // [LegacyUnforgeable]:
+-    window: { configurable: false },
+-    document: { configurable: false },
+-    location: { configurable: false },
+-    top: { configurable: false }
++    window: { configurable: true },
++    document: { configurable: true },
++    location: { configurable: true },
++    top: { configurable: true }
+   });
+ 
+ 
+diff --git a/node_modules/jsdom/lib/jsdom/living/generated/Location.js b/node_modules/jsdom/lib/jsdom/living/generated/Location.js
+index fc4d1dd..c855bd5 100644
+--- a/node_modules/jsdom/lib/jsdom/living/generated/Location.js
++++ b/node_modules/jsdom/lib/jsdom/living/generated/Location.js
+@@ -322,19 +322,19 @@ function getUnforgeables(globalObject) {
+       }
+     });
+     Object.defineProperties(unforgeables, {
+-      assign: { configurable: false, writable: false },
+-      replace: { configurable: false, writable: false },
+-      reload: { configurable: false, writable: false },
+-      href: { configurable: false },
+-      toString: { configurable: false, writable: false },
+-      origin: { configurable: false },
+-      protocol: { configurable: false },
+-      host: { configurable: false },
+-      hostname: { configurable: false },
+-      port: { configurable: false },
+-      pathname: { configurable: false },
+-      search: { configurable: false },
+-      hash: { configurable: false }
++      assign: { configurable: true, writable: false },
++      replace: { configurable: true, writable: false },
++      reload: { configurable: true, writable: false },
++      href: { configurable: true },
++      toString: { configurable: true, writable: false },
++      origin: { configurable: true },
++      protocol: { configurable: true },
++      host: { configurable: true },
++      hostname: { configurable: true },
++      port: { configurable: true },
++      pathname: { configurable: true },
++      search: { configurable: true },
++      hash: { configurable: true }
+     });
+     unforgeablesMap.set(globalObject, unforgeables);
+   }
diff --git a/playwright/e2e/accessibility/keyboard-navigation.spec.ts b/playwright/e2e/accessibility/keyboard-navigation.spec.ts
index e22664c898..8ba6cc3a92 100644
--- a/playwright/e2e/accessibility/keyboard-navigation.spec.ts
+++ b/playwright/e2e/accessibility/keyboard-navigation.spec.ts
@@ -29,7 +29,7 @@ test.describe("Landmark navigation tests", () => {
 
         // Pressing Control+F6 again will focus room search
         await page.keyboard.press("ControlOrMeta+F6");
-        await expect(page.locator(".mx_RoomSearch")).toBeFocused();
+        await expect(page.locator("#room-list-search-button")).toBeFocused();
 
         // Pressing Control+F6 again will focus the message composer
         await page.keyboard.press("ControlOrMeta+F6");
@@ -44,7 +44,7 @@ test.describe("Landmark navigation tests", () => {
         await expect(page.locator(".mx_HomePage")).toBeFocused();
 
         await page.keyboard.press("ControlOrMeta+Shift+F6");
-        await expect(page.locator(".mx_RoomSearch")).toBeFocused();
+        await expect(page.locator("#room-list-search-button")).toBeFocused();
 
         await page.keyboard.press("ControlOrMeta+Shift+F6");
         await expect(page.locator(".mx_SpaceButton_active")).toBeFocused();
@@ -75,11 +75,11 @@ test.describe("Landmark navigation tests", () => {
 
         // Pressing Control+F6 again will focus room search
         await page.keyboard.press("ControlOrMeta+F6");
-        await expect(page.locator(".mx_RoomSearch")).toBeFocused();
+        await expect(page.locator("#room-list-search-button")).toBeFocused();
 
         // Pressing Control+F6 again will focus the room tile in the room list
         await page.keyboard.press("ControlOrMeta+F6");
-        await expect(page.locator(".mx_RoomTile_selected")).toBeFocused();
+        await expect(page.locator(".mx_RoomListItemView_selected")).toBeFocused();
 
         // Pressing Control+F6 again will focus the message composer
         await page.keyboard.press("ControlOrMeta+F6");
@@ -94,10 +94,10 @@ test.describe("Landmark navigation tests", () => {
         await expect(page.locator(".mx_BasicMessageComposer_input")).toBeFocused();
 
         await page.keyboard.press("ControlOrMeta+Shift+F6");
-        await expect(page.locator(".mx_RoomTile_selected")).toBeFocused();
+        await expect(page.locator(".mx_RoomListItemView_selected")).toBeFocused();
 
         await page.keyboard.press("ControlOrMeta+Shift+F6");
-        await expect(page.locator(".mx_RoomSearch")).toBeFocused();
+        await expect(page.locator("#room-list-search-button")).toBeFocused();
 
         await page.keyboard.press("ControlOrMeta+Shift+F6");
         await expect(page.locator(".mx_SpaceButton_active")).toBeFocused();
@@ -131,11 +131,11 @@ test.describe("Landmark navigation tests", () => {
 
         // Pressing Control+F6 again will focus room search
         await page.keyboard.press("ControlOrMeta+F6");
-        await expect(page.locator(".mx_RoomSearch")).toBeFocused();
+        await expect(page.locator("#room-list-search-button")).toBeFocused();
 
         // Pressing Control+F6 again will focus the room tile in the room list
         await page.keyboard.press("ControlOrMeta+F6");
-        await expect(page.locator(".mx_RoomTile")).toBeFocused();
+        await expect(page.locator(".mx_RoomListItemView")).toBeFocused();
 
         // Pressing Control+F6 again will focus the home section
         await page.keyboard.press("ControlOrMeta+F6");
@@ -150,10 +150,10 @@ test.describe("Landmark navigation tests", () => {
         await expect(page.locator(".mx_HomePage")).toBeFocused();
 
         await page.keyboard.press("ControlOrMeta+Shift+F6");
-        await expect(page.locator(".mx_RoomTile")).toBeFocused();
+        await expect(page.locator(".mx_RoomListItemView")).toBeFocused();
 
         await page.keyboard.press("ControlOrMeta+Shift+F6");
-        await expect(page.locator(".mx_RoomSearch")).toBeFocused();
+        await expect(page.locator("#room-list-search-button")).toBeFocused();
 
         await page.keyboard.press("ControlOrMeta+Shift+F6");
         await expect(page.locator(".mx_SpaceButton_active")).toBeFocused();
diff --git a/playwright/e2e/audio-player/audio-player.spec.ts b/playwright/e2e/audio-player/audio-player.spec.ts
index a8cb15a5da..282440f74e 100644
--- a/playwright/e2e/audio-player/audio-player.spec.ts
+++ b/playwright/e2e/audio-player/audio-player.spec.ts
@@ -19,6 +19,7 @@ const clickButtonReply = async (tile: Locator) => {
         await tile.hover();
         await tile.getByRole("button", { name: "Reply", exact: true }).click();
     }).toPass();
+    await expect(tile.page().getByText("Replying", { exact: true })).toBeVisible();
 };
 
 test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
@@ -39,7 +40,7 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
         // wait for the tile to finish loading
         await expect(
             page
-                .locator(".mx_AudioPlayer_mediaName")
+                .getByTestId("audio-player-name")
                 .last()
                 .filter({ hasText: file.split("/").at(-1) }),
         ).toBeVisible();
@@ -48,25 +49,23 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
     /**
      * Take snapshots of mx_EventTile_last on each layout, outputting log for reference/debugging.
      * @param detail The snapshot name. Used for outputting logs too.
-     * @param monospace This changes the font used to render the UI from a default one to Inconsolata. Set to false by default.
+     * @param monospace This changes the font used to render the UI from a default one to Fira Code. Set to false by default.
      */
     const takeSnapshots = async (page: Page, app: ElementAppPage, detail: string, monospace = false) => {
         // Check that the audio player is rendered and its button becomes visible
         const checkPlayerVisibility = async (locator: Locator) => {
             // Assert that the audio player and media information are visible
-            const mediaInfo = locator.locator(
-                ".mx_EventTile_mediaLine .mx_MAudioBody .mx_AudioPlayer_container .mx_AudioPlayer_mediaInfo",
-            );
-            await expect(mediaInfo.locator(".mx_AudioPlayer_mediaName", { hasText: ".ogg" })).toBeVisible(); // extension
-            await expect(mediaInfo.locator(".mx_AudioPlayer_byline", { hasText: "00:01" })).toBeVisible();
-            await expect(mediaInfo.locator(".mx_AudioPlayer_byline", { hasText: "(3.56 KB)" })).toBeVisible(); // actual size
+            const mediaInfo = locator.getByRole("region", { name: "Audio player" });
+            await expect(mediaInfo.getByText(".ogg")).toBeVisible(); // extension
+            await expect(mediaInfo.getByRole("time")).toHaveText("00:01"); // duration
+            await expect(mediaInfo.getByText("(3.56 KB)")).toBeVisible(); // actual size;
 
             // Assert that the play button can be found and is visible
             await expect(locator.getByRole("button", { name: "Play" })).toBeVisible();
 
             if (monospace) {
                 // Assert that the monospace timer is visible
-                await expect(locator.locator("[role='timer']")).toHaveCSS("font-family", "Inconsolata");
+                await expect(locator.locator("[role='timer']")).toHaveCSS("font-family", '"Fira Code"');
             }
         };
 
@@ -74,11 +73,11 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
             // Enable system font and monospace setting
             await app.settings.setValue("useBundledEmojiFont", null, SettingLevel.DEVICE, false);
             await app.settings.setValue("useSystemFont", null, SettingLevel.DEVICE, true);
-            await app.settings.setValue("systemFont", null, SettingLevel.DEVICE, "Inconsolata");
+            await app.settings.setValue("systemFont", null, SettingLevel.DEVICE, "Fira Code");
         }
 
         // Check the status of the seek bar
-        expect(await page.locator(".mx_AudioPlayer_seek input[type='range']").count()).toBeGreaterThan(0);
+        expect(await page.getByRole("region", { name: "Audio player" }).getByRole("slider").count()).toBeGreaterThan(0);
 
         // Enable IRC layout
         await app.settings.setValue("layout", null, SettingLevel.DEVICE, Layout.IRC);
@@ -93,14 +92,14 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
             css: `
                 /* The timestamp is of inconsistent width depending on the time the test runs at */
                 .mx_MessageTimestamp {
-                    display: none !important;
+                    visibility: hidden;
                 }
                 /* The MAB showing up on hover is not needed for the test */
                 .mx_MessageActionBar {
                     display: none !important;
                 }
             `,
-            mask: [page.locator(".mx_AudioPlayer_seek")],
+            mask: [page.getByTestId("audio-player-seek")],
         };
 
         // Take a snapshot of mx_EventTile_last on IRC layout
@@ -186,9 +185,9 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
         await uploadFile(page, "playwright/sample-files/1sec.ogg");
 
         // Assert that the audio player is rendered
-        const container = page.locator(".mx_EventTile_last .mx_AudioPlayer_container");
+        const container = page.locator(".mx_EventTile_last").getByRole("region", { name: "Audio player" });
         // Assert that the counter is zero before clicking the play button
-        await expect(container.locator(".mx_AudioPlayer_seek [role='timer']", { hasText: "00:00" })).toBeVisible();
+        await expect(container.getByRole("timer")).toHaveText("00:00");
 
         // Find and click "Play" button, the wait is to make the test less flaky
         await expect(container.getByRole("button", { name: "Play" })).toBeVisible();
@@ -198,7 +197,7 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
         await expect(container.getByRole("button", { name: "Pause" })).toBeVisible();
 
         // Assert that the timer is reset when the audio file finished playing
-        await expect(container.locator(".mx_AudioPlayer_seek [role='timer']", { hasText: "00:00" })).toBeVisible();
+        await expect(container.getByRole("timer")).toHaveText("00:00");
 
         // Assert that "Play" button can be found
         await expect(container.getByRole("button", { name: "Play" })).toBeVisible();
@@ -226,7 +225,7 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
             await uploadFile(page, "playwright/sample-files/1sec.ogg");
 
             // Assert the audio player is rendered
-            await expect(page.locator(".mx_EventTile_last .mx_AudioPlayer_container")).toBeVisible();
+            await expect(page.getByRole("region", { name: "Audio player" })).toBeVisible();
 
             // Find and click "Reply" button on MessageActionBar
             const tile = page.locator(".mx_EventTile_last");
@@ -236,7 +235,7 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
             await uploadFile(page, "playwright/sample-files/1sec.ogg");
 
             // Assert that the audio player is rendered
-            await expect(tile.locator(".mx_AudioPlayer_container")).toBeVisible();
+            await expect(tile.getByRole("region", { name: "Audio player" })).toBeVisible();
 
             // Assert that replied audio file is rendered as file button inside ReplyChain
             const button = tile.locator(".mx_ReplyChain_wrapper .mx_MFileBody_info[role='button']");
@@ -261,7 +260,9 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
             await uploadFile(page, "playwright/sample-files/upload-first.ogg");
 
             // Assert that the audio player is rendered
-            await expect(page.locator(".mx_EventTile_last .mx_AudioPlayer_container")).toBeVisible();
+            await expect(
+                page.locator(".mx_EventTile_last").getByRole("region", { name: "Audio player" }),
+            ).toBeVisible();
 
             await clickButtonReply(tile);
 
@@ -269,7 +270,9 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
             await uploadFile(page, "playwright/sample-files/upload-second.ogg");
 
             // Assert that the audio player is rendered
-            await expect(page.locator(".mx_EventTile_last .mx_AudioPlayer_container")).toBeVisible();
+            await expect(
+                page.locator(".mx_EventTile_last").getByRole("region", { name: "Audio player" }),
+            ).toBeVisible();
 
             await clickButtonReply(tile);
 
@@ -277,7 +280,7 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
             await uploadFile(page, "playwright/sample-files/upload-third.ogg");
 
             // Assert that the audio player is rendered
-            await expect(tile.locator(".mx_AudioPlayer_container")).toBeVisible();
+            await expect(tile.getByRole("region", { name: "Audio player" })).toBeVisible();
 
             // Assert that there are two "mx_ReplyChain" elements
             await expect(tile.locator(".mx_ReplyChain")).toHaveCount(2);
@@ -313,7 +316,9 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
         // On the main timeline
         const messageList = page.locator(".mx_RoomView_MessageList");
         // Assert the audio player is rendered
-        await expect(messageList.locator(".mx_EventTile_last .mx_AudioPlayer_container")).toBeVisible();
+        await expect(
+            messageList.locator(".mx_EventTile_last").getByRole("region", { name: "Audio player" }),
+        ).toBeVisible();
         // Find and click "Reply in thread" button
         await messageList.locator(".mx_EventTile_last").hover();
         await messageList.locator(".mx_EventTile_last").getByRole("button", { name: "Reply in thread" }).click();
@@ -321,10 +326,10 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
         // On a thread
         const thread = page.locator(".mx_ThreadView");
         const threadTile = thread.locator(".mx_EventTile_last");
-        const audioPlayer = threadTile.locator(".mx_AudioPlayer_container");
+        const audioPlayer = threadTile.getByRole("region", { name: "Audio player" });
 
         // Assert that the counter is zero before clicking the play button
-        await expect(audioPlayer.locator(".mx_AudioPlayer_seek [role='timer']", { hasText: "00:00" })).toBeVisible();
+        await expect(audioPlayer.getByRole("timer")).toHaveText("00:00");
 
         // Find and click "Play" button, the wait is to make the test less flaky
         await expect(audioPlayer.getByRole("button", { name: "Play" })).toBeVisible();
@@ -334,7 +339,7 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
         await expect(audioPlayer.getByRole("button", { name: "Pause" })).toBeVisible();
 
         // Assert that the timer is reset when the audio file finished playing
-        await expect(audioPlayer.locator(".mx_AudioPlayer_seek [role='timer']", { hasText: "00:00" })).toBeVisible();
+        await expect(audioPlayer.getByRole("timer")).toHaveText("00:00");
 
         // Assert that "Play" button can be found
         await expect(audioPlayer.getByRole("button", { name: "Play" })).not.toBeDisabled();
diff --git a/playwright/e2e/chat-export/html-export.spec.ts b/playwright/e2e/chat-export/html-export.spec.ts
index 760d3cc5f1..371111151e 100644
--- a/playwright/e2e/chat-export/html-export.spec.ts
+++ b/playwright/e2e/chat-export/html-export.spec.ts
@@ -124,11 +124,12 @@ test.describe("HTML Export", () => {
             const zip = await extractZipFileToPath(zipPath, dirPath);
             await page.goto(`file://${dirPath}/${Object.keys(zip.files)[0]}/messages.html`);
             await expect(page).toMatchScreenshot("html-export.png", {
-                mask: [
-                    // We need to mask the whole thing because the width of the time part changes
-                    page.locator(".mx_TimelineSeparator"),
-                    page.locator(".mx_MessageTimestamp"),
-                ],
+                mask: [page.locator(".mx_TimelineSeparator")],
+                css: `
+                    .mx_MessageTimestamp {
+                        visibility: hidden;
+                    }
+                `,
             });
         },
     );
diff --git a/playwright/e2e/composer/CIDER.spec.ts b/playwright/e2e/composer/CIDER.spec.ts
index 03fc59cd0f..55cb84f37a 100644
--- a/playwright/e2e/composer/CIDER.spec.ts
+++ b/playwright/e2e/composer/CIDER.spec.ts
@@ -14,6 +14,9 @@ const CtrlOrMeta = process.platform === "darwin" ? "Meta" : "Control";
 test.describe("Composer", () => {
     test.use({
         displayName: "Janet",
+        botCreateOpts: {
+            displayName: "Bob",
+        },
     });
 
     test.use({
@@ -28,7 +31,7 @@ test.describe("Composer", () => {
 
     test.describe("CIDER", () => {
         test("sends a message when you click send or press Enter", async ({ page }) => {
-            const composer = page.getByRole("textbox", { name: "Send a message…" });
+            const composer = page.getByRole("textbox", { name: "Send an unencrypted message…" });
 
             // Type a message
             await composer.pressSequentially("my message 0");
@@ -52,7 +55,7 @@ test.describe("Composer", () => {
         });
 
         test("can write formatted text", async ({ page }) => {
-            const composer = page.getByRole("textbox", { name: "Send a message…" });
+            const composer = page.getByRole("textbox", { name: "Send an unencrypted message…" });
 
             await composer.pressSequentially("my bold");
             await composer.press(`${CtrlOrMeta}+KeyB`);
@@ -68,18 +71,69 @@ test.describe("Composer", () => {
             await page.getByTestId("mx_EmojiPicker").locator(".mx_EmojiPicker_item", { hasText: "😇" }).click();
 
             await page.locator(".mx_ContextualMenu_background").click(); // Close emoji picker
-            await page.getByRole("textbox", { name: "Send a message…" }).press("Enter"); // Send message
+            await page.getByRole("textbox", { name: "Send an unencrypted message…" }).press("Enter"); // Send message
 
             await expect(page.locator(".mx_EventTile_body", { hasText: "😇" })).toBeVisible();
         });
 
+        test.describe("render emoji picker with larger viewport height", async () => {
+            test.use({ viewport: { width: 1280, height: 720 } });
+            test("render emoji picker", { tag: "@screenshot" }, async ({ page, app }) => {
+                await app.getComposer(false).getByRole("button", { name: "Emoji" }).click();
+                await expect(page.getByTestId("mx_EmojiPicker")).toMatchScreenshot("emoji-picker.png");
+            });
+        });
+
+        test.describe("render emoji picker with small viewport height", async () => {
+            test.use({ viewport: { width: 1280, height: 360 } });
+            test("render emoji picker", { tag: "@screenshot" }, async ({ page, app }) => {
+                await app.getComposer(false).getByRole("button", { name: "Emoji" }).click();
+                await expect(page.getByTestId("mx_EmojiPicker")).toMatchScreenshot("emoji-picker-small.png");
+            });
+        });
+
+        test("should have focus lock in emoji picker", async ({ page, app }) => {
+            const emojiButton = app.getComposer(false).getByRole("button", { name: "Emoji" });
+
+            // Open emoji picker by clicking the button
+            await emojiButton.click();
+
+            // Wait for emoji picker to be visible
+            const emojiPicker = page.getByTestId("mx_EmojiPicker");
+            await expect(emojiPicker).toBeVisible();
+
+            // Get initial focused element (should be search input)
+            const searchInput = emojiPicker.getByRole("textbox", { name: "Search" });
+            await expect(searchInput).toBeFocused();
+
+            // Try to tab multiple times - focus should stay within emoji picker
+            await page.keyboard.press("Tab");
+            await page.keyboard.press("Tab");
+            await page.keyboard.press("Tab");
+            await page.keyboard.press("Tab");
+            await page.keyboard.press("Tab");
+
+            // Verify we're still within the emoji picker (not back to composer)
+            const focusedElement = await page.evaluate(() => document.activeElement?.closest(".mx_EmojiPicker"));
+            expect(focusedElement).not.toBeNull();
+
+            // Close with Escape key
+            await page.keyboard.press("Escape");
+
+            // Verify emoji picker is closed
+            await expect(emojiPicker).not.toBeVisible();
+
+            // Verify focus returns to emoji button
+            await expect(emojiButton).toBeFocused();
+        });
+
         test.describe("when Control+Enter is required to send", () => {
             test.beforeEach(async ({ app }) => {
                 await app.settings.setValue("MessageComposerInput.ctrlEnterToSend", null, SettingLevel.ACCOUNT, true);
             });
 
             test("only sends when you press Control+Enter", async ({ page }) => {
-                const composer = page.getByRole("textbox", { name: "Send a message…" });
+                const composer = page.getByRole("textbox", { name: "Send an unencrypted message…" });
                 // Type a message and press Enter
                 await composer.pressSequentially("my message 3");
                 await composer.press("Enter");
@@ -94,5 +148,39 @@ test.describe("Composer", () => {
                 ).toBeVisible();
             });
         });
+
+        test("can send mention", { tag: "@screenshot" }, async ({ page, bot, app }) => {
+            // Set up a private room so we have another user to mention
+            await app.client.createRoom({
+                is_direct: true,
+                invite: [bot.credentials.userId],
+            });
+            await app.viewRoomByName("Bob");
+
+            const composer = page.getByRole("textbox", { name: "Send an unencrypted message…" });
+            await composer.pressSequentially("@bob");
+
+            // Note that we include the user ID here as the room tile is also an 'option' role
+            // with text 'Bob'
+            await page.getByRole("option", { name: `Bob ${bot.credentials.userId}` }).click();
+            await expect(composer.getByText("Bob")).toBeVisible();
+            await expect(composer).toMatchScreenshot("mention.png");
+            await composer.press("Enter");
+            await expect(page.locator(".mx_EventTile_body", { hasText: "Bob" })).toBeVisible();
+        });
+
+        test("renders emoji autocomplete", { tag: "@screenshot" }, async ({ page }) => {
+            const composer = page.getByRole("textbox", { name: "Send an unencrypted message…" });
+
+            // Type ":+1" to trigger emoji autocomplete
+            await composer.pressSequentially(":+1");
+
+            // Wait for autocomplete to appear
+            const autocomplete = page.locator("#mx_Autocomplete");
+            await expect(autocomplete).toBeVisible();
+
+            // Take a screenshot of the autocomplete
+            await expect(autocomplete).toMatchScreenshot("emoji-autocomplete.png");
+        });
     });
 });
diff --git a/playwright/e2e/create-room/create-room.spec.ts b/playwright/e2e/create-room/create-room.spec.ts
deleted file mode 100644
index 087a89e68d..0000000000
--- a/playwright/e2e/create-room/create-room.spec.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2022, 2023 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-import { test, expect } from "../../element-web-test";
-
-test.describe("Create Room", () => {
-    test.use({ displayName: "Jim" });
-
-    test("should allow us to create a public room with name, topic & address set", async ({ page, user, app }) => {
-        const name = "Test room 1";
-        const topic = "This room is dedicated to this test and this test only!";
-
-        const dialog = await app.openCreateRoomDialog();
-        // Fill name & topic
-        await dialog.getByRole("textbox", { name: "Name" }).fill(name);
-        await dialog.getByRole("textbox", { name: "Topic" }).fill(topic);
-        // Change room to public
-        await dialog.getByRole("button", { name: "Room visibility" }).click();
-        await dialog.getByRole("option", { name: "Public room" }).click();
-        // Fill room address
-        await dialog.getByRole("textbox", { name: "Room address" }).fill("test-room-1");
-        // Submit
-        await dialog.getByRole("button", { name: "Create room" }).click();
-
-        await expect(page).toHaveURL(new RegExp(`/#/room/#test-room-1:${user.homeServer}`));
-        const header = page.locator(".mx_RoomHeader");
-        await expect(header).toContainText(name);
-    });
-});
diff --git a/playwright/e2e/crypto/backups-mas.spec.ts b/playwright/e2e/crypto/backups-mas.spec.ts
index 6519a484e9..f048bc6a2b 100644
--- a/playwright/e2e/crypto/backups-mas.spec.ts
+++ b/playwright/e2e/crypto/backups-mas.spec.ts
@@ -23,7 +23,13 @@ test.describe("Encryption state after registration", () => {
     test("Key backup is enabled by default", async ({ page, mailpitClient, app }, testInfo) => {
         await page.goto("/#/login");
         await page.getByRole("button", { name: "Continue" }).click();
-        await registerAccountMas(page, mailpitClient, `alice_${testInfo.testId}`, "alice@email.com", "Pa$sW0rD!");
+        await registerAccountMas(
+            page,
+            mailpitClient,
+            `alice_${testInfo.testId}`,
+            `alice_${testInfo.testId}@email.com`,
+            "Pa$sW0rD!",
+        );
 
         // Wait for the ui to load
         await expect(page.locator(".mx_MatrixChat")).toBeVisible();
@@ -35,9 +41,18 @@ test.describe("Encryption state after registration", () => {
     test("user is prompted to set up recovery", async ({ page, mailpitClient, app }, testInfo) => {
         await page.goto("/#/login");
         await page.getByRole("button", { name: "Continue" }).click();
-        await registerAccountMas(page, mailpitClient, `alice_${testInfo.testId}`, "alice@email.com", "Pa$sW0rD!");
+        await registerAccountMas(
+            page,
+            mailpitClient,
+            `alice_${testInfo.testId}`,
+            `alice_${testInfo.testId}@email.com`,
+            "Pa$sW0rD!",
+        );
 
-        await page.getByRole("button", { name: "Add room" }).click();
+        await page
+            .getByRole("navigation", { name: "Room list" })
+            .getByRole("button", { name: "New conversation" })
+            .click();
         await page.getByRole("menuitem", { name: "New room" }).click();
         await page.getByRole("textbox", { name: "Name" }).fill("test room");
         await page.getByRole("button", { name: "Create room" }).click();
@@ -64,9 +79,12 @@ test.describe("Key backup reset from elsewhere", () => {
 
         await page.goto("/#/login");
         await page.getByRole("button", { name: "Continue" }).click();
-        await registerAccountMas(page, mailpitClient, testUsername, "alice@email.com", testPassword);
+        await registerAccountMas(page, mailpitClient, testUsername, `${testUsername}@email.com`, testPassword);
 
-        await page.getByRole("button", { name: "Add room" }).click();
+        await page
+            .getByRole("navigation", { name: "Room list" })
+            .getByRole("button", { name: "New conversation" })
+            .click();
         await page.getByRole("menuitem", { name: "New room" }).click();
         await page.getByRole("textbox", { name: "Name" }).fill("test room");
         await page.getByRole("button", { name: "Create room" }).click();
@@ -79,10 +97,10 @@ test.describe("Key backup reset from elsewhere", () => {
 
         await csAPI.deleteBackupVersion(backupInfo.version);
 
-        await page.getByRole("textbox", { name: "Send an encrypted message…" }).fill("/discardsession");
+        await page.getByRole("textbox", { name: "Send a message…" }).fill("/discardsession");
         await page.getByRole("button", { name: "Send message" }).click();
 
-        await page.getByRole("textbox", { name: "Send an encrypted message…" }).fill("Message with broken key backup");
+        await page.getByRole("textbox", { name: "Send a message…" }).fill("Message with broken key backup");
         await page.getByRole("button", { name: "Send message" }).click();
 
         // Should be the message we sent plus the room creation event
diff --git a/playwright/e2e/crypto/crypto.spec.ts b/playwright/e2e/crypto/crypto.spec.ts
index bad9072f0c..ae4db1b0c3 100644
--- a/playwright/e2e/crypto/crypto.spec.ts
+++ b/playwright/e2e/crypto/crypto.spec.ts
@@ -21,12 +21,11 @@ const checkDMRoom = async (page: Page) => {
 };
 
 const startDMWithBob = async (page: Page, bob: Bot) => {
-    await page.locator(".mx_LegacyRoomList").getByRole("button", { name: "Start chat" }).click();
+    await page.getByRole("navigation", { name: "Room list" }).getByRole("button", { name: "New conversation" }).click();
+    await page.getByRole("menuitem", { name: "Start chat" }).click();
     await page.getByTestId("invite-dialog-input").fill(bob.credentials.userId);
-    await page.locator(".mx_InviteDialog_tile_nameStack_name").getByText("Bob").click();
-    await expect(
-        page.locator(".mx_InviteDialog_userTile_pill .mx_InviteDialog_userTile_name").getByText("Bob"),
-    ).toBeVisible();
+    await page.getByRole("option", { name: bob.credentials.displayName }).click();
+    await expect(page.getByTestId("invite-dialog-input-wrapper").getByText("Bob")).toBeVisible();
     await page.getByRole("button", { name: "Go" }).click();
 };
 
@@ -147,6 +146,29 @@ test.describe("Cryptography", function () {
         }).toPass();
     });
 
+    // When the user resets their identity, key storage also gets enabled.
+    // Check that the toggle updates to show the correct state.
+    test("Key backup status updates after resetting identity", async ({ page, app, user: aliceCredentials }) => {
+        await app.client.bootstrapCrossSigning(aliceCredentials);
+
+        const encryptionTab = await app.settings.openUserSettings("Encryption");
+        const keyStorageToggle = encryptionTab.getByRole("switch", { name: "Allow key storage" });
+        // Check that key storage starts off as disabled
+        expect(await keyStorageToggle.isChecked()).toBe(false);
+        // Find "the Reset cryptographic identity" button
+        await encryptionTab.getByRole("button", { name: "Reset cryptographic identity" }).click();
+
+        // Confirm
+        await encryptionTab.getByRole("button", { name: "Continue" }).click();
+
+        // Enter the password
+        await page.getByPlaceholder("Password").fill(aliceCredentials.password);
+        await page.getByRole("button", { name: "Continue" }).click();
+
+        // Key storage should now be enabled
+        expect(await keyStorageToggle.isChecked()).toBe(true);
+    });
+
     test(
         "creating a DM should work, being e2e-encrypted / user verification",
         { tag: "@screenshot" },
@@ -158,6 +180,9 @@ test.describe("Cryptography", function () {
             await page.getByRole("textbox", { name: "Send a message…" }).press("Enter");
             await checkDMRoom(page);
             const bobRoomId = await bobJoin(page, bob);
+            // We no longer show the grey badge in the composer, check that it is not there.
+            await expect(page.locator(".mx_MessageComposer_e2eIcon")).toHaveCount(0);
+
             await testMessages(page, bob, bobRoomId);
             await verify(app, bob);
 
@@ -168,6 +193,7 @@ test.describe("Cryptography", function () {
 
             // Take a snapshot of RoomSummaryCard with a verified E2EE icon
             await expect(page.locator(".mx_RightPanel")).toMatchScreenshot("RoomSummaryCard-with-verified-e2ee.png");
+            await expect(page.locator(".mx_MessageComposer_e2eIcon")).toMatchScreenshot("composer-e2e-icon.png");
         },
     );
 
diff --git a/playwright/e2e/crypto/decryption-failure-messages.spec.ts b/playwright/e2e/crypto/decryption-failure-messages.spec.ts
index 529251b223..306e073c00 100644
--- a/playwright/e2e/crypto/decryption-failure-messages.spec.ts
+++ b/playwright/e2e/crypto/decryption-failure-messages.spec.ts
@@ -143,10 +143,7 @@ test.describe("Cryptography", function () {
                 );
 
                 // Alice accepts the invite
-                await expect(
-                    page.getByRole("group", { name: "Invites" }).locator(".mx_RoomSublist_tiles").getByRole("treeitem"),
-                ).toHaveCount(1);
-                await page.getByRole("treeitem", { name: "Test room" }).click();
+                await page.getByRole("option", { name: "Test room" }).click();
                 await page.locator(".mx_RoomView").getByRole("button", { name: "Accept" }).click();
 
                 // Bob sends an encrypted event and an undecryptable event
@@ -280,10 +277,7 @@ test.describe("Cryptography", function () {
                 );
 
                 // Alice accepts the invite
-                await expect(
-                    page.getByRole("group", { name: "Invites" }).locator(".mx_RoomSublist_tiles").getByRole("treeitem"),
-                ).toHaveCount(1);
-                await page.getByRole("treeitem", { name: "Test room" }).click();
+                await page.getByRole("option", { name: "Test room" }).click();
                 await page.locator(".mx_RoomView").getByRole("button", { name: "Accept" }).click();
 
                 // wait until we're joined and see the timeline
diff --git a/playwright/e2e/crypto/dehydration.spec.ts b/playwright/e2e/crypto/dehydration.spec.ts
index 379fc36cf9..4483593f1c 100644
--- a/playwright/e2e/crypto/dehydration.spec.ts
+++ b/playwright/e2e/crypto/dehydration.spec.ts
@@ -38,7 +38,7 @@ test.describe("Dehydration", () => {
         // Reset the identity key
         const settings = await app.settings.openUserSettings("Encryption");
         await settings.getByRole("button", { name: "Verify this device" }).click();
-        await page.getByRole("button", { name: "Proceed with reset" }).click();
+        await page.getByRole("button", { name: "Can't confirm?" }).click();
         await page.getByRole("button", { name: "Continue" }).click();
 
         // Set up recovery
@@ -106,7 +106,7 @@ test.describe("Dehydration", () => {
         await logIntoElement(page, credentials);
 
         // Oh no, we forgot our recovery key - reset our identity
-        await page.locator(".mx_AuthPage").getByRole("button", { name: "Reset all" }).click();
+        await page.locator(".mx_AuthPage").getByRole("button", { name: "Can't confirm" }).click();
         await expect(
             page.getByRole("heading", { name: "Are you sure you want to reset your identity?" }),
         ).toBeVisible();
diff --git a/playwright/e2e/crypto/device-verification.spec.ts b/playwright/e2e/crypto/device-verification.spec.ts
index 64846ac86d..eb43d4dc78 100644
--- a/playwright/e2e/crypto/device-verification.spec.ts
+++ b/playwright/e2e/crypto/device-verification.spec.ts
@@ -22,6 +22,7 @@ import {
 } from "./utils";
 import { type Bot } from "../../pages/bot";
 import { Toasts } from "../../pages/toasts.ts";
+import type { ElementAppPage } from "../../pages/ElementAppPage.ts";
 
 test.describe("Device verification", { tag: "@no-webkit" }, () => {
     let aliceBotClient: Bot;
@@ -35,43 +36,50 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
         expectedBackupVersion = res.expectedBackupVersion;
     });
 
-    // Click the "Verify with another device" button, and have the bot client auto-accept it.
+    // Click the "Use another device" button, and have the bot client auto-accept it.
     async function initiateAliceVerificationRequest(page: Page): Promise<JSHandle<VerificationRequest>> {
         // alice bot waits for verification request
         const promiseVerificationRequest = waitForVerificationRequest(aliceBotClient);
 
-        // Click on "Verify with another device"
-        await page.locator(".mx_AuthPage").getByRole("button", { name: "Verify with another device" }).click();
+        // Click on "Use another device"
+        await page.locator(".mx_AuthPage").getByRole("button", { name: "Use another device" }).click();
 
         // alice bot responds yes to verification request from alice
         return promiseVerificationRequest;
     }
 
-    test("Verify device with SAS during login", async ({ page, app, credentials, homeserver }) => {
-        await logIntoElement(page, credentials);
+    test(
+        "Verify device with SAS during login",
+        { tag: "@screenshot" },
+        async ({ page, app, credentials, homeserver }) => {
+            await logIntoElement(page, credentials);
 
-        // Launch the verification request between alice and the bot
-        const verificationRequest = await initiateAliceVerificationRequest(page);
+            // Launch the verification request between alice and the bot
+            const verificationRequest = await initiateAliceVerificationRequest(page);
 
-        // Handle emoji SAS verification
-        const infoDialog = page.locator(".mx_InfoDialog");
-        // the bot chooses to do an emoji verification
-        const verifier = await verificationRequest.evaluateHandle((request) => request.startVerification("m.sas.v1"));
+            // Handle emoji SAS verification
+            const infoDialog = page.locator(".mx_InfoDialog");
+            // the bot chooses to do an emoji verification
+            const verifier = await verificationRequest.evaluateHandle((request) =>
+                request.startVerification("m.sas.v1"),
+            );
 
-        // Handle emoji request and check that emojis are matching
-        await doTwoWaySasVerification(page, verifier);
+            // Handle emoji request and check that emojis are matching
+            await doTwoWaySasVerification(page, verifier);
 
-        await infoDialog.getByRole("button", { name: "They match" }).click();
-        await infoDialog.getByRole("button", { name: "Got it" }).click();
+            await infoDialog.getByRole("button", { name: "They match" }).click();
+            await expect(page.locator(".mx_E2EIcon_verified")).toMatchScreenshot("device-verified-e2eIcon.png");
+            await infoDialog.getByRole("button", { name: "Got it" }).click();
 
-        // Check that our device is now cross-signed
-        await checkDeviceIsCrossSigned(app);
+            // Check that our device is now cross-signed
+            await checkDeviceIsCrossSigned(app);
 
-        // Check that the current device is connected to key backup
-        // For now we don't check that the backup key is in cache because it's a bit flaky,
-        // as we need to wait for the secret gossiping to happen.
-        await checkDeviceIsConnectedKeyBackup(app, expectedBackupVersion, false);
-    });
+            // Check that the current device is connected to key backup
+            // For now we don't check that the backup key is in cache because it's a bit flaky,
+            // as we need to wait for the secret gossiping to happen.
+            await checkDeviceIsConnectedKeyBackup(app, expectedBackupVersion, false);
+        },
+    );
 
     // Regression test for https://github.com/element-hq/element-web/issues/29110
     test("No toast after verification, even if the secrets take a while to arrive", async ({ page, credentials }) => {
@@ -116,85 +124,143 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
         const toasts = new Toasts(page);
         await toasts.rejectToast("Notifications");
         await toasts.assertNoToasts();
+
+        // There may still be a `/sendToDevice/m.secret.request` in flight, which will later throw an error and cause
+        // a *subsequent* test to fail. Tell playwright to ignore any errors resulting from in-flight routes.
+        await page.unrouteAll({ behavior: "ignoreErrors" });
     });
 
-    test("Verify device with QR code during login", async ({ page, app, credentials, homeserver }) => {
-        // A mode 0x02 verification: "self-verifying in which the current device does not yet trust the master key"
-        await logIntoElement(page, credentials);
+    test(
+        "Verify device with QR code during login",
+        { tag: "@screenshot" },
+        async ({ page, app, credentials, homeserver }) => {
+            // A mode 0x02 verification: "self-verifying in which the current device does not yet trust the master key"
+            await logIntoElement(page, credentials);
 
-        // Launch the verification request between alice and the bot
-        const verificationRequest = await initiateAliceVerificationRequest(page);
+            // Launch the verification request between alice and the bot
+            const verificationRequest = await initiateAliceVerificationRequest(page);
 
-        const infoDialog = page.locator(".mx_InfoDialog");
-        // feed the QR code into the verification request.
-        const qrData = await readQrCode(infoDialog);
-        const verifier = await verificationRequest.evaluateHandle(
-            (request, qrData) => request.scanQRCode(new Uint8ClampedArray(qrData)),
-            [...qrData],
-        );
+            const infoDialog = page.locator(".mx_InfoDialog");
+            // feed the QR code into the verification request.
+            const qrData = await readQrCode(infoDialog);
+            await expect(page.locator(".mx_Dialog")).toMatchScreenshot("qr-code.png", {
+                mask: [infoDialog.locator("img")],
+            });
+            const verifier = await verificationRequest.evaluateHandle(
+                (request, qrData) => request.scanQRCode(new Uint8ClampedArray(qrData)),
+                [...qrData],
+            );
 
-        // Confirm that the bot user scanned successfully
-        await expect(infoDialog.getByText("Almost there! Is your other device showing the same shield?")).toBeVisible();
-        await infoDialog.getByRole("button", { name: "Yes" }).click();
-        await infoDialog.getByRole("button", { name: "Got it" }).click();
+            // Confirm that the bot user scanned successfully
+            await expect(
+                infoDialog.getByText("Confirm that you see a green shield on your other device"),
+            ).toBeVisible();
+            await expect(page.locator(".mx_Dialog")).toMatchScreenshot("confirm-green-shield.png");
+            await infoDialog.getByRole("button", { name: "Yes, I see a green shield" }).click();
+            await expect(page.locator(".mx_Dialog")).toMatchScreenshot("got-it.png");
+            await infoDialog.getByRole("button", { name: "Got it" }).click();
 
-        // wait for the bot to see we have finished
-        await verifier.evaluate((verifier) => verifier.verify());
+            // wait for the bot to see we have finished
+            await verifier.evaluate((verifier) => verifier.verify());
 
-        // the bot uploads the signatures asynchronously, so wait for that to happen
-        await page.waitForTimeout(1000);
+            // the bot uploads the signatures asynchronously, so wait for that to happen
+            await page.waitForTimeout(1000);
 
-        // our device should trust the bot device
-        await app.client.evaluate(async (cli, aliceBotCredentials) => {
-            const deviceStatus = await cli
-                .getCrypto()!
-                .getDeviceVerificationStatus(aliceBotCredentials.userId, aliceBotCredentials.deviceId);
-            if (!deviceStatus.isVerified()) {
-                throw new Error("Bot device was not verified after QR code verification");
-            }
-        }, aliceBotClient.credentials);
+            // our device should trust the bot device
+            await app.client.evaluate(async (cli, aliceBotCredentials) => {
+                const deviceStatus = await cli
+                    .getCrypto()!
+                    .getDeviceVerificationStatus(aliceBotCredentials.userId, aliceBotCredentials.deviceId);
+                if (!deviceStatus.isVerified()) {
+                    throw new Error("Bot device was not verified after QR code verification");
+                }
+            }, aliceBotClient.credentials);
 
-        // Check that our device is now cross-signed
-        await checkDeviceIsCrossSigned(app);
+            // Check that our device is now cross-signed
+            await checkDeviceIsCrossSigned(app);
 
-        // Check that the current device is connected to key backup
-        await checkDeviceIsConnectedKeyBackup(app, expectedBackupVersion, true);
-    });
+            // Check that the current device is connected to key backup
+            await checkDeviceIsConnectedKeyBackup(app, expectedBackupVersion, true);
+        },
+    );
 
-    test("Verify device with Security Phrase during login", async ({ page, app, credentials, homeserver }) => {
-        await logIntoElement(page, credentials);
-
-        // Select the security phrase
-        await page.locator(".mx_AuthPage").getByRole("button", { name: "Verify with Recovery Key or Phrase" }).click();
-
-        // Fill the passphrase
-        const dialog = page.locator(".mx_Dialog");
-        await dialog.locator("textarea").fill("new passphrase");
-        await dialog.getByRole("button", { name: "Continue", disabled: false }).click();
-
-        await page.locator(".mx_AuthPage").getByRole("button", { name: "Done" }).click();
-
-        // Check that our device is now cross-signed
-        await checkDeviceIsCrossSigned(app);
-
-        // Check that the current device is connected to key backup
-        // The backup decryption key should be in cache also, as we got it directly from the 4S
-        await checkDeviceIsConnectedKeyBackup(app, expectedBackupVersion, true);
-    });
+    test(
+        "Verify device with Security Phrase during login",
+        { tag: "@screenshot" },
+        async ({ page, app, credentials, homeserver }) => {
+            await logIntoElement(page, credentials);
+            await enterRecoveryKeyAndCheckVerified(page, app, "new passphrase", true);
+        },
+    );
 
     test("Verify device with Recovery Key during login", async ({ page, app, credentials, homeserver }) => {
+        const recoveryKey = (await aliceBotClient.getRecoveryKey()).encodedPrivateKey;
+
+        await logIntoElement(page, credentials);
+        await enterRecoveryKeyAndCheckVerified(page, app, recoveryKey);
+    });
+
+    test("Verify device with Recovery Key from settings", async ({ page, app, credentials }) => {
+        const recoveryKey = (await aliceBotClient.getRecoveryKey()).encodedPrivateKey;
+
         await logIntoElement(page, credentials);
 
-        // Select the security phrase
-        await page.locator(".mx_AuthPage").getByRole("button", { name: "Verify with Recovery Key or Phrase" }).click();
+        /* Dismiss "Verify this device" */
+        const authPage = page.locator(".mx_AuthPage");
+        await authPage.getByRole("button", { name: "Skip verification for now" }).click();
+        await authPage.getByRole("button", { name: "I'll verify later" }).click();
+        await page.waitForSelector(".mx_MatrixChat");
 
-        // Fill the recovery key
+        const settings = await app.settings.openUserSettings("Encryption");
+        await settings.getByRole("button", { name: "Verify this device" }).click();
+        await enterRecoveryKeyAndCheckVerified(page, app, recoveryKey);
+    });
+
+    test("After cancelling verify with another device, I can try again #29882", async ({ page, app, credentials }) => {
+        // Regression test for https://github.com/element-hq/element-web/issues/29882
+
+        // Log in without verifying
+        await logIntoElement(page, credentials);
+        const authPage = page.locator(".mx_AuthPage");
+        await authPage.getByRole("button", { name: "Skip verification for now" }).click();
+        await authPage.getByRole("button", { name: "I'll verify later" }).click();
+        await page.waitForSelector(".mx_MatrixChat");
+
+        // Start to verify with "Use another device" but cancel
+        const settings = await app.settings.openUserSettings("Encryption");
+        await settings.getByRole("button", { name: "Verify this device" }).click();
+        await page.getByRole("button", { name: "Use another device" }).click();
+        await page.locator("#mx_Dialog_Container").getByRole("button", { name: "Close dialog" }).click();
+
+        // Start again
+        await settings.getByRole("button", { name: "Verify this device" }).click();
+
+        // We should be offered to use another device again.
+        // (In the bug, we were immediately told that verification has been cancelled.)
+        await expect(page.getByRole("button", { name: "Use another device" })).toBeVisible();
+    });
+
+    /** Helper for the three tests above which verify by recovery key */
+    async function enterRecoveryKeyAndCheckVerified(
+        page: Page,
+        app: ElementAppPage,
+        recoveryKey: string,
+        screenshot = false,
+    ) {
+        await page.getByRole("button", { name: "Use recovery key" }).click();
+
+        // Enter the recovery key
         const dialog = page.locator(".mx_Dialog");
-        const aliceRecoveryKey = await aliceBotClient.getRecoveryKey();
-        await dialog.locator("textarea").fill(aliceRecoveryKey.encodedPrivateKey);
+        // We use `pressSequentially` here to make sure that the FocusLock isn't causing us any problems
+        // (cf https://github.com/element-hq/element-web/issues/30089)
+        await dialog.getByTitle("Recovery key").pressSequentially(recoveryKey);
+        if (screenshot) {
+            await expect(page.locator(".mx_Dialog").filter({ hasText: "Enter your recovery key" })).toMatchScreenshot(
+                "recovery-key.png",
+            );
+        }
         await dialog.getByRole("button", { name: "Continue", disabled: false }).click();
-
-        await page.locator(".mx_AuthPage").getByRole("button", { name: "Done" }).click();
+        await page.getByRole("button", { name: "Done" }).click();
 
         // Check that our device is now cross-signed
         await checkDeviceIsCrossSigned(app);
@@ -202,7 +268,7 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
         // Check that the current device is connected to key backup
         // The backup decryption key should be in cache also, as we got it directly from the 4S
         await checkDeviceIsConnectedKeyBackup(app, expectedBackupVersion, true);
-    });
+    }
 
     test("Handle incoming verification request with SAS", async ({ page, credentials, homeserver, toasts }) => {
         await logIntoElement(page, credentials);
@@ -228,7 +294,7 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
         // it should contain the device ID of the requesting device
         await expect(toast.getByText(`${aliceBotClient.credentials.deviceId} from `)).toBeVisible();
         // Accept
-        await toast.getByRole("button", { name: "Verify Session" }).click();
+        await toast.getByRole("button", { name: "Start verification" }).click();
 
         /* Click 'Start' to start SAS verification */
         await page.getByRole("button", { name: "Start" }).click();
@@ -243,10 +309,7 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
         /* And we're all done! */
         const infoDialog = page.locator(".mx_InfoDialog");
         await infoDialog.getByRole("button", { name: "They match" }).click();
-        // We don't assert the full string as the device name is unset on Synapse but set to the user ID on Dendrite
-        await expect(infoDialog.getByText(`You've successfully verified`)).toContainText(
-            `(${aliceBotClient.credentials.deviceId})`,
-        );
+        await expect(infoDialog.getByText("Device verified")).toBeVisible();
         await infoDialog.getByRole("button", { name: "Got it" }).click();
     });
 });
diff --git a/playwright/e2e/crypto/event-shields.spec.ts b/playwright/e2e/crypto/event-shields.spec.ts
index e577a66467..722a30a0d2 100644
--- a/playwright/e2e/crypto/event-shields.spec.ts
+++ b/playwright/e2e/crypto/event-shields.spec.ts
@@ -14,7 +14,7 @@ import {
     createSecondBotDevice,
     createSharedRoomWithUser,
     enableKeyBackup,
-    logIntoElement,
+    logIntoElementAndVerify,
     logOutOfElement,
     verify,
     waitForDevices,
@@ -58,108 +58,108 @@ test.describe("Cryptography", function () {
             await app.client.network.setupRoute();
         });
 
-        test("should show the correct shield on e2e events", async ({
-            page,
-            app,
-            bot: bob,
-            homeserver,
-        }, workerInfo) => {
-            // Bob has a second, not cross-signed, device
-            const bobSecondDevice = await createSecondBotDevice(page, homeserver, bob);
+        test(
+            "should show the correct shield on e2e events",
+            { tag: "@screenshot" },
+            async ({ page, app, bot: bob, homeserver }, workerInfo) => {
+                // Bob has a second, not cross-signed, device
+                const bobSecondDevice = await createSecondBotDevice(page, homeserver, bob);
 
-            // Dismiss the toasts nagging us, otherwise they get in the way of clicking the room list
-            await page.getByRole("button", { name: "Dismiss" }).click();
-            await page.getByRole("button", { name: "Yes, dismiss" }).click();
+                // Dismiss the toasts nagging us, otherwise they get in the way of clicking the room list
+                await page.getByRole("button", { name: "Dismiss" }).click();
+                await page.getByRole("button", { name: "Yes, dismiss" }).click();
 
-            await bob.sendEvent(testRoomId, null, "m.room.encrypted", {
-                algorithm: "m.megolm.v1.aes-sha2",
-                ciphertext: "the bird is in the hand",
-            });
+                await bob.sendEvent(testRoomId, null, "m.room.encrypted", {
+                    algorithm: "m.megolm.v1.aes-sha2",
+                    ciphertext: "the bird is in the hand",
+                });
 
-            const last = page.locator(".mx_EventTile_last");
-            await expect(last).toContainText("Unable to decrypt message");
-            const lastE2eIcon = last.locator(".mx_EventTile_e2eIcon");
-            await expect(lastE2eIcon).toHaveClass(/mx_EventTile_e2eIcon_decryption_failure/);
-            await lastE2eIcon.focus();
-            await expect(await app.getTooltipForElement(lastE2eIcon)).toContainText(
-                "This message could not be decrypted",
-            );
+                const last = page.locator(".mx_EventTile_last");
+                await expect(last).toContainText("Unable to decrypt message");
+                const lastE2eIcon = last.locator(".mx_EventTile_e2eIcon");
+                await expect(lastE2eIcon).toHaveClass(/mx_EventTile_e2eIcon_decryption_failure/);
+                await lastE2eIcon.focus();
+                await expect(await app.getTooltipForElement(lastE2eIcon)).toContainText(
+                    "This message could not be decrypted",
+                );
 
-            /* Should show a red padlock for an unencrypted message in an e2e room */
-            await bob.evaluate(
-                (cli, testRoomId) =>
-                    cli.http.authedRequest(
-                        window.matrixcs.Method.Put,
-                        `/rooms/${encodeURIComponent(testRoomId)}/send/m.room.message/test_txn_1`,
-                        undefined,
-                        {
-                            msgtype: "m.text",
-                            body: "test unencrypted",
-                        },
-                    ),
-                testRoomId,
-            );
+                /* Should show a red padlock for an unencrypted message in an e2e room */
+                await bob.evaluate(
+                    (cli, testRoomId) =>
+                        cli.http.authedRequest(
+                            window.matrixcs.Method.Put,
+                            `/rooms/${encodeURIComponent(testRoomId)}/send/m.room.message/test_txn_1`,
+                            undefined,
+                            {
+                                msgtype: "m.text",
+                                body: "test unencrypted",
+                            },
+                        ),
+                    testRoomId,
+                );
 
-            await expect(last).toContainText("test unencrypted");
-            await expect(lastE2eIcon).toHaveClass(/mx_EventTile_e2eIcon_warning/);
-            await lastE2eIcon.focus();
-            await expect(await app.getTooltipForElement(lastE2eIcon)).toContainText("Not encrypted");
+                await expect(last).toContainText("test unencrypted");
+                await expect(lastE2eIcon).toHaveClass(/mx_EventTile_e2eIcon_warning/);
+                await expect(lastE2eIcon).toMatchScreenshot("event-shield-warning.png");
+                await lastE2eIcon.focus();
+                await expect(await app.getTooltipForElement(lastE2eIcon)).toContainText("Not encrypted");
 
-            /* Should show no padlock for an unverified user */
-            // bob sends a valid event
-            await bob.sendMessage(testRoomId, "test encrypted 1");
+                /* Should show no padlock for an unverified user */
+                // bob sends a valid event
+                await bob.sendMessage(testRoomId, "test encrypted 1");
 
-            // the message should appear, decrypted, with no warning, but also no "verified"
-            const lastTile = page.locator(".mx_EventTile_last");
-            const lastTileE2eIcon = lastTile.locator(".mx_EventTile_e2eIcon");
-            await expect(lastTile).toContainText("test encrypted 1");
-            // no e2e icon
-            await expect(lastTileE2eIcon).not.toBeVisible();
+                // the message should appear, decrypted, with no warning, but also no "verified"
+                const lastTile = page.locator(".mx_EventTile_last");
+                const lastTileE2eIcon = lastTile.locator(".mx_EventTile_e2eIcon");
+                await expect(lastTile).toContainText("test encrypted 1");
+                // no e2e icon
+                await expect(lastTileE2eIcon).not.toBeVisible();
 
-            /* Now verify Bob */
-            await verify(app, bob);
+                /* Now verify Bob */
+                await verify(app, bob);
 
-            /* Existing message should be updated when user is verified. */
-            await expect(last).toContainText("test encrypted 1");
-            // still no e2e icon
-            await expect(last.locator(".mx_EventTile_e2eIcon")).not.toBeVisible();
+                /* Existing message should be updated when user is verified. */
+                await expect(last).toContainText("test encrypted 1");
+                // still no e2e icon
+                await expect(last.locator(".mx_EventTile_e2eIcon")).not.toBeVisible();
 
-            /* should show no padlock, and be verified, for a message from a verified device */
-            await bob.sendMessage(testRoomId, "test encrypted 2");
+                /* should show no padlock, and be verified, for a message from a verified device */
+                await bob.sendMessage(testRoomId, "test encrypted 2");
 
-            await expect(lastTile).toContainText("test encrypted 2");
-            // no e2e icon
-            await expect(lastTileE2eIcon).not.toBeVisible();
+                await expect(lastTile).toContainText("test encrypted 2");
+                // no e2e icon
+                await expect(lastTileE2eIcon).not.toBeVisible();
 
-            /* should show red padlock for a message from an unverified device */
-            await bobSecondDevice.sendMessage(testRoomId, "test encrypted from unverified");
-            await expect(lastTile).toContainText("test encrypted from unverified");
-            await expect(lastTileE2eIcon).toHaveClass(/mx_EventTile_e2eIcon_warning/);
-            await lastTileE2eIcon.focus();
-            await expect(await app.getTooltipForElement(lastTileE2eIcon)).toContainText(
-                "Encrypted by a device not verified by its owner.",
-            );
+                /* should show red padlock for a message from an unverified device */
+                await bobSecondDevice.sendMessage(testRoomId, "test encrypted from unverified");
+                await expect(lastTile).toContainText("test encrypted from unverified");
+                await expect(lastTileE2eIcon).toHaveClass(/mx_EventTile_e2eIcon_warning/);
+                await lastTileE2eIcon.focus();
+                await expect(await app.getTooltipForElement(lastTileE2eIcon)).toContainText(
+                    "Encrypted by a device not verified by its owner.",
+                );
 
-            /* Should show a red padlock for a message from an unverified device.
-             * Rust crypto remembers the verification state of the sending device, so it will know that the device was
-             * unverified, even if it gets deleted. */
-            // bob deletes his second device
-            await bobSecondDevice.evaluate((cli) => cli.logout(true));
+                /* Should show a red padlock for a message from an unverified device.
+                 * Rust crypto remembers the verification state of the sending device, so it will know that the device was
+                 * unverified, even if it gets deleted. */
+                // bob deletes his second device
+                await bobSecondDevice.evaluate((cli) => cli.logout(true));
 
-            // wait for the logout to propagate.
-            await waitForDevices(app, bob.credentials.userId, 1);
+                // wait for the logout to propagate.
+                await waitForDevices(app, bob.credentials.userId, 1);
 
-            // close and reopen the room, to get the shield to update.
-            await app.viewRoomByName("Bob");
-            await app.viewRoomByName("TestRoom");
+                // close and reopen the room, to get the shield to update.
+                await app.viewRoomByName("Bob");
+                await app.viewRoomByName("TestRoom");
 
-            await expect(last).toContainText("test encrypted from unverified");
-            await expect(lastE2eIcon).toHaveClass(/mx_EventTile_e2eIcon_warning/);
-            await lastE2eIcon.focus();
-            await expect(await app.getTooltipForElement(lastE2eIcon)).toContainText(
-                "Encrypted by a device not verified by its owner.",
-            );
-        });
+                await expect(last).toContainText("test encrypted from unverified");
+                await expect(lastE2eIcon).toHaveClass(/mx_EventTile_e2eIcon_warning/);
+                await lastE2eIcon.focus();
+                await expect(await app.getTooltipForElement(lastE2eIcon)).toContainText(
+                    "Encrypted by a device not verified by its owner.",
+                );
+            },
+        );
 
         test("Should show a grey padlock for a key restored from backup", async ({
             page,
@@ -195,7 +195,7 @@ test.describe("Cryptography", function () {
                 window.localStorage.clear();
             });
             await page.reload();
-            await logIntoElement(page, aliceCredentials, securityKey);
+            await logIntoElementAndVerify(page, aliceCredentials, securityKey);
 
             /* go back to the test room and find Bob's message again */
             await app.viewRoomById(testRoomId);
diff --git a/playwright/e2e/crypto/history-sharing.spec.ts b/playwright/e2e/crypto/history-sharing.spec.ts
new file mode 100644
index 0000000000..ee275da84a
--- /dev/null
+++ b/playwright/e2e/crypto/history-sharing.spec.ts
@@ -0,0 +1,140 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { createNewInstance } from "@element-hq/element-web-playwright-common";
+
+import { expect, test } from "../../element-web-test";
+import { ElementAppPage } from "../../pages/ElementAppPage";
+import { createRoom, sendMessageInCurrentRoom } from "./utils";
+
+test.use({
+    displayName: "Alice",
+    labsFlags: ["feature_share_history_on_invite"],
+});
+
+/** Tests for MSC4268: encrypted history sharing */
+test.describe("History sharing", function () {
+    test(
+        "We should share history when sending invites",
+        { tag: "@screenshot" },
+        async (
+            { labsFlags, browser, page: alicePage, user: aliceCredentials, app: aliceElementApp, homeserver },
+            testInfo,
+        ) => {
+            // In this test, Alice creates an encrypted room and sends an event;
+            // we then invite Bob, and ensure Bob can see the content.
+
+            await aliceElementApp.client.bootstrapCrossSigning(aliceCredentials);
+
+            // Register a second user, and open it in a second instance of the app
+            const bobCredentials = await homeserver.registerUser(`user_${testInfo.testId}_bob`, "password", "Bob");
+            const bobPage = await createNewInstance(browser, bobCredentials, {}, labsFlags);
+            const bobElementApp = new ElementAppPage(bobPage);
+            await bobElementApp.client.bootstrapCrossSigning(bobCredentials);
+
+            // Create the room and send a message
+            await createRoom(alicePage, "TestRoom", true);
+            await sendMessageInCurrentRoom(alicePage, "A message from Alice");
+
+            // Send the invite to Bob
+            await aliceElementApp.inviteUserToCurrentRoom(bobCredentials.userId);
+
+            // Bob accepts the invite
+            await bobPage.getByRole("option", { name: "TestRoom" }).click();
+            await bobPage.getByRole("button", { name: "Accept" }).click();
+
+            // Bob should now be able to decrypt the event
+            await expect(bobPage.getByText("A message from Alice")).toBeVisible();
+
+            const mask = [bobPage.locator(".mx_MessageTimestamp")];
+            await expect(bobPage.locator(".mx_RoomView_body")).toMatchScreenshot("shared-history-invite-accepted.png", {
+                mask,
+            });
+        },
+    );
+
+    test("Messages sent when we believed the room history was unshared should not be visible", async ({
+        labsFlags,
+        browser,
+        page: alicePage,
+        user: aliceCredentials,
+        app: aliceElementApp,
+        homeserver,
+    }, testInfo) => {
+        test.setTimeout(60000);
+
+        // In this test:
+        //   1. Alice creates an encrypted room with Bob.
+        //   2. She sets the history visibility to "shared", but Bob doesn't receive the memo
+        //   3. Bob sends a message
+        //   4. Alice invites Charlie
+        //   5. Charlie can't see the message.
+
+        await aliceElementApp.client.bootstrapCrossSigning(aliceCredentials);
+        await createRoom(alicePage, "TestRoom", true);
+
+        // Register a second user, and open it in a second instance of the app
+        const bobCredentials = await homeserver.registerUser(`user_${testInfo.testId}_bob`, "password", "Bob");
+        const bobPage = await createNewInstance(browser, bobCredentials, {}, labsFlags);
+        const bobElementApp = new ElementAppPage(bobPage);
+        await bobElementApp.client.bootstrapCrossSigning(bobCredentials);
+
+        // ... and a third
+        const charlieCredentials = await homeserver.registerUser(
+            `user_${testInfo.testId}_charlie`,
+            "password",
+            "Charlie",
+        );
+        const charliePage = await createNewInstance(browser, charlieCredentials, {}, labsFlags);
+        const charlieElementApp = new ElementAppPage(charliePage);
+        await charlieElementApp.client.bootstrapCrossSigning(charlieCredentials);
+
+        // Alice invites Bob, and Bob accepts
+        const roomId = await aliceElementApp.getCurrentRoomIdFromUrl();
+        await aliceElementApp.inviteUserToCurrentRoom(bobCredentials.userId);
+        await bobPage.getByRole("option", { name: "TestRoom" }).click();
+        await bobPage.getByRole("button", { name: "Accept" }).click();
+
+        // Bob sends a message with "shared" visibility
+        await sendMessageInCurrentRoom(bobPage, "Message1: 'shared' visibility");
+        await expect(alicePage.getByText("Message1")).toBeVisible();
+
+        // Alice sets the history visibility to "joined"
+        await aliceElementApp.client.sendStateEvent(roomId, "m.room.history_visibility", {
+            history_visibility: "joined",
+        });
+        await expect(
+            bobPage.getByText(
+                "Alice made future room history visible to all room members, from the point they joined.",
+            ),
+        ).toBeVisible();
+
+        // Bob stops syncing, and sends a message with "joined" visibility.
+        // (Stopping syncing *before* sending the message means that the active sync will be flushed by sending the
+        // message, so that Alice's change to the history viz below won't be seen by Bob.)
+        await bobPage.route(`**/sync*`, (route) => route.fulfill({}));
+        await sendMessageInCurrentRoom(bobPage, "Message2: 'joined' visibility");
+        await expect(alicePage.getByText("Message2")).toBeVisible();
+
+        // Alice changes the history viz, but Bob doesn't receive the memo
+        await aliceElementApp.client.sendStateEvent(roomId, "m.room.history_visibility", {
+            history_visibility: "shared",
+        });
+        await sendMessageInCurrentRoom(bobPage, "Message3: 'shared' visibility, but Bob thinks it is still 'joined'");
+
+        // Alice now invites Charlie
+        await aliceElementApp.inviteUserToCurrentRoom(charlieCredentials.userId);
+        await charliePage.getByRole("option", { name: "TestRoom" }).click();
+        await charliePage.getByRole("button", { name: "Accept" }).click();
+
+        // Message1 should be visible
+        // Message2 should be invisible
+        // Message3 should be undecryptable
+        await expect(charliePage.getByText("Message1")).toBeVisible();
+        await expect(charliePage.getByText("You don't have access to this message")).toBeVisible();
+    });
+});
diff --git a/playwright/e2e/crypto/toasts.spec.ts b/playwright/e2e/crypto/toasts.spec.ts
index 7b838edaac..5e1dedfdc7 100644
--- a/playwright/e2e/crypto/toasts.spec.ts
+++ b/playwright/e2e/crypto/toasts.spec.ts
@@ -8,7 +8,7 @@
 import { type GeneratedSecretStorageKey } from "matrix-js-sdk/src/crypto-api";
 
 import { test, expect } from "../../element-web-test";
-import { createBot, deleteCachedSecrets, disableKeyBackup, logIntoElement } from "./utils";
+import { createBot, deleteCachedSecrets, disableKeyBackup, logIntoElementAndVerify } from "./utils";
 import { type Bot } from "../../pages/bot";
 
 test.describe("Key storage out of sync toast", () => {
@@ -18,12 +18,15 @@ test.describe("Key storage out of sync toast", () => {
         const res = await createBot(page, homeserver, credentials);
         recoveryKey = res.recoveryKey;
 
-        await logIntoElement(page, credentials, recoveryKey.encodedPrivateKey);
+        await logIntoElementAndVerify(page, credentials, recoveryKey.encodedPrivateKey);
 
         await deleteCachedSecrets(page);
 
         // We won't be prompted for crypto setup unless we have an e2e room, so make one
-        await page.getByRole("button", { name: "Add room" }).click();
+        await page
+            .getByRole("navigation", { name: "Room list" })
+            .getByRole("button", { name: "New conversation" })
+            .click();
         await page.getByRole("menuitem", { name: "New room" }).click();
         await page.getByRole("textbox", { name: "Name" }).fill("Test room");
         await page.getByRole("button", { name: "Create room" }).click();
@@ -65,10 +68,13 @@ test.describe("'Turn on key storage' toast", () => {
         const recoveryKey = res.recoveryKey;
         botClient = res.botClient;
 
-        await logIntoElement(page, credentials, recoveryKey.encodedPrivateKey);
+        await logIntoElementAndVerify(page, credentials, recoveryKey.encodedPrivateKey);
 
         // We won't be prompted for crypto setup unless we have an e2e room, so make one
-        await page.getByRole("button", { name: "Add room" }).click();
+        await page
+            .getByRole("navigation", { name: "Room list" })
+            .getByRole("button", { name: "New conversation" })
+            .click();
         await page.getByRole("menuitem", { name: "New room" }).click();
         await page.getByRole("textbox", { name: "Name" }).fill("Test room");
         await page.getByRole("button", { name: "Create room" }).click();
@@ -126,7 +132,7 @@ test.describe("'Turn on key storage' toast", () => {
         await toast.getByRole("button", { name: "Continue" }).click();
 
         // Then we see the Encryption settings dialog with an option to turn on key storage
-        await expect(page.getByRole("checkbox", { name: "Allow key storage" })).toBeVisible();
+        await expect(page.getByRole("switch", { name: "Allow key storage" })).toBeVisible();
 
         // And when we close that
         await page.getByRole("button", { name: "Close dialog" }).click();
@@ -153,7 +159,7 @@ test.describe("'Turn on key storage' toast", () => {
         await page.getByRole("button", { name: "Go to Settings" }).click();
 
         // Then we see Encryption settings again
-        await expect(page.getByRole("checkbox", { name: "Allow key storage" })).toBeVisible();
+        await expect(page.getByRole("switch", { name: "Allow key storage" })).toBeVisible();
 
         // And when we close that, see the toast, click Dismiss, and Yes, Dismiss
         await page.getByRole("button", { name: "Close dialog" }).click();
diff --git a/playwright/e2e/crypto/utils.ts b/playwright/e2e/crypto/utils.ts
index 289b123e86..8b677ed4cb 100644
--- a/playwright/e2e/crypto/utils.ts
+++ b/playwright/e2e/crypto/utils.ts
@@ -206,32 +206,42 @@ export async function checkDeviceIsConnectedKeyBackup(
 
 /**
  * Fill in the login form in element with the given creds.
- *
- * If a `securityKey` is given, verifies the new device using the key.
  */
-export async function logIntoElement(page: Page, credentials: Credentials, securityKey?: string) {
+export async function logIntoElement(page: Page, credentials: Credentials) {
     await page.goto("/#/login");
 
     await page.getByRole("textbox", { name: "Username" }).fill(credentials.userId);
     await page.getByPlaceholder("Password").fill(credentials.password);
     await page.getByRole("button", { name: "Sign in" }).click();
+}
 
-    // if a securityKey was given, verify the new device
-    if (securityKey !== undefined) {
-        await page.locator(".mx_AuthPage").getByRole("button", { name: "Verify with Recovery Key" }).click();
+/**
+ * Fill in the login form in Element with the given creds, and then complete the `CompleteSecurity` step, using the
+ * given recovery key. (Normally this will verify the new device using the secrets from 4S.)
+ *
+ * Afterwards, waits for the application to redirect to the home page.
+ */
+export async function logIntoElementAndVerify(page: Page, credentials: Credentials, recoveryKey: string) {
+    await logIntoElement(page, credentials);
 
-        const useSecurityKey = page.locator(".mx_Dialog").getByRole("button", { name: "use your Recovery Key" });
-        // If the user has set a recovery *passphrase*, they'll be prompted for that first and have to click
-        // through to enter the recovery key which is what we have here. If they haven't, they'll be prompted
-        // for a recovery key straight away. We click the button if it's there so this works in both cases.
-        if (await useSecurityKey.isVisible()) {
-            await useSecurityKey.click();
-        }
-        // Fill in the recovery key
-        await page.locator(".mx_Dialog").locator("textarea").fill(securityKey);
-        await page.getByRole("button", { name: "Continue", disabled: false }).click();
-        await page.getByRole("button", { name: "Done" }).click();
+    await page.locator(".mx_AuthPage").getByRole("button", { name: "Use recovery key" }).click();
+
+    const useSecurityKey = page.locator(".mx_Dialog").getByRole("button", { name: "Use recovery key" });
+    // If the user has set a recovery *passphrase*, they'll be prompted for that first and have to click
+    // through to enter the recovery key which is what we have here. If they haven't, they'll be prompted
+    // for a recovery key straight away. We click the button if it's there so this works in both cases.
+    if (await useSecurityKey.isVisible()) {
+        await useSecurityKey.click();
     }
+
+    // Fill in the recovery key
+    await page.locator(".mx_Dialog").getByTitle("Recovery key").fill(recoveryKey);
+    await page.getByRole("button", { name: "Continue", disabled: false }).click();
+    await page.getByRole("button", { name: "Done" }).click();
+
+    // The application should now redirect to `/#/home`. Wait for that to happen, otherwise if a test immediately does
+    // a `viewRoomById` or similar, it could race.
+    await page.waitForURL("/#/home");
 }
 
 /**
@@ -262,8 +272,8 @@ export async function logOutOfElement(page: Page, discardKeys: boolean = false)
 export async function verifySession(app: ElementAppPage, securityKey: string) {
     const settings = await app.settings.openUserSettings("Encryption");
     await settings.getByRole("button", { name: "Verify this device" }).click();
-    await app.page.getByRole("button", { name: "Verify with Recovery Key" }).click();
-    await app.page.locator(".mx_Dialog").locator("textarea").fill(securityKey);
+    await app.page.getByRole("button", { name: "Use recovery key" }).click();
+    await app.page.locator(".mx_Dialog").getByTitle("Recovery key").fill(securityKey);
     await app.page.getByRole("button", { name: "Continue", disabled: false }).click();
     await app.page.getByRole("button", { name: "Done" }).click();
     await app.settings.closeDialog();
@@ -300,9 +310,9 @@ export async function doTwoWaySasVerification(page: Page, verifier: JSHandle<Ver
 export async function enableKeyBackup(app: ElementAppPage): Promise<string> {
     const encryptionTab = await app.settings.openUserSettings("Encryption");
 
-    const keyStorageToggle = encryptionTab.getByRole("checkbox", { name: "Allow key storage" });
+    const keyStorageToggle = encryptionTab.getByRole("switch", { name: "Allow key storage" });
     if (!(await keyStorageToggle.isChecked())) {
-        await encryptionTab.getByRole("checkbox", { name: "Allow key storage" }).click();
+        await encryptionTab.getByRole("switch", { name: "Allow key storage" }).click();
     }
 
     await encryptionTab.getByRole("button", { name: "Set up recovery" }).click();
@@ -323,11 +333,11 @@ export async function enableKeyBackup(app: ElementAppPage): Promise<string> {
 export async function disableKeyBackup(app: ElementAppPage): Promise<void> {
     const encryptionTab = await app.settings.openUserSettings("Encryption");
 
-    const keyStorageToggle = encryptionTab.getByRole("checkbox", { name: "Allow key storage" });
+    const keyStorageToggle = encryptionTab.getByRole("switch", { name: "Allow key storage" });
     if (await keyStorageToggle.isChecked()) {
-        await encryptionTab.getByRole("checkbox", { name: "Allow key storage" }).click();
+        await encryptionTab.getByRole("switch", { name: "Allow key storage" }).click();
         await encryptionTab.getByRole("button", { name: "Delete key storage" }).click();
-        await encryptionTab.getByRole("checkbox", { name: "Allow key storage" }).isVisible();
+        await encryptionTab.getByRole("switch", { name: "Allow key storage" }).isVisible();
 
         // Wait for the update to account data to stick
         await new Promise((resolve) => setTimeout(resolve, 2000));
@@ -428,8 +438,8 @@ export async function sendMessageInCurrentRoom(page: Page, message: string): Pro
  * @param isEncrypted - Whether the room should be encrypted
  */
 export async function createRoom(page: Page, roomName: string, isEncrypted: boolean): Promise<void> {
-    await page.getByRole("button", { name: "Add room" }).click();
-    await page.locator(".mx_IconizedContextMenu").getByRole("menuitem", { name: "New room" }).click();
+    await page.getByRole("navigation", { name: "Room list" }).getByRole("button", { name: "New conversation" }).click();
+    await page.getByRole("menuitem", { name: "New room" }).click();
 
     const dialog = page.locator(".mx_Dialog");
 
diff --git a/playwright/e2e/devtools/devtools.spec.ts b/playwright/e2e/devtools/devtools.spec.ts
new file mode 100644
index 0000000000..1f9217d7eb
--- /dev/null
+++ b/playwright/e2e/devtools/devtools.spec.ts
@@ -0,0 +1,40 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { test, expect } from "../../element-web-test";
+
+test.describe("Devtools", () => {
+    test.use({
+        displayName: "Alice",
+    });
+
+    test("should render the devtools", { tag: "@screenshot" }, async ({ page, homeserver, user, app, axe }) => {
+        await app.client.createRoom({ name: "Test Room" });
+        await app.viewRoomByName("Test Room");
+
+        const composer = app.getComposer().locator("[contenteditable]");
+        await composer.fill("/devtools");
+        await composer.press("Enter");
+        const dialog = page.locator(".mx_Dialog");
+        await dialog.getByLabel("Developer mode").check();
+
+        axe.disableRules("color-contrast"); // XXX: Inheriting colour contrast issues from room view.
+        await expect(axe).toHaveNoViolations();
+        await expect(dialog).toMatchScreenshot("devtools-dialog.png", {
+            css: `.mx_CopyableText {
+                display: none;
+            }`,
+        });
+
+        // Try entering a value for the Developer.elementCallUrl setting
+        const input = page.getByRole("textbox", { name: "Element Call URL" });
+        await input.fill("https://example.com");
+        await input.press("Enter");
+        // expect EW NOT to reload
+        await page.getByText("Saved").isVisible();
+    });
+});
diff --git a/playwright/e2e/devtools/upgraderoom.spec.ts b/playwright/e2e/devtools/upgraderoom.spec.ts
new file mode 100644
index 0000000000..69de03b6ee
--- /dev/null
+++ b/playwright/e2e/devtools/upgraderoom.spec.ts
@@ -0,0 +1,38 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { SettingLevel } from "../../../src/settings/SettingLevel";
+import { test, expect } from "../../element-web-test";
+
+test.describe("Room upgrade dialog", () => {
+    test.use({
+        displayName: "Alice",
+    });
+
+    test(
+        "should render the room upgrade dialog",
+        { tag: "@screenshot" },
+        async ({ page, homeserver, user, app, axe }) => {
+            // Enable developer mode
+            await app.settings.setValue("developerMode", null, SettingLevel.ACCOUNT, true);
+
+            await app.client.createRoom({ name: "Test Room" });
+            await app.viewRoomByName("Test Room");
+
+            const composer = app.getComposer().locator("[contenteditable]");
+            // Pick a room version that is likely to be supported by all our target homeservers.
+            await composer.fill("/upgraderoom 5");
+            await composer.press("Enter");
+            const dialog = page.locator(".mx_Dialog");
+            await dialog.getByLabel("Automatically invite members from this room to the new one").check();
+
+            axe.disableRules("color-contrast"); // XXX: Inheriting colour contrast issues from room view.
+            await expect(axe).toHaveNoViolations();
+            await expect(dialog).toMatchScreenshot("upgrade-room.png");
+        },
+    );
+});
diff --git a/playwright/e2e/editing/editing.spec.ts b/playwright/e2e/editing/editing.spec.ts
index 6f8e68bbc3..415bcd1845 100644
--- a/playwright/e2e/editing/editing.spec.ts
+++ b/playwright/e2e/editing/editing.spec.ts
@@ -138,7 +138,11 @@ test.describe("Editing", () => {
 
             // Take a snapshot of the dialog
             await expect(dialog).toMatchScreenshot("message-edit-history-dialog.png", {
-                mask: [page.locator(".mx_MessageTimestamp")],
+                css: `
+                    .mx_MessageTimestamp {
+                        visibility: hidden;
+                    }
+                `,
             });
 
             {
diff --git a/playwright/e2e/invite/decline-and-block-invite-dialog.spec.ts b/playwright/e2e/invite/decline-and-block-invite-dialog.spec.ts
new file mode 100644
index 0000000000..1dbacaac24
--- /dev/null
+++ b/playwright/e2e/invite/decline-and-block-invite-dialog.spec.ts
@@ -0,0 +1,28 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { test, expect } from "../../element-web-test";
+
+test.describe("Decline and block invite dialog", function () {
+    test.use({
+        displayName: "Hanako",
+    });
+
+    test(
+        "should show decline and block dialog for a room",
+        { tag: "@screenshot" },
+        async ({ page, app, user, bot, axe }) => {
+            await bot.createRoom({ name: "Test Room", invite: [user.userId] });
+            await app.viewRoomByName("Test Room");
+            await page.getByRole("button", { name: "Decline and block" }).click();
+
+            axe.disableRules("color-contrast"); // XXX: Inheriting colour contrast issues from room view.
+            await expect(axe).toHaveNoViolations();
+            await expect(page.locator(".mx_Dialog")).toMatchScreenshot("decline-and-block-invite-empty.png");
+        },
+    );
+});
diff --git a/playwright/e2e/invite/invite-dialog.spec.ts b/playwright/e2e/invite/invite-dialog.spec.ts
index 8d64e6e047..42588f37c7 100644
--- a/playwright/e2e/invite/invite-dialog.spec.ts
+++ b/playwright/e2e/invite/invite-dialog.spec.ts
@@ -50,15 +50,11 @@ test.describe("Invite dialog", function () {
         await expect(other.locator(".mx_InviteDialog_identityServer")).toBeVisible();
 
         // Assert that the bot id is rendered properly
-        await expect(
-            other.locator(".mx_InviteDialog_tile_nameStack_userId").getByText(bot.credentials.userId),
-        ).toBeVisible();
+        await expect(other.getByRole("option", { name: botName }).getByText(bot.credentials.userId)).toBeVisible();
 
-        await other.locator(".mx_InviteDialog_tile_nameStack_name").getByText(botName).click();
+        await other.getByRole("option", { name: botName }).click();
 
-        await expect(
-            other.locator(".mx_InviteDialog_userTile_pill .mx_InviteDialog_userTile_name").getByText(botName),
-        ).toBeVisible();
+        await expect(other.getByTestId("invite-dialog-input-wrapper").getByText(botName)).toBeVisible();
 
         // Take a snapshot of the invite dialog with a user pill
         await expect(page.locator(".mx_Dialog")).toMatchScreenshot("invite-dialog-room-with-user-pill.png");
@@ -77,7 +73,11 @@ test.describe("Invite dialog", function () {
         "should support inviting a user to Direct Messages",
         { tag: "@screenshot" },
         async ({ page, app, user, bot }) => {
-            await page.locator(".mx_LegacyRoomList").getByRole("button", { name: "Start chat" }).click();
+            await page
+                .getByRole("navigation", { name: "Room list" })
+                .getByRole("button", { name: "New conversation" })
+                .click();
+            await page.getByRole("menuitem", { name: "Start chat" }).click();
 
             const other = page.locator(".mx_InviteDialog_other");
             // Assert that the header is rendered
@@ -93,14 +93,10 @@ test.describe("Invite dialog", function () {
 
             await other.getByTestId("invite-dialog-input").fill(bot.credentials.userId);
 
-            await expect(
-                other.locator(".mx_InviteDialog_tile_nameStack").getByText(bot.credentials.userId),
-            ).toBeVisible();
-            await other.locator(".mx_InviteDialog_tile_nameStack").getByText(botName).click();
+            await expect(other.getByRole("option", { name: botName }).getByText(bot.credentials.userId)).toBeVisible();
+            await other.getByRole("option", { name: botName }).click();
 
-            await expect(
-                other.locator(".mx_InviteDialog_userTile_pill .mx_InviteDialog_userTile_name").getByText(botName),
-            ).toBeVisible();
+            await expect(other.getByTestId("invite-dialog-input-wrapper").getByText(botName)).toBeVisible();
 
             // Take a snapshot of the invite dialog with a user pill
             await expect(page.locator(".mx_Dialog")).toMatchScreenshot("invite-dialog-dm-with-user-pill.png");
@@ -120,6 +116,8 @@ test.describe("Invite dialog", function () {
                 "rgba(0, 0, 0, 0)",
             );
 
+            await expect(page.locator(".mx_RoomView")).toMatchScreenshot("send_your_first_message_view.png");
+
             // Send a message to invite the bots
             const composer = app.getComposer().locator("[contenteditable]");
             await composer.fill("Hello}");
diff --git a/playwright/e2e/knock/create-knock-room.spec.ts b/playwright/e2e/knock/create-knock-room.spec.ts
index e21b30a3c2..d53271ef3c 100644
--- a/playwright/e2e/knock/create-knock-room.spec.ts
+++ b/playwright/e2e/knock/create-knock-room.spec.ts
@@ -27,8 +27,7 @@ test.describe("Create Knock Room", () => {
 
         await expect(page.locator(".mx_RoomHeader").getByText("Cybersecurity")).toBeVisible();
 
-        const urlHash = await page.evaluate(() => window.location.hash);
-        const roomId = urlHash.replace("#/room/", "");
+        const roomId = await app.getCurrentRoomIdFromUrl();
 
         // Room should have a knock join rule
         await waitForRoom(page, app.client, roomId, (room) => {
@@ -44,8 +43,7 @@ test.describe("Create Knock Room", () => {
 
         await expect(page.locator(".mx_RoomHeader").getByText("Cybersecurity")).toBeVisible();
 
-        const urlHash = await page.evaluate(() => window.location.hash);
-        const roomId = urlHash.replace("#/room/", "");
+        const roomId = await app.getCurrentRoomIdFromUrl();
 
         await app.settings.openRoomSettings("Security & Privacy");
 
@@ -70,8 +68,7 @@ test.describe("Create Knock Room", () => {
 
         await expect(page.locator(".mx_RoomHeader").getByText("Cybersecurity")).toBeVisible();
 
-        const urlHash = await page.evaluate(() => window.location.hash);
-        const roomId = urlHash.replace("#/room/", "");
+        const roomId = await app.getCurrentRoomIdFromUrl();
 
         // Room should have a knock join rule
         await waitForRoom(page, app.client, roomId, (room) => {
diff --git a/playwright/e2e/knock/knock-into-room.spec.ts b/playwright/e2e/knock/knock-into-room.spec.ts
index be6619697d..26440a6e1e 100644
--- a/playwright/e2e/knock/knock-into-room.spec.ts
+++ b/playwright/e2e/knock/knock-into-room.spec.ts
@@ -59,7 +59,7 @@ test.describe("Knock Into Room", () => {
 
         // Knocked room should appear in Rooms
         await expect(
-            page.getByRole("group", { name: "Rooms" }).getByRole("treeitem", { name: "Cybersecurity" }),
+            page.getByTestId("room-list").getByRole("option", { name: "Open room Cybersecurity" }),
         ).toBeVisible();
 
         // bot waits for knock request from Alice
@@ -77,7 +77,7 @@ test.describe("Knock Into Room", () => {
         await bot.inviteUser(room.roomId, user.userId);
 
         await expect(
-            page.getByRole("group", { name: "Invites" }).getByRole("treeitem", { name: "Cybersecurity" }),
+            page.getByTestId("room-list").getByRole("option", { name: "Open room Cybersecurity" }),
         ).toBeVisible();
 
         // Alice have to accept invitation in order to join the room.
@@ -85,7 +85,7 @@ test.describe("Knock Into Room", () => {
         await page.locator(".mx_RoomView").getByRole("button", { name: "Accept" }).click();
 
         await expect(
-            page.getByRole("group", { name: "Rooms" }).getByRole("treeitem", { name: "Cybersecurity" }),
+            page.getByTestId("room-list").getByRole("option", { name: "Open room Cybersecurity" }),
         ).toBeVisible();
 
         await expect(page.getByText("Alice joined the room")).toBeVisible();
@@ -136,7 +136,7 @@ test.describe("Knock Into Room", () => {
 
         // Knocked room should appear in Rooms
         await expect(
-            page.getByRole("group", { name: "Rooms" }).getByRole("treeitem", { name: "Cybersecurity" }),
+            page.getByTestId("room-list").getByRole("option", { name: "Open room Cybersecurity" }),
         ).toBeVisible();
 
         // bot waits for knock request from Alice
@@ -154,7 +154,7 @@ test.describe("Knock Into Room", () => {
         await bot.inviteUser(room.roomId, user.userId);
 
         await expect(
-            page.getByRole("group", { name: "Invites" }).getByRole("treeitem", { name: "Cybersecurity" }),
+            page.getByTestId("room-list").getByRole("option", { name: "Open room Cybersecurity" }),
         ).toBeVisible();
 
         // Alice have to accept invitation in order to join the room.
@@ -162,7 +162,7 @@ test.describe("Knock Into Room", () => {
         await page.locator(".mx_RoomView").getByRole("button", { name: "Accept" }).click();
 
         await expect(
-            page.getByRole("group", { name: "Rooms" }).getByRole("treeitem", { name: "Cybersecurity" }),
+            page.getByTestId("room-list").getByRole("option", { name: "Open room Cybersecurity" }),
         ).toBeVisible();
 
         await expect(page.getByText("Alice joined the room")).toBeVisible();
@@ -215,14 +215,14 @@ test.describe("Knock Into Room", () => {
         await expect(roomPreviewBar.getByRole("heading", { name: "Request to join sent" })).toBeVisible();
 
         // Knocked room should appear in Rooms
-        page.getByRole("group", { name: "Rooms" }).getByRole("treeitem", { name: "Cybersecurity" });
+        page.getByTestId("room-list").getByRole("option", { name: "Open room Cybersecurity" });
 
         await roomPreviewBar.getByRole("button", { name: "Cancel request" }).click();
         await expect(roomPreviewBar.getByRole("heading", { name: "Ask to join Cybersecurity?" })).toBeVisible();
         await expect(roomPreviewBar.getByRole("button", { name: "Request access" })).toBeVisible();
 
         await expect(
-            page.getByRole("group", { name: "Rooms" }).getByRole("treeitem", { name: "Cybersecurity" }),
+            page.getByTestId("room-list").getByRole("option", { name: "Open room Cybersecurity" }),
         ).not.toBeVisible();
     });
 
@@ -244,7 +244,7 @@ test.describe("Knock Into Room", () => {
 
         // Knocked room should appear in Rooms
         await expect(
-            page.getByRole("group", { name: "Rooms" }).getByRole("treeitem", { name: "Cybersecurity" }),
+            page.getByTestId("room-list").getByRole("option", { name: "Open room Cybersecurity" }),
         ).toBeVisible();
 
         // bot waits for knock request from Alice
@@ -262,13 +262,10 @@ test.describe("Knock Into Room", () => {
         await bot.kick(room.roomId, user.userId);
 
         // Room should stay in Rooms and have red badge when knock is denied
-        await expect(
-            page.getByRole("group", { name: "Rooms" }).getByRole("treeitem", { name: "Cybersecurity", exact: true }),
-        ).not.toBeVisible();
         await expect(
             page
-                .getByRole("group", { name: "Rooms" })
-                .getByRole("treeitem", { name: "Cybersecurity 1 unread mention." }),
+                .getByTestId("room-list")
+                .getByRole("option", { name: "Open room Cybersecurity with 1 unread mention." }),
         ).toBeVisible();
 
         await expect(roomPreviewBar.getByRole("heading", { name: "You have been denied access" })).toBeVisible();
diff --git a/playwright/e2e/lazy-loading/lazy-loading.spec.ts b/playwright/e2e/lazy-loading/lazy-loading.spec.ts
index 7c31c288fa..f6f098a079 100644
--- a/playwright/e2e/lazy-loading/lazy-loading.spec.ts
+++ b/playwright/e2e/lazy-loading/lazy-loading.spec.ts
@@ -30,6 +30,10 @@ test.describe("Lazy Loading", () => {
     });
 
     test.beforeEach(async ({ page, homeserver, user, bot, app }) => {
+        // The charlies were running off the bottom of the screen.
+        // We no longer overscan the member list so the result is they are not in the dom.
+        // Increase the viewport size to ensure they are.
+        await page.setViewportSize({ width: 1000, height: 1000 });
         for (let i = 1; i <= 10; i++) {
             const displayName = `Charly #${i}`;
             const bot = new Bot(page, homeserver, { displayName, startClient: false, autoAcceptInvites: false });
diff --git a/playwright/e2e/left-panel/left-panel.spec.ts b/playwright/e2e/left-panel/left-panel.spec.ts
index 3850df5cd0..cae6fd8934 100644
--- a/playwright/e2e/left-panel/left-panel.spec.ts
+++ b/playwright/e2e/left-panel/left-panel.spec.ts
@@ -17,7 +17,7 @@ test.describe("LeftPanel", () => {
         // create rooms and check room names are correct
         for (const name of ["Apple", "Pineapple", "Orange"]) {
             await app.client.createRoom({ name });
-            await expect(page.getByRole("treeitem", { name })).toBeVisible();
+            await expect(page.getByRole("option", { name: `Open room ${name}` })).toBeVisible();
         }
     });
 });
diff --git a/playwright/e2e/left-panel/room-list-panel/room-list-filter-sort.spec.ts b/playwright/e2e/left-panel/room-list-panel/room-list-filter-sort.spec.ts
index d3aa060a27..d1c0332cef 100644
--- a/playwright/e2e/left-panel/room-list-panel/room-list-filter-sort.spec.ts
+++ b/playwright/e2e/left-panel/room-list-panel/room-list-filter-sort.spec.ts
@@ -22,13 +22,21 @@ test.describe("Room list filters and sort", () => {
     });
 
     function getPrimaryFilters(page: Page): Locator {
-        return page.getByRole("listbox", { name: "Room list filters" });
+        return page.getByTestId("primary-filters");
     }
 
     function getRoomOptionsMenu(page: Page): Locator {
         return page.getByRole("button", { name: "Room Options" });
     }
 
+    function getFilterExpandButton(page: Page): Locator {
+        return getPrimaryFilters(page).getByRole("button", { name: "Expand filter list" });
+    }
+
+    function getFilterCollapseButton(page: Page): Locator {
+        return getPrimaryFilters(page).getByRole("button", { name: "Collapse filter list" });
+    }
+
     /**
      * Get the room list
      * @param page
@@ -60,7 +68,7 @@ test.describe("Room list filters and sort", () => {
         So we expect 'Old Room' to show up in the room list.
         */
         const roomListView = getRoomList(page);
-        const oldRoomTile = roomListView.getByRole("gridcell", { name: "Open room Old Room" });
+        const oldRoomTile = roomListView.getByRole("option", { name: "Open room Old Room" });
         await expect(oldRoomTile).toBeVisible();
 
         /*
@@ -131,18 +139,20 @@ test.describe("Room list filters and sort", () => {
 
             // Open the non-favourite room
             const roomListView = getRoomList(page);
-            const tile = roomListView.getByRole("gridcell", { name: "Open room room-non-fav" });
-            await tile.scrollIntoViewIfNeeded();
+            const tile = roomListView.getByRole("option", { name: "Open room room-non-fav" });
+            // item may not be in the DOM using scrollListToBottom rather than scrollIntoViewIfNeeded
+            await app.scrollListToBottom(roomListView);
             await tile.click();
 
             // Enable Favourite filter
+            await getFilterExpandButton(page).click();
             const primaryFilters = getPrimaryFilters(page);
             await primaryFilters.getByRole("option", { name: "Favourite" }).click();
             await expect(tile).not.toBeVisible();
 
             // Ensure the room list is not scrolled
             const isScrolledDown = await page
-                .getByRole("grid", { name: "Room list" })
+                .getByRole("listbox", { name: "Room list", exact: true })
                 .evaluate((e) => e.scrollTop !== 0);
             expect(isScrolledDown).toStrictEqual(false);
         });
@@ -218,35 +228,40 @@ test.describe("Room list filters and sort", () => {
 
             await primaryFilters.getByRole("option", { name: "Unread" }).click();
             // only one room should be visible
-            await expect(roomList.getByRole("gridcell", { name: "unread dm" })).toBeVisible();
-            await expect(roomList.getByRole("gridcell", { name: "unread room" })).toBeVisible();
-            expect(await roomList.locator("role=gridcell").count()).toBe(4);
+            await expect(roomList.getByRole("option", { name: "unread dm" })).toBeVisible();
+            await expect(roomList.getByRole("option", { name: "unread room" })).toBeVisible();
+            await expect.poll(() => roomList.locator("role=option").count()).toBe(4);
             await expect(primaryFilters).toMatchScreenshot("unread-primary-filters.png");
 
-            await primaryFilters.getByRole("option", { name: "Favourite" }).click();
-            await expect(roomList.getByRole("gridcell", { name: "favourite room" })).toBeVisible();
-            expect(await roomList.locator("role=gridcell").count()).toBe(1);
-
             await primaryFilters.getByRole("option", { name: "People" }).click();
-            await expect(roomList.getByRole("gridcell", { name: "unread dm" })).toBeVisible();
-            await expect(roomList.getByRole("gridcell", { name: "invited room" })).toBeVisible();
-            expect(await roomList.locator("role=gridcell").count()).toBe(2);
+            await expect(roomList.getByRole("option", { name: "unread dm" })).toBeVisible();
+            await expect(roomList.getByRole("option", { name: "invited room" })).toBeVisible();
+            await expect.poll(() => roomList.locator("role=option").count()).toBe(2);
 
             await primaryFilters.getByRole("option", { name: "Rooms" }).click();
-            await expect(roomList.getByRole("gridcell", { name: "unread room" })).toBeVisible();
-            await expect(roomList.getByRole("gridcell", { name: "favourite room" })).toBeVisible();
-            await expect(roomList.getByRole("gridcell", { name: "empty room" })).toBeVisible();
-            await expect(roomList.getByRole("gridcell", { name: "room with mention" })).toBeVisible();
-            await expect(roomList.getByRole("gridcell", { name: "Low prio room" })).toBeVisible();
-            expect(await roomList.locator("role=gridcell").count()).toBe(5);
+            await expect(roomList.getByRole("option", { name: "unread room" })).toBeVisible();
+            await expect(roomList.getByRole("option", { name: "favourite room" })).toBeVisible();
+            await expect(roomList.getByRole("option", { name: "empty room" })).toBeVisible();
+            await expect(roomList.getByRole("option", { name: "room with mention" })).toBeVisible();
+            await expect(roomList.getByRole("option", { name: "Low prio room" })).toBeVisible();
+            await expect.poll(() => roomList.locator("role=option").count()).toBe(5);
+
+            await getFilterExpandButton(page).click();
+
+            await primaryFilters.getByRole("option", { name: "Favourite" }).click();
+            await expect(roomList.getByRole("option", { name: "favourite room" })).toBeVisible();
+            await expect.poll(() => roomList.locator("role=option").count()).toBe(1);
 
             await primaryFilters.getByRole("option", { name: "Mentions" }).click();
-            await expect(roomList.getByRole("gridcell", { name: "room with mention" })).toBeVisible();
-            expect(await roomList.locator("role=gridcell").count()).toBe(1);
+            await expect(roomList.getByRole("option", { name: "room with mention" })).toBeVisible();
+            await expect.poll(() => roomList.locator("role=option").count()).toBe(1);
 
             await primaryFilters.getByRole("option", { name: "Invites" }).click();
-            await expect(roomList.getByRole("gridcell", { name: "invited room" })).toBeVisible();
-            expect(await roomList.locator("role=gridcell").count()).toBe(1);
+            await expect(roomList.getByRole("option", { name: "invited room" })).toBeVisible();
+            await expect.poll(() => roomList.locator("role=option").count()).toBe(1);
+
+            await getFilterCollapseButton(page).click();
+            await expect(primaryFilters.locator("role=option").first()).toHaveText("Invites");
         });
 
         test(
@@ -254,6 +269,7 @@ test.describe("Room list filters and sort", () => {
             { tag: "@screenshot" },
             async ({ page, app, bot }) => {
                 const roomListView = getRoomList(page);
+                const primaryFilters = getPrimaryFilters(page);
 
                 // Let's configure unread dm room so that we only get notification for mentions and keywords
                 await app.viewRoomById(unReadDmId);
@@ -262,20 +278,20 @@ test.describe("Room list filters and sort", () => {
                 await app.settings.closeDialog();
 
                 // Let's open a room other than unread room or unread dm
-                await roomListView.getByRole("gridcell", { name: "Open room favourite room" }).click();
+                await roomListView.getByRole("option", { name: "Open room favourite room" }).click();
 
                 // Let's make the bot send a new message in both rooms
                 await bot.sendMessage(unReadDmId, "Hello!");
                 await bot.sendMessage(unReadRoomId, "Hello!");
 
                 // Let's activate the unread filter now
-                await page.getByRole("option", { name: "Unread" }).click();
+                await primaryFilters.getByRole("option", { name: "Unread" }).click();
 
                 // Unread filter should only show unread room and not unread dm!
-                const unreadDm = roomListView.getByRole("gridcell", { name: "Open room unread room" });
+                const unreadDm = roomListView.getByRole("option", { name: "Open room unread room" });
                 await expect(unreadDm).toBeVisible();
                 await expect(unreadDm).toMatchScreenshot("unread-dm.png");
-                await expect(roomListView.getByRole("gridcell", { name: "Open room unread dm" })).not.toBeVisible();
+                await expect(roomListView.getByRole("option", { name: "Open room unread dm" })).not.toBeVisible();
             },
         );
 
@@ -285,7 +301,7 @@ test.describe("Room list filters and sort", () => {
             await getRoomOptionsMenu(page).click();
             await page.getByRole("menuitemradio", { name: "A-Z" }).click();
 
-            await expect(roomListView.getByRole("gridcell").first()).toHaveText(/empty room/);
+            await expect(roomListView.getByRole("option").first()).toHaveText(/empty room/);
         });
 
         test("should move room to the top on message when sorting by activity", async ({ page, bot }) => {
@@ -293,7 +309,7 @@ test.describe("Room list filters and sort", () => {
 
             await bot.sendMessage(unReadDmId, "Hello!");
 
-            await expect(roomListView.getByRole("gridcell").first()).toHaveText(/unread dm/);
+            await expect(roomListView.getByRole("option").first()).toHaveText(/unread dm/);
         });
     });
 
@@ -306,13 +322,22 @@ test.describe("Room list filters and sort", () => {
             return page.getByTestId("empty-room-list");
         }
 
+        test("should render the primary filters", { tag: "@screenshot" }, async ({ page, app, user }) => {
+            const primaryFilters = getPrimaryFilters(page);
+            await expect(primaryFilters).toMatchScreenshot("collapsed-primary-filters.png");
+            await getFilterExpandButton(page).click();
+            await expect(primaryFilters).toMatchScreenshot("expanded-primary-filters.png");
+        });
+
         test(
             "should render the default placeholder when there is no filter",
             { tag: "@screenshot" },
             async ({ page, app, user }) => {
                 const emptyRoomList = getEmptyRoomList(page);
                 await expect(emptyRoomList).toMatchScreenshot("default-empty-room-list.png");
-                await expect(page.getByTestId("room-list-panel")).toMatchScreenshot("room-panel-empty-room-list.png");
+                await expect(page.getByRole("navigation", { name: "Room list" })).toMatchScreenshot(
+                    "room-panel-empty-room-list.png",
+                );
             },
         );
 
@@ -326,6 +351,8 @@ test.describe("Room list filters and sort", () => {
                 { tag: "@screenshot" },
                 async ({ page, app, user }) => {
                     const primaryFilters = getPrimaryFilters(page);
+                    await getFilterExpandButton(page).click();
+
                     await primaryFilters.getByRole("option", { name: filter }).click();
 
                     const emptyRoomList = getEmptyRoomList(page);
@@ -343,6 +370,8 @@ test.describe("Room list filters and sort", () => {
                 { tag: "@screenshot" },
                 async ({ page, app, user }) => {
                     const primaryFilters = getPrimaryFilters(page);
+                    await getFilterExpandButton(page).click();
+
                     await primaryFilters.getByRole("option", { name: filter }).click();
 
                     const emptyRoomList = getEmptyRoomList(page);
diff --git a/playwright/e2e/left-panel/room-list-panel/room-list-header.spec.ts b/playwright/e2e/left-panel/room-list-panel/room-list-header.spec.ts
index daa8d3869f..96e0ca8597 100644
--- a/playwright/e2e/left-panel/room-list-panel/room-list-header.spec.ts
+++ b/playwright/e2e/left-panel/room-list-panel/room-list-header.spec.ts
@@ -30,13 +30,13 @@ test.describe("Header section of the room list", () => {
         const roomListHeader = getHeaderSection(page);
         await expect(roomListHeader).toMatchScreenshot("room-list-header.png");
 
-        const composeMenu = roomListHeader.getByRole("button", { name: "Add" });
+        const composeMenu = roomListHeader.getByRole("button", { name: "New conversation" });
         await composeMenu.click();
 
         await expect(page.getByRole("menu")).toMatchScreenshot("room-list-header-compose-menu.png");
 
-        // New message should open the direct messages dialog
-        await page.getByRole("menuitem", { name: "New message" }).click();
+        // Start chat should open the direct messages dialog
+        await page.getByRole("menuitem", { name: "Start chat" }).click();
         await expect(page.getByRole("heading", { name: "Direct Messages" })).toBeVisible();
         await app.closeDialog();
 
@@ -55,7 +55,7 @@ test.describe("Header section of the room list", () => {
         await expect(roomListHeader).toMatchScreenshot("room-list-space-header.png");
 
         await expect(roomListHeader.getByRole("heading", { name: "MySpace" })).toBeVisible();
-        await expect(roomListHeader.getByRole("button", { name: "Add" })).toBeVisible();
+        await expect(roomListHeader.getByRole("button", { name: "New conversation" })).toBeVisible();
 
         const spaceMenu = roomListHeader.getByRole("button", { name: "Open space menu" });
         await spaceMenu.click();
diff --git a/playwright/e2e/left-panel/room-list-panel/room-list-panel.spec.ts b/playwright/e2e/left-panel/room-list-panel/room-list-panel.spec.ts
index 8ca138a707..bc1387cbce 100644
--- a/playwright/e2e/left-panel/room-list-panel/room-list-panel.spec.ts
+++ b/playwright/e2e/left-panel/room-list-panel/room-list-panel.spec.ts
@@ -19,7 +19,7 @@ test.describe("Room list panel", () => {
      * @param page
      */
     function getRoomListView(page: Page) {
-        return page.getByTestId("room-list-panel");
+        return page.getByRole("navigation", { name: "Room list" });
     }
 
     test.beforeEach(async ({ page, app, user }) => {
@@ -38,13 +38,13 @@ test.describe("Room list panel", () => {
     test("should render the room list panel", { tag: "@screenshot" }, async ({ page, app, user }) => {
         const roomListView = getRoomListView(page);
         // Wait for the last room to be visible
-        await expect(roomListView.getByRole("gridcell", { name: "Open room room19" })).toBeVisible();
+        await expect(roomListView.getByRole("option", { name: "Open room room19" })).toBeVisible();
         await expect(roomListView).toMatchScreenshot("room-list-panel.png");
     });
 
     test("should respond to small screen sizes", { tag: "@screenshot" }, async ({ page }) => {
         await page.setViewportSize({ width: 575, height: 600 });
-        const roomListPanel = page.getByTestId("room-list-panel");
+        const roomListPanel = getRoomListView(page);
         await expect(roomListPanel).toMatchScreenshot("room-list-panel-smallscreen.png");
     });
 });
diff --git a/playwright/e2e/left-panel/room-list-panel/room-list.spec.ts b/playwright/e2e/left-panel/room-list-panel/room-list.spec.ts
index d9e1922934..5cc78eca69 100644
--- a/playwright/e2e/left-panel/room-list-panel/room-list.spec.ts
+++ b/playwright/e2e/left-panel/room-list-panel/room-list.spec.ts
@@ -41,28 +41,38 @@ test.describe("Room list", () => {
             }
         });
 
-        test("should render the room list", { tag: "@screenshot" }, async ({ page, app, user }) => {
+        test("should render the room list", { tag: "@screenshot" }, async ({ page, app, user, axe }) => {
             const roomListView = getRoomList(page);
-            await expect(roomListView.getByRole("gridcell", { name: "Open room room29" })).toBeVisible();
+            await expect(roomListView.getByRole("option", { name: "Open room room29" })).toBeVisible();
             await expect(roomListView).toMatchScreenshot("room-list.png");
 
             // Put focus on the room list
-            await roomListView.getByRole("gridcell", { name: "Open room room29" }).click();
+            await roomListView.getByRole("option", { name: "Open room room29" }).click();
             // Scroll to the end of the room list
-            await page.mouse.wheel(0, 1000);
-            await expect(roomListView.getByRole("gridcell", { name: "Open room room0" })).toBeVisible();
+            await app.scrollListToBottom(roomListView);
+
+            // scrollListToBottom seems to leave the mouse hovered over the list, move it away.
+            await page.getByRole("button", { name: "User menu" }).hover();
+
+            await expect(axe).toHaveNoViolations();
             await expect(roomListView).toMatchScreenshot("room-list-scrolled.png");
         });
 
         test("should open the room when it is clicked", async ({ page, app, user }) => {
             const roomListView = getRoomList(page);
-            await roomListView.getByRole("gridcell", { name: "Open room room29" }).click();
+            await roomListView.getByRole("option", { name: "Open room room29" }).click();
             await expect(page.getByRole("heading", { name: "room29", level: 1 })).toBeVisible();
         });
 
+        test("should open the context menu", { tag: "@screenshot" }, async ({ page, app, user }) => {
+            const roomListView = getRoomList(page);
+            await roomListView.getByRole("option", { name: "Open room room29" }).click({ button: "right" });
+            await expect(page.getByRole("menu", { name: "More Options" })).toBeVisible();
+        });
+
         test("should open the more options menu", { tag: "@screenshot" }, async ({ page, app, user }) => {
             const roomListView = getRoomList(page);
-            const roomItem = roomListView.getByRole("gridcell", { name: "Open room room29" });
+            const roomItem = roomListView.getByRole("option", { name: "Open room room29" });
             await roomItem.hover();
 
             await expect(roomItem).toMatchScreenshot("room-list-item-hover.png");
@@ -92,7 +102,7 @@ test.describe("Room list", () => {
         test("should open the notification options menu", { tag: "@screenshot" }, async ({ page, app, user }) => {
             const roomListView = getRoomList(page);
 
-            const roomItem = roomListView.getByRole("gridcell", { name: "Open room room29" });
+            const roomItem = roomListView.getByRole("option", { name: "Open room room29" });
             await roomItem.hover();
 
             await expect(roomItem).toMatchScreenshot("room-list-item-hover.png");
@@ -109,10 +119,13 @@ test.describe("Room list", () => {
             // It should make the room muted
             await page.getByRole("menuitem", { name: "Mute room" }).click();
 
+            await expect(roomItem.getByTestId("notification-decoration")).not.toBeVisible();
+
             // Put focus on the room list
-            await roomListView.getByRole("gridcell", { name: "Open room room28" }).click();
+            await roomListView.getByRole("option", { name: "Open room room28" }).click();
+
             // Scroll to the end of the room list
-            await page.mouse.wheel(0, 1000);
+            await app.scrollListToBottom(roomListView);
 
             // The room decoration should have the muted icon
             await expect(roomItem.getByTestId("notification-decoration")).toBeVisible();
@@ -131,24 +144,25 @@ test.describe("Room list", () => {
         test("should scroll to the current room", async ({ page, app, user }) => {
             const roomListView = getRoomList(page);
             // Put focus on the room list
-            await roomListView.getByRole("gridcell", { name: "Open room room29" }).click();
+            await roomListView.getByRole("option", { name: "Open room room29" }).click();
             // Scroll to the end of the room list
-            await page.mouse.wheel(0, 1000);
+            await app.scrollListToBottom(roomListView);
 
-            await roomListView.getByRole("gridcell", { name: "Open room room0" }).click();
+            await expect(roomListView.getByRole("option", { name: "Open room room0" })).toBeVisible();
+            await roomListView.getByRole("option", { name: "Open room room0" }).click();
 
             const filters = page.getByRole("listbox", { name: "Room list filters" });
             await filters.getByRole("option", { name: "People" }).click();
-            await expect(roomListView.getByRole("gridcell", { name: "Open room room0" })).not.toBeVisible();
+            await expect(roomListView.getByRole("option", { name: "Open room room0" })).not.toBeVisible();
 
             await filters.getByRole("option", { name: "People" }).click();
-            await expect(roomListView.getByRole("gridcell", { name: "Open room room0" })).toBeVisible();
+            await expect(roomListView.getByRole("option", { name: "Open room room0" })).toBeVisible();
         });
 
         test.describe("Shortcuts", () => {
             test("should select the next room", async ({ page, app, user }) => {
                 const roomListView = getRoomList(page);
-                await roomListView.getByRole("gridcell", { name: "Open room room29" }).click();
+                await roomListView.getByRole("option", { name: "Open room room29" }).click();
                 await page.keyboard.press("Alt+ArrowDown");
 
                 await expect(page.getByRole("heading", { name: "room28", level: 1 })).toBeVisible();
@@ -156,7 +170,7 @@ test.describe("Room list", () => {
 
             test("should select the previous room", async ({ page, app, user }) => {
                 const roomListView = getRoomList(page);
-                await roomListView.getByRole("gridcell", { name: "Open room room28" }).click();
+                await roomListView.getByRole("option", { name: "Open room room28" }).click();
                 await page.keyboard.press("Alt+ArrowUp");
 
                 await expect(page.getByRole("heading", { name: "room29", level: 1 })).toBeVisible();
@@ -164,7 +178,7 @@ test.describe("Room list", () => {
 
             test("should select the last room", async ({ page, app, user }) => {
                 const roomListView = getRoomList(page);
-                await roomListView.getByRole("gridcell", { name: "Open room room29" }).click();
+                await roomListView.getByRole("option", { name: "Open room room29" }).click();
                 await page.keyboard.press("Alt+ArrowUp");
 
                 await expect(page.getByRole("heading", { name: "room0", level: 1 })).toBeVisible();
@@ -178,7 +192,10 @@ test.describe("Room list", () => {
                 await bot.joinRoom(roomId);
                 await bot.sendMessage(roomId, "I am a robot. Beep.");
 
-                await roomListView.getByRole("gridcell", { name: "Open room room20" }).click();
+                await roomListView.getByRole("option", { name: "Open room room20" }).click();
+
+                // Make sure the room with the unread is visible before we press the keyboard action to select it
+                await expect(roomListView.getByRole("option", { name: "1 notification" })).toBeVisible();
 
                 await page.keyboard.press("Alt+Shift+ArrowDown");
 
@@ -190,8 +207,8 @@ test.describe("Room list", () => {
             test("should navigate to the room list", async ({ page, app, user }) => {
                 const roomListView = getRoomList(page);
 
-                const room29 = roomListView.getByRole("gridcell", { name: "Open room room29" });
-                const room28 = roomListView.getByRole("gridcell", { name: "Open room room28" });
+                const room29 = roomListView.getByRole("option", { name: "Open room room29" });
+                const room28 = roomListView.getByRole("option", { name: "Open room room28" });
 
                 // open the room
                 await room29.click();
@@ -210,7 +227,7 @@ test.describe("Room list", () => {
 
             test("should navigate to the notification menu", async ({ page, app, user }) => {
                 const roomListView = getRoomList(page);
-                const room29 = roomListView.getByRole("gridcell", { name: "Open room room29" });
+                const room29 = roomListView.getByRole("option", { name: "Open room room29" });
                 const moreButton = room29.getByRole("button", { name: "More options" });
                 const notificationButton = room29.getByRole("button", { name: "Notification options" });
 
@@ -223,17 +240,37 @@ test.describe("Room list", () => {
                 await expect(notificationButton).toBeFocused();
 
                 // Open the menu
-                await notificationButton.click();
+                await page.keyboard.press("Enter");
                 // Wait for the menu to be open
                 await expect(page.getByRole("menuitem", { name: "Match default settings" })).toHaveAttribute(
                     "aria-selected",
                     "true",
                 );
 
-                // Close the menu
+                await page.keyboard.press("ArrowDown");
                 await page.keyboard.press("Escape");
-                // Focus should be back on the room list item
-                await expect(room29).toBeFocused();
+                // Focus should be back on the notification button
+                await expect(notificationButton).toBeFocused();
+            });
+
+            test("should navigate to the top and then bottom of the room list", async ({ page, app, user }) => {
+                const roomListView = getRoomList(page);
+
+                const topRoom = roomListView.getByRole("option", { name: "Open room room29" });
+
+                // open the room
+                await topRoom.click();
+                // put focus back on the room list item
+                await topRoom.click();
+                await expect(topRoom).toBeFocused();
+
+                await page.keyboard.press("End");
+                const bottomRoom = roomListView.getByRole("option", { name: "Open room room0" });
+                await expect(bottomRoom).toBeFocused();
+
+                await page.keyboard.press("Home");
+                const topRoomAgain = roomListView.getByRole("option", { name: "Open room room29" });
+                await expect(topRoomAgain).toBeFocused();
             });
         });
     });
@@ -249,20 +286,43 @@ test.describe("Room list", () => {
             await page.getByRole("button", { name: "User menu" }).focus();
 
             const roomListView = getRoomList(page);
-            const publicRoom = roomListView.getByRole("gridcell", { name: "public room" });
+            const publicRoom = roomListView.getByRole("option", { name: "public room" });
 
             await expect(publicRoom).toBeVisible();
             await expect(publicRoom).toMatchScreenshot("room-list-item-public.png");
         });
 
+        test("should be a low priority room", { tag: "@screenshot" }, async ({ page, app, user }) => {
+            // @ts-ignore Visibility enum is not accessible
+            await app.client.createRoom({ name: "low priority room", visibility: "public" });
+            const roomListView = getRoomList(page);
+            const publicRoom = roomListView.getByRole("option", { name: "low priority room" });
+
+            // Make room low priority
+            await publicRoom.click({ button: "right" });
+            await page.getByRole("menuitemcheckbox", { name: "Low priority" }).click();
+
+            // Should have low priority decoration
+            await expect(publicRoom.locator(".mx_RoomAvatarView_icon")).toHaveAccessibleName(
+                "This is a low priority room",
+            );
+
+            // focus the header to avoid to have hover decoration
+            await page.getByTestId("room-list-header").click();
+            await expect(publicRoom).toMatchScreenshot("room-list-item-low-priority.png");
+        });
+
         test("should be a video room", { tag: "@screenshot" }, async ({ page, app, user }) => {
-            await page.getByTestId("room-list-panel").getByRole("button", { name: "Add" }).click();
+            await page
+                .getByRole("navigation", { name: "Room list" })
+                .getByRole("button", { name: "New conversation" })
+                .click();
             await page.getByRole("menuitem", { name: "New video room" }).click();
             await page.getByRole("textbox", { name: "Name" }).fill("video room");
             await page.getByRole("button", { name: "Create video room" }).click();
 
             const roomListView = getRoomList(page);
-            const videoRoom = roomListView.getByRole("gridcell", { name: "video room" });
+            const videoRoom = roomListView.getByRole("option", { name: "video room" });
 
             // focus the user menu to avoid to have hover decoration
             await page.getByRole("button", { name: "User menu" }).focus();
@@ -281,7 +341,7 @@ test.describe("Room list", () => {
                 invite: [user.userId],
                 is_direct: true,
             });
-            const invitedRoom = roomListView.getByRole("gridcell", { name: "invited room" });
+            const invitedRoom = roomListView.getByRole("option", { name: "invited room" });
             await expect(invitedRoom).toBeVisible();
             await expect(invitedRoom).toMatchScreenshot("room-list-item-invited.png");
         });
@@ -296,7 +356,7 @@ test.describe("Room list", () => {
             await bot.sendMessage(roomId, "I am a robot. Beep.");
             await bot.sendMessage(roomId, "I am a robot. Beep.");
 
-            const room = roomListView.getByRole("gridcell", { name: "2 notifications" });
+            const room = roomListView.getByRole("option", { name: "2 notifications" });
             await expect(room).toBeVisible();
             await expect(room.getByTestId("notification-decoration")).toHaveText("2");
             await expect(room).toMatchScreenshot("room-list-item-notification.png");
@@ -327,16 +387,17 @@ test.describe("Room list", () => {
             );
             await bot.sendMessage(roomId, "I am a robot. Beep.");
 
-            const room = roomListView.getByRole("gridcell", { name: "mention" });
+            const room = roomListView.getByRole("option", { name: "mention" });
             await expect(room).toBeVisible();
             await expect(room).toMatchScreenshot("room-list-item-mention.png");
         });
 
         test("should render a message preview", { tag: "@screenshot" }, async ({ page, app, user, bot }) => {
-            const roomListView = getRoomList(page);
+            await app.settings.openUserSettings("Preferences");
+            await page.getByRole("switch", { name: "Show message previews" }).click();
+            await app.closeDialog();
 
-            await page.getByRole("button", { name: "Room Options" }).click();
-            await page.getByRole("menuitemcheckbox", { name: "Show message previews" }).click();
+            const roomListView = getRoomList(page);
 
             const roomId = await app.client.createRoom({ name: "activity" });
 
@@ -347,7 +408,7 @@ test.describe("Room list", () => {
             await bot.joinRoom(roomId);
             await bot.sendMessage(roomId, "I am a robot. Beep.");
 
-            const room = roomListView.getByRole("gridcell", { name: "activity" });
+            const room = roomListView.getByRole("option", { name: "activity" });
             await expect(room.getByText("I am a robot. Beep.")).toBeVisible();
             await expect(room).toMatchScreenshot("room-list-item-message-preview.png");
         });
@@ -367,14 +428,16 @@ test.describe("Room list", () => {
             await app.settings.closeDialog();
 
             await app.settings.openUserSettings("Notifications");
-            await page.getByText("Show all activity in the room list (dots or number of unread messages)").click();
+            await page
+                .getByRole("switch", { name: "Show all activity in the room list (dots or number of unread messages)" })
+                .check();
             await app.settings.closeDialog();
 
             // Switch to the other room to avoid the notification to be cleared
             await app.viewRoomById(otherRoomId);
             await bot.sendMessage(roomId, "I am a robot. Beep.");
 
-            const room = roomListView.getByRole("gridcell", { name: "activity" });
+            const room = roomListView.getByRole("option", { name: "activity" });
             await expect(room.getByTestId("notification-decoration")).toBeVisible();
             await expect(room).toMatchScreenshot("room-list-item-activity.png");
         });
@@ -386,13 +449,12 @@ test.describe("Room list", () => {
             await app.client.inviteUser(roomId, bot.credentials.userId);
             await bot.joinRoom(roomId);
 
-            const room = roomListView.getByRole("gridcell", { name: "mark as unread" });
-            await room.hover();
-            await room.getByRole("button", { name: "More Options" }).click();
+            const room = roomListView.getByRole("option", { name: "mark as unread" });
+            await room.click({ button: "right" });
             await page.getByRole("menuitem", { name: "mark as unread" }).click();
 
-            // focus the user menu to avoid to have hover decoration
-            await page.getByRole("button", { name: "User menu" }).focus();
+            // focus the header to avoid to have hover decoration
+            await page.getByTestId("room-list-header").click();
 
             await expect(room).toMatchScreenshot("room-list-item-mark-as-unread.png");
         });
@@ -409,7 +471,7 @@ test.describe("Room list", () => {
             await page.getByText("Off").click();
             await app.settings.closeDialog();
 
-            const room = roomListView.getByRole("gridcell", { name: "silent" });
+            const room = roomListView.getByRole("option", { name: "silent" });
             await expect(room.getByTestId("notification-decoration")).toBeVisible();
             await expect(room).toMatchScreenshot("room-list-item-silent.png");
         });
diff --git a/playwright/e2e/location/location.spec.ts b/playwright/e2e/location/location.spec.ts
index 52afd5e173..5ea371b70d 100644
--- a/playwright/e2e/location/location.spec.ts
+++ b/playwright/e2e/location/location.spec.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 New Vector Ltd.
+Copyright 2024, 2025 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
 SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
@@ -30,31 +30,59 @@ test.describe("Location sharing", { tag: "@no-firefox" }, () => {
         });
     });
 
-    test("sends and displays pin drop location message successfully", async ({ page, user, app }) => {
-        const roomId = await app.client.createRoom({});
-        await page.goto(`/#/room/${roomId}`);
+    test(
+        "sends and displays pin drop location message successfully",
+        { tag: "@screenshot" },
+        async ({ page, user, app }) => {
+            const roomId = await app.client.createRoom({});
+            await page.goto(`/#/room/${roomId}`);
 
-        const composerOptions = await app.openMessageComposerOptions();
-        await composerOptions.getByRole("menuitem", { name: "Location", exact: true }).click();
+            const composerOptions = await app.openMessageComposerOptions();
+            await composerOptions.getByRole("menuitem", { name: "Location", exact: true }).click();
 
-        await selectLocationShareTypeOption(page, "Pin").click();
+            await selectLocationShareTypeOption(page, "Pin").click();
 
-        await page.locator("#mx_LocationPicker_map").click();
+            await page.locator("#mx_LocationPicker_map").click();
 
-        await submitShareLocation(page);
+            await submitShareLocation(page);
 
-        await page.locator(".mx_RoomView_body .mx_EventTile .mx_MLocationBody").click({
-            position: {
-                x: 225,
-                y: 150,
-            },
-        });
+            await page.getByRole("button", { name: "Map marker" }).click();
 
-        // clicking location tile opens maximised map
-        await expect(page.getByRole("dialog")).toBeVisible();
+            const dialog = page.getByRole("dialog");
 
-        await app.closeDialog();
+            // wait for the dialog to be visible
+            await expect(dialog).toBeVisible();
 
-        await expect(page.locator(".mx_Marker")).toBeVisible();
-    });
+            // screenshot the map within the dialog
+            await expect(dialog.getByRole("region", { name: "Map" })).toMatchScreenshot(
+                "location-pin-drop-message-map.png",
+            );
+
+            await app.closeDialog();
+
+            await expect(page.getByRole("button", { name: "Map marker" })).toBeVisible();
+        },
+    );
+
+    test(
+        "is prompted for and can consent to live location sharing",
+        { tag: "@screenshot" },
+        async ({ page, user, app, axe }) => {
+            await app.viewRoomById(await app.client.createRoom({}));
+
+            const composerOptions = await app.openMessageComposerOptions();
+            await composerOptions.getByRole("menuitem", { name: "Location", exact: true }).click();
+            const menu = page.locator(".mx_LocationShareMenu");
+
+            await menu.getByRole("button", { name: "My live location" }).click();
+            await menu.getByLabel("Enable live location sharing").check();
+
+            axe.disableRules([
+                "color-contrast", // XXX: Inheriting colour contrast issues from room view.
+                "region", // XXX: ContextMenu managed=false does not provide a role.
+            ]);
+            await expect(axe).toHaveNoViolations();
+            await expect(menu).toMatchScreenshot("location-live-share-dialog.png");
+        },
+    );
 });
diff --git a/playwright/e2e/login/login-consent.spec.ts b/playwright/e2e/login/login-consent.spec.ts
index 23baf023fa..33dd88df6c 100644
--- a/playwright/e2e/login/login-consent.spec.ts
+++ b/playwright/e2e/login/login-consent.spec.ts
@@ -129,6 +129,7 @@ test.describe("Login", () => {
             await expect(page.getByRole("heading", { name: "Welcome to Element!" })).toBeVisible();
 
             // Start the login process
+            await expect(axe).toHaveNoViolations();
             await page.getByRole("link", { name: "Sign in" }).click();
 
             // first pick the homeserver, as otherwise the user picker won't be visible
@@ -148,8 +149,6 @@ test.describe("Login", () => {
             await selectHomeserver(page, homeserver.baseUrl);
 
             await expect(page.getByRole("textbox", { name: "Username" })).toBeVisible();
-            // Disabled because flaky - see https://github.com/vector-im/element-web/issues/24688
-            // cy.percySnapshot("Login");
             await expect(axe).toHaveNoViolations();
 
             await page.getByRole("textbox", { name: "Username" }).fill(credentials.username);
@@ -186,7 +185,7 @@ test.describe("Login", () => {
                 await page.goto("/");
                 await login(page, homeserver, credentials);
 
-                await expect(page.getByRole("heading", { name: "Verify this device", level: 1 })).toBeVisible();
+                await expect(page.getByRole("heading", { name: "Confirm your identity", level: 2 })).toBeVisible();
 
                 await expect(page.getByRole("button", { name: "Skip verification for now" })).toBeVisible();
             });
@@ -219,7 +218,7 @@ test.describe("Login", () => {
                     await page.goto("/");
                     await login(page, homeserver, credentials);
 
-                    await expect(page.getByRole("heading", { name: "Verify this device", level: 1 })).toBeVisible();
+                    await expect(page.getByRole("heading", { name: "Confirm your identity", level: 2 })).toBeVisible();
 
                     await expect(page.getByRole("button", { name: "Skip verification for now" })).toBeVisible();
                 });
@@ -254,10 +253,10 @@ test.describe("Login", () => {
                     await page.goto("/");
                     await login(page, homeserver, credentials);
 
-                    const h1 = page.getByRole("heading", { name: "Verify this device", level: 1 });
-                    await expect(h1).toBeVisible();
+                    const h2 = page.getByRole("heading", { name: "Confirm your identity", level: 2 });
+                    await expect(h2).toBeVisible();
 
-                    await expect(h1.locator(".mx_CompleteSecurity_skip")).toHaveCount(0);
+                    await expect(h2.locator(".mx_CompleteSecurity_skip")).toHaveCount(0);
                 });
 
                 test("Continues to show verification prompt after cancelling device verification", async ({
@@ -274,18 +273,18 @@ test.describe("Login", () => {
                     // Load the page and see that we are asked to verify
                     await page.goto("/#/welcome");
                     await login(page, homeserver, credentials);
-                    let h1 = page.getByRole("heading", { name: "Verify this device", level: 1 });
-                    await expect(h1).toBeVisible();
+                    let h2 = page.getByRole("heading", { name: "Confirm your identity", level: 2 });
+                    await expect(h2).toBeVisible();
 
-                    // Click "Verify with another device"
-                    await page.getByRole("button", { name: "Verify with another device" }).click();
+                    // Click "Use another device"
+                    await page.getByRole("button", { name: "Use another device" }).click();
 
                     // Cancel the new dialog
                     await page.getByRole("button", { name: "Close dialog" }).click();
 
                     // Check that we are still being asked to verify
-                    h1 = page.getByRole("heading", { name: "Verify this device", level: 1 });
-                    await expect(h1).toBeVisible();
+                    h2 = page.getByRole("heading", { name: "Confirm your identity", level: 2 });
+                    await expect(h2).toBeVisible();
                 });
             });
 
@@ -303,18 +302,18 @@ test.describe("Login", () => {
                 await page.goto("/");
                 await login(page, homeserver, credentials);
 
-                await expect(page.getByRole("heading", { name: "Verify this device", level: 1 })).toBeVisible();
+                await expect(page.getByRole("heading", { name: "Confirm your identity", level: 2 })).toBeVisible();
 
                 // Start the reset process
-                await page.getByRole("button", { name: "Proceed with reset" }).click();
+                await page.getByRole("button", { name: "Can't confirm?" }).click();
 
                 // First try cancelling and restarting
                 await page.getByRole("button", { name: "Cancel" }).click();
-                await page.getByRole("button", { name: "Proceed with reset" }).click();
+                await page.getByRole("button", { name: "Can't confirm?" }).click();
 
                 // Then click outside the dialog and restart
                 await page.getByRole("link", { name: "Powered by Matrix" }).click({ force: true });
-                await page.getByRole("button", { name: "Proceed with reset" }).click();
+                await page.getByRole("button", { name: "Can't confirm?" }).click();
 
                 // Finally we actually continue
                 await page.getByRole("button", { name: "Continue" }).click();
diff --git a/playwright/e2e/login/login.spec.ts b/playwright/e2e/login/login.spec.ts
new file mode 100644
index 0000000000..56025d9405
--- /dev/null
+++ b/playwright/e2e/login/login.spec.ts
@@ -0,0 +1,30 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { expect, test } from "../../element-web-test";
+import { logIntoElement } from "../crypto/utils.ts";
+
+test.describe(`With force_verification: true`, () => {
+    test.use({
+        config: {
+            force_verification: true,
+        },
+    });
+
+    test("Can reload after login", async ({ page, credentials }) => {
+        // The page should reload fine when going to the base client URL
+        // Regression test for https://github.com/element-hq/element-web/issues/31203
+        await logIntoElement(page, credentials);
+
+        // We should auto-upload the E2EE keys, and show a welcome page
+        await expect(page.getByRole("heading", { name: `Welcome ${credentials.displayName}` })).toBeVisible();
+
+        await page.goto("/");
+
+        await expect(page.getByRole("heading", { name: `Welcome ${credentials.displayName}` })).toBeVisible();
+    });
+});
diff --git a/playwright/e2e/login/utils.ts b/playwright/e2e/login/utils.ts
index d74300908a..e9ff05bb69 100644
--- a/playwright/e2e/login/utils.ts
+++ b/playwright/e2e/login/utils.ts
@@ -51,6 +51,7 @@ export async function doTokenRegistration(
     await expect(page.getByRole("heading", { name: "Welcome Alice", exact: true })).toBeVisible();
 
     return page.evaluate(() => ({
+        homeserverBaseUrl: window.mxMatrixClientPeg.get().getHomeserverUrl(),
         accessToken: window.mxMatrixClientPeg.get().getAccessToken(),
         userId: window.mxMatrixClientPeg.get().getUserId(),
         deviceId: window.mxMatrixClientPeg.get().getDeviceId(),
diff --git a/playwright/e2e/messages/messages.spec.ts b/playwright/e2e/messages/messages.spec.ts
index f430d6b18b..a5ea38482c 100644
--- a/playwright/e2e/messages/messages.spec.ts
+++ b/playwright/e2e/messages/messages.spec.ts
@@ -13,7 +13,7 @@ import { type Locator, type Page } from "@playwright/test";
 import { test, expect } from "../../element-web-test";
 
 async function sendMessage(page: Page, message: string): Promise<Locator> {
-    await page.getByRole("textbox", { name: "Send a message…" }).fill(message);
+    await page.getByRole("textbox", { name: "Send an unencrypted message…" }).fill(message);
     await page.getByRole("button", { name: "Send message" }).click();
 
     const msgTile = page.locator(".mx_EventTile_last");
@@ -22,7 +22,7 @@ async function sendMessage(page: Page, message: string): Promise<Locator> {
 }
 
 async function sendMultilineMessages(page: Page, messages: string[]) {
-    await page.getByRole("textbox", { name: "Send a message…" }).focus();
+    await page.getByRole("textbox", { name: "Send an unencrypted message…" }).focus();
     for (let i = 0; i < messages.length; i++) {
         await page.keyboard.type(messages[i]);
         if (i < messages.length - 1) await page.keyboard.press("Shift+Enter");
@@ -40,7 +40,7 @@ async function replyMessage(page: Page, message: Locator, replyMessage: string):
     await line.hover();
     await line.getByRole("button", { name: "Reply", exact: true }).click();
 
-    await page.getByRole("textbox", { name: "Send a reply…" }).fill(replyMessage);
+    await page.getByRole("textbox", { name: "Send an unencrypted reply…" }).fill(replyMessage);
     await page.getByRole("button", { name: "Send message" }).click();
 
     const msgTile = page.locator(".mx_EventTile_last");
@@ -59,9 +59,11 @@ async function editMessage(page: Page, message: Locator, newMsg: string): Promis
 }
 
 const screenshotOptions = (page?: Page) => ({
-    mask: page ? [page.locator(".mx_MessageTimestamp")] : undefined,
     // Hide the jump to bottom button in the timeline to avoid flakiness
     css: `
+        .mx_MessageTimestamp {
+            visibility: hidden;
+        }
         .mx_JumpToBottomButton {
             display: none !important;
         }
diff --git a/playwright/e2e/mobile-guide/mobile-guide.spec.ts b/playwright/e2e/mobile-guide/mobile-guide.spec.ts
new file mode 100644
index 0000000000..ff2ad69bf8
--- /dev/null
+++ b/playwright/e2e/mobile-guide/mobile-guide.spec.ts
@@ -0,0 +1,36 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { test, expect } from "../../element-web-test";
+import { MobileAppVariant } from "../../../src/vector/mobile_guide/mobile-apps";
+
+const variants = [MobileAppVariant.Classic, MobileAppVariant.X, MobileAppVariant.Pro];
+
+test.describe("Mobile Guide Screenshots", { tag: "@screenshot" }, () => {
+    for (const variant of variants) {
+        test.describe(`for variant ${variant}`, () => {
+            test.use({
+                config: {
+                    default_server_config: {
+                        "m.homeserver": {
+                            base_url: "https://matrix.server.invalid",
+                            server_name: "server.invalid",
+                        },
+                    },
+                    mobile_guide_app_variant: variant,
+                },
+                viewport: { width: 390, height: 844 }, // iPhone 16e
+            });
+
+            test("should match the mobile_guide screenshot", async ({ page, axe }) => {
+                await page.goto("/mobile_guide/");
+                await expect(page).toMatchScreenshot(`mobile-guide-${variant}.png`);
+                await expect(axe).toHaveNoViolations();
+            });
+        });
+    }
+});
diff --git a/playwright/e2e/modules/custom-component.spec.ts b/playwright/e2e/modules/custom-component.spec.ts
new file mode 100644
index 0000000000..d8f4d4646d
--- /dev/null
+++ b/playwright/e2e/modules/custom-component.spec.ts
@@ -0,0 +1,162 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type Page } from "@playwright/test";
+import fs from "node:fs";
+
+import { test, expect } from "../../element-web-test";
+
+const screenshotOptions = (page: Page) => ({
+    // Hide the jump to bottom button in the timeline to avoid flakiness
+    // Exclude timestamp and read marker from snapshot
+    css: `
+        .mx_MessageTimestamp {
+            visibility: hidden;
+        }
+        .mx_JumpToBottomButton {
+            display: none !important;
+        }
+        .mx_TopUnreadMessagesBar, .mx_MessagePanel_myReadMarker {
+            display: none !important;
+        }
+    `,
+});
+
+const IMAGE_FILE = fs.readFileSync("playwright/sample-files/element.png");
+
+test.describe("Custom Component API", () => {
+    test.use({
+        displayName: "Manny",
+        config: {
+            modules: ["/modules/custom-component-module.js"],
+        },
+        page: async ({ page }, use) => {
+            await page.route("/modules/custom-component-module.js", async (route) => {
+                await route.fulfill({ path: "playwright/sample-files/custom-component-module.js" });
+            });
+            await use(page);
+        },
+        room: async ({ page, app, user, bot }, use) => {
+            const roomId = await app.client.createRoom({ name: "TestRoom" });
+            await use({ roomId });
+        },
+    });
+    test.describe("basic functionality", () => {
+        test(
+            "should replace the render method of a textual event",
+            { tag: "@screenshot" },
+            async ({ page, room, app }) => {
+                await app.viewRoomById(room.roomId);
+                await app.client.sendMessage(room.roomId, "Simple message");
+                await expect(await page.locator(".mx_EventTile_last")).toMatchScreenshot(
+                    "custom-component-tile.png",
+                    screenshotOptions(page),
+                );
+            },
+        );
+        test(
+            "should fall through if one module does not render a component",
+            { tag: "@screenshot" },
+            async ({ page, room, app }) => {
+                await app.viewRoomById(room.roomId);
+                await app.client.sendMessage(room.roomId, "Fall through here");
+                await expect(await page.locator(".mx_EventTile_last")).toMatchScreenshot(
+                    "custom-component-tile-fall-through.png",
+                    screenshotOptions(page),
+                );
+            },
+        );
+        test(
+            "should render the original content of a textual event conditionally",
+            { tag: "@screenshot" },
+            async ({ page, room, app }) => {
+                await app.viewRoomById(room.roomId);
+                await app.client.sendMessage(room.roomId, "Do not replace me");
+                await expect(await page.locator(".mx_EventTile_last")).toMatchScreenshot(
+                    "custom-component-tile-original.png",
+                    screenshotOptions(page),
+                );
+            },
+        );
+        test("should disallow editing when the allowEditingEvent hint is set to false", async ({ page, room, app }) => {
+            await app.viewRoomById(room.roomId);
+            await app.client.sendMessage(room.roomId, "Do not show edits");
+            await page.getByText("Do not show edits").hover();
+            await expect(
+                await page.getByRole("toolbar", { name: "Message Actions" }).getByRole("button", { name: "Edit" }),
+            ).not.toBeVisible();
+        });
+        test("should disallow downloading media when the allowDownloading hint is set to false", async ({
+            page,
+            room,
+            app,
+        }) => {
+            await app.viewRoomById(room.roomId);
+            await app.viewRoomById(room.roomId);
+            const upload = await app.client.uploadContent(IMAGE_FILE, { name: "bad.png", type: "image/png" });
+            await app.client.sendEvent(room.roomId, null, "m.room.message", {
+                msgtype: "m.image",
+                body: "bad.png",
+                url: upload.content_uri,
+            });
+
+            await app.timeline.scrollToBottom();
+            const imgTile = page.locator(".mx_MImageBody").first();
+            await expect(imgTile).toBeVisible();
+            await imgTile.hover();
+            await expect(page.getByRole("button", { name: "Download" })).not.toBeVisible();
+            await imgTile.click();
+            await expect(page.getByLabel("Image view").getByLabel("Download")).not.toBeVisible();
+        });
+        test("should allow downloading media when the allowDownloading hint is set to true", async ({
+            page,
+            room,
+            app,
+        }) => {
+            await app.viewRoomById(room.roomId);
+            await app.viewRoomById(room.roomId);
+            const upload = await app.client.uploadContent(IMAGE_FILE, { name: "good.png", type: "image/png" });
+            await app.client.sendEvent(room.roomId, null, "m.room.message", {
+                msgtype: "m.image",
+                body: "good.png",
+                url: upload.content_uri,
+            });
+
+            await app.timeline.scrollToBottom();
+            const imgTile = page.locator(".mx_MImageBody").first();
+            await expect(imgTile).toBeVisible();
+            await imgTile.hover();
+            await expect(page.getByRole("button", { name: "Download" })).toBeVisible();
+            await imgTile.click();
+            await expect(page.getByLabel("Image view").getByLabel("Download")).toBeVisible();
+        });
+        test(
+            "should render the next registered component if the filter function throws",
+            { tag: "@screenshot" },
+            async ({ page, room, app }) => {
+                await app.viewRoomById(room.roomId);
+                await app.client.sendMessage(room.roomId, "Crash the filter!");
+                await expect(await page.locator(".mx_EventTile_last")).toMatchScreenshot(
+                    "custom-component-crash-handle-filter.png",
+                    screenshotOptions(page),
+                );
+            },
+        );
+        test(
+            "should render original component if the render function throws",
+            { tag: "@screenshot" },
+            async ({ page, room, app }) => {
+                await app.viewRoomById(room.roomId);
+                await app.client.sendMessage(room.roomId, "Crash the renderer!");
+                await expect(await page.locator(".mx_EventTile_last")).toMatchScreenshot(
+                    "custom-component-crash-handle-renderer.png",
+                    screenshotOptions(page),
+                );
+            },
+        );
+    });
+});
diff --git a/playwright/e2e/oidc/index.ts b/playwright/e2e/oidc/index.ts
index 02de6e2f03..50aa2de8d5 100644
--- a/playwright/e2e/oidc/index.ts
+++ b/playwright/e2e/oidc/index.ts
@@ -11,6 +11,9 @@ import { type Page } from "@playwright/test";
 
 import { expect } from "../../element-web-test";
 
+/**
+ * Click through registering a new user in the MAS UI.
+ */
 export async function registerAccountMas(
     page: Page,
     mailpit: MailpitClient,
@@ -39,6 +42,20 @@ export async function registerAccountMas(
     await page.getByRole("button", { name: "Continue" }).click();
     await page.getByRole("textbox", { name: "Display Name" }).fill(username);
     await page.getByRole("button", { name: "Continue" }).click();
-    await expect(page.getByText("Allow access to your account?")).toBeVisible();
+    await expect(page.getByText("Continue to Element?")).toBeVisible();
+    await page.getByRole("button", { name: "Continue" }).click();
+}
+
+/**
+ * Click through entering username and password into the MAS login prompt.
+ */
+export async function logInAccountMas(page: Page, username: string, password: string): Promise<void> {
+    await expect(page.getByText("Please sign in to continue:")).toBeVisible();
+
+    await page.getByRole("textbox", { name: "Username" }).fill(username);
+    await page.getByRole("textbox", { name: "Password", exact: true }).fill(password);
+    await page.getByRole("button", { name: "Continue" }).click();
+
+    await expect(page.getByText("Continue to Element?")).toBeVisible();
     await page.getByRole("button", { name: "Continue" }).click();
 }
diff --git a/playwright/e2e/oidc/oidc-native.spec.ts b/playwright/e2e/oidc/oidc-native.spec.ts
index e985e58d09..3d80c7d56f 100644
--- a/playwright/e2e/oidc/oidc-native.spec.ts
+++ b/playwright/e2e/oidc/oidc-native.spec.ts
@@ -6,8 +6,13 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
+import { type Config } from "@element-hq/element-web-playwright-common";
+import { type Browser, type Page } from "@playwright/test";
+import { type StartedHomeserverContainer } from "@element-hq/element-web-playwright-common/lib/testcontainers/HomeserverContainer";
+import { routeConfigJson } from "@element-hq/element-web-playwright-common";
+
 import { test, expect } from "../../element-web-test.ts";
-import { registerAccountMas } from ".";
+import { logInAccountMas, registerAccountMas } from ".";
 import { ElementAppPage } from "../../pages/ElementAppPage.ts";
 import { masHomeserver } from "../../plugins/homeserver/synapse/masHomeserver.ts";
 
@@ -33,7 +38,7 @@ test.describe("OIDC Native", { tag: ["@no-firefox", "@no-webkit"] }, () => {
         await page.getByRole("button", { name: "Continue" }).click();
 
         const userId = `alice_${testInfo.testId}`;
-        await registerAccountMas(page, mailpitClient, userId, "alice@email.com", "Pa$sW0rD!");
+        await registerAccountMas(page, mailpitClient, userId, `${userId}@email.com`, "Pa$sW0rD!");
 
         // Eventually, we should end up at the home screen.
         await expect(page).toHaveURL(/\/#\/home$/, { timeout: 10000 });
@@ -55,7 +60,7 @@ test.describe("OIDC Native", { tag: ["@no-firefox", "@no-webkit"] }, () => {
         const newPage = await newPagePromise;
         await newPage.getByText("Devices").click();
         await newPage.getByText(deviceId).click();
-        await expect(newPage.getByText("Element")).toBeVisible();
+        await expect(newPage.getByText("Element", { exact: true })).toBeVisible();
         await expect(newPage.getByText("http://localhost:8080/")).toBeVisible();
         await expect(newPage).toHaveURL(/\/oauth2_session/);
         await newPage.close();
@@ -77,13 +82,13 @@ test.describe("OIDC Native", { tag: ["@no-firefox", "@no-webkit"] }, () => {
     test(
         "it should log out the user & wipe data when logging out via MAS",
         { tag: "@screenshot" },
-        async ({ mas, page, mailpitClient }, testInfo) => {
+        async ({ mas, page, mailpitClient, homeserver }, testInfo) => {
             // We use this over the `user` fixture to ensure we get an OIDC session rather than a compatibility one
             await page.goto("/#/login");
             await page.getByRole("button", { name: "Continue" }).click();
 
             const userId = `alice_${testInfo.testId}`;
-            await registerAccountMas(page, mailpitClient, userId, "alice@email.com", "Pa$sW0rD!");
+            await registerAccountMas(page, mailpitClient, userId, `${userId}@email.com`, "Pa$sW0rD!");
 
             await expect(page.getByText("Welcome")).toBeVisible();
             await page.goto("about:blank");
@@ -95,10 +100,149 @@ test.describe("OIDC Native", { tag: ["@no-firefox", "@no-webkit"] }, () => {
             await expect(
                 page.getByText("For security, this session has been signed out. Please sign in again."),
             ).toBeVisible();
-            await expect(page).toMatchScreenshot("token-expired.png", { includeDialogBackground: true });
+            //await expect(page).toMatchScreenshot("token-expired.png", { includeDialogBackground: true });
 
             const localStorageKeys = await page.evaluate(() => Object.keys(localStorage));
             expect(localStorageKeys).toHaveLength(0);
         },
     );
+
+    test("can log in to an existing MAS account", { tag: "@screenshot" }, async ({ page, mailpitClient }, testInfo) => {
+        // Register an account with MAS
+        await page.goto("/#/login");
+        await page.getByRole("button", { name: "Continue" }).click();
+
+        const userId = `alice_${testInfo.testId}`;
+        await registerAccountMas(page, mailpitClient, userId, `${userId}@email.com`, "Pa$sW0rD!");
+        await expect(page.getByText("Welcome")).toBeVisible();
+
+        // Log out
+        await page.getByRole("button", { name: "User menu" }).click();
+        await expect(page.getByText(userId, { exact: true })).toBeVisible();
+
+        // Allow the outstanding requests queue to settle before logging out
+        await page.waitForTimeout(2000);
+        await page.locator(".mx_UserMenu_contextMenu").getByRole("menuitem", { name: "Sign out" }).click();
+        await expect(page).toHaveURL(/\/#\/login$/);
+
+        // Log in again
+        await page.goto("/#/login");
+        await page.getByRole("button", { name: "Continue" }).click();
+        await page.getByRole("button", { name: "Continue" }).click();
+
+        // We should be in
+        await expect(page.getByText("Confirm your identity")).toBeVisible();
+    });
+
+    test.describe("with force_verification on", () => {
+        test.use({
+            config: {
+                force_verification: true,
+            },
+        });
+
+        test("verify dialog cannot be dismissed", { tag: "@screenshot" }, async ({ page, mailpitClient }, testInfo) => {
+            // Register an account with MAS
+            await page.goto("/#/login");
+            await page.getByRole("button", { name: "Continue" }).click();
+
+            const userId = `alice_${testInfo.testId}`;
+            await registerAccountMas(page, mailpitClient, userId, `${userId}@email.com`, "Pa$sW0rD!");
+            await expect(page.getByText("Welcome")).toBeVisible();
+
+            // Log out
+            await page.getByRole("button", { name: "User menu" }).click();
+            await expect(page.getByText(userId, { exact: true })).toBeVisible();
+            await page.waitForTimeout(2000);
+            await page.locator(".mx_UserMenu_contextMenu").getByRole("menuitem", { name: "Sign out" }).click();
+            await expect(page).toHaveURL(/\/#\/login$/);
+
+            // Log in again
+            await page.goto("/#/login");
+            await page.getByRole("button", { name: "Continue" }).click();
+            await page.getByRole("button", { name: "Continue" }).click();
+
+            // We should be being warned that we need to verify (but we can't)
+            await expect(page.getByText("Confirm your identity")).toBeVisible();
+
+            // And there should be no way to close this prompt
+            await expect(page.getByRole("button", { name: "Skip verification for now" })).not.toBeVisible();
+        });
+
+        test(
+            "continues to show verification prompt after cancelling device verification",
+            { tag: "@screenshot" },
+            async ({ browser, config, homeserver, page, mailpitClient }, testInfo) => {
+                // Register an account with MAS
+                await page.goto("/#/login");
+                await page.getByRole("button", { name: "Continue" }).click();
+
+                const userId = `alice_${testInfo.testId}`;
+                const password = "Pa$sW0rD!";
+                await registerAccountMas(page, mailpitClient, userId, `${userId}@email.com`, password);
+                await expect(page.getByText("Welcome")).toBeVisible();
+
+                // Log in an additional account, and verify it.
+                //
+                // This means that when we log out and in again, we are offered
+                // to verify using another device.
+                const otherContext = await newContext(browser, config, homeserver);
+                const otherDevicePage = await otherContext.newPage();
+                await otherDevicePage.goto("/#/login");
+                await otherDevicePage.getByRole("button", { name: "Continue" }).click();
+                await logInAccountMas(otherDevicePage, userId, password);
+                await verifyUsingOtherDevice(otherDevicePage, page);
+                await otherDevicePage.close();
+
+                // Log out
+                await page.getByRole("button", { name: "User menu" }).click();
+                await expect(page.getByText(userId, { exact: true })).toBeVisible();
+                await page.waitForTimeout(2000);
+                await page.locator(".mx_UserMenu_contextMenu").getByRole("menuitem", { name: "Sign out" }).click();
+                await expect(page).toHaveURL(/\/#\/login$/);
+
+                // Log in again
+                await page.goto("/#/login");
+                await page.getByRole("button", { name: "Continue" }).click();
+                await page.getByRole("button", { name: "Continue" }).click();
+
+                // We should be in, and not able to dismiss the verify dialog
+                await expect(page.getByText("Verify this device")).toBeVisible();
+                await expect(page.getByRole("button", { name: "Skip verification for now" })).not.toBeVisible();
+
+                // When we start verifying with another device
+                await page.getByRole("button", { name: "Use another device" }).click();
+
+                // And then cancel it
+                await page.getByRole("button", { name: "Close dialog" }).click();
+
+                // Then we should still be at the unskippable verify prompt
+                await expect(page.getByText("Verify this device")).toBeVisible();
+                await expect(page.getByRole("button", { name: "Skip verification for now" })).not.toBeVisible();
+            },
+        );
+    });
 });
+
+/**
+ * Perform interactive emoji verification for a new device.
+ */
+async function verifyUsingOtherDevice(deviceToVerifyPage: Page, alreadyVerifiedDevicePage: Page) {
+    await deviceToVerifyPage.getByRole("button", { name: "Use another device" }).click();
+    await alreadyVerifiedDevicePage.getByRole("button", { name: "Start verification" }).click();
+    await alreadyVerifiedDevicePage.getByRole("button", { name: "Start" }).click();
+    await alreadyVerifiedDevicePage.getByRole("button", { name: "They match" }).click();
+    await deviceToVerifyPage.getByRole("button", { name: "They match" }).click();
+    await alreadyVerifiedDevicePage.getByRole("button", { name: "Got it" }).click();
+    await deviceToVerifyPage.getByRole("button", { name: "Got it" }).click();
+}
+
+/**
+ * Create a new browser context which serves up the default config plus what you supplied, and sets m.homeserver to the
+ * supplied homeserver's URL.
+ */
+async function newContext(browser: Browser, config: Partial<Partial<Config>>, homeserver: StartedHomeserverContainer) {
+    const otherContext = await browser.newContext();
+    await routeConfigJson(otherContext, homeserver.baseUrl, config);
+    return otherContext;
+}
diff --git a/playwright/e2e/permalinks/permalinks.spec.ts b/playwright/e2e/permalinks/permalinks.spec.ts
index e7657b1394..cd1aa5c42e 100644
--- a/playwright/e2e/permalinks/permalinks.spec.ts
+++ b/playwright/e2e/permalinks/permalinks.spec.ts
@@ -93,10 +93,60 @@ test.describe("permalinks", () => {
         getPill(timeline, danielleId);
 
         await expect(timeline).toMatchScreenshot("permalink-rendering.png", {
-            mask: [
-                // Exclude timestamps from the snapshot, for consistency.
-                page.locator(".mx_MessageTimestamp"),
-            ],
+            // Exclude timestamps from the snapshot, for consistency.
+            css: `
+                .mx_MessageTimestamp {
+                    visibility: hidden;
+                }
+            `,
         });
     });
 });
+
+test.describe("triple-click message selection", () => {
+    test.use({
+        displayName: "Alice",
+    });
+
+    test("should select entire message line when triple-clicking on message with pills", async ({
+        page,
+        app,
+        user,
+        bot,
+    }) => {
+        await bot.prepareClient();
+
+        const roomId = await app.client.createRoom({ name: "Test Room" });
+        await app.client.inviteUser(roomId, bot.credentials.userId);
+        await app.viewRoomByName("Test Room");
+
+        // Send a message with user and room pills
+        await app.client.sendMessage(
+            roomId,
+            `Testing triple-click message selection. ` +
+                `User: ${permalinkPrefix}${bot.credentials.userId}, ` +
+                `Room: ${permalinkPrefix}${roomId}, ` +
+                `Message: ${permalinkPrefix}${roomId}/$dummy-event, ` +
+                `and @room mention.`,
+        );
+
+        const timeline = page.locator(".mx_RoomView_timeline");
+        const messageTile = timeline.locator(".mx_EventTile").last();
+
+        // Triple-click on the message body to select its entire content
+        const messageBody = messageTile.locator(".mx_EventTile_body");
+        await messageBody.click({ clickCount: 3 });
+
+        // Get the expected text content of the message, including pills
+        const expectedText = await messageBody.innerText();
+
+        // Get the currently selected text from the page
+        const selectedText = await page.evaluate(() => {
+            const selection = window.getSelection();
+            return selection ? selection.toString().trim() : "";
+        });
+
+        // Verify that the selected text exactly matches the message content
+        expect(selectedText).toBe(expectedText);
+    });
+});
diff --git a/playwright/e2e/pinned-messages/index.ts b/playwright/e2e/pinned-messages/index.ts
index 198ab24118..793dc1b45e 100644
--- a/playwright/e2e/pinned-messages/index.ts
+++ b/playwright/e2e/pinned-messages/index.ts
@@ -29,6 +29,7 @@ export const test = base.extend<{
     room1Name: "Room 1",
     room1: async ({ room1Name: name, app, user, bot }, use) => {
         const roomId = await app.client.createRoom({ name, invite: [bot.credentials.userId] });
+        await bot.awaitRoomMembership(roomId);
         await use({ name, roomId });
     },
 
diff --git a/playwright/e2e/polls/polls.spec.ts b/playwright/e2e/polls/polls.spec.ts
index fc49906b47..f10b46f209 100644
--- a/playwright/e2e/polls/polls.spec.ts
+++ b/playwright/e2e/polls/polls.spec.ts
@@ -121,7 +121,11 @@ test.describe("Polls", () => {
             .filter({ hasText: pollParams.title })
             .getAttribute("data-scroll-tokens");
         await expect(getPollTile(page, pollId)).toMatchScreenshot("Polls_Timeline_tile_no_votes.png", {
-            mask: [page.locator(".mx_MessageTimestamp")],
+            css: `
+                .mx_MessageTimestamp {
+                    visibility: hidden;
+                }
+            `,
         });
 
         // Bot votes 'Maybe' in the poll
@@ -293,7 +297,11 @@ test.describe("Polls", () => {
             await expect(page.locator(".mx_ThreadView")).toMatchScreenshot(
                 "ThreadView_with_a_poll_on_bubble_layout.png",
                 {
-                    mask: [page.locator(".mx_MessageTimestamp")],
+                    css: `
+                        .mx_MessageTimestamp {
+                            visibility: hidden;
+                        }
+                    `,
                 },
             );
 
@@ -303,7 +311,11 @@ test.describe("Polls", () => {
             await expect(page.locator(".mx_ThreadView")).toMatchScreenshot(
                 "ThreadView_with_a_poll_on_group_layout.png",
                 {
-                    mask: [page.locator(".mx_MessageTimestamp")],
+                    css: `
+                        .mx_MessageTimestamp {
+                            visibility: hidden;
+                        }
+                    `,
                 },
             );
 
diff --git a/playwright/e2e/read-receipts/index.ts b/playwright/e2e/read-receipts/index.ts
index 067d3d16d2..bd04be36a8 100644
--- a/playwright/e2e/read-receipts/index.ts
+++ b/playwright/e2e/read-receipts/index.ts
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import type { JSHandle, Page } from "@playwright/test";
+import type { JSHandle, Locator, Page } from "@playwright/test";
 import type { MatrixEvent, Room, IndexedDBStore, ReceiptType } from "matrix-js-sdk/src/matrix";
 import { test as base, expect } from "../../element-web-test";
 import { type Bot } from "../../pages/bot";
@@ -36,11 +36,13 @@ export const test = base.extend<{
     roomAlphaName: "Room Alpha",
     roomAlpha: async ({ roomAlphaName: name, app, user, bot }, use) => {
         const roomId = await app.client.createRoom({ name, invite: [bot.credentials.userId] });
+        await bot.awaitRoomMembership(roomId);
         await use({ name, roomId });
     },
     roomBetaName: "Room Beta",
     roomBeta: async ({ roomBetaName: name, app, user, bot }, use) => {
         const roomId = await app.client.createRoom({ name, invite: [bot.credentials.userId] });
+        await bot.awaitRoomMembership(roomId);
         await use({ name, roomId });
     },
     msg: async ({ page, app, util }, use) => {
@@ -428,7 +430,7 @@ class Helpers {
     }
 
     getRoomListTile(label: string) {
-        return this.page.getByRole("treeitem", { name: new RegExp("^" + label) });
+        return this.page.getByRole("option", { name: new RegExp("^Open room " + label) });
     }
 
     /**
@@ -446,8 +448,8 @@ class Helpers {
      */
     async assertRead(room: RoomRef) {
         const tile = this.getRoomListTile(room.name);
-        await expect(tile.locator(".mx_NotificationBadge_dot")).not.toBeVisible();
-        await expect(tile.locator(".mx_NotificationBadge_count")).not.toBeVisible();
+        await expect(tile.getByTestId("notification-decoration")).not.toBeVisible();
+        await expect(tile).not.toHaveAccessibleName(/with \d* unread message/);
     }
 
     /**
@@ -463,15 +465,18 @@ class Helpers {
     /**
      * Assert a given room is marked as unread (via the room list tile)
      * @param room - the name of the room to check
-     * @param count - the numeric count to assert, or if "." specified then a bold/dot (no count) state is asserted
+     * @param count - the numeric count to assert
      */
-    async assertUnread(room: RoomRef, count: number | ".") {
+    async assertUnread(room: RoomRef, count: number) {
         const tile = this.getRoomListTile(room.name);
-        if (count === ".") {
-            await expect(tile.locator(".mx_NotificationBadge_dot")).toBeVisible();
-        } else {
-            await expect(tile.locator(".mx_NotificationBadge_count")).toHaveText(count.toString());
-        }
+        await expect(tile).toBeVisible();
+        await expect(tile).toHaveAccessibleName(/with \d* unread message/);
+    }
+
+    async unreadCountForRoomTile(tile: Locator): Promise<number> {
+        const accessibleName = await tile.getAttribute("aria-label");
+        const match = accessibleName?.match(/(\d+)\s+unread message/);
+        return match ? parseInt(match[1], 10) : 0;
     }
 
     /**
@@ -487,7 +492,7 @@ class Helpers {
         // .toBeLessThan doesn't have a retry mechanism, so we use .poll
         await expect
             .poll(async () => {
-                return parseInt(await tile.locator(".mx_NotificationBadge_count").textContent(), 10);
+                return this.unreadCountForRoomTile(tile);
             })
             .toBeLessThan(lessThan);
     }
@@ -505,7 +510,7 @@ class Helpers {
         // .toBeGreaterThan doesn't have a retry mechanism, so we use .poll
         await expect
             .poll(async () => {
-                return parseInt(await tile.locator(".mx_NotificationBadge_count").textContent(), 10);
+                return this.unreadCountForRoomTile(tile);
             })
             .toBeGreaterThan(greaterThan);
     }
@@ -596,24 +601,15 @@ class Helpers {
         await button.click();
     }
 
-    /**
-     * Toggle the `Show rooms with unread messages first` option for the room list
-     */
-    async toggleRoomUnreadOrder() {
-        await this.toggleRoomListMenu();
-        await this.page.getByText("Show rooms with unread messages first").click();
-        // Close contextual menu
-        await this.page.locator(".mx_ContextualMenu_background").click();
-    }
-
     /**
      * Assert that the room list is ordered as expected
      * @param rooms
      */
     async assertRoomListOrder(rooms: Array<{ name: string }>) {
-        const roomList = this.page.locator(".mx_RoomTile_title");
+        const roomListContainer = this.page.getByTestId("room-list");
+        const roomTiles = roomListContainer.getByRole("option");
         for (const [i, room] of rooms.entries()) {
-            await expect(roomList.nth(i)).toHaveText(room.name);
+            await expect(roomTiles.nth(i)).toHaveAccessibleName(new RegExp(`${room.name}`));
         }
     }
 }
diff --git a/playwright/e2e/read-receipts/message-ordering.spec.ts b/playwright/e2e/read-receipts/message-ordering.spec.ts
index 59a56e6c50..5f4c994fda 100644
--- a/playwright/e2e/read-receipts/message-ordering.spec.ts
+++ b/playwright/e2e/read-receipts/message-ordering.spec.ts
@@ -13,72 +13,30 @@ import { test } from ".";
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
     test.describe("Message ordering", () => {
         test.describe("in the main timeline", () => {
-            test.fixme(
-                "A receipt for the last event in sync order (even with wrong ts) marks a room as read",
-                () => {},
-            );
-            test.fixme(
-                "A receipt for a non-last event in sync order (even when ts makes it last) leaves room unread",
-                () => {},
-            );
+            test.fixme("A receipt for the last event in sync order (even with wrong ts) marks a room as read", () => {});
+            test.fixme("A receipt for a non-last event in sync order (even when ts makes it last) leaves room unread", () => {});
         });
 
         test.describe("in threads", () => {
             // These don't pass yet - we need MSC4033 - we don't even know the Sync order yet
-            test.fixme(
-                "A receipt for the last event in sync order (even with wrong ts) marks a thread as read",
-                () => {},
-            );
-            test.fixme(
-                "A receipt for a non-last event in sync order (even when ts makes it last) leaves thread unread",
-                () => {},
-            );
+            test.fixme("A receipt for the last event in sync order (even with wrong ts) marks a thread as read", () => {});
+            test.fixme("A receipt for a non-last event in sync order (even when ts makes it last) leaves thread unread", () => {});
 
             // These pass now and should not later - we should use order from MSC4033 instead of ts
             // These are broken out
-            test.fixme(
-                "A receipt for last threaded event in ts order (even when it was received non-last) marks a thread as read",
-                () => {},
-            );
-            test.fixme(
-                "A receipt for non-last threaded event in ts order (even when it was received last) leaves thread unread",
-                () => {},
-            );
-            test.fixme(
-                "A receipt for last threaded edit in ts order (even when it was received non-last) marks a thread as read",
-                () => {},
-            );
-            test.fixme(
-                "A receipt for non-last threaded edit in ts order (even when it was received last) leaves thread unread",
-                () => {},
-            );
-            test.fixme(
-                "A receipt for last threaded reaction in ts order (even when it was received non-last) marks a thread as read",
-                () => {},
-            );
-            test.fixme(
-                "A receipt for non-last threaded reaction in ts order (even when it was received last) leaves thread unread",
-                () => {},
-            );
+            test.fixme("A receipt for last threaded event in ts order (even when it was received non-last) marks a thread as read", () => {});
+            test.fixme("A receipt for non-last threaded event in ts order (even when it was received last) leaves thread unread", () => {});
+            test.fixme("A receipt for last threaded edit in ts order (even when it was received non-last) marks a thread as read", () => {});
+            test.fixme("A receipt for non-last threaded edit in ts order (even when it was received last) leaves thread unread", () => {});
+            test.fixme("A receipt for last threaded reaction in ts order (even when it was received non-last) marks a thread as read", () => {});
+            test.fixme("A receipt for non-last threaded reaction in ts order (even when it was received last) leaves thread unread", () => {});
         });
 
         test.describe("thread roots", () => {
-            test.fixme(
-                "A receipt for last reaction to thread root in sync order (even when ts makes it last) marks room as read",
-                () => {},
-            );
-            test.fixme(
-                "A receipt for non-last reaction to thread root in sync order (even when ts makes it last) leaves room unread",
-                () => {},
-            );
-            test.fixme(
-                "A receipt for last edit to thread root in sync order (even when ts makes it last) marks room as read",
-                () => {},
-            );
-            test.fixme(
-                "A receipt for non-last edit to thread root in sync order (even when ts makes it last) leaves room unread",
-                () => {},
-            );
+            test.fixme("A receipt for last reaction to thread root in sync order (even when ts makes it last) marks room as read", () => {});
+            test.fixme("A receipt for non-last reaction to thread root in sync order (even when ts makes it last) leaves room unread", () => {});
+            test.fixme("A receipt for last edit to thread root in sync order (even when ts makes it last) marks room as read", () => {});
+            test.fixme("A receipt for non-last edit to thread root in sync order (even when ts makes it last) leaves room unread", () => {});
         });
     });
 });
diff --git a/playwright/e2e/read-receipts/missing-referents.spec.ts b/playwright/e2e/read-receipts/missing-referents.spec.ts
index a953aae448..baa5e907f5 100644
--- a/playwright/e2e/read-receipts/missing-referents.spec.ts
+++ b/playwright/e2e/read-receipts/missing-referents.spec.ts
@@ -12,18 +12,20 @@ import { test } from ".";
 
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
     test.describe("messages with missing referents", () => {
-        test.fixme(
-            "A message in an unknown thread is not visible and the room is read",
-            async ({ roomAlpha: room1, roomBeta: room2, util, msg }) => {
-                // Given a thread existed and the room is read
-                await util.goTo(room1);
-                await util.receiveMessages(room2, ["Root1", msg.threadedOff("Root1", "T1a")]);
+        test.fixme("A message in an unknown thread is not visible and the room is read", async ({
+            roomAlpha: room1,
+            roomBeta: room2,
+            util,
+            msg,
+        }) => {
+            // Given a thread existed and the room is read
+            await util.goTo(room1);
+            await util.receiveMessages(room2, ["Root1", msg.threadedOff("Root1", "T1a")]);
 
-                // When I restart, forgetting the thread root
-                // And I receive a message on that thread
-                // Then the message is invisible and the room remains read
-            },
-        );
+            // When I restart, forgetting the thread root
+            // And I receive a message on that thread
+            // Then the message is invisible and the room remains read
+        });
         test.fixme("When a message's thread root appears later the thread appears and the room is unread", () => {});
         test.fixme("An edit of an unknown message is not visible and the room is read", () => {});
         test.fixme("When an edit's message appears later the edited version appears and the room is unread", () => {});
diff --git a/playwright/e2e/read-receipts/notifications.spec.ts b/playwright/e2e/read-receipts/notifications.spec.ts
index 93f5515eeb..7013d49141 100644
--- a/playwright/e2e/read-receipts/notifications.spec.ts
+++ b/playwright/e2e/read-receipts/notifications.spec.ts
@@ -14,14 +14,8 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
     test.describe("Notifications", () => {
         test.describe("in the main timeline", () => {
             test.fixme("A new message that mentions me shows a notification", () => {});
-            test.fixme(
-                "Reading a notifying message reduces the notification count in the room list, space and tab",
-                () => {},
-            );
-            test.fixme(
-                "Reading the last notifying message removes the notification marker from room list, space and tab",
-                () => {},
-            );
+            test.fixme("Reading a notifying message reduces the notification count in the room list, space and tab", () => {});
+            test.fixme("Reading the last notifying message removes the notification marker from room list, space and tab", () => {});
             test.fixme("Editing a message to mentions me shows a notification", () => {});
             test.fixme("Reading the last notifying edited message removes the notification marker", () => {});
             test.fixme("Redacting a notifying message removes the notification marker", () => {});
@@ -30,18 +24,9 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
         test.describe("in threads", () => {
             test.fixme("A new threaded message that mentions me shows a notification", () => {});
             test.fixme("Reading a notifying threaded message removes the notification count", () => {});
-            test.fixme(
-                "Notification count remains steady when reading threads that contain seen notifications",
-                () => {},
-            );
-            test.fixme(
-                "Notification count remains steady when paging up thread view even when threads contain seen notifications",
-                () => {},
-            );
-            test.fixme(
-                "Notification count remains steady when paging up thread view after mark as unread even if older threads contain notifications",
-                () => {},
-            );
+            test.fixme("Notification count remains steady when reading threads that contain seen notifications", () => {});
+            test.fixme("Notification count remains steady when paging up thread view even when threads contain seen notifications", () => {});
+            test.fixme("Notification count remains steady when paging up thread view after mark as unread even if older threads contain notifications", () => {});
             test.fixme("Redacting a notifying threaded message removes the notification marker", () => {});
         });
     });
diff --git a/playwright/e2e/read-receipts/read-receipts.spec.ts b/playwright/e2e/read-receipts/read-receipts.spec.ts
index 8ebce22b52..b1142bae59 100644
--- a/playwright/e2e/read-receipts/read-receipts.spec.ts
+++ b/playwright/e2e/read-receipts/read-receipts.spec.ts
@@ -112,7 +112,7 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
         const main3 = await sendMessage(bot);
 
         // (So the room starts off unread)
-        await expect(page.getByLabel(`${otherRoomName} 3 unread messages.`)).toBeVisible();
+        await expect(page.getByLabel(`${otherRoomName} with 3 unread messages.`)).toBeVisible();
 
         // When we send a threaded receipt for the last event in main
         // And an unthreaded receipt for an earlier event
@@ -147,13 +147,13 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
         await sendMessage(bot);
 
         // (The room starts off unread)
-        await expect(page.getByLabel(`${otherRoomName} 3 unread messages.`)).toBeVisible();
+        await expect(page.getByLabel(`${otherRoomName} with 3 unread messages.`)).toBeVisible();
 
         // When we send a threaded receipt for the second-last event in main
         await sendThreadedReadReceipt(app, main2);
 
         // Then the room has only one unread
-        await expect(page.getByLabel(`${otherRoomName} 1 unread message.`)).toBeVisible();
+        await expect(page.getByLabel(`${otherRoomName} with 1 unread message.`)).toBeVisible();
     });
 
     test("Considers room read if there is only a main thread and we have a main receipt", async ({
@@ -166,7 +166,7 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
         await sendMessage(bot);
         const main3 = await sendMessage(bot);
         // (The room starts off unread)
-        await expect(page.getByLabel(`${otherRoomName} 3 unread messages.`)).toBeVisible();
+        await expect(page.getByLabel(`${otherRoomName} with 3 unread messages.`)).toBeVisible();
 
         // When we send a threaded receipt for the last event in main
         await sendThreadedReadReceipt(app, main3);
@@ -186,7 +186,7 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
         const thread1a = await botSendThreadMessage(bot, main1.event_id);
         await botSendThreadMessage(bot, main1.event_id);
         // 1 unread on the main thread, 2 in the new thread that aren't shown
-        await expect(page.getByLabel(`${otherRoomName} 1 unread message.`)).toBeVisible();
+        await expect(page.getByLabel(`${otherRoomName} with 1 unread message.`)).toBeVisible();
 
         // When we send receipts for main, and the second-last in the thread
         await sendThreadedReadReceipt(app, main1);
@@ -203,7 +203,7 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
         await botSendThreadMessage(bot, main1.event_id);
         const thread1b = await botSendThreadMessage(bot, main1.event_id);
         // 1 unread on the main thread, 2 in the new thread which don't show
-        await expect(page.getByLabel(`${otherRoomName} 1 unread message.`)).toBeVisible();
+        await expect(page.getByLabel(`${otherRoomName} with 1 unread message.`)).toBeVisible();
 
         // When we send receipts for main, and the last in the thread
         await sendThreadedReadReceipt(app, main1);
@@ -226,7 +226,7 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
         const thread1a = await botSendThreadMessage(bot, main1.event_id);
         await botSendThreadMessage(bot, main1.event_id);
         // 1 unread on the main thread, 2 in the new thread which don't count
-        await expect(page.getByLabel(`${otherRoomName} 1 unread message.`)).toBeVisible();
+        await expect(page.getByLabel(`${otherRoomName} with 1 unread message.`)).toBeVisible();
 
         // When we send an unthreaded receipt for the second-last in the thread
         await sendUnthreadedReadReceipt(app, thread1a);
@@ -251,7 +251,7 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
         const thread1b = await botSendThreadMessage(bot, main1.event_id);
         await sendMessage(bot);
         // 2 unreads on the main thread, 2 in the new thread which don't count
-        await expect(page.getByLabel(`${otherRoomName} 2 unread messages.`)).toBeVisible();
+        await expect(page.getByLabel(`${otherRoomName} with 2 unread messages.`)).toBeVisible();
 
         // When we send an unthreaded receipt for the last in the thread
         await sendUnthreadedReadReceipt(app, thread1b);
@@ -259,7 +259,7 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
         // Then the room has only one unread - the one in the
         // main thread, because it is later than the unthreaded
         // receipt.
-        await expect(page.getByLabel(`${otherRoomName} 1 unread message.`)).toBeVisible();
+        await expect(page.getByLabel(`${otherRoomName} with 1 unread message.`)).toBeVisible();
     });
 
     /**
@@ -291,7 +291,9 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
         const uriEncodedLastMessageId = encodeURIComponent(lastMessageId);
 
         // wait until all messages have been received
-        await expect(page.getByLabel(`${otherRoomName} ${sendMessageResponses.length} unread messages.`)).toBeVisible();
+        await expect(
+            page.getByLabel(`${otherRoomName} with ${sendMessageResponses.length} unread messages.`),
+        ).toBeVisible();
 
         // switch to the room with the messages
         await page.goto(`/#/room/${otherRoomId}`);
diff --git a/playwright/e2e/read-receipts/room-list-order.spec.ts b/playwright/e2e/read-receipts/room-list-order.spec.ts
index e940c45b87..405cdf22ed 100644
--- a/playwright/e2e/read-receipts/room-list-order.spec.ts
+++ b/playwright/e2e/read-receipts/room-list-order.spec.ts
@@ -12,7 +12,7 @@ import { test } from ".";
 
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
     test.describe("Room list order", () => {
-        test("Rooms with unread messages appear at the top of room list if 'unread first' is selected", async ({
+        test("Rooms with unread messages appear at the top of room list with default 'activity' ordering", async ({
             roomAlpha: room1,
             roomBeta: room2,
             util,
@@ -22,15 +22,18 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
             await util.goTo(room2);
 
             // Display the unread first room
-            await util.toggleRoomUnreadOrder();
             await util.receiveMessages(room1, ["Msg1"]);
             await page.reload();
 
+            // switch rooms so they can re-order in the list
+            await util.goTo(room1);
+
             // Room 1 has an unread message and should be displayed first
+            // (as the default is to sort by activity)
             await util.assertRoomListOrder([room1, room2]);
         });
 
-        test("Rooms with unread threads appear at the top of room list if 'unread first' is selected", async ({
+        test("Rooms with unread threads appear at the top of room list with default 'activity' order", async ({
             roomAlpha: room1,
             roomBeta: room2,
             util,
@@ -42,7 +45,6 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
             await util.assertRead(room1);
 
             // Display the unread first room
-            await util.toggleRoomUnreadOrder();
             await util.receiveMessages(room1, [msg.threadedOff("Msg1", "Resp1")]);
             await util.saveAndReload();
 
diff --git a/playwright/e2e/regression-tests/pills-click-in-app.spec.ts b/playwright/e2e/regression-tests/pills-click-in-app.spec.ts
index 3670e64308..6856e70609 100644
--- a/playwright/e2e/regression-tests/pills-click-in-app.spec.ts
+++ b/playwright/e2e/regression-tests/pills-click-in-app.spec.ts
@@ -29,7 +29,7 @@ test.describe("Pills", () => {
 
         // send a message using the built-in room mention functionality (autocomplete)
         await page
-            .getByRole("textbox", { name: "Send a message…" })
+            .getByRole("textbox", { name: "Send an unencrypted message…" })
             .pressSequentially(`Hello world! Join here: #${targetLocalpart.substring(0, 3)}`);
         await page.locator(".mx_Autocomplete_Completion_title").click();
         await page.getByRole("button", { name: "Send message" }).click();
diff --git a/playwright/e2e/release-announcement/index.ts b/playwright/e2e/release-announcement/index.ts
index 3b6c2dd38a..e28fa6f989 100644
--- a/playwright/e2e/release-announcement/index.ts
+++ b/playwright/e2e/release-announcement/index.ts
@@ -30,9 +30,8 @@ export class Helpers {
     /**
      * Get the release announcement with the given name.
      * @param name
-     * @private
      */
-    private getReleaseAnnouncement(name: string) {
+    public getReleaseAnnouncement(name: string) {
         return this.page.getByRole("dialog", { name });
     }
 
@@ -42,7 +41,10 @@ export class Helpers {
      */
     async assertReleaseAnnouncementIsVisible(name: string) {
         await expect(this.getReleaseAnnouncement(name)).toBeVisible();
-        await expect(this.page).toMatchScreenshot(`release-announcement-${name}.png`, { showTooltips: true });
+        await expect(this.page).toMatchScreenshot(`release-announcement-${name}.png`, {
+            showTooltips: true,
+            hideJumpToBottomButton: true,
+        });
     }
 
     /**
@@ -52,16 +54,6 @@ export class Helpers {
     assertReleaseAnnouncementIsNotVisible(name: string) {
         return expect(this.getReleaseAnnouncement(name)).not.toBeVisible();
     }
-
-    /**
-     * Mark the release announcement with the given name as read.
-     * If the release announcement is not visible, this will throw an error.
-     * @param name
-     */
-    async markReleaseAnnouncementAsRead(name: string) {
-        const dialog = this.getReleaseAnnouncement(name);
-        await dialog.getByRole("button", { name: "Ok" }).click();
-    }
 }
 
 export { expect };
diff --git a/playwright/e2e/release-announcement/releaseAnnouncement.spec.ts b/playwright/e2e/release-announcement/releaseAnnouncement.spec.ts
index 812b66b796..8f0a73ebff 100644
--- a/playwright/e2e/release-announcement/releaseAnnouncement.spec.ts
+++ b/playwright/e2e/release-announcement/releaseAnnouncement.spec.ts
@@ -22,27 +22,37 @@ test.describe("Release announcement", () => {
             await app.viewRoomById(roomId);
             await use({ roomId });
         },
+        labsFlags: ["feature_new_room_list"],
     });
 
-    test(
-        "should display the pinned messages release announcement",
+    // There is no release announcement currently live
+    test.skip(
+        "should display the new room list release announcement",
         { tag: "@screenshot" },
         async ({ page, app, room, util }) => {
-            await app.toggleRoomInfoPanel();
+            // dismiss the toast so the announcement appears
+            await page.getByRole("button", { name: "Dismiss" }).click();
 
-            const name = "All new pinned messages";
+            const newSoundsName = "We’ve refreshed your sounds";
+            // The new sounds release announcement should be displayed
+            await util.assertReleaseAnnouncementIsVisible(newSoundsName);
+            // Hide the new sounds release announcement
+            const newSoundsDialog = util.getReleaseAnnouncement(newSoundsName);
+            await newSoundsDialog.getByRole("button", { name: "OK" }).click();
 
-            // The release announcement should be displayed
-            await util.assertReleaseAnnouncementIsVisible(name);
-            // Hide the release announcement
-            await util.markReleaseAnnouncementAsRead(name);
-            await util.assertReleaseAnnouncementIsNotVisible(name);
+            const newRoomListName = "Chats has a new look!";
+            // The new room list release announcement should be displayed
+            await util.assertReleaseAnnouncementIsVisible(newRoomListName);
+            // Hide the new room list release announcement
+            const dialog = util.getReleaseAnnouncement(newRoomListName);
+            await dialog.getByRole("button", { name: "Next" }).click();
+
+            await util.assertReleaseAnnouncementIsNotVisible(newRoomListName);
 
             await page.reload();
-            await app.toggleRoomInfoPanel();
-            await expect(page.getByRole("menuitem", { name: "Pinned messages" })).toBeVisible();
-            // Check that once the release announcement has been marked as viewed, it does not appear again
-            await util.assertReleaseAnnouncementIsNotVisible(name);
+            await expect(page.getByRole("button", { name: "Room options" })).toBeVisible();
+            // Check that once the release announcements has been marked as viewed, it does not appear again
+            await util.assertReleaseAnnouncementIsNotVisible(newRoomListName);
         },
     );
 });
diff --git a/playwright/e2e/right-panel/file-panel.spec.ts b/playwright/e2e/right-panel/file-panel.spec.ts
index d69b7d4731..5549b2d315 100644
--- a/playwright/e2e/right-panel/file-panel.spec.ts
+++ b/playwright/e2e/right-panel/file-panel.spec.ts
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { type Download, type Page } from "@playwright/test";
+import { type Page } from "@playwright/test";
 
 import { test, expect } from "../../element-web-test";
 import { viewRoomSummaryByName } from "./utils";
@@ -63,9 +63,7 @@ test.describe("FilePanel", () => {
             await expect(roomViewBody.locator(".mx_EventTile[data-layout='group'] img[alt='riot.png']")).toBeVisible();
 
             // Assert that the audio player is rendered
-            await expect(
-                roomViewBody.locator(".mx_EventTile[data-layout='group'] .mx_AudioPlayer_container"),
-            ).toBeVisible();
+            await expect(roomViewBody.getByRole("region", { name: "Audio player" })).toBeVisible();
 
             // Assert that the file button exists
             await expect(
@@ -97,9 +95,7 @@ test.describe("FilePanel", () => {
             await expect(image.locator("img[alt='riot.png']")).toBeVisible();
 
             // Detect the audio file
-            const audio = filePanelMessageList.locator(
-                ".mx_EventTile_mediaLine .mx_MAudioBody .mx_AudioPlayer_container",
-            );
+            const audio = filePanelMessageList.getByRole("region", { name: "Audio player" });
             // Assert that the play button is rendered
             await expect(audio.getByRole("button", { name: "Play" })).toBeVisible();
 
@@ -130,7 +126,12 @@ test.describe("FilePanel", () => {
             // Take a snapshot of file tiles list on FilePanel
             await expect(filePanelMessageList).toMatchScreenshot("file-tiles-list.png", {
                 // Exclude timestamps & flaky seek bar from snapshot
-                mask: [page.locator(".mx_MessageTimestamp, .mx_AudioPlayer_seek")],
+                mask: [page.getByTestId("audio-player-seek")],
+                css: `
+                    .mx_MessageTimestamp {
+                        visibility: hidden;
+                    }
+                `,
             });
         });
 
@@ -138,21 +139,19 @@ test.describe("FilePanel", () => {
             // Upload an image file
             await uploadFile(page, "playwright/sample-files/1sec.ogg");
 
-            const audioBody = page.locator(
-                ".mx_FilePanel .mx_RoomView_MessageList .mx_EventTile_mediaLine .mx_MAudioBody .mx_AudioPlayer_container",
-            );
+            const audioBody = page.getByTestId("right-panel").getByRole("region", { name: "Audio player" });
+
             // Assert that the audio player is rendered
-            // Assert that the audio file information is rendered
-            const mediaInfo = audioBody.locator(".mx_AudioPlayer_mediaInfo");
-            await expect(mediaInfo.locator(".mx_AudioPlayer_mediaName").getByText("1sec.ogg")).toBeVisible();
-            await expect(mediaInfo.locator(".mx_AudioPlayer_byline", { hasText: "00:01" })).toBeVisible();
-            await expect(mediaInfo.locator(".mx_AudioPlayer_byline", { hasText: "(3.56 KB)" })).toBeVisible(); // actual size
+            // Assert that the audio file information is rendered;
+            await expect(audioBody.getByText("1sec.ogg")).toBeVisible(); // extension
+            await expect(audioBody.getByRole("time")).toHaveText("00:01"); // duration
+            await expect(audioBody.getByText("(3.56 KB)")).toBeVisible(); // actual size;
 
             // Assert that the duration counter is 00:01 before clicking the play button
-            await expect(audioBody.locator(".mx_AudioPlayer_mediaInfo time", { hasText: "00:01" })).toBeVisible();
+            await expect(audioBody.getByRole("time")).toHaveText("00:01");
 
             // Assert that the counter is zero before clicking the play button
-            await expect(audioBody.locator(".mx_AudioPlayer_seek [role='timer']", { hasText: "00:00" })).toBeVisible();
+            await expect(audioBody.getByRole("timer")).toHaveText("00:00");
 
             // Click the play button
             await audioBody.getByRole("button", { name: "Play" }).click();
@@ -161,7 +160,7 @@ test.describe("FilePanel", () => {
             await expect(audioBody.getByRole("button", { name: "Pause" })).toBeVisible();
 
             // Assert that the timer is reset when the audio file finished playing
-            await expect(audioBody.locator(".mx_AudioPlayer_seek [role='timer']", { hasText: "00:00" })).toBeVisible();
+            await expect(audioBody.getByRole("timer")).toHaveText("00:00");
 
             // Assert that the play button is rendered
             await expect(audioBody.getByRole("button", { name: "Play" })).toBeVisible();
@@ -195,23 +194,13 @@ test.describe("FilePanel", () => {
 
             const link = imageBody.locator(".mx_MFileBody_download a");
 
-            const newPagePromise = context.waitForEvent("page");
-
-            const downloadPromise = new Promise<Download>((resolve) => {
-                page.once("download", resolve);
-            });
+            const downloadPromise = page.waitForEvent("download");
 
             // Click the anchor link (not the image itself)
             await link.click();
 
-            const newPage = await newPagePromise;
-            // XXX: Clicking the link opens the image in a new tab on some browsers rather than downloading
-            await expect(newPage)
-                .toHaveURL(/.+\/_matrix\/media\/\w+\/download\/localhost\/\w+/)
-                .catch(async () => {
-                    const download = await downloadPromise;
-                    expect(download.suggestedFilename()).toBe("riot.png");
-                });
+            const download = await downloadPromise;
+            expect(download.suggestedFilename()).toBe("riot.png");
         });
     });
 });
diff --git a/playwright/e2e/right-panel/memberlist.spec.ts b/playwright/e2e/right-panel/memberlist.spec.ts
index cd22626575..bb3dc8cb33 100644
--- a/playwright/e2e/right-panel/memberlist.spec.ts
+++ b/playwright/e2e/right-panel/memberlist.spec.ts
@@ -11,6 +11,32 @@ import { Bot } from "../../pages/bot";
 const ROOM_NAME = "Test room";
 const NAME = "Alice";
 
+async function setupRoomWithMembers(
+    app: any,
+    page: any,
+    homeserver: any,
+    roomName: string,
+    memberNames: string[],
+): Promise<string> {
+    const visibility = await page.evaluate(() => (window as any).matrixcs.Visibility.Public);
+    const id = await app.client.createRoom({ name: roomName, visibility });
+    const bots: Bot[] = [];
+
+    for (let i = 0; i < memberNames.length; i++) {
+        const displayName = memberNames[i];
+        const bot = new Bot(page, homeserver, { displayName, startClient: false, autoAcceptInvites: false });
+        if (displayName === "Susan") {
+            await bot.prepareClient();
+            await app.client.inviteUser(id, bot.credentials?.userId);
+        } else {
+            await bot.joinRoom(id);
+        }
+        bots.push(bot);
+    }
+
+    return id;
+}
+
 test.use({
     synapseConfig: {
         presence: {
@@ -25,17 +51,8 @@ test.use({
 test.describe("Memberlist", () => {
     test.beforeEach(async ({ app, user, page, homeserver }, testInfo) => {
         testInfo.setTimeout(testInfo.timeout + 30_000);
-        const id = await app.client.createRoom({ name: ROOM_NAME });
-        const newBots: Bot[] = [];
         const names = ["Bob", "Bob", "Susan"];
-        for (let i = 0; i < 3; i++) {
-            const displayName = names[i];
-            const autoAcceptInvites = displayName !== "Susan";
-            const bot = new Bot(page, homeserver, { displayName, startClient: true, autoAcceptInvites });
-            await bot.prepareClient();
-            await app.client.inviteUser(id, bot.credentials?.userId);
-            newBots.push(bot);
-        }
+        await setupRoomWithMembers(app, page, homeserver, ROOM_NAME, names);
     });
 
     test("Renders correctly", { tag: "@screenshot" }, async ({ page, app }) => {
@@ -45,4 +62,36 @@ test.describe("Memberlist", () => {
         await expect(memberlist.getByText("Invited")).toHaveCount(1);
         await expect(page.locator(".mx_MemberListView")).toMatchScreenshot("with-four-members.png");
     });
+
+    test("should handle scroll and click to view member profile", async ({ page, app, homeserver }) => {
+        // Create a room with many members to enable scrolling
+        const memberNames = Array.from({ length: 15 }, (_, i) => `Member${i.toString()}`);
+        await setupRoomWithMembers(app, page, homeserver, "Large Room", memberNames);
+
+        // Navigate to the room and open member list
+        await app.viewRoomByName("Large Room");
+
+        const memberlist = await app.toggleMemberlistPanel();
+
+        // Get the scrollable container
+        const memberListContainer = memberlist.locator(".mx_AutoHideScrollbar");
+
+        // Scroll down to the bottom of the member list
+        await app.scrollListToBottom(memberListContainer);
+
+        // Wait for the target member to be visible after scrolling
+        // Member9 is the last in the list as they are lexicographically sorted
+        const targetName = "Member9";
+        const targetMember = memberlist.locator(".mx_MemberTileView_name").filter({ hasText: targetName });
+        await targetMember.waitFor({ state: "visible" });
+        // Alice is not visible and will require scrolling to,
+        // but is likely in the dom as we have an overscan on the top and bottom of the list.
+        // Click on a member near the bottom of the list
+        await expect(targetMember).toBeVisible();
+        await targetMember.click();
+
+        // Verify that the user info screen is shown and hasn't scrolled back to top
+        await expect(page.locator(".mx_UserInfo")).toBeVisible();
+        await expect(page.locator(".mx_UserInfo_profile").getByText(targetName)).toBeVisible();
+    });
 });
diff --git a/playwright/e2e/right-panel/right-panel.spec.ts b/playwright/e2e/right-panel/right-panel.spec.ts
index 0fbd306d86..6a6aba8fd5 100644
--- a/playwright/e2e/right-panel/right-panel.spec.ts
+++ b/playwright/e2e/right-panel/right-panel.spec.ts
@@ -164,7 +164,7 @@ test.describe("RightPanel", () => {
                     css: `
                         /* Use monospace font for consistent mask width */
                         .mx_UserInfo_profile_mxid {
-                            font-family: Inconsolata !important;
+                            font-family: "Fira Code" !important;
                         }
                     `,
                 });
@@ -207,7 +207,7 @@ test.describe("RightPanel", () => {
 
             // \d represents the number of the space members
             await page
-                .locator(".mx_RoomInfoLine_private")
+                .locator(".mx_RoomInfoLine")
                 .getByRole("button", { name: /\d member/ })
                 .click();
             await expect(page.locator(".mx_MemberListView")).toBeVisible();
diff --git a/playwright/e2e/room-directory/room-directory.spec.ts b/playwright/e2e/room-directory/room-directory.spec.ts
index 8f90ef4b7e..741fde3505 100644
--- a/playwright/e2e/room-directory/room-directory.spec.ts
+++ b/playwright/e2e/room-directory/room-directory.spec.ts
@@ -38,12 +38,11 @@ test.describe("Room Directory", () => {
             // Publish into the public rooms directory
             const publishedAddresses = page.locator(".mx_SettingsFieldset", { hasText: "Published Addresses" });
             await expect(publishedAddresses.locator("#canonicalAlias")).toHaveValue(`#gaming:${user.homeServer}`);
-            const checkbox = publishedAddresses
-                .locator(".mx_SettingsFlag", {
-                    hasText: `Publish this room to the public in ${user.homeServer}'s room directory?`,
-                })
-                .getByRole("switch");
-            await checkbox.check();
+            const checkbox = publishedAddresses.getByRole("switch", {
+                name: `Publish this room to the public in ${user.homeServer}'s room directory?`,
+            });
+            // .click() rather than .check() as checking happens after publish
+            await checkbox.click();
             await expect(checkbox).toBeChecked();
 
             await app.closeDialog();
diff --git a/playwright/e2e/room/create-room.spec.ts b/playwright/e2e/room/create-room.spec.ts
new file mode 100644
index 0000000000..dd0ea63776
--- /dev/null
+++ b/playwright/e2e/room/create-room.spec.ts
@@ -0,0 +1,227 @@
+/*
+Copyright 2024 New Vector Ltd.
+Copyright 2022, 2023 The Matrix.org Foundation C.I.C.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type Page } from "playwright-core";
+
+import { SettingLevel } from "../../../src/settings/SettingLevel";
+import { UIFeature } from "../../../src/settings/UIFeature";
+import { test, expect } from "../../element-web-test";
+
+const name = "Test room";
+const topic = "A decently explanatory topic for a test room.";
+
+test.describe("Create Room", () => {
+    test.use({ displayName: "Jim" });
+
+    test(
+        "should create a public room with name, topic & address set",
+        { tag: "@screenshot" },
+        async ({ page, user, app, axe }) => {
+            const dialog = await app.openCreateRoomDialog();
+            // Fill name & topic
+            await dialog.getByRole("textbox", { name: "Name" }).fill(name);
+            await dialog.getByRole("textbox", { name: "Topic" }).fill(topic);
+            // Change room to public
+            await dialog.getByRole("button", { name: "Room visibility" }).click();
+            await dialog.getByRole("option", { name: "Public room" }).click();
+            // Fill room address
+            await dialog.getByRole("textbox", { name: "Room address" }).fill("test-create-room-standard");
+
+            axe.disableRules("color-contrast"); // XXX: Inheriting colour contrast issues from room view.
+            await expect(axe).toHaveNoViolations();
+            // Snapshot it
+            // Mask topic to avoid flakiness with top border
+            await expect(dialog).toMatchScreenshot("create-room.png", {
+                mask: [dialog.locator(".mx_CreateRoomDialog_topic")],
+            });
+
+            // Submit
+            await dialog.getByRole("button", { name: "Create room" }).click();
+
+            await expect(page).toHaveURL(new RegExp(`/#/room/#test-create-room-standard:${user.homeServer}`));
+            const header = page.locator(".mx_RoomHeader");
+            await expect(header).toContainText(name);
+        },
+    );
+
+    test("should allow us to start a chat and show encryption state", async ({ page, user, app }) => {
+        await page.getByRole("button", { name: "New conversation", exact: true }).click();
+        await page.getByRole("menuitem", { name: "Start chat" }).click();
+
+        await page.getByTestId("invite-dialog-input").fill(user.userId);
+
+        await page.getByRole("button", { name: "Go" }).click();
+
+        await expect(page.getByText("Encryption enabled")).toBeVisible();
+        await expect(page.getByText("Send your first message to")).toBeVisible();
+
+        const composer = page.getByRole("region", { name: "Message composer" });
+        await expect(composer.getByRole("textbox", { name: "Send a message…" })).toBeVisible();
+    });
+
+    test("should create a video room", { tag: "@screenshot" }, async ({ page, user, app }) => {
+        await app.settings.setValue("feature_video_rooms", null, SettingLevel.DEVICE, true);
+
+        const dialog = await app.openCreateRoomDialog("New video room");
+        // Fill name & topic
+        await dialog.getByRole("textbox", { name: "Name" }).fill(name);
+        await dialog.getByRole("textbox", { name: "Topic" }).fill(topic);
+        // Change room to public
+        await dialog.getByRole("button", { name: "Room visibility" }).click();
+        await dialog.getByRole("option", { name: "Public room" }).click();
+        // Fill room address
+        await dialog.getByRole("textbox", { name: "Room address" }).fill("test-create-room-video");
+        // Snapshot it
+        // Mask topic to avoid flakiness with top border
+        await expect(dialog).toMatchScreenshot("create-video-room.png", {
+            mask: [dialog.locator(".mx_CreateRoomDialog_topic")],
+        });
+
+        // Submit
+        await dialog.getByRole("button", { name: "Create video room" }).click();
+
+        await expect(page).toHaveURL(new RegExp(`/#/room/#test-create-room-video:${user.homeServer}`));
+        const header = page.locator(".mx_RoomHeader");
+        await expect(header).toContainText(name);
+    });
+
+    test.describe("Should hide public room option if not allowed", () => {
+        test.use({
+            config: {
+                setting_defaults: {
+                    [UIFeature.AllowCreatingPublicRooms]: false,
+                },
+            },
+        });
+
+        test("should disallow creating public rooms", { tag: "@screenshot" }, async ({ page, user, app, axe }) => {
+            const dialog = await app.openCreateRoomDialog();
+            // Fill name & topic
+            await dialog.getByRole("textbox", { name: "Name" }).fill(name);
+            await dialog.getByRole("textbox", { name: "Topic" }).fill(topic);
+
+            axe.disableRules("color-contrast"); // XXX: Inheriting colour contrast issues from room view.
+            await expect(axe).toHaveNoViolations();
+            // Snapshot it
+            // Mask topic to avoid flakiness with top border
+            await expect(dialog).toMatchScreenshot("create-room-no-public.png", {
+                mask: [dialog.locator(".mx_CreateRoomDialog_topic")],
+            });
+
+            // Submit
+            await dialog.getByRole("button", { name: "Create room" }).click();
+
+            await expect(page).toHaveURL(new RegExp(`/#/room/!.+`));
+            const header = page.locator(".mx_RoomHeader");
+            await expect(header).toContainText(name);
+        });
+    });
+
+    test.describe("when the encrypted state labs flag is turned off", () => {
+        test.use({ labsFlags: [] });
+
+        test("creates a room without encrypted state", { tag: "@screenshot" }, async ({ page, user: _user }) => {
+            // When we start to create a room
+            await page.getByRole("button", { name: "New conversation", exact: true }).click();
+            await page.getByRole("menuitem", { name: "New room" }).click();
+            await page.getByRole("textbox", { name: "Name" }).fill(name);
+
+            // Then there is no Encrypt state events button
+            await expect(page.getByRole("checkbox", { name: "Encrypt state events" })).not.toBeVisible();
+
+            // And when we create the room
+            await page.getByRole("button", { name: "Create room" }).click();
+
+            // Then we created a normal encrypted room, without encrypted state
+            await expect(page.getByText("Encryption enabled")).toBeVisible();
+            await expect(page.getByText("State encryption enabled")).not.toBeVisible();
+
+            // And the room name state event is not encrypted
+            await viewSourceOnRoomNameEvent(page);
+            await expect(page.getByText("Original event source")).toBeVisible();
+            await expect(page.getByText("Decrypted event source")).not.toBeVisible();
+        });
+    });
+
+    test.describe("when the encrypted state labs flag is turned on", () => {
+        test.use({ labsFlags: ["feature_msc4362_encrypted_state_events"] });
+
+        test(
+            "creates a room with encrypted state if we check the box",
+            { tag: "@screenshot" },
+            async ({ page, user: _user }) => {
+                // Given we check the Encrypted State checkbox
+                await page.getByRole("button", { name: "New conversation", exact: true }).click();
+                await page.getByRole("menuitem", { name: "New room" }).click();
+                await expect(page.getByRole("switch", { name: "Enable end-to-end encryption" })).toBeChecked();
+                await page.getByRole("switch", { name: "Encrypt state events" }).click();
+                await expect(page.getByRole("switch", { name: "Encrypt state events" })).toBeChecked();
+
+                // When we create a room
+                await page.getByRole("textbox", { name: "Name" }).fill(name);
+                await page.getByRole("button", { name: "Create room" }).click();
+
+                // Then we created an encrypted state room
+                await expect(page.getByText("State encryption enabled")).toBeVisible();
+
+                // And it has the correct name
+                await expect(page.getByTestId("timeline").getByRole("heading", { name })).toBeVisible();
+
+                // And the room name state event is encrypted
+                await viewSourceOnRoomNameEvent(page);
+                await expect(page.getByText("Decrypted event source")).toBeVisible();
+            },
+        );
+
+        test(
+            "creates a room without encrypted state if we don't check the box",
+            { tag: "@screenshot" },
+            async ({ page, user: _user }) => {
+                // Given we did not check the Encrypted State checkbox
+                await page.getByRole("button", { name: "New conversation", exact: true }).click();
+                await page.getByRole("menuitem", { name: "New room" }).click();
+                await expect(page.getByRole("switch", { name: "Enable end-to-end encryption" })).toBeChecked();
+
+                // And it is off by default
+                await expect(page.getByRole("switch", { name: "Encrypt state events" })).not.toBeChecked();
+
+                // When we create a room
+                await page.getByRole("textbox", { name: "Name" }).fill(name);
+                await page.getByRole("button", { name: "Create room" }).click();
+
+                // Then we created a normal encrypted room, without encrypted state
+                await expect(page.getByText("Encryption enabled")).toBeVisible();
+                await expect(page.getByText("State encryption enabled")).not.toBeVisible();
+
+                // And it has the correct name
+                await expect(page.getByTestId("timeline").getByRole("heading", { name })).toBeVisible();
+
+                // And the room name state event is not encrypted
+                await viewSourceOnRoomNameEvent(page);
+                await expect(page.getByText("Original event source")).toBeVisible();
+                await expect(page.getByText("Decrypted event source")).not.toBeVisible();
+            },
+        );
+    });
+});
+
+async function viewSourceOnRoomNameEvent(page: Page) {
+    await page
+        .getByRole("listitem")
+        .filter({ hasText: "created and configured the room" })
+        .getByRole("button", { name: "expand" })
+        .click();
+
+    await page
+        .getByRole("listitem")
+        .filter({ hasText: "changed the room name to" })
+        .getByRole("button", { name: "Options" })
+        .click();
+
+    await page.getByRole("menuitem", { name: "View source" }).click();
+}
diff --git a/playwright/e2e/room/room-header.spec.ts b/playwright/e2e/room/room-header.spec.ts
index 78e37cd4d2..2f681fe3d3 100644
--- a/playwright/e2e/room/room-header.spec.ts
+++ b/playwright/e2e/room/room-header.spec.ts
@@ -15,6 +15,11 @@ import { type ElementAppPage } from "../../pages/ElementAppPage";
 test.describe("Room Header", () => {
     test.use({
         displayName: "Sakura",
+        config: {
+            features: {
+                feature_new_room_list: false,
+            },
+        },
     });
 
     test.describe("with feature_notifications enabled", () => {
@@ -23,7 +28,7 @@ test.describe("Room Header", () => {
         });
         test("should render default buttons properly", { tag: "@screenshot" }, async ({ page, app, user }) => {
             await app.client.createRoom({ name: "Test Room" });
-            await app.viewRoomByName("Test Room");
+            await app.viewRoomByNameOnOldRoomList("Test Room");
 
             const header = page.locator(".mx_RoomHeader");
 
@@ -37,11 +42,8 @@ test.describe("Room Header", () => {
             await expect(header.locator(".mx_FacePile")).toBeVisible();
 
             // There should be both a voice and a video call button
-            // but they'll be disabled
-            const callButtons = header.getByRole("button", { name: "There's no one here to call" });
-            await expect(callButtons).toHaveCount(2);
-            await expect(callButtons.first()).toBeVisible();
-            await expect(callButtons.last()).toBeVisible();
+            await expect(header.getByRole("button", { name: "Video call" })).toBeVisible();
+            await expect(header.getByRole("button", { name: "Voice call" })).toBeVisible();
 
             await expect(header.getByRole("button", { name: "Threads" })).toBeVisible();
             await expect(header.getByRole("button", { name: "Notifications" })).toBeVisible();
@@ -64,7 +66,7 @@ test.describe("Room Header", () => {
                     "officia deserunt mollit anim id est laborum.";
 
                 await app.client.createRoom({ name: LONG_ROOM_NAME });
-                await app.viewRoomByName(LONG_ROOM_NAME);
+                await app.viewRoomByNameOnOldRoomList(LONG_ROOM_NAME);
 
                 const header = page.locator(".mx_RoomHeader");
                 // Wait until the room name is set
@@ -89,7 +91,7 @@ test.describe("Room Header", () => {
 
         test("should render room header icon correctly", { tag: "@screenshot" }, async ({ page, app, user }) => {
             await app.client.createRoom({ name: "Test Room", visibility: "public" as Visibility });
-            await app.viewRoomByName("Test Room");
+            await app.viewRoomByNameOnOldRoomList("Test Room");
 
             const header = page.locator(".mx_RoomHeader");
 
@@ -109,7 +111,7 @@ test.describe("Room Header", () => {
 
             await page.getByRole("button", { name: "Create video room" }).click();
 
-            await app.viewRoomByName("Test video room");
+            await app.viewRoomByNameOnOldRoomList("Test video room");
         };
 
         test.describe("and with feature_notifications enabled", () => {
diff --git a/playwright/e2e/room/room-status-bar.spec.ts b/playwright/e2e/room/room-status-bar.spec.ts
new file mode 100644
index 0000000000..249aa6e9d5
--- /dev/null
+++ b/playwright/e2e/room/room-status-bar.spec.ts
@@ -0,0 +1,174 @@
+/*
+Copyright 2025 Element Creations Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { test, expect } from "../../element-web-test";
+
+test.describe("Room Status Bar", () => {
+    test.use({
+        displayName: "Jim",
+        page: async ({ page }, use) => {
+            // Increase width as these components look horrible at lower
+            // widths.
+            await page.setViewportSize({ width: 1400, height: 768 });
+            await use(page);
+        },
+        room: async ({ app, user }, use) => {
+            const roomId = await app.client.createRoom({
+                name: "A room",
+            });
+            await app.closeNotificationToast();
+            await app.viewRoomById(roomId);
+            await use({ roomId });
+        },
+    });
+
+    test("should show an error when sync stops", { tag: "@screenshot" }, async ({ page, user, app, room, axe }) => {
+        await page.route("**/_matrix/client/*/sync*", async (route, req) => {
+            await route.fulfill({
+                status: 500,
+                contentType: "application/json",
+                body: '{"error": "Test fail", "errcode": "M_UNKNOWN"}',
+            });
+        });
+        await app.client.sendMessage(room.roomId, "forcing sync to run");
+        const banner = page.getByRole("region", { name: "Room status bar" });
+        await expect(banner).toBeVisible({ timeout: 15000 });
+        await expect(banner).toMatchScreenshot("connectivity_lost.png");
+    });
+    test("should NOT an error when a resource limit is hit", async ({ page, user, app, room, axe, toasts }) => {
+        await app.viewRoomById(room.roomId);
+        await page.route("**/_matrix/client/*/sync*", async (route, req) => {
+            await route.fulfill({
+                status: 400,
+                contentType: "application/json",
+                body: JSON.stringify({
+                    error: "Test fail",
+                    errcode: "M_RESOURCE_LIMIT_EXCEEDED",
+                    limit_type: "monthly_active_user",
+                    admin_contact: "https://example.org",
+                }),
+            });
+        });
+        await app.client.sendMessage(room.roomId, "forcing sync to run");
+        // Wait for the MAU warning toast to appear so we know this status bar would have appeared.
+        await toasts.getToast("Warning", 15000);
+        await expect(page.getByRole("region", { name: "Room status bar" })).not.toBeVisible();
+    });
+    test(
+        "should show an error when the user needs to consent",
+        { tag: "@screenshot" },
+        async ({ page, user, app, room, axe }) => {
+            await app.viewRoomById(room.roomId);
+            await page.route("**/_matrix/client/**/send**", async (route) => {
+                await route.fulfill({
+                    status: 400,
+                    contentType: "application/json",
+                    body: JSON.stringify({
+                        error: "Test fail",
+                        errcode: "M_CONSENT_NOT_GIVEN",
+                        consent_uri: "https://example.org",
+                    }),
+                });
+            });
+            const composer = app.getComposerField();
+            await composer.fill("Hello!");
+            await composer.press("Enter");
+            await page
+                .getByRole("dialog", { name: "Terms and Conditions" })
+                .getByRole("button", { name: "Dismiss" })
+                .click();
+            const banner = page.getByRole("region", { name: "Room status bar" });
+            await expect(banner).toBeVisible({ timeout: 15000 });
+            await expect(banner).toMatchScreenshot("consent.png");
+        },
+    );
+    test.describe("Message fails to send", () => {
+        test.beforeEach(async ({ page, user, app, room, axe }) => {
+            await app.viewRoomById(room.roomId);
+            await page.route("**/_matrix/client/**/send**", async (route) => {
+                await route.fulfill({
+                    status: 400,
+                    contentType: "application/json",
+                    body: JSON.stringify({ error: "Test fail", errcode: "M_UNKNOWN" }),
+                });
+            });
+            const composer = app.getComposerField();
+            await composer.fill("Hello!");
+            await composer.press("Enter");
+            const banner = page.getByRole("region", { name: "Room status bar" });
+            await expect(banner).toBeVisible();
+        });
+        test(
+            "should show an error when a message fails to send",
+            { tag: "@screenshot" },
+            async ({ page, user, app, room, axe }) => {
+                const banner = page.getByRole("region", { name: "Room status bar" });
+                await expect(banner).toMatchScreenshot("message_failed.png");
+            },
+        );
+        test("should be able to 'Delete all' messages", async ({ page, user, app, room, axe }) => {
+            const banner = page.getByRole("region", { name: "Room status bar" });
+            await banner.getByRole("button", { name: "Delete all" }).click();
+            await expect(banner).not.toBeVisible();
+        });
+        test("should be able to 'Retry all' messages", async ({ page, user, app, room, axe }) => {
+            const banner = page.getByRole("region", { name: "Room status bar" });
+            await page.unroute("**/_matrix/client/**/send**");
+            await banner.getByRole("button", { name: "Retry all" }).click();
+            await expect(banner).not.toBeVisible();
+        });
+    });
+
+    test.describe("Local rooms", () => {
+        test.use({
+            botCreateOpts: {
+                displayName: "Alice",
+            },
+        });
+        test(
+            "should show an error when creating a local room fails",
+            { tag: "@screenshot" },
+            async ({ page, app, user, bot }) => {
+                await page
+                    .getByRole("navigation", { name: "Room list" })
+                    .getByRole("button", { name: "New conversation" })
+                    .click();
+                await page.getByRole("menuitem", { name: "Start chat" }).click();
+
+                await page.route("**/_matrix/client/*/createRoom*", async (route, req) => {
+                    await route.fulfill({
+                        status: 400,
+                        contentType: "application/json",
+                        body: JSON.stringify({
+                            error: "Test fail",
+                            errcode: "M_UNKNOWN",
+                        }),
+                    });
+                });
+
+                const other = page.locator(".mx_InviteDialog_other");
+                await other.getByTestId("invite-dialog-input").fill(bot.credentials.userId);
+                await expect(
+                    other.getByRole("option", { name: "Alice" }).getByText(bot.credentials.userId),
+                ).toBeVisible();
+                await other.getByRole("option", { name: "Alice" }).click();
+                await other.getByRole("button", { name: "Go" }).click();
+                // Send a message to invite the bots
+                const composer = app.getComposerField();
+                await composer.fill("Hello");
+                await composer.press("Enter");
+
+                const banner = page.getByText("!Some of your messages have");
+                await expect(banner).toBeVisible();
+                await expect(banner).toMatchScreenshot("local_room_create_failed.png");
+
+                await page.unroute("**/_matrix/client/*/createRoom*");
+                await banner.getByRole("button", { name: "Retry" }).click();
+                await expect(banner).not.toBeVisible();
+            },
+        );
+    });
+});
diff --git a/playwright/e2e/room_options/marked_unread.spec.ts b/playwright/e2e/room_options/marked_unread.spec.ts
index 2817bbc921..ce3e170072 100644
--- a/playwright/e2e/room_options/marked_unread.spec.ts
+++ b/playwright/e2e/room_options/marked_unread.spec.ts
@@ -34,7 +34,7 @@ test.describe("Mark as Unread", () => {
         await bot.sendMessage(roomId, "I am a robot. Beep.");
 
         // Regular notification on new message
-        await expect(page.getByLabel(TEST_ROOM_NAME + " 1 unread message.")).toBeVisible();
+        await expect(page.getByLabel(`Open room ${TEST_ROOM_NAME} with 1 unread message.`)).toBeVisible();
         await expect(page).toHaveTitle("Element [1]");
 
         await page.goto("/#/room/" + roomId);
@@ -47,10 +47,12 @@ test.describe("Mark as Unread", () => {
         await page.goto("/#/room/" + dummyRoomId);
 
         const roomTile = page.getByLabel(TEST_ROOM_NAME);
-        await roomTile.focus();
-        await roomTile.getByRole("button", { name: "Room options" }).click();
+        await roomTile.click({ button: "right" });
         await page.getByRole("menuitem", { name: "Mark as unread" }).click();
 
-        await expect(page.getByLabel(TEST_ROOM_NAME + " Unread messages.")).toBeVisible();
+        // focus another room to make the notification decoration appear (room options are display on hover)
+        await page.getByRole("option", { name: "Open room Room of no consequence" }).click();
+
+        await expect(roomTile.getByTestId("notification-decoration")).toBeVisible();
     });
 });
diff --git a/playwright/e2e/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts b/playwright/e2e/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts
index 53f9c37dd0..df41ef4b70 100644
--- a/playwright/e2e/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts
+++ b/playwright/e2e/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts
@@ -50,8 +50,8 @@ test.describe("Appearance user settings tab", () => {
         // Click "Show advanced" link button
         await tab.getByRole("button", { name: "Show advanced" }).click();
 
-        await tab.getByLabel("Use bundled emoji font").click();
-        await tab.getByLabel("Use a system font").click();
+        await tab.getByRole("switch", { name: "Use bundled emoji font" }).click();
+        await tab.getByRole("switch", { name: "Use a system font" }).click();
 
         // Assert that the font-family value was removed
         await expect(page.locator("body")).toHaveCSS("font-family", '""');
diff --git a/playwright/e2e/settings/appearance-user-settings-tab/index.ts b/playwright/e2e/settings/appearance-user-settings-tab/index.ts
index 29e51fb0dd..15f2f47888 100644
--- a/playwright/e2e/settings/appearance-user-settings-tab/index.ts
+++ b/playwright/e2e/settings/appearance-user-settings-tab/index.ts
@@ -84,8 +84,8 @@ class Helpers {
     /**
      * Return the system theme toggle
      */
-    getMatchSystemThemeCheckbox() {
-        return this.getThemePanel().getByRole("checkbox", { name: "Match system theme" });
+    getMatchSystemThemeSwitch() {
+        return this.getThemePanel().getByRole("switch", { name: "Match system theme" });
     }
 
     /**
@@ -216,10 +216,10 @@ class Helpers {
     }
 
     /**
-     * Return the compact layout checkbox
+     * Return the compact layout switch
      */
-    getCompactLayoutCheckbox() {
-        return this.getMessageLayoutPanel().getByRole("checkbox", { name: "Show compact text and messages" });
+    getCompactLayoutSwitch() {
+        return this.getMessageLayoutPanel().getByRole("switch", { name: "Show compact text and messages" });
     }
 
     /**
diff --git a/playwright/e2e/settings/appearance-user-settings-tab/message-layout-panel.spec.ts b/playwright/e2e/settings/appearance-user-settings-tab/message-layout-panel.spec.ts
index ce0d614d90..3c05487723 100644
--- a/playwright/e2e/settings/appearance-user-settings-tab/message-layout-panel.spec.ts
+++ b/playwright/e2e/settings/appearance-user-settings-tab/message-layout-panel.spec.ts
@@ -40,9 +40,9 @@ test.describe("Appearance user settings tab", () => {
         );
 
         test("should enable compact layout when the modern layout is selected", async ({ page, app, user, util }) => {
-            await expect(util.getCompactLayoutCheckbox()).not.toBeChecked();
+            await expect(util.getCompactLayoutSwitch()).not.toBeChecked();
 
-            await util.getCompactLayoutCheckbox().click();
+            await util.getCompactLayoutSwitch().click();
             await util.assertCompactLayout();
         });
 
@@ -52,11 +52,11 @@ test.describe("Appearance user settings tab", () => {
             user,
             util,
         }) => {
-            await expect(util.getCompactLayoutCheckbox()).not.toBeDisabled();
+            await expect(util.getCompactLayoutSwitch()).not.toBeDisabled();
 
             // Select the bubble layout, which should disable the compact layout checkbox
             await util.getBubbleLayout().click();
-            await expect(util.getCompactLayoutCheckbox()).toBeDisabled();
+            await expect(util.getCompactLayoutSwitch()).toBeDisabled();
         });
     });
 });
diff --git a/playwright/e2e/settings/appearance-user-settings-tab/theme-choice-panel.spec.ts b/playwright/e2e/settings/appearance-user-settings-tab/theme-choice-panel.spec.ts
index 1fad16948d..7198e1fd82 100644
--- a/playwright/e2e/settings/appearance-user-settings-tab/theme-choice-panel.spec.ts
+++ b/playwright/e2e/settings/appearance-user-settings-tab/theme-choice-panel.spec.ts
@@ -25,7 +25,7 @@ test.describe("Appearance user settings tab", () => {
             { tag: "@screenshot" },
             async ({ page, app, util }) => {
                 // Assert that 'Match system theme' is not checked
-                await expect(util.getMatchSystemThemeCheckbox()).not.toBeChecked();
+                await expect(util.getMatchSystemThemeSwitch()).not.toBeChecked();
 
                 // Assert that the light theme is selected
                 await expect(util.getLightTheme()).toBeChecked();
@@ -41,7 +41,7 @@ test.describe("Appearance user settings tab", () => {
             "should disable the themes when the system theme is clicked",
             { tag: "@screenshot" },
             async ({ page, app, util }) => {
-                await util.getMatchSystemThemeCheckbox().click();
+                await util.getMatchSystemThemeSwitch().click();
 
                 // Assert that the themes are disabled
                 await expect(util.getLightTheme()).toBeDisabled();
diff --git a/playwright/e2e/settings/encryption-user-tab/encryption-tab.spec.ts b/playwright/e2e/settings/encryption-user-tab/encryption-tab.spec.ts
index ed1daecf35..c944e92307 100644
--- a/playwright/e2e/settings/encryption-user-tab/encryption-tab.spec.ts
+++ b/playwright/e2e/settings/encryption-user-tab/encryption-tab.spec.ts
@@ -25,7 +25,9 @@ test.describe("Encryption tab", () => {
 
         test.beforeEach(async ({ page, homeserver, credentials }) => {
             // The bot bootstraps cross-signing, creates a key backup and sets up a recovery key
-            const res = await createBot(page, homeserver, credentials);
+            const botCredentials = { ...credentials };
+            delete botCredentials.accessToken; // use a new login for the bot
+            const res = await createBot(page, homeserver, botCredentials);
             recoveryKey = res.recoveryKey;
             expectedBackupVersion = res.expectedBackupVersion;
         });
@@ -117,7 +119,7 @@ test.describe("Encryption tab", () => {
             await verifySession(app, recoveryKey.encodedPrivateKey);
             await util.openEncryptionTab();
 
-            await page.getByRole("checkbox", { name: "Allow key storage" }).click();
+            await page.getByRole("switch", { name: "Allow key storage" }).click();
 
             await expect(
                 page.getByRole("heading", { name: "Are you sure you want to turn off key storage and delete it?" }),
@@ -136,7 +138,7 @@ test.describe("Encryption tab", () => {
 
             await page.getByRole("button", { name: "Delete key storage" }).click();
 
-            await expect(page.getByRole("checkbox", { name: "Allow key storage" })).not.toBeChecked();
+            await expect(page.getByRole("switch", { name: "Allow key storage" })).not.toBeChecked();
 
             for (const prom of deleteRequestPromises) {
                 const request = await prom;
@@ -160,15 +162,15 @@ test.describe("Encryption tab", () => {
 
             // We will reset our identity
             await settings.getByRole("button", { name: "Verify this device" }).click();
-            await page.getByRole("button", { name: "Proceed with reset" }).click();
+            await page.getByRole("button", { name: "Can't confirm?" }).click();
 
             // First try cancelling and restarting
             await page.getByRole("button", { name: "Cancel" }).click();
-            await page.getByRole("button", { name: "Proceed with reset" }).click();
+            await page.getByRole("button", { name: "Can't confirm?" }).click();
 
             // Then click outside the dialog and restart
             await page.locator("li").filter({ hasText: "Encryption" }).click({ force: true });
-            await page.getByRole("button", { name: "Proceed with reset" }).click();
+            await page.getByRole("button", { name: "Can't confirm?" }).click();
 
             // Finally we actually continue
             await page.getByRole("button", { name: "Continue" }).click();
diff --git a/playwright/e2e/settings/encryption-user-tab/index.ts b/playwright/e2e/settings/encryption-user-tab/index.ts
index a7351fd2b4..3d180047a1 100644
--- a/playwright/e2e/settings/encryption-user-tab/index.ts
+++ b/playwright/e2e/settings/encryption-user-tab/index.ts
@@ -43,7 +43,7 @@ class Helpers {
      */
     async verifyDevice(recoveryKey: GeneratedSecretStorageKey) {
         // Select the security phrase
-        await this.page.getByRole("button", { name: "Verify with Recovery Key" }).click();
+        await this.page.getByRole("button", { name: "Use recovery key" }).click();
         await this.enterRecoveryKey(recoveryKey);
         await this.page.getByRole("button", { name: "Done" }).click();
     }
@@ -104,7 +104,10 @@ class Helpers {
 
         const clipboardContent = await this.app.getClipboard();
         await dialog.getByRole("textbox").fill(clipboardContent);
-        await dialog.getByRole("button", { name: confirmButtonLabel }).click();
+        const button = dialog.getByRole("button", { name: confirmButtonLabel });
+        await button.click();
+        // Button should disable immediately after clicking.
+        await expect(button).toBeDisabled();
         await expect(this.getEncryptionRecoverySection()).toMatchScreenshot("default-recovery.png");
     }
 }
diff --git a/playwright/e2e/settings/encryption-user-tab/recovery.spec.ts b/playwright/e2e/settings/encryption-user-tab/recovery.spec.ts
index 8895e4a7ee..db558a43da 100644
--- a/playwright/e2e/settings/encryption-user-tab/recovery.spec.ts
+++ b/playwright/e2e/settings/encryption-user-tab/recovery.spec.ts
@@ -17,7 +17,9 @@ test.describe("Recovery section in Encryption tab", () => {
     let recoveryKey: GeneratedSecretStorageKey;
     test.beforeEach(async ({ page, homeserver, credentials }) => {
         // The bot bootstraps cross-signing, creates a key backup and sets up a recovery key
-        const res = await createBot(page, homeserver, credentials);
+        const botCredentials = { ...credentials };
+        delete botCredentials.accessToken; // use a new login for the bot
+        const res = await createBot(page, homeserver, botCredentials);
         recoveryKey = res.recoveryKey;
     });
 
diff --git a/playwright/e2e/settings/notifications/notifications-settings-2-tab.spec.ts b/playwright/e2e/settings/notifications/notifications-settings-2-tab.spec.ts
new file mode 100644
index 0000000000..48f03ecf0d
--- /dev/null
+++ b/playwright/e2e/settings/notifications/notifications-settings-2-tab.spec.ts
@@ -0,0 +1,28 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { test, expect } from "../../../element-web-test";
+import { SettingLevel } from "../../../../src/settings/SettingLevel";
+
+test.describe("Notifications 2 tab", () => {
+    test.use({
+        displayName: "Alice",
+    });
+
+    test("should display notification settings", { tag: "@screenshot" }, async ({ page, app, user, axe }) => {
+        await app.settings.setValue("feature_notification_settings2", null, SettingLevel.DEVICE, true);
+        await page.setViewportSize({ width: 1024, height: 2000 });
+        const settings = await app.settings.openUserSettings("Notifications");
+
+        axe.disableRules("color-contrast"); // XXX: Inheriting colour contrast issues from room view.
+        await expect(axe).toHaveNoViolations();
+        await expect(settings).toMatchScreenshot("standard-notifications-2-settings.png", {
+            // Mask the mxid.
+            mask: [settings.locator("#mx_NotificationSettings2_MentionCheckbox span")],
+        });
+    });
+});
diff --git a/playwright/e2e/settings/notifications/notifications-settings-tab.spec.ts b/playwright/e2e/settings/notifications/notifications-settings-tab.spec.ts
new file mode 100644
index 0000000000..a63e730788
--- /dev/null
+++ b/playwright/e2e/settings/notifications/notifications-settings-tab.spec.ts
@@ -0,0 +1,25 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { test, expect } from "../../../element-web-test";
+
+test.describe("Notifications tab", () => {
+    test.use({
+        displayName: "Alice",
+    });
+
+    test("should display notification settings", { tag: "@screenshot" }, async ({ page, app, user, axe }) => {
+        await page.setViewportSize({ width: 1024, height: 1400 });
+        const settings = await app.settings.openUserSettings("Notifications");
+        await settings.getByLabel("Enable notifications for this account").check();
+        await settings.getByLabel("Enable notifications for this device").check();
+
+        axe.disableRules("color-contrast"); // XXX: Inheriting colour contrast issues from room view.
+        await expect(axe).toHaveNoViolations();
+        await expect(settings).toMatchScreenshot("standard-notification-settings.png");
+    });
+});
diff --git a/playwright/e2e/settings/preferences-user-settings-tab.spec.ts b/playwright/e2e/settings/preferences-user-settings-tab.spec.ts
index 33392d8848..8adbc74cc5 100644
--- a/playwright/e2e/settings/preferences-user-settings-tab.spec.ts
+++ b/playwright/e2e/settings/preferences-user-settings-tab.spec.ts
@@ -21,16 +21,23 @@ test.describe("Preferences user settings tab", () => {
             const locator = await app.settings.openUserSettings("Preferences");
             await use(locator);
         },
+        // display message preview settings
+        labsFlags: ["feature_new_room_list"],
     });
 
     test("should be rendered properly", { tag: "@screenshot" }, async ({ app, page, user }) => {
-        await page.setViewportSize({ width: 1024, height: 3300 });
+        await page.setViewportSize({ width: 1024, height: 4000 });
         const tab = await app.settings.openUserSettings("Preferences");
         // Assert that the top heading is rendered
         await expect(tab.getByRole("heading", { name: "Preferences" })).toBeVisible();
         await expect(tab).toMatchScreenshot("Preferences-user-settings-tab-should-be-rendered-properly-1.png", {
-            // masked due to daylight saving time
+            // masked with fixed-width due to daylight saving time making the text content vary
             mask: [tab.locator("#mx_dropdownUserTimezone_value")],
+            css: `
+                #mx_dropdownUserTimezone_value {
+                    width: 200px;
+                }
+            `,
         });
     });
 
diff --git a/playwright/e2e/settings/roles-permissions-room-settings-tab.spec.ts b/playwright/e2e/settings/room-settings/roles-permissions-room-settings-tab.spec.ts
similarity index 97%
rename from playwright/e2e/settings/roles-permissions-room-settings-tab.spec.ts
rename to playwright/e2e/settings/room-settings/roles-permissions-room-settings-tab.spec.ts
index 06ee25e9cb..d287234af5 100644
--- a/playwright/e2e/settings/roles-permissions-room-settings-tab.spec.ts
+++ b/playwright/e2e/settings/room-settings/roles-permissions-room-settings-tab.spec.ts
@@ -8,7 +8,7 @@
 
 import { type Locator } from "@playwright/test";
 
-import { test, expect } from "../../element-web-test";
+import { test, expect } from "../../../element-web-test";
 
 test.describe("Roles & Permissions room settings tab", () => {
     const roomName = "Test room";
diff --git a/playwright/e2e/settings/room-settings/room-security-tab.spec.ts b/playwright/e2e/settings/room-settings/room-security-tab.spec.ts
new file mode 100644
index 0000000000..605d38abc2
--- /dev/null
+++ b/playwright/e2e/settings/room-settings/room-security-tab.spec.ts
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { type Locator } from "@playwright/test";
+
+import { test, expect } from "../../../element-web-test";
+
+test.describe("Roles & Permissions room settings tab", () => {
+    const roomName = "Test room";
+
+    test.use({
+        displayName: "Alice",
+    });
+
+    let settings: Locator;
+
+    test.beforeEach(async ({ user, app }) => {
+        await app.client.createRoom({
+            name: roomName,
+            power_level_content_override: {
+                events: {
+                    // Set the join rules as lower than the history vis to test an edge case.
+                    ["m.room.join_rules"]: 80,
+                    ["m.room.history_visibility"]: 100,
+                },
+            },
+        });
+        await app.viewRoomByName(roomName);
+        settings = await app.settings.openRoomSettings("Security & Privacy");
+    });
+
+    test(
+        "should be able to toggle on encryption in a room",
+        { tag: "@screenshot" },
+        async ({ page, app, user, axe }) => {
+            await page.setViewportSize({ width: 1024, height: 1400 });
+            const encryptedToggle = settings.getByLabel("Encrypted");
+            await encryptedToggle.click();
+
+            // Accept the dialog.
+            await page.getByRole("button", { name: "Ok " }).click();
+
+            await expect(encryptedToggle).toBeChecked();
+            await expect(encryptedToggle).toBeDisabled();
+
+            await settings.getByLabel("Only send messages to verified users.").check();
+
+            axe.disableRules("color-contrast"); // XXX: Inheriting colour contrast issues from room view.
+            await expect(axe).toHaveNoViolations();
+            await expect(settings).toMatchScreenshot("room-security-settings.png");
+        },
+    );
+
+    test(
+        "should automatically adjust history visibility when a room is changed from public to private",
+        { tag: "@screenshot" },
+        async ({ page, app, user, axe }) => {
+            await page.setViewportSize({ width: 1024, height: 1400 });
+
+            const settingsGroupAccess = page.getByRole("group", { name: "Access" });
+            const settingsGroupHistory = page.getByRole("group", { name: "Who can read history?" });
+
+            await settingsGroupAccess.getByText("Public").click();
+            await settingsGroupHistory.getByText("Anyone").click();
+
+            // Test that we have the warning appear.
+            axe.disableRules("color-contrast"); // XXX: Inheriting colour contrast issues from room view.
+            await expect(axe).toHaveNoViolations();
+            await expect(settings).toMatchScreenshot("room-security-settings-world-readable.png");
+
+            await settingsGroupAccess.getByText("Private (invite only)").click();
+            // Element should have automatically set the room to "sharing" history visibility
+            await expect(
+                settingsGroupHistory.getByText("Members only (since the point in time of selecting this option)"),
+            ).toBeChecked();
+        },
+    );
+
+    test(
+        "should disallow changing from public to private if the user cannot alter history",
+        { tag: "@screenshot" },
+        async ({ page, app, user, bot }) => {
+            await page.setViewportSize({ width: 1024, height: 1400 });
+
+            const settingsGroupAccess = page.getByRole("group", { name: "Access" });
+            const settingsGroupHistory = page.getByRole("group", { name: "Who can read history?" });
+
+            await settingsGroupAccess.getByText("Public").click();
+            await settingsGroupHistory.getByText("Anyone").click();
+
+            // De-op ourselves
+            await app.settings.switchTab("Roles & Permissions");
+
+            // Wait for the permissions list to be visible
+            await expect(settings.getByRole("heading", { name: "Permissions" })).toBeVisible();
+
+            const ourComboBox = settings.getByRole("combobox", { name: user.userId });
+            await ourComboBox.selectOption("Custom level");
+            const ourPl = settings.getByRole("spinbutton", { name: user.userId });
+            await ourPl.fill("80");
+            await ourPl.blur(); // Shows a warning on
+
+            // Accept the de-op
+            await page.getByRole("button", { name: "Continue" }).click();
+            await settings.getByRole("button", { name: "Apply", disabled: false }).click();
+
+            await app.settings.switchTab("Security & Privacy");
+
+            await settingsGroupAccess.getByText("Private (invite only)").click();
+            // Element should have automatically set the room to "sharing" history visibility
+            const errorDialog = page.getByRole("heading", { name: "Cannot make room private" });
+            await expect(errorDialog).toBeVisible();
+            await errorDialog.getByLabel("OK");
+            await expect(settingsGroupHistory.getByText("Anyone")).toBeChecked();
+        },
+    );
+});
diff --git a/playwright/e2e/settings/room-settings/room-video-tab.spec.ts b/playwright/e2e/settings/room-settings/room-video-tab.spec.ts
new file mode 100644
index 0000000000..feff22a04e
--- /dev/null
+++ b/playwright/e2e/settings/room-settings/room-video-tab.spec.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { type Locator } from "@playwright/test";
+
+import { test, expect } from "../../../element-web-test";
+import { SettingLevel } from "../../../../src/settings/SettingLevel";
+
+test.describe("Voice & Video room settings tab", () => {
+    const roomName = "Test room";
+
+    test.use({
+        displayName: "Alice",
+    });
+
+    let settings: Locator;
+
+    test.beforeEach(async ({ user, app, page }) => {
+        // Execute client actions before setting, as the setting will force a reload.
+        await app.client.createRoom({ name: roomName });
+        await app.settings.setValue("feature_group_calls", null, SettingLevel.DEVICE, true);
+        await app.viewRoomByName(roomName);
+        settings = await app.settings.openRoomSettings("Voice & Video");
+    });
+
+    test(
+        "should be able to toggle on Element Call in the room",
+        { tag: "@screenshot" },
+        async ({ page, app, user, axe }) => {
+            await page.setViewportSize({ width: 1024, height: 1400 });
+            const callToggle = settings.getByLabel("Enable Element Call as an additional calling option in this room");
+            await callToggle.check();
+            axe.disableRules("color-contrast"); // XXX: Inheriting colour contrast issues from room view.
+            await expect(axe).toHaveNoViolations();
+            await expect(settings).toMatchScreenshot("room-video-settings.png");
+        },
+    );
+});
diff --git a/playwright/e2e/settings/security-user-settings-tab.spec.ts b/playwright/e2e/settings/security-user-settings-tab.spec.ts
index 25bf1a9dbe..377cae7495 100644
--- a/playwright/e2e/settings/security-user-settings-tab.spec.ts
+++ b/playwright/e2e/settings/security-user-settings-tab.spec.ts
@@ -41,6 +41,18 @@ test.describe("Security user settings tab", () => {
             });
         });
 
+        test("should render the security tab", { tag: "@screenshot" }, async ({ app, page, user }) => {
+            await page.setViewportSize({ width: 1024, height: 1400 });
+            const tab = await app.settings.openUserSettings("Security");
+            await expect(tab).toMatchScreenshot("security-settings-tab.png", {
+                mask: [
+                    // Contains IM name.
+                    tab.locator("#mx_SetIntegrationManager_BodyText"),
+                    tab.locator("#mx_SetIntegrationManager_ManagerName"),
+                ],
+            });
+        });
+
         test("should be able to set an ID server", async ({ app, context, user, page }) => {
             const tab = await app.settings.openUserSettings("Security");
 
diff --git a/playwright/e2e/share-dialog/share-by-url.spec.ts b/playwright/e2e/share-dialog/share-by-url.spec.ts
index c5b9174782..49024d79d9 100644
--- a/playwright/e2e/share-dialog/share-by-url.spec.ts
+++ b/playwright/e2e/share-dialog/share-by-url.spec.ts
@@ -18,13 +18,14 @@ test.describe("share from URL", () => {
 
     test("should share message when users navigates to share URL", async ({ page, user, room, app }) => {
         await page.goto("/#/share?msg=Hello+world");
+        const dialog = page.getByRole("dialog", { name: "Forward message" });
         // The forward message dialog doesn't update as new infomation arrives via sync, which means sometimes
         // this is just says, "Empty room". For the same reason, we can't reliably write a test for loading the
         // app straight away with a /#/share url as the room doesn't appear until the client syncs.]
         // Ideally we should fix the forward dialog to update and eliminate races, until then, there is only one
         // room so we click the first button.
-        await page.getByRole("listitem" /*, { name: "A test room" }*/).getByRole("button", { name: "Send" }).click();
-        await page.keyboard.press("Escape");
+        await dialog.getByRole("listitem" /*, { name: "A test room" }*/).getByRole("button", { name: "Send" }).click();
+        await dialog.getByRole("button", { name: "Close" }).click();
         await app.viewRoomByName("A test room");
         const lastMessage = page.locator(".mx_RoomView_MessageList .mx_EventTile_last");
         await expect(lastMessage).toBeVisible();
diff --git a/playwright/e2e/share-dialog/share-dialog.spec.ts b/playwright/e2e/share-dialog/share-dialog.spec.ts
index 58574a46ff..a77e89fcdc 100644
--- a/playwright/e2e/share-dialog/share-dialog.spec.ts
+++ b/playwright/e2e/share-dialog/share-dialog.spec.ts
@@ -35,7 +35,7 @@ test.describe("Share dialog", () => {
 
         const rightPanel = await app.toggleRoomInfoPanel();
         await rightPanel.getByRole("menuitem", { name: "People" }).click();
-        await rightPanel.getByRole("button", { name: `${user.userId} (power 100)` }).click();
+        await rightPanel.getByRole("option", { name: user.displayName }).click();
         await rightPanel.getByRole("button", { name: "Share profile" }).click();
 
         const dialog = page.getByRole("dialog", { name: "Share User" });
diff --git a/playwright/e2e/sliding-sync/sliding-sync.spec.ts b/playwright/e2e/sliding-sync/sliding-sync.spec.ts
index b540cd11d5..b31deadace 100644
--- a/playwright/e2e/sliding-sync/sliding-sync.spec.ts
+++ b/playwright/e2e/sliding-sync/sliding-sync.spec.ts
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { type Page, type Request } from "@playwright/test";
+import { type Locator, type Page, type Request } from "@playwright/test";
 
 import { test as base, expect } from "../../element-web-test";
 import type { ElementAppPage } from "../../pages/ElementAppPage";
@@ -38,7 +38,7 @@ const test = base.extend<{
 
 test.describe("Sliding Sync", () => {
     const checkOrder = async (wantOrder: string[], page: Page) => {
-        await expect(page.getByRole("group", { name: "Rooms" }).locator(".mx_RoomTile_title")).toHaveText(wantOrder);
+        await expect(page.getByTestId("room-list").locator(".mx_RoomListItemView_text")).toHaveText(wantOrder);
     };
 
     const bumpRoom = async (roomId: string, app: ElementAppPage) => {
@@ -50,6 +50,18 @@ test.describe("Sliding Sync", () => {
         });
     };
 
+    function getPrimaryFilters(page: Page): Locator {
+        return page.getByTestId("primary-filters");
+    }
+
+    function getRoomOptionsMenu(page: Page): Locator {
+        return page.getByRole("button", { name: "Room Options" });
+    }
+
+    function getFilterExpandButton(page: Page): Locator {
+        return getPrimaryFilters(page).getByRole("button", { name: "Expand filter list" });
+    }
+
     test.use({
         config: {
             features: {
@@ -69,20 +81,15 @@ test.describe("Sliding Sync", () => {
         // create rooms and check room names are correct
         for (const fruit of ["Apple", "Pineapple", "Orange"]) {
             await app.client.createRoom({ name: fruit });
-            await expect(page.getByRole("treeitem", { name: fruit })).toBeVisible();
+            await expect(page.getByRole("option", { name: `Open room ${fruit}` })).toBeVisible();
         }
-
+        const roomList = page.getByTestId("room-list");
         // Check count, 3 fruits + 1 testRoom = 4
-        await expect(page.locator(".mx_RoomSublist_tiles").getByRole("treeitem")).toHaveCount(4);
+        await expect(roomList.getByRole("option")).toHaveCount(4);
         await checkOrder(["Orange", "Pineapple", "Apple", "Test Room"], page);
 
-        const locator = page.getByRole("group", { name: "Rooms" }).locator(".mx_RoomSublist_headerContainer");
-        await locator.hover();
-        await locator.getByRole("button", { name: "List options" }).click();
-
-        // force click as the radio button's size is zero
-        await page.getByRole("menuitemradio", { name: "A-Z" }).dispatchEvent("click");
-        await expect(page.locator(".mx_StyledRadioButton_checked").getByText("A-Z")).toBeVisible();
+        await getRoomOptionsMenu(page).click();
+        await page.getByRole("menuitemradio", { name: "A-Z" }).click();
 
         await checkOrder(["Apple", "Orange", "Pineapple", "Test Room"], page);
     });
@@ -93,11 +100,11 @@ test.describe("Sliding Sync", () => {
         for (const fruit of ["Apple", "Pineapple", "Orange"]) {
             const id = await app.client.createRoom({ name: fruit });
             roomIds.push(id);
-            await expect(page.getByRole("treeitem", { name: fruit })).toBeVisible();
+            await expect(page.getByRole("option", { name: `Open room ${fruit}` })).toBeVisible();
         }
 
         // Select the Test Room
-        await page.getByRole("treeitem", { name: "Test Room" }).click();
+        await page.getByRole("option", { name: "Open room Test Room" }).click();
         const [apple, pineapple, orange] = roomIds;
         await checkOrder(["Orange", "Pineapple", "Apple", "Test Room"], page);
         await bumpRoom(apple, app);
@@ -116,7 +123,7 @@ test.describe("Sliding Sync", () => {
         for (const fruit of ["Apple", "Pineapple", "Orange"]) {
             const id = await app.client.createRoom({ name: fruit });
             roomIds.push(id);
-            await expect(page.getByRole("treeitem", { name: fruit })).toBeVisible();
+            await expect(page.getByRole("option", { name: `Open room ${fruit}` })).toBeVisible();
         }
 
         // Given a list of Orange, Pineapple, Apple - if Pineapple is active and a message is sent in Apple, the list should
@@ -124,7 +131,7 @@ test.describe("Sliding Sync", () => {
         // be Apple, Orange Pineapple - only when you click on a different room do things reshuffle.
 
         // Select the Pineapple room
-        await page.getByRole("treeitem", { name: "Pineapple" }).click();
+        await page.getByRole("option", { name: "Open room Pineapple" }).click();
         await checkOrder(["Orange", "Pineapple", "Apple", "Test Room"], page);
 
         // Move Apple
@@ -132,7 +139,7 @@ test.describe("Sliding Sync", () => {
         await checkOrder(["Apple", "Pineapple", "Orange", "Test Room"], page);
 
         // Select the Test Room
-        await page.getByRole("treeitem", { name: "Test Room" }).click();
+        await page.getByRole("option", { name: "Open room Test Room" }).click();
 
         // the rooms reshuffle to match reality
         await checkOrder(["Apple", "Orange", "Pineapple", "Test Room"], page);
@@ -142,25 +149,20 @@ test.describe("Sliding Sync", () => {
         // send a message in the test room: unread notification count should increment
         await bob.sendMessage(testRoom.roomId, "Hello World");
 
-        const treeItemLocator1 = page.getByRole("treeitem", { name: "Test Room 1 unread message." });
-        await expect(treeItemLocator1.locator(".mx_NotificationBadge_count")).toHaveText("1");
-        // await expect(page.locator(".mx_NotificationBadge")).not.toHaveClass("mx_NotificationBadge_highlighted");
-        await expect(treeItemLocator1.locator(".mx_NotificationBadge")).not.toHaveClass(
-            /mx_NotificationBadge_highlighted/,
-        );
+        const itemLocator1 = page.getByRole("option", { name: "Open room David Langley with 1 unread message." });
+        await expect(itemLocator1.getByTestId("notification-decoration")).toHaveText("1");
 
         // send an @mention: highlight count (red) should be 2.
         await bob.sendMessage(testRoom.roomId, `Hello ${user.displayName}`);
-        const treeItemLocator2 = page.getByRole("treeitem", {
-            name: "Test Room 2 unread messages including mentions.",
+        const itemLocator2 = page.getByRole("treeitem", {
+            name: "Open room Test Room 2 unread messages including mentions.",
         });
-        await expect(treeItemLocator2.locator(".mx_NotificationBadge_count")).toHaveText("2");
-        await expect(treeItemLocator2.locator(".mx_NotificationBadge")).toHaveClass(/mx_NotificationBadge_highlighted/);
+        await expect(itemLocator2.getByTestId("notification-decoration")).toHaveText("2");
 
         // click on the room, the notif counts should disappear
-        await page.getByRole("treeitem", { name: "Test Room 2 unread messages including mentions." }).click();
+        await page.getByRole("option", { name: "Open room Test Room 2 unread messages including mentions." }).click();
         await expect(
-            page.getByRole("treeitem", { name: "Test Room" }).locator("mx_NotificationBadge_count"),
+            page.getByRole("option", { name: "Open room Test Room" }).getByTestId("notification-decoration"),
         ).not.toBeAttached();
     });
 
@@ -175,16 +177,16 @@ test.describe("Sliding Sync", () => {
         // wait for this message to arrive, tell by the room list resorting
         await checkOrder(["Test Room", "Dummy"], page);
 
-        await expect(page.getByRole("treeitem", { name: "Test Room" }).locator(".mx_NotificationBadge")).toBeAttached();
+        await expect(
+            page.getByRole("option", { name: "Open room Test Room" }).getByTestId("notification-decoration"),
+        ).toBeAttached();
     });
 
     test("should update user settings promptly", async ({ page, app }) => {
         await app.settings.openUserSettings("Preferences");
-        const locator = page.locator(".mx_SettingsFlag").filter({ hasText: "Show timestamps in 12 hour format" });
+        const locator = page.getByRole("switch", { name: "Show timestamps in 12 hour format" });
         await expect(locator).toBeVisible();
-        await expect(locator.locator(".mx_ToggleSwitch_on")).not.toBeAttached();
-        await locator.locator(".mx_ToggleSwitch_ball").click();
-        await expect(locator.locator(".mx_ToggleSwitch_on")).toBeAttached();
+        await locator.check();
     });
 
     test("should send subscribe_rooms on room switch if room not already subscribed", async ({ page, app }) => {
@@ -193,7 +195,7 @@ test.describe("Sliding Sync", () => {
         for (const fruit of ["Apple", "Pineapple", "Orange"]) {
             const id = await app.client.createRoom({ name: fruit });
             roomIds.push(id);
-            await expect(page.getByRole("treeitem", { name: fruit })).toBeVisible();
+            await expect(page.getByRole("option", { name: `Open room ${fruit}` })).toBeVisible();
         }
         const [roomAId, roomPId] = roomIds;
 
@@ -206,7 +208,7 @@ test.describe("Sliding Sync", () => {
         // Select the Test Room and wait for playwright to get the request
         const [request] = await Promise.all([
             page.waitForRequest(matchRoomSubRequest(roomAId)),
-            page.getByRole("treeitem", { name: "Apple", exact: true }).click(),
+            page.getByRole("option", { name: "Open room Apple", exact: true }).click(),
         ]);
         const roomSubscriptions = request.postDataJSON().room_subscriptions;
         expect(roomSubscriptions, "room_subscriptions is object").toBeDefined();
@@ -214,7 +216,7 @@ test.describe("Sliding Sync", () => {
         // Switch to another room and wait for playwright to get the request
         await Promise.all([
             page.waitForRequest(matchRoomSubRequest(roomPId)),
-            page.getByRole("treeitem", { name: "Pineapple", exact: true }).click(),
+            page.getByRole("option", { name: "Open room Pineapple", exact: true }).click(),
         ]);
     });
 
@@ -240,34 +242,29 @@ test.describe("Sliding Sync", () => {
             { roomNames, clientUserId },
         );
 
-        await expect(
-            page.getByRole("group", { name: "Invites" }).locator(".mx_RoomSublist_tiles").getByRole("treeitem"),
-        ).toHaveCount(3);
+        await getFilterExpandButton(page).click();
+        const primaryFilters = getPrimaryFilters(page);
+        await primaryFilters.getByRole("option", { name: "Invites" }).click();
+
+        await expect(page.getByTestId("room-list").getByRole("option")).toHaveCount(3);
 
         // Select the room to join
-        await page.getByRole("treeitem", { name: "Room to Join" }).click();
+        await page.getByRole("option", { name: "Open room Room to Join" }).click();
 
         // Accept the invite
         await page.locator(".mx_RoomView").getByRole("button", { name: "Accept" }).click();
 
-        await checkOrder(["Room to Join", "Test Room"], page);
+        await checkOrder(["Room to Rescind", "Room to Reject"], page);
 
         // Select the room to reject
-        await page.getByRole("treeitem", { name: "Room to Reject" }).click();
+        await page.getByRole("option", { name: "Open room Room to Reject" }).click();
 
         // Decline the invite
         await page.locator(".mx_RoomView").getByRole("button", { name: "Decline", exact: true }).click();
 
-        await expect(
-            page.getByRole("group", { name: "Invites" }).locator(".mx_RoomSublist_tiles").getByRole("treeitem"),
-        ).toHaveCount(2);
+        await expect(page.getByTestId("room-list").getByRole("option")).toHaveCount(1);
 
-        // check the lists are correct
-        await checkOrder(["Room to Join", "Test Room"], page);
-
-        const titleLocator = page.getByRole("group", { name: "Invites" }).locator(".mx_RoomTile_title");
-        await expect(titleLocator).toHaveCount(1);
-        await expect(titleLocator).toHaveText("Room to Rescind");
+        await expect(page.getByRole("option", { name: "Open room Room to Rescind" })).toBeVisible();
 
         // now rescind the invite
         await bot.evaluate(
@@ -277,10 +274,14 @@ test.describe("Sliding Sync", () => {
             { roomRescind, clientUserId },
         );
 
+        await page.getByRole("option", { name: "Open room Room to Rescind" }).click();
+
+        await page.locator(".mx_RoomView").getByRole("button", { name: "Forget this room", exact: true }).click();
+
+        await primaryFilters.getByRole("option", { name: "Invites" }).click();
+
         // Wait for the rescind to take effect and check the joined list once more
-        await expect(
-            page.getByRole("group", { name: "Rooms" }).locator(".mx_RoomSublist_tiles").getByRole("treeitem"),
-        ).toHaveCount(2);
+        await expect(page.getByTestId("room-list").getByRole("option")).toHaveCount(2);
 
         await checkOrder(["Room to Join", "Test Room"], page);
     });
@@ -293,19 +294,27 @@ test.describe("Sliding Sync", () => {
         await app.client.evaluate(async (client, roomId) => {
             await client.setRoomTag(roomId, "m.favourite", { order: 0.5 });
         }, roomId);
-        await expect(page.getByRole("group", { name: "Favourites" }).getByText("Favourite DM")).toBeVisible();
-        await expect(page.getByRole("group", { name: "People" }).getByText("Favourite DM")).not.toBeAttached();
+
+        await getFilterExpandButton(page).click();
+        const primaryFilters = getPrimaryFilters(page);
+        await primaryFilters.getByRole("option", { name: "Favourites" }).click();
+
+        await expect(page.getByRole("option", { name: "Favourite DM" })).toBeVisible();
+
+        await primaryFilters.getByRole("option", { name: "People" }).click();
+
+        await expect(page.getByRole("option", { name: "Favourite DM" })).not.toBeAttached();
     });
 
     // Regression test for a bug in SS mode, but would be useful to have in non-SS mode too.
     // This ensures we are setting RoomViewStore state correctly.
     test("should clear the reply to field when swapping rooms", async ({ page, app, testRoom }) => {
         await app.client.createRoom({ name: "Other Room" });
-        await expect(page.getByRole("treeitem", { name: "Other Room" })).toBeVisible();
+        await expect(page.getByRole("option", { name: "Open room Other Room" })).toBeVisible();
         await app.client.sendMessage(testRoom.roomId, "Hello world");
 
         // select the room
-        await page.getByRole("treeitem", { name: "Test Room" }).click();
+        await page.getByRole("option", { name: "Open room Test Room" }).click();
 
         await expect(page.locator(".mx_ReplyPreview")).not.toBeAttached();
 
@@ -318,13 +327,13 @@ test.describe("Sliding Sync", () => {
         await expect(page.locator(".mx_ReplyPreview")).toBeVisible();
 
         // now click Other Room
-        await page.getByRole("treeitem", { name: "Other Room" }).click();
+        await page.getByRole("option", { name: "Open room Other Room" }).click();
 
         // ensure the reply-to disappears
         await expect(page.locator(".mx_ReplyPreview")).not.toBeAttached();
 
         // click back
-        await page.getByRole("treeitem", { name: "Test Room" }).click();
+        await page.getByRole("option", { name: "Open room Test Room" }).click();
 
         // ensure the reply-to reappears
         await expect(page.locator(".mx_ReplyPreview")).toBeVisible();
@@ -338,7 +347,7 @@ test.describe("Sliding Sync", () => {
         await app.client.sendMessage(testRoom.roomId, "Reply to me");
 
         // select the room
-        await page.getByRole("treeitem", { name: "Test Room" }).click();
+        await page.getByRole("option", { name: "Open room Test Room" }).click();
         await expect(page.locator(".mx_ReplyPreview")).not.toBeAttached();
 
         // click reply-to on the Reply to me message
@@ -350,7 +359,9 @@ test.describe("Sliding Sync", () => {
         await expect(page.locator(".mx_ReplyPreview")).toBeVisible();
 
         // now click on the permalink for Permalink me
-        await page.locator(".mx_EventTile").filter({ hasText: "Permalink me" }).locator("a").dispatchEvent("click");
+        const tile = page.locator(".mx_EventTile").filter({ hasText: "Permalink me" });
+        await tile.hover();
+        await tile.locator("a").dispatchEvent("click");
 
         // make sure it is now selected with the little green |
         await expect(page.locator(".mx_EventTile_selected").filter({ hasText: "Permalink me" })).toBeVisible();
diff --git a/playwright/e2e/spaces/spaces.spec.ts b/playwright/e2e/spaces/spaces.spec.ts
index 56c8ae22b8..19e619e9c6 100644
--- a/playwright/e2e/spaces/spaces.spec.ts
+++ b/playwright/e2e/spaces/spaces.spec.ts
@@ -11,6 +11,7 @@ import { test, expect } from "../../element-web-test";
 import type { Preset, ICreateRoomOpts } from "matrix-js-sdk/src/matrix";
 import { type ElementAppPage } from "../../pages/ElementAppPage";
 import { isDendrite } from "../../plugins/homeserver/dendrite";
+import { UIFeature } from "../../../src/settings/UIFeature";
 
 async function openSpaceCreateMenu(page: Page): Promise<Locator> {
     await page.getByRole("button", { name: "Create a space" }).click();
@@ -23,7 +24,7 @@ async function openSpaceContextMenu(page: Page, app: ElementAppPage, spaceName:
     return page.locator(".mx_SpacePanel_contextMenu");
 }
 
-function spaceCreateOptions(spaceName: string, roomIds: string[] = []): ICreateRoomOpts {
+function spaceCreateOptions(serverName: string, spaceName: string, roomIds: string[] = []): ICreateRoomOpts {
     return {
         creation_content: {
             type: "m.space",
@@ -35,17 +36,21 @@ function spaceCreateOptions(spaceName: string, roomIds: string[] = []): ICreateR
                     name: spaceName,
                 },
             },
-            ...roomIds.map((r) => spaceChildInitialState(r)),
+            ...roomIds.map((r) => spaceChildInitialState(serverName, r)),
         ],
     };
 }
 
-function spaceChildInitialState(roomId: string, order?: string): ICreateRoomOpts["initial_state"]["0"] {
+function spaceChildInitialState(
+    serverName: string,
+    roomId: string,
+    order?: string,
+): ICreateRoomOpts["initial_state"]["0"] {
     return {
         type: "m.space.child",
         state_key: roomId,
         content: {
-            via: [roomId.split(":")[1]],
+            via: [serverName],
             order,
         },
     };
@@ -91,9 +96,9 @@ test.describe("Spaces", () => {
             await page.getByRole("button", { name: "Go to my first room" }).click();
 
             // Assert rooms exist in the room list
-            await expect(page.getByRole("treeitem", { name: "General" })).toBeVisible();
-            await expect(page.getByRole("treeitem", { name: "Random" })).toBeVisible();
-            await expect(page.getByRole("treeitem", { name: "Jokes" })).toBeVisible();
+            await expect(page.getByRole("option", { name: "General" })).toBeVisible();
+            await expect(page.getByRole("option", { name: "Random" })).toBeVisible();
+            await expect(page.getByRole("option", { name: "Jokes" })).toBeVisible();
         },
     );
 
@@ -122,10 +127,10 @@ test.describe("Spaces", () => {
         await page.getByRole("button", { name: "Skip for now" }).click();
 
         // Assert rooms exist in the room list
-        const roomList = page.getByRole("tree", { name: "Rooms" });
-        await expect(roomList.getByRole("treeitem", { name: "General", exact: true })).toBeVisible();
-        await expect(roomList.getByRole("treeitem", { name: "Random", exact: true })).toBeVisible();
-        await expect(roomList.getByRole("treeitem", { name: "Projects", exact: true })).toBeVisible();
+        const roomList = page.getByRole("listbox", { name: "Room list", exact: true });
+        await expect(roomList.getByRole("option", { name: "General" })).toBeVisible();
+        await expect(roomList.getByRole("option", { name: "Random" })).toBeVisible();
+        await expect(roomList.getByRole("option", { name: "Projects" })).toBeVisible();
 
         // Assert rooms exist in the space explorer
         await expect(
@@ -195,7 +200,7 @@ test.describe("Spaces", () => {
 
             await page.getByRole("button", { name: "Skip for now" }).click();
 
-            await page.getByRole("button", { name: "Add room" }).click();
+            await page.getByRole("main").getByRole("button", { name: "Add" }).click();
             await page.getByRole("menuitem", { name: "Add existing room" }).click();
 
             await page.getByRole("checkbox", { name: "Sample Room" }).click();
@@ -240,7 +245,7 @@ test.describe("Spaces", () => {
         });
         await expect(await app.getSpacePanelButton("My Space")).toBeVisible();
 
-        const roomId = await bot.createRoom(spaceCreateOptions("Space Space"));
+        const roomId = await bot.createRoom(spaceCreateOptions(user.homeServer, "Space Space"));
         await bot.inviteUser(roomId, user.userId);
 
         // Assert that `Space Space` is above `My Space` due to it being an invite
@@ -260,7 +265,10 @@ test.describe("Spaces", () => {
         const spaceName = "Spacey Mc. Space Space";
         await app.client.createSpace({
             name: spaceName,
-            initial_state: [spaceChildInitialState(roomId1), spaceChildInitialState(roomId2)],
+            initial_state: [
+                spaceChildInitialState(user.homeServer, roomId1),
+                spaceChildInitialState(user.homeServer, roomId2),
+            ],
         });
 
         await app.viewSpaceHomeByName(spaceName);
@@ -287,7 +295,7 @@ test.describe("Spaces", () => {
             });
             await app.client.createSpace({
                 name: "Root Space",
-                initial_state: [spaceChildInitialState(childSpaceId)],
+                initial_state: [spaceChildInitialState(user.homeServer, childSpaceId)],
             });
 
             // Find collapsed Space panel
@@ -323,7 +331,7 @@ test.describe("Spaces", () => {
             name: "Test Room",
             topic: "This is a topic https://github.com/matrix-org/matrix-react-sdk/pull/10060 with a link",
         });
-        const spaceId = await bot.createRoom(spaceCreateOptions("Test Space", [roomId]));
+        const spaceId = await bot.createRoom(spaceCreateOptions(user.homeServer, "Test Space", [roomId]));
         await bot.inviteUser(spaceId, user.userId);
 
         await expect(await app.getSpacePanelButton("Test Space")).toBeVisible();
@@ -361,12 +369,76 @@ test.describe("Spaces", () => {
         await app.client.createSpace({
             name: "Root Space",
             initial_state: [
-                spaceChildInitialState(childSpaceId1, "a"),
-                spaceChildInitialState(childSpaceId2, "b"),
-                spaceChildInitialState(childSpaceId3, "c"),
+                spaceChildInitialState(user.homeServer, childSpaceId1, "a"),
+                spaceChildInitialState(user.homeServer, childSpaceId2, "b"),
+                spaceChildInitialState(user.homeServer, childSpaceId3, "c"),
             ],
         });
         await app.viewSpaceByName("Root Space");
         await expect(page.locator(".mx_SpaceRoomView")).toMatchScreenshot("space-room-view.png");
     });
+
+    test("should render spaces visibility settings", { tag: "@screenshot" }, async ({ page, app, user, axe }) => {
+        await app.client.createSpace({
+            name: "My Space",
+        });
+        await app.viewSpaceByName("My space");
+        await page.getByLabel("Settings", { exact: true }).click();
+        await app.settings.switchTab("Visibility");
+
+        axe.disableRules("color-contrast"); // XXX: Inheriting colour contrast issues from room view.
+        await expect(axe).toHaveNoViolations();
+        await expect(page.locator("#mx_tabpanel_SPACE_VISIBILITY_TAB")).toMatchScreenshot(
+            "space-visibility-settings.png",
+        );
+    });
+
+    test.describe("Should hide public spaces option if not allowed", () => {
+        test.use({
+            config: {
+                setting_defaults: {
+                    [UIFeature.AllowCreatingPublicSpaces]: false,
+                },
+            },
+        });
+
+        test("should disallow creating public rooms", { tag: "@screenshot" }, async ({ page, user, app }) => {
+            const menu = await openSpaceCreateMenu(page);
+            await menu
+                .locator('.mx_SpaceBasicSettings_avatarContainer input[type="file"]')
+                .setInputFiles("playwright/sample-files/riot.png");
+            await menu.getByRole("textbox", { name: "Name" }).fill("This is a private space");
+            await expect(menu.getByRole("textbox", { name: "Address" })).not.toBeVisible();
+            await menu
+                .getByRole("textbox", { name: "Description" })
+                .fill("This is a private space because we can't make public ones");
+            await menu.getByRole("button", { name: "Create" }).click();
+
+            await page.getByRole("button", { name: "Me and my teammates" }).click();
+
+            // Create the default General & Random rooms, as well as a custom "Projects" room
+            await expect(page.getByPlaceholder("General")).toBeVisible();
+            await expect(page.getByPlaceholder("Random")).toBeVisible();
+            await page.getByPlaceholder("Support").fill("Projects");
+            await page.getByRole("button", { name: "Continue" }).click();
+            await page.getByRole("button", { name: "Skip for now" }).click();
+
+            // Assert rooms exist in the room list
+            const roomList = page.getByRole("listbox", { name: "Room list", exact: true });
+            await expect(roomList.getByRole("option", { name: "General" })).toBeVisible();
+            await expect(roomList.getByRole("option", { name: "Random" })).toBeVisible();
+            await expect(roomList.getByRole("option", { name: "Projects" })).toBeVisible();
+
+            // Assert rooms exist in the space explorer
+            await expect(
+                page.locator(".mx_SpaceHierarchy_list .mx_SpaceHierarchy_roomTile", { hasText: "General" }),
+            ).toBeVisible();
+            await expect(
+                page.locator(".mx_SpaceHierarchy_list .mx_SpaceHierarchy_roomTile", { hasText: "Random" }),
+            ).toBeVisible();
+            await expect(
+                page.locator(".mx_SpaceHierarchy_list .mx_SpaceHierarchy_roomTile", { hasText: "Projects" }),
+            ).toBeVisible();
+        });
+    });
 });
diff --git a/playwright/e2e/spaces/threads-activity-centre/index.ts b/playwright/e2e/spaces/threads-activity-centre/index.ts
index a050175c83..cf889f64cc 100644
--- a/playwright/e2e/spaces/threads-activity-centre/index.ts
+++ b/playwright/e2e/spaces/threads-activity-centre/index.ts
@@ -377,7 +377,7 @@ export class Helpers {
      * Expand the space panel
      */
     expandSpacePanel() {
-        return this.page.getByRole("button", { name: "Expand" }).click();
+        return this.page.getByRole("navigation", { name: "Spaces" }).getByRole("button", { name: "Expand" }).click();
     }
 
     /**
diff --git a/playwright/e2e/spotlight/spotlight.spec.ts b/playwright/e2e/spotlight/spotlight.spec.ts
index 7a5f7d4ea8..e07643c193 100644
--- a/playwright/e2e/spotlight/spotlight.spec.ts
+++ b/playwright/e2e/spotlight/spotlight.spec.ts
@@ -36,7 +36,7 @@ async function startDM(app: ElementAppPage, page: Page, name: string): Promise<v
     await locator.press("Enter");
     // The DM room is created at this point, this can take a little bit of time
     await expect(page.locator(".mx_EventTile_body").getByText("Hey!")).toBeAttached({ timeout: 3000 });
-    await expect(page.getByRole("group", { name: "People" }).getByText(name)).toBeAttached();
+    await expect(page.getByTestId("room-list").getByRole("option", { name: `Open room ${name}` })).toBeVisible();
 }
 
 type RoomRef = { name: string; roomId: string };
@@ -266,7 +266,9 @@ test.describe("Spotlight", () => {
 
         // Assert DM exists by checking for the first message and the room being in the room list
         await expect(page.locator(".mx_EventTile_body").filter({ hasText: "Hey!" })).toBeAttached({ timeout: 3000 });
-        await expect(page.getByRole("group", { name: "People" })).toContainText(bot2.credentials.displayName);
+        await expect(
+            page.getByTestId("room-list").getByRole("option", { name: `Open room ${bot2.credentials.displayName}` }),
+        ).toBeVisible();
 
         // Invite BotBob into existing DM with ByteBot
         const dmRooms = await app.client.evaluate((client, userId) => {
@@ -279,7 +281,9 @@ test.describe("Spotlight", () => {
         const groupDmName = await app.client.evaluate((client, id) => client.getRoom(id).name, dmRooms[0]);
         await app.client.inviteUser(dmRooms[0], bot1.credentials.userId);
         await expect(roomHeaderName(page).first()).toContainText(groupDmName);
-        await expect(page.getByRole("group", { name: "People" }).first()).toContainText(groupDmName);
+        await expect(
+            page.getByTestId("room-list").getByRole("option", { name: `Open room ${groupDmName}` }),
+        ).toBeVisible();
 
         // Search for BotBob by id, should return group DM and user
         spotlight = await app.openSpotlight();
diff --git a/playwright/e2e/threads/threads.spec.ts b/playwright/e2e/threads/threads.spec.ts
index 89cfe418ba..5ffc2003b8 100644
--- a/playwright/e2e/threads/threads.spec.ts
+++ b/playwright/e2e/threads/threads.spec.ts
@@ -39,11 +39,16 @@ test.describe("Threads", () => {
 
         const ThreadViewGroupSpacingStart = "56px"; // --ThreadView_group_spacing-start
         // Exclude timestamp and read marker from snapshots
-        const mask = [page.locator(".mx_MessageTimestamp"), page.locator(".mx_MessagePanel_myReadMarker")];
+        const mask = [page.locator(".mx_MessagePanel_myReadMarker")];
+        const css = `
+            .mx_MessageTimestamp {
+                visibility: hidden;
+            }
+        `;
 
         const roomViewLocator = page.locator(".mx_RoomView_body");
         // User sends message
-        const textbox = roomViewLocator.getByRole("textbox", { name: "Send a message…" });
+        const textbox = roomViewLocator.getByRole("textbox", { name: "Send an unencrypted message…" });
         await textbox.fill("Hello Mr. Bot");
         await textbox.press("Enter");
 
@@ -74,13 +79,15 @@ test.describe("Threads", () => {
 
         // Take snapshots in group layout and bubble layout (IRC layout is not available on ThreadView)
         await expect(page.locator(".mx_ThreadView")).toMatchScreenshot("Initial_ThreadView_on_group_layout.png", {
-            mask: mask,
+            mask,
+            css,
         });
         await app.settings.setValue("layout", null, SettingLevel.DEVICE, Layout.Bubble);
         await expect(page.locator(".mx_ThreadView .mx_EventTile[data-layout='bubble']")).toHaveCount(2);
 
         await expect(page.locator(".mx_ThreadView")).toMatchScreenshot("Initial_ThreadView_on_bubble_layout.png", {
-            mask: mask,
+            mask,
+            css,
         });
 
         // Set the group layout
@@ -108,7 +115,7 @@ test.describe("Threads", () => {
         await app.settings.setValue("layout", null, SettingLevel.DEVICE, Layout.Group);
 
         // User responds in thread
-        locator = page.locator(".mx_ThreadView").getByRole("textbox", { name: "Send a message…" });
+        locator = page.locator(".mx_ThreadView").getByRole("textbox", { name: "Send an unencrypted message…" });
         await locator.fill("Test");
         await locator.press("Enter");
 
@@ -154,7 +161,8 @@ test.describe("Threads", () => {
         await expect(page.locator(".mx_ThreadView")).toMatchScreenshot(
             "ThreadView_with_reaction_and_a_hidden_event_on_group_layout.png",
             {
-                mask: mask,
+                mask,
+                css,
             },
         );
 
@@ -178,7 +186,8 @@ test.describe("Threads", () => {
         await expect(page.locator(".mx_ThreadView")).toMatchScreenshot(
             "ThreadView_with_reaction_and_a_hidden_event_on_bubble_layout.png",
             {
-                mask: mask,
+                mask,
+                css,
             },
         );
 
@@ -214,7 +223,8 @@ test.describe("Threads", () => {
         await expect(page.locator(".mx_ThreadView")).toMatchScreenshot(
             "ThreadView_with_redacted_messages_on_group_layout.png",
             {
-                mask: mask,
+                mask,
+                css,
             },
         );
         await app.settings.setValue("layout", null, SettingLevel.DEVICE, Layout.Bubble);
@@ -222,7 +232,8 @@ test.describe("Threads", () => {
         await expect(page.locator(".mx_ThreadView")).toMatchScreenshot(
             "ThreadView_with_redacted_messages_on_bubble_layout.png",
             {
-                mask: mask,
+                mask,
+                css,
             },
         );
 
@@ -262,7 +273,7 @@ test.describe("Threads", () => {
         await locator.locator(".mx_EventTile_line").click();
 
         // User responds & asserts
-        locator = page.locator(".mx_ThreadView").getByRole("textbox", { name: "Send a message…" });
+        locator = page.locator(".mx_ThreadView").getByRole("textbox", { name: "Send an unencrypted message…" });
         await locator.fill("Great!");
         await locator.press("Enter");
 
@@ -335,8 +346,8 @@ test.describe("Threads", () => {
 
             // Send message
             const locator = page.locator(".mx_RoomView_body");
-            await locator.getByRole("textbox", { name: "Send a message…" }).fill("Hello Mr. Bot");
-            await locator.getByRole("textbox", { name: "Send a message…" }).press("Enter");
+            await locator.getByRole("textbox", { name: "Send an unencrypted message…" }).fill("Hello Mr. Bot");
+            await locator.getByRole("textbox", { name: "Send an unencrypted message…" }).press("Enter");
             // Create thread
             const locator2 = locator.locator(".mx_EventTile[data-scroll-tokens]").filter({ hasText: "Hello Mr. Bot" });
             await locator2.hover();
@@ -362,11 +373,11 @@ test.describe("Threads", () => {
 
             // Exclude timestamp, read marker, and maplibregl-map from snapshots
             const css =
-                ".mx_MessageTimestamp, .mx_MessagePanel_myReadMarker, .maplibregl-map { visibility: hidden !important; }";
+                ".mx_MessageTimestamp, .mx_MessagePanel_myReadMarker, .maplibregl-map, .maplibregl-ctrl-attrib { visibility: hidden !important; }";
 
             let locator = page.locator(".mx_RoomView_body");
             // User sends message
-            let textbox = locator.getByRole("textbox", { name: "Send a message…" });
+            let textbox = locator.getByRole("textbox", { name: "Send an unencrypted message…" });
             await textbox.fill("Hello Mr. Bot");
             await textbox.press("Enter");
             // Wait for message to send, get its ID and save as @threadId
@@ -395,7 +406,7 @@ test.describe("Threads", () => {
             locator = page.locator(".mx_ThreadView");
             await locator.locator(".mx_EventTile_last").hover();
             await locator.locator(".mx_EventTile_last").getByRole("button", { name: "Reply" }).click();
-            textbox = locator.getByRole("textbox", { name: "Reply to thread…" });
+            textbox = locator.getByRole("textbox", { name: "Reply to unencrypted thread…" });
             await textbox.fill("Please come here");
             await textbox.press("Enter");
             // Wait until the reply is sent
@@ -414,7 +425,7 @@ test.describe("Threads", () => {
 
         // Send message
         let locator = page.locator(".mx_RoomView_body");
-        let textbox = locator.getByRole("textbox", { name: "Send a message…" });
+        let textbox = locator.getByRole("textbox", { name: "Send an unencrypted message…" });
         await textbox.fill("Hello Mr. Bot");
         await textbox.press("Enter");
         // Create thread
@@ -425,7 +436,7 @@ test.describe("Threads", () => {
 
         // Send message to thread
         locator = page.locator(".mx_ThreadPanel");
-        textbox = locator.getByRole("textbox", { name: "Send a message…" });
+        textbox = locator.getByRole("textbox", { name: "Send an unencrypted message…" });
         await textbox.fill("Hello Mr. User");
         await textbox.press("Enter");
         await expect(locator.locator(".mx_EventTile_last").getByText("Hello Mr. User")).toBeAttached();
@@ -445,7 +456,7 @@ test.describe("Threads", () => {
         await expect(locator.locator(".mx_EventTile").last().getByText("Hello Mr. User")).toBeAttached();
     });
 
-    test("navigate through right panel", async ({ page, app, user }) => {
+    test("navigate through right panel", { tag: "@screenshot" }, async ({ page, app, user }) => {
         // Create room
         const roomId = await app.client.createRoom({});
         await page.goto("/#/room/" + roomId);
@@ -456,7 +467,7 @@ test.describe("Threads", () => {
          */
         const sendMessage = async (message: string) => {
             const messageComposer = page.getByRole("region", { name: "Message composer" });
-            const textbox = messageComposer.getByRole("textbox", { name: "Send a message…" });
+            const textbox = messageComposer.getByRole("textbox", { name: "Send an unencrypted message…" });
             await textbox.fill(message);
             await textbox.press("Enter");
         };
@@ -478,7 +489,7 @@ test.describe("Threads", () => {
 
             // Send a message in the thread
             const threadPanel = page.locator(".mx_ThreadPanel");
-            const textbox = threadPanel.getByRole("textbox", { name: "Send a message…" });
+            const textbox = threadPanel.getByRole("textbox", { name: "Send an unencrypted message…" });
             await textbox.fill(threadMessage);
             await textbox.press("Enter");
             await expect(threadPanel.locator(".mx_EventTile_last").getByText(threadMessage)).toBeVisible();
@@ -497,6 +508,9 @@ test.describe("Threads", () => {
         await expect(
             threadPanel.locator(".mx_EventTile_last").getByText("Hello again Mr. User in a thread"),
         ).toBeVisible();
+        await expect(threadPanel).toMatchScreenshot("thread-panel.png", {
+            css: ".mx_MessageTimestamp { visibility: hidden !important; }",
+        });
 
         const rightPanel = page.locator(".mx_RightPanel");
         // Check that the threads are listed
diff --git a/playwright/e2e/timeline/media-preview-settings.spec.ts b/playwright/e2e/timeline/media-preview-settings.spec.ts
index e32a7dbc82..617aa08c09 100644
--- a/playwright/e2e/timeline/media-preview-settings.spec.ts
+++ b/playwright/e2e/timeline/media-preview-settings.spec.ts
@@ -50,9 +50,12 @@ test.describe("Media preview settings", () => {
                 }
             `,
         });
-        await expect(
-            page.getByRole("tree", { name: "Rooms" }).getByRole("treeitem", { name: "Test room" }),
-        ).toMatchScreenshot("invite-room-tree-no-avatar.png");
+
+        const testRoomTile = page
+            .getByRole("listbox", { name: "Room list" })
+            .getByRole("option", { name: "Test room" });
+        await expect(testRoomTile).toBeVisible();
+        await expect(testRoomTile).toMatchScreenshot("invite-room-tree-no-avatar.png");
 
         // And then go back to being visible
         settings = await app.settings.openUserSettings("Preferences");
@@ -70,9 +73,7 @@ test.describe("Media preview settings", () => {
                 }
             `,
         });
-        await expect(
-            page.getByRole("tree", { name: "Rooms" }).getByRole("treeitem", { name: "Test room" }),
-        ).toMatchScreenshot("invite-room-tree-with-avatar.png");
+        await expect(testRoomTile).toMatchScreenshot("invite-room-tree-with-avatar.png");
     });
 
     test("should be able to hide media in rooms globally", async ({ page, app, room, user }) => {
diff --git a/playwright/e2e/timeline/timeline.spec.ts b/playwright/e2e/timeline/timeline.spec.ts
index e5bfa0c71b..806e7e9038 100644
--- a/playwright/e2e/timeline/timeline.spec.ts
+++ b/playwright/e2e/timeline/timeline.spec.ts
@@ -181,8 +181,10 @@ test.describe("Timeline", () => {
                 await expect(gels.getByRole("button", { name: "Collapse" })).toBeVisible();
 
                 await expect(page.locator(".mx_MainSplit")).toMatchScreenshot("expanded-gels-irc-layout.png", {
-                    mask: [page.locator(".mx_MessageTimestamp")],
                     css: `
+                    .mx_MessageTimestamp {
+                        visibility: hidden;
+                    }
                     .mx_TopUnreadMessagesBar, .mx_MessagePanel_myReadMarker {
                         display: none !important;
                     }
@@ -215,8 +217,10 @@ test.describe("Timeline", () => {
                 await expect(gels.getByRole("button", { name: "Collapse" })).toBeVisible();
 
                 await expect(page.locator(".mx_MainSplit")).toMatchScreenshot("expanded-gels-modern-layout.png", {
-                    mask: [page.locator(".mx_MessageTimestamp")],
                     css: `
+                    .mx_MessageTimestamp {
+                        visibility: hidden;
+                    }
                     .mx_TopUnreadMessagesBar, .mx_MessagePanel_myReadMarker {
                         display: none !important;
                     }
@@ -255,7 +259,11 @@ test.describe("Timeline", () => {
                 // Save snapshot of expanded generic event list summary on bubble layout
                 await expect(page.locator(".mx_MainSplit")).toMatchScreenshot("expanded-gels-bubble-layout.png", {
                     // Exclude timestamp from snapshot
-                    mask: [page.locator(".mx_MessageTimestamp")],
+                    css: `
+                        .mx_MessageTimestamp {
+                            visibility: hidden;
+                        }
+                    `,
                 });
 
                 // Click "collapse" link button on the first hovered info event line
@@ -271,7 +279,11 @@ test.describe("Timeline", () => {
 
                 // Save snapshot of collapsed generic event list summary on bubble layout
                 await expect(page.locator(".mx_MainSplit")).toMatchScreenshot("collapsed-gels-bubble-layout.png", {
-                    mask: [page.locator(".mx_MessageTimestamp")],
+                    css: `
+                        .mx_MessageTimestamp {
+                            visibility: hidden;
+                        }
+                    `,
                 });
             },
         );
@@ -312,12 +324,14 @@ test.describe("Timeline", () => {
                     "event-line-inline-start-margin-irc-layout.png",
                     {
                         // Exclude timestamp and read marker from snapshot
-                        mask: [page.locator(".mx_MessageTimestamp")],
                         css: `
-                    .mx_TopUnreadMessagesBar, .mx_MessagePanel_myReadMarker {
-                        display: none !important;
-                    }
-                `,
+                        .mx_MessageTimestamp {
+                            visibility: hidden;
+                        }
+                        .mx_TopUnreadMessagesBar, .mx_MessagePanel_myReadMarker {
+                            display: none !important;
+                        }
+                    `,
                     },
                 );
                 await expect(axe).toHaveNoViolations();
@@ -409,7 +423,11 @@ test.describe("Timeline", () => {
                     "collapsed-gels-and-messages-irc-layout.png",
                     {
                         // Exclude timestamp from snapshot of mx_MainSplit
-                        mask: [page.locator(".mx_MessageTimestamp")],
+                        css: `
+                            .mx_MessageTimestamp {
+                                visibility: hidden;
+                            }
+                        `,
                     },
                 );
 
@@ -428,7 +446,11 @@ test.describe("Timeline", () => {
                     "expanded-gels-and-messages-irc-layout.png",
                     {
                         // Exclude timestamp from snapshot of mx_MainSplit
-                        mask: [page.locator(".mx_MessageTimestamp")],
+                        css: `
+                            .mx_MessageTimestamp {
+                                visibility: hidden;
+                            }
+                        `,
                     },
                 );
 
@@ -453,7 +475,11 @@ test.describe("Timeline", () => {
                     "expanded-gels-redaction-placeholder.png",
                     {
                         // Exclude timestamp from snapshot of mx_MainSplit
-                        mask: [page.locator(".mx_MessageTimestamp")],
+                        css: `
+                            .mx_MessageTimestamp {
+                                visibility: hidden;
+                            }
+                        `,
                     },
                 );
 
@@ -461,11 +487,11 @@ test.describe("Timeline", () => {
                 // Send a emote
                 await page
                     .locator(".mx_RoomView_body")
-                    .getByRole("textbox", { name: "Send a message…" })
+                    .getByRole("textbox", { name: "Send an unencrypted message…" })
                     .fill("/me says hello to Mr. Bot");
                 await page
                     .locator(".mx_RoomView_body")
-                    .getByRole("textbox", { name: "Send a message…" })
+                    .getByRole("textbox", { name: "Send an unencrypted message…" })
                     .press("Enter");
                 // Check inline start margin of its avatar
                 // Here --right-padding is for the avatar on the message line
@@ -481,7 +507,11 @@ test.describe("Timeline", () => {
                 // Record alignment of expanded GELS, placeholder of deleted message, and emote
                 await expect(page.locator(".mx_MainSplit")).toMatchScreenshot("expanded-gels-emote-irc-layout.png", {
                     // Exclude timestamp from snapshot of mx_MainSplit
-                    mask: [page.locator(".mx_MessageTimestamp")],
+                    css: `
+                        .mx_MessageTimestamp {
+                            visibility: hidden;
+                        }
+                    `,
                 });
             },
         );
@@ -492,12 +522,14 @@ test.describe("Timeline", () => {
             async ({ page, app, room }) => {
                 const screenshotOptions = {
                     // Hide because flaky - See https://github.com/vector-im/element-web/issues/24957
-                    mask: [page.locator(".mx_MessageTimestamp")],
                     css: `
-                    .mx_TopUnreadMessagesBar, .mx_MessagePanel_myReadMarker {
-                        display: none !important;
-                    }
-                `,
+                        .mx_MessageTimestamp {
+                            visibility: hidden;
+                        }
+                        .mx_TopUnreadMessagesBar, .mx_MessagePanel_myReadMarker {
+                            display: none !important;
+                        }
+                    `,
                 };
 
                 await sendEvent(app.client, room.roomId);
@@ -605,12 +637,10 @@ test.describe("Timeline", () => {
                 await messageEdit(page);
 
                 // Click timestamp to highlight hidden event line
-                const timestamp = page.locator(".mx_RoomView_body .mx_EventTile_info a", {
-                    has: page.locator(".mx_MessageTimestamp"),
-                });
+                const timestamp = page.locator(".mx_RoomView_body .mx_EventTile_info a.mx_MessageTimestamp");
                 // wait for the remote echo otherwise we get an error modal due to a 404 on the /event/ API
                 await expect(timestamp).not.toHaveAttribute("href", /~!/);
-                await timestamp.locator(".mx_MessageTimestamp").click();
+                await timestamp.click();
 
                 // should not add inline start padding to a hidden event line on IRC layout
                 await app.settings.setValue("layout", null, SettingLevel.DEVICE, Layout.IRC);
@@ -620,12 +650,14 @@ test.describe("Timeline", () => {
 
                 // Exclude timestamp and read marker from snapshot
                 const screenshotOptions = {
-                    mask: [page.locator(".mx_MessageTimestamp")],
                     css: `
-                    .mx_TopUnreadMessagesBar, .mx_MessagePanel_myReadMarker {
-                        display: none !important;
-                    }
-                `,
+                        .mx_MessageTimestamp {
+                            visibility: hidden;
+                        }
+                        .mx_TopUnreadMessagesBar, .mx_MessagePanel_myReadMarker {
+                            display: none !important;
+                        }
+                    `,
                 };
 
                 await expect(page.locator(".mx_MainSplit")).toMatchScreenshot(
@@ -654,7 +686,11 @@ test.describe("Timeline", () => {
 
             // Exclude timestamp from snapshot
             const screenshotOptions = {
-                mask: [page.locator(".mx_MessageTimestamp")],
+                css: `
+                    .mx_MessageTimestamp {
+                        visibility: hidden;
+                    }
+                `,
             };
 
             await sendEvent(app.client, room.roomId);
@@ -795,8 +831,10 @@ test.describe("Timeline", () => {
             await app.timeline.scrollToBottom();
             await expect(page.locator(".mx_EventTile_last")).toMatchScreenshot("url-preview.png", {
                 // Exclude timestamp and read marker from snapshot
-                mask: [page.locator(".mx_MessageTimestamp")],
                 css: `
+                    .mx_MessageTimestamp {
+                        visibility: hidden;
+                    }
                     .mx_TopUnreadMessagesBar, .mx_MessagePanel_myReadMarker {
                         display: none !important;
                     }
@@ -892,7 +930,13 @@ test.describe("Timeline", () => {
 
             const tile = page.locator(".mx_EventTile");
             await expect(tile).toBeVisible();
-            await expect(tile).toMatchScreenshot("code-block.png", { mask: [page.locator(".mx_MessageTimestamp")] });
+            await expect(tile).toMatchScreenshot("code-block.png", {
+                css: `
+                    .mx_MessageTimestamp {
+                        visibility: hidden;
+                    }
+                `,
+            });
 
             // Edit a code block and assert the edited code block has been correctly rendered
             await tile.hover();
@@ -904,27 +948,45 @@ test.describe("Timeline", () => {
 
             const newTile = page.locator(".mx_EventTile");
             await expect(newTile).toMatchScreenshot("edited-code-block.png", {
-                mask: [page.locator(".mx_MessageTimestamp")],
+                css: `
+                    .mx_MessageTimestamp {
+                        visibility: hidden;
+                    }
+                `,
             });
         });
 
-        test("should be able to hide an image", { tag: "@screenshot" }, async ({ page, app, room, context }) => {
-            await app.viewRoomById(room.roomId);
-            await sendImage(app.client, room.roomId, NEW_AVATAR);
-            await app.timeline.scrollToBottom();
-            const imgTile = page.locator(".mx_MImageBody").first();
-            await expect(imgTile).toBeVisible();
-            await imgTile.hover();
-            await page.getByRole("button", { name: "Hide" }).click();
+        test(
+            "should be able to hide an image",
+            { tag: "@screenshot" },
+            async ({ page, app, homeserver, room, context }) => {
+                await app.viewRoomById(room.roomId);
 
-            // Check that the image is now hidden.
-            await expect(page.getByRole("button", { name: "Show image" })).toBeVisible();
-        });
+                const bot = new Bot(page, homeserver, {});
+                await bot.prepareClient();
+                await app.client.inviteUser(room.roomId, bot.credentials.userId);
 
-        test("should be able to hide a video", async ({ page, app, room, context }) => {
+                await sendImage(bot, room.roomId, NEW_AVATAR);
+                await app.timeline.scrollToBottom();
+                const imgTile = page.locator(".mx_MImageBody").first();
+                await expect(imgTile).toBeVisible();
+                await imgTile.hover();
+                await page.getByRole("button", { name: "Hide" }).click();
+
+                // Check that the image is now hidden.
+                await expect(page.getByRole("button", { name: "Show image" })).toBeVisible();
+            },
+        );
+
+        test("should be able to hide a video", async ({ page, app, homeserver, room, context }) => {
             await app.viewRoomById(room.roomId);
-            const upload = await app.client.uploadContent(VIDEO_FILE, { name: "bbb.webm", type: "video/webm" });
-            await app.client.sendEvent(room.roomId, null, "m.room.message" as EventType, {
+
+            const bot = new Bot(page, homeserver, {});
+            await bot.prepareClient();
+            await app.client.inviteUser(room.roomId, bot.credentials.userId);
+
+            const upload = await bot.uploadContent(VIDEO_FILE, { name: "bbb.webm", type: "video/webm" });
+            await bot.sendEvent(room.roomId, null, "m.room.message" as EventType, {
                 msgtype: "m.video" as MsgType,
                 body: "bbb.webm",
                 url: upload.content_uri,
@@ -947,7 +1009,7 @@ test.describe("Timeline", () => {
         const reply = "Reply";
         const viewRoomSendMessageAndSetupReply = async (page: Page, app: ElementAppPage, roomId: string) => {
             // View room
-            await page.goto(`/#/room/${roomId}`);
+            await app.viewRoomById(roomId);
 
             // Send a message
             const composer = app.getComposerField();
@@ -979,6 +1041,24 @@ test.describe("Timeline", () => {
             await expect(eventTileLine.getByText(reply)).toHaveCount(1);
         });
 
+        test("can send a voice message", { tag: "@screenshot" }, async ({ page, app, room, context }) => {
+            await app.viewRoomById(room.roomId);
+
+            const composerOptions = await app.openMessageComposerOptions();
+            await composerOptions.getByRole("menuitem", { name: "Voice Message" }).click();
+
+            // Record an empty message
+            await page.waitForTimeout(3000);
+
+            const roomViewBody = page.locator(".mx_RoomView_body");
+            await roomViewBody
+                .locator(".mx_MessageComposer")
+                .getByRole("button", { name: "Send voice message" })
+                .click();
+
+            await expect(roomViewBody.locator(".mx_MVoiceMessageBody")).toMatchScreenshot("voice-message.png");
+        });
+
         test("can reply with a voice message", async ({ page, app, room, context }) => {
             await viewRoomSendMessageAndSetupReply(page, app, room.roomId);
 
@@ -1075,8 +1155,10 @@ test.describe("Timeline", () => {
 
             // Exclude timestamp and read marker from snapshot
             const screenshotOptions = {
-                mask: [page.locator(".mx_MessageTimestamp")],
                 css: `
+                    .mx_MessageTimestamp {
+                        visibility: hidden;
+                    }
                     .mx_TopUnreadMessagesBar, .mx_MessagePanel_myReadMarker {
                         display: none !important;
                     }
@@ -1201,12 +1283,14 @@ test.describe("Timeline", () => {
 
                 // Exclude timestamp and read marker from snapshot
                 const screenshotOptions = {
-                    mask: [page.locator(".mx_MessageTimestamp")],
                     css: `
-                    .mx_TopUnreadMessagesBar, .mx_MessagePanel_myReadMarker {
-                        display: none !important;
-                    }
-                `,
+                        .mx_MessageTimestamp {
+                            visibility: hidden;
+                        }
+                        .mx_TopUnreadMessagesBar, .mx_MessagePanel_myReadMarker {
+                            display: none !important;
+                        }
+                    `,
                 };
 
                 // Make sure the strings do not overflow on IRC layout
@@ -1265,8 +1349,10 @@ test.describe("Timeline", () => {
 
             // Exclude timestamp and read marker from snapshot
             const screenshotOptions = {
-                mask: [page.locator(".mx_MessageTimestamp")],
                 css: `
+                    .mx_MessageTimestamp {
+                        visibility: hidden;
+                    }
                     .mx_TopUnreadMessagesBar, .mx_MessagePanel_myReadMarker {
                         display: none !important;
                     }
diff --git a/playwright/e2e/user-view/user-view.spec.ts b/playwright/e2e/user-view/user-view.spec.ts
index de97133e6a..e09d8a1593 100644
--- a/playwright/e2e/user-view/user-view.spec.ts
+++ b/playwright/e2e/user-view/user-view.spec.ts
@@ -24,7 +24,7 @@ test.describe("UserView", () => {
             css: `
                 /* Use monospace font for consistent mask width */
                 .mx_UserInfo_profile_mxid {
-                    font-family: Inconsolata !important;
+                    font-family: "Fira Code" !important;
                 }
             `,
         });
diff --git a/playwright/e2e/voip/element-call.spec.ts b/playwright/e2e/voip/element-call.spec.ts
new file mode 100644
index 0000000000..7c2494d2ae
--- /dev/null
+++ b/playwright/e2e/voip/element-call.spec.ts
@@ -0,0 +1,662 @@
+/*
+Copyright 2025 New Vector Ltd.
+Copyright (C) 2025 Element Creations Ltd
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { readFile } from "node:fs/promises";
+import { type Page } from "playwright-core";
+
+import type { EventType, Preset } from "matrix-js-sdk/src/matrix";
+import { SettingLevel } from "../../../src/settings/SettingLevel";
+import { test, expect } from "../../element-web-test";
+import type { Credentials } from "../../plugins/homeserver";
+import { Bot } from "../../pages/bot";
+import { isDendrite } from "../../plugins/homeserver/dendrite";
+
+// Load a copy of our fake Element Call app, and the latest widget API.
+// The fake call app does *just* enough to convince Element Web that a call is ongoing
+// and functions like PiP work. It does not actually do anything though, to limit the
+// surface we test.
+const widgetApi = readFile("node_modules/matrix-widget-api/dist/api.min.js", "utf-8");
+const fakeCallClient = readFile("playwright/sample-files/fake-element-call.html", "utf-8");
+
+function assertCommonCallParameters(
+    url: URLSearchParams,
+    hash: URLSearchParams,
+    user: Credentials,
+    room: { roomId: string },
+): void {
+    expect(url.has("widgetId")).toEqual(true);
+    expect(url.has("parentUrl")).toEqual(true);
+
+    expect(hash.get("perParticipantE2EE")).toEqual("false");
+    expect(hash.get("userId")).toEqual(user.userId);
+    expect(hash.get("deviceId")).toEqual(user.deviceId);
+    expect(hash.get("roomId")).toEqual(room.roomId);
+    expect(hash.get("preload")).toEqual("false");
+}
+
+async function sendRTCState(bot: Bot, roomId: string, notification?: "ring" | "notification", intent?: string) {
+    const resp = await bot.sendStateEvent(
+        roomId,
+        "org.matrix.msc3401.call.member",
+        {
+            "application": "m.call",
+            "call_id": "",
+            "m.call.intent": intent,
+            "device_id": "OiDFxsZrjz",
+            "expires": 180000000,
+            "foci_preferred": [
+                {
+                    livekit_alias: roomId,
+                    livekit_service_url: "https://example.org",
+                    type: "livekit",
+                },
+            ],
+            "focus_active": {
+                focus_selection: "oldest_membership",
+                type: "livekit",
+            },
+            "scope": "m.room",
+        },
+        `_@${bot.credentials.userId}_OiDFxsZrjz_m.call`,
+    );
+    if (!notification) {
+        return;
+    }
+    await bot.sendEvent(roomId, null, "org.matrix.msc4075.rtc.notification", {
+        "lifetime": 30000,
+        "m.mentions": {
+            room: true,
+            user_ids: [],
+        },
+        "m.relates_to": {
+            event_id: resp.event_id,
+            rel_type: "org.matrix.msc4075.rtc.notification.parent",
+        },
+        "m.call.intent": intent,
+        "notification_type": notification,
+        "sender_ts": 1758611895996,
+    });
+}
+
+test.describe("Element Call", () => {
+    test.use({
+        config: {
+            element_call: {
+                use_exclusively: false,
+            },
+            features: {
+                feature_group_calls: true,
+            },
+        },
+        displayName: "Alice",
+        botCreateOpts: {
+            autoAcceptInvites: true,
+            displayName: "Bob",
+        },
+    });
+
+    test.beforeEach(async ({ page, user, app }) => {
+        // Mock a widget page. We use a fake version of Element Call here.
+        // We should match on things after .html as these widgets get a ton of extra params.
+        await page.route(/\/widget.html.+/, async (route) => {
+            await route.fulfill({
+                status: 200,
+                // Do enough to
+                body: (await fakeCallClient).replace("widgetCodeHere", await widgetApi),
+            });
+        });
+        await app.settings.setValue(
+            "Developer.elementCallUrl",
+            null,
+            SettingLevel.DEVICE,
+            new URL("/widget.html#", page.url()).toString(),
+        );
+    });
+
+    test.describe("Group Chat", () => {
+        let charlie: Bot;
+        test.use({
+            room: async ({ page, app, user, homeserver, bot }, use) => {
+                charlie = new Bot(page, homeserver, { displayName: "Charlie" });
+                await charlie.prepareClient();
+                const roomId = await app.client.createRoom({
+                    name: "TestRoom",
+                    invite: [bot.credentials.userId, charlie.credentials.userId],
+                });
+                await use({ roomId });
+            },
+        });
+        test("should be able to start a video call", async ({ page, user, room, app }) => {
+            await app.viewRoomById(room.roomId);
+            await expect(page.getByText("Bob and one other were invited and joined")).toBeVisible();
+
+            await page.getByRole("button", { name: "Video call" }).click();
+            await page.getByRole("menuitem", { name: "Element Call" }).click();
+
+            const frameUrlStr = await page.locator("iframe").getAttribute("src");
+            await expect(frameUrlStr).toBeDefined();
+            // Ensure we set the correct parameters for ECall.
+            const url = new URL(frameUrlStr);
+            const hash = new URLSearchParams(url.hash.slice(1));
+            assertCommonCallParameters(url.searchParams, hash, user, room);
+            expect(hash.get("intent")).toEqual("start_call");
+            expect(hash.get("skipLobby")).toEqual(null);
+        });
+
+        test("should NOT be able to start a voice call", async ({ page, user, room, app }) => {
+            // Voice calls do not exist in group rooms
+            await app.viewRoomById(room.roomId);
+            await expect(page.getByText("Bob and one other were invited and joined")).toBeVisible();
+            await expect(page.getByRole("button", { name: "Voice call" })).not.toBeVisible();
+        });
+
+        test("should be able to skip lobby by holding down shift", async ({ page, user, bot, room, app }) => {
+            await app.viewRoomById(room.roomId);
+            await expect(page.getByText("Bob and one other were invited and joined")).toBeVisible();
+
+            await page.getByRole("button", { name: "Video call" }).click();
+            await page.keyboard.down("Shift");
+            await page.getByRole("menuitem", { name: "Element Call" }).click();
+            await page.keyboard.up("Shift");
+
+            const frameUrlStr = await page.locator("iframe").getAttribute("src");
+            await expect(frameUrlStr).toBeDefined();
+            const url = new URL(frameUrlStr);
+            const hash = new URLSearchParams(url.hash.slice(1));
+            assertCommonCallParameters(url.searchParams, hash, user, room);
+            expect(hash.get("intent")).toEqual("start_call");
+            expect(hash.get("skipLobby")).toEqual("true");
+        });
+
+        test("should be able to join a call in progress", async ({ page, user, bot, room, app }) => {
+            await app.viewRoomById(room.roomId);
+            // Allow bob to create a call
+            await expect(page.getByText("Bob and one other were invited and joined")).toBeVisible();
+            await app.client.setPowerLevel(room.roomId, bot.credentials.userId, 50);
+            // Fake a start of a call
+            await sendRTCState(bot, room.roomId);
+            const button = page.getByTestId("join-call-button");
+            await expect(button).toBeInViewport({ timeout: 5000 });
+            // And test joining
+            await button.click();
+            const frameUrlStr = await page.locator("iframe").getAttribute("src");
+            await expect(frameUrlStr).toBeDefined();
+            const url = new URL(frameUrlStr);
+            const hash = new URLSearchParams(url.hash.slice(1));
+            assertCommonCallParameters(url.searchParams, hash, user, room);
+
+            expect(hash.get("intent")).toEqual("join_existing");
+            expect(hash.get("skipLobby")).toEqual(null);
+        });
+
+        [true, false].forEach((skipLobbyToggle) => {
+            test(
+                `should be able to join a call via incoming video call toast (skipLobby=${skipLobbyToggle})`,
+                { tag: ["@screenshot"] },
+                async ({ page, user, bot, room, app }) => {
+                    await app.viewRoomById(room.roomId);
+                    // Allow bob to create a call
+                    await expect(page.getByText("Bob and one other were invited and joined")).toBeVisible();
+                    await app.client.setPowerLevel(room.roomId, bot.credentials.userId, 50);
+                    // Fake a start of a call
+                    await sendRTCState(bot, room.roomId, "notification", "video");
+                    const toast = page.locator(".mx_Toast_toast");
+                    const button = toast.getByRole("button", { name: "Join" });
+
+                    if (skipLobbyToggle) {
+                        await toast.getByRole("switch").check();
+                        await expect(toast).toMatchScreenshot(`incoming-call-group-video-toast-checked.png`);
+                    } else {
+                        await toast.getByRole("switch").uncheck();
+                        await expect(toast).toMatchScreenshot(`incoming-call-group-video-toast-unchecked.png`);
+                    }
+
+                    // And test joining
+                    await button.click();
+                    const frameUrlStr = await page.locator("iframe").getAttribute("src");
+                    await expect(frameUrlStr).toBeDefined();
+                    const url = new URL(frameUrlStr);
+                    const hash = new URLSearchParams(url.hash.slice(1));
+                    assertCommonCallParameters(url.searchParams, hash, user, room);
+
+                    expect(hash.get("intent")).toEqual("join_existing");
+                    expect(hash.get("skipLobby")).toEqual(skipLobbyToggle.toString());
+                },
+            );
+        });
+
+        test(
+            `should be able to join a call via incoming voice call toast`,
+            { tag: ["@screenshot"] },
+            async ({ page, user, bot, room, app }) => {
+                await app.viewRoomById(room.roomId);
+                // Allow bob to create a call
+                await expect(page.getByText("Bob and one other were invited and joined")).toBeVisible();
+                await app.client.setPowerLevel(room.roomId, bot.credentials.userId, 50);
+                // Fake a start of a call
+                await sendRTCState(bot, room.roomId, "notification", "audio");
+                const toast = page.locator(".mx_Toast_toast");
+                const button = toast.getByRole("button", { name: "Join" });
+
+                await expect(toast).toMatchScreenshot(`incoming-call-group-voice-toast.png`);
+
+                // And test joining
+                await button.click();
+                const frameUrlStr = await page.locator("iframe").getAttribute("src");
+                await expect(frameUrlStr).toBeDefined();
+                const url = new URL(frameUrlStr);
+                const hash = new URLSearchParams(url.hash.slice(1));
+                assertCommonCallParameters(url.searchParams, hash, user, room);
+
+                expect(hash.get("intent")).toEqual("join_existing");
+                expect(hash.get("skipLobby")).toEqual("true");
+            },
+        );
+    });
+
+    test.describe("DMs", () => {
+        test.use({
+            room: async ({ page, app, user, bot }, use) => {
+                const roomId = await app.client.createRoom({
+                    preset: "trusted_private_chat" as Preset.TrustedPrivateChat,
+                    invite: [bot.credentials.userId],
+                });
+                await bot.awaitRoomMembership(roomId);
+                await app.client.setAccountData("m.direct" as EventType.Direct, {
+                    [bot.credentials.userId]: [roomId],
+                });
+                await use({ roomId });
+            },
+        });
+
+        test("should be able to start a video call", async ({ page, user, room, app }) => {
+            await app.viewRoomById(room.roomId);
+            await expect(page.getByText("Bob joined the room")).toBeVisible();
+
+            await page.getByRole("button", { name: "Video call" }).click();
+            await page.getByRole("menuitem", { name: "Element Call" }).click();
+            const frameUrlStr = await page.locator("iframe").getAttribute("src");
+
+            await expect(frameUrlStr).toBeDefined();
+            const url = new URL(frameUrlStr);
+            const hash = new URLSearchParams(url.hash.slice(1));
+            assertCommonCallParameters(url.searchParams, hash, user, room);
+            expect(hash.get("intent")).toEqual("start_call_dm");
+            expect(hash.get("skipLobby")).toEqual(null);
+        });
+
+        test("should be able to skip lobby by holding down shift", async ({ page, user, room, app }) => {
+            await app.viewRoomById(room.roomId);
+            await expect(page.getByText("Bob joined the room")).toBeVisible();
+
+            await page.getByRole("button", { name: "Video call" }).click();
+            await page.keyboard.down("Shift");
+            await page.getByRole("menuitem", { name: "Element Call" }).click();
+            await page.keyboard.up("Shift");
+            const frameUrlStr = await page.locator("iframe").getAttribute("src");
+
+            await expect(frameUrlStr).toBeDefined();
+            const url = new URL(frameUrlStr);
+            const hash = new URLSearchParams(url.hash.slice(1));
+            assertCommonCallParameters(url.searchParams, hash, user, room);
+            expect(hash.get("intent")).toEqual("start_call_dm");
+            expect(hash.get("skipLobby")).toEqual("true");
+        });
+
+        test("should be able to join a call in progress", async ({ page, user, bot, room, app }) => {
+            await app.viewRoomById(room.roomId);
+            await expect(page.getByText("Bob joined the room")).toBeVisible();
+            // Fake a start of a call
+            await sendRTCState(bot, room.roomId);
+            const button = page.getByTestId("join-call-button");
+            await expect(button).toBeInViewport({ timeout: 5000 });
+            // And test joining
+            await button.click();
+            const frameUrlStr = await page.locator("iframe").getAttribute("src");
+            await expect(frameUrlStr).toBeDefined();
+            const url = new URL(frameUrlStr);
+            const hash = new URLSearchParams(url.hash.slice(1));
+            assertCommonCallParameters(url.searchParams, hash, user, room);
+
+            expect(hash.get("intent")).toEqual("join_existing_dm");
+            expect(hash.get("skipLobby")).toEqual(null);
+        });
+
+        [true, false].forEach((skipLobbyToggle) => {
+            test(
+                `should be able to join a call via incoming call toast (skipLobby=${skipLobbyToggle})`,
+                { tag: ["@screenshot"] },
+                async ({ page, user, bot, room, app }) => {
+                    await app.viewRoomById(room.roomId);
+                    await expect(page.getByText("Bob joined the room")).toBeVisible();
+                    // Fake a start of a call
+                    await sendRTCState(bot, room.roomId, "ring", "video");
+                    const toast = page.locator(".mx_Toast_toast");
+                    const button = toast.getByRole("button", { name: "Accept" });
+                    if (skipLobbyToggle) {
+                        await toast.getByRole("switch").check();
+                    } else {
+                        await toast.getByRole("switch").uncheck();
+                    }
+                    await expect(toast).toMatchScreenshot(
+                        `incoming-call-dm-video-toast-${skipLobbyToggle ? "checked" : "unchecked"}.png`,
+                        {
+                            // Hide UserId
+                            css: `
+                            .mx_IncomingCallToast_AvatarWithDetails span:nth-child(2) {
+                                opacity: 0;
+                            }
+                        `,
+                        },
+                    );
+
+                    // And test joining
+                    await button.click();
+                    const frameUrlStr = await page.locator("iframe").getAttribute("src");
+                    await expect(frameUrlStr).toBeDefined();
+                    const url = new URL(frameUrlStr);
+                    const hash = new URLSearchParams(url.hash.slice(1));
+                    assertCommonCallParameters(url.searchParams, hash, user, room);
+
+                    expect(hash.get("intent")).toEqual("join_existing_dm");
+                    expect(hash.get("skipLobby")).toEqual(skipLobbyToggle.toString());
+                },
+            );
+        });
+
+        test(
+            `should be able to join a call via incoming voice call toast`,
+            { tag: ["@screenshot"] },
+            async ({ page, user, bot, room, app }) => {
+                await app.viewRoomById(room.roomId);
+                await expect(page.getByText("Bob joined the room")).toBeVisible();
+                // Fake a start of a call
+                await sendRTCState(bot, room.roomId, "ring", "audio");
+                const toast = page.locator(".mx_Toast_toast");
+                const button = toast.getByRole("button", { name: "Accept" });
+
+                await expect(toast).toMatchScreenshot(`incoming-call-dm-voice-toast.png`, {
+                    // Hide UserId
+                    css: `
+                        .mx_IncomingCallToast_AvatarWithDetails span:nth-child(2) {
+                            opacity: 0;
+                        }
+                    `,
+                });
+
+                // And test joining
+                await button.click();
+                const frameUrlStr = await page.locator("iframe").getAttribute("src");
+                await expect(frameUrlStr).toBeDefined();
+                const url = new URL(frameUrlStr);
+                const hash = new URLSearchParams(url.hash.slice(1));
+                assertCommonCallParameters(url.searchParams, hash, user, room);
+
+                expect(hash.get("intent")).toEqual("join_existing_dm_voice");
+                expect(hash.get("skipLobby")).toEqual("true");
+            },
+        );
+    });
+
+    test.describe("Video Rooms", () => {
+        test.use({
+            config: {
+                features: {
+                    feature_video_rooms: true,
+                    feature_element_call_video_rooms: true,
+                },
+            },
+        });
+        test("should be able to create and join a video room", async ({ page, user }) => {
+            await page
+                .getByRole("navigation", { name: "Room list" })
+                .getByRole("button", { name: "New conversation" })
+                .click();
+            await page.getByRole("menuitem", { name: "New video room" }).click();
+            await page.getByRole("textbox", { name: "Name" }).fill("Test room");
+            await page.getByRole("button", { name: "Create video room" }).click();
+            await expect(page).toHaveURL(new RegExp(`/#/room/`));
+            const roomId = new URL(page.url()).hash.slice("#/room/".length);
+
+            const frameUrlStr = await page.locator("iframe").getAttribute("src");
+            await expect(frameUrlStr).toBeDefined();
+            // Ensure we set the correct parameters for ECall.
+            const url = new URL(frameUrlStr);
+            const hash = new URLSearchParams(url.hash.slice(1));
+            assertCommonCallParameters(url.searchParams, hash, user, { roomId });
+            expect(hash.get("intent")).toEqual("join_existing");
+            expect(hash.get("skipLobby")).toEqual("false");
+            expect(hash.get("returnToLobby")).toEqual("true");
+        });
+    });
+
+    test.describe("Switching rooms", () => {
+        let charlie: Bot;
+        test.use({
+            room: async ({ page, app, user, homeserver, bot }, use) => {
+                charlie = new Bot(page, homeserver, { displayName: "Charlie" });
+                await charlie.prepareClient();
+                const roomId = await app.client.createRoom({
+                    name: "TestRoom",
+                    invite: [bot.credentials.userId, charlie.credentials.userId],
+                });
+                await app.client.createRoom({
+                    name: "OtherRoom",
+                });
+                await use({ roomId });
+            },
+        });
+
+        async function openAndJoinCall(page: Page, existing = false) {
+            if (existing) {
+                await page.getByTestId("join-call-button").click();
+            } else {
+                await page.getByRole("button", { name: "Video call" }).click();
+                await page.getByRole("menuitem", { name: "Element Call" }).click();
+            }
+            const iframe = page.locator("iframe");
+            await expect(iframe).toBeVisible();
+            const frameUrlStr = await page.locator("iframe").getAttribute("src");
+            const callFrame = page.frame({ url: frameUrlStr });
+            await callFrame.getByRole("button", { name: "Join Call" }).click();
+            await expect(callFrame.getByText("In call", { exact: true })).toBeVisible();
+
+            // Wait for Element Web to pickup the RTC session and update the room list entry.
+            await expect(await page.getByTestId("notification-decoration")).toBeVisible();
+        }
+
+        test("should be able to switch rooms and have the call persist", async ({ page, user, room, app }) => {
+            await app.viewRoomById(room.roomId);
+            await expect(page.getByText("Bob and one other were invited and joined")).toBeVisible();
+
+            await openAndJoinCall(page);
+            await app.viewRoomByName("OtherRoom");
+
+            // We should have a PiP container here.
+            await expect(page.locator(".mx_AppTile_persistedWrapper")).toBeVisible();
+        });
+
+        test("should be able to start a call, close it via PiP, and start again in the same room", async ({
+            page,
+            user,
+            room,
+            app,
+        }) => {
+            await app.viewRoomById(room.roomId);
+            await expect(page.getByText("Bob and one other were invited and joined")).toBeVisible();
+
+            await openAndJoinCall(page);
+            await app.viewRoomByName("OtherRoom");
+            const pipContainer = page.locator(".mx_WidgetPip");
+
+            // We should have a PiP container here.
+            await expect(pipContainer).toBeVisible();
+
+            // Leave the call.
+            const overlay = page.locator(".mx_WidgetPip_overlay");
+            await overlay.hover({ timeout: 2000 }); // Show the call footer.
+            await overlay.getByRole("button", { name: "Leave", exact: true }).click();
+
+            // PiP container goes.
+            await expect(pipContainer).not.toBeVisible();
+
+            // Wait for call to stop.
+            await expect(await page.getByTestId("notification-decoration")).not.toBeVisible();
+            await app.viewRoomById(room.roomId);
+            await expect(await page.getByTestId("join-call-button")).not.toBeVisible();
+
+            // Join the call again.
+            await openAndJoinCall(page);
+        });
+
+        test("should be able to start a call, close it via PiP, and start again in a different room", async ({
+            page,
+            user,
+            room,
+            app,
+        }) => {
+            await app.viewRoomById(room.roomId);
+            await expect(page.getByText("Bob and one other were invited and joined")).toBeVisible();
+
+            await openAndJoinCall(page);
+            await app.viewRoomByName("OtherRoom");
+            const pipContainer = page.locator(".mx_WidgetPip");
+
+            // We should have a PiP container here.
+            await expect(pipContainer).toBeVisible();
+
+            // Leave the call.
+            const overlay = page.locator(".mx_WidgetPip_overlay");
+            await overlay.hover({ timeout: 2000 }); // Show the call footer.
+            await overlay.getByRole("button", { name: "Leave", exact: true }).click();
+
+            // PiP container goes.
+            await expect(pipContainer).not.toBeVisible();
+
+            // Wait for call to stop.
+            await expect(await page.getByTestId("notification-decoration")).not.toBeVisible();
+            await expect(await page.getByTestId("join-call-button")).not.toBeVisible();
+
+            // Join the call again, but from the other room.
+            await openAndJoinCall(page);
+        });
+
+        // For https://github.com/element-hq/element-web/issues/30838
+        test("should be able to join a call, leave via PiP, and rejoin the call", async ({
+            page,
+            user,
+            room,
+            app,
+            bot,
+        }) => {
+            await app.viewRoomById(room.roomId);
+            await expect(page.getByText("Bob and one other were invited and joined")).toBeVisible();
+            await app.client.setPowerLevel(room.roomId, bot.credentials.userId, 50);
+
+            await sendRTCState(bot, room.roomId);
+            await openAndJoinCall(page, true);
+
+            await app.viewRoomByName("OtherRoom");
+            const pipContainer = page.locator(".mx_WidgetPip");
+
+            // We should have a PiP container here.
+            await expect(pipContainer).toBeVisible();
+
+            // Leave the call.
+            const overlay = page.locator(".mx_WidgetPip_overlay");
+            await overlay.hover({ timeout: 2000 }); // Show the call footer.
+            await overlay.getByRole("button", { name: "Leave", exact: true }).click();
+
+            // PiP container goes.
+            await expect(pipContainer).not.toBeVisible();
+
+            // Rejoin the call
+            await app.viewRoomById(room.roomId);
+            await openAndJoinCall(page, true);
+        });
+    });
+
+    test.describe("Widget leak bug reproduction", { tag: ["@no-firefox", "@no-webkit"] }, () => {
+        test.skip(isDendrite, "No need to test on other HS, this is a client bug reproduction");
+        test.use({
+            config: {
+                features: {
+                    feature_video_rooms: true,
+                    feature_element_call_video_rooms: true,
+                },
+            },
+        });
+
+        const fakeCallClientSend = readFile("playwright/sample-files/fake-element-call-with-send.html", "utf-8");
+
+        let charlie: Bot;
+        test.use({
+            room: async ({ page, app, user, homeserver, bot }, use) => {
+                charlie = new Bot(page, homeserver, { displayName: "Charlie" });
+                await charlie.prepareClient();
+                const roomId = await app.client.createRoom({
+                    name: "VideoRoom",
+                    invite: [bot.credentials.userId, charlie.credentials.userId],
+                    creation_content: {
+                        type: "org.matrix.msc3417.call",
+                    },
+                });
+                await app.client.createRoom({
+                    name: "OtherRoom",
+                });
+                await use({ roomId });
+            },
+        });
+
+        test.beforeEach(async ({ page, user, app }) => {
+            // use a specific widget to reproduce the bug.
+            // Mock a widget page. We use a fake version of Element Call here.
+            // We should match on things after .html as these widgets get a ton of extra params.
+            await page.route(/\/widget-with-send.html.+/, async (route) => {
+                await route.fulfill({
+                    status: 200,
+                    // Do enough to
+                    body: (await fakeCallClientSend).replace("widgetCodeHere", await widgetApi),
+                });
+            });
+            await app.settings.setValue(
+                "Developer.elementCallUrl",
+                null,
+                SettingLevel.DEVICE,
+                new URL("/widget-with-send.html#", page.url()).toString(),
+            );
+        });
+
+        test("Switching rooms should not leak widgets", async ({ page, user, room, app }) => {
+            await app.viewRoomByName("VideoRoom");
+
+            await expect(page.getByRole("heading", { name: "Approve widget permissions" })).toBeVisible();
+            // approve
+            await page.getByTestId("dialog-primary-button").click();
+
+            // Switch back and forth a few times to trigger the bug.
+
+            await app.viewRoomByName("OtherRoom");
+            await app.viewRoomByName("VideoRoom");
+            await app.viewRoomByName("OtherRoom");
+            await app.viewRoomByName("VideoRoom");
+
+            // For this test we want to display the chat area alongside the widget
+            await page.getByRole("button", { name: "Chat" }).click();
+
+            await page
+                .locator('iframe[title="Element Call"]')
+                .contentFrame()
+                .getByRole("button", { name: "Send Room Message" })
+                .click();
+
+            const messageSent = await page.getByText("I sent this once!!").count();
+
+            expect(messageSent).toBe(1);
+        });
+    });
+});
diff --git a/playwright/e2e/voip/pstn.spec.ts b/playwright/e2e/voip/pstn.spec.ts
index 9a35d9b9c3..4241db6522 100644
--- a/playwright/e2e/voip/pstn.spec.ts
+++ b/playwright/e2e/voip/pstn.spec.ts
@@ -24,7 +24,7 @@ test.describe("PSTN", () => {
         await toasts.rejectToast("Notifications");
         await toasts.assertNoToasts();
 
-        await expect(page.locator(".mx_LeftPanel_filterContainer")).toMatchScreenshot("dialpad-trigger.png");
+        await expect(page.getByTestId("room-list-search")).toMatchScreenshot("dialpad-trigger.png");
         await page.getByLabel("Open dial pad").click();
         await expect(page.locator(".mx_Dialog")).toMatchScreenshot("dialpad.png");
     });
diff --git a/playwright/e2e/widgets/jitsi.spec.ts b/playwright/e2e/widgets/jitsi.spec.ts
new file mode 100644
index 0000000000..fc269c506b
--- /dev/null
+++ b/playwright/e2e/widgets/jitsi.spec.ts
@@ -0,0 +1,51 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { test as base, expect } from "../../element-web-test";
+import { Bot } from "../../pages/bot";
+
+const ROOM_NAME = "Jitsi Room";
+
+const test = base.extend<{
+    bot1: Bot;
+    bot2: Bot;
+}>({
+    bot2: async ({ page, homeserver }, use, testInfo) => {
+        const bot = new Bot(page, homeserver, { displayName: `ByteBot_${testInfo.testId}` });
+        await bot.prepareClient(); // eagerly register the bot
+        await use(bot);
+    },
+});
+
+test.describe("Jitsi Calls", () => {
+    test.use({
+        displayName: "Jimmy",
+        botCreateOpts: { displayName: "Bot", autoAcceptInvites: false },
+    });
+
+    test("should be able to pop out a jitsi widget", async ({ page, app, bot, bot2, context }) => {
+        const roomId = await app.client.createRoom({
+            name: ROOM_NAME,
+            invite: [bot.credentials.userId, bot2.credentials.userId],
+        });
+
+        await bot.joinRoom(roomId);
+        await bot2.joinRoom(roomId);
+
+        // open the room
+        await app.viewRoomByName(ROOM_NAME);
+
+        await page.getByRole("button", { name: "Video call" }).click();
+
+        const pagePromise = context.waitForEvent("page");
+
+        await page.getByRole("button", { name: "Popout widget" }).click();
+
+        const newPage = await pagePromise;
+        await expect(newPage.getByRole("button", { name: "Join Conference" })).toBeVisible();
+    });
+});
diff --git a/playwright/e2e/widgets/permissions-dialog.spec.ts b/playwright/e2e/widgets/permissions-dialog.spec.ts
new file mode 100644
index 0000000000..bdaec30cd5
--- /dev/null
+++ b/playwright/e2e/widgets/permissions-dialog.spec.ts
@@ -0,0 +1,98 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { test, expect } from "../../element-web-test";
+
+const DEMO_WIDGET_ID = "demo-widget-id";
+const DEMO_WIDGET_NAME = "Demo Widget";
+const DEMO_WIDGET_TYPE = "demo";
+const ROOM_NAME = "Demo";
+
+const DEMO_WIDGET_HTML = `
+    <html lang="en">
+        <head>
+            <title>Demo Widget</title>
+            <script>
+                let sendEventCount = 0
+                window.onmessage = ev => {
+                    if (ev.data.action === 'capabilities') {
+                        window.parent.postMessage(Object.assign({
+                            response: {
+                                capabilities: [
+                                    "org.matrix.msc2762.timeline:*",
+                                    "org.matrix.msc2762.receive.state_event:m.room.topic",
+                                    "org.matrix.msc2762.send.event:net.widget_echo"
+                                ]
+                            },
+                        }, ev.data), '*');
+                    }
+                };
+            </script>
+        </head>
+    </html>
+`;
+
+test.describe("Widger permissions dialog", () => {
+    test.use({
+        displayName: "Mike",
+    });
+
+    let demoWidgetUrl: string;
+    test.beforeEach(async ({ webserver }) => {
+        demoWidgetUrl = webserver.start(DEMO_WIDGET_HTML);
+    });
+
+    test(
+        "should be updated if user is re-invited into the room with updated state event",
+        { tag: "@screenshot" },
+        async ({ page, app, user, axe }) => {
+            const roomId = await app.client.createRoom({
+                name: ROOM_NAME,
+            });
+
+            // setup widget via state event
+            await app.client.sendStateEvent(
+                roomId,
+                "im.vector.modular.widgets",
+                {
+                    id: DEMO_WIDGET_ID,
+                    creatorUserId: "somebody",
+                    type: DEMO_WIDGET_TYPE,
+                    name: DEMO_WIDGET_NAME,
+                    url: demoWidgetUrl,
+                },
+                DEMO_WIDGET_ID,
+            );
+
+            // set initial layout
+            await app.client.sendStateEvent(
+                roomId,
+                "io.element.widgets.layout",
+                {
+                    widgets: {
+                        [DEMO_WIDGET_ID]: {
+                            container: "top",
+                            index: 1,
+                            width: 100,
+                            height: 0,
+                        },
+                    },
+                },
+                "",
+            );
+
+            // open the room
+            await app.viewRoomByName(ROOM_NAME);
+
+            axe.disableRules("color-contrast"); // XXX: Inheriting colour contrast issues from room view.
+            await expect(axe).toHaveNoViolations();
+            await expect(page.locator(".mx_WidgetCapabilitiesPromptDialog")).toMatchScreenshot(
+                "widget-capabilites-prompt.png",
+            );
+        },
+    );
+});
diff --git a/playwright/element-web-test.ts b/playwright/element-web-test.ts
index 8520533461..bf1353ea6c 100644
--- a/playwright/element-web-test.ts
+++ b/playwright/element-web-test.ts
@@ -107,6 +107,7 @@ interface ExtendedToMatchScreenshotOptions extends ToMatchScreenshotOptions {
     includeDialogBackground?: boolean;
     showTooltips?: boolean;
     timeout?: number;
+    hideJumpToBottomButton?: boolean;
 }
 
 type Expectations = {
@@ -132,6 +133,7 @@ export const expect = baseExpect.extend<Expectations>({
             }
             .mx_BaseAvatar {
                 background-color: var(--cpd-color-fuchsia-1200) !important;
+                border-color: var(--cpd-color-fuchsia-1200) !important;
                 color: white !important;
             }
             .mx_ReplyChain {
@@ -143,7 +145,7 @@ export const expect = baseExpect.extend<Expectations>({
             }
             /* Use monospace font for timestamp for consistent mask width */
             .mx_MessageTimestamp {
-                font-family: Inconsolata !important;
+                font-family: "Fira Code" !important;
             }
         `;
 
@@ -165,6 +167,14 @@ export const expect = baseExpect.extend<Expectations>({
             `;
         }
 
+        if (options?.hideJumpToBottomButton) {
+            css += `
+                .mx_JumpToBottomButton {
+                    display: none !important;
+                }
+            `;
+        }
+
         if (options?.css) {
             css += options.css;
         }
diff --git a/playwright/pages/ElementAppPage.ts b/playwright/pages/ElementAppPage.ts
index afc814b3e1..e51ed7b5d4 100644
--- a/playwright/pages/ElementAppPage.ts
+++ b/playwright/pages/ElementAppPage.ts
@@ -51,9 +51,13 @@ export class ElementAppPage {
     /**
      * Open room creation dialog.
      */
-    public async openCreateRoomDialog(): Promise<Locator> {
-        await this.page.getByRole("button", { name: "Add room", exact: true }).click();
-        await this.page.getByRole("menuitem", { name: "New room", exact: true }).click();
+
+    public async openCreateRoomDialog(roomKindname: "New room" | "New video room" = "New room"): Promise<Locator> {
+        await this.page
+            .getByRole("navigation", { name: "Room list" })
+            .getByRole("button", { name: "New conversation" })
+            .click();
+        await this.page.getByRole("menuitem", { name: roomKindname }).click();
         return this.page.locator(".mx_CreateRoomDialog");
     }
 
@@ -68,14 +72,39 @@ export class ElementAppPage {
         return await this.page.evaluate(() => navigator.clipboard.readText());
     }
 
+    /**
+     * Get the room ID from the current URL.
+     *
+     * @returns The room ID.
+     * @throws if the current URL does not contain a room ID.
+     */
+    public async getCurrentRoomIdFromUrl(): Promise<string> {
+        const urlHash = await this.page.evaluate(() => window.location.hash);
+        if (!urlHash.startsWith("#/room/")) {
+            throw new Error("URL hash suggests we are not in a room");
+        }
+        return urlHash.replace("#/room/", "");
+    }
+
     /**
      * Opens the given room by name. The room must be visible in the
+     * room list and the room may contain unread messages.
+     *
+     * @param name The exact room name to find and click on/open.
+     */
+    public async viewRoomByName(name: string): Promise<void> {
+        // We get the room list by test-id which is a listbox and matching title=name
+        return this.page.getByTestId("room-list").locator(`[title="${name}"]`).first().click();
+    }
+
+    /**
+     * Opens the given room on the old room list by name. The room must be visible in the
      * room list, but the room list may be folded horizontally, and the
      * room may contain unread messages.
      *
      * @param name The exact room name to find and click on/open.
      */
-    public async viewRoomByName(name: string): Promise<void> {
+    public async viewRoomByNameOnOldRoomList(name: string): Promise<void> {
         // We look for the room inside the room list, which is a tree called Rooms.
         //
         // There are 3 cases:
@@ -173,6 +202,21 @@ export class ElementAppPage {
         return this.page.locator(".mx_RightPanel");
     }
 
+    /**
+     * Opens the room info panel if it is not already open.
+     *
+     * TODO: fix this so that it works correctly if, say, the member list was open instead of the room info panel.
+     *
+     * @returns locator to the right panel
+     */
+    public async openRoomInfoPanel(): Promise<Locator> {
+        const locator = this.page.getByTestId("right-panel");
+        if (!(await locator.isVisible())) {
+            await this.page.getByRole("button", { name: "Room info" }).first().click();
+        }
+        return locator;
+    }
+
     /**
      * Opens/closes the memberlist panel
      * @returns locator to the memberlist panel
@@ -185,6 +229,21 @@ export class ElementAppPage {
         return memberlist;
     }
 
+    /**
+     * Open the room info panel, and use it to send an invite to the given user.
+     *
+     * @param userId - The user to invite to the room.
+     */
+    public async inviteUserToCurrentRoom(userId: string): Promise<void> {
+        const rightPanel = await this.openRoomInfoPanel();
+        await rightPanel.getByRole("menuitem", { name: "Invite" }).click();
+
+        const input = this.page.getByRole("dialog").getByTestId("invite-dialog-input");
+        await input.fill(userId);
+        await input.press("Enter");
+        await this.page.getByRole("dialog").getByRole("button", { name: "Invite" }).click();
+    }
+
     /**
      * Get a locator for the tooltip associated with an element
      * @param e The element with the tooltip
@@ -213,4 +272,26 @@ export class ElementAppPage {
             .getByRole("button", { name: "Dismiss" })
             .click();
     }
+
+    /**
+     * Scroll an infinite list to the bottom.
+     * @param list The element to scroll
+     */
+    public async scrollListToBottom(list: Locator): Promise<void> {
+        // First hover the mouse over the element that we want to scroll
+        await list.hover();
+
+        const needsScroll = async () => {
+            // From https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollHeight#determine_if_an_element_has_been_totally_scrolled
+            const fullyScrolled = await list.evaluate(
+                (e) => Math.abs(e.scrollHeight - e.clientHeight - e.scrollTop) <= 1,
+            );
+            return !fullyScrolled;
+        };
+
+        // Scroll the element until we detect that it is fully scrolled
+        do {
+            await this.page.mouse.wheel(0, 1000);
+        } while (await needsScroll());
+    }
 }
diff --git a/playwright/pages/bot.ts b/playwright/pages/bot.ts
index 05a8948a65..c3168a89ac 100644
--- a/playwright/pages/bot.ts
+++ b/playwright/pages/bot.ts
@@ -16,6 +16,10 @@ import type { Credentials, HomeserverInstance } from "../plugins/homeserver";
 import type { GeneratedSecretStorageKey } from "matrix-js-sdk/src/crypto-api";
 import { bootstrapCrossSigningForClient, Client } from "./client";
 
+export interface CredentialsOptionalAccessToken extends Omit<Credentials, "accessToken"> {
+    accessToken?: string;
+}
+
 export interface CreateBotOpts {
     /**
      * A prefix to use for the userid. If unspecified, "bot_" will be used.
@@ -58,7 +62,7 @@ const defaultCreateBotOptions = {
 type ExtendedMatrixClient = MatrixClient & { __playwright_recovery_key: GeneratedSecretStorageKey };
 
 export class Bot extends Client {
-    public credentials?: Credentials;
+    public credentials?: CredentialsOptionalAccessToken;
     private handlePromise: Promise<JSHandle<ExtendedMatrixClient>>;
 
     constructor(
@@ -70,7 +74,16 @@ export class Bot extends Client {
         this.opts = Object.assign({}, defaultCreateBotOptions, opts);
     }
 
-    public setCredentials(credentials: Credentials): void {
+    /**
+     * Set the credentials used by the bot.
+     *
+     * If `credentials.accessToken` is unset, then `buildClient` will log in a
+     * new session.  Note that `getCredentials` will return the credentials
+     * passed to this function, rather than the updated credentials from the new
+     * login.  In particular, the `accessToken` and `deviceId` will not be
+     * updated.
+     */
+    public setCredentials(credentials: CredentialsOptionalAccessToken): void {
         if (this.credentials) throw new Error("Bot has already started");
         this.credentials = credentials;
     }
@@ -80,7 +93,7 @@ export class Bot extends Client {
         return client.evaluate((cli) => cli.__playwright_recovery_key);
     }
 
-    private async getCredentials(): Promise<Credentials> {
+    private async getCredentials(): Promise<CredentialsOptionalAccessToken> {
         if (this.credentials) return this.credentials;
         // We want to pad the uniqueId but not the prefix
         const username =
@@ -161,6 +174,30 @@ export class Bot extends Client {
                     getSecretStorageKey,
                 };
 
+                if (!("accessToken" in credentials)) {
+                    const loginCli = new window.matrixcs.MatrixClient({
+                        baseUrl,
+                        store: new window.matrixcs.MemoryStore(),
+                        scheduler: new window.matrixcs.MatrixScheduler(),
+                        cryptoStore: new window.matrixcs.MemoryCryptoStore(),
+                        cryptoCallbacks,
+                        logger,
+                    });
+
+                    const loginResponse = await loginCli.loginRequest({
+                        type: "m.login.password",
+                        identifier: {
+                            type: "m.id.user",
+                            user: credentials.userId,
+                        },
+                        password: credentials.password,
+                    });
+
+                    credentials.accessToken = loginResponse.access_token;
+                    credentials.userId = loginResponse.user_id;
+                    credentials.deviceId = loginResponse.device_id;
+                }
+
                 const cli = new window.matrixcs.MatrixClient({
                     baseUrl,
                     userId: credentials.userId,
diff --git a/playwright/pages/client.ts b/playwright/pages/client.ts
index 8296e9111e..76f2733820 100644
--- a/playwright/pages/client.ts
+++ b/playwright/pages/client.ts
@@ -28,7 +28,7 @@ import type {
     EmptyObject,
 } from "matrix-js-sdk/src/matrix";
 import type { RoomMessageEventContent } from "matrix-js-sdk/src/types";
-import { type Credentials } from "../plugins/homeserver";
+import { type CredentialsOptionalAccessToken } from "./bot";
 
 export class Client {
     public network: Network;
@@ -424,7 +424,7 @@ export class Client {
     /**
      * Bootstraps cross-signing.
      */
-    public async bootstrapCrossSigning(credentials: Credentials): Promise<void> {
+    public async bootstrapCrossSigning(credentials: CredentialsOptionalAccessToken): Promise<void> {
         const client = await this.prepareClient();
         return bootstrapCrossSigningForClient(client, credentials);
     }
@@ -469,6 +469,27 @@ export class Client {
         );
     }
 
+    /**
+     * Set a power level to one or multiple users.
+     * Will apply changes atop of current power level event.
+     * @param roomId - the room to update power levels in
+     * @param userId - the ID of the user or users to update power levels of
+     * @param powerLevel - the numeric power level to update given users to
+     */
+    public async setPowerLevel(
+        roomId: string,
+        userId: string | string[],
+        powerLevel: number,
+    ): Promise<ISendEventResponse> {
+        const client = await this.prepareClient();
+        return client.evaluate(
+            async (client, { roomId, userId, powerLevel }) => {
+                return client.setPowerLevel(roomId, userId, powerLevel);
+            },
+            { roomId, userId, powerLevel },
+        );
+    }
+
     /**
      * Leaves the given room.
      * @param roomId ID of the room to leave
@@ -501,7 +522,7 @@ export class Client {
  */
 export function bootstrapCrossSigningForClient(
     client: JSHandle<MatrixClient>,
-    credentials: Credentials,
+    credentials: CredentialsOptionalAccessToken,
     resetKeys: boolean = false,
 ) {
     return client.evaluate(
diff --git a/playwright/pages/settings.ts b/playwright/pages/settings.ts
index a08ca65f34..0ea8c50348 100644
--- a/playwright/pages/settings.ts
+++ b/playwright/pages/settings.ts
@@ -43,7 +43,7 @@ export class Settings {
      * @param {*} value The new value of the setting, may be null.
      * @return {Promise} Resolves when the setting has been changed.
      */
-    public async setValue(settingName: string, roomId: string, level: SettingLevel, value: any): Promise<void> {
+    public async setValue(settingName: string, roomId: string | null, level: SettingLevel, value: any): Promise<void> {
         return this.page.evaluate<
             Promise<void>,
             {
diff --git a/playwright/pages/toasts.ts b/playwright/pages/toasts.ts
index cfab354aaf..80ee3c9f26 100644
--- a/playwright/pages/toasts.ts
+++ b/playwright/pages/toasts.ts
@@ -15,11 +15,12 @@ export class Toasts {
      * Assert that a toast with the given title exists, and return it
      *
      * @param expectedTitle - Expected title of the toast
+     * @param timeout Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      * @returns the Locator for the matching toast
      */
-    public async getToast(expectedTitle: string): Promise<Locator> {
+    public async getToast(expectedTitle: string, timeout?: number): Promise<Locator> {
         const toast = this.page.locator(".mx_Toast_toast", { hasText: expectedTitle }).first();
-        await expect(toast).toBeVisible();
+        await expect(toast).toBeVisible({ timeout });
         return toast;
     }
 
diff --git a/playwright/plugins/homeserver/index.ts b/playwright/plugins/homeserver/index.ts
index 0571cd9615..993853a3a2 100644
--- a/playwright/plugins/homeserver/index.ts
+++ b/playwright/plugins/homeserver/index.ts
@@ -6,7 +6,8 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { type ClientServerApi } from "@element-hq/element-web-playwright-common/lib/utils/api.js";
+import { type ClientServerApi, type Credentials } from "@element-hq/element-web-playwright-common/lib/utils/api.js";
+export { type Credentials } from "@element-hq/element-web-playwright-common/lib/utils/api.js";
 
 export interface HomeserverInstance {
     readonly baseUrl: string;
@@ -37,14 +38,4 @@ export interface HomeserverInstance {
     setThreepid(userId: string, medium: string, address: string): Promise<void>;
 }
 
-export interface Credentials {
-    accessToken: string;
-    userId: string;
-    deviceId: string;
-    homeServer: string;
-    password: string | null; // null for password-less users
-    displayName?: string;
-    username: string; // the localpart of the userId
-}
-
 export type HomeserverType = "synapse" | "dendrite" | "pinecone";
diff --git a/playwright/plugins/homeserver/synapse/masHomeserver.ts b/playwright/plugins/homeserver/synapse/masHomeserver.ts
index 342737d80d..84d73018fc 100644
--- a/playwright/plugins/homeserver/synapse/masHomeserver.ts
+++ b/playwright/plugins/homeserver/synapse/masHomeserver.ts
@@ -1,38 +1,49 @@
 /*
-Copyright 2024 New Vector Ltd.
+Copyright 2024-2025 New Vector Ltd.
 Copyright 2023 The Matrix.org Foundation C.I.C.
 
 SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE files in the repository root for full details.
 */
 
-import { MatrixAuthenticationServiceContainer } from "@element-hq/element-web-playwright-common/lib/testcontainers";
-
+import { MatrixAuthenticationServiceContainer } from "../../../testcontainers/mas.ts";
 import { type Fixtures } from "../../../element-web-test.ts";
 
 export const masHomeserver: Fixtures = {
     mas: [
         async ({ _homeserver: homeserver, logger, network, postgres, mailpit }, use) => {
-            const config = {
-                clients: [
-                    {
-                        client_id: "0000000000000000000SYNAPSE",
-                        client_auth_method: "client_secret_basic",
-                        client_secret: "SomeRandomSecret",
-                    },
-                ],
-                matrix: {
-                    homeserver: "localhost",
-                    secret: "AnotherRandomSecret",
-                    endpoint: "http://homeserver:8008",
-                },
-            };
+            const secret = "AnotherRandomSecret";
 
+            const limits = { burst: 10, per_second: 10 };
             const container = await new MatrixAuthenticationServiceContainer(postgres)
                 .withNetwork(network)
                 .withNetworkAliases("mas")
                 .withLogConsumer(logger.getConsumer("mas"))
-                .withConfig(config)
+                .withConfig({
+                    matrix: {
+                        kind: "synapse",
+                        homeserver: "localhost",
+                        secret,
+                        endpoint: "http://homeserver:8008",
+                    },
+                    rate_limiting: {
+                        login: {
+                            per_ip: limits,
+                            per_account: limits,
+                        },
+                        registration: limits,
+                        email_authentication: {
+                            per_ip: limits,
+                            per_address: limits,
+                            emails_per_session: limits,
+                            attempt_per_session: limits,
+                        },
+                        account_recovery: {
+                            per_ip: limits,
+                            per_address: limits,
+                        },
+                    },
+                })
                 .start();
 
             homeserver.withConfig({
@@ -40,16 +51,10 @@ export const masHomeserver: Fixtures = {
                 enable_registration_without_verification: undefined,
                 disable_msisdn_registration: undefined,
                 password_config: undefined,
-                experimental_features: {
-                    msc3861: {
-                        enabled: true,
-                        issuer: `http://mas:8080/`,
-                        introspection_endpoint: "http://mas:8080/oauth2/introspect",
-                        client_id: config.clients[0].client_id,
-                        client_auth_method: config.clients[0].client_auth_method,
-                        client_secret: config.clients[0].client_secret,
-                        admin_token: config.matrix.secret,
-                    },
+                matrix_authentication_service: {
+                    enabled: true,
+                    endpoint: "http://mas:8080/",
+                    secret,
                 },
             });
 
@@ -59,28 +64,6 @@ export const masHomeserver: Fixtures = {
         { scope: "worker" },
     ],
 
-    config: async ({ homeserver, context, mas }, use) => {
-        const issuer = `${mas.baseUrl}/`;
-        const wellKnown = {
-            "m.homeserver": {
-                base_url: homeserver.baseUrl,
-            },
-            "org.matrix.msc2965.authentication": {
-                issuer,
-                account: `${issuer}account`,
-            },
-        };
-
-        // Ensure org.matrix.msc2965.authentication is in well-known
-        await context.route("https://localhost/.well-known/matrix/client", async (route) => {
-            await route.fulfill({ json: wellKnown });
-        });
-
-        await use({
-            default_server_config: wellKnown,
-        });
-    },
-
     context: async ({ homeserverType, context }, use, testInfo) => {
         testInfo.skip(homeserverType !== "synapse", "does not yet support MAS");
         await use(context);
diff --git a/playwright/sample-files/custom-component-module.js b/playwright/sample-files/custom-component-module.js
new file mode 100644
index 0000000000..be2ab5928d
--- /dev/null
+++ b/playwright/sample-files/custom-component-module.js
@@ -0,0 +1,74 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+// Note: eslint-plugin-jsdoc doesn't like import types as parameters, so we
+// get around it with @typedef
+/**
+ * @typedef {import("@element-hq/element-web-module-api").Api} Api
+ */
+
+export default class CustomComponentModule {
+    static moduleApiVersion = "^1.2.0";
+    /**
+     * Basic module for testing.
+     * @param {Api} api API object
+     */
+    constructor(api) {
+        this.api = api;
+        this.api.customComponents.registerMessageRenderer(
+            (evt) => evt.content.body === "Do not show edits",
+            (_props, originalComponent) => {
+                return originalComponent();
+            },
+            { allowEditingEvent: false },
+        );
+        this.api.customComponents.registerMessageRenderer(
+            (evt) => evt.content.body === "Fall through here",
+            (props) => {
+                const body = props.mxEvent.content.body;
+                return `Fallthrough text for ${body}`;
+            },
+        );
+        this.api.customComponents.registerMessageRenderer(
+            (evt) => {
+                if (evt.content.body === "Crash the filter!") {
+                    throw new Error("Fail test!");
+                }
+                return false;
+            },
+            () => {
+                return `Should not render!`;
+            },
+        );
+        this.api.customComponents.registerMessageRenderer(
+            (evt) => evt.content.body === "Crash the renderer!",
+            () => {
+                throw new Error("Fail test!");
+            },
+        );
+
+        this.api.customComponents.registerMessageRenderer(
+            (mxEvent) => mxEvent.type === "m.room.message" && mxEvent.content.msgtype === "m.image",
+            (_props, originalComponent) => {
+                return originalComponent();
+            },
+            { allowDownloadingMedia: async (mxEvent) => mxEvent.content.body !== "bad.png" },
+        );
+
+        // Order is specific here to avoid this overriding the other renderers
+        this.api.customComponents.registerMessageRenderer("m.room.message", (props, originalComponent) => {
+            const body = props.mxEvent.content.body;
+            if (body === "Do not replace me") {
+                return originalComponent();
+            } else if (body === "Fall through here") {
+                return null;
+            }
+            return `Custom text for ${body}`;
+        });
+    }
+    async load() {}
+}
diff --git a/playwright/sample-files/fake-element-call-with-send.html b/playwright/sample-files/fake-element-call-with-send.html
new file mode 100644
index 0000000000..c7fb2fdcbc
--- /dev/null
+++ b/playwright/sample-files/fake-element-call-with-send.html
@@ -0,0 +1,53 @@
+<!doctype html>
+<style>
+    body {
+        background: rgb(139, 192, 253);
+    }
+</style>
+
+<!-- element-call.spec.ts will insert the widget API in this block -->
+<script>
+    widgetCodeHere;
+</script>
+
+<div>
+    <p>Fake Element Call</p>
+    <p>State: <span id="state">Loading</span></p>
+    <button id="send-button">Send Room Message</button>
+</div>
+
+<!-- Minimal fake implementation of Element Call. Just enough for testing the leagkin widgets.-->
+<script>
+    const stateIndicator = document.querySelector("#state");
+    const { WidgetApi, WidgetApiToWidgetAction, MatrixCapabilities } = mxwidgets();
+    const widgetId = new URLSearchParams(window.location.search).get("widgetId");
+    const params = new URLSearchParams(window.location.hash.slice(1));
+
+    const roomId = params.get("roomId");
+    const api = new WidgetApi(widgetId, "*");
+
+    document.querySelector("#send-button").onclick = async () => {
+        await api.sendRoomEvent(
+            "m.room.message",
+            { msgtype: "m.text", body: "I sent this once!!" },
+            roomId,
+            undefined,
+            undefined,
+            undefined,
+        );
+    };
+
+    api.requestCapability(MatrixCapabilities.AlwaysOnScreen);
+    api.requestCapability(`org.matrix.msc2762.timeline:${roomId}`);
+    api.requestCapabilityToSendMessage("m.text");
+
+    api.on("ready", (ev) => {
+        stateIndicator.innerHTML = "Ready";
+    });
+
+    // Start the messaging
+    api.start();
+
+    // If waitForIframeLoad is false, tell the client that we're good to go
+    api.sendContentLoaded();
+</script>
diff --git a/playwright/sample-files/fake-element-call.html b/playwright/sample-files/fake-element-call.html
new file mode 100644
index 0000000000..a0fc1f8689
--- /dev/null
+++ b/playwright/sample-files/fake-element-call.html
@@ -0,0 +1,87 @@
+<!doctype html>
+<style>
+    body {
+        background: rgb(139, 192, 253);
+    }
+</style>
+
+<!-- element-call.spec.ts will insert the widget API in this block -->
+<script>
+    widgetCodeHere;
+</script>
+
+<div>
+    <p>Fake Element Call</p>
+    <p>State: <span id="state">Loading</span></p>
+    <button id="join-button">Join Call</button>
+    <button id="close-button">Close</button>
+</div>
+
+<!-- Minimal fake implementation of Element Call. Just enough for testing persistent widgets.-->
+<script>
+    const content = {
+        "application": "m.call",
+        "call_id": "",
+        "device_id": "gycSobuY0z",
+        "expires": 14400000,
+        "foci_preferred": [
+            {
+                livekit_alias: "any-alias",
+                livekit_service_url: "https://example.org",
+                type: "livekit",
+            },
+        ],
+        "focus_active": {
+            focus_selection: "oldest_membership",
+            type: "livekit",
+        },
+        "m.call.intent": "video",
+        "scope": "m.room",
+    };
+    const stateIndicator = document.querySelector("#state");
+    const { WidgetApi, WidgetApiToWidgetAction, MatrixCapabilities } = mxwidgets();
+    const widgetId = new URLSearchParams(window.location.search).get("widgetId");
+    const params = new URLSearchParams(window.location.hash.slice(1));
+    const userId = params.get("userId");
+    const deviceId = params.get("deviceId");
+    const roomId = params.get("roomId");
+    const api = new WidgetApi(widgetId, "*");
+
+    const stateKey = `_${userId}_${deviceId}_m.call`;
+
+    async function hangup() {
+        await api.sendStateEvent("org.matrix.msc3401.call.member", stateKey, {}, roomId);
+        await api.setAlwaysOnScreen(false);
+        await api.transport.send("io.element.close", {});
+        stateIndicator.innerHTML = "Ended";
+    }
+
+    document.querySelector("#join-button").onclick = async () => {
+        await api.setAlwaysOnScreen(true);
+        await api.transport.send("io.element.join", {});
+        await api.sendStateEvent("org.matrix.msc3401.call.member", stateKey, content, roomId);
+        stateIndicator.innerHTML = "In call";
+    };
+
+    document.querySelector("#close-button").onclick = () => {
+        hangup();
+    };
+
+    api.requestCapability(MatrixCapabilities.AlwaysOnScreen);
+    api.requestCapability(`org.matrix.msc2762.timeline:${roomId}`);
+    api.requestCapabilityToSendState("org.matrix.msc3401.call.member", stateKey);
+
+    api.on("ready", (ev) => {
+        stateIndicator.innerHTML = "Ready";
+        // Pretend to join a call.
+    });
+    api.on("action:im.vector.hangup", async () => {
+        await hangup();
+    });
+
+    // Start the messaging
+    api.start();
+
+    // If waitForIframeLoad is false, tell the client that we're good to go
+    api.sendContentLoaded();
+</script>
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--dark-theme--bubble-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--dark-theme--bubble-layout-linux.png
index 165033dbe9..ad46ca44d5 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--dark-theme--bubble-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--dark-theme--bubble-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--dark-theme--group-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--dark-theme--group-layout-linux.png
index f309d57bc0..d4c123d787 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--dark-theme--group-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--dark-theme--group-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--dark-theme--irc-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--dark-theme--irc-layout-linux.png
index bd02a2f21a..97097a3f28 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--dark-theme--irc-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--dark-theme--irc-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--high-contrast--bubble-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--high-contrast--bubble-layout-linux.png
index 16e0624b83..5d240ebd76 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--high-contrast--bubble-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--high-contrast--bubble-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--high-contrast--group-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--high-contrast--group-layout-linux.png
index 1e78930256..2620b9cd20 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--high-contrast--group-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--high-contrast--group-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--high-contrast--irc-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--high-contrast--irc-layout-linux.png
index 6a43aac7ef..6c09f076f9 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--high-contrast--irc-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--high-contrast--irc-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--bubble-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--bubble-layout-linux.png
index 014b8dbaec..06f850704d 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--bubble-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--bubble-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--group-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--group-layout-linux.png
index 156d89053c..5f4e409c3a 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--group-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--group-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--irc-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--irc-layout-linux.png
index caf6e1e698..74060e2f42 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--irc-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--irc-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--monospace-font--bubble-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--monospace-font--bubble-layout-linux.png
index c9591ebf49..706ed77713 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--monospace-font--bubble-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--monospace-font--bubble-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--monospace-font--group-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--monospace-font--group-layout-linux.png
index 794ac11b01..ac0c53994d 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--monospace-font--group-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--monospace-font--group-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--monospace-font--irc-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--monospace-font--irc-layout-linux.png
index 2b6475fbdf..07534229d8 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--monospace-font--irc-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player--light-theme--monospace-font--irc-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-bubble-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-bubble-layout-linux.png
index 0f643ee43a..a3a1894eac 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-bubble-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-bubble-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-chain-bubble-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-chain-bubble-layout-linux.png
index bc9d6c88c3..aa9956a50d 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-chain-bubble-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-chain-bubble-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-chain-group-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-chain-group-layout-linux.png
index 2b867170ae..45a80c8ed5 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-chain-group-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-chain-group-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-chain-irc-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-chain-irc-layout-linux.png
index 459ebd3584..b12365c9ac 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-chain-irc-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-chain-irc-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-group-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-group-layout-linux.png
index da97c28029..724bcb482f 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-group-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-group-layout-linux.png differ
diff --git a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-irc-layout-linux.png b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-irc-layout-linux.png
index 009ea38f7b..340015a06b 100644
Binary files a/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-irc-layout-linux.png and b/playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-irc-layout-linux.png differ
diff --git a/playwright/snapshots/chat-export/html-export.spec.ts/html-export-linux.png b/playwright/snapshots/chat-export/html-export.spec.ts/html-export-linux.png
index 26c506097a..ffe31b9b26 100644
Binary files a/playwright/snapshots/chat-export/html-export.spec.ts/html-export-linux.png and b/playwright/snapshots/chat-export/html-export.spec.ts/html-export-linux.png differ
diff --git a/playwright/snapshots/composer/CIDER.spec.ts/emoji-autocomplete-linux.png b/playwright/snapshots/composer/CIDER.spec.ts/emoji-autocomplete-linux.png
new file mode 100644
index 0000000000..94c7ec42c8
Binary files /dev/null and b/playwright/snapshots/composer/CIDER.spec.ts/emoji-autocomplete-linux.png differ
diff --git a/playwright/snapshots/composer/CIDER.spec.ts/emoji-picker-linux.png b/playwright/snapshots/composer/CIDER.spec.ts/emoji-picker-linux.png
new file mode 100644
index 0000000000..8c0daa555c
Binary files /dev/null and b/playwright/snapshots/composer/CIDER.spec.ts/emoji-picker-linux.png differ
diff --git a/playwright/snapshots/composer/CIDER.spec.ts/emoji-picker-small-linux.png b/playwright/snapshots/composer/CIDER.spec.ts/emoji-picker-small-linux.png
new file mode 100644
index 0000000000..e3911831de
Binary files /dev/null and b/playwright/snapshots/composer/CIDER.spec.ts/emoji-picker-small-linux.png differ
diff --git a/playwright/snapshots/composer/CIDER.spec.ts/mention-linux.png b/playwright/snapshots/composer/CIDER.spec.ts/mention-linux.png
new file mode 100644
index 0000000000..8098757aba
Binary files /dev/null and b/playwright/snapshots/composer/CIDER.spec.ts/mention-linux.png differ
diff --git a/playwright/snapshots/crypto/crypto.spec.ts/composer-e2e-icon-linux.png b/playwright/snapshots/crypto/crypto.spec.ts/composer-e2e-icon-linux.png
new file mode 100644
index 0000000000..1adc91faf0
Binary files /dev/null and b/playwright/snapshots/crypto/crypto.spec.ts/composer-e2e-icon-linux.png differ
diff --git a/playwright/snapshots/crypto/device-verification.spec.ts/confirm-green-shield-linux.png b/playwright/snapshots/crypto/device-verification.spec.ts/confirm-green-shield-linux.png
new file mode 100644
index 0000000000..23c295c2f6
Binary files /dev/null and b/playwright/snapshots/crypto/device-verification.spec.ts/confirm-green-shield-linux.png differ
diff --git a/playwright/snapshots/crypto/device-verification.spec.ts/device-verified-e2eIcon-linux.png b/playwright/snapshots/crypto/device-verification.spec.ts/device-verified-e2eIcon-linux.png
new file mode 100644
index 0000000000..bd282ff485
Binary files /dev/null and b/playwright/snapshots/crypto/device-verification.spec.ts/device-verified-e2eIcon-linux.png differ
diff --git a/playwright/snapshots/crypto/device-verification.spec.ts/got-it-linux.png b/playwright/snapshots/crypto/device-verification.spec.ts/got-it-linux.png
new file mode 100644
index 0000000000..0d705053b3
Binary files /dev/null and b/playwright/snapshots/crypto/device-verification.spec.ts/got-it-linux.png differ
diff --git a/playwright/snapshots/crypto/device-verification.spec.ts/qr-code-linux.png b/playwright/snapshots/crypto/device-verification.spec.ts/qr-code-linux.png
new file mode 100644
index 0000000000..23094f7b8b
Binary files /dev/null and b/playwright/snapshots/crypto/device-verification.spec.ts/qr-code-linux.png differ
diff --git a/playwright/snapshots/crypto/device-verification.spec.ts/recovery-key-linux.png b/playwright/snapshots/crypto/device-verification.spec.ts/recovery-key-linux.png
new file mode 100644
index 0000000000..7683872ec8
Binary files /dev/null and b/playwright/snapshots/crypto/device-verification.spec.ts/recovery-key-linux.png differ
diff --git a/playwright/snapshots/crypto/event-shields.spec.ts/event-shield-warning-linux.png b/playwright/snapshots/crypto/event-shields.spec.ts/event-shield-warning-linux.png
new file mode 100644
index 0000000000..eacd2a7803
Binary files /dev/null and b/playwright/snapshots/crypto/event-shields.spec.ts/event-shield-warning-linux.png differ
diff --git a/playwright/snapshots/crypto/history-sharing.spec.ts/shared-history-invite-accepted-linux.png b/playwright/snapshots/crypto/history-sharing.spec.ts/shared-history-invite-accepted-linux.png
new file mode 100644
index 0000000000..c33dbaadf9
Binary files /dev/null and b/playwright/snapshots/crypto/history-sharing.spec.ts/shared-history-invite-accepted-linux.png differ
diff --git a/playwright/snapshots/crypto/toasts.spec.ts/key-storage-out-of-sync-toast-linux.png b/playwright/snapshots/crypto/toasts.spec.ts/key-storage-out-of-sync-toast-linux.png
index 8cf3cb7d69..c5ca8fdc02 100644
Binary files a/playwright/snapshots/crypto/toasts.spec.ts/key-storage-out-of-sync-toast-linux.png and b/playwright/snapshots/crypto/toasts.spec.ts/key-storage-out-of-sync-toast-linux.png differ
diff --git a/playwright/snapshots/devtools/devtools.spec.ts/devtools-dialog-linux.png b/playwright/snapshots/devtools/devtools.spec.ts/devtools-dialog-linux.png
new file mode 100644
index 0000000000..7f802aca0e
Binary files /dev/null and b/playwright/snapshots/devtools/devtools.spec.ts/devtools-dialog-linux.png differ
diff --git a/playwright/snapshots/devtools/upgraderoom.spec.ts/upgrade-room-linux.png b/playwright/snapshots/devtools/upgraderoom.spec.ts/upgrade-room-linux.png
new file mode 100644
index 0000000000..e4f9bf4b13
Binary files /dev/null and b/playwright/snapshots/devtools/upgraderoom.spec.ts/upgrade-room-linux.png differ
diff --git a/playwright/snapshots/editing/editing.spec.ts/message-edit-history-dialog-linux.png b/playwright/snapshots/editing/editing.spec.ts/message-edit-history-dialog-linux.png
index 81939514ff..f606955146 100644
Binary files a/playwright/snapshots/editing/editing.spec.ts/message-edit-history-dialog-linux.png and b/playwright/snapshots/editing/editing.spec.ts/message-edit-history-dialog-linux.png differ
diff --git a/playwright/snapshots/forgot-password/forgot-password.spec.ts/forgot-password-linux.png b/playwright/snapshots/forgot-password/forgot-password.spec.ts/forgot-password-linux.png
index 8bc25d6f2f..e9eb06375f 100644
Binary files a/playwright/snapshots/forgot-password/forgot-password.spec.ts/forgot-password-linux.png and b/playwright/snapshots/forgot-password/forgot-password.spec.ts/forgot-password-linux.png differ
diff --git a/playwright/snapshots/invite/decline-and-block-invite-dialog.spec.ts/decline-and-block-invite-empty-linux.png b/playwright/snapshots/invite/decline-and-block-invite-dialog.spec.ts/decline-and-block-invite-empty-linux.png
new file mode 100644
index 0000000000..cb3f9f8618
Binary files /dev/null and b/playwright/snapshots/invite/decline-and-block-invite-dialog.spec.ts/decline-and-block-invite-empty-linux.png differ
diff --git a/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-with-user-pill-linux.png b/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-with-user-pill-linux.png
index 1a66050e5f..86154ad35d 100644
Binary files a/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-with-user-pill-linux.png and b/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-with-user-pill-linux.png differ
diff --git a/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-without-user-linux.png b/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-without-user-linux.png
index 86cb11aad9..e63333c1e9 100644
Binary files a/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-without-user-linux.png and b/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-without-user-linux.png differ
diff --git a/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-room-with-user-pill-linux.png b/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-room-with-user-pill-linux.png
index 043e35b6be..0c0695ad64 100644
Binary files a/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-room-with-user-pill-linux.png and b/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-room-with-user-pill-linux.png differ
diff --git a/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-room-without-user-linux.png b/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-room-without-user-linux.png
index 910040e20f..cee338835f 100644
Binary files a/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-room-without-user-linux.png and b/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-room-without-user-linux.png differ
diff --git a/playwright/snapshots/invite/invite-dialog.spec.ts/send-your-first-message-view-linux.png b/playwright/snapshots/invite/invite-dialog.spec.ts/send-your-first-message-view-linux.png
new file mode 100644
index 0000000000..ab42c30cd2
Binary files /dev/null and b/playwright/snapshots/invite/invite-dialog.spec.ts/send-your-first-message-view-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Favourite-empty-room-list-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Favourite-empty-room-list-linux.png
index 6c71c11b1d..d30b38b38f 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Favourite-empty-room-list-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Favourite-empty-room-list-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Invites-empty-room-list-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Invites-empty-room-list-linux.png
index c7396da41d..c770da3377 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Invites-empty-room-list-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Invites-empty-room-list-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Mentions-empty-room-list-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Mentions-empty-room-list-linux.png
index 15620d3612..44e27d9618 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Mentions-empty-room-list-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Mentions-empty-room-list-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/People-empty-room-list-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/People-empty-room-list-linux.png
index 7b73e0b819..3f700037cb 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/People-empty-room-list-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/People-empty-room-list-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Rooms-empty-room-list-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Rooms-empty-room-list-linux.png
index eb3add5733..e01564eeb4 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Rooms-empty-room-list-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Rooms-empty-room-list-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Unreads-empty-room-list-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Unreads-empty-room-list-linux.png
index 70ed4bb782..94b09ac14f 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Unreads-empty-room-list-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/Unreads-empty-room-list-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/collapsed-primary-filters-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/collapsed-primary-filters-linux.png
new file mode 100644
index 0000000000..1d5a8ae87a
Binary files /dev/null and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/collapsed-primary-filters-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/default-empty-room-list-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/default-empty-room-list-linux.png
index 6781c1d364..d47d04e9a6 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/default-empty-room-list-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/default-empty-room-list-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/expanded-primary-filters-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/expanded-primary-filters-linux.png
new file mode 100644
index 0000000000..3bafa521b7
Binary files /dev/null and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/expanded-primary-filters-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/room-panel-empty-room-list-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/room-panel-empty-room-list-linux.png
index 34924cf69f..ac3f26e529 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/room-panel-empty-room-list-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/room-panel-empty-room-list-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-dm-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-dm-linux.png
index 2f12ee4e41..6968a4f134 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-dm-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-dm-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-primary-filters-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-primary-filters-linux.png
index f0cda0b577..ac8abd60ad 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-primary-filters-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-primary-filters-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unselected-primary-filters-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unselected-primary-filters-linux.png
index 7d63f923b0..0b879c18fe 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unselected-primary-filters-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unselected-primary-filters-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-compose-menu-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-compose-menu-linux.png
index 9f501a58d4..202a83c23a 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-compose-menu-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-compose-menu-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-linux.png
index 46ff1a53be..5e6ddff442 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-space-menu-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-space-menu-linux.png
index c706e71b0f..43d8781239 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-space-menu-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-space-menu-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-space-header-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-space-header-linux.png
index 3a4aea566e..c42c449281 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-space-header-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-space-header-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-linux.png
index 9b130b73c4..3795176be2 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-smallscreen-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-smallscreen-linux.png
index 92b81245a2..f21e92a373 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-smallscreen-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-smallscreen-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-search.spec.ts/search-section-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-search.spec.ts/search-section-linux.png
index 123cf37586..df3e924e4c 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-search.spec.ts/search-section-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-search.spec.ts/search-section-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-activity-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-activity-linux.png
index aa73d79988..ac0ee1ad6c 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-activity-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-activity-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-hover-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-hover-linux.png
index fba408c922..c3b5f34feb 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-hover-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-hover-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-hover-silent-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-hover-silent-linux.png
index 36b7304a01..bc2085b205 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-hover-silent-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-hover-silent-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-invited-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-invited-linux.png
index 1f2b691b4a..b024c0729c 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-invited-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-invited-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-low-priority-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-low-priority-linux.png
new file mode 100644
index 0000000000..c9dd4b6bd8
Binary files /dev/null and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-low-priority-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-mark-as-unread-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-mark-as-unread-linux.png
index 310912e50d..ee778c6871 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-mark-as-unread-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-mark-as-unread-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-mention-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-mention-linux.png
index 9fa531f5b1..4b3c7fc1d1 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-mention-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-mention-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-message-preview-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-message-preview-linux.png
index dac349eb2d..7042a7078e 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-message-preview-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-message-preview-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-notification-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-notification-linux.png
index 144604ffeb..4a92165c46 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-notification-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-notification-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-more-options-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-more-options-linux.png
index 99bb312695..b44e61b3eb 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-more-options-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-more-options-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-linux.png
index c91ebf3b3a..c182c853b9 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png
index 4b3ac052ca..950bc3a0eb 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-public-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-public-linux.png
index e951f77ef2..ad64e0c526 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-public-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-public-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-silent-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-silent-linux.png
index 57c5cb1eb7..d9deb6cb1c 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-silent-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-silent-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-video-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-video-linux.png
index 16ea458274..c3d6f5f952 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-video-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-video-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-linux.png
index f2b625f498..896af9eff7 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-linux.png differ
diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-scrolled-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-scrolled-linux.png
index a1752e30d3..81f3af0cb6 100644
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-scrolled-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-scrolled-linux.png differ
diff --git a/playwright/snapshots/location/location.spec.ts/location-live-share-dialog-linux.png b/playwright/snapshots/location/location.spec.ts/location-live-share-dialog-linux.png
new file mode 100644
index 0000000000..13ba504919
Binary files /dev/null and b/playwright/snapshots/location/location.spec.ts/location-live-share-dialog-linux.png differ
diff --git a/playwright/snapshots/location/location.spec.ts/location-pin-drop-message-map-linux.png b/playwright/snapshots/location/location.spec.ts/location-pin-drop-message-map-linux.png
new file mode 100644
index 0000000000..36632e6a61
Binary files /dev/null and b/playwright/snapshots/location/location.spec.ts/location-pin-drop-message-map-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/basic-message-ltr-ltrdisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/basic-message-ltr-ltrdisplayname-linux.png
index 9831051768..9e26f29f74 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/basic-message-ltr-ltrdisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/basic-message-ltr-ltrdisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/basic-message-ltr-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/basic-message-ltr-rtldisplayname-linux.png
index 35523b7db8..5e6fc8dd6f 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/basic-message-ltr-rtldisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/basic-message-ltr-rtldisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/basic-message-rtl-ltrdisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/basic-message-rtl-ltrdisplayname-linux.png
index 9f31f518fc..199daa5e5e 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/basic-message-rtl-ltrdisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/basic-message-rtl-ltrdisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/basic-message-rtl-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/basic-message-rtl-rtldisplayname-linux.png
index 40a096409e..362930195d 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/basic-message-rtl-rtldisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/basic-message-rtl-rtldisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/edited-message-ltr-ltrdisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/edited-message-ltr-ltrdisplayname-linux.png
index d8b02a028b..0e3826f022 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/edited-message-ltr-ltrdisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/edited-message-ltr-ltrdisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/edited-message-ltr-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/edited-message-ltr-rtldisplayname-linux.png
index 557613e7e6..314d4e8938 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/edited-message-ltr-rtldisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/edited-message-ltr-rtldisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/edited-message-rtl-ltrdisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/edited-message-rtl-ltrdisplayname-linux.png
index 85a3c69c0e..4f4266737f 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/edited-message-rtl-ltrdisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/edited-message-rtl-ltrdisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/edited-message-rtl-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/edited-message-rtl-rtldisplayname-linux.png
index bd26e84628..fa17ddf3f5 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/edited-message-rtl-rtldisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/edited-message-rtl-rtldisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/emote-ltr-ltrdisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/emote-ltr-ltrdisplayname-linux.png
index 5ab0a7e88f..d7325c874d 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/emote-ltr-ltrdisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/emote-ltr-ltrdisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/emote-ltr-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/emote-ltr-rtldisplayname-linux.png
index 055ad23a81..4b45b09a90 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/emote-ltr-rtldisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/emote-ltr-rtldisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/emote-rich-ltr-ltrdisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/emote-rich-ltr-ltrdisplayname-linux.png
index c3501583f8..eb95e95298 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/emote-rich-ltr-ltrdisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/emote-rich-ltr-ltrdisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/emote-rich-ltr-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/emote-rich-ltr-rtldisplayname-linux.png
index cfb905b689..c1c8bc34fc 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/emote-rich-ltr-rtldisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/emote-rich-ltr-rtldisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/emote-rich-rtl-ltrdisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/emote-rich-rtl-ltrdisplayname-linux.png
index 537f1dd2c4..e5af698b56 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/emote-rich-rtl-ltrdisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/emote-rich-rtl-ltrdisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/emote-rich-rtl-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/emote-rich-rtl-rtldisplayname-linux.png
index ea29e98a75..df4d6c0642 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/emote-rich-rtl-rtldisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/emote-rich-rtl-rtldisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/emote-rtl-ltrdisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/emote-rtl-ltrdisplayname-linux.png
index 27357dc503..fae90a16b3 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/emote-rtl-ltrdisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/emote-rtl-ltrdisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/emote-rtl-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/emote-rtl-rtldisplayname-linux.png
index d84780f530..95531ecaf8 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/emote-rtl-rtldisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/emote-rtl-rtldisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/reply-message-ltr-ltrdisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/reply-message-ltr-ltrdisplayname-linux.png
index a4de383fba..4e93ab419e 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/reply-message-ltr-ltrdisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/reply-message-ltr-ltrdisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/reply-message-ltr-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/reply-message-ltr-rtldisplayname-linux.png
index b59d960f4f..0a65531909 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/reply-message-ltr-rtldisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/reply-message-ltr-rtldisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/reply-message-trl-ltrdisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/reply-message-trl-ltrdisplayname-linux.png
index a3acc741f3..067fab6cf9 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/reply-message-trl-ltrdisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/reply-message-trl-ltrdisplayname-linux.png differ
diff --git a/playwright/snapshots/messages/messages.spec.ts/reply-message-trl-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/reply-message-trl-rtldisplayname-linux.png
index f6eaea241a..a1c1f4aea7 100644
Binary files a/playwright/snapshots/messages/messages.spec.ts/reply-message-trl-rtldisplayname-linux.png and b/playwright/snapshots/messages/messages.spec.ts/reply-message-trl-rtldisplayname-linux.png differ
diff --git a/playwright/snapshots/mobile-guide/mobile-guide.spec.ts/mobile-guide-element-classic-linux.png b/playwright/snapshots/mobile-guide/mobile-guide.spec.ts/mobile-guide-element-classic-linux.png
new file mode 100644
index 0000000000..f091eeed74
Binary files /dev/null and b/playwright/snapshots/mobile-guide/mobile-guide.spec.ts/mobile-guide-element-classic-linux.png differ
diff --git a/playwright/snapshots/mobile-guide/mobile-guide.spec.ts/mobile-guide-element-linux.png b/playwright/snapshots/mobile-guide/mobile-guide.spec.ts/mobile-guide-element-linux.png
new file mode 100644
index 0000000000..9c32731ab7
Binary files /dev/null and b/playwright/snapshots/mobile-guide/mobile-guide.spec.ts/mobile-guide-element-linux.png differ
diff --git a/playwright/snapshots/mobile-guide/mobile-guide.spec.ts/mobile-guide-element-pro-linux.png b/playwright/snapshots/mobile-guide/mobile-guide.spec.ts/mobile-guide-element-pro-linux.png
new file mode 100644
index 0000000000..ff1bb69a4f
Binary files /dev/null and b/playwright/snapshots/mobile-guide/mobile-guide.spec.ts/mobile-guide-element-pro-linux.png differ
diff --git a/playwright/snapshots/modules/custom-component.spec.ts/custom-component-crash-handle-filter-linux.png b/playwright/snapshots/modules/custom-component.spec.ts/custom-component-crash-handle-filter-linux.png
new file mode 100644
index 0000000000..ccf6439b65
Binary files /dev/null and b/playwright/snapshots/modules/custom-component.spec.ts/custom-component-crash-handle-filter-linux.png differ
diff --git a/playwright/snapshots/modules/custom-component.spec.ts/custom-component-crash-handle-renderer-linux.png b/playwright/snapshots/modules/custom-component.spec.ts/custom-component-crash-handle-renderer-linux.png
new file mode 100644
index 0000000000..479f2d34ad
Binary files /dev/null and b/playwright/snapshots/modules/custom-component.spec.ts/custom-component-crash-handle-renderer-linux.png differ
diff --git a/playwright/snapshots/modules/custom-component.spec.ts/custom-component-tile-fall-through-linux.png b/playwright/snapshots/modules/custom-component.spec.ts/custom-component-tile-fall-through-linux.png
new file mode 100644
index 0000000000..4198fed325
Binary files /dev/null and b/playwright/snapshots/modules/custom-component.spec.ts/custom-component-tile-fall-through-linux.png differ
diff --git a/playwright/snapshots/modules/custom-component.spec.ts/custom-component-tile-linux.png b/playwright/snapshots/modules/custom-component.spec.ts/custom-component-tile-linux.png
new file mode 100644
index 0000000000..baf7bf4ef2
Binary files /dev/null and b/playwright/snapshots/modules/custom-component.spec.ts/custom-component-tile-linux.png differ
diff --git a/playwright/snapshots/modules/custom-component.spec.ts/custom-component-tile-original-linux.png b/playwright/snapshots/modules/custom-component.spec.ts/custom-component-tile-original-linux.png
new file mode 100644
index 0000000000..5ac5509641
Binary files /dev/null and b/playwright/snapshots/modules/custom-component.spec.ts/custom-component-tile-original-linux.png differ
diff --git a/playwright/snapshots/permalinks/permalinks.spec.ts/permalink-rendering-linux.png b/playwright/snapshots/permalinks/permalinks.spec.ts/permalink-rendering-linux.png
index b386eaa564..760e2b181a 100644
Binary files a/playwright/snapshots/permalinks/permalinks.spec.ts/permalink-rendering-linux.png and b/playwright/snapshots/permalinks/permalinks.spec.ts/permalink-rendering-linux.png differ
diff --git a/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-Msg1-linux.png b/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-Msg1-linux.png
index f39caf654a..fc82f24778 100644
Binary files a/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-Msg1-linux.png and b/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-Msg1-linux.png differ
diff --git a/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-1-Msg1-linux.png b/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-1-Msg1-linux.png
index ac13a2152d..e240565e11 100644
Binary files a/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-1-Msg1-linux.png and b/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-1-Msg1-linux.png differ
diff --git a/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-2-Msg1-linux.png b/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-2-Msg1-linux.png
index 20917ae16f..a22ae313ae 100644
Binary files a/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-2-Msg1-linux.png and b/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-2-Msg1-linux.png differ
diff --git a/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-2-Msg2-linux.png b/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-2-Msg2-linux.png
index aaf8c720eb..4f635ff5fd 100644
Binary files a/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-2-Msg2-linux.png and b/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-2-Msg2-linux.png differ
diff --git a/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-4-Msg1-linux.png b/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-4-Msg1-linux.png
index 7ef356c589..0c544e58cb 100644
Binary files a/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-4-Msg1-linux.png and b/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-4-Msg1-linux.png differ
diff --git a/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-4-Msg2-linux.png b/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-4-Msg2-linux.png
index a62d8182b1..f9df40b66d 100644
Binary files a/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-4-Msg2-linux.png and b/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-4-Msg2-linux.png differ
diff --git a/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-4-Msg3-linux.png b/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-4-Msg3-linux.png
index fa548aaadc..969df22f36 100644
Binary files a/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-4-Msg3-linux.png and b/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-4-Msg3-linux.png differ
diff --git a/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-4-Msg4-linux.png b/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-4-Msg4-linux.png
index bc2062f98d..8af50bb4e5 100644
Binary files a/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-4-Msg4-linux.png and b/playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-message-banner-4-Msg4-linux.png differ
diff --git a/playwright/snapshots/polls/polls.spec.ts/Polls-Timeline-tile-no-votes-linux.png b/playwright/snapshots/polls/polls.spec.ts/Polls-Timeline-tile-no-votes-linux.png
index 7b7f296be1..39e39de944 100644
Binary files a/playwright/snapshots/polls/polls.spec.ts/Polls-Timeline-tile-no-votes-linux.png and b/playwright/snapshots/polls/polls.spec.ts/Polls-Timeline-tile-no-votes-linux.png differ
diff --git a/playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-bubble-layout-linux.png b/playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-bubble-layout-linux.png
index 0a4abba833..b974688d7b 100644
Binary files a/playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-bubble-layout-linux.png and b/playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-bubble-layout-linux.png differ
diff --git a/playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-group-layout-linux.png b/playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-group-layout-linux.png
index f00047fe84..3af5214e43 100644
Binary files a/playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-group-layout-linux.png and b/playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-group-layout-linux.png differ
diff --git a/playwright/snapshots/register/email.spec.ts/registration-check-your-email-linux.png b/playwright/snapshots/register/email.spec.ts/registration-check-your-email-linux.png
index fc52c2cb65..c958717a58 100644
Binary files a/playwright/snapshots/register/email.spec.ts/registration-check-your-email-linux.png and b/playwright/snapshots/register/email.spec.ts/registration-check-your-email-linux.png differ
diff --git a/playwright/snapshots/register/register.spec.ts/email-prompt-linux.png b/playwright/snapshots/register/register.spec.ts/email-prompt-linux.png
index 9bc2ed101b..e49db5d408 100644
Binary files a/playwright/snapshots/register/register.spec.ts/email-prompt-linux.png and b/playwright/snapshots/register/register.spec.ts/email-prompt-linux.png differ
diff --git a/playwright/snapshots/register/register.spec.ts/registration-linux.png b/playwright/snapshots/register/register.spec.ts/registration-linux.png
index 481c74fcda..1cca0eb56b 100644
Binary files a/playwright/snapshots/register/register.spec.ts/registration-linux.png and b/playwright/snapshots/register/register.spec.ts/registration-linux.png differ
diff --git a/playwright/snapshots/register/register.spec.ts/server-picker-linux.png b/playwright/snapshots/register/register.spec.ts/server-picker-linux.png
index db3ec188d1..65bf54fc88 100644
Binary files a/playwright/snapshots/register/register.spec.ts/server-picker-linux.png and b/playwright/snapshots/register/register.spec.ts/server-picker-linux.png differ
diff --git a/playwright/snapshots/register/register.spec.ts/terms-prompt-linux.png b/playwright/snapshots/register/register.spec.ts/terms-prompt-linux.png
index f5326e9d2d..92839f2ad9 100644
Binary files a/playwright/snapshots/register/register.spec.ts/terms-prompt-linux.png and b/playwright/snapshots/register/register.spec.ts/terms-prompt-linux.png differ
diff --git a/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-All-new-pinned-messages-linux.png b/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-All-new-pinned-messages-linux.png
deleted file mode 100644
index f466c17d64..0000000000
Binary files a/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-All-new-pinned-messages-linux.png and /dev/null differ
diff --git a/playwright/snapshots/right-panel/file-panel.spec.ts/file-tiles-list-linux.png b/playwright/snapshots/right-panel/file-panel.spec.ts/file-tiles-list-linux.png
index 1c75a92373..34a415dc21 100644
Binary files a/playwright/snapshots/right-panel/file-panel.spec.ts/file-tiles-list-linux.png and b/playwright/snapshots/right-panel/file-panel.spec.ts/file-tiles-list-linux.png differ
diff --git a/playwright/snapshots/right-panel/memberlist.spec.ts/with-four-members-linux.png b/playwright/snapshots/right-panel/memberlist.spec.ts/with-four-members-linux.png
index a5db88aae6..ab5b0ea76c 100644
Binary files a/playwright/snapshots/right-panel/memberlist.spec.ts/with-four-members-linux.png and b/playwright/snapshots/right-panel/memberlist.spec.ts/with-four-members-linux.png differ
diff --git a/playwright/snapshots/right-panel/right-panel.spec.ts/room-report-dialog-linux.png b/playwright/snapshots/right-panel/right-panel.spec.ts/room-report-dialog-linux.png
index 627071591c..573d63416d 100644
Binary files a/playwright/snapshots/right-panel/right-panel.spec.ts/room-report-dialog-linux.png and b/playwright/snapshots/right-panel/right-panel.spec.ts/room-report-dialog-linux.png differ
diff --git a/playwright/snapshots/right-panel/right-panel.spec.ts/with-long-name-linux.png b/playwright/snapshots/right-panel/right-panel.spec.ts/with-long-name-linux.png
index 9a3479a1e6..b1f73126c8 100644
Binary files a/playwright/snapshots/right-panel/right-panel.spec.ts/with-long-name-linux.png and b/playwright/snapshots/right-panel/right-panel.spec.ts/with-long-name-linux.png differ
diff --git a/playwright/snapshots/right-panel/right-panel.spec.ts/with-name-and-address-linux.png b/playwright/snapshots/right-panel/right-panel.spec.ts/with-name-and-address-linux.png
index 8ba6f98e11..0645b780b8 100644
Binary files a/playwright/snapshots/right-panel/right-panel.spec.ts/with-name-and-address-linux.png and b/playwright/snapshots/right-panel/right-panel.spec.ts/with-name-and-address-linux.png differ
diff --git a/playwright/snapshots/room-directory/room-directory.spec.ts/filtered-no-results-linux.png b/playwright/snapshots/room-directory/room-directory.spec.ts/filtered-no-results-linux.png
index 783e468c6e..e02a1a24cf 100644
Binary files a/playwright/snapshots/room-directory/room-directory.spec.ts/filtered-no-results-linux.png and b/playwright/snapshots/room-directory/room-directory.spec.ts/filtered-no-results-linux.png differ
diff --git a/playwright/snapshots/room-directory/room-directory.spec.ts/filtered-one-result-linux.png b/playwright/snapshots/room-directory/room-directory.spec.ts/filtered-one-result-linux.png
index aaa504f4e3..213cdb1d87 100644
Binary files a/playwright/snapshots/room-directory/room-directory.spec.ts/filtered-one-result-linux.png and b/playwright/snapshots/room-directory/room-directory.spec.ts/filtered-one-result-linux.png differ
diff --git a/playwright/snapshots/room/create-room.spec.ts/create-room-linux.png b/playwright/snapshots/room/create-room.spec.ts/create-room-linux.png
new file mode 100644
index 0000000000..10fe7a381f
Binary files /dev/null and b/playwright/snapshots/room/create-room.spec.ts/create-room-linux.png differ
diff --git a/playwright/snapshots/room/create-room.spec.ts/create-room-no-public-linux.png b/playwright/snapshots/room/create-room.spec.ts/create-room-no-public-linux.png
new file mode 100644
index 0000000000..7cd35b0050
Binary files /dev/null and b/playwright/snapshots/room/create-room.spec.ts/create-room-no-public-linux.png differ
diff --git a/playwright/snapshots/room/create-room.spec.ts/create-video-room-linux.png b/playwright/snapshots/room/create-room.spec.ts/create-video-room-linux.png
new file mode 100644
index 0000000000..a8fe2e9e64
Binary files /dev/null and b/playwright/snapshots/room/create-room.spec.ts/create-video-room-linux.png differ
diff --git a/playwright/snapshots/room/invites.spec.ts/Invites-reject-dialog-linux.png b/playwright/snapshots/room/invites.spec.ts/Invites-reject-dialog-linux.png
index 22ef895d1a..ce50be25a2 100644
Binary files a/playwright/snapshots/room/invites.spec.ts/Invites-reject-dialog-linux.png and b/playwright/snapshots/room/invites.spec.ts/Invites-reject-dialog-linux.png differ
diff --git a/playwright/snapshots/room/invites.spec.ts/Invites-room-view-linux.png b/playwright/snapshots/room/invites.spec.ts/Invites-room-view-linux.png
index 86d0e37b93..60487a7768 100644
Binary files a/playwright/snapshots/room/invites.spec.ts/Invites-room-view-linux.png and b/playwright/snapshots/room/invites.spec.ts/Invites-room-view-linux.png differ
diff --git a/playwright/snapshots/room/room-header.spec.ts/room-header-with-icon-linux.png b/playwright/snapshots/room/room-header.spec.ts/room-header-with-icon-linux.png
index 471c26ccdb..c872720f66 100644
Binary files a/playwright/snapshots/room/room-header.spec.ts/room-header-with-icon-linux.png and b/playwright/snapshots/room/room-header.spec.ts/room-header-with-icon-linux.png differ
diff --git a/playwright/snapshots/room/room-status-bar.spec.ts/connectivity-lost-linux.png b/playwright/snapshots/room/room-status-bar.spec.ts/connectivity-lost-linux.png
new file mode 100644
index 0000000000..106f16403c
Binary files /dev/null and b/playwright/snapshots/room/room-status-bar.spec.ts/connectivity-lost-linux.png differ
diff --git a/playwright/snapshots/room/room-status-bar.spec.ts/consent-linux.png b/playwright/snapshots/room/room-status-bar.spec.ts/consent-linux.png
new file mode 100644
index 0000000000..13aa6a4833
Binary files /dev/null and b/playwright/snapshots/room/room-status-bar.spec.ts/consent-linux.png differ
diff --git a/playwright/snapshots/room/room-status-bar.spec.ts/local-room-create-failed-linux.png b/playwright/snapshots/room/room-status-bar.spec.ts/local-room-create-failed-linux.png
new file mode 100644
index 0000000000..a8fe32646e
Binary files /dev/null and b/playwright/snapshots/room/room-status-bar.spec.ts/local-room-create-failed-linux.png differ
diff --git a/playwright/snapshots/room/room-status-bar.spec.ts/message-failed-linux.png b/playwright/snapshots/room/room-status-bar.spec.ts/message-failed-linux.png
new file mode 100644
index 0000000000..cccc5fb675
Binary files /dev/null and b/playwright/snapshots/room/room-status-bar.spec.ts/message-failed-linux.png differ
diff --git a/playwright/snapshots/settings/account-user-settings-tab.spec.ts/account-linux.png b/playwright/snapshots/settings/account-user-settings-tab.spec.ts/account-linux.png
index 3b4031063c..677473dded 100644
Binary files a/playwright/snapshots/settings/account-user-settings-tab.spec.ts/account-linux.png and b/playwright/snapshots/settings/account-user-settings-tab.spec.ts/account-linux.png differ
diff --git a/playwright/snapshots/settings/account-user-settings-tab.spec.ts/account-smallscreen-linux.png b/playwright/snapshots/settings/account-user-settings-tab.spec.ts/account-smallscreen-linux.png
index e0e46682a3..da4d594e23 100644
Binary files a/playwright/snapshots/settings/account-user-settings-tab.spec.ts/account-smallscreen-linux.png and b/playwright/snapshots/settings/account-user-settings-tab.spec.ts/account-smallscreen-linux.png differ
diff --git a/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/appearance-tab-linux.png b/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/appearance-tab-linux.png
index 20518942b0..5a9190aa6b 100644
Binary files a/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/appearance-tab-linux.png and b/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/appearance-tab-linux.png differ
diff --git a/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/window-12px-linux.png b/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/window-12px-linux.png
index a847075a4d..c86f95ee29 100644
Binary files a/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/window-12px-linux.png and b/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/window-12px-linux.png differ
diff --git a/playwright/snapshots/settings/encryption-user-tab/advanced.spec.ts/encryption-details-linux.png b/playwright/snapshots/settings/encryption-user-tab/advanced.spec.ts/encryption-details-linux.png
index e18821b774..438691fd44 100644
Binary files a/playwright/snapshots/settings/encryption-user-tab/advanced.spec.ts/encryption-details-linux.png and b/playwright/snapshots/settings/encryption-user-tab/advanced.spec.ts/encryption-details-linux.png differ
diff --git a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/change-key-2-encryption-tab-linux.png b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/change-key-2-encryption-tab-linux.png
index ec0207a227..a9f601e822 100644
Binary files a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/change-key-2-encryption-tab-linux.png and b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/change-key-2-encryption-tab-linux.png differ
diff --git a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-key-3-encryption-tab-linux.png b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-key-3-encryption-tab-linux.png
index cb0bc78e00..526797f712 100644
Binary files a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-key-3-encryption-tab-linux.png and b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-key-3-encryption-tab-linux.png differ
diff --git a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-recovery-linux.png b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-recovery-linux.png
index e26d001a90..39e74833b6 100644
Binary files a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-recovery-linux.png and b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-recovery-linux.png differ
diff --git a/playwright/snapshots/settings/general-room-settings-tab.spec.ts/General-room-settings-tab-should-be-rendered-properly-1-linux.png b/playwright/snapshots/settings/general-room-settings-tab.spec.ts/General-room-settings-tab-should-be-rendered-properly-1-linux.png
index c326c3f8e4..c2d1cc52a0 100644
Binary files a/playwright/snapshots/settings/general-room-settings-tab.spec.ts/General-room-settings-tab-should-be-rendered-properly-1-linux.png and b/playwright/snapshots/settings/general-room-settings-tab.spec.ts/General-room-settings-tab-should-be-rendered-properly-1-linux.png differ
diff --git a/playwright/snapshots/settings/notifications/notifications-settings-2-tab.spec.ts/standard-notifications-2-settings-linux.png b/playwright/snapshots/settings/notifications/notifications-settings-2-tab.spec.ts/standard-notifications-2-settings-linux.png
new file mode 100644
index 0000000000..5bd96ef009
Binary files /dev/null and b/playwright/snapshots/settings/notifications/notifications-settings-2-tab.spec.ts/standard-notifications-2-settings-linux.png differ
diff --git a/playwright/snapshots/settings/notifications/notifications-settings-tab.spec.ts/standard-notification-settings-linux.png b/playwright/snapshots/settings/notifications/notifications-settings-tab.spec.ts/standard-notification-settings-linux.png
new file mode 100644
index 0000000000..9452120bfb
Binary files /dev/null and b/playwright/snapshots/settings/notifications/notifications-settings-tab.spec.ts/standard-notification-settings-linux.png differ
diff --git a/playwright/snapshots/settings/preferences-user-settings-tab.spec.ts/Preferences-user-settings-tab-should-be-rendered-properly-1-linux.png b/playwright/snapshots/settings/preferences-user-settings-tab.spec.ts/Preferences-user-settings-tab-should-be-rendered-properly-1-linux.png
index 5f92c00fc3..ac54127655 100644
Binary files a/playwright/snapshots/settings/preferences-user-settings-tab.spec.ts/Preferences-user-settings-tab-should-be-rendered-properly-1-linux.png and b/playwright/snapshots/settings/preferences-user-settings-tab.spec.ts/Preferences-user-settings-tab-should-be-rendered-properly-1-linux.png differ
diff --git a/playwright/snapshots/settings/quick-settings-menu.spec.ts/quick-settings-linux.png b/playwright/snapshots/settings/quick-settings-menu.spec.ts/quick-settings-linux.png
index c6605b5b64..bd95b29bfa 100644
Binary files a/playwright/snapshots/settings/quick-settings-menu.spec.ts/quick-settings-linux.png and b/playwright/snapshots/settings/quick-settings-menu.spec.ts/quick-settings-linux.png differ
diff --git a/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-linux.png b/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-linux.png
new file mode 100644
index 0000000000..6149e4fe55
Binary files /dev/null and b/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-linux.png differ
diff --git a/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-world-readable-linux.png b/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-world-readable-linux.png
new file mode 100644
index 0000000000..fb48a55879
Binary files /dev/null and b/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-world-readable-linux.png differ
diff --git a/playwright/snapshots/settings/room-settings/room-video-tab.spec.ts/room-video-settings-linux.png b/playwright/snapshots/settings/room-settings/room-video-tab.spec.ts/room-video-settings-linux.png
new file mode 100644
index 0000000000..37303257b7
Binary files /dev/null and b/playwright/snapshots/settings/room-settings/room-video-tab.spec.ts/room-video-settings-linux.png differ
diff --git a/playwright/snapshots/settings/security-user-settings-tab.spec.ts/Security-user-settings-tab-with-posthog-enable-b5d89-csLearnMoreDialog-should-be-rendered-properly-1-linux.png b/playwright/snapshots/settings/security-user-settings-tab.spec.ts/Security-user-settings-tab-with-posthog-enable-b5d89-csLearnMoreDialog-should-be-rendered-properly-1-linux.png
index 9cd18bee3e..5a6493738f 100644
Binary files a/playwright/snapshots/settings/security-user-settings-tab.spec.ts/Security-user-settings-tab-with-posthog-enable-b5d89-csLearnMoreDialog-should-be-rendered-properly-1-linux.png and b/playwright/snapshots/settings/security-user-settings-tab.spec.ts/Security-user-settings-tab-with-posthog-enable-b5d89-csLearnMoreDialog-should-be-rendered-properly-1-linux.png differ
diff --git a/playwright/snapshots/settings/security-user-settings-tab.spec.ts/security-settings-tab-linux.png b/playwright/snapshots/settings/security-user-settings-tab.spec.ts/security-settings-tab-linux.png
new file mode 100644
index 0000000000..5ae88a2b1c
Binary files /dev/null and b/playwright/snapshots/settings/security-user-settings-tab.spec.ts/security-settings-tab-linux.png differ
diff --git a/playwright/snapshots/spaces/spaces.spec.ts/add-existing-rooms-dialog-linux.png b/playwright/snapshots/spaces/spaces.spec.ts/add-existing-rooms-dialog-linux.png
index 53ccabf4f2..52fe99b90a 100644
Binary files a/playwright/snapshots/spaces/spaces.spec.ts/add-existing-rooms-dialog-linux.png and b/playwright/snapshots/spaces/spaces.spec.ts/add-existing-rooms-dialog-linux.png differ
diff --git a/playwright/snapshots/spaces/spaces.spec.ts/invite-teammates-dialog-linux.png b/playwright/snapshots/spaces/spaces.spec.ts/invite-teammates-dialog-linux.png
index b69496e5fe..d7126166d7 100644
Binary files a/playwright/snapshots/spaces/spaces.spec.ts/invite-teammates-dialog-linux.png and b/playwright/snapshots/spaces/spaces.spec.ts/invite-teammates-dialog-linux.png differ
diff --git a/playwright/snapshots/spaces/spaces.spec.ts/space-panel-collapsed-linux.png b/playwright/snapshots/spaces/spaces.spec.ts/space-panel-collapsed-linux.png
index 312ca2580c..4ca008798f 100644
Binary files a/playwright/snapshots/spaces/spaces.spec.ts/space-panel-collapsed-linux.png and b/playwright/snapshots/spaces/spaces.spec.ts/space-panel-collapsed-linux.png differ
diff --git a/playwright/snapshots/spaces/spaces.spec.ts/space-panel-expanded-linux.png b/playwright/snapshots/spaces/spaces.spec.ts/space-panel-expanded-linux.png
index f0606ce47a..6ebcb8635f 100644
Binary files a/playwright/snapshots/spaces/spaces.spec.ts/space-panel-expanded-linux.png and b/playwright/snapshots/spaces/spaces.spec.ts/space-panel-expanded-linux.png differ
diff --git a/playwright/snapshots/spaces/spaces.spec.ts/space-room-view-linux.png b/playwright/snapshots/spaces/spaces.spec.ts/space-room-view-linux.png
index 8e627ec9f2..ac19c94bdb 100644
Binary files a/playwright/snapshots/spaces/spaces.spec.ts/space-room-view-linux.png and b/playwright/snapshots/spaces/spaces.spec.ts/space-room-view-linux.png differ
diff --git a/playwright/snapshots/spaces/spaces.spec.ts/space-visibility-settings-linux.png b/playwright/snapshots/spaces/spaces.spec.ts/space-visibility-settings-linux.png
new file mode 100644
index 0000000000..2408c046bd
Binary files /dev/null and b/playwright/snapshots/spaces/spaces.spec.ts/space-visibility-settings-linux.png differ
diff --git a/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-button-expanded-linux.png b/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-button-expanded-linux.png
index 2ad6315d9e..5d47b6b9b5 100644
Binary files a/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-button-expanded-linux.png and b/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-button-expanded-linux.png differ
diff --git a/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-expanded-linux.png b/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-expanded-linux.png
index 2ad6315d9e..5d47b6b9b5 100644
Binary files a/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-expanded-linux.png and b/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-expanded-linux.png differ
diff --git a/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-linux.png b/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-linux.png
index 591d22c3c4..40f1243619 100644
Binary files a/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-linux.png and b/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-linux.png differ
diff --git a/playwright/snapshots/threads/threads.spec.ts/Initial-ThreadView-on-bubble-layout-linux.png b/playwright/snapshots/threads/threads.spec.ts/Initial-ThreadView-on-bubble-layout-linux.png
index 60d6dc9e18..3c030baa04 100644
Binary files a/playwright/snapshots/threads/threads.spec.ts/Initial-ThreadView-on-bubble-layout-linux.png and b/playwright/snapshots/threads/threads.spec.ts/Initial-ThreadView-on-bubble-layout-linux.png differ
diff --git a/playwright/snapshots/threads/threads.spec.ts/Initial-ThreadView-on-group-layout-linux.png b/playwright/snapshots/threads/threads.spec.ts/Initial-ThreadView-on-group-layout-linux.png
index f217fe7094..77c96f7312 100644
Binary files a/playwright/snapshots/threads/threads.spec.ts/Initial-ThreadView-on-group-layout-linux.png and b/playwright/snapshots/threads/threads.spec.ts/Initial-ThreadView-on-group-layout-linux.png differ
diff --git a/playwright/snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png b/playwright/snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png
index e43e41dd79..f0d6c452a8 100644
Binary files a/playwright/snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png and b/playwright/snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png differ
diff --git a/playwright/snapshots/threads/threads.spec.ts/ThreadView-with-reaction-and-a-hidden-event-on-bubble-layout-linux.png b/playwright/snapshots/threads/threads.spec.ts/ThreadView-with-reaction-and-a-hidden-event-on-bubble-layout-linux.png
index cff1b27bd3..85ef504581 100644
Binary files a/playwright/snapshots/threads/threads.spec.ts/ThreadView-with-reaction-and-a-hidden-event-on-bubble-layout-linux.png and b/playwright/snapshots/threads/threads.spec.ts/ThreadView-with-reaction-and-a-hidden-event-on-bubble-layout-linux.png differ
diff --git a/playwright/snapshots/threads/threads.spec.ts/ThreadView-with-reaction-and-a-hidden-event-on-group-layout-linux.png b/playwright/snapshots/threads/threads.spec.ts/ThreadView-with-reaction-and-a-hidden-event-on-group-layout-linux.png
index 30fa37ab9e..669ef94f3c 100644
Binary files a/playwright/snapshots/threads/threads.spec.ts/ThreadView-with-reaction-and-a-hidden-event-on-group-layout-linux.png and b/playwright/snapshots/threads/threads.spec.ts/ThreadView-with-reaction-and-a-hidden-event-on-group-layout-linux.png differ
diff --git a/playwright/snapshots/threads/threads.spec.ts/ThreadView-with-redacted-messages-on-bubble-layout-linux.png b/playwright/snapshots/threads/threads.spec.ts/ThreadView-with-redacted-messages-on-bubble-layout-linux.png
index c92780196d..d17cf99326 100644
Binary files a/playwright/snapshots/threads/threads.spec.ts/ThreadView-with-redacted-messages-on-bubble-layout-linux.png and b/playwright/snapshots/threads/threads.spec.ts/ThreadView-with-redacted-messages-on-bubble-layout-linux.png differ
diff --git a/playwright/snapshots/threads/threads.spec.ts/ThreadView-with-redacted-messages-on-group-layout-linux.png b/playwright/snapshots/threads/threads.spec.ts/ThreadView-with-redacted-messages-on-group-layout-linux.png
index 4bad759050..5e8d75aeb5 100644
Binary files a/playwright/snapshots/threads/threads.spec.ts/ThreadView-with-redacted-messages-on-group-layout-linux.png and b/playwright/snapshots/threads/threads.spec.ts/ThreadView-with-redacted-messages-on-group-layout-linux.png differ
diff --git a/playwright/snapshots/threads/threads.spec.ts/thread-panel-linux.png b/playwright/snapshots/threads/threads.spec.ts/thread-panel-linux.png
new file mode 100644
index 0000000000..f0871c7625
Binary files /dev/null and b/playwright/snapshots/threads/threads.spec.ts/thread-panel-linux.png differ
diff --git a/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-no-avatar-linux.png b/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-no-avatar-linux.png
index 377282a2c8..6840739135 100644
Binary files a/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-no-avatar-linux.png and b/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-no-avatar-linux.png differ
diff --git a/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-room-tree-no-avatar-linux.png b/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-room-tree-no-avatar-linux.png
index 29d129f73f..f3478d05aa 100644
Binary files a/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-room-tree-no-avatar-linux.png and b/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-room-tree-no-avatar-linux.png differ
diff --git a/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-room-tree-with-avatar-linux.png b/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-room-tree-with-avatar-linux.png
index 452f08d3e2..7555a90440 100644
Binary files a/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-room-tree-with-avatar-linux.png and b/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-room-tree-with-avatar-linux.png differ
diff --git a/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-with-avatar-linux.png b/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-with-avatar-linux.png
index 93459507d0..7a7d2025c2 100644
Binary files a/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-with-avatar-linux.png and b/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-with-avatar-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/code-block-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/code-block-linux.png
index 2f62d0dec6..3f4cae7c29 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/code-block-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/code-block-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-and-messages-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-and-messages-irc-layout-linux.png
index f8135426c2..1a0a852cd1 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-and-messages-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-and-messages-irc-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-bubble-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-bubble-layout-linux.png
index 4d75b3b966..cf5e66851c 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-bubble-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-bubble-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/configured-room-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/configured-room-irc-layout-linux.png
index a6e31b89cd..d9359dab70 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/configured-room-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/configured-room-irc-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/edited-code-block-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/edited-code-block-linux.png
index 46f5cf1a7a..8b906b346e 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/edited-code-block-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/edited-code-block-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/event-line-inline-start-margin-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/event-line-inline-start-margin-irc-layout-linux.png
index 8d3d7b09ed..7c660888e6 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/event-line-inline-start-margin-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/event-line-inline-start-margin-irc-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-bubble-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-bubble-layout-linux.png
index 167f9b6855..99577dbece 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-bubble-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-bubble-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-compact-modern-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-compact-modern-layout-linux.png
index 0682bf760f..f724a3198f 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-compact-modern-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-compact-modern-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-irc-layout-linux.png
index b9899fb177..3af1ce146f 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-irc-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-irc-modern-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-irc-modern-linux.png
index ca4ce5933f..031f5aa419 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-irc-modern-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-irc-modern-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-bubble-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-bubble-layout-linux.png
index 785681b28c..040b1ef72c 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-bubble-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-bubble-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-compact-modern-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-compact-modern-layout-linux.png
index e5e312ac73..63eb2da98f 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-compact-modern-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-compact-modern-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-irc-layout-linux.png
index f79934e621..f943108d73 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-irc-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-modern-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-modern-layout-linux.png
index ff4fa7c1b9..914e10dff2 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-modern-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-modern-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-and-messages-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-and-messages-irc-layout-linux.png
index f6840e8daf..912fa679b8 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-and-messages-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-and-messages-irc-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-bubble-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-bubble-layout-linux.png
index 6154a0a268..9fbe9c79e1 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-bubble-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-bubble-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-emote-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-emote-irc-layout-linux.png
index 06853769d7..39fffefc70 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-emote-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-emote-irc-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-irc-layout-linux.png
index 8d3d7b09ed..7c660888e6 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-irc-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-modern-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-modern-layout-linux.png
index f1a95a8275..3684f57b11 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-modern-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-modern-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-redaction-placeholder-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-redaction-placeholder-linux.png
index 9d9dacd1bf..39c40e0b13 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-redaction-placeholder-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-redaction-placeholder-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/hidden-event-line-padding-modern-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/hidden-event-line-padding-modern-layout-linux.png
index e0523d6eec..74a2028787 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/hidden-event-line-padding-modern-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/hidden-event-line-padding-modern-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/hidden-event-line-zero-padding-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/hidden-event-line-zero-padding-irc-layout-linux.png
index 5c6d7710f6..f6785d89c9 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/hidden-event-line-zero-padding-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/hidden-event-line-zero-padding-irc-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/highlighted-search-results-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/highlighted-search-results-linux.png
index a99cfb68cf..d8e061597f 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/highlighted-search-results-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/highlighted-search-results-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/hovered-hidden-event-line-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/hovered-hidden-event-line-irc-layout-linux.png
index 5fb0c283b5..8a86ec81bb 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/hovered-hidden-event-line-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/hovered-hidden-event-line-irc-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/image-in-timeline-default-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/image-in-timeline-default-layout-linux.png
index b1236c9ea0..8949324613 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/image-in-timeline-default-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/image-in-timeline-default-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-bubble-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-bubble-layout-linux.png
index 5d44a1f655..fdcbb28133 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-bubble-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-bubble-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-irc-layout-linux.png
index baa75ffaba..78196d2632 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-irc-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-modern-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-modern-layout-linux.png
index 4b54392a21..df6aca3083 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-modern-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-modern-layout-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/search-aux-panel-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/search-aux-panel-linux.png
index 125c47ee35..6009b554ca 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/search-aux-panel-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/search-aux-panel-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/search-results-with-TextualEvent-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/search-results-with-TextualEvent-linux.png
index 5aa6bcea19..e742edfed9 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/search-results-with-TextualEvent-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/search-results-with-TextualEvent-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/spoiler-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/spoiler-linux.png
index 529d254dc4..1679135c12 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/spoiler-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/spoiler-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/spoiler-uncovered-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/spoiler-uncovered-linux.png
index 41d5bc8bee..65fe4d96e1 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/spoiler-uncovered-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/spoiler-uncovered-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/url-preview-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/url-preview-linux.png
index 56220d88d1..0f7d951d69 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/url-preview-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/url-preview-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/voice-message-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/voice-message-linux.png
new file mode 100644
index 0000000000..ba1cb6e3f6
Binary files /dev/null and b/playwright/snapshots/timeline/timeline.spec.ts/voice-message-linux.png differ
diff --git a/playwright/snapshots/user-view/user-view.spec.ts/user-info-linux.png b/playwright/snapshots/user-view/user-view.spec.ts/user-info-linux.png
index a4f6a476f6..9926b5801a 100644
Binary files a/playwright/snapshots/user-view/user-view.spec.ts/user-info-linux.png and b/playwright/snapshots/user-view/user-view.spec.ts/user-info-linux.png differ
diff --git a/playwright/snapshots/voip/element-call.spec.ts/incoming-call-dm-video-toast-checked-linux.png b/playwright/snapshots/voip/element-call.spec.ts/incoming-call-dm-video-toast-checked-linux.png
new file mode 100644
index 0000000000..b0fd216c56
Binary files /dev/null and b/playwright/snapshots/voip/element-call.spec.ts/incoming-call-dm-video-toast-checked-linux.png differ
diff --git a/playwright/snapshots/voip/element-call.spec.ts/incoming-call-dm-video-toast-unchecked-linux.png b/playwright/snapshots/voip/element-call.spec.ts/incoming-call-dm-video-toast-unchecked-linux.png
new file mode 100644
index 0000000000..a7b7aea8a9
Binary files /dev/null and b/playwright/snapshots/voip/element-call.spec.ts/incoming-call-dm-video-toast-unchecked-linux.png differ
diff --git a/playwright/snapshots/voip/element-call.spec.ts/incoming-call-dm-voice-toast-linux.png b/playwright/snapshots/voip/element-call.spec.ts/incoming-call-dm-voice-toast-linux.png
new file mode 100644
index 0000000000..34ddc1b02f
Binary files /dev/null and b/playwright/snapshots/voip/element-call.spec.ts/incoming-call-dm-voice-toast-linux.png differ
diff --git a/playwright/snapshots/voip/element-call.spec.ts/incoming-call-group-video-toast-checked-linux.png b/playwright/snapshots/voip/element-call.spec.ts/incoming-call-group-video-toast-checked-linux.png
new file mode 100644
index 0000000000..d25b9467d0
Binary files /dev/null and b/playwright/snapshots/voip/element-call.spec.ts/incoming-call-group-video-toast-checked-linux.png differ
diff --git a/playwright/snapshots/voip/element-call.spec.ts/incoming-call-group-video-toast-unchecked-linux.png b/playwright/snapshots/voip/element-call.spec.ts/incoming-call-group-video-toast-unchecked-linux.png
new file mode 100644
index 0000000000..78a31d1662
Binary files /dev/null and b/playwright/snapshots/voip/element-call.spec.ts/incoming-call-group-video-toast-unchecked-linux.png differ
diff --git a/playwright/snapshots/voip/element-call.spec.ts/incoming-call-group-voice-toast-linux.png b/playwright/snapshots/voip/element-call.spec.ts/incoming-call-group-voice-toast-linux.png
new file mode 100644
index 0000000000..29cf843d7b
Binary files /dev/null and b/playwright/snapshots/voip/element-call.spec.ts/incoming-call-group-voice-toast-linux.png differ
diff --git a/playwright/snapshots/voip/pstn.spec.ts/dialpad-linux.png b/playwright/snapshots/voip/pstn.spec.ts/dialpad-linux.png
index 3be63e2f50..ea67953d9e 100644
Binary files a/playwright/snapshots/voip/pstn.spec.ts/dialpad-linux.png and b/playwright/snapshots/voip/pstn.spec.ts/dialpad-linux.png differ
diff --git a/playwright/snapshots/voip/pstn.spec.ts/dialpad-trigger-linux.png b/playwright/snapshots/voip/pstn.spec.ts/dialpad-trigger-linux.png
index 17bea8979d..d1c0cad107 100644
Binary files a/playwright/snapshots/voip/pstn.spec.ts/dialpad-trigger-linux.png and b/playwright/snapshots/voip/pstn.spec.ts/dialpad-trigger-linux.png differ
diff --git a/playwright/snapshots/widgets/layout.spec.ts/apps-drawer-linux.png b/playwright/snapshots/widgets/layout.spec.ts/apps-drawer-linux.png
index 6331d373b3..50c0e1ed2d 100644
Binary files a/playwright/snapshots/widgets/layout.spec.ts/apps-drawer-linux.png and b/playwright/snapshots/widgets/layout.spec.ts/apps-drawer-linux.png differ
diff --git a/playwright/snapshots/widgets/permissions-dialog.spec.ts/widget-capabilites-prompt-linux.png b/playwright/snapshots/widgets/permissions-dialog.spec.ts/widget-capabilites-prompt-linux.png
new file mode 100644
index 0000000000..747ffb15ff
Binary files /dev/null and b/playwright/snapshots/widgets/permissions-dialog.spec.ts/widget-capabilites-prompt-linux.png differ
diff --git a/playwright/stale-screenshot-reporter.ts b/playwright/stale-screenshot-reporter.ts
deleted file mode 100644
index 36aba56a07..0000000000
--- a/playwright/stale-screenshot-reporter.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2024 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-/**
- * Test reporter which compares the reported screenshots vs those on disk to find stale screenshots
- * Only intended to run from within GitHub Actions
- */
-
-import path from "node:path";
-import { glob } from "glob";
-
-import type { Reporter, TestCase } from "@playwright/test/reporter";
-
-const snapshotRoot = path.join(__dirname, "snapshots");
-
-class StaleScreenshotReporter implements Reporter {
-    private screenshots = new Set<string>();
-    private failing = false;
-    private success = true;
-
-    public onTestEnd(test: TestCase): void {
-        if (!test.ok()) {
-            this.failing = true;
-        }
-        for (const annotation of test.annotations) {
-            if (annotation.type === "_screenshot") {
-                this.screenshots.add(annotation.description);
-            }
-        }
-    }
-
-    private error(msg: string, file: string) {
-        if (process.env.GITHUB_ACTIONS) {
-            console.log(`::error file=${file}::${msg}`);
-        }
-        console.error(msg, file);
-        this.success = false;
-    }
-
-    public async onExit(): Promise<void> {
-        if (this.failing) return;
-        const screenshotFiles = new Set(await glob(`**/*.png`, { cwd: snapshotRoot }));
-        for (const screenshot of screenshotFiles) {
-            if (screenshot.split("-").at(-1) !== "linux.png") {
-                this.error(
-                    "Found screenshot belonging to different platform, this should not be checked in",
-                    screenshot,
-                );
-            }
-        }
-        for (const screenshot of this.screenshots) {
-            screenshotFiles.delete(screenshot);
-        }
-        if (screenshotFiles.size > 0) {
-            for (const screenshot of screenshotFiles) {
-                this.error("Stale screenshot file", screenshot);
-            }
-        }
-
-        if (!this.success) {
-            process.exit(1);
-        }
-    }
-}
-
-export default StaleScreenshotReporter;
diff --git a/playwright/testcontainers/mas.ts b/playwright/testcontainers/mas.ts
new file mode 100644
index 0000000000..61cc53bbc9
--- /dev/null
+++ b/playwright/testcontainers/mas.ts
@@ -0,0 +1,24 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import {
+    MatrixAuthenticationServiceContainer as BaseMatrixAuthenticationServiceContainer,
+    type StartedPostgreSqlContainer,
+} from "@element-hq/element-web-playwright-common/lib/testcontainers";
+
+const TAG = "main@sha256:2c5966c2ff06458ac5cbae959f12e19d30e3ebb63c641d31ec1ae08abccb9c6d";
+
+/**
+ * MatrixAuthenticationServiceContainer which freezes the docker digest to
+ * stabilise tests, updated periodically by the `playwright-image-updates.yaml`
+ * workflow.
+ */
+export class MatrixAuthenticationServiceContainer extends BaseMatrixAuthenticationServiceContainer {
+    public constructor(db: StartedPostgreSqlContainer) {
+        super(db, `ghcr.io/element-hq/matrix-authentication-service:${TAG}`);
+    }
+}
diff --git a/playwright/testcontainers/synapse.ts b/playwright/testcontainers/synapse.ts
index 19d1544196..1359cd0f69 100644
--- a/playwright/testcontainers/synapse.ts
+++ b/playwright/testcontainers/synapse.ts
@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 
 import { SynapseContainer as BaseSynapseContainer } from "@element-hq/element-web-playwright-common/lib/testcontainers";
 
-const TAG = "develop@sha256:66955f34a593cfc3b6e77b8d5510c60c6094f5bade8a17d2feaefbb8662ccf09";
+const TAG = "develop@sha256:7c3dce1d2b44fdc4b1494c5b8f4792018733ad323f823b88aac30c883d09fb35";
 
 /**
  * SynapseContainer which freezes the docker digest to stabilise tests,
diff --git a/res/css/_common.pcss b/res/css/_common.pcss
index 3eed8c93c6..ec83fef901 100644
--- a/res/css/_common.pcss
+++ b/res/css/_common.pcss
@@ -9,8 +9,6 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-@import url("@vector-im/compound-design-tokens/assets/web/css/compound-design-tokens.css") layer(compound);
-@import url("@vector-im/compound-web/dist/style.css");
 @import "./_font-sizes.pcss";
 @import "./_animations.pcss";
 @import "./_spacing.pcss";
@@ -85,8 +83,9 @@ html {
 }
 
 body {
-    font: var(--cpd-font-body-md-regular);
-    letter-spacing: var(--cpd-font-letter-spacing-body-md);
+    /* !important because compound overrides these font settings for body */
+    font: var(--cpd-font-body-md-regular) !important;
+    letter-spacing: var(--cpd-font-letter-spacing-body-md) !important;
     /**
      * We want to apply Inter Dynamic metrics (https://rsms.me/inter/dynmetrics/)
      * We need to tweak the `letter-spacing` property and doing so, disables by
@@ -97,7 +96,7 @@ body {
     font-feature-settings:
         "kern" 1,
         "liga" 1,
-        "calt" 1;
+        "calt" 1 !important;
 
     background-color: $background;
     color: $primary-content;
@@ -602,6 +601,8 @@ legend {
         .mx_AccessibleButton,
         .mx_IdentityServerPicker button,
         .mx_AccessSecretStorageDialog button,
+        .mx_InviteDialog_section button,
+        .mx_InviteDialog_editor button,
         [class|="maplibregl"]
     ),
 .mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton, .mx_AccessibleButton),
@@ -643,7 +644,9 @@ legend {
         .mx_ThemeChoicePanel_CustomTheme button,
         .mx_UnpinAllDialog button,
         .mx_ShareDialog button,
-        .mx_EncryptionUserSettingsTab button
+        .mx_EncryptionUserSettingsTab button,
+        .mx_InviteDialog_section button,
+        .mx_InviteDialog_editor button
     ):focus,
 .mx_Dialog input[type="submit"]:focus,
 .mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton, .mx_AccessibleButton):focus,
@@ -892,53 +895,23 @@ legend {
 
 @define-mixin composerButtonHighLight {
     background: var(--cpd-color-bg-subtle-primary);
-    &::before {
-        background-color: var(--cpd-color-icon-primary) !important;
-    }
+    color: var(--cpd-color-icon-primary) !important;
 }
 
 @define-mixin composerButton $border-radius, $hover-color, $hover-bg {
-    --size: 26px;
     position: relative;
     cursor: pointer;
-    height: var(--size);
-    line-height: var(--size);
-    width: auto;
-    padding-left: var(--size);
     border-radius: $border-radius;
 
-    &::before {
-        content: "";
-        position: absolute;
-        top: 3px;
-        left: 3px;
-        height: 20px;
-        width: 20px;
-        background-color: $icon-button-color;
-        mask-repeat: no-repeat;
-        mask-size: contain;
-        mask-position: center;
-        z-index: 2;
-    }
-
-    &::after {
-        content: "";
-        position: absolute;
-        left: 0;
-        top: 0;
-        z-index: 0;
-        width: var(--size);
-        height: var(--size);
-        border-radius: $border-radius;
+    svg {
+        color: $icon-button-color;
     }
 
     &:hover {
-        &::after {
-            background: $hover-bg;
-        }
+        background-color: $hover-bg;
 
-        &::before {
-            background-color: $hover-color;
+        svg {
+            color: $hover-color;
         }
     }
 }
diff --git a/res/css/_components.pcss b/res/css/_components.pcss
index e212163784..11c9883bcb 100644
--- a/res/css/_components.pcss
+++ b/res/css/_components.pcss
@@ -53,8 +53,6 @@
 @import "./components/views/settings/shared/_SettingsSubsectionHeading.pcss";
 @import "./components/views/spaces/_QuickThemeSwitcher.pcss";
 @import "./components/views/typography/_Caption.pcss";
-@import "./components/views/utils/_Box.pcss";
-@import "./components/views/utils/_Flex.pcss";
 @import "./compound/_Icon.pcss";
 @import "./compound/_SuccessDialog.pcss";
 @import "./structures/_AutoHideScrollbar.pcss";
@@ -81,6 +79,7 @@
 @import "./structures/_SearchBox.pcss";
 @import "./structures/_SpaceHierarchy.pcss";
 @import "./structures/_SpacePanel.pcss";
+@import "./structures/_SpacePillButton.pcss";
 @import "./structures/_SpaceRoomView.pcss";
 @import "./structures/_SplashPage.pcss";
 @import "./structures/_TabbedView.pcss";
@@ -97,7 +96,6 @@
 @import "./structures/auth/_Registration.pcss";
 @import "./structures/auth/_SessionLockStolenView.pcss";
 @import "./structures/auth/_SetupEncryptionBody.pcss";
-@import "./views/audio_messages/_AudioPlayer.pcss";
 @import "./views/audio_messages/_PlayPauseButton.pcss";
 @import "./views/audio_messages/_PlaybackContainer.pcss";
 @import "./views/audio_messages/_SeekBar.pcss";
@@ -123,9 +121,6 @@
 @import "./views/context_menus/_DeviceContextMenu.pcss";
 @import "./views/context_menus/_IconizedContextMenu.pcss";
 @import "./views/context_menus/_LegacyCallContextMenu.pcss";
-@import "./views/context_menus/_MessageContextMenu.pcss";
-@import "./views/context_menus/_RoomGeneralContextMenu.pcss";
-@import "./views/context_menus/_RoomNotificationContextMenu.pcss";
 @import "./views/dialogs/_AddExistingToSpaceDialog.pcss";
 @import "./views/dialogs/_AnalyticsLearnMoreDialog.pcss";
 @import "./views/dialogs/_BugReportDialog.pcss";
@@ -145,6 +140,7 @@
 @import "./views/dialogs/_GenericFeatureFeedbackDialog.pcss";
 @import "./views/dialogs/_IncomingSasDialog.pcss";
 @import "./views/dialogs/_InviteDialog.pcss";
+@import "./views/dialogs/_InviteProgressBody.pcss";
 @import "./views/dialogs/_JoinRuleDropdown.pcss";
 @import "./views/dialogs/_LeaveSpaceDialog.pcss";
 @import "./views/dialogs/_LocationViewDialog.pcss";
@@ -177,7 +173,6 @@
 @import "./views/dialogs/_WidgetCapabilitiesPromptDialog.pcss";
 @import "./views/dialogs/security/_AccessSecretStorageDialog.pcss";
 @import "./views/dialogs/security/_CreateCrossSigningDialog.pcss";
-@import "./views/dialogs/security/_CreateKeyBackupDialog.pcss";
 @import "./views/dialogs/security/_CreateSecretStorageDialog.pcss";
 @import "./views/dialogs/security/_KeyBackupFailedDialog.pcss";
 @import "./views/dialogs/security/_RestoreKeyBackupDialog.pcss";
@@ -212,6 +207,7 @@
 @import "./views/elements/_SSOButtons.pcss";
 @import "./views/elements/_SearchWarning.pcss";
 @import "./views/elements/_ServerPicker.pcss";
+@import "./views/elements/_SettingsDropdown.pcss";
 @import "./views/elements/_SettingsFlag.pcss";
 @import "./views/elements/_Spinner.pcss";
 @import "./views/elements/_StyledRadioButton.pcss";
@@ -241,7 +237,6 @@
 @import "./views/messages/_MLocationBody.pcss";
 @import "./views/messages/_MNoticeBody.pcss";
 @import "./views/messages/_MPollBody.pcss";
-@import "./views/messages/_MPollEndBody.pcss";
 @import "./views/messages/_MStickerBody.pcss";
 @import "./views/messages/_MTextBody.pcss";
 @import "./views/messages/_MVideoBody.pcss";
@@ -280,7 +275,6 @@
 @import "./views/rooms/RoomListPanel/_RoomListItemView.pcss";
 @import "./views/rooms/RoomListPanel/_RoomListPanel.pcss";
 @import "./views/rooms/RoomListPanel/_RoomListPrimaryFilters.pcss";
-@import "./views/rooms/RoomListPanel/_RoomListSearch.pcss";
 @import "./views/rooms/RoomListPanel/_RoomListSecondaryFilters.pcss";
 @import "./views/rooms/RoomListPanel/_RoomListSkeleton.pcss";
 @import "./views/rooms/_AppsDrawer.pcss";
@@ -288,7 +282,6 @@
 @import "./views/rooms/_AuxPanel.pcss";
 @import "./views/rooms/_BasicMessageComposer.pcss";
 @import "./views/rooms/_CallGuestLinkButton.pcss";
-@import "./views/rooms/_DecryptionFailureBar.pcss";
 @import "./views/rooms/_E2EIcon.pcss";
 @import "./views/rooms/_E2EIconView.pcss";
 @import "./views/rooms/_EditMessageComposer.pcss";
@@ -390,7 +383,6 @@
 @import "./views/spaces/_SpaceBasicSettings.pcss";
 @import "./views/spaces/_SpaceChildrenPicker.pcss";
 @import "./views/spaces/_SpaceCreateMenu.pcss";
-@import "./views/spaces/_SpacePublicShare.pcss";
 @import "./views/terms/_InlineTermsAgreement.pcss";
 @import "./views/toasts/_AnalyticsToast.pcss";
 @import "./views/toasts/_IncomingCallToast.pcss";
diff --git a/res/css/_compound.pcss b/res/css/_compound.pcss
new file mode 100644
index 0000000000..2bc482551d
--- /dev/null
+++ b/res/css/_compound.pcss
@@ -0,0 +1,3 @@
+/* Modules bundled with compound apply compound lastly. In order to catch issue due to css class ordering, we put compound at the end */
+@import url("@vector-im/compound-design-tokens/assets/web/css/compound-design-tokens.css") layer(compound);
+@import url("@vector-im/compound-web/dist/style.css");
diff --git a/res/css/_font-sizes.pcss b/res/css/_font-sizes.pcss
index 528cc3c462..98ebf28af0 100644
--- a/res/css/_font-sizes.pcss
+++ b/res/css/_font-sizes.pcss
@@ -12,31 +12,39 @@ Please see LICENSE files in the repository root for full details.
  * These are defined in `rem` so that they scale with the `font-size` of the root element (which is adjustable via the
  * "Font size" setting). They exist to make the job of converting designs (which tend to be based in pixels) into CSS
  * easier.
+ */
+
+/*
+ * These variables are now *deprecated* and should not be used in new code; instead Compound typographic tokens
+ * should be used. Direct equivalents for these old font size tokens are listed below; where no equivalent exists,
+ * that suggests that the design is using a non-standard font size and should be updated.
  *
+ * In fact, modern Figma designs should actually use a named Typography style such as "Web/font/heading/sm/semibold",
+ * translates directly to `font: var(--cpd-font-heading-sm-semibold)`.
  */
 $font-1px: 0.0625rem;
 $font-8px: 0.5rem;
 $font-9px: 0.5625rem;
 $font-10px: 0.625rem;
 $font-10-4px: 0.6275rem;
-$font-11px: 0.6875rem;
+$font-11px: 0.6875rem; /* Compound equivalent: --cpd-font-size-body-xs */
 $font-12px: 0.75rem;
-$font-13px: 0.8125rem;
+$font-13px: 0.8125rem; /* Compound equivalent: --cpd-font-size-body-sm */
 $font-14px: 0.875rem;
-$font-15px: 0.9375rem;
+$font-15px: 0.9375rem; /* Compound equivalent: --cpd-font-size-body-md */
 $font-16px: 1rem;
-$font-17px: 1.0625rem;
+$font-17px: 1.0625rem; /* Compound equivalent: --cpd-font-size-body-lg */
 $font-18px: 1.125rem;
-$font-20px: 1.25rem;
+$font-20px: 1.25rem; /* Compound equivalent: --cpd-font-size-heading-sm */
 $font-22px: 1.375rem;
 $font-23px: 1.4375rem;
-$font-24px: 1.5rem;
+$font-24px: 1.5rem; /* Compound equivalent: --cpd-font-size-heading-md */
 $font-25px: 1.5625rem;
 $font-26px: 1.625rem;
-$font-28px: 1.75rem;
+$font-28px: 1.75rem; /* Compound equivalent: --cpd-font-size-heading-lg */
 $font-29px: 1.8125rem;
 $font-30px: 1.875rem;
-$font-32px: 2rem;
+$font-32px: 2rem; /* Compound equivalent: --cpd-font-size-heading-xl */
 $font-34px: 2.125rem;
 $font-35px: 2.1875rem;
 $font-39px: 2.4375rem;
diff --git a/res/css/components/views/dialogs/polls/_PollListItem.pcss b/res/css/components/views/dialogs/polls/_PollListItem.pcss
index 6cb46a21d2..cd24c75937 100644
--- a/res/css/components/views/dialogs/polls/_PollListItem.pcss
+++ b/res/css/components/views/dialogs/polls/_PollListItem.pcss
@@ -15,7 +15,7 @@ Please see LICENSE files in the repository root for full details.
     display: grid;
     justify-content: left;
     align-items: center;
-    grid-gap: $spacing-8;
+    gap: $spacing-8;
     grid-template-columns: auto auto auto;
     grid-template-rows: auto;
     cursor: pointer;
diff --git a/res/css/components/views/dialogs/polls/_PollListItemEnded.pcss b/res/css/components/views/dialogs/polls/_PollListItemEnded.pcss
index 772b47c9a4..2eb7a185ac 100644
--- a/res/css/components/views/dialogs/polls/_PollListItemEnded.pcss
+++ b/res/css/components/views/dialogs/polls/_PollListItemEnded.pcss
@@ -22,7 +22,7 @@ Please see LICENSE files in the repository root for full details.
     display: grid;
     justify-content: left;
     align-items: center;
-    grid-gap: $spacing-8;
+    gap: $spacing-8;
     grid-template-columns: min-content 1fr min-content;
     grid-template-rows: auto;
 }
@@ -47,7 +47,7 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_PollListItemEnded_answers {
     display: grid;
-    grid-gap: $spacing-8;
+    gap: $spacing-8;
     margin-top: $spacing-12;
 }
 
diff --git a/res/css/components/views/elements/_FilterDropdown.pcss b/res/css/components/views/elements/_FilterDropdown.pcss
index 22eb5f2ff1..5385a614cc 100644
--- a/res/css/components/views/elements/_FilterDropdown.pcss
+++ b/res/css/components/views/elements/_FilterDropdown.pcss
@@ -40,7 +40,7 @@ Please see LICENSE files in the repository root for full details.
     }
 
     .mx_Dropdown_arrow {
-        background: $secondary-content;
+        color: $secondary-content;
     }
 }
 
diff --git a/res/css/components/views/polls/_PollOption.pcss b/res/css/components/views/polls/_PollOption.pcss
index 42ec7c8dac..4fecce4752 100644
--- a/res/css/components/views/polls/_PollOption.pcss
+++ b/res/css/components/views/polls/_PollOption.pcss
@@ -50,8 +50,43 @@ Please see LICENSE files in the repository root for full details.
 }
 
 .mx_PollOption_checked {
-    border-color: var(--cpd-color-border-interactive-hovered);
+    .mx_PollOption_popularityBackground {
+        .mx_PollOption_popularityAmount {
+            background-color: var(--cpd-color-icon-primary);
+        }
+    }
 
+    /* override checked radio button styling to show checkmark instead */
+    .mx_StyledRadioButton_checked {
+        input[type="radio"]:checked + div {
+            position: relative;
+            border-width: 2px;
+            border-color: var(--cpd-color-icon-primary);
+            background-color: var(--cpd-color-icon-primary);
+
+            &::before {
+                content: "";
+                position: absolute;
+                top: 50%;
+                left: 50%;
+                transform: translate(-50%, -50%);
+                mask-image: url("@vector-im/compound-design-tokens/icons/check.svg");
+                mask-size: 12px 12px;
+                mask-repeat: no-repeat;
+                mask-position: center;
+                background-color: var(--cpd-color-icon-on-solid-primary);
+                width: 12px;
+                height: 12px;
+            }
+
+            div {
+                visibility: hidden;
+            }
+        }
+    }
+}
+
+.mx_PollOption_ended.mx_PollOption_checked {
     .mx_PollOption_popularityBackground {
         .mx_PollOption_popularityAmount {
             background-color: var(--cpd-color-icon-accent-tertiary);
@@ -61,17 +96,8 @@ Please see LICENSE files in the repository root for full details.
     /* override checked radio button styling to show checkmark instead */
     .mx_StyledRadioButton_checked {
         input[type="radio"]:checked + div {
-            border-width: 2px;
             border-color: var(--cpd-color-icon-accent-tertiary);
             background-color: var(--cpd-color-icon-accent-tertiary);
-            background-image: url("@vector-im/compound-design-tokens/icons/check.svg");
-            background-size: 12px;
-            background-repeat: no-repeat;
-            background-position: center;
-
-            div {
-                visibility: hidden;
-            }
         }
     }
 }
@@ -94,6 +120,6 @@ Please see LICENSE files in the repository root for full details.
         width: 0%;
         height: 8px;
         border-radius: 8px;
-        background-color: $quaternary-content;
+        background-color: var(--cpd-color-icon-primary);
     }
 }
diff --git a/res/css/components/views/settings/devices/_DeviceDetailHeading.pcss b/res/css/components/views/settings/devices/_DeviceDetailHeading.pcss
index 789efa9e7f..82b19b9ff1 100644
--- a/res/css/components/views/settings/devices/_DeviceDetailHeading.pcss
+++ b/res/css/components/views/settings/devices/_DeviceDetailHeading.pcss
@@ -19,7 +19,7 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_DeviceDetailHeading_renameForm {
     display: grid;
-    grid-gap: $spacing-16;
+    gap: $spacing-16;
     justify-content: left;
     grid-template-columns: 100%;
 }
diff --git a/res/css/components/views/settings/devices/_DeviceDetails.pcss b/res/css/components/views/settings/devices/_DeviceDetails.pcss
index d3635710f3..4b311d1c7c 100644
--- a/res/css/components/views/settings/devices/_DeviceDetails.pcss
+++ b/res/css/components/views/settings/devices/_DeviceDetails.pcss
@@ -23,7 +23,7 @@ Please see LICENSE files in the repository root for full details.
     border-bottom: 1px solid $quinary-content;
 
     display: grid;
-    grid-gap: $spacing-24;
+    gap: $spacing-24;
     justify-content: left;
     grid-template-columns: 100%;
 
diff --git a/res/css/components/views/settings/devices/_DeviceTile.pcss b/res/css/components/views/settings/devices/_DeviceTile.pcss
index e4096329d6..07ee70792d 100644
--- a/res/css/components/views/settings/devices/_DeviceTile.pcss
+++ b/res/css/components/views/settings/devices/_DeviceTile.pcss
@@ -35,7 +35,7 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_DeviceTile_actions {
     display: grid;
-    grid-gap: $spacing-8;
+    gap: $spacing-8;
     grid-auto-flow: column;
     margin-left: $spacing-8;
 }
diff --git a/res/css/components/views/settings/devices/_FilteredDeviceList.pcss b/res/css/components/views/settings/devices/_FilteredDeviceList.pcss
index aac5986280..06f5a80b65 100644
--- a/res/css/components/views/settings/devices/_FilteredDeviceList.pcss
+++ b/res/css/components/views/settings/devices/_FilteredDeviceList.pcss
@@ -15,7 +15,7 @@ Please see LICENSE files in the repository root for full details.
 .mx_FilteredDeviceList_list {
     list-style-type: none;
     display: grid;
-    grid-gap: $spacing-16;
+    gap: $spacing-16;
     margin: 0;
     padding: 0 $spacing-16;
 }
diff --git a/res/css/components/views/settings/shared/_SettingsSubsection.pcss b/res/css/components/views/settings/shared/_SettingsSubsection.pcss
index 0d03a12b1d..77ed0f9f82 100644
--- a/res/css/components/views/settings/shared/_SettingsSubsection.pcss
+++ b/res/css/components/views/settings/shared/_SettingsSubsection.pcss
@@ -20,9 +20,10 @@ Please see LICENSE files in the repository root for full details.
         /**
          * The gap between subsections is 32px and inside the subsection is 24px.
          * The separator separates the subsections, so it should have the same gap as the subsections.
-         * We add 12px and the separator spacing to the top margin to make the separator visually centered between the subsections.
+         * We add 12px and the separator spacing (8px) to the top margin to make the separator visually centered between the subsections.
+         * !important because it's overriding compound margin.
          */
-        margin-top: calc(var(--cpd-space-3x) + var(--cpd-separator-spacing));
+        margin-top: var(--cpd-space-5x) !important;
     }
 }
 
@@ -39,7 +40,7 @@ Please see LICENSE files in the repository root for full details.
 .mx_SettingsSubsection_content {
     width: 100%;
     display: grid;
-    grid-gap: $spacing-8;
+    gap: var(--cpd-space-4x);
     /* setting minwidth 0 makes columns definitely sized fixing horizontal overflow */
     grid-template-columns: minmax(0, 1fr);
     justify-items: flex-start;
diff --git a/res/css/rethemendex.sh b/res/css/rethemendex.sh
index 37090b96d8..3f0ed28e3f 100755
--- a/res/css/rethemendex.sh
+++ b/res/css/rethemendex.sh
@@ -8,7 +8,7 @@ cd `dirname $0`
     # we used to have exclude /themes from the find at this point.
     # as themes are no longer a spurious subdirectory of css/, we don't
     # need it any more.
-    find . -iname _\*.pcss | fgrep -v _components.pcss | LC_ALL=C sort |
+    find . -iname _\*.pcss | fgrep -v _components.pcss | fgrep -v _compound.pcss | LC_ALL=C sort |
         while read i; do
             echo "@import \"$i\";"
         done
diff --git a/res/css/shared.pcss b/res/css/shared.pcss
new file mode 100644
index 0000000000..42f8393666
--- /dev/null
+++ b/res/css/shared.pcss
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+@import url("@vector-im/compound-design-tokens/assets/web/css/compound-design-tokens.css") layer(compound);
+@import url("@vector-im/compound-web/dist/style.css");
diff --git a/res/css/structures/ErrorView.pcss b/res/css/structures/ErrorView.pcss
index ddc510e188..c7eebd450e 100644
--- a/res/css/structures/ErrorView.pcss
+++ b/res/css/structures/ErrorView.pcss
@@ -24,7 +24,7 @@ Please see LICENSE files in the repository root for full details.
     background-color: var(--cpd-color-theme-bg);
     background-image: url("../../themes/element/img/compound/fade-arc-light.png");
     background-repeat: no-repeat;
-    background-size: 100% 100%;
+    background-size: 100%;
 
     .mx_ErrorView_logo {
         display: block;
@@ -50,7 +50,7 @@ Please see LICENSE files in the repository root for full details.
         color: var(--cpd-color-text-secondary);
     }
 
-    .mx_Flex {
+    .mx_ErrorView_flexContainer {
         margin: 0 auto;
         max-width: max-content;
         flex-wrap: wrap;
diff --git a/res/css/structures/_GenericDropdownMenu.pcss b/res/css/structures/_GenericDropdownMenu.pcss
index 1d0fb79648..a2aa022eee 100644
--- a/res/css/structures/_GenericDropdownMenu.pcss
+++ b/res/css/structures/_GenericDropdownMenu.pcss
@@ -13,6 +13,12 @@ Please see LICENSE files in the repository root for full details.
     user-select: none;
     font-size: $font-12px;
     color: $secondary-content;
+
+    svg {
+        width: 18px;
+        height: 18px;
+        float: right;
+    }
 }
 
 .mx_GenericDropdownMenu_button:hover,
@@ -20,17 +26,6 @@ Please see LICENSE files in the repository root for full details.
     background: $quinary-content;
 }
 
-.mx_GenericDropdownMenu_button::before {
-    content: "";
-    width: 18px;
-    height: 18px;
-    background: currentColor;
-    mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg");
-    mask-size: 100%;
-    mask-repeat: no-repeat;
-    float: right;
-}
-
 .mx_ContextualMenu_wrapper.mx_GenericDropdownMenu_wrapper {
     .mx_ContextualMenu {
         position: initial;
@@ -97,16 +92,12 @@ Please see LICENSE files in the repository root for full details.
                 background-color: $menu-selected-color;
             }
 
-            &[aria-checked="true"]::before {
-                content: "";
+            .mx_GenericDropdownMenu_Option--checkIcon {
                 width: 16px;
                 height: 16px;
                 margin-left: -22px;
                 margin-right: 6px;
-                mask-image: url("@vector-im/compound-design-tokens/icons/check.svg");
-                mask-size: 100%;
-                mask-repeat: no-repeat;
-                background-color: $primary-content;
+                color: $primary-content;
                 display: inline-block;
                 vertical-align: middle;
             }
diff --git a/res/css/structures/_HomePage.pcss b/res/css/structures/_HomePage.pcss
index 4999bae3fe..505fc4bad6 100644
--- a/res/css/structures/_HomePage.pcss
+++ b/res/css/structures/_HomePage.pcss
@@ -88,11 +88,11 @@ Please see LICENSE files in the repository root for full details.
             }
 
             &.mx_HomePage_button_explore::before {
-                mask-image: url("$(res)/img/element-icons/roomlist/explore.svg");
+                mask-image: url("@vector-im/compound-design-tokens/icons/explore.svg");
             }
 
             &.mx_HomePage_button_createGroup::before {
-                mask-image: url("$(res)/img/element-icons/group-members.svg");
+                mask-image: url("@vector-im/compound-design-tokens/icons/group.svg");
             }
         }
     }
diff --git a/res/css/structures/_LeftPanel.pcss b/res/css/structures/_LeftPanel.pcss
index c1886b6b80..f290772e20 100644
--- a/res/css/structures/_LeftPanel.pcss
+++ b/res/css/structures/_LeftPanel.pcss
@@ -18,9 +18,6 @@ Please see LICENSE files in the repository root for full details.
     flex-direction: column;
     max-width: 50%;
     position: relative;
-
-    /* Contain the amount of layers rendered by constraining what actually needs re-layering via css */
-    contain: layout paint;
 }
 
 .mx_LeftPanel_wrapper,
@@ -28,12 +25,6 @@ Please see LICENSE files in the repository root for full details.
     --collapsedWidth: 68px;
 }
 
-.mx_LeftPanel_newRoomList {
-    /* Thew new rooms list is not designed to be collapsed to just icons. */
-    /* 224 + 68(spaces bar) was deemed by design to be a good minimum for the left panel. */
-    --collapsedWidth: 224px;
-}
-
 .mx_LeftPanel_wrapper {
     display: flex;
     flex-direction: row;
@@ -123,67 +114,30 @@ Please see LICENSE files in the repository root for full details.
                 margin-top: 12px;
             }
 
-            .mx_LeftPanel_dialPadButton {
-                width: 32px;
-                height: 32px;
+            .mx_LeftPanel_dialPadButton,
+            .mx_LeftPanel_exploreButton {
+                width: 20px;
+                height: 20px;
+                padding: var(--cpd-space-1-5x);
                 border-radius: 8px;
                 background-color: $panel-actions;
-                position: relative;
                 margin-left: 8px;
 
-                &::before {
-                    content: "";
-                    position: absolute;
-                    top: 8px;
-                    left: 8px;
-                    width: 16px;
-                    height: 16px;
-                    mask-image: url("$(res)/img/element-icons/call/dialpad.svg");
-                    mask-position: center;
-                    mask-size: contain;
-                    mask-repeat: no-repeat;
-                    background-color: $secondary-content;
-                }
-            }
-
-            .mx_LeftPanel_exploreButton,
-            .mx_LeftPanel_recentsButton {
-                width: 32px;
-                height: 32px;
-                border-radius: 8px;
-                background-color: $panel-actions;
-                position: relative;
-                margin-left: 8px;
-
-                &::before {
-                    content: "";
-                    position: absolute;
-                    top: 8px;
-                    left: 8px;
-                    width: 16px;
-                    height: 16px;
-                    mask-position: center;
-                    mask-size: contain;
-                    mask-repeat: no-repeat;
-                    background-color: $secondary-content;
+                svg {
+                    width: inherit;
+                    height: inherit;
+                    display: block;
+                    color: $secondary-content;
                 }
 
                 &:hover {
                     background-color: $tertiary-content;
 
-                    &::before {
-                        background-color: $background;
+                    svg {
+                        color: $background;
                     }
                 }
             }
-
-            .mx_LeftPanel_exploreButton::before {
-                mask-image: url("$(res)/img/element-icons/roomlist/explore.svg");
-            }
-
-            .mx_LeftPanel_recentsButton::before {
-                mask-image: url("@vector-im/compound-design-tokens/icons/time.svg");
-            }
         }
 
         .mx_LegacyRoomListHeader:first-child {
@@ -237,8 +191,7 @@ Please see LICENSE files in the repository root for full details.
                     background-color: transparent;
                 }
 
-                .mx_LeftPanel_exploreButton,
-                .mx_LeftPanel_recentsButton {
+                .mx_LeftPanel_exploreButton {
                     margin-left: 0;
                     margin-top: 8px;
                 }
@@ -246,3 +199,11 @@ Please see LICENSE files in the repository root for full details.
         }
     }
 }
+
+.mx_LeftPanel_newRoomList {
+    /* Thew new rooms list is not designed to be collapsed to just icons. */
+    /* 224 + 68(spaces bar) was deemed by design to be a good minimum for the left panel. */
+    --collapsedWidth: 224px;
+    /* Important to force the color on ED titlebar until we remove the old room list */
+    background-color: var(--cpd-color-bg-canvas-default) !important;
+}
diff --git a/res/css/structures/_QuickSettingsButton.pcss b/res/css/structures/_QuickSettingsButton.pcss
index f4b881f955..b681cecb30 100644
--- a/res/css/structures/_QuickSettingsButton.pcss
+++ b/res/css/structures/_QuickSettingsButton.pcss
@@ -7,39 +7,59 @@ Please see LICENSE files in the repository root for full details.
 */
 
 .mx_QuickSettingsButton {
-    flex: 0 0 auto;
-    border-radius: 8px;
-    position: relative;
-    margin: 12px auto;
-    color: $secondary-content;
-    min-width: 32px;
-    min-height: 32px;
-    line-height: 32px;
+    /* !important override compound */
+    border-radius: 8px !important;
+    margin: 12px auto 12px;
 
-    &.expanded {
-        margin-left: 20px;
-        padding-left: 44px; /* align with toggle collapse button text */
-        padding-right: 8px;
-    }
-
-    &::before {
-        content: "";
-        position: absolute;
-        width: 32px;
-        height: 32px;
-        left: 0;
-        mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg");
-        mask-repeat: no-repeat;
-        mask-position: center;
-        mask-size: 24px;
-        background: $secondary-content;
+    svg {
+        fill: $secondary-content;
     }
 
     &:not(.expanded):hover {
-        background-color: $quaternary-content;
+        /**
+         * override compound default background color when hovered
+         * should disappear when the space panel will be migrated to compound
+         */
+        background-color: $quaternary-content !important;
+        color: $primary-content;
 
-        &::before {
-            background-color: $primary-content;
+        svg {
+            fill: $primary-content;
+        }
+    }
+
+    &.expanded {
+        /**
+         * override compound default background color when hovered
+         * should disappear when the space panel will be migrated to compound
+         */
+        background-color: transparent !important;
+
+        /* align with settings icon */
+        margin-left: 21px;
+        margin-right: 8px;
+        width: 100%;
+
+        /**
+         * modify internal css of the compound component
+         * dirty but we need to add the label into the indicator icon button
+         **/
+        & > div {
+            display: flex;
+            align-items: center;
+        }
+
+        svg {
+            /* align with settings label */
+            margin-right: 14px;
+            /* required to set the icon width when into a flex container */
+            width: 24px;
+            flex-shrink: 0;
+        }
+
+        & .mx_QuickSettingsButton_label {
+            /* !important override compound  */
+            color: $secondary-content !important;
         }
     }
 }
diff --git a/res/css/structures/_RightPanel.pcss b/res/css/structures/_RightPanel.pcss
index f96f8b7232..8c1ed8691f 100644
--- a/res/css/structures/_RightPanel.pcss
+++ b/res/css/structures/_RightPanel.pcss
@@ -24,36 +24,6 @@ Please see LICENSE files in the repository root for full details.
     }
 }
 
-/** Fixme - factor this out with the main header **/
-
-.mx_RightPanel_threadsButton::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/threads-solid.svg");
-}
-
-.mx_RightPanel_notifsButton::before {
-    mask-image: url("$(res)/img/element-icons/notifications.svg");
-    mask-position: center;
-}
-
-.mx_RightPanel_roomSummaryButton::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/info-solid.svg");
-    mask-position: center;
-}
-
-.mx_RightPanel_pinnedMessagesButton {
-    &::before {
-        mask-image: url("$(res)/img/element-icons/room/pin.svg");
-        mask-position: center;
-    }
-}
-
-.mx_RightPanel_timelineCardButton {
-    &::before {
-        mask-image: url("$(res)/img/element-icons/feedback.svg");
-        mask-position: center;
-    }
-}
-
 .mx_RightPanel .mx_MemberList,
 .mx_RightPanel .mx_MemberInfo {
     order: 2;
diff --git a/res/css/structures/_RoomSearch.pcss b/res/css/structures/_RoomSearch.pcss
index 8c82f73ea4..beb60e7ef9 100644
--- a/res/css/structures/_RoomSearch.pcss
+++ b/res/css/structures/_RoomSearch.pcss
@@ -26,10 +26,7 @@ Please see LICENSE files in the repository root for full details.
     .mx_RoomSearch_icon {
         width: 20px;
         height: 20px;
-        mask-image: url("@vector-im/compound-design-tokens/icons/search.svg");
-        mask-repeat: no-repeat;
-        mask-size: contain;
-        background-color: $secondary-content;
+        color: $secondary-content;
         margin-left: var(--cpd-space-2x);
         flex-shrink: 0;
     }
@@ -90,7 +87,7 @@ Please see LICENSE files in the repository root for full details.
         }
 
         .mx_RoomSearch_icon {
-            background-color: $background;
+            color: $background;
         }
     }
 }
diff --git a/res/css/structures/_RoomStatusBar.pcss b/res/css/structures/_RoomStatusBar.pcss
index 19bcc4cb97..f3b1737812 100644
--- a/res/css/structures/_RoomStatusBar.pcss
+++ b/res/css/structures/_RoomStatusBar.pcss
@@ -99,34 +99,17 @@ Please see LICENSE files in the repository root for full details.
             position: relative;
             user-select: none;
 
-            &:nth-child(2) {
+            & + .mx_AccessibleButton {
                 border-left: 1px solid $resend-button-divider-color;
             }
 
-            &::before {
-                content: "";
-                position: absolute;
+            svg {
                 left: 10px; /* inset for regular button padding */
-                background-color: $muted-fg-color;
-                mask-repeat: no-repeat;
-                mask-position: center;
-                mask-size: contain;
+
                 width: 18px;
                 height: 18px;
-                top: 50%; /* text sizes are dynamic */
-                transform: translateY(-50%);
-            }
-
-            &.mx_RoomStatusBar_unsentCancelAllBtn::before {
-                mask-image: url("@vector-im/compound-design-tokens/icons/delete.svg");
-            }
-
-            &.mx_RoomStatusBar_unsentRetry {
-                padding-left: 34px; /* 28px from above, but +6px to account for the wider icon */
-
-                &::before {
-                    mask-image: url("@vector-im/compound-design-tokens/icons/restart.svg");
-                }
+                vertical-align: middle;
+                color: $muted-fg-color;
             }
         }
 
diff --git a/res/css/structures/_RoomView.pcss b/res/css/structures/_RoomView.pcss
index 5012013cf3..1ff009f16c 100644
--- a/res/css/structures/_RoomView.pcss
+++ b/res/css/structures/_RoomView.pcss
@@ -59,18 +59,13 @@ Please see LICENSE files in the repository root for full details.
     background-repeat: no-repeat;
     position: relative;
 
-    &::before {
-        background-color: $info-plinth-fg-color;
-        mask: url("@vector-im/compound-design-tokens/icons/search.svg");
-        mask-repeat: no-repeat;
-        mask-position: center;
-        mask-size: 50px;
-        content: "";
+    svg {
+        color: $info-plinth-fg-color;
+        width: 50px;
+        height: 50px;
         position: absolute;
         top: 286px;
-        left: 0;
-        right: 0;
-        height: 50px;
+        left: calc(50% - 25px);
     }
 }
 
@@ -79,6 +74,8 @@ Please see LICENSE files in the repository root for full details.
     flex-direction: column;
     flex: 1;
     min-width: 0;
+    container-type: size;
+    container-name: roomview;
 
     .mx_RoomView_messagePanel,
     .mx_RoomView_messagePanelSpinner,
diff --git a/res/css/structures/_SearchBox.pcss b/res/css/structures/_SearchBox.pcss
index dcb7bbb85e..b8a4f82022 100644
--- a/res/css/structures/_SearchBox.pcss
+++ b/res/css/structures/_SearchBox.pcss
@@ -9,6 +9,7 @@ Please see LICENSE files in the repository root for full details.
 .mx_SearchBox {
     flex: 1 1 0;
     min-width: 0;
+    min-height: 36px; /* to avoid jumping when the X to clear shows/hides */
 
     &.mx_SearchBox_blurred:not(:hover) {
         background-color: transparent;
@@ -16,13 +17,14 @@ Please see LICENSE files in the repository root for full details.
 
     .mx_SearchBox_closeButton {
         cursor: pointer;
-        mask-image: url("@vector-im/compound-design-tokens/icons/close.svg");
-        mask-repeat: no-repeat;
-        mask-position: center;
-        mask-size: 16px;
-        width: 16px;
         height: 16px;
+        width: 16px;
         padding: 9px;
-        background-color: var(--cpd-color-icon-secondary);
+
+        svg {
+            height: inherit;
+            width: inherit;
+            color: var(--cpd-color-icon-secondary);
+        }
     }
 }
diff --git a/res/css/structures/_SpaceHierarchy.pcss b/res/css/structures/_SpaceHierarchy.pcss
index 88c40b6fab..7f6a429543 100644
--- a/res/css/structures/_SpaceHierarchy.pcss
+++ b/res/css/structures/_SpaceHierarchy.pcss
@@ -109,22 +109,14 @@ Please see LICENSE files in the repository root for full details.
         border-radius: 4px;
         background-color: $background;
 
-        &::before {
-            content: "";
-            position: absolute;
-            top: 0;
-            left: 0;
-            height: 16px;
-            width: 16px;
-            mask-repeat: no-repeat;
-            mask-position: center;
-            background-color: $tertiary-content;
-            mask-size: 16px;
+        svg {
+            width: inherit;
+            height: inherit;
+            color: $tertiary-content;
             transform: rotate(270deg);
-            mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg");
         }
 
-        &.mx_SpaceHierarchy_subspace_toggle_shown::before {
+        &.mx_SpaceHierarchy_subspace_toggle_shown svg {
             transform: rotate(0deg);
         }
     }
@@ -177,18 +169,6 @@ Please see LICENSE files in the repository root for full details.
                             color: $tertiary-content;
                             font-size: $font-12px;
                             line-height: $font-15px;
-
-                            .mx_InfoTooltip_icon {
-                                margin-right: 4px;
-                                position: relative;
-                                vertical-align: text-top;
-
-                                &::before {
-                                    position: absolute;
-                                    top: 0;
-                                    left: 0;
-                                }
-                            }
                         }
 
                         .mx_InfoTooltip {
@@ -196,22 +176,14 @@ Please see LICENSE files in the repository root for full details.
                         }
 
                         .mx_SpaceHierarchy_roomTile_joined {
-                            display: inline;
-                            position: relative;
-                            padding-left: 16px;
+                            display: inline-flex;
+                            align-items: center;
+                            vertical-align: middle;
 
-                            &::before {
-                                content: "";
+                            svg {
                                 width: 20px;
                                 height: 20px;
-                                top: -2px;
-                                left: -4px;
-                                position: absolute;
-                                mask-position: center;
-                                mask-size: contain;
-                                mask-repeat: no-repeat;
-                                background-color: $accent;
-                                mask-image: url("@vector-im/compound-design-tokens/icons/check.svg");
+                                color: $accent;
                             }
                         }
                     }
diff --git a/res/css/structures/_SpacePanel.pcss b/res/css/structures/_SpacePanel.pcss
index 64044c4c5c..a20e26403d 100644
--- a/res/css/structures/_SpacePanel.pcss
+++ b/res/css/structures/_SpacePanel.pcss
@@ -44,29 +44,23 @@ Please see LICENSE files in the repository root for full details.
         top: 19px; /* v-align with avatar */
         right: -8px;
 
-        &::before {
-            content: "";
-            position: absolute;
-            width: inherit;
+        svg {
             height: inherit;
-            mask-position: center;
-            mask-size: contain;
-            mask-repeat: no-repeat;
-            background-color: $background;
-            mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg");
-            transform: rotate(270deg);
+            width: inherit;
+            display: inline-block;
+            color: $background;
+            /* Slight alignment tweak to center the asset */
+            margin-left: 1px;
         }
 
         &:not(.expanded) {
             opacity: 0;
-
-            &::before {
-                mask-position: center 1px;
-            }
         }
 
-        &.expanded::before {
-            transform: rotate(90deg);
+        &.expanded svg {
+            transform: rotate(180deg);
+            /* Slight alignment tweak to center the asset */
+            margin-left: -1px;
         }
     }
 
@@ -103,7 +97,6 @@ Please see LICENSE files in the repository root for full details.
         & > .mx_SpaceButton > .mx_SpaceButton_toggleCollapse {
             padding: 0 10px;
             margin: 0 -10px;
-            transform: rotate(-90deg);
         }
 
         & > .mx_SpaceTreeLevel {
@@ -166,105 +159,67 @@ Please see LICENSE files in the repository root for full details.
         }
 
         .mx_SpaceButton_toggleCollapse {
-            width: var(--gutterSize);
-            padding: 10px 0;
-            min-width: var(--gutterSize);
             height: 20px;
-            mask-position: center;
-            mask-size: 20px;
-            mask-repeat: no-repeat;
-            background-color: $tertiary-content;
-            mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg");
+            width: var(--gutterSize);
+            flex-shrink: 0;
+            padding: 10px 0;
+
+            svg {
+                width: 20px;
+                height: inherit;
+                display: inline-block;
+                color: $tertiary-content;
+                /* Re-align with parent */
+                margin-left: -3px;
+            }
         }
 
         .mx_SpaceButton_icon {
-            width: var(--height-topLevel);
-            min-width: var(--height-topLevel);
-            height: var(--height-topLevel);
+            /* Calculate height excluding padding to allow svg to inherit */
+            width: calc(var(--height-topLevel) - 14px);
+            height: calc(var(--height-topLevel) - 14px);
+            flex-shrink: 0;
             border-radius: 8px;
-            position: relative;
+            padding: 7px;
+            background-color: $panel-actions;
 
-            &::before {
-                position: absolute;
-                content: "";
-                width: var(--height-topLevel);
-                height: var(--height-topLevel);
-                top: 0;
-                left: 0;
-                mask-position: center;
-                mask-repeat: no-repeat;
-                mask-size: 18px;
+            svg {
+                width: inherit;
+                height: inherit;
+                display: block;
+                color: $secondary-content;
             }
         }
 
-        &.mx_SpaceButton_home,
-        &.mx_SpaceButton_favourites,
-        &.mx_SpaceButton_people,
-        &.mx_SpaceButton_orphans,
-        &.mx_SpaceButton_videoRooms {
-            .mx_SpaceButton_icon {
-                background-color: $panel-actions;
-
-                &::before {
-                    background-color: $secondary-content;
-                }
-            }
-        }
-
-        &.mx_SpaceButton_home .mx_SpaceButton_icon::before {
-            mask-image: url("@vector-im/compound-design-tokens/icons/home-solid.svg");
-        }
-
-        &.mx_SpaceButton_favourites .mx_SpaceButton_icon::before {
-            mask-image: url("@vector-im/compound-design-tokens/icons/favourite-solid.svg");
-        }
-
-        &.mx_SpaceButton_people .mx_SpaceButton_icon::before {
-            mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg");
-        }
-
-        &.mx_SpaceButton_orphans .mx_SpaceButton_icon::before {
-            mask-image: url("$(res)/img/element-icons/roomlist/hash-circle.svg");
-        }
-
-        &.mx_SpaceButton_videoRooms .mx_SpaceButton_icon::before {
-            mask-image: url("@vector-im/compound-design-tokens/icons/video-call-solid.svg");
-        }
-
         &.mx_SpaceButton_new .mx_SpaceButton_icon {
-            &::before {
-                background-color: $primary-content;
-                mask-image: url("@vector-im/compound-design-tokens/icons/plus.svg");
+            background-color: unset;
+
+            svg {
+                color: $primary-content;
                 transition: all 0.2s ease-in-out; /* TODO transition */
             }
         }
 
-        &.mx_SpaceButton_newCancel .mx_SpaceButton_icon::before {
+        &.mx_SpaceButton_newCancel .mx_SpaceButton_icon svg {
             transform: rotate(45deg);
         }
 
         .mx_SpaceButton_menuButton {
-            width: 20px;
-            min-width: 20px; /* yay flex */
-            height: 20px;
+            width: 16px;
+            height: 16px;
+            padding: var(--cpd-space-0-5x);
+            flex-shrink: 0;
             margin-top: auto;
             margin-bottom: auto;
             display: none;
             position: absolute;
             right: 4px;
 
-            &::before {
-                top: 3px;
-                left: 2px;
-                content: "";
-                width: 16px;
-                height: 16px;
-                position: absolute;
-                mask-position: center;
-                mask-size: contain;
-                mask-repeat: no-repeat;
-                mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg");
-                background: $primary-content;
+            svg {
+                width: inherit;
+                height: inherit;
+                display: block;
+                color: $primary-content;
             }
         }
     }
@@ -337,18 +292,6 @@ Please see LICENSE files in the repository root for full details.
         padding: 0 0 16px 0;
         scrollbar-gutter: stable;
 
-        & > .mx_SpaceButton {
-            height: var(--height-topLevel);
-
-            &.mx_SpaceButton_active::before {
-                height: var(--height-topLevel);
-            }
-        }
-
-        & > ul {
-            padding-left: 0;
-        }
-
         &.mx_IndicatorScrollbar_topOverflow {
             mask-image: linear-gradient(to bottom, transparent, black 16px);
         }
@@ -424,46 +367,6 @@ Please see LICENSE files in the repository root for full details.
         white-space: nowrap;
     }
 
-    .mx_SpacePanel_iconHome::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/home-solid.svg");
-    }
-
-    .mx_SpacePanel_iconInvite::before {
-        mask-image: url("$(res)/img/element-icons/room/invite.svg");
-    }
-
-    .mx_SpacePanel_iconSettings::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg");
-    }
-
-    .mx_SpacePanel_iconLeave::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/leave.svg");
-    }
-
-    .mx_SpacePanel_iconMembers::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg");
-    }
-
-    .mx_SpacePanel_iconPlus::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/plus.svg");
-    }
-
-    .mx_SpacePanel_iconExplore::before {
-        mask-image: url("$(res)/img/element-icons/roomlist/hash-search.svg");
-    }
-
-    .mx_SpacePanel_iconPreferences::before {
-        mask-image: url("$(res)/img/element-icons/settings/preference.svg");
-    }
-
-    .mx_SpacePanel_noIcon {
-        display: none;
-
-        & + .mx_IconizedContextMenu_label {
-            padding-left: 5px !important; /* override default iconized label style to align with header */
-        }
-    }
-
     .mx_SpacePanel_contextMenu_separatorLabel {
         color: $tertiary-content;
         font-size: $font-10px;
diff --git a/res/css/structures/_SpacePillButton.pcss b/res/css/structures/_SpacePillButton.pcss
new file mode 100644
index 0000000000..eed2feb48a
--- /dev/null
+++ b/res/css/structures/_SpacePillButton.pcss
@@ -0,0 +1,48 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+.mx_SpacePillButton {
+    position: relative;
+    padding: 16px 32px 16px 72px;
+    width: 432px;
+    box-sizing: border-box;
+    border-radius: 8px;
+    border: 1px solid $input-border-color;
+    font-size: $font-17px;
+    font-weight: var(--cpd-font-weight-semibold);
+    margin: 20px 0;
+
+    > div {
+        margin-top: 4px;
+        font-weight: normal;
+        font-size: $font-15px;
+        color: $secondary-content;
+    }
+
+    svg {
+        position: absolute;
+        content: "";
+        width: 28px;
+        height: 28px;
+        top: 50%;
+        transform: translateY(-50%);
+        left: 22px;
+        color: $tertiary-content;
+    }
+
+    &:hover {
+        border-color: var(--cpd-color-bg-action-primary-rest);
+
+        svg {
+            color: var(--cpd-color-icon-primary);
+        }
+
+        > span {
+            color: $primary-content;
+        }
+    }
+}
diff --git a/res/css/structures/_SpaceRoomView.pcss b/res/css/structures/_SpaceRoomView.pcss
index 3f981ba2de..25989fd937 100644
--- a/res/css/structures/_SpaceRoomView.pcss
+++ b/res/css/structures/_SpaceRoomView.pcss
@@ -6,51 +6,6 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-@define-mixin SpacePillButton {
-    position: relative;
-    padding: 16px 32px 16px 72px;
-    width: 432px;
-    box-sizing: border-box;
-    border-radius: 8px;
-    border: 1px solid $input-border-color;
-    font-size: $font-17px;
-    font-weight: var(--cpd-font-weight-semibold);
-    margin: 20px 0;
-
-    > div {
-        margin-top: 4px;
-        font-weight: normal;
-        font-size: $font-15px;
-        color: $secondary-content;
-    }
-
-    &::before {
-        position: absolute;
-        content: "";
-        width: 28px;
-        height: 28px;
-        top: 50%;
-        transform: translateY(-50%);
-        left: 22px;
-        mask-position: center;
-        mask-repeat: no-repeat;
-        mask-size: 28px;
-        background-color: $tertiary-content;
-    }
-
-    &:hover {
-        border-color: var(--cpd-color-bg-action-primary-rest);
-
-        &::before {
-            background-color: var(--cpd-color-icon-primary);
-        }
-
-        > span {
-            color: $primary-content;
-        }
-    }
-}
-
 .mx_SpaceRoomView {
     --innerWidth: 428px;
 
@@ -207,7 +162,7 @@ Please see LICENSE files in the repository root for full details.
                         width: 16px;
                         background: var(--cpd-color-icon-on-solid-primary);
                         mask-size: 16px;
-                        mask-image: url("$(res)/img/element-icons/room/invite.svg");
+                        mask-image: url("@vector-im/compound-design-tokens/icons/user-add.svg");
                     }
                 }
 
@@ -242,20 +197,6 @@ Please see LICENSE files in the repository root for full details.
         }
     }
 
-    .mx_SpaceRoomView_privateScope {
-        > .mx_AccessibleButton {
-            @mixin SpacePillButton;
-        }
-
-        .mx_SpaceRoomView_privateScope_justMeButton::before {
-            mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg");
-        }
-
-        .mx_SpaceRoomView_privateScope_meAndMyTeammatesButton::before {
-            mask-image: url("$(res)/img/element-icons/group-members.svg");
-        }
-    }
-
     .mx_SpaceRoomView_inviteTeammates {
         .mx_SpaceRoomView_inviteTeammates_buttons {
             color: $secondary-content;
@@ -291,7 +232,7 @@ Please see LICENSE files in the repository root for full details.
                 text-decoration: underline;
 
                 &::before {
-                    mask-image: url("$(res)/img/element-icons/room/invite.svg");
+                    mask-image: url("@vector-im/compound-design-tokens/icons/user-add.svg");
                     background-color: var(--cpd-color-icon-primary);
                 }
             }
diff --git a/res/css/structures/_SplashPage.pcss b/res/css/structures/_SplashPage.pcss
index bd57fbb48d..8f06541179 100644
--- a/res/css/structures/_SplashPage.pcss
+++ b/res/css/structures/_SplashPage.pcss
@@ -32,7 +32,7 @@ Please see LICENSE files in the repository root for full details.
             /* mask to dither resulting combined gradient */
             url("$(res)/img/noise.png"),
             /* gradient to apply different amounts of dithering to different parts of the gradient */
-                linear-gradient(
+            linear-gradient(
                     to bottom,
                     /* 10% dithering at the top */ rgb(0, 0, 0, 0.9) 20%,
                     /* 80% dithering at the bottom */ rgb(0, 0, 0, 0.2) 100%
diff --git a/res/css/structures/_ThreadsActivityCentre.pcss b/res/css/structures/_ThreadsActivityCentre.pcss
index a1472108ac..a6e4627dd0 100644
--- a/res/css/structures/_ThreadsActivityCentre.pcss
+++ b/res/css/structures/_ThreadsActivityCentre.pcss
@@ -11,7 +11,8 @@
 }
 
 .mx_ThreadsActivityCentreButton {
-    border-radius: 8px;
+    /* !important override compound */
+    border-radius: 8px !important;
     margin: 18px auto auto auto;
 
     &.expanded {
@@ -23,6 +24,8 @@
 
         /* align with settings icon */
         margin-left: 21px;
+        margin-right: 8px;
+        width: 100%;
 
         /**
          * modify internal css of the compound component
@@ -31,30 +34,39 @@
         & > div {
             display: flex;
             align-items: center;
+
+            &::before {
+                inline-size: 8px;
+                block-size: 8px;
+                left: 17px;
+            }
         }
 
         & .mx_ThreadsActivityCentreButton_Icon {
             /* align with settings label */
             margin-right: 14px;
             /* required to set the icon width when into a flex container */
-            min-width: 24px;
+            width: 24px;
+            flex-shrink: 0;
         }
 
         & .mx_ThreadsActivityCentreButton_Text {
-            color: $secondary-content;
+            /* !important override compound  */
+            color: $secondary-content !important;
         }
     }
 
     &:not(.expanded) {
         &:hover,
         &:hover .mx_ThreadsActivityCentreButton_Icon {
-            background-color: $quaternary-content;
-            color: $primary-content;
+            /* !important override compound */
+            background-color: $quaternary-content !important;
+            fill: $primary-content;
         }
     }
 
     & .mx_ThreadsActivityCentreButton_Icon {
-        color: $secondary-content;
+        fill: $secondary-content;
     }
 }
 
diff --git a/res/css/structures/_ToastContainer.pcss b/res/css/structures/_ToastContainer.pcss
index cf1d7fd4a9..68b39cae61 100644
--- a/res/css/structures/_ToastContainer.pcss
+++ b/res/css/structures/_ToastContainer.pcss
@@ -41,52 +41,10 @@ Please see LICENSE files in the repository root for full details.
         padding: var(--cpd-space-3x);
 
         &.mx_Toast_hasIcon {
-            &::before,
-            &::after {
-                content: "";
+            svg {
                 width: 22px;
                 height: 22px;
                 grid-column: 1;
-                grid-row: 1;
-                mask-size: 100%;
-                mask-position: center;
-                mask-repeat: no-repeat;
-                background-size: 100%;
-                background-repeat: no-repeat;
-            }
-
-            &.mx_Toast_icon_verification::after {
-                mask-image: url("$(res)/img/e2e/normal.svg");
-                background-color: $primary-content;
-            }
-
-            &.mx_Toast_icon_verification_warning {
-                /* white infill for the hollow svg mask */
-                &::before {
-                    background-color: #ffffff;
-                    mask-image: url("$(res)/img/e2e/normal.svg");
-                    mask-size: 80%;
-                }
-
-                &::after {
-                    mask-image: url("$(res)/img/e2e/warning.svg");
-                    background-color: $e2e-warning-color;
-                }
-            }
-
-            &.mx_Toast_icon_secure_backup::after {
-                mask-image: url("$(res)/img/feather-customised/secure-backup.svg");
-                background-color: $primary-content;
-            }
-
-            &.mx_Toast_icon_key_storage::after {
-                mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg");
-                background-color: $primary-content;
-            }
-
-            &.mx_Toast_icon_labs::after {
-                mask-image: url("$(res)/img/element-icons/flask.svg");
-                background-color: $secondary-content;
             }
 
             .mx_Toast_title,
diff --git a/res/css/structures/_UploadBar.pcss b/res/css/structures/_UploadBar.pcss
index 8bc341c057..2c34ce7f7e 100644
--- a/res/css/structures/_UploadBar.pcss
+++ b/res/css/structures/_UploadBar.pcss
@@ -7,12 +7,44 @@ Please see LICENSE files in the repository root for full details.
 */
 
 .mx_UploadBar {
-    padding-left: 65px; /* line up with the shield area in the composer */
-    padding-top: 5px;
+    /* line up with the shield area in the composer */
+    padding: 5px 21px 0;
     position: relative;
 
+    display: grid;
+    grid-template:
+        "icon     filename cancel" auto
+        "progress progress progress" auto
+        / min-content auto min-content;
+    gap: var(--cpd-space-1-5x);
+
+    & > svg {
+        grid-area: icon;
+        height: 18px;
+        width: 18px;
+        color: $muted-fg-color;
+        align-self: center;
+    }
+
+    .mx_UploadBar_filename {
+        grid-area: filename;
+        color: $muted-fg-color;
+        position: relative;
+        font-size: $font-15px;
+        vertical-align: middle;
+    }
+
+    .mx_UploadBar_cancel {
+        grid-area: cancel;
+        height: 16px;
+        width: 16px;
+        color: $muted-fg-color;
+        align-self: center;
+    }
+
     .mx_ProgressBar {
-        width: calc(100% - 40px); /* cheating at a right margin */
+        grid-area: progress;
+        width: 100%;
     }
 }
 
@@ -21,39 +53,3 @@ Please see LICENSE files in the repository root for full details.
         padding-left: 0;
     }
 }
-
-.mx_UploadBar_filename {
-    color: $muted-fg-color;
-    position: relative;
-    padding-right: 38px; /* 32px for cancel icon, 6px for padding */
-    padding-left: 22px; /* 18px for icon, 4px for padding */
-    font-size: $font-15px;
-    vertical-align: middle;
-
-    &::before {
-        content: "";
-        height: 18px;
-        width: 18px;
-        position: absolute;
-        top: 0;
-        left: 0;
-        mask-repeat: no-repeat;
-        mask-position: center;
-        background-color: $muted-fg-color;
-        mask-image: url("$(res)/img/element-icons/upload.svg");
-    }
-}
-
-.mx_UploadBar_cancel {
-    position: absolute;
-    top: 0;
-    right: 0;
-    height: 16px;
-    width: 16px;
-    margin-right: 16px; /* align over rightmost button in composer */
-    margin-top: 5px;
-    mask-repeat: no-repeat;
-    mask-position: center;
-    background-color: $muted-fg-color;
-    mask-image: url("@vector-im/compound-design-tokens/icons/close.svg");
-}
diff --git a/res/css/structures/_UserMenu.pcss b/res/css/structures/_UserMenu.pcss
index 2f4099c893..ddefc84d8f 100644
--- a/res/css/structures/_UserMenu.pcss
+++ b/res/css/structures/_UserMenu.pcss
@@ -116,48 +116,7 @@ Please see LICENSE files in the repository root for full details.
         }
     }
 
-    .mx_IconizedContextMenu_icon {
-        width: 16px;
-        height: 16px;
-        display: block;
-
-        &::before {
-            content: "";
-            width: 16px;
-            height: 16px;
-            display: block;
-            mask-position: center;
-            mask-size: contain;
-            mask-repeat: no-repeat;
-            background: $icon-button-color;
-        }
-    }
-
-    .mx_UserMenu_iconHome::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/home-solid.svg");
-    }
-
-    .mx_UserMenu_iconBell::before {
-        mask-image: url("$(res)/img/element-icons/notifications.svg");
-    }
-
-    .mx_UserMenu_iconLock::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg");
-    }
-
-    .mx_UserMenu_iconSettings::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg");
-    }
-
-    .mx_UserMenu_iconMessage::before {
-        mask-image: url("$(res)/img/element-icons/feedback.svg");
-    }
-
-    .mx_UserMenu_iconSignOut::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/leave.svg");
-    }
-
-    .mx_UserMenu_iconQr::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/qr-code.svg");
+    .mx_IconizedContextMenu_icon svg {
+        color: $icon-button-color;
     }
 }
diff --git a/res/css/structures/auth/_CompleteSecurity.pcss b/res/css/structures/auth/_CompleteSecurity.pcss
index f0bca3f39c..d8e9e4b4af 100644
--- a/res/css/structures/auth/_CompleteSecurity.pcss
+++ b/res/css/structures/auth/_CompleteSecurity.pcss
@@ -11,17 +11,16 @@ Please see LICENSE files in the repository root for full details.
     align-items: center;
 }
 
-.mx_CompleteSecurity_headerIcon {
+.mx_E2EIcon.mx_CompleteSecurity_headerIcon {
     width: 24px;
     height: 24px;
     margin-right: 4px;
-    position: relative;
+    display: inline-block;
 }
 
-.mx_CompleteSecurity_heroIcon {
+.mx_E2EIcon.mx_CompleteSecurity_heroIcon {
     width: 128px;
     height: 128px;
-    position: relative;
     margin: 0 auto;
 }
 
diff --git a/res/css/structures/auth/_SetupEncryptionBody.pcss b/res/css/structures/auth/_SetupEncryptionBody.pcss
index ac6384313c..204e1f5c59 100644
--- a/res/css/structures/auth/_SetupEncryptionBody.pcss
+++ b/res/css/structures/auth/_SetupEncryptionBody.pcss
@@ -6,13 +6,6 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-.mx_SetupEncryptionBody_reset {
-    color: $light-fg-color;
-    margin-top: $font-14px;
-
-    .mx_SetupEncryptionBody_reset_link {
-        &.mx_AccessibleButton_kind_link_inline {
-            color: $alert;
-        }
-    }
+.mx_SetupEncryptionBody {
+    width: 600px;
 }
diff --git a/res/css/views/audio_messages/_AudioPlayer.pcss b/res/css/views/audio_messages/_AudioPlayer.pcss
deleted file mode 100644
index 51e97611f5..0000000000
--- a/res/css/views/audio_messages/_AudioPlayer.pcss
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2021 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-.mx_MediaBody.mx_AudioPlayer_container {
-    padding: 16px 12px 12px 12px;
-
-    .mx_AudioPlayer_primaryContainer {
-        display: flex;
-
-        .mx_PlayPauseButton {
-            margin-right: 8px;
-        }
-
-        .mx_AudioPlayer_mediaInfo {
-            flex: 1;
-            overflow: hidden; /* makes the ellipsis on the file name work */
-
-            & > * {
-                display: block;
-            }
-
-            .mx_AudioPlayer_mediaName {
-                color: $primary-content;
-                font-size: $font-15px;
-                line-height: $font-15px;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-                overflow: hidden;
-                padding-bottom: 4px; /* mimics the line-height differences in the Figma */
-            }
-
-            .mx_AudioPlayer_byline {
-                font-size: $font-12px;
-                line-height: $font-12px;
-            }
-        }
-    }
-
-    .mx_AudioPlayer_seek {
-        display: flex;
-        align-items: center;
-
-        .mx_SeekBar {
-            flex: 1;
-        }
-
-        .mx_Clock {
-            min-width: $font-42px; /* for flexbox */
-            padding-left: $spacing-4; /* isolate from seek bar */
-            text-align: justify;
-            white-space: nowrap;
-        }
-    }
-}
diff --git a/res/css/views/audio_messages/_PlayPauseButton.pcss b/res/css/views/audio_messages/_PlayPauseButton.pcss
index e932c282e3..47df79c5d3 100644
--- a/res/css/views/audio_messages/_PlayPauseButton.pcss
+++ b/res/css/views/audio_messages/_PlayPauseButton.pcss
@@ -14,28 +14,16 @@ Please see LICENSE files in the repository root for full details.
     min-height: 32px; /* for when the button is used in a flexbox */
     border-radius: 32px;
     background-color: $system;
+    /* !important override compound icon button */
+    padding: var(--cpd-space-1-5x) !important;
+    box-sizing: border-box;
 
-    &::before {
-        content: "";
-        position: absolute; /* sizing varies by icon */
-        background-color: $secondary-content;
-        mask-repeat: no-repeat;
-        mask-size: contain;
-        top: 6px; /* center */
-        left: 6px; /* center */
+    svg {
         width: 20px;
         height: 20px;
     }
 
-    &.mx_PlayPauseButton_disabled::before {
+    &[disabled] svg {
         opacity: 0.5;
     }
-
-    &.mx_PlayPauseButton_play::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/play-solid.svg");
-    }
-
-    &.mx_PlayPauseButton_pause::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/pause-solid.svg");
-    }
 }
diff --git a/res/css/views/auth/_AuthBody.pcss b/res/css/views/auth/_AuthBody.pcss
index d86089e331..f5f0f9cce5 100644
--- a/res/css/views/auth/_AuthBody.pcss
+++ b/res/css/views/auth/_AuthBody.pcss
@@ -12,7 +12,7 @@ Please see LICENSE files in the repository root for full details.
     font-size: $font-12px;
     color: $authpage-secondary-color;
     background-color: $background;
-    border-radius: 0 4px 4px 0;
+    border-radius: 0 var(--cpd-space-6x) var(--cpd-space-6x) 0;
     padding: 25px 60px;
     box-sizing: border-box;
 
@@ -119,7 +119,7 @@ Please see LICENSE files in the repository root for full details.
     }
 
     .mx_Dropdown_arrow {
-        background: $authpage-primary-color;
+        color: $authpage-primary-color;
     }
 
     .mx_Dropdown_menu {
@@ -237,7 +237,7 @@ Please see LICENSE files in the repository root for full details.
         font-size: $font-15px;
         line-height: $font-24px;
 
-        .mx_InlineSpinner img {
+        .mx_InlineSpinner svg {
             vertical-align: sub;
             margin-right: 5px;
         }
diff --git a/res/css/views/auth/_AuthPage.pcss b/res/css/views/auth/_AuthPage.pcss
index 3ae17122be..e7a578b2f1 100644
--- a/res/css/views/auth/_AuthPage.pcss
+++ b/res/css/views/auth/_AuthPage.pcss
@@ -18,8 +18,7 @@ Please see LICENSE files in the repository root for full details.
 .mx_AuthPage_modal {
     display: flex;
     margin: 100px auto auto;
-    border-radius: 4px;
-    box-shadow: 0 2px 4px 0 rgb(0, 0, 0, 0.33);
+    border-radius: var(--cpd-space-6x);
     background-color: $authpage-modal-bg-color;
 
     @media only screen and (max-height: 768px) {
@@ -29,4 +28,14 @@ Please see LICENSE files in the repository root for full details.
     @media only screen and (max-width: 480px) {
         margin-top: 0;
     }
+
+    &.mx_AuthPage_modal_withBlur {
+        /* Apply a blurred shadow around the modal */
+        box-shadow: 0 2px 4px 0 rgb(0, 0, 0, 0.33);
+
+        .mx_AuthPage_modalContent {
+            /* Make the modal's background semitransparent */
+            background-color: $authpage-modal-content-with-blur-bg-color;
+        }
+    }
 }
diff --git a/res/css/views/auth/_CompleteSecurityBody.pcss b/res/css/views/auth/_CompleteSecurityBody.pcss
index f070129005..3aa9cbf518 100644
--- a/res/css/views/auth/_CompleteSecurityBody.pcss
+++ b/res/css/views/auth/_CompleteSecurityBody.pcss
@@ -8,11 +8,10 @@ Please see LICENSE files in the repository root for full details.
 */
 
 .mx_CompleteSecurityBody {
-    width: 600px;
     color: $authpage-primary-color;
     background-color: $background;
     border-radius: 4px;
-    padding: 20px;
+    padding: 20px 20px 60px 20px;
     box-sizing: border-box;
 
     h2 {
diff --git a/res/css/views/auth/_LanguageSelector.pcss b/res/css/views/auth/_LanguageSelector.pcss
index d5002d00b2..e620cd8ab5 100644
--- a/res/css/views/auth/_LanguageSelector.pcss
+++ b/res/css/views/auth/_LanguageSelector.pcss
@@ -17,5 +17,5 @@ Please see LICENSE files in the repository root for full details.
 }
 
 .mx_AuthBody_language .mx_Dropdown_arrow {
-    background: $authpage-lang-color;
+    color: $authpage-lang-color;
 }
diff --git a/res/css/views/auth/_Welcome.pcss b/res/css/views/auth/_Welcome.pcss
index 490b6490f6..50a91aa767 100644
--- a/res/css/views/auth/_Welcome.pcss
+++ b/res/css/views/auth/_Welcome.pcss
@@ -20,3 +20,8 @@ Please see LICENSE files in the repository root for full details.
     width: 160px;
     margin-bottom: 10px;
 }
+
+/* Invert image colours in dark mode. */
+.cpd-theme-dark .mx_WelcomePage_logo {
+    filter: invert(1);
+}
diff --git a/res/css/views/avatars/_WidgetAvatar.pcss b/res/css/views/avatars/_WidgetAvatar.pcss
index 564c9fefc2..c02b717e00 100644
--- a/res/css/views/avatars/_WidgetAvatar.pcss
+++ b/res/css/views/avatars/_WidgetAvatar.pcss
@@ -7,5 +7,6 @@ Please see LICENSE files in the repository root for full details.
 */
 
 .mx_WidgetAvatar {
-    border-radius: 4px;
+    /* !important override compound avatar */
+    border-radius: 4px !important;
 }
diff --git a/res/css/views/context_menus/_DeviceContextMenu.pcss b/res/css/views/context_menus/_DeviceContextMenu.pcss
index d70b5eb043..565b2dfd19 100644
--- a/res/css/views/context_menus/_DeviceContextMenu.pcss
+++ b/res/css/views/context_menus/_DeviceContextMenu.pcss
@@ -9,10 +9,6 @@ Please see LICENSE files in the repository root for full details.
 .mx_DeviceContextMenu {
     max-width: 252px;
 
-    .mx_DeviceContextMenu_device_icon {
-        display: none;
-    }
-
     .mx_IconizedContextMenu_label {
         padding-left: 0 !important;
     }
diff --git a/res/css/views/context_menus/_IconizedContextMenu.pcss b/res/css/views/context_menus/_IconizedContextMenu.pcss
index 853d97c935..ca6ada17f4 100644
--- a/res/css/views/context_menus/_IconizedContextMenu.pcss
+++ b/res/css/views/context_menus/_IconizedContextMenu.pcss
@@ -68,14 +68,6 @@ Please see LICENSE files in the repository root for full details.
                 cursor: not-allowed;
             }
 
-            img,
-            .mx_IconizedContextMenu_icon {
-                /* icons */
-                width: 16px;
-                min-width: 16px;
-                max-width: 16px;
-            }
-
             span.mx_IconizedContextMenu_label {
                 /* labels */
                 width: 100%;
@@ -87,8 +79,15 @@ Please see LICENSE files in the repository root for full details.
                 white-space: nowrap;
             }
 
-            .mx_IconizedContextMenu_icon + .mx_IconizedContextMenu_label {
-                padding-left: 14px;
+            svg {
+                width: 16px;
+                height: 16px;
+                display: block;
+                flex-shrink: 0;
+
+                & + .mx_IconizedContextMenu_label {
+                    padding-left: 14px;
+                }
             }
 
             .mx_BetaCard_betaPill {
@@ -97,38 +96,21 @@ Please see LICENSE files in the repository root for full details.
         }
     }
 
-    .mx_IconizedContextMenu_icon {
-        position: relative;
-        width: 16px;
-        height: 16px;
-
-        &::before {
-            content: "";
-            width: inherit;
-            height: inherit;
-            position: absolute;
-            mask-position: center;
-            mask-size: contain;
-            mask-repeat: no-repeat;
-            background-color: var(--cpd-color-icon-primary);
-        }
-    }
-
     .mx_IconizedContextMenu_optionList_red {
         .mx_IconizedContextMenu_item {
             color: $alert !important;
         }
 
-        .mx_IconizedContextMenu_icon::before {
-            background-color: var(--cpd-color-icon-critical-primary);
+        svg {
+            color: var(--cpd-color-icon-critical-primary);
         }
     }
 
     .mx_IconizedContextMenu_option_red {
         color: $alert !important;
 
-        .mx_IconizedContextMenu_icon::before {
-            background-color: $alert;
+        svg {
+            color: $alert;
         }
     }
 
@@ -136,10 +118,10 @@ Please see LICENSE files in the repository root for full details.
         &.mx_IconizedContextMenu_item,
         .mx_IconizedContextMenu_item {
             color: $accent !important;
-        }
 
-        .mx_IconizedContextMenu_icon::before {
-            background-color: $accent;
+            svg {
+                color: $accent;
+            }
         }
     }
 
@@ -149,24 +131,11 @@ Please see LICENSE files in the repository root for full details.
         }
     }
 
-    .mx_IconizedContextMenu_checked,
-    .mx_IconizedContextMenu_unchecked {
+    svg.mx_IconizedContextMenu_checked {
         margin-left: 16px;
         margin-right: -5px;
     }
 
-    .mx_IconizedContextMenu_developerTools::before {
-        mask-image: url("$(res)/img/element-icons/settings/flask.svg");
-    }
-
-    .mx_IconizedContextMenu_checked::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/check.svg");
-    }
-
-    .mx_IconizedContextMenu_unchecked::before {
-        content: unset;
-    }
-
     .mx_IconizedContextMenu_sublabel {
         margin-left: 20px;
         color: $tertiary-content;
diff --git a/res/css/views/context_menus/_MessageContextMenu.pcss b/res/css/views/context_menus/_MessageContextMenu.pcss
deleted file mode 100644
index 9fc454f328..0000000000
--- a/res/css/views/context_menus/_MessageContextMenu.pcss
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2021 Michael Weimann <mail@michael-weimann.eu>
-Copyright 2015, 2016 OpenMarket Ltd
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-.mx_MessageContextMenu {
-    .mx_IconizedContextMenu_icon {
-        width: 16px;
-        height: 16px;
-        display: block;
-
-        &::before {
-            content: "";
-            width: 16px;
-            height: 16px;
-            display: block;
-            mask-position: center;
-            mask-size: contain;
-            mask-repeat: no-repeat;
-        }
-    }
-
-    .mx_MessageContextMenu_iconCollapse::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/chevron-up.svg");
-    }
-
-    .mx_MessageContextMenu_iconReport::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/error-solid.svg");
-    }
-
-    .mx_MessageContextMenu_iconLink::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/link.svg");
-    }
-
-    .mx_MessageContextMenu_iconPermalink::before {
-        mask-image: url("$(res)/img/element-icons/room/share.svg");
-    }
-
-    .mx_MessageContextMenu_iconUnhidePreview::before {
-        mask-image: url("$(res)/img/element-icons/settings/appearance.svg");
-    }
-
-    .mx_MessageContextMenu_iconOpenInMapSite::before {
-        mask-image: url("$(res)/img/external-link.svg");
-    }
-
-    .mx_MessageContextMenu_iconEndPoll::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/check.svg");
-    }
-
-    .mx_MessageContextMenu_iconForward::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/forward.svg");
-    }
-
-    .mx_MessageContextMenu_iconRedact::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/delete.svg");
-    }
-
-    .mx_MessageContextMenu_iconResend::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/restart.svg");
-    }
-
-    .mx_MessageContextMenu_iconSource::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/inline-code.svg");
-    }
-
-    .mx_MessageContextMenu_iconQuote::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/quote.svg");
-    }
-
-    .mx_MessageContextMenu_iconPin::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/pin.svg");
-    }
-
-    .mx_MessageContextMenu_iconUnpin::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/unpin.svg");
-    }
-
-    .mx_MessageContextMenu_iconCopy::before {
-        height: 16px;
-        mask-image: url($copy-button-url);
-        position: relative;
-        width: 16px;
-    }
-
-    .mx_MessageContextMenu_iconEdit::before {
-        mask-image: url("$(res)/img/element-icons/room/message-bar/edit.svg");
-    }
-
-    .mx_MessageContextMenu_iconReply::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/reply.svg");
-    }
-
-    .mx_MessageContextMenu_iconReplyInThread::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/threads.svg");
-    }
-
-    .mx_MessageContextMenu_iconReact::before {
-        mask-image: url("$(res)/img/element-icons/room/message-bar/emoji.svg");
-    }
-
-    .mx_MessageContextMenu_iconViewInRoom::before {
-        mask-image: url("$(res)/img/element-icons/view-in-room.svg");
-    }
-
-    .mx_MessageContextMenu_jumpToEvent::before {
-        mask-image: url("$(res)/img/element-icons/child-relationship.svg");
-    }
-}
diff --git a/res/css/views/context_menus/_RoomGeneralContextMenu.pcss b/res/css/views/context_menus/_RoomGeneralContextMenu.pcss
deleted file mode 100644
index 0eb51420bb..0000000000
--- a/res/css/views/context_menus/_RoomGeneralContextMenu.pcss
+++ /dev/null
@@ -1,71 +0,0 @@
-.mx_RoomGeneralContextMenu_iconStar::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/favourite-solid.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconArrowDown::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/low-priority.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconMarkAsRead::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/mark-as-read.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconMarkAsUnread::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/mark-as-unread.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconNotificationsDefault::before {
-    mask-image: url("$(res)/img/element-icons/notifications.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconNotificationsAllMessages::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/notifications-default.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconNotificationsMentionsKeywords::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/notifications-dm.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconNotificationsNone::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/notifications-off.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconPeople::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconFiles::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/files.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconPins::before {
-    mask-image: url("$(res)/img/element-icons/room/pin-upright.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconWidgets::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/extensions-solid.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconSettings::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconExport::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/export-archive.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconDeveloperTools::before {
-    mask-image: url("$(res)/img/element-icons/settings/flask.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconCopyLink::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/link.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconInvite::before {
-    mask-image: url("$(res)/img/element-icons/room/invite.svg");
-}
-
-.mx_RoomGeneralContextMenu_iconSignOut::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/leave.svg");
-}
diff --git a/res/css/views/context_menus/_RoomNotificationContextMenu.pcss b/res/css/views/context_menus/_RoomNotificationContextMenu.pcss
deleted file mode 100644
index baf440fd43..0000000000
--- a/res/css/views/context_menus/_RoomNotificationContextMenu.pcss
+++ /dev/null
@@ -1,12 +0,0 @@
-.mx_RoomNotificationContextMenu_iconBell::before {
-    mask-image: url("$(res)/img/element-icons/notifications.svg");
-}
-.mx_RoomNotificationContextMenu_iconBellDot::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/notifications-default.svg");
-}
-.mx_RoomNotificationContextMenu_iconBellMentions::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/notifications-dm.svg");
-}
-.mx_RoomNotificationContextMenu_iconBellCrossed::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/notifications-off.svg");
-}
diff --git a/res/css/views/dialogs/_ConfirmSpaceUserActionDialog.pcss b/res/css/views/dialogs/_ConfirmSpaceUserActionDialog.pcss
index 1921ef2457..e3ce9db7dc 100644
--- a/res/css/views/dialogs/_ConfirmSpaceUserActionDialog.pcss
+++ b/res/css/views/dialogs/_ConfirmSpaceUserActionDialog.pcss
@@ -32,27 +32,20 @@ Please see LICENSE files in the repository root for full details.
     }
 
     .mx_ConfirmSpaceUserActionDialog_warning {
-        position: relative;
         border-radius: 8px;
-        padding: 12px 8px 12px 42px;
+        padding: 12px 8px;
         background-color: $header-panel-bg-color;
 
         font-size: $font-12px;
         line-height: $font-15px;
         color: $secondary-content;
 
-        &::before {
-            content: "";
-            position: absolute;
-            left: 10px;
-            top: calc(50% - 8px); /* vertical centering */
+        svg {
             height: 16px;
             width: 16px;
-            background-color: $secondary-content;
-            mask-repeat: no-repeat;
-            mask-size: contain;
-            mask-image: url("@vector-im/compound-design-tokens/icons/info-solid.svg");
-            mask-position: center;
+            vertical-align: -4px;
+            margin-right: var(--cpd-space-1-5x);
+            color: $secondary-content;
         }
     }
 }
diff --git a/res/css/views/dialogs/_CreateRoomDialog.pcss b/res/css/views/dialogs/_CreateRoomDialog.pcss
index a96b9ba472..1dff0896e9 100644
--- a/res/css/views/dialogs/_CreateRoomDialog.pcss
+++ b/res/css/views/dialogs/_CreateRoomDialog.pcss
@@ -57,16 +57,9 @@ Please see LICENSE files in the repository root for full details.
     width: 100%;
 }
 
-/* needed to make the alias field only grow as wide as needed */
-/* as opposed to full width */
 .mx_CreateRoomDialog_aliasContainer {
+    /* needed to make the alias field only grow as wide as needed as opposed to full width */
     display: flex;
-    /* put margin on container so it can collapse with siblings */
-    margin: 24px 0 10px;
-
-    .mx_RoomAliasField {
-        margin: 0;
-    }
 }
 
 .mx_CreateRoomDialog {
@@ -102,6 +95,14 @@ Please see LICENSE files in the repository root for full details.
         margin-top: 24px;
     }
 
+    .mx_Field {
+        margin: 0;
+    }
+
+    form {
+        gap: var(--cpd-space-4x);
+    }
+
     p {
         margin: 0 85px 0 0;
         font-size: $font-12px;
diff --git a/res/css/views/dialogs/_DevtoolsDialog.pcss b/res/css/views/dialogs/_DevtoolsDialog.pcss
index 3a706345c9..efcf4db372 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.pcss
+++ b/res/css/views/dialogs/_DevtoolsDialog.pcss
@@ -22,6 +22,16 @@ Please see LICENSE files in the repository root for full details.
             margin-bottom: 0;
         }
     }
+
+    .mx_DevTools_toggleForm {
+        gap: var(--cpd-space-2x);
+    }
+}
+
+.mx_DevTools_toolHeading {
+    color: var(--cpd-color-text-secondary);
+    font-weight: var(--cpd-font-weight-semibold);
+    font-size: var(--cpd-font-size-heading-sm);
 }
 
 .mx_DevTools_content {
diff --git a/res/css/views/dialogs/_FeedbackDialog.pcss b/res/css/views/dialogs/_FeedbackDialog.pcss
index a9e7d97920..88cfdf33a9 100644
--- a/res/css/views/dialogs/_FeedbackDialog.pcss
+++ b/res/css/views/dialogs/_FeedbackDialog.pcss
@@ -55,33 +55,17 @@ Please see LICENSE files in the repository root for full details.
             text-decoration: underline;
         }
 
-        &::before,
-        &::after {
-            content: "";
+        & > svg {
             position: absolute;
-            width: 40px;
-            height: 40px;
             left: 16px;
             top: 12px;
-        }
-
-        &::before {
+            padding: var(--cpd-space-2x);
+            width: 24px;
+            height: 24px;
             background-color: $icon-button-color;
+            color: $avatar-initial-color;
             border-radius: 8px;
         }
-
-        &::after {
-            background: $avatar-initial-color; /* TODO */
-            mask-position: center;
-            mask-size: 24px;
-            mask-repeat: no-repeat;
-        }
-    }
-
-    .mx_FeedbackDialog_reportBug {
-        &::after {
-            mask-image: url("$(res)/img/feather-customised/bug.svg");
-        }
     }
 
     .mx_FeedbackDialog_rateApp {
@@ -125,9 +109,5 @@ Please see LICENSE files in the repository root for full details.
             font-size: 24px;
             border-color: var(--cpd-color-bg-action-primary-rest);
         }
-
-        &::after {
-            mask-image: url("$(res)/img/element-icons/feedback.svg");
-        }
     }
 }
diff --git a/res/css/views/dialogs/_ForwardDialog.pcss b/res/css/views/dialogs/_ForwardDialog.pcss
index ecbc19d533..68132f0bbb 100644
--- a/res/css/views/dialogs/_ForwardDialog.pcss
+++ b/res/css/views/dialogs/_ForwardDialog.pcss
@@ -61,6 +61,11 @@ Please see LICENSE files in the repository root for full details.
             /* To match the space around the title */
             margin: 0 0 15px 0;
             flex-grow: 0;
+
+            &:not(:focus-within) + .mx_ForwardList_content {
+                /* Inhibit the styling if focus is not within the input which handles keyboard accessibility */
+                --mx_ForwardList_entry_selectedBgColor: transparent;
+            }
         }
 
         .mx_ForwardList_content {
@@ -90,7 +95,7 @@ Please see LICENSE files in the repository root for full details.
 
                 &:hover,
                 &.mx_ForwardList_entry_active {
-                    background-color: $spacePanel-bg-color;
+                    background-color: var(--mx_ForwardList_entry_selectedBgColor, $spacePanel-bg-color);
                 }
 
                 .mx_ForwardList_roomButton {
@@ -142,7 +147,7 @@ Please see LICENSE files in the repository root for full details.
 
                     &.mx_ForwardList_sending .mx_ForwardList_sendIcon {
                         background-color: $accent;
-                        mask-image: url("$(res)/img/element-icons/circle-sending.svg");
+                        mask-image: url("@vector-im/compound-design-tokens/icons/circle.svg");
                         mask-position: center;
                         mask-repeat: no-repeat;
                         mask-size: 14px;
@@ -152,7 +157,7 @@ Please see LICENSE files in the repository root for full details.
 
                     &.mx_ForwardList_sent .mx_ForwardList_sendIcon {
                         background-color: $accent;
-                        mask-image: url("$(res)/img/element-icons/circle-sent.svg");
+                        mask-image: url("@vector-im/compound-design-tokens/icons/check-circle.svg");
                         mask-position: center;
                         mask-repeat: no-repeat;
                         mask-size: 14px;
diff --git a/res/css/views/dialogs/_InviteDialog.pcss b/res/css/views/dialogs/_InviteDialog.pcss
index 70a8cdc608..cc737c9611 100644
--- a/res/css/views/dialogs/_InviteDialog.pcss
+++ b/res/css/views/dialogs/_InviteDialog.pcss
@@ -24,76 +24,20 @@ Please see LICENSE files in the repository root for full details.
 
     .mx_InviteDialog_editor {
         flex: 1;
-        width: 100%; /* Needed to make the Field inside grow */
-        background-color: $header-panel-bg-color;
-        border-radius: 4px;
-        min-height: 25px;
-        padding-inline-start: $spacing-8;
-        overflow-x: hidden;
-        overflow-y: auto;
-        display: flex;
-        flex-wrap: wrap;
-
-        .mx_InviteDialog_userTile {
-            margin: 6px 6px 0 0;
-            display: inline-block;
-            min-width: max-content; /* prevent manipulation by flexbox */
-        }
-
-        /* overrides bunch of our default text input styles */
-        > input[type="text"] {
-            margin: 6px 0 !important;
-            height: 24px;
-            font: var(--cpd-font-body-md-regular);
-            line-height: $font-24px;
-            padding-inline-start: $spacing-12;
-            border: 0 !important;
-            outline: 0 !important;
-            resize: none;
-            box-sizing: border-box;
-            min-width: 40%;
-            flex: 1 !important;
-            color: $primary-content !important;
-        }
+        margin-left: var(--cpd-space-0-5x);
     }
 
     .mx_InviteDialog_goButton {
-        min-width: 48px;
+        min-width: 86px;
         margin-inline-start: 10px;
-        height: 25px;
+        height: 41px;
         line-height: $font-25px;
     }
-
-    .mx_InviteDialog_buttonAndSpinner {
-        .mx_Spinner {
-            /* Width and height are required to trick the layout engine. */
-            width: 20px;
-            height: 20px;
-            margin-inline-start: 5px;
-            display: inline-block;
-            vertical-align: middle;
-        }
-    }
 }
 
 .mx_InviteDialog_section {
     padding-bottom: $spacing-4;
 
-    h3 {
-        font-size: $font-12px;
-        color: $muted-fg-color;
-        font-weight: bold;
-        text-transform: uppercase;
-    }
-
-    > p {
-        margin: 0;
-    }
-
-    > span {
-        color: $primary-content;
-    }
-
     .mx_InviteDialog_section_showMore {
         margin: 7px 18px;
         display: block;
@@ -138,51 +82,6 @@ Please see LICENSE files in the repository root for full details.
     }
 }
 
-/* Many of these styles are stolen from mx_UserPill, but adjusted for the invite dialog. */
-.mx_InviteDialog_userTile {
-    margin-inline-end: $spacing-8;
-
-    .mx_InviteDialog_userTile_pill {
-        background-color: var(--cpd-color-bg-canvas-default);
-        border: 1px solid var(--cpd-color-gray-400);
-        border-radius: 99px;
-        display: inline-block;
-        height: 24px;
-        line-height: $font-24px;
-        padding-inline: $spacing-8;
-        vertical-align: middle;
-        color: var(--cpd-color-gray-1100);
-
-        .mx_SearchResultAvatar {
-            border-radius: 20px;
-            position: relative;
-            left: -5px;
-            top: 2px;
-        }
-
-        img.mx_SearchResultAvatar {
-            vertical-align: top;
-        }
-
-        .mx_InviteDialog_userTile_name {
-            vertical-align: top;
-        }
-
-        .mx_SearchResultAvatar_threepidAvatar {
-            background-color: #ffffff; /* this is fine without a var because it's for both themes */
-        }
-    }
-
-    .mx_InviteDialog_userTile_remove {
-        display: inline-block;
-        vertical-align: middle;
-
-        svg {
-            vertical-align: middle;
-        }
-    }
-}
-
 .mx_InviteDialog_other {
     /* Prevent the dialog from jumping around randomly when elements change. */
     display: flex;
@@ -205,10 +104,13 @@ Please see LICENSE files in the repository root for full details.
     .mx_InviteDialog_userSections {
         flex-grow: 1;
         padding-inline-end: 0;
+        display: flex;
+        flex-direction: column;
+        margin-top: var(--cpd-space-3x);
+        gap: var(--cpd-space-3x);
 
         .mx_InviteDialog_section {
             padding-bottom: 0;
-            margin-top: $spacing-12;
         }
     }
 }
@@ -218,6 +120,10 @@ Please see LICENSE files in the repository root for full details.
     flex-direction: column;
     flex-grow: 1;
     overflow: hidden;
+
+    .mx_InviteProgressBody {
+        margin-top: var(--cpd-space-12x);
+    }
 }
 
 .mx_InviteDialog_transfer {
@@ -256,7 +162,6 @@ Please see LICENSE files in the repository root for full details.
 }
 
 .mx_InviteDialog_userSections {
-    margin-top: $spacing-4;
     overflow-y: auto;
     padding: 0 45px $spacing-4 0;
 }
@@ -318,62 +223,12 @@ Please see LICENSE files in the repository root for full details.
     margin-inline-start: auto;
 }
 
-.mx_InviteDialog_userDirectoryIcon::before {
-    mask-image: url("$(res)/img/voip/tab-userdirectory.svg");
-}
-
-.mx_InviteDialog_dialPadIcon::before {
-    mask-image: url("$(res)/img/voip/tab-dialpad.svg");
-}
-
 .mx_InviteDialog_tile {
     cursor: pointer;
     display: grid;
     gap: $spacing-8 $spacing-12;
     align-items: center;
 
-    &.mx_InviteDialog_tile--room {
-        /* mx_InviteDialog_tile_avatarStack, mx_InviteDialog_tile_nameStack, time */
-        grid-template-columns: min-content auto auto;
-        padding: $spacing-4 $spacing-8;
-
-        &:hover {
-            background-color: $header-panel-bg-color;
-            border-radius: 4px;
-        }
-
-        .mx_InviteDialog_tile--room_selected {
-            border-radius: 36px;
-            background-color: var(--cpd-color-bg-success-subtle);
-
-            &::before {
-                content: "";
-                width: 24px;
-                height: 24px;
-                grid-column: 1;
-                grid-row: 1;
-                mask-image: url("@vector-im/compound-design-tokens/icons/check.svg");
-                mask-size: 100%;
-                mask-repeat: no-repeat;
-                position: absolute;
-                top: 6px; /* 50% */
-                left: 6px; /* 50% */
-                background-color: $primary-content;
-            }
-        }
-
-        .mx_InviteDialog_tile--room_time {
-            margin-inline-start: auto;
-            width: max-content;
-            font-size: $font-12px;
-            color: $muted-fg-color;
-        }
-
-        .mx_InviteDialog_tile--room_highlight {
-            font-weight: 900;
-        }
-    }
-
     &.mx_InviteDialog_tile--inviterError {
         grid-template-columns: max-content auto; /* max-content = avatar width */
         margin-bottom: $spacing-24;
@@ -395,15 +250,11 @@ Please see LICENSE files in the repository root for full details.
         vertical-align: middle;
     }
 
-    .mx_InviteDialog_tile_avatarStack,
-    .mx_InviteDialog_tile--room_selected {
+    .mx_InviteDialog_tile_avatarStack {
         width: 36px;
         height: 36px;
         display: inline-block;
         position: relative;
-    }
-
-    .mx_InviteDialog_tile_avatarStack {
         grid-row-start: 1;
         grid-column-start: 1;
 
diff --git a/res/css/views/dialogs/_InviteProgressBody.pcss b/res/css/views/dialogs/_InviteProgressBody.pcss
new file mode 100644
index 0000000000..e3069a133c
--- /dev/null
+++ b/res/css/views/dialogs/_InviteProgressBody.pcss
@@ -0,0 +1,16 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+.mx_InviteProgressBody {
+    text-align: center;
+    font: var(--cpd-font-body-lg-regular);
+
+    h1 {
+        color: var(--cpd-color-text-primary);
+        font: var(--cpd-font-heading-sm-semibold);
+    }
+}
diff --git a/res/css/views/dialogs/_JoinRuleDropdown.pcss b/res/css/views/dialogs/_JoinRuleDropdown.pcss
index 3f72b09583..602e6db44c 100644
--- a/res/css/views/dialogs/_JoinRuleDropdown.pcss
+++ b/res/css/views/dialogs/_JoinRuleDropdown.pcss
@@ -18,19 +18,14 @@ Please see LICENSE files in the repository root for full details.
         min-height: 32px;
 
         > div {
-            padding-left: 30px;
-            position: relative;
+            padding-left: var(--cpd-space-1-5x);
 
-            &::before {
-                content: "";
-                position: absolute;
-                height: 16px;
+            svg {
                 width: 16px;
-                left: 6px;
-                top: 8px;
-                mask-repeat: no-repeat;
-                mask-position: center;
-                background-color: $secondary-content;
+                height: 16px;
+                color: $secondary-content;
+                vertical-align: -2px;
+                margin-right: var(--cpd-space-1-5x);
             }
 
             &.mx_JoinRuleDropdown_knock::before {
@@ -39,22 +34,6 @@ Please see LICENSE files in the repository root for full details.
         }
     }
 
-    .mx_JoinRuleDropdown_invite::before {
-        box-sizing: border-box;
-        mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg");
-        mask-size: contain;
-        padding: 1px;
-    }
-
-    .mx_JoinRuleDropdown_public::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/public.svg");
-    }
-
-    .mx_JoinRuleDropdown_restricted::before {
-        mask-image: url("$(res)/img/element-icons/group-members.svg");
-        mask-size: contain;
-    }
-
     .mx_JoinRuleDropdown_icon {
         color: $secondary-content;
         position: absolute;
diff --git a/res/css/views/dialogs/_LeaveSpaceDialog.pcss b/res/css/views/dialogs/_LeaveSpaceDialog.pcss
index d988466653..194f741d89 100644
--- a/res/css/views/dialogs/_LeaveSpaceDialog.pcss
+++ b/res/css/views/dialogs/_LeaveSpaceDialog.pcss
@@ -25,28 +25,21 @@ Please see LICENSE files in the repository root for full details.
                 overflow-y: auto;
 
                 .mx_LeaveSpaceDialog_section_warning {
-                    position: relative;
                     border-radius: 8px;
                     margin: 12px 0 0;
-                    padding: 12px 8px 12px 42px;
+                    padding: 12px 8px;
                     background-color: $header-panel-bg-color;
 
                     font-size: $font-12px;
                     line-height: $font-15px;
                     color: $secondary-content;
 
-                    &::before {
-                        content: "";
-                        position: absolute;
-                        left: 10px;
-                        top: calc(50% - 8px); /* vertical centering */
+                    svg {
                         height: 16px;
                         width: 16px;
-                        background-color: $secondary-content;
-                        mask-repeat: no-repeat;
-                        mask-size: contain;
-                        mask-image: url("@vector-im/compound-design-tokens/icons/info-solid.svg");
-                        mask-position: center;
+                        color: $secondary-content;
+                        vertical-align: middle;
+                        margin: 0 var(--cpd-space-1x);
                     }
                 }
 
diff --git a/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.pcss b/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.pcss
index ed51968dec..24e05e581e 100644
--- a/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.pcss
+++ b/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.pcss
@@ -87,25 +87,19 @@ Please see LICENSE files in the repository root for full details.
         position: relative;
         border-radius: 8px;
         margin: 12px 0;
-        padding: 8px 8px 8px 42px;
+        padding: 8px;
         background-color: $header-panel-bg-color;
 
         font-size: $font-12px;
         line-height: $font-15px;
         color: $secondary-content;
 
-        &::before {
-            content: "";
-            position: absolute;
-            left: 10px;
-            top: calc(50% - 8px); /* vertical centering */
+        svg {
             height: 16px;
             width: 16px;
-            background-color: $secondary-content;
-            mask-repeat: no-repeat;
-            mask-size: contain;
-            mask-image: url("@vector-im/compound-design-tokens/icons/info-solid.svg");
-            mask-position: center;
+            color: $secondary-content;
+            vertical-align: middle;
+            margin: 0 var(--cpd-space-1x);
         }
     }
 
diff --git a/res/css/views/dialogs/_RoomSettingsDialog.pcss b/res/css/views/dialogs/_RoomSettingsDialog.pcss
index 7593a72bd9..bc64e9543b 100644
--- a/res/css/views/dialogs/_RoomSettingsDialog.pcss
+++ b/res/css/views/dialogs/_RoomSettingsDialog.pcss
@@ -5,46 +5,6 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-/* ICONS */
-/* ========================================================== */
-
-.mx_RoomSettingsDialog_settingsIcon::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg");
-}
-
-.mx_RoomSettingsDialog_voiceIcon::before {
-    mask-image: url("$(res)/img/element-icons/call/voice-call.svg");
-}
-
-.mx_RoomSettingsDialog_securityIcon::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg");
-}
-
-.mx_RoomSettingsDialog_rolesIcon::before {
-    mask-image: url("$(res)/img/element-icons/room/settings/roles.svg");
-}
-
-.mx_RoomSettingsDialog_notificationsIcon::before {
-    mask-image: url("$(res)/img/element-icons/notifications.svg");
-}
-
-.mx_RoomSettingsDialog_bridgesIcon::before {
-    /* This icon is pants, please improve :) */
-    mask-image: url("$(res)/img/feather-customised/bridge.svg");
-}
-
-.mx_RoomSettingsDialog_pollsIcon::before {
-    mask-image: url("$(res)/img/element-icons/room/composer/poll.svg");
-}
-
-.mx_RoomSettingsDialog_warningIcon::before {
-    mask-image: url("$(res)/img/element-icons/room/settings/advanced.svg");
-}
-
-.mx_RoomSettingsDialog_peopleIcon::before {
-    mask-image: url("$(res)/img/element-icons/group-members.svg");
-}
-
 .mx_RoomSettingsDialog .mx_Dialog_title {
     -ms-text-overflow: ellipsis;
     text-overflow: ellipsis;
diff --git a/res/css/views/dialogs/_ServerPickerDialog.pcss b/res/css/views/dialogs/_ServerPickerDialog.pcss
index b1346ff73f..63ad6d1942 100644
--- a/res/css/views/dialogs/_ServerPickerDialog.pcss
+++ b/res/css/views/dialogs/_ServerPickerDialog.pcss
@@ -64,7 +64,7 @@ Please see LICENSE files in the repository root for full details.
     }
 
     .mx_AccessibleButton_kind_primary {
-        width: calc(100% - 64px);
+        width: calc(100% - 26px);
         margin: 0 8px;
         padding: 15px 18px;
     }
diff --git a/res/css/views/dialogs/_SettingsDialog.pcss b/res/css/views/dialogs/_SettingsDialog.pcss
index 186a82c0f5..2b65bff63b 100644
--- a/res/css/views/dialogs/_SettingsDialog.pcss
+++ b/res/css/views/dialogs/_SettingsDialog.pcss
@@ -30,4 +30,28 @@ Please see LICENSE files in the repository root for full details.
         /* colliding harshly with the dialog when scrolled down. */
         padding-bottom: 100px;
     }
+
+    .mx_SettingsDialog_tabLabelsAlert::after {
+        display: inline-block;
+        content: "";
+        width: 8px;
+        height: 8px;
+        background-color: var(--cpd-color-icon-critical-primary);
+        clip-path: circle(4px);
+        position: absolute;
+        right: var(--cpd-space-4x);
+    }
+}
+
+/* On narrow viewports, the tab labels are hidden, so we need to shift the indicator so it isn't over the tab icon. */
+@media (max-width: 1024px) {
+    .mx_UserSettingsDialog,
+    .mx_RoomSettingsDialog,
+    .mx_SpaceSettingsDialog,
+    .mx_SpacePreferencesDialog {
+        .mx_SettingsDialog_tabLabelsAlert::after {
+            right: var(--cpd-space-1x);
+            top: var(--cpd-space-1x);
+        }
+    }
 }
diff --git a/res/css/views/dialogs/_SpacePreferencesDialog.pcss b/res/css/views/dialogs/_SpacePreferencesDialog.pcss
index 709c926760..7b969e0ce0 100644
--- a/res/css/views/dialogs/_SpacePreferencesDialog.pcss
+++ b/res/css/views/dialogs/_SpacePreferencesDialog.pcss
@@ -26,7 +26,3 @@ Please see LICENSE files in the repository root for full details.
         }
     }
 }
-
-.mx_SpacePreferencesDialog_appearanceIcon::before {
-    mask-image: url("$(res)/img/element-icons/settings/appearance.svg");
-}
diff --git a/res/css/views/dialogs/_SpaceSettingsDialog.pcss b/res/css/views/dialogs/_SpaceSettingsDialog.pcss
index 6c48e34b75..e83025af36 100644
--- a/res/css/views/dialogs/_SpaceSettingsDialog.pcss
+++ b/res/css/views/dialogs/_SpaceSettingsDialog.pcss
@@ -71,14 +71,4 @@ Please see LICENSE files in the repository root for full details.
             }
         }
     }
-
-    .mx_TabbedView_tabLabel {
-        .mx_SpaceSettingsDialog_generalIcon::before {
-            mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg");
-        }
-
-        .mx_SpaceSettingsDialog_visibilityIcon::before {
-            mask-image: url("$(res)/img/element-icons/eye.svg");
-        }
-    }
 }
diff --git a/res/css/views/dialogs/_SpotlightDialog.pcss b/res/css/views/dialogs/_SpotlightDialog.pcss
index 592431c2f1..67d2ebcc39 100644
--- a/res/css/views/dialogs/_SpotlightDialog.pcss
+++ b/res/css/views/dialogs/_SpotlightDialog.pcss
@@ -13,11 +13,12 @@ Please see LICENSE files in the repository root for full details.
     }
 
     .mx_Dialog {
-        width: fit-content;
-        border-radius: 8px;
+        /* !important because it's overriding compound  */
+        width: fit-content !important;
+        border-radius: 8px !important;
+        height: 60% !important;
         overflow-y: initial;
         position: relative;
-        height: 60%;
         padding: 0;
         contain: unset; /* needed for #mx_SpotlightDialog_keyboardPrompt to not be culled */
 
@@ -97,7 +98,7 @@ Please see LICENSE files in the repository root for full details.
             }
 
             &.mx_SpotlightDialog_filterPublicRooms::before {
-                mask-image: url("$(res)/img/element-icons/roomlist/hash-circle.svg");
+                mask-image: url("@vector-im/compound-design-tokens/icons/room.svg");
             }
 
             &.mx_SpotlightDialog_filterPublicSpaces::before {
@@ -150,6 +151,16 @@ Please see LICENSE files in the repository root for full details.
             height: unset;
             margin-left: $spacing-16;
         }
+
+        &:not(:focus-within) + #mx_SpotlightDialog_content {
+            /* Inhibit the styling if focus is not within the input which handles keyboard accessibility */
+            --mx_SpotlightDialog_option_selectedBgColor: transparent;
+
+            /* Hide the enter prompt as in this state pressing enter would not actuate that option */
+            .mx_SpotlightDialog_enterPrompt {
+                visibility: hidden;
+            }
+        }
     }
 
     #mx_SpotlightDialog_content {
@@ -193,6 +204,17 @@ Please see LICENSE files in the repository root for full details.
             }
         }
 
+        .mx_SpotlightDialog_option {
+            border-radius: 8px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+
+            &:hover,
+            &[aria-selected="true"] {
+                background-color: var(--mx_SpotlightDialog_option_selectedBgColor, $quinary-content);
+            }
+        }
+
         .mx_SpotlightDialog_recentlyViewed {
             > div {
                 display: flex;
@@ -202,7 +224,6 @@ Please see LICENSE files in the repository root for full details.
             }
 
             .mx_SpotlightDialog_option {
-                border-radius: 8px;
                 padding: $spacing-4;
                 color: $primary-content;
                 font-size: $font-12px;
@@ -213,8 +234,6 @@ Please see LICENSE files in the repository root for full details.
                 min-width: 58px;
                 box-sizing: border-box;
                 text-align: center;
-                overflow: hidden;
-                text-overflow: ellipsis;
 
                 .mx_DecoratedRoomAvatar {
                     margin: 0 9px $spacing-4; /* maintain centering */
@@ -223,11 +242,6 @@ Please see LICENSE files in the repository root for full details.
                 & + .mx_SpotlightDialog_option {
                     margin-left: $spacing-16;
                 }
-
-                &:hover,
-                &[aria-selected="true"] {
-                    background-color: $quinary-content;
-                }
             }
         }
 
@@ -236,8 +250,9 @@ Please see LICENSE files in the repository root for full details.
         .mx_SpotlightDialog_otherSearches,
         .mx_SpotlightDialog_hiddenResults {
             .mx_SpotlightDialog_option {
+                --mx_SpotlightDialog_option_selectedBgColor: $system;
+
                 padding: 6px $spacing-4;
-                border-radius: 8px;
                 font-size: $font-15px;
                 line-height: $font-24px;
                 color: $primary-content;
@@ -245,8 +260,6 @@ Please see LICENSE files in the repository root for full details.
                 display: flex;
                 align-items: center;
                 white-space: nowrap;
-                text-overflow: ellipsis;
-                overflow: hidden;
 
                 .mx_SpotlightDialog_option--endAdornment {
                     display: inline-flex;
@@ -328,41 +341,30 @@ Please see LICENSE files in the repository root for full details.
 
                 .mx_SpotlightDialog_option--menu,
                 .mx_SpotlightDialog_option--notifications {
-                    width: 20px;
-                    min-width: 20px;
-                    height: 20px;
+                    width: 16px;
+                    height: 16px;
+                    padding: var(--cpd-space-0-5x);
+                    flex-shrink: 0;
                     margin-top: auto;
                     margin-bottom: auto;
                     position: relative;
                     display: none;
 
-                    &::before {
-                        top: 2px;
-                        left: 2px;
-                        content: "";
-                        width: 16px;
-                        height: 16px;
-                        position: absolute;
-                        mask-position: center;
-                        mask-size: contain;
-                        mask-repeat: no-repeat;
-                        background: $tertiary-content;
+                    svg {
+                        width: inherit;
+                        height: inherit;
+                        display: block;
+                        color: $tertiary-content;
                     }
 
-                    &:hover::before,
-                    &[aria-selected="true"]::before {
-                        background-color: $secondary-content;
+                    &:hover svg,
+                    &:focus-visible svg {
+                        color: $secondary-content;
                     }
                 }
 
-                .mx_SpotlightDialog_option--menu::before {
-                    mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg");
-                }
-
                 &:hover,
                 &[aria-selected="true"] {
-                    background-color: $system;
-
                     .mx_SpotlightDialog_option--menu,
                     .mx_SpotlightDialog_option--notifications {
                         display: block;
@@ -404,7 +406,7 @@ Please see LICENSE files in the repository root for full details.
         }
 
         .mx_SpotlightDialog_createRoom .mx_AccessibleButton::before {
-            mask-image: url("$(res)/img/element-icons/roomlist/hash.svg");
+            mask-image: url("@vector-im/compound-design-tokens/icons/room.svg");
         }
 
         .mx_SpotlightDialog_otherSearches {
@@ -437,11 +439,11 @@ Please see LICENSE files in the repository root for full details.
             }
 
             .mx_SpotlightDialog_joinRoomAlias::before {
-                mask-image: url("$(res)/img/element-icons/roomlist/hash-circle.svg");
+                mask-image: url("@vector-im/compound-design-tokens/icons/room.svg");
             }
 
             .mx_SpotlightDialog_explorePublicRooms::before {
-                mask-image: url("$(res)/img/element-icons/roomlist/hash-circle.svg");
+                mask-image: url("@vector-im/compound-design-tokens/icons/room.svg");
             }
 
             .mx_SpotlightDialog_explorePublicSpaces::before {
@@ -449,11 +451,11 @@ Please see LICENSE files in the repository root for full details.
             }
 
             .mx_SpotlightDialog_startGroupChat::before {
-                mask-image: url("$(res)/img/element-icons/group-members.svg");
+                mask-image: url("@vector-im/compound-design-tokens/icons/group.svg");
             }
 
             .mx_SpotlightDialog_searchMessages::before {
-                mask-image: url("$(res)/img/element-icons/room/search-inset.svg");
+                mask-image: url("@vector-im/compound-design-tokens/icons/chat.svg");
             }
 
             .mx_SpotlightDialog_otherSearches_messageSearchText {
@@ -513,7 +515,7 @@ Please see LICENSE files in the repository root for full details.
             }
 
             &.mx_SpotlightDialog_metaspaceResult_orphans-space {
-                mask-image: url("$(res)/img/element-icons/roomlist/hash-circle.svg");
+                mask-image: url("@vector-im/compound-design-tokens/icons/room.svg");
             }
         }
     }
diff --git a/res/css/views/dialogs/_VerifyEMailDialog.pcss b/res/css/views/dialogs/_VerifyEMailDialog.pcss
index 32fc8189e9..876962bfd9 100644
--- a/res/css/views/dialogs/_VerifyEMailDialog.pcss
+++ b/res/css/views/dialogs/_VerifyEMailDialog.pcss
@@ -15,7 +15,8 @@ Please see LICENSE files in the repository root for full details.
         font: var(--cpd-font-body-md-regular);
         padding: $spacing-24 $spacing-24 $spacing-16;
         text-align: center;
-        width: 485px;
+        /* !important override compound  */
+        width: 485px !important;
 
         h1 {
             font-size: $font-24px;
diff --git a/res/css/views/dialogs/security/_AccessSecretStorageDialog.pcss b/res/css/views/dialogs/security/_AccessSecretStorageDialog.pcss
index 943ec3a41f..2c78a62f8d 100644
--- a/res/css/views/dialogs/security/_AccessSecretStorageDialog.pcss
+++ b/res/css/views/dialogs/security/_AccessSecretStorageDialog.pcss
@@ -15,6 +15,23 @@ Please see LICENSE files in the repository root for full details.
     }
 
     .mx_AccessSecretStorageDialog_primaryContainer {
+        .mx_AccessSecretStorageDialog_recoveryKeyEntry {
+            /*
+             * Be specific here to avoid "margin: 9px" from _common.pcss
+             */
+            :not(.mx_textinput):not(.mx_Field):not(.mx_no_textinput) {
+                input {
+                    /*
+                     * From figma: https://www.figma.com/design/ZodBLtGnKmRTGJo5SGLnH3/ER-137--Excluding-Insecure-Devices?node-id=102-43729&t=QmewENUd7f6Tmw9U-1
+                     */
+                    width: 448px;
+                    height: 70px;
+                    margin: 0px;
+                    border: 1px solid;
+                }
+            }
+        }
+
         .mx_AccessSecretStorageDialog_recoveryKeyFeedback {
             &::before {
                 content: "";
@@ -32,7 +49,7 @@ Please see LICENSE files in the repository root for full details.
                 color: $alert;
 
                 &::before {
-                    mask-image: url("@vector-im/compound-design-tokens/icons/close.svg");
+                    mask-image: url("@vector-im/compound-design-tokens/icons/error-solid.svg");
                     background-color: $alert;
                 }
             }
diff --git a/res/css/views/dialogs/security/_CreateKeyBackupDialog.pcss b/res/css/views/dialogs/security/_CreateKeyBackupDialog.pcss
deleted file mode 100644
index 9bd8539881..0000000000
--- a/res/css/views/dialogs/security/_CreateKeyBackupDialog.pcss
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Copyright 2018-2024 New Vector Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-.mx_CreateKeyBackupDialog .mx_Dialog_title {
-    /* TODO: Consider setting this for all dialog titles. */
-    margin-bottom: 1em;
-}
-
-.mx_CreateKeyBackupDialog_primaryContainer {
-    /* FIXME: plinth colour in new theme(s). background-color: $accent; */
-    padding: 20px;
-}
-
-.mx_CreateKeyBackupDialog_primaryContainer::after {
-    content: "";
-    clear: both;
-    display: block;
-}
-
-.mx_CreateKeyBackupDialog_passPhraseContainer {
-    display: flex;
-    align-items: flex-start;
-}
-
-.mx_CreateKeyBackupDialog_passPhraseInput {
-    flex: none;
-    width: 250px;
-    border: 1px solid $accent;
-    border-radius: 5px;
-    padding: 10px;
-    margin-bottom: 1em;
-}
-
-.mx_CreateKeyBackupDialog_passPhraseMatch {
-    margin-left: 20px;
-}
-
-.mx_CreateKeyBackupDialog_recoveryKeyHeader {
-    margin-bottom: 1em;
-}
-
-.mx_CreateKeyBackupDialog_recoveryKeyContainer {
-    display: flex;
-}
-
-.mx_CreateKeyBackupDialog_recoveryKey {
-    width: 262px;
-    padding: 20px;
-    color: $info-plinth-fg-color;
-    background-color: $info-plinth-bg-color;
-    margin-right: 12px;
-}
-
-.mx_CreateKeyBackupDialog_recoveryKeyButtons {
-    flex: 1;
-    display: flex;
-    align-items: center;
-}
-
-.mx_CreateKeyBackupDialog_recoveryKeyButtons button {
-    flex: 1;
-    white-space: nowrap;
-}
-
-.mx_CreateKeyBackupDialog {
-    details .mx_AccessibleButton {
-        margin: 1em 0; /* emulate paragraph spacing because we can't put this button in a paragraph due to HTML rules */
-    }
-}
diff --git a/res/css/views/dialogs/security/_KeyBackupFailedDialog.pcss b/res/css/views/dialogs/security/_KeyBackupFailedDialog.pcss
index b02964f64b..f4ca40c66e 100644
--- a/res/css/views/dialogs/security/_KeyBackupFailedDialog.pcss
+++ b/res/css/views/dialogs/security/_KeyBackupFailedDialog.pcss
@@ -10,20 +10,12 @@ Please see LICENSE files in the repository root for full details.
 }
 
 .mx_KeyBackupFailedDialog_title {
-    position: relative;
-    padding-left: 45px;
     padding-bottom: 10px;
 
-    &::before {
-        mask: url("$(res)/img/e2e/lock-warning-filled.svg");
-        mask-repeat: no-repeat;
-        background-color: $primary-content;
-        content: "";
-        position: absolute;
-        top: -6px;
-        right: 0;
-        bottom: 0;
-        left: 0;
+    svg {
+        margin-right: var(--cpd-space-2x);
+        vertical-align: -2px;
+        color: $primary-content;
     }
 }
 
diff --git a/res/css/views/directory/_NetworkDropdown.pcss b/res/css/views/directory/_NetworkDropdown.pcss
index 47180e3c2f..f728c05091 100644
--- a/res/css/views/directory/_NetworkDropdown.pcss
+++ b/res/css/views/directory/_NetworkDropdown.pcss
@@ -39,19 +39,19 @@ Please see LICENSE files in the repository root for full details.
     .mx_GenericDropdownMenu_divider {
         margin-top: $spacing-4;
         margin-bottom: $spacing-4;
-    }
-}
 
-.mx_NetworkDropdown_addServer {
-    font-weight: normal;
-    font-size: $font-15px;
+        & + .mx_GenericDropdownMenu_Option .mx_GenericDropdownMenu_Option--label {
+            font-size: $font-15px;
+        }
+    }
 }
 
 .mx_NetworkDropdown_removeServer {
     position: relative;
     display: inline-block;
-    width: 16px;
-    height: 16px;
+    width: 14px;
+    height: 14px;
+    padding: 1px;
     background: $quinary-content;
     border-radius: 8px;
     text-align: center;
@@ -59,19 +59,10 @@ Please see LICENSE files in the repository root for full details.
     color: $secondary-content;
     margin-left: auto;
 
-    &::before {
-        background-color: $secondary-content;
-        content: "";
-        mask-repeat: no-repeat;
-        mask-position: center;
-        mask-size: 14px;
-        width: inherit;
+    svg {
+        color: $secondary-content;
         height: inherit;
-        position: absolute;
-        left: 50%;
-        top: 50%;
-        transform: translate(-50%, -50%);
-        mask-image: url("@vector-im/compound-design-tokens/icons/close.svg");
+        width: inherit;
     }
 }
 
diff --git a/res/css/views/elements/_AccessibleButton.pcss b/res/css/views/elements/_AccessibleButton.pcss
index c67a7441be..d9d78912f0 100644
--- a/res/css/views/elements/_AccessibleButton.pcss
+++ b/res/css/views/elements/_AccessibleButton.pcss
@@ -37,6 +37,7 @@ Please see LICENSE files in the repository root for full details.
         font: var(--cpd-font-body-md-semibold);
         border: none; /* override default <button /> styles */
         word-break: keep-all; /* prevent button text in Chinese/Japanese/Korean (CJK) from being collapsed */
+        box-sizing: border-box;
 
         &.mx_AccessibleButton_kind_primary_sm,
         &.mx_AccessibleButton_kind_danger_sm,
@@ -47,11 +48,13 @@ Please see LICENSE files in the repository root for full details.
         &.mx_AccessibleButton_kind_primary_sm {
             color: var(--cpd-color-text-on-solid-primary);
             background-color: var(--cpd-color-bg-action-primary-rest);
+            border: 1px solid var(--cpd-color-bg-action-primary-rest);
         }
 
         &.mx_AccessibleButton_kind_danger_sm {
             color: var(--cpd-color-text-on-solid-primary);
             background-color: var(--cpd-color-bg-critical-primary);
+            border: 1px solid var(--cpd-color-bg-critical-primary);
         }
 
         &.mx_AccessibleButton_kind_link_sm {
diff --git a/res/css/views/elements/_CopyableText.pcss b/res/css/views/elements/_CopyableText.pcss
index 2764fea46c..6219055085 100644
--- a/res/css/views/elements/_CopyableText.pcss
+++ b/res/css/views/elements/_CopyableText.pcss
@@ -39,17 +39,11 @@ Please see LICENSE files in the repository root for full details.
         top: 0.15em;
         background-color: $background;
 
-        &::before {
-            content: "";
-            mask-image: url($copy-button-url);
-            mask-position: center center;
-            mask-repeat: no-repeat;
-            mask-size: contain;
-            background-color: $message-action-bar-fg-color;
+        svg {
             width: 1em;
             height: 1em;
+            color: $message-action-bar-fg-color;
             display: block;
-            background-repeat: no-repeat;
         }
     }
 }
diff --git a/res/css/views/elements/_Dropdown.pcss b/res/css/views/elements/_Dropdown.pcss
index 355d79d569..158aa79275 100644
--- a/res/css/views/elements/_Dropdown.pcss
+++ b/res/css/views/elements/_Dropdown.pcss
@@ -38,15 +38,11 @@ Please see LICENSE files in the repository root for full details.
     filter: none;
 }
 
-.mx_Dropdown_arrow {
-    width: 16px;
-    height: 16px;
-    margin-right: 4px;
-    mask: url("@vector-im/compound-design-tokens/icons/chevron-down.svg");
-    mask-repeat: no-repeat;
-    mask-position: center;
-    mask-size: 18px;
-    background: $primary-content;
+svg.mx_Dropdown_arrow {
+    width: 18px;
+    height: 18px;
+    margin-right: 3px;
+    color: $primary-content;
 }
 
 .mx_Dropdown_option {
diff --git a/res/css/views/elements/_ExternalLink.pcss b/res/css/views/elements/_ExternalLink.pcss
index c103207ab0..32d2b040ae 100644
--- a/res/css/views/elements/_ExternalLink.pcss
+++ b/res/css/views/elements/_ExternalLink.pcss
@@ -12,10 +12,6 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_ExternalLink_icon {
     display: inline-block;
-    mask-image: url("$(res)/img/external-link.svg");
-    background-color: currentColor;
-    mask-repeat: no-repeat;
-    mask-size: contain;
     width: $font-11px;
     height: $font-11px;
     margin-left: 0.3rem;
diff --git a/res/css/views/elements/_FacePile.pcss b/res/css/views/elements/_FacePile.pcss
index 1e4acb75e8..de37d5ba6d 100644
--- a/res/css/views/elements/_FacePile.pcss
+++ b/res/css/views/elements/_FacePile.pcss
@@ -13,23 +13,12 @@ Please see LICENSE files in the repository root for full details.
     border-radius: 100%;
     width: 28px;
     height: 28px;
+    box-sizing: border-box;
+    padding: var(--cpd-space-1x);
     background-color: $panels;
+    color: $tertiary-content;
     display: inline-block;
-
-    &::before {
-        content: "";
-        z-index: 1;
-        position: absolute;
-        top: 0;
-        left: 0;
-        height: inherit;
-        width: inherit;
-        background: $tertiary-content;
-        mask-position: center;
-        mask-size: 20px;
-        mask-repeat: no-repeat;
-        mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg");
-    }
+    z-index: 1;
 }
 
 .mx_FacePile_summary {
diff --git a/res/css/views/elements/_InfoTooltip.pcss b/res/css/views/elements/_InfoTooltip.pcss
index a214f0bf83..800f50597b 100644
--- a/res/css/views/elements/_InfoTooltip.pcss
+++ b/res/css/views/elements/_InfoTooltip.pcss
@@ -10,24 +10,15 @@ Please see LICENSE files in the repository root for full details.
     width: 16px;
     height: 16px;
     display: inline-block;
+
+    svg {
+        height: inherit;
+        width: inherit;
+        color: $muted-fg-color;
+    }
 }
 
 .mx_InfoTooltip_icon::before {
     display: inline-block;
-    background-color: $muted-fg-color;
-    mask-repeat: no-repeat;
-    mask-size: 16px;
-    width: 16px;
-    height: 16px;
-    mask-position: center;
-    content: "";
     vertical-align: middle;
 }
-
-.mx_InfoTooltip_icon_info::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/info.svg");
-}
-
-.mx_InfoTooltip_icon_warning::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/error-solid.svg");
-}
diff --git a/res/css/views/elements/_InlineSpinner.pcss b/res/css/views/elements/_InlineSpinner.pcss
index 9f7ae2ab52..5df3bd9904 100644
--- a/res/css/views/elements/_InlineSpinner.pcss
+++ b/res/css/views/elements/_InlineSpinner.pcss
@@ -7,14 +7,10 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_InlineSpinner {
     display: inline;
-}
 
-.mx_InlineSpinner img,
-.mx_InlineSpinner_icon {
-    margin: 0px 6px;
-    vertical-align: -3px;
-}
-
-.mx_InlineSpinner_icon {
-    display: inline-block !important; /* Override regular mx_Spinner_icon */
+    svg {
+        margin: 0px 6px;
+        vertical-align: -3px;
+        display: inline-block;
+    }
 }
diff --git a/res/css/views/elements/_InviteReason.pcss b/res/css/views/elements/_InviteReason.pcss
index 509e6cfaf9..57cdb82351 100644
--- a/res/css/views/elements/_InviteReason.pcss
+++ b/res/css/views/elements/_InviteReason.pcss
@@ -23,14 +23,12 @@ Please see LICENSE files in the repository root for full details.
         cursor: pointer;
         color: $secondary-content;
 
-        &::before {
-            content: "";
-            margin-right: 8px;
-            background-color: $secondary-content;
-            mask-image: url("$(res)/img/element-icons/eye.svg");
+        svg {
+            width: 16px;
+            height: 16px;
+            color: $secondary-content;
             display: inline-block;
-            width: 18px;
-            height: 14px;
+            margin-right: 8px;
         }
     }
 }
diff --git a/res/css/views/elements/_MiniAvatarUploader.pcss b/res/css/views/elements/_MiniAvatarUploader.pcss
index 6fbe209ac9..2963d83e46 100644
--- a/res/css/views/elements/_MiniAvatarUploader.pcss
+++ b/res/css/views/elements/_MiniAvatarUploader.pcss
@@ -13,28 +13,22 @@ Please see LICENSE files in the repository root for full details.
     .mx_MiniAvatarUploader_indicator {
         position: absolute;
 
-        height: 26px;
-        width: 26px;
+        height: 16px;
+        width: 16px;
+        padding: 5px;
 
         right: -6px;
         bottom: -6px;
 
         background-color: $background;
         border-radius: 50%;
-        z-index: 1;
 
         line-height: 0;
 
         .mx_MiniAvatarUploader_cameraIcon {
-            height: 100%;
-            width: 100%;
-
-            background-color: $secondary-content;
-            mask-position: center;
-            mask-repeat: no-repeat;
-            mask-image: url("@vector-im/compound-design-tokens/icons/take-photo-solid.svg");
-            mask-size: 16px;
-            z-index: 2;
+            height: inherit;
+            width: inherit;
+            color: $secondary-content;
         }
     }
 }
diff --git a/res/css/views/elements/_Pill.pcss b/res/css/views/elements/_Pill.pcss
index d692f812a4..c466c4d6a3 100644
--- a/res/css/views/elements/_Pill.pcss
+++ b/res/css/views/elements/_Pill.pcss
@@ -11,8 +11,7 @@ Please see LICENSE files in the repository root for full details.
     line-height: $font-17px;
     border-radius: $font-16px;
     vertical-align: text-top;
-    display: inline-flex;
-    align-items: center;
+    display: inline-block;
     box-sizing: border-box;
     max-width: 100%;
     overflow: hidden;
@@ -57,6 +56,8 @@ Please see LICENSE files in the repository root for full details.
         margin-inline-start: -0.3em; /* Otherwise the gap is too large */
         margin-inline-end: 0.2em;
         min-width: $font-16px; /* ensure the avatar is not compressed */
+        user-select: text;
+        vertical-align: top;
     }
 
     .mx_Pill_text {
diff --git a/res/css/views/elements/_ServerPicker.pcss b/res/css/views/elements/_ServerPicker.pcss
index aced0976ce..5d04482334 100644
--- a/res/css/views/elements/_ServerPicker.pcss
+++ b/res/css/views/elements/_ServerPicker.pcss
@@ -25,13 +25,11 @@ Please see LICENSE files in the repository root for full details.
     .mx_ServerPicker_help {
         width: 20px;
         height: 20px;
-        background-color: $icon-button-color;
         border-radius: 10px;
         grid-column: 2;
         grid-row: 1;
         margin-left: auto;
         text-align: center;
-        color: #ffffff;
         font-size: 16px;
         position: relative;
 
@@ -45,8 +43,8 @@ Please see LICENSE files in the repository root for full details.
             mask-position: center;
             mask-size: contain;
             mask-repeat: no-repeat;
-            mask-image: url("$(res)/img/element-icons/i.svg");
-            background: #ffffff;
+            mask-image: url("@vector-im/compound-design-tokens/icons/info.svg");
+            background: $icon-button-color;
         }
     }
 
diff --git a/res/css/views/elements/_SettingsDropdown.pcss b/res/css/views/elements/_SettingsDropdown.pcss
new file mode 100644
index 0000000000..dff255a418
--- /dev/null
+++ b/res/css/views/elements/_SettingsDropdown.pcss
@@ -0,0 +1,20 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+.mx_SettingsDropdown {
+    margin-bottom: var(--cpd-space-1x);
+    width: 100%;
+
+    .mx_SettingsDropdown_label {
+        color: $primary-content;
+        margin: var(--cpd-space-1x) 0;
+    }
+
+    .mx_Dropdown_input {
+        width: 360px;
+    }
+}
diff --git a/res/css/views/elements/_Spinner.pcss b/res/css/views/elements/_Spinner.pcss
index 1280cc888c..a5cf725d3e 100644
--- a/res/css/views/elements/_Spinner.pcss
+++ b/res/css/views/elements/_Spinner.pcss
@@ -19,39 +19,3 @@ Please see LICENSE files in the repository root for full details.
 .mx_MatrixChat_middlePanel .mx_Spinner {
     height: auto;
 }
-
-@keyframes spin {
-    from {
-        transform: rotateZ(0deg);
-    }
-    to {
-        transform: rotateZ(360deg);
-    }
-}
-
-.mx_Spinner_icon {
-    background-color: $quinary-content;
-    mask: url("$(res)/img/spinner/spinner-background.svg");
-    mask-size: 100%;
-
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    width: 100%;
-    height: 100%;
-
-    &::before {
-        background-color: $secondary-content;
-        mask: url("$(res)/img/spinner/spinner-foreground.svg");
-        mask-size: 100%;
-
-        width: 100%;
-        height: 100%;
-
-        content: "";
-        display: flex;
-
-        animation: 1s linear spin infinite;
-    }
-}
diff --git a/res/css/views/elements/_Validation.pcss b/res/css/views/elements/_Validation.pcss
index 28ea95c0b0..f4e6766f50 100644
--- a/res/css/views/elements/_Validation.pcss
+++ b/res/css/views/elements/_Validation.pcss
@@ -11,7 +11,7 @@ Please see LICENSE files in the repository root for full details.
 }
 
 .mx_Validation_details {
-    padding-left: 20px;
+    padding-left: 0;
     margin: 0;
 }
 
@@ -20,7 +20,6 @@ Please see LICENSE files in the repository root for full details.
 }
 
 .mx_Validation_detail {
-    position: relative;
     font-weight: normal;
     list-style: none;
     margin-bottom: 0.5em;
@@ -29,33 +28,18 @@ Please see LICENSE files in the repository root for full details.
         margin-bottom: 0;
     }
 
-    &::before {
-        content: "";
-        position: absolute;
+    svg {
         width: 14px;
         height: 14px;
-        top: 0;
-        left: -18px;
-        mask-repeat: no-repeat;
-        mask-position: center;
-        mask-size: contain;
+        margin-right: var(--cpd-space-1x);
+        vertical-align: text-bottom;
     }
 
     &.mx_Validation_valid {
         color: $accent;
-
-        &::before {
-            mask-image: url("@vector-im/compound-design-tokens/icons/check.svg");
-            background-color: $accent;
-        }
     }
 
     &.mx_Validation_invalid {
         color: $alert;
-
-        &::before {
-            mask-image: url("@vector-im/compound-design-tokens/icons/close.svg");
-            background-color: $alert;
-        }
     }
 }
diff --git a/res/css/views/emojipicker/_EmojiPicker.pcss b/res/css/views/emojipicker/_EmojiPicker.pcss
index 7542424605..bc14c2e958 100644
--- a/res/css/views/emojipicker/_EmojiPicker.pcss
+++ b/res/css/views/emojipicker/_EmojiPicker.pcss
@@ -8,7 +8,8 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_EmojiPicker {
     width: 340px;
-    height: 450px;
+    height: min(450px, 80vh);
+    max-height: 80vh;
 
     border-radius: 4px;
 
@@ -181,7 +182,7 @@ Please see LICENSE files in the repository root for full details.
     }
 }
 
-.mx_EmojiPicker_body .mx_EmojiPicker_item_wrapper[tabindex="0"] .mx_EmojiPicker_item {
+.mx_EmojiPicker_body_showHighlight .mx_EmojiPicker_item_wrapper [tabindex="0"] .mx_EmojiPicker_item {
     background-color: $focus-bg-color;
 }
 
diff --git a/res/css/views/messages/_CallEvent.pcss b/res/css/views/messages/_CallEvent.pcss
index 1797c283ce..dd260189d8 100644
--- a/res/css/views/messages/_CallEvent.pcss
+++ b/res/css/views/messages/_CallEvent.pcss
@@ -51,7 +51,7 @@ Please see LICENSE files in the repository root for full details.
     vertical-align: middle;
     content: "";
     background-color: $secondary-content;
-    mask-image: url("$(res)/img/element-icons/call/video-call.svg");
+    mask-image: url("@vector-im/compound-design-tokens/icons/video-call-solid.svg");
     mask-size: 16px;
     width: 16px;
     height: 16px;
diff --git a/res/css/views/messages/_CreateEvent.pcss b/res/css/views/messages/_CreateEvent.pcss
index 0c8a003dcd..2f4d753436 100644
--- a/res/css/views/messages/_CreateEvent.pcss
+++ b/res/css/views/messages/_CreateEvent.pcss
@@ -11,6 +11,6 @@ Please see LICENSE files in the repository root for full details.
 
     &::before {
         background-color: $header-panel-text-primary-color;
-        mask-image: url("$(res)/img/element-icons/chat-bubbles.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/chat-solid.svg");
     }
 }
diff --git a/res/css/views/messages/_DateSeparator.pcss b/res/css/views/messages/_DateSeparator.pcss
index fe13412561..50d56b085a 100644
--- a/res/css/views/messages/_DateSeparator.pcss
+++ b/res/css/views/messages/_DateSeparator.pcss
@@ -27,9 +27,5 @@ Please see LICENSE files in the repository root for full details.
     align-self: center;
     width: 16px;
     height: 16px;
-    mask-position: center;
-    mask-size: contain;
-    mask-repeat: no-repeat;
-    mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg");
-    background-color: var(--cpd-color-icon-secondary);
+    color: var(--cpd-color-icon-secondary);
 }
diff --git a/res/css/views/messages/_HiddenBody.pcss b/res/css/views/messages/_HiddenBody.pcss
index 672cd262b2..30e3100dbb 100644
--- a/res/css/views/messages/_HiddenBody.pcss
+++ b/res/css/views/messages/_HiddenBody.pcss
@@ -18,7 +18,7 @@ Please see LICENSE files in the repository root for full details.
         height: 14px;
         width: 14px;
         background-color: $muted-fg-color;
-        mask-image: url("$(res)/img/element-icons/hide.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/visibility-off.svg");
 
         mask-repeat: no-repeat;
         mask-position: center;
diff --git a/res/css/views/messages/_LegacyCallEvent.pcss b/res/css/views/messages/_LegacyCallEvent.pcss
index c79279b763..449268c678 100644
--- a/res/css/views/messages/_LegacyCallEvent.pcss
+++ b/res/css/views/messages/_LegacyCallEvent.pcss
@@ -43,24 +43,24 @@ Please see LICENSE files in the repository root for full details.
         }
 
         .mx_LegacyCallEvent_silence::before {
-            mask-image: url("$(res)/img/voip/silence.svg");
+            mask-image: url("@vector-im/compound-design-tokens/icons/volume-on-solid.svg");
         }
 
         .mx_LegacyCallEvent_unSilence::before {
-            mask-image: url("$(res)/img/voip/un-silence.svg");
+            mask-image: url("@vector-im/compound-design-tokens/icons/volume-off-solid.svg");
         }
 
         &.mx_LegacyCallEvent_voice {
             .mx_LegacyCallEvent_type_icon::before,
             .mx_LegacyCallEvent_content_button_callBack span::before,
             .mx_LegacyCallEvent_content_button_answer span::before {
-                mask-image: url("$(res)/img/element-icons/call/voice-call.svg");
+                mask-image: url("@vector-im/compound-design-tokens/icons/voice-call-solid.svg");
             }
 
             &.mx_LegacyCallEvent_rejected,
             &.mx_LegacyCallEvent_noAnswer {
                 .mx_LegacyCallEvent_type_icon::before {
-                    mask-image: url("$(res)/img/element-icons/call/hangup.svg");
+                    mask-image: url("@vector-im/compound-design-tokens/icons/end-call.svg");
                 }
             }
         }
@@ -69,7 +69,7 @@ Please see LICENSE files in the repository root for full details.
             .mx_LegacyCallEvent_type_icon::before,
             .mx_LegacyCallEvent_content_button_callBack span::before,
             .mx_LegacyCallEvent_content_button_answer span::before {
-                mask-image: url("$(res)/img/element-icons/call/video-call.svg");
+                mask-image: url("@vector-im/compound-design-tokens/icons/video-call-solid.svg");
             }
 
             &.mx_LegacyCallEvent_rejected,
@@ -169,7 +169,7 @@ Please see LICENSE files in the repository root for full details.
 
             .mx_LegacyCallEvent_content_button_reject {
                 span::before {
-                    mask-image: url("$(res)/img/element-icons/call/hangup.svg");
+                    mask-image: url("@vector-im/compound-design-tokens/icons/end-call.svg");
                 }
             }
 
diff --git a/res/css/views/messages/_MFileBody.pcss b/res/css/views/messages/_MFileBody.pcss
index c8361f1d29..51ba681140 100644
--- a/res/css/views/messages/_MFileBody.pcss
+++ b/res/css/views/messages/_MFileBody.pcss
@@ -45,10 +45,10 @@ Please see LICENSE files in the repository root for full details.
             mask-repeat: no-repeat;
             mask-position: center;
             mask-size: cover;
-            mask-image: url("$(res)/img/element-icons/room/composer/attach.svg");
+            mask-image: url("@vector-im/compound-design-tokens/icons/attachment.svg");
             background-color: $secondary-content;
-            width: 15px;
-            height: 15px;
+            width: 16px;
+            height: 16px;
 
             position: absolute;
             top: 8px;
diff --git a/res/css/views/messages/_MJitsiWidgetEvent.pcss b/res/css/views/messages/_MJitsiWidgetEvent.pcss
index 252681f684..9884d8951f 100644
--- a/res/css/views/messages/_MJitsiWidgetEvent.pcss
+++ b/res/css/views/messages/_MJitsiWidgetEvent.pcss
@@ -9,6 +9,6 @@ Please see LICENSE files in the repository root for full details.
 .mx_EventTileBubble.mx_MJitsiWidgetEvent {
     &::before {
         background-color: $header-panel-text-primary-color; /* XXX: Variable abuse */
-        mask-image: url("$(res)/img/element-icons/call/video-call.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/video-call-solid.svg");
     }
 }
diff --git a/res/css/views/messages/_MPollBody.pcss b/res/css/views/messages/_MPollBody.pcss
index 33144083ea..b30807dd59 100644
--- a/res/css/views/messages/_MPollBody.pcss
+++ b/res/css/views/messages/_MPollBody.pcss
@@ -6,15 +6,30 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-.mx_MPollBody {
-    margin-top: 8px;
+$poll-max-width: 550px;
 
-    h2 {
+.mx_MPollBody {
+    margin-top: var(--cpd-space-2x);
+    min-width: 0; /* Override fieldset default min-width: min-content */
+    width: 100%; /* Ensure fieldset takes full available width */
+    border: none; /* Remove default fieldset border */
+    padding: 0; /* Remove default fieldset padding */
+
+    legend {
         font-weight: var(--cpd-font-weight-semibold);
         font-size: $font-15px;
         line-height: $font-24px;
         margin-top: 0;
-        margin-bottom: 8px;
+        margin-bottom: var(--cpd-space-2x);
+        letter-spacing: var(--cpd-font-letter-spacing-heading-lg);
+        display: flex;
+        align-items: center;
+        gap: var(--cpd-space-3x);
+
+        svg {
+            flex-shrink: 0;
+            color: var(--cpd-color-icon-primary);
+        }
 
         .mx_MPollBody_edited {
             color: $roomtopic-color;
@@ -23,22 +38,6 @@ Please see LICENSE files in the repository root for full details.
         }
     }
 
-    h2::before {
-        content: "";
-        position: relative;
-        display: inline-block;
-        margin-right: 12px;
-        top: 3px;
-        left: 3px;
-        height: 20px;
-        width: 20px;
-        background-color: $secondary-content;
-        mask-repeat: no-repeat;
-        mask-size: contain;
-        mask-position: center;
-        mask-image: url("$(res)/img/element-icons/room/composer/poll.svg");
-    }
-
     .mx_MPollBody_totalVotes {
         display: flex;
         flex-direction: inline;
@@ -60,7 +59,7 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_MPollBody_allOptions {
     display: grid;
-    grid-gap: $spacing-16;
+    gap: $spacing-16;
     margin-bottom: $spacing-8;
-    max-width: 550px;
+    max-width: $poll-max-width;
 }
diff --git a/res/css/views/messages/_MPollEndBody.pcss b/res/css/views/messages/_MPollEndBody.pcss
deleted file mode 100644
index 655f444e35..0000000000
--- a/res/css/views/messages/_MPollEndBody.pcss
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2023 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-.mx_MPollEndBody_icon {
-    height: 14px;
-    margin-right: $spacing-8;
-    vertical-align: middle;
-    color: $secondary-content;
-}
diff --git a/res/css/views/messages/_MessageTimestamp.pcss b/res/css/views/messages/_MessageTimestamp.pcss
index 2cca6a3aaf..d5dda3272d 100644
--- a/res/css/views/messages/_MessageTimestamp.pcss
+++ b/res/css/views/messages/_MessageTimestamp.pcss
@@ -13,13 +13,14 @@ Please see LICENSE files in the repository root for full details.
 }
 
 .mx_MessageTimestamp {
-    color: var(--MessageTimestamp-color);
+    color: var(--MessageTimestamp-color) !important; /* override anchor color */
     font-size: $font-10px;
     font-variant-numeric: tabular-nums;
     display: block; /* enable the width setting below */
     width: var(--MessageTimestamp-width);
     white-space: nowrap;
     user-select: none;
+    text-decoration: none;
 }
 
 .mx_MessageTimestamp_lateIcon {
diff --git a/res/css/views/messages/_PinnedMessageBadge.pcss b/res/css/views/messages/_PinnedMessageBadge.pcss
index 69b592d789..722945a49c 100644
--- a/res/css/views/messages/_PinnedMessageBadge.pcss
+++ b/res/css/views/messages/_PinnedMessageBadge.pcss
@@ -13,7 +13,7 @@
 
     padding: var(--cpd-space-1x) var(--cpd-space-3x) var(--cpd-space-1x) var(--cpd-space-1x);
     font: var(--cpd-font-body-xs-medium);
-    background-color: var(--cpd-color-alpha-gray-200);
+    background-color: var(--cpd-color-bg-subtle-secondary);
     color: var(--cpd-color-text-secondary);
 
     border-radius: 99px;
diff --git a/res/css/views/messages/_ReactionsRow.pcss b/res/css/views/messages/_ReactionsRow.pcss
index e787e50517..833dee9a35 100644
--- a/res/css/views/messages/_ReactionsRow.pcss
+++ b/res/css/views/messages/_ReactionsRow.pcss
@@ -27,7 +27,7 @@ Please see LICENSE files in the repository root for full details.
             mask-repeat: no-repeat;
             mask-position: center;
             background-color: $tertiary-content;
-            mask-image: url("$(res)/img/element-icons/room/message-bar/emoji.svg");
+            mask-image: url("@vector-im/compound-design-tokens/icons/reaction-add.svg");
         }
 
         &.mx_ReactionsRow_addReactionButton_active {
diff --git a/res/css/views/messages/_common_CryptoEvent.pcss b/res/css/views/messages/_common_CryptoEvent.pcss
index ba18f4f2ae..5f2e26fd1c 100644
--- a/res/css/views/messages/_common_CryptoEvent.pcss
+++ b/res/css/views/messages/_common_CryptoEvent.pcss
@@ -12,24 +12,24 @@ Please see LICENSE files in the repository root for full details.
     /* white infill for the transparency */
     &.mx_cryptoEvent_icon::before {
         background-color: #ffffff;
-        mask-image: url("$(res)/img/e2e/normal.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg");
         mask-repeat: no-repeat;
         mask-position: center;
         mask-size: 80%;
     }
 
     &.mx_cryptoEvent_icon::after {
-        mask-image: url("$(res)/img/e2e/normal.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg");
         background-color: $header-panel-text-primary-color;
     }
 
     &.mx_cryptoEvent_icon_verified::after {
-        mask-image: url("$(res)/img/e2e/verified.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/shield.svg");
         background-color: $accent;
     }
 
     &.mx_cryptoEvent_icon_warning::after {
-        mask-image: url("$(res)/img/e2e/warning.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/error-solid.svg");
         background-color: $e2e-warning-color;
     }
 
diff --git a/res/css/views/polls/pollHistory/_PollHistoryList.pcss b/res/css/views/polls/pollHistory/_PollHistoryList.pcss
index 95d54192f9..b732545178 100644
--- a/res/css/views/polls/pollHistory/_PollHistoryList.pcss
+++ b/res/css/views/polls/pollHistory/_PollHistoryList.pcss
@@ -21,12 +21,12 @@ Please see LICENSE files in the repository root for full details.
     flex: 1 1 0;
     align-content: flex-start;
     display: grid;
-    grid-gap: $spacing-20;
+    gap: $spacing-20;
     padding-right: $spacing-64;
     margin: $spacing-32 0;
 
     &.mx_PollHistoryList_list_ENDED {
-        grid-gap: $spacing-32;
+        gap: $spacing-32;
     }
 }
 
diff --git a/res/css/views/right_panel/_ExtensionsCard.pcss b/res/css/views/right_panel/_ExtensionsCard.pcss
index c98fa3e9dc..10a9cb2d56 100644
--- a/res/css/views/right_panel/_ExtensionsCard.pcss
+++ b/res/css/views/right_panel/_ExtensionsCard.pcss
@@ -89,7 +89,7 @@ Please see LICENSE files in the repository root for full details.
             right: 8px;
 
             &::before {
-                mask-image: url("$(res)/img/element-icons/room/pin-upright.svg");
+                mask-image: url("@vector-im/compound-design-tokens/icons/pin-solid.svg");
             }
         }
 
diff --git a/res/css/views/right_panel/_RoomSummaryCard.pcss b/res/css/views/right_panel/_RoomSummaryCard.pcss
index 3c1c07677c..96d1b0867e 100644
--- a/res/css/views/right_panel/_RoomSummaryCard.pcss
+++ b/res/css/views/right_panel/_RoomSummaryCard.pcss
@@ -32,7 +32,7 @@ Please see LICENSE files in the repository root for full details.
         padding: 0 12px;
         color: var(--cpd-color-text-secondary);
 
-        .mx_Box {
+        .mx_RoomSummaryCard_topic_box {
             width: 100%;
         }
 
diff --git a/res/css/views/right_panel/_ThreadPanel.pcss b/res/css/views/right_panel/_ThreadPanel.pcss
index 2fe1a86908..a5a6540dda 100644
--- a/res/css/views/right_panel/_ThreadPanel.pcss
+++ b/res/css/views/right_panel/_ThreadPanel.pcss
@@ -47,16 +47,12 @@ Please see LICENSE files in the repository root for full details.
                 background: $quinary-content;
             }
 
-            &::before {
+            svg {
                 margin-left: 2px;
-                content: "";
-                width: 20px;
                 height: 20px;
-                background: currentColor;
-                mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg");
-                mask-size: 100%;
-                mask-repeat: no-repeat;
-                float: right;
+                width: 20px;
+                display: inline-block;
+                vertical-align: bottom;
             }
         }
     }
@@ -167,14 +163,6 @@ Please see LICENSE files in the repository root for full details.
     }
 }
 
-.mx_ThreadPanel_viewInRoom::before {
-    mask-image: url("$(res)/img/element-icons/view-in-room.svg");
-}
-
-.mx_ThreadPanel_copyLinkToThread::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/link.svg");
-}
-
 .mx_ContextualMenu_wrapper {
     .mx_ThreadPanel_Header_FilterOptionItem {
         display: flex;
@@ -189,25 +177,24 @@ Please see LICENSE files in the repository root for full details.
         }
 
         &[aria-checked="true"] {
-            :first-child {
+            span:first-child {
                 margin-left: -20px;
             }
 
-            :first-child::before {
-                content: "";
+            svg {
                 width: 12px;
                 height: 12px;
                 margin-right: 8px;
-                mask-image: url("@vector-im/compound-design-tokens/icons/check.svg");
-                mask-size: 100%;
-                mask-repeat: no-repeat;
-                background-color: $primary-content;
+                color: $primary-content;
                 display: inline-block;
                 vertical-align: middle;
+                position: absolute;
+                top: 14px;
+                left: 10px;
             }
         }
 
-        :last-child {
+        span:last-child {
             color: $secondary-content;
         }
     }
diff --git a/res/css/views/right_panel/_UserInfo.pcss b/res/css/views/right_panel/_UserInfo.pcss
index 3030b93c03..70cc4ba064 100644
--- a/res/css/views/right_panel/_UserInfo.pcss
+++ b/res/css/views/right_panel/_UserInfo.pcss
@@ -13,26 +13,6 @@ Please see LICENSE files in the repository root for full details.
     overflow-y: auto;
     font-size: var(--cpd-font-size-body-sm);
 
-    .mx_UserInfo_cancel {
-        cursor: pointer;
-        position: absolute;
-        top: 0;
-        border-radius: 4px;
-        background-color: $dark-panel-bg-color;
-        margin: 9px;
-        z-index: 1; /* render on top of the right panel */
-
-        div {
-            height: 16px;
-            width: 16px;
-            padding: 4px;
-            mask-image: url("@vector-im/compound-design-tokens/icons/chevron-left.svg");
-            mask-repeat: no-repeat;
-            mask-position: center;
-            background-color: $header-panel-text-primary-color;
-        }
-    }
-
     .mx_UserInfo_container {
         padding: var(--cpd-space-2x) 0 var(--cpd-space-4x);
         margin: 0 var(--cpd-space-4x);
@@ -108,11 +88,6 @@ Please see LICENSE files in the repository root for full details.
             margin: 0;
             font-size: $font-20px;
             line-height: $font-25px;
-
-            /* E2E icon wrapper */
-            .mx_Flex > span {
-                display: inline-block;
-            }
         }
 
         .mx_UserInfo_profile_name {
diff --git a/res/css/views/rooms/RoomListPanel/_RoomListHeaderView.pcss b/res/css/views/rooms/RoomListPanel/_RoomListHeaderView.pcss
index 9af934c308..5427e1f133 100644
--- a/res/css/views/rooms/RoomListPanel/_RoomListHeaderView.pcss
+++ b/res/css/views/rooms/RoomListPanel/_RoomListHeaderView.pcss
@@ -32,4 +32,8 @@
             transform: rotate(180deg);
         }
     }
+
+    .mx_RoomListHeaderView_ReleaseAnnouncementAnchor {
+        display: inline-flex;
+    }
 }
diff --git a/res/css/views/rooms/RoomListPanel/_RoomListItemView.pcss b/res/css/views/rooms/RoomListPanel/_RoomListItemView.pcss
index ac58a69bef..7ce6280331 100644
--- a/res/css/views/rooms/RoomListPanel/_RoomListItemView.pcss
+++ b/res/css/views/rooms/RoomListPanel/_RoomListItemView.pcss
@@ -15,56 +15,81 @@
  * |-------------------------------------------------------|
  */
 .mx_RoomListItemView {
-    all: unset;
+    /* Remove button default style */
+    background: unset;
+    border: none;
+    padding: 0;
+    text-align: unset;
+
     cursor: pointer;
+    height: 48px;
+    width: 100%;
 
-    .mx_RoomListItemView_container {
-        padding-left: var(--cpd-space-3x);
-        font: var(--cpd-font-body-md-regular);
-        height: 100%;
+    padding-left: var(--cpd-space-3x);
+    font: var(--cpd-font-body-md-regular);
 
-        .mx_RoomListItemView_content {
-            height: 100%;
-            flex: 1;
-            /* The border is only under the room name and the future hover menu  */
-            border-bottom: var(--cpd-border-width-0-5) solid var(--cpd-color-bg-subtle-secondary);
-            box-sizing: border-box;
-            min-width: 0;
-            padding-right: var(--cpd-space-5x);
+    /*  Hide the menu by default  */
+    .mx_RoomListItemView_menu {
+        display: none;
+    }
 
-            .mx_RoomListItemView_text {
-                min-width: 0;
+    &:hover,
+    &:focus-visible,
+    /* When the context menu is opened  */
+    &[data-state="open"],
+    /*  When the options and notifications menu are opened */
+    &:has(.mx_RoomListItemMenuView > button[data-state="open"]) {
+        background-color: var(--cpd-color-bg-action-secondary-hovered);
+
+        .mx_RoomListItemView_menu {
+            display: flex;
+        }
+
+        &.mx_RoomListItemView_has_menu {
+            /**
+             * The figma uses 16px padding (--cpd-space-4x) but due to https://github.com/element-hq/compound-web/issues/331
+             * the icon size of the menu is 18px instead of 20px with a different internal padding
+             * We need to use 18px to align the icon with the others icons
+             * 18px is not available in compound spacing
+             */
+            .mx_RoomListItemView_content {
+                padding-right: 18px;
             }
 
-            .mx_RoomListItemView_roomName {
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: ellipsis;
-            }
-
-            .mx_RoomListItemView_messagePreview {
-                font: var(--cpd-font-body-sm-regular);
-                color: var(--cpd-color-text-secondary);
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: ellipsis;
+            /*  When the menu is visible, hide the notification decoration to avoid clutter */
+            .mx_RoomListItemView_notificationDecoration {
+                display: none;
             }
         }
     }
-}
 
-.mx_RoomListItemView_hover {
-    background-color: var(--cpd-color-bg-action-secondary-hovered);
-}
+    .mx_RoomListItemView_content {
+        height: 100%;
+        flex: 1;
+        /* The border is only under the room name and the future hover menu  */
+        border-bottom: var(--cpd-border-width-0-5) solid var(--cpd-color-bg-subtle-secondary);
+        box-sizing: border-box;
+        min-width: 0;
+        padding-right: var(--cpd-space-5x);
 
-.mx_RoomListItemView_menu_open .mx_RoomListItemView_container .mx_RoomListItemView_content {
-    /**
-     * The figma uses 16px padding (--cpd-space-4x) but due to https://github.com/element-hq/compound-web/issues/331
-     * the icon size of the menu is 18px instead of 20px with a different internal padding
-     * We need to use 18px to align the icon with the others icons
-     * 18px is not available in compound spacing
-     */
-    padding-right: 18px;
+        .mx_RoomListItemView_text {
+            min-width: 0;
+        }
+
+        .mx_RoomListItemView_roomName {
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+
+        .mx_RoomListItemView_messagePreview {
+            font: var(--cpd-font-body-sm-regular);
+            color: var(--cpd-color-text-secondary);
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+    }
 }
 
 .mx_RoomListItemView_selected {
diff --git a/res/css/views/rooms/RoomListPanel/_RoomListPrimaryFilters.pcss b/res/css/views/rooms/RoomListPanel/_RoomListPrimaryFilters.pcss
index ac85782bbd..378f2e75da 100644
--- a/res/css/views/rooms/RoomListPanel/_RoomListPrimaryFilters.pcss
+++ b/res/css/views/rooms/RoomListPanel/_RoomListPrimaryFilters.pcss
@@ -6,7 +6,29 @@
  */
 
 .mx_RoomListPrimaryFilters {
-    margin: unset;
-    list-style-type: none;
-    padding: var(--cpd-space-2x) var(--cpd-space-3x);
+    padding: var(--cpd-space-2x) var(--cpd-space-4x) var(--cpd-space-2x) var(--cpd-space-3x);
+
+    .mx_RoomListPrimaryFilters_wrapping {
+        display: none;
+    }
+
+    .mx_RoomListPrimaryFilters_list {
+        /**
+         * The InteractionObserver needs the height to be set to work properly.
+         */
+        height: 100%;
+        flex: 1;
+    }
+
+    .mx_RoomListPrimaryFilters_IconButton {
+        svg {
+            transition: transform 0.1s linear;
+        }
+    }
+
+    .mx_RoomListPrimaryFilters_IconButton[aria-expanded="true"] {
+        svg {
+            transform: rotate(180deg);
+        }
+    }
 }
diff --git a/res/css/views/rooms/RoomListPanel/_RoomListSearch.pcss b/res/css/views/rooms/RoomListPanel/_RoomListSearch.pcss
deleted file mode 100644
index f6f98e1efe..0000000000
--- a/res/css/views/rooms/RoomListPanel/_RoomListSearch.pcss
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-.mx_RoomListSearch {
-    /* From figma, this should be aligned with the room header */
-    flex: 0 0 64px;
-    box-sizing: border-box;
-    border-bottom: var(--cpd-border-width-1) solid var(--cpd-color-bg-subtle-primary);
-    padding: 0 var(--cpd-space-3x);
-
-    svg {
-        fill: var(--cpd-color-icon-secondary);
-    }
-
-    .mx_RoomListSearch_search {
-        /* The search button should take all the remaining space */
-        flex: 1;
-        font: var(--cpd-font-body-md-regular);
-        color: var(--cpd-color-text-secondary);
-        min-width: 0;
-
-        span {
-            flex: 1;
-
-            kbd {
-                font-family: inherit;
-            }
-
-            /* Shrink and truncate the search text */
-            white-space: nowrap;
-            overflow: hidden;
-            .mx_RoomListSearch_search_text {
-                min-width: 0;
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                text-align: start;
-            }
-        }
-    }
-
-    .mx_RoomListSearch_button:hover {
-        svg {
-            fill: var(--cpd-color-icon-primary);
-        }
-    }
-}
diff --git a/res/css/views/rooms/_AppsDrawer.pcss b/res/css/views/rooms/_AppsDrawer.pcss
index e8baa1257b..1ee13c4b8d 100644
--- a/res/css/views/rooms/_AppsDrawer.pcss
+++ b/res/css/views/rooms/_AppsDrawer.pcss
@@ -208,7 +208,7 @@ Please see LICENSE files in the repository root for full details.
             margin-right: 12px;
         }
 
-        h3 {
+        h1 {
             font-size: inherit;
             margin: 0;
         }
diff --git a/res/css/views/rooms/_Autocomplete.pcss b/res/css/views/rooms/_Autocomplete.pcss
index fe5d999fa6..7070304bf1 100644
--- a/res/css/views/rooms/_Autocomplete.pcss
+++ b/res/css/views/rooms/_Autocomplete.pcss
@@ -65,7 +65,12 @@
     margin: 12px;
     height: 100%;
     overflow-y: scroll;
-    max-height: 35vh;
+}
+
+@container roomview (height >= 0px) {
+    .mx_Autocomplete_Completion_container_pill {
+        max-height: 40cqh;
+    }
 }
 
 .mx_Autocomplete_Completion_container_truncate {
diff --git a/res/css/views/rooms/_BasicMessageComposer.pcss b/res/css/views/rooms/_BasicMessageComposer.pcss
index 5729c22075..b017b03da3 100644
--- a/res/css/views/rooms/_BasicMessageComposer.pcss
+++ b/res/css/views/rooms/_BasicMessageComposer.pcss
@@ -10,6 +10,7 @@ Please see LICENSE files in the repository root for full details.
     /* These are set in Javascript */
     --avatar-letter: "";
     --avatar-background: unset;
+    --avatar-color: unset;
     --placeholder: "";
 
     position: relative;
@@ -54,6 +55,8 @@ Please see LICENSE files in the repository root for full details.
             span.mx_UserPill,
             span.mx_RoomPill,
             span.mx_SpacePill {
+                display: inline-flex;
+                align-items: center;
                 user-select: all;
                 position: relative;
                 cursor: unset; /* We don't want indicate clickability */
diff --git a/res/css/views/rooms/_DecryptionFailureBar.pcss b/res/css/views/rooms/_DecryptionFailureBar.pcss
deleted file mode 100644
index ca6709b24b..0000000000
--- a/res/css/views/rooms/_DecryptionFailureBar.pcss
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2022 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-.mx_DecryptionFailureBar {
-    --gap-row: $spacing-8;
-    --gap-column: $spacing-12;
-    --gap: var(--gap-row) var(--gap-column);
-    --size-icon: 24px;
-
-    background-color: $system;
-    padding: $spacing-12;
-    margin-inline: $spacing-16;
-    border-radius: 4px;
-
-    &.mx_DecryptionFailureBar--withEnd {
-        display: flex;
-        flex-flow: wrap;
-        align-items: flex-start;
-        justify-content: space-between;
-        row-gap: calc(var(--gap-row) + $spacing-4); /* Increase spacing between the message and the buttons */
-
-        .mx_DecryptionFailureBar_end {
-            display: flex;
-            flex-wrap: wrap; /* Let the buttons wrapped on a narrow column */
-            gap: var(--buttons-dialog-gap-row) var(--buttons-dialog-gap-column);
-            margin-inline-start: calc(var(--size-icon) + var(--gap-column)); /* Align the button(s) and the message */
-        }
-    }
-
-    .mx_DecryptionFailureBar_start {
-        display: grid;
-        gap: var(--gap);
-        grid-template-areas:
-            "status headline"
-            ".      message";
-        grid-template-columns: var(--size-icon) auto;
-
-        .mx_DecryptionFailureBar_start_status {
-            grid-area: status;
-
-            display: flex;
-            align-items: center;
-            gap: var(--gap);
-
-            .mx_Spinner {
-                height: unset; /* Unset height: 100% */
-            }
-
-            .mx_DecryptionFailureBar_start_status_icon {
-                min-width: var(--size-icon);
-                height: var(--size-icon);
-                mask-image: url("$(res)/img/e2e/decryption-failure.svg");
-                background-color: $e2e-warning-color;
-                mask-repeat: no-repeat;
-                mask-position: center;
-                mask-size: contain;
-            }
-        }
-
-        .mx_DecryptionFailureBar_start_headline {
-            grid-area: headline;
-
-            font-weight: var(--cpd-font-weight-semibold);
-            font-size: $font-16px;
-            align-self: center;
-        }
-
-        .mx_DecryptionFailureBar_start_message {
-            grid-area: message;
-
-            color: $secondary-content;
-        }
-    }
-}
diff --git a/res/css/views/rooms/_E2EIcon.pcss b/res/css/views/rooms/_E2EIcon.pcss
index f3aaf8a883..efa8b1faff 100644
--- a/res/css/views/rooms/_E2EIcon.pcss
+++ b/res/css/views/rooms/_E2EIcon.pcss
@@ -9,53 +9,34 @@ Please see LICENSE files in the repository root for full details.
     width: 16px;
     height: 16px;
     margin: 0 9px;
-    position: relative;
     display: block;
-}
 
-.mx_E2EIcon_warning,
-.mx_E2EIcon_normal,
-.mx_E2EIcon_verified {
-    &::before,
-    &::after {
-        content: "";
+    svg {
+        width: inherit;
+        height: inherit;
         display: block;
-        position: absolute;
-        inset: 0;
-        mask-repeat: no-repeat;
-        mask-position: center;
-        mask-size: contain;
     }
 }
 
-/* transparent-looking border surrounding the shield for when overlain over avatars */
-.mx_E2EIcon_bordered {
-    mask-image: url("$(res)/img/e2e/normal.svg");
-    background-color: $header-panel-bg-color;
-    mask-size: 100%;
+.mx_E2EIcon.mx_E2EIcon_inline {
+    display: inline-block;
+}
 
-    /* shrink the actual badge */
-    &::after {
-        mask-size: 75%;
-    }
-    /* shrink the infill of the badge */
-    &::before {
-        mask-size: 60%;
-        background: var(--cpd-color-bg-canvas-default);
+.mx_E2EIcon_warning {
+    color: $e2e-warning-color;
+}
+
+.mx_E2EIcon_normal {
+    color: var(--cpd-color-icon-tertiary);
+}
+
+.mx_E2EIcon_verified,
+.mx_E2EIcon_warning {
+    .mx_E2EIcon_normal::after {
+        background-color: white;
     }
 }
 
-.mx_E2EIcon_warning::after {
-    mask-image: url("$(res)/img/e2e/warning.svg");
-    background-color: $e2e-warning-color;
-}
-
-.mx_E2EIcon_normal::after {
-    mask-image: url("$(res)/img/e2e/normal.svg");
-    background-color: var(--cpd-color-icon-tertiary);
-}
-
-.mx_E2EIcon_verified::after {
-    mask-image: url("$(res)/img/e2e/verified.svg");
-    background-color: $e2e-verified-color;
+.mx_E2EIcon_verified {
+    color: $e2e-verified-color;
 }
diff --git a/res/css/views/rooms/_EmojiButton.pcss b/res/css/views/rooms/_EmojiButton.pcss
index 1628104646..5911bf723f 100644
--- a/res/css/views/rooms/_EmojiButton.pcss
+++ b/res/css/views/rooms/_EmojiButton.pcss
@@ -14,10 +14,6 @@ Please see LICENSE files in the repository root for full details.
     @mixin composerButtonHighLight;
 }
 
-.mx_EmojiButton_icon::before {
-    mask-image: url("$(res)/img/element-icons/room/composer/emoji.svg");
-}
-
 .mx_MessageComposer_wysiwyg {
     .mx_EmojiButton {
         @mixin composerButton 5px, $tertiary-content, $panels;
diff --git a/res/css/views/rooms/_EventBubbleTile.pcss b/res/css/views/rooms/_EventBubbleTile.pcss
index 1607c45924..24cd126728 100644
--- a/res/css/views/rooms/_EventBubbleTile.pcss
+++ b/res/css/views/rooms/_EventBubbleTile.pcss
@@ -50,7 +50,7 @@ Please see LICENSE files in the repository root for full details.
         margin-right: 0;
     }
 
-    .mx_EventTile_avatar {
+    &:not(.mx_EventTile_info) .mx_EventTile_avatar {
         line-height: 0;
         border: 4px solid $background;
         border-radius: 50%;
@@ -153,7 +153,7 @@ Please see LICENSE files in the repository root for full details.
 
     .mx_MediaBody {
         /* leave space for the timestamp */
-        padding-right: 48px;
+        padding-right: 48px !important;
     }
 
     .mx_MImageBody {
@@ -355,11 +355,6 @@ Please see LICENSE files in the repository root for full details.
             /* Keep height equal to text for shield alignment, additional 2px because of 1px padding on text */
             height: calc($font-18px + 2px);
         }
-
-        .mx_MPollEndBody {
-            /* Prevent the poll end body from exceeding the tile width */
-            width: 100%;
-        }
     }
 
     &:not(.mx_EventTile_noBubble) .mx_EventTile_line:not(.mx_EventTile_mediaLine) {
@@ -588,6 +583,7 @@ Please see LICENSE files in the repository root for full details.
         position: static;
         order: -1;
         margin-inline-end: var(--EventTile_bubble_gap-inline); /* Same spacing between E2E icon and a hidden event */
+        display: inline-flex;
     }
 
     .mx_EventTile_e2eIcon {
diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss
index b4172fc003..8b9a8f46e1 100644
--- a/res/css/views/rooms/_EventTile.pcss
+++ b/res/css/views/rooms/_EventTile.pcss
@@ -61,11 +61,11 @@ $left-gutter: 64px;
     }
 
     .mx_EventTile_receiptSent::before {
-        mask-image: url("$(res)/img/element-icons/circle-sent.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/check-circle.svg");
     }
 
     .mx_EventTile_receiptSending::before {
-        mask-image: url("$(res)/img/element-icons/circle-sending.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/circle.svg");
     }
 
     .mx_EventTile_content {
@@ -200,10 +200,6 @@ $left-gutter: 64px;
                Replaces margin-top: -6px. This interacts better with a read
                marker being in between. Content overflows. */
             height: 1px;
-
-            a {
-                text-decoration: none;
-            }
         }
 
         &.mx_EventTile_highlight,
@@ -273,9 +269,9 @@ $left-gutter: 64px;
         align-items: flex-start;
         padding-top: 0;
 
-        > a {
-            text-decoration: none; /* timestamps are links which shouldn't be underlined */
+        .mx_MessageTimestamp {
             min-width: var(--MessageTimestamp-width); /* ensure space for EventTile without timestamp */
+            text-align: right;
         }
 
         > * {
@@ -300,13 +296,11 @@ $left-gutter: 64px;
             display: flex;
             align-items: center;
 
-            /* Need to use important to override the js provided height and width values. */
+            /* Need to use important to override the js calculated values. */
             > .mx_BaseAvatar,
             > .mx_BaseAvatar > * {
-                height: $font-14px !important;
-                width: $font-14px !important;
                 font-size: $font-10px !important;
-                line-height: $font-15px !important;
+                line-height: calc($font-15px - 2px) !important;
             }
         }
 
@@ -403,10 +397,6 @@ $left-gutter: 64px;
             margin: 0;
         }
 
-        .mx_MessageTimestamp {
-            text-align: right;
-        }
-
         .mx_EditMessageComposer_buttons {
             position: relative;
         }
@@ -843,7 +833,6 @@ $left-gutter: 64px;
     background-repeat: no-repeat;
     background-size: contain;
 
-    &::before,
     &::after {
         content: "";
         display: block;
@@ -854,22 +843,18 @@ $left-gutter: 64px;
         mask-size: contain;
     }
 
-    &::before {
-        mask-size: 80%;
-    }
-
     &.mx_EventTile_e2eIcon_warning::after {
-        mask-image: url("$(res)/img/e2e/warning.svg"); /* (!) in a shield */
+        mask-image: url("@vector-im/compound-design-tokens/icons/error-solid.svg");
         background-color: $e2e-warning-color; /* red */
     }
 
     &.mx_EventTile_e2eIcon_normal::after {
-        mask-image: url("$(res)/img/e2e/normal.svg"); /* regular shield */
+        mask-image: url("@vector-im/compound-design-tokens/icons/info.svg");
         background-color: var(--cpd-color-icon-tertiary); /* grey */
     }
 
     &.mx_EventTile_e2eIcon_decryption_failure::after {
-        mask-image: url("$(res)/img/e2e/decryption-failure.svg"); /* key in a circle */
+        mask-image: url("@vector-im/compound-design-tokens/icons/error-solid.svg");
         background-color: var(--cpd-color-icon-tertiary);
     }
 }
@@ -928,30 +913,21 @@ $left-gutter: 64px;
             position: absolute;
             top: $spacing-8;
             right: $spacing-8;
-            width: 19px;
-            height: 19px;
+            width: 16px;
+            height: 16px;
             visibility: hidden;
-            background-color: $message-action-bar-fg-color;
 
             &.mx_EventTile_buttonBottom {
                 top: 33px;
             }
 
-            &.mx_EventTile_collapseButton,
-            &.mx_EventTile_expandButton {
-                mask-size: 75%;
+            svg {
+                width: inherit;
+                height: inherit;
+                display: block;
+                color: $message-action-bar-fg-color;
             }
         }
-
-        .mx_EventTile_copyButton {
-            height: 17px;
-            mask-image: url($copy-button-url);
-            mask-position: center center;
-            mask-repeat: no-repeat;
-            mask-size: contain;
-            right: 9px;
-            width: 17px;
-        }
     }
 }
 
@@ -972,20 +948,6 @@ $left-gutter: 64px;
     cursor: pointer;
 }
 
-.mx_EventTile_collapseButton,
-.mx_EventTile_expandButton {
-    mask-position: center;
-    mask-repeat: no-repeat;
-}
-
-.mx_EventTile_collapseButton {
-    mask-image: url("@vector-im/compound-design-tokens/icons/collapse.svg");
-}
-
-.mx_EventTile_expandButton {
-    mask-image: url("@vector-im/compound-design-tokens/icons/expand.svg");
-}
-
 .mx_EventTile_tileError {
     color: red;
     text-align: center;
@@ -1174,11 +1136,11 @@ $left-gutter: 64px;
         &.mx_EventTile_info {
             .mx_EventTile_avatar {
                 position: absolute;
-                top: 1.5px; /* Align with hidden event content */
-                margin-top: 0;
+                /* Align with hidden event content */
+                top: 50%;
+                transform: translateY(-50%);
+                margin-top: -2px;
                 margin-bottom: 0;
-                width: 14px; /* avatar img size */
-                height: 14px; /* avatar img size */
             }
 
             &.mx_EventTile_selected .mx_EventTile_line,
diff --git a/res/css/views/rooms/_HistoryTile.pcss b/res/css/views/rooms/_HistoryTile.pcss
index 09a75c3e4a..53b1ca2765 100644
--- a/res/css/views/rooms/_HistoryTile.pcss
+++ b/res/css/views/rooms/_HistoryTile.pcss
@@ -11,6 +11,6 @@ Please see LICENSE files in the repository root for full details.
 
     &::before {
         background-color: $header-panel-text-primary-color;
-        mask-image: url("$(res)/img/element-icons/hide.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/visibility-off.svg");
     }
 }
diff --git a/res/css/views/rooms/_JumpToBottomButton.pcss b/res/css/views/rooms/_JumpToBottomButton.pcss
index 912dda0f67..fbcfcf4b9f 100644
--- a/res/css/views/rooms/_JumpToBottomButton.pcss
+++ b/res/css/views/rooms/_JumpToBottomButton.pcss
@@ -42,21 +42,17 @@ Please see LICENSE files in the repository root for full details.
     position: relative;
     display: block;
     height: 38px;
-    border-radius: 19px;
+    border-radius: 50%;
     box-sizing: border-box;
     background: $background;
     border: 1.3px solid var(--cpd-color-icon-tertiary);
     cursor: pointer;
-}
 
-.mx_JumpToBottomButton_scrollDown::before {
-    content: "";
-    position: absolute;
-    inset: 0;
-    mask-image: url("@vector-im/compound-design-tokens/icons/chevron-up.svg");
-    mask-repeat: no-repeat;
-    mask-size: 24px;
-    mask-position: center 6px;
-    transform: rotate(180deg);
-    background: var(--cpd-color-icon-tertiary);
+    svg {
+        height: inherit;
+        width: inherit;
+        box-sizing: border-box;
+        padding: 7px 8px 7px 6px;
+        color: var(--cpd-color-icon-tertiary);
+    }
 }
diff --git a/res/css/views/rooms/_LegacyRoomList.pcss b/res/css/views/rooms/_LegacyRoomList.pcss
index acf162b7a2..d890b561ec 100644
--- a/res/css/views/rooms/_LegacyRoomList.pcss
+++ b/res/css/views/rooms/_LegacyRoomList.pcss
@@ -9,28 +9,3 @@ Please see LICENSE files in the repository root for full details.
 .mx_LegacyRoomList {
     padding-right: 7px; /* width of the scrollbar, to line things up */
 }
-
-.mx_LegacyRoomList_iconPlus::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/plus-circle.svg");
-}
-.mx_LegacyRoomList_iconNewRoom::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/hash-plus.svg");
-}
-.mx_LegacyRoomList_iconNewVideoRoom::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/hash-video.svg");
-}
-.mx_LegacyRoomList_iconAddExistingRoom::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/hash.svg");
-}
-.mx_LegacyRoomList_iconExplore::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/hash-search.svg");
-}
-.mx_LegacyRoomList_iconDialpad::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/dialpad.svg");
-}
-.mx_LegacyRoomList_iconStartChat::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/user-add-solid.svg");
-}
-.mx_LegacyRoomList_iconInvite::before {
-    mask-image: url("$(res)/img/element-icons/room/share.svg");
-}
diff --git a/res/css/views/rooms/_LegacyRoomListHeader.pcss b/res/css/views/rooms/_LegacyRoomListHeader.pcss
index c04b56d94a..fd6d7b3b29 100644
--- a/res/css/views/rooms/_LegacyRoomListHeader.pcss
+++ b/res/css/views/rooms/_LegacyRoomListHeader.pcss
@@ -87,22 +87,3 @@ Please see LICENSE files in the repository root for full details.
         }
     }
 }
-
-.mx_LegacyRoomListHeader_iconInvite::before {
-    mask-image: url("$(res)/img/element-icons/room/invite.svg");
-}
-.mx_LegacyRoomListHeader_iconStartChat::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/user-add-solid.svg");
-}
-.mx_LegacyRoomListHeader_iconNewRoom::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/hash-plus.svg");
-}
-.mx_LegacyRoomListHeader_iconNewVideoRoom::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/hash-video.svg");
-}
-.mx_LegacyRoomListHeader_iconExplore::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/hash-search.svg");
-}
-.mx_LegacyRoomListHeader_iconPlus::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/plus.svg");
-}
diff --git a/res/css/views/rooms/_LiveContentSummary.pcss b/res/css/views/rooms/_LiveContentSummary.pcss
index 0736f0dd45..04704c6a1a 100644
--- a/res/css/views/rooms/_LiveContentSummary.pcss
+++ b/res/css/views/rooms/_LiveContentSummary.pcss
@@ -22,7 +22,11 @@ Please see LICENSE files in the repository root for full details.
         }
 
         &.mx_LiveContentSummary_text_video::before {
-            mask-image: url("$(res)/img/element-icons/call/video-call.svg");
+            mask-image: url("@vector-im/compound-design-tokens/icons/video-call-solid.svg");
+        }
+
+        &.mx_LiveContentSummary_text_voice::before {
+            mask-image: url("@vector-im/compound-design-tokens/icons/voice-call-solid.svg");
         }
 
         &.mx_LiveContentSummary_text_active {
@@ -39,7 +43,7 @@ Please see LICENSE files in the repository root for full details.
         vertical-align: text-bottom;
         content: "";
         background-color: $secondary-content;
-        mask-image: url("$(res)/img/element-icons/group-members.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/group.svg");
         mask-size: 16px;
         width: 16px;
         height: 16px;
diff --git a/res/css/views/rooms/_MessageComposer.pcss b/res/css/views/rooms/_MessageComposer.pcss
index 63ab25e84d..0c4e983b94 100644
--- a/res/css/views/rooms/_MessageComposer.pcss
+++ b/res/css/views/rooms/_MessageComposer.pcss
@@ -37,11 +37,6 @@ Please see LICENSE files in the repository root for full details.
     font-weight: bold;
 }
 
-.mx_MessageComposer_autocomplete_wrapper {
-    position: relative;
-    height: 0;
-}
-
 .mx_MessageComposer_row {
     display: flex;
     flex-direction: row;
@@ -66,9 +61,6 @@ Please see LICENSE files in the repository root for full details.
     }
 }
 
-.mx_MessageComposer_composecontrols {
-    width: 100%;
-}
 .mx_MessageComposer_e2eIconWrapper {
     height: 16px; /* Match the height of the E2E icon for alignment */
     padding-left: 24px; /* Space for the E2E icon */
@@ -76,10 +68,15 @@ Please see LICENSE files in the repository root for full details.
 .mx_MessageComposer_e2eIcon.mx_E2EIcon {
     position: absolute;
     left: 20px;
+    top: 22px;
     margin-right: 0; /* Counteract the E2EIcon class */
-    margin-left: 16px; /* Counteract the E2EIcon class */
-    width: 16px;
-    height: 16px;
+    margin-left: 3px; /* Counteract the E2EIcon class */
+
+    .mx_MessageComposer_e2eIcon {
+        margin: 0;
+        width: inherit;
+        height: inherit;
+    }
 }
 
 .mx_MessageComposer_noperm_error {
@@ -92,13 +89,6 @@ Please see LICENSE files in the repository root for full details.
     justify-content: center;
 }
 
-.mx_MessageComposer_input_wrapper {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    cursor: text;
-}
-
 .mx_MessageComposer_input {
     flex: 1;
     vertical-align: middle;
@@ -191,6 +181,9 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_MessageComposer_button {
     @mixin composerButton 50%, var(--cpd-color-icon-primary), var(--cpd-color-bg-subtle-primary);
+    padding: 3px;
+    height: 20px;
+    width: 20px;
 
     &:last-child {
         margin-right: auto;
@@ -207,8 +200,9 @@ Please see LICENSE files in the repository root for full details.
         }
     }
 
-    &.mx_MessageComposer_hangup:not(.mx_AccessibleButton_disabled)::before {
-        background-color: $alert;
+    svg {
+        width: inherit;
+        height: inherit;
     }
 }
 .mx_MessageComposer_wysiwyg {
@@ -245,68 +239,34 @@ Please see LICENSE files in the repository root for full details.
                 z-index: 2;
             }
         }
-
-        &.mx_MessageComposer_hangup:not(.mx_AccessibleButton_disabled)::before {
-            background-color: $alert;
-        }
     }
 }
 
-.mx_MessageComposer_upload::before {
-    mask-image: url("$(res)/img/element-icons/room/composer/attach.svg");
-}
+.mx_MessageComposer_buttonMenu {
+    width: 24px;
+    height: 24px;
+    padding: 1px;
 
-.mx_MessageComposer_poll::before {
-    mask-image: url("$(res)/img/element-icons/room/composer/poll.svg");
-}
-
-.mx_MessageComposer_voiceMessage::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/mic-on-solid.svg");
-}
-
-.mx_MessageComposer_plain_text::before {
-    mask-image: url("$(res)/img/element-icons/room/composer/plain_text.svg");
-}
-
-.mx_MessageComposer_rich_text::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/text-formatting.svg");
-}
-
-.mx_MessageComposer_location::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/location-pin-solid.svg");
-}
-
-.mx_MessageComposer_stickers::before {
-    mask-image: url("$(res)/img/element-icons/room/composer/sticker.svg");
-}
-
-.mx_MessageComposer_buttonMenu::before {
-    mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg");
-    mask-size: 24px;
+    svg {
+        width: 24px;
+        height: 24px;
+    }
 }
 
 .mx_MessageComposer_sendMessage {
     cursor: pointer;
     position: relative;
-    width: 32px;
-    height: 32px;
+    padding: var(--cpd-space-2x);
     border-radius: 100%;
     background-color: var(--cpd-color-icon-accent-tertiary);
+    height: 16px;
+    width: 16px;
 
-    &::before {
-        position: absolute;
-        height: 16px;
-        width: 16px;
-        top: 8px;
-        left: 9px;
+    svg {
+        height: inherit;
+        width: inherit;
 
-        mask-image: url("@vector-im/compound-design-tokens/icons/send-solid.svg");
-        mask-repeat: no-repeat;
-        mask-size: contain;
-        mask-position: center;
-
-        background-color: var(--cpd-color-icon-on-solid-primary);
-        content: "";
+        color: var(--cpd-color-icon-on-solid-primary);
     }
 }
 
@@ -331,6 +291,10 @@ Please see LICENSE files in the repository root for full details.
         padding: 0 0 0 25px;
     }
 
+    .mx_MessageComposer_e2eIconWrapper {
+        left: 0;
+    }
+
     &:not(.mx_MessageComposer_e2eStatus) {
         .mx_MessageComposer_wrapper {
             padding: 0;
diff --git a/res/css/views/rooms/_MessageComposerFormatBar.pcss b/res/css/views/rooms/_MessageComposerFormatBar.pcss
index 233fda1aff..41a5adad5e 100644
--- a/res/css/views/rooms/_MessageComposerFormatBar.pcss
+++ b/res/css/views/rooms/_MessageComposerFormatBar.pcss
@@ -38,54 +38,26 @@ Please see LICENSE files in the repository root for full details.
         vertical-align: middle;
         background: none;
         border: none;
+        padding: 0;
+
+        svg {
+            width: inherit;
+            height: inherit;
+            box-sizing: border-box;
+            padding: var(--cpd-space-1x);
+            color: var(--cpd-color-icon-secondary);
+        }
 
         &:hover {
             background: var(--cpd-color-bg-subtle-secondary);
             border-radius: 6px;
             z-index: 1;
+
+            svg {
+                color: var(--cpd-color-icon-primary);
+            }
         }
     }
-
-    .mx_MessageComposerFormatBar_button::after {
-        content: "";
-        position: absolute;
-        top: 0;
-        left: 0;
-        height: 100%;
-        width: 100%;
-        mask-repeat: no-repeat;
-        mask-position: center;
-        mask-size: 20px;
-        background-color: var(--cpd-color-icon-secondary);
-    }
-
-    .mx_MessageComposerFormatBar_button:hover::after {
-        background-color: var(--cpd-color-icon-primary);
-    }
-
-    .mx_MessageComposerFormatBar_buttonIconBold::after {
-        mask-image: url("@vector-im/compound-design-tokens/icons/bold.svg");
-    }
-
-    .mx_MessageComposerFormatBar_buttonIconItalic::after {
-        mask-image: url("@vector-im/compound-design-tokens/icons/italic.svg");
-    }
-
-    .mx_MessageComposerFormatBar_buttonIconStrikethrough::after {
-        mask-image: url("@vector-im/compound-design-tokens/icons/strikethrough.svg");
-    }
-
-    .mx_MessageComposerFormatBar_buttonIconQuote::after {
-        mask-image: url("@vector-im/compound-design-tokens/icons/quote.svg");
-    }
-
-    .mx_MessageComposerFormatBar_buttonIconCode::after {
-        mask-image: url("@vector-im/compound-design-tokens/icons/inline-code.svg");
-    }
-
-    .mx_MessageComposerFormatBar_buttonIconInsertLink::after {
-        mask-image: url("@vector-im/compound-design-tokens/icons/link.svg");
-    }
 }
 
 .mx_MessageComposerFormatBar_buttonTooltip {
diff --git a/res/css/views/rooms/_NewRoomIntro.pcss b/res/css/views/rooms/_NewRoomIntro.pcss
index 4f704facd9..9f18e790fd 100644
--- a/res/css/views/rooms/_NewRoomIntro.pcss
+++ b/res/css/views/rooms/_NewRoomIntro.pcss
@@ -40,7 +40,7 @@ Please see LICENSE files in the repository root for full details.
         }
 
         .mx_NewRoomIntro_inviteButton::before {
-            mask-image: url("$(res)/img/element-icons/room/invite.svg");
+            mask-image: url("@vector-im/compound-design-tokens/icons/user-add.svg");
         }
     }
 
diff --git a/res/css/views/rooms/_NotificationBadge.pcss b/res/css/views/rooms/_NotificationBadge.pcss
index 2066b81f0a..5f76d82bfa 100644
--- a/res/css/views/rooms/_NotificationBadge.pcss
+++ b/res/css/views/rooms/_NotificationBadge.pcss
@@ -56,8 +56,8 @@ Please see LICENSE files in the repository root for full details.
         }
 
         &.mx_NotificationBadge_knocked {
-            mask-image: url("$(res)/img/element-icons/ask-to-join.svg");
-            width: 12px;
+            mask-image: url("@vector-im/compound-design-tokens/icons/ask-to-join.svg");
+            width: 16px;
             height: 16px;
         }
 
diff --git a/res/css/views/rooms/_OverflowTile.pcss b/res/css/views/rooms/_OverflowTile.pcss
index a0ac5bb4f6..cf70c2909e 100644
--- a/res/css/views/rooms/_OverflowTile.pcss
+++ b/res/css/views/rooms/_OverflowTile.pcss
@@ -26,19 +26,20 @@ Please see LICENSE files in the repository root for full details.
 .mx_OverflowTileView:hover {
     padding-right: 30px;
     position: relative; /* to keep the chevron aligned */
+
+    .mx_OverflowTileView_chevron {
+        display: inline;
+    }
 }
 
-.mx_OverflowTileView:hover::before {
-    content: "";
+.mx_OverflowTileView_chevron {
     position: absolute;
-    top: calc(50% - 8px); /* center */
-    right: -8px;
-    mask: url("@vector-im/compound-design-tokens/icons/chevron-right.svg");
-    mask-repeat: no-repeat;
-    mask-position: center;
-    width: 16px;
-    height: 16px;
-    background-color: $header-panel-text-primary-color;
+    top: calc(50% - 12px); /* center */
+    right: 0;
+    width: 24px;
+    height: 24px;
+    color: $header-panel-text-primary-color;
+    display: none;
 }
 
 .mx_OverflowTileView_icon {
diff --git a/res/css/views/rooms/_ReadReceiptGroup.pcss b/res/css/views/rooms/_ReadReceiptGroup.pcss
index 1b6c1b4b44..b9e48444a5 100644
--- a/res/css/views/rooms/_ReadReceiptGroup.pcss
+++ b/res/css/views/rooms/_ReadReceiptGroup.pcss
@@ -41,11 +41,12 @@ Please see LICENSE files in the repository root for full details.
         height: 100%;
 
         .mx_BaseAvatar {
+            /* Compound uses a border on default avatars but no border on actual images, we want a border in all cases */
             box-sizing: content-box;
+            border: 1px solid $background !important;
+            /* Reset the line height as we are no longer box-sizing border-box. 14px because avatar is set at 14px in component */
+            line-height: 14px;
             position: absolute;
-            border: 1px solid $background;
-            width: 14px;
-            height: 14px;
             will-change: left, top;
             transition:
                 left var(--transition-short) ease-out,
diff --git a/res/css/views/rooms/_ReplyPreview.pcss b/res/css/views/rooms/_ReplyPreview.pcss
index 9e48e6656b..b80de710f6 100644
--- a/res/css/views/rooms/_ReplyPreview.pcss
+++ b/res/css/views/rooms/_ReplyPreview.pcss
@@ -29,16 +29,11 @@ Please see LICENSE files in the repository root for full details.
             font-weight: 400;
             opacity: 0.4;
 
-            .mx_ReplyPreview_header_cancel {
-                background-color: $primary-content;
-                mask-image: url("@vector-im/compound-design-tokens/icons/close.svg");
-                mask-repeat: no-repeat;
-                mask-position: center;
-                mask-size: contain;
+            .mx_ReplyPreview_header_cancel svg {
+                color: $primary-content;
                 width: 20px;
                 height: 20px;
-                min-width: 20px;
-                min-height: 20px;
+                flex-shrink: 0;
             }
         }
     }
diff --git a/res/css/views/rooms/_ReplyTile.pcss b/res/css/views/rooms/_ReplyTile.pcss
index 803e38c67f..05665887d3 100644
--- a/res/css/views/rooms/_ReplyTile.pcss
+++ b/res/css/views/rooms/_ReplyTile.pcss
@@ -16,7 +16,7 @@ Please see LICENSE files in the repository root for full details.
     }
 
     &.mx_ReplyTile_video .mx_MFileBody_info_icon::before {
-        mask-image: url("$(res)/img/element-icons/call/video-call.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/video-call-solid.svg");
     }
 
     > a {
@@ -134,7 +134,8 @@ Please see LICENSE files in the repository root for full details.
         }
 
         .mx_BaseAvatar {
-            line-height: 14px; /* To match size */
+            /* Prevent crushing by the flexbox */
+            flex-shrink: 0;
         }
     }
 }
diff --git a/res/css/views/rooms/_RoomCallBanner.pcss b/res/css/views/rooms/_RoomCallBanner.pcss
index 0be3abe26f..f4fd14c2fa 100644
--- a/res/css/views/rooms/_RoomCallBanner.pcss
+++ b/res/css/views/rooms/_RoomCallBanner.pcss
@@ -41,6 +41,6 @@ Please see LICENSE files in the repository root for full details.
         width: 16px;
         height: 1.2em; /* to match line height */
         margin-right: 8px;
-        mask-image: url("$(res)/img/element-icons/call/video-call.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/video-call-solid.svg");
     }
 }
diff --git a/res/css/views/rooms/_RoomHeader.pcss b/res/css/views/rooms/_RoomHeader.pcss
index afde8f3464..0e2b40e0bd 100644
--- a/res/css/views/rooms/_RoomHeader.pcss
+++ b/res/css/views/rooms/_RoomHeader.pcss
@@ -103,5 +103,5 @@ Please see LICENSE files in the repository root for full details.
 }
 
 .mx_RoomHeader .mx_RoomHeader_toggled {
-    color: var(--cpd-color-icon-accent-primary);
+    fill: var(--cpd-color-icon-accent-primary);
 }
diff --git a/res/css/views/rooms/_RoomInfoLine.pcss b/res/css/views/rooms/_RoomInfoLine.pcss
index 16127b1c6d..a9650f27b5 100644
--- a/res/css/views/rooms/_RoomInfoLine.pcss
+++ b/res/css/views/rooms/_RoomInfoLine.pcss
@@ -10,33 +10,10 @@ Please see LICENSE files in the repository root for full details.
     color: $secondary-content;
     display: inline-block;
 
-    &::before {
-        content: "";
-        display: inline-block;
-        height: 1.2em;
-        mask-position: center;
-        mask-repeat: no-repeat;
-        background-color: $tertiary-content;
-        vertical-align: text-bottom;
+    svg {
         margin-right: 6px;
-    }
-
-    &.mx_RoomInfoLine_public::before {
-        width: 12px;
-        mask-size: 12px;
-        mask-image: url("@vector-im/compound-design-tokens/icons/public.svg");
-    }
-
-    &.mx_RoomInfoLine_private::before {
-        width: 10px;
-        mask-size: 10px;
-        mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg");
-    }
-
-    &.mx_RoomInfoLine_video::before {
-        width: 16px;
-        mask-size: 16px;
-        mask-image: url("$(res)/img/element-icons/call/video-call.svg");
+        vertical-align: -2px;
+        color: $tertiary-content;
     }
 
     .mx_RoomInfoLine_members {
diff --git a/res/css/views/rooms/_RoomPreviewCard.pcss b/res/css/views/rooms/_RoomPreviewCard.pcss
index bad3a9ad05..7ad0f20e79 100644
--- a/res/css/views/rooms/_RoomPreviewCard.pcss
+++ b/res/css/views/rooms/_RoomPreviewCard.pcss
@@ -22,20 +22,13 @@ Please see LICENSE files in the repository root for full details.
         line-height: $font-24px;
         color: $primary-content;
         margin-top: $spacing-24;
-        position: relative;
-        padding-left: calc(20px + $spacing-8);
 
-        &::before {
-            content: "";
-            position: absolute;
-            height: $font-24px;
-            width: 20px;
-            left: 0;
-            mask-repeat: no-repeat;
-            mask-position: center;
-            mask-size: contain;
-            mask-image: url("@vector-im/compound-design-tokens/icons/info-solid.svg");
-            background-color: $secondary-content;
+        svg {
+            height: 1em;
+            width: 1em;
+            margin-right: $spacing-8;
+            color: $secondary-content;
+            vertical-align: -2px;
         }
     }
 
@@ -63,25 +56,19 @@ Please see LICENSE files in the repository root for full details.
         align-items: center;
 
         .mx_RoomPreviewCard_video {
-            width: 50px;
-            height: 50px;
+            width: 22px;
+            height: 22px;
+            padding: 14px;
             border-radius: calc((50px + 2 * 3px) / 2);
             background-color: $accent;
             border: 3px solid $system;
 
-            position: relative;
             left: calc(-50px / 4 - 3px);
 
-            &::before {
-                content: "";
-                background-color: $button-primary-fg-color;
-                position: absolute;
-                width: 50px;
-                height: 50px;
-                mask-size: 22px;
-                mask-position: center;
-                mask-repeat: no-repeat;
-                mask-image: url("$(res)/img/element-icons/call/video-call.svg");
+            svg {
+                width: inherit;
+                height: inherit;
+                color: $button-primary-fg-color;
             }
         }
 
diff --git a/res/css/views/rooms/_RoomTile.pcss b/res/css/views/rooms/_RoomTile.pcss
index 798f3bfa46..babb70aec2 100644
--- a/res/css/views/rooms/_RoomTile.pcss
+++ b/res/css/views/rooms/_RoomTile.pcss
@@ -105,25 +105,20 @@ Please see LICENSE files in the repository root for full details.
     /* The context menu buttons are hidden by default */
     .mx_RoomTile_menuButton,
     .mx_RoomTile_notificationsButton {
-        width: 20px;
-        min-width: 20px; /* yay flex */
-        height: 20px;
+        width: 16px;
+        height: 16px;
+        padding: var(--cpd-space-0-5x);
+        flex-shrink: 0;
         margin-top: auto;
         margin-bottom: auto;
         position: relative;
         display: none;
 
-        &::before {
-            top: 2px;
-            left: 2px;
-            content: "";
-            width: 16px;
-            height: 16px;
-            position: absolute;
-            mask-position: center;
-            mask-size: contain;
-            mask-repeat: no-repeat;
-            background: var(--cpd-color-icon-primary);
+        svg {
+            width: inherit;
+            height: inherit;
+            display: block;
+            color: var(--cpd-color-icon-primary);
         }
     }
 
@@ -132,10 +127,6 @@ Please see LICENSE files in the repository root for full details.
         display: block;
     }
 
-    .mx_RoomTile_menuButton::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg");
-    }
-
     &:not(.mx_RoomTile_minimized, .mx_RoomTile_sticky) {
         &:hover,
         &:focus-within,
@@ -165,79 +156,3 @@ Please see LICENSE files in the repository root for full details.
         }
     }
 }
-
-/* We use these both in context menus and the room tiles */
-.mx_RoomTile_iconBell::before {
-    mask-image: url("$(res)/img/element-icons/notifications.svg");
-}
-.mx_RoomTile_iconBellDot::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/notifications-default.svg");
-}
-.mx_RoomTile_iconBellCrossed::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/notifications-off.svg");
-}
-.mx_RoomTile_iconBellMentions::before {
-    mask-image: url("$(res)/img/element-icons/roomlist/notifications-dm.svg");
-}
-
-.mx_RoomTile_contextMenu {
-    .mx_RoomTile_iconStar::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/favourite-solid.svg");
-    }
-
-    .mx_RoomTile_iconArrowDown::before {
-        mask-image: url("$(res)/img/element-icons/roomlist/low-priority.svg");
-    }
-
-    .mx_RoomTile_iconNotificationsDefault::before {
-        mask-image: url("$(res)/img/element-icons/notifications.svg");
-    }
-
-    .mx_RoomTile_iconNotificationsAllMessages::before {
-        mask-image: url("$(res)/img/element-icons/roomlist/notifications-default.svg");
-    }
-
-    .mx_RoomTile_iconNotificationsMentionsKeywords::before {
-        mask-image: url("$(res)/img/element-icons/roomlist/notifications-dm.svg");
-    }
-
-    .mx_RoomTile_iconNotificationsNone::before {
-        mask-image: url("$(res)/img/element-icons/roomlist/notifications-off.svg");
-    }
-
-    .mx_RoomTile_iconPeople::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg");
-    }
-
-    .mx_RoomTile_iconFiles::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/files.svg");
-    }
-
-    .mx_RoomTile_iconPins::before {
-        mask-image: url("$(res)/img/element-icons/room/pin-upright.svg");
-    }
-
-    .mx_RoomTile_iconWidgets::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/extensions-solid.svg");
-    }
-
-    .mx_RoomTile_iconSettings::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg");
-    }
-
-    .mx_RoomTile_iconExport::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/export-archive.svg");
-    }
-
-    .mx_RoomTile_iconCopyLink::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/link.svg");
-    }
-
-    .mx_RoomTile_iconInvite::before {
-        mask-image: url("$(res)/img/element-icons/room/invite.svg");
-    }
-
-    .mx_RoomTile_iconSignOut::before {
-        mask-image: url("@vector-im/compound-design-tokens/icons/leave.svg");
-    }
-}
diff --git a/res/css/views/rooms/_ThreadSummary.pcss b/res/css/views/rooms/_ThreadSummary.pcss
index 0e30cd3fed..0d88d4f8c6 100644
--- a/res/css/views/rooms/_ThreadSummary.pcss
+++ b/res/css/views/rooms/_ThreadSummary.pcss
@@ -49,19 +49,14 @@ Please see LICENSE files in the repository root for full details.
         transform: translateX(60px);
         transition: all 0.1s ease-in-out;
 
-        &::before {
-            content: "";
+        svg {
             position: absolute;
             top: 50%;
             right: var(--cpd-space-1x);
             transform: translateY(-50%);
             width: 24px;
             height: 24px;
-            mask-image: url("@vector-im/compound-design-tokens/icons/chevron-right.svg");
-            mask-position: center;
-            mask-size: contain;
-            mask-repeat: no-repeat;
-            background-color: $secondary-content;
+            color: $secondary-content;
         }
     }
 
diff --git a/res/css/views/rooms/_TopUnreadMessagesBar.pcss b/res/css/views/rooms/_TopUnreadMessagesBar.pcss
index d80bc12916..84dc98c55e 100644
--- a/res/css/views/rooms/_TopUnreadMessagesBar.pcss
+++ b/res/css/views/rooms/_TopUnreadMessagesBar.pcss
@@ -29,23 +29,19 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_TopUnreadMessagesBar_scrollUp {
     height: 38px;
+    width: 38px;
     border-radius: 19px;
     box-sizing: border-box;
     background: $background;
     border: 1.3px solid var(--cpd-color-icon-tertiary);
     cursor: pointer;
-}
 
-.mx_TopUnreadMessagesBar_scrollUp::before {
-    content: "";
-    position: absolute;
-    width: 36px;
-    height: 36px;
-    mask-image: url("@vector-im/compound-design-tokens/icons/chevron-up.svg");
-    mask-repeat: no-repeat;
-    mask-size: 24px;
-    mask-position: center;
-    background: var(--cpd-color-icon-tertiary);
+    svg {
+        width: 24px;
+        height: 24px;
+        padding: 6px;
+        color: var(--cpd-color-icon-tertiary);
+    }
 }
 
 .mx_TopUnreadMessagesBar_markAsRead {
@@ -56,16 +52,11 @@ Please see LICENSE files in the repository root for full details.
     border: 1.3px solid var(--cpd-color-icon-tertiary);
     border-radius: 10px;
     margin: 5px auto;
-}
 
-.mx_TopUnreadMessagesBar_markAsRead::before {
-    content: "";
-    position: absolute;
-    width: 18px;
-    height: 18px;
-    mask-image: url("@vector-im/compound-design-tokens/icons/close.svg");
-    mask-repeat: no-repeat;
-    mask-size: 16px;
-    mask-position: center;
-    background: var(--cpd-color-icon-tertiary);
+    svg {
+        width: 16px;
+        height: 16px;
+        padding: 1px;
+        color: var(--cpd-color-icon-tertiary);
+    }
 }
diff --git a/res/css/views/rooms/_VoiceRecordComposerTile.pcss b/res/css/views/rooms/_VoiceRecordComposerTile.pcss
index 8dabc06fe5..1715a8efe5 100644
--- a/res/css/views/rooms/_VoiceRecordComposerTile.pcss
+++ b/res/css/views/rooms/_VoiceRecordComposerTile.pcss
@@ -32,10 +32,12 @@ Please see LICENSE files in the repository root for full details.
     height: 24px;
     vertical-align: middle;
     margin-right: 2px; /* distance from left edge of waveform container (container has some margin too) */
-    background-color: $voice-record-icon-color;
-    mask-repeat: no-repeat;
-    mask-size: contain;
-    mask-image: url("@vector-im/compound-design-tokens/icons/delete.svg");
+
+    svg {
+        width: inherit;
+        height: inherit;
+        color: $voice-record-icon-color;
+    }
 }
 
 .mx_VoiceRecordComposerTile_uploadingState {
@@ -115,3 +117,9 @@ Please see LICENSE files in the repository root for full details.
         opacity: 1;
     }
 }
+
+@media (forced-colors: active) {
+    .mx_VoiceMessagePrimaryContainer {
+        outline: 1px solid transparent;
+    }
+}
diff --git a/res/css/views/settings/_LayoutSwitcher.pcss b/res/css/views/settings/_LayoutSwitcher.pcss
index 8d50fa25d3..24991f9583 100644
--- a/res/css/views/settings/_LayoutSwitcher.pcss
+++ b/res/css/views/settings/_LayoutSwitcher.pcss
@@ -72,6 +72,10 @@ Please see LICENSE files in the repository root for full details.
                     flex-shrink: 1;
                 }
 
+                &[data-layout="irc"] .mx_MessageTimestamp {
+                    display: none; /* hide the container used for spacing consistency */
+                }
+
                 .mx_EventTile_line {
                     max-width: 100%;
                 }
diff --git a/res/css/views/settings/_NotificationSettings2.pcss b/res/css/views/settings/_NotificationSettings2.pcss
index d579c22b95..db439f0706 100644
--- a/res/css/views/settings/_NotificationSettings2.pcss
+++ b/res/css/views/settings/_NotificationSettings2.pcss
@@ -6,20 +6,24 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-.mx_NotificationSettings2 {
+.mx_SettingsTab .mx_NotificationSettings2 {
     .mx_SettingsSection_subSections {
         color: $primary-content;
         gap: 32px;
         display: flex;
         flex-direction: column;
+
+        > form {
+            gap: 32px;
+            display: flex;
+            flex-direction: column;
+        }
     }
 
     .mx_SettingsSubsection_description {
         margin-bottom: 20px;
 
         .mx_SettingsSubsection_text {
-            font-size: 1.2rem;
-
             .mx_NotificationBadge {
                 vertical-align: baseline;
                 display: inline-flex;
@@ -30,19 +34,11 @@ Please see LICENSE files in the repository root for full details.
 
     .mx_SettingsSubsection_content {
         margin-top: 12px;
-        grid-gap: 12px;
+        gap: 12px;
         justify-items: stretch;
         justify-content: stretch;
     }
 
-    .mx_SettingsBanner {
-        margin-bottom: 32px;
-    }
-
-    .mx_NotificationSettings2_flags {
-        grid-gap: 4px;
-    }
-
     .mx_StyledRadioButton_content {
         margin-left: 10px;
         margin-right: 10px;
diff --git a/res/css/views/settings/_Notifications.pcss b/res/css/views/settings/_Notifications.pcss
index e4e450fd58..a97d7529d5 100644
--- a/res/css/views/settings/_Notifications.pcss
+++ b/res/css/views/settings/_Notifications.pcss
@@ -11,7 +11,7 @@ Please see LICENSE files in the repository root for full details.
     display: grid;
     grid-template-columns: auto repeat(3, 62px);
     place-items: center center;
-    grid-gap: 8px;
+    gap: 8px;
 
     /* Override StyledRadioButton default styles */
     .mx_StyledRadioButton {
diff --git a/res/css/views/settings/_SettingsHeader.pcss b/res/css/views/settings/_SettingsHeader.pcss
index a705deda6c..e1c470214f 100644
--- a/res/css/views/settings/_SettingsHeader.pcss
+++ b/res/css/views/settings/_SettingsHeader.pcss
@@ -16,4 +16,13 @@
         font: var(--cpd-font-body-sm-medium);
         color: var(--cpd-color-text-action-accent);
     }
+
+    &.mx_SettingsHeader_recommended::after {
+        display: inline-block;
+        content: "";
+        width: 8px;
+        height: 8px;
+        background-color: var(--cpd-color-icon-critical-primary);
+        clip-path: circle(4px);
+    }
 }
diff --git a/res/css/views/settings/encryption/_AdvancedPanel.pcss b/res/css/views/settings/encryption/_AdvancedPanel.pcss
index fed8fca7ea..a0f53f87bd 100644
--- a/res/css/views/settings/encryption/_AdvancedPanel.pcss
+++ b/res/css/views/settings/encryption/_AdvancedPanel.pcss
@@ -9,7 +9,8 @@
 .mx_OtherSettings {
     display: flex;
     flex-direction: column;
-    gap: var(--cpd-space-6x);
+    /* !important override compound form */
+    gap: var(--cpd-space-6x) !important;
     width: 100%;
     align-items: start;
 
diff --git a/res/css/views/settings/encryption/_ChangeRecoveryKey.pcss b/res/css/views/settings/encryption/_ChangeRecoveryKey.pcss
index ceacb22c27..e37000931f 100644
--- a/res/css/views/settings/encryption/_ChangeRecoveryKey.pcss
+++ b/res/css/views/settings/encryption/_ChangeRecoveryKey.pcss
@@ -45,7 +45,7 @@
             color: var(--cpd-color-text-secondary);
 
             .mx_KeyPanel_key {
-                font-family: Inconsolata, monospace;
+                font-family: "Fira Code", monospace;
                 /*
                  * From figma https://www.figma.com/design/qTWRfItpO3RdCjnTKPu4mL/Settings?node-id=375-77471&t=t7lozYrSI1AVZZ3U-4
                  */
@@ -68,5 +68,28 @@
         display: flex;
         flex-direction: column;
         gap: var(--cpd-space-8x);
+
+        .mx_KeyForm_password {
+            > input[name="recoveryKey"] {
+                /*
+                 * From figma https://www.figma.com/design/qTWRfItpO3RdCjnTKPu4mL/Settings?node-id=375-77506&t=d82NdRBDoKsUe1C9-4
+                 */
+                height: 70px;
+                padding: var(--cpd-space-3x) var(--cpd-space-3x) var(--cpd-space-3x) var(--cpd-space-4x);
+                border: var(--cpd-border-width-1) solid;
+                border-radius: 8px;
+                margin: 0px;
+            }
+
+            > button {
+                /*
+                 * See figma https://www.figma.com/design/qTWRfItpO3RdCjnTKPu4mL/Settings?node-id=375-77506&t=d82NdRBDoKsUe1C9-4
+                 * Avoid stretching the hide/show symbol to the height of the input, and centre it vertically.
+                 */
+                height: 24.5px;
+                padding: var(--cpd-space-1x);
+                align-self: center;
+            }
+        }
     }
 }
diff --git a/res/css/views/settings/encryption/_EncryptionCard.pcss b/res/css/views/settings/encryption/_EncryptionCard.pcss
index 5598facfa9..5aba3fe7d7 100644
--- a/res/css/views/settings/encryption/_EncryptionCard.pcss
+++ b/res/css/views/settings/encryption/_EncryptionCard.pcss
@@ -30,6 +30,13 @@
             text-align: center;
         }
     }
+
+    /* extra class for specifying that we don't need a border */
+    &.mx_EncryptionCard_noBorder {
+        border: 0px none;
+        box-shadow: none;
+        padding: 0px;
+    }
 }
 
 .mx_EncryptionCard_buttons {
diff --git a/res/css/views/settings/tabs/_SettingsSection.pcss b/res/css/views/settings/tabs/_SettingsSection.pcss
index 997343190d..ce3c9266c3 100644
--- a/res/css/views/settings/tabs/_SettingsSection.pcss
+++ b/res/css/views/settings/tabs/_SettingsSection.pcss
@@ -34,7 +34,7 @@ Please see LICENSE files in the repository root for full details.
 .mx_SettingsSection_subSections {
     display: grid;
     grid-template-columns: minmax(0, 1fr);
-    grid-gap: $spacing-32;
+    gap: $spacing-32;
 
     padding: $spacing-16 0;
 }
diff --git a/res/css/views/settings/tabs/_SettingsTab.pcss b/res/css/views/settings/tabs/_SettingsTab.pcss
index e0abf08e83..92a392950f 100644
--- a/res/css/views/settings/tabs/_SettingsTab.pcss
+++ b/res/css/views/settings/tabs/_SettingsTab.pcss
@@ -77,14 +77,10 @@ Please see LICENSE files in the repository root for full details.
     }
 }
 
-.mx_SettingsTab_toggleWithDescription {
-    margin-top: $spacing-24;
-}
-
 .mx_SettingsTab_sections {
     display: grid;
     grid-template-columns: 1fr;
-    grid-gap: $spacing-32;
+    gap: $spacing-32;
 
     padding-bottom: $spacing-16;
 }
diff --git a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.pcss b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.pcss
index dd899389ef..adc55b58f6 100644
--- a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.pcss
+++ b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.pcss
@@ -8,6 +8,6 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_Field.mx_AppearanceUserSettingsTab_checkboxControlledField {
     width: 256px;
-    /* matches checkbox box + padding to align with checkbox label */
-    margin-inline-start: calc($font-16px + 10px);
+    /* Line up with Settings field toggle button */
+    margin-inline-start: 0;
 }
diff --git a/res/css/views/settings/tabs/user/_KeyboardUserSettingsTab.pcss b/res/css/views/settings/tabs/user/_KeyboardUserSettingsTab.pcss
index b3251f3e3c..44452be744 100644
--- a/res/css/views/settings/tabs/user/_KeyboardUserSettingsTab.pcss
+++ b/res/css/views/settings/tabs/user/_KeyboardUserSettingsTab.pcss
@@ -12,7 +12,7 @@ Please see LICENSE files in the repository root for full details.
     padding: 0;
     width: 100%;
     display: grid;
-    grid-gap: $spacing-4;
+    gap: $spacing-4;
 }
 
 .mx_KeyboardShortcut_shortcutRow,
diff --git a/res/css/views/settings/tabs/user/_MediaPreviewAccountSettings.pcss b/res/css/views/settings/tabs/user/_MediaPreviewAccountSettings.pcss
index 68187854c1..b8f6209139 100644
--- a/res/css/views/settings/tabs/user/_MediaPreviewAccountSettings.pcss
+++ b/res/css/views/settings/tabs/user/_MediaPreviewAccountSettings.pcss
@@ -14,7 +14,8 @@ Please see LICENSE files in the repository root for full details.
 }
 
 .mx_MediaPreviewAccountSetting_RadioHelp {
-    margin-top: 0;
+    /* !important because it's overriding compound help message */
+    margin-top: 0 !important;
     margin-bottom: var(--cpd-space-1x);
 }
 
diff --git a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.pcss b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.pcss
index 82f839042b..90a4fdd5b1 100644
--- a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.pcss
+++ b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.pcss
@@ -27,20 +27,16 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_SecurityUserSettingsTab_warning {
     color: $alert;
-    position: relative;
-    padding-left: 40px;
 
-    &::before {
-        mask-repeat: no-repeat;
-        mask-position: 0 center;
-        mask-size: $font-24px;
-        position: absolute;
-        width: $font-24px;
-        height: $font-24px;
-        content: "";
-        top: 0;
-        left: 0;
-        background-color: $alert;
-        mask-image: url("@vector-im/compound-design-tokens/icons/warning.svg");
+    svg {
+        width: 24px;
+        height: 24px;
+        margin-right: var(--cpd-space-4x);
+        color: $alert;
     }
 }
+
+form.mx_SecurityUserSettingsTab_posthogSection {
+    /* Inhibit compound spacing here as it clashes with pre-compound UI */
+    display: contents !important;
+}
diff --git a/res/css/views/spaces/_SpaceBasicSettings.pcss b/res/css/views/spaces/_SpaceBasicSettings.pcss
index 76c58e1f5c..211ac25068 100644
--- a/res/css/views/spaces/_SpaceBasicSettings.pcss
+++ b/res/css/views/spaces/_SpaceBasicSettings.pcss
@@ -16,36 +16,17 @@ Please see LICENSE files in the repository root for full details.
         margin-top: 24px;
 
         .mx_SpaceBasicSettings_avatar {
-            position: relative;
             height: 80px;
             width: 80px;
             background-color: $tertiary-content;
             border-radius: 16px;
-        }
-
-        img.mx_SpaceBasicSettings_avatar {
-            width: 80px;
-            height: 80px;
             object-fit: cover;
-            border-radius: 16px;
-        }
 
-        /* only show it when the button is a div and not an img (has avatar) */
-        div.mx_SpaceBasicSettings_avatar {
-            cursor: pointer;
-
-            &::before {
-                content: "";
-                position: absolute;
-                height: 80px;
-                width: 80px;
-                top: 0;
-                left: 0;
-                background-color: #ffffff; /* white icon fill */
-                mask-repeat: no-repeat;
-                mask-position: center;
-                mask-size: 20px;
-                mask-image: url("@vector-im/compound-design-tokens/icons/take-photo-solid.svg");
+            svg {
+                width: 20px;
+                height: 20px;
+                padding: 30px;
+                color: #ffffff; /* white icon fill */
             }
         }
 
diff --git a/res/css/views/spaces/_SpaceCreateMenu.pcss b/res/css/views/spaces/_SpaceCreateMenu.pcss
index ca2a2c8fc1..8bc7f6e3ad 100644
--- a/res/css/views/spaces/_SpaceCreateMenu.pcss
+++ b/res/css/views/spaces/_SpaceCreateMenu.pcss
@@ -34,18 +34,6 @@ Please see LICENSE files in the repository root for full details.
             }
         }
 
-        .mx_SpaceCreateMenuType {
-            @mixin SpacePillButton;
-        }
-
-        .mx_SpaceCreateMenuType_public::before {
-            mask-image: url("@vector-im/compound-design-tokens/icons/public.svg");
-        }
-
-        .mx_SpaceCreateMenuType_private::before {
-            mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg");
-        }
-
         .mx_SpaceCreateMenu_back {
             width: 28px;
             height: 28px;
diff --git a/res/css/views/spaces/_SpacePublicShare.pcss b/res/css/views/spaces/_SpacePublicShare.pcss
deleted file mode 100644
index b55c0e685c..0000000000
--- a/res/css/views/spaces/_SpacePublicShare.pcss
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2021 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-.mx_SpacePublicShare {
-    .mx_AccessibleButton {
-        @mixin SpacePillButton;
-
-        &.mx_SpacePublicShare_shareButton::before {
-            mask-image: url("@vector-im/compound-design-tokens/icons/link.svg");
-        }
-
-        &.mx_SpacePublicShare_inviteButton::before {
-            mask-image: url("$(res)/img/element-icons/room/invite.svg");
-        }
-    }
-}
diff --git a/res/css/views/terms/_InlineTermsAgreement.pcss b/res/css/views/terms/_InlineTermsAgreement.pcss
index d289501091..3a783cfd32 100644
--- a/res/css/views/terms/_InlineTermsAgreement.pcss
+++ b/res/css/views/terms/_InlineTermsAgreement.pcss
@@ -27,7 +27,7 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_InlineTermsAgreement_link {
     display: inline-block;
-    mask-image: url("$(res)/img/external-link.svg");
+    mask-image: url("@vector-im/compound-design-tokens/icons/pop-out.svg");
     background-color: $accent;
     mask-repeat: no-repeat;
     mask-size: contain;
diff --git a/res/css/views/toasts/_IncomingCallToast.pcss b/res/css/views/toasts/_IncomingCallToast.pcss
index 2aafff6b04..d13a4eb61a 100644
--- a/res/css/views/toasts/_IncomingCallToast.pcss
+++ b/res/css/views/toasts/_IncomingCallToast.pcss
@@ -11,92 +11,67 @@ Please see LICENSE files in the repository root for full details.
     display: flex;
     flex-direction: row;
     pointer-events: initial; /* restore pointer events so the user can accept/decline */
-    width: 250px;
 
-    $closeButtonSize: 16px;
+    $closeButtonSize: var(--cpd-space-4x);
 
     .mx_IncomingCallToast_content {
         display: flex;
         flex-direction: column;
-        margin-left: 8px;
+        gap: var(--cpd-space-4x);
+        padding: var(--cpd-space-3x);
         width: 100%;
         overflow: hidden;
 
-        .mx_IncomingCallToast_info {
-            margin-bottom: $spacing-16;
-
-            .mx_IncomingCallToast_room {
-                display: inline-block;
-
-                font-weight: var(--cpd-font-weight-semibold);
-                font-size: $font-15px;
-                line-height: $font-24px;
-
-                /* Prevent overlap with the close button */
-                width: calc(100% - $closeButtonSize - 2 * $spacing-4);
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-
-                margin-bottom: $spacing-4;
-            }
-
-            .mx_IncomingCallToast_message {
-                font-size: $font-12px;
-                line-height: $font-15px;
-
-                margin-bottom: $spacing-4;
-            }
-
-            .mx_LiveContentSummary {
-                font-size: $font-12px;
-                line-height: $font-15px;
-
-                .mx_LiveContentSummary_participants::before {
-                    width: 15px;
-                    height: 15px;
-                }
-            }
+        .mx_IncomingCallToast_message {
+            font-size: var(--cpd-font-size-body-lg);
+            line-height: var(--cpd-font-size-heading-sm);
+            width: calc(100% - $closeButtonSize - 2 * var(--cpd-space-1x));
+            font-weight: var(--cpd-font-weight-semibold);
         }
 
-        .mx_IncomingCallToast_joinButton {
-            position: relative;
+        .mx_LiveContentSummary_participants::before {
+            width: 15px;
+            height: 15px;
+        }
 
-            bottom: $spacing-4;
-            right: $spacing-4;
+        .mx_IncomingCallToast_buttons {
+            display: flex;
+            gap: var(--cpd-space-2x);
+        }
+
+        .mx_IncomingCallToast_actionButton {
+            position: relative;
 
             align-self: flex-end;
 
             box-sizing: border-box;
             min-width: 120px;
 
-            padding: $spacing-4 0;
-
-            line-height: $font-24px;
+            padding: var(--cpd-space-1x) 0;
+            padding-right: var(--cpd-space-4x);
+            line-height: var(--cpd-space-6x);
         }
     }
 
     .mx_IncomingCallToast_closeButton {
         position: absolute;
 
-        top: $spacing-4;
-        right: $spacing-4;
+        right: 0;
 
         display: flex;
         height: $closeButtonSize;
         width: $closeButtonSize;
 
-        &::before {
-            content: "";
-
-            mask-image: url("@vector-im/compound-design-tokens/icons/close.svg");
-
+        svg {
             height: inherit;
             width: inherit;
-            background-color: $secondary-content;
-            mask-repeat: no-repeat;
-            mask-size: contain;
-            mask-position: center;
+            color: $secondary-content;
+        }
+    }
+    .mx_IncomingCallToast_toggleWithLabel {
+        display: flex;
+        span {
+            flex-grow: 1;
         }
     }
 }
diff --git a/res/css/views/toasts/_IncomingLegacyCallToast.pcss b/res/css/views/toasts/_IncomingLegacyCallToast.pcss
index 257cfbe370..667dd110d1 100644
--- a/res/css/views/toasts/_IncomingLegacyCallToast.pcss
+++ b/res/css/views/toasts/_IncomingLegacyCallToast.pcss
@@ -65,14 +65,14 @@ Please see LICENSE files in the repository root for full details.
         &.mx_IncomingLegacyCallToast_content_voice {
             .mx_LegacyCallEvent_type .mx_LegacyCallEvent_type_icon::before,
             .mx_IncomingLegacyCallToast_buttons .mx_IncomingLegacyCallToast_button_accept span::before {
-                mask-image: url("$(res)/img/element-icons/call/voice-call.svg");
+                mask-image: url("@vector-im/compound-design-tokens/icons/voice-call-solid.svg");
             }
         }
 
         &.mx_IncomingLegacyCallToast_content_video {
             .mx_LegacyCallEvent_type .mx_LegacyCallEvent_type_icon::before,
             .mx_IncomingLegacyCallToast_buttons .mx_IncomingLegacyCallToast_button_accept span::before {
-                mask-image: url("$(res)/img/element-icons/call/video-call.svg");
+                mask-image: url("@vector-im/compound-design-tokens/icons/video-call-solid.svg");
             }
         }
 
@@ -100,7 +100,7 @@ Please see LICENSE files in the repository root for full details.
                 }
 
                 &.mx_IncomingLegacyCallToast_button_decline span::before {
-                    mask-image: url("$(res)/img/element-icons/call/hangup.svg");
+                    mask-image: url("@vector-im/compound-design-tokens/icons/end-call.svg");
                     mask-size: 16px;
                     width: 16px;
                     height: 16px;
@@ -127,10 +127,10 @@ Please see LICENSE files in the repository root for full details.
     }
 
     .mx_IncomingLegacyCallToast_silence::before {
-        mask-image: url("$(res)/img/voip/silence.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/volume-on-solid.svg");
     }
 
     .mx_IncomingLegacyCallToast_unSilence::before {
-        mask-image: url("$(res)/img/voip/un-silence.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/volume-off-solid.svg");
     }
 }
diff --git a/res/css/views/toasts/_NonUrgentEchoFailureToast.pcss b/res/css/views/toasts/_NonUrgentEchoFailureToast.pcss
index a404430204..9a4afb98ab 100644
--- a/res/css/views/toasts/_NonUrgentEchoFailureToast.pcss
+++ b/res/css/views/toasts/_NonUrgentEchoFailureToast.pcss
@@ -15,7 +15,7 @@ Please see LICENSE files in the repository root for full details.
         mask-size: contain;
         mask-repeat: no-repeat;
         background-color: #fff; /* we know that non-urgent toasts are always styled the same */
-        mask-image: url("$(res)/img/element-icons/cloud-off.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/offline.svg");
         margin-right: 8px;
     }
 
diff --git a/res/css/views/verification/_VerificationShowSas.pcss b/res/css/views/verification/_VerificationShowSas.pcss
index 1a24519cbf..9e4d1f138b 100644
--- a/res/css/views/verification/_VerificationShowSas.pcss
+++ b/res/css/views/verification/_VerificationShowSas.pcss
@@ -47,7 +47,7 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_VerificationShowSas_emojiSas_label {
     font-size: $font-12px;
-    word-break: break-all;
+    word-break: break-word;
 }
 
 .mx_VerificationShowSas_emojiSas_break {
diff --git a/res/css/views/voip/LegacyCallView/_LegacyCallViewButtons.pcss b/res/css/views/voip/LegacyCallView/_LegacyCallViewButtons.pcss
index 9849e9c560..ab0146fadc 100644
--- a/res/css/views/voip/LegacyCallView/_LegacyCallViewButtons.pcss
+++ b/res/css/views/voip/LegacyCallView/_LegacyCallViewButtons.pcss
@@ -148,14 +148,14 @@ Please see LICENSE files in the repository root for full details.
 
         /* Stateless buttons */
         &.mx_LegacyCallViewButtons_dialpad::before {
-            mask-image: url("$(res)/img/voip/call-view/dialpad.svg");
+            mask-image: url("@vector-im/compound-design-tokens/icons/dial-pad.svg");
         }
 
         &.mx_LegacyCallViewButtons_button_hangup {
             background-color: $alert;
 
             &::before {
-                mask-image: url("$(res)/img/element-icons/call/hangup.svg");
+                mask-image: url("@vector-im/compound-design-tokens/icons/end-call.svg");
                 background-color: white; /* Same on both themes */
             }
         }
diff --git a/res/css/views/voip/_CallView.pcss b/res/css/views/voip/_CallView.pcss
index 1acccda595..0621042b32 100644
--- a/res/css/views/voip/_CallView.pcss
+++ b/res/css/views/voip/_CallView.pcss
@@ -22,168 +22,4 @@ Please see LICENSE files in the repository root for full details.
         border-radius: inherit;
         background-color: $call-background;
     }
-
-    /* While the lobby is shown, the widget needs to stay loaded but hidden in the background */
-    .mx_CallView_lobby ~ .mx_AppTile {
-        display: none;
-    }
-
-    .mx_CallView_lobby {
-        min-height: 0;
-        flex-grow: 1;
-        padding: $spacing-12;
-        color: $call-primary-content;
-        background-color: $call-background;
-
-        --facepile-background: $call-background;
-        border-radius: 8px;
-
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        gap: $spacing-32;
-
-        .mx_FacePile {
-            width: fit-content;
-            margin: $spacing-8 auto 0;
-        }
-
-        .mx_CallView_preview {
-            position: relative;
-            width: 100%;
-            max-width: 800px;
-            aspect-ratio: 1.5;
-            background-color: $call-system;
-
-            border-radius: 20px;
-            overflow: hidden;
-
-            display: flex;
-            flex-direction: column;
-            justify-content: center;
-            align-items: center;
-
-            .mx_BaseAvatar {
-                margin: $spacing-20;
-
-                /* Override the explicit dimensions on the element so that this gets sized responsively */
-                width: unset !important;
-                height: unset !important;
-                min-width: 0;
-                min-height: 0;
-                flex: 0 1 200px;
-            }
-
-            video {
-                position: absolute;
-                top: 0;
-                width: 100%;
-                height: 100%;
-                object-fit: cover;
-                display: block;
-                transform: scaleX(-1); /* flip the image */
-                background-color: black;
-            }
-
-            .mx_CallView_controls {
-                position: absolute;
-                bottom: 0;
-                left: 0;
-                right: 0;
-
-                background-color: $info-plinth-fg-color;
-
-                display: flex;
-                justify-content: center;
-                gap: $spacing-24;
-
-                .mx_CallView_deviceButtonWrapper {
-                    position: relative;
-                    margin: 6px 0 10px;
-
-                    .mx_CallView_deviceButton {
-                        $size: 50px;
-
-                        width: $size;
-                        height: $size;
-
-                        background-color: $call-system;
-                        border-radius: calc($size / 2);
-
-                        &::before {
-                            content: "";
-                            display: inline-block;
-                            mask-repeat: no-repeat;
-                            mask-size: 20px;
-                            mask-position: center;
-                            background-color: $call-primary-content;
-                            height: 100%;
-                            width: 100%;
-                        }
-
-                        &.mx_CallView_deviceButton_audio::before {
-                            mask-image: url("@vector-im/compound-design-tokens/icons/mic-on-solid.svg");
-                            mask-size: 14px;
-                        }
-
-                        &.mx_CallView_deviceButton_video::before {
-                            mask-image: url("@vector-im/compound-design-tokens/icons/video-call-solid.svg");
-                        }
-                    }
-
-                    .mx_CallView_deviceListButton {
-                        $size: 15px;
-
-                        position: absolute;
-                        bottom: 0;
-                        right: -2.5px;
-                        width: $size;
-                        height: $size;
-
-                        background-color: $call-system;
-                        border-radius: calc($size / 2);
-
-                        &::before {
-                            content: "";
-                            display: inline-block;
-                            mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg");
-                            mask-size: 20px;
-                            mask-position: center;
-                            background-color: $call-primary-content;
-                            height: 100%;
-                            width: 100%;
-                        }
-                    }
-
-                    &.mx_CallView_deviceButtonWrapper_muted {
-                        .mx_CallView_deviceButton,
-                        .mx_CallView_deviceListButton {
-                            background-color: $call-primary-content;
-
-                            &::before {
-                                background-color: $call-system;
-                            }
-                        }
-
-                        .mx_CallView_deviceButton {
-                            &.mx_CallView_deviceButton_audio::before {
-                                mask-image: url("@vector-im/compound-design-tokens/icons/mic-off-solid.svg");
-                                mask-size: 18px;
-                            }
-
-                            &.mx_CallView_deviceButton_video::before {
-                                mask-image: url("@vector-im/compound-design-tokens/icons/video-call-off-solid.svg");
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        .mx_CallView_connectButton {
-            padding-left: 50px;
-            padding-right: 50px;
-        }
-    }
 }
diff --git a/res/css/views/voip/_DialPad.pcss b/res/css/views/voip/_DialPad.pcss
index e39620fd64..717ec335b8 100644
--- a/res/css/views/voip/_DialPad.pcss
+++ b/res/css/views/voip/_DialPad.pcss
@@ -54,6 +54,6 @@ Please see LICENSE files in the repository root for full details.
         mask-size: 20px;
         mask-position: center;
         background-color: #fff; /* on all themes */
-        mask-image: url("$(res)/img/element-icons/call/voice-call.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/voice-call-solid.svg");
     }
 }
diff --git a/res/css/views/voip/_LegacyCallViewHeader.pcss b/res/css/views/voip/_LegacyCallViewHeader.pcss
index c69add3ba0..234ecba41f 100644
--- a/res/css/views/voip/_LegacyCallViewHeader.pcss
+++ b/res/css/views/voip/_LegacyCallViewHeader.pcss
@@ -66,7 +66,7 @@ Please see LICENSE files in the repository root for full details.
 
     &.mx_LegacyCallViewHeader_button_pin {
         &::before {
-            mask-image: url("$(res)/img/element-icons/room/pin-upright.svg");
+            mask-image: url("@vector-im/compound-design-tokens/icons/pin-solid.svg");
         }
     }
 
@@ -116,6 +116,6 @@ Please see LICENSE files in the repository root for full details.
         mask-repeat: no-repeat;
         mask-size: contain;
         mask-position: center;
-        mask-image: url("$(res)/img/element-icons/call/voice-call.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/voice-call-solid.svg");
     }
 }
diff --git a/res/css/views/voip/_VideoFeed.pcss b/res/css/views/voip/_VideoFeed.pcss
index 8522fbb4f0..8e753c533b 100644
--- a/res/css/views/voip/_VideoFeed.pcss
+++ b/res/css/views/voip/_VideoFeed.pcss
@@ -49,9 +49,7 @@ Please see LICENSE files in the repository root for full details.
         position: absolute;
         left: 6px;
         bottom: 6px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
+        z-index: 1;
 
         width: 24px;
         height: 24px;
@@ -59,24 +57,11 @@ Please see LICENSE files in the repository root for full details.
         background-color: rgb(0, 0, 0, 0.5); /* Same on both themes */
         border-radius: 100%;
 
-        &::before {
-            position: absolute;
-            content: "";
-            width: 17px;
-            height: 17px;
-            mask-repeat: no-repeat;
-            mask-size: contain;
-            mask-position: center;
-            background-color: white; /* Same on both themes */
-            border-radius: 7px;
-        }
-
-        &.mx_VideoFeed_mic_muted::before {
-            mask-image: url("@vector-im/compound-design-tokens/icons/mic-off-solid.svg");
-        }
-
-        &.mx_VideoFeed_mic_unmuted::before {
-            mask-image: url("@vector-im/compound-design-tokens/icons/mic-on-solid.svg");
+        svg {
+            width: 16px;
+            height: 16px;
+            padding: 4px;
+            color: white; /* Same on both themes */
         }
     }
 }
diff --git a/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 b/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2
index 5bfc425d66..64705d8f8e 100644
Binary files a/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 and b/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 differ
diff --git a/res/img/compound/back-30s-24px.svg b/res/img/compound/back-30s-24px.svg
deleted file mode 100644
index c958c40a64..0000000000
--- a/res/img/compound/back-30s-24px.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.4764 23.1499C9.82793 23.1499 7.55452 22.2702 5.65616 20.5107C3.75779 18.7513 2.70674 16.5751 2.50302 13.9822C2.4845 13.7599 2.55395 13.5655 2.71137 13.3988C2.8688 13.2321 3.0679 13.1488 3.30866 13.1488C3.53091 13.1488 3.72075 13.2275 3.87817 13.3849C4.0356 13.5423 4.13283 13.7414 4.16987 13.9822C4.3736 16.1121 5.26259 17.8947 6.83685 19.33C8.4111 20.7654 10.291 21.4831 12.4764 21.4831C14.7915 21.4831 16.7593 20.6728 18.3798 19.0522C20.0004 17.4317 20.8107 15.4638 20.8107 13.1488C20.8107 10.8337 20.0236 8.86587 18.4493 7.24531C16.875 5.62475 14.9304 4.81447 12.6153 4.81447H12.0041L13.4487 6.25908C13.6154 6.42577 13.6988 6.62024 13.6988 6.84248C13.6988 7.06473 13.6154 7.2592 13.4487 7.42588C13.282 7.59257 13.0876 7.67591 12.8653 7.67591C12.6431 7.67591 12.4486 7.59257 12.2819 7.42588L9.36492 4.50888C9.27231 4.41628 9.20749 4.32368 9.17045 4.23107C9.13341 4.13847 9.11489 4.0366 9.11489 3.92548C9.11489 3.81436 9.13341 3.71249 9.17045 3.61989C9.20749 3.52729 9.27231 3.43468 9.36492 3.34208L12.3097 0.397297C12.4579 0.249131 12.6431 0.175049 12.8653 0.175049C13.0876 0.175049 13.282 0.249131 13.4487 0.397297C13.5969 0.563982 13.671 0.758449 13.671 0.980697C13.671 1.20294 13.5969 1.38815 13.4487 1.53632L11.8374 3.14761H12.4764C13.8654 3.14761 15.1665 3.4069 16.3796 3.92548C17.5927 4.44406 18.653 5.1571 19.5605 6.06462C20.4681 6.97213 21.1811 8.03244 21.6997 9.24554C22.2183 10.4586 22.4775 11.7597 22.4775 13.1488C22.4775 14.5378 22.2183 15.8389 21.6997 17.052C21.1811 18.2651 20.4681 19.3254 19.5605 20.2329C18.653 21.1404 17.5927 21.8535 16.3796 22.372C15.1665 22.8906 13.8654 23.1499 12.4764 23.1499Z" fill="#737D8C"/>
-<path d="M9.51705 17.0895C9.05682 17.0895 8.64773 17.0107 8.28977 16.853C7.93395 16.6953 7.6527 16.4759 7.44602 16.1946C7.23935 15.9134 7.12962 15.5884 7.11683 15.2198H8.31854C8.32919 15.3967 8.38778 15.5511 8.49432 15.6832C8.60085 15.8132 8.74254 15.9144 8.91939 15.9869C9.09624 16.0593 9.29439 16.0955 9.51385 16.0955C9.74822 16.0955 9.95597 16.055 10.1371 15.9741C10.3182 15.891 10.4599 15.7759 10.5621 15.6289C10.6644 15.4819 10.7145 15.3125 10.7124 15.1207C10.7145 14.9226 10.6634 14.7479 10.5589 14.5966C10.4545 14.4453 10.3033 14.3271 10.1051 14.2418C9.90909 14.1566 9.67259 14.114 9.3956 14.114H8.81712V13.1999H9.3956C9.62358 13.1999 9.8228 13.1605 9.99325 13.0817C10.1658 13.0028 10.3011 12.892 10.3991 12.7493C10.4972 12.6044 10.5451 12.4371 10.543 12.2475C10.5451 12.0621 10.5036 11.9013 10.4183 11.7649C10.3352 11.6264 10.217 11.5188 10.0636 11.4421C9.91229 11.3654 9.73438 11.3271 9.52983 11.3271C9.32955 11.3271 9.14418 11.3633 8.97372 11.4357C8.80327 11.5082 8.66584 11.6115 8.56143 11.7457C8.45703 11.8778 8.40163 12.0355 8.39524 12.2188H7.25426C7.26278 11.8523 7.36825 11.5305 7.57067 11.2536C7.77521 10.9744 8.04794 10.7571 8.38885 10.6016C8.72976 10.4439 9.11222 10.3651 9.53622 10.3651C9.97301 10.3651 10.3523 10.4471 10.674 10.6112C10.9979 10.7731 11.2482 10.9915 11.4251 11.2663C11.6019 11.5412 11.6903 11.8448 11.6903 12.1772C11.6925 12.5458 11.5838 12.8548 11.3643 13.104C11.147 13.3533 10.8615 13.5163 10.5078 13.593V13.6442C10.968 13.7081 11.3207 13.8786 11.5657 14.1555C11.8129 14.4304 11.9354 14.7724 11.9332 15.1815C11.9332 15.5479 11.8288 15.8761 11.62 16.1658C11.4134 16.4535 11.1278 16.6793 10.7635 16.8434C10.4013 17.0075 9.9858 17.0895 9.51705 17.0895ZM15.0151 17.1246C14.4889 17.1246 14.0371 16.9915 13.66 16.7251C13.285 16.4567 12.9963 16.07 12.7939 15.565C12.5936 15.0579 12.4935 14.4474 12.4935 13.7337C12.4956 13.0199 12.5968 12.4126 12.7971 11.9119C12.9995 11.4091 13.2882 11.0256 13.6632 10.7614C14.0403 10.4972 14.491 10.3651 15.0151 10.3651C15.5393 10.3651 15.9899 10.4972 16.367 10.7614C16.7442 11.0256 17.0329 11.4091 17.2332 11.9119C17.4356 12.4148 17.5368 13.022 17.5368 13.7337C17.5368 14.4496 17.4356 15.0611 17.2332 15.5682C17.0329 16.0732 16.7442 16.4588 16.367 16.7251C15.992 16.9915 15.5414 17.1246 15.0151 17.1246ZM15.0151 16.1243C15.4242 16.1243 15.747 15.9229 15.9835 15.5202C16.2222 15.1154 16.3415 14.5199 16.3415 13.7337C16.3415 13.2138 16.2871 12.777 16.1785 12.4233C16.0698 12.0696 15.9164 11.8033 15.7183 11.6243C15.5201 11.4432 15.2857 11.3526 15.0151 11.3526C14.6082 11.3526 14.2864 11.555 14.0499 11.9599C13.8134 12.3626 13.6941 12.9538 13.692 13.7337C13.6898 14.2557 13.742 14.6946 13.8486 15.0504C13.9572 15.4062 14.1107 15.6747 14.3088 15.8558C14.507 16.0348 14.7424 16.1243 15.0151 16.1243Z" fill="#737D8C"/>
-</svg>
diff --git a/res/img/compound/forward-30s-24px.svg b/res/img/compound/forward-30s-24px.svg
deleted file mode 100644
index b071aa3ed2..0000000000
--- a/res/img/compound/forward-30s-24px.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5013 23.1499C15.1498 23.1499 17.4232 22.2702 19.3216 20.5107C21.2199 18.7513 22.271 16.5751 22.4747 13.9822C22.4932 13.7599 22.4238 13.5655 22.2663 13.3988C22.1089 13.2321 21.9098 13.1488 21.6691 13.1488C21.4468 13.1488 21.257 13.2275 21.0995 13.3849C20.9421 13.5423 20.8449 13.7414 20.8078 13.9822C20.6041 16.1121 19.7151 17.8947 18.1409 19.33C16.5666 20.7654 14.6868 21.4831 12.5013 21.4831C10.1863 21.4831 8.21843 20.6728 6.59788 19.0522C4.97732 17.4317 4.16704 15.4638 4.16704 13.1488C4.16704 10.8337 4.95417 8.86587 6.52842 7.24531C8.10268 5.62475 10.0473 4.81447 12.3624 4.81447H12.9736L11.529 6.25908C11.3623 6.42577 11.279 6.62024 11.279 6.84248C11.279 7.06473 11.3623 7.2592 11.529 7.42588C11.6957 7.59257 11.8902 7.67591 12.1124 7.67591C12.3346 7.67591 12.5291 7.59257 12.6958 7.42588L15.6128 4.50888C15.7054 4.41628 15.7702 4.32368 15.8073 4.23107C15.8443 4.13847 15.8628 4.0366 15.8628 3.92548C15.8628 3.81436 15.8443 3.71249 15.8073 3.61989C15.7702 3.52729 15.7054 3.43468 15.6128 3.34208L12.668 0.397297C12.5199 0.249131 12.3346 0.175049 12.1124 0.175049C11.8902 0.175049 11.6957 0.249131 11.529 0.397297C11.3808 0.563982 11.3068 0.758449 11.3068 0.980697C11.3068 1.20294 11.3808 1.38815 11.529 1.53632L13.1403 3.14761H12.5013C11.1123 3.14761 9.81121 3.4069 8.59811 3.92548C7.385 4.44406 6.3247 5.1571 5.41718 6.06462C4.50967 6.97213 3.79663 8.03244 3.27805 9.24554C2.75947 10.4586 2.50018 11.7597 2.50018 13.1488C2.50018 14.5378 2.75947 15.8389 3.27805 17.052C3.79663 18.2651 4.50967 19.3254 5.41718 20.2329C6.3247 21.1404 7.385 21.8535 8.59811 22.372C9.81121 22.8906 11.1123 23.1499 12.5013 23.1499Z" fill="#737D8C"/>
-<path d="M9.51705 17.0895C9.05682 17.0895 8.64773 17.0107 8.28977 16.853C7.93395 16.6953 7.6527 16.4759 7.44602 16.1946C7.23935 15.9134 7.12962 15.5884 7.11683 15.2198H8.31854C8.32919 15.3967 8.38778 15.5511 8.49432 15.6832C8.60085 15.8132 8.74254 15.9144 8.91939 15.9869C9.09624 16.0593 9.29439 16.0955 9.51385 16.0955C9.74822 16.0955 9.95597 16.055 10.1371 15.9741C10.3182 15.891 10.4599 15.7759 10.5621 15.6289C10.6644 15.4819 10.7145 15.3125 10.7124 15.1207C10.7145 14.9226 10.6634 14.7479 10.5589 14.5966C10.4545 14.4453 10.3033 14.3271 10.1051 14.2418C9.90909 14.1566 9.67259 14.114 9.3956 14.114H8.81712V13.1999H9.3956C9.62358 13.1999 9.8228 13.1605 9.99325 13.0817C10.1658 13.0028 10.3011 12.892 10.3991 12.7493C10.4972 12.6044 10.5451 12.4371 10.543 12.2475C10.5451 12.0621 10.5036 11.9013 10.4183 11.7649C10.3352 11.6264 10.217 11.5188 10.0636 11.4421C9.91229 11.3654 9.73438 11.3271 9.52983 11.3271C9.32955 11.3271 9.14418 11.3633 8.97372 11.4357C8.80327 11.5082 8.66584 11.6115 8.56143 11.7457C8.45703 11.8778 8.40163 12.0355 8.39524 12.2188H7.25426C7.26278 11.8523 7.36825 11.5305 7.57067 11.2536C7.77521 10.9744 8.04794 10.7571 8.38885 10.6016C8.72976 10.4439 9.11222 10.3651 9.53622 10.3651C9.97301 10.3651 10.3523 10.4471 10.674 10.6112C10.9979 10.7731 11.2482 10.9915 11.4251 11.2663C11.6019 11.5412 11.6903 11.8448 11.6903 12.1772C11.6925 12.5458 11.5838 12.8548 11.3643 13.104C11.147 13.3533 10.8615 13.5163 10.5078 13.593V13.6442C10.968 13.7081 11.3207 13.8786 11.5657 14.1555C11.8129 14.4304 11.9354 14.7724 11.9332 15.1815C11.9332 15.5479 11.8288 15.8761 11.62 16.1658C11.4134 16.4535 11.1278 16.6793 10.7635 16.8434C10.4013 17.0075 9.9858 17.0895 9.51705 17.0895ZM15.0151 17.1246C14.4889 17.1246 14.0371 16.9915 13.66 16.7251C13.285 16.4567 12.9963 16.07 12.7939 15.565C12.5936 15.0579 12.4935 14.4474 12.4935 13.7337C12.4956 13.0199 12.5968 12.4126 12.7971 11.9119C12.9995 11.4091 13.2882 11.0256 13.6632 10.7614C14.0403 10.4972 14.491 10.3651 15.0151 10.3651C15.5393 10.3651 15.9899 10.4972 16.367 10.7614C16.7442 11.0256 17.0329 11.4091 17.2332 11.9119C17.4356 12.4148 17.5368 13.022 17.5368 13.7337C17.5368 14.4496 17.4356 15.0611 17.2332 15.5682C17.0329 16.0732 16.7442 16.4588 16.367 16.7251C15.992 16.9915 15.5414 17.1246 15.0151 17.1246ZM15.0151 16.1243C15.4242 16.1243 15.747 15.9229 15.9835 15.5202C16.2222 15.1154 16.3415 14.5199 16.3415 13.7337C16.3415 13.2138 16.2871 12.777 16.1785 12.4233C16.0698 12.0696 15.9164 11.8033 15.7183 11.6243C15.5201 11.4432 15.2857 11.3526 15.0151 11.3526C14.6082 11.3526 14.2864 11.555 14.0499 11.9599C13.8134 12.3626 13.6941 12.9538 13.692 13.7337C13.6898 14.2557 13.742 14.6946 13.8486 15.0504C13.9572 15.4062 14.1107 15.6747 14.3088 15.8558C14.507 16.0348 14.7424 16.1243 15.0151 16.1243Z" fill="#737D8C"/>
-</svg>
diff --git a/res/img/compound/live-16px.svg b/res/img/compound/live-16px.svg
deleted file mode 100644
index d7be98c008..0000000000
--- a/res/img/compound/live-16px.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.4592 2.79256C13.2332 2.50193 12.8144 2.44957 12.5237 2.67562C12.2334 2.90141 12.1809 3.31959 12.406 3.61019L12.4065 3.61084L12.4072 3.6117L12.4163 3.6238C12.4251 3.63567 12.4394 3.65505 12.4582 3.6816C12.496 3.73475 12.5521 3.81645 12.6206 3.92406C12.7577 4.13961 12.9431 4.45704 13.1289 4.85521C13.5024 5.65557 13.8663 6.75746 13.8663 8.00185C13.8663 9.24624 13.5024 10.3481 13.1289 11.1485C12.9431 11.5467 12.7577 11.8641 12.6206 12.0796C12.5521 12.1873 12.496 12.269 12.4582 12.3221C12.4394 12.3487 12.4251 12.368 12.4163 12.3799L12.4072 12.392L12.4065 12.3929L12.4059 12.3936C12.1809 12.6842 12.2335 13.1023 12.5237 13.3281C12.8144 13.5541 13.2332 13.5018 13.4592 13.2111L12.9624 12.8247C13.4593 13.2111 13.4592 13.2111 13.4592 13.2111L13.4606 13.2094L13.4625 13.207L13.468 13.1997L13.4857 13.1763C13.5003 13.1566 13.5204 13.1292 13.5453 13.0941C13.5951 13.024 13.6639 12.9236 13.7455 12.7955C13.9083 12.5396 14.1229 12.1713 14.3371 11.7123C14.7636 10.7984 15.1997 9.50032 15.1997 8.00185C15.1997 6.50338 14.7636 5.20528 14.3371 4.29136C14.1229 3.83239 13.9083 3.46409 13.7455 3.20822C13.6639 3.08011 13.5951 2.97967 13.5453 2.9096C13.5204 2.87455 13.5003 2.84706 13.4857 2.82745L13.468 2.80398L13.4625 2.79675L13.4606 2.79427L13.4598 2.79332C13.4598 2.79332 13.4592 2.79256 12.933 3.20185L13.4592 2.79256Z" fill="currentColor"/>
-<path d="M11.7265 5.19271C11.5005 4.90207 11.0816 4.84972 10.791 5.07577C10.5011 5.30122 10.4483 5.71848 10.6723 6.00901L10.6746 6.01206C10.6775 6.01606 10.6832 6.02372 10.6911 6.03488C10.707 6.05722 10.7319 6.09338 10.7628 6.14206C10.825 6.23976 10.9103 6.38575 10.9961 6.56964C11.1696 6.94143 11.3336 7.44332 11.3336 8.002C11.3336 8.56067 11.1696 9.06257 10.9961 9.43436C10.9103 9.61824 10.825 9.76424 10.7628 9.86194C10.7319 9.91061 10.707 9.94678 10.6911 9.96912C10.6832 9.98028 10.6775 9.98794 10.6746 9.99193L10.6723 9.99499C10.4483 10.2855 10.5011 10.7028 10.791 10.9282C11.0816 11.1543 11.5005 11.1019 11.7265 10.8113L11.2003 10.402C11.7265 10.8113 11.7265 10.8113 11.7265 10.8113L11.7277 10.8098L11.7292 10.8079L11.733 10.8029L11.7439 10.7883C11.7527 10.7766 11.7642 10.7608 11.7782 10.7411C11.8061 10.7019 11.8437 10.647 11.8877 10.5778C11.9755 10.4398 12.0902 10.2429 12.2044 9.99821C12.4309 9.51285 12.6669 8.81475 12.6669 8.002C12.6669 7.18925 12.4309 6.49114 12.2044 6.00579C12.0902 5.7611 11.9755 5.56424 11.8877 5.42623C11.8437 5.35704 11.8061 5.30214 11.7782 5.26287C11.7642 5.24323 11.7527 5.22745 11.7439 5.21571L11.733 5.20113L11.7292 5.19614L11.7277 5.19423L11.7271 5.19342C11.7271 5.19342 11.7265 5.19271 11.2003 5.602L11.7265 5.19271Z" fill="currentColor"/>
-<path d="M2.40721 13.2113C2.63325 13.502 3.0521 13.5543 3.34273 13.3283C3.63304 13.1025 3.6856 12.6843 3.46042 12.3937L3.45992 12.3931L3.45927 12.3922L3.45017 12.3801C3.44133 12.3682 3.4271 12.3489 3.40824 12.3223C3.3705 12.2692 3.31436 12.1875 3.24588 12.0799C3.10871 11.8643 2.92338 11.5469 2.73756 11.1487C2.36406 10.3483 2.00011 9.24644 2.00011 8.00205C2.00011 6.75766 2.36406 5.65577 2.73756 4.85541C2.92338 4.45724 3.10871 4.13982 3.24588 3.92426C3.31436 3.81665 3.3705 3.73495 3.40824 3.68181C3.4271 3.65525 3.44133 3.63587 3.45017 3.62401L3.45927 3.6119L3.45992 3.61104L3.46052 3.61026C3.68559 3.31968 3.633 2.90159 3.34273 2.67582C3.0521 2.44977 2.63325 2.50213 2.40721 2.79276L2.90404 3.17919C2.4072 2.79277 2.40721 2.79276 2.40721 2.79276L2.40588 2.79447L2.40397 2.79695L2.39843 2.80418L2.38078 2.82765C2.36617 2.84726 2.34603 2.87476 2.32114 2.90981C2.27138 2.97987 2.20252 3.08031 2.121 3.20842C1.95817 3.4643 1.74351 3.83259 1.52932 4.29156C1.10282 5.20549 0.666774 6.50359 0.666774 8.00205C0.666774 9.50052 1.10282 10.7986 1.52932 11.7125C1.74351 12.1715 1.95817 12.5398 2.121 12.7957C2.20252 12.9238 2.27138 13.0242 2.32114 13.0943C2.34603 13.1294 2.36617 13.1568 2.38078 13.1765L2.39843 13.1999L2.40397 13.2072L2.40588 13.2096L2.40662 13.2106C2.40662 13.2106 2.40721 13.2113 2.93344 12.8021L2.40721 13.2113Z" fill="currentColor"/>
-<path d="M4.13995 10.8112C4.366 11.1018 4.78485 11.1542 5.07548 10.9281C5.36535 10.7027 5.41819 10.2854 5.19419 9.99489L5.1919 9.99184C5.18892 9.98785 5.18329 9.98019 5.17537 9.96903C5.1595 9.94669 5.1346 9.91052 5.10363 9.86185C5.04146 9.76415 4.95612 9.61815 4.87031 9.43427C4.69681 9.06248 4.53285 8.56058 4.53285 8.00191C4.53285 7.44323 4.69681 6.94133 4.87031 6.56955C4.95612 6.38566 5.04146 6.23967 5.10363 6.14197C5.1346 6.09329 5.1595 6.05713 5.17537 6.03478C5.18329 6.02363 5.18892 6.01597 5.1919 6.01197L5.19419 6.00891C5.41819 5.71838 5.36535 5.30113 5.07548 5.07567C4.78485 4.84963 4.366 4.90198 4.13995 5.19261L4.66619 5.60191C4.13995 5.19261 4.13995 5.19261 4.13995 5.19261L4.13877 5.19414L4.1373 5.19605L4.13348 5.20104L4.12251 5.21562C4.11377 5.22736 4.10221 5.24313 4.08826 5.26278C4.06038 5.30205 4.02277 5.35695 3.97875 5.42613C3.89092 5.56415 3.77625 5.76101 3.66207 6.0057C3.43557 6.49105 3.19952 7.18915 3.19952 8.00191C3.19952 8.81466 3.43557 9.51276 3.66207 9.99812C3.77625 10.2428 3.89092 10.4397 3.97875 10.5777C4.02277 10.6469 4.06038 10.7018 4.08826 10.741C4.10221 10.7607 4.11377 10.7765 4.12251 10.7882L4.13348 10.8028L4.1373 10.8078L4.13877 10.8097L4.1394 10.8105C4.1394 10.8105 4.13995 10.8112 4.66619 10.4019L4.13995 10.8112Z" fill="currentColor"/>
-<circle cx="7.99996" cy="8.0013" r="1.33333" fill="currentColor"/>
-</svg>
diff --git a/res/img/compound/live-8px.svg b/res/img/compound/live-8px.svg
deleted file mode 100644
index 968c61f9e3..0000000000
--- a/res/img/compound/live-8px.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.72969 1.3953C6.61666 1.24999 6.40724 1.22381 6.26192 1.33683C6.11677 1.44973 6.09049 1.65882 6.20308 1.80412L6.20333 1.80444L6.20366 1.80487L6.20821 1.81093C6.21262 1.81686 6.21974 1.82655 6.22917 1.83983C6.24804 1.8664 6.27611 1.90725 6.31035 1.96105C6.37893 2.06883 6.4716 2.22754 6.56451 2.42663C6.75126 2.82681 6.93323 3.37775 6.93323 3.99995C6.93323 4.62214 6.75126 5.17309 6.56451 5.57327C6.4716 5.77236 6.37893 5.93107 6.31035 6.03885C6.27611 6.09265 6.24804 6.1335 6.22917 6.16007C6.21974 6.17335 6.21262 6.18304 6.20821 6.18897L6.20366 6.19503L6.20333 6.19546L6.20303 6.19584C6.09049 6.34114 6.11679 6.55018 6.26192 6.66307C6.40724 6.77609 6.61666 6.74991 6.72969 6.6046L6.48127 6.41138C6.72969 6.60459 6.72969 6.6046 6.72969 6.6046L6.73035 6.60374L6.7313 6.6025L6.73407 6.59889L6.7429 6.58715C6.7502 6.57735 6.76027 6.5636 6.77272 6.54607C6.7976 6.51104 6.83203 6.46082 6.87279 6.39676C6.9542 6.26883 7.06154 6.08468 7.16863 5.8552C7.38188 5.39823 7.5999 4.74918 7.5999 3.99995C7.5999 3.25072 7.38188 2.60166 7.16863 2.1447C7.06154 1.91522 6.9542 1.73107 6.87279 1.60313C6.83203 1.53908 6.7976 1.48886 6.77272 1.45383C6.76027 1.4363 6.7502 1.42255 6.7429 1.41275L6.73407 1.40101L6.7313 1.3974L6.73035 1.39616L6.72998 1.39568C6.72998 1.39568 6.72969 1.3953 6.46657 1.59995L6.72969 1.3953Z" fill="currentColor"/>
-<path d="M5.86331 2.59538C5.75029 2.45006 5.54086 2.42388 5.39555 2.53691C5.25061 2.64963 5.22419 2.85826 5.33619 3.00353L5.33734 3.00506C5.33883 3.00705 5.34165 3.01088 5.34561 3.01646C5.35354 3.02763 5.36599 3.04572 5.38147 3.07005C5.41256 3.1189 5.45523 3.1919 5.49813 3.28384C5.58488 3.46974 5.66686 3.72069 5.66686 4.00002C5.66686 4.27936 5.58488 4.53031 5.49813 4.7162C5.45523 4.80815 5.41256 4.88114 5.38147 4.92999C5.36599 4.95433 5.35354 4.97241 5.34561 4.98358C5.34165 4.98916 5.33883 4.99299 5.33734 4.99499L5.33619 4.99652C5.22419 5.14179 5.25061 5.35041 5.39555 5.46314C5.54086 5.57616 5.75029 5.54999 5.86331 5.40467L5.60019 5.20002C5.86331 5.40467 5.86331 5.40467 5.86331 5.40467L5.8639 5.40391L5.86464 5.40295L5.86655 5.40046L5.87203 5.39317C5.87641 5.3873 5.88218 5.37941 5.88916 5.36959C5.9031 5.34995 5.9219 5.3225 5.94392 5.28791C5.98783 5.2189 6.04516 5.12047 6.10226 4.99813C6.21551 4.75545 6.33353 4.4064 6.33353 4.00002C6.33353 3.59365 6.21551 3.2446 6.10226 3.00192C6.04516 2.87957 5.98783 2.78114 5.94392 2.71214C5.9219 2.67755 5.9031 2.65009 5.88916 2.63046C5.88218 2.62064 5.87641 2.61275 5.87203 2.60688L5.86655 2.59959L5.86464 2.59709L5.8639 2.59614L5.86359 2.59573C5.86359 2.59573 5.86331 2.59538 5.60019 2.80002L5.86331 2.59538Z" fill="currentColor"/>
-<path d="M1.20366 6.6047C1.31669 6.75001 1.52611 6.77619 1.67143 6.66317C1.81658 6.55027 1.84286 6.34118 1.73027 6.19588L1.73002 6.19556L1.72969 6.19513L1.72514 6.18907C1.72073 6.18314 1.71361 6.17345 1.70418 6.16017C1.68531 6.1336 1.65724 6.09275 1.623 6.03895C1.55442 5.93117 1.46175 5.77246 1.36884 5.57337C1.18209 5.17319 1.00011 4.62225 1.00011 4.00005C1.00011 3.37786 1.18209 2.82691 1.36884 2.42673C1.46175 2.22764 1.55442 2.06893 1.623 1.96115C1.65724 1.90735 1.68531 1.8665 1.70418 1.83993C1.71361 1.82665 1.72073 1.81696 1.72514 1.81103L1.72969 1.80497L1.73002 1.80454L1.73032 1.80416C1.84286 1.65886 1.81656 1.44982 1.67143 1.33693C1.52611 1.22391 1.31669 1.25009 1.20366 1.3954L1.45208 1.58862C1.20366 1.39541 1.20366 1.3954 1.20366 1.3954L1.203 1.39626L1.20205 1.3975L1.19928 1.40111L1.19045 1.41285C1.18315 1.42265 1.17308 1.4364 1.16063 1.45393C1.13575 1.48896 1.10132 1.53918 1.06056 1.60324C0.979147 1.73117 0.871814 1.91532 0.764721 2.1448C0.551471 2.60177 0.333448 3.25082 0.333448 4.00005C0.333448 4.74928 0.551471 5.39834 0.764721 5.8553C0.871814 6.08478 0.979147 6.26893 1.06056 6.39687C1.10132 6.46092 1.13575 6.51114 1.16063 6.54617C1.17308 6.5637 1.18315 6.57745 1.19045 6.58725L1.19928 6.59899L1.20205 6.6026L1.203 6.60384L1.20337 6.60432C1.20337 6.60432 1.20366 6.6047 1.46678 6.40005L1.20366 6.6047Z" fill="currentColor"/>
-<path d="M2.07004 5.40462C2.18306 5.54994 2.39249 5.57612 2.5378 5.46309C2.68274 5.35037 2.70916 5.14174 2.59716 4.99647L2.59601 4.99494C2.59452 4.99295 2.5917 4.98912 2.58774 4.98354C2.57981 4.97237 2.56736 4.95428 2.55188 4.92995C2.52079 4.8811 2.47812 4.8081 2.43522 4.71616C2.34847 4.53026 2.26649 4.27931 2.26649 3.99998C2.26649 3.72064 2.34847 3.46969 2.43522 3.2838C2.47812 3.19185 2.52079 3.11886 2.55188 3.07001C2.56736 3.04567 2.57981 3.02759 2.58774 3.01642C2.5917 3.01084 2.59452 3.00701 2.59601 3.00501L2.59716 3.00348C2.70916 2.85821 2.68274 2.64959 2.5378 2.53686C2.39249 2.42384 2.18306 2.45001 2.07004 2.59533L2.33316 2.79998C2.07004 2.59533 2.07004 2.59533 2.07004 2.59533L2.06945 2.59609L2.06871 2.59705L2.0668 2.59954L2.06132 2.60683C2.05694 2.6127 2.05117 2.62059 2.04419 2.63041C2.03025 2.65005 2.01145 2.6775 1.98943 2.71209C1.94552 2.7811 1.88819 2.87953 1.83109 3.00187C1.71784 3.24455 1.59982 3.5936 1.59982 3.99998C1.59982 4.40635 1.71784 4.7554 1.83109 4.99808C1.88819 5.12043 1.94552 5.21886 1.98943 5.28786C2.01145 5.32245 2.03025 5.34991 2.04419 5.36954C2.05117 5.37936 2.05694 5.38725 2.06132 5.39312L2.0668 5.40041L2.06871 5.40291L2.06945 5.40386L2.06976 5.40427C2.06976 5.40427 2.07004 5.40462 2.33316 5.19998L2.07004 5.40462Z" fill="currentColor"/>
-<circle cx="3.99992" cy="4.00016" r="0.666667" fill="currentColor"/>
-</svg>
diff --git a/res/img/compound/record-10px.svg b/res/img/compound/record-10px.svg
deleted file mode 100644
index a16ce774b0..0000000000
--- a/res/img/compound/record-10px.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="5" cy="5" r="5" fill="#FF5B55"/>
-</svg>
diff --git a/res/img/compound/stop-16.svg b/res/img/compound/stop-16.svg
deleted file mode 100644
index 439deb0d93..0000000000
--- a/res/img/compound/stop-16.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="13" height="16" viewBox="0 0 13 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="0.973877" y="2" width="12" height="12" rx="1" fill="#737D8C"/>
-</svg>
diff --git a/res/img/compound/timer-16px.svg b/res/img/compound/timer-16px.svg
deleted file mode 100644
index 4eb1b0ee49..0000000000
--- a/res/img/compound/timer-16px.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 1H6V2.33333H10V1ZM7.33333 9.66667H8.66667V5.66667H7.33333V9.66667ZM12.6867 5.26L13.6333 4.31333C13.3467 3.97333 13.0333 3.65333 12.6933 3.37333L11.7467 4.32C10.7133 3.49333 9.41333 3 8 3C4.68667 3 2 5.68667 2 9C2 12.3133 4.68 15 8 15C11.32 15 14 12.3133 14 9C14 7.58667 13.5067 6.28667 12.6867 5.26ZM8 13.6667C5.42 13.6667 3.33333 11.58 3.33333 9C3.33333 6.42 5.42 4.33333 8 4.33333C10.58 4.33333 12.6667 6.42 12.6667 9C12.6667 11.58 10.58 13.6667 8 13.6667Z" fill="currentColor"/>
-</svg>
diff --git a/res/img/e2e/decryption-failure.svg b/res/img/e2e/decryption-failure.svg
deleted file mode 100644
index 244e5d2816..0000000000
--- a/res/img/e2e/decryption-failure.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path fill-rule="evenodd" clip-rule="evenodd" fill="#000000" d="m 13.693359,4.8320312 c -0.831702,0.014848 -1.62869,0.3142589 -2.236328,0.921875 -1.205391,1.2054645 -1.19044,3.1514722 -0.164062,4.6464848 l -2.9101565,2.96875 -0.2617187,-0.269532 -0.00195,-0.002 C 8.0071963,12.985739 7.8869254,12.852667 7.6484375,12.767578 7.4099496,12.68249 7.0329991,12.769696 6.8398438,12.962891 L 5.8964844,13.90625 c -0.3865104,0.386392 -0.3518945,1.031029 0.015625,1.398438 l 0.2890625,0.289062 -0.1640625,0.167969 c -0.1940263,0.194049 -0.3312306,0.444035 -0.3574219,0.730469 -0.026191,0.286433 0.082836,0.602331 0.3027344,0.822265 0.2199669,0.219905 0.5630302,0.325807 0.84375,0.273438 0.2807198,-0.05237 0.4907236,-0.203587 0.6621093,-0.375 L 13.003906,11.896484 C 14.40572,12.59862 16.0549,12.487976 17.123047,11.419922 18.511821,10.031028 18.283868,7.6569034 16.751953,6.125 15.986,5.3590578 15.009306,4.9188574 14.050781,4.84375 c -0.119815,-0.00939 -0.238607,-0.01384 -0.357422,-0.011719 z m 0.111329,1.7011719 c 0.064,9.655e-4 0.128025,0.00455 0.193359,0.011719 0.522674,0.05732 1.080601,0.3130273 1.550781,0.7832031 0.940357,0.9403487 1.026123,2.2336423 0.371094,2.888672 C 15.26488,10.871761 13.971607,10.786061 13.03125,9.8457031 12.090894,8.905364 12.005137,7.6120286 12.660156,6.9570312 12.946738,6.670459 13.356711,6.5264448 13.804688,6.5332031 Z M 22,11 A 11,11 0 0 1 11,22 11,11 0 0 1 0,11 11,11 0 0 1 11,0 11,11 0 0 1 22,11 Z" />
-</svg>
diff --git a/res/img/e2e/lock-warning-filled.svg b/res/img/e2e/lock-warning-filled.svg
deleted file mode 100644
index a984ed85a0..0000000000
--- a/res/img/e2e/lock-warning-filled.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="42" width="37" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><mask id="a" fill="#fff"><path d="m23.521 14.596h-1.777a.454.454 0 0 1 -.456-.45v-4.14a8.974 8.974 0 0 0 -8.57-9 8.884 8.884 0 0 0 -9.253 8.82v4.365a.454.454 0 0 1 -.456.45h-1.78a1.218 1.218 0 0 0 -1.229 1.215v15.93a1.218 1.218 0 0 0 1.229 1.214h22.247a1.218 1.218 0 0 0 1.231-1.215v-15.974a1.153 1.153 0 0 0 -1.186-1.215zm-17.276-4.77a6.114 6.114 0 0 1 6.473-6.075 6.251 6.251 0 0 1 5.88 6.255v4.185a.454.454 0 0 1 -.456.45h-11.486a.454.454 0 0 1 -.456-.45v-4.365zm20.255 11.174c6.344.019 11.481 5.156 11.5 11.5 0 6.351-5.149 11.5-11.5 11.5s-11.5-5.149-11.5-11.5 5.149-11.5 11.5-11.5z" fill="#fff" fill-rule="evenodd"/></mask><g fill="#000" fill-rule="evenodd"><path d="m-.909 32.909h19.773c2.392-6.604 4.34-10.526 5.844-11.766s1.808-8.258.912-21.052h-26.529z" mask="url(#a)" transform="translate(0 -1)"/><path d="m26.5 21c-5.799 0-10.5 4.701-10.5 10.5s4.701 10.5 10.5 10.5 10.5-4.701 10.5-10.5c-.017-5.792-4.708-10.483-10.5-10.5zm1.444 16.012h-2.888v-2.493h3.019v2.494zm.131-9.712-.787 5.775h-1.575l-.788-5.775v-1.312h3.15z" fill-rule="nonzero"/></g></svg>
\ No newline at end of file
diff --git a/res/img/e2e/normal.svg b/res/img/e2e/normal.svg
deleted file mode 100644
index 83b544a326..0000000000
--- a/res/img/e2e/normal.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M2 9.27V3.05L9 1L16 3.05V9.27C16 15.63 9 17 9 17C9 17 2 15.63 2 9.27Z" fill="#020202"/>
-</svg>
diff --git a/res/img/e2e/verified-deprecated.svg b/res/img/e2e/verified-deprecated.svg
deleted file mode 100644
index f90d9db554..0000000000
--- a/res/img/e2e/verified-deprecated.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M2 3.05V9.27C2 15.63 9 17 9 17C9 17 16 15.63 16 9.27V3.05L9 1L2 3.05ZM11.9405 5.5196C12.1305 5.3396 12.4305 5.3496 12.6105 5.5396C12.7705 5.7196 12.7705 5.9896 12.6305 6.1696L8.41047 11.2796L8.38047 11.3196C8.10047 11.6596 7.59047 11.7096 7.25047 11.4296C7.22027 11.4145 7.19577 11.388 7.17266 11.363C7.16517 11.3549 7.15782 11.347 7.15047 11.3396L5.34047 9.2596C5.14047 9.0196 5.16047 8.6596 5.40047 8.4596C5.60047 8.2796 5.89047 8.2796 6.10047 8.4196L7.67047 9.5196L11.9405 5.5196Z" fill="#010101"/>
-</svg>
diff --git a/res/img/e2e/verified.svg b/res/img/e2e/verified.svg
deleted file mode 100644
index 9213d2b05d..0000000000
--- a/res/img/e2e/verified.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M2 3.05V9.27C2 15.63 9 17 9 17C9 17 16 15.63 16 9.27V3.05L9 1L2 3.05ZM11.9405 5.5196C12.1305 5.3396 12.4305 5.3496 12.6105 5.5396C12.7705 5.7196 12.7705 5.9896 12.6305 6.1696L8.41047 11.2796L8.38047 11.3196C8.10047 11.6596 7.59047 11.7096 7.25047 11.4296C7.22027 11.4145 7.19577 11.388 7.17266 11.363C7.16517 11.3549 7.15782 11.347 7.15047 11.3396L5.34047 9.2596C5.14047 9.0196 5.16047 8.6596 5.40047 8.4596C5.60047 8.2796 5.89047 8.2796 6.10047 8.4196L7.67047 9.5196L11.9405 5.5196Z" fill="currentColor"/>
-</svg>
diff --git a/res/img/e2e/warning-deprecated.svg b/res/img/e2e/warning-deprecated.svg
deleted file mode 100644
index 58f5c3b7d1..0000000000
--- a/res/img/e2e/warning-deprecated.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M2 9.27V3.05L9 1L16 3.05V9.27C16 15.63 9 17 9 17C9 17 2 15.63 2 9.27ZM8.92011 4.39997C8.35011 4.43997 7.93011 4.93997 7.98011 5.50997L8.30011 9.50997C8.33011 9.85997 8.60011 10.13 8.95011 10.16H9.01011C9.38011 10.16 9.69011 9.87997 9.72011 9.50997L10.0401 5.50997V5.34997C9.98011 4.77997 9.48011 4.35997 8.92011 4.39997ZM9.88012 12.12C9.88012 12.606 9.48613 13 9.00012 13C8.51411 13 8.12012 12.606 8.12012 12.12C8.12012 11.634 8.51411 11.24 9.00012 11.24C9.48613 11.24 9.88012 11.634 9.88012 12.12Z" fill="#020202"/>
-</svg>
diff --git a/res/img/e2e/warning.svg b/res/img/e2e/warning.svg
deleted file mode 100644
index 1acbb53bb7..0000000000
--- a/res/img/e2e/warning.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M2 9.27V3.05L9 1L16 3.05V9.27C16 15.63 9 17 9 17C9 17 2 15.63 2 9.27ZM8.92011 4.39997C8.35011 4.43997 7.93011 4.93997 7.98011 5.50997L8.30011 9.50997C8.33011 9.85997 8.60011 10.13 8.95011 10.16H9.01011C9.38011 10.16 9.69011 9.87997 9.72011 9.50997L10.0401 5.50997V5.34997C9.98011 4.77997 9.48011 4.35997 8.92011 4.39997ZM9.88012 12.12C9.88012 12.606 9.48613 13 9.00012 13C8.51411 13 8.12012 12.606 8.12012 12.12C8.12012 11.634 8.51411 11.24 9.00012 11.24C9.48613 11.24 9.88012 11.634 9.88012 12.12Z" fill="currentColor"/>
-</svg>
diff --git a/res/img/element-icons/ask-to-join.svg b/res/img/element-icons/ask-to-join.svg
deleted file mode 100644
index e8d447cfff..0000000000
--- a/res/img/element-icons/ask-to-join.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="12" height="16" xmlns="http://www.w3.org/2000/svg"><path d="M6.806 16c-1.211 0-2.242-.336-3.091-1.008-.85-.673-1.458-1.48-1.826-2.425L.217 8.25c-.206-.533-.265-.93-.179-1.192.087-.26.282-.391.585-.391.4 0 .714.12.941.358.227.239.411.542.552.908l.714 1.884c.01.033.097.094.26.183h.227V2.2c0-.233.084-.436.251-.608a.8.8 0 011.177 0 .858.858 0 01.244.608v5.467c0 .089.032.166.097.233a.307.307 0 00.454 0 .324.324 0 00.098-.233v-6.8c0-.234.084-.436.251-.609A.8.8 0 016.482 0a.8.8 0 01.592.258.843.843 0 01.252.609v6.8c0 .089.032.166.097.233a.307.307 0 00.455 0 .324.324 0 00.097-.233v-5.8c0-.234.084-.436.252-.609A.8.8 0 018.819 1a.8.8 0 01.592.258.843.843 0 01.252.609v5.8c0 .089.032.166.097.233a.307.307 0 00.455 0 .324.324 0 00.097-.233v-3.8c0-.234.084-.436.252-.609A.8.8 0 0111.156 3a.8.8 0 01.592.258.843.843 0 01.252.609v6.966c0 1.523-.495 2.764-1.485 3.725C9.525 15.52 8.289 16 6.806 16z" fill="currentColor"/></svg>
diff --git a/res/img/element-icons/brands/apple.svg b/res/img/element-icons/brands/apple.svg
deleted file mode 100644
index 308c3c5d5a..0000000000
--- a/res/img/element-icons/brands/apple.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.9803 1.2796C17.0771 2.54383 16.6773 3.79601 15.8657 4.77022C15.0784 5.74949 13.8854 6.31354 12.629 6.3006C12.5491 5.07276 12.9605 3.86352 13.7727 2.93921C14.5952 2.00238 15.7404 1.40982 16.9803 1.2796ZM20.9539 8.70795C19.5086 9.59652 18.6192 11.1635 18.5974 12.86C18.5994 14.7794 19.7489 16.5115 21.5166 17.2592C21.1766 18.3636 20.6642 19.4073 19.9982 20.3517C19.1038 21.6896 18.1661 22.9967 16.6777 23.0208C15.9698 23.0372 15.492 22.8336 14.9941 22.6215C14.4747 22.4003 13.9335 22.1697 13.0867 22.1697C12.1885 22.1697 11.6231 22.4077 11.0778 22.6372C10.6065 22.8355 10.1503 23.0275 9.50727 23.0542C8.08982 23.1067 7.00654 21.6263 6.07964 20.3009C4.22703 17.5943 2.78444 12.6733 4.71844 9.32483C5.62662 7.69286 7.32468 6.65727 9.19136 6.59696C9.99528 6.58042 10.7667 6.89028 11.443 7.16193C11.9602 7.36969 12.4219 7.5551 12.7999 7.5551C13.1321 7.5551 13.5809 7.37701 14.1038 7.16946C14.9276 6.84251 15.9356 6.44246 16.9628 6.55027C18.5589 6.60021 20.038 7.39984 20.9539 8.70795Z" fill="#17191C"/>
-</svg>
diff --git a/res/img/element-icons/call/dialpad.svg b/res/img/element-icons/call/dialpad.svg
deleted file mode 100644
index a97e80aa0b..0000000000
--- a/res/img/element-icons/call/dialpad.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="12" height="18" viewBox="0 0 12 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 14.25C5.175 14.25 4.5 14.925 4.5 15.75C4.5 16.575 5.175 17.25 6 17.25C6.825 17.25 7.5 16.575 7.5 15.75C7.5 14.925 6.825 14.25 6 14.25ZM1.5 0.75C0.675 0.75 0 1.425 0 2.25C0 3.075 0.675 3.75 1.5 3.75C2.325 3.75 3 3.075 3 2.25C3 1.425 2.325 0.75 1.5 0.75ZM1.5 5.25C0.675 5.25 0 5.925 0 6.75C0 7.575 0.675 8.25 1.5 8.25C2.325 8.25 3 7.575 3 6.75C3 5.925 2.325 5.25 1.5 5.25ZM1.5 9.75C0.675 9.75 0 10.425 0 11.25C0 12.075 0.675 12.75 1.5 12.75C2.325 12.75 3 12.075 3 11.25C3 10.425 2.325 9.75 1.5 9.75ZM10.5 3.75C11.325 3.75 12 3.075 12 2.25C12 1.425 11.325 0.75 10.5 0.75C9.675 0.75 9 1.425 9 2.25C9 3.075 9.675 3.75 10.5 3.75ZM6 9.75C5.175 9.75 4.5 10.425 4.5 11.25C4.5 12.075 5.175 12.75 6 12.75C6.825 12.75 7.5 12.075 7.5 11.25C7.5 10.425 6.825 9.75 6 9.75ZM10.5 9.75C9.675 9.75 9 10.425 9 11.25C9 12.075 9.675 12.75 10.5 12.75C11.325 12.75 12 12.075 12 11.25C12 10.425 11.325 9.75 10.5 9.75ZM10.5 5.25C9.675 5.25 9 5.925 9 6.75C9 7.575 9.675 8.25 10.5 8.25C11.325 8.25 12 7.575 12 6.75C12 5.925 11.325 5.25 10.5 5.25ZM6 5.25C5.175 5.25 4.5 5.925 4.5 6.75C4.5 7.575 5.175 8.25 6 8.25C6.825 8.25 7.5 7.575 7.5 6.75C7.5 5.925 6.825 5.25 6 5.25ZM6 0.75C5.175 0.75 4.5 1.425 4.5 2.25C4.5 3.075 5.175 3.75 6 3.75C6.825 3.75 7.5 3.075 7.5 2.25C7.5 1.425 6.825 0.75 6 0.75Z" fill="#737D8C"/>
-</svg>
diff --git a/res/img/element-icons/call/hangup.svg b/res/img/element-icons/call/hangup.svg
deleted file mode 100644
index 173677db2d..0000000000
--- a/res/img/element-icons/call/hangup.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.02698 15.9613C9.16801 17.1932 11.9148 19.3263 12.6635 19.7641C12.7078 19.79 12.7585 19.8201 12.8152 19.8538C13.9576 20.5329 17.5373 22.6609 20.1454 20.6694C22.1661 19.1266 21.5091 17.3909 20.8289 16.875C20.3633 16.5128 18.9914 15.5145 17.7006 14.6152C16.4331 13.7322 15.7268 14.4397 15.2492 14.918C15.2404 14.9268 15.2317 14.9355 15.2231 14.9442L14.2621 15.9051C14.0174 16.1498 13.6451 16.0605 13.2886 15.7804C12.0092 14.8061 11.0681 13.8659 10.5972 13.395L10.5933 13.391C10.1225 12.9202 9.19387 11.9908 8.21957 10.7114C7.93949 10.3548 7.85018 9.9826 8.09489 9.73789L9.05586 8.77693C9.06448 8.7683 9.0732 8.7596 9.08199 8.75082C9.56034 8.27321 10.2678 7.56684 9.38479 6.29937C8.48555 5.0086 7.4872 3.6367 7.125 3.17106C6.60907 2.49094 4.87345 1.83392 3.33056 3.85458C1.33907 6.46274 3.46708 10.0424 4.1462 11.1848C4.17991 11.2415 4.21005 11.2922 4.23593 11.3365C4.67367 12.0851 6.79507 14.8202 8.02698 15.9613Z" fill="currentColor"/>
-<path d="M20.6971 3.07817C20.94 2.83153 20.94 2.43163 20.6971 2.18499C20.4542 1.93834 20.0603 1.93834 19.8174 2.18499L17 5.04555L14.1826 2.18499C13.9397 1.93834 13.5458 1.93834 13.3029 2.18499C13.06 2.43163 13.06 2.83153 13.3029 3.07817L16.1203 5.93873L13.1822 8.92183C12.9393 9.16847 12.9393 9.56837 13.1822 9.81501C13.4251 10.0617 13.819 10.0617 14.0619 9.81501L17 6.83192L19.9381 9.81501C20.181 10.0617 20.5749 10.0617 20.8178 9.81501C21.0607 9.56837 21.0607 9.16847 20.8178 8.92182L17.8797 5.93873L20.6971 3.07817Z" fill="currentColor"/>
-</svg>
diff --git a/res/img/element-icons/call/video-call.svg b/res/img/element-icons/call/video-call.svg
deleted file mode 100644
index 1d9546d034..0000000000
--- a/res/img/element-icons/call/video-call.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 7C0 5.34315 1.34315 4 3 4H14C15.6569 4 17 5.34315 17 7V17C17 18.6569 15.6569 20 14 20H3C1.34315 20 0 18.6569 0 17V7Z" fill="currentColor"/>
-<path d="M19 9L22.3753 6.29976C23.0301 5.77595 24 6.24212 24 7.08062V16.9194C24 17.7579 23.0301 18.2241 22.3753 17.7002L19 15V9Z" fill="currentColor"/>
-</svg>
diff --git a/res/img/element-icons/call/voice-call.svg b/res/img/element-icons/call/voice-call.svg
deleted file mode 100644
index d32b703523..0000000000
--- a/res/img/element-icons/call/voice-call.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.02698 13.9613C7.16801 15.1932 9.91484 17.3263 10.6635 17.7641C10.7078 17.79 10.7585 17.8201 10.8152 17.8538C11.9576 18.5329 15.5373 20.6609 18.1454 18.6694C20.1661 17.1266 19.5091 15.3909 18.8289 14.875C18.3633 14.5128 16.9914 13.5145 15.7006 12.6152C14.4331 11.7322 13.7268 12.4397 13.2492 12.918C13.2404 12.9268 13.2317 12.9355 13.2231 12.9442L12.2621 13.9051C12.0174 14.1498 11.6451 14.0605 11.2886 13.7804C10.0092 12.8061 9.06809 11.8659 8.59723 11.395L8.59326 11.391C8.12246 10.9202 7.19387 9.99076 6.21957 8.7114C5.93949 8.35485 5.85018 7.9826 6.09489 7.73789L7.05586 6.77693C7.06448 6.7683 7.0732 6.7596 7.08199 6.75082C7.56034 6.27321 8.2678 5.56684 7.38479 4.29937C6.48555 3.0086 5.4872 1.6367 5.125 1.17106C4.60907 0.490937 2.87345 -0.166084 1.33056 1.85458C-0.660932 4.46274 1.46708 8.04241 2.1462 9.18482C2.17991 9.24152 2.21005 9.29221 2.23593 9.33649C2.67367 10.0851 4.79507 12.8203 6.02698 13.9613Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/chat-bubble.svg b/res/img/element-icons/chat-bubble.svg
deleted file mode 100644
index 3b0e765843..0000000000
--- a/res/img/element-icons/chat-bubble.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M 12.046004,0 C 5.4431281,0 0.08988791,5.3729108 0.08988791,12.000001 c 0,2.059897 0.5163635,3.998954 1.42753269,5.692825 l -1.46565664,4.725598 c -0.26501811,0.853738 0.53179935,1.6561 1.38305454,1.392383 L 6.0478246,22.382286 C 7.8109429,23.410602 9.8598215,24 12.046004,24 18.648792,24 24,18.627023 24,12.000001 24,5.3729108 18.648792,0 12.046004,0 Z M 6.7319388,10.667139 c 0.7336504,0 1.3279866,0.596453 1.3279866,1.332862 0,0.736298 -0.5943362,1.332861 -1.3279866,1.33286 -0.7336504,0 -1.3279866,-0.596562 -1.3279865,-1.33286 0,-0.736409 0.5943361,-1.332862 1.3279865,-1.332862 z m 5.3140652,0 c 0.733607,0 1.327986,0.596453 1.327986,1.332862 0,0.736298 -0.594379,1.33286 -1.327986,1.33286 -0.733716,1e-6 -1.327987,-0.596562 -1.327987,-1.33286 0,-0.736409 0.594271,-1.332862 1.327987,-1.332862 z m 5.311946,0 c 0.733607,0 1.330105,0.596453 1.330105,1.332862 0,0.736298 -0.596498,1.332861 -1.330105,1.33286 -0.733715,0 -1.327987,-0.596562 -1.327987,-1.33286 0,-0.736409 0.594272,-1.332862 1.327987,-1.332862 z" />
-</svg>
diff --git a/res/img/element-icons/chat-bubbles.svg b/res/img/element-icons/chat-bubbles.svg
deleted file mode 100644
index ac9db61f29..0000000000
--- a/res/img/element-icons/chat-bubbles.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M5.90964 11.5297C9.09231 11.5297 11.6724 8.94865 11.6724 5.76483C11.6724 2.581 9.09231 0 5.90964 0C2.72697 0 0.146904 2.581 0.146904 5.76483C0.146904 6.65678 0.3494 7.50142 0.710912 8.25525L0.0648767 10.3556C-0.171716 11.1248 0.550948 11.8442 1.31906 11.6041L3.39724 10.9544C4.15657 11.323 5.00898 11.5297 5.90964 11.5297Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M5.03851 12.8449C5.70399 13.1151 6.4314 13.2638 7.19345 13.2638C10.3676 13.2638 13.5 10.6832 13.5 7.49979C13.5 6.63255 13.2676 5.81005 12.8651 5.07227C14.6487 6.05071 15.8583 7.94999 15.8583 10.1326C15.8583 11.0243 15.6564 11.8688 15.2959 12.6224L15.9404 14.7232C16.1765 15.4926 15.4533 16.2114 14.6854 15.9708L12.6155 15.322C11.8585 15.6902 11.0088 15.8966 10.111 15.8966C7.91459 15.8966 6.00594 14.661 5.03851 12.8449Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/res/img/element-icons/circle-sending.svg b/res/img/element-icons/circle-sending.svg
deleted file mode 100644
index 2d15a0f716..0000000000
--- a/res/img/element-icons/circle-sending.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="8" r="7.5" stroke="#8D99A5"/>
-</svg>
diff --git a/res/img/element-icons/circle-sent.svg b/res/img/element-icons/circle-sent.svg
deleted file mode 100644
index 04a00ceff7..0000000000
--- a/res/img/element-icons/circle-sent.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 15C11.866 15 15 11.866 15 8C15 4.13401 11.866 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15ZM8 16C12.4183 16 16 12.4183 16 8C16 3.58172 12.4183 0 8 0C3.58172 0 0 3.58172 0 8C0 12.4183 3.58172 16 8 16Z" fill="#8D99A5"/>
-<path d="M11.8697 4.95309C11.6784 4.7576 11.3597 4.74731 11.1578 4.93251L6.62066 9.04804L4.95244 7.91627C4.7293 7.77223 4.42116 7.77223 4.20865 7.95742C3.95363 8.1632 3.93238 8.5336 4.14489 8.78053L6.06813 10.9206C6.1 10.9515 6.13188 10.9926 6.17438 11.0132C6.53565 11.3013 7.07756 11.2498 7.37508 10.9L7.40695 10.8589L11.891 5.60128C12.0397 5.41608 12.0397 5.13828 11.8697 4.95309Z" fill="#8D99A5"/>
-</svg>
diff --git a/res/img/element-icons/cloud-off.svg b/res/img/element-icons/cloud-off.svg
deleted file mode 100644
index 7faea7d3b5..0000000000
--- a/res/img/element-icons/cloud-off.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1.53033 0.46967C1.23744 0.176777 0.762563 0.176777 0.46967 0.46967C0.176777 0.762563 0.176777 1.23744 0.46967 1.53033L4.3982 5.45886C3.81109 6.13809 3.38896 7.01315 3.21555 7.99387C1.96379 8.20624 1 9.465 1 10.981C1 12.6455 2.16209 14 3.59014 14H12.9393L16.4697 17.5303C16.7626 17.8232 17.2374 17.8232 17.5303 17.5303C17.8232 17.2374 17.8232 16.7626 17.5303 16.4697L1.53033 0.46967ZM17 10.9817C16.998 11.8303 16.6946 12.5985 16.2081 13.1475L7.07635 4.01569C7.18805 4.00529 7.30083 4 7.41451 4C8.75982 4 9.99711 4.71787 10.8072 5.94503C11.0993 5.85476 11.4011 5.80939 11.7058 5.80939C13.0303 5.80939 14.2138 6.65743 14.8199 8.00337C16.0519 8.23522 17 9.48685 17 10.9817Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/eye.svg b/res/img/element-icons/eye.svg
deleted file mode 100644
index 0460a6201d..0000000000
--- a/res/img/element-icons/eye.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M14.3094 5.96587C15.3206 7.15704 15.3417 8.85457 14.3412 10.0548C13.0889 11.5571 10.9822 13.3332 8.02104 13.3332C5.05992 13.3332 2.9532 11.5571 1.70087 10.0548C0.700398 8.85457 0.721506 7.15704 1.7327 5.96587C3.01174 4.45918 5.1391 2.6665 8.02104 2.6665C10.903 2.6665 13.0303 4.45918 14.3094 5.96587ZM11.5556 7.99984C11.5556 9.96352 9.96369 11.5554 8.00001 11.5554C6.03633 11.5554 4.44446 9.96352 4.44446 7.99984C4.44446 6.03616 6.03633 4.44428 8.00001 4.44428C9.96369 4.44428 11.5556 6.03616 11.5556 7.99984ZM8.00001 9.77761C8.98185 9.77761 9.77779 8.98168 9.77779 7.99984C9.77779 7.018 8.98185 6.22206 8.00001 6.22206C7.01817 6.22206 6.22224 7.018 6.22224 7.99984C6.22224 8.98168 7.01817 9.77761 8.00001 9.77761Z" fill="white"/>
-</svg>
diff --git a/res/img/element-icons/flask.svg b/res/img/element-icons/flask.svg
deleted file mode 100644
index 1b6d1204ea..0000000000
--- a/res/img/element-icons/flask.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13 2.5C13 2.77614 12.7761 3 12.5 3C12.2239 3 12 2.77614 12 2.5C12 2.22386 12.2239 2 12.5 2C12.7761 2 13 2.22386 13 2.5ZM11 5C11 5.55228 10.5523 6 10 6C9.44772 6 9 5.55228 9 5C9 4.44772 9.44772 4 10 4C10.5523 4 11 4.44772 11 5ZM14.7778 11.3056L18.6333 18.2389C18.8466 18.6247 18.9556 19.0594 18.9495 19.5002C18.9434 19.9409 18.8225 20.3725 18.5987 20.7522C18.3749 21.132 18.0559 21.4468 17.6732 21.6656C17.2906 21.8845 16.8575 21.9997 16.4167 22H7.58334C7.14253 21.9997 6.70943 21.8845 6.32677 21.6656C5.94412 21.4468 5.62514 21.132 5.40132 20.7522C5.17751 20.3725 5.0566 19.9409 5.05052 19.5002C5.04444 19.0594 5.15341 18.6247 5.36667 18.2389L9.22222 11.3056L9.19445 8.11111H8.66667C8.51933 8.11111 8.37802 8.05258 8.27383 7.94839C8.16965 7.84421 8.11111 7.7029 8.11111 7.55556C8.11111 7.40821 8.16965 7.26691 8.27383 7.16272C8.37802 7.05853 8.51933 7 8.66667 7H15.3333C15.4807 7 15.622 7.05853 15.7262 7.16272C15.8304 7.26691 15.8889 7.40821 15.8889 7.55556C15.8889 7.7029 15.8304 7.84421 15.7262 7.94839C15.622 8.05258 15.4807 8.11111 15.3333 8.11111H14.8056L14.7778 11.3056ZM10.3333 11.4389C10.3338 11.5362 10.3089 11.6319 10.2611 11.7167L8.88334 14.2C10.0819 14.237 11.271 14.4256 12.4222 14.7611C13.4944 15.0808 14.6039 15.2583 15.7222 15.2889L13.7389 11.7167C13.6911 11.6319 13.6662 11.5362 13.6667 11.4389L13.6944 8.11111H10.3056L10.3333 11.4389ZM14.5 5C14.7761 5 15 4.77614 15 4.5C15 4.22386 14.7761 4 14.5 4C14.2239 4 14 4.22386 14 4.5C14 4.77614 14.2239 5 14.5 5Z" fill="#737D8C"/>
-</svg>
diff --git a/res/img/element-icons/group-members.svg b/res/img/element-icons/group-members.svg
deleted file mode 100644
index 7fa9c39232..0000000000
--- a/res/img/element-icons/group-members.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M 12 2 C 6.4771555 2 2 6.4771555 2 12 C 2 17.522794 6.4771555 22 12 22 C 17.522794 22 22 17.522794 22 12 C 22 6.4771555 17.522794 2 12 2 z M 8.6660156 7 C 10.046724 7 11.166016 8.2132159 11.166016 9.7089844 C 11.166016 11.204753 10.046724 12.416016 8.6660156 12.416016 C 7.285297 12.416016 6.1660156 11.204753 6.1660156 9.7089844 C 6.1660156 8.2132159 7.285297 7 8.6660156 7 z M 16.380859 8.6660156 C 17.590458 8.6660156 18.570312 9.7286238 18.570312 11.039062 C 18.570312 12.349461 17.590458 13.412109 16.380859 13.412109 C 15.171261 13.412109 14.189453 12.349461 14.189453 11.039062 C 14.189453 9.7286238 15.171261 8.6660156 16.380859 8.6660156 z M 8.6660156 13.666016 C 8.995795 13.666016 9.31892 13.699719 9.6308594 13.761719 C 11.462446 14.162917 12.833984 15.794098 12.833984 17.746094 L 12.833984 19.957031 C 12.560013 19.985187 12.281622 20 12 20 C 8.8339434 20 6.1088101 18.175143 4.8105469 15.517578 C 5.7276213 14.387632 7.1130646 13.666016 8.6660156 13.666016 z M 16.380859 14.507812 C 17.445748 14.507812 18.420522 14.894445 19.179688 15.537109 C 18.289454 17.346828 16.737071 18.766824 14.833984 19.484375 L 14.833984 17.746094 C 14.833984 16.791296 14.612503 15.887484 14.220703 15.083984 C 14.857901 14.716186 15.595961 14.507812 16.380859 14.507812 z" />
-</svg>
diff --git a/res/img/element-icons/hide.svg b/res/img/element-icons/hide.svg
deleted file mode 100644
index 8ea50a028f..0000000000
--- a/res/img/element-icons/hide.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1.74889 6.95039C2.29001 6.28246 2.98613 5.54443 3.83039 4.88884L5.69202 6.75047C5.2553 7.39143 5 8.1659 5 9C5 11.2091 6.79086 13 9 13C9.8341 13 10.6086 12.7447 11.2495 12.308L12.9251 13.9836C11.8136 14.5897 10.5052 15 9 15C5.51954 15 3.0914 12.806 1.7156 11.0714C0.745735 9.84863 0.766473 8.16305 1.74889 6.95039ZM12.9305 9.74631L15.3314 12.1473C15.6913 11.7844 16.0089 11.4187 16.2844 11.0714C17.2543 9.84863 17.2335 8.16305 16.2511 6.95039C14.8432 5.21247 12.3858 3 9 3C8.13025 3 7.32178 3.14599 6.57662 3.39243L8.25369 5.0695C8.49547 5.02387 8.74495 5 9 5C11.2091 5 13 6.79086 13 9C13 9.25505 12.9761 9.50453 12.9305 9.74631Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.15892 8.21741C7.05661 8.45779 7 8.7223 7 9.00003C7 10.1046 7.89543 11 9 11C9.27773 11 9.54224 10.9434 9.78262 10.8411L7.15892 8.21741Z" fill="black"/>
-<path d="M1 1L17 17" stroke="black" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
-</svg>
diff --git a/res/img/element-icons/i.svg b/res/img/element-icons/i.svg
deleted file mode 100644
index 6674f1ed8d..0000000000
--- a/res/img/element-icons/i.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12 10C12.8284 10 13.5 9.32843 13.5 8.5C13.5 7.67157 12.8284 7 12 7C11.1716 7 10.5 7.67157 10.5 8.5C10.5 9.32843 11.1716 10 12 10ZM11 13C10.4477 13 10 12.5523 10 12C10 11.4477 10.4477 11 11 11H12C12.5523 11 13 11.4477 13 12V15.5H13.5C14.0523 15.5 14.5 15.9477 14.5 16.5C14.5 17.0523 14.0523 17.5 13.5 17.5H12C11.4477 17.5 11 17.0523 11 16.5L11 13Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/live.svg b/res/img/element-icons/live.svg
deleted file mode 100644
index 31341f1ef6..0000000000
--- a/res/img/element-icons/live.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="21.799"
-   height="21.799"
-   viewBox="0 0 21.799 21.799"
-   fill="none"
-   version="1.1"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <path
-     d="m 19.188575,3.0855891 c -0.3391,-0.43594 -0.9674,-0.51448 -1.4033,-0.17541 -0.4355,0.3387 -0.5143,0.96596 -0.1766,1.40185 l 8e-4,9.8e-4 0.001,0.00129 0.0136,0.01816 c 0.0133,0.0178 0.0346,0.04686 0.0629,0.0867 0.0566,0.07972 0.1408,0.20227 0.2435,0.36368 0.2058,0.32333 0.4838,0.79947 0.7625,1.39672 0.5603,1.20054 1.1062,2.85339 1.1062,4.7199899 0,1.8666 -0.5459,3.5194 -1.1062,4.72 -0.2787,0.5972 -0.5567,1.0733 -0.7625,1.3967 -0.1027,0.1614 -0.1869,0.2839 -0.2435,0.3637 -0.0283,0.0398 -0.0496,0.0689 -0.0629,0.0867 l -0.0136,0.0181 -0.001,0.0013 -9e-4,0.0012 c -0.3376,0.4358 -0.2587,1.063 0.1767,1.4016 0.4359,0.3391 1.0642,0.2606 1.4033,-0.1754 l -0.7453,-0.5796 c 0.7453,0.5796 0.7453,0.5796 0.7453,0.5796 l 0.002,-0.0025 0.0028,-0.0038 0.0083,-0.0108 0.0265,-0.0352 c 0.0219,-0.0294 0.0521,-0.0707 0.0895,-0.1232 0.0746,-0.1051 0.1779,-0.2558 0.3002,-0.448 0.2442,-0.3838 0.5662,-0.9362 0.8875,-1.6247 0.6397,-1.3709 1.2938,-3.318 1.2938,-5.5657 0,-2.2477199 -0.6541,-4.1948699 -1.2938,-5.5657599 -0.3213,-0.68846 -0.6433,-1.2409 -0.8875,-1.6247 -0.1223,-0.19217 -0.2256,-0.34283 -0.3002,-0.44793 -0.0374,-0.05258 -0.0676,-0.09382 -0.0895,-0.12323 l -0.0265,-0.03521 -0.0083,-0.01085 -0.0028,-0.00371 -0.0012,-0.00143 c 0,0 -8e-4,-0.00114 -0.7902,0.6128 z"
-     fill="currentColor" />
-  <path
-     d="m 16.589375,6.6858091 c -0.339,-0.43595 -0.9673,-0.51448 -1.4033,-0.17541 -0.4348,0.33819 -0.514,0.96407 -0.178,1.39987 l 0.0034,0.00458 c 0.0045,0.00599 0.0129,0.01748 0.0248,0.03422 0.0238,0.03351 0.0612,0.08776 0.1076,0.16077 0.0933,0.14655 0.2213,0.36554 0.35,0.64137 0.2603,0.55764 0.5062,1.3105399 0.5062,2.1485399 0,0.838 -0.2459,1.5909 -0.5062,2.1485 -0.1287,0.2759 -0.2567,0.4949 -0.35,0.6414 -0.0464,0.073 -0.0838,0.1273 -0.1076,0.1608 -0.0119,0.0167 -0.0203,0.0282 -0.0248,0.0342 l -0.0034,0.0046 c -0.336,0.4358 -0.2568,1.0617 0.178,1.3999 0.436,0.339 1.0643,0.2605 1.4033,-0.1755 l -0.7893,-0.6139 c 0.7893,0.6139 0.7893,0.6139 0.7893,0.6139 l 0.0018,-0.0022 0.0022,-0.0029 0.0058,-0.0075 0.0164,-0.0219 c 0.0131,-0.0176 0.0305,-0.0412 0.0514,-0.0707 0.0418,-0.0589 0.0982,-0.1413 0.1643,-0.245 0.1317,-0.2071 0.3037,-0.5024 0.475,-0.8694 0.3397,-0.728 0.6938,-1.7752 0.6938,-2.9943 0,-1.2190999 -0.3541,-2.2662799 -0.6938,-2.9943099 -0.1713,-0.36703 -0.3433,-0.66233 -0.475,-0.86935 -0.0661,-0.10377 -0.1225,-0.18613 -0.1643,-0.24503 -0.0209,-0.02947 -0.0383,-0.05314 -0.0514,-0.07074 l -0.0164,-0.02187 -0.0058,-0.00748 -0.0022,-0.00287 -9e-4,-0.00122 c 0,0 -9e-4,-0.00107 -0.7902,0.61287 z"
-     fill="currentColor" />
-  <path
-     d="m 2.6104749,18.713449 c 0.33907,0.4359 0.96734,0.5144 1.40329,0.1754 0.43547,-0.3387 0.5143,-0.966 0.17653,-1.4019 l -7.6e-4,-10e-4 -9.7e-4,-0.0013 -0.01365,-0.0181 c -0.01325,-0.0178 -0.0346,-0.0469 -0.06289,-0.0867 -0.05661,-0.0797 -0.14082,-0.2023 -0.24354,-0.3637 -0.20576,-0.3233 -0.48376,-0.7995 -0.76248,-1.3967 -0.56025,-1.2006 -1.10618,-2.8534 -1.10618,-4.72 0,-1.8665999 0.54593,-3.5194099 1.10618,-4.7199499 0.27872,-0.59726 0.55672,-1.07339 0.76248,-1.39673 0.10272,-0.1614 0.18693,-0.28396 0.24354,-0.36368 0.02829,-0.03983 0.04964,-0.0689 0.06289,-0.0867 l 0.01365,-0.01815 9.7e-4,-0.00129 9.1e-4,-0.00117 c 0.33761,-0.43588 0.25873,-1.06302 -0.17668,-1.40166 -0.43595,-0.33907 -1.06422,-0.26054 -1.40329,0.17541 l 0.74526,0.57964 c -0.74527,-0.57963 -0.74526,-0.57964 -0.74526,-0.57964 l -0.00199,0.00256 -0.00287,0.00372 -0.0083,0.01085 -0.02649,0.0352 c -0.0219,0.02941 -0.05212,0.07066 -0.08945,0.12323 -0.07464,0.10511 -0.17792,0.25577 -0.30021,0.44793 -0.24424,0.38381 -0.56624,0.93625 -0.88752,1.62471 -0.63975001,1.37088 -1.29382000681,3.31804 -1.29382000681,5.5657199 0,2.2477 0.65406999681,4.1949 1.29382000681,5.5658 0.32128,0.6884 0.64328,1.2409 0.88752,1.6247 0.12229,0.1921 0.22557,0.3428 0.30021,0.4479 0.03733,0.0526 0.06755,0.0938 0.08945,0.1232 l 0.02649,0.0352 0.0083,0.0109 0.00287,0.0037 0.0011,0.0014 c 0,0 8.9e-4,0.0012 0.79024,-0.6128 z"
-     fill="currentColor" />
-  <path
-     d="m 5.2095949,15.113149 c 0.33907,0.436 0.96735,0.5145 1.40329,0.1754 0.43481,-0.3381 0.51407,-0.964 0.17806,-1.3998 l -0.00343,-0.0046 c -0.00447,-0.006 -0.01292,-0.0175 -0.0248,-0.0342 -0.0238,-0.0335 -0.06114,-0.0878 -0.10761,-0.1608 -0.09326,-0.1465 -0.22126,-0.3655 -0.34997,-0.6414 -0.26026,-0.5576 -0.50619,-1.3105 -0.50619,-2.1485 0,-0.838 0.24593,-1.5908999 0.50619,-2.1485499 0.12871,-0.27582 0.25671,-0.49481 0.34997,-0.64136 0.04647,-0.07302 0.08381,-0.12727 0.10761,-0.16078 0.01188,-0.01673 0.02033,-0.02822 0.0248,-0.03422 l 0.00344,-0.00458 c 0.336,-0.43581 0.25674,-1.06168 -0.17807,-1.39986 -0.43594,-0.33907 -1.06422,-0.26054 -1.40329,0.17541 l 0.78935,0.61394 c -0.78935,-0.61394 -0.78935,-0.61394 -0.78935,-0.61394 l -0.00177,0.00228 -0.00222,0.00287 -0.00572,0.00749 -0.01646,0.02186 c -0.01311,0.01761 -0.03044,0.04128 -0.05137,0.07075 -0.04182,0.0589 -0.09823,0.14125 -0.16427,0.24503 -0.13174,0.20702 -0.30374,0.50231 -0.47502,0.86934 -0.33975,0.72803 -0.69382,1.77522 -0.69382,2.9943199 0,1.2191 0.35407,2.2663 0.69382,2.9943 0.17128,0.367 0.34328,0.6623 0.47502,0.8694 0.06604,0.1037 0.12245,0.1861 0.16427,0.245 0.02093,0.0295 0.03826,0.0531 0.05137,0.0707 l 0.01646,0.0219 0.00572,0.0075 0.00222,0.0029 9.4e-4,0.0012 c 0,0 8.3e-4,10e-4 0.79018,-0.6129 z"
-     fill="currentColor" />
-  <circle
-     cx="10.999774"
-     cy="10.898949"
-     r="2"
-     fill="currentColor" />
-</svg>
diff --git a/res/img/element-icons/notifications.svg b/res/img/element-icons/notifications.svg
index 7002782129..7709c673f1 100644
--- a/res/img/element-icons/notifications.svg
+++ b/res/img/element-icons/notifications.svg
@@ -1,5 +1,5 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M10.2375 19.5C10.1625 19.7 10.125 19.9 10.125 20.125C10.125 21.1625 10.9625 22 12 22C13.0375 22 13.875 21.1625 13.875 20.125C13.875 19.9 13.825 19.7 13.7625 19.5H10.2375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.6125 16.0625C18.8625 15.625 18.25 14.8875 18.25 13.75V9.5C18.25 6.05 15.3 3.25 12 3.25C8.7 3.25 5.75 6.05 5.75 9.5V13.75C5.75 14.875 5.125 15.625 4.3875 16.0625C3.8875 16.3625 3.25 16.775 3.25 17.275C3.25 17.85 3.6125 18.2375 4.3625 18.2375H12H19.6375C20.3875 18.2375 20.75 17.8375 20.75 17.275C20.75 16.775 20.125 16.3625 19.6125 16.0625Z" fill="black"/>
-<path d="M12 4.5C12.6904 4.5 13.25 3.94036 13.25 3.25C13.25 2.55964 12.6904 2 12 2C11.3096 2 10.75 2.55964 10.75 3.25C10.75 3.94036 11.3096 4.5 12 4.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.2375 19.5C10.1625 19.7 10.125 19.9 10.125 20.125C10.125 21.1625 10.9625 22 12 22C13.0375 22 13.875 21.1625 13.875 20.125C13.875 19.9 13.825 19.7 13.7625 19.5H10.2375Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.6125 16.0625C18.8625 15.625 18.25 14.8875 18.25 13.75V9.5C18.25 6.05 15.3 3.25 12 3.25C8.7 3.25 5.75 6.05 5.75 9.5V13.75C5.75 14.875 5.125 15.625 4.3875 16.0625C3.8875 16.3625 3.25 16.775 3.25 17.275C3.25 17.85 3.6125 18.2375 4.3625 18.2375H12H19.6375C20.3875 18.2375 20.75 17.8375 20.75 17.275C20.75 16.775 20.125 16.3625 19.6125 16.0625Z" fill="currentColor"/>
+<path d="M12 4.5C12.6904 4.5 13.25 3.94036 13.25 3.25C13.25 2.55964 12.6904 2 12 2C11.3096 2 10.75 2.55964 10.75 3.25C10.75 3.94036 11.3096 4.5 12 4.5Z" fill="currentColor"/>
 </svg>
diff --git a/res/img/element-icons/room/composer/attach.svg b/res/img/element-icons/room/composer/attach.svg
deleted file mode 100644
index 0cac44d29f..0000000000
--- a/res/img/element-icons/room/composer/attach.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15.8155 13.0336L11.2282 17.4193C9.08205 19.45 5.53015 19.6024 3.45617 17.4193C1.4888 15.3484 1.48412 12.0136 3.63032 9.98294L11.8691 2.10597C13.2999 0.752226 15.5435 0.535035 16.984 2.05147C18.5968 3.7491 18.1298 5.99061 16.699 7.34435L8.6284 14.9682C7.913 15.645 6.7551 15.7233 6.03771 14.9682C5.34842 14.2426 5.45967 13.0625 6.17507 12.3856L10.9045 7.86398" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/res/img/element-icons/room/composer/emoji.svg b/res/img/element-icons/room/composer/emoji.svg
deleted file mode 100644
index b02cb69364..0000000000
--- a/res/img/element-icons/room/composer/emoji.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <mask id="path-1-inside-1" fill="white">
-        <path fill-rule="evenodd" clip-rule="evenodd" d="M10 20C15.5228 20 20 15.5228 20 10C20 4.47715 15.5228 0 10 0C4.47715 0 0 4.47715 0 10C0 15.5228 4.47715 20 10 20ZM7.99989 7.5C7.99989 8.33 7.32989 9 6.49989 9C5.66989 9 4.99989 8.33 4.99989 7.5C4.99989 6.67 5.66989 6 6.49989 6C7.32989 6 7.99989 6.67 7.99989 7.5ZM14.9999 7.5C14.9999 8.33 14.3299 9 13.4999 9C12.6699 9 11.9999 8.33 11.9999 7.5C11.9999 6.67 12.6699 6 13.4999 6C14.3299 6 14.9999 6.67 14.9999 7.5ZM9.99989 15.5C12.3299 15.5 14.3099 14.04 15.1099 12H4.88989C5.68989 14.04 7.66989 15.5 9.99989 15.5Z"/>
-    </mask>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M10 20C15.5228 20 20 15.5228 20 10C20 4.47715 15.5228 0 10 0C4.47715 0 0 4.47715 0 10C0 15.5228 4.47715 20 10 20ZM7.99989 7.5C7.99989 8.33 7.32989 9 6.49989 9C5.66989 9 4.99989 8.33 4.99989 7.5C4.99989 6.67 5.66989 6 6.49989 6C7.32989 6 7.99989 6.67 7.99989 7.5ZM14.9999 7.5C14.9999 8.33 14.3299 9 13.4999 9C12.6699 9 11.9999 8.33 11.9999 7.5C11.9999 6.67 12.6699 6 13.4999 6C14.3299 6 14.9999 6.67 14.9999 7.5ZM9.99989 15.5C12.3299 15.5 14.3099 14.04 15.1099 12H4.88989C5.68989 14.04 7.66989 15.5 9.99989 15.5Z" fill="#737D8C"/>
-    <path d="M15.1099 12L16.0384 12.3641L16.5724 11.0026H15.1099V12ZM4.88989 12V11.0026H3.42744L3.96136 12.3641L4.88989 12ZM19.0026 10C19.0026 14.972 14.972 19.0026 10 19.0026V20.9974C16.0737 20.9974 20.9974 16.0737 20.9974 10H19.0026ZM10 0.997378C14.972 0.997378 19.0026 5.02799 19.0026 10H20.9974C20.9974 3.92632 16.0737 -0.997378 10 -0.997378V0.997378ZM0.997378 10C0.997378 5.02799 5.02799 0.997378 10 0.997378V-0.997378C3.92632 -0.997378 -0.997378 3.92632 -0.997378 10H0.997378ZM10 19.0026C5.02799 19.0026 0.997378 14.972 0.997378 10H-0.997378C-0.997378 16.0737 3.92632 20.9974 10 20.9974V19.0026ZM6.49989 9.99738C7.88073 9.99738 8.99727 8.88084 8.99727 7.5H7.00251C7.00251 7.77916 6.77906 8.00262 6.49989 8.00262V9.99738ZM4.00251 7.5C4.00251 8.88084 5.11906 9.99738 6.49989 9.99738V8.00262C6.22073 8.00262 5.99727 7.77916 5.99727 7.5H4.00251ZM6.49989 5.00262C5.11906 5.00262 4.00251 6.11916 4.00251 7.5H5.99727C5.99727 7.22084 6.22073 6.99738 6.49989 6.99738V5.00262ZM8.99727 7.5C8.99727 6.11916 7.88073 5.00262 6.49989 5.00262V6.99738C6.77906 6.99738 7.00251 7.22084 7.00251 7.5H8.99727ZM13.4999 9.99738C14.8807 9.99738 15.9973 8.88084 15.9973 7.5H14.0025C14.0025 7.77916 13.7791 8.00262 13.4999 8.00262V9.99738ZM11.0025 7.5C11.0025 8.88084 12.1191 9.99738 13.4999 9.99738V8.00262C13.2207 8.00262 12.9973 7.77916 12.9973 7.5H11.0025ZM13.4999 5.00262C12.1191 5.00262 11.0025 6.11916 11.0025 7.5H12.9973C12.9973 7.22084 13.2207 6.99738 13.4999 6.99738V5.00262ZM15.9973 7.5C15.9973 6.11916 14.8807 5.00262 13.4999 5.00262V6.99738C13.7791 6.99738 14.0025 7.22084 14.0025 7.5H15.9973ZM14.1814 11.6359C13.5241 13.3119 11.9006 14.5026 9.99989 14.5026V16.4974C12.7592 16.4974 15.0957 14.7681 16.0384 12.3641L14.1814 11.6359ZM4.88989 12.9974H15.1099V11.0026H4.88989V12.9974ZM9.99989 14.5026C8.09919 14.5026 6.47569 13.3119 5.81842 11.6359L3.96136 12.3641C4.9041 14.7681 7.24059 16.4974 9.99989 16.4974V14.5026Z" fill="#737D8C" mask="url(#path-1-inside-1)"/>
-</svg>
diff --git a/res/img/element-icons/room/composer/plain_text.svg b/res/img/element-icons/room/composer/plain_text.svg
deleted file mode 100644
index 053d41649a..0000000000
--- a/res/img/element-icons/room/composer/plain_text.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="20"
-   height="20"
-   viewBox="0 0 20 20"
-   fill="none"
-   xmlns="http://www.w3.org/2000/svg">
-    <g clip-path="url(#clip0_2168_154906)">
-        <path fill-rule="evenodd" clip-rule="evenodd" d="M14.5467 15.8667L13.6667 13.7333H7.00005L6.13338 15.8667C5.93338 16.3467 5.46672 16.6667 4.94672 16.6667C4.02672 16.6667 3.40005 15.72 3.76005 14.88L5.00323 12.0059H15.6635L16.9067 14.88C17.2667 15.72 16.6534 16.6667 15.7334 16.6667C15.2134 16.6667 14.7467 16.3467 14.5467 15.8667ZM13.6435 7.33594L11.7334 2.92C11.4934 2.36 10.9467 2 10.3334 2C9.72005 2 9.17338 2.36 8.93338 2.92L7.02326 7.33594H9.32912L10.3334 4.64L11.3376 7.33594H13.6435Z" fill="currentColor"/>
-        <path d="M1 9.67708C1 10.4104 1.6 11.0104 2.33333 11.0104H18.3333C19.0667 11.0104 19.6667 10.4104 19.6667 9.67708C19.6667 8.94375 19.0667 8.34375 18.3333 8.34375H2.33333C1.6 8.34375 1 8.94375 1 9.67708Z" fill="currentColor"/>
-    </g>
-    <defs>
-        <clipPath id="clip0_2168_154906">
-            <rect width="20" height="20" fill="white"/>
-        </clipPath>
-    </defs>
-</svg>
diff --git a/res/img/element-icons/room/composer/poll.svg b/res/img/element-icons/room/composer/poll.svg
deleted file mode 100644
index 75e74fd60a..0000000000
--- a/res/img/element-icons/room/composer/poll.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 9.5C3 9.22386 3.22386 9 3.5 9H6.5C6.77614 9 7 9.22386 7 9.5V22H3V9.5Z" fill="currentColor"/>
-<path d="M17 13.5C17 13.2239 17.2239 13 17.5 13H20.5C20.7761 13 21 13.2239 21 13.5V22H17V13.5Z" fill="currentColor"/>
-<path d="M10 2.5C10 2.22386 10.2239 2 10.5 2H13.5C13.7761 2 14 2.22386 14 2.5V22H10V2.5Z" fill="currentColor"/>
-</svg>
diff --git a/res/img/element-icons/room/composer/sticker.svg b/res/img/element-icons/room/composer/sticker.svg
deleted file mode 100644
index 3d8f445926..0000000000
--- a/res/img/element-icons/room/composer/sticker.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<mask id="path-1-inside-1" fill="white">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.83268 19.9326C3.85983 19.3544 0 15.128 0 10C0 4.47715 4.47715 0 10 0C15.1526 0 19.395 3.89699 19.9407 8.9044C19.906 8.88852 19.8701 8.87447 19.833 8.8624C16.7196 7.85038 13.2389 8.47712 10.8486 10.8893C8.46405 13.2956 7.84019 16.7967 8.83268 19.9326ZM10.7222 19.2778L19.2195 10.7805C16.7328 9.97252 14.0596 10.4993 12.2608 12.3145C10.4761 14.1155 9.94832 16.7851 10.7222 19.2778Z"/>
-</mask>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.83268 19.9326C3.85983 19.3544 0 15.128 0 10C0 4.47715 4.47715 0 10 0C15.1526 0 19.395 3.89699 19.9407 8.9044C19.906 8.88852 19.8701 8.87447 19.833 8.8624C16.7196 7.85038 13.2389 8.47712 10.8486 10.8893C8.46405 13.2956 7.84019 16.7967 8.83268 19.9326ZM10.7222 19.2778L19.2195 10.7805C16.7328 9.97252 14.0596 10.4993 12.2608 12.3145C10.4761 14.1155 9.94832 16.7851 10.7222 19.2778Z" fill="black"/>
-<path d="M8.83268 19.9326L8.7175 20.9233C9.05357 20.9624 9.38653 20.8284 9.6019 20.5675C9.81726 20.3065 9.88566 19.9542 9.78357 19.6316L8.83268 19.9326ZM19.9407 8.9044L19.5254 9.81119C19.8517 9.96064 20.2331 9.92324 20.5242 9.71327C20.8152 9.5033 20.9711 9.15314 20.9322 8.79635L19.9407 8.9044ZM19.833 8.8624L20.1413 7.91388L20.1413 7.91388L19.833 8.8624ZM10.8486 10.8893L11.557 11.5913L10.8486 10.8893ZM10.7222 19.2778L9.76968 19.5735C9.87326 19.9072 10.1439 20.1623 10.483 20.2461C10.8222 20.3298 11.1804 20.2301 11.4275 19.983L10.7222 19.2778ZM19.2195 10.7805L19.9248 11.4857C20.1702 11.2403 20.2704 10.8851 20.1894 10.5476C20.1083 10.2102 19.8578 9.93913 19.5277 9.8319L19.2195 10.7805ZM12.2608 12.3145L12.9693 13.0165L12.2608 12.3145ZM-0.997378 10C-0.997378 15.6401 3.24762 20.2874 8.7175 20.9233L8.94786 18.9419C4.47204 18.4215 0.997378 14.6158 0.997378 10H-0.997378ZM10 -0.997378C3.92632 -0.997378 -0.997378 3.92632 -0.997378 10H0.997378C0.997378 5.02799 5.02799 0.997378 10 0.997378V-0.997378ZM20.9322 8.79635C20.332 3.28845 15.6672 -0.997378 10 -0.997378V0.997378C14.638 0.997378 18.458 4.50552 18.9492 9.01244L20.9322 8.79635ZM19.5246 9.81093L19.5254 9.81119L20.356 7.9976C20.2866 7.96583 20.215 7.93783 20.1413 7.91388L19.5246 9.81093ZM11.557 11.5913C13.6521 9.47718 16.7269 8.9015 19.5246 9.81093L20.1413 7.91388C16.7123 6.79926 12.8258 7.47705 10.1401 10.1873L11.557 11.5913ZM9.78357 19.6316C8.88863 16.804 9.46516 13.7023 11.557 11.5913L10.1401 10.1873C7.46293 12.8889 6.79174 16.7894 7.88179 20.2335L9.78357 19.6316ZM11.4275 19.983L19.9248 11.4857L18.5143 10.0752L10.017 18.5725L11.4275 19.983ZM19.5277 9.8319C16.7239 8.92094 13.6455 9.50024 11.5524 11.6124L12.9693 13.0165C14.4738 11.4983 16.7417 11.0241 18.9113 11.729L19.5277 9.8319ZM11.5524 11.6124C9.47765 13.7061 8.89993 16.7721 9.76968 19.5735L11.6747 18.9821C10.9967 16.7982 11.4746 14.5248 12.9693 13.0165L11.5524 11.6124Z" fill="black" mask="url(#path-1-inside-1)"/>
-</svg>
diff --git a/res/img/element-icons/room/files.svg b/res/img/element-icons/room/files.svg
deleted file mode 100644
index 6648ab00a5..0000000000
--- a/res/img/element-icons/room/files.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 5C4 3.34315 5.34315 2 7 2H17C18.6569 2 20 3.34315 20 5V19C20 20.6569 18.6569 22 17 22H7C5.34315 22 4 20.6569 4 19V5ZM7 14.25C7 13.8358 7.33579 13.5 7.75 13.5H16.25C16.6642 13.5 17 13.8358 17 14.25C17 14.6642 16.6642 15 16.25 15H7.75C7.33579 15 7 14.6642 7 14.25ZM7.75 17C7.33579 17 7 17.3358 7 17.75C7 18.1642 7.33579 18.5 7.75 18.5H12.25C12.6642 18.5 13 18.1642 13 17.75C13 17.3358 12.6642 17 12.25 17H7.75Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/room/invite.svg b/res/img/element-icons/room/invite.svg
deleted file mode 100644
index d2ecb837b2..0000000000
--- a/res/img/element-icons/room/invite.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="-0.4 1 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.1001 9C18.7779 9 18.5168 8.73883 18.5168 8.41667V6.08333H16.1834C15.8613 6.08333 15.6001 5.82217 15.6001 5.5C15.6001 5.17783 15.8613 4.91667 16.1834 4.91667H18.5168V2.58333C18.5168 2.26117 18.7779 2 19.1001 2C19.4223 2 19.6834 2.26117 19.6834 2.58333V4.91667H22.0168C22.3389 4.91667 22.6001 5.17783 22.6001 5.5C22.6001 5.82217 22.3389 6.08333 22.0168 6.08333H19.6834V8.41667C19.6834 8.73883 19.4223 9 19.1001 9ZM19.6001 11C20.0669 11 20.5212 10.9467 20.9574 10.8458C21.1161 11.5383 21.2 12.2594 21.2 13C21.2 16.1409 19.6917 18.9294 17.3598 20.6808V20.6807C16.0014 21.7011 14.3635 22.3695 12.5815 22.5505C12.2588 22.5832 11.9314 22.6 11.6 22.6C6.29807 22.6 2 18.302 2 13C2 7.69809 6.29807 3.40002 11.6 3.40002C12.3407 3.40002 13.0618 3.48391 13.7543 3.64268C13.6534 4.07884 13.6001 4.53319 13.6001 5C13.6001 8.31371 16.2864 11 19.6001 11ZM11.5999 20.68C13.6754 20.68 15.5585 19.8567 16.9407 18.5189C16.0859 16.4086 14.0167 14.92 11.5998 14.92C9.18298 14.92 7.11378 16.4086 6.25901 18.5189C7.64115 19.8567 9.52436 20.68 11.5999 20.68ZM11.7426 7.41172C10.3168 7.54168 9.2 8.74043 9.2 10.2C9.2 11.7464 10.4536 13 12 13C13.0308 13 13.9315 12.443 14.4176 11.6135C13.0673 10.6058 12.0929 9.12248 11.7426 7.41172Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/room/message-bar/edit.svg b/res/img/element-icons/room/message-bar/edit.svg
deleted file mode 100644
index 3d823b165e..0000000000
--- a/res/img/element-icons/room/message-bar/edit.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 14L15 14" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 10.5L12 3.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/res/img/element-icons/room/message-bar/emoji.svg b/res/img/element-icons/room/message-bar/emoji.svg
deleted file mode 100644
index d34a88ed50..0000000000
--- a/res/img/element-icons/room/message-bar/emoji.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M20 1C19.4477 1 19 1.44772 19 2V4H17C16.4477 4 16 4.44771 16 5C16 5.55228 16.4477 6 17 6H19V8C19 8.55228 19.4477 9 20 9C20.5523 9 21 8.55228 21 8V6H23C23.5523 6 24 5.55228 24 5C24 4.44772 23.5523 4 23 4H21V2C21 1.44772 20.5523 1 20 1ZM7 9.5C7 8.67 7.67 8 8.5 8C9.33 8 10 8.67 10 9.5C10 10.33 9.33 11 8.5 11C7.67 11 7 10.33 7 9.5ZM15.5 11C16.33 11 17 10.33 17 9.5C17 8.67 16.33 8 15.5 8C14.67 8 14 8.67 14 9.5C14 10.33 14.67 11 15.5 11ZM12 17.5C14.33 17.5 16.31 16.04 17.11 14H6.89001C7.69001 16.04 9.67001 17.5 12 17.5ZM4 12C4 7.58172 7.58172 4 12 4C12.6108 4 13.2045 4.06827 13.7742 4.1972C14.3129 4.3191 14.8484 3.98125 14.9703 3.44258C15.0922 2.90392 14.7543 2.36843 14.2156 2.24653C13.502 2.08504 12.7603 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22C17.5228 22 22 17.5228 22 12C22 11.7878 21.9934 11.5771 21.9803 11.368C21.9459 10.8168 21.4711 10.3978 20.9199 10.4323C20.3687 10.4667 19.9498 10.9414 19.9842 11.4926C19.9947 11.6603 20 11.8295 20 12C20 16.4183 16.4183 20 12 20C7.58172 20 4 16.4183 4 12Z" fill="currentColor"/>
-</svg>
diff --git a/res/img/element-icons/room/message-bar/star.svg b/res/img/element-icons/room/message-bar/star.svg
deleted file mode 100644
index 73898d9a45..0000000000
--- a/res/img/element-icons/room/message-bar/star.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"  width="21.87" height="20.801"><path fill="currentColor" d="m4.178 20.801 6.758-4.91 6.756 4.91-2.58-7.946 6.758-4.91h-8.352L10.936 0 8.354 7.945H0l6.758 4.91-2.58 7.946z"/></svg> 
\ No newline at end of file
diff --git a/res/img/element-icons/room/pin-upright.svg b/res/img/element-icons/room/pin-upright.svg
deleted file mode 100644
index 9297f62a02..0000000000
--- a/res/img/element-icons/room/pin-upright.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11 18.5982V15H13V18.5982C13 20.5 12.2383 22 12 22C11.7617 22 11 20.5 11 18.5982Z" fill="black"/>
-<path d="M9.5 6C9.17534 5.83333 7.78566 5.2 6.61693 4C5.4482 2.8 6.12239 2 7.13026 2H12V6H9.5Z" fill="black"/>
-<path d="M14.5 6C14.8247 5.83333 16.2143 5.2 17.3831 4C18.5518 2.8 17.8776 2 16.8697 2H12V6H14.5Z" fill="black"/>
-<path d="M9.42857 6H14.5714L15 10H9L9.42857 6Z" fill="black"/>
-<path d="M12 9C8.93114 9 6.32353 10.6927 5.37867 13.0483C4.96746 14.0735 5.89543 15 7 15H17C18.1046 15 19.0325 14.0735 18.6213 13.0483C17.6765 10.6927 15.0689 9 12 9Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/room/pin.svg b/res/img/element-icons/room/pin.svg
deleted file mode 100644
index f090f60be8..0000000000
--- a/res/img/element-icons/room/pin.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="m11.068 2c-0.32021 4.772e-4 -0.66852 0.17244-0.96484 0.46875-2.5464 2.5435-5.0905 5.0892-7.6348 7.6348-0.79016 0.7902-0.69302 1.9462 1.1641 1.9707 1.855 0.02447 3.4407-0.56671 3.8281-0.69141l2.4355 3.1445c-0.83503 1.9462-0.86902 4.062-0.058594 5.7949 0.47213 1.0095 1.79 1.0049 2.5781 0.2168l3.2773-3.2773 2.8223 2.8223c1.491 1.491 3.2644 2.0696 3.4512 1.8828s-0.39181-1.9602-1.8828-3.4512l-2.8223-2.8223 3.2773-3.2773c0.788-0.788 0.79075-2.106-0.21875-2.5781-1.733-0.81044-3.8468-0.77643-5.793 0.058594l-3.1445-2.4355c0.1247-0.38742 0.71588-1.9731 0.69141-3.8281-0.015311-1.1607-0.47217-1.6336-1.0059-1.6328z" fill="#737d8c"/>
-</svg>
diff --git a/res/img/element-icons/room/search-inset.svg b/res/img/element-icons/room/search-inset.svg
deleted file mode 100644
index 699cdd1d00..0000000000
--- a/res/img/element-icons/room/search-inset.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM11 14C12.6569 14 14 12.6569 14 11C14 9.34315 12.6569 8 11 8C9.34315 8 8 9.34315 8 11C8 12.6569 9.34315 14 11 14ZM16 11C16 12.0191 15.6951 12.967 15.1716 13.7574L17.2071 15.7929C17.5976 16.1834 17.5976 16.8166 17.2071 17.2071C16.8166 17.5976 16.1834 17.5976 15.7929 17.2071L13.7574 15.1716C12.967 15.6951 12.0191 16 11 16C8.23858 16 6 13.7614 6 11C6 8.23858 8.23858 6 11 6C13.7614 6 16 8.23858 16 11Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/room/settings/advanced.svg b/res/img/element-icons/room/settings/advanced.svg
index 734ae543ea..2adbc7d3de 100644
--- a/res/img/element-icons/room/settings/advanced.svg
+++ b/res/img/element-icons/room/settings/advanced.svg
@@ -1,3 +1,3 @@
 <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17 13.89C17 15.0256 16.1603 16 14.9272 16H3.08038C1.83972 16 1 15.0256 1 13.89C1 13.5371 1.09078 13.1841 1.27234 12.8542L7.20331 2.08951C7.60426 1.36061 8.30024 1 9.00378 1C9.70733 1 10.3957 1.34527 10.7967 2.08951L16.7277 12.8542C16.9092 13.1841 17 13.5371 17 13.89ZM8.92011 5.00263C8.35011 5.04263 7.93011 5.54264 7.98011 6.11264L8.28011 9.85C8.31011 10.2 8.58011 10.47 8.93011 10.5H8.99011C9.36011 10.5 9.67011 10.22 9.70011 9.85L10.0401 6.11264V5.95264C9.98011 5.38264 9.48011 4.96263 8.92011 5.00263ZM10 12.5C10 13.0523 9.55229 13.5 9 13.5C8.44772 13.5 8 13.0523 8 12.5C8 11.9477 8.44772 11.5 9 11.5C9.55229 11.5 10 11.9477 10 12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 13.89C17 15.0256 16.1603 16 14.9272 16H3.08038C1.83972 16 1 15.0256 1 13.89C1 13.5371 1.09078 13.1841 1.27234 12.8542L7.20331 2.08951C7.60426 1.36061 8.30024 1 9.00378 1C9.70733 1 10.3957 1.34527 10.7967 2.08951L16.7277 12.8542C16.9092 13.1841 17 13.5371 17 13.89ZM8.92011 5.00263C8.35011 5.04263 7.93011 5.54264 7.98011 6.11264L8.28011 9.85C8.31011 10.2 8.58011 10.47 8.93011 10.5H8.99011C9.36011 10.5 9.67011 10.22 9.70011 9.85L10.0401 6.11264V5.95264C9.98011 5.38264 9.48011 4.96263 8.92011 5.00263ZM10 12.5C10 13.0523 9.55229 13.5 9 13.5C8.44772 13.5 8 13.0523 8 12.5C8 11.9477 8.44772 11.5 9 11.5C9.55229 11.5 10 11.9477 10 12.5Z" fill="currentColor"/>
 </svg>
diff --git a/res/img/element-icons/room/settings/roles.svg b/res/img/element-icons/room/settings/roles.svg
deleted file mode 100644
index 24bccf78f4..0000000000
--- a/res/img/element-icons/room/settings/roles.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.29794 15.1653H4.87499C3.51012 15.1653 2.83495 14.4974 2.83495 13.1254V11.7027C2.83495 11.601 2.80591 11.5212 2.73331 11.4486L1.72418 10.4396C0.758607 9.47411 0.758607 8.53043 1.72418 7.56497L2.73331 6.55595C2.80591 6.4761 2.83495 6.40351 2.83495 6.30188V4.87183C2.83495 3.49986 3.50286 2.83928 4.87499 2.83928H6.29794C6.40684 2.83928 6.47944 2.81024 6.55204 2.73039L7.56117 1.7359C8.52674 0.755915 9.47053 0.755915 10.4434 1.72864L11.4452 2.73039C11.5251 2.81024 11.5977 2.83928 11.7066 2.83928H13.1295C14.4944 2.83928 15.1623 3.50712 15.1623 4.87183V6.30188C15.1623 6.40351 15.1914 6.4761 15.2712 6.55595L16.2731 7.56497C17.2387 8.53043 17.2459 9.47411 16.2731 10.4396L15.2712 11.4486C15.1986 11.5212 15.1623 11.601 15.1623 11.7027V13.1254C15.1623 14.4902 14.4944 15.1653 13.1295 15.1653H11.7066C11.5977 15.1653 11.5324 15.187 11.4452 15.2669L10.4434 16.2759C9.47053 17.2414 8.52674 17.2414 7.56117 16.2759L6.55204 15.2669C6.47218 15.187 6.40684 15.1653 6.29794 15.1653ZM11.7631 6.11992C11.9397 5.95256 12.2186 5.96186 12.386 6.13851C12.5347 6.30586 12.5347 6.55689 12.4046 6.72425L8.48108 11.4752L8.45319 11.5124C8.19286 11.8285 7.7187 11.875 7.40259 11.6147C7.37451 11.6006 7.35173 11.576 7.33025 11.5528C7.32328 11.5452 7.31645 11.5378 7.30961 11.531L5.62678 9.59714C5.44083 9.374 5.45943 9.0393 5.68257 8.85335C5.86852 8.686 6.13814 8.686 6.33338 8.81616L7.79308 9.83887L11.7631 6.11992Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/room/share.svg b/res/img/element-icons/room/share.svg
deleted file mode 100644
index dac35ae5a7..0000000000
--- a/res/img/element-icons/room/share.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.7688 2.29289C12.3782 1.90237 11.7451 1.90237 11.3545 2.29289L6.82365 6.82378C6.43313 7.2143 6.43313 7.84747 6.82365 8.23799C7.21418 8.62851 7.84734 8.62851 8.23787 8.23799L11.0616 5.41421V10H6C4.89543 10 4 10.8954 4 12V20C4 21.1046 4.89543 22 6 22H18C19.1046 22 20 21.1046 20 20V12C20 10.8954 19.1046 10 18 10H13.0618V15C13.0618 15.5523 12.6141 16 12.0618 16C11.5095 16 11.0618 15.5523 11.0618 15V10H13.0616V5.41421L15.8854 8.23799C16.2759 8.62851 16.9091 8.62851 17.2996 8.23799C17.6902 7.84747 17.6902 7.2143 17.2996 6.82378L12.7688 2.29289Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/roomlist/browse.svg b/res/img/element-icons/roomlist/browse.svg
deleted file mode 100644
index 04714e2881..0000000000
--- a/res/img/element-icons/roomlist/browse.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="18" height="17" viewBox="0 0 18 17" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.00262 5.60945C7.02444 6.31867 7.18204 6.99371 7.45029 7.60945H5.83106L5.49798 11.0235H8.60274L8.757 9.44233C9.29964 9.94168 9.94406 10.3321 10.6556 10.579L10.6122 11.0235H12.7966C13.3489 11.0235 13.7966 11.4712 13.7966 12.0235C13.7966 12.5758 13.3489 13.0235 12.7966 13.0235H10.4171L10.1823 15.4305C10.1287 15.9802 9.63959 16.3823 9.08991 16.3287C8.54024 16.2751 8.13811 15.786 8.19174 15.2363L8.40762 13.0235H5.30286L5.06803 15.4305C5.0144 15.9802 4.52533 16.3823 3.97565 16.3287C3.42598 16.2751 3.02385 15.786 3.07748 15.2363L3.29336 13.0235H1.6665C1.11422 13.0235 0.666504 12.5758 0.666504 12.0235C0.666504 11.4712 1.11422 11.0235 1.6665 11.0235H3.48848L3.82156 7.60945H2.26807C1.71578 7.60945 1.26807 7.16173 1.26807 6.60945C1.26807 6.05716 1.71578 5.60945 2.26807 5.60945H4.01668L4.28073 2.90297C4.33436 2.3533 4.82343 1.95117 5.37311 2.0048C5.92278 2.05842 6.32491 2.5475 6.27128 3.09717L6.02618 5.60945H7.00262Z" fill="#8D99A5"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.4224 5.37843C14.4224 6.50754 13.5071 7.42287 12.3779 7.42287C11.2488 7.42287 10.3335 6.50754 10.3335 5.37843C10.3335 4.24931 11.2488 3.33398 12.3779 3.33398C13.5071 3.33398 14.4224 4.24931 14.4224 5.37843ZM15.8496 7.45454C16.2133 6.84764 16.4224 6.13745 16.4224 5.37843C16.4224 3.14474 14.6116 1.33398 12.3779 1.33398C10.1443 1.33398 8.3335 3.14474 8.3335 5.37843C8.3335 7.61211 10.1443 9.42287 12.3779 9.42287C13.1369 9.42287 13.8471 9.21381 14.454 8.85013C14.4853 8.89368 14.5205 8.93528 14.5597 8.97444L16.293 10.7078C16.6835 11.0983 17.3167 11.0983 17.7072 10.7078C18.0977 10.3172 18.0977 9.68408 17.7072 9.29356L15.9739 7.56023C15.9347 7.52107 15.8931 7.48584 15.8496 7.45454Z" fill="#8D99A5"/>
-</svg>
diff --git a/res/img/element-icons/roomlist/dialpad.svg b/res/img/element-icons/roomlist/dialpad.svg
deleted file mode 100644
index b51d4a4dc9..0000000000
--- a/res/img/element-icons/roomlist/dialpad.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.99999 15.8335C9.08333 15.8335 8.33333 16.5835 8.33333 17.5002C8.33333 18.4168 9.08333 19.1668 9.99999 19.1668C10.9167 19.1668 11.6667 18.4168 11.6667 17.5002C11.6667 16.5835 10.9167 15.8335 9.99999 15.8335ZM4.99999 0.833496C4.08333 0.833496 3.33333 1.5835 3.33333 2.50016C3.33333 3.41683 4.08333 4.16683 4.99999 4.16683C5.91666 4.16683 6.66666 3.41683 6.66666 2.50016C6.66666 1.5835 5.91666 0.833496 4.99999 0.833496ZM4.99999 5.8335C4.08333 5.8335 3.33333 6.5835 3.33333 7.50016C3.33333 8.41683 4.08333 9.16683 4.99999 9.16683C5.91666 9.16683 6.66666 8.41683 6.66666 7.50016C6.66666 6.5835 5.91666 5.8335 4.99999 5.8335ZM4.99999 10.8335C4.08333 10.8335 3.33333 11.5835 3.33333 12.5002C3.33333 13.4168 4.08333 14.1668 4.99999 14.1668C5.91666 14.1668 6.66666 13.4168 6.66666 12.5002C6.66666 11.5835 5.91666 10.8335 4.99999 10.8335ZM15 4.16683C15.9167 4.16683 16.6667 3.41683 16.6667 2.50016C16.6667 1.5835 15.9167 0.833496 15 0.833496C14.0833 0.833496 13.3333 1.5835 13.3333 2.50016C13.3333 3.41683 14.0833 4.16683 15 4.16683ZM9.99999 10.8335C9.08333 10.8335 8.33333 11.5835 8.33333 12.5002C8.33333 13.4168 9.08333 14.1668 9.99999 14.1668C10.9167 14.1668 11.6667 13.4168 11.6667 12.5002C11.6667 11.5835 10.9167 10.8335 9.99999 10.8335ZM15 10.8335C14.0833 10.8335 13.3333 11.5835 13.3333 12.5002C13.3333 13.4168 14.0833 14.1668 15 14.1668C15.9167 14.1668 16.6667 13.4168 16.6667 12.5002C16.6667 11.5835 15.9167 10.8335 15 10.8335ZM15 5.8335C14.0833 5.8335 13.3333 6.5835 13.3333 7.50016C13.3333 8.41683 14.0833 9.16683 15 9.16683C15.9167 9.16683 16.6667 8.41683 16.6667 7.50016C16.6667 6.5835 15.9167 5.8335 15 5.8335ZM9.99999 5.8335C9.08333 5.8335 8.33333 6.5835 8.33333 7.50016C8.33333 8.41683 9.08333 9.16683 9.99999 9.16683C10.9167 9.16683 11.6667 8.41683 11.6667 7.50016C11.6667 6.5835 10.9167 5.8335 9.99999 5.8335ZM9.99999 0.833496C9.08333 0.833496 8.33333 1.5835 8.33333 2.50016C8.33333 3.41683 9.08333 4.16683 9.99999 4.16683C10.9167 4.16683 11.6667 3.41683 11.6667 2.50016C11.6667 1.5835 10.9167 0.833496 9.99999 0.833496Z" fill="#8D99A5"/>
-</svg>
diff --git a/res/img/element-icons/roomlist/explore.svg b/res/img/element-icons/roomlist/explore.svg
deleted file mode 100644
index 3786ce1153..0000000000
--- a/res/img/element-icons/roomlist/explore.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17 9C17 13.4183 13.4183 17 9 17C4.58172 17 1 13.4183 1 9C1 4.58172 4.58172 1 9 1C13.4183 1 17 4.58172 17 9ZM13.375 5.3266C13.5583 4.92826 13.0716 4.44152 12.6733 4.62491L7.66968 6.9285C7.33893 7.08077 7.08014 7.33956 6.92787 7.67031L4.62428 12.6739C4.44089 13.0722 4.92763 13.559 5.32597 13.3756L10.3295 11.072C10.6603 10.9197 10.9191 10.6609 11.0714 10.3302L13.375 5.3266Z" fill="black"/>
-<path d="M9.8835 9.88413C9.39534 10.3723 8.60389 10.3723 8.11573 9.88413C7.62757 9.39597 7.62757 8.60452 8.11573 8.11636C8.60389 7.62821 9.39534 7.62821 9.8835 8.11636C10.3717 8.60452 10.3717 9.39597 9.8835 9.88413Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/roomlist/hash-circle.svg b/res/img/element-icons/roomlist/hash-circle.svg
deleted file mode 100644
index a6bf54fb23..0000000000
--- a/res/img/element-icons/roomlist/hash-circle.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <mask id="path-1-inside-1" fill="white">
-        <path fill-rule="evenodd" clip-rule="evenodd" d="M9 17C13.4183 17 17 13.4183 17 9C17 4.58172 13.4183 1 9 1C4.58172 1 1 4.58172 1 9C1 13.4183 4.58172 17 9 17ZM8.33969 5.15616C8.38275 4.74419 8.0837 4.37532 7.67173 4.33225C7.25976 4.28918 6.89088 4.58824 6.84781 5.00021L6.68776 6.53131H5.65625C5.24204 6.53131 4.90625 6.8671 4.90625 7.28131C4.90625 7.69552 5.24204 8.03131 5.65625 8.03131H6.53095L6.32841 9.96881H5.39062C4.97641 9.96881 4.64062 10.3046 4.64062 10.7188C4.64062 11.133 4.97641 11.4688 5.39062 11.4688H6.17161L6.01969 12.9221C5.97662 13.3341 6.27568 13.7029 6.68765 13.746C7.09962 13.7891 7.46849 13.49 7.51156 13.078L7.67978 11.4688H9.49973L9.34781 12.9221C9.30475 13.3341 9.6038 13.7029 10.0158 13.746C10.4277 13.7891 10.7966 13.49 10.8397 13.078L11.0079 11.4688H12.2969C12.7111 11.4688 13.0469 11.133 13.0469 10.7188C13.0469 10.3046 12.7111 9.96881 12.2969 9.96881H11.1647L11.3673 8.03131H12.2969C12.7111 8.03131 13.0469 7.69552 13.0469 7.28131C13.0469 6.8671 12.7111 6.53131 12.2969 6.53131H11.5241L11.6678 5.15616C11.7109 4.74419 11.4118 4.37532 10.9999 4.33225C10.5879 4.28918 10.219 4.58824 10.1759 5.00021L10.0159 6.53131H8.19593L8.33969 5.15616ZM9.65654 9.96881H7.83659L8.03913 8.03131H9.85908L9.65654 9.96881Z"/>
-    </mask>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M9 17C13.4183 17 17 13.4183 17 9C17 4.58172 13.4183 1 9 1C4.58172 1 1 4.58172 1 9C1 13.4183 4.58172 17 9 17ZM8.33969 5.15616C8.38275 4.74419 8.0837 4.37532 7.67173 4.33225C7.25976 4.28918 6.89088 4.58824 6.84781 5.00021L6.68776 6.53131H5.65625C5.24204 6.53131 4.90625 6.8671 4.90625 7.28131C4.90625 7.69552 5.24204 8.03131 5.65625 8.03131H6.53095L6.32841 9.96881H5.39062C4.97641 9.96881 4.64062 10.3046 4.64062 10.7188C4.64062 11.133 4.97641 11.4688 5.39062 11.4688H6.17161L6.01969 12.9221C5.97662 13.3341 6.27568 13.7029 6.68765 13.746C7.09962 13.7891 7.46849 13.49 7.51156 13.078L7.67978 11.4688H9.49973L9.34781 12.9221C9.30475 13.3341 9.6038 13.7029 10.0158 13.746C10.4277 13.7891 10.7966 13.49 10.8397 13.078L11.0079 11.4688H12.2969C12.7111 11.4688 13.0469 11.133 13.0469 10.7188C13.0469 10.3046 12.7111 9.96881 12.2969 9.96881H11.1647L11.3673 8.03131H12.2969C12.7111 8.03131 13.0469 7.69552 13.0469 7.28131C13.0469 6.8671 12.7111 6.53131 12.2969 6.53131H11.5241L11.6678 5.15616C11.7109 4.74419 11.4118 4.37532 10.9999 4.33225C10.5879 4.28918 10.219 4.58824 10.1759 5.00021L10.0159 6.53131H8.19593L8.33969 5.15616ZM9.65654 9.96881H7.83659L8.03913 8.03131H9.85908L9.65654 9.96881Z" fill="currentColor"/>
-    <path d="M7.67173 4.33225L7.5331 5.65836H7.5331L7.67173 4.33225ZM8.33969 5.15616L9.66579 5.29479V5.29479L8.33969 5.15616ZM6.84781 5.00021L5.52171 4.86158L5.52171 4.86158L6.84781 5.00021ZM6.68776 6.53131V7.86464H7.88898L8.01387 6.66994L6.68776 6.53131ZM6.53095 8.03131L7.85706 8.16994L8.01093 6.69798H6.53095V8.03131ZM6.32841 9.96881V11.3021H7.52963L7.65452 10.1074L6.32841 9.96881ZM6.17161 11.4688L7.49772 11.6074L7.65159 10.1355H6.17161V11.4688ZM6.01969 12.9221L4.69358 12.7835V12.7835L6.01969 12.9221ZM6.68765 13.746L6.82628 12.4199H6.82627L6.68765 13.746ZM7.51156 13.078L8.83767 13.2167L8.83767 13.2167L7.51156 13.078ZM7.67978 11.4688V10.1355H6.47857L6.35368 11.3302L7.67978 11.4688ZM9.49973 11.4688L10.8258 11.6074L10.9797 10.1355H9.49973V11.4688ZM9.34781 12.9221L10.6739 13.0607V13.0607L9.34781 12.9221ZM10.0158 13.746L10.1544 12.4199H10.1544L10.0158 13.746ZM10.8397 13.078L12.1658 13.2167V13.2167L10.8397 13.078ZM11.0079 11.4688V10.1355H9.80669L9.6818 11.3302L11.0079 11.4688ZM11.1647 9.96881L9.83861 9.83018L9.68473 11.3021H11.1647V9.96881ZM11.3673 8.03131V6.69798H10.166L10.0411 7.89268L11.3673 8.03131ZM11.5241 6.53131L10.198 6.39268L10.0441 7.86464H11.5241V6.53131ZM11.6678 5.15616L10.3417 5.01754V5.01754L11.6678 5.15616ZM10.9999 4.33225L11.1385 3.00614H11.1385L10.9999 4.33225ZM10.1759 5.00021L8.84983 4.86158L8.84983 4.86158L10.1759 5.00021ZM10.0159 6.53131V7.86464H11.2171L11.342 6.66994L10.0159 6.53131ZM8.19593 6.53131L6.86982 6.39268L6.71595 7.86464H8.19593V6.53131ZM7.83659 9.96881L6.51048 9.83018L6.35661 11.3021H7.83659V9.96881ZM9.65654 9.96881V11.3021H10.8578L10.9826 10.1074L9.65654 9.96881ZM8.03913 8.03131V6.69798H6.83791L6.71302 7.89268L8.03913 8.03131ZM9.85908 8.03131L11.1852 8.16994L11.3391 6.69798H9.85908V8.03131ZM15.6667 9C15.6667 12.6819 12.6819 15.6667 9 15.6667V18.3333C14.1547 18.3333 18.3333 14.1547 18.3333 9H15.6667ZM9 2.33333C12.6819 2.33333 15.6667 5.3181 15.6667 9H18.3333C18.3333 3.84534 14.1547 -0.333333 9 -0.333333V2.33333ZM2.33333 9C2.33333 5.3181 5.3181 2.33333 9 2.33333V-0.333333C3.84534 -0.333333 -0.333333 3.84534 -0.333333 9H2.33333ZM9 15.6667C5.3181 15.6667 2.33333 12.6819 2.33333 9H-0.333333C-0.333333 14.1547 3.84534 18.3333 9 18.3333V15.6667ZM7.5331 5.65836C7.21268 5.62486 6.98008 5.33796 7.01358 5.01754L9.66579 5.29479C9.78542 4.15043 8.95471 3.12577 7.81035 3.00614L7.5331 5.65836ZM8.17392 5.13884C8.14043 5.45925 7.85352 5.69185 7.5331 5.65836L7.81035 3.00614C6.666 2.88652 5.64134 3.71722 5.52171 4.86158L8.17392 5.13884ZM8.01387 6.66994L8.17392 5.13883L5.52171 4.86158L5.36165 6.39268L8.01387 6.66994ZM5.65625 7.86464H6.68776V5.19798H5.65625V7.86464ZM6.23958 7.28131C6.23958 7.60348 5.97842 7.86464 5.65625 7.86464V5.19798C4.50566 5.19798 3.57292 6.13072 3.57292 7.28131H6.23958ZM5.65625 6.69798C5.97842 6.69798 6.23958 6.95914 6.23958 7.28131H3.57292C3.57292 8.4319 4.50566 9.36464 5.65625 9.36464V6.69798ZM6.53095 6.69798H5.65625V9.36464H6.53095V6.69798ZM7.65452 10.1074L7.85706 8.16994L5.20485 7.89268L5.00231 9.83018L7.65452 10.1074ZM5.39062 11.3021H6.32841V8.63548H5.39062V11.3021ZM5.97396 10.7188C5.97396 11.041 5.71279 11.3021 5.39062 11.3021V8.63548C4.24003 8.63548 3.30729 9.56822 3.30729 10.7188H5.97396ZM5.39062 10.1355C5.71279 10.1355 5.97396 10.3966 5.97396 10.7188H3.30729C3.30729 11.8694 4.24003 12.8021 5.39062 12.8021V10.1355ZM6.17161 10.1355H5.39062V12.8021H6.17161V10.1355ZM7.3458 13.0607L7.49772 11.6074L4.8455 11.3302L4.69358 12.7835L7.3458 13.0607ZM6.82627 12.4199C7.14669 12.4534 7.37929 12.7403 7.3458 13.0607L4.69358 12.7835C4.57396 13.9278 5.40466 14.9525 6.54902 15.0721L6.82627 12.4199ZM6.18545 12.9394C6.21895 12.619 6.50585 12.3864 6.82628 12.4199L6.54902 15.0721C7.69338 15.1917 8.71804 14.361 8.83767 13.2167L6.18545 12.9394ZM6.35368 11.3302L6.18545 12.9394L8.83767 13.2167L9.00589 11.6074L6.35368 11.3302ZM9.49973 10.1355H7.67978V12.8021H9.49973V10.1355ZM10.6739 13.0607L10.8258 11.6074L8.17363 11.3302L8.02171 12.7835L10.6739 13.0607ZM10.1544 12.4199C10.4748 12.4534 10.7074 12.7403 10.6739 13.0607L8.02171 12.7835C7.90208 13.9278 8.73279 14.9525 9.87715 15.0721L10.1544 12.4199ZM9.51358 12.9394C9.54707 12.619 9.83398 12.3864 10.1544 12.4199L9.87714 15.0721C11.0215 15.1917 12.0462 14.361 12.1658 13.2167L9.51358 12.9394ZM9.6818 11.3302L9.51358 12.9394L12.1658 13.2167L12.334 11.6074L9.6818 11.3302ZM12.2969 10.1355H11.0079V12.8021H12.2969V10.1355ZM11.7135 10.7188C11.7135 10.3966 11.9747 10.1355 12.2969 10.1355V12.8021C13.4475 12.8021 14.3802 11.8694 14.3802 10.7188H11.7135ZM12.2969 11.3021C11.9747 11.3021 11.7135 11.041 11.7135 10.7188H14.3802C14.3802 9.56822 13.4475 8.63548 12.2969 8.63548V11.3021ZM11.1647 11.3021H12.2969V8.63548H11.1647V11.3021ZM10.0411 7.89268L9.83861 9.83018L12.4908 10.1074L12.6934 8.16994L10.0411 7.89268ZM12.2969 6.69798H11.3673V9.36464H12.2969V6.69798ZM11.7135 7.28131C11.7135 6.95914 11.9747 6.69798 12.2969 6.69798V9.36464C13.4475 9.36464 14.3802 8.4319 14.3802 7.28131H11.7135ZM12.2969 7.86464C11.9747 7.86464 11.7135 7.60348 11.7135 7.28131H14.3802C14.3802 6.13072 13.4475 5.19798 12.2969 5.19798V7.86464ZM11.5241 7.86464H12.2969V5.19798H11.5241V7.86464ZM10.3417 5.01754L10.198 6.39268L12.8502 6.66994L12.9939 5.29479L10.3417 5.01754ZM10.8612 5.65836C10.5408 5.62486 10.3082 5.33796 10.3417 5.01754L12.9939 5.29479C13.1135 4.15043 12.2828 3.12577 11.1385 3.00614L10.8612 5.65836ZM11.502 5.13884C11.4686 5.45925 11.1816 5.69185 10.8612 5.65836L11.1385 3.00614C9.99412 2.88652 8.96946 3.71722 8.84983 4.86158L11.502 5.13884ZM11.342 6.66994L11.502 5.13883L8.84983 4.86158L8.68978 6.39268L11.342 6.66994ZM8.19593 7.86464H10.0159V5.19798H8.19593V7.86464ZM7.01358 5.01754L6.86982 6.39268L9.52204 6.66994L9.66579 5.29479L7.01358 5.01754ZM7.83659 11.3021H9.65654V8.63548H7.83659V11.3021ZM6.71302 7.89268L6.51048 9.83018L9.16269 10.1074L9.36523 8.16994L6.71302 7.89268ZM9.85908 6.69798H8.03913V9.36464H9.85908V6.69798ZM10.9826 10.1074L11.1852 8.16994L8.53297 7.89268L8.33043 9.83018L10.9826 10.1074Z" fill="currentColor" mask="url(#path-1-inside-1)"/>
-</svg>
diff --git a/res/img/element-icons/roomlist/hash-plus.svg b/res/img/element-icons/roomlist/hash-plus.svg
deleted file mode 100644
index 326716ebe6..0000000000
--- a/res/img/element-icons/roomlist/hash-plus.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.393 1.00262C11.9421 1.06122 12.3398 1.55392 12.2812 2.10309L12.0245 4.50857H13.8482C14.4004 4.50857 14.8482 4.95628 14.8482 5.50857C14.8482 6.06085 14.4004 6.50857 13.8482 6.50857H13.0598C12.6805 5.45391 11.6713 4.69975 10.486 4.69975C9.30072 4.69975 8.29156 5.45391 7.91221 6.50857H6.36671L6.19745 8.09457C5.28778 8.53869 4.66113 9.47279 4.66113 10.5533C4.66113 11.4255 5.06957 12.2024 5.70563 12.7031L5.55614 14.1039C5.49753 14.6531 5.00484 15.0507 4.45567 14.9921C3.9065 14.9335 3.50883 14.4408 3.56743 13.8917L3.79316 11.7765H2.00049C1.4482 11.7765 1.00049 11.3288 1.00049 10.7765C1.00049 10.2242 1.4482 9.77651 2.00049 9.77651H4.0066L4.35535 6.50857H2.64186C2.08958 6.50857 1.64186 6.06085 1.64186 5.50857C1.64186 4.95628 2.08958 4.50857 2.64186 4.50857H4.56879L4.84815 1.89085C4.90676 1.34169 5.39946 0.94401 5.94862 1.00262C6.49779 1.06122 6.89547 1.55392 6.83686 2.10309L6.58015 4.50857H10.0131L10.2925 1.89085C10.3511 1.34169 10.8438 0.94401 11.393 1.00262Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.4108 7.28091C11.4108 6.72863 10.963 6.28091 10.4108 6.28091C9.85847 6.28091 9.41076 6.72863 9.41076 7.28091L9.41076 9.44016H7.28076C6.72848 9.44016 6.28076 9.88787 6.28076 10.4402C6.28076 10.9924 6.72848 11.4402 7.28076 11.4402H9.41076L9.41076 13.5994C9.41076 14.1517 9.85847 14.5994 10.4108 14.5994C10.963 14.5994 11.4108 14.1517 11.4108 13.5994V11.4402H13.539C14.0913 11.4402 14.539 10.9924 14.539 10.4402C14.539 9.88787 14.0913 9.44016 13.539 9.44016H11.4108V7.28091Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/roomlist/hash-search.svg b/res/img/element-icons/roomlist/hash-search.svg
deleted file mode 100644
index 1ea5950232..0000000000
--- a/res/img/element-icons/roomlist/hash-search.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M10.393 1.0028C10.9421 1.06141 11.3398 1.5541 11.2812 2.10327L11.0245 4.50875H12.8482C13.4005 4.50875 13.8482 4.95647 13.8482 5.50875C13.8482 6.06103 13.4005 6.50875 12.8482 6.50875H12.6234C12.0135 6.18307 11.3277 6.00024 10.6028 6.00024C9.87794 6.00024 9.19219 6.18307 8.58222 6.50875H5.36673L5.01797 9.77669H6.14293C6.04993 10.1746 6.0005 10.5915 6.0005 11.0209C6.0005 11.2778 6.01819 11.5302 6.0523 11.7767H4.80453L4.55616 14.1041C4.49755 14.6532 4.00485 15.0509 3.45569 14.9923C2.90652 14.9337 2.50884 14.441 2.56745 13.8918L2.79318 11.7767H1.0005C0.448219 11.7767 0.00050354 11.329 0.00050354 10.7767C0.00050354 10.2244 0.448219 9.77669 1.0005 9.77669H3.00661L3.35537 6.50875H1.64188C1.0896 6.50875 0.64188 6.06103 0.64188 5.50875C0.64188 4.95647 1.0896 4.50875 1.64188 4.50875H3.56881L3.84817 1.89104C3.90677 1.34187 4.39947 0.944193 4.94864 1.0028C5.49781 1.06141 5.89548 1.5541 5.83688 2.10327L5.58016 4.50875H9.01315L9.29251 1.89104C9.35111 1.34187 9.84381 0.944193 10.393 1.0028Z" fill="#737D8C"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.3731 10.6811C12.3731 11.6155 11.6156 12.3731 10.6811 12.3731C9.74669 12.3731 8.98917 11.6155 8.98917 10.6811C8.98917 9.74667 9.74669 8.98915 10.6811 8.98915C11.6156 8.98915 12.3731 9.74667 12.3731 10.6811ZM13.5542 12.3993C13.8552 11.897 14.0283 11.3093 14.0283 10.6811C14.0283 8.83254 12.5297 7.33398 10.6811 7.33398C8.83255 7.33398 7.33398 8.83254 7.33398 10.6811C7.33398 12.5297 8.83255 14.0282 10.6811 14.0282C11.3093 14.0282 11.897 13.8552 12.3992 13.5542C12.4251 13.5903 12.4543 13.6247 12.4867 13.6571L13.9212 15.0916C14.2444 15.4148 14.7684 15.4148 15.0916 15.0916C15.4148 14.7684 15.4148 14.2444 15.0916 13.9212L13.6571 12.4867C13.6247 12.4543 13.5903 12.4252 13.5542 12.3993Z" fill="#737D8C"/>
-</svg>
diff --git a/res/img/element-icons/roomlist/hash.svg b/res/img/element-icons/roomlist/hash.svg
deleted file mode 100644
index 6388116ab0..0000000000
--- a/res/img/element-icons/roomlist/hash.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.82942 1.08081C6.8741 0.622751 6.539 0.215191 6.08094 0.170502C5.62287 0.125813 5.21531 0.460918 5.17062 0.918981L4.85379 4.16656H2.66669C2.20645 4.16656 1.83335 4.53966 1.83335 4.9999C1.83335 5.46013 2.20645 5.83323 2.66669 5.83323H4.69119L4.26842 10.1666H2.00002C1.53978 10.1666 1.16669 10.5397 1.16669 10.9999C1.16669 11.4601 1.53978 11.8332 2.00002 11.8332H4.10582L3.83729 14.5856C3.7926 15.0437 4.12771 15.4513 4.58577 15.496C5.04383 15.5406 5.45139 15.2055 5.49608 14.7475L5.7804 11.8332H9.77249L9.50396 14.5856C9.45927 15.0437 9.79437 15.4513 10.2524 15.496C10.7105 15.5406 11.1181 15.2055 11.1627 14.7475L11.4471 11.8332H14.3334C14.7936 11.8332 15.1667 11.4601 15.1667 10.9999C15.1667 10.5397 14.7936 10.1666 14.3334 10.1666H11.6097L12.0324 5.83323H14.3334C14.7936 5.83323 15.1667 5.46013 15.1667 4.9999C15.1667 4.53966 14.7936 4.16656 14.3334 4.16656H12.195L12.4961 1.08081C12.5408 0.622751 12.2057 0.215191 11.7476 0.170502C11.2895 0.125813 10.882 0.460918 10.8373 0.918981L10.5205 4.16656H6.52837L6.82942 1.08081ZM9.93509 10.1666L10.3579 5.83323H6.36577L5.943 10.1666H9.93509Z" fill="#737D8C"/>
-</svg>
diff --git a/res/img/element-icons/roomlist/low-priority.svg b/res/img/element-icons/roomlist/low-priority.svg
deleted file mode 100644
index 832501527b..0000000000
--- a/res/img/element-icons/roomlist/low-priority.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M10.079 1.44694C9.48309 0.85102 8.51691 0.85102 7.92099 1.44694L1.44694 7.92099C0.85102 8.51691 0.85102 9.48309 1.44694 10.079L7.92099 16.5531C8.51691 17.149 9.48309 17.149 10.079 16.5531L16.5531 10.079C17.149 9.48309 17.149 8.51691 16.5531 7.92099L10.079 1.44694ZM9 4.25C9.41421 4.25 9.75 4.58579 9.75 5V11.1893L11.4697 9.46966C11.7626 9.17677 12.2374 9.17677 12.5303 9.46966C12.8232 9.76255 12.8232 10.2374 12.5303 10.5303L9.53259 13.5281C9.52504 13.5357 9.51732 13.5431 9.50945 13.5504C9.44549 13.6097 9.37372 13.6558 9.29761 13.6886C9.20637 13.7281 9.10574 13.75 9 13.75C8.89426 13.75 8.79363 13.7281 8.70239 13.6886C8.62599 13.6556 8.55396 13.6093 8.48983 13.5498C8.48224 13.5427 8.47481 13.5355 8.46752 13.5282L5.46967 10.5303C5.17678 10.2374 5.17678 9.76255 5.46967 9.46966C5.76256 9.17677 6.23744 9.17677 6.53033 9.46966L8.25 11.1893L8.25 5C8.25 4.58579 8.58579 4.25 9 4.25Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/roomlist/mark-as-read.svg b/res/img/element-icons/roomlist/mark-as-read.svg
deleted file mode 100644
index 322fa6c791..0000000000
--- a/res/img/element-icons/roomlist/mark-as-read.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.34474 4.9093C3.03141 5.10514 3.03141 5.56147 3.34474 5.7573L7.73468 8.50101C7.89681 8.60234 8.10254 8.60234 8.26467 8.50101L12.6546 5.7573C12.9679 5.56147 12.9679 5.10514 12.6546 4.9093L8.26467 2.16559C8.10254 2.06426 7.89681 2.06426 7.73468 2.16559L3.34474 4.9093ZM14.6663 5.3333V12C14.6663 12.3536 14.5259 12.6927 14.2758 12.9428C14.0258 13.1928 13.6866 13.3333 13.333 13.3333H2.66634C2.31272 13.3333 1.97358 13.1928 1.72353 12.9428C1.47348 12.6927 1.33301 12.3536 1.33301 12V5.3333C1.33301 4.84664 1.59301 4.42664 1.97967 4.1933L7.99967 0.426636L14.0197 4.1933C14.4063 4.42664 14.6663 4.84664 14.6663 5.3333Z" fill="currentColor"/>
-</svg>
diff --git a/res/img/element-icons/roomlist/mark-as-unread.svg b/res/img/element-icons/roomlist/mark-as-unread.svg
deleted file mode 100644
index a3ea89e3e9..0000000000
--- a/res/img/element-icons/roomlist/mark-as-unread.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17 5H5C3.89543 5 3 5.89543 3 7V17.4C3 18.5046 3.89543 19.4 5 19.4H19C20.1046 19.4 21 18.5046 21 17.4V7.82929C20.6872 7.93985 20.3506 8 20 8C18.3431 8 17 6.65685 17 5ZM5.26294 10.3869C4.97723 10.2282 4.80002 9.92703 4.80002 9.60018C4.80002 8.91395 5.53722 8.48018 6.1371 8.81344L12 12.0706L17.8629 8.81344C18.4628 8.48018 19.2 8.91395 19.2 9.60018C19.2 9.92703 19.0228 10.2282 18.7371 10.3869L12.4371 13.8869C12.1653 14.0379 11.8348 14.0379 11.5629 13.8869L5.26294 10.3869Z" fill="#1B1D22"/>
-<path d="M22 5C22 6.10457 21.1046 7 20 7C18.8954 7 18 6.10457 18 5C18 3.89543 18.8954 3 20 3C21.1046 3 22 3.89543 22 5Z" fill="#1B1D22"/>
-</svg>
diff --git a/res/img/element-icons/roomlist/notifications-default.svg b/res/img/element-icons/roomlist/notifications-default.svg
index 59743f5d67..c3af0ef809 100644
--- a/res/img/element-icons/roomlist/notifications-default.svg
+++ b/res/img/element-icons/roomlist/notifications-default.svg
@@ -1,5 +1,5 @@
 <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.59 15C7.53 15.16 7.5 15.32 7.5 15.5C7.5 16.33 8.17 17 9 17C9.83 17 10.5 16.33 10.5 15.5C10.5 15.32 10.46 15.16 10.41 15H7.59Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14 10.4C14 11.31 14.49 11.9 15.09 12.25C15.5 12.49 16 12.82 16 13.22C16 13.67 15.71 13.99 15.11 13.99H9H2.89C2.29 13.99 2 13.68 2 13.22C2 12.82 2.51 12.49 2.91 12.25C3.5 11.9 4 11.3 4 10.4V7C4 4.24 6.36 2 9 2C11.64 2 14 4.24 14 7V10.4ZM11.2402 6.1226C11.4223 5.9515 11.7099 5.96101 11.8824 6.14162C12.0358 6.31272 12.0358 6.56938 11.9016 6.74048L8.92075 10.685L8.892 10.723C8.62358 11.0462 8.13469 11.0938 7.80875 10.8276C7.7798 10.8132 7.75632 10.7881 7.73417 10.7643C7.72698 10.7566 7.71994 10.749 7.71289 10.7421L6.13071 8.99336C5.93899 8.76522 5.95816 8.42302 6.18823 8.2329C6.37995 8.0618 6.65795 8.0618 6.85926 8.19488L8.21138 9.012L11.2402 6.1226Z" fill="black"/>
-<path d="M9 3C9.55228 3 10 2.55228 10 2C10 1.44772 9.55228 1 9 1C8.44772 1 8 1.44772 8 2C8 2.55228 8.44772 3 9 3Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.59 15C7.53 15.16 7.5 15.32 7.5 15.5C7.5 16.33 8.17 17 9 17C9.83 17 10.5 16.33 10.5 15.5C10.5 15.32 10.46 15.16 10.41 15H7.59Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 10.4C14 11.31 14.49 11.9 15.09 12.25C15.5 12.49 16 12.82 16 13.22C16 13.67 15.71 13.99 15.11 13.99H9H2.89C2.29 13.99 2 13.68 2 13.22C2 12.82 2.51 12.49 2.91 12.25C3.5 11.9 4 11.3 4 10.4V7C4 4.24 6.36 2 9 2C11.64 2 14 4.24 14 7V10.4ZM11.2402 6.1226C11.4223 5.9515 11.7099 5.96101 11.8824 6.14162C12.0358 6.31272 12.0358 6.56938 11.9016 6.74048L8.92075 10.685L8.892 10.723C8.62358 11.0462 8.13469 11.0938 7.80875 10.8276C7.7798 10.8132 7.75632 10.7881 7.73417 10.7643C7.72698 10.7566 7.71994 10.749 7.71289 10.7421L6.13071 8.99336C5.93899 8.76522 5.95816 8.42302 6.18823 8.2329C6.37995 8.0618 6.65795 8.0618 6.85926 8.19488L8.21138 9.012L11.2402 6.1226Z" fill="currentColor"/>
+<path d="M9 3C9.55228 3 10 2.55228 10 2C10 1.44772 9.55228 1 9 1C8.44772 1 8 1.44772 8 2C8 2.55228 8.44772 3 9 3Z" fill="currentColor"/>
 </svg>
diff --git a/res/img/element-icons/roomlist/notifications-dm.svg b/res/img/element-icons/roomlist/notifications-dm.svg
index e0bd435240..9259c4d880 100644
--- a/res/img/element-icons/roomlist/notifications-dm.svg
+++ b/res/img/element-icons/roomlist/notifications-dm.svg
@@ -1,3 +1,3 @@
 <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13 7C14.6569 7 16 5.65685 16 4C16 2.34315 14.6569 1 13 1C11.3431 1 10 2.34315 10 4C10 5.65685 11.3431 7 13 7ZM8.9677 2C6.34078 2.01817 4 4.25115 4 6.99989V10.3999C4 11.2999 3.5 11.8999 2.91 12.2499C2.51 12.4899 2 12.8199 2 13.2199C2 13.6799 2.29 13.9899 2.89 13.9899H9H15.11C15.71 13.9899 16 13.6699 16 13.2199C16 12.8199 15.5 12.4899 15.09 12.2499C14.49 11.8999 14 11.3099 14 10.3999V8.38838C13.6784 8.46136 13.3437 8.49989 13 8.49989C10.5147 8.49989 8.5 6.48517 8.5 3.99989C8.5 3.28151 8.66833 2.60245 8.9677 2ZM7.59 15C7.53 15.16 7.5 15.32 7.5 15.5C7.5 16.33 8.17 17 9 17C9.83 17 10.5 16.33 10.5 15.5C10.5 15.32 10.46 15.16 10.41 15H7.59Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 7C14.6569 7 16 5.65685 16 4C16 2.34315 14.6569 1 13 1C11.3431 1 10 2.34315 10 4C10 5.65685 11.3431 7 13 7ZM8.9677 2C6.34078 2.01817 4 4.25115 4 6.99989V10.3999C4 11.2999 3.5 11.8999 2.91 12.2499C2.51 12.4899 2 12.8199 2 13.2199C2 13.6799 2.29 13.9899 2.89 13.9899H9H15.11C15.71 13.9899 16 13.6699 16 13.2199C16 12.8199 15.5 12.4899 15.09 12.2499C14.49 11.8999 14 11.3099 14 10.3999V8.38838C13.6784 8.46136 13.3437 8.49989 13 8.49989C10.5147 8.49989 8.5 6.48517 8.5 3.99989C8.5 3.28151 8.66833 2.60245 8.9677 2ZM7.59 15C7.53 15.16 7.5 15.32 7.5 15.5C7.5 16.33 8.17 17 9 17C9.83 17 10.5 16.33 10.5 15.5C10.5 15.32 10.46 15.16 10.41 15H7.59Z" fill="currentColor"/>
 </svg>
diff --git a/res/img/element-icons/roomlist/notifications-off.svg b/res/img/element-icons/roomlist/notifications-off.svg
index c848471f63..bbc2dcfeb9 100644
--- a/res/img/element-icons/roomlist/notifications-off.svg
+++ b/res/img/element-icons/roomlist/notifications-off.svg
@@ -1,7 +1,7 @@
 <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.59 15C7.53 15.16 7.5 15.32 7.5 15.5C7.5 16.33 8.17 17 9 17C9.83 17 10.5 16.33 10.5 15.5C10.5 15.32 10.46 15.16 10.41 15H7.59Z" fill="black"/>
-<path d="M9 3C9.55228 3 10 2.55228 10 2C10 1.44772 9.55228 1 9 1C8.44772 1 8 1.44772 8 2C8 2.55228 8.44772 3 9 3Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.08 10.9698C14.03 10.7998 14 10.6098 14 10.4098V7.00977C14 4.24977 11.64 2.00977 8.99998 2.00977C7.93998 2.00977 6.92998 2.37977 6.09998 2.98977L14.08 10.9698Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4.38 5.14978C4.14 5.72978 4 6.34978 4 6.99978V10.3998C4 11.2998 3.5 11.8998 2.91 12.2498C2.51 12.4898 2 12.8198 2 13.2198C2 13.6798 2.29 13.9898 2.89 13.9898H9H13.22L4.38 5.14978Z" fill="black"/>
-<path d="M1 1L17 17" stroke="black" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.59 15C7.53 15.16 7.5 15.32 7.5 15.5C7.5 16.33 8.17 17 9 17C9.83 17 10.5 16.33 10.5 15.5C10.5 15.32 10.46 15.16 10.41 15H7.59Z" fill="currentColor"/>
+<path d="M9 3C9.55228 3 10 2.55228 10 2C10 1.44772 9.55228 1 9 1C8.44772 1 8 1.44772 8 2C8 2.55228 8.44772 3 9 3Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.08 10.9698C14.03 10.7998 14 10.6098 14 10.4098V7.00977C14 4.24977 11.64 2.00977 8.99998 2.00977C7.93998 2.00977 6.92998 2.37977 6.09998 2.98977L14.08 10.9698Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.38 5.14978C4.14 5.72978 4 6.34978 4 6.99978V10.3998C4 11.2998 3.5 11.8998 2.91 12.2498C2.51 12.4898 2 12.8198 2 13.2198C2 13.6798 2.29 13.9898 2.89 13.9898H9H13.22L4.38 5.14978Z" fill="currentColor"/>
+<path d="M1 1L17 17" stroke="currentColor" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
 </svg>
diff --git a/res/img/element-icons/roomlist/plus-circle.svg b/res/img/element-icons/roomlist/plus-circle.svg
deleted file mode 100644
index 251ded225c..0000000000
--- a/res/img/element-icons/roomlist/plus-circle.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17 9C17 13.4183 13.4183 17 9 17C4.58172 17 1 13.4183 1 9C1 4.58172 4.58172 1 9 1C13.4183 1 17 4.58172 17 9ZM5.25 9C5.25 8.58579 5.58579 8.25 6 8.25H8.25V6C8.25 5.58579 8.58579 5.25 9 5.25C9.41421 5.25 9.75 5.58579 9.75 6V8.25H12C12.4142 8.25 12.75 8.58579 12.75 9C12.75 9.41421 12.4142 9.75 12 9.75H9.75V12C9.75 12.4142 9.41421 12.75 9 12.75C8.58579 12.75 8.25 12.4142 8.25 12V9.75H6C5.58579 9.75 5.25 9.41421 5.25 9Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/settings/appearance.svg b/res/img/element-icons/settings/appearance.svg
deleted file mode 100644
index 6f91759354..0000000000
--- a/res/img/element-icons/settings/appearance.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.2962 6.95039C17.2815 8.16305 17.3023 9.84863 16.3296 11.0714C14.9497 12.806 12.5144 15 9.02365 15C5.5329 15 3.09759 12.806 1.71772 11.0714C0.744983 9.84863 0.765783 8.16305 1.75111 6.95039C3.16323 5.21247 5.6278 3 9.02365 3C12.4195 3 14.8841 5.21247 16.2962 6.95039ZM13 9C13 11.2091 11.2091 13 9 13C6.79086 13 5 11.2091 5 9C5 6.79086 6.79086 5 9 5C11.2091 5 13 6.79086 13 9ZM9 11C10.1046 11 11 10.1046 11 9C11 7.89543 10.1046 7 9 7C7.89543 7 7 7.89543 7 9C7 10.1046 7.89543 11 9 11Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/settings/devices.svg b/res/img/element-icons/settings/devices.svg
deleted file mode 100644
index 4d2f171993..0000000000
--- a/res/img/element-icons/settings/devices.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="21" height="19" viewBox="0 0 21 19" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M20 2V7.005L18 7.003V4H2V14H13V16H2C1.45 16 0.979333 15.8043 0.588 15.413C0.196 15.021 0 14.55 0 14V2C0 1.45 0.196 0.979333 0.588 0.588C0.979333 0.196 1.45 0 2 0H18C18.55 0 19.021 0.196 19.413 0.588C19.8043 0.979333 20 1.45 20 2Z" fill="currentColor"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15 8L20 8.005C20.55 8.005 21 8.45 21 9V18C21 18.55 20.55 19 20
-19H15C14.45 19 14 18.55 14 18V9C14 8.45 14.45 8 15 8ZM15 17H20V10H15V17Z" fill="currentColor"/>
-</svg>
diff --git a/res/img/element-icons/settings/flask.svg b/res/img/element-icons/settings/flask.svg
deleted file mode 100644
index 7b8f2fda62..0000000000
--- a/res/img/element-icons/settings/flask.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M6.5 3C7.32843 3 8 2.32843 8 1.5C8 0.671573 7.32843 0 6.5 0C5.67157 0 5 0.671573 5 1.5C5 2.32843 5.67157 3 6.5 3ZM15.2041 14.7404L11.598 8.73148L11.624 6.96296H12.1176C12.2554 6.96296 12.3876 6.91224 12.485 6.82194C12.5825 6.73164 12.6372 6.60918 12.6372 6.48148C12.6372 6.35378 12.5825 6.23132 12.485 6.14102C12.3876 6.05073 12.2554 6 12.1176 6H5.88237C5.74456 6 5.6124 6.05073 5.51495 6.14102C5.41751 6.23132 5.36277 6.35378 5.36277 6.48148C5.36277 6.60918 5.41751 6.73164 5.51495 6.82194C5.6124 6.91224 5.74456 6.96296 5.88237 6.96296H6.376L6.40198 8.73148L2.79592 14.7404C2.59646 15.0747 2.49454 15.4515 2.50023 15.8335C2.50591 16.2155 2.619 16.5895 2.82833 16.9186C3.03766 17.2477 3.336 17.5206 3.69389 17.7102C4.05179 17.8999 4.45686 17.9997 4.86914 18H13.1309C13.5431 17.9997 13.9482 17.8999 14.3061 17.7102C14.664 17.5206 14.9623 17.2477 15.1717 16.9186C15.381 16.5895 15.4941 16.2155 15.4998 15.8335C15.5055 15.4515 15.4035 15.0747 15.2041 14.7404ZM7.37364 9.08778C7.41831 9.01432 7.44159 8.93136 7.44118 8.84704L7.4152 6.96296H10.5848L10.5588 8.84704C10.5584 8.93136 10.5817 9.01432 10.6264 9.08778L12.4814 12.1837C11.4354 12.1572 10.3977 12.0034 9.3949 11.7263C8.31816 11.4355 7.20603 11.2721 6.08502 11.24L7.37364 9.08778ZM13 3.5C13 4.32843 12.3284 5 11.5 5C10.6716 5 10 4.32843 10 3.5C10 2.67157 10.6716 2 11.5 2C12.3284 2 13 2.67157 13 3.5Z" fill="#737D8C"/>
-</svg>
diff --git a/res/img/element-icons/settings/help.svg b/res/img/element-icons/settings/help.svg
deleted file mode 100644
index 2ac4f675ec..0000000000
--- a/res/img/element-icons/settings/help.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9 17C13.4183 17 17 13.4183 17 9C17 4.58172 13.4183 1 9 1C4.58172 1 1 4.58172 1 9C1 13.4183 4.58172 17 9 17ZM9 13.9167C9.55228 13.9167 10 13.469 10 12.9167C10 12.3644 9.55228 11.9167 9 11.9167C8.44772 11.9167 8 12.3644 8 12.9167C8 13.469 8.44772 13.9167 9 13.9167ZM7.61072 7.49307C7.61072 6.72339 8.23521 6.10417 8.99961 6.10417C9.76178 6.10417 10.3885 6.73089 10.3885 7.49307C10.3885 7.84605 10.2375 7.97202 9.64273 8.38297C9.37919 8.56505 9.01775 8.81799 8.73629 9.189C8.43501 9.58614 8.24961 10.0814 8.24961 10.7111H9.74961C9.74961 10.4027 9.83156 10.2271 9.93133 10.0956C10.0509 9.93794 10.2242 9.80442 10.4954 9.61706C10.5238 9.59739 10.5539 9.57694 10.5853 9.5556C11.0769 9.22121 11.8885 8.6692 11.8885 7.49307C11.8885 5.90248 10.5902 4.60417 8.99961 4.60417C7.41122 4.60417 6.11072 5.89054 6.11072 7.49307H7.61072Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/settings/keyboard.svg b/res/img/element-icons/settings/keyboard.svg
deleted file mode 100644
index aec7a9ec82..0000000000
--- a/res/img/element-icons/settings/keyboard.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.3333 3.33331H2.66659C1.93325 3.33331 1.33992 3.93331 1.33992 4.66665L1.33325 11.3333C1.33325 12.0666 1.93325 12.6666 2.66659 12.6666H13.3333C14.0666 12.6666 14.6666 12.0666 14.6666 11.3333V4.66665C14.6666 3.93331 14.0666 3.33331 13.3333 3.33331ZM7.33325 5.66665C7.33325 5.48255 7.48249 5.33331 7.66658 5.33331H8.33325C8.51735 5.33331 8.66658 5.48255 8.66658 5.66665V6.33331C8.66658 6.51741 8.51735 6.66665 8.33325 6.66665H7.66659C7.48249 6.66665 7.33325 6.51741 7.33325 6.33331V5.66665ZM7.33325 7.66665C7.33325 7.48255 7.48249 7.33331 7.66658 7.33331H8.33325C8.51735 7.33331 8.66658 7.48255 8.66658 7.66665V8.33331C8.66658 8.51741 8.51735 8.66665 8.33325 8.66665H7.66659C7.48249 8.66665 7.33325 8.51741 7.33325 8.33331V7.66665ZM5.33325 5.66665C5.33325 5.48255 5.48249 5.33331 5.66658 5.33331H6.33325C6.51735 5.33331 6.66658 5.48255 6.66658 5.66665V6.33331C6.66658 6.51741 6.51735 6.66665 6.33325 6.66665H5.66659C5.48249 6.66665 5.33325 6.51741 5.33325 6.33331V5.66665ZM5.33325 7.66665C5.33325 7.48255 5.48249 7.33331 5.66658 7.33331H6.33325C6.51735 7.33331 6.66658 7.48255 6.66658 7.66665V8.33331C6.66658 8.51741 6.51735 8.66665 6.33325 8.66665H5.66659C5.48249 8.66665 5.33325 8.51741 5.33325 8.33331V7.66665ZM4.66658 8.33331C4.66658 8.51741 4.51735 8.66665 4.33325 8.66665H3.66659C3.48249 8.66665 3.33325 8.51741 3.33325 8.33331V7.66665C3.33325 7.48255 3.48249 7.33331 3.66659 7.33331H4.33325C4.51735 7.33331 4.66658 7.48255 4.66658 7.66665V8.33331ZM4.66658 6.33331C4.66658 6.51741 4.51735 6.66665 4.33325 6.66665H3.66659C3.48249 6.66665 3.33325 6.51741 3.33325 6.33331V5.66665C3.33325 5.48255 3.48249 5.33331 3.66659 5.33331H4.33325C4.51735 5.33331 4.66658 5.48255 4.66658 5.66665V6.33331ZM10.6666 11C10.6666 11.1841 10.5173 11.3333 10.3333 11.3333H5.66659C5.48249 11.3333 5.33325 11.1841 5.33325 11V10.3333C5.33325 10.1492 5.48249 9.99998 5.66658 9.99998H10.3333C10.5173 9.99998 10.6666 10.1492 10.6666 10.3333V11ZM10.6666 8.33331C10.6666 8.51741 10.5173 8.66665 10.3333 8.66665H9.66658C9.48249 8.66665 9.33325 8.51741 9.33325 8.33331V7.66665C9.33325 7.48255 9.48249 7.33331 9.66658 7.33331H10.3333C10.5173 7.33331 10.6666 7.48255 10.6666 7.66665V8.33331ZM10.6666 6.33331C10.6666 6.51741 10.5173 6.66665 10.3333 6.66665H9.66658C9.48249 6.66665 9.33325 6.51741 9.33325 6.33331V5.66665C9.33325 5.48255 9.48249 5.33331 9.66658 5.33331H10.3333C10.5173 5.33331 10.6666 5.48255 10.6666 5.66665V6.33331ZM12.6666 8.33331C12.6666 8.51741 12.5173 8.66665 12.3333 8.66665H11.6666C11.4825 8.66665 11.3333 8.51741 11.3333 8.33331V7.66665C11.3333 7.48255 11.4825 7.33331 11.6666 7.33331H12.3333C12.5173 7.33331 12.6666 7.48255 12.6666 7.66665V8.33331ZM12.6666 6.33331C12.6666 6.51741 12.5173 6.66665 12.3333 6.66665H11.6666C11.4825 6.66665 11.3333 6.51741 11.3333 6.33331V5.66665C11.3333 5.48255 11.4825 5.33331 11.6666 5.33331H12.3333C12.5173 5.33331 12.6666 5.48255 12.6666 5.66665V6.33331Z" fill="#8D99A5"/>
-</svg>
diff --git a/res/img/element-icons/settings/preference.svg b/res/img/element-icons/settings/preference.svg
deleted file mode 100644
index d466662117..0000000000
--- a/res/img/element-icons/settings/preference.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6 4C3.23858 4 1 6.23858 1 9C1 11.7614 3.23858 14 6 14H12C14.7614 14 17 11.7614 17 9C17 6.23858 14.7614 4 12 4H6ZM9 9C9 10.6569 7.65685 12 6 12C4.34315 12 3 10.6569 3 9C3 7.34315 4.34315 6 6 6C7.65685 6 9 7.34315 9 9Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/settings/sidebar.svg b/res/img/element-icons/settings/sidebar.svg
deleted file mode 100644
index dddb9dca00..0000000000
--- a/res/img/element-icons/settings/sidebar.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M7.50032 2.6H13C13.2209 2.6 13.4 2.77909 13.4 3V13C13.4 13.2209 13.2209 13.4 13 13.4H7.50032V2.6ZM5.90032 2.6H3C2.77909 2.6 2.6 2.77909 2.6 3V13C2.6 13.2209 2.77909 13.4 3 13.4H5.90032V2.6ZM1 3C1 1.89543 1.89543 1 3 1H13C14.1046 1 15 1.89543 15 3V13C15 14.1046 14.1046 15 13 15H3C1.89543 15 1 14.1046 1 13V3Z" fill="#737D8C"/>
-</svg>
diff --git a/res/img/element-icons/upload.svg b/res/img/element-icons/upload.svg
deleted file mode 100644
index 71ad7ba1cf..0000000000
--- a/res/img/element-icons/upload.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.99902 14L8.99902 4" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M12.5352 7.52441L8.99944 4.00012L5.46373 7.52441" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/res/img/element-icons/view-community.svg b/res/img/element-icons/view-community.svg
deleted file mode 100644
index 9bd7115a47..0000000000
--- a/res/img/element-icons/view-community.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-    <path d="M 10,0 C 4.4771555,0 0,4.4771555 0,10 0,15.522794 4.4771555,20 10,20 15.522794,20 20,15.522794 20,10 20,4.4771555 15.522794,0 10,0 Z M 6.6660156,5 C 8.046724,5 9.166016,6.2132159 9.166016,7.7089844 c 0,1.4957686 -1.119292,2.7070316 -2.5000004,2.7070316 -1.3807186,0 -2.5,-1.211263 -2.5,-2.7070316 C 4.1660156,6.2132159 5.285297,5 6.6660156,5 Z m 7.7148434,1.6660156 c 1.209599,0 2.189453,1.0626082 2.189453,2.3730464 0,1.310399 -0.979854,2.373047 -2.189453,2.373047 -1.209598,0 -2.191406,-1.062648 -2.191406,-2.373047 0,-1.3104382 0.981808,-2.3730464 2.191406,-2.3730464 z M 6.6660156,11.666016 c 0.3297794,0 0.6529044,0.0337 0.9648438,0.0957 1.8315866,0.401198 3.2031246,2.032379 3.2031246,3.984375 v 2.210937 C 10.560013,17.985187 10.281622,18 10,18 6.8339434,18 4.1088101,16.175143 2.8105469,13.517578 3.7276213,12.387632 5.1130646,11.666016 6.6660156,11.666016 Z m 7.7148434,0.841796 c 1.064889,0 2.039663,0.386633 2.798829,1.029297 -0.890234,1.809719 -2.442617,3.229715 -4.345704,3.947266 v -1.738281 c 0,-0.954798 -0.221481,-1.85861 -0.613281,-2.66211 0.637198,-0.367798 1.375258,-0.576172 2.160156,-0.576172 z" />
-</svg>
diff --git a/res/img/external-link.svg b/res/img/external-link.svg
deleted file mode 100644
index cae1446a68..0000000000
--- a/res/img/external-link.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="11" height="10" viewBox="0 0 11 10">
-    <g fill="none" fill-rule="evenodd" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round">
-        <path d="M8.5 5.5v3a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V3a1 1 0 0 1 1-1h3M7 .5h3v3M4.5 6L10 .5"/>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/bug.svg b/res/img/feather-customised/bug.svg
index 8939f8be11..ea2e4222aa 100644
--- a/res/img/feather-customised/bug.svg
+++ b/res/img/feather-customised/bug.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12 2C9.23858 2 7 4.23858 7 7L17 7C17 4.23858 14.7614 2 12 2ZM2.29289 7.70711C1.90237 7.31658 1.90237 6.68342 2.29289 6.29289C2.68342 5.90237 3.31658 5.90237 3.70711 6.29289L6.41421 9H17.5858L20.2929 6.29289C20.6834 5.90237 21.3166 5.90237 21.7071 6.29289C22.0976 6.68342 22.0976 7.31658 21.7071 7.70711L19 10.4142V13H22C22.5523 13 23 13.4477 23 14C23 14.5523 22.5523 15 22 15H19C19 15.7795 18.8726 16.5292 18.6375 17.2295C18.6614 17.2493 18.6847 17.2705 18.7071 17.2929L21.7071 20.2929C22.0976 20.6834 22.0976 21.3166 21.7071 21.7071C21.3166 22.0976 20.6834 22.0976 20.2929 21.7071L17.6791 19.0933C16.5924 20.5983 14.9222 21.6542 13 21.9291L13 12C13 11.4477 12.5523 11 12 11C11.4477 11 11 11.4477 11 12V21.9291C9.07785 21.6542 7.40759 20.5983 6.32091 19.0933L3.70711 21.7071C3.31658 22.0976 2.68342 22.0976 2.29289 21.7071C1.90237 21.3166 1.90237 20.6834 2.29289 20.2929L5.29289 17.2929C5.31533 17.2705 5.33857 17.2493 5.36252 17.2295C5.1274 16.5292 5 15.7795 5 15H2C1.44772 15 1 14.5523 1 14C1 13.4477 1.44772 13 2 13H5V10.4142L2.29289 7.70711Z" fill="#FF5B55"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 2C9.23858 2 7 4.23858 7 7L17 7C17 4.23858 14.7614 2 12 2ZM2.29289 7.70711C1.90237 7.31658 1.90237 6.68342 2.29289 6.29289C2.68342 5.90237 3.31658 5.90237 3.70711 6.29289L6.41421 9H17.5858L20.2929 6.29289C20.6834 5.90237 21.3166 5.90237 21.7071 6.29289C22.0976 6.68342 22.0976 7.31658 21.7071 7.70711L19 10.4142V13H22C22.5523 13 23 13.4477 23 14C23 14.5523 22.5523 15 22 15H19C19 15.7795 18.8726 16.5292 18.6375 17.2295C18.6614 17.2493 18.6847 17.2705 18.7071 17.2929L21.7071 20.2929C22.0976 20.6834 22.0976 21.3166 21.7071 21.7071C21.3166 22.0976 20.6834 22.0976 20.2929 21.7071L17.6791 19.0933C16.5924 20.5983 14.9222 21.6542 13 21.9291L13 12C13 11.4477 12.5523 11 12 11C11.4477 11 11 11.4477 11 12V21.9291C9.07785 21.6542 7.40759 20.5983 6.32091 19.0933L3.70711 21.7071C3.31658 22.0976 2.68342 22.0976 2.29289 21.7071C1.90237 21.3166 1.90237 20.6834 2.29289 20.2929L5.29289 17.2929C5.31533 17.2705 5.33857 17.2493 5.36252 17.2295C5.1274 16.5292 5 15.7795 5 15H2C1.44772 15 1 14.5523 1 14C1 13.4477 1.44772 13 2 13H5V10.4142L2.29289 7.70711Z" fill="currentColor"/>
 </svg>
diff --git a/res/img/spinner/spinner-background.svg b/res/img/spinner/spinner-background.svg
deleted file mode 100644
index 085abbfc60..0000000000
--- a/res/img/spinner/spinner-background.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="15" cy="15" r="14" stroke="#E3E8F0" stroke-width="2"/>
-</svg>
diff --git a/res/img/spinner/spinner-foreground.svg b/res/img/spinner/spinner-foreground.svg
deleted file mode 100644
index 8c1c83aa94..0000000000
--- a/res/img/spinner/spinner-foreground.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M29 15C29 12.4307 28.293 9.91095 26.9563 7.7167C25.6197 5.52246 23.705 3.73836 21.4219 2.55979C19.1389 1.38123 16.5755 0.853662 14.0126 1.03487C11.4497 1.21607 8.98611 2.09906 6.8916 3.58713" stroke="#737D8C" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/res/img/voip/call-view/dialpad.svg b/res/img/voip/call-view/dialpad.svg
deleted file mode 100644
index 68f1c71b6d..0000000000
--- a/res/img/voip/call-view/dialpad.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 19C10.9 19 10 19.9 10 21C10 22.1 10.9 23 12 23C13.1 23 14 22.1 14 21C14 19.9 13.1 19 12 19ZM6 1C4.9 1 4 1.9 4 3C4 4.1 4.9 5 6 5C7.1 5 8 4.1 8 3C8 1.9 7.1 1 6 1ZM6 7C4.9 7 4 7.9 4 9C4 10.1 4.9 11 6 11C7.1 11 8 10.1 8 9C8 7.9 7.1 7 6 7ZM6 13C4.9 13 4 13.9 4 15C4 16.1 4.9 17 6 17C7.1 17 8 16.1 8 15C8 13.9 7.1 13 6 13ZM18 5C19.1 5 20 4.1 20 3C20 1.9 19.1 1 18 1C16.9 1 16 1.9 16 3C16 4.1 16.9 5 18 5ZM12 13C10.9 13 10 13.9 10 15C10 16.1 10.9 17 12 17C13.1 17 14 16.1 14 15C14 13.9 13.1 13 12 13ZM18 13C16.9 13 16 13.9 16 15C16 16.1 16.9 17 18 17C19.1 17 20 16.1 20 15C20 13.9 19.1 13 18 13ZM18 7C16.9 7 16 7.9 16 9C16 10.1 16.9 11 18 11C19.1 11 20 10.1 20 9C20 7.9 19.1 7 18 7ZM12 7C10.9 7 10 7.9 10 9C10 10.1 10.9 11 12 11C13.1 11 14 10.1 14 9C14 7.9 13.1 7 12 7ZM12 1C10.9 1 10 1.9 10 3C10 4.1 10.9 5 12 5C13.1 5 14 4.1 14 3C14 1.9 13.1 1 12 1Z" fill="#737D8C"/>
-</svg>
diff --git a/res/img/voip/silence.svg b/res/img/voip/silence.svg
deleted file mode 100644
index 332932dfff..0000000000
--- a/res/img/voip/silence.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.56986 1.82566L4 4.80054L1.5 4.80054C0.671573 4.80054 0 5.47212 0 6.30054V9.70054C0 10.529 0.671573 11.2005 1.5 11.2005L4 11.2005L7.56986 14.1754C8.05836 14.5825 8.8 14.2351 8.8 13.5993L8.8 9.70054V6.30054L8.8 2.40182C8.8 1.76595 8.05836 1.41858 7.56986 1.82566ZM14.1546 2.76877C13.9162 2.46224 13.4745 2.40702 13.1679 2.64543L13.0443 3.6318L13.0446 3.63212L13.0448 3.63238L13.0536 3.64417C13.0623 3.65582 13.0764 3.67498 13.0951 3.7013C13.1325 3.75399 13.1883 3.83518 13.2564 3.94222C13.3929 4.15668 13.5774 4.47271 13.7624 4.86922C14.1345 5.66647 14.4965 6.763 14.4965 8.00044C14.4965 9.23789 14.1345 10.3344 13.7624 11.1317C13.5774 11.5282 13.3929 11.8442 13.2564 12.0587C13.1883 12.1657 13.1325 12.2469 13.0951 12.2996C13.0764 12.3259 13.0623 12.3451 13.0536 12.3567L13.0448 12.3685L13.0446 12.3688L13.0443 12.3691L13.0441 12.3694L13.0438 12.3698L13.0436 12.37C12.8063 12.6765 12.8618 13.1174 13.1679 13.3555C13.4745 13.5939 13.9162 13.5386 14.1546 13.2321L13.5996 12.8004C14.1546 13.2321 14.1548 13.2319 14.1549 13.2317L14.1552 13.2313L14.156 13.2303L14.158 13.2278L14.1636 13.2204L14.1815 13.1966C14.1963 13.1768 14.2166 13.1491 14.2416 13.1138C14.2917 13.0433 14.3609 12.9423 14.4428 12.8136C14.6063 12.5567 14.8218 12.187 15.0368 11.7264C15.4647 10.8093 15.9027 9.50586 15.9027 8.00044C15.9027 6.49503 15.4647 5.19156 15.0368 4.27453C14.8218 3.8139 14.6063 3.44421 14.4428 3.18724C14.3609 3.05857 14.2917 2.95762 14.2416 2.88709C14.2166 2.8518 14.1963 2.82408 14.1815 2.80426L14.1636 2.78048L14.158 2.7731L14.156 2.77055L14.1552 2.76956L14.1549 2.76914C14.1548 2.76895 14.1546 2.76877 13.5996 3.20045L14.1546 2.76877ZM11.7552 5.16879C11.5168 4.86227 11.075 4.80705 10.7685 5.04546C10.4628 5.28321 10.4071 5.72319 10.6432 6.02961L10.6452 6.03231C10.6481 6.03609 10.6535 6.04353 10.6613 6.05445C10.6768 6.07633 10.7014 6.11199 10.732 6.1601C10.7935 6.2567 10.878 6.4013 10.963 6.58353C11.1351 6.95221 11.2971 7.44874 11.2971 8.00047C11.2971 8.5522 11.1351 9.04873 10.963 9.41741C10.878 9.59964 10.7935 9.74424 10.732 9.84084C10.7014 9.88895 10.6768 9.92461 10.6613 9.94648C10.6535 9.95741 10.6481 9.96484 10.6452 9.96863L10.6432 9.97132C10.4071 10.2777 10.4628 10.7177 10.7685 10.9555C11.075 11.1939 11.5168 11.1387 11.7552 10.8321L11.2002 10.4005C11.7552 10.8321 11.7553 10.832 11.7555 10.8318L11.7558 10.8314L11.7564 10.8305L11.758 10.8286L11.7619 10.8234L11.7731 10.8085C11.782 10.7966 11.7937 10.7806 11.8078 10.7607C11.8361 10.721 11.874 10.6656 11.9184 10.5958C12.0069 10.4567 12.1224 10.2584 12.2374 10.0121C12.4653 9.52364 12.7033 8.82017 12.7033 8.00047C12.7033 7.18077 12.4653 6.4773 12.2374 5.98884C12.1224 5.74249 12.0069 5.54424 11.9184 5.40512C11.874 5.33538 11.8361 5.27996 11.8078 5.24023C11.7937 5.22035 11.782 5.20435 11.7731 5.1924L11.7619 5.17752L11.758 5.17238L11.7564 5.17039L11.7558 5.16954L11.7555 5.16916C11.7553 5.16897 11.7552 5.16879 11.2002 5.60047L11.7552 5.16879Z" fill="#8D99A5"/>
-</svg>
diff --git a/res/img/voip/tab-dialpad.svg b/res/img/voip/tab-dialpad.svg
deleted file mode 100644
index b7add0addb..0000000000
--- a/res/img/voip/tab-dialpad.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 19C10.9 19 10 19.9 10 21C10 22.1 10.9 23 12 23C13.1 23 14 22.1 14 21C14 19.9 13.1 19 12 19ZM6 1C4.9 1 4 1.9 4 3C4 4.1 4.9 5 6 5C7.1 5 8 4.1 8 3C8 1.9 7.1 1 6 1ZM6 7C4.9 7 4 7.9 4 9C4 10.1 4.9 11 6 11C7.1 11 8 10.1 8 9C8 7.9 7.1 7 6 7ZM6 13C4.9 13 4 13.9 4 15C4 16.1 4.9 17 6 17C7.1 17 8 16.1 8 15C8 13.9 7.1 13 6 13ZM18 5C19.1 5 20 4.1 20 3C20 1.9 19.1 1 18 1C16.9 1 16 1.9 16 3C16 4.1 16.9 5 18 5ZM12 13C10.9 13 10 13.9 10 15C10 16.1 10.9 17 12 17C13.1 17 14 16.1 14 15C14 13.9 13.1 13 12 13ZM18 13C16.9 13 16 13.9 16 15C16 16.1 16.9 17 18 17C19.1 17 20 16.1 20 15C20 13.9 19.1 13 18 13ZM18 7C16.9 7 16 7.9 16 9C16 10.1 16.9 11 18 11C19.1 11 20 10.1 20 9C20 7.9 19.1 7 18 7ZM12 7C10.9 7 10 7.9 10 9C10 10.1 10.9 11 12 11C13.1 11 14 10.1 14 9C14 7.9 13.1 7 12 7ZM12 1C10.9 1 10 1.9 10 3C10 4.1 10.9 5 12 5C13.1 5 14 4.1 14 3C14 1.9 13.1 1 12 1Z" fill="#8D97A5"/>
-</svg>
diff --git a/res/img/voip/tab-userdirectory.svg b/res/img/voip/tab-userdirectory.svg
deleted file mode 100644
index 792ded7be4..0000000000
--- a/res/img/voip/tab-userdirectory.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<mask id="path-1-inside-1" fill="white">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M18.1502 21.1214C16.3946 22.3074 14.2782 23 12 23C9.52367 23 7.23845 22.1817 5.4 20.8008C2.72821 18.794 1 15.5988 1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12C23 15.797 21.0762 19.1446 18.1502 21.1214ZM12 12.55C13.8225 12.55 15.3 10.9494 15.3 8.975C15.3 7.00058 13.8225 5.4 12 5.4C10.1775 5.4 8.7 7.00058 8.7 8.975C8.7 10.9494 10.1775 12.55 12 12.55ZM12 20.8C14.3782 20.8 16.536 19.8566 18.1197 18.3237C17.1403 15.9056 14.7693 14.2 12 14.2C9.23066 14.2 6.85969 15.9056 5.88028 18.3237C7.46399 19.8566 9.62183 20.8 12 20.8Z"/>
-</mask>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M18.1502 21.1214C16.3946 22.3074 14.2782 23 12 23C9.52367 23 7.23845 22.1817 5.4 20.8008C2.72821 18.794 1 15.5988 1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12C23 15.797 21.0762 19.1446 18.1502 21.1214ZM12 12.55C13.8225 12.55 15.3 10.9494 15.3 8.975C15.3 7.00058 13.8225 5.4 12 5.4C10.1775 5.4 8.7 7.00058 8.7 8.975C8.7 10.9494 10.1775 12.55 12 12.55ZM12 20.8C14.3782 20.8 16.536 19.8566 18.1197 18.3237C17.1403 15.9056 14.7693 14.2 12 14.2C9.23066 14.2 6.85969 15.9056 5.88028 18.3237C7.46399 19.8566 9.62183 20.8 12 20.8Z" fill="#8D97A5"/>
-<path d="M18.1502 21.1214L18.9339 22.2814L18.1502 21.1214ZM5.4 20.8008L4.55919 21.9202H4.55919L5.4 20.8008ZM18.1197 18.3237L19.0934 19.3296L19.7717 18.6731L19.4173 17.7981L18.1197 18.3237ZM5.88028 18.3237L4.58268 17.7981L4.22829 18.6731L4.90659 19.3296L5.88028 18.3237ZM12 24.4C14.5662 24.4 16.9541 23.619 18.9339 22.2814L17.3665 19.9613C15.835 20.9959 13.9902 21.6 12 21.6V24.4ZM4.55919 21.9202C6.63176 23.477 9.21011 24.4 12 24.4V21.6C9.83723 21.6 7.84514 20.8865 6.24081 19.6814L4.55919 21.9202ZM-0.399998 12C-0.399998 16.0577 1.55052 19.6603 4.55919 21.9202L6.24081 19.6814C3.90591 17.9276 2.4 15.1399 2.4 12H-0.399998ZM12 -0.399998C5.15167 -0.399998 -0.399998 5.15167 -0.399998 12H2.4C2.4 6.69807 6.69807 2.4 12 2.4V-0.399998ZM24.4 12C24.4 5.15167 18.8483 -0.399998 12 -0.399998V2.4C17.3019 2.4 21.6 6.69807 21.6 12H24.4ZM18.9339 22.2814C22.2288 20.0554 24.4 16.2815 24.4 12H21.6C21.6 15.3124 19.9236 18.2337 17.3665 19.9613L18.9339 22.2814ZM13.9 8.975C13.9 10.2838 12.9459 11.15 12 11.15V13.95C14.6991 13.95 16.7 11.615 16.7 8.975H13.9ZM12 6.8C12.9459 6.8 13.9 7.66616 13.9 8.975H16.7C16.7 6.335 14.6991 4 12 4V6.8ZM10.1 8.975C10.1 7.66616 11.0541 6.8 12 6.8V4C9.30086 4 7.3 6.335 7.3 8.975H10.1ZM12 11.15C11.0541 11.15 10.1 10.2838 10.1 8.975H7.3C7.3 11.615 9.30086 13.95 12 13.95V11.15ZM17.146 17.3178C15.8129 18.6081 14.0004 19.4 12 19.4V22.2C14.756 22.2 17.2591 21.1051 19.0934 19.3296L17.146 17.3178ZM12 15.6C14.1797 15.6 16.0494 16.9415 16.8221 18.8493L19.4173 17.7981C18.2312 14.8697 15.359 12.8 12 12.8V15.6ZM7.17788 18.8493C7.95058 16.9415 9.8203 15.6 12 15.6V12.8C8.64102 12.8 5.7688 14.8697 4.58268 17.7981L7.17788 18.8493ZM12 19.4C9.99963 19.4 8.18709 18.6081 6.85397 17.3178L4.90659 19.3296C6.74088 21.1051 9.24402 22.2 12 22.2V19.4Z" fill="#8D97A5" mask="url(#path-1-inside-1)"/>
-</svg>
diff --git a/res/img/voip/un-silence.svg b/res/img/voip/un-silence.svg
deleted file mode 100644
index c00b366f84..0000000000
--- a/res/img/voip/un-silence.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.18262 0.960693L14.3815 14.1596" stroke="#8D99A5" stroke-width="1.61751" stroke-miterlimit="10" stroke-linecap="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M5.57061 4.20635L5.19539 4.51904H3.58059L10.2419 11.1804V8.87764L5.57061 4.20635ZM10.2419 6.59013V2.15546C10.2419 1.42405 9.38884 1.0245 8.82695 1.49274L6.81834 3.16658L10.2419 6.59013ZM5.19526 11.2479H2.7146C1.76172 11.2479 0.989258 10.4754 0.989258 9.52254V6.24438C0.989258 5.69051 1.25024 5.1976 1.65595 4.88191L10.2419 13.4679V13.6117C10.2419 14.3431 9.38884 14.7426 8.82695 14.2744L5.19526 11.248V11.2479Z" fill="#8D99A5"/>
-</svg>
diff --git a/res/manifest.json b/res/manifest.json
index f6f1e91bf4..75eeab7b01 100644
--- a/res/manifest.json
+++ b/res/manifest.json
@@ -5,69 +5,39 @@
     "theme_color": "#76CFA6",
     "start_url": "index.html",
     "icons": [
-        {
-            "src": "/vector-icons/44.png",
-            "sizes": "44x44",
-            "type": "image/png"
-        },
-        {
-            "src": "/vector-icons/1240x600.png",
-            "sizes": "1240x600",
-            "type": "image/png"
-        },
-        {
-            "src": "/vector-icons/300.png",
-            "sizes": "300x300",
-            "type": "image/png"
-        },
-        {
-            "src": "/vector-icons/150.png",
-            "sizes": "150x150",
-            "type": "image/png"
-        },
-        {
-            "src": "/vector-icons/88.png",
-            "sizes": "88x88",
-            "type": "image/png"
-        },
         {
             "src": "/vector-icons/24.png",
             "sizes": "24x24",
             "type": "image/png"
         },
-        {
-            "src": "/vector-icons/50.png",
-            "sizes": "50x50",
-            "type": "image/png"
-        },
-        {
-            "src": "/vector-icons/620x300.png",
-            "sizes": "620x300",
-            "type": "image/png"
-        },
-        {
-            "src": "/vector-icons/1024.png",
-            "sizes": "1024x1024",
-            "type": "image/png"
-        },
-        {
-            "src": "/vector-icons/180.png",
-            "sizes": "180x180",
-            "type": "image/png"
-        },
-        {
-            "src": "/vector-icons/152.png",
-            "sizes": "152x152",
-            "type": "image/png"
-        },
         {
             "src": "/vector-icons/120.png",
             "sizes": "120x120",
             "type": "image/png"
         },
         {
-            "src": "/vector-icons/76.png",
-            "sizes": "76x76",
+            "src": "/vector-icons/144.png",
+            "sizes": "144x144",
+            "type": "image/png"
+        },
+        {
+            "src": "/vector-icons/152png",
+            "sizes": "152x152",
+            "type": "image/png"
+        },
+        {
+            "src": "/vector-icons/180.png",
+            "sizes": "180x180",
+            "type": "image/png"
+        },
+        {
+            "src": "/vector-icons/512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        },
+        {
+            "src": "/vector-icons/1024.png",
+            "sizes": "1024x1024",
             "type": "image/png"
         }
     ],
diff --git a/res/media/message.mp3 b/res/media/message.mp3
index 0e2f3207a7..5e9645adaf 100644
Binary files a/res/media/message.mp3 and b/res/media/message.mp3 differ
diff --git a/res/media/message.ogg b/res/media/message.ogg
index 23e5a89f1c..d5efbd27a3 100644
Binary files a/res/media/message.ogg and b/res/media/message.ogg differ
diff --git a/res/media/ring.mp3 b/res/media/ring.mp3
index 9b08ec7b36..386cce6998 100644
Binary files a/res/media/ring.mp3 and b/res/media/ring.mp3 differ
diff --git a/res/media/ring.ogg b/res/media/ring.ogg
index 41a22160b0..48c3f1c2ad 100644
Binary files a/res/media/ring.ogg and b/res/media/ring.ogg differ
diff --git a/res/themes/dark-custom/css/dark-custom.pcss b/res/themes/dark-custom/css/dark-custom.pcss
index 166d9cb292..dad1ede631 100644
--- a/res/themes/dark-custom/css/dark-custom.pcss
+++ b/res/themes/dark-custom/css/dark-custom.pcss
@@ -5,4 +5,5 @@
 @import "../../legacy-dark/css/_legacy-dark.pcss";
 @import "../../light-custom/css/_custom.pcss";
 @import "../../../../res/css/_components.pcss";
+@import "../../../../res/css/_compound.pcss";
 @import url("github-markdown-css/github-markdown-dark.css");
diff --git a/res/themes/dark/css/_dark.pcss b/res/themes/dark/css/_dark.pcss
index c9c86717e6..dbd5176653 100644
--- a/res/themes/dark/css/_dark.pcss
+++ b/res/themes/dark/css/_dark.pcss
@@ -54,7 +54,7 @@ $accent-1400: var(--cpd-color-green-1400);
 /* ******************** */
 $inverted-bg-color: var(--cpd-color-bg-action-primary-rest);
 $header-panel-bg-color: var(--cpd-color-bg-subtle-secondary);
-$header-panel-bg-hover: var(--cpd-color-gray-200);
+$header-panel-bg-hover: var(--cpd-color-bg-action-secondary-hovered);
 /* ******************** */
 
 /* Theme specific colors */
@@ -176,6 +176,8 @@ $togglesw-off-color: $room-highlight-color;
 /* Authpage */
 /* ******************** */
 $authpage-primary-color: $primary-content;
+/* background colour of the modal, when the background is blurred */
+$authpage-modal-content-with-blur-bg-color: rgb(0, 0, 0, 0.59);
 /* ******************** */
 
 /* Message action bar */
diff --git a/res/themes/dark/css/dark.pcss b/res/themes/dark/css/dark.pcss
index 51262598be..b81a2793f0 100644
--- a/res/themes/dark/css/dark.pcss
+++ b/res/themes/dark/css/dark.pcss
@@ -5,5 +5,6 @@
 @import "_dark.pcss";
 @import "../../light/css/_mods.pcss";
 @import "../../../../res/css/_components.pcss";
+@import "../../../../res/css/_compound.pcss";
 @import url("highlight.js/styles/atom-one-dark.min.css");
 @import url("github-markdown-css/github-markdown-dark.css");
diff --git a/res/themes/element/img/compound/apple.svg b/res/themes/element/img/compound/apple.svg
deleted file mode 100644
index 5e9c996e1c..0000000000
--- a/res/themes/element/img/compound/apple.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.4157 2C13.4922 2.92763 13.1763 3.84642 12.535 4.56125C11.9129 5.27979 10.9701 5.69366 9.97726 5.68417C9.91411 4.78324 10.2392 3.89596 10.881 3.21774C11.531 2.53034 12.436 2.09555 13.4157 2ZM16.5554 7.45058C15.4132 8.10257 14.7104 9.25238 14.6932 10.4972C14.6948 11.9055 15.6031 13.1765 17 13.7251C16.7313 14.5354 16.3264 15.3013 15.8001 15.9942C15.0934 16.9759 14.3523 17.935 13.1762 17.9527C12.6168 17.9647 12.2392 17.8153 11.8458 17.6597C11.4354 17.4974 11.0077 17.3282 10.3385 17.3282C9.62875 17.3282 9.18194 17.5028 8.75102 17.6712C8.37862 17.8167 8.01808 17.9576 7.50997 17.9772C6.38987 18.0157 5.53384 16.9294 4.80138 15.9569C3.33741 13.971 2.19745 10.3601 3.72573 7.90322C4.44339 6.70576 5.78524 5.94589 7.26033 5.90164C7.89561 5.8895 8.5052 6.11686 9.03964 6.31619C9.44837 6.46863 9.81314 6.60468 10.1118 6.60468C10.3744 6.60468 10.729 6.474 11.1423 6.32171C11.7932 6.08181 12.5898 5.78827 13.4015 5.86738C14.6627 5.90402 15.8316 6.49076 16.5554 7.45058Z" fill="#1B1D22"/>
-</svg>
diff --git a/res/themes/element/img/compound/linux.svg b/res/themes/element/img/compound/linux.svg
deleted file mode 100644
index 6df5e6f959..0000000000
--- a/res/themes/element/img/compound/linux.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_4244_203)">
-<path d="M11.0054 17.2033C10.7192 17.3348 10.4074 17.405 10.0911 17.4096C9.62287 17.4048 9.1673 17.2609 8.78524 16.9971C8.65787 17.3144 8.45841 17.5995 8.20182 17.831C7.94524 18.0626 7.63819 18.2344 7.30371 18.3337C7.34816 18.3337 7.39049 18.3337 7.43494 18.3337H12.4213C12.1196 18.2476 11.8387 18.103 11.5954 17.9088C11.3522 17.7147 11.1515 17.4747 11.0054 17.2033Z" fill="black"/>
-<path d="M5.59233 13.8942C5.61193 13.8889 5.63053 13.8805 5.64735 13.8694C5.6791 13.5971 5.71508 13.3352 5.7553 13.0856C5.74691 12.9449 5.77002 12.8041 5.82302 12.6731C6.11298 11.0868 6.51722 9.97294 7.07596 9.29637C7.09365 9.27503 7.1193 9.26142 7.14728 9.25851C7.17526 9.25561 7.20328 9.26367 7.22518 9.2809C7.24707 9.29813 7.26104 9.32313 7.26401 9.35041C7.26699 9.37768 7.25873 9.40498 7.24105 9.42631C7.18391 9.49645 7.12676 9.57277 7.07173 9.65322C6.64844 10.272 6.31404 11.2126 6.07277 12.477H6.09816C6.14375 12.4702 6.19014 12.4702 6.23573 12.477C6.40082 12.5121 6.65902 12.6462 7.05692 13.036C7.10771 10.7691 8.44108 8.94158 10.0919 8.94158C11.548 8.94158 12.765 10.371 13.0549 12.2729C13.1926 12.0053 13.4153 11.7882 13.6899 11.654C13.7577 11.6293 13.8293 11.6161 13.9016 11.6149C13.7518 10.9261 13.485 10.2666 13.1121 9.66353C13.0571 9.58308 13.002 9.50676 12.9449 9.43663C12.9357 9.42642 12.9287 9.41445 12.9244 9.40149C12.9201 9.38852 12.9186 9.37484 12.92 9.36128C12.9214 9.34774 12.9256 9.33461 12.9325 9.32273C12.9393 9.31085 12.9486 9.30047 12.9597 9.29224C12.9703 9.28351 12.9826 9.27695 12.9959 9.27294C13.0091 9.26893 13.0232 9.26756 13.0369 9.26891C13.0507 9.27025 13.0641 9.2743 13.0763 9.28078C13.0885 9.28727 13.0992 9.29608 13.1079 9.30668C13.5312 9.82648 13.8825 10.6041 14.145 11.6582C14.7101 11.8644 14.7248 12.7927 14.7375 13.5476C14.7375 13.9065 14.7375 14.2779 14.8243 14.3727C14.9111 14.4676 15.0952 14.447 15.3535 14.3397C15.3831 14.0118 15.3978 13.7209 15.4063 13.4755C15.4063 13.0856 15.4063 12.836 15.4063 12.836V12.574C15.4063 10.5113 12.6846 6.94487 12.6846 6.94487L12.3692 4.26334C12.3692 1.80251 10.0919 1.8252 10.0919 1.8252C10.0919 1.8252 7.80615 1.80251 7.80615 4.25302L7.50138 6.94487C7.50138 6.94487 4.77961 10.5092 4.77961 12.574V12.8319C4.77961 12.8319 4.76902 13.0814 4.77961 13.4713C4.77961 13.5311 4.77961 13.5951 4.77961 13.6611C5.1246 13.7889 5.47804 13.923 5.59233 13.8942ZM10.0813 5.21837C10.7163 5.27613 11.7279 5.42465 11.7745 5.72993C11.8084 5.96507 11.4168 6.41475 11.3385 6.50138C11.1755 6.68084 10.6083 7.26872 10.0962 7.26872C9.58397 7.26872 9.01676 6.68084 8.85591 6.50138C8.7776 6.41475 8.38606 5.96507 8.4178 5.72993C8.4559 5.41846 9.47815 5.27613 10.0813 5.21837Z" fill="black"/>
-<path d="M10.0925 7.0621C10.3698 7.0621 10.7952 6.78776 11.174 6.3649C11.464 6.04518 11.5698 5.81003 11.5613 5.7564C11.5084 5.6512 10.8164 5.49237 10.0798 5.42224C9.36657 5.49237 8.67449 5.6512 8.62158 5.76052C8.69778 5.98983 8.83166 6.19689 9.01101 6.36284C9.39197 6.78776 9.81526 7.0621 10.0925 7.0621Z" fill="black"/>
-<path d="M10.6623 15.9489C10.4189 13.7769 10.6432 13.3273 10.8337 13.1788C10.8804 13.1432 10.9358 13.1201 10.9945 13.1117C11.0531 13.1035 11.113 13.1102 11.1681 13.1313C11.3598 13.2237 11.5271 13.3577 11.657 13.5232C11.8962 13.7769 12.0634 13.9358 12.2179 13.8491C12.328 13.7852 12.4846 13.4366 12.6412 13.1169C12.7216 12.9456 12.8042 12.7621 12.8952 12.5868C12.6835 10.6457 11.5195 9.14819 10.0993 9.14819C8.53949 9.14819 7.27173 10.9531 7.27173 13.1705C7.27173 13.1973 7.27173 13.2241 7.27173 13.2509C7.52995 13.5149 7.83895 13.8698 8.21567 14.3338C8.36367 14.5155 8.4994 14.7064 8.62204 14.9052C8.79699 15.1841 8.909 15.4961 8.9506 15.8205C8.9922 16.1449 8.96245 16.4741 8.86331 16.7864C9.21862 17.0463 9.64882 17.1907 10.093 17.199C10.3777 17.1979 10.659 17.1382 10.9184 17.0236C10.862 16.9 10.8173 16.7716 10.7851 16.64C10.7302 16.4122 10.6892 16.1815 10.6623 15.9489Z" fill="black"/>
-<path d="M8.04303 14.459C7.74673 14.0918 7.49487 13.8009 7.279 13.5658L7.17105 13.4503L7.061 13.3348C6.5721 12.8397 6.31389 12.7037 6.17843 12.681C6.15951 12.678 6.14023 12.678 6.12129 12.681C6.10076 12.6833 6.08122 12.6909 6.06454 12.7028C6.04786 12.7147 6.03461 12.7307 6.02605 12.7489C6.02565 12.7538 6.02565 12.7586 6.02605 12.7634C5.98416 12.8712 5.96753 12.9869 5.97738 13.1017C5.97738 13.1595 5.97738 13.2173 5.97738 13.2749C5.97738 13.3327 5.97738 13.341 5.97738 13.374C6.00594 13.5827 5.96198 13.7947 5.8525 13.9763C5.83155 13.9994 5.80732 14.0196 5.78055 14.0362L5.7361 14.0629C5.70773 14.0774 5.67795 14.0892 5.6472 14.098H5.62393C5.44826 14.1289 5.16254 14.0279 4.80063 13.8917L4.6948 13.8505C4.24188 13.6752 3.71276 13.473 3.32545 13.473C3.23797 13.4644 3.14967 13.4777 3.06893 13.5116C2.98819 13.5455 2.91767 13.599 2.86406 13.6669C2.58046 14.0794 3.2154 14.7271 3.72758 15.2511C4.04294 15.5749 4.29056 15.8286 4.31808 16.0184C4.36675 16.3691 3.99002 16.5031 3.65774 16.6228C3.48628 16.6669 3.32623 16.7457 3.18788 16.8538C3.13709 16.9116 3.1392 16.9508 3.14979 16.9797C3.19635 17.1384 3.57308 17.4871 5.56466 18.0502C5.78512 18.1124 6.00914 18.1621 6.23558 18.1987C6.64453 18.2591 7.06268 18.2065 7.44245 18.0468C7.82223 17.8871 8.14838 17.6267 8.38379 17.2952C8.47591 17.159 8.55187 17.0129 8.61025 16.86L8.65257 16.7589C8.65257 16.7239 8.67163 16.6847 8.68221 16.6496C8.75827 16.3728 8.77591 16.0838 8.73407 15.8002C8.69223 15.5165 8.59179 15.2441 8.43881 14.9994C8.31764 14.812 8.18549 14.6316 8.04303 14.459Z" fill="black"/>
-<path d="M16.0589 14.3171C15.8816 14.3336 15.71 14.3863 15.5552 14.4717L15.3245 14.5687C15.0704 14.6635 14.8164 14.7089 14.6513 14.4903C14.6122 14.4329 14.5856 14.3683 14.573 14.3006C14.5437 14.1377 14.5282 13.9728 14.5265 13.8075C14.5265 13.723 14.5265 13.6342 14.5265 13.5393C14.5265 12.9391 14.5054 12.2171 14.2154 11.9346C14.1785 11.8974 14.1346 11.8673 14.0863 11.8459C14.0596 11.8345 14.0321 11.8255 14.0037 11.8191H13.972C13.9001 11.8109 13.8272 11.8208 13.7603 11.8479C13.5106 11.947 13.2926 12.2605 13.1022 12.6277L13.0112 12.8071C12.9772 12.8772 12.9455 12.9453 12.9138 13.0133C12.882 13.0814 12.8545 13.1392 12.827 13.2011C12.6408 13.6136 12.4947 13.9292 12.3254 14.0262C12.0122 14.2056 11.7391 13.9168 11.5 13.6611C11.3921 13.5236 11.2558 13.4098 11.1 13.3269C11.0796 13.3194 11.0582 13.3152 11.0365 13.3145C11.0108 13.3139 10.9859 13.3228 10.9666 13.3393C10.8354 13.4424 10.647 13.9148 10.8735 15.926C10.8978 16.148 10.936 16.3684 10.9878 16.586C11.0166 16.7008 11.0548 16.8133 11.1021 16.9222C11.1169 16.9532 11.1317 16.9841 11.1486 17.015C11.1656 17.0459 11.1762 17.0769 11.1931 17.1079C11.3664 17.4217 11.6184 17.6878 11.9256 17.8813C12.2328 18.0746 12.5853 18.1891 12.9501 18.214C13.3149 18.239 13.6804 18.1735 14.0122 18.0237C14.3441 17.8739 14.6317 17.6448 14.8482 17.3574C14.9843 17.1771 15.1093 16.989 15.2228 16.7943C16.2387 15.0307 16.2578 14.5254 16.1795 14.3809C16.1676 14.3603 16.15 14.3434 16.1286 14.332C16.1073 14.3208 16.0831 14.3155 16.0589 14.3171Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_4244_203">
-<rect width="14.4446" height="16.5081" fill="white" transform="translate(2.63892 1.8252)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/res/themes/element/img/compound/microsoft.svg b/res/themes/element/img/compound/microsoft.svg
deleted file mode 100644
index 221dcba716..0000000000
--- a/res/themes/element/img/compound/microsoft.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="10.4908" y="2" width="7.50926" height="7.50926" fill="#1B1D22"/>
-<rect x="2" y="10.4904" width="7.50926" height="7.50926" fill="#1B1D22"/>
-<rect x="2" y="2" width="7.50926" height="7.50926" fill="#1B1D22"/>
-<rect x="10.4908" y="10.4904" width="7.50926" height="7.50926" fill="#1B1D22"/>
-</svg>
diff --git a/res/themes/legacy-dark/css/legacy-dark.pcss b/res/themes/legacy-dark/css/legacy-dark.pcss
index ffb7e8d0aa..240175c9d1 100644
--- a/res/themes/legacy-dark/css/legacy-dark.pcss
+++ b/res/themes/legacy-dark/css/legacy-dark.pcss
@@ -4,5 +4,6 @@
 @import "../../legacy-light/css/_legacy-light.pcss";
 @import "_legacy-dark.pcss";
 @import "../../../../res/css/_components.pcss";
+@import "../../../../res/css/_compound.pcss";
 @import url("highlight.js/styles/atom-one-dark.min.css");
 @import url("github-markdown-css/github-markdown-dark.css");
diff --git a/res/themes/legacy-light/css/_legacy-light.pcss b/res/themes/legacy-light/css/_legacy-light.pcss
index eea7197d9f..8c00393d41 100644
--- a/res/themes/legacy-light/css/_legacy-light.pcss
+++ b/res/themes/legacy-light/css/_legacy-light.pcss
@@ -15,7 +15,7 @@ $font-family:
     "Noto Color Emoji";
 
 $monospace-font-family:
-    "Inconsolata", var(--emoji-font-family), "Apple Color Emoji", "Segoe UI Emoji", "Courier", monospace,
+    "Fira Code", var(--emoji-font-family), "Apple Color Emoji", "Segoe UI Emoji", "Courier", monospace,
     "Noto Color Emoji";
 
 /* unified palette */
@@ -241,8 +241,6 @@ $event-highlight-bg-color: $yellow-background;
 /* event timestamp */
 $event-timestamp-color: #acacac;
 
-$copy-button-url: "@vector-im/compound-design-tokens/icons/copy.svg";
-
 /* e2e */
 $e2e-verified-color: #0dbd8b;
 $e2e-warning-color: #ff5b55;
@@ -275,6 +273,7 @@ $progressbar-bg-color: rgba(141, 151, 165, 0.2);
 
 $authpage-bg-color: #2e3649;
 $authpage-modal-bg-color: rgba(255, 255, 255, 0.59);
+$authpage-modal-content-with-blur-bg-color: rgb(255, 255, 255, 0.59);
 $authpage-focus-bg-color: #dddddd;
 $authpage-lang-color: $secondary-content;
 $authpage-primary-color: $primary-content;
diff --git a/res/themes/legacy-light/css/legacy-light.pcss b/res/themes/legacy-light/css/legacy-light.pcss
index 4b3905a1f9..7e42d75bfc 100644
--- a/res/themes/legacy-light/css/legacy-light.pcss
+++ b/res/themes/legacy-light/css/legacy-light.pcss
@@ -3,5 +3,6 @@
 @import "_fonts.pcss";
 @import "_legacy-light.pcss";
 @import "../../../../res/css/_components.pcss";
+@import "../../../../res/css/_compound.pcss";
 @import url("highlight.js/styles/atom-one-light.min.css");
 @import url("github-markdown-css/github-markdown-light.css");
diff --git a/res/themes/light-custom/css/_custom.pcss b/res/themes/light-custom/css/_custom.pcss
index 043de30191..5f0210ed10 100644
--- a/res/themes/light-custom/css/_custom.pcss
+++ b/res/themes/light-custom/css/_custom.pcss
@@ -46,7 +46,7 @@ $dialog-backdrop-color: var(--sidebar-color-50pct);
 
 /* --roomlist-background-color */
 $header-panel-bg-color: var(--roomlist-background-color);
-$header-panel-bg-hover: var(--cpd-color-gray-200);
+$header-panel-bg-hover: var(--cpd-color-bg-action-secondary-hovered);
 $panel-gradient: var(--roomlist-background-color-0pct), var(--roomlist-background-color);
 /* these were #f2f5f8 instead of #f3f8fd, but close enough */
 $dark-panel-bg-color: var(--roomlist-background-color);
diff --git a/res/themes/light-custom/css/light-custom.pcss b/res/themes/light-custom/css/light-custom.pcss
index 0bf3bd9ba2..d58df8e68f 100644
--- a/res/themes/light-custom/css/light-custom.pcss
+++ b/res/themes/light-custom/css/light-custom.pcss
@@ -4,4 +4,5 @@
 @import "../../legacy-light/css/_legacy-light.pcss";
 @import "_custom.pcss";
 @import "../../../../res/css/_components.pcss";
+@import "../../../../res/css/_compound.pcss";
 @import url("github-markdown-css/github-markdown-light.css");
diff --git a/res/themes/light-high-contrast/css/light-high-contrast.pcss b/res/themes/light-high-contrast/css/light-high-contrast.pcss
index a843809e51..2556c2c4f5 100644
--- a/res/themes/light-high-contrast/css/light-high-contrast.pcss
+++ b/res/themes/light-high-contrast/css/light-high-contrast.pcss
@@ -5,5 +5,6 @@
 @import "_light-high-contrast.pcss";
 @import "../../light/css/_mods.pcss";
 @import "../../../../res/css/_components.pcss";
+@import "../../../../res/css/_compound.pcss";
 @import url("highlight.js/styles/atom-one-light.min.css");
 @import url("github-markdown-css/github-markdown-light.css");
diff --git a/res/themes/light/css/_light.pcss b/res/themes/light/css/_light.pcss
index a6bb29bac4..fcab227283 100644
--- a/res/themes/light/css/_light.pcss
+++ b/res/themes/light/css/_light.pcss
@@ -15,7 +15,7 @@ $font-family:
     "Noto Color Emoji";
 
 $monospace-font-family:
-    "Inconsolata", var(--emoji-font-family), "Apple Color Emoji", "Segoe UI Emoji", "Courier", monospace,
+    "Fira Code", var(--emoji-font-family), "Apple Color Emoji", "Segoe UI Emoji", "Courier", monospace,
     "Noto Color Emoji";
 
 /* Colors from Figma Compound https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=559%3A120 */
@@ -78,7 +78,7 @@ $accent-1400: var(--cpd-color-green-1400);
 /* ******************** */
 $inverted-bg-color: var(--cpd-color-bg-action-primary-rest);
 $header-panel-bg-color: var(--cpd-color-bg-subtle-primary);
-$header-panel-bg-hover: var(--cpd-color-gray-200);
+$header-panel-bg-hover: var(--cpd-color-bg-action-secondary-hovered);
 /* ******************** */
 
 /* Theme specific colors */
@@ -245,6 +245,8 @@ $togglesw-ball-color: var(--cpd-color-bg-action-primary-rest);
 $authpage-primary-color: #232f32;
 $authpage-bg-color: #2e3649;
 $authpage-modal-bg-color: $roomlist-bg-color;
+/* background colour of the modal, when the background is blurred */
+$authpage-modal-content-with-blur-bg-color: rgb(255, 255, 255, 0.59);
 $authpage-focus-bg-color: $focus-bg-color;
 $authpage-lang-color: $secondary-content;
 $authpage-primary-color: $primary-content;
@@ -345,11 +347,6 @@ $focus-brightness: 105%;
 
 /* ******************** */
 
-/* Icon URLs */
-/* ******************** */
-$copy-button-url: "@vector-im/compound-design-tokens/icons/copy.svg";
-/* ******************** */
-
 /* Location sharing */
 /* ******************** */
 $location-marker-color: var(--cpd-color-icon-on-solid-primary);
diff --git a/res/themes/light/css/light.pcss b/res/themes/light/css/light.pcss
index d3264e491e..3fd90482f1 100644
--- a/res/themes/light/css/light.pcss
+++ b/res/themes/light/css/light.pcss
@@ -4,5 +4,6 @@
 @import "_light.pcss";
 @import "_mods.pcss";
 @import "../../../../res/css/_components.pcss";
+@import "../../../../res/css/_compound.pcss";
 @import url("highlight.js/styles/atom-one-light.min.css");
 @import url("github-markdown-css/github-markdown-light.css");
diff --git a/res/vector-icons/1024.png b/res/vector-icons/1024.png
index f4f073930b..77d67480eb 100644
Binary files a/res/vector-icons/1024.png and b/res/vector-icons/1024.png differ
diff --git a/res/vector-icons/120.png b/res/vector-icons/120.png
index 5a8544944e..bf604618f4 100644
Binary files a/res/vector-icons/120.png and b/res/vector-icons/120.png differ
diff --git a/res/vector-icons/1240x600.png b/res/vector-icons/1240x600.png
deleted file mode 100644
index 11a963db65..0000000000
Binary files a/res/vector-icons/1240x600.png and /dev/null differ
diff --git a/res/vector-icons/144.png b/res/vector-icons/144.png
new file mode 100644
index 0000000000..5f09750bc8
Binary files /dev/null and b/res/vector-icons/144.png differ
diff --git a/res/vector-icons/150.png b/res/vector-icons/150.png
deleted file mode 100644
index 407668e679..0000000000
Binary files a/res/vector-icons/150.png and /dev/null differ
diff --git a/res/vector-icons/152.png b/res/vector-icons/152.png
index aefe0df014..2948c2e9b0 100644
Binary files a/res/vector-icons/152.png and b/res/vector-icons/152.png differ
diff --git a/res/vector-icons/180.png b/res/vector-icons/180.png
index bfb7a33243..8a412c5604 100644
Binary files a/res/vector-icons/180.png and b/res/vector-icons/180.png differ
diff --git a/res/vector-icons/24.png b/res/vector-icons/24.png
index b0ef723eb8..3aa66a3b1c 100644
Binary files a/res/vector-icons/24.png and b/res/vector-icons/24.png differ
diff --git a/res/vector-icons/300.png b/res/vector-icons/300.png
deleted file mode 100644
index 6cbb21a568..0000000000
Binary files a/res/vector-icons/300.png and /dev/null differ
diff --git a/res/vector-icons/44.png b/res/vector-icons/44.png
deleted file mode 100644
index 171508dde0..0000000000
Binary files a/res/vector-icons/44.png and /dev/null differ
diff --git a/res/vector-icons/50.png b/res/vector-icons/50.png
deleted file mode 100644
index 1d8de2bf06..0000000000
Binary files a/res/vector-icons/50.png and /dev/null differ
diff --git a/res/vector-icons/512.png b/res/vector-icons/512.png
new file mode 100644
index 0000000000..337a183e30
Binary files /dev/null and b/res/vector-icons/512.png differ
diff --git a/res/vector-icons/620x300.png b/res/vector-icons/620x300.png
deleted file mode 100644
index f05c32b1c9..0000000000
Binary files a/res/vector-icons/620x300.png and /dev/null differ
diff --git a/res/vector-icons/76.png b/res/vector-icons/76.png
deleted file mode 100644
index 05af3bb8dd..0000000000
Binary files a/res/vector-icons/76.png and /dev/null differ
diff --git a/res/vector-icons/88.png b/res/vector-icons/88.png
deleted file mode 100644
index dec953bcf5..0000000000
Binary files a/res/vector-icons/88.png and /dev/null differ
diff --git a/res/vector-icons/apple-touch-icon-114.png b/res/vector-icons/apple-touch-icon-114.png
deleted file mode 100644
index 1ae39a6deb..0000000000
Binary files a/res/vector-icons/apple-touch-icon-114.png and /dev/null differ
diff --git a/res/vector-icons/apple-touch-icon-120.png b/res/vector-icons/apple-touch-icon-120.png
deleted file mode 100644
index 749f941a1e..0000000000
Binary files a/res/vector-icons/apple-touch-icon-120.png and /dev/null differ
diff --git a/res/vector-icons/apple-touch-icon-144.png b/res/vector-icons/apple-touch-icon-144.png
deleted file mode 100644
index 0dcc56a802..0000000000
Binary files a/res/vector-icons/apple-touch-icon-144.png and /dev/null differ
diff --git a/res/vector-icons/apple-touch-icon-152.png b/res/vector-icons/apple-touch-icon-152.png
deleted file mode 100644
index 2ac8c6dce4..0000000000
Binary files a/res/vector-icons/apple-touch-icon-152.png and /dev/null differ
diff --git a/res/vector-icons/apple-touch-icon-180.png b/res/vector-icons/apple-touch-icon-180.png
deleted file mode 100644
index f87d72db93..0000000000
Binary files a/res/vector-icons/apple-touch-icon-180.png and /dev/null differ
diff --git a/res/vector-icons/apple-touch-icon-57.png b/res/vector-icons/apple-touch-icon-57.png
deleted file mode 100644
index d80f385954..0000000000
Binary files a/res/vector-icons/apple-touch-icon-57.png and /dev/null differ
diff --git a/res/vector-icons/apple-touch-icon-60.png b/res/vector-icons/apple-touch-icon-60.png
deleted file mode 100644
index d5ec84b038..0000000000
Binary files a/res/vector-icons/apple-touch-icon-60.png and /dev/null differ
diff --git a/res/vector-icons/apple-touch-icon-72.png b/res/vector-icons/apple-touch-icon-72.png
deleted file mode 100644
index 85dbe1b82f..0000000000
Binary files a/res/vector-icons/apple-touch-icon-72.png and /dev/null differ
diff --git a/res/vector-icons/apple-touch-icon-76.png b/res/vector-icons/apple-touch-icon-76.png
deleted file mode 100644
index f328d1bd61..0000000000
Binary files a/res/vector-icons/apple-touch-icon-76.png and /dev/null differ
diff --git a/res/vector-icons/browserconfig.xml b/res/vector-icons/browserconfig.xml
deleted file mode 100644
index 0ac493167d..0000000000
--- a/res/vector-icons/browserconfig.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-  <msapplication>
-    <tile>
-      <square70x70logo src="/vector-icons/mstile-70.png"/>
-      <square150x150logo src="/vector-icons/mstile-150.png"/>
-      <square310x310logo src="/vector-icons/mstile-310.png"/>
-      <wide310x150logo src="/vector-icons/mstile-310x150.png"/>
-      <TileColor>#da532c</TileColor>
-    </tile>
-  </msapplication>
-</browserconfig>
diff --git a/res/vector-icons/favicon.ico b/res/vector-icons/favicon.ico
deleted file mode 100644
index 6ad5fb0865..0000000000
Binary files a/res/vector-icons/favicon.ico and /dev/null differ
diff --git a/res/vector-icons/mstile-150.png b/res/vector-icons/mstile-150.png
deleted file mode 100644
index 6606d425f2..0000000000
Binary files a/res/vector-icons/mstile-150.png and /dev/null differ
diff --git a/res/vector-icons/mstile-310.png b/res/vector-icons/mstile-310.png
deleted file mode 100644
index 0ce998223b..0000000000
Binary files a/res/vector-icons/mstile-310.png and /dev/null differ
diff --git a/res/vector-icons/mstile-310x150.png b/res/vector-icons/mstile-310x150.png
deleted file mode 100644
index 42efd6a98e..0000000000
Binary files a/res/vector-icons/mstile-310x150.png and /dev/null differ
diff --git a/res/vector-icons/mstile-70.png b/res/vector-icons/mstile-70.png
deleted file mode 100644
index 709056bc61..0000000000
Binary files a/res/vector-icons/mstile-70.png and /dev/null differ
diff --git a/res/welcome.html b/res/welcome.html
index 9fdd60a7c0..f1cf3911f4 100644
--- a/res/welcome.html
+++ b/res/welcome.html
@@ -27,7 +27,6 @@
         align-items: center;
         text-align: center;
         padding: 25px 35px;
-        color: #2e2f32;
     }
 
     .mx_Logo {
@@ -167,11 +166,11 @@ we don't have an account and should hide them. No account == no guest account ei
 
 <div class="mx_Parent">
     <a href="https://element.io" target="_blank" rel="noopener">
-        <img src="$logoUrl" alt="" class="mx_Logo" />
+        <img src="$logoUrl" alt="$brand" class="mx_Logo" />
     </a>
     <h1 class="mx_Header_title">_t("welcome_to_element")</h1>
     <!-- XXX: Our translations system isn't smart enough to recognize variables in the HTML, so we manually do it -->
-    <h4 class="mx_Header_subtitle">_t("powered_by_matrix_with_logo")</h4>
+    <h2 class="mx_Header_subtitle">_t("powered_by_matrix_with_logo")</h2>
     <div class="mx_ButtonGroup">
         <div class="mx_ButtonRow">
             <a href="#/login" class="mx_ButtonParent mx_ButtonSignIn mx_Button_iconSignIn">
diff --git a/scripts/copy-res.ts b/scripts/copy-res.ts
index 905372cb0a..e74eb6fd2d 100755
--- a/scripts/copy-res.ts
+++ b/scripts/copy-res.ts
@@ -6,8 +6,8 @@ import parseArgs from "minimist";
 import * as chokidar from "chokidar";
 import * as fs from "node:fs";
 import _ from "lodash";
-import { util } from "webpack";
-import { Translations } from "matrix-web-i18n";
+import webpack from "webpack";
+import type { Translations } from "matrix-web-i18n";
 
 const I18N_BASE_PATH = "src/i18n/strings/";
 const INCLUDE_LANGS = [...new Set([...fs.readdirSync(I18N_BASE_PATH)])]
@@ -58,7 +58,7 @@ function prepareLangFile(lang: string, dest: string): [filename: string, json: s
 
     const json = JSON.stringify(translations, null, 4);
     const jsonBuffer = Buffer.from(json);
-    const digest = util.createHash("xxhash64").update(jsonBuffer).digest("hex").slice(0, 7);
+    const digest = webpack.util.createHash("xxhash64").update(jsonBuffer).digest("hex").slice(0, 7);
     const filename = `${lang}.${digest}.json`;
 
     return [filename, json];
diff --git a/scripts/docker-package.sh b/scripts/docker-package.sh
index 14444de556..61f89c6c83 100755
--- a/scripts/docker-package.sh
+++ b/scripts/docker-package.sh
@@ -17,4 +17,5 @@ else
 fi
 
 DIST_VERSION=$("$DIR"/normalize-version.sh "$DIST_VERSION")
+
 VERSION=$DIST_VERSION yarn build
diff --git a/scripts/gen-workflow-mermaid.ts b/scripts/gen-workflow-mermaid.ts
index c33398268f..448a9fb8f1 100755
--- a/scripts/gen-workflow-mermaid.ts
+++ b/scripts/gen-workflow-mermaid.ts
@@ -5,7 +5,7 @@ import path from "node:path";
 import YAML from "yaml";
 import parseArgs from "minimist";
 import cronstrue from "cronstrue";
-import { partition } from "lodash";
+import _ from "lodash";
 
 const argv = parseArgs<{
     debug: boolean;
@@ -81,7 +81,7 @@ class Graph<T extends Node> {
     public removeNode(node: T): Edge<T>[] {
         if (!this.nodes.has(node.id)) return [];
         this.nodes.delete(node.id);
-        const [removedEdges, keptEdges] = partition(
+        const [removedEdges, keptEdges] = _.partition(
             this.edges,
             ([source, destination]) => source === node || destination === node,
         );
@@ -384,6 +384,7 @@ class MermaidFlowchartPrinter {
     private static INDENT = 4;
     private currentIndent = 0;
     private text = "";
+    private readonly markdown: boolean;
     public readonly idGenerator = new IdGenerator();
 
     private print(text: string): void {
@@ -400,11 +401,8 @@ class MermaidFlowchartPrinter {
         this.currentIndent += delta * MermaidFlowchartPrinter.INDENT;
     }
 
-    public constructor(
-        direction: "TD" | "TB" | "BT" | "RL" | "LR",
-        title?: string,
-        private readonly markdown = false,
-    ) {
+    public constructor(direction: "TD" | "TB" | "BT" | "RL" | "LR", title?: string, markdown = false) {
+        this.markdown = markdown;
         if (this.markdown) {
             this.print("```mermaid");
         }
diff --git a/scripts/get-version-from-git.sh b/scripts/get-version-from-git.sh
index c8459dba44..90de770478 100755
--- a/scripts/get-version-from-git.sh
+++ b/scripts/get-version-from-git.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
-# Echoes a version based on the git hashes of the element-web, react-sdk & js-sdk checkouts, for the case where
+# Echoes a version based on the git hashes of the element-web & js-sdk checkouts, for the case where
 # these dependencies are git checkouts.
 
 set -e
 
-# Since the deps are fetched from git, we can rev-parse
+# Since the deps are fetched from git & linked, we can rev-parse
 JSSDK_SHA=$(git -C node_modules/matrix-js-sdk rev-parse --short=12 HEAD)
 VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop
-echo $VECTOR_SHA-js-$JSSDK_SHA
+echo "$VECTOR_SHA-js-$JSSDK_SHA"
diff --git a/sonar-project.properties b/sonar-project.properties
index 2d87d32efc..3706897f63 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -4,13 +4,14 @@ sonar.organization=element-hq
 # Encoding of the source code. Default is default system encoding
 #sonar.sourceEncoding=UTF-8
 
-sonar.sources=src,res
-sonar.tests=test,playwright
+sonar.sources=src,res,packages/shared-components/src
+sonar.tests=test,playwright,src,packages
+sonar.test.inclusions=test/*,playwright/*,src/**/*.test.*,packages/*/src/**/*.test.*,packages/*/src/test/**/*
 sonar.exclusions=__mocks__,docs,element.io,nginx
 
 sonar.cpd.exclusions=src/i18n/strings/*.json
 sonar.typescript.tsconfigPath=./tsconfig.json
-sonar.javascript.lcov.reportPaths=coverage/lcov.info
+sonar.javascript.lcov.reportPaths=coverage/lcov.info,packages/shared-components/coverage/lcov.info
 sonar.coverage.exclusions=\
   test/**/*,\
   playwright/**/*,\
@@ -19,5 +20,7 @@ sonar.coverage.exclusions=\
   src/vector/modernizr.js,\
   src/components/views/dialogs/devtools/**/*,\
   src/utils/SessionLock.ts,\
-  src/**/*.d.ts
+  src/**/*.d.ts,\
+  src/vector/mobile_guide/**/* \
+  packages/shared-components/src/test/**/*
 sonar.testExecutionReportPaths=coverage/jest-sonar-report.xml
diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
index f19a8591cb..9d43a13ca4 100644
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -68,9 +68,17 @@ type ElectronChannel =
     | "openDesktopCapturerSourcePicker"
     | "userAccessToken"
     | "homeserverUrl"
-    | "serverSupportedVersions";
+    | "serverSupportedVersions"
+    | "showToast";
 
 declare global {
+    // use `number` as the return type in all cases for globalThis.set{Interval,Timeout},
+    // so we don't accidentally use the methods on NodeJS.Timeout - they only exist in a subset of environments.
+    // The overload for clear{Interval,Timeout} is resolved as expected.
+    // We use `ReturnType<typeof setTimeout>` in the code to be agnostic of if this definition gets loaded.
+    function setInterval(handler: TimerHandler, timeout: number, ...arguments: any[]): number;
+    function setTimeout(handler: TimerHandler, timeout: number, ...arguments: any[]): number;
+
     interface Window {
         mxSendRageshake: (text: string, withLogs?: boolean) => void;
         matrixLogger: typeof logger;
@@ -90,7 +98,7 @@ declare global {
         mxToastStore: ToastStore;
         mxDeviceListener: DeviceListener;
         mxRoomListStore: RoomListStore;
-        mxRoomListStoreV3: RoomListStoreV3Class;
+        getRoomListStoreV3: () => RoomListStoreV3Class;
         mxRoomListLayoutStore: RoomListLayoutStore;
         mxPlatformPeg: PlatformPeg;
         mxIntegrationManagers: typeof IntegrationManagers;
@@ -128,13 +136,20 @@ declare global {
     }
 
     interface Electron {
+        // Legacy
         on(channel: ElectronChannel, listener: (event: Event, ...args: any[]) => void): void;
         send(channel: ElectronChannel, ...args: any[]): void;
+        // Initialisation
         initialise(): Promise<{
             protocol: string;
             sessionId: string;
+            supportsBadgeOverlay: boolean;
             config: IConfigOptions;
+            supportedSettings: Record<string, boolean>;
         }>;
+        // Settings
+        setSettingValue(settingName: string, value: any): Promise<void>;
+        getSettingValue(settingName: string): Promise<any>;
     }
 
     interface DesktopCapturerSource {
diff --git a/src/@types/invite-rules.ts b/src/@types/invite-rules.ts
new file mode 100644
index 0000000000..b51b9d377e
--- /dev/null
+++ b/src/@types/invite-rules.ts
@@ -0,0 +1,30 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+export const INVITE_RULES_ACCOUNT_DATA_TYPE = "org.matrix.msc4155.invite_permission_config";
+export const MSC4380_INVITE_RULES_ACCOUNT_DATA_TYPE = "org.matrix.msc4380.invite_permission_config";
+
+export interface InviteConfigAccountData {
+    allowed_users?: string[];
+    blocked_users?: string[];
+    ignored_users?: string[];
+    allowed_servers?: string[];
+    blocked_servers?: string[];
+    ignored_servers?: string[];
+}
+
+/**
+ * Computed values based on MSC4155. Currently Element Web only supports
+ * blocking all invites.
+ */
+export interface ComputedInviteConfig extends Record<string, unknown> {
+    /**
+     * Are all invites blocked. This is only about blocking all invites,
+     * but this being false may still block invites through other rules.
+     */
+    allBlocked: boolean;
+}
diff --git a/src/@types/matrix-js-sdk.d.ts b/src/@types/matrix-js-sdk.d.ts
index c81c5377bf..802ae0da21 100644
--- a/src/@types/matrix-js-sdk.d.ts
+++ b/src/@types/matrix-js-sdk.d.ts
@@ -15,6 +15,11 @@ import type { EmptyObject } from "matrix-js-sdk/src/matrix";
 import type { DeviceClientInformation } from "../utils/device/types.ts";
 import type { UserWidget } from "../utils/WidgetUtils-types.ts";
 import { type MediaPreviewConfig } from "./media_preview.ts";
+import {
+    type INVITE_RULES_ACCOUNT_DATA_TYPE,
+    type InviteConfigAccountData,
+    type MSC4380_INVITE_RULES_ACCOUNT_DATA_TYPE,
+} from "./invite-rules.ts";
 
 // Extend Matrix JS SDK types via Typescript declaration merging to support unspecced event fields and types
 declare module "matrix-js-sdk/src/types" {
@@ -60,7 +65,6 @@ declare module "matrix-js-sdk/src/types" {
             };
         };
     }
-
     export interface AccountDataEvents {
         // Analytics account data event
         "im.vector.analytics": {
@@ -89,7 +93,15 @@ declare module "matrix-js-sdk/src/types" {
             accepted: string[];
         };
 
+        // MSC4155: Invite filtering
+        [INVITE_RULES_ACCOUNT_DATA_TYPE]: InviteConfigAccountData;
+
+        [MSC4380_INVITE_RULES_ACCOUNT_DATA_TYPE]: { default_action?: "allow" | "block" };
+
         "io.element.msc4278.media_preview_config": MediaPreviewConfig;
+
+        // Indicate whether recovery is enabled or disabled
+        "io.element.recovery": { enabled: boolean };
     }
 
     export interface AudioContent {
diff --git a/src/Avatar.ts b/src/Avatar.ts
index 921332c250..8852578f28 100644
--- a/src/Avatar.ts
+++ b/src/Avatar.ts
@@ -13,14 +13,18 @@ import DMRoomMap from "./utils/DMRoomMap";
 import { mediaFromMxc } from "./customisations/Media";
 import { isLocalRoom } from "./utils/localRoom/isLocalRoom";
 import { getFirstGrapheme } from "./utils/strings";
+import ThemeWatcher from "./settings/watchers/ThemeWatcher";
 
 /**
  * Hardcoded from the Compound colors.
  * Shade for background as defined in the compound web implementation
  * https://github.com/vector-im/compound-web/blob/main/src/components/Avatar
  */
-const AVATAR_BG_COLORS = ["#e9f2ff", "#faeefb", "#e3f7ed", "#ffecf0", "#ffefe4", "#e3f5f8", "#f1efff", "#e0f8d9"];
-const AVATAR_TEXT_COLORS = ["#043894", "#671481", "#004933", "#7e0642", "#850000", "#004077", "#4c05b5", "#004b00"];
+const AVATAR_BG_LIGHT_COLORS = ["#e0f8d9", "#e3f5f8", "#faeefb", "#f1efff", "#ffecf0", "#ffefe4"];
+const AVATAR_TEXT_LIGHT_COLORS = ["#005f00", "#00548c", "#822198", "#5d26cd", "#9f0850", "#9b2200"];
+
+const AVATAR_BG_DARK_COLORS = ["#002600", "#001b4e", "#37004e", "#22006a", "#450018", "#470000"];
+const AVATAR_TEXT_DARK_COLORS = ["#56c02c", "#21bacd", "#d991de", "#ad9cfe", "#fe84a2", "#f6913d"];
 
 // Not to be used for BaseAvatar urls as that has similar default avatar fallback already
 export function avatarUrlForMember(
@@ -42,6 +46,13 @@ export function avatarUrlForMember(
     return url;
 }
 
+/**
+ * Determines if the current theme is dark
+ */
+function isDarkTheme(): boolean {
+    return new ThemeWatcher().getEffectiveTheme() === "dark";
+}
+
 /**
  * Determines the HEX color to use in the avatar pills
  * @param id the user or room ID
@@ -51,7 +62,8 @@ export function getAvatarTextColor(id: string): string {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     const index = useIdColorHash(id);
 
-    return AVATAR_TEXT_COLORS[index - 1];
+    // Use light colors by default
+    return isDarkTheme() ? AVATAR_TEXT_DARK_COLORS[index - 1] : AVATAR_TEXT_LIGHT_COLORS[index - 1];
 }
 
 export function avatarUrlForUser(
@@ -103,7 +115,10 @@ export function defaultAvatarUrlForString(s: string): string {
     // overwritten color value in custom themes
     const cssVariable = `--avatar-background-colors_${colorIndex}`;
     const cssValue = getComputedStyle(document.body).getPropertyValue(cssVariable);
-    const color = cssValue || AVATAR_BG_COLORS[colorIndex - 1];
+    // Light colors are the default
+    const color =
+        cssValue || isDarkTheme() ? AVATAR_BG_DARK_COLORS[colorIndex - 1] : AVATAR_BG_LIGHT_COLORS[colorIndex - 1];
+
     let dataUrl = colorToDataURLCache.get(color);
     if (!dataUrl) {
         // validate color as this can come from account_data
diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index 87635a421c..5c81beb9ff 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -70,6 +70,7 @@ export default abstract class BasePlatform {
     protected notificationCount = 0;
     protected errorDidOccur = false;
     protected _favicon?: Favicon;
+    public readonly initialised = Promise.resolve<void>(undefined);
 
     protected constructor() {
         dis.register(this.onAction.bind(this));
@@ -87,7 +88,7 @@ export default abstract class BasePlatform {
 
     protected onAction(payload: ActionPayload): void {
         switch (payload.action) {
-            case "on_client_not_viable":
+            case Action.ClientNotViable:
             case Action.OnLoggedOut:
                 this.setNotificationCount(0);
                 break;
@@ -477,6 +478,8 @@ export default abstract class BasePlatform {
         // The redirect URL has to exactly match that registered at the OIDC server, so
         // ensure that the fragment part of the URL is empty.
         url.hash = "";
+        // Set no_universal_links=true to prevent the callback being handled by Element X installed on macOS Apple Silicon
+        url.searchParams.set("no_universal_links", "true");
         return url;
     }
 
@@ -494,19 +497,31 @@ export default abstract class BasePlatform {
     }
 
     private updateFavicon(): void {
-        let bgColor = "#d00";
-        let notif: string | number = this.notificationCount;
+        const notif: string | number = this.notificationCount;
 
         if (this.errorDidOccur) {
-            notif = notif || "×";
-            bgColor = "#f00";
+            this.favicon.badge(notif || "×", { bgColor: "#f00" });
         }
-
-        this.favicon.badge(notif, { bgColor });
+        this.favicon.badge(notif);
     }
 
     /**
      * Begin update polling, if applicable
      */
     public startUpdater(): void {}
+
+    /**
+     * Checks if the current session is lock-free, i.e., no other instance is holding the session lock.
+     * Platforms that support session locking should override this method.
+     * @returns {boolean} True if the session is lock-free, false otherwise.
+     */
+    public abstract checkSessionLockFree(): boolean;
+    /**
+     * Attempts to acquire a session lock for this instance.
+     * If another instance is detected, calls the provided callback.
+     * Platforms that support session locking should override this method.
+     * @param _onNewInstance Callback to invoke if a new instance is detected.
+     * @returns {Promise<boolean>} True if the lock was acquired, false otherwise.
+     */
+    public abstract getSessionLock(_onNewInstance: () => Promise<void>): Promise<boolean>;
 }
diff --git a/src/ContentMessages.ts b/src/ContentMessages.ts
index c5e34d7130..ec68f854fe 100644
--- a/src/ContentMessages.ts
+++ b/src/ContentMessages.ts
@@ -53,9 +53,8 @@ import ErrorDialog from "./components/views/dialogs/ErrorDialog";
 import UploadFailureDialog from "./components/views/dialogs/UploadFailureDialog";
 import UploadConfirmDialog from "./components/views/dialogs/UploadConfirmDialog";
 import { createThumbnail } from "./utils/image-media";
-import { attachMentions, attachRelation } from "./components/views/rooms/SendMessageComposer";
+import { attachMentions, attachRelation } from "./utils/messages.ts";
 import { doMaybeLocalRoomAction } from "./utils/local-room";
-import { SdkContextClass } from "./contexts/SDKContext";
 import { blobIsAnimated } from "./utils/Image.ts";
 
 // scraped out of a macOS hidpi (5660ppm) screenshot png
@@ -63,6 +62,12 @@ import { blobIsAnimated } from "./utils/Image.ts";
 const PHYS_HIDPI = [0x00, 0x00, 0x16, 0x25, 0x00, 0x00, 0x16, 0x25, 0x01];
 
 export class UploadCanceledError extends Error {}
+export class UploadFailedError extends Error {
+    public constructor(cause: any) {
+        super();
+        this.cause = cause;
+    }
+}
 
 interface IMediaConfig {
     "m.upload.size"?: number;
@@ -135,7 +140,7 @@ const IMAGE_THUMBNAIL_MIN_REDUCTION_PERCENT = 0.1; // 10%
 // and videos tend to be much larger.
 
 // Image mime types for which to always include a thumbnail for even if it is larger than the input for wider support.
-const ALWAYS_INCLUDE_THUMBNAIL = ["image/avif", "image/webp"];
+const ALWAYS_INCLUDE_THUMBNAIL = ["image/avif", "image/webp", "image/svg+xml"];
 
 /**
  * Read the metadata for an image file and create and upload a thumbnail of the image.
@@ -152,14 +157,17 @@ async function infoForImageFile(matrixClient: MatrixClient, roomId: string, imag
     }
 
     // We don't await this immediately so it can happen in the background
-    const isAnimatedPromise = blobIsAnimated(imageFile.type, imageFile);
+    const isAnimatedPromise = blobIsAnimated(imageFile);
 
     const imageElement = await loadImageElement(imageFile);
 
     const result = await createThumbnail(imageElement.img, imageElement.width, imageElement.height, thumbnailType);
     const imageInfo = result.info;
 
-    imageInfo["org.matrix.msc4230.is_animated"] = await isAnimatedPromise;
+    const isAnimated = await isAnimatedPromise;
+    if (isAnimated !== undefined) {
+        imageInfo["org.matrix.msc4230.is_animated"] = await isAnimatedPromise;
+    }
 
     // For lesser supported image types, always include the thumbnail even if it is larger
     if (!ALWAYS_INCLUDE_THUMBNAIL.includes(imageFile.type)) {
@@ -355,12 +363,19 @@ export async function uploadFile(
         // Pass the encrypted data as a Blob to the uploader.
         const blob = new Blob([encryptResult.data]);
 
-        const { content_uri: url } = await matrixClient.uploadContent(blob, {
-            progressHandler,
-            abortController,
-            includeFilename: false,
-            type: "application/octet-stream",
-        });
+        let url: string;
+        try {
+            ({ content_uri: url } = await matrixClient.uploadContent(blob, {
+                progressHandler,
+                abortController,
+                includeFilename: false,
+                type: "application/octet-stream",
+            }));
+        } catch (e) {
+            if (abortController.signal.aborted) throw new UploadCanceledError();
+            console.error("Failed to upload file", e);
+            throw new UploadFailedError(e);
+        }
         if (abortController.signal.aborted) throw new UploadCanceledError();
 
         // If the attachment is encrypted then bundle the URL along with the information
@@ -372,7 +387,14 @@ export async function uploadFile(
             } as EncryptedFile,
         };
     } else {
-        const { content_uri: url } = await matrixClient.uploadContent(file, { progressHandler, abortController });
+        let url: string;
+        try {
+            ({ content_uri: url } = await matrixClient.uploadContent(file, { progressHandler, abortController }));
+        } catch (e) {
+            if (abortController.signal.aborted) throw new UploadCanceledError();
+            console.error("Failed to upload file", e);
+            throw new UploadFailedError(e);
+        }
         if (abortController.signal.aborted) throw new UploadCanceledError();
         // If the attachment isn't encrypted then include the URL directly.
         return { url };
@@ -405,10 +427,21 @@ export default class ContentMessages {
         return this.mediaConfig?.["m.upload.size"] ?? null;
     }
 
+    /**
+     * Sends a list of files to a room.
+     * @param files - The files to send.
+     * @param roomId - The ID of the room to send the files to.
+     * @param relation - The relation to the event being replied to.
+     * @param replyToEvent - The event being replied to, if any.
+     * @param matrixClient - The Matrix client to use for sending the files.
+     * @param context - The context in which the files are being sent.
+     * @returns A promise that resolves when the files have been sent.
+     */
     public async sendContentListToRoom(
         files: File[],
         roomId: string,
         relation: IEventRelation | undefined,
+        replyToEvent: MatrixEvent | undefined,
         matrixClient: MatrixClient,
         context = TimelineRenderingType.Room,
     ): Promise<void> {
@@ -417,7 +450,6 @@ export default class ContentMessages {
             return;
         }
 
-        const replyToEvent = SdkContextClass.instance.roomViewStore.getQuotingEvent();
         if (!this.mediaConfig) {
             // hot-path optimization to not flash a spinner if we don't need to
             const modal = Modal.createDialog(Spinner, undefined, "mx_Dialog_spinner");
@@ -570,7 +602,7 @@ export default class ContentMessages {
                     const imageInfo = await infoForImageFile(matrixClient, roomId, file);
                     Object.assign(content.info, imageInfo);
                 } catch (e) {
-                    if (e instanceof HTTPError) {
+                    if (e instanceof UploadFailedError) {
                         // re-throw to main upload error handler
                         throw e;
                     }
@@ -623,15 +655,18 @@ export default class ContentMessages {
             dis.dispatch<UploadFinishedPayload>({ action: Action.UploadFinished, upload });
             dis.dispatch({ action: "message_sent" });
         } catch (error) {
+            // Unwrap UploadFailedError to get the underlying error
+            const unwrappedError = error instanceof UploadFailedError && error.cause ? error.cause : error;
+
             // 413: File was too big or upset the server in some way:
             // clear the media size limit so we fetch it again next time we try to upload
-            if (error instanceof HTTPError && error.httpStatus === 413) {
+            if (unwrappedError instanceof HTTPError && unwrappedError.httpStatus === 413) {
                 this.mediaConfig = null;
             }
 
             if (!upload.cancelled) {
                 let desc = _t("upload_failed_generic", { fileName: upload.fileName });
-                if (error instanceof HTTPError && error.httpStatus === 413) {
+                if (unwrappedError instanceof HTTPError && unwrappedError.httpStatus === 413) {
                     desc = _t("upload_failed_size", {
                         fileName: upload.fileName,
                     });
diff --git a/src/CreateCrossSigning.ts b/src/CreateCrossSigning.ts
index c8e7aa3e73..5f6f3e48aa 100644
--- a/src/CreateCrossSigning.ts
+++ b/src/CreateCrossSigning.ts
@@ -38,10 +38,10 @@ export async function createCrossSigning(cli: MatrixClient): Promise<void> {
 
 export async function uiAuthCallback(
     matrixClient: MatrixClient,
-    makeRequest: (authData: AuthDict) => Promise<void>,
+    makeRequest: (authData: AuthDict | null) => Promise<void>,
 ): Promise<void> {
     try {
-        await makeRequest({});
+        await makeRequest(null);
     } catch (error) {
         if (!(error instanceof MatrixError) || !error.data || !error.data.flows) {
             // Not a UIA response
diff --git a/src/DateUtils.ts b/src/DateUtils.ts
index e788ca09bf..82e7bfa880 100644
--- a/src/DateUtils.ts
+++ b/src/DateUtils.ts
@@ -8,11 +8,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { type Optional } from "matrix-events-sdk";
-
 import { _t, getUserLanguage } from "./languageHandler";
 import { getUserTimezone } from "./TimezoneHandler";
 
+export { formatSeconds } from "@element-hq/web-shared-components";
+
 export const MINUTE_MS = 60000;
 export const HOUR_MS = MINUTE_MS * 60;
 export const DAY_MS = HOUR_MS * 24;
@@ -180,31 +180,6 @@ export function formatTime(date: Date, showTwelveHour = false, locale?: string):
     }).format(date);
 }
 
-export function formatSeconds(inSeconds: number): string {
-    const isNegative = inSeconds < 0;
-    inSeconds = Math.abs(inSeconds);
-
-    const hours = Math.floor(inSeconds / (60 * 60))
-        .toFixed(0)
-        .padStart(2, "0");
-    const minutes = Math.floor((inSeconds % (60 * 60)) / 60)
-        .toFixed(0)
-        .padStart(2, "0");
-    const seconds = Math.floor((inSeconds % (60 * 60)) % 60)
-        .toFixed(0)
-        .padStart(2, "0");
-
-    let output = "";
-    if (hours !== "00") output += `${hours}:`;
-    output += `${minutes}:${seconds}`;
-
-    if (isNegative) {
-        output = "-" + output;
-    }
-
-    return output;
-}
-
 export function formatTimeLeft(inSeconds: number): string {
     const hours = Math.floor(inSeconds / (60 * 60)).toFixed(0);
     const minutes = Math.floor((inSeconds % (60 * 60)) / 60).toFixed(0);
@@ -242,7 +217,7 @@ function withinCurrentYear(prevDate: Date, nextDate: Date): boolean {
     return prevDate.getFullYear() === nextDate.getFullYear();
 }
 
-export function wantsDateSeparator(prevEventDate: Optional<Date>, nextEventDate: Optional<Date>): boolean {
+export function wantsDateSeparator(prevEventDate: Date | undefined, nextEventDate: Date | undefined): boolean {
     if (!nextEventDate || !prevEventDate) {
         return false;
     }
diff --git a/src/DeviceListener.ts b/src/DeviceListener.ts
index e13d296bc1..f9904eaef1 100644
--- a/src/DeviceListener.ts
+++ b/src/DeviceListener.ts
@@ -1,4 +1,5 @@
 /*
+Copyright 2025 Element Creations Ltd.
 Copyright 2024 New Vector Ltd.
 Copyright 2020 The Matrix.org Foundation C.I.C.
 
@@ -14,8 +15,9 @@ import {
     RoomStateEvent,
     type SyncState,
     ClientStoppedError,
+    TypedEventEmitter,
 } from "matrix-js-sdk/src/matrix";
-import { logger as baseLogger, LogSpan } from "matrix-js-sdk/src/logger";
+import { logger as baseLogger, type BaseLogger, LogSpan } from "matrix-js-sdk/src/logger";
 import { CryptoEvent, type KeyBackupInfo } from "matrix-js-sdk/src/crypto-api";
 import { type CryptoSessionStateChange } from "@matrix-org/analytics-events/types/typescript/CryptoSessionStateChange";
 import { secureRandomString } from "matrix-js-sdk/src/randomstring";
@@ -28,7 +30,6 @@ import {
 } from "./toasts/BulkUnverifiedSessionsToast";
 import {
     hideToast as hideSetupEncryptionToast,
-    Kind as SetupKind,
     showToast as showSetupEncryptionToast,
 } from "./toasts/SetupEncryptionToast";
 import {
@@ -57,9 +58,54 @@ const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
  */
 export const BACKUP_DISABLED_ACCOUNT_DATA_KEY = "m.org.matrix.custom.backup_disabled";
 
+/**
+ * Account data key to indicate whether the user has chosen to enable or disable recovery.
+ */
+export const RECOVERY_ACCOUNT_DATA_KEY = "io.element.recovery";
+
 const logger = baseLogger.getChild("DeviceListener:");
 
-export default class DeviceListener {
+/**
+ * The state of the device and the user's account.
+ */
+export type DeviceState =
+    /**
+     * The device is in a good state.
+     */
+    | "ok"
+    /**
+     * The user needs to set up recovery.
+     */
+    | "set_up_recovery"
+    /**
+     * The device is not verified.
+     */
+    | "verify_this_session"
+    /**
+     * Key storage is out of sync (keys are missing locally, from recovery, or both).
+     */
+    | "key_storage_out_of_sync"
+    /**
+     * Key storage is not enabled, and has not been marked as purposely disabled.
+     */
+    | "turn_on_key_storage"
+    /**
+     * The user's identity needs resetting, due to missing keys.
+     */
+    | "identity_needs_reset";
+
+/**
+ * The events emitted by {@link DeviceListener}
+ */
+export enum DeviceListenerEvents {
+    DeviceState = "device_state",
+}
+
+type EventHandlerMap = {
+    [DeviceListenerEvents.DeviceState]: (state: DeviceState) => void;
+};
+
+export default class DeviceListener extends TypedEventEmitter<DeviceListenerEvents, EventHandlerMap> {
     private dispatcherRef?: string;
     // device IDs for which the user has dismissed the verify toast ('Later')
     private dismissed = new Set<string>();
@@ -81,6 +127,7 @@ export default class DeviceListener {
     private shouldRecordClientInformation = false;
     private enableBulkUnverifiedSessionsReminder = true;
     private deviceClientInformationSettingWatcherRef: string | undefined;
+    private deviceState: DeviceState = "ok";
 
     // Remember the current analytics state to avoid sending the same event multiple times.
     private analyticsVerificationState?: string;
@@ -139,6 +186,25 @@ export default class DeviceListener {
         this.client = undefined;
     }
 
+    /**
+     * Pause the device listener while a function runs.
+     *
+     * This can be done if the function makes several changes that would trigger
+     * multiple events, to suppress warning toasts until the process is
+     * finished.
+     */
+    public async whilePaused(fn: () => Promise<void>): Promise<void> {
+        const client = this.client;
+        try {
+            this.stop();
+            await fn();
+        } finally {
+            if (client) {
+                this.start(client);
+            }
+        }
+    }
+
     /**
      * Dismiss notifications about our own unverified devices
      *
@@ -165,6 +231,73 @@ export default class DeviceListener {
         await this.client?.setAccountData(BACKUP_DISABLED_ACCOUNT_DATA_KEY, { disabled: true });
     }
 
+    /**
+     * Set the account data to indicate that recovery is disabled
+     */
+    public async recordRecoveryDisabled(): Promise<void> {
+        await this.client?.setAccountData(RECOVERY_ACCOUNT_DATA_KEY, { enabled: false });
+    }
+
+    /**
+     * If the device is in a `key_storage_out_of_sync` state, check if
+     * it requires a reset of cross-signing keys.
+     *
+     * We will reset cross-signing keys if both our local cache and 4S don't
+     * have all cross-signing keys.
+     *
+     * In theory, if the set of keys in our cache and in 4S are different, and
+     * we have a complete set between the two, we could be OK, but that
+     * should be exceptionally rare, and is more complicated to detect.
+     */
+    public async keyStorageOutOfSyncNeedsCrossSigningReset(forgotRecovery: boolean): Promise<boolean> {
+        const crypto = this.client?.getCrypto();
+        if (!crypto) {
+            return false;
+        }
+        const crossSigningStatus = await crypto.getCrossSigningStatus();
+        const allCrossSigningSecretsCached =
+            crossSigningStatus.privateKeysCachedLocally.masterKey &&
+            crossSigningStatus.privateKeysCachedLocally.selfSigningKey &&
+            crossSigningStatus.privateKeysCachedLocally.userSigningKey;
+
+        if (forgotRecovery) {
+            return !allCrossSigningSecretsCached;
+        } else {
+            return !allCrossSigningSecretsCached && !crossSigningStatus.privateKeysInSecretStorage;
+        }
+    }
+
+    /**
+     * If the device is in a `"key_storage_out_of_sync"` state, check if
+     * it requires a reset of key backup.
+     *
+     * If the user has their recovery key, we need to reset backup if:
+     * - the user hasn't disabled backup,
+     * - we don't have the backup key cached locally, *and*
+     * - we don't have the backup key stored in 4S.
+     * (The user should already have a key backup created at this point, the
+     * device state would be `turn_on_key_storage`.)
+     *
+     * If the user has forgotten their recovery key, we need to reset backup if:
+     * - the user hasn't disabled backup, and
+     * - we don't have the backup key locally.
+     */
+    public async keyStorageOutOfSyncNeedsBackupReset(forgotRecovery: boolean): Promise<boolean> {
+        const crypto = this.client?.getCrypto();
+        if (!crypto) {
+            return false;
+        }
+        const shouldHaveBackup = !(await this.recheckBackupDisabled(this.client!));
+        const backupKeyCached = (await crypto.getSessionBackupPrivateKey()) !== null;
+        const backupKeyStored = await this.client!.isKeyBackupKeyStored();
+
+        if (forgotRecovery) {
+            return shouldHaveBackup && !backupKeyCached;
+        } else {
+            return shouldHaveBackup && !backupKeyCached && !backupKeyStored;
+        }
+    }
+
     private async ensureDeviceIdsAtStartPopulated(): Promise<void> {
         if (this.ourDeviceIdsAtStart === null) {
             this.ourDeviceIdsAtStart = await this.getDeviceIds();
@@ -201,6 +334,7 @@ export default class DeviceListener {
     };
 
     private onKeyBackupStatusChanged = (): void => {
+        logger.info("Backup status changed");
         this.cachedKeyBackupUploadActive = undefined;
         this.recheck();
     };
@@ -220,7 +354,8 @@ export default class DeviceListener {
             ev.getType().startsWith("m.secret_storage.") ||
             ev.getType().startsWith("m.cross_signing.") ||
             ev.getType() === "m.megolm_backup.v1" ||
-            ev.getType() === BACKUP_DISABLED_ACCOUNT_DATA_KEY
+            ev.getType() === BACKUP_DISABLED_ACCOUNT_DATA_KEY ||
+            ev.getType() === RECOVERY_ACCOUNT_DATA_KEY
         ) {
             this.recheck();
         }
@@ -300,15 +435,10 @@ export default class DeviceListener {
     private async doRecheck(): Promise<void> {
         if (!this.running || !this.client) return; // we have been stopped
         const logSpan = new LogSpan(logger, "check_" + secureRandomString(4));
+        logSpan.debug("starting recheck...");
 
         const cli = this.client;
 
-        // cross-signing support was added to Matrix in MSC1756, which landed in spec v1.1
-        if (!(await cli.isVersionSupported("v1.1"))) {
-            logSpan.debug("cross-signing not supported");
-            return;
-        }
-
         const crypto = cli.getCrypto();
         if (!crypto) {
             logSpan.debug("crypto not enabled");
@@ -324,87 +454,104 @@ export default class DeviceListener {
         }
 
         const crossSigningReady = await crypto.isCrossSigningReady();
-        const secretStorageReady = await crypto.isSecretStorageReady();
+        const secretStorageStatus = await crypto.getSecretStorageStatus();
         const crossSigningStatus = await crypto.getCrossSigningStatus();
         const allCrossSigningSecretsCached =
             crossSigningStatus.privateKeysCachedLocally.masterKey &&
             crossSigningStatus.privateKeysCachedLocally.selfSigningKey &&
             crossSigningStatus.privateKeysCachedLocally.userSigningKey;
 
-        const defaultKeyId = await cli.secretStorage.getDefaultKeyId();
+        const recoveryDisabled = await this.recheckRecoveryDisabled(cli);
 
-        const isCurrentDeviceTrusted =
-            crossSigningReady &&
-            Boolean(
-                (await crypto.getDeviceVerificationStatus(cli.getSafeUserId(), cli.deviceId!))?.crossSigningVerified,
-            );
+        const recoveryIsOk = secretStorageStatus.ready || recoveryDisabled;
 
-        const keyBackupUploadActive = await this.isKeyBackupUploadActive();
+        const isCurrentDeviceTrusted = Boolean(
+            (await crypto.getDeviceVerificationStatus(cli.getSafeUserId(), cli.deviceId!))?.crossSigningVerified,
+        );
+
+        const keyBackupUploadActive = await this.isKeyBackupUploadActive(logSpan);
         const backupDisabled = await this.recheckBackupDisabled(cli);
 
         // We warn if key backup upload is turned off and we have not explicitly
         // said we are OK with that.
-        const keyBackupIsOk = keyBackupUploadActive || backupDisabled;
+        const keyBackupUploadIsOk = keyBackupUploadActive || backupDisabled;
+
+        // We warn if key backup is set up, but we don't have the decryption
+        // key, so can't fetch keys from backup.
+        const keyBackupDownloadIsOk =
+            !keyBackupUploadActive || backupDisabled || (await crypto.getSessionBackupPrivateKey()) !== null;
 
         const allSystemsReady =
-            crossSigningReady && keyBackupIsOk && secretStorageReady && allCrossSigningSecretsCached;
+            isCurrentDeviceTrusted &&
+            allCrossSigningSecretsCached &&
+            keyBackupUploadIsOk &&
+            recoveryIsOk &&
+            keyBackupDownloadIsOk;
 
         await this.reportCryptoSessionStateToAnalytics(cli);
 
-        if (this.dismissedThisDeviceToast || allSystemsReady) {
+        if (allSystemsReady) {
             logSpan.info("No toast needed");
-            hideSetupEncryptionToast();
+            await this.setDeviceState("ok", logSpan);
 
             this.checkKeyBackupStatus();
-        } else if (await this.shouldShowSetupEncryptionToast()) {
+        } else {
             // make sure our keys are finished downloading
             await crypto.getUserDeviceInfo([cli.getSafeUserId()]);
 
-            if (!crossSigningReady) {
-                // This account is legacy and doesn't have cross-signing set up at all.
-                // Prompt the user to set it up.
-                logSpan.info("Cross-signing not ready: showing SET_UP_ENCRYPTION toast");
-                showSetupEncryptionToast(SetupKind.SET_UP_ENCRYPTION);
-            } else if (!isCurrentDeviceTrusted) {
-                // cross signing is ready but the current device is not trusted: prompt the user to verify
-                logSpan.info("Current device not verified: showing VERIFY_THIS_SESSION toast");
-                showSetupEncryptionToast(SetupKind.VERIFY_THIS_SESSION);
+            if (!isCurrentDeviceTrusted) {
+                // the current device is not trusted: prompt the user to verify
+                logSpan.info("Current device not verified: setting state to VERIFY_THIS_SESSION");
+                await this.setDeviceState("verify_this_session", logSpan);
             } else if (!allCrossSigningSecretsCached) {
                 // cross signing ready & device trusted, but we are missing secrets from our local cache.
                 // prompt the user to enter their recovery key.
                 logSpan.info(
-                    "Some secrets not cached: showing KEY_STORAGE_OUT_OF_SYNC toast",
+                    "Some secrets not cached: setting state to KEY_STORAGE_OUT_OF_SYNC",
                     crossSigningStatus.privateKeysCachedLocally,
+                    crossSigningStatus.privateKeysInSecretStorage,
                 );
-                showSetupEncryptionToast(SetupKind.KEY_STORAGE_OUT_OF_SYNC);
-            } else if (!keyBackupIsOk) {
-                logSpan.info("Key backup upload is unexpectedly turned off: showing TURN_ON_KEY_STORAGE toast");
-                showSetupEncryptionToast(SetupKind.TURN_ON_KEY_STORAGE);
-            } else if (defaultKeyId === null) {
+                await this.setDeviceState(
+                    crossSigningStatus.privateKeysInSecretStorage ? "key_storage_out_of_sync" : "identity_needs_reset",
+                    logSpan,
+                );
+            } else if (!keyBackupUploadIsOk) {
+                logSpan.info("Key backup upload is unexpectedly turned off: setting state to TURN_ON_KEY_STORAGE");
+                await this.setDeviceState("turn_on_key_storage", logSpan);
+            } else if (secretStorageStatus.defaultKeyId === null) {
                 // The user just hasn't set up 4S yet: if they have key
                 // backup, prompt them to turn on recovery too. (If not, they
                 // have explicitly opted out, so don't hassle them.)
-                if (keyBackupUploadActive) {
-                    logSpan.info("No default 4S key: showing SET_UP_RECOVERY toast");
-                    showSetupEncryptionToast(SetupKind.SET_UP_RECOVERY);
+                if (recoveryDisabled) {
+                    logSpan.info("Recovery disabled: no toast needed");
+                    await this.setDeviceState("ok", logSpan);
+                } else if (keyBackupUploadActive) {
+                    logSpan.info("No default 4S key: setting state to SET_UP_RECOVERY");
+                    await this.setDeviceState("set_up_recovery", logSpan);
                 } else {
                     logSpan.info("No default 4S key but backup disabled: no toast needed");
-                    hideSetupEncryptionToast();
+                    await this.setDeviceState("ok", logSpan);
                 }
             } else {
-                // some other condition... yikes! Show the 'set up encryption' toast: this is what we previously did
-                // in 'other' situations. Possibly we should consider prompting for a full reset in this case?
-                logSpan.warn("Couldn't match encryption state to a known case: showing 'setup encryption' prompt", {
+                // If we get here, then we are verified, have key backup, and
+                // 4S, but allSystemsReady is false, which means that either
+                // secretStorageStatus.ready is false (which means that 4S
+                // doesn't have all the secrets), or we don't have the backup
+                // key cached locally. If any of the cross-signing keys are
+                // missing locally, that is handled by the
+                // `!allCrossSigningSecretsCached` branch above.
+                logSpan.warn("4S is missing secrets or backup key not cached", {
                     crossSigningReady,
-                    secretStorageReady,
+                    secretStorageStatus,
                     allCrossSigningSecretsCached,
                     isCurrentDeviceTrusted,
-                    defaultKeyId,
+                    keyBackupDownloadIsOk,
                 });
-                showSetupEncryptionToast(SetupKind.SET_UP_ENCRYPTION);
+                await this.setDeviceState("key_storage_out_of_sync", logSpan);
+            }
+            if (this.dismissedThisDeviceToast) {
+                this.checkKeyBackupStatus();
             }
-        } else {
-            logSpan.info("Not yet ready, but shouldShowSetupEncryptionToast==false");
         }
 
         // This needs to be done after awaiting on getUserDeviceInfo() above, so
@@ -482,6 +629,45 @@ export default class DeviceListener {
         return !!backupDisabled?.disabled;
     }
 
+    /**
+     * Check whether the user has disabled recovery. If this is the first time,
+     * fetch it from the server (in case the initial sync has not finished).
+     * Otherwise, fetch it from the store as normal.
+     */
+    private async recheckRecoveryDisabled(cli: MatrixClient): Promise<boolean> {
+        const recoveryStatus = await cli.getAccountDataFromServer(RECOVERY_ACCOUNT_DATA_KEY);
+        // Recovery is disabled only if the `enabled` flag is set to `false`.
+        // If it is missing, or set to any other value, we consider it as
+        // not-disabled, and will prompt the user to create recovery (if
+        // missing).
+        return recoveryStatus?.enabled === false;
+    }
+
+    /**
+     * Get the state of the device and the user's account.  The device/account
+     * state indicates what action the user must take in order to get a
+     * self-verified device that is using key backup and recovery.
+     */
+    public getDeviceState(): DeviceState {
+        return this.deviceState;
+    }
+
+    /**
+     * Set the state of the device, and perform any actions necessary in
+     * response to the state changing.
+     */
+    private async setDeviceState(newState: DeviceState, logSpan: LogSpan): Promise<void> {
+        this.deviceState = newState;
+        this.emit(DeviceListenerEvents.DeviceState, newState);
+        if (newState === "ok" || this.dismissedThisDeviceToast) {
+            hideSetupEncryptionToast();
+        } else if (await this.shouldShowSetupEncryptionToast()) {
+            showSetupEncryptionToast(newState);
+        } else {
+            logSpan.info("Not yet ready, but shouldShowSetupEncryptionToast==false");
+        }
+    }
+
     /**
      * Reports current recovery state to analytics.
      * Checks if the session is verified and if the recovery is correctly set up (i.e all secrets known locally and in 4S).
@@ -490,10 +676,11 @@ export default class DeviceListener {
      */
     private async reportCryptoSessionStateToAnalytics(cli: MatrixClient): Promise<void> {
         const crypto = cli.getCrypto()!;
-        const secretStorageReady = await crypto.isSecretStorageReady();
+        const secretStorageStatus = await crypto.getSecretStorageStatus();
+        const secretStorageReady = secretStorageStatus.ready;
         const crossSigningStatus = await crypto.getCrossSigningStatus();
         const backupInfo = await this.getKeyBackupInfo();
-        const is4SEnabled = (await cli.secretStorage.getDefaultKeyId()) != null;
+        const is4SEnabled = secretStorageStatus.defaultKeyId != null;
         const deviceVerificationStatus = await crypto.getDeviceVerificationStatus(cli.getUserId()!, cli.getDeviceId()!);
 
         const verificationState =
@@ -551,7 +738,7 @@ export default class DeviceListener {
      * trigger an auto-rageshake).
      */
     private checkKeyBackupStatus = async (): Promise<void> => {
-        if (!(await this.isKeyBackupUploadActive())) {
+        if (!(await this.isKeyBackupUploadActive(logger))) {
             dis.dispatch({ action: Action.ReportKeyBackupNotEnabled });
         }
     };
@@ -559,7 +746,7 @@ export default class DeviceListener {
     /**
      * Is key backup enabled? Use a cached answer if we have one.
      */
-    private isKeyBackupUploadActive = async (): Promise<boolean> => {
+    private isKeyBackupUploadActive = async (logger: BaseLogger): Promise<boolean> => {
         if (!this.client) {
             // To preserve existing behaviour, if there is no client, we
             // pretend key backup upload is on.
@@ -583,6 +770,7 @@ export default class DeviceListener {
         // Fetch the answer and cache it
         const activeKeyBackupVersion = await crypto.getActiveSessionBackupVersion();
         this.cachedKeyBackupUploadActive = !!activeKeyBackupVersion;
+        logger.debug(`Key backup upload is ${this.cachedKeyBackupUploadActive ? "active" : "inactive"}`);
 
         return this.cachedKeyBackupUploadActive;
     };
diff --git a/src/HtmlUtils.tsx b/src/HtmlUtils.tsx
index 1d17710dab..5112e3f7ce 100644
--- a/src/HtmlUtils.tsx
+++ b/src/HtmlUtils.tsx
@@ -15,14 +15,13 @@ import classNames from "classnames";
 import katex from "katex";
 import { decode } from "html-entities";
 import { type IContent } from "matrix-js-sdk/src/matrix";
-import { type Optional } from "matrix-events-sdk";
 import escapeHtml from "escape-html";
 import { getEmojiFromUnicode } from "@matrix-org/emojibase-bindings";
 
 import SettingsStore from "./settings/SettingsStore";
 import { stripHTMLReply, stripPlainReply } from "./utils/Reply";
 import { PERMITTED_URL_SCHEMES } from "./utils/UrlUtils";
-import { sanitizeHtmlParams, transformTags } from "./Linkify";
+import { linkifyHtml, sanitizeHtmlParams, transformTags } from "./Linkify";
 import { graphemeSegmenter } from "./utils/strings";
 
 export { Linkify, linkifyAndSanitizeHtml } from "./Linkify";
@@ -298,9 +297,10 @@ export interface EventRenderOpts {
      * Should inline media be rendered?
      */
     mediaIsVisible?: boolean;
+    linkify?: boolean;
 }
 
-function analyseEvent(content: IContent, highlights: Optional<string[]>, opts: EventRenderOpts = {}): EventAnalysis {
+function analyseEvent(content: IContent, highlights?: string[], opts: EventRenderOpts = {}): EventAnalysis {
     let sanitizeParams = sanitizeHtmlParams;
     if (opts.forComposerQuote) {
         sanitizeParams = composerSanitizeHtmlParams;
@@ -320,6 +320,18 @@ function analyseEvent(content: IContent, highlights: Optional<string[]>, opts: E
         };
     }
 
+    if (opts.linkify) {
+        // Prevent mutating the source of sanitizeParams.
+        sanitizeParams = { ...sanitizeParams };
+        sanitizeParams.allowedClasses ??= {};
+        if (typeof sanitizeParams.allowedClasses.a === "boolean") {
+            // All classes are already allowed for "a"
+        } else {
+            sanitizeParams.allowedClasses.a ??= [];
+            sanitizeParams.allowedClasses.a.push("linkified");
+        }
+    }
+
     try {
         const isFormattedBody =
             content.format === "org.matrix.custom.html" && typeof content.formatted_body === "string";
@@ -346,19 +358,26 @@ function analyseEvent(content: IContent, highlights: Optional<string[]>, opts: E
             ? new HtmlHighlighter("mx_EventTile_searchHighlight", opts.highlightLink)
             : null;
 
+        if (highlighter) {
+            // XXX: We sanitize the HTML whilst also highlighting its text nodes, to avoid accidentally trying
+            // to highlight HTML tags themselves. However, this does mean that we don't highlight textnodes which
+            // are interrupted by HTML tags (not that we did before) - e.g. foo<span/>bar won't get highlighted
+            // by an attempt to search for 'foobar'.  Then again, the search query probably wouldn't work either
+            // XXX: hacky bodge to temporarily apply a textFilter to the sanitizeParams structure.
+            sanitizeParams.textFilter = function (safeText) {
+                return highlighter.applyHighlights(safeText, safeHighlights!).join("");
+            };
+        }
+
         if (isFormattedBody) {
-            if (highlighter) {
-                // XXX: We sanitize the HTML whilst also highlighting its text nodes, to avoid accidentally trying
-                // to highlight HTML tags themselves. However, this does mean that we don't highlight textnodes which
-                // are interrupted by HTML tags (not that we did before) - e.g. foo<span/>bar won't get highlighted
-                // by an attempt to search for 'foobar'.  Then again, the search query probably wouldn't work either
-                // XXX: hacky bodge to temporarily apply a textFilter to the sanitizeParams structure.
-                sanitizeParams.textFilter = function (safeText) {
-                    return highlighter.applyHighlights(safeText, safeHighlights!).join("");
-                };
+            let unsafeBody = formattedBody!;
+
+            if (opts.linkify) {
+                unsafeBody = linkifyHtml(unsafeBody);
             }
 
-            safeBody = sanitizeHtml(formattedBody!, sanitizeParams);
+            safeBody = sanitizeHtml(unsafeBody, sanitizeParams);
+
             const phtml = new DOMParser().parseFromString(safeBody, "text/html");
             const isPlainText = phtml.body.innerHTML === phtml.body.textContent;
             isHtmlMessage = !isPlainText;
@@ -373,6 +392,9 @@ function analyseEvent(content: IContent, highlights: Optional<string[]>, opts: E
                 });
                 safeBody = phtml.body.innerHTML;
             }
+        } else if (opts.linkify) {
+            // If we are linkifying plain text, pass the result through sanitizeHtml so that the highlighter configured in sanitizeParams.textFilter gets applied.
+            safeBody = sanitizeHtml(linkifyHtml(escapeHtml(plainBody)), sanitizeParams);
         } else if (highlighter) {
             safeBody = highlighter.applyHighlights(escapeHtml(plainBody), safeHighlights!).join("");
         }
@@ -390,11 +412,7 @@ interface BodyToNodeReturn {
     className: string;
 }
 
-export function bodyToNode(
-    content: IContent,
-    highlights: Optional<string[]>,
-    opts: EventRenderOpts = {},
-): BodyToNodeReturn {
+export function bodyToNode(content: IContent, highlights?: string[], opts: EventRenderOpts = {}): BodyToNodeReturn {
     const eventInfo = analyseEvent(content, highlights, opts);
 
     let emojiBody = false;
@@ -428,14 +446,15 @@ export function bodyToNode(
     });
 
     let formattedBody = eventInfo.safeBody;
-    if (eventInfo.isFormattedBody && eventInfo.bodyHasEmoji && eventInfo.safeBody) {
-        // This has to be done after the emojiBody check as to not break big emoji on replies
-        formattedBody = formatEmojis(eventInfo.safeBody, true).join("");
-    }
-
     let emojiBodyElements: JSX.Element[] | undefined;
-    if (!eventInfo.safeBody && eventInfo.bodyHasEmoji) {
-        emojiBodyElements = formatEmojis(eventInfo.strippedBody, false) as JSX.Element[];
+
+    if (eventInfo.bodyHasEmoji) {
+        if (eventInfo.safeBody) {
+            // This has to be done after the emojiBody check as to not break big emoji on replies
+            formattedBody = formatEmojis(eventInfo.safeBody, true).join("");
+        } else {
+            emojiBodyElements = formatEmojis(eventInfo.strippedBody, false) as JSX.Element[];
+        }
     }
 
     return { strippedBody: eventInfo.strippedBody, formattedBody, emojiBodyElements, className };
@@ -454,11 +473,11 @@ export function bodyToNode(
  * opts.forComposerQuote: optional param to lessen the url rewriting done by sanitization, for quoting into composer
  * opts.ref: React ref to attach to any React components returned (not compatible with opts.returnString)
  */
-export function bodyToHtml(content: IContent, highlights: Optional<string[]>, opts: EventRenderOpts = {}): string {
+export function bodyToHtml(content: IContent, highlights?: string[], opts: EventRenderOpts = {}): string {
     const eventInfo = analyseEvent(content, highlights, opts);
 
     let formattedBody = eventInfo.safeBody;
-    if (eventInfo.isFormattedBody && eventInfo.bodyHasEmoji && formattedBody) {
+    if (eventInfo.bodyHasEmoji && formattedBody) {
         // This has to be done after the emojiBody check above as to not break big emoji on replies
         formattedBody = formatEmojis(eventInfo.safeBody, true).join("");
     }
diff --git a/src/IConfigOptions.ts b/src/IConfigOptions.ts
index 7ebbbf3f2b..b424451640 100644
--- a/src/IConfigOptions.ts
+++ b/src/IConfigOptions.ts
@@ -82,6 +82,7 @@ export interface IConfigOptions {
     };
 
     mobile_guide_toast?: boolean;
+    mobile_guide_app_variant?: "element" | "element-classic" | "element-pro";
 
     default_theme?: "light" | "dark" | string; // custom themes are strings
     default_country_code?: string; // ISO 3166 alpha2 country code
diff --git a/src/Keyboard.ts b/src/Keyboard.ts
index de7ab059c6..5a7e7b59f1 100644
--- a/src/Keyboard.ts
+++ b/src/Keyboard.ts
@@ -79,3 +79,12 @@ export function isOnlyCtrlOrCmdKeyEvent(ev: React.KeyboardEvent | KeyboardEvent)
         return ev.ctrlKey && !ev.altKey && !ev.metaKey && !ev.shiftKey;
     }
 }
+
+/**
+ * Checks if the given keyboard event is a modified key event (i.e., if any modifier keys are active).
+ * @param ev The keyboard event to check
+ * @returns True if the event is a modified key event, false otherwise
+ */
+export function isModifiedKeyEvent(ev: React.KeyboardEvent | KeyboardEvent): boolean {
+    return ev.metaKey || ev.altKey || ev.ctrlKey || ev.shiftKey;
+}
diff --git a/src/LegacyCallHandler.tsx b/src/LegacyCallHandler.tsx
index 9c3e7073d5..9e4544c37d 100644
--- a/src/LegacyCallHandler.tsx
+++ b/src/LegacyCallHandler.tsx
@@ -112,6 +112,7 @@ export enum LegacyCallHandlerEvent {
     CallsChanged = "calls_changed",
     CallChangeRoom = "call_change_room",
     SilencedCallsChanged = "silenced_calls_changed",
+    ShownSidebarsChanged = "shown_sidebars_changed",
     CallState = "call_state",
     ProtocolSupport = "protocol_support",
 }
@@ -120,6 +121,7 @@ type EventEmitterMap = {
     [LegacyCallHandlerEvent.CallsChanged]: (calls: Map<string, MatrixCall>) => void;
     [LegacyCallHandlerEvent.CallChangeRoom]: (call: MatrixCall) => void;
     [LegacyCallHandlerEvent.SilencedCallsChanged]: (calls: Set<string>) => void;
+    [LegacyCallHandlerEvent.ShownSidebarsChanged]: (sidebarsShown: Map<string, boolean>) => void;
     [LegacyCallHandlerEvent.CallState]: (mappedRoomId: string | null, status: CallState) => void;
     [LegacyCallHandlerEvent.ProtocolSupport]: () => void;
 };
@@ -144,6 +146,8 @@ export default class LegacyCallHandler extends TypedEventEmitter<LegacyCallHandl
 
     private silencedCalls = new Set<string>(); // callIds
 
+    private shownSidebars = new Map<string, boolean>(); // callId (call) -> sidebar show
+
     private backgroundAudio = new BackgroundAudio();
     private playingSources: Record<string, AudioBufferSourceNode> = {}; // Record them for stopping
 
@@ -240,6 +244,15 @@ export default class LegacyCallHandler extends TypedEventEmitter<LegacyCallHandl
         return false;
     }
 
+    public setCallSidebarShown(callId: string, sidebarShown: boolean): void {
+        this.shownSidebars.set(callId, sidebarShown);
+        this.emit(LegacyCallHandlerEvent.ShownSidebarsChanged, this.shownSidebars);
+    }
+
+    public isCallSidebarShown(callId?: string): boolean {
+        return !!callId && (this.shownSidebars.get(callId) ?? true);
+    }
+
     private async checkProtocols(maxTries: number): Promise<void> {
         try {
             const protocols = await MatrixClientPeg.safeGet().getThirdpartyProtocols();
@@ -377,6 +390,9 @@ export default class LegacyCallHandler extends TypedEventEmitter<LegacyCallHandl
 
         const [urlPrefix, loop] = audioInfo[audioId];
         const source = await this.backgroundAudio.pickFormatAndPlay(urlPrefix, ["mp3", "ogg"], loop);
+        if (this.playingSources[audioId]) {
+            logger.warn(`${logPrefix} Already playing audio ${audioId}!`);
+        }
         this.playingSources[audioId] = source;
         logger.debug(`${logPrefix} playing audio successfully`);
     }
@@ -1039,9 +1055,9 @@ export default class LegacyCallHandler extends TypedEventEmitter<LegacyCallHandl
         const jitsiWidgets = roomInfo.widgets.filter((w) => WidgetType.JITSI.matches(w.type));
         jitsiWidgets.forEach((w) => {
             const messaging = WidgetMessagingStore.instance.getMessagingForUid(WidgetUtils.getWidgetUid(w));
-            if (!messaging) return; // more "should never happen" words
+            if (!messaging?.widgetApi) return; // more "should never happen" words
 
-            messaging.transport.send(ElementWidgetActions.HangupCall, {});
+            messaging.widgetApi.transport.send(ElementWidgetActions.HangupCall, {});
         });
     }
 
diff --git a/src/Lifecycle.ts b/src/Lifecycle.ts
index 5641f936ae..746588241a 100644
--- a/src/Lifecycle.ts
+++ b/src/Lifecycle.ts
@@ -599,6 +599,9 @@ async function abortLogin(): Promise<void> {
 }
 
 /** Attempt to restore the session from localStorage or indexeddb.
+ *
+ * If the credentials are found, and the session is successfully restored,
+ * emits {@link Action.OnLoggedIn}, {@link Action.WillStartClient} and {@link Action.StartedClient}.
  *
  * @returns true if a session was found; false if no existing session was found.
  *
@@ -621,6 +624,9 @@ export async function restoreSessionFromStorage(opts?: { ignoreGuest?: boolean }
         await getStoredSessionVars();
 
     if (hasAccessToken && !accessToken) {
+        logger.warn(
+            "restoreSessionFromStorage: storage indicates we should have an access token, but we do not. Displaying StorageEvictedDialog",
+        );
         await abortLogin();
     }
 
@@ -657,7 +663,7 @@ export async function restoreSessionFromStorage(opts?: { ignoreGuest?: boolean }
                 freshLogin: freshLogin,
             },
             false,
-            false,
+            freshLogin,
         );
         return true;
     } else {
@@ -745,45 +751,46 @@ export async function hydrateSession(credentials: IMatrixClientCreds): Promise<M
  * When we have a authenticated via OIDC-native flow and have a refresh token
  * try to create a token refresher.
  * @param credentials from current session
- * @returns Promise that resolves to a TokenRefresher, or undefined
+ * @param clientId OIDC client ID
+ * @throws If credentials.refreshToken or credentials.deviceId is falsy, or if no token issuer is stored
+ * @returns Promise that resolves to a TokenRefresher
  */
-async function createOidcTokenRefresher(credentials: IMatrixClientCreds): Promise<OidcTokenRefresher | undefined> {
+async function createOidcTokenRefresher(
+    credentials: IMatrixClientCreds,
+    clientId: string,
+): Promise<OidcTokenRefresher> {
     if (!credentials.refreshToken) {
-        return;
+        throw new Error("A refresh token must be supplied in order to create an OIDC token refresher.");
     }
     // stored token issuer indicates we authenticated via OIDC-native flow
     const tokenIssuer = getStoredOidcTokenIssuer();
     if (!tokenIssuer) {
-        return;
+        throw new Error("Cannot create an OIDC token refresher as no stored OIDC token issuer was found.");
     }
-    try {
-        const clientId = getStoredOidcClientId();
-        const idTokenClaims = getStoredOidcIdTokenClaims();
-        const redirectUri = PlatformPeg.get()!.getOidcCallbackUrl().href;
-        const deviceId = credentials.deviceId;
-        if (!deviceId) {
-            throw new Error("Expected deviceId in user credentials.");
-        }
-        const tokenRefresher = new TokenRefresher(
-            tokenIssuer,
-            clientId,
-            redirectUri,
-            deviceId,
-            idTokenClaims!,
-            credentials.userId,
-        );
-        // wait for the OIDC client to initialise
-        await tokenRefresher.oidcClientReady;
-        return tokenRefresher;
-    } catch (error) {
-        logger.error("Failed to initialise OIDC token refresher", error);
+
+    const idTokenClaims = getStoredOidcIdTokenClaims();
+    const redirectUri = PlatformPeg.get()!.getOidcCallbackUrl().href;
+    const deviceId = credentials.deviceId;
+    if (!deviceId) {
+        throw new Error("Expected deviceId in user credentials.");
     }
+    const tokenRefresher = new TokenRefresher(
+        tokenIssuer,
+        clientId,
+        redirectUri,
+        deviceId,
+        idTokenClaims!,
+        credentials.userId,
+    );
+    return tokenRefresher;
 }
 
 /**
  * optionally clears localstorage, persists new credentials
  * to localstorage, starts the new client.
  *
+ * Emits {@link Action.OnLoggedIn}, {@link Action.WillStartClient} and {@link Action.StartedClient}.
+ *
  * @param {IMatrixClientCreds} credentials The credentials to use
  * @param {Boolean} clearStorageEnabled True to clear storage before starting the new client
  * @param {Boolean} isFreshLogin True if this is a fresh login, false if it is previous session being restored
@@ -823,10 +830,21 @@ async function doSetLoggedIn(
     // crypto store, we'll be generally confused when handling encrypted data.
     // Show a modal recommending a full reset of storage.
     if (results.dataInLocalStorage && results.cryptoInited && !results.dataInCryptoStore) {
+        logger.warn("doSetLoggedIn: StorageManager consistency check failed; displaying StorageEvictedDialog.");
         await abortLogin();
     }
 
-    const tokenRefresher = await createOidcTokenRefresher(credentials);
+    let storedClientid;
+    try {
+        storedClientid = getStoredOidcClientId();
+    } catch {}
+
+    let tokenRefresher;
+    if (credentials.refreshToken && storedClientid) {
+        tokenRefresher = await createOidcTokenRefresher(credentials, storedClientid);
+    } else {
+        logger.debug("No refresh token was supplied: access token will not be refreshed");
+    }
 
     // check the session lock just before creating the new client
     checkSessionLock();
@@ -997,7 +1015,7 @@ export function softLogout(): void {
     // Ensure that we dispatch a view change **before** stopping the client so
     // so that React components unmount first. This avoids React soft crashes
     // that can occur when components try to use a null client.
-    dis.dispatch({ action: "on_client_not_viable" }); // generic version of on_logged_out
+    dis.dispatch({ action: Action.ClientNotViable }); // generic version of on_logged_out
     stopMatrixClient(/*unsetClient=*/ false);
 
     // DO NOT CALL LOGOUT. A soft logout preserves data, logout does not.
@@ -1015,6 +1033,12 @@ export function isLoggingOut(): boolean {
  * Starts the matrix client and all other react-sdk services that
  * listen for events while a session is logged in.
  *
+ * By the time this method is called, we have successfully logged in if necessary, and the client has been set up with
+ * the access token.
+ *
+ * Emits {@link Acction.WillStartClient} before starting the client, and {@link Action.ClientStarted} when the client has
+ * been started.
+ *
  * @param client the matrix client to start
  * @param startSyncing - `true` to actually start syncing the client.
  * @param clientPegOpts - Options to pass through to {@link MatrixClientPeg.start}.
@@ -1030,7 +1054,7 @@ async function startMatrixClient(
     // to add listeners for the 'sync' event so otherwise we'd have
     // a race condition (and we need to dispatch synchronously for this
     // to work).
-    dis.dispatch({ action: "will_start_client" }, true);
+    dis.dispatch({ action: Action.WillStartClient }, true);
 
     // reset things first just in case
     SdkContextClass.instance.typingStore.reset();
@@ -1076,7 +1100,7 @@ async function startMatrixClient(
 
     // dispatch that we finished starting up to wire up any other bits
     // of the matrix client that cannot be set prior to starting up.
-    dis.dispatch({ action: "client_started" });
+    dis.dispatch({ action: Action.ClientStarted });
 
     if (isSoftLogout()) {
         softLogout();
diff --git a/src/Linkify.tsx b/src/Linkify.tsx
index 846bf8e82d..f324acd9b8 100644
--- a/src/Linkify.tsx
+++ b/src/Linkify.tsx
@@ -11,7 +11,7 @@ import sanitizeHtml, { type IOptions } from "sanitize-html";
 import { merge } from "lodash";
 import _Linkify from "linkify-react";
 
-import { _linkifyString, ELEMENT_URL_PATTERN, options as linkifyMatrixOptions } from "./linkify-matrix";
+import { _linkifyString, _linkifyHtml, ELEMENT_URL_PATTERN, options as linkifyMatrixOptions } from "./linkify-matrix";
 import { tryTransformPermalinkToLocalHref } from "./utils/permalinks/Permalinks";
 import { mediaFromMxc } from "./customisations/Media";
 import { PERMITTED_URL_SCHEMES } from "./utils/UrlUtils";
@@ -213,6 +213,16 @@ export function linkifyString(str: string, options = linkifyMatrixOptions): stri
     return _linkifyString(str, options);
 }
 
+/**
+ * Linkifies the given HTML-formatted string. This is a wrapper around 'linkifyjs/html'.
+ *
+ * @param {string} str HTML string to linkify
+ * @param {object} [options] Options for linkifyHtml. Default: linkifyMatrixOptions
+ * @returns {string} Linkified string
+ */
+export function linkifyHtml(str: string, options = linkifyMatrixOptions): string {
+    return _linkifyHtml(str, options);
+}
 /**
  * Linkify the given string and sanitize the HTML afterwards.
  *
diff --git a/src/Livestream.ts b/src/Livestream.ts
index 5fa315b442..cc8812fc9d 100644
--- a/src/Livestream.ts
+++ b/src/Livestream.ts
@@ -41,12 +41,12 @@ async function createLiveStream(matrixClient: MatrixClient, roomId: string): Pro
 
 export async function startJitsiAudioLivestream(
     matrixClient: MatrixClient,
-    widgetMessaging: ClientWidgetApi,
+    widgetApi: ClientWidgetApi,
     roomId: string,
 ): Promise<void> {
     const streamId = await createLiveStream(matrixClient, roomId);
 
-    await widgetMessaging.transport.send(ElementWidgetActions.StartLiveStream, {
+    await widgetApi.transport.send(ElementWidgetActions.StartLiveStream, {
         rtmpStreamKey: AUDIOSTREAM_DUMMY_URL + streamId,
     });
 }
diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index 288878cddc..8148509ef1 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -437,6 +437,7 @@ class MatrixClientPegClass implements IMatrixClientPeg {
             // These are always installed regardless of the labs flag so that cross-signing features
             // can toggle on without reloading and also be accessed immediately after login.
             cryptoCallbacks: { ...crossSigningCallbacks },
+            enableEncryptedStateEvents: SettingsStore.getValue("feature_msc4362_encrypted_state_events"),
             roomNameGenerator: (_: string, state: RoomNameState) => {
                 switch (state.type) {
                     case RoomNameType.Generated:
diff --git a/src/Notifier.ts b/src/Notifier.ts
index 7dce26d6bd..aa68b386a3 100644
--- a/src/Notifier.ts
+++ b/src/Notifier.ts
@@ -25,7 +25,7 @@ import {
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import { type PermissionChanged as PermissionChangedEvent } from "@matrix-org/analytics-events/types/typescript/PermissionChanged";
-import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
+import { type IRTCNotificationContent, MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
 
 import { MatrixClientPeg } from "./MatrixClientPeg";
 import { PosthogAnalytics } from "./PosthogAnalytics";
@@ -45,7 +45,7 @@ import { mediaFromMxc } from "./customisations/Media";
 import ErrorDialog from "./components/views/dialogs/ErrorDialog";
 import { SdkContextClass } from "./contexts/SDKContext";
 import { localNotificationsAreSilenced, createLocalNotificationSettingsIfNeeded } from "./utils/notifications";
-import { getIncomingCallToastKey, IncomingCallToast } from "./toasts/IncomingCallToast";
+import { getIncomingCallToastKey, getNotificationEventSendTs, IncomingCallToast } from "./toasts/IncomingCallToast";
 import ToastStore from "./stores/ToastStore";
 import { stripPlainReply } from "./utils/Reply";
 import { BackgroundAudio } from "./audio/BackgroundAudio";
@@ -489,24 +489,30 @@ class NotifierClass extends TypedEventEmitter<keyof EmittedEvents, EmittedEvents
         const thisUserHasConnectedDevice =
             room && MatrixRTCSession.callMembershipsForRoom(room).some((m) => m.sender === cli.getUserId());
 
-        // Check maximum age (<= 15 seconds) of a call notify event that will trigger a ringing notification
-        if (EventType.CallNotify === ev.getType() && (ev.getAge() ?? 0) < 15000 && !thisUserHasConnectedDevice) {
-            const content = ev.getContent();
+        if (EventType.RTCNotification === ev.getType() && !thisUserHasConnectedDevice) {
+            const content = ev.getContent() as IRTCNotificationContent;
             const roomId = ev.getRoomId();
-            if (typeof content.call_id !== "string") {
-                logger.warn("Received malformatted CallNotify event. Did not contain 'call_id' of type 'string'");
+            const eventId = ev.getId();
+
+            // Check maximum age of a call notification event that will trigger a ringing notification
+            if (Date.now() - getNotificationEventSendTs(ev) > content.lifetime) {
+                logger.warn("Received outdated RTCNotification event.");
                 return;
             }
             if (!roomId) {
-                logger.warn("Could not get roomId for CallNotify event");
+                logger.warn("Could not get roomId for RTCNotification event");
+                return;
+            }
+            if (!eventId) {
+                logger.warn("Could not get eventId for RTCNotification event");
                 return;
             }
             ToastStore.sharedInstance().addOrReplaceToast({
-                key: getIncomingCallToastKey(content.call_id, roomId),
+                key: getIncomingCallToastKey(eventId, roomId),
                 priority: 100,
                 component: IncomingCallToast,
                 bodyClassName: "mx_IncomingCallToast",
-                props: { notifyEvent: ev },
+                props: { notificationEvent: ev },
             });
         }
     }
diff --git a/src/PlatformPeg.ts b/src/PlatformPeg.ts
index 9e8852170c..00ac04468b 100644
--- a/src/PlatformPeg.ts
+++ b/src/PlatformPeg.ts
@@ -8,9 +8,6 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import type BasePlatform from "./BasePlatform";
-import defaultDispatcher from "./dispatcher/dispatcher";
-import { Action } from "./dispatcher/actions";
-import { type PlatformSetPayload } from "./dispatcher/payloads/PlatformSetPayload";
 
 /*
  * Holds the current instance of the `Platform` to use across the codebase.
@@ -25,6 +22,14 @@ import { type PlatformSetPayload } from "./dispatcher/payloads/PlatformSetPayloa
  */
 export class PlatformPeg {
     private platform: BasePlatform | null = null;
+    private platformPromiseWithResolvers = Promise.withResolvers<BasePlatform>();
+
+    /**
+     * Returns a promise for the Platform object for the application.
+     */
+    public get platformPromise(): Promise<BasePlatform> {
+        return this.platformPromiseWithResolvers.promise;
+    }
 
     /**
      * Returns the current Platform object for the application.
@@ -39,11 +44,8 @@ export class PlatformPeg {
      * @param {BasePlatform} platform an instance of a class extending BasePlatform.
      */
     public set(platform: BasePlatform): void {
+        this.platformPromiseWithResolvers.resolve(platform);
         this.platform = platform;
-        defaultDispatcher.dispatch<PlatformSetPayload>({
-            action: Action.PlatformSet,
-            platform,
-        });
     }
 }
 
diff --git a/src/PosthogTrackers.ts b/src/PosthogTrackers.ts
index 5eddeecb2a..2650403d3b 100644
--- a/src/PosthogTrackers.ts
+++ b/src/PosthogTrackers.ts
@@ -27,11 +27,12 @@ const notLoggedInMap: Record<Exclude<Views, Views.LOGGED_IN>, ScreenName> = {
     [Views.FORGOT_PASSWORD]: "ForgotPassword",
     [Views.COMPLETE_SECURITY]: "CompleteSecurity",
     [Views.E2E_SETUP]: "E2ESetup",
+    [Views.PENDING_CLIENT_START]: "Loading",
     [Views.SOFT_LOGOUT]: "SoftLogout",
     [Views.LOCK_STOLEN]: "SessionLockStolen",
 };
 
-const loggedInPageTypeMap: Record<PageType, ScreenName> = {
+const loggedInPageTypeMap: Record<PageType | string, ScreenName> = {
     [PageType.HomePage]: "Home",
     [PageType.RoomView]: "Room",
     [PageType.UserView]: "User",
@@ -48,10 +49,10 @@ export default class PosthogTrackers {
     }
 
     private view: Views = Views.LOADING;
-    private pageType?: PageType;
+    private pageType?: PageType | string;
     private override?: ScreenName;
 
-    public trackPageChange(view: Views, pageType: PageType | undefined, durationMs: number): void {
+    public trackPageChange(view: Views, pageType: PageType | string | undefined, durationMs: number): void {
         this.view = view;
         this.pageType = pageType;
         if (this.override) return;
diff --git a/src/Presence.ts b/src/Presence.ts
index 7388e2d165..7ccafdf68c 100644
--- a/src/Presence.ts
+++ b/src/Presence.ts
@@ -15,6 +15,7 @@ import { MatrixClientPeg } from "./MatrixClientPeg";
 import dis from "./dispatcher/dispatcher";
 import Timer from "./utils/Timer";
 import { type ActionPayload } from "./dispatcher/payloads";
+import { Action } from "./dispatcher/actions.ts";
 
 // Time in ms after that a user is considered as unavailable/away
 const UNAVAILABLE_TIME_MS = 3 * 60 * 1000; // 3 mins
@@ -61,7 +62,7 @@ class Presence {
     }
 
     private onAction = (payload: ActionPayload): void => {
-        if (payload.action === "user_activity") {
+        if (payload.action === Action.UserActivity) {
             this.setState(SetPresence.Online);
             this.unavailableTimer?.restart();
         }
diff --git a/src/RoomAliasCache.ts b/src/RoomAliasCache.ts
index fd611a7559..ff57a70e6c 100644
--- a/src/RoomAliasCache.ts
+++ b/src/RoomAliasCache.ts
@@ -6,6 +6,8 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
+type CacheResult = { roomId: string; viaServers: string[] };
+
 /**
  * This is meant to be a cache of room alias to room ID so that moving between
  * rooms happens smoothly (for example using browser back / forward buttons).
@@ -16,12 +18,12 @@ Please see LICENSE files in the repository root for full details.
  * A similar thing could also be achieved via `pushState` with a state object,
  * but keeping it separate like this seems easier in case we do want to extend.
  */
-const aliasToIDMap = new Map<string, string>();
+const cache = new Map<string, CacheResult>();
 
-export function storeRoomAliasInCache(alias: string, id: string): void {
-    aliasToIDMap.set(alias, id);
+export function storeRoomAliasInCache(alias: string, roomId: string, viaServers: string[]): void {
+    cache.set(alias, { roomId, viaServers });
 }
 
-export function getCachedRoomIDForAlias(alias: string): string | undefined {
-    return aliasToIDMap.get(alias);
+export function getCachedRoomIdForAlias(alias: string): CacheResult | undefined {
+    return cache.get(alias);
 }
diff --git a/src/RoomInvite.tsx b/src/RoomInvite.tsx
index a02530a1cf..feefdf7244 100644
--- a/src/RoomInvite.tsx
+++ b/src/RoomInvite.tsx
@@ -7,10 +7,9 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type ComponentProps } from "react";
-import { type Room, type MatrixEvent, type MatrixClient, type User, EventType } from "matrix-js-sdk/src/matrix";
-import { logger } from "matrix-js-sdk/src/logger";
+import { EventType, type MatrixClient, type MatrixEvent, type Room, type User } from "matrix-js-sdk/src/matrix";
 
-import MultiInviter, { type CompletionStates } from "./utils/MultiInviter";
+import MultiInviter, { type CompletionStates, type MultiInviterOptions } from "./utils/MultiInviter";
 import Modal from "./Modal";
 import { _t } from "./languageHandler";
 import InviteDialog from "./components/views/dialogs/InviteDialog";
@@ -26,22 +25,24 @@ export interface IInviteResult {
 }
 
 /**
- * Invites multiple addresses to a room
- * Simpler interface to utils/MultiInviter but with
- * no option to cancel.
+ * Invites multiple addresses to a room.
+ *
+ * Simpler interface to {@link MultiInviter}.
+ *
+ * Any failures are returned via the `states` in the result.
  *
  * @param {string} roomId The ID of the room to invite to
  * @param {string[]} addresses Array of strings of addresses to invite. May be matrix IDs or 3pids.
- * @param {function} progressCallback optional callback, fired after each invite.
+ * @param options Options object.
  * @returns {Promise} Promise
  */
 export async function inviteMultipleToRoom(
     client: MatrixClient,
     roomId: string,
     addresses: string[],
-    progressCallback?: () => void,
+    options: MultiInviterOptions = {},
 ): Promise<IInviteResult> {
-    const inviter = new MultiInviter(client, roomId, progressCallback);
+    const inviter = new MultiInviter(client, roomId, options);
     return { states: await inviter.invite(addresses), inviter };
 }
 
@@ -89,26 +90,6 @@ export function isValid3pidInvite(event: MatrixEvent): boolean {
     return true;
 }
 
-export function inviteUsersToRoom(
-    client: MatrixClient,
-    roomId: string,
-    userIds: string[],
-    progressCallback?: () => void,
-): Promise<void> {
-    return inviteMultipleToRoom(client, roomId, userIds, progressCallback)
-        .then((result) => {
-            const room = client.getRoom(roomId)!;
-            showAnyInviteErrors(result.states, room, result.inviter);
-        })
-        .catch((err) => {
-            logger.error(err.stack);
-            Modal.createDialog(ErrorDialog, {
-                title: _t("invite|failed_title"),
-                description: err?.message ?? _t("invite|failed_generic"),
-            });
-        });
-}
-
 export function showAnyInviteErrors(
     states: CompletionStates,
     room: Room,
diff --git a/src/SdkConfig.ts b/src/SdkConfig.ts
index 9576aa209e..71ac6736c9 100644
--- a/src/SdkConfig.ts
+++ b/src/SdkConfig.ts
@@ -7,7 +7,6 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { type Optional } from "matrix-events-sdk";
 import { mergeWith } from "lodash";
 
 import { SnakedObject } from "./utils/SnakedObject";
@@ -90,7 +89,7 @@ function mergeConfig(
 
 type ObjectType<K extends keyof IConfigOptions> = IConfigOptions[K] extends object
     ? SnakedObject<NonNullable<IConfigOptions[K]>>
-    : Optional<SnakedObject<NonNullable<IConfigOptions[K]>>>;
+    : SnakedObject<NonNullable<IConfigOptions[K]>> | null | undefined;
 
 export default class SdkConfig {
     private static instance: DeepReadonly<IConfigOptions>;
diff --git a/src/SecurityManager.ts b/src/SecurityManager.ts
index b497c57a10..a5be789c8a 100644
--- a/src/SecurityManager.ts
+++ b/src/SecurityManager.ts
@@ -14,12 +14,10 @@ import { logger as rootLogger } from "matrix-js-sdk/src/logger";
 import Modal from "./Modal";
 import { MatrixClientPeg } from "./MatrixClientPeg";
 import { _t } from "./languageHandler";
-import { isSecureBackupRequired } from "./utils/WellKnownUtils";
 import AccessSecretStorageDialog, {
     type KeyParams,
 } from "./components/views/dialogs/security/AccessSecretStorageDialog";
 import { ModuleRunner } from "./modules/ModuleRunner";
-import QuestionDialog from "./components/views/dialogs/QuestionDialog";
 import InteractiveAuthDialog from "./components/views/dialogs/InteractiveAuthDialog";
 
 // This stores the secret storage private keys in memory for the JS SDK. This is
@@ -50,17 +48,6 @@ export class AccessCancelledError extends Error {
     }
 }
 
-async function confirmToDismiss(): Promise<boolean> {
-    const [sure] = await Modal.createDialog(QuestionDialog, {
-        title: _t("encryption|cancel_entering_passphrase_title"),
-        description: _t("encryption|cancel_entering_passphrase_description"),
-        danger: false,
-        button: _t("action|go_back"),
-        cancelButton: _t("action|cancel"),
-    }).finished;
-    return !sure;
-}
-
 function makeInputToKey(
     keyInfo: SecretStorage.SecretStorageKeyDescription,
 ): (keyParams: KeyParams) => Promise<Uint8Array> {
@@ -134,17 +121,6 @@ async function getSecretStorageKey(
                 return MatrixClientPeg.safeGet().secretStorage.checkKey(key, keyInfo);
             },
         },
-        /* className= */ undefined,
-        /* isPriorityModal= */ false,
-        /* isStaticModal= */ false,
-        /* options= */ {
-            onBeforeClose: async (reason): Promise<boolean> => {
-                if (reason === "backgroundClick") {
-                    return confirmToDismiss();
-                }
-                return true;
-            },
-        },
     );
     const [keyParams] = await finished;
     if (!keyParams) {
@@ -199,10 +175,11 @@ export async function withSecretStorageKeyCache<T>(func: () => Promise<T>): Prom
 }
 
 export interface AccessSecretStorageOpts {
-    /** Reset secret storage even if it's already set up. */
+    /**
+     * Reset secret storage even if it's already set up.
+     * @deprecated send the user to the Encryption settings tab to reset secret storage
+     */
     forceReset?: boolean;
-    /** Create new cross-signing keys. Only applicable if `forceReset` is `true`. */
-    resetCrossSigning?: boolean;
 }
 
 /**
@@ -212,8 +189,8 @@ export interface AccessSecretStorageOpts {
  * provided function.
  *
  * Bootstrapping secret storage may take one of these paths:
- * 1. Create secret storage from a passphrase and store cross-signing keys
- *    in secret storage.
+ * 1. (Only if `opts.forceReset` is set) create secret storage from a passphrase
+ *    and store cross-signing keys in secret storage.
  * 2. Access existing secret storage by requesting passphrase and accessing
  *    cross-signing keys as needed.
  * 3. All keys are loaded and there's nothing to do.
@@ -222,6 +199,8 @@ export interface AccessSecretStorageOpts {
  * to ensure the user is prompted only once for their secret storage
  * passphrase. The cache is then cleared once the provided function completes.
  *
+ * Throws an error if secret storage is not set up (and `opts.forceReset` is not set)
+ *
  * @param {Function} [func] An operation to perform once secret storage has been
  * bootstrapped. Optional.
  * @param [opts] The options to use when accessing secret storage.
@@ -242,16 +221,8 @@ async function doAccessSecretStorage(func: () => Promise<void>, opts: AccessSecr
             throw new Error("End-to-end encryption is disabled - unable to access secret storage.");
         }
 
-        let createNew = false;
         if (opts.forceReset) {
             logger.debug("accessSecretStorage: resetting 4S");
-            createNew = true;
-        } else if (!(await cli.secretStorage.hasKey())) {
-            logger.debug("accessSecretStorage: no 4S key configured, creating a new one");
-            createNew = true;
-        }
-
-        if (createNew) {
             // This dialog calls bootstrap itself after guiding the user through
             // passphrase creation.
             const { finished } = Modal.createDialog(
@@ -260,20 +231,14 @@ async function doAccessSecretStorage(func: () => Promise<void>, opts: AccessSecr
                 undefined,
                 /* priority = */ false,
                 /* static = */ true,
-                /* options = */ {
-                    onBeforeClose: async (reason): Promise<boolean> => {
-                        // If Secure Backup is required, you cannot leave the modal.
-                        if (reason === "backgroundClick") {
-                            return !isSecureBackupRequired(cli);
-                        }
-                        return true;
-                    },
-                },
             );
             const [confirmed] = await finished;
             if (!confirmed) {
                 throw new Error("Secret storage creation canceled");
             }
+        } else if (!(await cli.secretStorage.hasKey())) {
+            logger.debug("accessSecretStorage: no 4S key configured");
+            throw new Error("Secret storage has not been created yet.");
         } else {
             logger.debug("accessSecretStorage: bootstrapCrossSigning");
             await crypto.bootstrapCrossSigning({
diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index afbfeeca03..cf87bc79d0 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -60,6 +60,7 @@ import { deop, op } from "./slash-commands/op";
 import { CommandCategories } from "./slash-commands/interface";
 import { Command } from "./slash-commands/command";
 import { goto, join } from "./slash-commands/join";
+import { manuallyVerifyDevice } from "./components/views/dialogs/ManualDeviceKeyVerificationDialog";
 
 export { CommandCategories, Command };
 
@@ -147,7 +148,7 @@ export const Commands = [
         command: "upgraderoom",
         args: "<new_version>",
         description: _td("slash_command|upgraderoom"),
-        isEnabled: (cli) => !isCurrentLocalRoom(cli) && SettingsStore.getValue("developerMode"),
+        isEnabled: (cli) => !isCurrentLocalRoom(cli),
         runFn: function (cli, roomId, threadId, args) {
             if (args) {
                 const room = cli.getRoom(roomId);
@@ -663,6 +664,36 @@ export const Commands = [
         category: CommandCategories.admin,
         renderingTypes: [TimelineRenderingType.Room],
     }),
+    new Command({
+        command: "verify",
+        args: "<device-id> <device-fingerprint>",
+        description: _td("slash_command|verify"),
+        runFn: function (cli, _roomId, _threadId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+) +(\S+)$/);
+                if (matches) {
+                    const deviceId = matches[1];
+                    const fingerprint = matches[2];
+
+                    const { finished } = Modal.createDialog(QuestionDialog, {
+                        title: _t("slash_command|manual_device_verification_confirm_title"),
+                        description: _t("slash_command|manual_device_verification_confirm_description"),
+                        button: _t("action|verify"),
+                        danger: true,
+                    });
+
+                    return success(
+                        finished.then(([confirmed]) => {
+                            if (confirmed) manuallyVerifyDevice(cli, deviceId, fingerprint);
+                        }),
+                    );
+                }
+            }
+            return reject(this.getUsage());
+        },
+        category: CommandCategories.advanced,
+        renderingTypes: [TimelineRenderingType.Room],
+    }),
     new Command({
         command: "discardsession",
         description: _td("slash_command|discardsession"),
@@ -701,8 +732,8 @@ export const Commands = [
     new Command({
         command: "help",
         description: _td("slash_command|help"),
-        runFn: function () {
-            Modal.createDialog(SlashCommandHelpDialog);
+        runFn: function (cli, roomId, threadId, args) {
+            Modal.createDialog(SlashCommandHelpDialog, { roomId });
             return success();
         },
         category: CommandCategories.advanced,
@@ -936,14 +967,15 @@ interface ICmd {
 
 /**
  * Process the given text for /commands and returns a parsed command that can be used for running the operation.
+ * @param {string} roomId The room ID where the command was issued.
  * @param {string} input The raw text input by the user.
  * @return {ICmd} The parsed command object.
  * Returns an empty object if the input didn't match a command.
  */
-export function getCommand(input: string): ICmd {
+export function getCommand(roomId: string, input: string): ICmd {
     const { cmd, args } = parseCommandString(input);
 
-    if (cmd && CommandMap.has(cmd) && CommandMap.get(cmd)!.isEnabled(MatrixClientPeg.get())) {
+    if (cmd && CommandMap.has(cmd) && CommandMap.get(cmd)!.isEnabled(MatrixClientPeg.get(), roomId)) {
         return {
             cmd: CommandMap.get(cmd),
             args,
diff --git a/src/TextForEvent.tsx b/src/TextForEvent.tsx
index b63e5b2a00..8d798205bc 100644
--- a/src/TextForEvent.tsx
+++ b/src/TextForEvent.tsx
@@ -36,9 +36,9 @@ import { RoomSettingsTab } from "./components/views/dialogs/RoomSettingsDialog";
 import AccessibleButton from "./components/views/elements/AccessibleButton";
 import RightPanelStore from "./stores/right-panel/RightPanelStore";
 import { highlightEvent, isLocationEvent } from "./utils/EventUtils";
-import { ElementCall } from "./models/Call";
 import { getSenderName } from "./utils/event/getSenderName";
 import PosthogTrackers from "./PosthogTrackers.ts";
+import { ElementCallEventType } from "./call-types.ts";
 
 function getRoomMemberDisplayname(client: MatrixClient, event: MatrixEvent, userId = event.getSender()): string {
     const roomId = event.getRoomId();
@@ -572,8 +572,11 @@ function textForPinnedEvent(event: MatrixEvent, client: MatrixClient, allowJSX:
     const senderName = getSenderName(event);
     const roomId = event.getRoomId()!;
 
-    const pinned = event.getContent<{ pinned: string[] }>().pinned ?? [];
-    const previouslyPinned: string[] = event.getPrevContent().pinned ?? [];
+    const content = event.getContent<{ pinned: string[] }>();
+    const prevContent = event.getPrevContent();
+
+    const pinned = Array.isArray(content.pinned) ? content.pinned : [];
+    const previouslyPinned: string[] = Array.isArray(prevContent.pinned) ? prevContent.pinned : [];
     const newlyPinned = pinned.filter((item) => previouslyPinned.indexOf(item) < 0);
     const newlyUnpinned = previouslyPinned.filter((item) => pinned.indexOf(item) < 0);
 
@@ -922,7 +925,7 @@ for (const evType of ALL_RULE_TYPES) {
 }
 
 // Add both stable and unstable m.call events
-for (const evType of ElementCall.CALL_EVENT_TYPE.names) {
+for (const evType of ElementCallEventType.names) {
     stateHandlers[evType] = textForCallEvent;
 }
 
@@ -936,7 +939,13 @@ for (const evType of ElementCall.CALL_EVENT_TYPE.names) {
  */
 export function hasText(ev: MatrixEvent, client: MatrixClient, showHiddenEvents?: boolean): boolean {
     const handler = (ev.isState() ? stateHandlers : handlers)[ev.getType()];
-    return Boolean(handler?.(ev, client, false, showHiddenEvents));
+    try {
+        return Boolean(handler?.(ev, client, false, showHiddenEvents));
+    } catch (e) {
+        console.error(`Error encountered when trying to render event type=${ev.getType()} id=${ev.getId()}`, e);
+        // Returning true if we have a handler so we can show an error tile rather than no tile at all
+        return !!handler;
+    }
 }
 
 /**
diff --git a/src/Unread.ts b/src/Unread.ts
index e8f4769e25..d6a80a8f97 100644
--- a/src/Unread.ts
+++ b/src/Unread.ts
@@ -39,7 +39,12 @@ export function eventTriggersUnreadCount(client: MatrixClient, ev: MatrixEvent):
     }
 
     if (ev.isRedacted()) return false;
-    return haveRendererForEvent(ev, client, false /* hidden messages should never trigger unread counts anyways */);
+    try {
+        return haveRendererForEvent(ev, client, false /* hidden messages should never trigger unread counts anyways */);
+    } catch (e) {
+        console.warn("Error determining if event should trigger unread count", e);
+        return false; // If we can't determine if the event should trigger an unread count, assume it does not.
+    }
 }
 
 export function doesRoomHaveUnreadMessages(room: Room, includeThreads: boolean): boolean {
diff --git a/src/UserActivity.ts b/src/UserActivity.ts
index c63b595b41..61f786e861 100644
--- a/src/UserActivity.ts
+++ b/src/UserActivity.ts
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import dis from "./dispatcher/dispatcher";
 import Timer from "./utils/Timer";
+import { Action } from "./dispatcher/actions.ts";
 
 // important these are larger than the timeouts of timers
 // used with UserActivity.timeWhileActive*,
@@ -190,11 +191,9 @@ export default class UserActivity {
             this.lastScreenY = event.screenY;
         }
 
-        dis.dispatch({ action: "user_activity" });
+        dis.dispatch({ action: Action.UserActivity });
         if (!this.activeNowTimeout.isRunning()) {
             this.activeNowTimeout.start();
-            dis.dispatch({ action: "user_activity_start" });
-
             UserActivity.runTimersUntilTimeout(this.attachedActiveNowTimers, this.activeNowTimeout);
         } else {
             this.activeNowTimeout.restart();
diff --git a/src/Views.ts b/src/Views.ts
index 6c0df53a66..ccb0d93e05 100644
--- a/src/Views.ts
+++ b/src/Views.ts
@@ -6,7 +6,86 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-/** constants for MatrixChat.state.view */
+/**
+ * Constants for MatrixChat.state.view.
+ *
+ * The `View` is the primary state machine of the application: it has different states for the various setup flows
+ * that the user may find themselves in. Once we have a functioning client, we can transition to the `LOGGED_IN` state
+ * which is the "normal" state of the application.
+ *
+ * An incomplete state transition diagram follows.
+ *
+ *                      (initial state)
+ *                    ┌─────────────────┐ Lock held by other instance  ┌─────────────────┐
+ *                    │    LOADING      │─────────────────────────────►│ CONFIRM_LOCK_   │
+ *                    │                 │◄─────────────────────────────│     THEFT       │
+ *                    └─────────────────┘ Lock theft confirmed         └─────────────────┘
+ *     Session recovered │     │      │                                           Token/OIDC login succeeded
+ *        ┌──────────────┘     │      └──────────────────────────────────────────────────────────────────┐
+ *        │                    └───────────────────────────────────────────┐                             │
+ *        │                                                                │ No previous session         │
+ *        │                                                                ▼                             │
+ *        │          (from all other states                        ┌─────────────────┐                   │
+ *        │            except LOCK_STOLEN)                         │     WELCOME     │                   │
+ *        │                  │                                     │                 │                   │
+ *        │                  │ Client logged out                   └─────────────────┘                   │
+ *        │                  │                                            │   │                          │
+ *        │                  └──────────────────────────┐       "Sign in" │   │ "Create account"         │
+ *        │                                             │    ┌────────────┘   └──────────────┐           │
+ *        │                                             │    │                               │           │
+ *        │                       "Forgot               ▼    ▼       "Create an              ▼           │
+ *        │   ┌─────────────────┐  password"     ┌─────────────────┐   account"     ┌─────────────────┐  │
+ *        │   │ FORGOT_PASSWORD │◄───────────────│      LOGIN      │───────────────►│     REGISTER    │  │
+ *        │   │                 │───────────────►│                 │◄───────────────│                 │  │
+ *        │   └─────────────────┘ Complete /     └─────────────────┘ "Sign in here" └─────────────────┘  │
+ *        │            ▲        "Sign in instead"        │                                   │           │
+ *        │            │                                 └──────────────────────┐  ┌─────────┘           │
+ *        │            │"Forgotten your                                         │  │  ┌──────────────────┘
+ *        │            │ password?"                                             │  │  │
+ *        │            │                                                        │  │  │
+ *        │   ┌─────────────────┐ Soft-logout error                             │  │  │
+ *        │   │  SOFT_LOGOUT    │◄───────────── (from all other states          │  │  │
+ *        │   │                 │                except LOCK_STOLEN)            │  │  │
+ *        │   └─────────────────┘                                               │  │  │
+ *        │         │ Re-authentication succeeded                               ▼  ▼  ▼
+ *        │         │                                                    ┌──────────────────┐
+ *        ▼         ▼                                                    │ (postLoginSetup) │
+ *     ┌─────────────────┐                                               └──────────────────┘
+ *     │ PENDING_CLIENT_ │                                      Account has │     │      │ Account lacks
+ *     │     START       │                                    cross-signing │     │      │ cross-signing
+ *     └─────────────────┘                                           keys   │     │      │ keys
+ *        │          │                                                      │     │      │
+ *        │          └───────────────────────────────┐                      │     │      │
+ *        │            Client started,               │                      │     │      └──────┐
+ *        │            force_verification pending    │                      │     │             │
+ *        │                                          ▼                      │     │             │
+ *        │ Client started,                 ┌─────────────────┐             │     │             │
+ *        │ force_verification              │  COMPLETE_      │◄────────────┘     │             ▼
+ *        │ not needed                      │      SECURITY   │                   │      ┌─────────────────┐
+ *        │                                 └─────────────────┘                   │      │   E2E_SETUP     │
+ *        │                                          │                            │      │                 │
+ *        │    ┌─────────────────────────────────────┘           E2EE not enabled │      └─────────────────┘
+ *        │    │    ┌─────────────────────────────────────────────────────────────┘              │
+ *        │    │    │     ┌──────────────────────────────────────────────────────────────────────┘
+ *        │    │    │     │
+ *        │    │    │     │
+ *        │    │    │     │
+ *        │    │    │     │
+ *        ▼    ▼    ▼     ▼
+ *       ┌─────────────────┐
+ *       │   LOGGED_IN     │
+ *       │                 │
+ *       └─────────────────┘
+ *
+ *       (from all other states)
+ *                │
+ *                │ Session lock stolen
+ *                ▼
+ *       ┌─────────────────┐
+ *       │  LOCK_STOLEN    │
+ *       │                 │
+ *       └─────────────────┘
+ */
 enum Views {
     // a special initial state which is only used at startup, while we are
     // trying to re-animate a matrix client or register as a guest.
@@ -33,6 +112,12 @@ enum Views {
     // flow to setup SSSS / cross-signing on this account
     E2E_SETUP,
 
+    /**
+     * We have successfully recovered a session from localstorage, but the client
+     * has not yet been started.
+     */
+    PENDING_CLIENT_START,
+
     // we are logged in with an active matrix client. The logged_in state also
     // includes guests users as they too are logged in at the client level.
     LOGGED_IN,
diff --git a/src/accessibility/KeyboardShortcuts.ts b/src/accessibility/KeyboardShortcuts.ts
index ec5b8312b9..2872e1a1a2 100644
--- a/src/accessibility/KeyboardShortcuts.ts
+++ b/src/accessibility/KeyboardShortcuts.ts
@@ -8,7 +8,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { _td, type TranslationKey } from "../languageHandler";
+// Import i18n.tsx instead of languageHandler to avoid circular deps
+import { _td, type TranslationKey } from "@element-hq/web-shared-components";
+
 import { IS_MAC, IS_ELECTRON, Key } from "../Keyboard";
 import { type IBaseSetting } from "../settings/Settings";
 import { type KeyCombo } from "../KeyBindingsManager";
@@ -145,6 +147,7 @@ export enum KeyBindingAction {
     ArrowDown = "KeyBinding.arrowDown",
     Tab = "KeyBinding.tab",
     Comma = "KeyBinding.comma",
+    Save = "KeyBinding.save",
 
     /** Toggle visibility of hidden events */
     ToggleHiddenEventVisibility = "KeyBinding.toggleHiddenEventVisibility",
@@ -268,6 +271,7 @@ export const CATEGORIES: Record<CategoryName, ICategory> = {
             KeyBindingAction.ArrowRight,
             KeyBindingAction.ArrowDown,
             KeyBindingAction.Comma,
+            KeyBindingAction.Save,
         ],
     },
     [CategoryName.NAVIGATION]: {
@@ -620,6 +624,13 @@ export const KEYBOARD_SHORTCUTS: IKeyboardShortcuts = {
         },
         displayName: _td("keyboard|composer_redo"),
     },
+    [KeyBindingAction.Save]: {
+        default: {
+            key: Key.S,
+            ctrlOrCmdKey: true,
+        },
+        displayName: _td("keyboard|save"),
+    },
     [KeyBindingAction.PreviousVisitedRoomOrSpace]: {
         default: {
             metaKey: IS_MAC,
diff --git a/src/accessibility/LandmarkNavigation.ts b/src/accessibility/LandmarkNavigation.ts
index 1c6fe54345..632c7ec613 100644
--- a/src/accessibility/LandmarkNavigation.ts
+++ b/src/accessibility/LandmarkNavigation.ts
@@ -9,6 +9,7 @@
 import { TimelineRenderingType } from "../contexts/RoomContext";
 import { Action } from "../dispatcher/actions";
 import defaultDispatcher from "../dispatcher/dispatcher";
+import SettingsStore from "../settings/SettingsStore";
 
 export const enum Landmark {
     // This is the space/home button in the left panel.
@@ -72,10 +73,16 @@ export class LandmarkNavigation {
 const landmarkToDomElementMap: Record<Landmark, () => HTMLElement | null | undefined> = {
     [Landmark.ACTIVE_SPACE_BUTTON]: () => document.querySelector<HTMLElement>(".mx_SpaceButton_active"),
 
-    [Landmark.ROOM_SEARCH]: () => document.querySelector<HTMLElement>(".mx_RoomSearch"),
+    [Landmark.ROOM_SEARCH]: () =>
+        SettingsStore.getValue("feature_new_room_list")
+            ? document.querySelector<HTMLElement>("#room-list-search-button")
+            : document.querySelector<HTMLElement>(".mx_RoomSearch"),
     [Landmark.ROOM_LIST]: () =>
-        document.querySelector<HTMLElement>(".mx_RoomTile_selected") ||
-        document.querySelector<HTMLElement>(".mx_RoomTile"),
+        SettingsStore.getValue("feature_new_room_list")
+            ? document.querySelector<HTMLElement>(".mx_RoomListItemView_selected") ||
+              document.querySelector<HTMLElement>(".mx_RoomListItemView")
+            : document.querySelector<HTMLElement>(".mx_RoomTile_selected") ||
+              document.querySelector<HTMLElement>(".mx_RoomTile"),
 
     [Landmark.MESSAGE_COMPOSER_OR_HOME]: () => {
         const isComposerOpen = !!document.querySelector(".mx_MessageComposer");
diff --git a/src/async-components/structures/ErrorView.tsx b/src/async-components/structures/ErrorView.tsx
index 0f9a61781e..80a3d8dba1 100644
--- a/src/async-components/structures/ErrorView.tsx
+++ b/src/async-components/structures/ErrorView.tsx
@@ -8,13 +8,11 @@ Please see LICENSE files in the repository root for full details.
 import React, { type JSX, type ReactNode } from "react";
 import { Text, Heading, Button, Separator } from "@vector-im/compound-web";
 import PopOutIcon from "@vector-im/compound-design-tokens/assets/web/icons/pop-out";
+import { Flex } from "@element-hq/web-shared-components";
+import { LinuxIcon, MacIcon, WindowsIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import SdkConfig from "../../SdkConfig";
-import { Flex } from "../../components/utils/Flex";
 import { _t } from "../../languageHandler";
-import { Icon as AppleIcon } from "../../../res/themes/element/img/compound/apple.svg";
-import { Icon as MicrosoftIcon } from "../../../res/themes/element/img/compound/microsoft.svg";
-import { Icon as LinuxIcon } from "../../../res/themes/element/img/compound/linux.svg";
 
 // directly import the style here as this layer does not support rethemedex at this time so no matrix-react-sdk
 // PostCSS variables will be accessible.
@@ -58,7 +56,7 @@ const MobileAppLinks: React.FC<{
     googlePlayUrl?: string;
     fdroidUrl?: string;
 }> = ({ appleAppStoreUrl, googlePlayUrl, fdroidUrl }) => (
-    <Flex gap="var(--cpd-space-6x)">
+    <Flex gap="var(--cpd-space-6x)" className="mx_ErrorView_flexContainer">
         {appleAppStoreUrl && (
             <a href={appleAppStoreUrl} target="_blank" rel="noreferrer noopener">
                 <img height="64" src="themes/element/img/download/apple.svg" alt="Apple App Store" />
@@ -84,19 +82,19 @@ const DesktopAppLinks: React.FC<{
     linuxUrl?: string;
 }> = ({ macOsUrl, win64Url, win64ArmUrl, linuxUrl }) => {
     return (
-        <Flex gap="var(--cpd-space-4x)">
+        <Flex gap="var(--cpd-space-4x)" className="mx_ErrorView_flexContainer">
             {macOsUrl && (
-                <Button as="a" href={macOsUrl} kind="secondary" Icon={AppleIcon}>
+                <Button as="a" href={macOsUrl} kind="secondary" Icon={MacIcon}>
                     {_t("incompatible_browser|macos")}
                 </Button>
             )}
             {win64Url && (
-                <Button as="a" href={win64Url} kind="secondary" Icon={MicrosoftIcon}>
+                <Button as="a" href={win64Url} kind="secondary" Icon={WindowsIcon}>
                     {_t("incompatible_browser|windows_64bit")}
                 </Button>
             )}
             {win64ArmUrl && (
-                <Button as="a" href={win64ArmUrl} kind="secondary" Icon={MicrosoftIcon}>
+                <Button as="a" href={win64ArmUrl} kind="secondary" Icon={WindowsIcon}>
                     {_t("incompatible_browser|windows_arm_64bit")}
                 </Button>
             )}
@@ -193,7 +191,7 @@ export const UnsupportedBrowserView: React.FC<{
                 )}
             </Text>
 
-            <Flex gap="var(--cpd-space-4x)" className="mx_ErrorView_buttons">
+            <Flex gap="var(--cpd-space-4x)" className="mx_ErrorView_flexContainer mx_ErrorView_buttons">
                 <Button Icon={PopOutIcon} kind="secondary" size="sm">
                     {_t("incompatible_browser|learn_more")}
                 </Button>
diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.tsx b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.tsx
index d0680fb4cd..ad46048554 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.tsx
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.tsx
@@ -26,11 +26,25 @@ interface IProps {
 }
 
 interface IState {
+    /** Size of the event index, in bytes. */
     eventIndexSize: number;
+
+    /** Number of events currently indexed in the event index. */
     eventCount: number;
+
+    /** Number of rooms currently mentioned in the event index. */
+    eventIndexRoomCount: number;
+
+    /** Number of rooms awaiting crawling by the EventIndex. */
     crawlingRoomsCount: number;
+
+    /** Number of encrypted rooms known by the MatrixClient. */
     roomCount: number;
+
+    /** Room currently being crawled by the EventIndex. */
     currentRoom: string | null;
+
+    /** Time to sleep between crawlwer passes, in milliseconds. */
     crawlerSleepTime: number;
 }
 
@@ -44,6 +58,7 @@ export default class ManageEventIndexDialog extends React.Component<IProps, ISta
         this.state = {
             eventIndexSize: 0,
             eventCount: 0,
+            eventIndexRoomCount: 0,
             crawlingRoomsCount: 0,
             roomCount: 0,
             currentRoom: null,
@@ -51,7 +66,7 @@ export default class ManageEventIndexDialog extends React.Component<IProps, ISta
         };
     }
 
-    public updateCurrentRoom = async (room: Room): Promise<void> => {
+    public updateCurrentRoom = async (room: Room | null): Promise<void> => {
         const eventIndex = EventIndexPeg.get();
         if (!eventIndex) return;
         let stats: IIndexStats | undefined;
@@ -74,6 +89,7 @@ export default class ManageEventIndexDialog extends React.Component<IProps, ISta
         this.setState({
             eventIndexSize: stats?.size ?? 0,
             eventCount: stats?.eventCount ?? 0,
+            eventIndexRoomCount: stats?.roomCount ?? 0,
             crawlingRoomsCount: crawlingRoomsCount,
             roomCount: roomCount,
             currentRoom: currentRoom,
@@ -89,44 +105,14 @@ export default class ManageEventIndexDialog extends React.Component<IProps, ISta
     }
 
     public async componentDidMount(): Promise<void> {
-        let eventIndexSize = 0;
-        let crawlingRoomsCount = 0;
-        let roomCount = 0;
-        let eventCount = 0;
-        let currentRoom: string | null = null;
-
         const eventIndex = EventIndexPeg.get();
 
         if (eventIndex !== null) {
             eventIndex.on("changedCheckpoint", this.updateCurrentRoom);
 
-            try {
-                const stats = await eventIndex.getStats();
-                if (stats) {
-                    eventIndexSize = stats.size;
-                    eventCount = stats.eventCount;
-                }
-            } catch {
-                // This call may fail if sporadically, not a huge issue as we
-                // will try later again in the updateCurrentRoom call and
-                // probably succeed.
-            }
-
-            const roomStats = eventIndex.crawlingRooms();
-            crawlingRoomsCount = roomStats.crawlingRooms.size;
-            roomCount = roomStats.totalRooms.size;
-
             const room = eventIndex.currentRoom();
-            if (room) currentRoom = room.name;
+            await this.updateCurrentRoom(room);
         }
-
-        this.setState({
-            eventIndexSize,
-            eventCount,
-            crawlingRoomsCount,
-            roomCount,
-            currentRoom,
-        });
     }
 
     private onDisable = async (): Promise<void> => {
@@ -149,7 +135,7 @@ export default class ManageEventIndexDialog extends React.Component<IProps, ISta
             crawlerState = _t("settings|security|message_search_indexing", { currentRoom: this.state.currentRoom });
         }
 
-        const doneRooms = Math.max(0, this.state.roomCount - this.state.crawlingRoomsCount);
+        const doneRooms = Math.max(0, this.state.eventIndexRoomCount - this.state.crawlingRoomsCount);
 
         const eventIndexingSettings = (
             <div>
@@ -169,6 +155,10 @@ export default class ManageEventIndexDialog extends React.Component<IProps, ISta
                         totalRooms: formatCountLong(this.state.roomCount),
                     })}{" "}
                     <br />
+                    {_t("settings|security|message_search_pending_rooms", {
+                        pendingRooms: formatCountLong(this.state.crawlingRoomsCount),
+                    })}
+                    <br />
                     <Field
                         label={_t("settings|security|message_search_sleep_time")}
                         type="number"
diff --git a/src/async-components/views/dialogs/security/CreateKeyBackupDialog.tsx b/src/async-components/views/dialogs/security/CreateKeyBackupDialog.tsx
deleted file mode 100644
index 0bc6fea219..0000000000
--- a/src/async-components/views/dialogs/security/CreateKeyBackupDialog.tsx
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
-Copyright 2018, 2019 New Vector Ltd
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-import React, { type JSX } from "react";
-import { logger } from "matrix-js-sdk/src/logger";
-
-import { MatrixClientPeg } from "../../../../MatrixClientPeg";
-import { _t } from "../../../../languageHandler";
-import { accessSecretStorage, withSecretStorageKeyCache } from "../../../../SecurityManager";
-import Spinner from "../../../../components/views/elements/Spinner";
-import BaseDialog from "../../../../components/views/dialogs/BaseDialog";
-import DialogButtons from "../../../../components/views/elements/DialogButtons";
-
-enum Phase {
-    BackingUp = "backing_up",
-    Done = "done",
-}
-
-interface IProps {
-    onFinished(done?: boolean): void;
-}
-
-interface IState {
-    phase: Phase;
-    passPhrase: string;
-    passPhraseValid: boolean;
-    passPhraseConfirm: string;
-    copied: boolean;
-    downloaded: boolean;
-    error?: boolean;
-}
-
-/**
- * Walks the user through the process of setting up e2e key backups to a new backup, and storing the decryption key in
- * SSSS.
- *
- * Uses {@link accessSecretStorage}, which means that if 4S is not already configured, it will be bootstrapped (which
- * involves displaying an {@link CreateSecretStorageDialog} so the user can enter a passphrase and/or download the 4S
- * key).
- */
-export default class CreateKeyBackupDialog extends React.PureComponent<IProps, IState> {
-    public constructor(props: IProps) {
-        super(props);
-
-        this.state = {
-            phase: Phase.BackingUp,
-            passPhrase: "",
-            passPhraseValid: false,
-            passPhraseConfirm: "",
-            copied: false,
-            downloaded: false,
-        };
-    }
-
-    public componentDidMount(): void {
-        this.createBackup();
-    }
-
-    private createBackup = async (): Promise<void> => {
-        this.setState({
-            error: undefined,
-        });
-        const cli = MatrixClientPeg.safeGet();
-        try {
-            // Check if 4S already set up
-            const secretStorageAlreadySetup = await cli.secretStorage.hasKey();
-
-            if (!secretStorageAlreadySetup) {
-                // bootstrap secret storage; that will also create a backup version
-                await accessSecretStorage(async (): Promise<void> => {
-                    // do nothing, all is now set up correctly
-                });
-            } else {
-                await withSecretStorageKeyCache(async () => {
-                    const crypto = cli.getCrypto();
-                    if (!crypto) {
-                        throw new Error("End-to-end encryption is disabled - unable to create backup.");
-                    }
-
-                    // Before we reset the backup, let's make sure we can access secret storage, to
-                    // reduce the chance of us getting into a broken state where we have an outdated
-                    // secret in secret storage.
-                    // `SecretStorage.get` will ask the user to enter their passphrase/key if necessary;
-                    // it will then be cached for the actual backup reset operation.
-                    await cli.secretStorage.get("m.megolm_backup.v1");
-
-                    // We now know we can store the new backup key in secret storage, so it is safe to
-                    // go ahead with the reset.
-                    await crypto.resetKeyBackup();
-                });
-            }
-
-            this.setState({
-                phase: Phase.Done,
-            });
-        } catch (e) {
-            logger.error("Error creating key backup", e);
-            // TODO: If creating a version succeeds, but backup fails, should we
-            // delete the version, disable backup, or do nothing?  If we just
-            // disable without deleting, we'll enable on next app reload since
-            // it is trusted.
-            this.setState({
-                error: true,
-            });
-        }
-    };
-
-    private onCancel = (): void => {
-        this.props.onFinished(false);
-    };
-
-    private onDone = (): void => {
-        this.props.onFinished(true);
-    };
-
-    private renderBusyPhase(): JSX.Element {
-        return (
-            <div>
-                <Spinner />
-            </div>
-        );
-    }
-
-    private renderPhaseDone(): JSX.Element {
-        return (
-            <div>
-                <p>{_t("settings|key_backup|backup_in_progress")}</p>
-                <DialogButtons primaryButton={_t("action|ok")} onPrimaryButtonClick={this.onDone} hasCancel={false} />
-            </div>
-        );
-    }
-
-    private titleForPhase(phase: Phase): string {
-        switch (phase) {
-            case Phase.BackingUp:
-                return _t("settings|key_backup|backup_starting");
-            case Phase.Done:
-                return _t("settings|key_backup|backup_success");
-            default:
-                return _t("settings|key_backup|create_title");
-        }
-    }
-
-    public render(): React.ReactNode {
-        let content;
-        if (this.state.error) {
-            content = (
-                <div>
-                    <p>{_t("settings|key_backup|cannot_create_backup")}</p>
-                    <DialogButtons
-                        primaryButton={_t("action|retry")}
-                        onPrimaryButtonClick={this.createBackup}
-                        hasCancel={true}
-                        onCancel={this.onCancel}
-                    />
-                </div>
-            );
-        } else {
-            switch (this.state.phase) {
-                case Phase.BackingUp:
-                    content = this.renderBusyPhase();
-                    break;
-                case Phase.Done:
-                    content = this.renderPhaseDone();
-                    break;
-            }
-        }
-
-        return (
-            <BaseDialog
-                className="mx_CreateKeyBackupDialog"
-                onFinished={this.props.onFinished}
-                title={this.titleForPhase(this.state.phase)}
-                hasCancel={[Phase.Done].includes(this.state.phase)}
-            >
-                <div>{content}</div>
-            </BaseDialog>
-        );
-    }
-}
diff --git a/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx b/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx
index 0d17ddaa39..ed2fbe87a5 100644
--- a/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx
+++ b/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx
@@ -25,11 +25,6 @@ import StyledRadioButton from "../../../../components/views/elements/StyledRadio
 import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
 import DialogButtons from "../../../../components/views/elements/DialogButtons";
 import InlineSpinner from "../../../../components/views/elements/InlineSpinner";
-import {
-    getSecureBackupSetupMethods,
-    isSecureBackupRequired,
-    SecureBackupSetupMethod,
-} from "../../../../utils/WellKnownUtils";
 import { ModuleRunner } from "../../../../modules/ModuleRunner";
 import type Field from "../../../../components/views/elements/Field";
 import BaseDialog from "../../../../components/views/dialogs/BaseDialog";
@@ -39,6 +34,11 @@ import { type IValidationResult } from "../../../../components/views/elements/Va
 import PassphraseConfirmField from "../../../../components/views/auth/PassphraseConfirmField";
 import { initialiseDehydrationIfEnabled } from "../../../../utils/device/dehydration";
 
+enum SecureBackupSetupMethod {
+    Key = "key",
+    Passphrase = "passphrase",
+}
+
 // I made a mistake while converting this and it has to be fixed!
 enum Phase {
     Loading = "loading",
@@ -56,7 +56,6 @@ const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow,
 
 interface IProps {
     forceReset?: boolean;
-    resetCrossSigning?: boolean;
     onFinished(ok?: boolean): void;
 }
 
@@ -69,7 +68,6 @@ interface IState {
     downloaded: boolean;
     setPassphrase: boolean;
 
-    canSkip: boolean;
     passPhraseKeySelected: string;
     error?: boolean;
 }
@@ -80,11 +78,12 @@ interface IState {
  * If the user already has a key backup, follows a "migration" flow (aka "Upgrade your encryption") which
  * prompts the user to enter their backup decryption password (a Curve25519 private key, possibly derived
  * from a passphrase), and uses that as the (AES) 4S encryption key.
+ *
+ * @deprecated send the user to EncryptionUserSettingsTab instead
  */
 export default class CreateSecretStorageDialog extends React.PureComponent<IProps, IState> {
     public static defaultProps: Partial<IProps> = {
         forceReset: false,
-        resetCrossSigning: false,
     };
     private recoveryKey?: GeneratedSecretStorageKey;
     private recoveryKeyNode = createRef<HTMLElement>();
@@ -93,16 +92,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
     public constructor(props: IProps) {
         super(props);
 
-        const cli = MatrixClientPeg.safeGet();
-
-        let passPhraseKeySelected: SecureBackupSetupMethod;
-        const setupMethods = getSecureBackupSetupMethods(cli);
-        if (setupMethods.includes(SecureBackupSetupMethod.Key)) {
-            passPhraseKeySelected = SecureBackupSetupMethod.Key;
-        } else {
-            passPhraseKeySelected = SecureBackupSetupMethod.Passphrase;
-        }
-
         const keyFromCustomisations = ModuleRunner.instance.extensions.cryptoSetup.createSecretStorageKey();
         const phase = keyFromCustomisations ? Phase.Loading : Phase.ChooseKeyPassphrase;
 
@@ -114,8 +103,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
             copied: false,
             downloaded: false,
             setPassphrase: false,
-            canSkip: !isSecureBackupRequired(cli),
-            passPhraseKeySelected,
+            passPhraseKeySelected: SecureBackupSetupMethod.Key,
         };
     }
 
@@ -211,7 +199,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
     private bootstrapSecretStorage = async (): Promise<void> => {
         const cli = MatrixClientPeg.safeGet();
         const crypto = cli.getCrypto()!;
-        const { forceReset, resetCrossSigning } = this.props;
+        const { forceReset } = this.props;
 
         let backupInfo;
         // First, unless we know we want to do a reset, we see if there is an existing key backup
@@ -246,13 +234,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
                     createSecretStorageKey: async () => this.recoveryKey!,
                     setupNewSecretStorage: true,
                 });
-                if (resetCrossSigning) {
-                    logger.log("Resetting cross signing");
-                    await crypto.bootstrapCrossSigning({
-                        authUploadDeviceSigningKeys: this.doBootstrapUIAuth,
-                        setupNewCrossSigning: true,
-                    });
-                }
                 logger.log("Resetting key backup");
                 await crypto.resetKeyBackup();
             } else {
@@ -398,11 +379,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
     }
 
     private renderPhaseChooseKeyPassphrase(): JSX.Element {
-        const setupMethods = getSecureBackupSetupMethods(MatrixClientPeg.safeGet());
-        const optionKey = setupMethods.includes(SecureBackupSetupMethod.Key) ? this.renderOptionKey() : null;
-        const optionPassphrase = setupMethods.includes(SecureBackupSetupMethod.Passphrase)
-            ? this.renderOptionPassphrase()
-            : null;
+        const optionKey = this.renderOptionKey();
+        const optionPassphrase = this.renderOptionPassphrase();
 
         return (
             <form onSubmit={this.onChooseKeyPassphraseFormSubmit}>
@@ -417,7 +395,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
                     primaryButton={_t("action|continue")}
                     onPrimaryButtonClick={this.onChooseKeyPassphraseFormSubmit}
                     onCancel={this.onCancelClick}
-                    hasCancel={this.state.canSkip}
                 />
             </form>
         );
@@ -608,7 +585,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
                     <DialogButtons
                         primaryButton={_t("action|retry")}
                         onPrimaryButtonClick={this.onLoadRetryClick}
-                        hasCancel={this.state.canSkip}
                         onCancel={this.onCancel}
                     />
                 </div>
@@ -679,7 +655,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
                         <DialogButtons
                             primaryButton={_t("action|retry")}
                             onPrimaryButtonClick={this.bootstrapSecretStorage}
-                            hasCancel={this.state.canSkip}
                             onCancel={this.onCancel}
                         />
                     </div>
diff --git a/src/async-components/views/dialogs/security/NewRecoveryMethodDialog.tsx b/src/async-components/views/dialogs/security/NewRecoveryMethodDialog.tsx
index a2fef4e1c9..2642f01560 100644
--- a/src/async-components/views/dialogs/security/NewRecoveryMethodDialog.tsx
+++ b/src/async-components/views/dialogs/security/NewRecoveryMethodDialog.tsx
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type JSX, useEffect, useState } from "react";
+import { ErrorIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import dis from "../../../../dispatcher/dispatcher";
 import { _t } from "../../../../languageHandler";
@@ -60,6 +61,7 @@ export default function NewRecoveryMethodDialog({ onFinished }: NewRecoveryMetho
             onFinished={onFinished}
             title={
                 <span className="mx_KeyBackupFailedDialog_title">
+                    <ErrorIcon />
                     {_t("encryption|new_recovery_method_detected|title")}
                 </span>
             }
diff --git a/src/async-components/views/dialogs/security/RecoveryMethodRemovedDialog.tsx b/src/async-components/views/dialogs/security/RecoveryMethodRemovedDialog.tsx
index 7e82ff722b..8feac6f043 100644
--- a/src/async-components/views/dialogs/security/RecoveryMethodRemovedDialog.tsx
+++ b/src/async-components/views/dialogs/security/RecoveryMethodRemovedDialog.tsx
@@ -7,14 +7,16 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { lazy } from "react";
+import React from "react";
+import { ErrorIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import dis from "../../../../dispatcher/dispatcher";
 import { _t } from "../../../../languageHandler";
-import Modal from "../../../../Modal";
 import { Action } from "../../../../dispatcher/actions";
+import { UserTab } from "../../../../components/views/dialogs/UserTab";
 import BaseDialog from "../../../../components/views/dialogs/BaseDialog";
 import DialogButtons from "../../../../components/views/elements/DialogButtons";
+import { type OpenToTabPayload } from "../../../../dispatcher/payloads/OpenToTabPayload";
 
 interface IProps {
     onFinished(): void;
@@ -28,18 +30,20 @@ export default class RecoveryMethodRemovedDialog extends React.PureComponent<IPr
 
     private onSetupClick = (): void => {
         this.props.onFinished();
-        Modal.createDialog(
-            lazy(() => import("./CreateKeyBackupDialog")),
-            undefined,
-            undefined,
-            /* priority = */ false,
-            /* static = */ true,
-        );
+        // Open the user settings dialog to the encryption tab and start the flow to reset encryption
+        const payload: OpenToTabPayload = {
+            action: Action.ViewUserSettings,
+            initialTabId: UserTab.Encryption,
+        };
+        dis.dispatch(payload);
     };
 
     public render(): React.ReactNode {
         const title = (
-            <span className="mx_KeyBackupFailedDialog_title">{_t("encryption|recovery_method_removed|title")}</span>
+            <span className="mx_KeyBackupFailedDialog_title">
+                <ErrorIcon />
+                {_t("encryption|recovery_method_removed|title")}
+            </span>
         );
 
         return (
diff --git a/src/audio/Playback.ts b/src/audio/Playback.ts
index 54d2c710d0..fa0bceffdf 100644
--- a/src/audio/Playback.ts
+++ b/src/audio/Playback.ts
@@ -9,17 +9,18 @@ Please see LICENSE files in the repository root for full details.
 import EventEmitter from "events";
 import { SimpleObservable } from "matrix-widget-api";
 import { logger } from "matrix-js-sdk/src/logger";
+import { clamp } from "@element-hq/web-shared-components";
 
 import { UPDATE_EVENT } from "../stores/AsyncStore";
 import { arrayFastResample } from "../utils/arrays";
 import { type IDestroyable } from "../utils/IDestroyable";
 import { PlaybackClock } from "./PlaybackClock";
 import { createAudioContext, decodeOgg } from "./compat";
-import { clamp } from "../utils/numbers";
 import { DEFAULT_WAVEFORM, PLAYBACK_WAVEFORM_SAMPLES } from "./consts";
 import { PlaybackEncoder } from "../PlaybackEncoder";
 
 export enum PlaybackState {
+    Preparing = "preparing", // preparing to decode
     Decoding = "decoding",
     Stopped = "stopped", // no progress on timeline
     Paused = "paused", // some progress on timeline
@@ -146,6 +147,8 @@ export class Playback extends EventEmitter implements IDestroyable, PlaybackInte
             return;
         }
 
+        this.state = PlaybackState.Preparing;
+
         // The point where we use an audio element is fairly arbitrary, though we don't want
         // it to be too low. As of writing, voice messages want to show a waveform but audio
         // messages do not. Using an audio element means we can't show a waveform preview, so
@@ -199,6 +202,7 @@ export class Playback extends EventEmitter implements IDestroyable, PlaybackInte
     private onPlaybackEnd = async (): Promise<void> => {
         await this.context.suspend();
         this.emit(PlaybackState.Stopped);
+        this.clock.flagStop();
     };
 
     public async play(): Promise<void> {
@@ -245,9 +249,8 @@ export class Playback extends EventEmitter implements IDestroyable, PlaybackInte
         this.emit(PlaybackState.Paused);
     }
 
-    public async stop(): Promise<void> {
-        await this.onPlaybackEnd();
-        this.clock.flagStop();
+    public stop(): Promise<void> {
+        return this.onPlaybackEnd();
     }
 
     public async toggle(): Promise<void> {
diff --git a/src/audio/PlaybackClock.ts b/src/audio/PlaybackClock.ts
index 4099483c8e..d279745b36 100644
--- a/src/audio/PlaybackClock.ts
+++ b/src/audio/PlaybackClock.ts
@@ -74,7 +74,7 @@ export class PlaybackClock implements IDestroyable {
         // remainder of the division operation, we're assuming that playback is
         // incomplete or stopped, thus giving an accurate position within the active
         // clip segment.
-        return (this.context.currentTime - this.clipStart) % this.clipDuration;
+        return (this.context.currentTime - this.clipStart) % this.clipDuration || 0;
     }
 
     public get liveData(): SimpleObservable<number[]> {
diff --git a/src/audio/PlaybackQueue.ts b/src/audio/PlaybackQueue.ts
index fbca9d7872..025c9d2587 100644
--- a/src/audio/PlaybackQueue.ts
+++ b/src/audio/PlaybackQueue.ts
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { type MatrixEvent, type Room, EventType } from "matrix-js-sdk/src/matrix";
+import { EventType, type MatrixEvent, type Room } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { type Playback, PlaybackState } from "./Playback";
@@ -15,7 +15,7 @@ import { MatrixClientPeg } from "../MatrixClientPeg";
 import { arrayFastClone } from "../utils/arrays";
 import { PlaybackManager } from "./PlaybackManager";
 import { isVoiceMessage } from "../utils/EventUtils";
-import { SdkContextClass } from "../contexts/SDKContext";
+import { type RoomViewStore } from "../stores/RoomViewStore";
 
 /**
  * Audio playback queue management for a given room. This keeps track of where the user
@@ -38,10 +38,18 @@ export class PlaybackQueue {
     private currentPlaybackId: string | null = null; // event ID, broken out from above for ease of use
     private recentFullPlays = new Set<string>(); // event IDs
 
-    public constructor(private room: Room) {
+    /**
+     * Create a PlaybackQueue for a given room.
+     * @param room The room
+     * @param roomViewStore The RoomViewStore instance
+     */
+    public constructor(
+        private room: Room,
+        private roomViewStore: RoomViewStore,
+    ) {
         this.loadClocks();
 
-        SdkContextClass.instance.roomViewStore.addRoomListener(this.room.roomId, (isActive) => {
+        this.roomViewStore.addRoomListener(this.room.roomId, (isActive) => {
             if (!isActive) return;
 
             // Reset the state of the playbacks before they start mounting and enqueuing updates.
@@ -53,14 +61,20 @@ export class PlaybackQueue {
         });
     }
 
-    public static forRoom(roomId: string): PlaybackQueue {
+    /**
+     * Get the PlaybackQueue for a given room, creating it if necessary.
+     * @param roomId The ID of the room
+     * @param roomViewStore The RoomViewStore instance
+     * @returns The PlaybackQueue for the room
+     */
+    public static forRoom(roomId: string, roomViewStore: RoomViewStore): PlaybackQueue {
         const cli = MatrixClientPeg.safeGet();
         const room = cli.getRoom(roomId);
         if (!room) throw new Error("Unknown room");
         if (PlaybackQueue.queues.has(room.roomId)) {
             return PlaybackQueue.queues.get(room.roomId)!;
         }
-        const queue = new PlaybackQueue(room);
+        const queue = new PlaybackQueue(room, roomViewStore);
         PlaybackQueue.queues.set(room.roomId, queue);
         return queue;
     }
@@ -76,6 +90,12 @@ export class PlaybackQueue {
         const val = localStorage.getItem(`mx_voice_message_clocks_${this.room.roomId}`);
         if (!!val) {
             this.clockStates = new Map<string, number>(JSON.parse(val));
+            // Clean out any null values (from older versions)
+            for (const [key, value] of this.clockStates.entries()) {
+                if (value == null) {
+                    this.clockStates.delete(key);
+                }
+            }
         }
     }
 
@@ -89,9 +109,11 @@ export class PlaybackQueue {
     private onPlaybackStateChange(playback: Playback, mxEvent: MatrixEvent, newState: PlaybackState): void {
         // Remember where the user got to in playback
         const wasLastPlaying = this.currentPlaybackId === mxEvent.getId();
-        if (newState === PlaybackState.Stopped && this.clockStates.has(mxEvent.getId()!) && !wasLastPlaying) {
+        const currentClockState = this.clockStates.get(mxEvent.getId()!);
+
+        if (newState === PlaybackState.Stopped && currentClockState !== undefined && !wasLastPlaying) {
             // noinspection JSIgnoredPromiseFromCall
-            playback.skipTo(this.clockStates.get(mxEvent.getId()!)!);
+            playback.skipTo(currentClockState);
         } else if (newState === PlaybackState.Stopped) {
             // Remove the now-useless clock for some space savings
             this.clockStates.delete(mxEvent.getId()!);
@@ -201,10 +223,8 @@ export class PlaybackQueue {
     }
 
     private onPlaybackClock(playback: Playback, mxEvent: MatrixEvent, clocks: number[]): void {
-        if (playback.currentState === PlaybackState.Decoding) return; // ignore pre-ready values
+        if (playback.currentState !== PlaybackState.Playing && playback.currentState !== PlaybackState.Paused) return; // ignore pre-ready values
 
-        if (playback.currentState !== PlaybackState.Stopped) {
-            this.clockStates.set(mxEvent.getId()!, clocks[0]); // [0] is the current seek position
-        }
+        this.clockStates.set(mxEvent.getId()!, clocks[0]); // [0] is the current seek position
     }
 }
diff --git a/src/audio/RecorderWorklet.ts b/src/audio/RecorderWorklet.ts
index ec4a143c4e..5d6ce32630 100644
--- a/src/audio/RecorderWorklet.ts
+++ b/src/audio/RecorderWorklet.ts
@@ -6,8 +6,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
+import { percentageOf } from "@element-hq/web-shared-components";
+
 import { type IAmplitudePayload, type ITimingPayload, PayloadEvent, WORKLET_NAME } from "./consts";
-import { percentageOf } from "../utils/numbers";
 
 // from AudioWorkletGlobalScope: https://developer.mozilla.org/en-US/docs/Web/API/AudioWorkletGlobalScope
 declare const currentTime: number;
diff --git a/src/audio/VoiceRecording.ts b/src/audio/VoiceRecording.ts
index bde86f9dd7..705b96375a 100644
--- a/src/audio/VoiceRecording.ts
+++ b/src/audio/VoiceRecording.ts
@@ -11,6 +11,7 @@ import encoderPath from "opus-recorder/dist/encoderWorker.min.js";
 import { SimpleObservable } from "matrix-widget-api";
 import EventEmitter from "events";
 import { logger } from "matrix-js-sdk/src/logger";
+import { clamp } from "@element-hq/web-shared-components";
 
 import MediaDeviceHandler from "../MediaDeviceHandler";
 import { type IDestroyable } from "../utils/IDestroyable";
@@ -19,7 +20,6 @@ import { PayloadEvent, WORKLET_NAME } from "./consts";
 import { UPDATE_EVENT } from "../stores/AsyncStore";
 import { createAudioContext } from "./compat";
 import { FixedRollingArray } from "../utils/FixedRollingArray";
-import { clamp } from "../utils/numbers";
 import recorderWorkletFactory from "./recorderWorkletFactory";
 
 const CHANNELS = 1; // stereo isn't important
diff --git a/src/autocomplete/CommandProvider.tsx b/src/autocomplete/CommandProvider.tsx
index 76d53bb865..41781c0a68 100644
--- a/src/autocomplete/CommandProvider.tsx
+++ b/src/autocomplete/CommandProvider.tsx
@@ -25,7 +25,7 @@ const COMMAND_RE = /(^\/\w*)(?: .*)?/g;
 
 export default class CommandProvider extends AutocompleteProvider {
     public matcher: QueryMatcher<Command>;
-
+    private room: Room;
     public constructor(room: Room, renderingType?: TimelineRenderingType) {
         super({ commandRegex: COMMAND_RE, renderingType });
         this.matcher = new QueryMatcher(Commands, {
@@ -33,6 +33,7 @@ export default class CommandProvider extends AutocompleteProvider {
             funcs: [({ aliases }) => aliases.join(" ")], // aliases
             context: renderingType,
         });
+        this.room = room;
     }
 
     public async getCompletions(
@@ -51,7 +52,7 @@ export default class CommandProvider extends AutocompleteProvider {
         if (command[0] !== command[1]) {
             // The input looks like a command with arguments, perform exact match
             const name = command[1].slice(1); // strip leading `/`
-            if (CommandMap.has(name) && CommandMap.get(name)!.isEnabled(cli)) {
+            if (CommandMap.has(name) && CommandMap.get(name)!.isEnabled(cli, this.room.roomId)) {
                 // some commands, namely `me` don't suit having the usage shown whilst typing their arguments
                 if (CommandMap.get(name)!.hideCompletionAfterSpace) return [];
                 matches = [CommandMap.get(name)!];
@@ -70,7 +71,7 @@ export default class CommandProvider extends AutocompleteProvider {
         return matches
             .filter((cmd) => {
                 const display = !cmd.renderingTypes || cmd.renderingTypes.includes(this.renderingType);
-                return cmd.isEnabled(cli) && display;
+                return cmd.isEnabled(cli, this.room.roomId) && display;
             })
             .map((result) => {
                 let completion = result.getCommand() + " ";
diff --git a/src/call-types.ts b/src/call-types.ts
index 6586bcf3b9..9ee870945f 100644
--- a/src/call-types.ts
+++ b/src/call-types.ts
@@ -6,6 +6,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
+import { EventType } from "matrix-js-sdk/src/matrix";
+import { NamespacedValue } from "matrix-js-sdk/src/NamespacedValue";
+
 export const JitsiCallMemberEventType = "io.element.video.member";
 
 export interface JitsiCallMemberContent {
@@ -14,3 +17,9 @@ export interface JitsiCallMemberContent {
     // Time at which this state event should be considered stale
     expires_ts: number;
 }
+
+// Element Call no longer sends this event type; it only exists to support timeline rendering of
+// group calls from a previous iteration of the group VoIP MSCs (MSC3401) which used it.
+export const ElementCallEventType = new NamespacedValue(null, EventType.GroupCallPrefix);
+
+export const ElementCallMemberEventType = new NamespacedValue(null, EventType.GroupCallMemberPrefix);
diff --git a/src/components/structures/ContextMenu.tsx b/src/components/structures/ContextMenu.tsx
index bdbd8b4a08..03538a21bf 100644
--- a/src/components/structures/ContextMenu.tsx
+++ b/src/components/structures/ContextMenu.tsx
@@ -12,6 +12,7 @@ import React, { type JSX, type CSSProperties, type RefObject, type SyntheticEven
 import ReactDOM from "react-dom";
 import classNames from "classnames";
 import FocusLock from "react-focus-lock";
+import { TooltipProvider } from "@vector-im/compound-web";
 
 import { type Writeable } from "../../@types/common";
 import UIStore from "../../stores/UIStore";
@@ -404,7 +405,7 @@ export default class ContextMenu extends React.PureComponent<React.PropsWithChil
         );
 
         if (focusLock) {
-            body = <FocusLock>{body}</FocusLock>;
+            body = <FocusLock returnFocus>{body}</FocusLock>;
         }
 
         // filter props that are invalid for DOM elements
@@ -425,15 +426,17 @@ export default class ContextMenu extends React.PureComponent<React.PropsWithChil
                         onContextMenu={this.onContextMenuPreventBubbling}
                     >
                         {background}
-                        <div
-                            className={menuClasses}
-                            style={menuStyle}
-                            ref={this.collectContextMenuRect}
-                            role={managed ? "menu" : undefined}
-                            {...divProps}
-                        >
-                            {body}
-                        </div>
+                        <TooltipProvider>
+                            <div
+                                className={menuClasses}
+                                style={menuStyle}
+                                ref={this.collectContextMenuRect}
+                                role={managed ? "menu" : undefined}
+                                {...divProps}
+                            >
+                                {body}
+                            </div>
+                        </TooltipProvider>
                     </div>
                 )}
             </RovingTabIndexProvider>
diff --git a/src/components/structures/EmbeddedPage.tsx b/src/components/structures/EmbeddedPage.tsx
index f1c7b75b96..53a5d7d537 100644
--- a/src/components/structures/EmbeddedPage.tsx
+++ b/src/components/structures/EmbeddedPage.tsx
@@ -18,6 +18,7 @@ import { MatrixClientPeg } from "../../MatrixClientPeg";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import AutoHideScrollbar from "./AutoHideScrollbar";
 import { type ActionPayload } from "../../dispatcher/payloads";
+import { Action } from "../../dispatcher/actions.ts";
 
 interface IProps {
     // URL to request embedded page content from
@@ -72,7 +73,11 @@ export default class EmbeddedPage extends React.PureComponent<IProps, IState> {
             return;
         }
 
-        let body = (await res.text()).replace(/_t\(['"]([\s\S]*?)['"]\)/gm, (match, g1) => this.translate(g1));
+        // Replace '," and HTML encoded variants
+        let body = (await res.text()).replace(
+            /_t\((?:['"]|(?:&#(?:34|27);))([\s\S]*?)(?:['"]|(?:&#(?:34|27);))\)/gm,
+            (match, g1) => this.translate(g1),
+        );
 
         if (this.props.replaceMap) {
             Object.keys(this.props.replaceMap).forEach((key) => {
@@ -105,7 +110,7 @@ export default class EmbeddedPage extends React.PureComponent<IProps, IState> {
 
     private onAction = (payload: ActionPayload): void => {
         // HACK: Workaround for the context's MatrixClient not being set up at render time.
-        if (payload.action === "client_started") {
+        if (payload.action === Action.ClientStarted) {
             this.forceUpdate();
         }
     };
diff --git a/src/components/structures/FileDropTarget.tsx b/src/components/structures/FileDropTarget.tsx
index dcf4a2fdb1..5ad16303bf 100644
--- a/src/components/structures/FileDropTarget.tsx
+++ b/src/components/structures/FileDropTarget.tsx
@@ -7,11 +7,14 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { useEffect, useState } from "react";
+import { type Room } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../languageHandler";
 import UploadBigSvg from "../../../res/img/upload-big.svg";
+import { useRoomState } from "../../hooks/useRoomState.ts";
 
 interface IProps {
+    room: Room;
     parent: HTMLElement | null;
     onFileDrop(dataTransfer: DataTransfer): void;
 }
@@ -21,14 +24,15 @@ interface IState {
     counter: number;
 }
 
-const FileDropTarget: React.FC<IProps> = ({ parent, onFileDrop }) => {
+const FileDropTarget: React.FC<IProps> = ({ parent, onFileDrop, room }) => {
     const [state, setState] = useState<IState>({
         dragging: false,
         counter: 0,
     });
+    const hasPermission = useRoomState(room, (state) => state.maySendMessage(room.client.getUserId()!));
 
     useEffect(() => {
-        if (!parent || parent.ondrop) return;
+        if (!hasPermission || !parent || parent.ondrop) return;
 
         const onDragEnter = (ev: DragEvent): void => {
             ev.stopPropagation();
@@ -102,9 +106,9 @@ const FileDropTarget: React.FC<IProps> = ({ parent, onFileDrop }) => {
             parent?.removeEventListener("dragenter", onDragEnter);
             parent?.removeEventListener("dragleave", onDragLeave);
         };
-    }, [parent, onFileDrop]);
+    }, [parent, onFileDrop, hasPermission]);
 
-    if (state.dragging) {
+    if (hasPermission && state.dragging) {
         return (
             <div className="mx_FileDropTarget">
                 <img src={UploadBigSvg} className="mx_FileDropTarget_image" alt="" />
diff --git a/src/components/structures/FilePanel.tsx b/src/components/structures/FilePanel.tsx
index 5930490c34..7f80525e29 100644
--- a/src/components/structures/FilePanel.tsx
+++ b/src/components/structures/FilePanel.tsx
@@ -27,7 +27,6 @@ import EventIndexPeg from "../../indexing/EventIndexPeg";
 import { _t } from "../../languageHandler";
 import SearchWarning, { WarningKind } from "../views/elements/SearchWarning";
 import BaseCard from "../views/right_panel/BaseCard";
-import type ResizeNotifier from "../../utils/ResizeNotifier";
 import TimelinePanel from "./TimelinePanel";
 import Spinner from "../views/elements/Spinner";
 import { Layout } from "../../settings/enums/Layout";
@@ -39,7 +38,6 @@ import { ScopedRoomContextProvider } from "../../contexts/ScopedRoomContext.tsx"
 interface IProps {
     roomId: string;
     onClose: () => void;
-    resizeNotifier: ResizeNotifier;
 }
 
 interface IState {
@@ -294,7 +292,6 @@ class FilePanel extends React.Component<IProps, IState> {
                             timelineSet={this.state.timelineSet}
                             showUrlPreview={false}
                             onPaginationRequest={this.onPaginationRequest}
-                            resizeNotifier={this.props.resizeNotifier}
                             empty={emptyState}
                             layout={Layout.Group}
                         />
diff --git a/src/components/structures/GenericDropdownMenu.tsx b/src/components/structures/GenericDropdownMenu.tsx
index 78cd3d3ad4..f76e43c108 100644
--- a/src/components/structures/GenericDropdownMenu.tsx
+++ b/src/components/structures/GenericDropdownMenu.tsx
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import classNames from "classnames";
 import React, { type JSX, type FunctionComponent, type Key, type PropsWithChildren, type ReactNode } from "react";
+import { ChevronDownIcon, CheckIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { MenuItemRadio } from "../../accessibility/context_menu/MenuItemRadio";
 import { type ButtonEvent } from "../views/elements/AccessibleButton";
@@ -42,9 +43,10 @@ export function GenericDropdownMenuOption<T extends Key>({
             className="mx_GenericDropdownMenu_Option mx_GenericDropdownMenu_Option--item"
             onClick={onClick}
         >
+            {isSelected && <CheckIcon className="mx_GenericDropdownMenu_Option--checkIcon" />}
             <div className="mx_GenericDropdownMenu_Option--label">
                 <span>{label}</span>
-                <span>{description}</span>
+                {description && <span>{description}</span>}
             </div>
             {adornment}
         </MenuItemRadio>
@@ -202,6 +204,7 @@ export function GenericDropdownMenu<T>({
                 }}
             >
                 {selectedLabel(selected)}
+                <ChevronDownIcon />
             </ContextMenuButton>
             {contextMenu}
         </>
diff --git a/src/components/structures/InteractiveAuth.tsx b/src/components/structures/InteractiveAuth.tsx
index d1c670c27c..a4de1e4d21 100644
--- a/src/components/structures/InteractiveAuth.tsx
+++ b/src/components/structures/InteractiveAuth.tsx
@@ -20,7 +20,7 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import getEntryComponentForLoginType, {
     type ContinueKind,
-    type CustomAuthType,
+    CustomAuthType,
     type IStageComponent,
 } from "../views/auth/InteractiveAuthEntryComponents";
 import Spinner from "../views/elements/Spinner";
@@ -117,6 +117,7 @@ export default class InteractiveAuthComponent<T> extends React.Component<Interac
                 AuthType.UnstableRegistrationToken,
                 AuthType.Sso,
                 AuthType.SsoUnstable,
+                CustomAuthType.MasCrossSigningReset,
             ],
         });
     }
diff --git a/src/components/structures/LargeLoader.tsx b/src/components/structures/LargeLoader.tsx
index 57f0f949e9..dce73a9eb4 100644
--- a/src/components/structures/LargeLoader.tsx
+++ b/src/components/structures/LargeLoader.tsx
@@ -20,7 +20,7 @@ interface LargeLoaderProps {
 export const LargeLoader: React.FC<LargeLoaderProps> = ({ text }) => {
     return (
         <div className="mx_LargeLoader">
-            <Spinner w={45} h={45} />
+            <Spinner size={45} />
             <div className="mx_LargeLoader_text">{text}</div>
         </div>
     );
diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx
index 3bd2518c8a..52e5a87231 100644
--- a/src/components/structures/LeftPanel.tsx
+++ b/src/components/structures/LeftPanel.tsx
@@ -9,6 +9,7 @@ Please see LICENSE files in the repository root for full details.
 import React, { type JSX } from "react";
 import { createRef } from "react";
 import classNames from "classnames";
+import { ExploreIcon, DialPadIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import dis from "../../dispatcher/dispatcher";
 import { _t } from "../../languageHandler";
@@ -344,10 +345,12 @@ export default class LeftPanel extends React.Component<IProps, IState> {
         if (this.state.supportsPstnProtocol) {
             dialPadButton = (
                 <AccessibleButton
-                    className={classNames("mx_LeftPanel_dialPadButton", {})}
+                    className="mx_LeftPanel_dialPadButton"
                     onClick={this.onDialPad}
                     title={_t("left_panel|open_dial_pad")}
-                />
+                >
+                    <DialPadIcon />
+                </AccessibleButton>
             );
         }
 
@@ -358,7 +361,9 @@ export default class LeftPanel extends React.Component<IProps, IState> {
                     className="mx_LeftPanel_exploreButton"
                     onClick={this.onExplore}
                     title={_t("action|explore_rooms")}
-                />
+                >
+                    <ExploreIcon />
+                </AccessibleButton>
             );
         }
 
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 26e127f21f..70258e143c 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -17,6 +17,8 @@ import {
     type SyncStateData,
     SyncState,
     EventType,
+    ProfileKeyTimezone,
+    ProfileKeyMSC4175Timezone,
 } from "matrix-js-sdk/src/matrix";
 import { type MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 import classNames from "classnames";
@@ -30,7 +32,6 @@ import SettingsStore from "../../settings/SettingsStore";
 import { SettingLevel } from "../../settings/SettingLevel";
 import ResizeHandle from "../views/elements/ResizeHandle";
 import { CollapseDistributor, Resizer } from "../../resizer";
-import type ResizeNotifier from "../../utils/ResizeNotifier";
 import PlatformPeg from "../../PlatformPeg";
 import { DefaultTagID } from "../../stores/room-list/models";
 import { hideToast as hideServerLimitToast, showToast as showServerLimitToast } from "../../toasts/ServerLimitToast";
@@ -67,6 +68,8 @@ import { monitorSyncedPushRules } from "../../utils/pushRules/monitorSyncedPushR
 import { type ConfigOptions } from "../../SdkConfig";
 import { MatrixClientContextProvider } from "./MatrixClientContextProvider";
 import { Landmark, LandmarkNavigation } from "../../accessibility/LandmarkNavigation";
+import { ModuleApi } from "../../modules/Api.ts";
+import { SDKContext } from "../../contexts/SDKContext.ts";
 
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
@@ -86,7 +89,6 @@ interface IProps {
     // transitioned to PWLU)
     onRegistered: (credentials: IMatrixClientCreds) => Promise<MatrixClient>;
     hideToSRUsers: boolean;
-    resizeNotifier: ResizeNotifier;
     // eslint-disable-next-line camelcase
     page_type?: string;
     autoJoin?: boolean;
@@ -111,6 +113,7 @@ interface IState {
     backgroundImage?: string;
 }
 
+const NEW_ROOM_LIST_MIN_WIDTH = 224;
 /**
  * This is what our MatrixChat shows when we are logged in. The precise view is
  * determined by the page_type property.
@@ -133,8 +136,11 @@ class LoggedInView extends React.Component<IProps, IState> {
     protected timezoneProfileUpdateRef?: string[];
     protected resizer?: Resizer<ICollapseConfig, CollapseItem>;
 
-    public constructor(props: IProps) {
-        super(props);
+    public static contextType = SDKContext;
+    declare public context: React.ContextType<typeof SDKContext>;
+
+    public constructor(props: IProps, context: React.ContextType<typeof SDKContext>) {
+        super(props, context);
 
         this.state = {
             syncErrorData: undefined,
@@ -185,19 +191,37 @@ class LoggedInView extends React.Component<IProps, IState> {
             SettingsStore.watchSetting("userTimezone", null, this.onTimezoneUpdate),
         ];
 
-        this.resizer = this.createResizer();
-        this.resizer.attach();
+        this.loadResizer();
 
         OwnProfileStore.instance.on(UPDATE_EVENT, this.refreshBackgroundImage);
-        this.loadResizerPreferences();
         this.refreshBackgroundImage();
     }
 
+    /**
+     * Load or reload the resizer for the left panel
+     */
+    private loadResizer(): void {
+        // If the resizer already exists, detach it first
+        this.resizer?.detach();
+
+        this.resizer = this.createResizer();
+        this.resizer.attach();
+        this.loadResizerPreferences();
+    }
+
+    public componentDidUpdate(nextProps: Readonly<IProps>, nextState: Readonly<IState>, nextContext: any): void {
+        if (nextProps.page_type !== this.props.page_type) {
+            this.loadResizer();
+        }
+    }
+
     private onTimezoneUpdate = async (): Promise<void> => {
+        // TODO: In a future app release, remove support for legacy key.
         if (!SettingsStore.getValue("userTimezonePublish")) {
             // Ensure it's deleted
             try {
-                await this._matrixClient.deleteExtendedProfileProperty("us.cloke.msc4175.tz");
+                await this._matrixClient.deleteExtendedProfileProperty(ProfileKeyMSC4175Timezone);
+                await this._matrixClient.deleteExtendedProfileProperty(ProfileKeyTimezone);
             } catch (ex) {
                 console.warn("Failed to delete timezone from user profile", ex);
             }
@@ -212,7 +236,8 @@ class LoggedInView extends React.Component<IProps, IState> {
             return;
         }
         try {
-            await this._matrixClient.setExtendedProfileProperty("us.cloke.msc4175.tz", currentTimezone);
+            await this._matrixClient.setExtendedProfileProperty(ProfileKeyTimezone, currentTimezone);
+            await this._matrixClient.setExtendedProfileProperty(ProfileKeyMSC4175Timezone, currentTimezone);
         } catch (ex) {
             console.warn("Failed to update user profile with current timezone", ex);
         }
@@ -261,10 +286,15 @@ class LoggedInView extends React.Component<IProps, IState> {
         let panelCollapsed: boolean;
         const useNewRoomList = SettingsStore.getValue("feature_new_room_list");
         // TODO decrease this once Spaces launches as it'll no longer need to include the 56px Community Panel
-        const toggleSize = useNewRoomList ? 224 : 206 - 50;
+        const toggleSize = useNewRoomList ? NEW_ROOM_LIST_MIN_WIDTH : 206 - 50;
+
         const collapseConfig: ICollapseConfig = {
             toggleSize,
             onCollapsed: (collapsed) => {
+                if (useNewRoomList) {
+                    // The new room list does not support collapsing.
+                    return;
+                }
                 panelCollapsed = collapsed;
                 if (collapsed) {
                     dis.dispatch({ action: "hide_left_panel" });
@@ -275,17 +305,19 @@ class LoggedInView extends React.Component<IProps, IState> {
             },
             onResized: (size) => {
                 panelSize = size;
-                this.props.resizeNotifier.notifyLeftHandleResized();
+                this.context.resizeNotifier.notifyLeftHandleResized();
             },
             onResizeStart: () => {
-                this.props.resizeNotifier.startResizing();
+                this.context.resizeNotifier.startResizing();
             },
             onResizeStop: () => {
-                if (!panelCollapsed) window.localStorage.setItem("mx_lhs_size", "" + panelSize);
-                this.props.resizeNotifier.stopResizing();
+                // Always save the lhs size for the new room list.
+                if (useNewRoomList || !panelCollapsed) window.localStorage.setItem("mx_lhs_size", "" + panelSize);
+                this.context.resizeNotifier.stopResizing();
             },
             isItemCollapsed: (domNode) => {
-                return domNode.classList.contains("mx_LeftPanel_minimized");
+                // New rooms list does not support collapsing.
+                return !useNewRoomList && domNode.classList.contains("mx_LeftPanel_minimized");
             },
             handler: this.resizeHandler.current ?? undefined,
         };
@@ -299,8 +331,11 @@ class LoggedInView extends React.Component<IProps, IState> {
     }
 
     private loadResizerPreferences(): void {
+        const useNewRoomList = SettingsStore.getValue("feature_new_room_list");
         let lhsSize = parseInt(window.localStorage.getItem("mx_lhs_size")!, 10);
-        if (isNaN(lhsSize)) {
+        // If the user has not set a size, or for the new room list if the size is less than the minimum width,
+        // set a default size.
+        if (isNaN(lhsSize) || (useNewRoomList && lhsSize < NEW_ROOM_LIST_MIN_WIDTH)) {
             lhsSize = 350;
         }
         this.resizer?.forHandleWithId("lp-resizer")?.resize(lhsSize);
@@ -324,14 +359,15 @@ class LoggedInView extends React.Component<IProps, IState> {
         const newErrCode = (data?.error as MatrixError)?.errcode;
         if (syncState === oldSyncState && oldErrCode === newErrCode) return;
 
+        const syncErrorData = syncState === SyncState.Error ? data : undefined;
         this.setState({
-            syncErrorData: syncState === SyncState.Error ? data : undefined,
+            syncErrorData,
         });
 
         if (oldSyncState === SyncState.Prepared && syncState === SyncState.Syncing) {
             this.updateServerNoticeEvents();
         } else {
-            this.calculateServerLimitToast(this.state.syncErrorData, this.state.usageLimitEventContent);
+            this.calculateServerLimitToast(syncErrorData, this.state.usageLimitEventContent);
         }
     };
 
@@ -356,7 +392,7 @@ class LoggedInView extends React.Component<IProps, IState> {
 
         // usageLimitDismissed is true when the user has explicitly hidden the toast
         // and it will be reset to false if a *new* usage alert comes in.
-        if (usageLimitEventContent && this.state.usageLimitDismissed) {
+        if (usageLimitEventContent && !this.state.usageLimitDismissed) {
             showServerLimitToast(
                 usageLimitEventContent.limit_type,
                 this.onUsageLimitDismissed,
@@ -661,6 +697,10 @@ class LoggedInView extends React.Component<IProps, IState> {
     public render(): React.ReactNode {
         let pageElement;
 
+        const moduleRenderer = this.props.page_type
+            ? ModuleApi.instance.navigation.locationRenderers.get(this.props.page_type)
+            : undefined;
+
         switch (this.props.page_type) {
             case PageTypes.RoomView:
                 pageElement = (
@@ -670,7 +710,6 @@ class LoggedInView extends React.Component<IProps, IState> {
                         threepidInvite={this.props.threepidInvite}
                         oobData={this.props.roomOobData}
                         key={this.props.currentRoomId || "roomview"}
-                        resizeNotifier={this.props.resizeNotifier}
                         justCreatedOpts={this.props.roomJustCreatedOpts}
                         forceTimeline={this.props.forceTimeline}
                     />
@@ -684,10 +723,17 @@ class LoggedInView extends React.Component<IProps, IState> {
             case PageTypes.UserView:
                 if (!!this.props.currentUserId) {
                     pageElement = (
-                        <UserView userId={this.props.currentUserId} resizeNotifier={this.props.resizeNotifier} />
+                        <UserView userId={this.props.currentUserId} resizeNotifier={this.context.resizeNotifier} />
                     );
                 }
                 break;
+            default: {
+                if (moduleRenderer) {
+                    pageElement = moduleRenderer();
+                } else {
+                    console.warn(`Couldn't render page type "${this.props.page_type}"`);
+                }
+            }
         }
 
         const wrapperClasses = classNames({
@@ -729,20 +775,22 @@ class LoggedInView extends React.Component<IProps, IState> {
                                 )}
                                 <SpacePanel />
                                 {!useNewRoomList && <BackdropPanel backgroundImage={this.state.backgroundImage} />}
-                                <div
-                                    className="mx_LeftPanel_wrapper--user"
-                                    ref={this._resizeContainer}
-                                    data-collapsed={shouldUseMinimizedUI ? true : undefined}
-                                >
-                                    <LeftPanel
-                                        pageType={this.props.page_type as PageTypes}
-                                        isMinimized={shouldUseMinimizedUI || false}
-                                        resizeNotifier={this.props.resizeNotifier}
-                                    />
-                                </div>
+                                {!moduleRenderer && (
+                                    <div
+                                        className="mx_LeftPanel_wrapper--user"
+                                        ref={this._resizeContainer}
+                                        data-collapsed={shouldUseMinimizedUI ? true : undefined}
+                                    >
+                                        <LeftPanel
+                                            pageType={this.props.page_type as PageTypes}
+                                            isMinimized={shouldUseMinimizedUI || false}
+                                            resizeNotifier={this.context.resizeNotifier}
+                                        />
+                                    </div>
+                                )}
                             </div>
                         </div>
-                        <ResizeHandle passRef={this.resizeHandler} id="lp-resizer" />
+                        {!moduleRenderer && <ResizeHandle passRef={this.resizeHandler} id="lp-resizer" />}
                         <div className="mx_RoomView_wrapper">{pageElement}</div>
                     </div>
                 </div>
diff --git a/src/components/structures/MainSplit.tsx b/src/components/structures/MainSplit.tsx
index 6b6736d4ec..4ffabfeafe 100644
--- a/src/components/structures/MainSplit.tsx
+++ b/src/components/structures/MainSplit.tsx
@@ -12,11 +12,10 @@ import { type NumberSize, Resizable } from "re-resizable";
 import { type Direction } from "re-resizable/lib/resizer";
 import { type WebPanelResize } from "@matrix-org/analytics-events/types/typescript/WebPanelResize";
 
-import type ResizeNotifier from "../../utils/ResizeNotifier";
 import { PosthogAnalytics } from "../../PosthogAnalytics.ts";
+import { SDKContext } from "../../contexts/SDKContext.ts";
 
 interface IProps {
-    resizeNotifier: ResizeNotifier;
     collapsedRhs?: boolean;
     panel?: JSX.Element;
     children: ReactNode;
@@ -36,16 +35,23 @@ interface IProps {
 }
 
 export default class MainSplit extends React.Component<IProps> {
+    public static contextType = SDKContext;
+    declare public context: React.ContextType<typeof SDKContext>;
+
     public static defaultProps = {
         defaultSize: 320,
     };
 
+    public constructor(props: IProps, context: React.ContextType<typeof SDKContext>) {
+        super(props, context);
+    }
+
     private onResizeStart = (): void => {
-        this.props.resizeNotifier.startResizing();
+        this.context.resizeNotifier.startResizing();
     };
 
     private onResize = (): void => {
-        this.props.resizeNotifier.notifyRightHandleResized();
+        this.context.resizeNotifier.notifyRightHandleResized();
     };
 
     private get sizeSettingStorageKey(): string {
@@ -63,7 +69,7 @@ export default class MainSplit extends React.Component<IProps> {
         delta: NumberSize,
     ): void => {
         const newSize = this.loadSidePanelSize().width + delta.width;
-        this.props.resizeNotifier.stopResizing();
+        this.context.resizeNotifier.stopResizing();
         window.localStorage.setItem(this.sizeSettingStorageKey, newSize.toString());
 
         PosthogAnalytics.instance.trackEvent<WebPanelResize>({
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index e61713ca69..8a9ffdd115 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -28,6 +28,8 @@ import { TooltipProvider } from "@vector-im/compound-web";
 // what-input helps improve keyboard accessibility
 import "what-input";
 import sanitizeHtml from "sanitize-html";
+import { I18nContext } from "@element-hq/web-shared-components";
+import { LockSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import PosthogTrackers from "../../PosthogTrackers";
 import { DecryptionFailureTracker } from "../../DecryptionFailureTracker";
@@ -47,11 +49,9 @@ import PageType from "../../PageTypes";
 import createRoom, { type IOpts } from "../../createRoom";
 import { _t, _td } from "../../languageHandler";
 import SettingsStore from "../../settings/SettingsStore";
-import ThemeController from "../../settings/controllers/ThemeController";
 import { startAnyRegistrationFlow } from "../../Registration";
-import ResizeNotifier from "../../utils/ResizeNotifier";
 import AutoDiscoveryUtils from "../../utils/AutoDiscoveryUtils";
-import { makeRoomPermalink } from "../../utils/permalinks/Permalinks";
+import { calculateRoomVia, makeRoomPermalink } from "../../utils/permalinks/Permalinks";
 import ThemeWatcher, { ThemeWatcherEvent } from "../../settings/watchers/ThemeWatcher";
 import { FontWatcher } from "../../settings/watchers/FontWatcher";
 import { storeRoomAliasInCache } from "../../RoomAliasCache";
@@ -130,7 +130,6 @@ import { NotificationLevel } from "../../stores/notifications/NotificationLevel"
 import { type UserTab } from "../views/dialogs/UserTab";
 import { shouldSkipSetupEncryption } from "../../utils/crypto/shouldSkipSetupEncryption";
 import { Filter } from "../views/dialogs/spotlight/Filter";
-import { checkSessionLockFree, getSessionLock } from "../../utils/SessionLock";
 import { SessionLockStolenView } from "./auth/SessionLockStolenView";
 import { ConfirmSessionLockTheftView } from "./auth/ConfirmSessionLockTheftView";
 import { LoginSplashView } from "./auth/LoginSplashView";
@@ -141,6 +140,8 @@ import { type OpenForwardDialogPayload } from "../../dispatcher/payloads/OpenFor
 import { ShareFormat, type SharePayload } from "../../dispatcher/payloads/SharePayload";
 import Markdown from "../../Markdown";
 import { sanitizeHtmlParams } from "../../Linkify";
+import { isOnlyAdmin } from "../../utils/membership";
+import { ModuleApi } from "../../modules/Api.ts";
 
 // legacy export
 export { default as Views } from "../../Views";
@@ -174,11 +175,23 @@ interface IProps {
 }
 
 interface IState {
-    // the master view we are showing.
+    /**
+     * The master view we are showing.
+     *
+     * This represents the state of a state machine: see the documentation on {@link Views} for a transition diagram.
+     *
+     * TODO: this doesn't work well, because updates to React state are not instantaneous, meaning that if several
+     *   events or {@link Action}s happen in quick succession, we may end up following the wrong transition.
+     *   We should probably move the view into a separate object (like a ViewModel) and have the React state subscribe
+     *   to updates.
+     */
     view: Views;
-    // What the LoggedInView would be showing if visible
+
+    // What the LoggedInView would be showing if visible.
+    // A member of the enum for standard pages or a string for those provided by
+    // a module.
     // eslint-disable-next-line camelcase
-    page_type?: PageType;
+    page_type?: PageType | string;
     // The ID of the room we're viewing. This is either populated directly
     // in the case where we view a room by ID or by RoomView when it resolves
     // what ID an alias points at.
@@ -199,9 +212,11 @@ interface IState {
     // and disable it when there are no dialogs
     hideToSRUsers: boolean;
     syncError: Error | null;
-    resizeNotifier: ResizeNotifier;
     serverConfig?: ValidatedServerConfig;
+
+    /** Has our MatrixClient started? */
     ready: boolean;
+
     threepidInvite?: IThreepidInvite;
     roomOobData?: object;
     pendingInitialSync?: boolean;
@@ -224,7 +239,13 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     private firstSyncPromise: PromiseWithResolvers<void>;
 
     private screenAfterLogin?: IScreen;
+
+    /** True if we have successfully completed an OIDC or token login.
+     *
+     * XXX it's unclear if this is ever cleared, so what happens if the user logs out and then logs back in?
+     */
     private tokenLogin?: boolean;
+
     // What to focus on next component update, if anything
     private focusNext: FocusNextType;
     private subTitleStatus: string;
@@ -237,6 +258,8 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     private readonly stores: SdkContextClass;
     private loadSessionAbortController = new AbortController();
 
+    private sessionLoadStarted = false;
+
     public constructor(props: IProps) {
         super(props);
         this.stores = SdkContextClass.instance;
@@ -252,7 +275,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             isMobileRegistration: false,
 
             syncError: null, // If the current syncing status is ERROR, the error object, otherwise null.
-            resizeNotifier: new ResizeNotifier(),
             ready: false,
         };
 
@@ -311,7 +333,8 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     private async initSession(): Promise<void> {
         // The Rust Crypto SDK will break if two Element instances try to use the same datastore at once, so
         // make sure we are the only Element instance in town (on this browser/domain).
-        if (!(await getSessionLock(() => this.onSessionLockStolen()))) {
+        const platform = PlatformPeg.get();
+        if (platform && !(await platform.getSessionLock(() => this.onSessionLockStolen()))) {
             // we failed to get the lock. onSessionLockStolen should already have been called, so nothing left to do.
             return;
         }
@@ -383,11 +406,30 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         await Lifecycle.onSessionLockStolen();
     }
 
+    /**
+     * Perform actions that are specific to a user that has just logged in.
+     *
+     * Called when:
+     *
+     *  - We successfully completed an OIDC or token login, via {@link initSession}.
+     *  - The {@link Login} or {@link Register} components notify us that we successfully completed a non-OIDC login or
+     *    registration.
+     *
+     * In both cases, {@link Action.OnLoggedIn} will already have been emitted, but the call to {@link onShowPostLoginScreen} will
+     * have been suppressed (by either {@link tokenLogin} being set, or the view being set to {@link Views.LOGIN} or
+     * {@link Views.REGISTER}).
+     *
+     * {@link onWillStartClient} and {@link onClientStarted} will already have been called (but not necessarily
+     * completed).
+     *
+     * This method either calls {@link onLiggedIn} directly, or switches to {@link Views.E2E_SETUP} or
+     * {@link Views.COMPLETE_SECURITY}, which will later call {@link onCompleteSecurityE2eSetupFinished}.
+     */
     private async postLoginSetup(): Promise<void> {
         const cli = MatrixClientPeg.safeGet();
         const cryptoEnabled = Boolean(cli.getCrypto());
         if (!cryptoEnabled) {
-            this.onLoggedIn();
+            this.onShowPostLoginScreen();
         }
 
         const promisesList: Promise<any>[] = [this.firstSyncPromise.promise];
@@ -420,14 +462,11 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
             const cryptoExtension = ModuleRunner.instance.extensions.cryptoSetup;
             if (cryptoExtension.SHOW_ENCRYPTION_SETUP_UI == false) {
-                this.onLoggedIn();
+                this.onShowPostLoginScreen();
             } else {
                 this.setStateForNewView({ view: Views.COMPLETE_SECURITY });
             }
-        } else if (
-            (await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")) &&
-            !(await shouldSkipSetupEncryption(cli))
-        ) {
+        } else if (!(await shouldSkipSetupEncryption(cli))) {
             // if cross-signing is not yet set up, do so now if possible.
             InitialCryptoSetupStore.sharedInstance().startInitialCryptoSetup(
                 cli,
@@ -435,7 +474,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             );
             this.setStateForNewView({ view: Views.E2E_SETUP });
         } else {
-            this.onLoggedIn();
+            this.onShowPostLoginScreen();
         }
         this.setState({ pendingInitialSync: false });
     }
@@ -446,6 +485,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             | (Pick<IState, K> | IState | null),
         callback?: () => void,
     ): void {
+        if (state && "view" in state) {
+            logger.debug(`MatrixChat: Queuing change of view from ${Views[this.state.view]} to ${Views[state.view]}`);
+        }
         if (this.shouldTrackPageChange(this.state, { ...this.state, ...state })) {
             this.startPageChangeTimer();
         }
@@ -456,7 +498,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         UIStore.instance.on(UI_EVENTS.Resize, this.handleResize);
 
         // For PersistentElement
-        this.state.resizeNotifier.on("middlePanelResized", this.dispatchTimelineResize);
+        this.stores.resizeNotifier.on("middlePanelResized", this.dispatchTimelineResize);
 
         RoomNotificationStateStore.instance.on(UPDATE_STATUS_INDICATOR, this.onUpdateStatusIndicator);
 
@@ -469,15 +511,21 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.fontWatcher.start();
 
         initSentry(SdkConfig.get("sentry"));
-
-        if (!checkSessionLockFree()) {
-            // another instance holds the lock; confirm its theft before proceeding
-            setTimeout(() => this.setState({ view: Views.CONFIRM_LOCK_THEFT }), 0);
-        } else {
-            this.startInitSession();
-        }
-
         window.addEventListener("resize", this.onWindowResized);
+
+        // Once we start loading the MatrixClient, we can't stop, even if MatrixChat gets unmounted (as it does
+        // in React's Strict Mode). So, start loading the session now, but only if this MatrixChat was not previously
+        // mounted.
+        if (!this.sessionLoadStarted) {
+            this.sessionLoadStarted = true;
+            const platform = PlatformPeg.get();
+            if (platform && !platform.checkSessionLockFree()) {
+                // another instance holds the lock; confirm its theft before proceeding
+                setTimeout(() => this.setState({ view: Views.CONFIRM_LOCK_THEFT }), 0);
+            } else {
+                this.startInitSession();
+            }
+        }
     }
 
     public componentDidUpdate(prevProps: IProps, prevState: IState): void {
@@ -502,7 +550,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.themeWatcher?.stop();
         this.fontWatcher?.stop();
         UIStore.destroy();
-        this.state.resizeNotifier.removeListener("middlePanelResized", this.dispatchTimelineResize);
+        this.stores.resizeNotifier.removeListener("middlePanelResized", this.dispatchTimelineResize);
         window.removeEventListener("resize", this.onWindowResized);
     }
 
@@ -597,6 +645,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         );
     }
 
+    private isLoggedInViewPageDisplayed(): boolean {
+        return this.loggedInView.current !== null && this.state.page_type !== undefined;
+    }
+
     private setStateForNewView(state: Partial<IState>): void {
         if (state.view === undefined) {
             throw new Error("setStateForNewView with no view!");
@@ -611,9 +663,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     private onAction = (payload: ActionPayload): void => {
         // once the session lock has been stolen, don't try to do anything.
         if (this.state.view === Views.LOCK_STOLEN) {
+            logger.warn(`MatrixChat: ignoring action ${payload.action} as session lock has been stolen`);
             return;
         }
 
+        // Exclude some rather spammy actions from being logged.
+        if (payload.action != Action.UserActivity) {
+            logger.debug(`MatrixChat: handling action ${payload.action}`);
+        }
+
         // Start the onboarding process for certain actions
         if (
             MatrixClientPeg.get()?.isGuest() &&
@@ -806,20 +864,13 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 }
                 break;
             }
-            case "view_last_screen":
-                // This function does what we want, despite the name. The idea is that it shows
-                // the last room we were looking at or some reasonable default/guess. We don't
-                // have to worry about email invites or similar being re-triggered because the
-                // function will have cleared that state and not execute that path.
-                this.showScreenAfterLogin();
-                break;
             case "hide_left_panel":
                 this.setState(
                     {
                         collapseLhs: true,
                     },
                     () => {
-                        this.state.resizeNotifier.notifyLeftHandleResized();
+                        this.stores.resizeNotifier.notifyLeftHandleResized();
                     },
                 );
                 break;
@@ -829,7 +880,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                         collapseLhs: false,
                     },
                     () => {
-                        this.state.resizeNotifier.notifyLeftHandleResized();
+                        this.stores.resizeNotifier.notifyLeftHandleResized();
                     },
                 );
                 break;
@@ -837,26 +888,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 Modal.createDialog(DialPadModal, {}, "mx_Dialog_dialPadWrapper");
                 break;
             case Action.OnLoggedIn:
-                this.stores.client = MatrixClientPeg.safeGet();
-                if (
-                    // Skip this handling for token login as that always calls onLoggedIn itself
-                    !this.tokenLogin &&
-                    !Lifecycle.isSoftLogout() &&
-                    this.state.view !== Views.LOGIN &&
-                    this.state.view !== Views.REGISTER &&
-                    this.state.view !== Views.COMPLETE_SECURITY &&
-                    this.state.view !== Views.E2E_SETUP
-                ) {
-                    this.onLoggedIn();
-                }
+                this.onLoggedIn();
                 break;
-            case "on_client_not_viable":
+            case Action.ClientNotViable:
                 this.onSoftLogout();
                 break;
             case Action.OnLoggedOut:
                 this.onLoggedOut();
                 break;
-            case "will_start_client":
+            case Action.WillStartClient:
                 this.setState({ ready: false }, () => {
                     // if the client is about to start, we are, by definition, not ready.
                     // Set ready to false now, then it'll be set to true when the sync
@@ -864,7 +904,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     this.onWillStartClient();
                 });
                 break;
-            case "client_started":
+            case Action.ClientStarted:
                 // No need to make this handler async to wait for the result of this
                 this.onClientStarted().catch((e) => {
                     logger.error("Exception in onClientStarted", e);
@@ -984,8 +1024,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         newState.isMobileRegistration = isMobileRegistration;
 
         this.setStateForNewView(newState);
-        ThemeController.isLogin = true;
-        this.themeWatcher?.recheck();
         this.notifyNewScreen(isMobileRegistration ? "mobile_register" : "register");
     }
 
@@ -1018,7 +1056,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 presentedId = theAlias;
                 // Store display alias of the presented room in cache to speed future
                 // navigation.
-                storeRoomAliasInCache(theAlias, room.roomId);
+                storeRoomAliasInCache(theAlias, room.roomId, calculateRoomVia(room));
             }
 
             // Store this as the ID of the last room accessed. This is so that we can
@@ -1057,8 +1095,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 roomJustCreatedOpts: roomInfo.justCreatedOpts,
             },
             () => {
-                ThemeController.isLogin = false;
-                this.themeWatcher?.recheck();
                 this.notifyNewScreen("room/" + presentedId, replaceLast);
             },
         );
@@ -1069,7 +1105,8 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             this.viewWelcome();
             return;
         }
-        if (!this.state.currentRoomId && !this.state.currentUserId) {
+
+        if (!this.state.currentRoomId && !this.state.currentUserId && !this.isLoggedInViewPageDisplayed()) {
             this.viewHome();
         }
     }
@@ -1082,8 +1119,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             view: Views.WELCOME,
         });
         this.notifyNewScreen("welcome");
-        ThemeController.isLogin = true;
-        this.themeWatcher?.recheck();
     }
 
     private viewLogin(otherState?: any): void {
@@ -1092,8 +1127,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             ...otherState,
         });
         this.notifyNewScreen("login");
-        ThemeController.isLogin = true;
-        this.themeWatcher?.recheck();
     }
 
     private viewHome(justRegistered = false): void {
@@ -1105,8 +1138,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         });
         this.setPage(PageType.HomePage);
         this.notifyNewScreen("home");
-        ThemeController.isLogin = false;
-        this.themeWatcher?.recheck();
     }
 
     private viewUser(userId: string, subAction: string): void {
@@ -1255,29 +1286,22 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
         const client = MatrixClientPeg.get();
         if (client && roomToLeave) {
-            const plEvent = roomToLeave.currentState.getStateEvents(EventType.RoomPowerLevels, "");
-            const plContent = plEvent ? plEvent.getContent() : {};
-            const userLevels = plContent.users || {};
-            const currentUserLevel = userLevels[client.getUserId()!];
-            const userLevelValues = Object.values(userLevels);
-            if (userLevelValues.every((x) => typeof x === "number")) {
+            // If the user is the only user with highest power level
+            if (isOnlyAdmin(roomToLeave)) {
+                const userLevelValues = roomToLeave.getJoinedMembers().map((m) => m.powerLevel);
+
                 const maxUserLevel = Math.max(...(userLevelValues as number[]));
-                // If the user is the only user with highest power level
-                if (
-                    maxUserLevel === currentUserLevel &&
-                    userLevelValues.lastIndexOf(maxUserLevel) == userLevelValues.indexOf(maxUserLevel)
-                ) {
-                    const warning =
-                        maxUserLevel >= 100
-                            ? _t("leave_room_dialog|room_leave_admin_warning")
-                            : _t("leave_room_dialog|room_leave_mod_warning");
-                    warnings.push(
-                        <strong className="warning" key="last_admin_warning">
-                            {" " /* Whitespace, otherwise the sentences get smashed together */}
-                            {warning}
-                        </strong>,
-                    );
-                }
+
+                const warning =
+                    maxUserLevel >= 100
+                        ? _t("leave_room_dialog|room_leave_admin_warning")
+                        : _t("leave_room_dialog|room_leave_mod_warning");
+                warnings.push(
+                    <strong className="warning" key="last_admin_warning">
+                        {" " /* Whitespace, otherwise the sentences get smashed together */}
+                        {warning}
+                    </strong>,
+                );
             }
         }
 
@@ -1377,21 +1401,24 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     }
 
     /**
-     * Called when a new logged in session has started
+     * Show the first screen after the application is successfully loaded in a logged-in state.
+     *
+     * Called:
+     *
+     *  - on {@link Action.OnLoggedIn}, but only when we don't expect a separate call to {@link postLoginSetup}.
+     *  - from {@link postLoginSetup}, when we don't have crypto setup tasks to perform after the login.
+     *  - by {@link onCompleteSecurityE2eSetupFinished}
+     *
+     * In other words, whenever we think we have completed the login and E2E setup tasks.
      */
-    private async onLoggedIn(): Promise<void> {
-        ThemeController.isLogin = false;
-        this.themeWatcher?.recheck();
-        StorageManager.tryPersistStorage();
+    private onShowPostLoginScreen(): void {
+        logger.debug("onShowPostLoginScreen: Transitioning to logged in view.");
 
-        await this.onShowPostLoginScreen();
-    }
-
-    private async onShowPostLoginScreen(): Promise<void> {
         this.setStateForNewView({ view: Views.LOGGED_IN });
         // If a specific screen is set to be shown after login, show that above
         // all else, as it probably means the user clicked on something already.
         if (this.screenAfterLogin?.screen) {
+            logger.debug(`onShowPostLoginScreen: showing screen ${this.screenAfterLogin.screen}`);
             this.showScreen(this.screenAfterLogin.screen, this.screenAfterLogin.params);
             this.screenAfterLogin = undefined;
         } else if (MatrixClientPeg.currentUserIsJustRegistered()) {
@@ -1400,6 +1427,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             if (ThreepidInviteStore.instance.pickBestInvite()) {
                 // The user has a 3pid invite pending - show them that
                 const threepidInvite = ThreepidInviteStore.instance.pickBestInvite();
+                logger.debug(`onShowPostLoginScreen: showing room ${threepidInvite.roomId} after registration`);
 
                 // HACK: This is a pretty brutal way of threading the invite back through
                 // our systems, but it's the safest we have for now.
@@ -1408,9 +1436,11 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             } else {
                 // The user has just logged in after registering,
                 // so show the homepage.
+                logger.debug("onShowPostLoginScreen: Showing home page after registration");
                 dis.dispatch<ViewHomePagePayload>({ action: Action.ViewHomePage, justRegistered: true });
             }
-        } else if (!(await this.shouldForceVerification())) {
+        } else {
+            logger.debug("onShowPostLoginScreen: showScreenAfterLogin");
             this.showScreenAfterLogin();
         }
 
@@ -1474,15 +1504,19 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         // If screenAfterLogin is set, use that, then null it so that a second login will
         // result in view_home_page, _user_settings or _room_directory
         if (this.screenAfterLogin && this.screenAfterLogin.screen) {
+            logger.debug(`showScreenAfterLogin: showing screen ${this.screenAfterLogin.screen}`);
             this.showScreen(this.screenAfterLogin.screen, this.screenAfterLogin.params);
             this.screenAfterLogin = undefined;
         } else if (localStorage && localStorage.getItem("mx_last_room_id")) {
             // Before defaulting to directory, show the last viewed room
+            logger.debug("showScreenAfterLogin: showing last room");
             this.viewLastRoom();
         } else {
             if (MatrixClientPeg.safeGet().isGuest()) {
+                logger.debug("showScreenAfterLogin: showing guest welcome page");
                 dis.dispatch({ action: "view_welcome_page" });
             } else {
+                logger.debug("showScreenAfterLogin: showing home page");
                 dis.dispatch({ action: Action.ViewHomePage });
             }
         }
@@ -1496,6 +1530,37 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         });
     }
 
+    /**
+     * Handle an {@link Action.OnLoggedIn} action (i.e, we now have a client with working credentials).
+     */
+    private onLoggedIn(): void {
+        this.stores.client = MatrixClientPeg.safeGet();
+        StorageManager.tryPersistStorage();
+
+        // If we're loading the app for the first time, we can now transition to a splash screen while we wait for the
+        // client to start. The exceptions are:
+        //
+        //   - If there is a token login in flight: in that case we wait for the login to complete (which hits
+        //     `postLoginSetup`).
+        //
+        //   - Lifecycle emits an `Action.OnLoggedIn` event during startup even if the localstorage flag indicating a
+        //     previous soft logout is set. In that situation we actually want to wait for the `Action.ClientNotViable`
+        //     event, which will transition us into Views.SOFT_LOGOUT. We therefore have to check for !isSoftLogout().
+        //     There will be a subsequent `Action.OnLoggedIn` event once the reauthentication completes.
+        //
+        //     XXX: fix this properly by having Lifecycle not emit OnLoggedIn when it knows it is about to emit a
+        //     ClientNotViable.
+        //
+        // If we're already in the SOFT_LOGOUT view, that means that reauthentication has succeeded, and we can
+        // transition to the splash screen.
+        if (
+            (this.state.view === Views.LOADING && !Lifecycle.isSoftLogout() && !this.tokenLogin) ||
+            this.state.view === Views.SOFT_LOGOUT
+        ) {
+            this.setStateForNewView({ view: Views.PENDING_CLIENT_START });
+        }
+    }
+
     /**
      * Called when the session is logged out
      */
@@ -1707,7 +1772,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 ToastStore.sharedInstance().addOrReplaceToast({
                     key: "verifreq_" + request.transactionId,
                     title: _t("encryption|verification_requested_toast_title"),
-                    icon: "verification",
+                    icon: <LockSolidIcon color="var(--cpd-color-text-primary)" />,
                     props: { request },
                     component: VerificationRequestToast,
                     priority: 90,
@@ -1725,15 +1790,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         const cli = MatrixClientPeg.safeGet();
 
         const shouldForceVerification = await this.shouldForceVerification();
-        // XXX: Don't replace the screen if it's already one of these: postLoginSetup
-        // changes to these screens in certain circumstances so we shouldn't clobber it.
-        // We should probably have one place where we decide what the next screen is after
-        // login.
-        if (![Views.COMPLETE_SECURITY, Views.E2E_SETUP].includes(this.state.view)) {
-            if (shouldForceVerification) {
-                this.setStateForNewView({ view: Views.COMPLETE_SECURITY });
-            }
-        }
 
         const crypto = cli.getCrypto();
         if (crypto) {
@@ -1750,13 +1806,31 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.setState({
             ready: true,
         });
+
+        // If the view is PENDING_CLIENT_START, that means we recovered the session from localstorage, or from
+        // soft-logout: we can now transition to the logged-in view.
+        //
+        // If the view is something else, that probably means it's a login or registration view; we handle that in
+        // `postLoginSetup`.
+        if (this.state.view === Views.PENDING_CLIENT_START) {
+            if (shouldForceVerification) {
+                this.setStateForNewView({ view: Views.COMPLETE_SECURITY });
+            } else {
+                this.onShowPostLoginScreen();
+            }
+        }
     }
 
     public showScreen(screen: string, params?: { [key: string]: any }): void {
+        logger.debug(`showScreen ${screen}`);
+
         const cli = MatrixClientPeg.get();
         const isLoggedOutOrGuest = !cli || cli.isGuest();
         if (!isLoggedOutOrGuest && AUTH_SCREENS.includes(screen)) {
             // user is logged in and landing on an auth page which will uproot their session, redirect them home instead
+            logger.info(
+                `showScreen: suppressing change to AuthScreen ${screen} for logged-in user, and going to home screen instead`,
+            );
             dis.dispatch({ action: Action.ViewHomePage });
             return;
         }
@@ -1813,7 +1887,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             // if we weren't already coming at this from an existing screen
             // and we're logged in, then explicitly default to home.
             // if we're not logged in, then the login flow will do the right thing.
-            if (!this.state.currentRoomId && !this.state.currentUserId) {
+            if (!this.state.currentRoomId && !this.state.currentUserId && !this.isLoggedInViewPageDisplayed()) {
                 this.viewHome();
             }
         } else if (screen === "settings") {
@@ -1922,8 +1996,8 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 userId: userId,
                 subAction: params?.action,
             });
-        } else {
-            logger.info(`Ignoring showScreen for '${screen}'`);
+        } else if (ModuleApi.instance.navigation.locationRenderers.get(screen)) {
+            this.setState({ page_type: screen });
         }
     }
 
@@ -1955,7 +2029,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         }
 
         this.prevWindowWidth = width;
-        this.state.resizeNotifier.notifyWindowResized();
+        this.stores.resizeNotifier.notifyWindowResized();
     };
 
     private dispatchTimelineResize(): void {
@@ -2051,7 +2125,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         PerformanceMonitor.instance.stop(PerformanceEntryNames.REGISTER);
     };
 
-    // complete security / e2e setup has finished
+    /** Called when {@link Views.E2E_SETUP} or {@link Views.COMPLETE_SECURITY} have completed. */
     private onCompleteSecurityE2eSetupFinished = async (): Promise<void> => {
         const forceVerify = await this.shouldForceVerification();
         if (forceVerify) {
@@ -2062,9 +2136,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             }
         }
 
-        await this.onShowPostLoginScreen().catch((e) => {
-            logger.error("Exception showing post-login screen", e);
-        });
+        this.onShowPostLoginScreen();
     };
 
     private getFragmentAfterLogin(): string {
@@ -2102,7 +2174,16 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         } else if (this.state.view === Views.COMPLETE_SECURITY) {
             view = <CompleteSecurity onFinished={this.onCompleteSecurityE2eSetupFinished} />;
         } else if (this.state.view === Views.E2E_SETUP) {
-            view = <E2eSetup onFinished={this.onCompleteSecurityE2eSetupFinished} />;
+            view = <E2eSetup onCancelled={this.onCompleteSecurityE2eSetupFinished} />;
+        } else if (this.state.view === Views.PENDING_CLIENT_START) {
+            // we think we are logged in, but are still waiting for the /sync to complete
+            view = (
+                <LoginSplashView
+                    matrixClient={MatrixClientPeg.safeGet()}
+                    onLogoutClick={this.onLogoutClick}
+                    syncError={this.state.syncError}
+                />
+            );
         } else if (this.state.view === Views.LOGGED_IN) {
             // `ready` and `view==LOGGED_IN` may be set before `page_type` (because the
             // latter is set via the dispatcher). If we don't yet have a `page_type`,
@@ -2193,9 +2274,11 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
         return (
             <ErrorBoundary>
-                <SDKContext.Provider value={this.stores}>
-                    <TooltipProvider>{view}</TooltipProvider>
-                </SDKContext.Provider>
+                <I18nContext.Provider value={ModuleApi.instance.i18n}>
+                    <SDKContext.Provider value={this.stores}>
+                        <TooltipProvider>{view}</TooltipProvider>
+                    </SDKContext.Provider>
+                </I18nContext.Provider>
             </ErrorBoundary>
         );
     }
diff --git a/src/components/structures/MessagePanel.tsx b/src/components/structures/MessagePanel.tsx
index 2441182bc8..30f9b474a6 100644
--- a/src/components/structures/MessagePanel.tsx
+++ b/src/components/structures/MessagePanel.tsx
@@ -39,7 +39,6 @@ import ScrollPanel, { type IScrollState } from "./ScrollPanel";
 import DateSeparator from "../views/messages/DateSeparator";
 import TimelineSeparator, { SeparatorKind } from "../views/messages/TimelineSeparator";
 import ErrorBoundary from "../views/elements/ErrorBoundary";
-import type ResizeNotifier from "../../utils/ResizeNotifier";
 import Spinner from "../views/elements/Spinner";
 import { type RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
 import type EditorStateTransfer from "../../utils/EditorStateTransfer";
@@ -167,7 +166,6 @@ interface IProps {
     // which layout to use
     layout?: Layout;
 
-    resizeNotifier?: ResizeNotifier;
     permalinkCreator?: RoomPermalinkCreator;
     editState?: EditorStateTransfer;
 
@@ -1064,7 +1062,6 @@ export default class MessagePanel extends React.Component<IProps, IState> {
                     onUnfillRequest={this.props.onUnfillRequest}
                     style={style}
                     stickyBottom={this.props.stickyBottom}
-                    resizeNotifier={this.props.resizeNotifier}
                     fixedChildren={ircResizer}
                 >
                     {topSpinner}
diff --git a/src/components/structures/PipContainer.tsx b/src/components/structures/PipContainer.tsx
index e46267c149..9dbb6daef7 100644
--- a/src/components/structures/PipContainer.tsx
+++ b/src/components/structures/PipContainer.tsx
@@ -9,7 +9,6 @@ Please see LICENSE files in the repository root for full details.
 import React, { type RefObject, type ReactNode, useRef } from "react";
 import { CallEvent, CallState, type MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 import { logger } from "matrix-js-sdk/src/logger";
-import { type Optional } from "matrix-events-sdk";
 
 import LegacyCallView from "../views/voip/LegacyCallView";
 import LegacyCallHandler, { LegacyCallHandlerEvent } from "../../LegacyCallHandler";
@@ -57,7 +56,7 @@ interface IState {
 // (which should be a single element) of other calls.
 // The primary will be the one not on hold, or an arbitrary one
 // if they're all on hold)
-function getPrimarySecondaryCallsForPip(roomId: Optional<string>): [MatrixCall | null, MatrixCall[]] {
+function getPrimarySecondaryCallsForPip(roomId: string | null): [MatrixCall | null, MatrixCall[]] {
     if (!roomId) return [null, []];
 
     const calls = LegacyCallHandler.instance.getAllActiveCallsForPip(roomId);
@@ -245,6 +244,7 @@ class PipContainerInner extends React.Component<IProps, IState> {
                     secondaryCall={this.state.secondaryCall}
                     pipMode={pipMode}
                     onResize={onResize}
+                    sidebarShown={false}
                 />
             ));
         }
diff --git a/src/components/structures/ReleaseAnnouncement.tsx b/src/components/structures/ReleaseAnnouncement.tsx
index da41b3c1dd..5a9eea2d68 100644
--- a/src/components/structures/ReleaseAnnouncement.tsx
+++ b/src/components/structures/ReleaseAnnouncement.tsx
@@ -12,8 +12,10 @@ import { ReleaseAnnouncement as ReleaseAnnouncementCompound } from "@vector-im/c
 import { ReleaseAnnouncementStore, type Feature } from "../../stores/ReleaseAnnouncementStore";
 import { useIsReleaseAnnouncementOpen } from "../../hooks/useIsReleaseAnnouncementOpen";
 
-interface ReleaseAnnouncementProps
-    extends Omit<ComponentProps<typeof ReleaseAnnouncementCompound>, "open" | "onClick"> {
+interface ReleaseAnnouncementProps extends Omit<
+    ComponentProps<typeof ReleaseAnnouncementCompound>,
+    "open" | "onClick"
+> {
     feature: Feature;
 }
 
diff --git a/src/components/structures/RightPanel.tsx b/src/components/structures/RightPanel.tsx
index 94a5d34d60..24c1655455 100644
--- a/src/components/structures/RightPanel.tsx
+++ b/src/components/structures/RightPanel.tsx
@@ -215,9 +215,7 @@ export default class RightPanel extends React.Component<Props, IState> {
                 break;
             case RightPanelPhases.FilePanel:
                 if (!!roomId) {
-                    card = (
-                        <FilePanel roomId={roomId} resizeNotifier={this.props.resizeNotifier} onClose={this.onClose} />
-                    );
+                    card = <FilePanel roomId={roomId} onClose={this.onClose} />;
                 }
                 break;
 
diff --git a/src/components/structures/RoomSearch.tsx b/src/components/structures/RoomSearch.tsx
index 2130f4fa21..4c8329b6dd 100644
--- a/src/components/structures/RoomSearch.tsx
+++ b/src/components/structures/RoomSearch.tsx
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import classNames from "classnames";
 import React from "react";
+import { SearchIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { ALTERNATE_KEY_NAME } from "../../accessibility/KeyboardShortcuts";
 import defaultDispatcher from "../../dispatcher/dispatcher";
@@ -34,8 +35,6 @@ export default class RoomSearch extends React.PureComponent<IProps> {
             "mx_RoomSearch_spotlightTrigger",
         );
 
-        const icon = <div className="mx_RoomSearch_icon" />;
-
         const shortcutPrompt = (
             <kbd className="mx_RoomSearch_shortcutPrompt">
                 {IS_MAC ? "⌘ K" : _t(ALTERNATE_KEY_NAME[Key.CONTROL]) + " K"}
@@ -44,7 +43,7 @@ export default class RoomSearch extends React.PureComponent<IProps> {
 
         return (
             <AccessibleButton onClick={this.openSpotlight} className={classes} aria-label={_t("action|search")}>
-                {icon}
+                <SearchIcon className="mx_RoomSearch_icon" />
                 {!this.props.isMinimized && (
                     <div className="mx_RoomSearch_spotlightTriggerText">{_t("action|search")}</div>
                 )}
diff --git a/src/components/structures/RoomSearchView.tsx b/src/components/structures/RoomSearchView.tsx
index c4d4f30b05..f19c0e0dc5 100644
--- a/src/components/structures/RoomSearchView.tsx
+++ b/src/components/structures/RoomSearchView.tsx
@@ -14,6 +14,7 @@ import {
     THREAD_RELATION_TYPE,
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
+import { SearchIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import ScrollPanel from "./ScrollPanel";
 import Spinner from "../views/elements/Spinner";
@@ -21,7 +22,6 @@ import { _t } from "../../languageHandler";
 import { haveRendererForEvent } from "../../events/EventTileFactory";
 import SearchResultTile from "../views/rooms/SearchResultTile";
 import { searchPagination, SearchScope } from "../../Searching";
-import type ResizeNotifier from "../../utils/ResizeNotifier";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import { RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
 import { useScopedRoomContext } from "../../contexts/ScopedRoomContext.tsx";
@@ -41,7 +41,6 @@ interface Props {
     inProgress: boolean;
     promise: Promise<ISearchResults>;
     abortController?: AbortController;
-    resizeNotifier: ResizeNotifier;
     className: string;
     onUpdate(inProgress: boolean, results: ISearchResults | null, error: Error | null): void;
     ref?: Ref<ScrollPanel>;
@@ -54,7 +53,6 @@ export const RoomSearchView = ({
     scope,
     promise,
     abortController,
-    resizeNotifier,
     className,
     onUpdate,
     inProgress,
@@ -156,7 +154,9 @@ export const RoomSearchView = ({
             <div
                 className="mx_RoomView_messagePanel mx_RoomView_messagePanelSearchSpinner"
                 data-testid="messagePanelSearchSpinner"
-            />
+            >
+                <SearchIcon />
+            </div>
         );
     }
 
@@ -309,7 +309,6 @@ export const RoomSearchView = ({
             ref={onRef}
             className={"mx_RoomView_searchResultsPanel " + className}
             onFillRequest={onSearchResultsFillRequest}
-            resizeNotifier={resizeNotifier}
         >
             <li className="mx_RoomView_scrollheader" />
             {ret}
diff --git a/src/components/structures/RoomStatusBar.tsx b/src/components/structures/RoomStatusBar.tsx
index 4793f1a65b..d9889342b1 100644
--- a/src/components/structures/RoomStatusBar.tsx
+++ b/src/components/structures/RoomStatusBar.tsx
@@ -17,7 +17,7 @@ import {
     type SyncState,
     type SyncStateData,
 } from "matrix-js-sdk/src/matrix";
-import { WarningIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
+import { RestartIcon, WarningIcon, DeleteIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t, _td } from "../../languageHandler";
 import Resend from "../../Resend";
@@ -187,8 +187,8 @@ export default class RoomStatusBar extends React.PureComponent<IProps, IState> {
         // if it's a resource limit exceeded error: those are shown in the top bar.
         const errorIsMauError = Boolean(
             this.state.syncStateData &&
-                this.state.syncStateData.error &&
-                this.state.syncStateData.error.name === "M_RESOURCE_LIMIT_EXCEEDED",
+            this.state.syncStateData.error &&
+            this.state.syncStateData.error.name === "M_RESOURCE_LIMIT_EXCEEDED",
         );
         return this.state.syncState === "ERROR" && !errorIsMauError;
     }
@@ -237,10 +237,12 @@ export default class RoomStatusBar extends React.PureComponent<IProps, IState> {
 
         let buttonRow = (
             <>
-                <AccessibleButton onClick={this.onCancelAllClick} className="mx_RoomStatusBar_unsentCancelAllBtn">
+                <AccessibleButton onClick={this.onCancelAllClick}>
+                    <DeleteIcon />
                     {_t("room|status_bar|delete_all")}
                 </AccessibleButton>
                 <AccessibleButton onClick={this.onResendAllClick} className="mx_RoomStatusBar_unsentRetry">
+                    <RestartIcon />
                     {_t("room|status_bar|retry_all")}
                 </AccessibleButton>
             </>
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index fbff50bd01..997d86e0dc 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -44,6 +44,8 @@ import { type CallState, type MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 import { debounce, throttle } from "lodash";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto-api";
 import { type ViewRoomOpts } from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle";
+import { type RoomViewProps } from "@element-hq/element-web-module-api";
+import { RestartIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import shouldHideEvent from "../../shouldHideEvent";
 import { _t } from "../../languageHandler";
@@ -133,6 +135,8 @@ import { PinnedMessageBanner } from "../views/rooms/PinnedMessageBanner";
 import { ScopedRoomContextProvider, useScopedRoomContext } from "../../contexts/ScopedRoomContext";
 import { DeclineAndBlockInviteDialog } from "../views/dialogs/DeclineAndBlockInviteDialog";
 import { type FocusMessageSearchPayload } from "../../dispatcher/payloads/FocusMessageSearchPayload.ts";
+import { isRoomEncrypted } from "../../hooks/useIsEncrypted";
+import { type RoomViewStore } from "../../stores/RoomViewStore.tsx";
 
 const DEBUG = false;
 const PREVENT_MULTIPLE_JITSI_WITHIN = 30_000;
@@ -146,17 +150,54 @@ if (DEBUG) {
     debuglog = logger.log.bind(console);
 }
 
-interface IRoomProps {
+interface IRoomProps extends RoomViewProps {
     threepidInvite?: IThreepidInvite;
     oobData?: IOOBData;
 
-    resizeNotifier: ResizeNotifier;
     justCreatedOpts?: IOpts;
 
     forceTimeline?: boolean; // should we force access to the timeline, overriding (for eg) spaces
 
     // Called with the credentials of a registered user (if they were a ROU that transitioned to PWLU)
     onRegistered?(credentials: IMatrixClientCreds): void;
+
+    /**
+     * Only necessary if RoomView should get it's RoomViewStore through the MultiRoomViewStore.
+     * Omitting this will mean that RoomView renders for the room held in SDKContext.RoomViewStore.
+     */
+    roomId?: string;
+
+    /*
+     * If true, hide the header
+     */
+    hideHeader?: boolean;
+
+    /*
+     * If true, hide the composer
+     */
+    hideComposer?: boolean;
+
+    /*
+     * If true, hide the right panel
+     */
+    hideRightPanel?: boolean;
+
+    /**
+     * If true, hide the pinned messages banner
+     */
+    hidePinnedMessageBanner?: boolean;
+
+    /**
+     * If true, hide the widgets
+     */
+    hideWidgets?: boolean;
+
+    /**
+     * If true, enable sending read receipts and markers on user activity in the room view. When the user interacts with the room view, read receipts and markers are sent.
+     * If false, the read receipts and markers are only send when the room view is focused. The user has to focus the room view in order to clear any unreads and to move the unread marker to the bottom of the view.
+     * @default true
+     */
+    enableReadReceiptsAndMarkersOnActivity?: boolean;
 }
 
 export { MainSplitContentType };
@@ -257,6 +298,7 @@ interface LocalRoomViewProps {
     roomView: RefObject<HTMLElement | null>;
     onFileDrop: (dataTransfer: DataTransfer) => Promise<void>;
     mainSplitContentType: MainSplitContentType;
+    e2eStatus?: E2EStatus;
 }
 
 /**
@@ -289,7 +331,8 @@ function LocalRoomView(props: LocalRoomViewProps): ReactElement {
 
     if (room.isError) {
         const buttons = (
-            <AccessibleButton onClick={onRetryClicked} className="mx_RoomStatusBar_unsentRetry">
+            <AccessibleButton onClick={onRetryClicked}>
+                <RestartIcon />
                 {_t("action|retry")}
             </AccessibleButton>
         );
@@ -304,6 +347,7 @@ function LocalRoomView(props: LocalRoomViewProps): ReactElement {
     } else {
         composer = (
             <MessageComposer
+                e2eStatus={props.e2eStatus}
                 room={props.localRoom}
                 resizeNotifier={props.resizeNotifier}
                 permalinkCreator={props.permalinkCreator}
@@ -315,10 +359,10 @@ function LocalRoomView(props: LocalRoomViewProps): ReactElement {
         <div className="mx_RoomView mx_RoomView--local">
             <ErrorBoundary>
                 <RoomHeader room={room} />
-                <main className="mx_RoomView_body" ref={props.roomView}>
-                    <FileDropTarget parent={props.roomView.current} onFileDrop={props.onFileDrop} />
+                <main className="mx_RoomView_body" ref={props.roomView} aria-label={_t("room|room_content")}>
+                    <FileDropTarget parent={props.roomView.current} onFileDrop={props.onFileDrop} room={room} />
                     <div className="mx_RoomView_timeline">
-                        <ScrollPanel className="mx_RoomView_messagePanel" resizeNotifier={props.resizeNotifier}>
+                        <ScrollPanel className="mx_RoomView_messagePanel">
                             {encryptionTile}
                             <NewRoomIntro />
                         </ScrollPanel>
@@ -334,7 +378,6 @@ function LocalRoomView(props: LocalRoomViewProps): ReactElement {
 interface ILocalRoomCreateLoaderProps {
     localRoom: LocalRoom;
     names: string;
-    resizeNotifier: ResizeNotifier;
     mainSplitContentType: MainSplitContentType;
 }
 
@@ -370,14 +413,24 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
     private unmounted = false;
     private permalinkCreators: Record<string, RoomPermalinkCreator> = {};
 
+    // The userId from which we received this invite.
+    // Only populated if the membership of our user is invite.
+    private inviter?: string;
+
     private roomView = createRef<HTMLDivElement>();
     private searchResultsPanel = createRef<ScrollPanel>();
     private messagePanel: TimelinePanel | null = null;
     private roomViewBody = createRef<HTMLDivElement>();
 
+    private roomViewStore: RoomViewStore;
+
     public static contextType = SDKContext;
     declare public context: React.ContextType<typeof SDKContext>;
 
+    public static readonly defaultProps = {
+        enableReadReceiptsAndMarkersOnActivity: true,
+    };
+
     public constructor(props: IRoomProps, context: React.ContextType<typeof SDKContext>) {
         super(props, context);
 
@@ -387,6 +440,12 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             throw new Error("Unable to create RoomView without MatrixClient");
         }
 
+        if (props.roomId) {
+            this.roomViewStore = this.context.multiRoomViewStore.getRoomViewStoreForRoom(props.roomId);
+        } else {
+            this.roomViewStore = context.roomViewStore;
+        }
+
         const llMembers = context.client.hasLazyLoadMembersEnabled();
         this.state = {
             roomId: undefined,
@@ -520,7 +579,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
     };
 
     private getMainSplitContentType = (room: Room): MainSplitContentType => {
-        if (this.context.roomViewStore.isViewingCall() || isVideoRoom(room)) {
+        if (this.roomViewStore.isViewingCall() || isVideoRoom(room)) {
             return MainSplitContentType.Call;
         }
         if (this.context.widgetLayoutStore.hasMaximisedWidget(room)) {
@@ -534,8 +593,8 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             return;
         }
 
-        const roomLoadError = this.context.roomViewStore.getRoomLoadError() ?? undefined;
-        if (!initial && !roomLoadError && this.state.roomId !== this.context.roomViewStore.getRoomId()) {
+        const roomLoadError = this.roomViewStore.getRoomLoadError() ?? undefined;
+        if (!initial && !roomLoadError && this.state.roomId !== this.roomViewStore.getRoomId()) {
             // RoomView explicitly does not support changing what room
             // is being viewed: instead it should just be re-mounted when
             // switching rooms. Therefore, if the room ID changes, we
@@ -549,30 +608,38 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             // it was, it means we're about to be unmounted.
             return;
         }
-
-        const roomId = this.context.roomViewStore.getRoomId() ?? null;
+        const roomViewStore = this.roomViewStore;
+        const roomId = roomViewStore.getRoomId() ?? null;
+        const roomAlias = roomViewStore.getRoomAlias() ?? undefined;
+        const roomLoading = roomViewStore.isRoomLoading();
+        const joining = roomViewStore.isJoining();
+        const replyToEvent = roomViewStore.getQuotingEvent() ?? undefined;
+        const shouldPeek = this.state.matrixClientIsReady && roomViewStore.shouldPeek();
+        const wasContextSwitch = roomViewStore.getWasContextSwitch();
+        const promptAskToJoin = roomViewStore.promptAskToJoin();
+        const viewRoomOpts = roomViewStore.getViewRoomOpts();
         const room = this.context.client?.getRoom(roomId ?? undefined) ?? undefined;
 
         const newState: Partial<IRoomState> = {
             roomId: roomId ?? undefined,
-            roomAlias: this.context.roomViewStore.getRoomAlias() ?? undefined,
-            roomLoading: this.context.roomViewStore.isRoomLoading(),
+            roomAlias: roomAlias,
+            roomLoading: roomLoading,
             roomLoadError,
-            joining: this.context.roomViewStore.isJoining(),
-            replyToEvent: this.context.roomViewStore.getQuotingEvent() ?? undefined,
+            joining: joining,
+            replyToEvent: replyToEvent,
             // we should only peek once we have a ready client
-            shouldPeek: this.state.matrixClientIsReady && this.context.roomViewStore.shouldPeek(),
+            shouldPeek: shouldPeek,
             showReadReceipts: SettingsStore.getValue("showReadReceipts", roomId),
             showRedactions: SettingsStore.getValue("showRedactions", roomId),
             showJoinLeaves: SettingsStore.getValue("showJoinLeaves", roomId),
             showAvatarChanges: SettingsStore.getValue("showAvatarChanges", roomId),
             showDisplaynameChanges: SettingsStore.getValue("showDisplaynameChanges", roomId),
-            wasContextSwitch: this.context.roomViewStore.getWasContextSwitch(),
+            wasContextSwitch: wasContextSwitch,
             mainSplitContentType: room ? this.getMainSplitContentType(room) : undefined,
             initialEventId: undefined, // default to clearing this, will get set later in the method if needed
             showRightPanel: roomId ? this.context.rightPanelStore.isOpenForRoom(roomId) : false,
-            promptAskToJoin: this.context.roomViewStore.promptAskToJoin(),
-            viewRoomOpts: this.context.roomViewStore.getViewRoomOpts(),
+            promptAskToJoin: promptAskToJoin,
+            viewRoomOpts: viewRoomOpts,
         };
 
         if (
@@ -588,7 +655,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             newState.showRightPanel = false;
         }
 
-        const initialEventId = this.context.roomViewStore.getInitialEventId() ?? this.state.initialEventId;
+        const initialEventId = this.roomViewStore.getInitialEventId() ?? this.state.initialEventId;
         if (initialEventId) {
             let initialEvent = room?.findEventById(initialEventId);
             // The event does not exist in the current sync data
@@ -614,13 +681,13 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                     action: Action.ShowThread,
                     rootEvent: thread.rootEvent,
                     initialEvent,
-                    highlighted: this.context.roomViewStore.isInitialEventHighlighted(),
-                    scroll_into_view: this.context.roomViewStore.initialEventScrollIntoView(),
+                    highlighted: this.roomViewStore.isInitialEventHighlighted(),
+                    scroll_into_view: this.roomViewStore.initialEventScrollIntoView(),
                 });
             } else {
                 newState.initialEventId = initialEventId;
-                newState.isInitialEventHighlighted = this.context.roomViewStore.isInitialEventHighlighted();
-                newState.initialEventScrollIntoView = this.context.roomViewStore.initialEventScrollIntoView();
+                newState.isInitialEventHighlighted = this.roomViewStore.isInitialEventHighlighted();
+                newState.initialEventScrollIntoView = this.roomViewStore.initialEventScrollIntoView();
             }
         }
 
@@ -848,6 +915,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
     private shouldShowApps(room: Room): boolean {
         if (!BROWSER_SUPPORTS_SANDBOX || !room) return false;
+        if (this.props.hideWidgets) return false;
 
         // Check if user has previously chosen to hide the app drawer for this
         // room. If so, do not show apps
@@ -880,14 +948,14 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             this.context.client.on(MatrixEventEvent.Decrypted, this.onEventDecrypted);
         }
         // Start listening for RoomViewStore updates
-        this.context.roomViewStore.on(UPDATE_EVENT, this.onRoomViewStoreUpdate);
+        this.roomViewStore.on(UPDATE_EVENT, this.onRoomViewStoreUpdate);
 
         this.context.rightPanelStore.on(UPDATE_EVENT, this.onRightPanelStoreUpdate);
 
         WidgetEchoStore.on(UPDATE_EVENT, this.onWidgetEchoStoreUpdate);
         this.context.widgetStore.on(UPDATE_EVENT, this.onWidgetStoreUpdate);
 
-        this.props.resizeNotifier.on("isResizing", this.onIsResizing);
+        this.context.resizeNotifier.on("isResizing", this.onIsResizing);
 
         this.settingWatchers = [
             SettingsStore.watchSetting("layout", null, (...[, , , value]) =>
@@ -997,13 +1065,13 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
         window.removeEventListener("beforeunload", this.onPageUnload);
 
-        this.context.roomViewStore.off(UPDATE_EVENT, this.onRoomViewStoreUpdate);
+        this.roomViewStore.off(UPDATE_EVENT, this.onRoomViewStoreUpdate);
 
         this.context.rightPanelStore.off(UPDATE_EVENT, this.onRightPanelStoreUpdate);
         WidgetEchoStore.removeListener(UPDATE_EVENT, this.onWidgetEchoStoreUpdate);
         this.context.widgetStore.removeListener(UPDATE_EVENT, this.onWidgetStoreUpdate);
 
-        this.props.resizeNotifier.off("isResizing", this.onIsResizing);
+        this.context.resizeNotifier.off("isResizing", this.onIsResizing);
 
         if (this.state.room) {
             this.context.widgetLayoutStore.off(
@@ -1025,6 +1093,8 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             // clean up if this was a local room
             this.context.client?.store.removeRoom(this.state.room.roomId);
         }
+
+        if (this.props.roomId) this.context.multiRoomViewStore.removeRoomViewStore(this.props.roomId);
     }
 
     private onRightPanelStoreUpdate = (): void => {
@@ -1105,6 +1175,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                         [payload.file],
                         roomId,
                         undefined,
+                        this.state.replyToEvent,
                         this.context.client,
                     );
                 }
@@ -1155,7 +1226,13 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             case Action.EditEvent: {
                 // Quit early if we're trying to edit events in wrong rendering context
                 if (payload.timelineRenderingType !== this.state.timelineRenderingType) return;
-                if (payload.event && payload.event.getRoomId() !== this.state.roomId) {
+
+                const roomId: string | undefined = payload.event?.getRoomId();
+
+                if (payload.event && roomId !== this.state.roomId) {
+                    // if the room is displayed in a module, we don't want to change the room view
+                    if (roomId && this.roomViewStore.isRoomDisplayedInModule(roomId)) return;
+
                     // If the event is in a different room (e.g. because the event to be edited is being displayed
                     // in the results of an all-rooms search), we need to view that room first.
                     defaultDispatcher.dispatch<ViewRoomPayload>({
@@ -1350,6 +1427,11 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
     // after a successful peek, or after we join the room).
     private onRoomLoaded = (room: Room): void => {
         if (this.unmounted) return;
+
+        // Store the inviter so that we can know who invited us to this room even if
+        // the membership event changes.
+        this.inviter = this.getInviterFromRoom(room);
+
         // Attach a widget store listener only when we get a room
         this.context.widgetLayoutStore.on(WidgetLayoutStore.emissionForRoom(room), this.onWidgetLayoutChange);
 
@@ -1388,10 +1470,13 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
     }
 
     private async getIsRoomEncrypted(roomId = this.state.roomId): Promise<boolean> {
-        const crypto = this.context.client?.getCrypto();
-        if (!crypto || !roomId) return false;
+        if (!roomId) return false;
 
-        return await crypto.isEncryptionEnabledInRoom(roomId);
+        const room = this.context.client?.getRoom(roomId);
+        const crypto = this.context.client?.getCrypto();
+        if (!room || !crypto) return false;
+
+        return isRoomEncrypted(room, crypto);
     }
 
     private async calculateRecommendedVersion(room: Room): Promise<void> {
@@ -1729,8 +1814,20 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         });
     };
 
+    private getInviterFromRoom(room: Room): string | undefined {
+        const ownUserId = this.context.client?.getSafeUserId();
+        if (!ownUserId) return;
+
+        const myMember = room.getMember(ownUserId);
+        const memberEvent = myMember?.events.member;
+        const senderId = memberEvent?.getSender();
+
+        if (memberEvent?.getContent().membership === KnownMembership.Invite) return senderId;
+    }
+
     private onDeclineAndBlockButtonClicked = async (): Promise<void> => {
         if (!this.state.room || !this.context.client) return;
+
         const [shouldReject, ignoreUser, reportRoom] = await Modal.createDialog(DeclineAndBlockInviteDialog, {
             roomName: this.state.room.name,
         }).finished;
@@ -1745,11 +1842,20 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         const actions: Promise<unknown>[] = [];
 
         if (ignoreUser) {
-            const myMember = this.state.room.getMember(this.context.client!.getSafeUserId());
-            const inviteEvent = myMember!.events.member;
-            const ignoredUsers = this.context.client.getIgnoredUsers();
-            ignoredUsers.push(inviteEvent!.getSender()!); // de-duped internally in the js-sdk
-            actions.push(this.context.client.setIgnoredUsers(ignoredUsers));
+            const doIgnore = async (): Promise<void> => {
+                const ownUserId = this.context.client!.getSafeUserId();
+                if (!this.inviter || this.inviter === ownUserId) {
+                    // This is unlikely to happen since we cache the inviter as early as possible.
+                    // However, we still do this check here to be double sure.
+                    throw new CannotDetermineUserError(
+                        "Cannot determine which user to ignore since the member event has changed.",
+                    );
+                }
+                const ignoredUsers = this.context.client!.getIgnoredUsers();
+                ignoredUsers.push(this.inviter); // de-duped internally in the js-sdk
+                await this.context.client!.setIgnoredUsers(ignoredUsers);
+            };
+            actions.push(doIgnore());
         }
 
         if (reportRoom !== false) {
@@ -1766,7 +1872,14 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         } catch (error) {
             logger.error(`Failed to reject invite: ${error}`);
 
-            const msg = error instanceof Error ? error.message : JSON.stringify(error);
+            let msg: string = "";
+            if (error instanceof CannotDetermineUserError) {
+                msg = _t("room|failed_determine_user");
+            } else if (error instanceof Error) {
+                msg = error.message;
+            } else {
+                msg = JSON.stringify(error);
+            }
             Modal.createDialog(ErrorDialog, {
                 title: _t("room|failed_reject_invite"),
                 description: msg,
@@ -1783,6 +1896,9 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             return;
         }
         try {
+            this.setState({
+                rejecting: true,
+            });
             await this.context.client.leave(this.state.room.roomId);
             defaultDispatcher.dispatch({ action: Action.ViewHomePage });
             this.setState({
@@ -1985,6 +2101,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             Array.from(dataTransfer.files),
             roomId,
             undefined,
+            this.state.replyToEvent,
             this.context.client,
             TimelineRenderingType.Room,
         );
@@ -2006,11 +2123,10 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         if (!this.state.room || !this.context?.client) return null;
         const names = this.state.room.getDefaultRoomName(this.context.client.getSafeUserId());
         return (
-            <ScopedRoomContextProvider {...this.state}>
+            <ScopedRoomContextProvider {...this.state} roomViewStore={this.roomViewStore}>
                 <LocalRoomCreateLoader
                     localRoom={localRoom}
                     names={names}
-                    resizeNotifier={this.props.resizeNotifier}
                     mainSplitContentType={this.state.mainSplitContentType}
                 />
             </ScopedRoomContextProvider>
@@ -2019,10 +2135,11 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
     private renderLocalRoomView(localRoom: LocalRoom): ReactNode {
         return (
-            <ScopedRoomContextProvider {...this.state}>
+            <ScopedRoomContextProvider {...this.state} roomViewStore={this.roomViewStore}>
                 <LocalRoomView
+                    e2eStatus={this.state.e2eStatus}
                     localRoom={localRoom}
-                    resizeNotifier={this.props.resizeNotifier}
+                    resizeNotifier={this.context.resizeNotifier}
                     permalinkCreator={this.permalinkCreator}
                     roomView={this.roomView}
                     onFileDrop={this.onFileDrop}
@@ -2034,9 +2151,9 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
     private renderWaitingForThirdPartyRoomView(inviteEvent: MatrixEvent): ReactNode {
         return (
-            <ScopedRoomContextProvider {...this.state}>
+            <ScopedRoomContextProvider {...this.state} roomViewStore={this.roomViewStore}>
                 <WaitingForThirdPartyRoomView
-                    resizeNotifier={this.props.resizeNotifier}
+                    resizeNotifier={this.context.resizeNotifier}
                     roomView={this.roomView}
                     inviteEvent={inviteEvent}
                 />
@@ -2078,6 +2195,19 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         }
     };
 
+    /**
+     * Handles the focus event on the RoomView component.
+     *
+     * Sends read receipts and updates the read marker if the
+     * disableReadReceiptsAndMarkersOnActivity prop is set.
+     */
+    private onFocus = (): void => {
+        if (this.props.enableReadReceiptsAndMarkersOnActivity) return;
+
+        this.messagePanel?.sendReadReceipts();
+        this.messagePanel?.updateReadMarker();
+    };
+
     public render(): ReactNode {
         if (!this.context.client) return null;
         const { isRoomEncrypted } = this.state;
@@ -2355,7 +2485,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 <SpaceRoomView
                     space={this.state.room}
                     justCreatedOpts={this.props.justCreatedOpts}
-                    resizeNotifier={this.props.resizeNotifier}
+                    resizeNotifier={this.context.resizeNotifier}
                     permalinkCreator={this.permalinkCreator}
                     onJoinButtonClicked={this.onJoinButtonClicked}
                     onRejectButtonClicked={
@@ -2372,22 +2502,18 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 room={this.state.room}
                 userId={this.context.client.getSafeUserId()}
                 showApps={this.state.showApps}
-                resizeNotifier={this.props.resizeNotifier}
             >
                 {aux}
             </AuxPanel>
         );
 
-        const pinnedMessageBanner = (
-            <PinnedMessageBanner
-                room={this.state.room}
-                permalinkCreator={this.permalinkCreator}
-                resizeNotifier={this.props.resizeNotifier}
-            />
+        const pinnedMessageBanner = !this.props.hidePinnedMessageBanner && (
+            <PinnedMessageBanner room={this.state.room} permalinkCreator={this.permalinkCreator} />
         );
 
         let messageComposer;
         const showComposer =
+            !this.props.hideComposer &&
             !isRoomEncryptionLoading &&
             // joined and not showing search results
             myMembership === KnownMembership.Join &&
@@ -2397,7 +2523,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 <MessageComposer
                     room={this.state.room}
                     e2eStatus={this.state.e2eStatus}
-                    resizeNotifier={this.props.resizeNotifier}
+                    resizeNotifier={this.context.resizeNotifier}
                     replyToEvent={this.state.replyToEvent}
                     permalinkCreator={this.permalinkCreator}
                 />
@@ -2419,7 +2545,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                     promise={this.state.search.promise}
                     abortController={this.state.search.abortController}
                     inProgress={!!this.state.search.inProgress}
-                    resizeNotifier={this.props.resizeNotifier}
                     className={this.messagePanelClassNames}
                     onUpdate={this.onSearchUpdate}
                 />
@@ -2440,7 +2565,9 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                     timelineSet={this.state.room.getUnfilteredTimelineSet()}
                     showReadReceipts={this.state.showReadReceipts}
                     manageReadReceipts={!this.state.isPeeking}
-                    sendReadReceiptOnLoad={!this.state.wasContextSwitch}
+                    sendReadReceiptOnLoad={
+                        !this.state.wasContextSwitch && this.props.enableReadReceiptsAndMarkersOnActivity
+                    }
                     manageReadMarkers={!this.state.isPeeking}
                     hidden={hideMessagePanel}
                     highlightedEventId={highlightedEventId}
@@ -2454,10 +2581,10 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                     className={this.messagePanelClassNames}
                     membersLoaded={this.state.membersLoaded}
                     permalinkCreator={this.permalinkCreator}
-                    resizeNotifier={this.props.resizeNotifier}
                     showReactions={true}
                     layout={this.state.layout}
                     editState={this.state.editState}
+                    enableReadReceiptsAndMarkersOnActivity={this.props.enableReadReceiptsAndMarkersOnActivity}
                 />
             );
         }
@@ -2481,12 +2608,13 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             );
         }
 
-        const showRightPanel = !isRoomEncryptionLoading && this.state.room && this.state.showRightPanel;
+        const showRightPanel =
+            !this.props.hideRightPanel && !isRoomEncryptionLoading && this.state.room && this.state.showRightPanel;
 
         const rightPanel = showRightPanel ? (
             <RightPanel
                 room={this.state.room}
-                resizeNotifier={this.props.resizeNotifier}
+                resizeNotifier={this.context.resizeNotifier}
                 permalinkCreator={this.permalinkCreator}
                 e2eStatus={this.state.e2eStatus}
                 onSearchChange={this.onSearchChange}
@@ -2523,8 +2651,12 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                         <Measured sensor={this.roomViewBody} onMeasurement={this.onMeasurement} />
                         {auxPanel}
                         {pinnedMessageBanner}
-                        <main className={timelineClasses}>
-                            <FileDropTarget parent={this.roomView.current} onFileDrop={this.onFileDrop} />
+                        <main className={timelineClasses} data-testid="timeline">
+                            <FileDropTarget
+                                parent={this.roomView.current}
+                                onFileDrop={this.onFileDrop}
+                                room={this.state.room}
+                            />
                             {topUnreadMessagesBar}
                             {jumpToBottom}
                             {messagePanel}
@@ -2543,7 +2675,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                         <AppsDrawer
                             room={this.state.room}
                             userId={this.context.client.getSafeUserId()}
-                            resizeNotifier={this.props.resizeNotifier}
                             showApps={true}
                             role="main"
                         />
@@ -2558,7 +2689,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                         <CallView
                             room={this.state.room}
                             resizing={this.state.resizing}
-                            skipLobby={this.context.roomViewStore.skipCallLobby() ?? false}
                             role="main"
                             onClose={this.onCallClose}
                         />
@@ -2581,15 +2711,20 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         }
 
         return (
-            <ScopedRoomContextProvider {...this.state}>
-                <div className={mainClasses} ref={this.roomView} onKeyDown={this.onReactKeyDown}>
+            <ScopedRoomContextProvider {...this.state} roomViewStore={this.roomViewStore}>
+                <div
+                    className={mainClasses}
+                    ref={this.roomView}
+                    onKeyDown={this.onReactKeyDown}
+                    onFocus={this.onFocus}
+                    tabIndex={-1}
+                >
                     {showChatEffects && this.roomView.current && (
                         <EffectsOverlay roomWidth={this.roomView.current.offsetWidth} />
                     )}
                     <ErrorBoundary>
                         <MainSplit
                             panel={rightPanel}
-                            resizeNotifier={this.props.resizeNotifier}
                             sizeKey={sizeKey}
                             defaultSize={defaultSize}
                             analyticsRoomType={analyticsRoomType}
@@ -2599,10 +2734,12 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                                 ref={this.roomViewBody}
                                 data-layout={this.state.layout}
                             >
-                                <RoomHeader
-                                    room={this.state.room}
-                                    additionalButtons={this.state.viewRoomOpts.buttons}
-                                />
+                                {!this.props.hideHeader && (
+                                    <RoomHeader
+                                        room={this.state.room}
+                                        additionalButtons={this.state.viewRoomOpts.buttons}
+                                    />
+                                )}
                                 {mainSplitBody}
                             </div>
                         </MainSplit>
@@ -2612,3 +2749,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         );
     }
 }
+
+class CannotDetermineUserError extends Error {
+    public name = "CannotDetermineUserError";
+}
diff --git a/src/components/structures/ScrollPanel.tsx b/src/components/structures/ScrollPanel.tsx
index a92b24fc55..e206fc3c70 100644
--- a/src/components/structures/ScrollPanel.tsx
+++ b/src/components/structures/ScrollPanel.tsx
@@ -13,8 +13,8 @@ import SettingsStore from "../../settings/SettingsStore";
 import Timer from "../../utils/Timer";
 import AutoHideScrollbar from "./AutoHideScrollbar";
 import { getKeyBindingsManager } from "../../KeyBindingsManager";
-import type ResizeNotifier from "../../utils/ResizeNotifier";
 import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
+import { SDKContext } from "../../contexts/SDKContext";
 
 // The amount of extra scroll distance to allow prior to unfilling.
 // See getExcessHeight.
@@ -58,10 +58,6 @@ interface IProps {
      */
     style?: CSSProperties;
 
-    /* resizeNotifier: ResizeNotifier to know when middle column has changed size
-     */
-    resizeNotifier?: ResizeNotifier;
-
     /* fixedChildren: allows for children to be passed which are rendered outside
      * of the wrapper
      */
@@ -188,15 +184,18 @@ export default class ScrollPanel extends React.Component<IProps> {
     private heightUpdateInProgress = false;
     public divScroll: HTMLDivElement | null = null;
 
-    public constructor(props: IProps) {
-        super(props);
+    public static contextType = SDKContext;
+    declare public context: React.ContextType<typeof SDKContext>;
+
+    public constructor(props: IProps, context: React.ContextType<typeof SDKContext>) {
+        super(props, context);
 
         this.resetScrollState();
     }
 
     public componentDidMount(): void {
         this.unmounted = false;
-        this.props.resizeNotifier?.on("middlePanelResizedNoisy", this.onResize);
+        this.context?.resizeNotifier?.on("middlePanelResizedNoisy", this.onResize);
         this.checkScroll();
     }
 
@@ -217,14 +216,14 @@ export default class ScrollPanel extends React.Component<IProps> {
         // (We could use isMounted(), but facebook have deprecated that.)
         this.unmounted = true;
 
-        this.props.resizeNotifier?.removeListener("middlePanelResizedNoisy", this.onResize);
+        this.context?.resizeNotifier?.removeListener("middlePanelResizedNoisy", this.onResize);
 
         this.divScroll = null;
     }
 
     private onScroll = (ev: Event): void => {
         // skip scroll events caused by resizing
-        if (this.props.resizeNotifier && this.props.resizeNotifier.isResizing) return;
+        if (this.context?.resizeNotifier && this.context.resizeNotifier.isResizing) return;
         debuglog("onScroll called past resize gate; scroll node top:", this.getScrollNode().scrollTop);
         this.scrollTimeout?.restart();
         this.saveScrollState();
diff --git a/src/components/structures/SearchBox.tsx b/src/components/structures/SearchBox.tsx
index ec85314349..4f9c840cb6 100644
--- a/src/components/structures/SearchBox.tsx
+++ b/src/components/structures/SearchBox.tsx
@@ -10,6 +10,7 @@ Please see LICENSE files in the repository root for full details.
 import React, { createRef, type HTMLProps } from "react";
 import { throttle } from "lodash";
 import classNames from "classnames";
+import { CloseIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import AccessibleButton from "../../components/views/elements/AccessibleButton";
 import { getKeyBindingsManager } from "../../KeyBindingsManager";
@@ -124,7 +125,9 @@ export default class SearchBox extends React.Component<IProps, IState> {
                     onClick={() => {
                         this.clearSearch("button");
                     }}
-                />
+                >
+                    <CloseIcon />
+                </AccessibleButton>
             ) : undefined;
 
         // show a shorter placeholder when blurred, if requested
diff --git a/src/components/structures/SpaceHierarchy.tsx b/src/components/structures/SpaceHierarchy.tsx
index 0d41e56c92..e2b05c54f1 100644
--- a/src/components/structures/SpaceHierarchy.tsx
+++ b/src/components/structures/SpaceHierarchy.tsx
@@ -32,7 +32,6 @@ import {
     RoomType,
     GuestAccess,
     HistoryVisibility,
-    type HierarchyRelation,
     type HierarchyRoom,
     JoinRule,
 } from "matrix-js-sdk/src/matrix";
@@ -41,6 +40,7 @@ import classNames from "classnames";
 import { sortBy, uniqBy } from "lodash";
 import { logger } from "matrix-js-sdk/src/logger";
 import { KnownMembership, type SpaceChildEventContent } from "matrix-js-sdk/src/types";
+import { ChevronDownIcon, CheckIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import defaultDispatcher from "../../dispatcher/dispatcher";
 import { _t } from "../../languageHandler";
@@ -68,9 +68,11 @@ import { type JoinRoomReadyPayload } from "../../dispatcher/payloads/JoinRoomRea
 import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
 import { getKeyBindingsManager } from "../../KeyBindingsManager";
 import { getTopic } from "../../hooks/room/useTopic";
-import { SdkContextClass } from "../../contexts/SDKContext";
 import { getDisplayAliasForAliasSet } from "../../Rooms";
 import SettingsStore from "../../settings/SettingsStore";
+import { filterBoolean } from "../../utils/arrays.ts";
+import { type RoomViewStore } from "../../stores/RoomViewStore.tsx";
+import RoomContext from "../../contexts/RoomContext.ts";
 
 interface IProps {
     space: Room;
@@ -148,7 +150,7 @@ const Tile: React.FC<ITileProps> = ({
                 tabIndex={isActive ? 0 : -1}
                 title={_t("space|joining_space")}
             >
-                <Spinner w={24} h={24} />
+                <Spinner size={24} />
             </AccessibleButton>
         );
     } else if (joinedRoom || room.join_rule === JoinRule.Knock) {
@@ -250,7 +252,12 @@ const Tile: React.FC<ITileProps> = ({
 
     let joinedSection: ReactElement | undefined;
     if (joinedRoom) {
-        joinedSection = <div className="mx_SpaceHierarchy_roomTile_joined">{_t("common|joined")}</div>;
+        joinedSection = (
+            <div className="mx_SpaceHierarchy_roomTile_joined">
+                <CheckIcon />
+                {_t("common|joined")}
+            </div>
+        );
     }
 
     let suggestedSection: ReactElement | undefined;
@@ -293,7 +300,9 @@ const Tile: React.FC<ITileProps> = ({
                     ev.stopPropagation();
                     toggleShowChildren();
                 }}
-            />
+            >
+                <ChevronDownIcon />
+            </div>
         );
 
         if (showChildren) {
@@ -404,7 +413,20 @@ export const showRoom = (cli: MatrixClient, hierarchy: RoomHierarchy, roomId: st
     });
 };
 
-export const joinRoom = async (cli: MatrixClient, hierarchy: RoomHierarchy, roomId: string): Promise<unknown> => {
+/**
+ * Join a room.
+ * @param cli The Matrix client
+ * @param roomViewStore The RoomViewStore instance
+ * @param hierarchy The RoomHierarchy instance
+ * @param roomId The ID of the room to join
+ * @returns A promise that resolves when the room has been joined
+ */
+export const joinRoom = async (
+    cli: MatrixClient,
+    roomViewStore: RoomViewStore,
+    hierarchy: RoomHierarchy,
+    roomId: string,
+): Promise<unknown> => {
     // Don't let the user view a room they won't be able to either peek or join:
     // fail earlier so they don't have to click back to the directory.
     if (cli.isGuest()) {
@@ -418,10 +440,10 @@ export const joinRoom = async (cli: MatrixClient, hierarchy: RoomHierarchy, room
         });
     } catch (err: unknown) {
         if (err instanceof MatrixError) {
-            SdkContextClass.instance.roomViewStore.showJoinRoomError(err, roomId);
+            roomViewStore.showJoinRoomError(err, roomId);
         } else {
             logger.warn("Got a non-MatrixError while joining room", err);
-            SdkContextClass.instance.roomViewStore.showJoinRoomError(
+            roomViewStore.showJoinRoomError(
                 new MatrixError({
                     error: _t("error|unknown"),
                 }),
@@ -504,68 +526,67 @@ export const HierarchyLevel: React.FC<IHierarchyLevelProps> = ({
     const space = cli.getRoom(root.room_id);
     const hasPermissions = space?.currentState.maySendStateEvent(EventType.SpaceChild, cli.getSafeUserId());
 
-    const sortedChildren = sortBy(root.children_state, (ev) => {
-        return getChildOrder(ev.content.order, ev.origin_server_ts, ev.state_key);
-    });
-
-    const [subspaces, childRooms] = sortedChildren.reduce(
-        (result, ev: HierarchyRelation) => {
-            const room = hierarchy.roomMap.get(ev.state_key);
-            if (room && roomSet.has(room)) {
-                result[room.room_type === RoomType.Space ? 0 : 1].push(toLocalRoom(cli, room, hierarchy));
-            }
-            return result;
-        },
-        [[] as HierarchyRoom[], [] as HierarchyRoom[]],
+    const sortedChildren = filterBoolean(
+        sortBy(root.children_state, (ev) => {
+            return getChildOrder(ev.content.order, ev.origin_server_ts, ev.state_key);
+        }).map((ev) => {
+            const hierarchyRoom = hierarchy.roomMap.get(ev.state_key);
+            if (!hierarchyRoom || !roomSet.has(hierarchyRoom)) return null;
+            // Find the most up-to-date info for this room, if it has been upgraded and we know about it.
+            return toLocalRoom(cli, hierarchyRoom, hierarchy);
+        }),
     );
 
     const newParents = new Set(parents).add(root.room_id);
     return (
         <React.Fragment>
-            {uniqBy(childRooms, "room_id").map((room) => (
-                <Tile
-                    key={room.room_id}
-                    room={room}
-                    suggested={hierarchy.isSuggested(root.room_id, room.room_id)}
-                    selected={selectedMap?.get(root.room_id)?.has(room.room_id)}
-                    onViewRoomClick={() => onViewRoomClick(room.room_id, room.room_type as RoomType)}
-                    onJoinRoomClick={() => onJoinRoomClick(room.room_id, newParents)}
-                    hasPermissions={hasPermissions}
-                    onToggleClick={onToggleClick ? () => onToggleClick(root.room_id, room.room_id) : undefined}
-                />
-            ))}
-
-            {subspaces
-                .filter((room) => !newParents.has(room.room_id))
-                .map((space) => (
-                    <Tile
-                        key={space.room_id}
-                        room={space}
-                        numChildRooms={
-                            space.children_state.filter((ev) => {
-                                const room = hierarchy.roomMap.get(ev.state_key);
-                                return room && roomSet.has(room) && !room.room_type;
-                            }).length
-                        }
-                        suggested={hierarchy.isSuggested(root.room_id, space.room_id)}
-                        selected={selectedMap?.get(root.room_id)?.has(space.room_id)}
-                        onViewRoomClick={() => onViewRoomClick(space.room_id, RoomType.Space)}
-                        onJoinRoomClick={() => onJoinRoomClick(space.room_id, newParents)}
-                        hasPermissions={hasPermissions}
-                        onToggleClick={onToggleClick ? () => onToggleClick(root.room_id, space.room_id) : undefined}
-                    >
-                        <HierarchyLevel
-                            root={space}
-                            roomSet={roomSet}
-                            hierarchy={hierarchy}
-                            parents={newParents}
-                            selectedMap={selectedMap}
-                            onViewRoomClick={onViewRoomClick}
-                            onJoinRoomClick={onJoinRoomClick}
-                            onToggleClick={onToggleClick}
+            {uniqBy(sortedChildren, "room_id").map((room) => {
+                if (room.room_type !== RoomType.Space) {
+                    return (
+                        <Tile
+                            key={room.room_id}
+                            room={room}
+                            suggested={hierarchy.isSuggested(root.room_id, room.room_id)}
+                            selected={selectedMap?.get(root.room_id)?.has(room.room_id)}
+                            onViewRoomClick={() => onViewRoomClick(room.room_id, room.room_type as RoomType)}
+                            onJoinRoomClick={() => onJoinRoomClick(room.room_id, newParents)}
+                            hasPermissions={hasPermissions}
+                            onToggleClick={onToggleClick ? () => onToggleClick(root.room_id, room.room_id) : undefined}
                         />
-                    </Tile>
-                ))}
+                    );
+                } else {
+                    if (newParents.has(room.room_id)) return null; // prevent cycles
+                    return (
+                        <Tile
+                            key={room.room_id}
+                            room={room}
+                            numChildRooms={
+                                room.children_state.filter((ev) => {
+                                    const child = hierarchy.roomMap.get(ev.state_key);
+                                    return child && roomSet.has(child) && !child.room_type;
+                                }).length
+                            }
+                            suggested={hierarchy.isSuggested(root.room_id, room.room_id)}
+                            selected={selectedMap?.get(root.room_id)?.has(room.room_id)}
+                            onViewRoomClick={() => onViewRoomClick(room.room_id, RoomType.Space)}
+                            onJoinRoomClick={() => onJoinRoomClick(room.room_id, newParents)}
+                            hasPermissions={hasPermissions}
+                            onToggleClick={onToggleClick ? () => onToggleClick(root.room_id, room.room_id) : undefined}
+                        >
+                            <HierarchyLevel
+                                root={room}
+                                roomSet={roomSet}
+                                hierarchy={hierarchy}
+                                parents={newParents}
+                                selectedMap={selectedMap}
+                                onViewRoomClick={onViewRoomClick}
+                                onJoinRoomClick={onJoinRoomClick}
+                                onToggleClick={onToggleClick}
+                            />
+                        </Tile>
+                    );
+                }
+            })}
         </React.Fragment>
     );
 };
@@ -762,6 +783,7 @@ const ManageButtons: React.FC<IManageButtonsProps> = ({ hierarchy, selected, set
 
 const SpaceHierarchy: React.FC<IProps> = ({ space, initialText = "", showRoom, additionalButtons }) => {
     const cli = useContext(MatrixClientContext);
+    const roomContext = useContext(RoomContext);
     const [query, setQuery] = useState(initialText);
 
     const [selected, setSelected] = useState(new Map<string, Set<string>>()); // Map<parentId, Set<childId>>
@@ -856,10 +878,10 @@ const SpaceHierarchy: React.FC<IProps> = ({ space, initialText = "", showRoom, a
                                     onJoinRoomClick={async (roomId, parents) => {
                                         for (const parent of parents) {
                                             if (cli.getRoom(parent)?.getMyMembership() !== KnownMembership.Join) {
-                                                await joinRoom(cli, hierarchy, parent);
+                                                await joinRoom(cli, roomContext.roomViewStore, hierarchy, parent);
                                             }
                                         }
-                                        await joinRoom(cli, hierarchy, roomId);
+                                        await joinRoom(cli, roomContext.roomViewStore, hierarchy, roomId);
                                     }}
                                 />
                             </>
diff --git a/src/components/structures/SpacePillButton.tsx b/src/components/structures/SpacePillButton.tsx
new file mode 100644
index 0000000000..0093e2911b
--- /dev/null
+++ b/src/components/structures/SpacePillButton.tsx
@@ -0,0 +1,27 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React, { type JSX } from "react";
+
+import AccessibleButton from "../views/elements/AccessibleButton";
+
+const SpacePillButton: React.FC<{
+    title: string;
+    icon: JSX.Element;
+    description: string;
+    onClick(): void;
+}> = ({ title, icon, description, onClick }) => {
+    return (
+        <AccessibleButton className="mx_SpacePillButton" onClick={onClick}>
+            {icon}
+            {title}
+            <div>{description}</div>
+        </AccessibleButton>
+    );
+};
+
+export default SpacePillButton;
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 59ec657b02..1df95439d4 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -10,6 +10,12 @@ import { EventType, RoomType, JoinRule, Preset, type Room, RoomEvent } from "mat
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 import React, { type JSX, useCallback, useContext, useRef, useState } from "react";
+import {
+    GroupIcon,
+    PlusIcon,
+    RoomIcon,
+    UserProfileSolidIcon,
+} from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import createRoom, { type IOpts } from "../../createRoom";
@@ -66,6 +72,8 @@ import MainSplit from "./MainSplit";
 import RightPanel from "./RightPanel";
 import SpaceHierarchy, { showRoom } from "./SpaceHierarchy";
 import { type RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
+import { Icon as HashVideoIcon } from "../../../res/img/element-icons/roomlist/hash-video.svg";
+import SpacePillButton from "./SpacePillButton.tsx";
 
 interface IProps {
     space: Room;
@@ -117,7 +125,7 @@ const SpaceLandingAddButton: React.FC<{ space: Room }> = ({ space }) => {
                         <>
                             <IconizedContextMenuOption
                                 label={_t("action|new_room")}
-                                iconClassName="mx_LegacyRoomList_iconNewRoom"
+                                icon={<PlusIcon />}
                                 onClick={async (e): Promise<void> => {
                                     e.preventDefault();
                                     e.stopPropagation();
@@ -132,7 +140,7 @@ const SpaceLandingAddButton: React.FC<{ space: Room }> = ({ space }) => {
                             {videoRoomsEnabled && (
                                 <IconizedContextMenuOption
                                     label={_t("action|new_video_room")}
-                                    iconClassName="mx_LegacyRoomList_iconNewVideoRoom"
+                                    icon={<HashVideoIcon />}
                                     onClick={async (e): Promise<void> => {
                                         e.preventDefault();
                                         e.stopPropagation();
@@ -157,7 +165,7 @@ const SpaceLandingAddButton: React.FC<{ space: Room }> = ({ space }) => {
                     )}
                     <IconizedContextMenuOption
                         label={_t("action|add_existing_room")}
-                        iconClassName="mx_LegacyRoomList_iconAddExistingRoom"
+                        icon={<RoomIcon />}
                         onClick={(e) => {
                             e.preventDefault();
                             e.stopPropagation();
@@ -168,7 +176,7 @@ const SpaceLandingAddButton: React.FC<{ space: Room }> = ({ space }) => {
                     {canCreateSpace && (
                         <IconizedContextMenuOption
                             label={_t("room_list|add_space_label")}
-                            iconClassName="mx_LegacyRoomList_iconPlus"
+                            icon={<PlusIcon />}
                             onClick={(e) => {
                                 e.preventDefault();
                                 e.stopPropagation();
@@ -329,8 +337,8 @@ const SpaceSetupFirstRooms: React.FC<{
                     return createRoom(space.client, {
                         createOpts: {
                             preset: isPublic ? Preset.PublicChat : Preset.PrivateChat,
-                            name,
                         },
+                        name,
                         spinner: false,
                         encryption: false,
                         andView: false,
@@ -423,7 +431,7 @@ const SpaceSetupPublicShare: React.FC<ISpaceSetupPublicShareProps> = ({
         <div className="mx_SpaceRoomView_publicShare">
             <h1>
                 {_t("create_space|share_heading", {
-                    name: justCreatedOpts?.createOpts?.name || space.name,
+                    name: justCreatedOpts?.name || space.name,
                 })}
             </h1>
             <div className="mx_SpaceRoomView_description">{_t("create_space|share_description")}</div>
@@ -449,28 +457,26 @@ const SpaceSetupPrivateScope: React.FC<{
             <h1>{_t("create_space|private_personal_heading")}</h1>
             <div className="mx_SpaceRoomView_description">
                 {_t("create_space|private_personal_description", {
-                    name: justCreatedOpts?.createOpts?.name || space.name,
+                    name: justCreatedOpts?.name || space.name,
                 })}
             </div>
 
-            <AccessibleButton
-                className="mx_SpaceRoomView_privateScope_justMeButton"
+            <SpacePillButton
+                icon={<UserProfileSolidIcon />}
+                title={_t("create_space|personal_space")}
+                description={_t("create_space|personal_space_description")}
                 onClick={() => {
                     onFinished(false);
                 }}
-            >
-                {_t("create_space|personal_space")}
-                <div>{_t("create_space|personal_space_description")}</div>
-            </AccessibleButton>
-            <AccessibleButton
-                className="mx_SpaceRoomView_privateScope_meAndMyTeammatesButton"
+            />
+            <SpacePillButton
+                icon={<GroupIcon />}
+                title={_t("create_space|private_space")}
+                description={_t("create_space|private_space_description")}
                 onClick={() => {
                     onFinished(true);
                 }}
-            >
-                {_t("create_space|private_space")}
-                <div>{_t("create_space|private_space_description")}</div>
-            </AccessibleButton>
+            />
         </div>
     );
 };
@@ -686,7 +692,7 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
                     <SpaceSetupFirstRooms
                         space={this.props.space}
                         title={_t("create_space|setup_rooms_community_heading", {
-                            spaceName: this.props.justCreatedOpts?.createOpts?.name || this.props.space.name,
+                            spaceName: this.props.justCreatedOpts?.name || this.props.space.name,
                         })}
                         description={
                             <>
@@ -763,7 +769,7 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
         return (
             <main className="mx_SpaceRoomView">
                 <ErrorBoundary>
-                    <MainSplit panel={rightPanel} resizeNotifier={this.props.resizeNotifier} analyticsRoomType="space">
+                    <MainSplit panel={rightPanel} analyticsRoomType="space">
                         {this.renderBody()}
                     </MainSplit>
                 </ErrorBoundary>
diff --git a/src/components/structures/TabbedView.tsx b/src/components/structures/TabbedView.tsx
index b01f160551..7b11b92e9c 100644
--- a/src/components/structures/TabbedView.tsx
+++ b/src/components/structures/TabbedView.tsx
@@ -26,16 +26,18 @@ export class Tab<T extends string> {
      * Creates a new tab.
      * @param {string} id The tab's ID.
      * @param {string} label The untranslated tab label.
-     * @param {string|JSX.Element} icon An SVG element to use for the tab icon. Can also be a string for legacy icons, in which case it is the class for the tab icon. This should be a simple mask.
+     * @param {string|JSX.Element} icon An SVG element to use for the tab icon.
      * @param {JSX.Element} body The JSX for the tab container.
      * @param {string} screenName The screen name to report to Posthog.
+     * @param {string} labelClassName Additional class to add to the tab label.
      */
     public constructor(
         public readonly id: T,
         public readonly label: TranslationKey,
-        public readonly icon: string | JSX.Element | null,
+        public readonly icon: JSX.Element | null,
         public readonly body: JSX.Element,
         public readonly screenName?: ScreenName,
+        public readonly labelClassName?: string,
     ) {}
 }
 
@@ -85,7 +87,7 @@ interface ITabLabelProps<T extends string> {
 }
 
 function TabLabel<T extends string>({ tab, isActive, showToolip, onClick }: ITabLabelProps<T>): JSX.Element {
-    const classes = classNames("mx_TabbedView_tabLabel", {
+    const classes = classNames("mx_TabbedView_tabLabel", tab.labelClassName, {
         mx_TabbedView_tabLabel_active: isActive,
     });
 
diff --git a/src/components/structures/ThreadPanel.tsx b/src/components/structures/ThreadPanel.tsx
index 892dc82c75..61386574ea 100644
--- a/src/components/structures/ThreadPanel.tsx
+++ b/src/components/structures/ThreadPanel.tsx
@@ -6,12 +6,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { type Optional } from "matrix-events-sdk";
 import React, { useContext, useEffect, useRef, useState } from "react";
 import { type EventTimelineSet, type Room, Thread } from "matrix-js-sdk/src/matrix";
 import { IconButton, Tooltip } from "@vector-im/compound-web";
 import { logger } from "matrix-js-sdk/src/logger";
-import ThreadsIcon from "@vector-im/compound-design-tokens/assets/web/icons/threads";
+import { ThreadsIcon, CheckIcon, ChevronDownIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { Icon as MarkAllThreadsReadIcon } from "../../../res/img/element-icons/check-all.svg";
 import BaseCard from "../views/right_panel/BaseCard";
@@ -58,6 +57,7 @@ export const ThreadPanelHeaderFilterOptionItem: React.FC<
 > = ({ label, description, onClick, isSelected }) => {
     return (
         <MenuItemRadio active={isSelected} className="mx_ThreadPanel_Header_FilterOptionItem" onClick={onClick}>
+            {isSelected ? <CheckIcon /> : null}
             <span>{label}</span>
             <span>{description}</span>
         </MenuItemRadio>
@@ -146,6 +146,7 @@ export const ThreadPanelHeader: React.FC<{
                 }}
             >
                 {`${_t("threads|show_thread_filter")} ${value?.label}`}
+                <ChevronDownIcon />
             </ContextMenuButton>
             {contextMenu}
         </div>
@@ -163,14 +164,13 @@ const ThreadPanel: React.FC<IProps> = ({ roomId, onClose, permalinkCreator }) =>
     const [room, setRoom] = useState<Room | null>(null);
     const [narrow, setNarrow] = useState<boolean>(false);
 
-    const timelineSet: Optional<EventTimelineSet> =
+    const timelineSet: EventTimelineSet | undefined =
         filterOption === ThreadFilterType.My ? room?.threadsTimelineSets[1] : room?.threadsTimelineSets[0];
     const hasThreads = Boolean(room?.threadsTimelineSets?.[0]?.getLiveTimeline()?.getEvents()?.length);
 
     useEffect(() => {
         const room = mxClient.getRoom(roomId);
-        room
-            ?.createThreadsTimelineSets()
+        room?.createThreadsTimelineSets()
             .then(() => room.fetchRoomThreads())
             .then(() => {
                 setFilterOption(ThreadFilterType.All);
diff --git a/src/components/structures/ThreadView.tsx b/src/components/structures/ThreadView.tsx
index c1c4b3ff57..8ddbbf6367 100644
--- a/src/components/structures/ThreadView.tsx
+++ b/src/components/structures/ThreadView.tsx
@@ -49,7 +49,6 @@ import { type ButtonEvent } from "../views/elements/AccessibleButton";
 import Spinner from "../views/elements/Spinner";
 import { type ComposerInsertPayload, ComposerType } from "../../dispatcher/payloads/ComposerInsertPayload";
 import Heading from "../views/typography/Heading";
-import { SdkContextClass } from "../../contexts/SDKContext";
 import { type ThreadPayload } from "../../dispatcher/payloads/ThreadPayload";
 import { ScopedRoomContextProvider } from "../../contexts/ScopedRoomContext.tsx";
 
@@ -124,7 +123,7 @@ export default class ThreadView extends React.Component<IProps, IState> {
         const roomId = this.props.mxEvent.getRoomId();
         SettingsStore.unwatchSetting(this.layoutWatcherRef);
 
-        const hasRoomChanged = SdkContextClass.instance.roomViewStore.getRoomId() !== roomId;
+        const hasRoomChanged = this.context.roomViewStore.getRoomId() !== roomId;
         if (this.props.initialEvent && !hasRoomChanged) {
             dis.dispatch<ViewRoomPayload>({
                 action: Action.ViewRoom,
@@ -334,6 +333,7 @@ export default class ThreadView extends React.Component<IProps, IState> {
                 Array.from(dataTransfer.files),
                 roomId,
                 this.threadRelation,
+                this.context.replyToEvent,
                 MatrixClientPeg.safeGet(),
                 TimelineRenderingType.Thread,
             );
@@ -388,7 +388,7 @@ export default class ThreadView extends React.Component<IProps, IState> {
 
             timeline = (
                 <>
-                    <FileDropTarget parent={this.card.current} onFileDrop={this.onFileDrop} />
+                    <FileDropTarget parent={this.card.current} onFileDrop={this.onFileDrop} room={this.props.room} />
                     <TimelinePanel
                         key={this.state.thread.id}
                         ref={this.timelinePanel}
diff --git a/src/components/structures/TimelinePanel.tsx b/src/components/structures/TimelinePanel.tsx
index 8346a0ab31..665ca6f677 100644
--- a/src/components/structures/TimelinePanel.tsx
+++ b/src/components/structures/TimelinePanel.tsx
@@ -47,7 +47,6 @@ import shouldHideEvent from "../../shouldHideEvent";
 import MessagePanel from "./MessagePanel";
 import { type IScrollState } from "./ScrollPanel";
 import { type ActionPayload } from "../../dispatcher/payloads";
-import type ResizeNotifier from "../../utils/ResizeNotifier";
 import { type RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
 import Spinner from "../views/elements/Spinner";
 import type EditorStateTransfer from "../../utils/EditorStateTransfer";
@@ -123,7 +122,6 @@ interface IProps {
     // whether to always show timestamps for an event
     alwaysShowTimestamps?: boolean;
 
-    resizeNotifier?: ResizeNotifier;
     editState?: EditorStateTransfer;
     permalinkCreator?: RoomPermalinkCreator;
     membersLoaded?: boolean;
@@ -141,6 +139,12 @@ interface IProps {
 
     hideThreadedMessages?: boolean;
     disableGrouping?: boolean;
+
+    /**
+     * Enable updating the read receipts and markers on user activity.
+     * @default true
+     */
+    enableReadReceiptsAndMarkersOnActivity?: boolean;
 }
 
 interface IState {
@@ -230,6 +234,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
         sendReadReceiptOnLoad: true,
         hideThreadedMessages: true,
         disableGrouping: false,
+        enableReadReceiptsAndMarkersOnActivity: true,
     };
 
     private lastRRSentEventId: string | null | undefined = undefined;
@@ -304,10 +309,10 @@ class TimelinePanel extends React.Component<IProps, IState> {
 
         this.props.timelineSet.room?.on(ThreadEvent.Update, this.onThreadUpdate);
 
-        if (this.props.manageReadReceipts) {
+        if (this.props.manageReadReceipts && this.props.enableReadReceiptsAndMarkersOnActivity) {
             this.updateReadReceiptOnUserActivity();
         }
-        if (this.props.manageReadMarkers) {
+        if (this.props.manageReadMarkers && this.props.enableReadReceiptsAndMarkersOnActivity) {
             this.updateReadMarkerOnUserActivity();
         }
         this.initTimeline(this.props);
@@ -1030,7 +1035,10 @@ class TimelinePanel extends React.Component<IProps, IState> {
         );
     }
 
-    private sendReadReceipts = async (): Promise<void> => {
+    /**
+     * Sends read receipts and fully read markers as appropriate.
+     */
+    public sendReadReceipts = async (): Promise<void> => {
         if (SettingsStore.getValue("lowBandwidth")) return;
         if (!this.messagePanel.current) return;
         if (!this.props.manageReadReceipts) return;
@@ -1136,9 +1144,12 @@ class TimelinePanel extends React.Component<IProps, IState> {
         }
     }
 
-    // if the read marker is on the screen, we can now assume we've caught up to the end
-    // of the screen, so move the marker down to the bottom of the screen.
-    private updateReadMarker = async (): Promise<void> => {
+    /**
+     * Move the marker to the bottom of the screen.
+     * If the read marker is on the screen, we can now assume we've caught up to the end
+     * of the screen, so move the marker down to the bottom of the screen.
+     */
+    public updateReadMarker = async (): Promise<void> => {
         if (!this.props.manageReadMarkers) return;
         if (this.getReadMarkerPosition() === 1) {
             // the read marker is at an event below the viewport,
@@ -1849,7 +1860,6 @@ class TimelinePanel extends React.Component<IProps, IState> {
                     this.state.alwaysShowTimestamps
                 }
                 className={this.props.className}
-                resizeNotifier={this.props.resizeNotifier}
                 getRelationsForEvent={this.getRelationsForEvent}
                 editState={this.props.editState}
                 showReactions={this.props.showReactions}
diff --git a/src/components/structures/ToastContainer.tsx b/src/components/structures/ToastContainer.tsx
index 649cd1dc59..a84af5a504 100644
--- a/src/components/structures/ToastContainer.tsx
+++ b/src/components/structures/ToastContainer.tsx
@@ -53,8 +53,7 @@ export default class ToastContainer extends React.Component<EmptyObject, IState>
             const { title, icon, key, component, className, bodyClassName, props } = topToast;
             const bodyClasses = classNames("mx_Toast_body", bodyClassName);
             const toastClasses = classNames("mx_Toast_toast", className, {
-                mx_Toast_hasIcon: icon,
-                [`mx_Toast_icon_${icon}`]: icon,
+                mx_Toast_hasIcon: !!icon,
             });
             const toastProps = Object.assign({}, props, {
                 key,
@@ -81,6 +80,7 @@ export default class ToastContainer extends React.Component<EmptyObject, IState>
 
             toast = (
                 <div className={toastClasses}>
+                    {icon}
                     {titleElement}
                     <div className={bodyClasses}>{content}</div>
                 </div>
diff --git a/src/components/structures/UploadBar.tsx b/src/components/structures/UploadBar.tsx
index a28ff2ba44..4fbe35f3fd 100644
--- a/src/components/structures/UploadBar.tsx
+++ b/src/components/structures/UploadBar.tsx
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import { type Room, type IEventRelation } from "matrix-js-sdk/src/matrix";
-import { type Optional } from "matrix-events-sdk";
+import { CloseIcon, ShareIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import ContentMessages from "../../ContentMessages";
 import dis from "../../dispatcher/dispatcher";
@@ -45,7 +45,7 @@ function isUploadPayload(payload: ActionPayload): payload is UploadPayload {
 }
 
 export default class UploadBar extends React.PureComponent<IProps, IState> {
-    private dispatcherRef: Optional<string>;
+    private dispatcherRef?: string;
     private unmounted = false;
 
     public constructor(props: IProps) {
@@ -115,10 +115,13 @@ export default class UploadBar extends React.PureComponent<IProps, IState> {
         const uploadSize = fileSize(this.state.currentTotal!);
         return (
             <div className="mx_UploadBar">
+                <ShareIcon />
                 <div className="mx_UploadBar_filename">
                     {uploadText} ({uploadSize})
                 </div>
-                <AccessibleButton onClick={this.onCancelClick} className="mx_UploadBar_cancel" />
+                <AccessibleButton onClick={this.onCancelClick} className="mx_UploadBar_cancel">
+                    <CloseIcon />
+                </AccessibleButton>
                 <ProgressBar value={this.state.currentLoaded!} max={this.state.currentTotal!} />
             </div>
         );
diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx
index 67af61f7ac..249a5f456b 100644
--- a/src/components/structures/UserMenu.tsx
+++ b/src/components/structures/UserMenu.tsx
@@ -8,6 +8,14 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type JSX, createRef, type ReactNode } from "react";
 import { type Room } from "matrix-js-sdk/src/matrix";
+import {
+    ChatSolidIcon,
+    HomeSolidIcon,
+    LockSolidIcon,
+    QrCodeIcon,
+    SettingsSolidIcon,
+    LeaveIcon,
+} from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 import defaultDispatcher from "../../dispatcher/dispatcher";
@@ -42,7 +50,8 @@ import PosthogTrackers from "../../PosthogTrackers";
 import { type ViewHomePagePayload } from "../../dispatcher/payloads/ViewHomePagePayload";
 import { SDKContext } from "../../contexts/SDKContext";
 import { shouldShowFeedback } from "../../utils/Feedback";
-import DarkLightModeSvg from "../../../res/img/element-icons/roomlist/dark-light-mode.svg";
+import { Icon as DarkLightModeSvg } from "../../../res/img/element-icons/roomlist/dark-light-mode.svg";
+import { Icon as NotificationsIcon } from "../../../res/img/element-icons/notifications.svg";
 
 interface IProps {
     isPanelCollapsed: boolean;
@@ -297,7 +306,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
         if (this.hasHomePage) {
             homeButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_UserMenu_iconHome"
+                    icon={<HomeSolidIcon />}
                     label={_t("common|home")}
                     onClick={this.onHomeClick}
                 />
@@ -308,7 +317,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
         if (shouldShowFeedback()) {
             feedbackButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_UserMenu_iconMessage"
+                    icon={<ChatSolidIcon />}
                     label={_t("common|feedback")}
                     onClick={this.onProvideFeedback}
                 />
@@ -317,7 +326,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
 
         const linkNewDeviceButton = (
             <IconizedContextMenuOption
-                iconClassName="mx_UserMenu_iconQr"
+                icon={<QrCodeIcon />}
                 label={_t("user_menu|link_new_device")}
                 onClick={(e) => this.onSettingsOpen(e, UserTab.SessionManager, { showMsc4108QrCode: true })}
             />
@@ -328,24 +337,24 @@ export default class UserMenu extends React.Component<IProps, IState> {
                 {homeButton}
                 {linkNewDeviceButton}
                 <IconizedContextMenuOption
-                    iconClassName="mx_UserMenu_iconBell"
+                    icon={<NotificationsIcon />}
                     label={_t("notifications|enable_prompt_toast_title")}
                     onClick={(e) => this.onSettingsOpen(e, UserTab.Notifications)}
                 />
                 <IconizedContextMenuOption
-                    iconClassName="mx_UserMenu_iconLock"
+                    icon={<LockSolidIcon />}
                     label={_t("room_settings|security|title")}
                     onClick={(e) => this.onSettingsOpen(e, UserTab.Security)}
                 />
                 <IconizedContextMenuOption
-                    iconClassName="mx_UserMenu_iconSettings"
+                    icon={<SettingsSolidIcon />}
                     label={_t("user_menu|settings")}
                     onClick={(e) => this.onSettingsOpen(e)}
                 />
                 {feedbackButton}
                 <IconizedContextMenuOption
                     className="mx_IconizedContextMenu_option_red"
-                    iconClassName="mx_UserMenu_iconSignOut"
+                    icon={<LeaveIcon />}
                     label={_t("action|sign_out")}
                     onClick={this.onSignOutClick}
                 />
@@ -357,7 +366,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
                 <IconizedContextMenuOptionList>
                     {homeButton}
                     <IconizedContextMenuOption
-                        iconClassName="mx_UserMenu_iconSettings"
+                        icon={<SettingsSolidIcon />}
                         label={_t("common|settings")}
                         onClick={(e) => this.onSettingsOpen(e)}
                     />
@@ -398,7 +407,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
                                 : _t("user_menu|switch_theme_dark")
                         }
                     >
-                        <img src={DarkLightModeSvg} role="presentation" alt="" width={16} />
+                        <DarkLightModeSvg width="16px" height="16px" />
                     </RovingAccessibleButton>
                 </div>
                 {topSection}
diff --git a/src/components/structures/UserView.tsx b/src/components/structures/UserView.tsx
index 58aed9932b..ded92b6eb9 100644
--- a/src/components/structures/UserView.tsx
+++ b/src/components/structures/UserView.tsx
@@ -87,12 +87,7 @@ export default class UserView extends React.Component<IProps, IState> {
                 />
             );
             return (
-                <MainSplit
-                    panel={panel}
-                    resizeNotifier={this.props.resizeNotifier}
-                    defaultSize={420}
-                    analyticsRoomType="user_profile"
-                >
+                <MainSplit panel={panel} defaultSize={420} analyticsRoomType="user_profile">
                     <HomePage />
                 </MainSplit>
             );
diff --git a/src/components/structures/WaitingForThirdPartyRoomView.tsx b/src/components/structures/WaitingForThirdPartyRoomView.tsx
index 3983b286f1..a02a807c9b 100644
--- a/src/components/structures/WaitingForThirdPartyRoomView.tsx
+++ b/src/components/structures/WaitingForThirdPartyRoomView.tsx
@@ -41,7 +41,7 @@ export const WaitingForThirdPartyRoomView: React.FC<Props> = ({ roomView, resize
                 <RoomHeader room={context.room!} />
                 <main className="mx_RoomView_body" ref={roomView}>
                     <div className="mx_RoomView_timeline">
-                        <ScrollPanel className="mx_RoomView_messagePanel" resizeNotifier={resizeNotifier}>
+                        <ScrollPanel className="mx_RoomView_messagePanel">
                             <EventTileBubble
                                 className="mx_cryptoEvent mx_cryptoEvent_icon"
                                 title={_t("room|waiting_for_join_title", { brand })}
diff --git a/src/components/structures/auth/CompleteSecurity.tsx b/src/components/structures/auth/CompleteSecurity.tsx
index 5bade7b24a..ed3b3d9a20 100644
--- a/src/components/structures/auth/CompleteSecurity.tsx
+++ b/src/components/structures/auth/CompleteSecurity.tsx
@@ -7,14 +7,17 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
+import { Glass } from "@vector-im/compound-web";
 
 import { _t } from "../../../languageHandler";
-import { SetupEncryptionStore, Phase } from "../../../stores/SetupEncryptionStore";
+import { Phase, SetupEncryptionStore } from "../../../stores/SetupEncryptionStore";
 import SetupEncryptionBody from "./SetupEncryptionBody";
 import AccessibleButton from "../../views/elements/AccessibleButton";
 import CompleteSecurityBody from "../../views/auth/CompleteSecurityBody";
 import AuthPage from "../../views/auth/AuthPage";
 import SdkConfig from "../../../SdkConfig";
+import E2EIcon from "../../views/rooms/E2EIcon.tsx";
+import { E2EStatus } from "../../../utils/ShieldUtils.ts";
 
 interface IProps {
     onFinished: () => void;
@@ -22,15 +25,17 @@ interface IProps {
 
 interface IState {
     phase?: Phase;
-    lostKeys: boolean;
 }
 
+/**
+ * Prompts the user to verify their device when they first log in.
+ */
 export default class CompleteSecurity extends React.Component<IProps, IState> {
     public constructor(props: IProps) {
         super(props);
         const store = SetupEncryptionStore.sharedInstance();
         store.start();
-        this.state = { phase: store.phase, lostKeys: store.lostKeys() };
+        this.state = { phase: store.phase };
     }
 
     public componentDidMount(): void {
@@ -40,7 +45,7 @@ export default class CompleteSecurity extends React.Component<IProps, IState> {
 
     private onStoreUpdate = (): void => {
         const store = SetupEncryptionStore.sharedInstance();
-        this.setState({ phase: store.phase, lostKeys: store.lostKeys() });
+        this.setState({ phase: store.phase });
     };
 
     private onSkipClick = (): void => {
@@ -55,28 +60,22 @@ export default class CompleteSecurity extends React.Component<IProps, IState> {
     }
 
     public render(): React.ReactNode {
-        const { phase, lostKeys } = this.state;
+        const { phase } = this.state;
         let icon;
         let title;
 
         if (phase === Phase.Loading) {
             return null;
         } else if (phase === Phase.Intro) {
-            if (lostKeys) {
-                icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
-                title = _t("encryption|verification|after_new_login|unable_to_verify");
-            } else {
-                icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
-                title = _t("encryption|verification|after_new_login|verify_this_device");
-            }
+            // We don't specify an icon nor title since `SetupEncryptionBody` provides its own
         } else if (phase === Phase.Done) {
-            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified" />;
+            icon = <E2EIcon className="mx_CompleteSecurity_headerIcon" status={E2EStatus.Verified} hideTooltip />;
             title = _t("encryption|verification|after_new_login|device_verified");
         } else if (phase === Phase.ConfirmSkip) {
-            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
+            icon = <E2EIcon className="mx_CompleteSecurity_headerIcon" status={E2EStatus.Warning} hideTooltip />;
             title = _t("common|are_you_sure");
         } else if (phase === Phase.Busy) {
-            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
+            icon = <E2EIcon className="mx_CompleteSecurity_headerIcon" status={E2EStatus.Warning} hideTooltip />;
             title = _t("encryption|verification|after_new_login|verify_this_device");
         } else if (phase === Phase.Finished) {
             // SetupEncryptionBody will take care of calling onFinished, we don't need to do anything
@@ -98,17 +97,19 @@ export default class CompleteSecurity extends React.Component<IProps, IState> {
         }
 
         return (
-            <AuthPage>
-                <CompleteSecurityBody>
-                    <h1 className="mx_CompleteSecurity_header">
-                        {icon}
-                        {title}
-                        {skipButton}
-                    </h1>
-                    <div className="mx_CompleteSecurity_body">
-                        <SetupEncryptionBody onFinished={this.props.onFinished} />
-                    </div>
-                </CompleteSecurityBody>
+            <AuthPage addBlur={false}>
+                <Glass className="mx_Dialog_border">
+                    <CompleteSecurityBody>
+                        <h1 className="mx_CompleteSecurity_header">
+                            {icon}
+                            {title}
+                            {skipButton}
+                        </h1>
+                        <div className="mx_CompleteSecurity_body">
+                            <SetupEncryptionBody onFinished={this.props.onFinished} allowLogout={true} />
+                        </div>
+                    </CompleteSecurityBody>
+                </Glass>
             </AuthPage>
         );
     }
diff --git a/src/components/structures/auth/E2eSetup.tsx b/src/components/structures/auth/E2eSetup.tsx
index 0fcacca66a..af3003dd27 100644
--- a/src/components/structures/auth/E2eSetup.tsx
+++ b/src/components/structures/auth/E2eSetup.tsx
@@ -13,15 +13,19 @@ import CompleteSecurityBody from "../../views/auth/CompleteSecurityBody";
 import { InitialCryptoSetupDialog } from "../../views/dialogs/security/InitialCryptoSetupDialog";
 
 interface IProps {
-    onFinished: () => void;
+    /** Callback which is called if the crypto setup failed, and the user clicked the 'cancel' button */
+    onCancelled: () => void;
 }
 
+/**
+ * An {@link AuthPage} which shows the {@link InitialCryptoSetupDialog}.
+ */
 export default class E2eSetup extends React.Component<IProps> {
     public render(): React.ReactNode {
         return (
             <AuthPage>
                 <CompleteSecurityBody>
-                    <InitialCryptoSetupDialog onFinished={this.props.onFinished} />
+                    <InitialCryptoSetupDialog onCancelled={this.props.onCancelled} />
                 </CompleteSecurityBody>
             </AuthPage>
         );
diff --git a/src/components/structures/auth/ForgotPassword.tsx b/src/components/structures/auth/ForgotPassword.tsx
index 171bd955a1..0a5080869b 100644
--- a/src/components/structures/auth/ForgotPassword.tsx
+++ b/src/components/structures/auth/ForgotPassword.tsx
@@ -373,7 +373,7 @@ export default class ForgotPassword extends React.Component<Props, State> {
 
     public renderSetPassword(): JSX.Element {
         const submitButtonChild =
-            this.state.phase === Phase.ResettingPassword ? <Spinner w={16} h={16} /> : _t("auth|reset_password_action");
+            this.state.phase === Phase.ResettingPassword ? <Spinner size={16} /> : _t("auth|reset_password_action");
 
         return (
             <>
diff --git a/src/components/structures/auth/SetupEncryptionBody.tsx b/src/components/structures/auth/SetupEncryptionBody.tsx
index b76a623e2c..22b7a1adb5 100644
--- a/src/components/structures/auth/SetupEncryptionBody.tsx
+++ b/src/components/structures/auth/SetupEncryptionBody.tsx
@@ -9,7 +9,9 @@ Please see LICENSE files in the repository root for full details.
 import React, { type JSX } from "react";
 import { type KeyBackupInfo, type VerificationRequest } from "matrix-js-sdk/src/crypto-api";
 import { logger } from "matrix-js-sdk/src/logger";
-import { type SecretStorageKeyDescription } from "matrix-js-sdk/src/secret-storage";
+import DevicesIcon from "@vector-im/compound-design-tokens/assets/web/icons/devices";
+import LockIcon from "@vector-im/compound-design-tokens/assets/web/icons/lock-solid";
+import { Button } from "@vector-im/compound-web";
 
 import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
@@ -17,25 +19,40 @@ import Modal from "../../../Modal";
 import VerificationRequestDialog from "../../views/dialogs/VerificationRequestDialog";
 import { SetupEncryptionStore, Phase } from "../../../stores/SetupEncryptionStore";
 import EncryptionPanel from "../../views/right_panel/EncryptionPanel";
-import AccessibleButton, { type ButtonEvent } from "../../views/elements/AccessibleButton";
+import AccessibleButton from "../../views/elements/AccessibleButton";
 import Spinner from "../../views/elements/Spinner";
 import { ResetIdentityDialog } from "../../views/dialogs/ResetIdentityDialog";
-
-function keyHasPassphrase(keyInfo: SecretStorageKeyDescription): boolean {
-    return Boolean(keyInfo.passphrase && keyInfo.passphrase.salt && keyInfo.passphrase.iterations);
-}
+import { EncryptionCard } from "../../views/settings/encryption/EncryptionCard";
+import { EncryptionCardButtons } from "../../views/settings/encryption/EncryptionCardButtons";
+import { EncryptionCardEmphasisedContent } from "../../views/settings/encryption/EncryptionCardEmphasisedContent";
+import ExternalLink from "../../views/elements/ExternalLink";
+import dispatcher from "../../../dispatcher/dispatcher";
+import E2EIcon from "../../views/rooms/E2EIcon.tsx";
+import { E2EStatus } from "../../../utils/ShieldUtils.ts";
 
 interface IProps {
     onFinished: () => void;
+    /**
+     * Offer the user an option to log out, instead of setting up encryption.
+     *
+     * This is used when this component is shown when the user is initially
+     * prompted to set up encryption, before the user is shown the main chat
+     * interface.
+     *
+     * Defaults to `false` if omitted.
+     */
+    allowLogout?: boolean;
 }
 
 interface IState {
     phase?: Phase;
     verificationRequest: VerificationRequest | null;
     backupInfo: KeyBackupInfo | null;
-    lostKeys: boolean;
 }
 
+/**
+ * Component to set up encryption by verifying the current device.
+ */
 export default class SetupEncryptionBody extends React.Component<IProps, IState> {
     public constructor(props: IProps) {
         super(props);
@@ -48,7 +65,6 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
             // Because of the latter, it lives in the state.
             verificationRequest: store.verificationRequest,
             backupInfo: store.backupInfo,
-            lostKeys: store.lostKeys(),
         };
     }
 
@@ -67,7 +83,6 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
             phase: store.phase,
             verificationRequest: store.verificationRequest,
             backupInfo: store.backupInfo,
-            lostKeys: store.lostKeys(),
         });
     };
 
@@ -112,8 +127,8 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
         store.returnAfterSkip();
     };
 
-    private onResetClick = (ev: ButtonEvent): void => {
-        ev.preventDefault();
+    private onCantConfirmClick = (): void => {
+        const store = SetupEncryptionStore.sharedInstance();
         Modal.createDialog(ResetIdentityDialog, {
             onReset: () => {
                 // The user completed the reset process - close this dialog
@@ -121,10 +136,14 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
                 const store = SetupEncryptionStore.sharedInstance();
                 store.done();
             },
-            variant: "confirm",
+            variant: store.lostKeys() ? "no_verification_method" : "confirm",
         });
     };
 
+    private onSignOutClick = (): void => {
+        dispatcher.dispatch({ action: "logout" });
+    };
+
     private onDoneClick = (): void => {
         const store = SetupEncryptionStore.sharedInstance();
         store.done();
@@ -136,7 +155,7 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
 
     public render(): React.ReactNode {
         const cli = MatrixClientPeg.safeGet();
-        const { phase, lostKeys } = this.state;
+        const { phase } = this.state;
 
         if (this.state.verificationRequest && cli.getUser(this.state.verificationRequest.otherUserId)) {
             return (
@@ -149,69 +168,59 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
                 />
             );
         } else if (phase === Phase.Intro) {
-            if (lostKeys) {
-                return (
-                    <div>
-                        <p>{_t("encryption|verification|no_key_or_device")}</p>
+            const store = SetupEncryptionStore.sharedInstance();
 
-                        <div className="mx_CompleteSecurity_actionRow">
-                            <AccessibleButton kind="primary" onClick={this.onResetClick}>
-                                {_t("encryption|verification|reset_proceed_prompt")}
-                            </AccessibleButton>
-                        </div>
-                    </div>
-                );
-            } else {
-                const store = SetupEncryptionStore.sharedInstance();
-                let recoveryKeyPrompt;
-                if (store.keyInfo && keyHasPassphrase(store.keyInfo)) {
-                    recoveryKeyPrompt = _t("encryption|verification|verify_using_key_or_phrase");
-                } else if (store.keyInfo) {
-                    recoveryKeyPrompt = _t("encryption|verification|verify_using_key");
-                }
-
-                let useRecoveryKeyButton;
-                if (recoveryKeyPrompt) {
-                    useRecoveryKeyButton = (
-                        <AccessibleButton kind="primary" onClick={this.onUsePassphraseClick}>
-                            {recoveryKeyPrompt}
-                        </AccessibleButton>
-                    );
-                }
-
-                let verifyButton;
-                if (store.hasDevicesToVerifyAgainst) {
-                    verifyButton = (
-                        <AccessibleButton kind="primary" onClick={this.onVerifyClick}>
-                            {_t("encryption|verification|verify_using_device")}
-                        </AccessibleButton>
-                    );
-                }
-
-                return (
-                    <div>
-                        <p>{_t("encryption|verification|verification_description")}</p>
-
-                        <div className="mx_CompleteSecurity_actionRow">
-                            {verifyButton}
-                            {useRecoveryKeyButton}
-                        </div>
-                        <div className="mx_SetupEncryptionBody_reset">
-                            {_t("encryption|reset_all_button", undefined, {
-                                a: (sub) => (
-                                    <AccessibleButton
-                                        kind="link_inline"
-                                        className="mx_SetupEncryptionBody_reset_link"
-                                        onClick={this.onResetClick}
-                                    >
-                                        {sub}
-                                    </AccessibleButton>
-                                ),
-                            })}
-                        </div>
-                    </div>
+            let verifyButton;
+            if (store.hasDevicesToVerifyAgainst) {
+                verifyButton = (
+                    <Button kind="primary" onClick={this.onVerifyClick}>
+                        <DevicesIcon /> {_t("encryption|verification|use_another_device")}
+                    </Button>
                 );
             }
+
+            let useRecoveryKeyButton;
+            if (store.keyInfo) {
+                useRecoveryKeyButton = (
+                    <Button kind="primary" onClick={this.onUsePassphraseClick}>
+                        {_t("encryption|verification|use_recovery_key")}
+                    </Button>
+                );
+            }
+
+            let signOutButton;
+            if (this.props.allowLogout) {
+                signOutButton = (
+                    <Button kind="tertiary" onClick={this.onSignOutClick}>
+                        {_t("action|sign_out")}
+                    </Button>
+                );
+            }
+
+            return (
+                <EncryptionCard
+                    title={_t("encryption|verification|confirm_identity_title")}
+                    Icon={LockIcon}
+                    className="mx_EncryptionCard_noBorder mx_SetupEncryptionBody"
+                >
+                    <EncryptionCardEmphasisedContent>
+                        <span>{_t("encryption|verification|confirm_identity_description")}</span>
+                        <span>
+                            <ExternalLink href="https://element.io/help#encryption-device-verification">
+                                {_t("action|learn_more")}
+                            </ExternalLink>
+                        </span>
+                    </EncryptionCardEmphasisedContent>
+                    <EncryptionCardButtons>
+                        {verifyButton}
+                        {useRecoveryKeyButton}
+                        <Button kind="secondary" onClick={this.onCantConfirmClick}>
+                            {_t("encryption|verification|cant_confirm")}
+                        </Button>
+                        {signOutButton}
+                    </EncryptionCardButtons>
+                </EncryptionCard>
+            );
         } else if (phase === Phase.Done) {
             let message: JSX.Element;
             if (this.state.backupInfo) {
@@ -221,7 +230,7 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
             }
             return (
                 <div>
-                    <div className="mx_CompleteSecurity_heroIcon mx_E2EIcon_verified" />
+                    <E2EIcon className="mx_CompleteSecurity_heroIcon" status={E2EStatus.Verified} hideTooltip />
                     {message}
                     <div className="mx_CompleteSecurity_actionRow">
                         <AccessibleButton kind="primary" onClick={this.onDoneClick}>
diff --git a/src/components/structures/auth/SoftLogout.tsx b/src/components/structures/auth/SoftLogout.tsx
index 34fabe46c7..a307078658 100644
--- a/src/components/structures/auth/SoftLogout.tsx
+++ b/src/components/structures/auth/SoftLogout.tsx
@@ -8,7 +8,6 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type JSX, type ChangeEvent, type SyntheticEvent } from "react";
 import { logger } from "matrix-js-sdk/src/logger";
-import { type Optional } from "matrix-events-sdk";
 import { type LoginFlow, MatrixError, SSOAction, type SSOFlow } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../../languageHandler";
@@ -217,7 +216,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
             });
     }
 
-    private renderPasswordForm(introText: Optional<string>): JSX.Element {
+    private renderPasswordForm(introText?: string): JSX.Element {
         let error: JSX.Element | undefined;
         if (this.state.errorText) {
             error = <span className="mx_Login_error">{this.state.errorText}</span>;
@@ -244,7 +243,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
         );
     }
 
-    private renderSsoForm(introText: Optional<string>): JSX.Element {
+    private renderSsoForm(introText?: string): JSX.Element {
         const loginType = this.state.loginView === LoginView.CAS ? "cas" : "sso";
         const flow = this.state.flows.find((flow) => flow.type === "m.login." + loginType) as SSOFlow;
 
@@ -284,14 +283,14 @@ export default class SoftLogout extends React.Component<IProps, IState> {
             return (
                 <>
                     <p>{_t("auth|soft_logout_intro_sso")}</p>
-                    {this.renderSsoForm(null)}
+                    {this.renderSsoForm()}
                     <h2 className="mx_AuthBody_centered">
                         {_t("auth|sso_or_username_password", {
                             ssoButtons: "",
                             usernamePassword: "",
                         }).trim()}
                     </h2>
-                    {this.renderPasswordForm(null)}
+                    {this.renderPasswordForm()}
                 </>
             );
         }
diff --git a/src/components/structures/auth/forgot-password/EnterEmail.tsx b/src/components/structures/auth/forgot-password/EnterEmail.tsx
index 9e7d6ae5a6..643cb6c963 100644
--- a/src/components/structures/auth/forgot-password/EnterEmail.tsx
+++ b/src/components/structures/auth/forgot-password/EnterEmail.tsx
@@ -38,7 +38,7 @@ export const EnterEmail: React.FC<EnterEmailProps> = ({
     onLoginClick,
     onSubmitForm,
 }) => {
-    const submitButtonChild = loading ? <Spinner w={16} h={16} /> : _t("auth|forgot_password_send_email");
+    const submitButtonChild = loading ? <Spinner size={16} /> : _t("auth|forgot_password_send_email");
 
     const emailFieldRef = useRef<Field>(null);
 
diff --git a/src/components/structures/static-page-vars.ts b/src/components/structures/static-page-vars.ts
index e27a449546..b5f21ea195 100644
--- a/src/components/structures/static-page-vars.ts
+++ b/src/components/structures/static-page-vars.ts
@@ -14,5 +14,5 @@ const matrixSvg = require("../../../res/img/matrix.svg").default;
  * Intended to replace $matrixLogo in the welcome page.
  */
 export const MATRIX_LOGO_HTML = `<a href="https://matrix.org" target="_blank" rel="noreferrer noopener">
-    <img width="79" height="34" alt="Matrix" style="padding-left: 1px;vertical-align: middle" src="${matrixSvg}"/>
+    <img class="mx_WelcomePage_logo" width="79" height="34" alt="Matrix" style="padding-left: 1px;vertical-align: middle" src="${matrixSvg}"/>
 </a>`;
diff --git a/src/components/utils/ListView.tsx b/src/components/utils/ListView.tsx
new file mode 100644
index 0000000000..e35f7e2e47
--- /dev/null
+++ b/src/components/utils/ListView.tsx
@@ -0,0 +1,315 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React, { useRef, type JSX, useCallback, useEffect, useState } from "react";
+import { type VirtuosoHandle, type ListRange, Virtuoso, type VirtuosoProps } from "react-virtuoso";
+
+import { isModifiedKeyEvent, Key } from "../../Keyboard";
+/**
+ * Context object passed to each list item containing the currently focused key
+ * and any additional context data from the parent component.
+ */
+export type ListContext<Context> = {
+    /** The key of item that should have tabIndex == 0 */
+    tabIndexKey?: string;
+    /** Whether an item in the list is currently focused */
+    focused: boolean;
+    /** Additional context data passed from the parent component */
+    context: Context;
+};
+
+export interface IListViewProps<Item, Context> extends Omit<
+    VirtuosoProps<Item, ListContext<Context>>,
+    "data" | "itemContent" | "context"
+> {
+    /**
+     * The array of items to display in the virtualized list.
+     * Each item will be passed to getItemComponent for rendering.
+     */
+    items: Item[];
+
+    /**
+     * Function that renders each list item as a JSX element.
+     * @param index - The index of the item in the list
+     * @param item - The data item to render
+     * @param context - The context object containing the focused key and any additional data
+     * @param onFocus - A callback that is required to be called when the item component receives focus
+     * @returns JSX element representing the rendered item
+     */
+    getItemComponent: (
+        index: number,
+        item: Item,
+        context: ListContext<Context>,
+        onFocus: (item: Item, e: React.FocusEvent) => void,
+    ) => JSX.Element;
+
+    /**
+     * Optional additional context data to pass to each rendered item.
+     * This will be available in the ListContext passed to getItemComponent.
+     */
+    context?: Context;
+
+    /**
+     * Function to determine if an item can receive focus during keyboard navigation.
+     * @param item - The item to check for focusability
+     * @returns true if the item can be focused, false otherwise
+     */
+    isItemFocusable: (item: Item) => boolean;
+
+    /**
+     * Function to get the key to use for focusing an item.
+     * @param item - The item to get the key for
+     * @return The key to use for focusing the item
+     */
+    getItemKey: (item: Item) => string;
+    /**
+     * Callback function to handle key down events on the list container.
+     * ListView handles keyboard navigation for focus(up, down, home, end, pageUp, pageDown)
+     * and stops propagation otherwise the event bubbles and this callback is called for the use of the parent.
+     * @param e - The keyboard event
+     * @returns
+     */
+    onKeyDown?: (e: React.KeyboardEvent<HTMLDivElement>) => void;
+}
+
+/**
+ * A generic virtualized list component built on top of react-virtuoso.
+ * Provides keyboard navigation and virtualized rendering for performance with large lists.
+ *
+ * @template Item - The type of data items in the list
+ * @template Context - The type of additional context data passed to items
+ */
+export function ListView<Item, Context = any>(props: IListViewProps<Item, Context>): React.ReactElement {
+    // Extract our custom props to avoid conflicts with Virtuoso props
+    const { items, getItemComponent, isItemFocusable, getItemKey, context, onKeyDown, ...virtuosoProps } = props;
+    /** Reference to the Virtuoso component for programmatic scrolling */
+    const virtuosoHandleRef = useRef<VirtuosoHandle>(null);
+    /** Reference to the DOM element containing the virtualized list */
+    const virtuosoDomRef = useRef<HTMLElement | Window>(null);
+    /** Key of the item that should have tabIndex == 0 */
+    const [tabIndexKey, setTabIndexKey] = useState<string | undefined>(
+        props.items[0] ? getItemKey(props.items[0]) : undefined,
+    );
+    /** Range of currently visible items in the viewport */
+    const [visibleRange, setVisibleRange] = useState<ListRange | undefined>(undefined);
+    /** Map from item keys to their indices in the items array */
+    const [keyToIndexMap, setKeyToIndexMap] = useState<Map<string, number>>(new Map());
+    /** Whether the list is currently scrolling to an item */
+    const isScrollingToItem = useRef<boolean>(false);
+    /** Whether the list is currently focused */
+    const [isFocused, setIsFocused] = useState<boolean>(false);
+
+    // Update the key-to-index mapping whenever items change
+    useEffect(() => {
+        const newKeyToIndexMap = new Map<string, number>();
+        items.forEach((item, index) => {
+            const key = getItemKey(item);
+            newKeyToIndexMap.set(key, index);
+        });
+        setKeyToIndexMap(newKeyToIndexMap);
+    }, [items, getItemKey]);
+
+    // Ensure the tabIndexKey is set if there is none already or if the existing key is no longer displayed
+    useEffect(() => {
+        if (items.length && (!tabIndexKey || keyToIndexMap.get(tabIndexKey) === undefined)) {
+            setTabIndexKey(getItemKey(items[0]));
+        }
+    }, [items, getItemKey, tabIndexKey, keyToIndexMap]);
+
+    /**
+     * Scrolls to a specific item index and sets it as focused.
+     * Uses Virtuoso's scrollIntoView method for smooth scrolling.
+     */
+    const scrollToIndex = useCallback(
+        (index: number, align?: "center" | "end" | "start"): void => {
+            // Ensure index is within bounds
+            const clampedIndex = Math.max(0, Math.min(index, items.length - 1));
+            if (isScrollingToItem.current) {
+                // If already scrolling to an item drop this request. Adding further requests
+                // causes the event to bubble up and be handled by other components(unintentional timeline scrolling was observed).
+                return;
+            }
+            if (items[clampedIndex]) {
+                const key = getItemKey(items[clampedIndex]);
+                isScrollingToItem.current = true;
+                virtuosoHandleRef.current?.scrollIntoView({
+                    index: clampedIndex,
+                    align: align,
+                    behavior: "auto",
+                    done: () => {
+                        setTabIndexKey(key);
+                        isScrollingToItem.current = false;
+                    },
+                });
+            }
+        },
+        [items, getItemKey],
+    );
+
+    /**
+     * Scrolls to an item, skipping over non-focusable items if necessary.
+     * This is used for keyboard navigation to ensure focus lands on valid items.
+     */
+    const scrollToItem = useCallback(
+        (index: number, isDirectionDown: boolean, align?: "center" | "end" | "start"): void => {
+            const totalRows = items.length;
+            let nextIndex: number | undefined;
+
+            for (let i = index; isDirectionDown ? i < totalRows : i >= 0; i = i + (isDirectionDown ? 1 : -1)) {
+                if (isItemFocusable(items[i])) {
+                    nextIndex = i;
+                    break;
+                }
+            }
+
+            if (nextIndex === undefined) {
+                return;
+            }
+
+            scrollToIndex(nextIndex, align);
+        },
+        [scrollToIndex, items, isItemFocusable],
+    );
+
+    /**
+     * Handles keyboard navigation for the list.
+     * Supports Arrow keys, Home, End, Page Up/Down, Enter, and Space.
+     */
+    const keyDownCallback = useCallback(
+        (e: React.KeyboardEvent<HTMLDivElement>) => {
+            const currentIndex = tabIndexKey ? keyToIndexMap.get(tabIndexKey) : undefined;
+            let handled = false;
+
+            // Guard against null/undefined events and modified keys which we don't want to handle here but do
+            // at the settings level shortcuts(E.g. Select next room, etc )
+            // Guard against null/undefined events and modified keys
+            if (!e || isModifiedKeyEvent(e)) {
+                onKeyDown?.(e);
+                return;
+            }
+
+            if (e.code === Key.ARROW_UP && currentIndex !== undefined) {
+                scrollToItem(currentIndex - 1, false);
+                handled = true;
+            } else if (e.code === Key.ARROW_DOWN && currentIndex !== undefined) {
+                scrollToItem(currentIndex + 1, true);
+                handled = true;
+            } else if (e.code === Key.HOME) {
+                scrollToIndex(0);
+                handled = true;
+            } else if (e.code === Key.END) {
+                scrollToIndex(items.length - 1);
+                handled = true;
+            } else if (e.code === Key.PAGE_DOWN && visibleRange && currentIndex !== undefined) {
+                const numberDisplayed = visibleRange.endIndex - visibleRange.startIndex;
+                scrollToItem(Math.min(currentIndex + numberDisplayed, items.length - 1), true, `start`);
+                handled = true;
+            } else if (e.code === Key.PAGE_UP && visibleRange && currentIndex !== undefined) {
+                const numberDisplayed = visibleRange.endIndex - visibleRange.startIndex;
+                scrollToItem(Math.max(currentIndex - numberDisplayed, 0), false, `start`);
+                handled = true;
+            }
+
+            if (handled) {
+                e.stopPropagation();
+                e.preventDefault();
+            } else {
+                onKeyDown?.(e);
+            }
+        },
+        [scrollToIndex, scrollToItem, tabIndexKey, keyToIndexMap, visibleRange, items, onKeyDown],
+    );
+
+    /**
+     * Callback ref for the Virtuoso scroller element.
+     * Stores the reference for use in focus management.
+     */
+    const scrollerRef = useCallback((element: HTMLElement | Window | null) => {
+        virtuosoDomRef.current = element;
+    }, []);
+
+    /**
+     * Focus handler passed to each item component.
+     * Don't declare inside getItemComponent to avoid re-creating on each render.
+     */
+    const onFocusForGetItemComponent = useCallback(
+        (item: Item, e: React.FocusEvent) => {
+            // If one of the item components has been focused directly, set the focused and tabIndex state
+            // and stop propagation so the ListViews onFocus doesn't also handle it.
+            const key = getItemKey(item);
+            setIsFocused(true);
+            setTabIndexKey(key);
+            e.stopPropagation();
+        },
+        [getItemKey],
+    );
+
+    const getItemComponentInternal = useCallback(
+        (index: number, item: Item, context: ListContext<Context>): JSX.Element =>
+            getItemComponent(index, item, context, onFocusForGetItemComponent),
+        [getItemComponent, onFocusForGetItemComponent],
+    );
+    /**
+     * Handles focus events on the list.
+     * Sets the focused state and scrolls to the focused item if it is not currently visible.
+     */
+    const onFocus = useCallback(
+        (e?: React.FocusEvent): void => {
+            if (e?.currentTarget !== virtuosoDomRef.current || typeof tabIndexKey !== "string") {
+                return;
+            }
+
+            setIsFocused(true);
+            const index = keyToIndexMap.get(tabIndexKey);
+            if (
+                index !== undefined &&
+                visibleRange &&
+                (index < visibleRange.startIndex || index > visibleRange.endIndex)
+            ) {
+                scrollToIndex(index);
+            }
+            e?.stopPropagation();
+            e?.preventDefault();
+        },
+        [keyToIndexMap, visibleRange, scrollToIndex, tabIndexKey],
+    );
+
+    const onBlur = useCallback((event: React.FocusEvent<HTMLDivElement>): void => {
+        // Only set isFocused to false if the focus is moving outside the list
+        // This prevents the list from losing focus when interacting with menus inside it
+        if (!event.currentTarget.contains(event.relatedTarget)) {
+            setIsFocused(false);
+        }
+    }, []);
+
+    const listContext: ListContext<Context> = {
+        tabIndexKey: tabIndexKey,
+        focused: isFocused,
+        context: props.context || ({} as Context),
+    };
+
+    return (
+        <Virtuoso
+            // note that either the container of direct children must be focusable to be axe
+            // compliant, so we leave tabIndex as the default so the container can be focused
+            // (virtuoso wraps the children inside another couple of elements so setting it
+            // on those doesn't seem to work, unfortunately)
+            ref={virtuosoHandleRef}
+            scrollerRef={scrollerRef}
+            onKeyDown={keyDownCallback}
+            context={listContext}
+            rangeChanged={setVisibleRange}
+            // virtuoso errors internally if you pass undefined.
+            overscan={props.overscan || 0}
+            data={props.items}
+            onFocus={onFocus}
+            onBlur={onBlur}
+            itemContent={getItemComponentInternal}
+            {...virtuosoProps}
+        />
+    );
+}
diff --git a/src/components/viewmodels/avatars/RoomAvatarViewModel.tsx b/src/components/viewmodels/avatars/RoomAvatarViewModel.tsx
index 8879f5ae69..3832616a9c 100644
--- a/src/components/viewmodels/avatars/RoomAvatarViewModel.tsx
+++ b/src/components/viewmodels/avatars/RoomAvatarViewModel.tsx
@@ -10,26 +10,26 @@ import { useEffect, useState } from "react";
 
 import { useTypedEventEmitter } from "../../../hooks/useEventEmitter";
 import { useDmMember, usePresence, type Presence } from "../../views/avatars/WithPresenceIndicator";
+import { DefaultTagID } from "../../../stores/room-list/models";
+
+export enum AvatarBadgeDecoration {
+    LowPriority = "LowPriority",
+    VideoRoom = "VideoRoom",
+    PublicRoom = "PublicRoom",
+    Presence = "Presence",
+}
 
 export interface RoomAvatarViewState {
-    /**
-     * Whether the room avatar has a decoration.
-     * A decoration can be a public or a video call icon or an indicator of presence.
-     */
-    hasDecoration: boolean;
-    /**
-     * Whether the room is public.
-     */
-    isPublic: boolean;
-    /**
-     * Whether the room is a video room.
-     */
-    isVideoRoom: boolean;
     /**
      * The presence of the user in the DM room.
      * If null, the user is not in a DM room or presence is not enabled.
      */
     presence: Presence | null;
+
+    /**
+     * The decoration that should be rendered.
+     */
+    badgeDecoration?: AvatarBadgeDecoration;
 }
 
 /**
@@ -41,10 +41,20 @@ export function useRoomAvatarViewModel(room: Room): RoomAvatarViewState {
     const roomMember = useDmMember(room);
     const presence = usePresence(room, roomMember);
     const isPublic = useIsPublic(room);
+    const isLowPriority = !!room.tags[DefaultTagID.LowPriority];
 
-    const hasDecoration = isPublic || isVideoRoom || presence !== null;
+    let badgeDecoration: AvatarBadgeDecoration | undefined;
+    if (isLowPriority) {
+        badgeDecoration = AvatarBadgeDecoration.LowPriority;
+    } else if (isVideoRoom) {
+        badgeDecoration = AvatarBadgeDecoration.VideoRoom;
+    } else if (isPublic) {
+        badgeDecoration = AvatarBadgeDecoration.PublicRoom;
+    } else if (presence) {
+        badgeDecoration = AvatarBadgeDecoration.Presence;
+    }
 
-    return { hasDecoration, isPublic, isVideoRoom, presence };
+    return { badgeDecoration, presence };
 }
 
 /**
diff --git a/src/components/viewmodels/memberlist/MemberListViewModel.tsx b/src/components/viewmodels/memberlist/MemberListViewModel.tsx
index a03f703511..41233a4d6f 100644
--- a/src/components/viewmodels/memberlist/MemberListViewModel.tsx
+++ b/src/components/viewmodels/memberlist/MemberListViewModel.tsx
@@ -38,6 +38,7 @@ import { isValid3pidInvite } from "../../../RoomInvite";
 import { type ThreePIDInvite } from "../../../models/rooms/ThreePIDInvite";
 import { type XOR } from "../../../@types/common";
 import { useTypedEventEmitter } from "../../../hooks/useEventEmitter";
+import { useRoomMemberCount } from "../../../hooks/useRoomMembers";
 
 type Member = XOR<{ member: RoomMember }, { threePidInvite: ThreePIDInvite }>;
 
@@ -126,6 +127,9 @@ export function useMemberListViewModel(roomId: string): MemberListViewState {
     const [isLoading, setIsLoading] = useState<boolean>(true);
     // This is the last known total number of members in this room.
     const [totalMemberCount, setTotalMemberCount] = useState(0);
+
+    const memberCountWithout3Pid = useRoomMemberCount(room, { includeInvited: true });
+
     /**
      * This is the current number of members in the list.
      * This number will be less than the total number of members
@@ -168,7 +172,7 @@ export function useMemberListViewModel(roomId: string): MemberListViewState {
                     }
 
                     setMemberMap(newMemberMap);
-                    setMemberCount(joinedSdk.length + invitedSdk.length + threePidInvited.length);
+                    setMemberCount(memberCountWithout3Pid + threePidInvited.length);
                     if (!searchQuery) {
                         /**
                          * Since searching for members only gives you the relevant
@@ -180,7 +184,7 @@ export function useMemberListViewModel(roomId: string): MemberListViewState {
                 500,
                 { leading: true, trailing: true },
             ),
-        [sdkContext.memberListStore, roomId, room],
+        [sdkContext.memberListStore, roomId, room, memberCountWithout3Pid],
     );
 
     const isPresenceEnabled = useMemo(
diff --git a/src/components/viewmodels/memberlist/tiles/MemberTileViewModel.tsx b/src/components/viewmodels/memberlist/tiles/MemberTileViewModel.tsx
index 4f6814caae..d99c127d85 100644
--- a/src/components/viewmodels/memberlist/tiles/MemberTileViewModel.tsx
+++ b/src/components/viewmodels/memberlist/tiles/MemberTileViewModel.tsx
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
 import { RoomStateEvent, type MatrixEvent, EventType } from "matrix-js-sdk/src/matrix";
 import { type UserVerificationStatus, CryptoEvent } from "matrix-js-sdk/src/crypto-api";
 
@@ -16,7 +16,6 @@ import { asyncSome } from "../../../../utils/arrays";
 import { getUserDeviceIds } from "../../../../utils/crypto/deviceInfo";
 import { type RoomMember } from "../../../../models/rooms/RoomMember";
 import { _t, _td, type TranslationKey } from "../../../../languageHandler";
-import UserIdentifierCustomisations from "../../../../customisations/UserIdentifier";
 import { E2EStatus } from "../../../../utils/ShieldUtils";
 
 interface MemberTileViewModelProps {
@@ -28,16 +27,17 @@ export interface MemberTileViewState extends MemberTileViewModelProps {
     e2eStatus?: E2EStatus;
     name: string;
     onClick: () => void;
-    title?: string;
     userLabel?: string;
 }
 
 export enum PowerStatus {
+    Creator = "creator",
     Admin = "admin",
     Moderator = "moderator",
 }
 
 const PowerLabel: Record<PowerStatus, TranslationKey> = {
+    [PowerStatus.Creator]: _td("power_level|creator"),
     [PowerStatus.Admin]: _td("power_level|admin"),
     [PowerStatus.Moderator]: _td("power_level|moderator"),
 };
@@ -117,6 +117,7 @@ export function useMemberTileViewModel(props: MemberTileViewModelProps): MemberT
     const name = props.member.name;
 
     const powerStatusMap = new Map([
+        [Infinity, PowerStatus.Creator],
         [100, PowerStatus.Admin],
         [50, PowerStatus.Moderator],
     ]);
@@ -130,15 +131,6 @@ export function useMemberTileViewModel(props: MemberTileViewModelProps): MemberT
         }
     }
 
-    const title = useMemo(() => {
-        return _t("member_list|power_label", {
-            userName: UserIdentifierCustomisations.getDisplayUserIdentifier(member.userId, {
-                roomId: member.roomId,
-            }),
-            powerLevelNumber: member.powerLevel,
-        }).trim();
-    }, [member.powerLevel, member.roomId, member.userId]);
-
     let userLabel;
     const powerStatus = powerStatusMap.get(powerLevel);
     if (powerStatus) {
@@ -149,7 +141,6 @@ export function useMemberTileViewModel(props: MemberTileViewModelProps): MemberT
     }
 
     return {
-        title,
         member,
         name,
         onClick,
diff --git a/src/components/viewmodels/right_panel/RoomSummaryCardTopicViewModel.tsx b/src/components/viewmodels/right_panel/RoomSummaryCardTopicViewModel.tsx
index 10cbc5b568..fd98a76541 100644
--- a/src/components/viewmodels/right_panel/RoomSummaryCardTopicViewModel.tsx
+++ b/src/components/viewmodels/right_panel/RoomSummaryCardTopicViewModel.tsx
@@ -6,7 +6,6 @@ Please see LICENSE files in the repository root for full details.
 
 import { type SyntheticEvent, useState } from "react";
 import { EventType, type Room, type ContentHelpers } from "matrix-js-sdk/src/matrix";
-import { type Optional } from "matrix-events-sdk";
 
 import { useRoomState } from "../../../hooks/useRoomState";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
@@ -17,7 +16,7 @@ export interface RoomTopicState {
     /**
      * The topic of the room, the value is taken from the room state
      */
-    topic: Optional<ContentHelpers.TopicState>;
+    topic: ContentHelpers.TopicState | null;
     /**
      * Whether the topic is expanded or not
      */
diff --git a/src/components/viewmodels/right_panel/UserInfoPowerlevelViewModel.tsx b/src/components/viewmodels/right_panel/UserInfoPowerlevelViewModel.tsx
new file mode 100644
index 0000000000..f56356ff41
--- /dev/null
+++ b/src/components/viewmodels/right_panel/UserInfoPowerlevelViewModel.tsx
@@ -0,0 +1,108 @@
+/*
+Copyright 2025 New Vector Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React, { useContext, useEffect, useState, useCallback } from "react";
+import { logger } from "@sentry/browser";
+import { type RoomMember, type Room } from "matrix-js-sdk/src/matrix";
+
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { _t } from "../../../languageHandler";
+import Modal from "../../../Modal";
+import ErrorDialog from "../../views/dialogs/ErrorDialog";
+import QuestionDialog from "../../views/dialogs/QuestionDialog";
+import { warnSelfDemote } from "../../views/right_panel/UserInfo";
+
+/**
+ *
+ */
+export interface UserInfoPowerLevelState {
+    /**
+     * default power level value of the selected user
+     */
+    powerLevelUsersDefault: number;
+    /**
+     * The new power level to apply
+     */
+    selectedPowerLevel: number;
+    /**
+     * Method to call When power level selection change
+     */
+    onPowerChange: (powerLevel: number) => void;
+}
+
+export const useUserInfoPowerlevelViewModel = (user: RoomMember, room: Room): UserInfoPowerLevelState => {
+    const [selectedPowerLevel, setSelectedPowerLevel] = useState(user.powerLevel);
+
+    useEffect(() => {
+        setSelectedPowerLevel(user.powerLevel);
+    }, [user]);
+
+    const cli = useContext(MatrixClientContext);
+    const onPowerChange = useCallback(
+        async (powerLevel: number) => {
+            setSelectedPowerLevel(powerLevel);
+
+            const applyPowerChange = (roomId: string, target: string, powerLevel: number): Promise<unknown> => {
+                return cli.setPowerLevel(roomId, target, powerLevel).then(
+                    function () {
+                        logger.info("Power change success");
+                    },
+                    function (err) {
+                        logger.error("Failed to change power level " + err);
+                        Modal.createDialog(ErrorDialog, {
+                            title: _t("common|error"),
+                            description: _t("error|update_power_level"),
+                        });
+                    },
+                );
+            };
+
+            const roomId = user.roomId;
+            const target = user.userId;
+
+            const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
+            if (!powerLevelEvent) return;
+
+            const myUserId = cli.getUserId();
+            const myPower = powerLevelEvent.getContent().users[myUserId || ""];
+            if (myPower && parseInt(myPower) <= powerLevel && myUserId !== target) {
+                const { finished } = Modal.createDialog(QuestionDialog, {
+                    title: _t("common|warning"),
+                    description: (
+                        <div>
+                            {_t("user_info|promote_warning")}
+                            <br />
+                            {_t("common|are_you_sure")}
+                        </div>
+                    ),
+                    button: _t("action|continue"),
+                });
+
+                const [confirmed] = await finished;
+                if (!confirmed) return;
+            } else if (myUserId === target && myPower && parseInt(myPower) > powerLevel) {
+                // If we are changing our own PL it can only ever be decreasing, which we cannot reverse.
+                try {
+                    if (!(await warnSelfDemote(room?.isSpaceRoom()))) return;
+                } catch (e) {
+                    logger.error("Failed to warn about self demotion: " + e);
+                }
+            }
+
+            await applyPowerChange(roomId, target, powerLevel);
+        },
+        [user.roomId, user.userId, cli, room],
+    );
+
+    const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
+    const powerLevelUsersDefault = powerLevelEvent ? powerLevelEvent.getContent().users_default : 0;
+
+    return {
+        powerLevelUsersDefault,
+        onPowerChange,
+        selectedPowerLevel,
+    };
+};
diff --git a/src/components/viewmodels/right_panel/user_info/UserInfoBasicOptionsViewModel.tsx b/src/components/viewmodels/right_panel/user_info/UserInfoBasicOptionsViewModel.tsx
new file mode 100644
index 0000000000..9d286125ae
--- /dev/null
+++ b/src/components/viewmodels/right_panel/user_info/UserInfoBasicOptionsViewModel.tsx
@@ -0,0 +1,152 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { useContext } from "react";
+import { RoomMember, User, type Room, KnownMembership } from "matrix-js-sdk/src/matrix";
+
+import Modal from "../../../../Modal";
+import ErrorDialog from "../../../views/dialogs/ErrorDialog";
+import { _t, UserFriendlyError } from "../../../../languageHandler";
+import MatrixClientContext from "../../../../contexts/MatrixClientContext";
+import dis from "../../../../dispatcher/dispatcher";
+import PosthogTrackers from "../../../../PosthogTrackers";
+import { ShareDialog } from "../../../views/dialogs/ShareDialog";
+import { type ComposerInsertPayload } from "../../../../dispatcher/payloads/ComposerInsertPayload";
+import { Action } from "../../../../dispatcher/actions";
+import { TimelineRenderingType } from "../../../../contexts/RoomContext";
+import MultiInviter from "../../../../utils/MultiInviter";
+import { type ViewRoomPayload } from "../../../../dispatcher/payloads/ViewRoomPayload";
+import { useRoomPermissions } from "./UserInfoBasicViewModel";
+import { DirectoryMember, startDmOnFirstMessage } from "../../../../utils/direct-messages";
+import { type Member } from "../../../views/right_panel/UserInfo";
+
+export interface UserInfoBasicOptionsState {
+    // boolean to know if selected user is current user
+    isMe: boolean;
+    // boolean to display/hide invite button
+    showInviteButton: boolean;
+    // boolean to display/hide insert pill button
+    showInsertPillButton: boolean | "";
+    // boolean to display/hide read receipt button
+    readReceiptButtonDisabled: boolean;
+    // Method called when a insert pill button is clicked
+    onInsertPillButton: () => void;
+    // Method called when a read receipt button is clicked, will add a pill in the input message field
+    onReadReceiptButton: () => void;
+    // Method called when a share user button is clicked, will display modal with profile to share
+    onShareUserClick: () => void;
+    // Method called when a invite button is clicked, will display modal to invite user
+    onInviteUserButton: (fallbackRoomId: string, evt: Event) => Promise<void>;
+    // Method called when the DM button is clicked, will open a DM with the selected member
+    onOpenDmForUser: (member: Member) => Promise<void>;
+}
+
+export const useUserInfoBasicOptionsViewModel = (room: Room, member: User | RoomMember): UserInfoBasicOptionsState => {
+    const cli = useContext(MatrixClientContext);
+
+    // selected member is current user
+    const isMe = member.userId === cli.getUserId();
+
+    // Those permissions are updated when a change is done on the room current state and the selected user
+    const roomPermissions = useRoomPermissions(cli, room, member as RoomMember);
+
+    const isSpace = room?.isSpaceRoom();
+
+    // read receipt button stay disable for a room space or if all events where read (null)
+    const readReceiptButtonDisabled = isSpace || !room?.getEventReadUpTo(member.userId);
+
+    // always show exempt when room is a space
+    const showInsertPillButton = member instanceof RoomMember && member.roomId && !isSpace;
+
+    // show invite button only if current user has the permission to invite and the selected user membership is LEAVE
+    const showInviteButton =
+        member instanceof RoomMember &&
+        roomPermissions.canInvite &&
+        (member?.membership ?? KnownMembership.Leave) === KnownMembership.Leave;
+
+    const onReadReceiptButton = function (): void {
+        const room = member instanceof RoomMember ? cli.getRoom(member.roomId) : null;
+        if (!room || readReceiptButtonDisabled) return;
+
+        dis.dispatch<ViewRoomPayload>({
+            action: Action.ViewRoom,
+            highlighted: true,
+            // this could return null, the default prevents a type error
+            event_id: room.getEventReadUpTo(member.userId) || undefined,
+            room_id: room.roomId,
+            metricsTrigger: undefined, // room doesn't change
+        });
+    };
+
+    const onInsertPillButton = function (): void {
+        dis.dispatch<ComposerInsertPayload>({
+            action: Action.ComposerInsert,
+            userId: member.userId,
+            timelineRenderingType: TimelineRenderingType.Room,
+        });
+    };
+
+    const onInviteUserButton = async (fallbackRoomId: string, ev: Event): Promise<void> => {
+        try {
+            const roomId = member instanceof RoomMember && member.roomId ? member.roomId : fallbackRoomId;
+
+            // We use a MultiInviter to re-use the invite logic, even though we're only inviting one user.
+            const inviter = new MultiInviter(cli, roomId || "");
+            await inviter.invite([member.userId]).then(() => {
+                if (inviter.getCompletionState(member.userId) !== "invited") {
+                    const errorStringFromInviterUtility = inviter.getErrorText(member.userId);
+                    if (errorStringFromInviterUtility) {
+                        throw new Error(errorStringFromInviterUtility);
+                    } else {
+                        throw new UserFriendlyError("slash_command|invite_failed", {
+                            user: member.userId,
+                            roomId,
+                            cause: undefined,
+                        });
+                    }
+                }
+            });
+        } catch (err) {
+            const description = err instanceof Error ? err.message : _t("invite|failed_generic");
+
+            Modal.createDialog(ErrorDialog, {
+                title: _t("invite|failed_title"),
+                description,
+            });
+        }
+
+        PosthogTrackers.trackInteraction("WebRightPanelRoomUserInfoInviteButton", ev);
+    };
+
+    const onShareUserClick = (): void => {
+        Modal.createDialog(ShareDialog, {
+            target: member,
+        });
+    };
+
+    const onOpenDmForUser = async (user: Member): Promise<void> => {
+        const avatarUrl = user instanceof User ? user.avatarUrl : user.getMxcAvatarUrl();
+        const startDmUser = new DirectoryMember({
+            user_id: user.userId,
+            display_name: user.rawDisplayName,
+            avatar_url: avatarUrl,
+        });
+        await startDmOnFirstMessage(cli, [startDmUser]);
+    };
+
+    return {
+        isMe,
+        showInviteButton,
+        showInsertPillButton,
+        readReceiptButtonDisabled,
+        onReadReceiptButton,
+        onInsertPillButton,
+        onInviteUserButton,
+        onShareUserClick,
+        onOpenDmForUser,
+    };
+};
diff --git a/src/components/viewmodels/right_panel/user_info/UserInfoBasicViewModel.tsx b/src/components/viewmodels/right_panel/user_info/UserInfoBasicViewModel.tsx
new file mode 100644
index 0000000000..0773ca3cb7
--- /dev/null
+++ b/src/components/viewmodels/right_panel/user_info/UserInfoBasicViewModel.tsx
@@ -0,0 +1,197 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React, { useCallback, useEffect, useState } from "react";
+import {
+    EventType,
+    type RoomMember,
+    type IPowerLevelsContent,
+    type Room,
+    RoomStateEvent,
+    type MatrixClient,
+    type User,
+    type MatrixEvent,
+} from "matrix-js-sdk/src/matrix";
+import { logger } from "matrix-js-sdk/src/logger";
+
+import { useAsyncMemo } from "../../../../hooks/useAsyncMemo";
+import { useTypedEventEmitter } from "../../../../hooks/useEventEmitter";
+import Modal from "../../../../Modal";
+import ErrorDialog from "../../../views/dialogs/ErrorDialog";
+import { _t } from "../../../../languageHandler";
+import { type IRoomPermissions } from "../../../views/right_panel/UserInfo";
+import { useMatrixClientContext } from "../../../../contexts/MatrixClientContext";
+import QuestionDialog from "../../../views/dialogs/QuestionDialog";
+import DMRoomMap from "../../../../utils/DMRoomMap";
+
+export interface UserInfoBasicState {
+    // current room powerlevels
+    powerLevels: IPowerLevelsContent;
+    // getting user permissions in this room
+    roomPermissions: IRoomPermissions;
+    // numbers of operation in progress > 0
+    pendingUpdateCount: number;
+    // true if user is me
+    isMe: boolean;
+    // true if room is a DM for the user
+    isRoomDMForMember: boolean;
+    // Boolean to hide or show the deactivate button
+    showDeactivateButton: boolean;
+    // Method called when a deactivate user action is triggered
+    onSynapseDeactivate: () => void;
+    startUpdating: () => void;
+    stopUpdating: () => void;
+}
+
+export const getPowerLevels = (room: Room): IPowerLevelsContent =>
+    room?.currentState?.getStateEvents(EventType.RoomPowerLevels, "")?.getContent() || {};
+
+export const useRoomPermissions = (cli: MatrixClient, room: Room, user: RoomMember): IRoomPermissions => {
+    const [roomPermissions, setRoomPermissions] = useState<IRoomPermissions>({
+        // modifyLevelMax is the max PL we can set this user to, typically min(their PL, our PL) && canSetPL
+        modifyLevelMax: -1,
+        canEdit: false,
+        canInvite: false,
+    });
+
+    const updateRoomPermissions = useCallback(() => {
+        const powerLevels = room?.currentState.getStateEvents(EventType.RoomPowerLevels, "")?.getContent();
+        if (!powerLevels) return;
+
+        const me = room.getMember(cli.getUserId() || "");
+        if (!me) return;
+
+        const them = user;
+        const isMe = me.userId === them.userId;
+        const canAffectUser = them.powerLevel < me.powerLevel || isMe;
+
+        let modifyLevelMax = -1;
+        if (canAffectUser) {
+            const editPowerLevel = powerLevels.events?.[EventType.RoomPowerLevels] ?? powerLevels.state_default ?? 50;
+            if (me.powerLevel >= editPowerLevel) {
+                modifyLevelMax = me.powerLevel;
+            }
+        }
+
+        setRoomPermissions({
+            canInvite: me.powerLevel >= (powerLevels.invite ?? 0),
+            canEdit: modifyLevelMax >= 0,
+            modifyLevelMax,
+        });
+    }, [cli, user, room]);
+
+    useTypedEventEmitter(cli, RoomStateEvent.Update, updateRoomPermissions);
+    useEffect(() => {
+        updateRoomPermissions();
+        return () => {
+            setRoomPermissions({
+                modifyLevelMax: -1,
+                canEdit: false,
+                canInvite: false,
+            });
+        };
+    }, [updateRoomPermissions]);
+
+    return roomPermissions;
+};
+
+const useIsSynapseAdmin = (cli?: MatrixClient): boolean => {
+    return useAsyncMemo(async () => (cli ? cli.isSynapseAdministrator().catch(() => false) : false), [cli], false);
+};
+
+export const useRoomPowerLevels = (cli: MatrixClient, room: Room): IPowerLevelsContent => {
+    const [powerLevels, setPowerLevels] = useState<IPowerLevelsContent>(getPowerLevels(room));
+
+    const update = useCallback(
+        (ev?: MatrixEvent) => {
+            if (!room) return;
+            if (ev && ev.getType() !== EventType.RoomPowerLevels) return;
+            setPowerLevels(getPowerLevels(room));
+        },
+        [room],
+    );
+
+    useTypedEventEmitter(cli, RoomStateEvent.Events, update);
+    useEffect(() => {
+        update();
+        return () => {
+            setPowerLevels({});
+        };
+    }, [update]);
+    return powerLevels;
+};
+
+export const useUserInfoBasicViewModel = (room: Room, member: User | RoomMember): UserInfoBasicState => {
+    const cli = useMatrixClientContext();
+
+    const powerLevels = useRoomPowerLevels(cli, room);
+    // Load whether or not we are a Synapse Admin
+    const isSynapseAdmin = useIsSynapseAdmin(cli);
+
+    // Count of how many operations are currently in progress, if > 0 then show a Spinner
+    const [pendingUpdateCount, setPendingUpdateCount] = useState(0);
+
+    const roomPermissions = useRoomPermissions(cli, room, member as RoomMember);
+
+    // selected member is current user
+    const isMe = member.userId === cli.getUserId();
+
+    // is needed to hide the Roles section for DMs as it doesn't make sense there
+    const isRoomDMForMember = !!DMRoomMap.shared().getUserIdForRoomId((member as RoomMember).roomId);
+
+    // used to check if user can deactivate another member
+    const isMemberSameDomain = member.userId.endsWith(`:${cli.getDomain()}`);
+
+    // We don't need a perfect check here, just something to pass as "probably not our homeserver". If
+    // someone does figure out how to bypass this check the worst that happens is an error.
+    const showDeactivateButton = isSynapseAdmin && isMemberSameDomain;
+
+    const startUpdating = useCallback(() => {
+        setPendingUpdateCount(pendingUpdateCount + 1);
+    }, [pendingUpdateCount]);
+
+    const stopUpdating = useCallback(() => {
+        setPendingUpdateCount(pendingUpdateCount - 1);
+    }, [pendingUpdateCount]);
+
+    const onSynapseDeactivate = useCallback(async () => {
+        const { finished } = Modal.createDialog(QuestionDialog, {
+            title: _t("user_info|deactivate_confirm_title"),
+            description: <div>{_t("user_info|deactivate_confirm_description")}</div>,
+            button: _t("user_info|deactivate_confirm_action"),
+            danger: true,
+        });
+
+        const [accepted] = await finished;
+        if (!accepted) return;
+        try {
+            await cli.deactivateSynapseUser(member.userId);
+        } catch (err) {
+            logger.error("Failed to deactivate user");
+            logger.error(err);
+
+            const description = err instanceof Error ? err.message : _t("invite|failed_generic");
+
+            Modal.createDialog(ErrorDialog, {
+                title: _t("user_info|error_deactivate"),
+                description,
+            });
+        }
+    }, [cli, member.userId]);
+
+    return {
+        showDeactivateButton,
+        powerLevels,
+        roomPermissions,
+        pendingUpdateCount,
+        isMe,
+        isRoomDMForMember,
+        onSynapseDeactivate,
+        startUpdating,
+        stopUpdating,
+    };
+};
diff --git a/src/components/viewmodels/right_panel/user_info/UserInfoHeaderVerificationViewModel.tsx b/src/components/viewmodels/right_panel/user_info/UserInfoHeaderVerificationViewModel.tsx
new file mode 100644
index 0000000000..4b39d50353
--- /dev/null
+++ b/src/components/viewmodels/right_panel/user_info/UserInfoHeaderVerificationViewModel.tsx
@@ -0,0 +1,69 @@
+/*
+Copyright 2025 New Vector Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type MatrixClient, type RoomMember, type User } from "matrix-js-sdk/src/matrix";
+import { useContext } from "react";
+import { type UserVerificationStatus } from "matrix-js-sdk/src/crypto-api";
+
+import MatrixClientContext from "../../../../contexts/MatrixClientContext";
+import { type IDevice } from "../../../views/right_panel/UserInfo";
+import { useAsyncMemo } from "../../../../hooks/useAsyncMemo";
+import { verifyUser } from "../../../../verification";
+
+export interface UserInfoVerificationSectionState {
+    /**
+     * variables used to check if we can verify the user and display the verify button
+     */
+    canVerify: boolean;
+    hasCrossSigningKeys: boolean | undefined;
+    /**
+     * used to display correct badge value
+     */
+    isUserVerified: boolean;
+    /**
+     * callback function when verifyUser button is clicked
+     */
+    verifySelectedUser: () => Promise<void>;
+}
+
+const useHasCrossSigningKeys = (cli: MatrixClient, member: User, canVerify: boolean): boolean | undefined => {
+    return useAsyncMemo(async () => {
+        if (!canVerify) return undefined;
+        return cli.getCrypto()?.userHasCrossSigningKeys(member.userId, true);
+    }, [cli, member, canVerify]);
+};
+
+/**
+ * View model for the userInfoVerificationHeaderView
+ * @see {@link UserInfoVerificationSectionState} for more information about what this view model returns.
+ */
+export const useUserInfoVerificationViewModel = (
+    member: User | RoomMember,
+    devices: IDevice[],
+): UserInfoVerificationSectionState => {
+    const cli = useContext(MatrixClientContext);
+
+    const userTrust = useAsyncMemo<UserVerificationStatus | undefined>(
+        async () => cli.getCrypto()?.getUserVerificationStatus(member.userId),
+        [member.userId],
+        // the user verification status is not initialized
+        undefined,
+    );
+    const hasUserVerificationStatus = Boolean(userTrust);
+    const isUserVerified = Boolean(userTrust?.isVerified());
+    const isMe = member.userId === cli.getUserId();
+    const canVerify = hasUserVerificationStatus && !isUserVerified && !isMe && devices && devices.length > 0;
+
+    const hasCrossSigningKeys = useHasCrossSigningKeys(cli, member as User, canVerify);
+    const verifySelectedUser = (): Promise<void> => verifyUser(cli, member as User);
+
+    return {
+        canVerify,
+        hasCrossSigningKeys,
+        isUserVerified,
+        verifySelectedUser,
+    };
+};
diff --git a/src/components/viewmodels/right_panel/user_info/UserInfoHeaderViewModel.tsx b/src/components/viewmodels/right_panel/user_info/UserInfoHeaderViewModel.tsx
new file mode 100644
index 0000000000..12899f0bc1
--- /dev/null
+++ b/src/components/viewmodels/right_panel/user_info/UserInfoHeaderViewModel.tsx
@@ -0,0 +1,115 @@
+/*
+Copyright 2025 New Vector Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { RoomMember, type User } from "matrix-js-sdk/src/matrix";
+import { useCallback, useContext } from "react";
+
+import { mediaFromMxc } from "../../../../customisations/Media";
+import Modal from "../../../../Modal";
+import ImageView from "../../../views/elements/ImageView";
+import SdkConfig from "../../../../SdkConfig";
+import MatrixClientContext from "../../../../contexts/MatrixClientContext";
+import { type Member } from "../../../views/right_panel/UserInfo";
+import { useUserTimezone } from "../../../../hooks/useUserTimezone";
+import UserIdentifierCustomisations from "../../../../customisations/UserIdentifier";
+
+export interface PresenceInfo {
+    lastActiveAgo: number | undefined;
+    currentlyActive: boolean | undefined;
+    state: string | undefined;
+}
+
+export interface TimezoneInfo {
+    timezone: string;
+    friendly: string;
+}
+
+export interface UserInfoHeaderState {
+    /**
+     * callback function when selected user avatar is clicked in user info
+     */
+    onMemberAvatarClick: () => void;
+    /**
+     * Object containing information about the precense of the selected user
+     */
+    precenseInfo: PresenceInfo;
+    /**
+     * Boolean that show or hide the precense information
+     */
+    showPresence: boolean;
+    /**
+     *  Timezone object
+     */
+    timezoneInfo: TimezoneInfo | null;
+    /**
+     * Displayed identifier for the selected user
+     */
+    userIdentifier: string | null;
+}
+interface UserInfoHeaderViewModelProps {
+    member: Member;
+    roomId?: string;
+}
+
+/**
+ * View model for the userInfoHeaderView
+ * props
+ * @see {@link UserInfoHeaderState} for more information about what this view model returns.
+ */
+export function useUserfoHeaderViewModel({ member, roomId }: UserInfoHeaderViewModelProps): UserInfoHeaderState {
+    const cli = useContext(MatrixClientContext);
+
+    let showPresence = true;
+
+    const precenseInfo: PresenceInfo = {
+        lastActiveAgo: undefined,
+        currentlyActive: undefined,
+        state: undefined,
+    };
+
+    const enablePresenceByHsUrl = SdkConfig.get("enable_presence_by_hs_url");
+
+    const timezoneInfo = useUserTimezone(cli, member.userId);
+
+    const userIdentifier = UserIdentifierCustomisations.getDisplayUserIdentifier?.(member.userId, {
+        roomId,
+        withDisplayName: true,
+    });
+
+    const onMemberAvatarClick = useCallback(() => {
+        const avatarUrl = (member as RoomMember).getMxcAvatarUrl
+            ? (member as RoomMember).getMxcAvatarUrl()
+            : (member as User).avatarUrl;
+
+        const httpUrl = mediaFromMxc(avatarUrl).srcHttp;
+        if (!httpUrl) return;
+
+        const params = {
+            src: httpUrl,
+            name: (member as RoomMember).name || (member as User).displayName,
+        };
+
+        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox", undefined, true);
+    }, [member]);
+
+    if (member instanceof RoomMember && member.user) {
+        precenseInfo.state = member.user.presence;
+        precenseInfo.lastActiveAgo = member.user.lastActiveAgo;
+        precenseInfo.currentlyActive = member.user.currentlyActive;
+    }
+
+    if (enablePresenceByHsUrl && enablePresenceByHsUrl[cli.baseUrl] !== undefined) {
+        showPresence = enablePresenceByHsUrl[cli.baseUrl];
+    }
+
+    return {
+        onMemberAvatarClick,
+        showPresence,
+        precenseInfo,
+        timezoneInfo,
+        userIdentifier,
+    };
+}
diff --git a/src/components/viewmodels/right_panel/user_info/UserInfoIgnoreButtonViewModel.tsx b/src/components/viewmodels/right_panel/user_info/UserInfoIgnoreButtonViewModel.tsx
new file mode 100644
index 0000000000..3c243feaec
--- /dev/null
+++ b/src/components/viewmodels/right_panel/user_info/UserInfoIgnoreButtonViewModel.tsx
@@ -0,0 +1,85 @@
+/*
+Copyright 2025 New Vector Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React, { useContext, useEffect, useState, useCallback } from "react";
+import { type RoomMember, User, ClientEvent, type MatrixEvent } from "matrix-js-sdk/src/matrix";
+
+import MatrixClientContext from "../../../../contexts/MatrixClientContext";
+import { _t } from "../../../../languageHandler";
+import Modal from "../../../../Modal";
+import QuestionDialog from "../../../views/dialogs/QuestionDialog";
+import { useTypedEventEmitter } from "../../../../hooks/useEventEmitter";
+
+export interface UserInfoPowerLevelState {
+    /**
+     * Weither the member is ignored by current user or not
+     */
+    isIgnored: boolean;
+    /**
+     * Trigger the method to ignore or unignore a user
+     * @param ev - The click event
+     */
+    ignoreButtonClick: (ev: Event) => void;
+}
+
+export const useUserInfoIgnoreButtonViewModel = (member: User | RoomMember): UserInfoPowerLevelState => {
+    const cli = useContext(MatrixClientContext);
+
+    const unignore = useCallback(() => {
+        const ignoredUsers = cli.getIgnoredUsers();
+        const index = ignoredUsers.indexOf(member.userId);
+        if (index !== -1) ignoredUsers.splice(index, 1);
+        cli.setIgnoredUsers(ignoredUsers);
+    }, [cli, member]);
+
+    const ignore = useCallback(async () => {
+        const name = (member instanceof User ? member.displayName : member.name) || member.userId;
+        const { finished } = Modal.createDialog(QuestionDialog, {
+            title: _t("user_info|ignore_confirm_title", { user: name }),
+            description: <div>{_t("user_info|ignore_confirm_description")}</div>,
+            button: _t("action|ignore"),
+        });
+        const [confirmed] = await finished;
+
+        if (confirmed) {
+            const ignoredUsers = cli.getIgnoredUsers();
+            ignoredUsers.push(member.userId);
+            cli.setIgnoredUsers(ignoredUsers);
+        }
+    }, [cli, member]);
+
+    // Check whether the user is ignored
+    const [isIgnored, setIsIgnored] = useState(cli.isUserIgnored(member.userId));
+    // Recheck if the user or client changes
+    useEffect(() => {
+        setIsIgnored(cli.isUserIgnored(member.userId));
+    }, [cli, member.userId]);
+
+    // Recheck also if we receive new accountData m.ignored_user_list
+    const accountDataHandler = useCallback(
+        (ev: MatrixEvent) => {
+            if (ev.getType() === "m.ignored_user_list") {
+                setIsIgnored(cli.isUserIgnored(member.userId));
+            }
+        },
+        [cli, member.userId],
+    );
+    useTypedEventEmitter(cli, ClientEvent.AccountData, accountDataHandler);
+
+    const ignoreButtonClick = (ev: Event): void => {
+        ev.preventDefault();
+        if (isIgnored) {
+            unignore();
+        } else {
+            ignore();
+        }
+    };
+
+    return {
+        ignoreButtonClick,
+        isIgnored,
+    };
+};
diff --git a/src/components/viewmodels/right_panel/user_info/admin/UserInfoAdminToolsContainerViewModel.tsx b/src/components/viewmodels/right_panel/user_info/admin/UserInfoAdminToolsContainerViewModel.tsx
new file mode 100644
index 0000000000..54ed32ceb5
--- /dev/null
+++ b/src/components/viewmodels/right_panel/user_info/admin/UserInfoAdminToolsContainerViewModel.tsx
@@ -0,0 +1,82 @@
+/*
+Copyright 2025 New Vector Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type Room, type RoomMember, type IPowerLevelsContent } from "matrix-js-sdk/src/matrix";
+
+import { useMatrixClientContext } from "../../../../../contexts/MatrixClientContext";
+
+/**
+ * Interface used by admin tools container subcomponents props
+ */
+export interface RoomAdminToolsProps {
+    room: Room;
+    member: RoomMember;
+    isUpdating: boolean;
+    startUpdating: () => void;
+    stopUpdating: () => void;
+}
+
+/**
+ * Interface used by admin tools container props
+ */
+export interface RoomAdminToolsContainerProps {
+    room: Room;
+    member: RoomMember;
+    powerLevels: IPowerLevelsContent;
+}
+
+interface UserInfoAdminToolsContainerState {
+    shouldShowKickButton: boolean;
+    shouldShowBanButton: boolean;
+    shouldShowMuteButton: boolean;
+    shouldShowRedactButton: boolean;
+    isCurrentUserInTheRoom: boolean;
+}
+
+/**
+ * The view model for the user info admin tools container
+ * @param {RoomAdminToolsContainerProps} props - the object containing the necceray props for the view model
+ * @param {Room} props.room - the room that display the admin tools
+ * @param {RoomMember} props.member - the selected member
+ * @param {IPowerLevelsContent} props.powerLevels - current room power levels
+ * @returns {UserInfoAdminToolsContainerState} the user info admin tools container state
+ */
+export const useUserInfoAdminToolsContainerViewModel = (
+    props: RoomAdminToolsContainerProps,
+): UserInfoAdminToolsContainerState => {
+    const cli = useMatrixClientContext();
+    const { room, member, powerLevels } = props;
+
+    const editPowerLevel =
+        (powerLevels.events ? powerLevels.events["m.room.power_levels"] : null) || powerLevels.state_default;
+
+    // if these do not exist in the event then they should default to 50 as per the spec
+    const { ban: banPowerLevel = 50, kick: kickPowerLevel = 50, redact: redactPowerLevel = 50 } = powerLevels;
+
+    const me = room.getMember(cli.getUserId() || "");
+    const isCurrentUserInTheRoom = me !== null;
+
+    if (!isCurrentUserInTheRoom) {
+        return {
+            shouldShowKickButton: false,
+            shouldShowBanButton: false,
+            shouldShowMuteButton: false,
+            shouldShowRedactButton: false,
+            isCurrentUserInTheRoom: false,
+        };
+    }
+
+    const isMe = me.userId === member.userId;
+    const canAffectUser = member.powerLevel < me.powerLevel || isMe;
+
+    return {
+        shouldShowKickButton: !isMe && canAffectUser && me.powerLevel >= kickPowerLevel,
+        shouldShowRedactButton: me.powerLevel >= redactPowerLevel && !room.isSpaceRoom(),
+        shouldShowBanButton: !isMe && canAffectUser && me.powerLevel >= banPowerLevel,
+        shouldShowMuteButton: !isMe && canAffectUser && me.powerLevel >= Number(editPowerLevel) && !room.isSpaceRoom(),
+        isCurrentUserInTheRoom,
+    };
+};
diff --git a/src/components/viewmodels/right_panel/user_info/admin/UserInfoBanButtonViewModel.tsx b/src/components/viewmodels/right_panel/user_info/admin/UserInfoBanButtonViewModel.tsx
new file mode 100644
index 0000000000..525b10e093
--- /dev/null
+++ b/src/components/viewmodels/right_panel/user_info/admin/UserInfoBanButtonViewModel.tsx
@@ -0,0 +1,153 @@
+/*
+Copyright 2025 New Vector Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { logger } from "@sentry/browser";
+import { type Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
+
+import { useMatrixClientContext } from "../../../../../contexts/MatrixClientContext";
+import { _t } from "../../../../../languageHandler";
+import Modal from "../../../../../Modal";
+import { bulkSpaceBehaviour } from "../../../../../utils/space";
+import ConfirmSpaceUserActionDialog from "../../../../views/dialogs/ConfirmSpaceUserActionDialog";
+import ConfirmUserActionDialog from "../../../../views/dialogs/ConfirmUserActionDialog";
+import ErrorDialog from "../../../../views/dialogs/ErrorDialog";
+import { type RoomAdminToolsProps } from "./UserInfoAdminToolsContainerViewModel";
+
+export interface BanButtonState {
+    /**
+     * The function to call when the button is clicked
+     */
+    onBanOrUnbanClick: () => Promise<void>;
+    /**
+     * The label of the ban button can be ban or unban
+     */
+    banLabel: string;
+}
+/**
+ * The view model for the room ban button used in the UserInfoAdminToolsContainer
+ * @param {RoomAdminToolsProps} props - the object containing the necceray props for banButton the view model
+ * @param {Room} props.room - the room to ban/unban the user in
+ * @param {RoomMember} props.member - the member to ban/unban
+ * @param {boolean} props.isUpdating - whether the operation is currently in progress
+ * @param {function} props.startUpdating - callback function to start the operation
+ * @param {function} props.stopUpdating - callback function to stop the operation
+ * @returns {BanButtonState} the room ban/unban button state
+ */
+export const useBanButtonViewModel = (props: RoomAdminToolsProps): BanButtonState => {
+    const { isUpdating, startUpdating, stopUpdating, room, member } = props;
+
+    const cli = useMatrixClientContext();
+
+    const isBanned = member.membership === KnownMembership.Ban;
+
+    let banLabel = room.isSpaceRoom() ? _t("user_info|ban_button_space") : _t("user_info|ban_button_room");
+    if (isBanned) {
+        banLabel = room.isSpaceRoom() ? _t("user_info|unban_button_space") : _t("user_info|unban_button_room");
+    }
+
+    const onBanOrUnbanClick = async (): Promise<void> => {
+        if (isUpdating) return; // only allow one operation at a time
+        startUpdating();
+
+        const commonProps = {
+            member,
+            action: room.isSpaceRoom()
+                ? isBanned
+                    ? _t("user_info|unban_button_space")
+                    : _t("user_info|ban_button_space")
+                : isBanned
+                  ? _t("user_info|unban_button_room")
+                  : _t("user_info|ban_button_room"),
+            title: isBanned
+                ? _t("user_info|unban_room_confirm_title", { roomName: room.name })
+                : _t("user_info|ban_room_confirm_title", { roomName: room.name }),
+            askReason: !isBanned,
+            danger: !isBanned,
+        };
+
+        let finished: Promise<[success?: boolean, reason?: string, rooms?: Room[]]>;
+
+        if (room.isSpaceRoom()) {
+            ({ finished } = Modal.createDialog(
+                ConfirmSpaceUserActionDialog,
+                {
+                    ...commonProps,
+                    space: room,
+                    spaceChildFilter: isBanned
+                        ? (child: Room) => {
+                              // Return true if the target member is banned and we have sufficient PL to unban
+                              const myMember = child.getMember(cli.credentials.userId || "");
+                              const theirMember = child.getMember(member.userId);
+                              return (
+                                  !!myMember &&
+                                  !!theirMember &&
+                                  theirMember.membership === KnownMembership.Ban &&
+                                  myMember.powerLevel > theirMember.powerLevel &&
+                                  child.currentState.hasSufficientPowerLevelFor("ban", myMember.powerLevel)
+                              );
+                          }
+                        : (child: Room) => {
+                              // Return true if the target member isn't banned and we have sufficient PL to ban
+                              const myMember = child.getMember(cli.credentials.userId || "");
+                              const theirMember = child.getMember(member.userId);
+                              return (
+                                  !!myMember &&
+                                  !!theirMember &&
+                                  theirMember.membership !== KnownMembership.Ban &&
+                                  myMember.powerLevel > theirMember.powerLevel &&
+                                  child.currentState.hasSufficientPowerLevelFor("ban", myMember.powerLevel)
+                              );
+                          },
+                    allLabel: isBanned ? _t("user_info|unban_space_everything") : _t("user_info|ban_space_everything"),
+                    specificLabel: isBanned ? _t("user_info|unban_space_specific") : _t("user_info|ban_space_specific"),
+                    warningMessage: isBanned ? _t("user_info|unban_space_warning") : _t("user_info|kick_space_warning"),
+                },
+                "mx_ConfirmSpaceUserActionDialog_wrapper",
+            ));
+        } else {
+            ({ finished } = Modal.createDialog(ConfirmUserActionDialog, commonProps));
+        }
+
+        const [proceed, reason, rooms = []] = await finished;
+        if (!proceed) {
+            stopUpdating();
+            return;
+        }
+
+        const fn = (roomId: string): Promise<unknown> => {
+            if (isBanned) {
+                return cli.unban(roomId, member.userId);
+            } else {
+                return cli.ban(roomId, member.userId, reason || undefined);
+            }
+        };
+
+        bulkSpaceBehaviour(room, rooms, (room) => fn(room.roomId))
+            .then(
+                () => {
+                    // NO-OP; rely on the m.room.member event coming down else we could
+                    // get out of sync if we force setState here!
+                    logger.info("Ban success");
+                },
+                function (err) {
+                    logger.error("Ban error: " + err);
+                    Modal.createDialog(ErrorDialog, {
+                        title: _t("common|error"),
+                        description: _t("user_info|error_ban_user"),
+                    });
+                },
+            )
+            .finally(() => {
+                stopUpdating();
+            });
+    };
+
+    return {
+        onBanOrUnbanClick,
+        banLabel,
+    };
+};
diff --git a/src/components/viewmodels/right_panel/user_info/admin/UserInfoKickButtonViewModel.tsx b/src/components/viewmodels/right_panel/user_info/admin/UserInfoKickButtonViewModel.tsx
new file mode 100644
index 0000000000..8ae179ac07
--- /dev/null
+++ b/src/components/viewmodels/right_panel/user_info/admin/UserInfoKickButtonViewModel.tsx
@@ -0,0 +1,142 @@
+/*
+Copyright 2025 New Vector Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { logger } from "@sentry/browser";
+import { type Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
+
+import { useMatrixClientContext } from "../../../../../contexts/MatrixClientContext";
+import { _t } from "../../../../../languageHandler";
+import Modal from "../../../../../Modal";
+import { bulkSpaceBehaviour } from "../../../../../utils/space";
+import ConfirmSpaceUserActionDialog from "../../../../views/dialogs/ConfirmSpaceUserActionDialog";
+import ConfirmUserActionDialog from "../../../../views/dialogs/ConfirmUserActionDialog";
+import ErrorDialog from "../../../../views/dialogs/ErrorDialog";
+import { type RoomAdminToolsProps } from "./UserInfoAdminToolsContainerViewModel";
+
+interface RoomKickButtonState {
+    /**
+     * The function to call when the button is clicked
+     */
+    onKickClick: () => Promise<void>;
+    /**
+     * Whether the user can be kicked based on membership value. If the user already join or was invited, it can be kicked
+     */
+    canUserBeKicked: boolean;
+    /**
+     * The label of the kick button can be kick or disinvite
+     */
+    kickLabel: string;
+}
+
+/**
+ * The view model for the room kick button used in the UserInfoAdminToolsContainer
+ * @param {RoomAdminToolsProps} props - the object containing the necceray props for kickButton the view model
+ * @param {Room} props.room - the room to kick/disinvite the user from
+ * @param {RoomMember} props.member - the member to kick/disinvite
+ * @param {boolean} props.isUpdating - whether the operation is currently in progress
+ * @param {function} props.startUpdating - callback function to start the operation
+ * @param {function} props.stopUpdating - callback function to stop the operation
+ * @returns {KickButtonState} the room kick/disinvite button state
+ */
+export function useRoomKickButtonViewModel(props: RoomAdminToolsProps): RoomKickButtonState {
+    const { isUpdating, startUpdating, stopUpdating, room, member } = props;
+
+    const cli = useMatrixClientContext();
+
+    const onKickClick = async (): Promise<void> => {
+        if (isUpdating) return; // only allow one operation at a time
+        startUpdating();
+
+        const commonProps = {
+            member,
+            action: room.isSpaceRoom()
+                ? member.membership === KnownMembership.Invite
+                    ? _t("user_info|disinvite_button_space")
+                    : _t("user_info|kick_button_space")
+                : member.membership === KnownMembership.Invite
+                  ? _t("user_info|disinvite_button_room")
+                  : _t("user_info|kick_button_room"),
+            title:
+                member.membership === KnownMembership.Invite
+                    ? _t("user_info|disinvite_button_room_name", { roomName: room.name })
+                    : _t("user_info|kick_button_room_name", { roomName: room.name }),
+            askReason: member.membership === KnownMembership.Join,
+            danger: true,
+        };
+
+        let finished: Promise<[success?: boolean, reason?: string, rooms?: Room[]]>;
+
+        if (room.isSpaceRoom()) {
+            ({ finished } = Modal.createDialog(
+                ConfirmSpaceUserActionDialog,
+                {
+                    ...commonProps,
+                    space: room,
+                    spaceChildFilter: (child: Room) => {
+                        // Return true if the target member is not banned and we have sufficient PL to ban them
+                        const myMember = child.getMember(cli.credentials.userId || "");
+                        const theirMember = child.getMember(member.userId);
+                        return (
+                            !!myMember &&
+                            !!theirMember &&
+                            theirMember.membership === member.membership &&
+                            myMember.powerLevel > theirMember.powerLevel &&
+                            child.currentState.hasSufficientPowerLevelFor("kick", myMember.powerLevel)
+                        );
+                    },
+                    allLabel: _t("user_info|kick_button_space_everything"),
+                    specificLabel: _t("user_info|kick_space_specific"),
+                    warningMessage: _t("user_info|kick_space_warning"),
+                },
+                "mx_ConfirmSpaceUserActionDialog_wrapper",
+            ));
+        } else {
+            ({ finished } = Modal.createDialog(ConfirmUserActionDialog, commonProps));
+        }
+
+        const [proceed, reason, rooms = []] = await finished;
+        if (!proceed) {
+            stopUpdating();
+            return;
+        }
+
+        bulkSpaceBehaviour(room, rooms, (room) => cli.kick(room.roomId, member.userId, reason || undefined))
+            .then(
+                () => {
+                    // NO-OP; rely on the m.room.member event coming down else we could
+                    // get out of sync if we force setState here!
+                    logger.info("Kick success");
+                },
+                function (err) {
+                    logger.error("Kick error: " + err);
+                    Modal.createDialog(ErrorDialog, {
+                        title: _t("user_info|error_kicking_user"),
+                        description: err?.message ?? "Operation failed",
+                    });
+                },
+            )
+            .finally(() => {
+                stopUpdating();
+            });
+    };
+
+    const canUserBeKicked = member.membership === KnownMembership.Invite || member.membership === KnownMembership.Join;
+
+    const kickLabel = room.isSpaceRoom()
+        ? member.membership === KnownMembership.Invite
+            ? _t("user_info|disinvite_button_space")
+            : _t("user_info|kick_button_space")
+        : member.membership === KnownMembership.Invite
+          ? _t("user_info|disinvite_button_room")
+          : _t("user_info|kick_button_room");
+
+    return {
+        onKickClick,
+        canUserBeKicked,
+        kickLabel,
+    };
+}
diff --git a/src/components/viewmodels/right_panel/user_info/admin/UserInfoMuteButtonViewModel.tsx b/src/components/viewmodels/right_panel/user_info/admin/UserInfoMuteButtonViewModel.tsx
new file mode 100644
index 0000000000..1608628198
--- /dev/null
+++ b/src/components/viewmodels/right_panel/user_info/admin/UserInfoMuteButtonViewModel.tsx
@@ -0,0 +1,120 @@
+/*
+Copyright 2025 New Vector Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { logger } from "@sentry/browser";
+import { type RoomMember, type IPowerLevelsContent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
+
+import { useMatrixClientContext } from "../../../../../contexts/MatrixClientContext";
+import { _t } from "../../../../../languageHandler";
+import Modal from "../../../../../Modal";
+import ErrorDialog from "../../../../views/dialogs/ErrorDialog";
+import { type RoomAdminToolsProps } from "./UserInfoAdminToolsContainerViewModel";
+
+interface MuteButtonState {
+    /**
+     * Whether the member is in the roomn based on the membership value
+     */
+    isMemberInTheRoom: boolean;
+    /**
+     * The label of the mute button can be mute or unmute
+     */
+    muteLabel: string;
+    /**
+     * The function to call when the mute button is clicked
+     */
+    onMuteButtonClick: () => Promise<void>;
+}
+
+/**
+ * The view model for the room mute button used in the UserInfoAdminToolsContainer
+ * @param {RoomAdminToolsProps} props - the object containing the necceray props for muteButton the view model
+ * @param {Room} props.room - the room to mute/unmute the user in
+ * @param {RoomMember} props.member - the member to mute/unmute
+ * @param {boolean} props.isUpdating - whether the operation is currently in progress
+ * @param {function} props.startUpdating - callback function to start the operation
+ * @param {function} props.stopUpdating - callback function to stop the operation
+ * @returns {MuteButtonState} the room mute/unmute button state
+ */
+export const useMuteButtonViewModel = (props: RoomAdminToolsProps): MuteButtonState => {
+    const { isUpdating, startUpdating, stopUpdating, room, member } = props;
+
+    const cli = useMatrixClientContext();
+
+    const isMuted = (member: RoomMember, powerLevelContent: IPowerLevelsContent): boolean => {
+        if (!powerLevelContent || !member) return false;
+
+        const levelToSend =
+            (powerLevelContent.events ? powerLevelContent.events["m.room.message"] : null) ||
+            powerLevelContent.events_default;
+
+        // levelToSend could be undefined as .events_default is optional. Coercing in this case using
+        // Number() would always return false, so this preserves behaviour
+        // FIXME: per the spec, if `events_default` is unset, it defaults to zero. If
+        //   the member has a negative powerlevel, this will give an incorrect result.
+        if (levelToSend === undefined) return false;
+
+        return member.powerLevel < levelToSend;
+    };
+
+    const muted = isMuted(member, room.currentState.getStateEvents("m.room.power_levels", "")?.getContent() || {});
+    const muteLabel = muted ? _t("common|unmute") : _t("common|mute");
+
+    const isMemberInTheRoom = member.membership == KnownMembership.Join;
+
+    const onMuteButtonClick = async (): Promise<void> => {
+        if (isUpdating) return; // only allow one operation at a time
+        startUpdating();
+
+        const roomId = member.roomId;
+        const target = member.userId;
+
+        const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
+        const powerLevels = powerLevelEvent?.getContent();
+        const levelToSend = powerLevels?.events?.["m.room.message"] ?? powerLevels?.events_default;
+
+        let level;
+        if (muted) {
+            // unmute
+            level = levelToSend;
+        } else {
+            // mute
+            level = levelToSend - 1;
+        }
+        level = parseInt(level);
+
+        console.log("level", level);
+        if (isNaN(level)) {
+            stopUpdating();
+            return;
+        }
+
+        cli.setPowerLevel(roomId, target, level)
+            .then(
+                () => {
+                    // NO-OP; rely on the m.room.member event coming down else we could
+                    // get out of sync if we force setState here!
+                    logger.info("Mute toggle success");
+                },
+                function (err) {
+                    logger.error("Mute error: " + err);
+                    Modal.createDialog(ErrorDialog, {
+                        title: _t("common|error"),
+                        description: _t("user_info|error_mute_user"),
+                    });
+                },
+            )
+            .finally(() => {
+                stopUpdating();
+            });
+    };
+
+    return {
+        isMemberInTheRoom,
+        onMuteButtonClick,
+        muteLabel,
+    };
+};
diff --git a/src/components/viewmodels/right_panel/user_info/admin/UserInfoRedactButtonViewModel.tsx b/src/components/viewmodels/right_panel/user_info/admin/UserInfoRedactButtonViewModel.tsx
new file mode 100644
index 0000000000..73b8ea70f0
--- /dev/null
+++ b/src/components/viewmodels/right_panel/user_info/admin/UserInfoRedactButtonViewModel.tsx
@@ -0,0 +1,39 @@
+/*
+Copyright 2025 New Vector Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type RoomMember } from "matrix-js-sdk/src/matrix";
+
+import { useMatrixClientContext } from "../../../../../contexts/MatrixClientContext";
+import Modal from "../../../../../Modal";
+import BulkRedactDialog from "../../../../views/dialogs/BulkRedactDialog";
+
+export interface RedactMessagesButtonState {
+    onRedactAllMessagesClick: () => void;
+}
+
+/**
+ * The view model for the redact messages button used in the UserInfoAdminToolsContainer
+ * @param {RoomMember} member - the selected member to redact messages for
+ * @returns {RedactMessagesButtonState} the redact messages button state
+ */
+export const useRedactMessagesButtonViewModel = (member: RoomMember): RedactMessagesButtonState => {
+    const cli = useMatrixClientContext();
+
+    const onRedactAllMessagesClick = (): void => {
+        const room = cli.getRoom(member.roomId);
+        if (!room) return;
+
+        Modal.createDialog(BulkRedactDialog, {
+            matrixClient: cli,
+            room,
+            member,
+        });
+    };
+
+    return {
+        onRedactAllMessagesClick,
+    };
+};
diff --git a/src/components/viewmodels/roomlist/RoomListHeaderViewModel.tsx b/src/components/viewmodels/roomlist/RoomListHeaderViewModel.tsx
index d6f54fcae7..451a4898b7 100644
--- a/src/components/viewmodels/roomlist/RoomListHeaderViewModel.tsx
+++ b/src/components/viewmodels/roomlist/RoomListHeaderViewModel.tsx
@@ -32,7 +32,6 @@ import { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
 import type { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
 import { createRoom, hasCreateRoomRights } from "./utils";
 import { type SortOption, useSorter } from "./useSorter";
-import { useMessagePreviewToggle } from "./useMessagePreviewToggle";
 
 /**
  * Hook to get the active space and its title.
@@ -127,14 +126,6 @@ export interface RoomListHeaderViewState {
      * The currently active sort option.
      */
     activeSortOption: SortOption;
-    /**
-     * Whether message previews must be shown or not.
-     */
-    shouldShowMessagePreview: boolean;
-    /**
-     * A function to turn on/off message previews.
-     */
-    toggleMessagePreview: () => void;
 }
 
 /**
@@ -157,7 +148,6 @@ export function useRoomListHeaderViewModel(): RoomListHeaderViewState {
     /* Actions */
 
     const { activeSortOption, sort } = useSorter();
-    const { shouldShowMessagePreview, toggleMessagePreview } = useMessagePreviewToggle();
 
     const createChatRoom = useCallback((e: Event) => {
         defaultDispatcher.fire(Action.CreateChat);
@@ -230,7 +220,5 @@ export function useRoomListHeaderViewModel(): RoomListHeaderViewState {
         openSpaceSettings,
         activeSortOption,
         sort,
-        shouldShowMessagePreview,
-        toggleMessagePreview,
     };
 }
diff --git a/src/components/viewmodels/roomlist/RoomListItemMenuViewModel.tsx b/src/components/viewmodels/roomlist/RoomListItemMenuViewModel.tsx
index 997b515f27..738a05b8c3 100644
--- a/src/components/viewmodels/roomlist/RoomListItemMenuViewModel.tsx
+++ b/src/components/viewmodels/roomlist/RoomListItemMenuViewModel.tsx
@@ -37,6 +37,10 @@ export interface RoomListItemMenuViewState {
      * Whether the room is a favourite room.
      */
     isFavourite: boolean;
+    /**
+     * Whether the room is a low priority room.
+     */
+    isLowPriority: boolean;
     /**
      * Can invite other user's in the room.
      */
@@ -117,6 +121,7 @@ export function useRoomListItemMenuViewModel(room: Room): RoomListItemMenuViewSt
 
     const isDm = Boolean(DMRoomMap.shared().getUserIdForRoomId(room.roomId));
     const isFavourite = Boolean(roomTags[DefaultTagID.Favourite]);
+    const isLowPriority = Boolean(roomTags[DefaultTagID.LowPriority]);
     const isArchived = Boolean(roomTags[DefaultTagID.Archived]);
 
     const showMoreOptionsMenu = hasAccessToOptionsMenu(room);
@@ -200,6 +205,7 @@ export function useRoomListItemMenuViewModel(room: Room): RoomListItemMenuViewSt
         showMoreOptionsMenu,
         showNotificationMenu,
         isFavourite,
+        isLowPriority,
         canInvite,
         canCopyRoomLink,
         canMarkAsRead,
diff --git a/src/components/viewmodels/roomlist/RoomListItemViewModel.tsx b/src/components/viewmodels/roomlist/RoomListItemViewModel.tsx
index e009033875..30576e2dc2 100644
--- a/src/components/viewmodels/roomlist/RoomListItemViewModel.tsx
+++ b/src/components/viewmodels/roomlist/RoomListItemViewModel.tsx
@@ -7,6 +7,7 @@
 
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { type Room, RoomEvent } from "matrix-js-sdk/src/matrix";
+import { CallType } from "matrix-js-sdk/src/webrtc/call";
 
 import dispatcher from "../../../dispatcher/dispatcher";
 import type { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
@@ -19,7 +20,7 @@ import { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
 import { useEventEmitter, useEventEmitterState, useTypedEventEmitter } from "../../../hooks/useEventEmitter";
 import { DefaultTagID } from "../../../stores/room-list/models";
 import { useCall, useConnectionState, useParticipantCount } from "../../../hooks/useCall";
-import { type ConnectionState } from "../../../models/Call";
+import { CallEvent, type ConnectionState } from "../../../models/Call";
 import { NotificationStateEvents } from "../../../stores/notifications/NotificationState";
 import DMRoomMap from "../../../utils/DMRoomMap";
 import { MessagePreviewStore } from "../../../stores/room-list/MessagePreviewStore";
@@ -30,6 +31,10 @@ export interface RoomListItemViewState {
      * The name of the room.
      */
     name: string;
+    /**
+     * Whether the context menu should be shown.
+     */
+    showContextMenu: boolean;
     /**
      * Whether the hover menu should be shown.
      */
@@ -63,6 +68,10 @@ export interface RoomListItemViewState {
      * Whether there are participants in the call.
      */
     hasParticipantInCall: boolean;
+    /**
+     * Whether the call is a voice or video call.
+     */
+    callType: CallType | undefined;
     /**
      * Pre-rendered and translated preview for the latest message in the room, or undefined
      * if no preview should be shown.
@@ -105,12 +114,12 @@ export function useRoomListItemViewModel(room: Room): RoomListItemViewState {
         setNotificationValues(getNotificationValues(notificationState));
     }, [notificationState]);
 
-    // We don't want to show the hover menu if
+    // We don't want to show the menus if
     // - there is an invitation for this room
-    // - the user doesn't have access to both notification and more options menus
+    // - the user doesn't have access to notification and more options menus
+    const showContextMenu = !invited && hasAccessToOptionsMenu(room);
     const showHoverMenu =
-        !invited &&
-        (hasAccessToOptionsMenu(room) || hasAccessToNotificationMenu(room, matrixClient.isGuest(), isArchived));
+        !invited && (showContextMenu || hasAccessToNotificationMenu(room, matrixClient.isGuest(), isArchived));
 
     const messagePreview = useRoomMessagePreview(room);
 
@@ -119,10 +128,10 @@ export function useRoomListItemViewModel(room: Room): RoomListItemViewState {
     // EC video call or video room
     const call = useCall(room.roomId);
     const connectionState = useConnectionState(call);
-    const hasParticipantInCall = useParticipantCount(call) > 0;
+    const participantCount = useParticipantCount(call);
     const callConnectionState = call ? connectionState : null;
 
-    const showNotificationDecoration = hasVisibleNotification || hasParticipantInCall;
+    const showNotificationDecoration = hasVisibleNotification || participantCount > 0;
 
     // Actions
 
@@ -134,18 +143,23 @@ export function useRoomListItemViewModel(room: Room): RoomListItemViewState {
         });
     }, [room]);
 
+    const [callType, setCallType] = useState<CallType>(CallType.Video);
+    useTypedEventEmitter(call ?? undefined, CallEvent.CallTypeChanged, setCallType);
+
     return {
         name,
         notificationState,
+        showContextMenu,
         showHoverMenu,
         openRoom,
         a11yLabel,
         isBold,
         isVideoRoom,
         callConnectionState,
-        hasParticipantInCall,
+        hasParticipantInCall: participantCount > 0,
         messagePreview,
         showNotificationDecoration,
+        callType: call ? callType : undefined,
     };
 }
 
diff --git a/src/components/viewmodels/roomlist/RoomListViewModel.tsx b/src/components/viewmodels/roomlist/RoomListViewModel.tsx
index e4e5093782..a48d973b23 100644
--- a/src/components/viewmodels/roomlist/RoomListViewModel.tsx
+++ b/src/components/viewmodels/roomlist/RoomListViewModel.tsx
@@ -18,6 +18,7 @@ import { Action } from "../../../dispatcher/actions";
 import { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
 import { useStickyRoomList } from "./useStickyRoomList";
 import { useRoomListNavigation } from "./useRoomListNavigation";
+import { type RoomsResult } from "../../../stores/room-list-v3/RoomListStoreV3";
 
 export interface RoomListViewState {
     /**
@@ -26,9 +27,9 @@ export interface RoomListViewState {
     isLoadingRooms: boolean;
 
     /**
-     * A list of rooms to be displayed in the left panel.
+     * The room results to be displayed (along with the spaceId and filter keys at the time of query)
      */
-    rooms: Room[];
+    roomsResult: RoomsResult;
 
     /**
      * Create a chat room
@@ -71,10 +72,10 @@ export interface RoomListViewState {
  */
 export function useRoomListViewModel(): RoomListViewState {
     const matrixClient = useMatrixClientContext();
-    const { isLoadingRooms, primaryFilters, activePrimaryFilter, rooms: filteredRooms } = useFilteredRooms();
-    const { activeIndex, rooms } = useStickyRoomList(filteredRooms);
+    const { isLoadingRooms, primaryFilters, activePrimaryFilter, roomsResult: filteredRooms } = useFilteredRooms();
+    const { activeIndex, roomsResult } = useStickyRoomList(filteredRooms);
 
-    useRoomListNavigation(rooms);
+    useRoomListNavigation(roomsResult.rooms);
 
     const currentSpace = useEventEmitterState<Room | null>(
         SpaceStore.instance,
@@ -88,7 +89,7 @@ export function useRoomListViewModel(): RoomListViewState {
 
     return {
         isLoadingRooms,
-        rooms,
+        roomsResult,
         canCreateRoom,
         createRoom,
         createChatRoom,
diff --git a/src/components/viewmodels/roomlist/useFilteredRooms.tsx b/src/components/viewmodels/roomlist/useFilteredRooms.tsx
index c3ed4df2ae..4e311f39db 100644
--- a/src/components/viewmodels/roomlist/useFilteredRooms.tsx
+++ b/src/components/viewmodels/roomlist/useFilteredRooms.tsx
@@ -5,15 +5,16 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { useCallback, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 
-import type { Room } from "matrix-js-sdk/src/matrix";
 import { FilterKey } from "../../../stores/room-list-v3/skip-list/filters";
 import { _t, _td, type TranslationKey } from "../../../languageHandler";
-import RoomListStoreV3, { LISTS_LOADED_EVENT, LISTS_UPDATE_EVENT } from "../../../stores/room-list-v3/RoomListStoreV3";
+import RoomListStoreV3, {
+    LISTS_LOADED_EVENT,
+    LISTS_UPDATE_EVENT,
+    type RoomsResult,
+} from "../../../stores/room-list-v3/RoomListStoreV3";
 import { useEventEmitter } from "../../../hooks/useEventEmitter";
-import SpaceStore from "../../../stores/spaces/SpaceStore";
-import { UPDATE_SELECTED_SPACE } from "../../../stores/spaces";
 
 /**
  * Provides information about a primary filter.
@@ -35,7 +36,7 @@ export interface PrimaryFilter {
 interface FilteredRooms {
     primaryFilters: PrimaryFilter[];
     isLoadingRooms: boolean;
-    rooms: Room[];
+    roomsResult: RoomsResult;
     /**
      * The currently active primary filter.
      * If no primary filter is active, this will be undefined.
@@ -47,9 +48,10 @@ const filterKeyToNameMap: Map<FilterKey, TranslationKey> = new Map([
     [FilterKey.UnreadFilter, _td("room_list|filters|unread")],
     [FilterKey.PeopleFilter, _td("room_list|filters|people")],
     [FilterKey.RoomsFilter, _td("room_list|filters|rooms")],
+    [FilterKey.FavouriteFilter, _td("room_list|filters|favourite")],
     [FilterKey.MentionsFilter, _td("room_list|filters|mentions")],
     [FilterKey.InvitesFilter, _td("room_list|filters|invites")],
-    [FilterKey.FavouriteFilter, _td("room_list|filters|favourite")],
+    [FilterKey.LowPriorityFilter, _td("room_list|filters|low_priority")],
 ]);
 
 /**
@@ -62,23 +64,26 @@ export function useFilteredRooms(): FilteredRooms {
      */
     const [primaryFilter, setPrimaryFilter] = useState<FilterKey | undefined>();
 
-    const [rooms, setRooms] = useState(() => RoomListStoreV3.instance.getSortedRoomsInActiveSpace());
+    const [roomsResult, setRoomsResult] = useState(() => RoomListStoreV3.instance.getSortedRoomsInActiveSpace());
     const [isLoadingRooms, setIsLoadingRooms] = useState(() => RoomListStoreV3.instance.isLoadingRooms);
 
     const updateRoomsFromStore = useCallback((filters: FilterKey[] = []): void => {
         const newRooms = RoomListStoreV3.instance.getSortedRoomsInActiveSpace(filters);
-        setRooms(newRooms);
+        setRoomsResult(newRooms);
     }, []);
 
-    // Reset filters when active space changes
-    useEventEmitter(SpaceStore.instance, UPDATE_SELECTED_SPACE, () => setPrimaryFilter(undefined));
-
     const filterUndefined = (array: (FilterKey | undefined)[]): FilterKey[] =>
         array.filter((f) => f !== undefined) as FilterKey[];
 
-    const getAppliedFilters = (): FilterKey[] => {
+    const getAppliedFilters = useCallback((): FilterKey[] => {
         return filterUndefined([primaryFilter]);
-    };
+    }, [primaryFilter]);
+
+    useEffect(() => {
+        // Update the rooms state when the primary filter changes
+        const filters = getAppliedFilters();
+        updateRoomsFromStore(filters);
+    }, [getAppliedFilters, updateRoomsFromStore]);
 
     useEventEmitter(RoomListStoreV3.instance, LISTS_UPDATE_EVENT, () => {
         const filters = getAppliedFilters();
@@ -121,6 +126,6 @@ export function useFilteredRooms(): FilteredRooms {
         isLoadingRooms,
         primaryFilters,
         activePrimaryFilter,
-        rooms,
+        roomsResult,
     };
 }
diff --git a/src/components/viewmodels/roomlist/useStickyRoomList.tsx b/src/components/viewmodels/roomlist/useStickyRoomList.tsx
index 06feb58581..355e09a292 100644
--- a/src/components/viewmodels/roomlist/useStickyRoomList.tsx
+++ b/src/components/viewmodels/roomlist/useStickyRoomList.tsx
@@ -12,10 +12,10 @@ import { useDispatcher } from "../../../hooks/useDispatcher";
 import dispatcher from "../../../dispatcher/dispatcher";
 import { Action } from "../../../dispatcher/actions";
 import type { Room } from "matrix-js-sdk/src/matrix";
-import type { Optional } from "matrix-events-sdk";
 import SpaceStore from "../../../stores/spaces/SpaceStore";
+import { type RoomsResult } from "../../../stores/room-list-v3/RoomListStoreV3";
 
-function getIndexByRoomId(rooms: Room[], roomId: Optional<string>): number | undefined {
+function getIndexByRoomId(rooms: Room[], roomId: string): number | undefined {
     const index = rooms.findIndex((room) => room.roomId === roomId);
     return index === -1 ? undefined : index;
 }
@@ -67,11 +67,11 @@ function getRoomsWithStickyRoom(
     return { newIndex: oldIndex, newRooms };
 }
 
-interface StickyRoomListResult {
+export interface StickyRoomListResult {
     /**
-     * List of rooms with sticky active room.
+     * The rooms result with the active sticky room applied
      */
-    rooms: Room[];
+    roomsResult: RoomsResult;
     /**
      * Index of the active room in the room list.
      */
@@ -85,10 +85,10 @@ interface StickyRoomListResult {
  * @param rooms list of rooms
  * @see {@link StickyRoomListResult} details what this hook returns..
  */
-export function useStickyRoomList(rooms: Room[]): StickyRoomListResult {
-    const [listState, setListState] = useState<{ index: number | undefined; roomsWithStickyRoom: Room[] }>({
-        index: undefined,
-        roomsWithStickyRoom: rooms,
+export function useStickyRoomList(roomsResult: RoomsResult): StickyRoomListResult {
+    const [listState, setListState] = useState<StickyRoomListResult>({
+        activeIndex: getIndexByRoomId(roomsResult.rooms, SdkContextClass.instance.roomViewStore.getRoomId()!),
+        roomsResult: roomsResult,
     });
 
     const currentSpaceRef = useRef(SpaceStore.instance.activeSpace);
@@ -97,13 +97,18 @@ export function useStickyRoomList(rooms: Room[]): StickyRoomListResult {
         (newRoomId: string | null, isRoomChange: boolean = false) => {
             setListState((current) => {
                 const activeRoomId = newRoomId ?? SdkContextClass.instance.roomViewStore.getRoomId();
-                const newActiveIndex = getIndexByRoomId(rooms, activeRoomId);
-                const oldIndex = current.index;
-                const { newIndex, newRooms } = getRoomsWithStickyRoom(rooms, oldIndex, newActiveIndex, isRoomChange);
-                return { index: newIndex, roomsWithStickyRoom: newRooms };
+                const newActiveIndex = getIndexByRoomId(roomsResult.rooms, activeRoomId!);
+                const oldIndex = current.activeIndex;
+                const { newIndex, newRooms } = getRoomsWithStickyRoom(
+                    roomsResult.rooms,
+                    oldIndex,
+                    newActiveIndex,
+                    isRoomChange,
+                );
+                return { activeIndex: newIndex, roomsResult: { ...roomsResult, rooms: newRooms } };
             });
         },
-        [rooms],
+        [roomsResult],
     );
 
     // Re-calculate the index when the active room has changed.
@@ -115,20 +120,19 @@ export function useStickyRoomList(rooms: Room[]): StickyRoomListResult {
     useEffect(() => {
         let newRoomId: string | null = null;
         let isRoomChange = false;
-        const newSpace = SpaceStore.instance.activeSpace;
-        if (currentSpaceRef.current !== newSpace) {
+        if (currentSpaceRef.current !== roomsResult.spaceId) {
             /*
             If the space has changed, we check if we can immediately set the active
             index to the last opened room in that space. Otherwise, we might see a
             flicker because of the delay between the space change event and
             active room change dispatch.
             */
-            newRoomId = SpaceStore.instance.getLastSelectedRoomIdForSpace(newSpace);
+            newRoomId = SpaceStore.instance.getLastSelectedRoomIdForSpace(roomsResult.spaceId);
             isRoomChange = true;
-            currentSpaceRef.current = newSpace;
+            currentSpaceRef.current = roomsResult.spaceId;
         }
         updateRoomsAndIndex(newRoomId, isRoomChange);
-    }, [rooms, updateRoomsAndIndex]);
+    }, [roomsResult, updateRoomsAndIndex]);
 
-    return { activeIndex: listState.index, rooms: listState.roomsWithStickyRoom };
+    return listState;
 }
diff --git a/src/components/viewmodels/settings/encryption/KeyStoragePanelViewModel.ts b/src/components/viewmodels/settings/encryption/KeyStoragePanelViewModel.ts
index ee301bd27f..e0979d8dbb 100644
--- a/src/components/viewmodels/settings/encryption/KeyStoragePanelViewModel.ts
+++ b/src/components/viewmodels/settings/encryption/KeyStoragePanelViewModel.ts
@@ -5,11 +5,14 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useState } from "react";
+import { CryptoEvent } from "matrix-js-sdk/src/crypto-api";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { useMatrixClientContext } from "../../../../contexts/MatrixClientContext";
 import DeviceListener, { BACKUP_DISABLED_ACCOUNT_DATA_KEY } from "../../../../DeviceListener";
+import { useEventEmitterAsyncState } from "../../../../hooks/useEventEmitter";
+import { resetKeyBackupAndWait } from "../../../../utils/crypto/resetKeyBackup";
 
 interface KeyStoragePanelState {
     /**
@@ -37,79 +40,97 @@ interface KeyStoragePanelState {
 
 /** Returns a ViewModel for use in {@link KeyStoragePanel} and {@link DeleteKeyStoragePanel}. */
 export function useKeyStoragePanelViewModel(): KeyStoragePanelState {
-    const [isEnabled, setIsEnabled] = useState<boolean | undefined>(undefined);
     const [loading, setLoading] = useState(true);
     // Whilst the change is being made, the toggle will reflect the pending value rather than the actual state
     const [pendingValue, setPendingValue] = useState<boolean | undefined>(undefined);
 
     const matrixClient = useMatrixClientContext();
 
-    const checkStatus = useCallback(async () => {
-        const crypto = matrixClient.getCrypto();
-        if (!crypto) {
-            logger.error("Can't check key backup status: no crypto module available");
-            return;
-        }
-        // The toggle is enabled only if this device will upload megolm keys to the backup.
-        // This is consistent with EX.
-        const activeBackupVersion = await crypto.getActiveSessionBackupVersion();
-        setIsEnabled(activeBackupVersion !== null);
-    }, [matrixClient]);
+    const isEnabled = useEventEmitterAsyncState(
+        matrixClient,
+        CryptoEvent.KeyBackupStatus,
+        async (enabled?: boolean) => {
+            // If we're called as a result of an event, rather than during
+            // initialisation, we can get the backup status from the event
+            // instead of having to query the backup version.
+            if (enabled !== undefined) {
+                return enabled;
+            }
 
-    useEffect(() => {
-        (async () => {
-            await checkStatus();
+            const crypto = matrixClient.getCrypto();
+            if (!crypto) {
+                logger.error("Can't check key backup status: no crypto module available");
+                return;
+            }
+            // The toggle is enabled only if this device will upload megolm keys to the backup.
+            // This is consistent with EX.
+            const activeBackupVersion = await crypto.getActiveSessionBackupVersion();
             setLoading(false);
-        })();
-    }, [checkStatus]);
+            return activeBackupVersion !== null;
+        },
+        [matrixClient],
+        undefined,
+    );
 
     const setEnabled = useCallback(
         async (enable: boolean) => {
             setPendingValue(enable);
             try {
-                // stop the device listener since enabling or (especially) disabling key storage must be
+                // pause the device listener since enabling or (especially) disabling key storage must be
                 // done with a sequence of API calls that will put the account in a slightly different
-                // state each time, so suppress any warning toasts until the process is finished (when
-                // we'll turn it back on again.)
-                DeviceListener.sharedInstance().stop();
-
-                const crypto = matrixClient.getCrypto();
-                if (!crypto) {
-                    logger.error("Can't change key backup status: no crypto module available");
-                    return;
-                }
-                if (enable) {
-                    // If there is no existing key backup on the server, create one.
-                    // `resetKeyBackup` will delete any existing backup, so we only do this if there is no existing backup.
-                    const currentKeyBackup = await crypto.checkKeyBackupAndEnable();
-                    if (currentKeyBackup === null) {
-                        await crypto.resetKeyBackup();
-
-                        // resetKeyBackup fires this off in the background without waiting, so we need to do it
-                        // explicitly and wait for it, otherwise it won't be enabled yet when we check again.
-                        await crypto.checkKeyBackupAndEnable();
+                // state each time, so suppress any warning toasts until the process is finished
+                await DeviceListener.sharedInstance().whilePaused(async () => {
+                    const crypto = matrixClient.getCrypto();
+                    if (!crypto) {
+                        logger.error("Can't change key backup status: no crypto module available");
+                        return;
                     }
+                    if (enable) {
+                        const childLogger = logger.getChild("[enable key storage]");
+                        childLogger.info("User requested enabling key storage");
+                        let currentKeyBackup = await crypto.checkKeyBackupAndEnable();
+                        if (currentKeyBackup) {
+                            logger.info(
+                                `Existing key backup is present. version: ${currentKeyBackup.backupInfo.version}`,
+                                currentKeyBackup.trustInfo,
+                            );
+                            // Check if the current key backup can be used. Either of these properties causes the key backup to be used.
+                            if (currentKeyBackup.trustInfo.trusted || currentKeyBackup.trustInfo.matchesDecryptionKey) {
+                                logger.info("Existing key backup can be used");
+                            } else {
+                                logger.warn("Existing key backup cannot be used, creating new backup");
+                                // There aren't any *usable* backups, so we need to create a new one.
+                                currentKeyBackup = null;
+                            }
+                        } else {
+                            logger.info("No existing key backup versions are present, creating new backup");
+                        }
 
-                    // Set the flag so that EX no longer thinks the user wants backup disabled
-                    await matrixClient.setAccountData(BACKUP_DISABLED_ACCOUNT_DATA_KEY, { disabled: false });
-                } else {
-                    // This method will delete the key backup as well as server side recovery keys and other
-                    // server-side crypto data.
-                    await crypto.disableKeyStorage();
+                        // If there is no usable key backup on the server, create one.
+                        // `resetKeyBackup` will delete any existing backup, so we only do this if there is no usable backup.
+                        if (currentKeyBackup === null) {
+                            await resetKeyBackupAndWait(crypto);
+                        }
 
-                    // Set a flag to say that the user doesn't want key backup.
-                    // Element X uses this to determine whether to set up automatically,
-                    // so this will stop EX turning it back on spontaneously.
-                    await matrixClient.setAccountData(BACKUP_DISABLED_ACCOUNT_DATA_KEY, { disabled: true });
-                }
+                        // Set the flag so that EX no longer thinks the user wants backup disabled
+                        await matrixClient.setAccountData(BACKUP_DISABLED_ACCOUNT_DATA_KEY, { disabled: false });
+                    } else {
+                        logger.info("User requested disabling key backup");
+                        // This method will delete the key backup as well as server side recovery keys and other
+                        // server-side crypto data.
+                        await crypto.disableKeyStorage();
 
-                await checkStatus();
+                        // Set a flag to say that the user doesn't want key backup.
+                        // Element X uses this to determine whether to set up automatically,
+                        // so this will stop EX turning it back on spontaneously.
+                        await matrixClient.setAccountData(BACKUP_DISABLED_ACCOUNT_DATA_KEY, { disabled: true });
+                    }
+                });
             } finally {
                 setPendingValue(undefined);
-                DeviceListener.sharedInstance().start(matrixClient);
             }
         },
-        [setPendingValue, checkStatus, matrixClient],
+        [setPendingValue, matrixClient],
     );
 
     return { isEnabled: pendingValue ?? isEnabled, setEnabled, loading, busy: pendingValue !== undefined };
diff --git a/src/components/views/audio_messages/AudioPlayer.tsx b/src/components/views/audio_messages/AudioPlayer.tsx
deleted file mode 100644
index 6f674e504d..0000000000
--- a/src/components/views/audio_messages/AudioPlayer.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2021-2023 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-import React, { type ReactNode } from "react";
-
-import PlayPauseButton from "./PlayPauseButton";
-import { formatBytes } from "../../../utils/FormattingUtils";
-import DurationClock from "./DurationClock";
-import { _t } from "../../../languageHandler";
-import SeekBar from "./SeekBar";
-import PlaybackClock from "./PlaybackClock";
-import AudioPlayerBase from "./AudioPlayerBase";
-import { PlaybackState } from "../../../audio/Playback";
-
-export default class AudioPlayer extends AudioPlayerBase {
-    protected renderFileSize(): string | null {
-        const bytes = this.props.playback.sizeBytes;
-        if (!bytes) return null;
-
-        // Not translated here - we're just presenting the data which should already
-        // be translated if needed.
-        return `(${formatBytes(bytes)})`;
-    }
-
-    protected renderComponent(): ReactNode {
-        // tabIndex=0 to ensure that the whole component becomes a tab stop, where we handle keyboard
-        // events for accessibility
-        return (
-            <div className="mx_MediaBody mx_AudioPlayer_container" tabIndex={0} onKeyDown={this.onKeyDown}>
-                <div className="mx_AudioPlayer_primaryContainer">
-                    <PlayPauseButton
-                        playback={this.props.playback}
-                        playbackPhase={this.state.playbackPhase}
-                        tabIndex={-1} // prevent tabbing into the button
-                        ref={this.playPauseRef}
-                    />
-                    <div className="mx_AudioPlayer_mediaInfo">
-                        <span className="mx_AudioPlayer_mediaName">
-                            {this.props.mediaName || _t("timeline|m.audio|unnamed_audio")}
-                        </span>
-                        <div className="mx_AudioPlayer_byline">
-                            <DurationClock playback={this.props.playback} />
-                            &nbsp; {/* easiest way to introduce a gap between the components */}
-                            {this.renderFileSize()}
-                        </div>
-                    </div>
-                </div>
-                <div className="mx_AudioPlayer_seek">
-                    <SeekBar
-                        playback={this.props.playback}
-                        tabIndex={-1} // prevent tabbing into the bar
-                        disabled={this.state.playbackPhase === PlaybackState.Decoding}
-                        ref={this.seekRef}
-                    />
-                    <PlaybackClock playback={this.props.playback} defaultDisplaySeconds={0} />
-                </div>
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/audio_messages/AudioPlayerBase.tsx b/src/components/views/audio_messages/AudioPlayerBase.tsx
index 71bea008a2..9da1020634 100644
--- a/src/components/views/audio_messages/AudioPlayerBase.tsx
+++ b/src/components/views/audio_messages/AudioPlayerBase.tsx
@@ -14,7 +14,7 @@ import { UPDATE_EVENT } from "../../../stores/AsyncStore";
 import { _t } from "../../../languageHandler";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
-import type SeekBar from "./SeekBar";
+import type LegacySeekBar from "./LegacySeekBar";
 import type PlayPauseButton from "./PlayPauseButton";
 
 export interface IProps {
@@ -31,7 +31,7 @@ interface IState {
 }
 
 export default abstract class AudioPlayerBase<T extends IProps = IProps> extends React.PureComponent<T, IState> {
-    protected seekRef = createRef<SeekBar>();
+    protected seekRef = createRef<LegacySeekBar>();
     protected playPauseRef = createRef<PlayPauseButton>();
 
     public constructor(props: T) {
diff --git a/src/components/views/audio_messages/DurationClock.tsx b/src/components/views/audio_messages/DurationClock.tsx
deleted file mode 100644
index 920baa99be..0000000000
--- a/src/components/views/audio_messages/DurationClock.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2021 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-import React from "react";
-
-import Clock from "./Clock";
-import { type Playback } from "../../../audio/Playback";
-
-interface IProps {
-    playback: Playback;
-}
-
-interface IState {
-    durationSeconds: number;
-}
-
-/**
- * A clock which shows a clip's maximum duration.
- */
-export default class DurationClock extends React.PureComponent<IProps, IState> {
-    public constructor(props: IProps) {
-        super(props);
-
-        this.state = {
-            // we track the duration on state because we won't really know what the clip duration
-            // is until the first time update, and as a PureComponent we are trying to dedupe state
-            // updates as much as possible. This is just the easiest way to avoid a forceUpdate() or
-            // member property to track "did we get a duration".
-            durationSeconds: this.props.playback.clockInfo.durationSeconds,
-        };
-    }
-
-    public componentDidMount(): void {
-        this.props.playback.clockInfo.liveData.onUpdate(this.onTimeUpdate);
-    }
-
-    private onTimeUpdate = (time: number[]): void => {
-        this.setState({ durationSeconds: time[1] });
-    };
-
-    public render(): React.ReactNode {
-        return <Clock seconds={this.state.durationSeconds} />;
-    }
-}
diff --git a/src/components/views/audio_messages/SeekBar.tsx b/src/components/views/audio_messages/LegacySeekBar.tsx
similarity index 94%
rename from src/components/views/audio_messages/SeekBar.tsx
rename to src/components/views/audio_messages/LegacySeekBar.tsx
index 587975ce1b..fe9e1dacd8 100644
--- a/src/components/views/audio_messages/SeekBar.tsx
+++ b/src/components/views/audio_messages/LegacySeekBar.tsx
@@ -7,10 +7,10 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type ChangeEvent, type CSSProperties, type ReactNode } from "react";
+import { percentageOf } from "@element-hq/web-shared-components";
 
 import { type PlaybackInterface } from "../../../audio/Playback";
 import { MarkedExecution } from "../../../utils/MarkedExecution";
-import { percentageOf } from "../../../utils/numbers";
 import { _t } from "../../../languageHandler";
 
 interface IProps {
@@ -35,7 +35,10 @@ interface ISeekCSS extends CSSProperties {
 
 const ARROW_SKIP_SECONDS = 5; // arbitrary
 
-export default class SeekBar extends React.PureComponent<IProps, IState> {
+/**
+ * @deprecated Use {@link SeekBar} instead.
+ */
+export default class LegacySeekBar extends React.PureComponent<IProps, IState> {
     // We use an animation frame request to avoid overly spamming prop updates, even if we aren't
     // really using anything demanding on the CSS front.
 
diff --git a/src/components/views/audio_messages/LiveRecordingClock.tsx b/src/components/views/audio_messages/LiveRecordingClock.tsx
index 74415566a6..9ea00c2d67 100644
--- a/src/components/views/audio_messages/LiveRecordingClock.tsx
+++ b/src/components/views/audio_messages/LiveRecordingClock.tsx
@@ -7,9 +7,9 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
+import { Clock } from "@element-hq/web-shared-components";
 
 import { type IRecordingUpdate } from "../../../audio/VoiceRecording";
-import Clock from "./Clock";
 import { MarkedExecution } from "../../../utils/MarkedExecution";
 import { type VoiceMessageRecording } from "../../../audio/VoiceMessageRecording";
 
diff --git a/src/components/views/audio_messages/PlayPauseButton.tsx b/src/components/views/audio_messages/PlayPauseButton.tsx
index a4457b2230..1af6971d2c 100644
--- a/src/components/views/audio_messages/PlayPauseButton.tsx
+++ b/src/components/views/audio_messages/PlayPauseButton.tsx
@@ -6,14 +6,12 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { type ReactNode } from "react";
-import classNames from "classnames";
+import React, { type HTMLAttributes, type ReactNode } from "react";
+import { PlayPauseButton as SharedPlayPauseButton } from "@element-hq/web-shared-components";
 
-import { _t } from "../../../languageHandler";
 import { type Playback, PlaybackState } from "../../../audio/Playback";
-import AccessibleButton, { type ButtonProps } from "../elements/AccessibleButton";
 
-type Props = Omit<ButtonProps<"div">, "title" | "onClick" | "disabled" | "element" | "ref"> & {
+type Props = HTMLAttributes<HTMLButtonElement> & {
     // Playback instance to manipulate. Cannot change during the component lifecycle.
     playback: Playback;
 
@@ -27,8 +25,7 @@ type Props = Omit<ButtonProps<"div">, "title" | "onClick" | "disabled" | "elemen
  */
 export default class PlayPauseButton extends React.PureComponent<Props> {
     private onClick = (): void => {
-        // noinspection JSIgnoredPromiseFromCall
-        this.toggleState();
+        void this.toggleState();
     };
 
     public async toggleState(): Promise<void> {
@@ -37,21 +34,14 @@ export default class PlayPauseButton extends React.PureComponent<Props> {
 
     public render(): ReactNode {
         const { playback, playbackPhase, ...restProps } = this.props;
-        const isPlaying = playback.isPlaying;
-        const isDisabled = playbackPhase === PlaybackState.Decoding;
-        const classes = classNames("mx_PlayPauseButton", {
-            mx_PlayPauseButton_play: !isPlaying,
-            mx_PlayPauseButton_pause: isPlaying,
-            mx_PlayPauseButton_disabled: isDisabled,
-        });
 
         return (
-            <AccessibleButton
+            <SharedPlayPauseButton
                 data-testid="play-pause-button"
-                className={classes}
-                title={isPlaying ? _t("action|pause") : _t("action|play")}
-                onClick={this.onClick}
-                disabled={isDisabled}
+                className="mx_PlayPauseButton"
+                togglePlay={this.onClick}
+                playing={playback.isPlaying}
+                disabled={playbackPhase === PlaybackState.Decoding}
                 {...restProps}
             />
         );
diff --git a/src/components/views/audio_messages/PlaybackClock.tsx b/src/components/views/audio_messages/PlaybackClock.tsx
index 0d69793379..78ac81f25c 100644
--- a/src/components/views/audio_messages/PlaybackClock.tsx
+++ b/src/components/views/audio_messages/PlaybackClock.tsx
@@ -7,8 +7,8 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
+import { Clock } from "@element-hq/web-shared-components";
 
-import Clock from "./Clock";
 import { type Playback, PlaybackState } from "../../../audio/Playback";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
 
diff --git a/src/components/views/audio_messages/PlaybackWaveform.tsx b/src/components/views/audio_messages/PlaybackWaveform.tsx
index c1f470f4b1..215011e6cb 100644
--- a/src/components/views/audio_messages/PlaybackWaveform.tsx
+++ b/src/components/views/audio_messages/PlaybackWaveform.tsx
@@ -7,11 +7,11 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
+import { percentageOf } from "@element-hq/web-shared-components";
 
 import { arraySeed, arrayTrimFill } from "../../../utils/arrays";
 import Waveform from "./Waveform";
 import { type Playback } from "../../../audio/Playback";
-import { percentageOf } from "../../../utils/numbers";
 import { PLAYBACK_WAVEFORM_SAMPLES } from "../../../audio/consts";
 
 interface IProps {
diff --git a/src/components/views/audio_messages/RecordingPlayback.tsx b/src/components/views/audio_messages/RecordingPlayback.tsx
index c0e3337787..4f5c392d41 100644
--- a/src/components/views/audio_messages/RecordingPlayback.tsx
+++ b/src/components/views/audio_messages/RecordingPlayback.tsx
@@ -11,7 +11,7 @@ import React, { type ReactNode } from "react";
 import PlayPauseButton from "./PlayPauseButton";
 import PlaybackClock from "./PlaybackClock";
 import AudioPlayerBase, { type IProps as IAudioPlayerBaseProps } from "./AudioPlayerBase";
-import SeekBar from "./SeekBar";
+import LegacySeekBar from "./LegacySeekBar";
 import PlaybackWaveform from "./PlaybackWaveform";
 import { PlaybackState } from "../../../audio/Playback";
 
@@ -49,7 +49,7 @@ export default class RecordingPlayback extends AudioPlayerBase<IProps> {
             <>
                 <div className="mx_RecordingPlayback_timelineLayoutMiddle">
                     <PlaybackWaveform playback={this.props.playback} />
-                    <SeekBar
+                    <LegacySeekBar
                         playback={this.props.playback}
                         tabIndex={0} // allow keyboard users to fall into the seek bar
                         disabled={this.state.playbackPhase === PlaybackState.Decoding}
@@ -74,7 +74,11 @@ export default class RecordingPlayback extends AudioPlayerBase<IProps> {
         }
 
         return (
-            <div className="mx_MediaBody mx_VoiceMessagePrimaryContainer" onKeyDown={this.onKeyDown}>
+            <div
+                className="mx_MediaBody mx_VoiceMessagePrimaryContainer"
+                onKeyDown={this.onKeyDown}
+                data-testid="recording-playback"
+            >
                 <PlayPauseButton
                     playback={this.props.playback}
                     playbackPhase={this.state.playbackPhase}
diff --git a/src/components/views/auth/AuthBody.tsx b/src/components/views/auth/AuthBody.tsx
index 98ed548584..e357752a97 100644
--- a/src/components/views/auth/AuthBody.tsx
+++ b/src/components/views/auth/AuthBody.tsx
@@ -14,5 +14,5 @@ interface Props {
 }
 
 export default function AuthBody({ flex, className, children }: PropsWithChildren<Props>): JSX.Element {
-    return <main className={classNames("mx_AuthBody", className, { mx_AuthBody_flex: flex })}>{children}</main>;
+    return <div className={classNames("mx_AuthBody", className, { mx_AuthBody_flex: flex })}>{children}</div>;
 }
diff --git a/src/components/views/auth/AuthPage.tsx b/src/components/views/auth/AuthPage.tsx
index dd3facaa79..adc901f6c9 100644
--- a/src/components/views/auth/AuthPage.tsx
+++ b/src/components/views/auth/AuthPage.tsx
@@ -8,11 +8,22 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
+import classNames from "classnames";
 
 import SdkConfig from "../../../SdkConfig";
 import AuthFooter from "./AuthFooter";
 
-export default class AuthPage extends React.PureComponent<React.PropsWithChildren> {
+interface IProps {
+    /**
+     * Whether to add a blurred shadow around the modal.
+     *
+     * If the modal component provides its own shadow or blurring, this can be
+     * disabled.  Defaults to `true`.
+     */
+    addBlur?: boolean;
+}
+
+export default class AuthPage extends React.PureComponent<React.PropsWithChildren<IProps>> {
     private static welcomeBackgroundUrl?: string;
 
     // cache the url as a static to prevent it changing without refreshing
@@ -58,17 +69,33 @@ export default class AuthPage extends React.PureComponent<React.PropsWithChildre
         const modalContentStyle: React.CSSProperties = {
             display: "flex",
             zIndex: 1,
-            background: "rgba(255, 255, 255, 0.59)",
-            borderRadius: "8px",
+            borderRadius: "inherit",
         };
 
+        let modalBlur;
+        if (this.props.addBlur !== false) {
+            // Blur out the background: add a `div` which covers the content behind the modal,
+            // and blurs it out.
+            modalBlur = <div className="mx_AuthPage_modalBlur" style={blurStyle} />;
+        }
+
+        const modalClasses = classNames({
+            mx_AuthPage_modal: true,
+            mx_AuthPage_modal_withBlur: this.props.addBlur !== false,
+        });
+
         return (
             <div className="mx_AuthPage" style={pageStyle}>
-                <div className="mx_AuthPage_modal" style={modalStyle}>
-                    <div className="mx_AuthPage_modalBlur" style={blurStyle} />
-                    <div className="mx_AuthPage_modalContent" style={modalContentStyle}>
+                <div className={modalClasses} style={modalStyle}>
+                    {modalBlur}
+                    <main
+                        className="mx_AuthPage_modalContent"
+                        style={modalContentStyle}
+                        tabIndex={-1}
+                        aria-live="polite"
+                    >
                         {this.props.children}
-                    </div>
+                    </main>
                 </div>
                 <AuthFooter />
             </div>
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.tsx b/src/components/views/auth/InteractiveAuthEntryComponents.tsx
index a9bf8b7597..6f1e74b63d 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.tsx
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.tsx
@@ -460,7 +460,7 @@ export class EmailIdentityAuthEntry extends React.Component<
                                     a: (text: string) => (
                                         <Fragment>
                                             <AccessibleButton kind="link_inline" onClick={null} disabled>
-                                                {text} <Spinner w={14} h={14} />
+                                                {text} <Spinner size={14} />
                                             </AccessibleButton>
                                         </Fragment>
                                     ),
@@ -875,7 +875,7 @@ export class SSOAuthEntry extends React.Component<ISSOAuthEntryProps, ISSOAuthEn
                 {errorSection}
                 <div className="mx_InteractiveAuthEntryComponents_sso_buttons">
                     {this.props.busy ? (
-                        <Spinner w={24} h={24} />
+                        <Spinner size={24} />
                     ) : (
                         <>
                             {cancelButton}
diff --git a/src/components/views/auth/LoginWithQRFlow.tsx b/src/components/views/auth/LoginWithQRFlow.tsx
index 3a5a88f78d..a432baac72 100644
--- a/src/components/views/auth/LoginWithQRFlow.tsx
+++ b/src/components/views/auth/LoginWithQRFlow.tsx
@@ -290,7 +290,7 @@ export default class LoginWithQRFlow extends React.Component<Props> {
                             data-testid="back-button"
                             className="mx_LoginWithQR_BackButton"
                             onClick={this.handleClick(Click.Back)}
-                            title="Back"
+                            title={_t("action|back")}
                         >
                             <ChevronLeftIcon />
                         </AccessibleButton>
diff --git a/src/components/views/auth/Welcome.tsx b/src/components/views/auth/Welcome.tsx
index 59fd1533e3..e2b64028e4 100644
--- a/src/components/views/auth/Welcome.tsx
+++ b/src/components/views/auth/Welcome.tsx
@@ -26,6 +26,7 @@ export default class Welcome extends React.PureComponent<EmptyObject> {
         }
 
         const replaceMap: Record<string, string> = {
+            "$brand": SdkConfig.get("brand"),
             "$riot:ssoUrl": "#/start_sso",
             "$riot:casUrl": "#/start_cas",
             "$matrixLogo": MATRIX_LOGO_HTML,
diff --git a/src/components/views/avatars/RoomAvatarView.tsx b/src/components/views/avatars/RoomAvatarView.tsx
index 8810d073c5..408690fa1d 100644
--- a/src/components/views/avatars/RoomAvatarView.tsx
+++ b/src/components/views/avatars/RoomAvatarView.tsx
@@ -9,13 +9,15 @@ import React, { type JSX } from "react";
 import { type Room } from "matrix-js-sdk/src/matrix";
 import PublicIcon from "@vector-im/compound-design-tokens/assets/web/icons/public";
 import VideoIcon from "@vector-im/compound-design-tokens/assets/web/icons/video-call-solid";
+import ArrowDownIcon from "@vector-im/compound-design-tokens/assets/web/icons/arrow-down";
 import OnlineOrUnavailableIcon from "@vector-im/compound-design-tokens/assets/web/icons/presence-solid-8x8";
 import OfflineIcon from "@vector-im/compound-design-tokens/assets/web/icons/presence-outline-8x8";
 import BusyIcon from "@vector-im/compound-design-tokens/assets/web/icons/presence-strikethrough-8x8";
 import classNames from "classnames";
+import { Tooltip } from "@vector-im/compound-web";
 
 import RoomAvatar from "./RoomAvatar";
-import { useRoomAvatarViewModel } from "../../viewmodels/avatars/RoomAvatarViewModel";
+import { AvatarBadgeDecoration, useRoomAvatarViewModel } from "../../viewmodels/avatars/RoomAvatarViewModel";
 import { _t } from "../../../languageHandler";
 import { Presence } from "./WithPresenceIndicator";
 
@@ -33,56 +35,30 @@ interface RoomAvatarViewProps {
 export function RoomAvatarView({ room }: RoomAvatarViewProps): JSX.Element {
     const vm = useRoomAvatarViewModel(room);
     // No decoration, we just show the avatar
-    if (!vm.hasDecoration) return <RoomAvatar size="32px" room={room} />;
+    if (!vm.badgeDecoration) return <RoomAvatar size="32px" room={room} />;
+
+    const icon = getAvatarDecoration(vm.badgeDecoration, vm.presence);
+    const label = getDecorationLabel(vm.badgeDecoration, vm.presence);
+
+    // Presence indicator and video/public icons don't have the same size
+    // We use different masks
+    const maskClass =
+        vm.badgeDecoration === AvatarBadgeDecoration.Presence
+            ? "mx_RoomAvatarView_RoomAvatar_presence"
+            : "mx_RoomAvatarView_RoomAvatar_icon";
 
     return (
         <div className="mx_RoomAvatarView">
-            <RoomAvatar
-                className={classNames("mx_RoomAvatarView_RoomAvatar", {
-                    // Presence indicator and video/public icons don't have the same size
-                    // We use different masks
-                    mx_RoomAvatarView_RoomAvatar_icon: vm.isVideoRoom || vm.isPublic,
-                    mx_RoomAvatarView_RoomAvatar_presence: Boolean(vm.presence),
-                })}
-                size="32px"
-                room={room}
-            />
-
-            {/* If the room is a public video room, we prefer to display only the video icon */}
-            {vm.isPublic && !vm.isVideoRoom && (
-                <PublicIcon
-                    width="16px"
-                    height="16px"
-                    className="mx_RoomAvatarView_icon"
-                    color="var(--cpd-color-icon-tertiary)"
-                    aria-label={_t("room|header|room_is_public")}
-                />
-            )}
-            {vm.isVideoRoom && (
-                <VideoIcon
-                    width="16px"
-                    height="16px"
-                    className="mx_RoomAvatarView_icon"
-                    color="var(--cpd-color-icon-tertiary)"
-                    aria-label={_t("room|video_room")}
-                />
-            )}
-            {vm.presence && <PresenceDecoration presence={vm.presence} />}
+            <RoomAvatar className={classNames("mx_RoomAvatarView_RoomAvatar", maskClass)} size="32px" room={room} />
+            {label ? <Tooltip label={label}>{icon}</Tooltip> : icon}
         </div>
     );
 }
 
-type PresenceDecorationProps = {
-    /**
-     * The presence of the user in the DM room.
-     */
-    presence: NonNullable<Presence>;
-};
-
 /**
- * Component to display the presence of a user in a DM room.
+ * Get the decoration for the avatar based on the presence.
  */
-function PresenceDecoration({ presence }: PresenceDecorationProps): JSX.Element {
+function getPresenceDecoration(presence: Presence): JSX.Element {
     switch (presence) {
         case Presence.Online:
             return (
@@ -91,7 +67,7 @@ function PresenceDecoration({ presence }: PresenceDecorationProps): JSX.Element
                     height="8px"
                     className="mx_RoomAvatarView_PresenceDecoration"
                     color="var(--cpd-color-icon-accent-primary)"
-                    aria-label={_t("presence|online")}
+                    aria-label={getPresenceLabel(presence)}
                 />
             );
         case Presence.Away:
@@ -101,7 +77,7 @@ function PresenceDecoration({ presence }: PresenceDecorationProps): JSX.Element
                     height="8px"
                     className="mx_RoomAvatarView_PresenceDecoration"
                     color="var(--cpd-color-icon-quaternary)"
-                    aria-label={_t("presence|away")}
+                    aria-label={getPresenceLabel(presence)}
                 />
             );
         case Presence.Offline:
@@ -111,7 +87,7 @@ function PresenceDecoration({ presence }: PresenceDecorationProps): JSX.Element
                     height="8px"
                     className="mx_RoomAvatarView_PresenceDecoration"
                     color="var(--cpd-color-icon-tertiary)"
-                    aria-label={_t("presence|offline")}
+                    aria-label={getPresenceLabel(presence)}
                 />
             );
         case Presence.Busy:
@@ -121,8 +97,78 @@ function PresenceDecoration({ presence }: PresenceDecorationProps): JSX.Element
                     height="8px"
                     className="mx_RoomAvatarView_PresenceDecoration"
                     color="var(--cpd-color-icon-tertiary)"
-                    aria-label={_t("presence|busy")}
+                    aria-label={getPresenceLabel(presence)}
                 />
             );
     }
 }
+
+function getAvatarDecoration(decoration: AvatarBadgeDecoration, presence: Presence | null): React.ReactNode {
+    if (decoration === AvatarBadgeDecoration.LowPriority) {
+        return (
+            <ArrowDownIcon
+                width="16px"
+                height="16px"
+                className="mx_RoomAvatarView_icon"
+                color="var(--cpd-color-icon-tertiary)"
+                aria-label={getDecorationLabel(decoration, presence)}
+            />
+        );
+    } else if (decoration === AvatarBadgeDecoration.VideoRoom) {
+        return (
+            <VideoIcon
+                width="16px"
+                height="16px"
+                className="mx_RoomAvatarView_icon"
+                color="var(--cpd-color-icon-tertiary)"
+                aria-label={getDecorationLabel(decoration, presence)}
+            />
+        );
+    } else if (decoration === AvatarBadgeDecoration.PublicRoom) {
+        return (
+            <PublicIcon
+                width="16px"
+                height="16px"
+                className="mx_RoomAvatarView_icon"
+                color="var(--cpd-color-icon-info-primary)"
+                aria-label={getDecorationLabel(decoration, presence)}
+            />
+        );
+    } else if (decoration === AvatarBadgeDecoration.Presence) {
+        return getPresenceDecoration(presence!);
+    }
+}
+
+/**
+ * Get the label for the avatar decoration.
+ * This is used for the tooltip and a11y label.
+ */
+function getDecorationLabel(decoration: AvatarBadgeDecoration, presence: Presence | null): string | undefined {
+    switch (decoration) {
+        case AvatarBadgeDecoration.LowPriority:
+            return _t("room|room_is_low_priority");
+        case AvatarBadgeDecoration.VideoRoom:
+            return _t("room|video_room");
+        case AvatarBadgeDecoration.PublicRoom:
+            return _t("room|header|room_is_public");
+        case AvatarBadgeDecoration.Presence:
+            return getPresenceLabel(presence!);
+    }
+}
+
+/**
+ * Get the label for the presence.
+ * This is used for the tooltip and a11y label.
+ */
+function getPresenceLabel(presence: Presence): string {
+    switch (presence) {
+        case Presence.Online:
+            return _t("presence|online");
+        case Presence.Away:
+            return _t("presence|away");
+        case Presence.Offline:
+            return _t("presence|offline");
+        case Presence.Busy:
+            return _t("presence|busy");
+    }
+}
diff --git a/src/components/views/avatars/WidgetAvatar.tsx b/src/components/views/avatars/WidgetAvatar.tsx
index c43cd98216..5baba7ca01 100644
--- a/src/components/views/avatars/WidgetAvatar.tsx
+++ b/src/components/views/avatars/WidgetAvatar.tsx
@@ -37,6 +37,8 @@ const WidgetAvatar: React.FC<IProps> = ({ app, className, size = "20px", ...prop
     return (
         <BaseAvatar
             {...props}
+            // Span elements cannot have a label
+            role="img"
             name={app.id}
             className={classNames("mx_WidgetAvatar", className)}
             // MSC2765
diff --git a/src/components/views/beacon/BeaconListItem.tsx b/src/components/views/beacon/BeaconListItem.tsx
index ceedbf05fd..fb2dc2e17d 100644
--- a/src/components/views/beacon/BeaconListItem.tsx
+++ b/src/components/views/beacon/BeaconListItem.tsx
@@ -8,10 +8,10 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type HTMLProps, useContext } from "react";
 import { type Beacon, BeaconEvent, LocationAssetType } from "matrix-js-sdk/src/matrix";
+import { humanizeTime } from "@element-hq/web-shared-components";
 
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { useEventEmitterState } from "../../../hooks/useEventEmitter";
-import { humanizeTime } from "../../../utils/humanize";
 import { preventDefaultWrapper } from "../../../utils/NativeEventUtils";
 import { _t } from "../../../languageHandler";
 import MemberAvatar from "../avatars/MemberAvatar";
diff --git a/src/components/views/beacon/RoomCallBanner.tsx b/src/components/views/beacon/RoomCallBanner.tsx
index e4f0dfa608..25109a0a5a 100644
--- a/src/components/views/beacon/RoomCallBanner.tsx
+++ b/src/components/views/beacon/RoomCallBanner.tsx
@@ -20,7 +20,7 @@ import { useCall } from "../../../hooks/useCall";
 import { useEventEmitterState } from "../../../hooks/useEventEmitter";
 import { OwnBeaconStore, OwnBeaconStoreEvent } from "../../../stores/OwnBeaconStore";
 import { SessionDuration } from "../voip/CallDuration";
-import { SdkContextClass } from "../../../contexts/SDKContext";
+import { useScopedRoomContext } from "../../../contexts/ScopedRoomContext";
 
 interface RoomCallBannerProps {
     roomId: Room["roomId"];
@@ -35,7 +35,7 @@ const RoomCallBannerInner: React.FC<RoomCallBannerProps> = ({ roomId, call }) =>
                 action: Action.ViewRoom,
                 room_id: roomId,
                 view_call: true,
-                skipLobby: "shiftKey" in ev ? ev.shiftKey : false,
+                skipLobby: ("shiftKey" in ev && ev.shiftKey) || undefined,
                 metricsTrigger: undefined,
             });
         },
@@ -83,7 +83,7 @@ interface Props {
 
 const RoomCallBanner: React.FC<Props> = ({ roomId }) => {
     const call = useCall(roomId);
-
+    const { roomViewStore } = useScopedRoomContext("roomViewStore");
     // this section is to check if we have a live location share. If so, we dont show the call banner
     const isMonitoringLiveLocation = useEventEmitterState(
         OwnBeaconStore.instance,
@@ -100,7 +100,7 @@ const RoomCallBanner: React.FC<Props> = ({ roomId }) => {
     }
 
     // Check if the call is already showing. No banner is needed in this case.
-    if (SdkContextClass.instance.roomViewStore.isViewingCall()) {
+    if (roomViewStore.isViewingCall()) {
         return null;
     }
 
diff --git a/src/components/views/beacon/ShareLatestLocation.tsx b/src/components/views/beacon/ShareLatestLocation.tsx
index b18cdff839..9eee972419 100644
--- a/src/components/views/beacon/ShareLatestLocation.tsx
+++ b/src/components/views/beacon/ShareLatestLocation.tsx
@@ -9,8 +9,8 @@ Please see LICENSE files in the repository root for full details.
 import React, { useEffect, useState } from "react";
 import { type ContentHelpers } from "matrix-js-sdk/src/matrix";
 import { Tooltip } from "@vector-im/compound-web";
+import { PopOutIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
-import { Icon as ExternalLinkIcon } from "../../../../res/img/external-link.svg";
 import { _t } from "../../../languageHandler";
 import { makeMapSiteLink, parseGeoUri } from "../../../utils/location";
 import CopyableText from "../elements/CopyableText";
@@ -40,7 +40,7 @@ const ShareLatestLocation: React.FC<Props> = ({ latestLocationState }) => {
         <>
             <Tooltip label={_t("timeline|context_menu|open_in_osm")}>
                 <a data-testid="open-location-in-osm" href={mapLink} target="_blank" rel="noreferrer noopener">
-                    <ExternalLinkIcon className="mx_ShareLatestLocation_icon" />
+                    <PopOutIcon className="mx_ShareLatestLocation_icon" />
                 </a>
             </Tooltip>
             <CopyableText className="mx_ShareLatestLocation_copy" border={false} getTextToCopy={() => latLonString} />
diff --git a/src/components/views/composer/HistoryVisibleBanner.tsx b/src/components/views/composer/HistoryVisibleBanner.tsx
new file mode 100644
index 0000000000..85a6bd7fb9
--- /dev/null
+++ b/src/components/views/composer/HistoryVisibleBanner.tsx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { HistoryVisibleBannerView, useCreateAutoDisposedViewModel } from "@element-hq/web-shared-components";
+import React from "react";
+import { type Room } from "matrix-js-sdk/src/matrix";
+
+import { HistoryVisibleBannerViewModel } from "../../../viewmodels/composer/HistoryVisibleBannerViewModel";
+
+/** Wrapper around {@link HistoryVisibleBannerViewModel} for the creation of an auto-disposed view model. */
+export const HistoryVisibleBanner: React.FC<{
+    /** The room instance associated with this banner view model. */
+    room: Room;
+
+    /** Whether the current user can send messages in the room. */
+    canSendMessages: boolean;
+
+    /**
+     * If not null, specifies the ID of the thread currently being viewed in the thread timeline side view,
+     * where the banner view is displayed as a child of the message composer.
+     */
+    threadId: string | null;
+}> = (props) => {
+    const vm = useCreateAutoDisposedViewModel(() => new HistoryVisibleBannerViewModel(props));
+    return <HistoryVisibleBannerView vm={vm} />;
+};
diff --git a/src/components/views/context_menus/DeveloperToolsOption.tsx b/src/components/views/context_menus/DeveloperToolsOption.tsx
index 53a5d7283d..b1b8a5b136 100644
--- a/src/components/views/context_menus/DeveloperToolsOption.tsx
+++ b/src/components/views/context_menus/DeveloperToolsOption.tsx
@@ -7,6 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
+import { LabsIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import Modal from "../../../Modal";
 import DevtoolsDialog from "../dialogs/DevtoolsDialog";
@@ -32,7 +33,7 @@ export const DeveloperToolsOption: React.FC<Props> = ({ onFinished, roomId }) =>
                 onFinished();
             }}
             label={_t("devtools|title")}
-            iconClassName="mx_IconizedContextMenu_developerTools"
+            icon={<LabsIcon />}
         />
     );
 };
diff --git a/src/components/views/context_menus/DeviceContextMenu.tsx b/src/components/views/context_menus/DeviceContextMenu.tsx
index b6646c05ec..7560b4a7d5 100644
--- a/src/components/views/context_menus/DeviceContextMenu.tsx
+++ b/src/components/views/context_menus/DeviceContextMenu.tsx
@@ -26,14 +26,7 @@ interface IDeviceContextMenuDeviceProps {
 }
 
 const DeviceContextMenuDevice: React.FC<IDeviceContextMenuDeviceProps> = ({ label, selected, onClick }) => {
-    return (
-        <IconizedContextMenuRadio
-            iconClassName="mx_DeviceContextMenu_device_icon"
-            label={label}
-            active={selected}
-            onClick={onClick}
-        />
-    );
+    return <IconizedContextMenuRadio label={label} active={selected} onClick={onClick} />;
 };
 
 interface IDeviceContextMenuSectionProps {
diff --git a/src/components/views/context_menus/IconizedContextMenu.tsx b/src/components/views/context_menus/IconizedContextMenu.tsx
index b6372a96c6..b7d07cae3f 100644
--- a/src/components/views/context_menus/IconizedContextMenu.tsx
+++ b/src/components/views/context_menus/IconizedContextMenu.tsx
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type JSX, type ReactNode } from "react";
 import classNames from "classnames";
+import { CheckIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import ContextMenu, {
     ChevronFace,
@@ -32,26 +33,20 @@ interface IOptionListProps {
 }
 
 interface IOptionProps extends React.ComponentProps<typeof MenuItem> {
-    iconClassName?: string;
+    icon?: ReactNode;
     isDestructive?: boolean;
 }
 
 interface ICheckboxProps extends React.ComponentProps<typeof MenuItemCheckbox> {
-    iconClassName: string;
+    icon?: ReactNode;
     words?: boolean;
 }
 
 interface IRadioProps extends React.ComponentProps<typeof MenuItemRadio> {
-    iconClassName?: string;
+    icon?: ReactNode;
 }
 
-export const IconizedContextMenuRadio: React.FC<IRadioProps> = ({
-    label,
-    iconClassName,
-    active,
-    className,
-    ...props
-}) => {
+export const IconizedContextMenuRadio: React.FC<IRadioProps> = ({ label, icon, active, className, ...props }) => {
     return (
         <MenuItemRadio
             {...props}
@@ -62,35 +57,28 @@ export const IconizedContextMenuRadio: React.FC<IRadioProps> = ({
             active={active}
             label={label}
         >
-            {iconClassName && <span className={classNames("mx_IconizedContextMenu_icon", iconClassName)} />}
+            {icon}
             <span className="mx_IconizedContextMenu_label">{label}</span>
-            {active && <span className="mx_IconizedContextMenu_icon mx_IconizedContextMenu_checked" />}
+            {active && <CheckIcon className="mx_IconizedContextMenu_checked" />}
         </MenuItemRadio>
     );
 };
 
 export const IconizedContextMenuCheckbox: React.FC<ICheckboxProps> = ({
     label,
-    iconClassName,
+    icon,
     active,
     className,
     words,
     ...props
 }) => {
-    let marker: JSX.Element;
+    let marker: JSX.Element | undefined;
     if (words) {
         marker = (
             <span className="mx_IconizedContextMenu_activeText">{active ? _t("common|on") : _t("common|off")}</span>
         );
-    } else {
-        marker = (
-            <span
-                className={classNames("mx_IconizedContextMenu_icon", {
-                    mx_IconizedContextMenu_checked: active,
-                    mx_IconizedContextMenu_unchecked: !active,
-                })}
-            />
-        );
+    } else if (active) {
+        marker = <CheckIcon className="mx_IconizedContextMenu_checked" />;
     }
 
     return (
@@ -103,7 +91,7 @@ export const IconizedContextMenuCheckbox: React.FC<ICheckboxProps> = ({
             active={active}
             label={label}
         >
-            <span className={classNames("mx_IconizedContextMenu_icon", iconClassName)} />
+            {icon}
             <span className="mx_IconizedContextMenu_label">{label}</span>
             {marker}
         </MenuItemCheckbox>
@@ -113,7 +101,7 @@ export const IconizedContextMenuCheckbox: React.FC<ICheckboxProps> = ({
 export const IconizedContextMenuOption: React.FC<IOptionProps> = ({
     label,
     className,
-    iconClassName,
+    icon,
     children,
     isDestructive,
     ...props
@@ -128,7 +116,7 @@ export const IconizedContextMenuOption: React.FC<IOptionProps> = ({
             })}
             label={label}
         >
-            {iconClassName && <span className={classNames("mx_IconizedContextMenu_icon", iconClassName)} />}
+            {icon}
             <span className="mx_IconizedContextMenu_label">{label}</span>
             {children}
         </MenuItem>
diff --git a/src/components/views/context_menus/MessageContextMenu.tsx b/src/components/views/context_menus/MessageContextMenu.tsx
index 76f6b31989..4f1a6a962a 100644
--- a/src/components/views/context_menus/MessageContextMenu.tsx
+++ b/src/components/views/context_menus/MessageContextMenu.tsx
@@ -20,6 +20,27 @@ import {
     Thread,
     M_POLL_START,
 } from "matrix-js-sdk/src/matrix";
+import {
+    CheckIcon,
+    ChevronUpIcon,
+    EditIcon,
+    ErrorSolidIcon,
+    InlineCodeIcon,
+    LinkIcon,
+    PinIcon,
+    QuoteIcon,
+    ReactionAddIcon,
+    ReplyIcon,
+    RestartIcon,
+    ThreadsIcon,
+    UnpinIcon,
+    DeleteIcon,
+    ForwardIcon,
+    PopOutIcon,
+    VisibilityOnIcon,
+    ShareIcon,
+    CopyIcon,
+} from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher/dispatcher";
@@ -53,6 +74,8 @@ import { type ShowThreadPayload } from "../../../dispatcher/payloads/ShowThreadP
 import { CardContext } from "../right_panel/context";
 import PinningUtils from "../../../utils/PinningUtils";
 import PosthogTrackers from "../../../PosthogTrackers.ts";
+import { Icon as ViewInRoomIcon } from "../../../../res/img/element-icons/view-in-room.svg";
+import { Icon as ChildRelationshipIcon } from "../../../../res/img/element-icons/child-relationship.svg";
 
 interface IReplyInThreadButton {
     mxEvent: MatrixEvent;
@@ -86,13 +109,7 @@ const ReplyInThreadButton: React.FC<IReplyInThreadButton> = ({ mxEvent, closeMen
         closeMenu();
     };
 
-    return (
-        <IconizedContextMenuOption
-            iconClassName="mx_MessageContextMenu_iconReplyInThread"
-            label={_t("action|reply_in_thread")}
-            onClick={onClick}
-        />
-    );
+    return <IconizedContextMenuOption icon={<ThreadsIcon />} label={_t("action|reply_in_thread")} onClick={onClick} />;
 };
 
 interface IProps extends MenuProps {
@@ -183,6 +200,30 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         );
     }
 
+    /**
+     * Returns true if the current selection is entirely within a single "mx_MTextBody" element.
+     */
+    private isSelectionWithinSingleTextBody(): boolean {
+        const selection = window.getSelection();
+        if (!selection || selection.rangeCount === 0) return false;
+        const range = selection.getRangeAt(0);
+
+        function getParentByClass(node: Node | null, className: string): HTMLElement | null {
+            while (node) {
+                if (node instanceof HTMLElement && node.classList.contains(className)) {
+                    return node;
+                }
+                node = node.parentNode;
+            }
+            return null;
+        }
+
+        const startTextBody = getParentByClass(range.startContainer, "mx_MTextBody");
+        const endTextBody = getParentByClass(range.endContainer, "mx_MTextBody");
+
+        return !!startTextBody && startTextBody === endTextBody;
+    }
+
     private onResendReactionsClick = (): void => {
         for (const reaction of this.getUnsentReactions()) {
             Resend.resend(MatrixClientPeg.safeGet(), reaction);
@@ -231,7 +272,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         dis.dispatch<OpenForwardDialogPayload>({
             action: Action.OpenForwardDialog,
             event: forwardableEvent,
-            permalinkCreator: this.props.permalinkCreator,
+            permalinkCreator: this.props.permalinkCreator ?? null,
         });
         this.closeMenu();
     };
@@ -279,6 +320,24 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         this.closeMenu();
     };
 
+    private onQuoteClick = (): void => {
+        const selectedText = getSelectedText();
+        if (selectedText) {
+            // Format as markdown quote
+            const quotedText = selectedText
+                .trim()
+                .split(/\r?\n/)
+                .map((line) => `> ${line}`)
+                .join("\n");
+            dis.dispatch({
+                action: Action.ComposerInsert,
+                text: "\n" + quotedText + "\n\n ",
+                timelineRenderingType: this.context.timelineRenderingType,
+            });
+        }
+        this.closeMenu();
+    };
+
     private onEditClick = (): void => {
         editEvent(
             MatrixClientPeg.safeGet(),
@@ -371,7 +430,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         if (!mxEvent.isRedacted() && unsentReactionsCount !== 0) {
             resendReactionsButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_iconResend"
+                    icon={<RestartIcon />}
                     label={_t("timeline|context_menu|resent_unsent_reactions", { unsentCount: unsentReactionsCount })}
                     onClick={this.onResendReactionsClick}
                 />
@@ -382,7 +441,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         if (isSent && this.state.canRedact) {
             redactButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_iconRedact"
+                    icon={<DeleteIcon />}
                     label={_t("action|remove")}
                     onClick={this.onRedactClick}
                 />
@@ -395,7 +454,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
             const mapSiteLink = createMapSiteLinkFromEvent(shareableLocationEvent);
             openInMapSiteButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_iconOpenInMapSite"
+                    icon={<PopOutIcon />}
                     onClick={null}
                     label={_t("timeline|context_menu|open_in_osm")}
                     element="a"
@@ -413,7 +472,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         if (contentActionable && forwardableEvent) {
             forwardButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_iconForward"
+                    icon={<ForwardIcon />}
                     label={_t("action|forward")}
                     onClick={this.onForwardClick(forwardableEvent)}
                 />
@@ -423,7 +482,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         // This is specifically not behind the developerMode flag to give people insight into the Matrix
         const viewSourceButton = (
             <IconizedContextMenuOption
-                iconClassName="mx_MessageContextMenu_iconSource"
+                icon={<InlineCodeIcon />}
                 label={_t("timeline|context_menu|view_source")}
                 onClick={this.onViewSourceClick}
             />
@@ -433,7 +492,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         if (eventTileOps?.isWidgetHidden()) {
             unhidePreviewButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_iconUnhidePreview"
+                    icon={<VisibilityOnIcon />}
                     label={_t("timeline|context_menu|show_url_preview")}
                     onClick={this.onUnhidePreviewClick}
                 />
@@ -444,7 +503,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         if (permalink) {
             permalinkButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_iconPermalink"
+                    icon={<ShareIcon />}
                     onClick={this.onShareClick}
                     label={_t("action|share")}
                     element="a"
@@ -464,7 +523,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         if (this.canEndPoll(mxEvent)) {
             endPollButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_iconEndPoll"
+                    icon={<CheckIcon />}
                     label={_t("poll|end_title")}
                     onClick={this.onEndPollClick}
                 />
@@ -479,7 +538,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         ) {
             externalURLButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_iconLink"
+                    icon={<LinkIcon />}
                     onClick={this.closeMenu}
                     label={_t("timeline|context_menu|external_url")}
                     element="a"
@@ -499,7 +558,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         if (collapseReplyChain) {
             collapseReplyChainButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_iconCollapse"
+                    icon={<ChevronUpIcon />}
                     label={_t("timeline|context_menu|collapse_reply_thread")}
                     onClick={this.onCollapseReplyChainClick}
                 />
@@ -511,7 +570,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         if (relatedEventId && SettingsStore.getValue("developerMode")) {
             jumpToRelatedEventButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_jumpToEvent"
+                    icon={<ChildRelationshipIcon />}
                     label={_t("timeline|context_menu|view_related_event")}
                     onClick={() => this.onJumpToRelatedEventClick(relatedEventId)}
                 />
@@ -522,7 +581,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         if (mxEvent.getSender() !== me) {
             reportEventButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_iconReport"
+                    icon={<ErrorSolidIcon />}
                     label={_t("timeline|context_menu|report")}
                     onClick={this.onReportEventClick}
                 />
@@ -533,7 +592,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         if (link) {
             copyLinkButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_iconCopy"
+                    icon={<CopyIcon />}
                     onClick={this.onCopyLinkClick}
                     label={_t("action|copy_link")}
                     element="a"
@@ -549,11 +608,13 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
             );
         }
 
+        const selectedText = getSelectedText();
+
         let copyButton: JSX.Element | undefined;
-        if (rightClick && getSelectedText()) {
+        if (rightClick && selectedText) {
             copyButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_iconCopy"
+                    icon={<CopyIcon />}
                     label={_t("action|copy")}
                     triggerOnMouseDown={true} // We use onMouseDown so that the selection isn't cleared when we click
                     onClick={this.onCopyClick}
@@ -561,14 +622,22 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
             );
         }
 
+        let quoteButton: JSX.Element | undefined;
+        if (rightClick && selectedText && selectedText.trim().length > 0 && this.isSelectionWithinSingleTextBody()) {
+            quoteButton = (
+                <IconizedContextMenuOption
+                    icon={<QuoteIcon />}
+                    label={_t("action|quote")}
+                    triggerOnMouseDown={true}
+                    onClick={this.onQuoteClick}
+                />
+            );
+        }
+
         let editButton: JSX.Element | undefined;
         if (rightClick && canEditContent(cli, mxEvent)) {
             editButton = (
-                <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_iconEdit"
-                    label={_t("action|edit")}
-                    onClick={this.onEditClick}
-                />
+                <IconizedContextMenuOption icon={<EditIcon />} label={_t("action|edit")} onClick={this.onEditClick} />
             );
         }
 
@@ -576,7 +645,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         if (rightClick && contentActionable && canSendMessages) {
             replyButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_iconReply"
+                    icon={<ReplyIcon />}
                     label={_t("action|reply")}
                     onClick={this.onReplyClick}
                 />
@@ -598,7 +667,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         if (rightClick && contentActionable && canReact) {
             reactButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_iconReact"
+                    icon={<ReactionAddIcon />}
                     label={_t("action|react")}
                     onClick={this.onReactClick}
                     inputRef={this.reactButtonRef}
@@ -611,7 +680,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
             const isPinned = PinningUtils.isPinned(MatrixClientPeg.safeGet(), this.props.mxEvent);
             pinButton = (
                 <IconizedContextMenuOption
-                    iconClassName={isPinned ? "mx_MessageContextMenu_iconUnpin" : "mx_MessageContextMenu_iconPin"}
+                    icon={isPinned ? <UnpinIcon /> : <PinIcon />}
                     label={isPinned ? _t("action|unpin") : _t("action|pin")}
                     onClick={() => this.onPinClick(isPinned)}
                 />
@@ -622,7 +691,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         if (isThreadRootEvent) {
             viewInRoomButton = (
                 <IconizedContextMenuOption
-                    iconClassName="mx_MessageContextMenu_iconViewInRoom"
+                    icon={<ViewInRoomIcon />}
                     label={_t("timeline|mab|view_in_room")}
                     onClick={this.viewInRoom}
                 />
@@ -630,10 +699,11 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         }
 
         let nativeItemsList: JSX.Element | undefined;
-        if (copyButton || copyLinkButton) {
+        if (copyButton || quoteButton || copyLinkButton) {
             nativeItemsList = (
                 <IconizedContextMenuOptionList>
                     {copyButton}
+                    {quoteButton}
                     {copyLinkButton}
                 </IconizedContextMenuOptionList>
             );
@@ -678,7 +748,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         if (this.state.reactionPickerDisplayed) {
             const buttonRect = (this.reactButtonRef.current as HTMLElement)?.getBoundingClientRect();
             reactionPicker = (
-                <ContextMenu {...toRightOf(buttonRect)} onFinished={this.closeMenu} managed={false}>
+                <ContextMenu {...toRightOf(buttonRect)} onFinished={this.closeMenu} managed={false} focusLock>
                     <ReactionPicker mxEvent={mxEvent} onFinished={this.onCloseReactionPicker} reactions={reactions} />
                 </ContextMenu>
             );
diff --git a/src/components/views/context_menus/RoomGeneralContextMenu.tsx b/src/components/views/context_menus/RoomGeneralContextMenu.tsx
index 7c21d09853..fdfabdeee9 100644
--- a/src/components/views/context_menus/RoomGeneralContextMenu.tsx
+++ b/src/components/views/context_menus/RoomGeneralContextMenu.tsx
@@ -9,6 +9,16 @@ Please see LICENSE files in the repository root for full details.
 import { logger } from "matrix-js-sdk/src/logger";
 import { type Room } from "matrix-js-sdk/src/matrix";
 import React, { type JSX, useContext } from "react";
+import {
+    FavouriteSolidIcon,
+    LinkIcon,
+    SettingsSolidIcon,
+    ArrowDownIcon,
+    MarkAsReadIcon,
+    MarkAsUnreadIcon,
+    LeaveIcon,
+    UserAddIcon,
+} from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import RoomListActions from "../../../actions/RoomListActions";
@@ -153,7 +163,7 @@ export const RoomGeneralContextMenu: React.FC<RoomGeneralContextMenuProps> = ({
             onClick={wrapHandler((ev) => onTagRoom(ev, DefaultTagID.Favourite), onPostFavoriteClick, true)}
             active={isFavorite}
             label={isFavorite ? _t("room|context_menu|unfavourite") : _t("room|context_menu|favourite")}
-            iconClassName="mx_RoomGeneralContextMenu_iconStar"
+            icon={<FavouriteSolidIcon />}
         />
     );
 
@@ -163,7 +173,7 @@ export const RoomGeneralContextMenu: React.FC<RoomGeneralContextMenuProps> = ({
             onClick={wrapHandler((ev) => onTagRoom(ev, DefaultTagID.LowPriority), onPostLowPriorityClick, true)}
             active={isLowPriority}
             label={_t("room|context_menu|low_priority")}
-            iconClassName="mx_RoomGeneralContextMenu_iconArrowDown"
+            icon={<ArrowDownIcon />}
         />
     );
 
@@ -180,7 +190,7 @@ export const RoomGeneralContextMenu: React.FC<RoomGeneralContextMenuProps> = ({
                     onPostInviteClick,
                 )}
                 label={_t("action|invite")}
-                iconClassName="mx_RoomGeneralContextMenu_iconInvite"
+                icon={<UserAddIcon />}
             />
         );
     }
@@ -198,7 +208,7 @@ export const RoomGeneralContextMenu: React.FC<RoomGeneralContextMenuProps> = ({
                     onPostCopyLinkClick,
                 )}
                 label={_t("room|context_menu|copy_link")}
-                iconClassName="mx_RoomGeneralContextMenu_iconCopyLink"
+                icon={<LinkIcon />}
             />
         );
     }
@@ -214,7 +224,7 @@ export const RoomGeneralContextMenu: React.FC<RoomGeneralContextMenuProps> = ({
                 onPostSettingsClick,
             )}
             label={_t("common|settings")}
-            iconClassName="mx_RoomGeneralContextMenu_iconSettings"
+            icon={<SettingsSolidIcon />}
         />
     );
 
@@ -222,7 +232,7 @@ export const RoomGeneralContextMenu: React.FC<RoomGeneralContextMenuProps> = ({
     if (roomTags.includes(DefaultTagID.Archived)) {
         leaveOption = (
             <IconizedContextMenuOption
-                iconClassName="mx_RoomGeneralContextMenu_iconSignOut"
+                icon={<LeaveIcon />}
                 label={_t("room|context_menu|forget")}
                 className="mx_IconizedContextMenu_option_red"
                 onClick={wrapHandler(
@@ -248,7 +258,7 @@ export const RoomGeneralContextMenu: React.FC<RoomGeneralContextMenuProps> = ({
                 )}
                 label={_t("action|leave")}
                 className="mx_IconizedContextMenu_option_red"
-                iconClassName="mx_RoomGeneralContextMenu_iconSignOut"
+                icon={<LeaveIcon />}
             />
         );
     }
@@ -263,7 +273,7 @@ export const RoomGeneralContextMenu: React.FC<RoomGeneralContextMenuProps> = ({
                         onFinished?.();
                     }, onPostMarkAsReadClick)}
                     label={_t("room|context_menu|mark_read")}
-                    iconClassName="mx_RoomGeneralContextMenu_iconMarkAsRead"
+                    icon={<MarkAsReadIcon />}
                 />
             );
         } else if (!roomTags.includes(DefaultTagID.Archived)) {
@@ -274,7 +284,7 @@ export const RoomGeneralContextMenu: React.FC<RoomGeneralContextMenuProps> = ({
                         onFinished?.();
                     }, onPostMarkAsUnreadClick)}
                     label={_t("room|context_menu|mark_unread")}
-                    iconClassName="mx_RoomGeneralContextMenu_iconMarkAsUnread"
+                    icon={<MarkAsUnreadIcon />}
                 />
             );
         } else {
diff --git a/src/components/views/context_menus/RoomNotificationContextMenu.tsx b/src/components/views/context_menus/RoomNotificationContextMenu.tsx
index 9844f27695..9ad381736a 100644
--- a/src/components/views/context_menus/RoomNotificationContextMenu.tsx
+++ b/src/components/views/context_menus/RoomNotificationContextMenu.tsx
@@ -20,6 +20,10 @@ import IconizedContextMenu, {
     IconizedContextMenuRadio,
 } from "../context_menus/IconizedContextMenu";
 import { type ButtonEvent } from "../elements/AccessibleButton";
+import { Icon as NotificationsIcon } from "../../../../res/img/element-icons/notifications.svg";
+import { Icon as NotificationsDefaultIcon } from "../../../../res/img/element-icons/roomlist/notifications-default.svg";
+import { Icon as NotificationsDmIcon } from "../../../../res/img/element-icons/roomlist/notifications-dm.svg";
+import { Icon as NotificationsOffIcon } from "../../../../res/img/element-icons/roomlist/notifications-off.svg";
 
 interface IProps extends IContextMenuProps {
     room: Room;
@@ -46,7 +50,7 @@ export const RoomNotificationContextMenu: React.FC<IProps> = ({ room, onFinished
         <IconizedContextMenuRadio
             label={_t("room|context_menu|notifications_default")}
             active={notificationState === RoomNotifState.AllMessages}
-            iconClassName="mx_RoomNotificationContextMenu_iconBell"
+            icon={<NotificationsIcon />}
             onClick={wrapHandler(() => setNotificationState(RoomNotifState.AllMessages))}
         />
     );
@@ -55,7 +59,7 @@ export const RoomNotificationContextMenu: React.FC<IProps> = ({ room, onFinished
         <IconizedContextMenuRadio
             label={_t("notifications|all_messages")}
             active={notificationState === RoomNotifState.AllMessagesLoud}
-            iconClassName="mx_RoomNotificationContextMenu_iconBellDot"
+            icon={<NotificationsDefaultIcon />}
             onClick={wrapHandler(() => setNotificationState(RoomNotifState.AllMessagesLoud))}
         />
     );
@@ -64,7 +68,7 @@ export const RoomNotificationContextMenu: React.FC<IProps> = ({ room, onFinished
         <IconizedContextMenuRadio
             label={_t("notifications|mentions_keywords")}
             active={notificationState === RoomNotifState.MentionsOnly}
-            iconClassName="mx_RoomNotificationContextMenu_iconBellMentions"
+            icon={<NotificationsDmIcon />}
             onClick={wrapHandler(() => setNotificationState(RoomNotifState.MentionsOnly))}
         />
     );
@@ -73,7 +77,7 @@ export const RoomNotificationContextMenu: React.FC<IProps> = ({ room, onFinished
         <IconizedContextMenuRadio
             label={_t("room|context_menu|notifications_mute")}
             active={notificationState === RoomNotifState.Mute}
-            iconClassName="mx_RoomNotificationContextMenu_iconBellCrossed"
+            icon={<NotificationsOffIcon />}
             onClick={wrapHandler(() => setNotificationState(RoomNotifState.Mute))}
         />
     );
diff --git a/src/components/views/context_menus/SpaceContextMenu.tsx b/src/components/views/context_menus/SpaceContextMenu.tsx
index eab9c1d011..49d8275ab6 100644
--- a/src/components/views/context_menus/SpaceContextMenu.tsx
+++ b/src/components/views/context_menus/SpaceContextMenu.tsx
@@ -8,6 +8,15 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type JSX, useContext } from "react";
 import { type Room, EventType, RoomType } from "matrix-js-sdk/src/matrix";
+import {
+    HomeSolidIcon,
+    PlusIcon,
+    SettingsSolidIcon,
+    LeaveIcon,
+    SearchIcon,
+    PreferencesIcon,
+    UserAddIcon,
+} from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { type IProps as IContextMenuProps } from "../../structures/ContextMenu";
 import IconizedContextMenu, { IconizedContextMenuOption, IconizedContextMenuOptionList } from "./IconizedContextMenu";
@@ -60,7 +69,7 @@ const SpaceContextMenu: React.FC<IProps> = ({ space, hideHeader, onFinished, ...
             <IconizedContextMenuOption
                 data-testid="invite-option"
                 className="mx_SpacePanel_contextMenu_inviteButton"
-                iconClassName="mx_SpacePanel_iconInvite"
+                icon={<UserAddIcon />}
                 label={_t("action|invite")}
                 onClick={onInviteClick}
             />
@@ -81,7 +90,7 @@ const SpaceContextMenu: React.FC<IProps> = ({ space, hideHeader, onFinished, ...
         settingsOption = (
             <IconizedContextMenuOption
                 data-testid="settings-option"
-                iconClassName="mx_SpacePanel_iconSettings"
+                icon={<SettingsSolidIcon />}
                 label={_t("common|settings")}
                 onClick={onSettingsClick}
             />
@@ -98,7 +107,7 @@ const SpaceContextMenu: React.FC<IProps> = ({ space, hideHeader, onFinished, ...
         leaveOption = (
             <IconizedContextMenuOption
                 data-testid="leave-option"
-                iconClassName="mx_SpacePanel_iconLeave"
+                icon={<LeaveIcon />}
                 className="mx_IconizedContextMenu_option_red"
                 label={_t("space|leave_dialog_action")}
                 onClick={onLeaveClick}
@@ -123,7 +132,7 @@ const SpaceContextMenu: React.FC<IProps> = ({ space, hideHeader, onFinished, ...
 
         devtoolsOption = (
             <IconizedContextMenuOption
-                iconClassName="mx_SpacePanel_iconSettings"
+                icon={<SettingsSolidIcon />}
                 label={_t("space|context_menu|devtools_open_timeline")}
                 onClick={onViewTimelineClick}
             />
@@ -170,7 +179,7 @@ const SpaceContextMenu: React.FC<IProps> = ({ space, hideHeader, onFinished, ...
                 {canAddRooms && (
                     <IconizedContextMenuOption
                         data-testid="new-room-option"
-                        iconClassName="mx_SpacePanel_iconPlus"
+                        icon={<PlusIcon />}
                         label={_t("common|room")}
                         onClick={onNewRoomClick}
                     />
@@ -178,7 +187,7 @@ const SpaceContextMenu: React.FC<IProps> = ({ space, hideHeader, onFinished, ...
                 {canAddVideoRooms && (
                     <IconizedContextMenuOption
                         data-testid="new-video-room-option"
-                        iconClassName="mx_SpacePanel_iconPlus"
+                        icon={<PlusIcon />}
                         label={_t("common|video_room")}
                         onClick={onNewVideoRoomClick}
                     >
@@ -188,7 +197,7 @@ const SpaceContextMenu: React.FC<IProps> = ({ space, hideHeader, onFinished, ...
                 {canAddSubSpaces && (
                     <IconizedContextMenuOption
                         data-testid="new-subspace-option"
-                        iconClassName="mx_SpacePanel_iconPlus"
+                        icon={<PlusIcon />}
                         label={_t("common|space")}
                         onClick={onNewSubspaceClick}
                     >
@@ -234,18 +243,18 @@ const SpaceContextMenu: React.FC<IProps> = ({ space, hideHeader, onFinished, ...
             {!hideHeader && <div className="mx_SpacePanel_contextMenu_header">{space.name}</div>}
             <IconizedContextMenuOptionList first>
                 <IconizedContextMenuOption
-                    iconClassName="mx_SpacePanel_iconHome"
+                    icon={<HomeSolidIcon />}
                     label={_t("space|context_menu|home")}
                     onClick={onHomeClick}
                 />
                 {inviteOption}
                 <IconizedContextMenuOption
-                    iconClassName="mx_SpacePanel_iconExplore"
+                    icon={<SearchIcon />}
                     label={canAddRooms ? _t("space|context_menu|manage_and_explore") : _t("space|context_menu|explore")}
                     onClick={onExploreRoomsClick}
                 />
                 <IconizedContextMenuOption
-                    iconClassName="mx_SpacePanel_iconPreferences"
+                    icon={<PreferencesIcon />}
                     label={_t("common|preferences")}
                     onClick={onPreferencesClick}
                 />
diff --git a/src/components/views/context_menus/ThreadListContextMenu.tsx b/src/components/views/context_menus/ThreadListContextMenu.tsx
index ef32d62282..11292f2a4f 100644
--- a/src/components/views/context_menus/ThreadListContextMenu.tsx
+++ b/src/components/views/context_menus/ThreadListContextMenu.tsx
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { useCallback, useEffect } from "react";
 import { type MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { LinkIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { type ButtonEvent } from "../elements/AccessibleButton";
 import dis from "../../../dispatcher/dispatcher";
@@ -20,6 +21,7 @@ import IconizedContextMenu, { IconizedContextMenuOption, IconizedContextMenuOpti
 import { WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { type ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
+import { Icon as ViewInRoomIcon } from "../../../../res/img/element-icons/view-in-room.svg";
 
 export interface ThreadListContextMenuProps {
     mxEvent: MatrixEvent;
@@ -102,7 +104,7 @@ const ThreadListContextMenu: React.FC<ThreadListContextMenuProps> = ({
                             <IconizedContextMenuOption
                                 onClick={(e) => viewInRoom(e)}
                                 label={_t("timeline|mab|view_in_room")}
-                                iconClassName="mx_ThreadPanel_viewInRoom"
+                                icon={<ViewInRoomIcon />}
                             />
                         )}
                         {permalinkCreator && (
@@ -110,7 +112,7 @@ const ThreadListContextMenu: React.FC<ThreadListContextMenuProps> = ({
                                 data-testid="copy-thread-link"
                                 onClick={(e) => copyLinkToThread(e)}
                                 label={_t("timeline|mab|copy_link_thread")}
-                                iconClassName="mx_ThreadPanel_copyLinkToThread"
+                                icon={<LinkIcon />}
                             />
                         )}
                     </IconizedContextMenuOptionList>
diff --git a/src/components/views/context_menus/WidgetContextMenu.tsx b/src/components/views/context_menus/WidgetContextMenu.tsx
index 5b03d54e17..ff74e25d38 100644
--- a/src/components/views/context_menus/WidgetContextMenu.tsx
+++ b/src/components/views/context_menus/WidgetContextMenu.tsx
@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type JSX, type ComponentProps, useContext } from "react";
-import { type ClientWidgetApi, type IWidget, MatrixCapabilities } from "matrix-widget-api";
+import { type IWidget, MatrixCapabilities } from "matrix-widget-api";
 import { logger } from "matrix-js-sdk/src/logger";
 import { type ApprovalOpts, WidgetLifecycle } from "@matrix-org/react-sdk-module-api/lib/lifecycles/WidgetLifecycle";
 import { type MatrixClient, type Room } from "matrix-js-sdk/src/matrix";
@@ -28,7 +28,7 @@ import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
 import { getConfigLivestreamUrl, startJitsiAudioLivestream } from "../../../Livestream";
 import { ModuleRunner } from "../../../modules/ModuleRunner";
-import { ElementWidget } from "../../../stores/widgets/StopGapWidget";
+import { ElementWidget, type WidgetMessaging } from "../../../stores/widgets/WidgetMessaging";
 import { useScopedRoomContext } from "../../../contexts/ScopedRoomContext.tsx";
 
 interface IProps extends Omit<ComponentProps<typeof IconizedContextMenu>, "children"> {
@@ -69,10 +69,10 @@ const showDeleteButton = (canModify: boolean, onDeleteClick: undefined | (() =>
     return !!onDeleteClick || canModify;
 };
 
-const showSnapshotButton = (widgetMessaging: ClientWidgetApi | undefined): boolean => {
+const showSnapshotButton = (widgetMessaging: WidgetMessaging | undefined): boolean => {
     return (
         SettingsStore.getValue("enableWidgetScreenshots") &&
-        !!widgetMessaging?.hasCapability(MatrixCapabilities.Screenshots)
+        !!widgetMessaging?.widgetApi?.hasCapability(MatrixCapabilities.Screenshots)
     );
 };
 
@@ -123,7 +123,7 @@ export const WidgetContextMenu: React.FC<IProps> = ({
     if (roomId && showStreamAudioStreamButton(app)) {
         const onStreamAudioClick = async (): Promise<void> => {
             try {
-                await startJitsiAudioLivestream(cli, widgetMessaging!, roomId);
+                await startJitsiAudioLivestream(cli, widgetMessaging!.widgetApi!, roomId);
             } catch (err) {
                 logger.error("Failed to start livestream", err);
                 // XXX: won't i18n well, but looks like widget api only support 'message'?
@@ -161,7 +161,7 @@ export const WidgetContextMenu: React.FC<IProps> = ({
     let snapshotButton: JSX.Element | undefined;
     if (showSnapshotButton(widgetMessaging)) {
         const onSnapshotClick = (): void => {
-            widgetMessaging
+            widgetMessaging?.widgetApi
                 ?.takeScreenshot()
                 .then((data) => {
                     dis.dispatch({
diff --git a/src/components/views/dialogs/BaseDialog.tsx b/src/components/views/dialogs/BaseDialog.tsx
index bf23919771..8eba4d3fc6 100644
--- a/src/components/views/dialogs/BaseDialog.tsx
+++ b/src/components/views/dialogs/BaseDialog.tsx
@@ -12,6 +12,7 @@ import React, { type JSX } from "react";
 import FocusLock from "react-focus-lock";
 import classNames from "classnames";
 import { type MatrixClient } from "matrix-js-sdk/src/matrix";
+import { I18nContext } from "@element-hq/web-shared-components";
 
 import AccessibleButton from "../elements/AccessibleButton";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
@@ -23,13 +24,25 @@ import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 
 interface IProps {
-    // Whether the dialog should have a 'close' button that will
-    // cause the dialog to be cancelled. This should only be set
-    // to false if there is nothing the app can sensibly do if the
-    // dialog is cancelled, eg. "We can't restore your session and
-    // the app cannot work". Default: true.
+    /**
+     * Whether the dialog should have a 'close' button and a keyDown handler which
+     * will intercept 'Escape'.
+     *
+     * This should only be set to `false` if there is nothing the app can sensibly do if the
+     * dialog is cancelled, eg. "We can't restore your session and
+     * the app cannot work".
+     *
+     * Default: `true`.
+     */
     "hasCancel"?: boolean;
 
+    /**
+     * Callback that will be called when the 'close' button is clicked or 'Escape' is pressed.
+     *
+     * Not used if `hasCancel` is false.
+     */
+    "onFinished"?: () => void;
+
     // called when a key is pressed
     "onKeyDown"?: (e: KeyboardEvent | React.KeyboardEvent) => void;
 
@@ -66,7 +79,6 @@ interface IProps {
 
     // optional Posthog ScreenName to supply during the lifetime of this dialog
     "screenName"?: ScreenName;
-    onFinished(): void;
 }
 
 /*
@@ -103,13 +115,13 @@ export default class BaseDialog extends React.Component<IProps> {
 
                 e.stopPropagation();
                 e.preventDefault();
-                this.props.onFinished();
+                this.props.onFinished?.();
                 break;
         }
     };
 
     private onCancelClick = (): void => {
-        this.props.onFinished();
+        this.props.onFinished?.();
     };
 
     public render(): React.ReactNode {
@@ -134,6 +146,9 @@ export default class BaseDialog extends React.Component<IProps> {
         const lockProps: Record<string, any> = {
             "onKeyDown": this.onKeyDown,
             "role": "dialog",
+            // Allow the dialog to be keyboard focusable
+            // So the escape key handling works in more cases (say you select the header)
+            "tabIndex": -1,
             // This should point to a node describing the dialog.
             // If we were about to completely follow this recommendation we'd need to
             // make all the components relying on BaseDialog to be aware of it.
@@ -150,38 +165,42 @@ export default class BaseDialog extends React.Component<IProps> {
         }
 
         return (
-            <MatrixClientContext.Provider value={this.matrixClient}>
-                {this.props.screenName && <PosthogScreenTracker screenName={this.props.screenName} />}
-                <FocusLock
-                    returnFocus={true}
-                    lockProps={lockProps}
-                    className={classNames(this.props.className, {
-                        mx_Dialog_fixedWidth: this.props.fixedWidth,
-                    })}
-                >
-                    {this.props.top}
-                    <div
-                        className={classNames("mx_Dialog_header", {
-                            mx_Dialog_headerWithButton: !!this.props.headerButton,
+            // XXX: We can't import ModuleAPI here because it causes a dependency cycle - hack and
+            // use the copy on the window object :(
+            <I18nContext.Provider value={window.mxModuleApi.i18n}>
+                <MatrixClientContext.Provider value={this.matrixClient}>
+                    {this.props.screenName && <PosthogScreenTracker screenName={this.props.screenName} />}
+                    <FocusLock
+                        returnFocus={true}
+                        lockProps={lockProps}
+                        className={classNames(this.props.className, {
+                            mx_Dialog_fixedWidth: this.props.fixedWidth,
                         })}
                     >
-                        {!!(this.props.title || headerImage) && (
-                            <Heading
-                                size="3"
-                                as="h1"
-                                className={classNames("mx_Dialog_title", this.props.titleClass)}
-                                id="mx_BaseDialog_title"
-                            >
-                                {headerImage}
-                                {this.props.title}
-                            </Heading>
-                        )}
-                        {this.props.headerButton}
-                    </div>
-                    {this.props.children}
-                    {cancelButton}
-                </FocusLock>
-            </MatrixClientContext.Provider>
+                        {this.props.top}
+                        <div
+                            className={classNames("mx_Dialog_header", {
+                                mx_Dialog_headerWithButton: !!this.props.headerButton,
+                            })}
+                        >
+                            {!!(this.props.title || headerImage) && (
+                                <Heading
+                                    size="3"
+                                    as="h1"
+                                    className={classNames("mx_Dialog_title", this.props.titleClass)}
+                                    id="mx_BaseDialog_title"
+                                >
+                                    {headerImage}
+                                    {this.props.title}
+                                </Heading>
+                            )}
+                            {this.props.headerButton}
+                        </div>
+                        {this.props.children}
+                        {cancelButton}
+                    </FocusLock>
+                </MatrixClientContext.Provider>
+            </I18nContext.Provider>
         );
     }
 }
diff --git a/src/components/views/dialogs/ConfirmKeyStorageOffDialog.tsx b/src/components/views/dialogs/ConfirmKeyStorageOffDialog.tsx
index 49e7cad17b..d6a5f79aeb 100644
--- a/src/components/views/dialogs/ConfirmKeyStorageOffDialog.tsx
+++ b/src/components/views/dialogs/ConfirmKeyStorageOffDialog.tsx
@@ -17,6 +17,7 @@ import { EncryptionCardButtons } from "../settings/encryption/EncryptionCardButt
 import { type OpenToTabPayload } from "../../../dispatcher/payloads/OpenToTabPayload";
 import { Action } from "../../../dispatcher/actions";
 import { UserTab } from "./UserTab";
+import SdkConfig from "../../../SdkConfig";
 
 interface Props {
     onFinished: (dismissed: boolean) => void;
@@ -60,7 +61,7 @@ export default class ConfirmKeyStorageOffDialog extends React.Component<Props> {
                     a: (sub) => (
                         <>
                             <br />
-                            <a href="https://element.io/help#encryption5" target="_blank" rel="noreferrer noopener">
+                            <a href={SdkConfig.get("help_encryption_url")} target="_blank" rel="noreferrer noopener">
                                 {sub} <PopOutIcon />
                             </a>
                         </>
diff --git a/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx b/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx
index 3851460bdd..6d1bb38956 100644
--- a/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx
+++ b/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type JSX, type ComponentProps, useMemo, useState } from "react";
 import { type Room } from "matrix-js-sdk/src/matrix";
+import { InfoSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import ConfirmUserActionDialog from "./ConfirmUserActionDialog";
 import SpaceStore from "../../../stores/spaces/SpaceStore";
@@ -47,7 +48,12 @@ const ConfirmSpaceUserActionDialog: React.FC<IProps> = ({
 
     let warning: JSX.Element | undefined;
     if (warningMessage) {
-        warning = <div className="mx_ConfirmSpaceUserActionDialog_warning">{warningMessage}</div>;
+        warning = (
+            <div className="mx_ConfirmSpaceUserActionDialog_warning">
+                <InfoSolidIcon />
+                {warningMessage}
+            </div>
+        );
     }
 
     return (
diff --git a/src/components/views/dialogs/CreateRoomDialog.tsx b/src/components/views/dialogs/CreateRoomDialog.tsx
index 3ff42cde22..5321390fca 100644
--- a/src/components/views/dialogs/CreateRoomDialog.tsx
+++ b/src/components/views/dialogs/CreateRoomDialog.tsx
@@ -7,8 +7,16 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { type JSX, type ChangeEvent, createRef, type KeyboardEvent, type SyntheticEvent } from "react";
+import React, {
+    type JSX,
+    type ChangeEvent,
+    createRef,
+    type KeyboardEvent,
+    type SyntheticEvent,
+    type ChangeEventHandler,
+} from "react";
 import { type Room, RoomType, JoinRule, Preset, Visibility } from "matrix-js-sdk/src/matrix";
+import { Form, SettingsToggleInput } from "@vector-im/compound-web";
 
 import SdkConfig from "../../../SdkConfig";
 import withValidation, { type IFieldState, type IValidationResult } from "../elements/Validation";
@@ -17,7 +25,6 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { checkUserIsAllowedToChangeEncryption, type IOpts } from "../../../createRoom";
 import Field from "../elements/Field";
 import RoomAliasField from "../elements/RoomAliasField";
-import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import DialogButtons from "../elements/DialogButtons";
 import BaseDialog from "../dialogs/BaseDialog";
 import JoinRuleDropdown from "../elements/JoinRuleDropdown";
@@ -25,7 +32,7 @@ import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { privateShouldBeEncrypted } from "../../../utils/rooms";
 import SettingsStore from "../../../settings/SettingsStore";
-import LabelledCheckbox from "../elements/LabelledCheckbox";
+import { UIFeature } from "../../../settings/UIFeature";
 
 interface IProps {
     type?: RoomType;
@@ -33,6 +40,7 @@ interface IProps {
     defaultName?: string;
     parentSpace?: Room;
     defaultEncrypted?: boolean;
+    defaultStateEncrypted?: boolean;
     onFinished(proceed?: false): void;
     onFinished(proceed: true, opts: IOpts): void;
 }
@@ -51,6 +59,11 @@ interface IState {
      * Indicates whether end-to-end encryption is enabled for the room.
      */
     isEncrypted: boolean;
+    /**
+     * Indicates whether end-to-end state encryption is enabled for this room.
+     * See MSC4362. Available if feature_msc4362_encrypted_state_events is enabled.
+     */
+    isStateEncrypted: boolean;
     /**
      * The room name.
      */
@@ -83,6 +96,8 @@ interface IState {
 
 export default class CreateRoomDialog extends React.Component<IProps, IState> {
     private readonly askToJoinEnabled: boolean;
+    private readonly advancedSettingsEnabled: boolean;
+    private readonly allowCreatingPublicRooms: boolean;
     private readonly supportsRestricted: boolean;
     private nameField = createRef<Field>();
     private aliasField = createRef<RoomAliasField>();
@@ -91,10 +106,14 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
         super(props);
 
         this.askToJoinEnabled = SettingsStore.getValue("feature_ask_to_join");
+        this.advancedSettingsEnabled = SettingsStore.getValue(UIFeature.AdvancedSettings);
+        this.allowCreatingPublicRooms = SettingsStore.getValue(UIFeature.AllowCreatingPublicRooms);
+
         this.supportsRestricted = !!this.props.parentSpace;
+        const defaultPublic = this.allowCreatingPublicRooms && this.props.defaultPublic;
 
         let joinRule = JoinRule.Invite;
-        if (this.props.defaultPublic) {
+        if (defaultPublic) {
             joinRule = JoinRule.Public;
         } else if (this.supportsRestricted) {
             joinRule = JoinRule.Restricted;
@@ -102,8 +121,9 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
 
         const cli = MatrixClientPeg.safeGet();
         this.state = {
-            isPublicKnockRoom: this.props.defaultPublic || false,
+            isPublicKnockRoom: defaultPublic || false,
             isEncrypted: this.props.defaultEncrypted ?? privateShouldBeEncrypted(cli),
+            isStateEncrypted: this.props.defaultStateEncrypted ?? false,
             joinRule,
             name: this.props.defaultName || "",
             topic: "",
@@ -119,7 +139,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
         const opts: IOpts = {};
         const createOpts: IOpts["createOpts"] = (opts.createOpts = {});
         opts.roomType = this.props.type;
-        createOpts.name = this.state.name;
+        opts.name = this.state.name;
 
         if (this.state.joinRule === JoinRule.Public) {
             createOpts.visibility = Visibility.Public;
@@ -128,11 +148,14 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
             const { alias } = this.state;
             createOpts.room_alias_name = alias.substring(1, alias.indexOf(":"));
         } else {
+            const encryptedStateFeature = SettingsStore.getValue("feature_msc4362_encrypted_state_events", null, false);
+
             opts.encryption = this.state.isEncrypted;
+            opts.stateEncryption = encryptedStateFeature && this.state.isStateEncrypted;
         }
 
         if (this.state.topic) {
-            createOpts.topic = this.state.topic;
+            opts.topic = this.state.topic;
         }
         if (this.state.noFederate) {
             createOpts.creation_content = { "m.federate": false };
@@ -219,8 +242,12 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
         this.setState({ joinRule });
     };
 
-    private onEncryptedChange = (isEncrypted: boolean): void => {
-        this.setState({ isEncrypted });
+    private onEncryptedChange: ChangeEventHandler<HTMLInputElement> = (evt): void => {
+        this.setState({ isEncrypted: evt.target.checked });
+    };
+
+    private onStateEncryptedChange: ChangeEventHandler<HTMLInputElement> = (evt): void => {
+        this.setState({ isStateEncrypted: evt.target.checked });
     };
 
     private onAliasChange = (alias: string): void => {
@@ -231,8 +258,8 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
         this.setState({ detailsOpen: (ev.target as HTMLDetailsElement).open });
     };
 
-    private onNoFederateChange = (noFederate: boolean): void => {
-        this.setState({ noFederate });
+    private onNoFederateChange: ChangeEventHandler<HTMLInputElement> = (evt): void => {
+        this.setState({ noFederate: evt.target.checked });
     };
 
     private onNameValidate = async (fieldState: IFieldState): Promise<IValidationResult> => {
@@ -241,8 +268,8 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
         return result;
     };
 
-    private onIsPublicKnockRoomChange = (isPublicKnockRoom: boolean): void => {
-        this.setState({ isPublicKnockRoom });
+    private onIsPublicKnockRoomChange: ChangeEventHandler<HTMLInputElement> = (evt): void => {
+        this.setState({ isPublicKnockRoom: evt.target.checked });
     };
 
     private static validateRoomName = withValidation({
@@ -329,11 +356,12 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
         let visibilitySection: JSX.Element | undefined;
         if (this.state.joinRule === JoinRule.Knock) {
             visibilitySection = (
-                <LabelledCheckbox
+                <SettingsToggleInput
+                    name="publish-room"
                     className="mx_CreateRoomDialog_labelledCheckbox"
                     label={_t("room_settings|security|publish_room")}
                     onChange={this.onIsPublicKnockRoomChange}
-                    value={this.state.isPublicKnockRoom}
+                    checked={this.state.isPublicKnockRoom}
                 />
             );
         }
@@ -353,16 +381,37 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
                 microcopy = _t("settings|security|e2ee_default_disabled_warning");
             }
             e2eeSection = (
-                <React.Fragment>
-                    <LabelledToggleSwitch
-                        label={_t("create_room|encryption_label")}
-                        onChange={this.onEncryptedChange}
-                        value={this.state.isEncrypted}
-                        className="mx_CreateRoomDialog_e2eSwitch" // for end-to-end tests
-                        disabled={!this.state.canChangeEncryption}
-                    />
-                    <p>{microcopy}</p>
-                </React.Fragment>
+                <SettingsToggleInput
+                    name="encryption-toggle"
+                    label={_t("create_room|encryption_label")}
+                    onChange={this.onEncryptedChange}
+                    checked={this.state.isEncrypted}
+                    disabled={!this.state.canChangeEncryption}
+                    helpMessage={microcopy}
+                />
+            );
+        }
+
+        let e2eeStateSection: JSX.Element | undefined;
+        if (
+            SettingsStore.getValue("feature_msc4362_encrypted_state_events", null, false) &&
+            this.state.joinRule !== JoinRule.Public
+        ) {
+            let microcopy: string;
+            if (!this.state.canChangeEncryption) {
+                microcopy = _t("create_room|encryption_forced");
+            } else {
+                microcopy = _t("create_room|state_encrypted_warning");
+            }
+            e2eeStateSection = (
+                <SettingsToggleInput
+                    name="state-encryption-toggle"
+                    label={_t("create_room|state_encryption_label")}
+                    onChange={this.onStateEncryptedChange}
+                    checked={this.state.isStateEncrypted}
+                    disabled={!this.state.canChangeEncryption}
+                    helpMessage={microcopy}
+                />
             );
         }
 
@@ -392,8 +441,8 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
                 title={title}
                 screenName="CreateRoom"
             >
-                <form onSubmit={this.onOk} onKeyDown={this.onKeyDown}>
-                    <div className="mx_Dialog_content">
+                <div className="mx_Dialog_content">
+                    <Form.Root onSubmit={this.onOk} onKeyDown={this.onKeyDown}>
                         <Field
                             ref={this.nameField}
                             label={_t("common|name")}
@@ -409,39 +458,46 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
                             className="mx_CreateRoomDialog_topic"
                         />
 
-                        <JoinRuleDropdown
-                            label={_t("create_room|room_visibility_label")}
-                            labelInvite={_t("create_room|join_rule_invite")}
-                            labelKnock={
-                                this.askToJoinEnabled ? _t("room_settings|security|join_rule_knock") : undefined
-                            }
-                            labelPublic={_t("common|public_room")}
-                            labelRestricted={
-                                this.supportsRestricted ? _t("create_room|join_rule_restricted") : undefined
-                            }
-                            value={this.state.joinRule}
-                            onChange={this.onJoinRuleChange}
-                        />
+                        <div>
+                            <JoinRuleDropdown
+                                label={_t("create_room|room_visibility_label")}
+                                labelInvite={_t("create_room|join_rule_invite")}
+                                labelKnock={
+                                    this.askToJoinEnabled ? _t("room_settings|security|join_rule_knock") : undefined
+                                }
+                                labelPublic={this.allowCreatingPublicRooms ? _t("common|public_room") : undefined}
+                                labelRestricted={
+                                    this.supportsRestricted ? _t("create_room|join_rule_restricted") : undefined
+                                }
+                                value={this.state.joinRule}
+                                onChange={this.onJoinRuleChange}
+                            />
+
+                            {publicPrivateLabel}
+                        </div>
 
-                        {publicPrivateLabel}
                         {visibilitySection}
                         {e2eeSection}
+                        {e2eeStateSection}
                         {aliasField}
-                        <details onToggle={this.onDetailsToggled} className="mx_CreateRoomDialog_details">
-                            <summary className="mx_CreateRoomDialog_details_summary">
-                                {this.state.detailsOpen ? _t("action|hide_advanced") : _t("action|show_advanced")}
-                            </summary>
-                            <LabelledToggleSwitch
-                                label={_t("create_room|unfederated", {
-                                    serverName: MatrixClientPeg.safeGet().getDomain(),
-                                })}
-                                onChange={this.onNoFederateChange}
-                                value={this.state.noFederate}
-                            />
-                            <p>{federateLabel}</p>
-                        </details>
-                    </div>
-                </form>
+                        {this.advancedSettingsEnabled && (
+                            <details onToggle={this.onDetailsToggled} className="mx_CreateRoomDialog_details">
+                                <summary className="mx_CreateRoomDialog_details_summary">
+                                    {this.state.detailsOpen ? _t("action|hide_advanced") : _t("action|show_advanced")}
+                                </summary>
+                                <SettingsToggleInput
+                                    name="unfederated"
+                                    label={_t("create_room|unfederated", {
+                                        serverName: MatrixClientPeg.safeGet().getDomain(),
+                                    })}
+                                    onChange={this.onNoFederateChange}
+                                    checked={this.state.noFederate}
+                                    helpMessage={federateLabel}
+                                />
+                            </details>
+                        )}
+                    </Form.Root>
+                </div>
                 <DialogButtons
                     primaryButton={
                         isVideoRoom ? _t("create_room|action_create_video_room") : _t("create_room|action_create_room")
diff --git a/src/components/views/dialogs/DeclineAndBlockInviteDialog.tsx b/src/components/views/dialogs/DeclineAndBlockInviteDialog.tsx
index a10dfbe42b..2f20b66f60 100644
--- a/src/components/views/dialogs/DeclineAndBlockInviteDialog.tsx
+++ b/src/components/views/dialogs/DeclineAndBlockInviteDialog.tsx
@@ -6,12 +6,11 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type ChangeEventHandler, useCallback, useState } from "react";
-import { Field, Label, Root } from "@vector-im/compound-web";
+import { Field, Label, Root, SettingsToggleInput } from "@vector-im/compound-web";
 
 import { _t } from "../../../languageHandler";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
-import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 
 interface IProps {
     onFinished: (shouldReject: boolean, ignoreUser: boolean, reportRoom: false | string) => void;
@@ -22,6 +21,14 @@ export const DeclineAndBlockInviteDialog: React.FunctionComponent<IProps> = ({ o
     const [shouldReport, setShouldReport] = useState<boolean>(false);
     const [ignoreUser, setIgnoreUser] = useState<boolean>(false);
 
+    const onShouldReportChanged = useCallback<ChangeEventHandler<HTMLInputElement>>(
+        (e) => setShouldReport(e.target.checked),
+        [setShouldReport],
+    );
+    const onIgnoreUserChanged = useCallback<ChangeEventHandler<HTMLInputElement>>(
+        (e) => setIgnoreUser(e.target.checked),
+        [setIgnoreUser],
+    );
     const [reportReason, setReportReason] = useState<string>("");
     const reportReasonChanged = useCallback<ChangeEventHandler<HTMLTextAreaElement>>(
         (e) => setReportReason(e.target.value),
@@ -43,17 +50,19 @@ export const DeclineAndBlockInviteDialog: React.FunctionComponent<IProps> = ({ o
         >
             <Root>
                 <p>{_t("decline_invitation_dialog|confirm", { roomName })}</p>
-                <LabelledToggleSwitch
+                <SettingsToggleInput
+                    name="ignore-user"
                     label={_t("report_content|ignore_user")}
-                    onChange={setIgnoreUser}
-                    caption={_t("decline_invitation_dialog|ignore_user_help")}
-                    value={ignoreUser}
+                    onChange={onIgnoreUserChanged}
+                    helpMessage={_t("decline_invitation_dialog|ignore_user_help")}
+                    checked={ignoreUser}
                 />
-                <LabelledToggleSwitch
+                <SettingsToggleInput
+                    name="report-room"
                     label={_t("action|report_room")}
-                    onChange={setShouldReport}
-                    caption={_t("decline_invitation_dialog|report_room_description")}
-                    value={shouldReport}
+                    onChange={onShouldReportChanged}
+                    helpMessage={_t("decline_invitation_dialog|report_room_description")}
+                    checked={shouldReport}
                 />
                 <Field name="report-reason" aria-disabled={!shouldReport}>
                     <Label htmlFor="mx_DeclineAndBlockInviteDialog_reason">
diff --git a/src/components/views/dialogs/DevtoolsDialog.tsx b/src/components/views/dialogs/DevtoolsDialog.tsx
index 9b8b28ea7f..5ac0478012 100644
--- a/src/components/views/dialogs/DevtoolsDialog.tsx
+++ b/src/components/views/dialogs/DevtoolsDialog.tsx
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type JSX, useState } from "react";
+import { Form } from "@vector-im/compound-web";
 
 import { _t, _td, type TranslationKey } from "../../../languageHandler";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
@@ -18,6 +19,7 @@ import SettingExplorer from "./devtools/SettingExplorer";
 import { RoomStateExplorer } from "./devtools/RoomState";
 import BaseTool, { DevtoolsContext, type IDevtoolsProps } from "./devtools/BaseTool";
 import WidgetExplorer from "./devtools/WidgetExplorer";
+import { UserList } from "./devtools/Users";
 import { AccountDataExplorer, RoomAccountDataExplorer } from "./devtools/AccountData";
 import SettingsFlag from "../elements/SettingsFlag";
 import { SettingLevel } from "../../../settings/SettingLevel";
@@ -46,6 +48,7 @@ const Tools: Record<Category, [label: TranslationKey, tool: Tool][]> = {
         [_td("devtools|view_servers_in_room"), ServersInRoom],
         [_td("devtools|notifications_debug"), RoomNotifications],
         [_td("devtools|active_widgets"), WidgetExplorer],
+        [_td("devtools|users"), UserList],
     ],
     [Category.Other]: [
         [_td("devtools|explore_account_data"), AccountDataExplorer],
@@ -84,7 +87,9 @@ const DevtoolsDialog: React.FC<IProps> = ({ roomId, threadRootId, onFinished })
             <BaseTool onBack={onBack}>
                 {Object.entries(Tools).map(([category, tools]) => (
                     <div key={category}>
-                        <h3>{_t(categoryLabels[category as unknown as Category])}</h3>
+                        <h2 className="mx_DevTools_toolHeading">
+                            {_t(categoryLabels[category as unknown as Category])}
+                        </h2>
                         {tools.map(([label, tool]) => {
                             const onClick = (): void => {
                                 setTool([label, tool]);
@@ -97,13 +102,27 @@ const DevtoolsDialog: React.FC<IProps> = ({ roomId, threadRootId, onFinished })
                         })}
                     </div>
                 ))}
-                <div>
-                    <h3>{_t("common|options")}</h3>
+                <Form.Root
+                    onSubmit={(evt) => {
+                        evt.preventDefault();
+                        evt.stopPropagation();
+                    }}
+                    className="mx_DevTools_toggleForm"
+                >
+                    <h2 className="mx_DevTools_toolHeading">{_t("common|options")}</h2>
                     <SettingsFlag name="developerMode" level={SettingLevel.ACCOUNT} />
                     <SettingsFlag name="showHiddenEventsInTimeline" level={SettingLevel.DEVICE} />
                     <SettingsFlag name="enableWidgetScreenshots" level={SettingLevel.ACCOUNT} />
-                    <SettingsField settingKey="Developer.elementCallUrl" level={SettingLevel.DEVICE} />
-                </div>
+                </Form.Root>
+                {/* The settings field needs to be outside `Form.Root` because `SettingsField` will have a inner Form,
+                    Otherwise we end up with a nester `Form` and that prohibits `preventDefault` so setting the value
+                    will reload the page.
+                 */}
+                <SettingsField
+                    settingKey="Developer.elementCallUrl"
+                    level={SettingLevel.DEVICE}
+                    aria-label="elementCallUrl"
+                />
             </BaseTool>
         );
     }
diff --git a/src/components/views/dialogs/ExportDialog.tsx b/src/components/views/dialogs/ExportDialog.tsx
index a1b6daa721..c615f106fc 100644
--- a/src/components/views/dialogs/ExportDialog.tsx
+++ b/src/components/views/dialogs/ExportDialog.tsx
@@ -391,7 +391,7 @@ const ExportDialog: React.FC<IProps> = ({ room, onFinished }) => {
                 </div>
                 {isExporting ? (
                     <div data-testid="export-progress" className="mx_ExportDialog_progress">
-                        <Spinner w={24} h={24} />
+                        <Spinner size={24} />
                         <p>{exportProgressText}</p>
                         <DialogButtons
                             primaryButton={_t("action|cancel")}
diff --git a/src/components/views/dialogs/FeedbackDialog.tsx b/src/components/views/dialogs/FeedbackDialog.tsx
index 5e1efba38f..1775e9667a 100644
--- a/src/components/views/dialogs/FeedbackDialog.tsx
+++ b/src/components/views/dialogs/FeedbackDialog.tsx
@@ -6,6 +6,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type JSX, useEffect, useRef, useState } from "react";
+import { ChatSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import QuestionDialog from "./QuestionDialog";
 import { _t } from "../../../languageHandler";
@@ -19,6 +20,7 @@ import { submitFeedback } from "../../../rageshake/submit-rageshake";
 import { useStateToggle } from "../../../hooks/useStateToggle";
 import StyledCheckbox from "../elements/StyledCheckbox";
 import ExternalLink from "../elements/ExternalLink";
+import { Icon as BugIcon } from "../../../../res/img/feather-customised/bug.svg";
 
 interface IProps {
     feature?: string;
@@ -58,6 +60,7 @@ const FeedbackDialog: React.FC<IProps> = (props: IProps) => {
     if (hasFeedback) {
         feedbackSection = (
             <div className="mx_FeedbackDialog_section mx_FeedbackDialog_rateApp">
+                <ChatSolidIcon />
                 <h3>{_t("feedback|comment_label")}</h3>
 
                 <p>{_t("feedback|platform_username")}</p>
@@ -111,7 +114,8 @@ const FeedbackDialog: React.FC<IProps> = (props: IProps) => {
             title={_t("common|feedback")}
             description={
                 <React.Fragment>
-                    <div className="mx_FeedbackDialog_section mx_FeedbackDialog_reportBug">
+                    <div className="mx_FeedbackDialog_section">
+                        <BugIcon />
                         <h3>{_t("common|report_a_bug")}</h3>
                         <p>
                             {_t(
diff --git a/src/components/views/dialogs/ForwardDialog.tsx b/src/components/views/dialogs/ForwardDialog.tsx
index 512f0ad697..32aab5d6e9 100644
--- a/src/components/views/dialogs/ForwardDialog.tsx
+++ b/src/components/views/dialogs/ForwardDialog.tsx
@@ -57,6 +57,7 @@ import {
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { OverflowTileView } from "../rooms/OverflowTileView";
+import { attachMentions } from "../../../utils/messages";
 
 const AVATAR_SIZE = 30;
 
@@ -178,7 +179,18 @@ const Entry: React.FC<IEntryProps<any>> = ({ room, type, content, matrixClient:
     );
 };
 
-const transformEvent = (event: MatrixEvent): { type: string; content: IContent } => {
+/**
+ * Transform content of a MatrixEvent before forwarding:
+ * 1. Strip all relations.
+ * 2. Convert location events into a static pin-drop location share,
+ *    and remove description from self-location shares.
+ * 3. Pass through attachMentions() to strip mentions (as no EditorModel is present to recalculate from).
+ *
+ * @param event - The MatrixEvent to transform.
+ * @param userId - Current user MXID (passed through to attachMentions()).
+ * @returns The transformed event type and content.
+ */
+const transformEvent = (event: MatrixEvent, userId: string): { type: string; content: IContent } => {
     const {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         "m.relates_to": _, // strip relations - in future we will attach a relation pointing at the original event
@@ -213,6 +225,13 @@ const transformEvent = (event: MatrixEvent): { type: string; content: IContent }
         };
     }
 
+    // Mentions can leak information about the context of the original message,
+    // so pass through attachMentions() to recalculate mentions.
+    // Currently, this strips all mentions (forces an empty m.mentions),
+    // as there is no EditorModel to parse pills from.
+    // Future improvements could actually recalculate mentions based on the message body.
+    attachMentions(userId, content, null, undefined);
+
     return { type, content };
 };
 
@@ -223,7 +242,7 @@ const ForwardDialog: React.FC<IProps> = ({ matrixClient: cli, event, permalinkCr
         cli.getProfileInfo(userId).then((info) => setProfileInfo(info));
     }, [cli, userId]);
 
-    const { type, content } = transformEvent(event);
+    const { type, content } = transformEvent(event, userId);
 
     // For the message preview we fake the sender as ourselves
     const mockEvent = new MatrixEvent({
diff --git a/src/components/views/dialogs/IntegrationsDisabledDialog.tsx b/src/components/views/dialogs/IntegrationsDisabledDialog.tsx
index ad0f765413..93cd5f82c9 100644
--- a/src/components/views/dialogs/IntegrationsDisabledDialog.tsx
+++ b/src/components/views/dialogs/IntegrationsDisabledDialog.tsx
@@ -1,55 +1,53 @@
 /*
-Copyright 2024 New Vector Ltd.
+Copyright 2024, 2025 New Vector Ltd.
 Copyright 2019 The Matrix.org Foundation C.I.C.
 
 SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE files in the repository root for full details.
 */
 
-import React from "react";
+import React, { useCallback } from "react";
 
 import { _t } from "../../../languageHandler";
 import dis from "../../../dispatcher/dispatcher";
 import { Action } from "../../../dispatcher/actions";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
+import { UserTab } from "./UserTab";
 
 interface IProps {
     onFinished(): void;
 }
 
-export default class IntegrationsDisabledDialog extends React.Component<IProps> {
-    private onAcknowledgeClick = (): void => {
-        this.props.onFinished();
-    };
+export const IntegrationsDisabledDialog: React.FC<IProps> = ({ onFinished }) => {
+    const onOpenSettingsClick = useCallback(() => {
+        onFinished();
+        dis.dispatch({
+            action: Action.ViewUserSettings,
+            initialTabId: UserTab.Security,
+        });
+    }, [onFinished]);
 
-    private onOpenSettingsClick = (): void => {
-        this.props.onFinished();
-        dis.fire(Action.ViewUserSettings);
-    };
-
-    public render(): React.ReactNode {
-        return (
-            <BaseDialog
-                className="mx_IntegrationsDisabledDialog"
-                hasCancel={true}
-                onFinished={this.props.onFinished}
-                title={_t("integrations|disabled_dialog_title")}
-            >
-                <div className="mx_IntegrationsDisabledDialog_content">
-                    <p>
-                        {_t("integrations|disabled_dialog_description", {
-                            manageIntegrations: _t("integration_manager|manage_title"),
-                        })}
-                    </p>
-                </div>
-                <DialogButtons
-                    primaryButton={_t("common|settings")}
-                    onPrimaryButtonClick={this.onOpenSettingsClick}
-                    cancelButton={_t("action|ok")}
-                    onCancel={this.onAcknowledgeClick}
-                />
-            </BaseDialog>
-        );
-    }
-}
+    return (
+        <BaseDialog
+            className="mx_IntegrationsDisabledDialog"
+            hasCancel={true}
+            onFinished={onFinished}
+            title={_t("integrations|disabled_dialog_title")}
+        >
+            <div className="mx_IntegrationsDisabledDialog_content">
+                <p>
+                    {_t("integrations|disabled_dialog_description", {
+                        manageIntegrations: _t("integration_manager|manage_title"),
+                    })}
+                </p>
+            </div>
+            <DialogButtons
+                primaryButton={_t("common|settings")}
+                onPrimaryButtonClick={onOpenSettingsClick}
+                cancelButton={_t("action|ok")}
+                onCancel={onFinished}
+            />
+        </BaseDialog>
+    );
+};
diff --git a/src/components/views/dialogs/InteractiveAuthDialog.tsx b/src/components/views/dialogs/InteractiveAuthDialog.tsx
index d4ea7218c7..1aa3e7fe68 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.tsx
+++ b/src/components/views/dialogs/InteractiveAuthDialog.tsx
@@ -34,8 +34,10 @@ type DialogAesthetics = Partial<{
     };
 }>;
 
-export interface InteractiveAuthDialogProps<T = unknown>
-    extends Pick<InteractiveAuthProps<T>, "makeRequest" | "authData"> {
+export interface InteractiveAuthDialogProps<T = unknown> extends Pick<
+    InteractiveAuthProps<T>,
+    "makeRequest" | "authData"
+> {
     // matrix client to use for UI auth requests
     matrixClient: MatrixClient;
 
diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
index 62536acfd6..6f60f56fdb 100644
--- a/src/components/views/dialogs/InviteDialog.tsx
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -6,14 +6,14 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { type JSX, createRef, type ReactNode, type SyntheticEvent } from "react";
-import classNames from "classnames";
-import { RoomMember, type Room, MatrixError, EventType } from "matrix-js-sdk/src/matrix";
+import React, { createRef, type JSX, type ReactNode, type SyntheticEvent } from "react";
+import { EventType, MatrixError, type Room, RoomMember } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { type MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 import { logger } from "matrix-js-sdk/src/logger";
 import { uniqBy } from "lodash";
-import { CloseIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
+import { RichList, RichItem, PillInput, Pill } from "@element-hq/web-shared-components";
+import { DialPadIcon, UserProfileSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { Icon as EmailPillAvatarIcon } from "../../../../res/img/icon-email-pill-avatar.svg";
 import { _t, _td } from "../../../languageHandler";
@@ -25,7 +25,6 @@ import { getDefaultIdentityServerUrl, setToDefaultIdentityServer } from "../../.
 import { buildActivityScores, buildMemberScores, compareMembers } from "../../../utils/SortMembers";
 import { abbreviateUrl } from "../../../utils/UrlUtils";
 import IdentityAuthClient from "../../../IdentityAuthClient";
-import { humanizeTime } from "../../../utils/humanize";
 import { type IInviteResult, inviteMultipleToRoom, showAnyInviteErrors } from "../../../RoomInvite";
 import { Action } from "../../../dispatcher/actions";
 import { DefaultTagID } from "../../../stores/room-list/models";
@@ -41,7 +40,6 @@ import Field from "../elements/Field";
 import TabbedView, { Tab, TabLocation } from "../../structures/TabbedView";
 import Dialpad from "../voip/DialPad";
 import QuestionDialog from "./QuestionDialog";
-import Spinner from "../elements/Spinner";
 import BaseDialog from "./BaseDialog";
 import DialPadBackspaceButton from "../elements/DialPadBackspaceButton";
 import LegacyCallHandler from "../../../LegacyCallHandler";
@@ -66,6 +64,7 @@ import { UNKNOWN_PROFILE_ERRORS } from "../../../utils/MultiInviter";
 import AskInviteAnywayDialog, { type UnknownProfiles } from "./AskInviteAnywayDialog";
 import { SdkContextClass } from "../../../contexts/SDKContext";
 import { type UserProfilesStore } from "../../../stores/UserProfilesStore";
+import InviteProgressBody from "./InviteProgressBody.tsx";
 
 // we have a number of types defined from the Matrix spec which can't reasonably be altered here.
 /* eslint-disable camelcase */
@@ -121,27 +120,10 @@ class DMUserTile extends React.PureComponent<IDMUserTileProps> {
         const avatarSize = "20px";
         const avatar = <SearchResultAvatar user={this.props.member} size={avatarSize} />;
 
-        let closeButton;
-        if (this.props.onRemove) {
-            closeButton = (
-                <AccessibleButton
-                    className="mx_InviteDialog_userTile_remove"
-                    onClick={this.onRemove}
-                    aria-label={_t("action|remove")}
-                >
-                    <CloseIcon width="16px" height="16px" />
-                </AccessibleButton>
-            );
-        }
-
         return (
-            <span className="mx_InviteDialog_userTile">
-                <span className="mx_InviteDialog_userTile_pill">
-                    {avatar}
-                    <span className="mx_InviteDialog_userTile_name">{this.props.member.name}</span>
-                </span>
-                {closeButton}
-            </span>
+            <Pill label={this.props.member.name} onClick={this.onRemove}>
+                {avatar}
+            </Pill>
         );
     }
 }
@@ -164,7 +146,6 @@ interface IDMRoomTileProps {
     member: Member;
     lastActiveTs?: number;
     onToggle(member: Member): void;
-    highlightWord: string;
     isSelected: boolean;
 }
 
@@ -177,54 +158,8 @@ class DMRoomTile extends React.PureComponent<IDMRoomTileProps> {
         this.props.onToggle(this.props.member);
     };
 
-    private highlightName(str: string): ReactNode {
-        if (!this.props.highlightWord) return str;
-
-        // We convert things to lowercase for index searching, but pull substrings from
-        // the submitted text to preserve case. Note: we don't need to htmlEntities the
-        // string because React will safely encode the text for us.
-        const lowerStr = str.toLowerCase();
-        const filterStr = this.props.highlightWord.toLowerCase();
-
-        const result: JSX.Element[] = [];
-
-        let i = 0;
-        let ii: number;
-        while ((ii = lowerStr.indexOf(filterStr, i)) >= 0) {
-            // Push any text we missed (first bit/middle of text)
-            if (ii > i) {
-                // Push any text we aren't highlighting (middle of text match, or beginning of text)
-                result.push(<span key={i + "begin"}>{str.substring(i, ii)}</span>);
-            }
-
-            i = ii; // copy over ii only if we have a match (to preserve i for end-of-text matching)
-
-            // Highlight the word the user entered
-            const substr = str.substring(i, filterStr.length + i);
-            result.push(
-                <span className="mx_InviteDialog_tile--room_highlight" key={i + "bold"}>
-                    {substr}
-                </span>,
-            );
-            i += substr.length;
-        }
-
-        // Push any text we missed (end of text)
-        if (i < str.length) {
-            result.push(<span key={i + "end"}>{str.substring(i)}</span>);
-        }
-
-        return result;
-    }
-
     public render(): React.ReactNode {
-        let timestamp: JSX.Element | undefined;
-        if (this.props.lastActiveTs) {
-            const humanTs = humanizeTime(this.props.lastActiveTs);
-            timestamp = <span className="mx_InviteDialog_tile--room_time">{humanTs}</span>;
-        }
-
-        const avatarSize = "36px";
+        const avatarSize = "32px";
         const avatar = (this.props.member as ThreepidMember).isEmail ? (
             <EmailPillAvatarIcon width={avatarSize} height={avatarSize} />
         ) : (
@@ -242,40 +177,23 @@ class DMRoomTile extends React.PureComponent<IDMRoomTileProps> {
             />
         );
 
-        let checkmark: JSX.Element | undefined;
-        if (this.props.isSelected) {
-            // To reduce flickering we put the 'selected' room tile above the real avatar
-            checkmark = <div className="mx_InviteDialog_tile--room_selected" />;
-        }
-
-        // To reduce flickering we put the checkmark on top of the actual avatar (prevents
-        // the browser from reloading the image source when the avatar remounts).
-        const stackedAvatar = (
-            <span className="mx_InviteDialog_tile_avatarStack">
-                {avatar}
-                {checkmark}
-            </span>
-        );
-
         const userIdentifier = UserIdentifierCustomisations.getDisplayUserIdentifier(this.props.member.userId, {
             withDisplayName: true,
         });
 
         const caption = (this.props.member as ThreepidMember).isEmail
             ? _t("invite|email_caption")
-            : this.highlightName(userIdentifier || this.props.member.userId);
+            : userIdentifier || this.props.member.userId;
 
         return (
-            <AccessibleButton className="mx_InviteDialog_tile mx_InviteDialog_tile--room" onClick={this.onClick}>
-                {stackedAvatar}
-                <span className="mx_InviteDialog_tile_nameStack">
-                    <div className="mx_InviteDialog_tile_nameStack_name">
-                        {this.highlightName(this.props.member.name)}
-                    </div>
-                    <div className="mx_InviteDialog_tile_nameStack_userId">{caption}</div>
-                </span>
-                {timestamp}
-            </AccessibleButton>
+            <RichItem
+                avatar={avatar}
+                title={this.props.member.name}
+                description={caption}
+                timestamp={this.props.lastActiveTs}
+                onClick={this.onClick}
+                selected={this.props.isSelected}
+            />
         );
     }
 }
@@ -330,8 +248,14 @@ interface IInviteDialogState {
     dialPadValue: string;
     currentTabId: TabId;
 
-    // These two flags are used for the 'Go' button to communicate what is going on.
+    /**
+     * True if we are sending the invites.
+     *
+     * We will grey out the action button, hide the suggestions, and display a spinner.
+     */
     busy: boolean;
+
+    /** Error from the last attempt to send invites. */
     errorText?: string;
 }
 
@@ -358,20 +282,22 @@ export default class InviteDialog extends React.PureComponent<Props, IInviteDial
         }
 
         this.profilesStore = SdkContextClass.instance.userProfilesStore;
+        const cli = MatrixClientPeg.safeGet();
 
-        const excludedIds = new Set([MatrixClientPeg.safeGet().getUserId()!]);
+        const excludedIds = new Set([cli.getSafeUserId()]);
         if (isRoomInvite(props)) {
-            const room = MatrixClientPeg.safeGet().getRoom(props.roomId);
-            const isFederated = room?.currentState.getStateEvents(EventType.RoomCreate, "")?.getContent()["m.federate"];
+            const room = cli.getRoom(props.roomId);
             if (!room) throw new Error("Room ID given to InviteDialog does not look like a room");
+            const isFederated = room?.currentState.getStateEvents(EventType.RoomCreate, "")?.getContent()["m.federate"];
             room.getMembersWithMembership(KnownMembership.Invite).forEach((m) => excludedIds.add(m.userId));
             room.getMembersWithMembership(KnownMembership.Join).forEach((m) => excludedIds.add(m.userId));
             // add banned users, so we don't try to invite them
             room.getMembersWithMembership(KnownMembership.Ban).forEach((m) => excludedIds.add(m.userId));
-            if (isFederated === false) {
+            const ourHomeserver = cli.getDomain();
+            if (isFederated === false && ourHomeserver) {
+                // If this room isn't federated, we must be on the same server.
                 // exclude users from external servers
-                const homeserver = props.roomId.split(":")[1];
-                this.excludeExternals(homeserver, excludedIds);
+                this.excludeExternals(ourHomeserver, excludedIds);
             }
         }
 
@@ -385,7 +311,7 @@ export default class InviteDialog extends React.PureComponent<Props, IInviteDial
             numSuggestionsShown: INITIAL_ROOMS_SHOWN,
             serverResultsMixin: [],
             threepidResultsMixin: [],
-            canUseIdentityServer: !!MatrixClientPeg.safeGet().getIdentityServerUrl(),
+            canUseIdentityServer: !!cli.getIdentityServerUrl(),
             tryingIdentityServer: false,
             consultFirst: false,
             dialPadValue: "",
@@ -487,7 +413,7 @@ export default class InviteDialog extends React.PureComponent<Props, IInviteDial
             // We mutate the given set so that any later callers avoid duplicating these users
             excludedTargetIds.add(userId);
         }
-        if (!recents) logger.warn("[Invite:Recents] No recents to suggest!");
+        if (recents.length === 0) logger.warn("[Invite:Recents] No recents to suggest!");
 
         // Sort the recents by last active to save us time later
         recents.sort((a, b) => b.lastActive - a.lastActive);
@@ -616,7 +542,10 @@ export default class InviteDialog extends React.PureComponent<Props, IInviteDial
         }
 
         try {
-            const result = await inviteMultipleToRoom(cli, this.props.roomId, targetIds);
+            const result = await inviteMultipleToRoom(cli, this.props.roomId, targetIds, {
+                // We show our own progress body, so don't pop up a separate dialog.
+                inhibitProgressDialog: true,
+            });
             if (!this.shouldAbortAfterInviteError(result, room)) {
                 // handles setting error message too
                 this.props.onFinished(true);
@@ -662,13 +591,6 @@ export default class InviteDialog extends React.PureComponent<Props, IInviteDial
         const action = getKeyBindingsManager().getAccessibilityAction(e);
 
         switch (action) {
-            case KeyBindingAction.Backspace:
-                if (value || this.state.targets.length <= 0) break;
-
-                // when the field is empty and the user hits backspace remove the right-most target
-                this.removeMember(this.state.targets[this.state.targets.length - 1]);
-                handled = true;
-                break;
             case KeyBindingAction.Space:
                 if (!value || !value.includes("@") || value.includes(" ")) break;
 
@@ -961,16 +883,6 @@ export default class InviteDialog extends React.PureComponent<Props, IInviteDial
         }
     };
 
-    private onClickInputArea = (e: React.MouseEvent): void => {
-        // Stop the browser from highlighting text
-        e.preventDefault();
-        e.stopPropagation();
-
-        if (this.editorRef && this.editorRef.current) {
-            this.editorRef.current.focus();
-        }
-    };
-
     private onUseDefaultIdentityServerClick = (e: ButtonEvent): void => {
         e.preventDefault();
 
@@ -1038,8 +950,13 @@ export default class InviteDialog extends React.PureComponent<Props, IInviteDial
             if (sourceMembers.length === 0 && !hasAdditionalMembers) {
                 return (
                     <div className="mx_InviteDialog_section">
-                        <h3>{sectionName}</h3>
-                        <p>{_t("common|no_results")}</p>
+                        <RichList
+                            title={sectionName}
+                            titleAttributes={{ "role": "heading", "aria-level": 3 }}
+                            isEmpty={true}
+                        >
+                            {_t("common|no_results")}
+                        </RichList>
                     </div>
                 );
             }
@@ -1074,49 +991,48 @@ export default class InviteDialog extends React.PureComponent<Props, IInviteDial
                 lastActiveTs={lastActive(r)}
                 key={r.user.userId}
                 onToggle={this.toggleMember}
-                highlightWord={this.state.filterText}
                 isSelected={this.state.targets.some((t) => t.userId === r.userId)}
             />
         ));
+
         return (
             <div className="mx_InviteDialog_section">
-                <h3>{sectionName}</h3>
-                {tiles}
+                <RichList title={sectionName} titleAttributes={{ "role": "heading", "aria-level": 3 }}>
+                    {tiles}
+                </RichList>
                 {showMore}
             </div>
         );
     }
 
     private renderEditor(): JSX.Element {
-        const hasPlaceholder =
-            this.props.kind == InviteKind.CallTransfer &&
-            this.state.targets.length === 0 &&
-            this.state.filterText.length === 0;
         const targets = this.state.targets.map((t) => (
             <DMUserTile member={t} onRemove={this.state.busy ? undefined : this.removeMember} key={t.userId} />
         ));
-        const input = (
-            <input
-                type="text"
-                onKeyDown={this.onKeyDown}
-                onChange={this.updateFilter}
-                value={this.state.filterText}
-                ref={this.editorRef}
-                onPaste={this.onPaste}
-                autoFocus={true}
-                disabled={
-                    this.state.busy || (this.props.kind == InviteKind.CallTransfer && this.state.targets.length > 0)
-                }
-                autoComplete="off"
-                placeholder={hasPlaceholder ? _t("action|search") : undefined}
-                data-testid="invite-dialog-input"
-            />
-        );
+
         return (
-            <div className="mx_InviteDialog_editor" onClick={this.onClickInputArea}>
+            <PillInput
+                data-testid="invite-dialog-input-wrapper"
+                className="mx_InviteDialog_editor"
+                inputProps={{
+                    "ref": this.editorRef,
+                    "value": this.state.filterText,
+                    "onKeyDown": this.onKeyDown,
+                    "onChange": this.updateFilter,
+                    "onPaste": this.onPaste,
+                    "placeholder": _t("action|search"),
+                    "autoFocus": true,
+                    "disabled":
+                        this.state.busy ||
+                        (this.props.kind == InviteKind.CallTransfer && this.state.targets.length > 0),
+                    "data-testid": "invite-dialog-input",
+                }}
+                onRemoveChildren={() =>
+                    !this.state.busy && this.removeMember(this.state.targets[this.state.targets.length - 1])
+                }
+            >
                 {targets}
-                {input}
-            </div>
+            </PillInput>
         );
     }
 
@@ -1258,30 +1174,84 @@ export default class InviteDialog extends React.PureComponent<Props, IInviteDial
         });
     }
 
-    public render(): React.ReactNode {
-        let spinner: JSX.Element | undefined;
-        if (this.state.busy) {
-            spinner = <Spinner w={20} h={20} />;
+    private hasSelection(): boolean {
+        return this.state.targets.length > 0 || (!!this.state.filterText && this.state.filterText.includes("@"));
+    }
+
+    /**
+     * Render the "suggestions" section, which shows a list of people you might want to invite, together with any
+     * errors from the previous iteration.
+     */
+    private renderSuggestions(): JSX.Element {
+        // If we're starting a DM, add a footer which showing our matrix.to link, for copying & pasting.
+        let footer;
+        if (this.props.kind === InviteKind.Dm) {
+            const link = makeUserPermalink(MatrixClientPeg.safeGet().getSafeUserId());
+            footer = (
+                <div className="mx_InviteDialog_footer">
+                    <h3>{_t("invite|send_link_prompt")}</h3>
+                    <CopyableText getTextToCopy={() => makeUserPermalink(MatrixClientPeg.safeGet().getSafeUserId())}>
+                        <a className="mx_InviteDialog_footer_link" href={link} onClick={this.onLinkClick}>
+                            {link}
+                        </a>
+                    </CopyableText>
+                </div>
+            );
         }
 
-        let title;
+        let results: React.ReactNode | null = null;
+        let onlyOneThreepidNote: React.ReactNode | null = null;
+
+        if (!this.canInviteMore() || (this.hasFilterAtLeastOneEmail() && !this.canInviteThirdParty())) {
+            // We are in DM case here, because of the checks in canInviteMore() / canInviteThirdParty().
+            // Show a note saying "Invites by email can only be sent one at a time".
+            onlyOneThreepidNote = <div className="mx_InviteDialog_oneThreepid">{_t("invite|email_limit_one")}</div>;
+        } else {
+            let extraSection;
+            if (this.props.kind === InviteKind.Dm) {
+                // Some extra words saying "Some suggestions may be hidden for privacy"
+                extraSection = (
+                    <div className="mx_InviteDialog_section_hidden_suggestions_disclaimer">
+                        <span>{_t("invite|suggestions_disclaimer")}</span>
+                        <p>{_t("invite|suggestions_disclaimer_prompt")}</p>
+                    </div>
+                );
+            }
+
+            results = (
+                <div className="mx_InviteDialog_userSections">
+                    {this.renderSection("recents")}
+                    {this.renderSection("suggestions")}
+                    {extraSection}
+                </div>
+            );
+        }
+
+        return (
+            <React.Fragment>
+                {this.renderIdentityServerWarning()}
+                <div className="error">{this.state.errorText}</div>
+                {onlyOneThreepidNote}
+                {results}
+                {footer}
+            </React.Fragment>
+        );
+    }
+
+    /**
+     * Render content of the common "users" tab that is shown whether we have a regular invite dialog or a
+     * "CallTransfer" one.
+     */
+    private renderMainTab(): JSX.Element {
         let helpText;
         let buttonText;
         let goButtonFn: (() => Promise<void>) | null = null;
-        let consultConnectSection;
-        let extraSection;
-        let footer;
 
         const identityServersEnabled = SettingsStore.getValue(UIFeature.IdentityServer);
 
-        const hasSelection =
-            this.state.targets.length > 0 || (this.state.filterText && this.state.filterText.includes("@"));
-
         const cli = MatrixClientPeg.safeGet();
         const userId = cli.getUserId()!;
         if (this.props.kind === InviteKind.Dm) {
-            title = _t("space|add_existing_room_space|dm_heading");
-
             if (identityServersEnabled) {
                 helpText = _t(
                     "invite|start_conversation_name_email_mxid_prompt",
@@ -1314,34 +1284,10 @@ export default class InviteDialog extends React.PureComponent<Props, IInviteDial
 
             buttonText = _t("action|go");
             goButtonFn = this.checkProfileAndStartDm;
-            extraSection = (
-                <div className="mx_InviteDialog_section_hidden_suggestions_disclaimer">
-                    <span>{_t("invite|suggestions_disclaimer")}</span>
-                    <p>{_t("invite|suggestions_disclaimer_prompt")}</p>
-                </div>
-            );
-            const link = makeUserPermalink(MatrixClientPeg.safeGet().getSafeUserId());
-            footer = (
-                <div className="mx_InviteDialog_footer">
-                    <h3>{_t("invite|send_link_prompt")}</h3>
-                    <CopyableText getTextToCopy={() => makeUserPermalink(MatrixClientPeg.safeGet().getSafeUserId())}>
-                        <a className="mx_InviteDialog_footer_link" href={link} onClick={this.onLinkClick}>
-                            {link}
-                        </a>
-                    </CopyableText>
-                </div>
-            );
         } else if (this.props.kind === InviteKind.Invite) {
             const roomId = this.props.roomId;
             const room = MatrixClientPeg.get()?.getRoom(roomId);
             const isSpace = room?.isSpaceRoom();
-            title = isSpace
-                ? _t("invite|to_space", {
-                      spaceName: room?.name || _t("common|unnamed_space"),
-                  })
-                : _t("invite|to_room", {
-                      roomName: room?.name || _t("common|unnamed_room"),
-                  });
 
             let helpTextUntranslated;
             if (isSpace) {
@@ -1382,31 +1328,6 @@ export default class InviteDialog extends React.PureComponent<Props, IInviteDial
 
             buttonText = _t("action|invite");
             goButtonFn = this.inviteUsers;
-        } else if (this.props.kind === InviteKind.CallTransfer) {
-            title = _t("action|transfer");
-
-            consultConnectSection = (
-                <div className="mx_InviteDialog_transferConsultConnect">
-                    <label>
-                        <input type="checkbox" checked={this.state.consultFirst} onChange={this.onConsultFirstChange} />
-                        {_t("voip|transfer_consult_first_label")}
-                    </label>
-                    <AccessibleButton
-                        kind="secondary"
-                        onClick={this.onCancel}
-                        className="mx_InviteDialog_transferConsultConnect_pushRight"
-                    >
-                        {_t("action|cancel")}
-                    </AccessibleButton>
-                    <AccessibleButton
-                        kind="primary"
-                        onClick={this.transferCall}
-                        disabled={!hasSelection && this.state.dialPadValue === ""}
-                    >
-                        {_t("action|transfer")}
-                    </AccessibleButton>
-                </div>
-            );
         }
 
         const goButton =
@@ -1415,134 +1336,166 @@ export default class InviteDialog extends React.PureComponent<Props, IInviteDial
                     kind="primary"
                     onClick={goButtonFn}
                     className="mx_InviteDialog_goButton"
-                    disabled={this.state.busy || !hasSelection}
+                    disabled={this.state.busy || !this.hasSelection()}
                 >
                     {buttonText}
                 </AccessibleButton>
             );
 
-        let results: React.ReactNode | null = null;
-        let onlyOneThreepidNote: React.ReactNode | null = null;
-
-        if (!this.canInviteMore() || (this.hasFilterAtLeastOneEmail() && !this.canInviteThirdParty())) {
-            // We are in DM case here, because of the checks in canInviteMore() / canInviteThirdParty().
-            onlyOneThreepidNote = <div className="mx_InviteDialog_oneThreepid">{_t("invite|email_limit_one")}</div>;
-        } else {
-            results = (
-                <div className="mx_InviteDialog_userSections">
-                    {this.renderSection("recents")}
-                    {this.renderSection("suggestions")}
-                    {extraSection}
-                </div>
-            );
-        }
-
-        const usersSection = (
+        return (
             <React.Fragment>
                 <p className="mx_InviteDialog_helpText">{helpText}</p>
                 <div className="mx_InviteDialog_addressBar">
                     {this.renderEditor()}
-                    <div className="mx_InviteDialog_buttonAndSpinner">
-                        {goButton}
-                        {spinner}
-                    </div>
+                    {goButton}
                 </div>
-                {this.renderIdentityServerWarning()}
-                <div className="error">{this.state.errorText}</div>
-                {onlyOneThreepidNote}
-                {results}
-                {footer}
+                {this.state.busy ? <InviteProgressBody /> : this.renderSuggestions()}
             </React.Fragment>
         );
+    }
 
-        let dialogContent;
-        if (this.props.kind === InviteKind.CallTransfer) {
-            const tabs: NonEmptyArray<Tab<TabId>> = [
-                new Tab(
-                    TabId.UserDirectory,
-                    _td("invite|transfer_user_directory_tab"),
-                    "mx_InviteDialog_userDirectoryIcon",
-                    usersSection,
-                ),
-            ];
-
-            const backspaceButton = <DialPadBackspaceButton onBackspacePress={this.onDeletePress} />;
-
-            // Only show the backspace button if the field has content
-            let dialPadField;
-            if (this.state.dialPadValue.length !== 0) {
-                dialPadField = (
-                    <Field
-                        ref={this.numberEntryFieldRef}
-                        className="mx_InviteDialog_dialPadField"
-                        id="dialpad_number"
-                        value={this.state.dialPadValue}
-                        autoFocus={true}
-                        onChange={this.onDialChange}
-                        postfixComponent={backspaceButton}
-                    />
-                );
-            } else {
-                dialPadField = (
-                    <Field
-                        ref={this.numberEntryFieldRef}
-                        className="mx_InviteDialog_dialPadField"
-                        id="dialpad_number"
-                        value={this.state.dialPadValue}
-                        autoFocus={true}
-                        onChange={this.onDialChange}
-                    />
-                );
-            }
-
-            const dialPadSection = (
-                <div className="mx_InviteDialog_dialPad">
-                    <form onSubmit={this.onDialFormSubmit}>{dialPadField}</form>
-                    <Dialpad hasDial={false} onDigitPress={this.onDigitPress} onDeletePress={this.onDeletePress} />
-                </div>
-            );
-            tabs.push(
-                new Tab(
-                    TabId.DialPad,
-                    _td("invite|transfer_dial_pad_tab"),
-                    "mx_InviteDialog_dialPadIcon",
-                    dialPadSection,
-                ),
-            );
-            dialogContent = (
-                <React.Fragment>
-                    <TabbedView<TabId>
-                        tabs={tabs}
-                        activeTabId={this.state.currentTabId}
-                        tabLocation={TabLocation.TOP}
-                        onChange={this.onTabChange}
-                    />
-                    {consultConnectSection}
-                </React.Fragment>
-            );
-        } else {
-            dialogContent = (
-                <React.Fragment>
-                    {usersSection}
-                    {consultConnectSection}
-                </React.Fragment>
-            );
+    /**
+     * Render the complete dialog, given this is not a call transfer dialog.
+     *
+     * See also: {@link renderCallTransferDialog}.
+     */
+    private renderRegularDialog(): React.ReactNode {
+        let title;
+        if (this.props.kind === InviteKind.Dm) {
+            title = _t("space|add_existing_room_space|dm_heading");
+        } else if (this.props.kind === InviteKind.Invite) {
+            const roomId = this.props.roomId;
+            const room = MatrixClientPeg.get()?.getRoom(roomId);
+            const isSpace = room?.isSpaceRoom();
+            title = isSpace
+                ? _t("invite|to_space", {
+                      spaceName: room?.name || _t("common|unnamed_space"),
+                  })
+                : _t("invite|to_room", {
+                      roomName: room?.name || _t("common|unnamed_room"),
+                  });
         }
 
         return (
             <BaseDialog
-                className={classNames({
-                    mx_InviteDialog_transfer: this.props.kind === InviteKind.CallTransfer,
-                    mx_InviteDialog_other: this.props.kind !== InviteKind.CallTransfer,
-                    mx_InviteDialog_hasFooter: !!footer,
-                })}
+                className="mx_InviteDialog_other"
                 hasCancel={true}
                 onFinished={this.props.onFinished}
                 title={title}
                 screenName={this.screenName}
+            >
+                <div className="mx_InviteDialog_content">{this.renderMainTab()}</div>
+            </BaseDialog>
+        );
+    }
+
+    /**
+     * Render the complete call transfer dialog.
+     *
+     * See also: {@link renderRegularDialog}.
+     */
+    private renderCallTransferDialog(): React.ReactNode {
+        const usersSection = this.renderMainTab();
+
+        const tabs: NonEmptyArray<Tab<TabId>> = [
+            new Tab(
+                TabId.UserDirectory,
+                _td("invite|transfer_user_directory_tab"),
+                <UserProfileSolidIcon />,
+                usersSection,
+            ),
+        ];
+
+        const backspaceButton = <DialPadBackspaceButton onBackspacePress={this.onDeletePress} />;
+
+        // Only show the backspace button if the field has content
+        let dialPadField;
+        if (this.state.dialPadValue.length !== 0) {
+            dialPadField = (
+                <Field
+                    ref={this.numberEntryFieldRef}
+                    className="mx_InviteDialog_dialPadField"
+                    id="dialpad_number"
+                    value={this.state.dialPadValue}
+                    autoFocus={true}
+                    onChange={this.onDialChange}
+                    postfixComponent={backspaceButton}
+                />
+            );
+        } else {
+            dialPadField = (
+                <Field
+                    ref={this.numberEntryFieldRef}
+                    className="mx_InviteDialog_dialPadField"
+                    id="dialpad_number"
+                    value={this.state.dialPadValue}
+                    autoFocus={true}
+                    onChange={this.onDialChange}
+                />
+            );
+        }
+
+        const dialPadSection = (
+            <div className="mx_InviteDialog_dialPad">
+                <form onSubmit={this.onDialFormSubmit}>{dialPadField}</form>
+                <Dialpad hasDial={false} onDigitPress={this.onDigitPress} onDeletePress={this.onDeletePress} />
+            </div>
+        );
+        tabs.push(new Tab(TabId.DialPad, _td("invite|transfer_dial_pad_tab"), <DialPadIcon />, dialPadSection));
+
+        const consultConnectSection = (
+            <div className="mx_InviteDialog_transferConsultConnect">
+                <label>
+                    <input type="checkbox" checked={this.state.consultFirst} onChange={this.onConsultFirstChange} />
+                    {_t("voip|transfer_consult_first_label")}
+                </label>
+                <AccessibleButton
+                    kind="secondary"
+                    onClick={this.onCancel}
+                    className="mx_InviteDialog_transferConsultConnect_pushRight"
+                >
+                    {_t("action|cancel")}
+                </AccessibleButton>
+                <AccessibleButton
+                    kind="primary"
+                    onClick={this.transferCall}
+                    disabled={!this.hasSelection() && this.state.dialPadValue === ""}
+                >
+                    {_t("action|transfer")}
+                </AccessibleButton>
+            </div>
+        );
+
+        const dialogContent = (
+            <React.Fragment>
+                <TabbedView<TabId>
+                    tabs={tabs}
+                    activeTabId={this.state.currentTabId}
+                    tabLocation={TabLocation.TOP}
+                    onChange={this.onTabChange}
+                />
+                {consultConnectSection}
+            </React.Fragment>
+        );
+
+        return (
+            <BaseDialog
+                className="mx_InviteDialog_transfer"
+                hasCancel={true}
+                onFinished={this.props.onFinished}
+                title={_t("action|transfer")}
+                screenName={this.screenName}
             >
                 <div className="mx_InviteDialog_content">{dialogContent}</div>
             </BaseDialog>
         );
     }
+
+    public render(): React.ReactNode {
+        if (this.props.kind === InviteKind.CallTransfer) {
+            return this.renderCallTransferDialog();
+        } else {
+            return this.renderRegularDialog();
+        }
+    }
 }
diff --git a/src/components/views/dialogs/InviteProgressBody.tsx b/src/components/views/dialogs/InviteProgressBody.tsx
new file mode 100644
index 0000000000..a61c0d5922
--- /dev/null
+++ b/src/components/views/dialogs/InviteProgressBody.tsx
@@ -0,0 +1,24 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+
+import InlineSpinner from "../elements/InlineSpinner";
+import { _t } from "../../../languageHandler";
+
+/** The common body of components that show the progress of sending room invites. */
+const InviteProgressBody: React.FC = () => {
+    return (
+        <div className="mx_InviteProgressBody">
+            <InlineSpinner w={32} h={32} />
+            <h1>{_t("invite|progress|preparing")}</h1>
+            {_t("invite|progress|dont_close")}
+        </div>
+    );
+};
+
+export default InviteProgressBody;
diff --git a/src/components/views/dialogs/InviteProgressDialog.tsx b/src/components/views/dialogs/InviteProgressDialog.tsx
new file mode 100644
index 0000000000..fe62afa8d8
--- /dev/null
+++ b/src/components/views/dialogs/InviteProgressDialog.tsx
@@ -0,0 +1,38 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+
+import Modal from "../../../Modal.tsx";
+import InviteProgressBody from "./InviteProgressBody.tsx";
+
+/** A Modal dialog that pops up while room invites are being sent. */
+const InviteProgressDialog: React.FC = (_) => {
+    return <InviteProgressBody />;
+};
+
+/**
+ * Open the invite progress dialog.
+ *
+ * Returns a callback which will close the dialog again.
+ */
+export function openInviteProgressDialog(): () => void {
+    const onBeforeClose = async (reason?: string): Promise<boolean> => {
+        // Inhibit closing via background click
+        return reason != "backgroundClick";
+    };
+
+    const { close } = Modal.createDialog(
+        InviteProgressDialog,
+        /* props */ {},
+        /* className */ undefined,
+        /* isPriorityModal */ false,
+        /* isStaticModal */ false,
+        { onBeforeClose },
+    );
+    return close;
+}
diff --git a/src/components/views/dialogs/LeaveSpaceDialog.tsx b/src/components/views/dialogs/LeaveSpaceDialog.tsx
index e81606db79..37838292ff 100644
--- a/src/components/views/dialogs/LeaveSpaceDialog.tsx
+++ b/src/components/views/dialogs/LeaveSpaceDialog.tsx
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { useMemo, useState } from "react";
 import { type Room, JoinRule } from "matrix-js-sdk/src/matrix";
+import { InfoSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import DialogButtons from "../elements/DialogButtons";
@@ -15,23 +16,13 @@ import BaseDialog from "../dialogs/BaseDialog";
 import SpaceStore from "../../../stores/spaces/SpaceStore";
 import SpaceChildrenPicker from "../spaces/SpaceChildrenPicker";
 import { filterBoolean } from "../../../utils/arrays";
+import { isOnlyAdmin } from "../../../utils/membership";
 
 interface IProps {
     space: Room;
     onFinished(leave: boolean, rooms?: Room[]): void;
 }
 
-const isOnlyAdmin = (room: Room): boolean => {
-    const userId = room.client.getSafeUserId();
-    if (room.getMember(userId)?.powerLevelNorm !== 100) {
-        return false; // user is not an admin
-    }
-    return room.getJoinedMembers().every((member) => {
-        // return true if every other member has a lower power level (we are highest)
-        return member.userId === userId || member.powerLevelNorm < 100;
-    });
-};
-
 const LeaveSpaceDialog: React.FC<IProps> = ({ space, onFinished }) => {
     const spaceChildren = useMemo(() => {
         const roomSet = new Set(SpaceStore.instance.getSpaceFilteredRoomIds(space.roomId));
@@ -98,7 +89,12 @@ const LeaveSpaceDialog: React.FC<IProps> = ({ space, onFinished }) => {
                     />
                 )}
 
-                {onlyAdminWarning && <div className="mx_LeaveSpaceDialog_section_warning">{onlyAdminWarning}</div>}
+                {onlyAdminWarning && (
+                    <div className="mx_LeaveSpaceDialog_section_warning">
+                        <InfoSolidIcon />
+                        {onlyAdminWarning}
+                    </div>
+                )}
             </div>
             <DialogButtons
                 primaryButton={_t("space|leave_dialog_action")}
diff --git a/src/components/views/dialogs/LogoutDialog.tsx b/src/components/views/dialogs/LogoutDialog.tsx
index 6e000ef631..830e5fb589 100644
--- a/src/components/views/dialogs/LogoutDialog.tsx
+++ b/src/components/views/dialogs/LogoutDialog.tsx
@@ -13,9 +13,11 @@ import { type MatrixClient } from "matrix-js-sdk/src/matrix";
 
 import Modal from "../../../Modal";
 import dis from "../../../dispatcher/dispatcher";
+import { type OpenToTabPayload } from "../../../dispatcher/payloads/OpenToTabPayload";
+import { Action } from "../../../dispatcher/actions";
+import { UserTab } from "../../../components/views/dialogs/UserTab";
 import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import RestoreKeyBackupDialog from "./security/RestoreKeyBackupDialog";
 import QuestionDialog from "./QuestionDialog";
 import BaseDialog from "./BaseDialog";
 import Spinner from "../elements/Spinner";
@@ -138,26 +140,12 @@ export default class LogoutDialog extends React.Component<IProps, IState> {
     };
 
     private onSetRecoveryMethodClick = (): void => {
-        if (this.state.backupStatus === BackupStatus.SERVER_BACKUP_BUT_DISABLED) {
-            // A key backup exists for this account, but the creating device is not
-            // verified, so restore the backup which will give us the keys from it and
-            // allow us to trust it (ie. upload keys to it)
-            Modal.createDialog(
-                RestoreKeyBackupDialog,
-                undefined,
-                undefined,
-                /* priority = */ false,
-                /* static = */ true,
-            );
-        } else {
-            Modal.createDialog(
-                lazy(() => import("../../../async-components/views/dialogs/security/CreateKeyBackupDialog")),
-                undefined,
-                undefined,
-                /* priority = */ false,
-                /* static = */ true,
-            );
-        }
+        // Open the user settings dialog to the encryption tab and start the flow to reset encryption
+        const payload: OpenToTabPayload = {
+            action: Action.ViewUserSettings,
+            initialTabId: UserTab.Encryption,
+        };
+        dis.dispatch(payload);
 
         // close dialog
         this.props.onFinished(true);
@@ -190,22 +178,13 @@ export default class LogoutDialog extends React.Component<IProps, IState> {
             </div>
         );
 
-        let setupButtonCaption;
-        if (this.state.backupStatus === BackupStatus.SERVER_BACKUP_BUT_DISABLED) {
-            setupButtonCaption = _t("settings|security|key_backup_connect");
-        } else {
-            // if there's an error fetching the backup info, we'll just assume there's
-            // no backup for the purpose of the button caption
-            setupButtonCaption = _t("auth|logout_dialog|use_key_backup");
-        }
-
         const dialogContent = (
             <div>
                 <div className="mx_Dialog_content" id="mx_Dialog_content">
                     {description}
                 </div>
                 <DialogButtons
-                    primaryButton={setupButtonCaption}
+                    primaryButton={_t("common|go_to_settings")}
                     hasCancel={false}
                     onPrimaryButtonClick={this.onSetRecoveryMethodClick}
                     focus={true}
diff --git a/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx b/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx
index 0f16d3d6f6..2de5d23b55 100644
--- a/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx
+++ b/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx
@@ -9,6 +9,7 @@ Please see LICENSE files in the repository root for full details.
 import React, { useMemo, useState } from "react";
 import { Room } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
+import { InfoSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import BaseDialog from "./BaseDialog";
@@ -126,6 +127,7 @@ const ManageRestrictedJoinRuleDialog: React.FC<IProps> = ({ room, selected = [],
     if (newSelected.size < 1) {
         inviteOnlyWarning = (
             <div className="mx_ManageRestrictedJoinRuleDialog_section_info">
+                <InfoSolidIcon />
                 {_t("room_settings|security|join_rule_restricted_dialog_empty_warning")}
             </div>
         );
@@ -183,7 +185,8 @@ const ManageRestrictedJoinRuleDialog: React.FC<IProps> = ({ room, selected = [],
                         <div className="mx_ManageRestrictedJoinRuleDialog_section">
                             <h3>{_t("room_settings|security|join_rule_restricted_dialog_heading_other")}</h3>
                             <div className="mx_ManageRestrictedJoinRuleDialog_section_info">
-                                <div>{_t("room_settings|security|join_rule_restricted_dialog_heading_unknown")}</div>
+                                <InfoSolidIcon />
+                                {_t("room_settings|security|join_rule_restricted_dialog_heading_unknown")}
                             </div>
                             {filteredOtherEntries.map((space) => {
                                 return (
diff --git a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx
new file mode 100644
index 0000000000..566061f73b
--- /dev/null
+++ b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx
@@ -0,0 +1,171 @@
+/*
+Copyright 2024-2025 New Vector Ltd.
+Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2019 New Vector Ltd
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2017 Vector Creations Ltd
+Copyright 2016 OpenMarket Ltd
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React, { type ChangeEvent, type JSX, useCallback, useState } from "react";
+import { type MatrixClient } from "matrix-js-sdk/src/matrix";
+
+import { _t, UserFriendlyError } from "../../../languageHandler";
+import { getDeviceCryptoInfo } from "../../../utils/crypto/deviceInfo";
+import QuestionDialog from "./QuestionDialog";
+import Modal from "../../../Modal";
+import InfoDialog from "./InfoDialog";
+import Field from "../elements/Field";
+import ErrorDialog from "./ErrorDialog";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+
+interface Props {
+    onFinished(confirm?: boolean): void;
+}
+
+/**
+ * A dialog to allow us to verify devices logged in with clients that can't do
+ * the verification themselves. Intended for use as a dev tool.
+ *
+ * Requires entering the fingerprint ("session key") of the device in an attempt
+ * to prevent users being tricked into verifying a malicious device.
+ */
+export function ManualDeviceKeyVerificationDialog({ onFinished }: Readonly<Props>): JSX.Element {
+    const [deviceId, setDeviceId] = useState("");
+    const [fingerprint, setFingerprint] = useState("");
+
+    const client = MatrixClientPeg.safeGet();
+
+    const onDialogFinished = useCallback(
+        async (confirm: boolean) => {
+            if (confirm) {
+                await manuallyVerifyDevice(client, deviceId, fingerprint);
+            }
+            onFinished(confirm);
+        },
+        [client, deviceId, fingerprint, onFinished],
+    );
+
+    const onDeviceIdChange = useCallback((e: ChangeEvent<HTMLInputElement>) => {
+        setDeviceId(e.target.value);
+    }, []);
+
+    const onFingerprintChange = useCallback((e: ChangeEvent<HTMLInputElement>) => {
+        setFingerprint(e.target.value);
+    }, []);
+
+    const body = (
+        <div>
+            <p>{_t("encryption|verification|manual|text")}</p>
+            <div className="mx_DeviceVerifyDialog_cryptoSection">
+                <Field
+                    className="mx_TextInputDialog_input"
+                    type="text"
+                    label={_t("encryption|verification|manual|device_id")}
+                    value={deviceId}
+                    onChange={onDeviceIdChange}
+                />
+                <Field
+                    className="mx_TextInputDialog_input"
+                    type="text"
+                    label={_t("encryption|verification|manual|fingerprint")}
+                    value={fingerprint}
+                    onChange={onFingerprintChange}
+                />
+            </div>
+        </div>
+    );
+
+    return (
+        <QuestionDialog
+            title={_t("settings|sessions|verify_session")}
+            description={body}
+            button={_t("settings|sessions|verify_session")}
+            onFinished={onDialogFinished}
+        />
+    );
+}
+
+/**
+ * Check the supplied fingerprint matches the fingerprint ("session key") of the
+ * device with the supplied device ID, and if so, mark the device as verified.
+ */
+export async function manuallyVerifyDevice(client: MatrixClient, deviceId: string, fingerprint: string): Promise<void> {
+    try {
+        await doManuallyVerifyDevice(client, deviceId, fingerprint);
+
+        // Tell the user we verified everything
+        Modal.createDialog(InfoDialog, {
+            title: _t("encryption|verification|manual|success_title"),
+            description: (
+                <div>
+                    <p>{_t("encryption|verification|manual|success_description", { deviceId })}</p>
+                </div>
+            ),
+        });
+    } catch (e: any) {
+        // Display an error
+        const error = e instanceof UserFriendlyError ? e.translatedMessage : e.toString();
+        Modal.createDialog(ErrorDialog, {
+            title: _t("encryption|verification|manual|failure_title"),
+            description: (
+                <div>
+                    <p>{_t("encryption|verification|manual|failure_description", { deviceId, error })}</p>
+                </div>
+            ),
+        });
+    }
+}
+
+async function doManuallyVerifyDevice(client: MatrixClient, deviceId: string, fingerprint: string): Promise<void> {
+    const userId = client.getUserId();
+    if (!userId) {
+        throw new UserFriendlyError("encryption|verification|manual|no_userid", {
+            cause: undefined,
+        });
+    }
+
+    const crypto = client.getCrypto();
+    if (!crypto) {
+        throw new UserFriendlyError("encryption|verification|manual|no_crypto");
+    }
+
+    const device = await getDeviceCryptoInfo(client, userId, deviceId);
+    if (!device) {
+        throw new UserFriendlyError("encryption|verification|manual|no_device", {
+            deviceId,
+            cause: undefined,
+        });
+    }
+    const deviceTrust = await crypto.getDeviceVerificationStatus(userId, deviceId);
+
+    if (deviceTrust?.isVerified()) {
+        if (device.getFingerprint() === fingerprint) {
+            throw new UserFriendlyError("encryption|verification|manual|already_verified", {
+                deviceId,
+                cause: undefined,
+            });
+        } else {
+            throw new UserFriendlyError("encryption|verification|manual|already_verified_and_wrong_fingerprint", {
+                deviceId,
+                cause: undefined,
+            });
+        }
+    }
+
+    if (device.getFingerprint() !== fingerprint) {
+        const fprint = device.getFingerprint();
+        throw new UserFriendlyError("encryption|verification|manual|wrong_fingerprint", {
+            fprint,
+            deviceId,
+            fingerprint,
+            cause: undefined,
+        });
+    }
+
+    // We've passed all the checks - do the device verification
+    await crypto.crossSignDevice(deviceId);
+}
diff --git a/src/components/views/dialogs/ModalWidgetDialog.tsx b/src/components/views/dialogs/ModalWidgetDialog.tsx
index 250a438c13..c0af2b632b 100644
--- a/src/components/views/dialogs/ModalWidgetDialog.tsx
+++ b/src/components/views/dialogs/ModalWidgetDialog.tsx
@@ -27,11 +27,11 @@ import { ErrorIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 import BaseDialog from "./BaseDialog";
 import { _t, getUserLanguage } from "../../../languageHandler";
 import AccessibleButton, { type AccessibleButtonKind } from "../elements/AccessibleButton";
-import { StopGapWidgetDriver } from "../../../stores/widgets/StopGapWidgetDriver";
+import { ElementWidgetDriver } from "../../../stores/widgets/ElementWidgetDriver";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { OwnProfileStore } from "../../../stores/OwnProfileStore";
 import { arrayFastClone } from "../../../utils/arrays";
-import { ElementWidget } from "../../../stores/widgets/StopGapWidget";
+import { ElementWidget } from "../../../stores/widgets/WidgetMessaging";
 import { ELEMENT_CLIENT_ID } from "../../../identifiers";
 import ThemeWatcher, { ThemeWatcherEvent } from "../../../settings/watchers/ThemeWatcher";
 
@@ -72,7 +72,7 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
     }
 
     public componentDidMount(): void {
-        const driver = new StopGapWidgetDriver([], this.widget, WidgetKind.Modal, false);
+        const driver = new ElementWidgetDriver(this.widget, WidgetKind.Modal, false);
         const messaging = new ClientWidgetApi(this.widget, this.appFrame.current!, driver);
         this.setState({ messaging });
     }
diff --git a/src/components/views/dialogs/ReportRoomDialog.tsx b/src/components/views/dialogs/ReportRoomDialog.tsx
index 2204153c0e..9a7ac2bd56 100644
--- a/src/components/views/dialogs/ReportRoomDialog.tsx
+++ b/src/components/views/dialogs/ReportRoomDialog.tsx
@@ -6,7 +6,15 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type JSX, type ChangeEventHandler, useCallback, useState } from "react";
-import { Root, Field, Label, InlineSpinner, ErrorMessage, HelpMessage } from "@vector-im/compound-web";
+import {
+    Root,
+    Field,
+    Label,
+    InlineSpinner,
+    ErrorMessage,
+    HelpMessage,
+    SettingsToggleInput,
+} from "@vector-im/compound-web";
 
 import { _t } from "../../../languageHandler";
 import SdkConfig from "../../../SdkConfig";
@@ -14,7 +22,6 @@ import Markdown from "../../../Markdown";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 
 interface IProps {
     roomId: string;
@@ -33,6 +40,10 @@ export const ReportRoomDialog: React.FC<IProps> = function ({ roomId, onFinished
     const client = MatrixClientPeg.safeGet();
 
     const onReasonChange = useCallback<ChangeEventHandler<HTMLTextAreaElement>>((e) => setReason(e.target.value), []);
+    const onLeaveRoomChanged = useCallback<ChangeEventHandler<HTMLInputElement>>(
+        (e) => setLeaveRoom(e.target.checked),
+        [setLeaveRoom],
+    );
     const onCancel = useCallback(() => onFinished(false), [onFinished]);
     const onSubmit = useCallback(async () => {
         setBusy(true);
@@ -78,10 +89,11 @@ export const ReportRoomDialog: React.FC<IProps> = function ({ roomId, onFinished
                 </Field>
                 {adminMessage}
                 {busy ? <InlineSpinner /> : null}
-                <LabelledToggleSwitch
+                <SettingsToggleInput
+                    name="leave-room"
                     label={_t("room_list|more_options|leave_room")}
-                    value={leaveRoom}
-                    onChange={setLeaveRoom}
+                    checked={leaveRoom}
+                    onChange={onLeaveRoomChanged}
                 />
                 <DialogButtons
                     primaryButton={_t("action|send_report")}
diff --git a/src/components/views/dialogs/RoomSettingsDialog.tsx b/src/components/views/dialogs/RoomSettingsDialog.tsx
index 8c90a356d2..5e9e660967 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.tsx
+++ b/src/components/views/dialogs/RoomSettingsDialog.tsx
@@ -10,6 +10,15 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import { RoomEvent, type Room, RoomStateEvent, type MatrixEvent, EventType } from "matrix-js-sdk/src/matrix";
+import {
+    AdminIcon,
+    GroupIcon,
+    LockIcon,
+    PollsIcon,
+    SettingsIcon,
+    VoiceCallIcon,
+    NotificationsIcon,
+} from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import TabbedView, { Tab } from "../../structures/TabbedView";
 import { _t, _td } from "../../../languageHandler";
@@ -31,6 +40,8 @@ import { type NonEmptyArray } from "../../../@types/common";
 import { PollHistoryTab } from "../settings/tabs/room/PollHistoryTab";
 import ErrorBoundary from "../elements/ErrorBoundary";
 import { PeopleRoomSettingsTab } from "../settings/tabs/room/PeopleRoomSettingsTab";
+import { Icon as AdvancedIcon } from "../../../../res/img/element-icons/room/settings/advanced.svg";
+import { Icon as BridgeIcon } from "../../../../res/img/feather-customised/bridge.svg";
 
 export const enum RoomSettingsTab {
     General = "ROOM_GENERAL_TAB",
@@ -129,7 +140,7 @@ class RoomSettingsDialog extends React.Component<IProps, IState> {
             new Tab(
                 RoomSettingsTab.General,
                 _td("common|general"),
-                "mx_RoomSettingsDialog_settingsIcon",
+                <SettingsIcon />,
                 <GeneralRoomSettingsTab room={this.state.room} />,
                 "RoomSettingsGeneral",
             ),
@@ -139,7 +150,7 @@ class RoomSettingsDialog extends React.Component<IProps, IState> {
                 new Tab(
                     RoomSettingsTab.People,
                     _td("common|people"),
-                    "mx_RoomSettingsDialog_peopleIcon",
+                    <GroupIcon />,
                     <PeopleRoomSettingsTab room={this.state.room} />,
                 ),
             );
@@ -149,7 +160,7 @@ class RoomSettingsDialog extends React.Component<IProps, IState> {
                 new Tab(
                     RoomSettingsTab.Voip,
                     _td("settings|voip|title"),
-                    "mx_RoomSettingsDialog_voiceIcon",
+                    <VoiceCallIcon />,
                     <VoipRoomSettingsTab room={this.state.room} />,
                 ),
             );
@@ -158,7 +169,7 @@ class RoomSettingsDialog extends React.Component<IProps, IState> {
             new Tab(
                 RoomSettingsTab.Security,
                 _td("room_settings|security|title"),
-                "mx_RoomSettingsDialog_securityIcon",
+                <LockIcon />,
                 <SecurityRoomSettingsTab room={this.state.room} closeSettingsFn={() => this.props.onFinished(true)} />,
                 "RoomSettingsSecurityPrivacy",
             ),
@@ -167,7 +178,7 @@ class RoomSettingsDialog extends React.Component<IProps, IState> {
             new Tab(
                 RoomSettingsTab.Roles,
                 _td("room_settings|permissions|title"),
-                "mx_RoomSettingsDialog_rolesIcon",
+                <AdminIcon />,
                 <RolesRoomSettingsTab room={this.state.room} />,
                 "RoomSettingsRolesPermissions",
             ),
@@ -176,13 +187,11 @@ class RoomSettingsDialog extends React.Component<IProps, IState> {
             new Tab(
                 RoomSettingsTab.Notifications,
                 _td("notifications|enable_prompt_toast_title"),
-                "mx_RoomSettingsDialog_notificationsIcon",
-                (
-                    <NotificationSettingsTab
-                        roomId={this.state.room.roomId}
-                        closeSettingsFn={() => this.props.onFinished(true)}
-                    />
-                ),
+                <NotificationsIcon />,
+                <NotificationSettingsTab
+                    roomId={this.state.room.roomId}
+                    closeSettingsFn={() => this.props.onFinished(true)}
+                />,
                 "RoomSettingsNotifications",
             ),
         );
@@ -192,7 +201,7 @@ class RoomSettingsDialog extends React.Component<IProps, IState> {
                 new Tab(
                     RoomSettingsTab.Bridges,
                     _td("room_settings|bridges|title"),
-                    "mx_RoomSettingsDialog_bridgesIcon",
+                    <BridgeIcon />,
                     <BridgeSettingsTab room={this.state.room} />,
                     "RoomSettingsBridges",
                 ),
@@ -203,7 +212,7 @@ class RoomSettingsDialog extends React.Component<IProps, IState> {
             new Tab(
                 RoomSettingsTab.PollHistory,
                 _td("right_panel|polls_button"),
-                "mx_RoomSettingsDialog_pollsIcon",
+                <PollsIcon />,
                 <PollHistoryTab room={this.state.room} onFinished={() => this.props.onFinished(true)} />,
             ),
         );
@@ -213,13 +222,11 @@ class RoomSettingsDialog extends React.Component<IProps, IState> {
                 new Tab(
                     RoomSettingsTab.Advanced,
                     _td("common|advanced"),
-                    "mx_RoomSettingsDialog_warningIcon",
-                    (
-                        <AdvancedRoomSettingsTab
-                            room={this.state.room}
-                            closeSettingsFn={() => this.props.onFinished(true)}
-                        />
-                    ),
+                    <AdvancedIcon />,
+                    <AdvancedRoomSettingsTab
+                        room={this.state.room}
+                        closeSettingsFn={() => this.props.onFinished(true)}
+                    />,
                     "RoomSettingsAdvanced",
                 ),
             );
diff --git a/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx b/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
index 4eeb6677f1..caaf41eaaa 100644
--- a/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
+++ b/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
@@ -6,12 +6,12 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { type JSX, type ReactNode, type SyntheticEvent } from "react";
+import React, { type ChangeEventHandler, type JSX, type ReactNode, type SyntheticEvent } from "react";
 import { EventType, JoinRule } from "matrix-js-sdk/src/matrix";
+import { Form, SettingsToggleInput } from "@vector-im/compound-web";
 
 import { _t } from "../../../languageHandler";
 import SdkConfig from "../../../SdkConfig";
-import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import Modal from "../../../Modal";
 import BugReportDialog from "./BugReportDialog";
@@ -87,8 +87,8 @@ export default class RoomUpgradeWarningDialog extends React.Component<IProps, IS
         this.props.onFinished({ continue: false, invite: false });
     };
 
-    private onInviteUsersToggle = (inviteUsersToNewRoom: boolean): void => {
-        this.setState({ inviteUsersToNewRoom });
+    private onInviteUsersToggle: ChangeEventHandler<HTMLInputElement> = (evt): void => {
+        this.setState({ inviteUsersToNewRoom: evt.target.checked });
     };
 
     private openBugReportDialog = (e: SyntheticEvent): void => {
@@ -104,11 +104,19 @@ export default class RoomUpgradeWarningDialog extends React.Component<IProps, IS
         let inviteToggle: JSX.Element | undefined;
         if (this.isInviteOrKnockRoom) {
             inviteToggle = (
-                <LabelledToggleSwitch
-                    value={this.state.inviteUsersToNewRoom}
-                    onChange={this.onInviteUsersToggle}
-                    label={_t("room_settings|advanced|upgrade_warning_dialog_invite_label")}
-                />
+                <Form.Root
+                    onSubmit={(evt) => {
+                        evt.preventDefault();
+                        evt.stopPropagation();
+                    }}
+                >
+                    <SettingsToggleInput
+                        name="room-upgrade-warning"
+                        checked={this.state.inviteUsersToNewRoom}
+                        onChange={this.onInviteUsersToggle}
+                        label={_t("room_settings|advanced|upgrade_warning_dialog_invite_label")}
+                    />
+                </Form.Root>
             );
         }
 
diff --git a/src/components/views/dialogs/ServerOfflineDialog.tsx b/src/components/views/dialogs/ServerOfflineDialog.tsx
index 45a1e80714..f403ecb790 100644
--- a/src/components/views/dialogs/ServerOfflineDialog.tsx
+++ b/src/components/views/dialogs/ServerOfflineDialog.tsx
@@ -52,7 +52,7 @@ export default class ServerOfflineDialog extends React.PureComponent<IProps> {
             const entries = c.transactions
                 .filter((t) => t.status === TransactionStatus.Error || t.didPreviouslyFail)
                 .map((t, j) => {
-                    let button = <Spinner w={19} h={19} />;
+                    let button = <Spinner size={19} />;
                     if (t.status === TransactionStatus.Error) {
                         button = (
                             <AccessibleButton kind="link" onClick={() => t.run()}>
diff --git a/src/components/views/dialogs/SlashCommandHelpDialog.tsx b/src/components/views/dialogs/SlashCommandHelpDialog.tsx
index 819d28513e..0ac1a0de0d 100644
--- a/src/components/views/dialogs/SlashCommandHelpDialog.tsx
+++ b/src/components/views/dialogs/SlashCommandHelpDialog.tsx
@@ -13,14 +13,20 @@ import { type Command, CommandCategories, Commands } from "../../../SlashCommand
 import InfoDialog from "./InfoDialog";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 
+/**
+ * Props for {@link SlashCommandHelpDialog}
+ * @param roomId - The room ID to check whether commands are enabled
+ * @param onFinished - Callback called when the dialog is closed
+ */
 interface IProps {
+    roomId: string;
     onFinished(): void;
 }
 
-const SlashCommandHelpDialog: React.FC<IProps> = ({ onFinished }) => {
+const SlashCommandHelpDialog: React.FC<IProps> = ({ roomId, onFinished }) => {
     const categories: Record<string, Command[]> = {};
     Commands.forEach((cmd) => {
-        if (!cmd.isEnabled(MatrixClientPeg.get())) return;
+        if (!cmd.isEnabled(MatrixClientPeg.get(), roomId)) return;
         if (!categories[cmd.category]) {
             categories[cmd.category] = [];
         }
diff --git a/src/components/views/dialogs/SpacePreferencesDialog.tsx b/src/components/views/dialogs/SpacePreferencesDialog.tsx
index 3bb3416524..69fa897ec3 100644
--- a/src/components/views/dialogs/SpacePreferencesDialog.tsx
+++ b/src/components/views/dialogs/SpacePreferencesDialog.tsx
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type ChangeEvent } from "react";
 import { type Room } from "matrix-js-sdk/src/matrix";
+import { VisibilityOnIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t, _td } from "../../../languageHandler";
 import BaseDialog from "../dialogs/BaseDialog";
@@ -63,7 +64,7 @@ const SpacePreferencesDialog: React.FC<IProps> = ({ space, onFinished }) => {
         new Tab(
             SpacePreferenceTab.Appearance,
             _td("common|appearance"),
-            "mx_SpacePreferencesDialog_appearanceIcon",
+            <VisibilityOnIcon />,
             <SpacePreferencesAppearanceTab space={space} />,
         ),
     ];
diff --git a/src/components/views/dialogs/SpaceSettingsDialog.tsx b/src/components/views/dialogs/SpaceSettingsDialog.tsx
index 797622a271..336dee0c87 100644
--- a/src/components/views/dialogs/SpaceSettingsDialog.tsx
+++ b/src/components/views/dialogs/SpaceSettingsDialog.tsx
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { useMemo } from "react";
 import { type Room, type MatrixClient } from "matrix-js-sdk/src/matrix";
+import { AdminIcon, SettingsSolidIcon, VisibilityOnIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t, _td } from "../../../languageHandler";
 import BaseDialog from "./BaseDialog";
@@ -22,6 +23,7 @@ import AdvancedRoomSettingsTab from "../settings/tabs/room/AdvancedRoomSettingsT
 import RolesRoomSettingsTab from "../settings/tabs/room/RolesRoomSettingsTab";
 import { Action } from "../../../dispatcher/actions";
 import { type NonEmptyArray } from "../../../@types/common";
+import { Icon as AdvancedIcon } from "../../../../res/img/element-icons/room/settings/advanced.svg";
 
 export enum SpaceSettingsTab {
     General = "SPACE_GENERAL_TAB",
@@ -48,26 +50,26 @@ const SpaceSettingsDialog: React.FC<IProps> = ({ matrixClient: cli, space, onFin
             new Tab(
                 SpaceSettingsTab.General,
                 _td("common|general"),
-                "mx_SpaceSettingsDialog_generalIcon",
+                <SettingsSolidIcon />,
                 <SpaceSettingsGeneralTab matrixClient={cli} space={space} />,
             ),
             new Tab(
                 SpaceSettingsTab.Visibility,
                 _td("room_settings|visibility|title"),
-                "mx_SpaceSettingsDialog_visibilityIcon",
+                <VisibilityOnIcon />,
                 <SpaceSettingsVisibilityTab matrixClient={cli} space={space} closeSettingsFn={onFinished} />,
             ),
             new Tab(
                 SpaceSettingsTab.Roles,
                 _td("room_settings|permissions|title"),
-                "mx_RoomSettingsDialog_rolesIcon",
+                <AdminIcon />,
                 <RolesRoomSettingsTab room={space} />,
             ),
             SettingsStore.getValue(UIFeature.AdvancedSettings)
                 ? new Tab(
                       SpaceSettingsTab.Advanced,
                       _td("common|advanced"),
-                      "mx_RoomSettingsDialog_warningIcon",
+                      <AdvancedIcon />,
                       <AdvancedRoomSettingsTab room={space} closeSettingsFn={onFinished} />,
                   )
                 : null,
diff --git a/src/components/views/dialogs/UploadConfirmDialog.tsx b/src/components/views/dialogs/UploadConfirmDialog.tsx
index 36a05733a3..820b047c38 100644
--- a/src/components/views/dialogs/UploadConfirmDialog.tsx
+++ b/src/components/views/dialogs/UploadConfirmDialog.tsx
@@ -11,7 +11,6 @@ import React, { type JSX } from "react";
 import { FilesIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
-import { getBlobSafeMimeType } from "../../../utils/blobs";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 import { fileSize } from "../../../utils/FileUtils";
@@ -23,10 +22,11 @@ interface IProps {
     onFinished: (uploadConfirmed: boolean, uploadAll?: boolean) => void;
 }
 
-export default class UploadConfirmDialog extends React.Component<IProps> {
-    private readonly objectUrl: string;
-    private readonly mimeType: string;
+interface IState {
+    objectUrl?: string;
+}
 
+export default class UploadConfirmDialog extends React.Component<IProps, IState> {
     public static defaultProps: Partial<IProps> = {
         totalFiles: 1,
         currentIndex: 0,
@@ -35,15 +35,22 @@ export default class UploadConfirmDialog extends React.Component<IProps> {
     public constructor(props: IProps) {
         super(props);
 
-        // Create a fresh `Blob` for previewing (even though `File` already is
-        // one) so we can adjust the MIME type if needed.
-        this.mimeType = getBlobSafeMimeType(props.file.type);
-        const blob = new Blob([props.file], { type: this.mimeType });
-        this.objectUrl = URL.createObjectURL(blob);
+        this.state = {};
+    }
+
+    public componentDidMount(): void {
+        if (this.props.file.type.startsWith("image/") || this.props.file.type.startsWith("video/")) {
+            this.setState({
+                // We do not filter the mimetype using getBlobSafeMimeType here as if the user is uploading the file
+                // themselves they should be trusting it enough to open/load it, and it will be rendered into a hidden
+                // canvas for thumbnail generation anyway
+                objectUrl: URL.createObjectURL(this.props.file),
+            });
+        }
     }
 
     public componentWillUnmount(): void {
-        if (this.objectUrl) URL.revokeObjectURL(this.objectUrl);
+        if (this.state.objectUrl) URL.revokeObjectURL(this.state.objectUrl);
     }
 
     private onCancelClick = (): void => {
@@ -70,17 +77,23 @@ export default class UploadConfirmDialog extends React.Component<IProps> {
         }
 
         const fileId = `mx-uploadconfirmdialog-${this.props.file.name}`;
+        const mimeType = this.props.file.type;
+
         let preview: JSX.Element | undefined;
         let placeholder: JSX.Element | undefined;
-        if (this.mimeType.startsWith("image/")) {
+        if (mimeType.startsWith("image/")) {
             preview = (
-                <img className="mx_UploadConfirmDialog_imagePreview" src={this.objectUrl} aria-labelledby={fileId} />
+                <img
+                    className="mx_UploadConfirmDialog_imagePreview"
+                    src={this.state.objectUrl}
+                    aria-labelledby={fileId}
+                />
             );
-        } else if (this.mimeType.startsWith("video/")) {
+        } else if (mimeType.startsWith("video/")) {
             preview = (
                 <video
                     className="mx_UploadConfirmDialog_imagePreview"
-                    src={this.objectUrl}
+                    src={this.state.objectUrl}
                     playsInline
                     controls={false}
                 />
diff --git a/src/components/views/dialogs/UserSettingsDialog.tsx b/src/components/views/dialogs/UserSettingsDialog.tsx
index bb68051dfc..4d8b8ad3c0 100644
--- a/src/components/views/dialogs/UserSettingsDialog.tsx
+++ b/src/components/views/dialogs/UserSettingsDialog.tsx
@@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
+import { ClientEvent, type MatrixEvent } from "matrix-js-sdk/src/matrix";
 import { Toast } from "@vector-im/compound-web";
 import React, { type JSX, useState } from "react";
 import UserProfileIcon from "@vector-im/compound-design-tokens/assets/web/icons/user-profile";
@@ -44,6 +45,7 @@ import { UserTab } from "./UserTab";
 import { type NonEmptyArray } from "../../../@types/common";
 import { SDKContext, type SdkContextClass } from "../../../contexts/SDKContext";
 import { useSettingValue } from "../../../hooks/useSettings";
+import { NoChange, useEventEmitterAsyncState, type AsyncStateCallbackResult } from "../../../hooks/useEventEmitter";
 import { ToastContext, useActiveToast } from "../../../contexts/ToastContext";
 import { EncryptionUserSettingsTab, type State } from "../settings/tabs/user/EncryptionUserSettingsTab";
 
@@ -100,6 +102,26 @@ export default function UserSettingsDialog(props: IProps): JSX.Element {
     const [showMsc4108QrCode, setShowMsc4108QrCode] = useState(props.showMsc4108QrCode);
     const [initialEncryptionState, setInitialEncryptionState] = useState(props.initialEncryptionState);
 
+    // If the user doesn't have Recovery set up (no default Secret Storage key),
+    // we show an indicator on the Encryption tab.
+    const showSetupRecoveryIndicator = useEventEmitterAsyncState(
+        props.sdkContext.client,
+        ClientEvent.AccountData,
+        async (event?: MatrixEvent): AsyncStateCallbackResult<boolean> => {
+            if (event === undefined || event.getType() === "m.secret_storage.default_key") {
+                const client = props.sdkContext.client;
+                if (!client) {
+                    return false;
+                }
+
+                return !(await client.secretStorage.getDefaultKeyId());
+            }
+            return new NoChange();
+        },
+        [],
+        false,
+    );
+
     const getTabs = (): NonEmptyArray<Tab<UserTab>> => {
         const tabs: Tab<UserTab>[] = [];
 
@@ -196,6 +218,7 @@ export default function UserSettingsDialog(props: IProps): JSX.Element {
                 <KeyIcon />,
                 <EncryptionUserSettingsTab initialState={initialEncryptionState} />,
                 "UserSettingsEncryption",
+                showSetupRecoveryIndicator ? "mx_SettingsDialog_tabLabelsAlert" : undefined,
             ),
         );
 
diff --git a/src/components/views/dialogs/VerificationRequestDialog.tsx b/src/components/views/dialogs/VerificationRequestDialog.tsx
index d8cef61036..9414c9107b 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.tsx
+++ b/src/components/views/dialogs/VerificationRequestDialog.tsx
@@ -7,7 +7,8 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
-import { type VerificationRequest } from "matrix-js-sdk/src/crypto-api";
+import { VerificationPhase, VerificationRequestEvent, type VerificationRequest } from "matrix-js-sdk/src/crypto-api";
+import { VerificationMethod } from "matrix-js-sdk/src/types";
 import { type User } from "matrix-js-sdk/src/matrix";
 
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
@@ -23,7 +24,17 @@ interface IProps {
 }
 
 interface IState {
+    // The VerificationRequest that is ongoing. This can be replaced if a
+    // promise was supplied in the props and it completes.
     verificationRequest?: VerificationRequest;
+
+    // What phase the VerificationRequest is at. This is part of
+    // verificationRequest but we have it as independent state because we need
+    // to update when it changes.
+    //
+    // We listen to the `Change` event on verificationRequest and update phase
+    // when that fires.
+    phase?: VerificationPhase;
 }
 
 export default class VerificationRequestDialog extends React.Component<IProps, IState> {
@@ -31,22 +42,51 @@ export default class VerificationRequestDialog extends React.Component<IProps, I
         super(props);
         this.state = {
             verificationRequest: this.props.verificationRequest,
+            phase: this.props.verificationRequest?.phase,
         };
     }
 
     public componentDidMount(): void {
+        // Listen to when the verificationRequest changes, so we can keep our
+        // phase up-to-date.
+        this.state.verificationRequest?.on(VerificationRequestEvent.Change, this.onRequestChange);
+
         this.props.verificationRequestPromise?.then((r) => {
-            this.setState({ verificationRequest: r });
+            // The request promise completed, so we have a new request
+
+            // Stop listening to the old request (if we have one, which normally we won't)
+            this.state.verificationRequest?.off(VerificationRequestEvent.Change, this.onRequestChange);
+
+            // And start listening to the new one
+            r.on(VerificationRequestEvent.Change, this.onRequestChange);
+
+            this.setState({ verificationRequest: r, phase: r.phase });
         });
     }
 
+    public componentWillUnmount(): void {
+        // Stop listening for changes to the request when we close
+        this.state.verificationRequest?.off(VerificationRequestEvent.Change, this.onRequestChange);
+    }
+
+    /**
+     * The verificationRequest changed, so we need to make sure we update our
+     * state to have the correct phase.
+     *
+     * Note: this is called when verificationRequest changes in some way, not
+     * when we replace verificationRequest with some new request.
+     */
+    private readonly onRequestChange = (): void => {
+        this.setState((prevState) => ({
+            phase: prevState.verificationRequest?.phase,
+        }));
+    };
+
     public render(): React.ReactNode {
         const request = this.state.verificationRequest;
         const otherUserId = request?.otherUserId;
         const member = this.props.member || (otherUserId ? MatrixClientPeg.safeGet().getUser(otherUserId) : null);
-        const title = request?.isSelfVerification
-            ? _t("encryption|verification|verification_dialog_title_device")
-            : _t("encryption|verification|verification_dialog_title_user");
+        const title = this.dialogTitle(request);
 
         if (!member) return null;
 
@@ -60,7 +100,7 @@ export default class VerificationRequestDialog extends React.Component<IProps, I
             >
                 <EncryptionPanel
                     layout="dialog"
-                    verificationRequest={this.props.verificationRequest}
+                    verificationRequest={this.state.verificationRequest}
                     verificationRequestPromise={this.props.verificationRequestPromise}
                     onClose={this.props.onFinished}
                     member={member}
@@ -69,4 +109,33 @@ export default class VerificationRequestDialog extends React.Component<IProps, I
             </BaseDialog>
         );
     }
+
+    private dialogTitle(request?: VerificationRequest): string {
+        if (request?.isSelfVerification) {
+            switch (request.phase) {
+                case VerificationPhase.Ready:
+                    return _t("encryption|verification|verification_dialog_title_choose");
+                case VerificationPhase.Done:
+                    return _t("encryption|verification|verification_dialog_title_verified");
+                case VerificationPhase.Started:
+                    switch (request.chosenMethod) {
+                        case VerificationMethod.Reciprocate:
+                            return _t("encryption|verification|verification_dialog_title_confirm_green_shield");
+                        case VerificationMethod.Sas:
+                            return _t("encryption|verification|verification_dialog_title_compare_emojis");
+                        default:
+                            return _t("encryption|verification|verification_dialog_title_device");
+                    }
+                case VerificationPhase.Unsent:
+                case VerificationPhase.Requested:
+                    return _t("encryption|verification|verification_dialog_title_start_on_other_device");
+                case VerificationPhase.Cancelled:
+                    return _t("encryption|verification|verification_dialog_title_failed");
+                default:
+                    return _t("encryption|verification|verification_dialog_title_device");
+            }
+        } else {
+            return _t("encryption|verification|verification_dialog_title_user");
+        }
+    }
 }
diff --git a/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx b/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
index 2837701673..33ca9c510b 100644
--- a/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
+++ b/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React from "react";
+import React, { type ChangeEventHandler } from "react";
 import {
     type Capability,
     isTimelineCapability,
@@ -15,13 +15,13 @@ import {
     type WidgetKind,
 } from "matrix-widget-api";
 import { lexicographicCompare } from "matrix-js-sdk/src/utils";
+import { Form, SettingsToggleInput } from "@vector-im/compound-web";
 
 import BaseDialog from "./BaseDialog";
 import { _t } from "../../../languageHandler";
 import { objectShallowClone } from "../../../utils/objects";
 import StyledCheckbox from "../elements/StyledCheckbox";
 import DialogButtons from "../elements/DialogButtons";
-import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import { CapabilityText } from "../../../widgets/CapabilityText";
 
 interface IProps {
@@ -64,8 +64,8 @@ export default class WidgetCapabilitiesPromptDialog extends React.PureComponent<
         this.setState({ booleanStates: newStates });
     };
 
-    private onRememberSelectionChange = (newVal: boolean): void => {
-        this.setState({ rememberSelection: newVal });
+    private onRememberSelectionChange: ChangeEventHandler<HTMLInputElement> = (evt): void => {
+        this.setState({ rememberSelection: evt.target.checked });
     };
 
     private onSubmit = async (): Promise<void> => {
@@ -91,12 +91,13 @@ export default class WidgetCapabilitiesPromptDialog extends React.PureComponent<
             const isTimelineA = isTimelineCapability(capA);
             const isTimelineB = isTimelineCapability(capB);
 
-            if (!isTimelineA && !isTimelineB) return lexicographicCompare(capA, capB);
-            if (isTimelineA && !isTimelineB) return 1;
-            if (!isTimelineA && isTimelineB) return -1;
-            if (isTimelineA && isTimelineB) return lexicographicCompare(capA, capB);
+            // Sort timeline capabilities to the bottom, non-timeline to the top
+            if (isTimelineA !== isTimelineB) {
+                return isTimelineA ? 1 : -1;
+            }
 
-            return 0;
+            // Both are the same type (both timeline or both non-timeline), sort lexicographically
+            return lexicographicCompare(capA, capB);
         });
         const checkboxRows = orderedCapabilities.map(([cap, isChecked], i) => {
             const text = CapabilityText.for(cap, this.props.widgetKind);
@@ -116,7 +117,7 @@ export default class WidgetCapabilitiesPromptDialog extends React.PureComponent<
                 onFinished={this.props.onFinished}
                 title={_t("widget|capabilities_dialog|title")}
             >
-                <form onSubmit={this.onSubmit}>
+                <Form.Root onSubmit={this.onSubmit}>
                     <div className="mx_Dialog_content">
                         <div className="text-muted">{_t("widget|capabilities_dialog|content_starting_text")}</div>
                         {checkboxRows}
@@ -126,16 +127,16 @@ export default class WidgetCapabilitiesPromptDialog extends React.PureComponent<
                             onPrimaryButtonClick={this.onSubmit}
                             onCancel={this.onReject}
                             additive={
-                                <LabelledToggleSwitch
-                                    value={this.state.rememberSelection}
-                                    toggleInFront={true}
+                                <SettingsToggleInput
+                                    name="remember-selection"
+                                    checked={this.state.rememberSelection}
                                     onChange={this.onRememberSelectionChange}
                                     label={_t("widget|capabilities_dialog|remember_Selection")}
                                 />
                             }
                         />
                     </div>
-                </form>
+                </Form.Root>
             </BaseDialog>
         );
     }
diff --git a/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx b/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx
index f9729a695e..d0d06d12d5 100644
--- a/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx
+++ b/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx
@@ -7,12 +7,12 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React from "react";
+import React, { type ChangeEventHandler } from "react";
 import { type Widget, type WidgetKind } from "matrix-widget-api";
 import { logger } from "matrix-js-sdk/src/logger";
+import { Form, SettingsToggleInput } from "@vector-im/compound-web";
 
 import { _t } from "../../../languageHandler";
-import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import { OIDCState } from "../../../stores/widgets/WidgetPermissionStore";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
@@ -61,8 +61,8 @@ export default class WidgetOpenIDPermissionsDialog extends React.PureComponent<I
         this.props.onFinished(allowed);
     }
 
-    private onRememberSelectionChange = (newVal: boolean): void => {
-        this.setState({ rememberSelection: newVal });
+    private onRememberSelectionChange: ChangeEventHandler<HTMLInputElement> = (evt): void => {
+        this.setState({ rememberSelection: evt.target.checked });
     };
 
     public render(): React.ReactNode {
@@ -85,12 +85,19 @@ export default class WidgetOpenIDPermissionsDialog extends React.PureComponent<I
                     onPrimaryButtonClick={this.onAllow}
                     onCancel={this.onDeny}
                     additive={
-                        <LabelledToggleSwitch
-                            value={this.state.rememberSelection}
-                            toggleInFront={true}
-                            onChange={this.onRememberSelectionChange}
-                            label={_t("widget|open_id_permissions_dialog|remember_selection")}
-                        />
+                        <Form.Root
+                            onSubmit={(evt) => {
+                                evt.preventDefault();
+                                evt.stopPropagation();
+                            }}
+                        >
+                            <SettingsToggleInput
+                                name="remember-selection"
+                                checked={this.state.rememberSelection}
+                                onChange={this.onRememberSelectionChange}
+                                label={_t("widget|open_id_permissions_dialog|remember_selection")}
+                            />
+                        </Form.Root>
                     }
                 />
             </BaseDialog>
diff --git a/src/components/views/dialogs/devtools/Crypto.tsx b/src/components/views/dialogs/devtools/Crypto.tsx
index a05c415f00..af6d4935ba 100644
--- a/src/components/views/dialogs/devtools/Crypto.tsx
+++ b/src/components/views/dialogs/devtools/Crypto.tsx
@@ -12,6 +12,9 @@ import { useMatrixClientContext } from "../../../../contexts/MatrixClientContext
 import BaseTool from "./BaseTool";
 import { useAsyncMemo } from "../../../../hooks/useAsyncMemo";
 import { _t } from "../../../../languageHandler";
+import Modal from "../../../../Modal";
+import { ManualDeviceKeyVerificationDialog } from "../ManualDeviceKeyVerificationDialog";
+import RestoreKeyBackupDialog from "../../dialogs/security/RestoreKeyBackupDialog";
 
 interface KeyBackupProps {
     /**
@@ -31,6 +34,30 @@ export function Crypto({ onBack }: KeyBackupProps): JSX.Element {
                 <>
                     <KeyStorage />
                     <CrossSigning />
+                    <Session />
+
+                    <button
+                        type="button"
+                        onClick={() => {
+                            Modal.createDialog(ManualDeviceKeyVerificationDialog);
+                        }}
+                    >
+                        {_t("devtools|manual_device_verification")}
+                    </button>
+                    <button
+                        type="button"
+                        onClick={() => {
+                            Modal.createDialog(
+                                RestoreKeyBackupDialog,
+                                undefined,
+                                undefined,
+                                /* priority = */ true,
+                                /* static = */ true,
+                            );
+                        }}
+                    >
+                        {_t("devtools|restore_from_backup")}
+                    </button>
                 </>
             ) : (
                 <span>{_t("devtools|crypto|crypto_not_available")}</span>
@@ -254,3 +281,39 @@ function getCrossSigningStatus(crossSigningReady: boolean, crossSigningPrivateKe
 
     return _t("devtools|crypto|cross_signing_not_ready");
 }
+
+/**
+ * A component that displays information about the current session.
+ */
+function Session(): JSX.Element {
+    const matrixClient = useMatrixClientContext();
+    const sessionData = useAsyncMemo(async () => {
+        const crypto = matrixClient.getCrypto()!;
+        const keys = await crypto.getOwnDeviceKeys();
+        return {
+            fingerprint: keys.ed25519,
+            deviceId: matrixClient.deviceId,
+        };
+    }, [matrixClient]);
+
+    // Show a spinner while loading
+    if (sessionData === undefined) {
+        return <InlineSpinner aria-label={_t("common|loading")} />;
+    }
+
+    return (
+        <table aria-label={_t("devtools|crypto|session")}>
+            <thead>{_t("devtools|crypto|session")}</thead>
+            <tbody>
+                <tr>
+                    <th scope="row">{_t("devtools|crypto|device_id")}</th>
+                    <td>{sessionData.deviceId}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{_t("devtools|crypto|session_fingerprint")}</th>
+                    <td>{sessionData.fingerprint}</td>
+                </tr>
+            </tbody>
+        </table>
+    );
+}
diff --git a/src/components/views/dialogs/devtools/RoomState.tsx b/src/components/views/dialogs/devtools/RoomState.tsx
index 0a41743372..b9863b69ff 100644
--- a/src/components/views/dialogs/devtools/RoomState.tsx
+++ b/src/components/views/dialogs/devtools/RoomState.tsx
@@ -7,9 +7,10 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { useContext, useEffect, useMemo, useState } from "react";
+import React, { type ChangeEventHandler, useCallback, useContext, useEffect, useMemo, useState } from "react";
 import { type IContent, type MatrixEvent } from "matrix-js-sdk/src/matrix";
 import classNames from "classnames";
+import { Form, SettingsToggleInput } from "@vector-im/compound-web";
 
 import { _t, _td } from "../../../../languageHandler";
 import BaseTool, { DevtoolsContext, type IDevtoolsProps } from "./BaseTool";
@@ -114,6 +115,11 @@ const RoomStateExplorerEventType: React.FC<IEventTypeProps> = ({ eventType, onBa
     const [query, setQuery] = useState("");
     const [event, setEvent] = useState<MatrixEvent | null>(null);
     const [history, setHistory] = useState(false);
+    const [showEmptyState, setShowEmptyState] = useState(true);
+    const onEmptyStateToggled = useCallback<ChangeEventHandler<HTMLInputElement>>(
+        (e) => setShowEmptyState(e.target.checked),
+        [setShowEmptyState],
+    );
 
     const events = context.room.currentState.events.get(eventType)!;
 
@@ -149,10 +155,25 @@ const RoomStateExplorerEventType: React.FC<IEventTypeProps> = ({ eventType, onBa
     return (
         <BaseTool onBack={onBack}>
             <FilteredList query={query} onChange={setQuery}>
-                {Array.from(events.entries()).map(([stateKey, ev]) => (
-                    <StateEventButton key={stateKey} label={stateKey} onClick={() => setEvent(ev)} />
-                ))}
+                {Array.from(events.entries())
+                    .filter(([_, ev]) => showEmptyState || Object.keys(ev.getContent()).length > 0)
+                    .map(([stateKey, ev]) => (
+                        <StateEventButton key={stateKey} label={stateKey} onClick={() => setEvent(ev)} />
+                    ))}
             </FilteredList>
+            <Form.Root
+                onSubmit={(evt) => {
+                    evt.preventDefault();
+                    evt.stopPropagation();
+                }}
+            >
+                <SettingsToggleInput
+                    name="empty_state_toggle"
+                    label={_t("devtools|show_empty_content_events")}
+                    onChange={onEmptyStateToggled}
+                    checked={showEmptyState}
+                />
+            </Form.Root>
         </BaseTool>
     );
 };
diff --git a/src/components/views/dialogs/devtools/Users.tsx b/src/components/views/dialogs/devtools/Users.tsx
new file mode 100644
index 0000000000..889d437355
--- /dev/null
+++ b/src/components/views/dialogs/devtools/Users.tsx
@@ -0,0 +1,369 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+/**
+ * @file Devtool for viewing room members and their devices.
+ */
+
+import React, { type JSX, useContext, useState } from "react";
+import { type Device, type RoomMember } from "matrix-js-sdk/src/matrix";
+import { type CryptoApi } from "matrix-js-sdk/src/crypto-api";
+import { Form, SettingsToggleInput } from "@vector-im/compound-web";
+
+import { _t } from "../../../../languageHandler";
+import BaseTool, { DevtoolsContext, type IDevtoolsProps } from "./BaseTool";
+import FilteredList from "./FilteredList";
+import { useAsyncMemo } from "../../../../hooks/useAsyncMemo";
+import CopyableText from "../../elements/CopyableText";
+import E2EIcon from "../../rooms/E2EIcon";
+import { E2EStatus } from "../../../../utils/ShieldUtils";
+
+/**
+ * Replacement function for `<i>` tags in translation strings.
+ */
+function i(sub: string): JSX.Element {
+    return <i>{sub}</i>;
+}
+
+/**
+ * Shows a list of users in the room, and allows selecting a user to view.
+ *
+ * Initially, filters to only show joined users, but offers the user an option to show all users.
+ *
+ * Once the user chooses a specific member, delegates to {@link UserView} to view a single user.
+ */
+export const UserList: React.FC<Pick<IDevtoolsProps, "onBack">> = ({ onBack }) => {
+    const context = useContext(DevtoolsContext);
+    const [query, setQuery] = useState("");
+    // Show only joined users or all users with member events?
+    const [showOnlyJoined, setShowOnlyJoined] = useState(true);
+    // The `RoomMember` for the selected user (if any)
+    const [member, setMember] = useState<RoomMember | null>(null);
+
+    if (member) {
+        return <UserView member={member} onBack={() => setMember(null)} />;
+    }
+
+    const members = showOnlyJoined ? context.room.getJoinedMembers() : context.room.getMembers();
+
+    return (
+        <BaseTool onBack={onBack}>
+            <FilteredList query={query} onChange={setQuery}>
+                {members.map((member) => (
+                    <UserButton key={member.userId} member={member} onClick={() => setMember(member)} />
+                ))}
+            </FilteredList>
+            <Form.Root
+                onSubmit={(evt) => {
+                    evt.preventDefault();
+                    evt.stopPropagation();
+                }}
+            >
+                <SettingsToggleInput
+                    name="only_joined_members"
+                    label={_t("devtools|only_joined_members")}
+                    onChange={(e) => {
+                        setShowOnlyJoined(e.target.checked);
+                    }}
+                    checked={showOnlyJoined}
+                />
+            </Form.Root>
+        </BaseTool>
+    );
+};
+
+interface UserButtonProps {
+    member: RoomMember;
+    onClick(): void;
+}
+
+/**
+ * Button to select a user to view.
+ */
+const UserButton: React.FC<UserButtonProps> = ({ member, onClick }) => {
+    return (
+        <button className="mx_DevTools_button" onClick={onClick}>
+            {member.userId}
+        </button>
+    );
+};
+
+interface UserProps extends Pick<IDevtoolsProps, "onBack"> {
+    member: RoomMember;
+}
+
+/**
+ * Shows a single user to view, and allows selecting a device to view.
+ *
+ * Once the user chooses a specific device, delegates to {@link DeviceView} to show a single device.
+ */
+const UserView: React.FC<UserProps> = ({ member, onBack }) => {
+    const context = useContext(DevtoolsContext);
+    const crypto = context.room.client.getCrypto();
+    // An element to show the verification status of the device (unknown,
+    // unverified, verified by cross signing, signed by owner).  The element
+    // will show text as well as an icon.  If crypto is not available, the value
+    // will be `null`.
+    const verificationStatus = useAsyncMemo(
+        async () => {
+            if (!crypto) {
+                return null;
+            }
+            const status = await crypto.getUserVerificationStatus(member.userId);
+            if (status.isCrossSigningVerified()) {
+                const e2eIcon = (): JSX.Element => (
+                    <E2EIcon
+                        isUser={true}
+                        hideTooltip={true}
+                        status={E2EStatus.Verified}
+                        className="mx_E2EIcon_inline"
+                    />
+                );
+                return _t("devtools|user_verification_status|verified", {}, { E2EIcon: e2eIcon });
+            } else if (status.wasCrossSigningVerified()) {
+                const e2eIcon = (): JSX.Element => (
+                    <E2EIcon
+                        isUser={true}
+                        hideTooltip={true}
+                        status={E2EStatus.Warning}
+                        className="mx_E2EIcon_inline"
+                    />
+                );
+                return _t("devtools|user_verification_status|was_verified", {}, { E2EIcon: e2eIcon });
+            } else if (status.needsUserApproval) {
+                const e2eIcon = (): JSX.Element => (
+                    <E2EIcon
+                        isUser={true}
+                        hideTooltip={true}
+                        status={E2EStatus.Warning}
+                        className="mx_E2EIcon_inline"
+                    />
+                );
+                return _t("devtools|user_verification_status|identity_changed", {}, { E2EIcon: e2eIcon });
+            } else {
+                const e2eIcon = (): JSX.Element => (
+                    <E2EIcon isUser={true} hideTooltip={true} status={E2EStatus.Normal} className="mx_E2EIcon_inline" />
+                );
+                return _t("devtools|user_verification_status|unverified", {}, { E2EIcon: e2eIcon });
+            }
+        },
+        [context, member],
+        _t("common|loading"),
+    );
+    // The user's devices, as a Map from device ID to device information (see
+    // the `Device` type in `matrix-js-sdk/src/models/device.ts`).
+    const devices = useAsyncMemo(
+        async () => {
+            const devices = await crypto?.getUserDeviceInfo([member.userId]);
+            return devices?.get(member.userId) ?? new Map();
+        },
+        [context, member],
+        new Map(),
+    );
+    // The device to show, if any.
+    const [device, setDevice] = useState<Device | null>(null);
+
+    if (device) {
+        return <DeviceView crypto={crypto!} device={device} onBack={() => setDevice(null)} />;
+    }
+
+    const avatarUrl = member.getMxcAvatarUrl();
+    const memberEventContent = member.events.member?.getContent();
+
+    return (
+        <BaseTool onBack={onBack}>
+            <ul>
+                <li>
+                    <CopyableText getTextToCopy={() => member.userId} border={false}>
+                        {_t("devtools|user_id", { userId: member.userId })}
+                    </CopyableText>
+                </li>
+                <li>{_t("devtools|user_room_membership", { membership: member.membership ?? "leave" })}</li>
+                <li>
+                    {memberEventContent && "displayname" in memberEventContent
+                        ? _t("devtools|user_displayname", { displayname: member.rawDisplayName })
+                        : _t("devtools|user_no_displayname", {}, { i })}
+                </li>
+                <li>
+                    {avatarUrl !== undefined ? (
+                        <CopyableText getTextToCopy={() => avatarUrl} border={false}>
+                            {_t("devtools|user_avatar", { avatar: avatarUrl })}
+                        </CopyableText>
+                    ) : (
+                        _t("devtools|user_no_avatar", {}, { i })
+                    )}
+                </li>
+                <li>{verificationStatus}</li>
+            </ul>
+            <section>
+                <h2>{_t("devtools|devices", { count: devices.size })}</h2>
+                <ul>
+                    {Array.from(devices.values()).map((device) => (
+                        <li key={device.deviceId}>
+                            <DeviceButton crypto={crypto!} device={device} onClick={() => setDevice(device)} />
+                        </li>
+                    ))}
+                </ul>
+            </section>
+        </BaseTool>
+    );
+};
+
+interface DeviceButtonProps {
+    crypto: CryptoApi;
+    device: Device;
+    onClick(): void;
+}
+
+/**
+ * Button to select a user to view.
+ */
+const DeviceButton: React.FC<DeviceButtonProps> = ({ crypto, device, onClick }) => {
+    const verificationIcon = useAsyncMemo(
+        async () => {
+            const status = await crypto.getDeviceVerificationStatus(device.userId, device.deviceId);
+            if (!status) {
+                return;
+            } else if (status.crossSigningVerified) {
+                return (
+                    <E2EIcon
+                        isUser={true}
+                        hideTooltip={true}
+                        status={E2EStatus.Verified}
+                        className="mx_E2EIcon_inline"
+                    />
+                );
+            } else if (status.signedByOwner) {
+                return (
+                    <E2EIcon isUser={true} hideTooltip={true} status={E2EStatus.Normal} className="mx_E2EIcon_inline" />
+                );
+            } else {
+                return (
+                    <E2EIcon
+                        isUser={true}
+                        hideTooltip={true}
+                        status={E2EStatus.Warning}
+                        className="mx_E2EIcon_inline"
+                    />
+                );
+            }
+        },
+        [crypto, device],
+        null,
+    );
+    return (
+        <button className="mx_DevTools_button" onClick={onClick}>
+            {verificationIcon}
+            {device.deviceId}
+        </button>
+    );
+};
+
+interface DeviceProps extends Pick<IDevtoolsProps, "onBack"> {
+    crypto: CryptoApi;
+    device: Device;
+}
+
+/**
+ * Show a single device to view.
+ */
+const DeviceView: React.FC<DeviceProps> = ({ crypto, device, onBack }) => {
+    // An element to show the verification status of the device (unknown,
+    // unverified, verified by cross signing, signed by owner).  The element
+    // will show text as well as an icon if applicable.
+    const verificationStatus = useAsyncMemo(
+        async () => {
+            const status = await crypto.getDeviceVerificationStatus(device.userId, device.deviceId);
+            if (!status) {
+                // `status` will be `null` if the device is unknown or if the
+                // device doesn't have device keys.  In either case, it's not a
+                // security issue since we won't be sending it decryption keys.
+                return _t("devtools|device_verification_status|unknown");
+            } else if (status.crossSigningVerified) {
+                const e2eIcon = (): JSX.Element => (
+                    <E2EIcon
+                        isUser={true}
+                        hideTooltip={true}
+                        status={E2EStatus.Verified}
+                        className="mx_E2EIcon_inline"
+                    />
+                );
+                return _t("devtools|device_verification_status|verified", {}, { E2EIcon: e2eIcon });
+            } else if (status.signedByOwner) {
+                const e2eIcon = (): JSX.Element => (
+                    <E2EIcon isUser={true} hideTooltip={true} status={E2EStatus.Normal} className="mx_E2EIcon_inline" />
+                );
+                return _t("devtools|device_verification_status|signed_by_owner", {}, { E2EIcon: e2eIcon });
+            } else {
+                const e2eIcon = (): JSX.Element => (
+                    <E2EIcon
+                        isUser={true}
+                        hideTooltip={true}
+                        status={E2EStatus.Warning}
+                        className="mx_E2EIcon_inline"
+                    />
+                );
+                return _t("devtools|device_verification_status|unverified", {}, { E2EIcon: e2eIcon });
+            }
+        },
+        [crypto, device],
+        _t("common|loading"),
+    );
+
+    const keyIdSuffix = ":" + device.deviceId;
+    const deviceKeys = (
+        <ul>
+            {Array.from(device.keys.entries()).map(([keyId, key]) => {
+                if (keyId.endsWith(keyIdSuffix)) {
+                    return (
+                        <li key={keyId}>
+                            <CopyableText getTextToCopy={() => key} border={false}>
+                                {keyId.slice(0, -keyIdSuffix.length)}: {key}
+                            </CopyableText>
+                        </li>
+                    );
+                } else {
+                    return (
+                        <li key={keyId}>
+                            <i>{_t("devtools|invalid_device_key_id")}</i>: {keyId}: {key}
+                        </li>
+                    );
+                }
+            })}
+        </ul>
+    );
+
+    return (
+        <BaseTool onBack={onBack}>
+            <ul>
+                <li>
+                    <CopyableText getTextToCopy={() => device.userId} border={false}>
+                        {_t("devtools|user_id", { userId: device.userId })}
+                    </CopyableText>
+                </li>
+                <li>
+                    <CopyableText getTextToCopy={() => device.deviceId} border={false}>
+                        {_t("devtools|device_id", { deviceId: device.deviceId })}
+                    </CopyableText>
+                </li>
+                <li>
+                    {"displayName" in device
+                        ? _t("devtools|user_displayname", { displayname: device.displayName })
+                        : _t("devtools|user_no_displayname", {}, { i })}
+                </li>
+                <li>{verificationStatus}</li>
+                <li>
+                    {device.dehydrated ? _t("devtools|device_dehydrated_yes") : _t("devtools|device_dehydrated_no")}
+                </li>
+                <li>
+                    {_t("devtools|device_keys")}
+                    {deviceKeys}
+                </li>
+            </ul>
+        </BaseTool>
+    );
+};
diff --git a/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx b/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
index 5b1fb3e142..f1f81a2bf2 100644
--- a/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
+++ b/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
@@ -6,17 +6,18 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { Button } from "@vector-im/compound-web";
+import { Button, PasswordInput } from "@vector-im/compound-web";
 import LockSolidIcon from "@vector-im/compound-design-tokens/assets/web/icons/lock-solid";
 import { debounce } from "lodash";
 import classNames from "classnames";
 import React, { type ChangeEvent, type FormEvent } from "react";
 import { type SecretStorage } from "matrix-js-sdk/src/matrix";
+import { Flex } from "@element-hq/web-shared-components";
 
-import Field from "../../elements/Field";
 import { _t } from "../../../../languageHandler";
 import { EncryptionCard } from "../../settings/encryption/EncryptionCard";
 import { EncryptionCardButtons } from "../../settings/encryption/EncryptionCardButtons";
+import BaseDialog from "../BaseDialog";
 
 // Don't shout at the user that their key is invalid every time they type a key: wait a short time
 const VALIDATION_THROTTLE_MS = 200;
@@ -51,7 +52,7 @@ interface IState {
  * Access Secure Secret Storage by requesting the user's passphrase.
  */
 export default class AccessSecretStorageDialog extends React.PureComponent<IProps, IState> {
-    private inputRef = React.createRef<HTMLTextAreaElement>();
+    private inputRef = React.createRef<HTMLInputElement>();
 
     public constructor(props: IProps) {
         super(props);
@@ -83,6 +84,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
             this.setState({
                 recoveryKeyCorrect: null,
             });
+            return;
         }
 
         const hasPassphrase = this.props.keyInfo?.passphrase?.salt && this.props.keyInfo?.passphrase?.iterations;
@@ -116,7 +118,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
         });
     }
 
-    private onRecoveryKeyChange = (ev: ChangeEvent<HTMLTextAreaElement>): void => {
+    private onRecoveryKeyChange = (ev: ChangeEvent<HTMLInputElement>): void => {
         this.setState({
             recoveryKey: ev.target.value,
         });
@@ -139,30 +141,30 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
         }
     };
 
-    private getKeyValidationClasses(): string {
-        return classNames({
-            "mx_AccessSecretStorageDialog_recoveryKeyFeedback": this.state.recoveryKeyCorrect !== null,
-            "mx_AccessSecretStorageDialog_recoveryKeyFeedback--invalid": this.state.recoveryKeyCorrect === false,
-        });
-    }
-
-    private getKeyValidationText(): string | null {
-        if (this.state.recoveryKeyCorrect) {
-            return null;
-        } else if (this.state.recoveryKeyCorrect === null) {
-            return _t("encryption|access_secret_storage_dialog|alternatives");
-        } else {
-            return _t("encryption|access_secret_storage_dialog|key_validation_text|wrong_security_key");
-        }
-    }
-
     private getRecoveryKeyFeedback(): React.ReactNode | null {
-        const validationText = this.getKeyValidationText();
-        if (validationText === null) {
-            return null;
+        let validationText: string;
+        let classes: string | undefined;
+
+        if (this.state.recoveryKeyCorrect) {
+            // The recovery key is good. Empty feedback.
+            validationText = "\xA0"; // &nbsp;
+        } else if (this.state.recoveryKeyCorrect === null) {
+            // The input element is empty. Tell the user they can also use a passphrase.
+            validationText = _t("encryption|access_secret_storage_dialog|alternatives");
         } else {
-            return <div className={this.getKeyValidationClasses()}>{validationText}</div>;
+            // The entered key is not (yet) correct. Tell them so.
+            validationText = _t("encryption|access_secret_storage_dialog|key_validation_text|wrong_security_key");
+            classes = classNames({
+                "mx_AccessSecretStorageDialog_recoveryKeyFeedback": true,
+                "mx_AccessSecretStorageDialog_recoveryKeyFeedback--invalid": true,
+            });
         }
+
+        return (
+            <Flex align="center" className={classes}>
+                {validationText}
+            </Flex>
+        );
     }
 
     public render(): React.ReactNode {
@@ -178,17 +180,14 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
                     autoComplete="off"
                 >
                     <div className="mx_AccessSecretStorageDialog_recoveryKeyEntry">
-                        <Field
-                            inputRef={this.inputRef}
-                            element="textarea"
-                            rows={2}
-                            cols={45}
+                        <PasswordInput
+                            ref={this.inputRef}
                             id="mx_securityKey"
-                            label={_t("encryption|access_secret_storage_dialog|security_key_title")}
+                            title={_t("encryption|access_secret_storage_dialog|security_key_label")}
+                            placeholder={_t("encryption|access_secret_storage_dialog|security_key_label")}
                             value={this.state.recoveryKey}
                             onChange={this.onRecoveryKeyChange}
                             autoFocus={true}
-                            forceValidity={this.state.recoveryKeyCorrect ?? undefined}
                             autoComplete="off"
                         />
                     </div>
@@ -205,15 +204,19 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
             </div>
         );
 
+        // We wrap the content in `BaseDialog` mostly so that we get a `FocusLock` container; otherwise, if the
+        // SettingsDialog is open, then the `FocusLock` in *that* stops us getting the focus.
         return (
-            <EncryptionCard
-                Icon={LockSolidIcon}
-                className="mx_AccessSecretStorageDialog"
-                title={title}
-                description={_t("encryption|access_secret_storage_dialog|privacy_warning")}
-            >
-                {content}
-            </EncryptionCard>
+            <BaseDialog fixedWidth={false} hasCancel={false}>
+                <EncryptionCard
+                    Icon={LockSolidIcon}
+                    className="mx_AccessSecretStorageDialog"
+                    title={title}
+                    description={_t("encryption|access_secret_storage_dialog|privacy_warning")}
+                >
+                    {content}
+                </EncryptionCard>
+            </BaseDialog>
         );
     }
 }
diff --git a/src/components/views/dialogs/security/InitialCryptoSetupDialog.tsx b/src/components/views/dialogs/security/InitialCryptoSetupDialog.tsx
index bda09f02a6..a4c9e3a4c8 100644
--- a/src/components/views/dialogs/security/InitialCryptoSetupDialog.tsx
+++ b/src/components/views/dialogs/security/InitialCryptoSetupDialog.tsx
@@ -16,23 +16,21 @@ import Spinner from "../../elements/Spinner";
 import { InitialCryptoSetupStore, useInitialCryptoSetupStatus } from "../../../../stores/InitialCryptoSetupStore";
 
 interface Props {
-    onFinished: (success?: boolean) => void;
+    /** Callback which is called if the crypto setup failed, and the user clicked the 'cancel' button */
+    onCancelled: () => void;
 }
 
-/*
- * Walks the user through the process of creating a cross-signing keys.
+/**
+ * Walks the user through the process of creating cross-signing keys.
+ *
  * In most cases, only a spinner is shown, but for more
  * complex auth like SSO, the user may need to complete some steps to proceed.
  */
-export const InitialCryptoSetupDialog: React.FC<Props> = ({ onFinished }) => {
+export const InitialCryptoSetupDialog: React.FC<Props> = ({ onCancelled }) => {
     const onRetryClick = useCallback(() => {
         InitialCryptoSetupStore.sharedInstance().retry();
     }, []);
 
-    const onCancelClick = useCallback(() => {
-        onFinished(false);
-    }, [onFinished]);
-
     const status = useInitialCryptoSetupStatus(InitialCryptoSetupStore.sharedInstance());
 
     let content;
@@ -44,7 +42,7 @@ export const InitialCryptoSetupDialog: React.FC<Props> = ({ onFinished }) => {
                     <DialogButtons
                         primaryButton={_t("action|retry")}
                         onPrimaryButtonClick={onRetryClick}
-                        onCancel={onCancelClick}
+                        onCancel={onCancelled}
                     />
                 </div>
             </div>
@@ -60,7 +58,6 @@ export const InitialCryptoSetupDialog: React.FC<Props> = ({ onFinished }) => {
     return (
         <BaseDialog
             className="mx_CreateCrossSigningDialog"
-            onFinished={onFinished}
             title={_t("encryption|bootstrap_title")}
             hasCancel={false}
             fixedWidth={false}
diff --git a/src/components/views/dialogs/security/SetupEncryptionDialog.tsx b/src/components/views/dialogs/security/SetupEncryptionDialog.tsx
index 2f845b627a..dabea9660d 100644
--- a/src/components/views/dialogs/security/SetupEncryptionDialog.tsx
+++ b/src/components/views/dialogs/security/SetupEncryptionDialog.tsx
@@ -10,55 +10,19 @@ import React from "react";
 
 import SetupEncryptionBody from "../../../structures/auth/SetupEncryptionBody";
 import BaseDialog from "../BaseDialog";
-import { _t } from "../../../../languageHandler";
-import { SetupEncryptionStore, Phase } from "../../../../stores/SetupEncryptionStore";
-
-function iconFromPhase(phase?: Phase): string {
-    if (phase === Phase.Done) {
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
-        return require("../../../../../res/img/e2e/verified-deprecated.svg").default;
-    } else {
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
-        return require("../../../../../res/img/e2e/warning-deprecated.svg").default;
-    }
-}
 
 interface IProps {
     onFinished(): void;
 }
-interface IState {
-    icon: string;
-}
-
-export default class SetupEncryptionDialog extends React.Component<IProps, IState> {
-    private store: SetupEncryptionStore;
 
+export default class SetupEncryptionDialog extends React.Component<IProps> {
     public constructor(props: IProps) {
         super(props);
-
-        this.store = SetupEncryptionStore.sharedInstance();
-        this.state = { icon: iconFromPhase(this.store.phase) };
     }
 
-    public componentDidMount(): void {
-        this.store.on("update", this.onStoreUpdate);
-    }
-
-    public componentWillUnmount(): void {
-        this.store.removeListener("update", this.onStoreUpdate);
-    }
-
-    private onStoreUpdate = (): void => {
-        this.setState({ icon: iconFromPhase(this.store.phase) });
-    };
-
     public render(): React.ReactNode {
         return (
-            <BaseDialog
-                headerImage={this.state.icon}
-                onFinished={this.props.onFinished}
-                title={_t("encryption|verify_toast_title")}
-            >
+            <BaseDialog onFinished={this.props.onFinished} fixedWidth={false}>
                 <SetupEncryptionBody onFinished={this.props.onFinished} />
             </BaseDialog>
         );
diff --git a/src/components/views/dialogs/spotlight/RoomResultContextMenus.tsx b/src/components/views/dialogs/spotlight/RoomResultContextMenus.tsx
index f7fd5c6cb5..8bf5c1e22b 100644
--- a/src/components/views/dialogs/spotlight/RoomResultContextMenus.tsx
+++ b/src/components/views/dialogs/spotlight/RoomResultContextMenus.tsx
@@ -6,9 +6,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import classNames from "classnames";
 import { type Room } from "matrix-js-sdk/src/matrix";
-import React, { type JSX, Fragment, useState } from "react";
+import React, { type JSX, Fragment, useState, type ReactNode } from "react";
+import { OverflowHorizontalIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { ContextMenuTooltipButton } from "../../../../accessibility/context_menu/ContextMenuTooltipButton";
 import { useNotificationState } from "../../../../hooks/useRoomNotificationState";
@@ -21,11 +21,25 @@ import { type ButtonEvent } from "../../elements/AccessibleButton";
 import { contextMenuBelow } from "../../rooms/RoomTile";
 import { shouldShowComponent } from "../../../../customisations/helpers/UIComponents";
 import { UIComponent } from "../../../../settings/UIFeature";
+import { Icon as NotificationsIcon } from "../../../../../res/img/element-icons/notifications.svg";
+import { Icon as NotificationsDefaultIcon } from "../../../../../res/img/element-icons/roomlist/notifications-default.svg";
+import { Icon as NotificationsDmIcon } from "../../../../../res/img/element-icons/roomlist/notifications-dm.svg";
+import { Icon as NotificationsOffIcon } from "../../../../../res/img/element-icons/roomlist/notifications-off.svg";
 
 interface Props {
     room: Room;
 }
 
+export function getNotificationIcon(state: RoomNotifState): ReactNode {
+    const icons: Record<RoomNotifState, JSX.Element> = {
+        [RoomNotifState.AllMessages]: <NotificationsIcon />,
+        [RoomNotifState.AllMessagesLoud]: <NotificationsDefaultIcon />,
+        [RoomNotifState.MentionsOnly]: <NotificationsDmIcon />,
+        [RoomNotifState.Mute]: <NotificationsOffIcon />,
+    };
+    return icons[state];
+}
+
 export function RoomResultContextMenus({ room }: Props): JSX.Element {
     const [notificationState] = useNotificationState(room);
 
@@ -64,14 +78,6 @@ export function RoomResultContextMenus({ room }: Props): JSX.Element {
         );
     }
 
-    const notificationMenuClasses = classNames("mx_SpotlightDialog_option--notifications", {
-        // Show bell icon for the default case too.
-        mx_RoomNotificationContextMenu_iconBell: notificationState === RoomNotifState.AllMessages,
-        mx_RoomNotificationContextMenu_iconBellDot: notificationState === RoomNotifState.AllMessagesLoud,
-        mx_RoomNotificationContextMenu_iconBellMentions: notificationState === RoomNotifState.MentionsOnly,
-        mx_RoomNotificationContextMenu_iconBellCrossed: notificationState === RoomNotifState.Mute,
-    });
-
     return (
         <Fragment>
             {shouldShowComponent(UIComponent.RoomOptionsMenu) && (
@@ -86,11 +92,13 @@ export function RoomResultContextMenus({ room }: Props): JSX.Element {
                     }}
                     title={room.isSpaceRoom() ? _t("space|context_menu|options") : _t("room|context_menu|title")}
                     isExpanded={generalMenuPosition !== null}
-                />
+                >
+                    <OverflowHorizontalIcon />
+                </ContextMenuTooltipButton>
             )}
             {!room.isSpaceRoom() && (
                 <ContextMenuTooltipButton
-                    className={notificationMenuClasses}
+                    className="mx_SpotlightDialog_option--notifications"
                     onClick={(ev: ButtonEvent) => {
                         ev.preventDefault();
                         ev.stopPropagation();
@@ -100,7 +108,9 @@ export function RoomResultContextMenus({ room }: Props): JSX.Element {
                     }}
                     title={_t("room_list|notification_options")}
                     isExpanded={notificationMenuPosition !== null}
-                />
+                >
+                    {getNotificationIcon(notificationState!)}
+                </ContextMenuTooltipButton>
             )}
             {generalMenu}
             {notificationMenu}
diff --git a/src/components/views/dialogs/spotlight/SpotlightDialog.tsx b/src/components/views/dialogs/spotlight/SpotlightDialog.tsx
index 419a12df89..f4e33ce155 100644
--- a/src/components/views/dialogs/spotlight/SpotlightDialog.tsx
+++ b/src/components/views/dialogs/spotlight/SpotlightDialog.tsx
@@ -53,7 +53,7 @@ import { getKeyBindingsManager } from "../../../../KeyBindingsManager";
 import { _t } from "../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../MatrixClientPeg";
 import { PosthogAnalytics } from "../../../../PosthogAnalytics";
-import { getCachedRoomIDForAlias } from "../../../../RoomAliasCache";
+import { getCachedRoomIdForAlias } from "../../../../RoomAliasCache";
 import { showStartChatInviteDialog } from "../../../../RoomInvite";
 import { SettingLevel } from "../../../../settings/SettingLevel";
 import SettingsStore from "../../../../settings/SettingsStore";
@@ -912,7 +912,7 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
         if (
             trimmedQuery.startsWith("#") &&
             trimmedQuery.includes(":") &&
-            (!getCachedRoomIDForAlias(trimmedQuery) || !cli.getRoom(getCachedRoomIDForAlias(trimmedQuery)))
+            (!getCachedRoomIdForAlias(trimmedQuery) || !cli.getRoom(getCachedRoomIdForAlias(trimmedQuery)!.roomId))
         ) {
             joinRoomSection = (
                 <div className="mx_SpotlightDialog_section mx_SpotlightDialog_otherSearches" role="group">
@@ -1144,7 +1144,7 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
 
                 if (rovingContext.state.activeNode && rovingContext.state.nodes.length > 0) {
                     let nodes = rovingContext.state.nodes;
-                    if (!query && !filter !== null) {
+                    if (!query && filter === null) {
                         // If the current selection is not in the recently viewed row then only include the
                         // first recently viewed so that is the target when the user is switching into recently viewed.
                         const keptRecentlyViewedRef = nodeIsForRecentlyViewed(rovingContext.state.activeNode)
@@ -1164,7 +1164,7 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
                 // only handle these keys when we are in the recently viewed row of options
                 if (
                     !query &&
-                    !filter !== null &&
+                    filter === null &&
                     rovingContext.state.activeNode &&
                     rovingContext.state.nodes.length > 0 &&
                     nodeIsForRecentlyViewed(rovingContext.state.activeNode)
@@ -1226,8 +1226,8 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
                             <>
                                 <kbd>↓</kbd>
                                 <kbd>↑</kbd>
-                                {!filter !== null && !query && <kbd>←</kbd>}
-                                {!filter !== null && !query && <kbd>→</kbd>}
+                                {filter === null && !query && <kbd>←</kbd>}
+                                {filter === null && !query && <kbd>→</kbd>}
                             </>
                         ),
                     },
@@ -1279,7 +1279,7 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
                         aria-label={_t("action|search")}
                         aria-describedby="mx_SpotlightDialog_keyboardPrompt"
                     />
-                    {(publicRoomsLoading || peopleLoading || profileLoading) && <Spinner w={24} h={24} />}
+                    {(publicRoomsLoading || peopleLoading || profileLoading) && <Spinner size={24} />}
                 </div>
 
                 <div
diff --git a/src/components/views/directory/NetworkDropdown.tsx b/src/components/views/directory/NetworkDropdown.tsx
index e46b89578a..e1545f7f77 100644
--- a/src/components/views/directory/NetworkDropdown.tsx
+++ b/src/components/views/directory/NetworkDropdown.tsx
@@ -9,8 +9,8 @@ Please see LICENSE files in the repository root for full details.
 import { without } from "lodash";
 import React, { useCallback, useEffect, useState } from "react";
 import { MatrixError } from "matrix-js-sdk/src/matrix";
+import { CloseIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
-import { MenuItemRadio } from "../../../accessibility/context_menu/MenuItemRadio";
 import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import Modal from "../../../Modal";
@@ -22,6 +22,7 @@ import {
     type AdditionalOptionsProps,
     GenericDropdownMenu,
     type GenericDropdownMenuItem,
+    GenericDropdownMenuOption,
 } from "../../structures/GenericDropdownMenu";
 import TextInputDialog from "../dialogs/TextInputDialog";
 import AccessibleButton from "../elements/AccessibleButton";
@@ -190,7 +191,9 @@ export const NetworkDropdown: React.FC<IProps> = ({ protocols, config, setConfig
                           className="mx_NetworkDropdown_removeServer"
                           title={_t("spotlight|public_rooms|network_dropdown_remove_server_adornment", { roomServer })}
                           onClick={() => setUserDefinedServers(without(userDefinedServers, roomServer))}
-                      />
+                      >
+                          <CloseIcon />
+                      </AccessibleButton>
                   ),
               }
             : {}),
@@ -200,9 +203,8 @@ export const NetworkDropdown: React.FC<IProps> = ({ protocols, config, setConfig
         ({ closeMenu }: AdditionalOptionsProps) => (
             <>
                 <span className="mx_GenericDropdownMenu_divider" />
-                <MenuItemRadio
-                    active={false}
-                    className="mx_GenericDropdownMenu_Option mx_GenericDropdownMenu_Option--item"
+                <GenericDropdownMenuOption
+                    key="add-server"
                     onClick={async (): Promise<void> => {
                         closeMenu();
                         const { finished } = Modal.createDialog(
@@ -229,13 +231,9 @@ export const NetworkDropdown: React.FC<IProps> = ({ protocols, config, setConfig
                             });
                         }
                     }}
-                >
-                    <div className="mx_GenericDropdownMenu_Option--label">
-                        <span className="mx_NetworkDropdown_addServer">
-                            {_t("spotlight|public_rooms|network_dropdown_add_server_option")}
-                        </span>
-                    </div>
-                </MenuItemRadio>
+                    isSelected={false}
+                    label={_t("spotlight|public_rooms|network_dropdown_add_server_option")}
+                />
             </>
         ),
         [allServers, setConfig, setUserDefinedServers, userDefinedServers],
diff --git a/src/components/views/elements/AppTile.tsx b/src/components/views/elements/AppTile.tsx
index cfb95abcc3..c56a23e43d 100644
--- a/src/components/views/elements/AppTile.tsx
+++ b/src/components/views/elements/AppTile.tsx
@@ -18,7 +18,7 @@ import React, {
     type ReactNode,
 } from "react";
 import classNames from "classnames";
-import { type IWidget, MatrixCapabilities } from "matrix-widget-api";
+import { type IWidget, MatrixCapabilities, type ClientWidgetApi } from "matrix-widget-api";
 import { type Room, RoomEvent } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
@@ -28,6 +28,7 @@ import {
     MinusIcon,
     ExpandIcon,
     CollapseIcon,
+    PopOutIcon,
 } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import AccessibleButton from "./AccessibleButton";
@@ -41,12 +42,11 @@ import SettingsStore from "../../../settings/SettingsStore";
 import { aboveLeftOf, ContextMenuButton } from "../../structures/ContextMenu";
 import PersistedElement, { getPersistKey } from "./PersistedElement";
 import { WidgetType } from "../../../widgets/WidgetType";
-import { ElementWidget, StopGapWidget } from "../../../stores/widgets/StopGapWidget";
+import { ElementWidget, WidgetMessaging, WidgetMessagingEvent } from "../../../stores/widgets/WidgetMessaging";
 import { showContextMenu, WidgetContextMenu } from "../context_menus/WidgetContextMenu";
 import WidgetAvatar from "../avatars/WidgetAvatar";
 import LegacyCallHandler from "../../../LegacyCallHandler";
 import { type IApp, isAppWidget } from "../../../stores/WidgetStore";
-import { Icon as PopoutIcon } from "../../../../res/img/external-link.svg";
 import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
 import { OwnProfileStore } from "../../../stores/OwnProfileStore";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
@@ -62,6 +62,20 @@ import { parseUrl } from "../../../utils/UrlUtils";
 import RightPanelStore from "../../../stores/right-panel/RightPanelStore.ts";
 import { RightPanelPhases } from "../../../stores/right-panel/RightPanelStorePhases.ts";
 
+// Note that there is advice saying allow-scripts shouldn't be used with allow-same-origin
+// because that would allow the iframe to programmatically remove the sandbox attribute, but
+// this would only be for content hosted on the same origin as the element client: anything
+// hosted on the same origin as the client will get the same access as if you clicked
+// a link to it.
+const sandboxFlags =
+    "allow-forms allow-popups allow-popups-to-escape-sandbox " +
+    "allow-same-origin allow-scripts allow-presentation allow-downloads";
+
+// Additional iframe feature permissions
+// (see - https://sites.google.com/a/chromium.org/dev/Home/chromium-security/deprecating-permissions-in-cross-origin-iframes and https://wicg.github.io/feature-policy/)
+const iframeFeatures =
+    "microphone; camera; encrypted-media; autoplay; display-capture; clipboard-write; clipboard-read;";
+
 interface IProps {
     app: IWidget | IApp;
     // If room is not specified then it is an account level widget
@@ -137,11 +151,12 @@ export default class AppTile extends React.Component<IProps, IState> {
         showLayoutButtons: true,
     };
 
+    private readonly widget: ElementWidget;
     private contextMenuButton = createRef<any>();
-    private iframe?: HTMLIFrameElement; // ref to the iframe (callback style)
+    private iframeParent: HTMLElement | null = null; // parent div of the iframe
     private allowedWidgetsWatchRef?: string;
     private persistKey: string;
-    private sgWidget?: StopGapWidget;
+    private messaging?: WidgetMessaging;
     private dispatcherRef?: string;
     private unmounted = false;
 
@@ -150,11 +165,16 @@ export default class AppTile extends React.Component<IProps, IState> {
 
         // The key used for PersistedElement
         this.persistKey = getPersistKey(WidgetUtils.getWidgetUid(this.props.app));
-        try {
-            this.sgWidget = new StopGapWidget(this.props);
-        } catch (e) {
-            logger.log("Failed to construct widget", e);
-            this.sgWidget = undefined;
+
+        this.widget = new ElementWidget(props.app);
+        this.messaging = WidgetMessagingStore.instance.getMessaging(this.widget, props.room?.roomId);
+        if (this.messaging === undefined) {
+            try {
+                this.messaging = new WidgetMessaging(this.widget, props);
+                WidgetMessagingStore.instance.storeMessaging(this.widget, props.room?.roomId, this.messaging);
+            } catch (e) {
+                logger.error("Failed to construct widget", e);
+            }
         }
 
         this.state = this.getNewState(props);
@@ -221,11 +241,11 @@ export default class AppTile extends React.Component<IProps, IState> {
 
     private determineInitialRequiresClientState(): boolean {
         try {
-            const mockWidget = new ElementWidget(this.props.app);
-            const widgetApi = WidgetMessagingStore.instance.getMessaging(mockWidget, this.props.room?.roomId);
-            if (widgetApi) {
+            const widget = new ElementWidget(this.props.app);
+            const messaging = WidgetMessagingStore.instance.getMessaging(widget, this.props.room?.roomId);
+            if (messaging?.widgetApi) {
                 // Load value from existing API to prevent resetting the requiresClient value on layout changes.
-                return widgetApi.hasCapability(ElementWidgetCapabilities.RequiresClient);
+                return messaging.widgetApi.hasCapability(ElementWidgetCapabilities.RequiresClient);
             }
         } catch {
             // fallback to true
@@ -277,7 +297,7 @@ export default class AppTile extends React.Component<IProps, IState> {
                 isAppWidget(this.props.app) ? this.props.app.roomId : null,
             );
             PersistedElement.destroyElement(this.persistKey);
-            this.sgWidget?.stopMessaging();
+            this.messaging?.stop();
         }
 
         this.setState({ hasPermissionToLoad });
@@ -311,12 +331,12 @@ export default class AppTile extends React.Component<IProps, IState> {
             );
         }
 
-        if (this.sgWidget) {
-            this.setupSgListeners();
+        if (this.messaging) {
+            this.setupMessagingListeners();
         }
 
         // Only fetch IM token on mount if we're showing and have permission to load
-        if (this.sgWidget && this.state.hasPermissionToLoad) {
+        if (this.messaging && this.state.hasPermissionToLoad) {
             this.startWidget();
         }
         this.watchUserReady();
@@ -362,56 +382,101 @@ export default class AppTile extends React.Component<IProps, IState> {
         OwnProfileStore.instance.removeListener(UPDATE_EVENT, this.onUserReady);
     }
 
-    private setupSgListeners(): void {
-        this.sgWidget?.on("ready", this.onWidgetReady);
-        this.sgWidget?.on("error:preparing", this.updateRequiresClient);
-        // emits when the capabilities have been set up or changed
-        this.sgWidget?.on("capabilitiesNotified", this.updateRequiresClient);
+    private setupMessagingListeners(): void {
+        this.messaging?.on(WidgetMessagingEvent.Start, this.onMessagingStart);
+        this.messaging?.on(WidgetMessagingEvent.Stop, this.onMessagingStop);
     }
 
-    private stopSgListeners(): void {
-        if (!this.sgWidget) return;
-        this.sgWidget?.off("ready", this.onWidgetReady);
-        this.sgWidget.off("error:preparing", this.updateRequiresClient);
-        this.sgWidget.off("capabilitiesNotified", this.updateRequiresClient);
+    private stopMessagingListeners(): void {
+        this.messaging?.off(WidgetMessagingEvent.Start, this.onMessagingStart);
+        this.messaging?.off(WidgetMessagingEvent.Stop, this.onMessagingStop);
     }
 
+    private readonly onMessagingStart = (widgetApi: ClientWidgetApi): void => {
+        widgetApi.on("ready", this.onWidgetReady);
+        widgetApi.on("error:preparing", this.updateRequiresClient);
+        // emits when the capabilities have been set up or changed
+        widgetApi.on("capabilitiesNotified", this.updateRequiresClient);
+    };
+
+    private readonly onMessagingStop = (widgetApi: ClientWidgetApi): void => {
+        widgetApi.off("ready", this.onWidgetReady);
+        widgetApi.off("error:preparing", this.updateRequiresClient);
+        widgetApi.off("capabilitiesNotified", this.updateRequiresClient);
+    };
+
     private resetWidget(newProps: IProps): void {
-        this.sgWidget?.stopMessaging();
-        this.stopSgListeners();
+        this.messaging?.stop();
+        this.stopMessagingListeners();
 
         try {
-            this.sgWidget = new StopGapWidget(newProps);
-            this.setupSgListeners();
+            WidgetMessagingStore.instance.stopMessaging(this.widget, this.props.room?.roomId);
+            this.messaging = new WidgetMessaging(this.widget, newProps);
+            WidgetMessagingStore.instance.storeMessaging(this.widget, this.props.room?.roomId, this.messaging);
+            this.setupMessagingListeners();
             this.startWidget();
         } catch (e) {
             logger.error("Failed to construct widget", e);
-            this.sgWidget = undefined;
+            this.messaging = undefined;
         }
     }
 
     private startWidget(): void {
-        this.sgWidget?.prepare().then(() => {
+        this.messaging?.prepare().then(() => {
             if (this.unmounted) return;
             this.setState({ initialising: false });
         });
     }
 
-    private startMessaging(): void {
-        try {
-            this.sgWidget?.startMessaging(this.iframe!);
-        } catch (e) {
-            logger.error("Failed to start widget", e);
-        }
-    }
-
-    private iframeRefChange = (ref: HTMLIFrameElement): void => {
-        this.iframe = ref;
+    /**
+     * A callback ref receiving the current parent div of the iframe. This is
+     * responsible for creating the iframe and starting or resetting
+     * communication with the widget.
+     */
+    private iframeParentRef = (element: HTMLElement | null): void => {
         if (this.unmounted) return;
-        if (ref) {
-            this.startMessaging();
-        } else {
+        // Detach the existing iframe (if any) from the document so we know not
+        // to do anything further with it, like starting up the messaging
+        this.iframeParent?.querySelector("iframe")?.remove();
+        this.iframeParent = element;
+
+        if (this.iframeParent === null) {
+            // The component is trying to unmount the iframe. We could reach
+            // this path if the widget definition was updated, for example. The
+            // iframe parent will later be remounted and widget communications
+            // reopened after this.state.initializing resets to false.
             this.resetWidget(this.props);
+        } else if (
+            this.messaging &&
+            // Check whether an iframe already exists (it totally could exist,
+            // seeing as it is a persisted element which might have hopped
+            // between React components)
+            this.iframeParent.querySelector("iframe") === null
+        ) {
+            // We create the iframe ourselves rather than leaving the job to React,
+            // because we need the lifetime of the messaging and the iframe to be
+            // the same; we don't want strict mode, for instance, to cause the
+            // messaging to restart (lose its state) without also killing the widget
+            const iframe = document.createElement("iframe");
+            iframe.title = WidgetUtils.getWidgetName(this.props.app);
+            iframe.allow = iframeFeatures;
+            iframe.src = this.messaging.embedUrl;
+            iframe.allowFullscreen = true;
+            iframe.sandbox = sandboxFlags;
+            this.iframeParent.appendChild(iframe);
+            // In order to start the widget messaging we need iframe.contentWindow
+            // to exist. Waiting until the next layout gives the browser a chance to
+            // initialize it.
+            requestAnimationFrame(() => {
+                // Handle the race condition (seen in strict mode) where the element is
+                // added and then removed from the DOM before we enter this callback
+                if (iframe.parentElement === null) return;
+                try {
+                    this.messaging?.start(iframe);
+                } catch (e) {
+                    logger.error("Failed to start widget", e);
+                }
+            });
         }
     };
 
@@ -426,44 +491,31 @@ export default class AppTile extends React.Component<IProps, IState> {
 
     /**
      * Ends all widget interaction, such as cancelling calls and disabling webcams.
-     * @private
-     * @returns {Promise<*>} Resolves when the widget is terminated, or timeout passed.
      */
-    private async endWidgetActions(): Promise<void> {
-        // widget migration dev note: async to maintain signature
-        // HACK: This is a really dirty way to ensure that Jitsi cleans up
-        // its hold on the webcam. Without this, the widget holds a media
-        // stream open, even after death. See https://github.com/vector-im/element-web/issues/7351
-        if (this.iframe) {
-            // In practice we could just do `+= ''` to trick the browser
-            // into thinking the URL changed, however I can foresee this
-            // being optimized out by a browser. Instead, we'll just point
-            // the iframe at a page that is reasonably safe to use in the
-            // event the iframe doesn't wink away.
-            // This is relative to where the Element instance is located.
-            this.iframe.src = "about:blank";
-        }
-
+    private endWidgetActions(): void {
         if (WidgetType.JITSI.matches(this.props.app.type) && this.props.room) {
             LegacyCallHandler.instance.hangupCallApp(this.props.room.roomId);
         }
 
         // Delete the widget from the persisted store for good measure.
+        // XXX: This removes persistent elements from the DOM entirely, which feels like
+        // a lot more than this function claims to be doing.
         PersistedElement.destroyElement(this.persistKey);
         ActiveWidgetStore.instance.destroyPersistentWidget(
             this.props.app.id,
             isAppWidget(this.props.app) ? this.props.app.roomId : null,
         );
 
-        this.sgWidget?.stopMessaging({ forceDestroy: true });
+        this.messaging?.stop({ forceDestroy: true });
     }
+
     private onWidgetReady = (): void => {
         this.setState({ loading: false });
     };
 
     private updateRequiresClient = (): void => {
         this.setState({
-            requiresClient: !!this.sgWidget?.widgetApi?.hasCapability(ElementWidgetCapabilities.RequiresClient),
+            requiresClient: !!this.messaging?.widgetApi?.hasCapability(ElementWidgetCapabilities.RequiresClient),
         });
     };
 
@@ -472,7 +524,7 @@ export default class AppTile extends React.Component<IProps, IState> {
             case "m.sticker":
                 if (
                     payload.widgetId === this.props.app.id &&
-                    this.sgWidget?.widgetApi?.hasCapability(MatrixCapabilities.StickerSending)
+                    this.messaging?.widgetApi?.hasCapability(MatrixCapabilities.StickerSending)
                 ) {
                     dis.dispatch({
                         action: "post_sticker_message",
@@ -544,7 +596,7 @@ export default class AppTile extends React.Component<IProps, IState> {
         return (
             <span>
                 <WidgetAvatar app={this.props.app} size="20px" />
-                <h3>{name}</h3>
+                <h1>{name}</h1>
                 <span>
                     {title ? titleSpacer : ""}
                     {title}
@@ -554,16 +606,11 @@ export default class AppTile extends React.Component<IProps, IState> {
     }
 
     private reload(): void {
-        this.endWidgetActions().then(() => {
-            // reset messaging
-            this.resetWidget(this.props);
-            this.startMessaging();
-
-            if (this.iframe && this.sgWidget) {
-                // Reload iframe
-                this.iframe.src = this.sgWidget.embedUrl;
-            }
-        });
+        this.endWidgetActions();
+        // reset messaging
+        this.resetWidget(this.props);
+        this.iframeParent?.querySelector("iframe")?.remove();
+        // iframeParent will now be re-mounted, at which point startMessaging will be called
     }
 
     // TODO replace with full screen interactions
@@ -577,7 +624,7 @@ export default class AppTile extends React.Component<IProps, IState> {
         // window.open(this._getPopoutUrl(), '_blank', 'noopener=yes');
         Object.assign(document.createElement("a"), {
             target: "_blank",
-            href: this.sgWidget?.popoutUrl,
+            href: this.messaging?.popoutUrl,
             rel: "noreferrer noopener",
         }).click();
     };
@@ -621,20 +668,6 @@ export default class AppTile extends React.Component<IProps, IState> {
     public render(): React.ReactNode {
         let appTileBody: JSX.Element | undefined;
 
-        // Note that there is advice saying allow-scripts shouldn't be used with allow-same-origin
-        // because that would allow the iframe to programmatically remove the sandbox attribute, but
-        // this would only be for content hosted on the same origin as the element client: anything
-        // hosted on the same origin as the client will get the same access as if you clicked
-        // a link to it.
-        const sandboxFlags =
-            "allow-forms allow-popups allow-popups-to-escape-sandbox " +
-            "allow-same-origin allow-scripts allow-presentation allow-downloads";
-
-        // Additional iframe feature permissions
-        // (see - https://sites.google.com/a/chromium.org/dev/Home/chromium-security/deprecating-permissions-in-cross-origin-iframes and https://wicg.github.io/feature-policy/)
-        const iframeFeatures =
-            "microphone; camera; encrypted-media; autoplay; display-capture; clipboard-write; " + "clipboard-read;";
-
         const appTileBodyClass = classNames({
             "mx_AppTileBody": true,
             "mx_AppTileBody--large": !this.props.miniMode,
@@ -654,15 +687,13 @@ export default class AppTile extends React.Component<IProps, IState> {
             </div>
         );
 
-        const widgetTitle = WidgetUtils.getWidgetName(this.props.app);
-
-        if (this.sgWidget === null) {
+        if (this.messaging === null) {
             appTileBody = (
                 <div className={appTileBodyClass} style={appTileBodyStyles}>
                     <AppWarning errorMsg={_t("widget|error_loading")} />
                 </div>
             );
-        } else if (!this.state.hasPermissionToLoad && this.props.room && this.sgWidget) {
+        } else if (!this.state.hasPermissionToLoad && this.props.room && this.messaging) {
             // only possible for room widgets, can assert this.props.room here
             const isEncrypted = this.context.isRoomEncrypted(this.props.room.roomId);
             appTileBody = (
@@ -670,7 +701,7 @@ export default class AppTile extends React.Component<IProps, IState> {
                     <AppPermission
                         roomId={this.props.room.roomId}
                         creatorUserId={this.props.creatorUserId}
-                        url={this.sgWidget.embedUrl}
+                        url={this.messaging.embedUrl}
                         isRoomEncrypted={isEncrypted}
                         onPermissionGranted={this.grantWidgetPermission}
                     />
@@ -689,19 +720,11 @@ export default class AppTile extends React.Component<IProps, IState> {
                         <AppWarning errorMsg={_t("widget|error_mixed_content")} />
                     </div>
                 );
-            } else if (this.sgWidget) {
+            } else if (this.messaging) {
                 appTileBody = (
                     <>
-                        <div className={appTileBodyClass} style={appTileBodyStyles}>
+                        <div className={appTileBodyClass} style={appTileBodyStyles} ref={this.iframeParentRef}>
                             {this.state.loading && loadingElement}
-                            <iframe
-                                title={widgetTitle}
-                                allow={iframeFeatures}
-                                ref={this.iframeRefChange}
-                                src={this.sgWidget.embedUrl}
-                                allowFullScreen={true}
-                                sandbox={sandboxFlags}
-                            />
                         </div>
                         {this.props.overlay}
                     </>
@@ -812,7 +835,7 @@ export default class AppTile extends React.Component<IProps, IState> {
                                         title={_t("widget|popout")}
                                         onClick={this.onPopoutWidgetClick}
                                     >
-                                        <PopoutIcon className="mx_Icon mx_Icon_12 mx_Icon--stroke" />
+                                        <PopOutIcon className="mx_Icon mx_Icon_12" />
                                     </AccessibleButton>
                                 )}
                                 {this.state.hasContextMenuOptions && (
diff --git a/src/components/views/elements/CopyableText.tsx b/src/components/views/elements/CopyableText.tsx
index 9c2472a202..8deaad1d4f 100644
--- a/src/components/views/elements/CopyableText.tsx
+++ b/src/components/views/elements/CopyableText.tsx
@@ -9,6 +9,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { useState } from "react";
 import classNames from "classnames";
+import { CopyIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import { copyPlaintext } from "../../../utils/strings";
@@ -21,7 +22,11 @@ interface IProps extends React.HTMLAttributes<HTMLDivElement> {
     className?: string;
 }
 
-export const CopyTextButton: React.FC<Pick<IProps, "getTextToCopy" | "className">> = ({ getTextToCopy, className }) => {
+export const CopyTextButton: React.FC<Pick<IProps, "getTextToCopy" | "className" | "children">> = ({
+    getTextToCopy,
+    className,
+    children,
+}) => {
     const [tooltip, setTooltip] = useState<string | undefined>(undefined);
 
     const onCopyClickInternal = async (e: ButtonEvent): Promise<void> => {
@@ -45,7 +50,9 @@ export const CopyTextButton: React.FC<Pick<IProps, "getTextToCopy" | "className"
             onTooltipOpenChange={(open) => {
                 if (!open) onHideTooltip();
             }}
-        />
+        >
+            {children}
+        </AccessibleButton>
     );
 };
 
@@ -57,7 +64,9 @@ const CopyableText: React.FC<IProps> = ({ children, getTextToCopy, border = true
     return (
         <div className={combinedClassName} {...props}>
             {children}
-            <CopyTextButton getTextToCopy={getTextToCopy} className="mx_CopyableText_copyButton" />
+            <CopyTextButton getTextToCopy={getTextToCopy} className="mx_CopyableText_copyButton">
+                <CopyIcon />
+            </CopyTextButton>
         </div>
     );
 };
diff --git a/src/components/views/elements/Dropdown.tsx b/src/components/views/elements/Dropdown.tsx
index 999c07a811..cc298cd2a6 100644
--- a/src/components/views/elements/Dropdown.tsx
+++ b/src/components/views/elements/Dropdown.tsx
@@ -17,6 +17,7 @@ import React, {
     type Ref,
 } from "react";
 import classnames from "classnames";
+import { ChevronDownIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import AccessibleButton, { type ButtonEvent } from "./AccessibleButton";
 import { _t } from "../../../languageHandler";
@@ -65,6 +66,7 @@ class MenuOption extends React.Component<IMenuOptionProps> {
                 role="option"
                 aria-selected={this.props.highlighted}
                 ref={this.props.inputRef}
+                tabIndex={-1}
             >
                 {this.props.children}
             </li>
@@ -232,18 +234,27 @@ export default class Dropdown extends React.Component<DropdownProps, IState> {
                 break;
             case KeyBindingAction.ArrowDown:
                 if (this.state.expanded) {
+                    const nextKey = this.nextOption(this.state.highlightedOption);
                     this.setState({
-                        highlightedOption: this.nextOption(this.state.highlightedOption),
+                        highlightedOption: nextKey,
                     });
+
+                    (
+                        this.dropdownRootElement?.querySelector(`#${this.props.id}__${nextKey}`) as HTMLLIElement
+                    )?.focus();
                 } else {
                     this.setState({ expanded: true });
                 }
                 break;
             case KeyBindingAction.ArrowUp:
                 if (this.state.expanded) {
+                    const prevKey = this.prevOption(this.state.highlightedOption);
                     this.setState({
-                        highlightedOption: this.prevOption(this.state.highlightedOption),
+                        highlightedOption: prevKey,
                     });
+                    (
+                        this.dropdownRootElement?.querySelector(`#${this.props.id}__${prevKey}`) as HTMLLIElement
+                    )?.focus();
                 } else {
                     this.setState({ expanded: true });
                 }
@@ -401,7 +412,7 @@ export default class Dropdown extends React.Component<DropdownProps, IState> {
                     onKeyDown={this.onKeyDown}
                 >
                     {currentValue}
-                    <span className="mx_Dropdown_arrow" />
+                    <ChevronDownIcon className="mx_Dropdown_arrow" />
                     {menu}
                 </AccessibleButton>
             </div>
diff --git a/src/components/views/elements/EventListSummary.tsx b/src/components/views/elements/EventListSummary.tsx
index 7e6ea442e3..9eec103c27 100644
--- a/src/components/views/elements/EventListSummary.tsx
+++ b/src/components/views/elements/EventListSummary.tsx
@@ -180,7 +180,6 @@ export default class EventListSummary extends React.Component<Props, State> {
 
     private onEventSentinelUpdated = throttle(
         (): void => {
-            console.log("@@ SENTINEL UPDATED");
             this.setState(this.generateState());
         },
         500,
diff --git a/src/components/views/elements/ExternalLink.tsx b/src/components/views/elements/ExternalLink.tsx
index 0e3856e132..7b6d2852ee 100644
--- a/src/components/views/elements/ExternalLink.tsx
+++ b/src/components/views/elements/ExternalLink.tsx
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type DetailedHTMLProps, type AnchorHTMLAttributes } from "react";
 import classNames from "classnames";
+import PopOutIcon from "@vector-im/compound-design-tokens/assets/web/icons/pop-out";
 
 interface Props extends DetailedHTMLProps<AnchorHTMLAttributes<HTMLAnchorElement>, HTMLAnchorElement> {}
 
@@ -17,7 +18,7 @@ interface Props extends DetailedHTMLProps<AnchorHTMLAttributes<HTMLAnchorElement
 const ExternalLink: React.FC<Props> = ({ children, className, ...rest }) => (
     <a target="_blank" rel="noreferrer noopener" {...rest} className={classNames("mx_ExternalLink", className)}>
         {children}
-        <i className="mx_ExternalLink_icon" />
+        <PopOutIcon className="mx_ExternalLink_icon" />
     </a>
 );
 
diff --git a/src/components/views/elements/FacePile.tsx b/src/components/views/elements/FacePile.tsx
index f2c04ee116..9c448dc186 100644
--- a/src/components/views/elements/FacePile.tsx
+++ b/src/components/views/elements/FacePile.tsx
@@ -10,6 +10,7 @@ import React, { type FC, type HTMLAttributes, type ReactNode } from "react";
 import { type RoomMember } from "matrix-js-sdk/src/matrix";
 import { AvatarStack, Tooltip } from "@vector-im/compound-web";
 import classNames from "classnames";
+import { OverflowHorizontalIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import MemberAvatar from "../avatars/MemberAvatar";
 import AccessibleButton, { type ButtonEvent } from "./AccessibleButton";
@@ -56,7 +57,7 @@ const FacePile: FC<IProps> = ({
     const pileContents = (
         <>
             {faces}
-            {overflow ? <span className="mx_FacePile_more" /> : null}
+            {overflow ? <OverflowHorizontalIcon className="mx_FacePile_more" /> : null}
         </>
     );
 
diff --git a/src/components/views/elements/ImageView.tsx b/src/components/views/elements/ImageView.tsx
index e3ee6f20d5..e88a1c066e 100644
--- a/src/components/views/elements/ImageView.tsx
+++ b/src/components/views/elements/ImageView.tsx
@@ -8,9 +8,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { type JSX, createRef, type CSSProperties, useRef, useState, useMemo } from "react";
+import React, { type JSX, createRef, type CSSProperties, useEffect } from "react";
 import FocusLock from "react-focus-lock";
-import { type MatrixEvent, parseErrorResponse } from "matrix-js-sdk/src/matrix";
+import { type MatrixEvent } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../../languageHandler";
 import MemberAvatar from "../avatars/MemberAvatar";
@@ -19,7 +19,6 @@ import MessageContextMenu from "../context_menus/MessageContextMenu";
 import { aboveLeftOf } from "../../structures/ContextMenu";
 import MessageTimestamp from "../messages/MessageTimestamp";
 import SettingsStore from "../../../settings/SettingsStore";
-import { formatFullDate } from "../../../DateUtils";
 import dis from "../../../dispatcher/dispatcher";
 import { Action } from "../../../dispatcher/actions";
 import { type RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
@@ -30,10 +29,7 @@ import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { presentableTextForFile } from "../../../utils/FileUtils";
 import AccessibleButton from "./AccessibleButton";
-import Modal from "../../../Modal";
-import ErrorDialog from "../dialogs/ErrorDialog";
-import { FileDownloader } from "../../../utils/FileDownloader";
-import { MediaEventHelper } from "../../../utils/MediaEventHelper.ts";
+import { useDownloadMedia } from "../../../hooks/useDownloadMedia.ts";
 
 // Max scale to keep gaps around the image
 const MAX_SCALE = 0.95;
@@ -121,6 +117,8 @@ export default class ImageView extends React.Component<IProps, IState> {
     private imageWrapper = createRef<HTMLDivElement>();
     private image = createRef<HTMLImageElement>();
 
+    private downloadFunction?: () => Promise<void>;
+
     private initX = 0;
     private initY = 0;
     private previousX = 0;
@@ -300,6 +298,13 @@ export default class ImageView extends React.Component<IProps, IState> {
                 ev.preventDefault();
                 this.props.onFinished();
                 break;
+            case KeyBindingAction.Save:
+                ev.preventDefault();
+                ev.stopPropagation();
+                if (this.downloadFunction) {
+                    this.downloadFunction();
+                }
+                break;
         }
     };
 
@@ -325,6 +330,10 @@ export default class ImageView extends React.Component<IProps, IState> {
         });
     };
 
+    private onDownloadFunctionReady = (download: () => Promise<void>): void => {
+        this.downloadFunction = download;
+    };
+
     private onPermalinkClicked = (ev: React.MouseEvent): void => {
         // This allows the permalink to be opened in a new tab/window or copied as
         // matrix.to, but also for it to enable routing within Element when clicked.
@@ -447,18 +456,15 @@ export default class ImageView extends React.Component<IProps, IState> {
             const senderName = mxEvent.sender?.name ?? mxEvent.getSender();
             const sender = <div className="mx_ImageView_info_sender">{senderName}</div>;
             const messageTimestamp = (
-                <a
+                <MessageTimestamp
                     href={permalink}
                     onClick={this.onPermalinkClicked}
-                    aria-label={formatFullDate(new Date(mxEvent.getTs()), showTwelveHour, false)}
-                >
-                    <MessageTimestamp
-                        showFullDate={true}
-                        showTwelveHour={showTwelveHour}
-                        ts={mxEvent.getTs()}
-                        showSeconds={false}
-                    />
-                </a>
+                    showFullDate={true}
+                    showTwelveHour={showTwelveHour}
+                    ts={mxEvent.getTs()}
+                    showSeconds={false}
+                    inhibitTooltip
+                />
             );
             const avatar = (
                 <MemberAvatar
@@ -550,7 +556,12 @@ export default class ImageView extends React.Component<IProps, IState> {
                             title={_t("lightbox|rotate_right")}
                             onClick={this.onRotateClockwiseClick}
                         />
-                        <DownloadButton url={this.props.src} fileName={this.props.name} mxEvent={this.props.mxEvent} />
+                        <DownloadButton
+                            url={this.props.src}
+                            fileName={this.props.name}
+                            mxEvent={this.props.mxEvent}
+                            onDownloadReady={this.onDownloadFunctionReady}
+                        />
                         {contextMenuButton}
                         <AccessibleButton
                             className="mx_ImageView_button mx_ImageView_button_close"
@@ -583,69 +594,28 @@ export default class ImageView extends React.Component<IProps, IState> {
     }
 }
 
-function DownloadButton({
-    url,
-    fileName,
-    mxEvent,
-}: {
+interface DownloadButtonProps {
     url: string;
     fileName?: string;
     mxEvent?: MatrixEvent;
-}): JSX.Element {
-    const downloader = useRef(new FileDownloader()).current;
-    const [loading, setLoading] = useState(false);
-    const blobRef = useRef<Blob>(undefined);
-    const mediaEventHelper = useMemo(() => (mxEvent ? new MediaEventHelper(mxEvent) : undefined), [mxEvent]);
+    onDownloadReady?: (download: () => Promise<void>) => void;
+}
 
-    function showError(e: unknown): void {
-        Modal.createDialog(ErrorDialog, {
-            title: _t("timeline|download_failed"),
-            description: (
-                <>
-                    <div>{_t("timeline|download_failed_description")}</div>
-                    <div>{e instanceof Error ? e.toString() : ""}</div>
-                </>
-            ),
-        });
-        setLoading(false);
-    }
+export const DownloadButton: React.FC<DownloadButtonProps> = ({ url, fileName, mxEvent, onDownloadReady }) => {
+    const { download, loading, canDownload } = useDownloadMedia(url, fileName, mxEvent);
 
-    const onDownloadClick = async (): Promise<void> => {
-        try {
-            if (loading) return;
-            setLoading(true);
+    useEffect(() => {
+        if (onDownloadReady) onDownloadReady(download);
+    }, [download, onDownloadReady]);
 
-            if (blobRef.current) {
-                // Cheat and trigger a download, again.
-                return downloadBlob(blobRef.current);
-            }
-
-            const res = await fetch(url);
-            if (!res.ok) {
-                throw parseErrorResponse(res, await res.text());
-            }
-            const blob = await res.blob();
-            blobRef.current = blob;
-            await downloadBlob(blob);
-        } catch (e) {
-            showError(e);
-        }
-    };
-
-    async function downloadBlob(blob: Blob): Promise<void> {
-        await downloader.download({
-            blob,
-            name: mediaEventHelper?.fileName ?? fileName ?? _t("common|image"),
-        });
-        setLoading(false);
-    }
+    if (!canDownload) return null;
 
     return (
         <AccessibleButton
             className="mx_ImageView_button mx_ImageView_button_download"
             title={loading ? _t("timeline|download_action_downloading") : _t("action|download")}
-            onClick={onDownloadClick}
+            onClick={download}
             disabled={loading}
         />
     );
-}
+};
diff --git a/src/components/views/elements/InfoTooltip.tsx b/src/components/views/elements/InfoTooltip.tsx
index 5600fbbbb2..8ac57354d6 100644
--- a/src/components/views/elements/InfoTooltip.tsx
+++ b/src/components/views/elements/InfoTooltip.tsx
@@ -10,6 +10,7 @@ Please see LICENSE files in the repository root for full details.
 import React, { type ReactNode } from "react";
 import classNames from "classnames";
 import { Tooltip } from "@vector-im/compound-web";
+import { ErrorSolidIcon, InfoIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 
@@ -30,14 +31,14 @@ export default class InfoTooltip extends React.PureComponent<TooltipProps> {
     public render(): React.ReactNode {
         const { tooltip, children, className, kind } = this.props;
         const title = _t("info_tooltip_title");
-        const iconClassName =
-            kind !== InfoTooltipKind.Warning ? "mx_InfoTooltip_icon_info" : "mx_InfoTooltip_icon_warning";
 
         // Tooltip are forced on the right for a more natural feel to them on info icons
         return (
             <Tooltip description={tooltip || title} placement="right">
                 <div className={classNames("mx_InfoTooltip", className)} tabIndex={this.props.tabIndex ?? 0}>
-                    <span className={classNames("mx_InfoTooltip_icon", iconClassName)} aria-label={title} />
+                    <span className="mx_InfoTooltip_icon" aria-label={title}>
+                        {kind !== InfoTooltipKind.Warning ? <InfoIcon /> : <ErrorSolidIcon />}
+                    </span>
                     {children}
                 </div>
             </Tooltip>
diff --git a/src/components/views/elements/InlineSpinner.tsx b/src/components/views/elements/InlineSpinner.tsx
index 7c1bde36b4..cc76e7ff0c 100644
--- a/src/components/views/elements/InlineSpinner.tsx
+++ b/src/components/views/elements/InlineSpinner.tsx
@@ -6,13 +6,12 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
+import { InlineSpinner as BaseInlineSpinner } from "@vector-im/compound-web";
 
 import { _t } from "../../../languageHandler";
 
 interface IProps {
-    w?: number;
-    h?: number;
-    children?: React.ReactNode;
+    size?: number;
 }
 
 export default class InlineSpinner extends React.PureComponent<IProps> {
@@ -23,15 +22,14 @@ export default class InlineSpinner extends React.PureComponent<IProps> {
 
     public render(): React.ReactNode {
         return (
-            <div className="mx_InlineSpinner">
-                <div
-                    className="mx_InlineSpinner_icon mx_Spinner_icon"
-                    style={{ width: this.props.w, height: this.props.h }}
+            <span className="mx_InlineSpinner">
+                <BaseInlineSpinner
+                    size={this.props.size}
                     aria-label={_t("common|loading")}
-                >
-                    {this.props.children}
-                </div>
-            </div>
+                    role="progressbar"
+                    data-testid="spinner"
+                />
+            </span>
         );
     }
 }
diff --git a/src/components/views/elements/InviteReason.tsx b/src/components/views/elements/InviteReason.tsx
index fd44b5a418..eaa65c7408 100644
--- a/src/components/views/elements/InviteReason.tsx
+++ b/src/components/views/elements/InviteReason.tsx
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import classNames from "classnames";
 import React from "react";
+import { VisibilityOnIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { sanitizedHtmlNode } from "../../../HtmlUtils";
 import { _t } from "../../../languageHandler";
@@ -50,6 +51,7 @@ export default class InviteReason extends React.PureComponent<IProps, IState> {
                     {this.props.htmlReason ? sanitizedHtmlNode(this.props.htmlReason) : this.props.reason}
                 </div>
                 <AccessibleButton kind="link_inline" className="mx_InviteReason_view" onClick={this.onViewClick}>
+                    <VisibilityOnIcon />
                     {_t("common|view_message")}
                 </AccessibleButton>
             </div>
diff --git a/src/components/views/elements/JoinRuleDropdown.tsx b/src/components/views/elements/JoinRuleDropdown.tsx
index cded54ffd6..f40493854e 100644
--- a/src/components/views/elements/JoinRuleDropdown.tsx
+++ b/src/components/views/elements/JoinRuleDropdown.tsx
@@ -8,10 +8,15 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type ReactElement } from "react";
 import { JoinRule } from "matrix-js-sdk/src/matrix";
+import {
+    GroupIcon,
+    LockSolidIcon,
+    PublicIcon,
+    AskToJoinIcon,
+} from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import Dropdown from "./Dropdown";
 import { type NonEmptyArray } from "../../../@types/common";
-import { Icon as AskToJoinIcon } from "../../../../res/img/element-icons/ask-to-join.svg";
 
 interface IProps {
     value: JoinRule;
@@ -19,7 +24,7 @@ interface IProps {
     width?: number;
     labelInvite: string;
     labelKnock?: string;
-    labelPublic: string;
+    labelPublic?: string;
     labelRestricted?: string; // if omitted then this option will be hidden, e.g if unsupported
     onChange(value: JoinRule): void;
 }
@@ -36,18 +41,27 @@ const JoinRuleDropdown: React.FC<IProps> = ({
 }) => {
     const options = [
         <div key={JoinRule.Invite} className="mx_JoinRuleDropdown_invite">
+            <LockSolidIcon />
             {labelInvite}
         </div>,
-        <div key={JoinRule.Public} className="mx_JoinRuleDropdown_public">
-            {labelPublic}
-        </div>,
     ] as NonEmptyArray<ReactElement & { key: string }>;
 
+    if (labelPublic) {
+        options.push(
+            (
+                <div key={JoinRule.Public} className="mx_JoinRuleDropdown_public">
+                    <PublicIcon />
+                    {labelPublic}
+                </div>
+            ) as ReactElement & { key: string },
+        );
+    }
+
     if (labelKnock) {
         options.unshift(
             (
                 <div key={JoinRule.Knock} className="mx_JoinRuleDropdown_knock">
-                    <AskToJoinIcon className="mx_Icon mx_Icon_16 mx_JoinRuleDropdown_icon" />
+                    <AskToJoinIcon />
                     {labelKnock}
                 </div>
             ) as ReactElement & { key: string },
@@ -58,6 +72,7 @@ const JoinRuleDropdown: React.FC<IProps> = ({
         options.unshift(
             (
                 <div key={JoinRule.Restricted} className="mx_JoinRuleDropdown_restricted">
+                    <GroupIcon />
                     {labelRestricted}
                 </div>
             ) as ReactElement & { key: string },
@@ -72,6 +87,7 @@ const JoinRuleDropdown: React.FC<IProps> = ({
             menuWidth={width}
             value={value}
             label={label}
+            disabled={options.length === 1}
         >
             {options}
         </Dropdown>
diff --git a/src/components/views/elements/LabelledCheckbox.tsx b/src/components/views/elements/LabelledCheckbox.tsx
index ba07ed9201..45cef43da9 100644
--- a/src/components/views/elements/LabelledCheckbox.tsx
+++ b/src/components/views/elements/LabelledCheckbox.tsx
@@ -24,11 +24,13 @@ interface IProps {
     onChange(checked: boolean): void;
     // Optional additional CSS class to apply to the label
     className?: string;
+    // The id for the checkbox
+    id?: string;
 }
 
-const LabelledCheckbox: React.FC<IProps> = ({ value, label, byline, disabled, onChange, className }) => {
+const LabelledCheckbox: React.FC<IProps> = ({ value, label, byline, disabled, onChange, className, id }) => {
     return (
-        <div className={classnames("mx_LabelledCheckbox", className)}>
+        <div id={id} className={classnames("mx_LabelledCheckbox", className)}>
             <StyledCheckbox
                 description={byline}
                 disabled={disabled}
diff --git a/src/components/views/elements/LabelledToggleSwitch.tsx b/src/components/views/elements/LabelledToggleSwitch.tsx
deleted file mode 100644
index 921241d62e..0000000000
--- a/src/components/views/elements/LabelledToggleSwitch.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2019-2022 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-import React, { type FC, useId } from "react";
-import classNames from "classnames";
-
-import ToggleSwitch from "./ToggleSwitch";
-import { Caption } from "../typography/Caption";
-
-interface IProps {
-    // The value for the toggle switch
-    "value": boolean;
-    // The translated label for the switch
-    "label": string;
-    // The translated caption for the switch
-    "caption"?: string;
-    // Tooltip to display
-    "tooltip"?: string;
-    // Whether or not to disable the toggle switch
-    "disabled"?: boolean;
-    // True to put the toggle in front of the label
-    // Default false.
-    "toggleInFront"?: boolean;
-    // Additional class names to append to the switch. Optional.
-    "className"?: string;
-    // The function to call when the value changes
-    onChange(checked: boolean): void;
-
-    "data-testid"?: string;
-}
-
-const LabelledToggleSwitch: FC<IProps> = ({
-    label,
-    caption,
-    value,
-    disabled,
-    onChange,
-    tooltip,
-    toggleInFront,
-    className,
-    "data-testid": testId,
-}) => {
-    // This is a minimal version of a SettingsFlag
-    const generatedId = useId();
-    const id = `mx_LabelledToggleSwitch_${generatedId}`;
-    let firstPart = (
-        <span className="mx_SettingsFlag_label">
-            <div id={id}>{label}</div>
-            {caption && <Caption id={`${id}_caption`}>{caption}</Caption>}
-        </span>
-    );
-    let secondPart = (
-        <ToggleSwitch
-            checked={value}
-            disabled={disabled}
-            onChange={onChange}
-            tooltip={tooltip}
-            aria-labelledby={id}
-            aria-describedby={caption ? `${id}_caption` : undefined}
-        />
-    );
-
-    if (toggleInFront) {
-        [firstPart, secondPart] = [secondPart, firstPart];
-    }
-
-    const classes = classNames("mx_SettingsFlag", className, {
-        mx_SettingsFlag_toggleInFront: toggleInFront,
-    });
-    return (
-        <div data-testid={testId} className={classes}>
-            {firstPart}
-            {secondPart}
-        </div>
-    );
-};
-
-export default LabelledToggleSwitch;
diff --git a/src/components/views/elements/MiniAvatarUploader.tsx b/src/components/views/elements/MiniAvatarUploader.tsx
index 49a908d854..fc9574b411 100644
--- a/src/components/views/elements/MiniAvatarUploader.tsx
+++ b/src/components/views/elements/MiniAvatarUploader.tsx
@@ -9,6 +9,7 @@ Please see LICENSE files in the repository root for full details.
 import classNames from "classnames";
 import { EventType } from "matrix-js-sdk/src/matrix";
 import React, { useContext, useRef, useState, type MouseEvent, type ReactNode } from "react";
+import { TakePhotoSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { chromeFileInputFix } from "../../../utils/BrowserWorkarounds";
@@ -86,7 +87,7 @@ const MiniAvatarUploader: React.FC<IProps> = ({
                 {children}
 
                 <div className="mx_MiniAvatarUploader_indicator">
-                    {busy ? <Spinner w={20} h={20} /> : <div className="mx_MiniAvatarUploader_cameraIcon" />}
+                    {busy ? <Spinner size={20} /> : <TakePhotoSolidIcon className="mx_MiniAvatarUploader_cameraIcon" />}
                 </div>
             </AccessibleButton>
         </React.Fragment>
diff --git a/src/components/views/elements/ReplyChain.tsx b/src/components/views/elements/ReplyChain.tsx
index 9ff1c1e017..d81ff992ee 100644
--- a/src/components/views/elements/ReplyChain.tsx
+++ b/src/components/views/elements/ReplyChain.tsx
@@ -246,7 +246,7 @@ export default class ReplyChain extends React.Component<IProps, IState> {
                 </p>
             );
         } else if (this.state.loading) {
-            header = <Spinner w={16} h={16} />;
+            header = <Spinner size={16} />;
         }
 
         const { isQuoteExpanded } = this.props;
diff --git a/src/components/views/elements/SSOButtons.tsx b/src/components/views/elements/SSOButtons.tsx
index 3945a66510..52fdef752c 100644
--- a/src/components/views/elements/SSOButtons.tsx
+++ b/src/components/views/elements/SSOButtons.tsx
@@ -35,7 +35,7 @@ const getIcon = (brand: IdentityProviderBrand | string): string | null => {
     switch (brand) {
         /* eslint-disable @typescript-eslint/no-require-imports */
         case IdentityProviderBrand.Apple:
-            return require(`../../../../res/img/element-icons/brands/apple.svg`).default;
+            return require("@vector-im/compound-design-tokens/icons/mac.svg").default;
         case IdentityProviderBrand.Facebook:
             return require(`../../../../res/img/element-icons/brands/facebook.svg`).default;
         case IdentityProviderBrand.Github:
diff --git a/src/components/views/elements/SettingsDropdown.tsx b/src/components/views/elements/SettingsDropdown.tsx
new file mode 100644
index 0000000000..db78e7cc36
--- /dev/null
+++ b/src/components/views/elements/SettingsDropdown.tsx
@@ -0,0 +1,81 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React, { type JSX, useCallback, useId, useState } from "react";
+import { _t } from "@element-hq/web-shared-components";
+
+import SettingsStore from "../../../settings/SettingsStore";
+import { type SettingLevel } from "../../../settings/SettingLevel";
+import { SETTINGS, type StringSettingKey } from "../../../settings/Settings";
+import { useSettingValueAt } from "../../../hooks/useSettings.ts";
+import Dropdown, { type DropdownProps } from "./Dropdown.tsx";
+
+interface Props {
+    settingKey: StringSettingKey;
+    level: SettingLevel;
+    roomId?: string; // for per-room settings
+    label?: string;
+    isExplicit?: boolean;
+    hideIfCannotSet?: boolean;
+    onChange?(option: string): void;
+}
+
+const SettingsDropdown = ({
+    settingKey,
+    roomId,
+    level,
+    label: specificLabel,
+    isExplicit,
+    hideIfCannotSet,
+    onChange,
+}: Props): JSX.Element => {
+    const id = useId();
+    const settingValue = useSettingValueAt(level, settingKey, roomId ?? null, isExplicit);
+    const [value, setValue] = useState(settingValue);
+    const setting = SETTINGS[settingKey];
+
+    const onOptionChange = useCallback(
+        (value: string): void => {
+            setValue(value); // local echo
+            SettingsStore.setValue(settingKey, roomId ?? null, level, value);
+            onChange?.(value);
+        },
+        [settingKey, roomId, level, onChange],
+    );
+
+    const disabled = !SettingsStore.canSetValue(settingKey, roomId ?? null, level);
+    if (disabled && hideIfCannotSet) return <></>;
+    if (!setting.options) {
+        console.error("SettingsDropdown used for a setting with no `options`");
+        return <></>;
+    }
+
+    const label = specificLabel ?? SettingsStore.getDisplayName(settingKey, level)!;
+    const options = setting.options.map((option) => {
+        return <div key={option.value}>{_t(option.label)}</div>;
+    }) as DropdownProps["children"];
+
+    return (
+        <div className="mx_SettingsDropdown">
+            <label className="mx_SettingsDropdown_label" htmlFor={id}>
+                <span className="mx_SettingsDropdown_labelText">{label}</span>
+            </label>
+            <Dropdown
+                id={id}
+                onOptionChange={onOptionChange}
+                menuWidth={360} // matches CSS width
+                value={value}
+                disabled={disabled}
+                label={label}
+            >
+                {options}
+            </Dropdown>
+        </div>
+    );
+};
+
+export default SettingsDropdown;
diff --git a/src/components/views/elements/SettingsFlag.tsx b/src/components/views/elements/SettingsFlag.tsx
index d7fac91875..eb05301270 100644
--- a/src/components/views/elements/SettingsFlag.tsx
+++ b/src/components/views/elements/SettingsFlag.tsx
@@ -7,13 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React from "react";
+import React, { type ChangeEvent } from "react";
 import { secureRandomString } from "matrix-js-sdk/src/randomstring";
+import { SettingsToggleInput } from "@vector-im/compound-web";
+import { logger } from "matrix-js-sdk/src/logger";
 
 import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from "../../../languageHandler";
-import ToggleSwitch from "./ToggleSwitch";
-import StyledCheckbox from "./StyledCheckbox";
 import { type SettingLevel } from "../../../settings/SettingLevel";
 import { type BooleanSettingKey, defaultWatchManager } from "../../../settings/Settings";
 
@@ -24,8 +24,6 @@ interface IProps {
     roomId?: string; // for per-room settings
     label?: string;
     isExplicit?: boolean;
-    // XXX: once design replaces all toggles make this the default
-    useCheckbox?: boolean;
     hideIfCannotSet?: boolean;
     onChange?(checked: boolean): void;
 }
@@ -74,14 +72,16 @@ export default class SettingsFlag extends React.Component<IProps, IState> {
         });
     };
 
-    private onChange = async (checked: boolean): Promise<void> => {
-        await this.save(checked);
-        this.setState({ value: checked });
-        this.props.onChange?.(checked);
-    };
-
-    private checkBoxOnChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
-        this.onChange(e.target.checked);
+    private onChange = async (evt: ChangeEvent<HTMLInputElement>): Promise<void> => {
+        const newValue = evt.target.checked;
+        try {
+            await this.save(newValue);
+        } catch (ex) {
+            logger.info(`Failed to save setting ${this.props.name}`, ex);
+            return;
+        }
+        this.setState({ value: newValue });
+        this.props.onChange?.(newValue);
     };
 
     private save = async (val?: boolean): Promise<void> => {
@@ -101,45 +101,28 @@ export default class SettingsFlag extends React.Component<IProps, IState> {
         const label = this.props.label ?? SettingsStore.getDisplayName(this.props.name, this.props.level);
         const description = SettingsStore.getDescription(this.props.name);
         const shouldWarn = SettingsStore.shouldHaveWarning(this.props.name);
-
-        if (this.props.useCheckbox) {
-            return (
-                <StyledCheckbox checked={this.state.value} onChange={this.checkBoxOnChange} disabled={disabled}>
-                    {label}
-                </StyledCheckbox>
-            );
-        } else {
-            return (
-                <div className="mx_SettingsFlag">
-                    <label className="mx_SettingsFlag_label" htmlFor={this.id}>
-                        <span className="mx_SettingsFlag_labelText">{label}</span>
-                        {description && (
-                            <div className="mx_SettingsFlag_microcopy">
-                                {shouldWarn
-                                    ? _t(
-                                          "settings|warning",
-                                          {},
-                                          {
-                                              w: (sub) => (
-                                                  <span className="mx_SettingsTab_microcopy_warning">{sub}</span>
-                                              ),
-                                              description,
-                                          },
-                                      )
-                                    : description}
-                            </div>
-                        )}
-                    </label>
-                    <ToggleSwitch
-                        id={this.id}
-                        checked={this.state.value}
-                        onChange={this.onChange}
-                        disabled={disabled}
-                        tooltip={disabled ? SettingsStore.disabledMessage(this.props.name) : undefined}
-                        title={label ?? undefined}
-                    />
-                </div>
-            );
-        }
+        const helpMessage = shouldWarn
+            ? _t(
+                  "settings|warning",
+                  {},
+                  {
+                      w: (sub) => <span className="mx_SettingsTab_microcopy_warning">{sub}</span>,
+                      description,
+                  },
+              )
+            : description;
+        const disabledMessage = SettingsStore.disabledMessage(this.props.name);
+        return (
+            <SettingsToggleInput
+                id={this.id}
+                checked={this.state.value}
+                onChange={disabledMessage ? undefined : this.onChange}
+                name={this.props.name}
+                disabled={disabled}
+                label={label ?? this.props.name}
+                helpMessage={helpMessage as string}
+                disabledMessage={disabledMessage}
+            />
+        );
     }
 }
diff --git a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
index 88a1ab1bd6..ffcbf972d7 100644
--- a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
+++ b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
@@ -52,8 +52,7 @@ export default class SpellCheckLanguagesDropdown extends React.Component<
         const plaf = PlatformPeg.get();
         if (plaf) {
             const languageNames = new Intl.DisplayNames([getUserLanguage()], { type: "language", style: "short" });
-            plaf
-                .getAvailableSpellCheckLanguages()
+            plaf.getAvailableSpellCheckLanguages()
                 ?.then((languages) => {
                     languages.sort(function (a, b) {
                         if (a < b) return -1;
diff --git a/src/components/views/elements/Spinner.tsx b/src/components/views/elements/Spinner.tsx
index ab23135a88..a3ba625e89 100644
--- a/src/components/views/elements/Spinner.tsx
+++ b/src/components/views/elements/Spinner.tsx
@@ -7,24 +7,23 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
+import { InlineSpinner } from "@vector-im/compound-web";
 
 import { _t } from "../../../languageHandler";
 
 interface IProps {
-    w?: number;
-    h?: number;
+    size?: number;
     message?: string;
     onFinished: any; // XXX: Spinner pretends to be a dialog so it must accept an onFinished, but it never calls it
 }
 
 export default class Spinner extends React.PureComponent<IProps> {
     public static defaultProps: Partial<IProps> = {
-        w: 32,
-        h: 32,
+        size: 32,
     };
 
     public render(): React.ReactNode {
-        const { w, h, message } = this.props;
+        const { size, message } = this.props;
         return (
             <div className="mx_Spinner">
                 {message && (
@@ -32,13 +31,7 @@ export default class Spinner extends React.PureComponent<IProps> {
                         <div className="mx_Spinner_Msg">{message}</div>&nbsp;
                     </React.Fragment>
                 )}
-                <div
-                    className="mx_Spinner_icon"
-                    style={{ width: w, height: h }}
-                    aria-label={_t("common|loading")}
-                    role="progressbar"
-                    data-testid="spinner"
-                />
+                <InlineSpinner size={size} aria-label={_t("common|loading")} role="progressbar" data-testid="spinner" />
             </div>
         );
     }
diff --git a/src/components/views/elements/Validation.tsx b/src/components/views/elements/Validation.tsx
index 4b2f8d9cd4..ce1a9b457a 100644
--- a/src/components/views/elements/Validation.tsx
+++ b/src/components/views/elements/Validation.tsx
@@ -10,6 +10,7 @@ Please see LICENSE files in the repository root for full details.
 import React, { type JSX, type ReactNode } from "react";
 import classNames from "classnames";
 import memoizeOne from "memoize-one";
+import { CheckIcon, CloseIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 type Data = Pick<IFieldState, "value" | "allowEmpty">;
 
@@ -173,6 +174,7 @@ export default function withValidation<T = void, D = void>({
                         });
                         return (
                             <li key={result.key} className={classes}>
+                                {result.valid ? <CheckIcon /> : <CloseIcon />}
                                 {result.text}
                             </li>
                         );
diff --git a/src/components/views/emojipicker/Category.tsx b/src/components/views/emojipicker/Category.tsx
index 9ffe1dce14..21e5c97c33 100644
--- a/src/components/views/emojipicker/Category.tsx
+++ b/src/components/views/emojipicker/Category.tsx
@@ -23,7 +23,10 @@ export interface ICategory {
     id: CategoryKey;
     name: string;
     enabled: boolean;
+    // Whether the category is currently visible
     visible: boolean;
+    // Whether the category is the first visible category
+    firstVisible: boolean;
     ref: RefObject<HTMLButtonElement | null>;
 }
 
@@ -61,17 +64,17 @@ class Category extends React.PureComponent<IProps> {
         return (
             <div key={rowIndex} role="row">
                 {emojisForRow.map((emoji) => (
-                    <Emoji
-                        key={emoji.hexcode}
-                        emoji={emoji}
-                        selectedEmojis={selectedEmojis}
-                        onClick={onClick}
-                        onMouseEnter={onMouseEnter}
-                        onMouseLeave={onMouseLeave}
-                        disabled={this.props.isEmojiDisabled?.(emoji.unicode)}
-                        id={`mx_EmojiPicker_item_${this.props.id}_${hexEncode(emoji.unicode)}`}
-                        role="gridcell"
-                    />
+                    <div role="gridcell" className="mx_EmojiPicker_item_wrapper" key={emoji.hexcode}>
+                        <Emoji
+                            emoji={emoji}
+                            selectedEmojis={selectedEmojis}
+                            onClick={onClick}
+                            onMouseEnter={onMouseEnter}
+                            onMouseLeave={onMouseLeave}
+                            disabled={this.props.isEmojiDisabled?.(emoji.unicode)}
+                            id={`mx_EmojiPicker_item_${this.props.id}_${hexEncode(emoji.unicode)}`}
+                        />
+                    </div>
                 ))}
             </div>
         );
@@ -118,6 +121,7 @@ class Category extends React.PureComponent<IProps> {
                     overflowMargin={0}
                     renderItem={this.renderEmojiRow}
                     role="grid"
+                    aria-multiselectable
                 />
             </section>
         );
diff --git a/src/components/views/emojipicker/Emoji.tsx b/src/components/views/emojipicker/Emoji.tsx
index 26d15d4dc6..8cc104f9a5 100644
--- a/src/components/views/emojipicker/Emoji.tsx
+++ b/src/components/views/emojipicker/Emoji.tsx
@@ -15,13 +15,17 @@ import { RovingAccessibleButton } from "../../../accessibility/RovingTabIndex";
 
 interface IProps {
     emoji: IEmoji;
+    /**
+     * Set of which emojis are already selected and should be decorated as such.
+     * If specified, emoji will use a checkbox role with aria-checked set appropriately.
+     */
     selectedEmojis?: Set<string>;
     onClick(ev: ButtonEvent, emoji: IEmoji): void;
     onMouseEnter(emoji: IEmoji): void;
     onMouseLeave(emoji: IEmoji): void;
     disabled?: boolean;
     id?: string;
-    role?: string;
+    className?: string;
 }
 
 class Emoji extends React.PureComponent<IProps> {
@@ -34,9 +38,10 @@ class Emoji extends React.PureComponent<IProps> {
                 onClick={(ev: ButtonEvent) => onClick(ev, emoji)}
                 onMouseEnter={() => onMouseEnter(emoji)}
                 onMouseLeave={() => onMouseLeave(emoji)}
-                className="mx_EmojiPicker_item_wrapper"
-                disabled={this.props.disabled}
-                role={this.props.role}
+                className={this.props.className}
+                disabled={this.props.disabled || undefined}
+                role={selectedEmojis ? "checkbox" : undefined}
+                aria-checked={this.props.disabled ? undefined : isSelected}
                 focusOnMouseOver
             >
                 <div className={`mx_EmojiPicker_item ${isSelected ? "mx_EmojiPicker_item_selected" : ""}`}>
diff --git a/src/components/views/emojipicker/EmojiPicker.tsx b/src/components/views/emojipicker/EmojiPicker.tsx
index 71659d579b..9ba2445102 100644
--- a/src/components/views/emojipicker/EmojiPicker.tsx
+++ b/src/components/views/emojipicker/EmojiPicker.tsx
@@ -9,6 +9,8 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type Dispatch } from "react";
 import { DATA_BY_CATEGORY, getEmojiFromUnicode, type Emoji as IEmoji } from "@matrix-org/emojibase-bindings";
+import { clamp } from "@element-hq/web-shared-components";
+import classNames from "classnames";
 
 import { _t } from "../../../languageHandler";
 import * as recent from "../../../emojipicker/recent";
@@ -26,7 +28,6 @@ import {
     Type,
 } from "../../../accessibility/RovingTabIndex";
 import { Key } from "../../../Keyboard";
-import { clamp } from "../../../utils/numbers";
 import { type ButtonEvent } from "../elements/AccessibleButton";
 
 export const CATEGORY_HEADER_HEIGHT = 20;
@@ -50,6 +51,8 @@ interface IState {
     // should be enough to never have blank rows of emojis as
     // 3 rows of overflow are also rendered. The actual value is updated on scroll.
     viewportHeight: number;
+    // Track if user has interacted with arrow keys or search
+    showHighlight: boolean;
 }
 
 class EmojiPicker extends React.Component<IProps, IState> {
@@ -66,6 +69,7 @@ class EmojiPicker extends React.Component<IProps, IState> {
             filter: "",
             scrollTop: 0,
             viewportHeight: 280,
+            showHighlight: false,
         };
 
         // Convert recent emoji characters to emoji data, removing unknowns and duplicates
@@ -75,71 +79,44 @@ class EmojiPicker extends React.Component<IProps, IState> {
             ...DATA_BY_CATEGORY,
         };
 
-        this.categories = [
-            {
-                id: "recent",
-                name: _t("emoji|category_frequently_used"),
-                enabled: this.recentlyUsed.length > 0,
-                visible: this.recentlyUsed.length > 0,
-                ref: React.createRef(),
-            },
-            {
-                id: "people",
-                name: _t("emoji|category_smileys_people"),
-                enabled: true,
-                visible: true,
-                ref: React.createRef(),
-            },
-            {
-                id: "nature",
-                name: _t("emoji|category_animals_nature"),
-                enabled: true,
-                visible: false,
-                ref: React.createRef(),
-            },
-            {
-                id: "foods",
-                name: _t("emoji|category_food_drink"),
-                enabled: true,
-                visible: false,
-                ref: React.createRef(),
-            },
-            {
-                id: "activity",
-                name: _t("emoji|category_activities"),
-                enabled: true,
-                visible: false,
-                ref: React.createRef(),
-            },
-            {
-                id: "places",
-                name: _t("emoji|category_travel_places"),
-                enabled: true,
-                visible: false,
-                ref: React.createRef(),
-            },
-            {
-                id: "objects",
-                name: _t("emoji|category_objects"),
-                enabled: true,
-                visible: false,
-                ref: React.createRef(),
-            },
-            {
-                id: "symbols",
-                name: _t("emoji|category_symbols"),
-                enabled: true,
-                visible: false,
-                ref: React.createRef(),
-            },
-            {
-                id: "flags",
-                name: _t("emoji|category_flags"),
-                enabled: true,
-                visible: false,
-                ref: React.createRef(),
-            },
+        const hasRecentlyUsed = this.recentlyUsed.length > 0;
+
+        const categoryConfig: Array<{
+            id: CategoryKey;
+            name: string;
+        }> = [
+            { id: "recent", name: _t("emoji|category_frequently_used") },
+            { id: "people", name: _t("emoji|category_smileys_people") },
+            { id: "nature", name: _t("emoji|category_animals_nature") },
+            { id: "foods", name: _t("emoji|category_food_drink") },
+            { id: "activity", name: _t("emoji|category_activities") },
+            { id: "places", name: _t("emoji|category_travel_places") },
+            { id: "objects", name: _t("emoji|category_objects") },
+            { id: "symbols", name: _t("emoji|category_symbols") },
+            { id: "flags", name: _t("emoji|category_flags") },
         ];
+
+        this.categories = categoryConfig.map((config) => {
+            let isEnabled = true;
+            let isVisible = false;
+            let firstVisible = false;
+            if (config.id === "recent") {
+                isEnabled = hasRecentlyUsed;
+                isVisible = hasRecentlyUsed;
+                firstVisible = hasRecentlyUsed;
+            } else if (config.id === "people") {
+                isVisible = true;
+                firstVisible = !hasRecentlyUsed;
+            }
+            return {
+                id: config.id,
+                name: config.name,
+                enabled: isEnabled,
+                visible: isVisible,
+                firstVisible: firstVisible,
+                ref: React.createRef(),
+            };
+        });
     }
 
     private onScroll = (): void => {
@@ -152,24 +129,42 @@ class EmojiPicker extends React.Component<IProps, IState> {
         this.updateVisibility();
     };
 
+    // Given a roving emoji button returns the role=row element containing it
+    private getRow(rovingNode?: Element): Element | undefined {
+        return this.getGridcell(rovingNode)?.parentElement ?? undefined;
+    }
+
+    // Given a roving emoji button returns the role=gridcell element containing it
+    private getGridcell(rovingNode?: Element): Element | undefined {
+        return rovingNode?.parentElement ?? undefined;
+    }
+
+    // Given a role=gridcell node returns the roving emoji button contained within
+    private getRovingNode(gridcellNode?: Element): Element | undefined {
+        return gridcellNode?.children[0];
+    }
+
     private keyboardNavigation(ev: React.KeyboardEvent, state: RovingState, dispatch: Dispatch<RovingAction>): void {
-        const node = state.activeNode;
-        const parent = node?.parentElement;
-        if (!parent || !state.activeNode) return;
-        const rowIndex = Array.from(parent.children).indexOf(node);
+        const rowElement = this.getRow(state.activeNode);
+        const gridcellNode = this.getGridcell(state.activeNode);
+        if (!rowElement || !gridcellNode || !state.activeNode) return;
+
+        // Index of element within row container
+        const columnIndex = Array.from(rowElement.children).indexOf(gridcellNode);
+        // Index of element within the list of roving nodes
         const refIndex = state.nodes.indexOf(state.activeNode);
 
         let focusNode: HTMLElement | undefined;
-        let newParent: HTMLElement | undefined;
+        let newRowElement: Element | undefined;
         switch (ev.key) {
             case Key.ARROW_LEFT:
                 focusNode = state.nodes[refIndex - 1];
-                newParent = focusNode?.parentElement ?? undefined;
+                newRowElement = this.getRow(focusNode);
                 break;
 
             case Key.ARROW_RIGHT:
                 focusNode = state.nodes[refIndex + 1];
-                newParent = focusNode?.parentElement ?? undefined;
+                newRowElement = this.getRow(focusNode);
                 break;
 
             case Key.ARROW_UP:
@@ -177,22 +172,30 @@ class EmojiPicker extends React.Component<IProps, IState> {
                 // For up/down we find the prev/next parent by inspecting the refs either side of our row
                 const node =
                     ev.key === Key.ARROW_UP
-                        ? state.nodes[refIndex - rowIndex - 1]
-                        : state.nodes[refIndex - rowIndex + EMOJIS_PER_ROW];
-                newParent = node?.parentElement ?? undefined;
-                const newTarget = newParent?.children[clamp(rowIndex, 0, newParent.children.length - 1)];
-                focusNode = state.nodes.find((r) => r === newTarget);
+                        ? state.nodes[refIndex - columnIndex - 1]
+                        : state.nodes[refIndex - columnIndex + EMOJIS_PER_ROW];
+                newRowElement = this.getRow(node);
+                if (newRowElement) {
+                    const newColumnIndex = clamp(columnIndex, 0, newRowElement.children.length - 1);
+                    const newTarget = this.getRovingNode(newRowElement?.children[newColumnIndex]);
+                    focusNode = state.nodes.find((r) => r === newTarget);
+                }
                 break;
             }
         }
 
         if (focusNode) {
+            // Only move actual DOM focus if an emoji already has focus
+            // If the input has focus, keep using aria-activedescendant for virtual focus
+            if (document.activeElement !== document.querySelector(".mx_EmojiPicker_search input")) {
+                focusNode?.focus();
+            }
             dispatch({
                 type: Type.SetFocus,
                 payload: { node: focusNode },
             });
 
-            if (parent !== newParent) {
+            if (rowElement !== newRowElement) {
                 focusNode?.scrollIntoView({
                     behavior: "auto",
                     block: "center",
@@ -207,6 +210,20 @@ class EmojiPicker extends React.Component<IProps, IState> {
 
     private onKeyDown = (ev: React.KeyboardEvent, state: RovingState, dispatch: Dispatch<RovingAction>): void => {
         if (state.activeNode && [Key.ARROW_DOWN, Key.ARROW_RIGHT, Key.ARROW_LEFT, Key.ARROW_UP].includes(ev.key)) {
+            // If highlight is not shown yet, show it and reset to first emoji
+            if (!this.state.showHighlight) {
+                this.setState({ showHighlight: true });
+                // Reset to first emoji when showing highlight for the first time (or after it was hidden)
+                if (state.nodes.length > 0) {
+                    dispatch({
+                        type: Type.SetFocus,
+                        payload: { node: state.nodes[0] },
+                    });
+                }
+                ev.preventDefault();
+                ev.stopPropagation();
+                return;
+            }
             this.keyboardNavigation(ev, state, dispatch);
         }
     };
@@ -215,6 +232,7 @@ class EmojiPicker extends React.Component<IProps, IState> {
         const body = this.scrollRef.current?.containerRef.current;
         if (!body) return;
         const rect = body.getBoundingClientRect();
+        let firstVisibleFound = false;
         for (const cat of this.categories) {
             const elem = body.querySelector(`[data-category-id="${cat.id}"]`);
             if (!elem) {
@@ -226,15 +244,24 @@ class EmojiPicker extends React.Component<IProps, IState> {
             const y = elemRect.y - rect.y;
             const yEnd = elemRect.y + elemRect.height - rect.y;
             cat.visible = y < rect.height && yEnd > 0;
+            if (cat.visible && !firstVisibleFound) {
+                firstVisibleFound = true;
+                cat.firstVisible = true;
+            } else {
+                cat.firstVisible = false;
+            }
             // We update this here instead of through React to avoid re-render on scroll.
             if (!cat.ref.current) continue;
             if (cat.visible) {
                 cat.ref.current.classList.add("mx_EmojiPicker_anchor_visible");
                 cat.ref.current.setAttribute("aria-selected", "true");
-                cat.ref.current.setAttribute("tabindex", "0");
             } else {
                 cat.ref.current.classList.remove("mx_EmojiPicker_anchor_visible");
                 cat.ref.current.setAttribute("aria-selected", "false");
+            }
+            if (cat.firstVisible) {
+                cat.ref.current.setAttribute("tabindex", "0");
+            } else {
                 cat.ref.current.setAttribute("tabindex", "-1");
             }
         }
@@ -248,6 +275,15 @@ class EmojiPicker extends React.Component<IProps, IState> {
 
     private onChangeFilter = (filter: string): void => {
         const lcFilter = filter.toLowerCase().trim(); // filter is case insensitive
+
+        // User has typed a query, show highlight
+        // If filter is cleared, hide highlight again
+        if (lcFilter && !this.state.showHighlight) {
+            this.setState({ showHighlight: true });
+        } else if (!lcFilter && this.state.showHighlight) {
+            this.setState({ showHighlight: false });
+        }
+
         for (const cat of this.categories) {
             let emojis: IEmoji[];
             // If the new filter string includes the old filter string, we don't have to re-filter the whole dataset.
@@ -309,8 +345,11 @@ class EmojiPicker extends React.Component<IProps, IState> {
     };
 
     private onEnterFilter = (): void => {
+        // Only select emoji if highlight is shown
+        if (!this.state.showHighlight) return;
+
         const btn = this.scrollRef.current?.containerRef.current?.querySelector<HTMLButtonElement>(
-            '.mx_EmojiPicker_item_wrapper[tabindex="0"]',
+            '.mx_EmojiPicker_item_wrapper [tabindex="0"]',
         );
         btn?.click();
         this.props.onFinished();
@@ -365,7 +404,9 @@ class EmojiPicker extends React.Component<IProps, IState> {
                             />
                             <AutoHideScrollbar
                                 id="mx_EmojiPicker_body"
-                                className="mx_EmojiPicker_body"
+                                className={classNames("mx_EmojiPicker_body", {
+                                    mx_EmojiPicker_body_showHighlight: this.state.showHighlight,
+                                })}
                                 ref={this.scrollRef}
                                 onScroll={this.onScroll}
                             >
diff --git a/src/components/views/emojipicker/Header.tsx b/src/components/views/emojipicker/Header.tsx
index 985882bd7b..ed2c6b9f21 100644
--- a/src/components/views/emojipicker/Header.tsx
+++ b/src/components/views/emojipicker/Header.tsx
@@ -9,7 +9,6 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import classNames from "classnames";
-import { findLastIndex } from "lodash";
 
 import { _t } from "../../../languageHandler";
 import { type CategoryKey, type ICategory } from "./Category";
@@ -33,14 +32,8 @@ class Header extends React.PureComponent<IProps> {
     }
 
     private changeCategoryRelative(delta: number): void {
-        let current: number;
-        // As multiple categories may be visible at once, we want to find the one closest to the relative direction
-        if (delta < 0) {
-            current = this.props.categories.findIndex((c) => c.visible);
-        } else {
-            // XXX: Switch to Array::findLastIndex once we enable ES2023
-            current = findLastIndex(this.props.categories, (c) => c.visible);
-        }
+        // Move to the next/previous category using the first visible as the current.
+        const current = this.props.categories.findIndex((c) => c.visible);
         this.changeCategoryAbsolute(current + delta, delta);
     }
 
@@ -104,7 +97,7 @@ class Header extends React.PureComponent<IProps> {
                             onClick={() => this.props.onAnchorClick(category.id)}
                             title={category.name}
                             role="tab"
-                            tabIndex={category.visible ? 0 : -1} // roving
+                            tabIndex={category.firstVisible ? 0 : -1} // roving
                             aria-selected={category.visible}
                             aria-controls={`mx_EmojiPicker_category_${category.id}`}
                         />
diff --git a/src/components/views/emojipicker/QuickReactions.tsx b/src/components/views/emojipicker/QuickReactions.tsx
index a814a6b206..4b337cd5f5 100644
--- a/src/components/views/emojipicker/QuickReactions.tsx
+++ b/src/components/views/emojipicker/QuickReactions.tsx
@@ -73,6 +73,7 @@ class QuickReactions extends React.Component<IProps, IState> {
                             onMouseEnter={this.onMouseEnter}
                             onMouseLeave={this.onMouseLeave}
                             selectedEmojis={this.props.selectedEmojis}
+                            className="mx_EmojiPicker_item_wrapper"
                         />
                     ))}
                 </Toolbar>
diff --git a/src/components/views/emojipicker/Search.tsx b/src/components/views/emojipicker/Search.tsx
index 16d30f6a9b..007fa2251d 100644
--- a/src/components/views/emojipicker/Search.tsx
+++ b/src/components/views/emojipicker/Search.tsx
@@ -66,11 +66,14 @@ class Search extends React.PureComponent<IProps> {
                     autoFocus
                     type="text"
                     placeholder={_t("action|search")}
+                    aria-label={_t("action|search")}
                     value={this.props.query}
                     onChange={(ev) => this.props.onChange(ev.target.value)}
                     onKeyDown={this.onKeyDown}
                     ref={this.inputRef}
-                    aria-activedescendant={this.context.state.activeNode?.id}
+                    // Setting aria-activedescendant on the input allows screen readers to identify the active emoji.
+                    // Setting it when there is not a query causes screen readers to read out the first emoji when focusing the input, and it continually tells you you are in the table vs the input.
+                    aria-activedescendant={this.props.query ? this.context.state.activeNode?.id : undefined}
                     aria-controls="mx_EmojiPicker_body"
                     aria-haspopup="grid"
                     aria-autocomplete="list"
diff --git a/src/components/views/location/EnableLiveShare.tsx b/src/components/views/location/EnableLiveShare.tsx
index 18fc6025d3..baa42ae6f9 100644
--- a/src/components/views/location/EnableLiveShare.tsx
+++ b/src/components/views/location/EnableLiveShare.tsx
@@ -6,12 +6,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { useState } from "react";
+import React, { type ChangeEventHandler, type FormEventHandler, useCallback, useState } from "react";
+import { SettingsToggleInput, Form, Button } from "@vector-im/compound-web";
 
 import { _t } from "../../../languageHandler";
 import StyledLiveBeaconIcon from "../beacon/StyledLiveBeaconIcon";
-import AccessibleButton from "../elements/AccessibleButton";
-import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import Heading from "../typography/Heading";
 
 interface Props {
@@ -20,6 +19,23 @@ interface Props {
 
 export const EnableLiveShare: React.FC<Props> = ({ onSubmit }) => {
     const [isEnabled, setEnabled] = useState(false);
+
+    const onEnabledChanged = useCallback<ChangeEventHandler<HTMLInputElement>>(
+        (e) => setEnabled(e.target.checked),
+        [setEnabled],
+    );
+
+    const onSubmitForm = useCallback<FormEventHandler>(
+        (evt) => {
+            evt.preventDefault();
+            evt.stopPropagation();
+            if (isEnabled) {
+                onSubmit();
+            }
+        },
+        [isEnabled, onSubmit],
+    );
+
     return (
         <div data-testid="location-picker-enable-live-share" className="mx_EnableLiveShare">
             <StyledLiveBeaconIcon className="mx_EnableLiveShare_icon" />
@@ -27,22 +43,17 @@ export const EnableLiveShare: React.FC<Props> = ({ onSubmit }) => {
                 {_t("location_sharing|live_enable_heading")}
             </Heading>
             <p className="mx_EnableLiveShare_description">{_t("location_sharing|live_enable_description")}</p>
-            <LabelledToggleSwitch
-                data-testid="enable-live-share-toggle"
-                value={isEnabled}
-                onChange={setEnabled}
-                label={_t("location_sharing|live_toggle_label")}
-            />
-            <AccessibleButton
-                data-testid="enable-live-share-submit"
-                className="mx_EnableLiveShare_button"
-                element="button"
-                kind="primary"
-                onClick={onSubmit}
-                disabled={!isEnabled}
-            >
-                {_t("action|ok")}
-            </AccessibleButton>
+            <Form.Root onSubmit={onSubmitForm}>
+                <SettingsToggleInput
+                    name="enable-live-share-toggle"
+                    checked={isEnabled}
+                    onChange={onEnabledChanged}
+                    label={_t("location_sharing|live_toggle_label")}
+                />
+                <Button className="mx_EnableLiveShare_button" kind="primary" disabled={!isEnabled}>
+                    {_t("action|ok")}
+                </Button>
+            </Form.Root>
         </div>
     );
 };
diff --git a/src/components/views/location/LocationButton.tsx b/src/components/views/location/LocationButton.tsx
index e84ce37ec5..79385a35b8 100644
--- a/src/components/views/location/LocationButton.tsx
+++ b/src/components/views/location/LocationButton.tsx
@@ -9,6 +9,7 @@ Please see LICENSE files in the repository root for full details.
 import React, { type ReactNode, type SyntheticEvent, useContext } from "react";
 import classNames from "classnames";
 import { type RoomMember, type IEventRelation } from "matrix-js-sdk/src/matrix";
+import { LocationPinIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import { CollapsibleButton } from "../rooms/CollapsibleButton";
@@ -54,13 +55,9 @@ const LocationButton: React.FC<IProps> = ({ roomId, sender, menuPosition, relati
 
     return (
         <React.Fragment>
-            <CollapsibleButton
-                className={className}
-                iconClassName="mx_MessageComposer_location"
-                onClick={openMenu}
-                title={_t("common|location")}
-                inputRef={button}
-            />
+            <CollapsibleButton className={className} onClick={openMenu} title={_t("common|location")} inputRef={button}>
+                <LocationPinIcon />
+            </CollapsibleButton>
 
             {contextMenu}
         </React.Fragment>
diff --git a/src/components/views/location/MapFallback.tsx b/src/components/views/location/MapFallback.tsx
index 59968d421e..d6b5f8e18e 100644
--- a/src/components/views/location/MapFallback.tsx
+++ b/src/components/views/location/MapFallback.tsx
@@ -22,7 +22,7 @@ const MapFallback: React.FC<Props> = ({ className, isLoading, children, ...rest
     return (
         <div className={classNames("mx_MapFallback", className)} {...rest}>
             <MapFallbackImage className="mx_MapFallback_bg" />
-            {isLoading ? <Spinner h={32} w={32} /> : <LocationMarkerIcon className="mx_MapFallback_icon" />}
+            {isLoading ? <Spinner size={32} /> : <LocationMarkerIcon className="mx_MapFallback_icon" />}
             {children}
         </div>
     );
diff --git a/src/components/views/messages/CodeBlock.tsx b/src/components/views/messages/CodeBlock.tsx
index cb21ffb5e0..0a3a80fb89 100644
--- a/src/components/views/messages/CodeBlock.tsx
+++ b/src/components/views/messages/CodeBlock.tsx
@@ -9,6 +9,7 @@ import React, { type JSX, useState } from "react";
 import classNames from "classnames";
 import { type DOMNode, Element as ParserElement, domToReact } from "html-react-parser";
 import { textContent, getInnerHTML } from "domutils";
+import { CollapseIcon, CopyIcon, ExpandIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { useSettingValue } from "../../../hooks/useSettings.ts";
 import { CopyTextButton } from "../elements/CopyableText.tsx";
@@ -25,13 +26,9 @@ const ExpandCollapseButton: React.FC<{
     onClick(): void;
 }> = ({ expanded, onClick }) => {
     return (
-        <span
-            className={classNames("mx_EventTile_button", {
-                mx_EventTile_expandButton: !expanded,
-                mx_EventTile_collapseButton: expanded,
-            })}
-            onClick={onClick}
-        />
+        <span className="mx_EventTile_button" onClick={onClick}>
+            {expanded ? <CollapseIcon /> : <ExpandIcon />}
+        </span>
     );
 };
 
@@ -138,7 +135,9 @@ const CodeBlock: React.FC<Props> = ({ preNode }) => {
                 className={classNames("mx_EventTile_button mx_EventTile_copyButton", {
                     mx_EventTile_buttonBottom: !!expandCollapseButton,
                 })}
-            />
+            >
+                <CopyIcon />
+            </CopyTextButton>
         </div>
     );
 };
diff --git a/src/components/views/messages/DateSeparator.tsx b/src/components/views/messages/DateSeparator.tsx
index a885806cf7..7d49042533 100644
--- a/src/components/views/messages/DateSeparator.tsx
+++ b/src/components/views/messages/DateSeparator.tsx
@@ -11,6 +11,7 @@ import React, { type JSX } from "react";
 import { Direction, ConnectionError, MatrixError, HTTPError } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import { capitalize } from "lodash";
+import { ChevronDownIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t, getUserLanguage } from "../../../languageHandler";
 import { formatFullDateNoDay, formatFullDateNoTime, getDaysArray } from "../../../DateUtils";
@@ -31,8 +32,8 @@ import IconizedContextMenu, {
 } from "../context_menus/IconizedContextMenu";
 import JumpToDatePicker from "./JumpToDatePicker";
 import { type ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
-import { SdkContextClass } from "../../../contexts/SDKContext";
 import TimelineSeparator from "./TimelineSeparator";
+import RoomContext from "../../../contexts/RoomContext";
 
 interface IProps {
     roomId: string;
@@ -51,6 +52,8 @@ interface IState {
  * Has additional jump to date functionality when labs flag is enabled
  */
 export default class DateSeparator extends React.Component<IProps, IState> {
+    public static contextType = RoomContext;
+    declare public context: React.ContextType<typeof RoomContext>;
     private settingWatcherRef?: string;
 
     public constructor(props: IProps) {
@@ -143,7 +146,7 @@ export default class DateSeparator extends React.Component<IProps, IState> {
             // Only try to navigate to the room if the user is still viewing the same
             // room. We don't want to jump someone back to a room after a slow request
             // if they've already navigated away to another room.
-            const currentRoomId = SdkContextClass.instance.roomViewStore.getRoomId();
+            const currentRoomId = this.context.roomViewStore.getRoomId();
             if (currentRoomId === roomIdForJumpRequest) {
                 dispatcher.dispatch<ViewRoomPayload>({
                     action: Action.ViewRoom,
@@ -169,7 +172,7 @@ export default class DateSeparator extends React.Component<IProps, IState> {
             // don't want to worry someone about an error in a room they no longer care
             // about after a slow request if they've already navigated away to another
             // room.
-            const currentRoomId = SdkContextClass.instance.roomViewStore.getRoomId();
+            const currentRoomId = this.context.roomViewStore.getRoomId();
             if (currentRoomId === roomIdForJumpRequest) {
                 let friendlyErrorMessage = "An error occured while trying to find and jump to the given date.";
                 let submitDebugLogsContent: JSX.Element = <></>;
@@ -310,7 +313,7 @@ export default class DateSeparator extends React.Component<IProps, IState> {
                 <h2 className="mx_DateSeparator_dateHeading" aria-hidden="true">
                     {this.getLabel()}
                 </h2>
-                <div className="mx_DateSeparator_chevron" />
+                <ChevronDownIcon className="mx_DateSeparator_chevron" />
                 {contextMenu}
             </ContextMenuTooltipButton>
         );
@@ -320,7 +323,7 @@ export default class DateSeparator extends React.Component<IProps, IState> {
         const label = this.getLabel();
 
         let dateHeaderContent: JSX.Element;
-        if (this.state.jumpToDateEnabled) {
+        if (this.state.jumpToDateEnabled && !this.props.forExport) {
             dateHeaderContent = this.renderJumpToDateMenu();
         } else {
             dateHeaderContent = (
diff --git a/src/components/views/messages/DownloadActionButton.tsx b/src/components/views/messages/DownloadActionButton.tsx
index 340bdffa54..af6ad8cc1d 100644
--- a/src/components/views/messages/DownloadActionButton.tsx
+++ b/src/components/views/messages/DownloadActionButton.tsx
@@ -7,17 +7,15 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { type MatrixEvent } from "matrix-js-sdk/src/matrix";
-import React, { type JSX } from "react";
+import React, { type ReactElement, useMemo } from "react";
 import classNames from "classnames";
 import { DownloadIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { type MediaEventHelper } from "../../../utils/MediaEventHelper";
 import { RovingAccessibleButton } from "../../../accessibility/RovingTabIndex";
 import Spinner from "../elements/Spinner";
-import { _t, _td, type TranslationKey } from "../../../languageHandler";
-import { FileDownloader } from "../../../utils/FileDownloader";
-import Modal from "../../../Modal";
-import ErrorDialog from "../dialogs/ErrorDialog";
+import { _t } from "../../../languageHandler";
+import { useDownloadMedia } from "../../../hooks/useDownloadMedia";
 
 interface IProps {
     mxEvent: MatrixEvent;
@@ -28,92 +26,40 @@ interface IProps {
     mediaEventHelperGet: () => MediaEventHelper | undefined;
 }
 
-interface IState {
-    loading: boolean;
-    blob?: Blob;
-    tooltip: TranslationKey;
+function useButtonTitle(loading: boolean, isEncrypted: boolean): string {
+    if (!loading) return _t("action|download");
+
+    return isEncrypted ? _t("timeline|download_action_decrypting") : _t("timeline|download_action_downloading");
 }
 
-export default class DownloadActionButton extends React.PureComponent<IProps, IState> {
-    private downloader = new FileDownloader();
+export default function DownloadActionButton({ mxEvent, mediaEventHelperGet }: IProps): ReactElement | null {
+    const mediaEventHelper = useMemo(() => mediaEventHelperGet(), [mediaEventHelperGet]);
+    const downloadUrl = mediaEventHelper?.media.srcHttp ?? "";
+    const fileName = mediaEventHelper?.fileName;
 
-    public constructor(props: IProps) {
-        super(props);
+    const { download, loading, canDownload } = useDownloadMedia(downloadUrl, fileName, mxEvent);
 
-        this.state = {
-            loading: false,
-            tooltip: _td("timeline|download_action_downloading"),
-        };
-    }
+    const buttonTitle = useButtonTitle(loading, mediaEventHelper?.media.isEncrypted ?? false);
 
-    private onDownloadClick = async (): Promise<void> => {
-        try {
-            await this.doDownload();
-        } catch (e) {
-            Modal.createDialog(ErrorDialog, {
-                title: _t("timeline|download_failed"),
-                description: (
-                    <>
-                        <div>{_t("timeline|download_failed_description")}</div>
-                        <div>{e instanceof Error ? e.toString() : ""}</div>
-                    </>
-                ),
-            });
-            this.setState({ loading: false });
-        }
-    };
+    if (!canDownload) return null;
 
-    private async doDownload(): Promise<void> {
-        const mediaEventHelper = this.props.mediaEventHelperGet();
-        if (this.state.loading || !mediaEventHelper) return;
+    const spinner = loading ? <Spinner size={18} /> : undefined;
+    const classes = classNames({
+        mx_MessageActionBar_iconButton: true,
+        mx_MessageActionBar_downloadButton: true,
+        mx_MessageActionBar_downloadSpinnerButton: !!spinner,
+    });
 
-        if (mediaEventHelper.media.isEncrypted) {
-            this.setState({ tooltip: _td("timeline|download_action_decrypting") });
-        }
-
-        this.setState({ loading: true });
-
-        if (this.state.blob) {
-            // Cheat and trigger a download, again.
-            return this.downloadBlob(this.state.blob);
-        }
-
-        const blob = await mediaEventHelper.sourceBlob.value;
-        this.setState({ blob });
-        await this.downloadBlob(blob);
-    }
-
-    private async downloadBlob(blob: Blob): Promise<void> {
-        await this.downloader.download({
-            blob,
-            name: this.props.mediaEventHelperGet()!.fileName,
-        });
-        this.setState({ loading: false });
-    }
-
-    public render(): React.ReactNode {
-        let spinner: JSX.Element | undefined;
-        if (this.state.loading) {
-            spinner = <Spinner w={18} h={18} />;
-        }
-
-        const classes = classNames({
-            mx_MessageActionBar_iconButton: true,
-            mx_MessageActionBar_downloadButton: true,
-            mx_MessageActionBar_downloadSpinnerButton: !!spinner,
-        });
-
-        return (
-            <RovingAccessibleButton
-                className={classes}
-                title={spinner ? _t(this.state.tooltip) : _t("action|download")}
-                onClick={this.onDownloadClick}
-                disabled={!!spinner}
-                placement="left"
-            >
-                <DownloadIcon />
-                {spinner}
-            </RovingAccessibleButton>
-        );
-    }
+    return (
+        <RovingAccessibleButton
+            className={classes}
+            title={buttonTitle}
+            onClick={download}
+            disabled={loading}
+            placement="left"
+        >
+            <DownloadIcon />
+            {spinner}
+        </RovingAccessibleButton>
+    );
 }
diff --git a/src/components/views/messages/EncryptionEvent.tsx b/src/components/views/messages/EncryptionEvent.tsx
index 5c5f1f0dc2..cf8b00db39 100644
--- a/src/components/views/messages/EncryptionEvent.tsx
+++ b/src/components/views/messages/EncryptionEvent.tsx
@@ -40,6 +40,9 @@ const EncryptionEvent = ({ mxEvent, timestamp, ref }: IProps): ReactNode => {
         let subtitle: string;
         const dmPartner = DMRoomMap.shared().getUserIdForRoomId(roomId);
         const room = cli?.getRoom(roomId);
+
+        const stateEncrypted = content["io.element.msc4362.encrypt_state_events"] && cli.enableEncryptedStateEvents;
+
         if (prevContent.algorithm === MEGOLM_ENCRYPTION_ALGORITHM) {
             subtitle = _t("timeline|m.room.encryption|parameters_changed");
         } else if (dmPartner) {
@@ -47,6 +50,8 @@ const EncryptionEvent = ({ mxEvent, timestamp, ref }: IProps): ReactNode => {
             subtitle = _t("timeline|m.room.encryption|enabled_dm", { displayName });
         } else if (room && isLocalRoom(room)) {
             subtitle = _t("timeline|m.room.encryption|enabled_local");
+        } else if (stateEncrypted) {
+            subtitle = _t("timeline|m.room.encryption|state_enabled");
         } else {
             subtitle = _t("timeline|m.room.encryption|enabled");
         }
@@ -54,7 +59,7 @@ const EncryptionEvent = ({ mxEvent, timestamp, ref }: IProps): ReactNode => {
         return (
             <EventTileBubble
                 className="mx_cryptoEvent mx_cryptoEvent_icon"
-                title={_t("common|encryption_enabled")}
+                title={stateEncrypted ? _t("common|state_encryption_enabled") : _t("common|encryption_enabled")}
                 subtitle={subtitle}
                 timestamp={timestamp}
             />
diff --git a/src/components/views/messages/EventContentBody.tsx b/src/components/views/messages/EventContentBody.tsx
index fce5428e8c..50d95642f8 100644
--- a/src/components/views/messages/EventContentBody.tsx
+++ b/src/components/views/messages/EventContentBody.tsx
@@ -11,7 +11,6 @@ import parse from "html-react-parser";
 import { PushProcessor } from "matrix-js-sdk/src/pushprocessor";
 
 import { bodyToNode } from "../../../HtmlUtils.tsx";
-import { Linkify } from "../../../Linkify.tsx";
 import PlatformPeg from "../../../PlatformPeg.ts";
 import {
     applyReplacerOnString,
@@ -23,7 +22,6 @@ import {
     ambiguousLinkTooltipRenderer,
     codeBlockRenderer,
     spoilerRenderer,
-    replacerToRenderFunction,
 } from "../../../renderer";
 import MatrixClientContext from "../../../contexts/MatrixClientContext.tsx";
 import { useSettingValue } from "../../../hooks/useSettings.ts";
@@ -151,15 +149,9 @@ interface Props extends ReplacerOptions {
 const EventContentBody = memo(
     ({ as, mxEvent, stripReply, content, linkify, highlights, includeDir = true, ref, ...options }: Props) => {
         const enableBigEmoji = useSettingValue("TextualBody.enableBigEmoji");
-        const [mediaIsVisible] = useMediaVisible(mxEvent?.getId(), mxEvent?.getRoomId());
+        const [mediaIsVisible] = useMediaVisible(mxEvent);
 
         const replacer = useReplacer(content, mxEvent, options);
-        const linkifyOptions = useMemo(
-            () => ({
-                render: replacerToRenderFunction(replacer),
-            }),
-            [replacer],
-        );
 
         const isEmote = content.msgtype === MsgType.Emote;
 
@@ -170,8 +162,9 @@ const EventContentBody = memo(
                     // Part of Replies fallback support
                     stripReplyFallback: stripReply,
                     mediaIsVisible,
+                    linkify,
                 }),
-            [content, mediaIsVisible, enableBigEmoji, highlights, isEmote, stripReply],
+            [content, mediaIsVisible, enableBigEmoji, highlights, isEmote, stripReply, linkify],
         );
 
         if (as === "div") includeDir = true; // force dir="auto" on divs
@@ -189,9 +182,7 @@ const EventContentBody = memo(
             </As>
         );
 
-        if (!linkify) return body;
-
-        return <Linkify options={linkifyOptions}>{body}</Linkify>;
+        return body;
     },
 );
 
diff --git a/src/components/views/messages/HideActionButton.tsx b/src/components/views/messages/HideActionButton.tsx
index 0c9817b2a6..ba0c8568f1 100644
--- a/src/components/views/messages/HideActionButton.tsx
+++ b/src/components/views/messages/HideActionButton.tsx
@@ -25,7 +25,7 @@ interface IProps {
  * Quick action button for marking a media event as hidden.
  */
 export const HideActionButton: React.FC<IProps> = ({ mxEvent }) => {
-    const [mediaIsVisible, setVisible] = useMediaVisible(mxEvent.getId(), mxEvent.getRoomId());
+    const [mediaIsVisible, setVisible] = useMediaVisible(mxEvent);
 
     if (!mediaIsVisible) {
         return;
diff --git a/src/components/views/messages/IBodyProps.ts b/src/components/views/messages/IBodyProps.ts
index 37aae37de6..a85f86644d 100644
--- a/src/components/views/messages/IBodyProps.ts
+++ b/src/components/views/messages/IBodyProps.ts
@@ -48,4 +48,9 @@ export interface IBodyProps {
     // Set to `true` to disable interactions (e.g. video controls) and to remove controls from the tab order.
     // This may be useful when displaying a preview of the event.
     inhibitInteraction?: boolean;
+
+    /**
+     * Optional ID for the root element.
+     */
+    id?: string;
 }
diff --git a/src/components/views/messages/LegacyCallEvent.tsx b/src/components/views/messages/LegacyCallEvent.tsx
index da41a56c02..f43953fb6e 100644
--- a/src/components/views/messages/LegacyCallEvent.tsx
+++ b/src/components/views/messages/LegacyCallEvent.tsx
@@ -10,6 +10,7 @@ import React, { type JSX, createRef } from "react";
 import { type MatrixEvent } from "matrix-js-sdk/src/matrix";
 import { CallErrorCode, CallState } from "matrix-js-sdk/src/webrtc/call";
 import classNames from "classnames";
+import { Clock } from "@element-hq/web-shared-components";
 
 import { _t } from "../../../languageHandler";
 import MemberAvatar from "../avatars/MemberAvatar";
@@ -18,7 +19,6 @@ import { LegacyCallEventGrouperEvent } from "../../structures/LegacyCallEventGro
 import AccessibleButton from "../elements/AccessibleButton";
 import InfoTooltip, { InfoTooltipKind } from "../elements/InfoTooltip";
 import { formatPreciseDuration } from "../../../DateUtils";
-import Clock from "../audio_messages/Clock";
 
 const MAX_NON_NARROW_WIDTH = (450 / 70) * 100;
 
diff --git a/src/components/views/messages/MAudioBody.tsx b/src/components/views/messages/MAudioBody.tsx
index 54003d6da9..967e0d5fc7 100644
--- a/src/components/views/messages/MAudioBody.tsx
+++ b/src/components/views/messages/MAudioBody.tsx
@@ -6,22 +6,21 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React from "react";
+import React, { type JSX, useEffect } from "react";
 import { logger } from "matrix-js-sdk/src/logger";
 import { type IContent } from "matrix-js-sdk/src/matrix";
 import { type MediaEventContent } from "matrix-js-sdk/src/types";
+import { AudioPlayerView, useCreateAutoDisposedViewModel } from "@element-hq/web-shared-components";
 
 import { type Playback } from "../../../audio/Playback";
 import InlineSpinner from "../elements/InlineSpinner";
 import { _t } from "../../../languageHandler";
-import AudioPlayer from "../audio_messages/AudioPlayer";
 import MFileBody from "./MFileBody";
 import { type IBodyProps } from "./IBodyProps";
 import { PlaybackManager } from "../../../audio/PlaybackManager";
-import { isVoiceMessage } from "../../../utils/EventUtils";
-import { PlaybackQueue } from "../../../audio/PlaybackQueue";
 import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext";
 import MediaProcessingError from "./shared/MediaProcessingError";
+import { AudioPlayerViewModel } from "../../../viewmodels/audio/AudioPlayerViewModel";
 
 interface IState {
     error?: boolean;
@@ -36,7 +35,6 @@ export default class MAudioBody extends React.PureComponent<IBodyProps, IState>
 
     public async componentDidMount(): Promise<void> {
         let buffer: ArrayBuffer;
-
         try {
             try {
                 const blob = await this.props.mediaEventHelper!.sourceBlob.value;
@@ -63,13 +61,12 @@ export default class MAudioBody extends React.PureComponent<IBodyProps, IState>
         playback.clockInfo.populatePlaceholdersFrom(this.props.mxEvent);
         this.setState({ playback });
 
-        if (isVoiceMessage(this.props.mxEvent)) {
-            PlaybackQueue.forRoom(this.props.mxEvent.getRoomId()!).unsortedEnqueue(this.props.mxEvent, playback);
-        }
-
-        // Note: the components later on will handle preparing the Playback class for us.
+        this.onMount(playback);
+        // Note: the components later on will handle preparing the Playback class for us
     }
 
+    protected onMount(playback: Playback): void {}
+
     public componentWillUnmount(): void {
         this.state.playback?.destroy();
     }
@@ -119,3 +116,26 @@ export default class MAudioBody extends React.PureComponent<IBodyProps, IState>
         );
     }
 }
+
+interface AudioPlayerProps {
+    /**
+     * The playback instance to control audio playback.
+     */
+    playback: Playback;
+    /**
+     * The name of the media being played
+     */
+    mediaName: string;
+}
+
+/**
+ * AudioPlayer component that initializes the AudioPlayerViewModel and renders the AudioPlayerView.
+ */
+function AudioPlayer({ playback, mediaName }: AudioPlayerProps): JSX.Element {
+    const vm = useCreateAutoDisposedViewModel(() => new AudioPlayerViewModel({ playback, mediaName }));
+    useEffect(() => {
+        vm.setProps({ playback, mediaName });
+    }, [playback, mediaName, vm]);
+
+    return <AudioPlayerView vm={vm} />;
+}
diff --git a/src/components/views/messages/MFileBody.tsx b/src/components/views/messages/MFileBody.tsx
index 24b141599e..1c55385d2c 100644
--- a/src/components/views/messages/MFileBody.tsx
+++ b/src/components/views/messages/MFileBody.tsx
@@ -178,7 +178,6 @@ export default class MFileBody extends React.Component<IProps, IState> {
     public render(): React.ReactNode {
         const isEncrypted = this.props.mediaEventHelper?.media.isEncrypted;
         const contentUrl = this.getContentUrl();
-        const contentFileSize = this.content.info ? this.content.info.size : null;
         const fileType = this.content.info?.mimetype ?? "application/octet-stream";
         // defaultProps breaks types on IBodyProps, so instead define the default here.
         const showGenericPlaceholder = this.props.showGenericPlaceholder ?? true;
@@ -285,21 +284,9 @@ export default class MFileBody extends React.Component<IProps, IState> {
                 target: "_blank",
                 rel: "noreferrer noopener",
 
-                // We set the href regardless of whether or not we intercept the download
-                // because we don't really want to convert the file to a blob eagerly, and
-                // still want "open in new tab" and "save link as" to work.
-                href: contentUrl,
-            };
-
-            // Blobs can only have up to 500mb, so if the file reports as being too large then
-            // we won't try and convert it. Likewise, if the file size is unknown then we'll assume
-            // it is too big. There is the risk of the reported file size and the actual file size
-            // being different, however the user shouldn't normally run into this problem.
-            const fileTooBig = typeof contentFileSize === "number" ? contentFileSize > 524288000 : true;
-
-            if (["application/pdf"].includes(fileType) && !fileTooBig) {
-                // We want to force a download on this type, so use an onClick handler.
-                downloadProps["onClick"] = (e) => {
+                // We cannot rely on href+download to download media due to the authenticated media API as it relies
+                // on authentication via headers, so we'll have to download the file into memory and then download it.
+                onClick: (e) => {
                     logger.log(`Downloading ${fileType} as blob (unencrypted)`);
 
                     // Avoid letting the <a> do its thing
@@ -319,11 +306,8 @@ export default class MFileBody extends React.Component<IProps, IState> {
                         tempAnchor.click();
                         tempAnchor.remove();
                     });
-                };
-            } else {
-                // Else we are hoping the browser will do the right thing
-                downloadProps["download"] = this.fileName;
-            }
+                },
+            };
 
             return (
                 <span className="mx_MFileBody">
diff --git a/src/components/views/messages/MImageBody.tsx b/src/components/views/messages/MImageBody.tsx
index 79f840ce39..788a93c813 100644
--- a/src/components/views/messages/MImageBody.tsx
+++ b/src/components/views/messages/MImageBody.tsx
@@ -35,6 +35,7 @@ import MediaProcessingError from "./shared/MediaProcessingError";
 import { DecryptError, DownloadError } from "../../../utils/DecryptFile";
 import { HiddenMediaPlaceholder } from "./HiddenMediaPlaceholder";
 import { useMediaVisible } from "../../../hooks/useMediaVisible";
+import { isMimeTypeAllowed } from "../../../utils/blobs.ts";
 
 enum Placeholder {
     NoImage,
@@ -101,7 +102,16 @@ export class MImageBodyInner extends React.Component<IProps, IState> {
             }
 
             const content = this.props.mxEvent.getContent<ImageContent>();
-            const httpUrl = this.state.contentUrl;
+
+            let httpUrl = this.state.contentUrl;
+            if (
+                this.props.mediaEventHelper?.media.isEncrypted &&
+                !isMimeTypeAllowed(this.props.mediaEventHelper.sourceBlob.cachedValue?.type ?? "")
+            ) {
+                // contentUrl will be a blob URI mime-type=application/octet-stream so fall back to the thumbUrl instead
+                httpUrl = this.state.thumbUrl;
+            }
+
             if (!httpUrl) return;
             const params: Omit<ComponentProps<typeof ImageView>, "onFinished"> = {
                 src: httpUrl,
@@ -311,10 +321,7 @@ export class MImageBodyInner extends React.Component<IProps, IState> {
                     // then we need to check if the image is animated by downloading it.
                     if (
                         content.info?.["org.matrix.msc4230.is_animated"] === false ||
-                        !(await blobIsAnimated(
-                            content.info?.mimetype,
-                            await this.props.mediaEventHelper!.sourceBlob.value,
-                        ))
+                        (await blobIsAnimated(await this.props.mediaEventHelper!.sourceBlob.value)) === false
                     ) {
                         isAnimated = false;
                     }
@@ -621,7 +628,7 @@ export class MImageBodyInner extends React.Component<IProps, IState> {
                 return <Blurhash className="mx_Blurhash" hash={blurhash} width={width} height={height} />;
             }
         }
-        return <Spinner w={32} h={32} />;
+        return <Spinner size={32} />;
     }
 
     // Overridden by MStickerBody
@@ -650,6 +657,15 @@ export class MImageBodyInner extends React.Component<IProps, IState> {
     public render(): React.ReactNode {
         const content = this.props.mxEvent.getContent<ImageContent>();
 
+        // Fall back to MFileBody if we are unable to render this image e.g. in the case of a blob svg
+        if (
+            this.props.mediaEventHelper?.media.isEncrypted &&
+            !isMimeTypeAllowed(content.info?.mimetype ?? "") &&
+            !content.info?.thumbnail_info
+        ) {
+            return <MFileBody {...this.props} />;
+        }
+
         if (this.state.error) {
             let errorText = _t("timeline|m.image|error");
             if (this.state.error instanceof DecryptError) {
@@ -686,7 +702,7 @@ export class MImageBodyInner extends React.Component<IProps, IState> {
 
 // Wrap MImageBody component so we can use a hook here.
 const MImageBody: React.FC<IBodyProps> = (props) => {
-    const [mediaVisible, setVisible] = useMediaVisible(props.mxEvent.getId(), props.mxEvent.getRoomId());
+    const [mediaVisible, setVisible] = useMediaVisible(props.mxEvent);
     return <MImageBodyInner mediaVisible={mediaVisible} setMediaVisible={setVisible} {...props} />;
 };
 
diff --git a/src/components/views/messages/MImageReplyBody.tsx b/src/components/views/messages/MImageReplyBody.tsx
index b73f8f77c3..5f04df724d 100644
--- a/src/components/views/messages/MImageReplyBody.tsx
+++ b/src/components/views/messages/MImageReplyBody.tsx
@@ -38,7 +38,7 @@ class MImageReplyBodyInner extends MImageBodyInner {
     }
 }
 const MImageReplyBody: React.FC<IBodyProps> = (props) => {
-    const [mediaVisible, setVisible] = useMediaVisible(props.mxEvent.getId(), props.mxEvent.getRoomId());
+    const [mediaVisible, setVisible] = useMediaVisible(props.mxEvent);
     return <MImageReplyBodyInner mediaVisible={mediaVisible} setMediaVisible={setVisible} {...props} />;
 };
 
diff --git a/src/components/views/messages/MPollBody.tsx b/src/components/views/messages/MPollBody.tsx
index 73fb82083a..83b7f5c415 100644
--- a/src/components/views/messages/MPollBody.tsx
+++ b/src/components/views/messages/MPollBody.tsx
@@ -22,6 +22,8 @@ import {
 import { RelatedRelations } from "matrix-js-sdk/src/models/related-relations";
 import { type PollStartEvent, type PollAnswerSubevent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
 import { PollResponseEvent } from "matrix-js-sdk/src/extensible_events_v1/PollResponseEvent";
+import PollsIcon from "@vector-im/compound-design-tokens/assets/web/icons/polls";
+import PollsEndIcon from "@vector-im/compound-design-tokens/assets/web/icons/polls-end";
 
 import { _t } from "../../../languageHandler";
 import Modal from "../../../Modal";
@@ -324,14 +326,18 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
             <span className="mx_MPollBody_edited"> ({_t("common|edited")})</span>
         ) : null;
 
+        const PollIcon = poll.isEnded ? PollsEndIcon : PollsIcon;
+        const pollLabel = poll.isEnded ? _t("poll|ended_poll_label") : _t("poll|poll_label");
+
         return (
-            <div className="mx_MPollBody">
-                <h2 data-testid="pollQuestion">
+            <fieldset className="mx_MPollBody">
+                <legend data-testid="pollQuestion">
+                    <PollIcon width="20" height="20" aria-label={pollLabel} />
                     {pollEvent.question.text}
                     {editedSpan}
-                </h2>
+                </legend>
                 <div className="mx_MPollBody_allOptions">
-                    {pollEvent.answers.map((answer: PollAnswerSubevent) => {
+                    {pollEvent.answers.map((answer: PollAnswerSubevent, index: number) => {
                         let answerVotes = 0;
 
                         if (showResults) {
@@ -346,6 +352,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
                                 key={answer.id}
                                 pollId={pollId}
                                 answer={answer}
+                                optionNumber={index + 1}
                                 isChecked={checked}
                                 isEnded={poll.isEnded}
                                 voteCount={answerVotes}
@@ -358,9 +365,9 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
                 </div>
                 <div data-testid="totalVotes" className="mx_MPollBody_totalVotes">
                     {totalText}
-                    {isFetchingResponses && <Spinner w={16} h={16} />}
+                    {isFetchingResponses && <Spinner size={16} />}
                 </div>
-            </div>
+            </fieldset>
         );
     }
 }
diff --git a/src/components/views/messages/MPollEndBody.tsx b/src/components/views/messages/MPollEndBody.tsx
deleted file mode 100644
index 95f8a53f2a..0000000000
--- a/src/components/views/messages/MPollEndBody.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2023 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-import React, { useEffect, useState, useContext, type JSX } from "react";
-import { MatrixEvent, M_TEXT } from "matrix-js-sdk/src/matrix";
-import { logger } from "matrix-js-sdk/src/logger";
-
-import { Icon as PollIcon } from "../../../../res/img/element-icons/room/composer/poll.svg";
-import MatrixClientContext, { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
-import { _t } from "../../../languageHandler";
-import { textForEvent } from "../../../TextForEvent";
-import { Caption } from "../typography/Caption";
-import { type IBodyProps } from "./IBodyProps";
-import MPollBody from "./MPollBody";
-
-const getRelatedPollStartEventId = (event: MatrixEvent): string | undefined => {
-    const relation = event.getRelation();
-    return relation?.event_id;
-};
-
-/**
- * Attempt to retrieve the related poll start event for this end event
- * If the event already exists in the rooms timeline, return it
- * Otherwise try to fetch the event from the server
- * @param event
- * @returns
- */
-const usePollStartEvent = (event: MatrixEvent): { pollStartEvent?: MatrixEvent; isLoadingPollStartEvent: boolean } => {
-    const matrixClient = useContext(MatrixClientContext);
-    const [pollStartEvent, setPollStartEvent] = useState<MatrixEvent>();
-    const [isLoadingPollStartEvent, setIsLoadingPollStartEvent] = useState(false);
-
-    const pollStartEventId = getRelatedPollStartEventId(event);
-
-    useEffect(() => {
-        const room = matrixClient.getRoom(event.getRoomId());
-        const fetchPollStartEvent = async (roomId: string, pollStartEventId: string): Promise<void> => {
-            setIsLoadingPollStartEvent(true);
-            try {
-                const startEventJson = await matrixClient.fetchRoomEvent(roomId, pollStartEventId);
-                const startEvent = new MatrixEvent(startEventJson);
-                // add the poll to the room polls state
-                room?.processPollEvents([startEvent, event]);
-
-                // end event is not a valid end to the related start event
-                // if not sent by the same user
-                if (startEvent.getSender() === event.getSender()) {
-                    setPollStartEvent(startEvent);
-                }
-            } catch (error) {
-                logger.error("Failed to fetch related poll start event", error);
-            } finally {
-                setIsLoadingPollStartEvent(false);
-            }
-        };
-
-        if (pollStartEvent || !room || !pollStartEventId) {
-            return;
-        }
-
-        const timelineSet = room.getUnfilteredTimelineSet();
-        const localEvent = timelineSet
-            ?.getTimelineForEvent(pollStartEventId)
-            ?.getEvents()
-            .find((e) => e.getId() === pollStartEventId);
-
-        if (localEvent) {
-            // end event is not a valid end to the related start event
-            // if not sent by the same user
-            if (localEvent.getSender() === event.getSender()) {
-                setPollStartEvent(localEvent);
-            }
-        } else {
-            // pollStartEvent is not in the current timeline,
-            // fetch it
-            fetchPollStartEvent(room.roomId, pollStartEventId);
-        }
-    }, [event, pollStartEventId, pollStartEvent, matrixClient]);
-
-    return { pollStartEvent, isLoadingPollStartEvent };
-};
-
-export const MPollEndBody = ({ mxEvent, ref, ...props }: IBodyProps): JSX.Element => {
-    const cli = useMatrixClientContext();
-    const { pollStartEvent, isLoadingPollStartEvent } = usePollStartEvent(mxEvent);
-
-    if (!pollStartEvent) {
-        const pollEndFallbackMessage = M_TEXT.findIn<string>(mxEvent.getContent()) || textForEvent(mxEvent, cli);
-        return (
-            <>
-                <PollIcon className="mx_MPollEndBody_icon" />
-                {!isLoadingPollStartEvent && pollEndFallbackMessage}
-            </>
-        );
-    }
-
-    return (
-        <div className="mx_MPollEndBody" ref={ref}>
-            <Caption>{_t("timeline|m.poll.end|ended")}</Caption>
-            <MPollBody mxEvent={pollStartEvent} {...props} />
-        </div>
-    );
-};
diff --git a/src/components/views/messages/MStickerBody.tsx b/src/components/views/messages/MStickerBody.tsx
index 3a922d35aa..f0beea72aa 100644
--- a/src/components/views/messages/MStickerBody.tsx
+++ b/src/components/views/messages/MStickerBody.tsx
@@ -20,7 +20,7 @@ class MStickerBodyInner extends MImageBodyInner {
     protected onClick = (ev: React.MouseEvent): void => {
         ev.preventDefault();
         if (!this.props.mediaVisible) {
-            this.props.setMediaVisible?.(true);
+            this.props.setMediaVisible(true);
         }
     };
 
@@ -79,7 +79,7 @@ class MStickerBodyInner extends MImageBodyInner {
 }
 
 const MStickerBody: React.FC<IBodyProps> = (props) => {
-    const [mediaVisible, setVisible] = useMediaVisible(props.mxEvent.getId(), props.mxEvent.getRoomId());
+    const [mediaVisible, setVisible] = useMediaVisible(props.mxEvent);
     return <MStickerBodyInner mediaVisible={mediaVisible} setMediaVisible={setVisible} {...props} />;
 };
 
diff --git a/src/components/views/messages/MVideoBody.tsx b/src/components/views/messages/MVideoBody.tsx
index 6a36dae6a8..680704d6fd 100644
--- a/src/components/views/messages/MVideoBody.tsx
+++ b/src/components/views/messages/MVideoBody.tsx
@@ -342,7 +342,7 @@ class MVideoBodyInner extends React.PureComponent<IProps, IState> {
 
 // Wrap MVideoBody component so we can use a hook here.
 const MVideoBody: React.FC<IBodyProps> = (props) => {
-    const [mediaVisible, setVisible] = useMediaVisible(props.mxEvent.getId(), props.mxEvent.getRoomId());
+    const [mediaVisible, setVisible] = useMediaVisible(props.mxEvent);
     return <MVideoBodyInner mediaVisible={mediaVisible} setMediaVisible={setVisible} {...props} />;
 };
 
diff --git a/src/components/views/messages/MVoiceMessageBody.tsx b/src/components/views/messages/MVoiceMessageBody.tsx
index cc0e030c78..8961009165 100644
--- a/src/components/views/messages/MVoiceMessageBody.tsx
+++ b/src/components/views/messages/MVoiceMessageBody.tsx
@@ -14,8 +14,24 @@ import RecordingPlayback from "../audio_messages/RecordingPlayback";
 import MAudioBody from "./MAudioBody";
 import MFileBody from "./MFileBody";
 import MediaProcessingError from "./shared/MediaProcessingError";
+import { isVoiceMessage } from "../../../utils/EventUtils";
+import { PlaybackQueue } from "../../../audio/PlaybackQueue";
+import { type Playback } from "../../../audio/Playback";
+import RoomContext from "../../../contexts/RoomContext";
 
 export default class MVoiceMessageBody extends MAudioBody {
+    public static contextType = RoomContext;
+    declare public context: React.ContextType<typeof RoomContext>;
+
+    protected onMount(playback: Playback): void {
+        if (isVoiceMessage(this.props.mxEvent)) {
+            PlaybackQueue.forRoom(this.props.mxEvent.getRoomId()!, this.context.roomViewStore).unsortedEnqueue(
+                this.props.mxEvent,
+                playback,
+            );
+        }
+    }
+
     // A voice message is an audio file but rendered in a special way.
     public render(): React.ReactNode {
         if (this.state.error) {
diff --git a/src/components/views/messages/MessageActionBar.tsx b/src/components/views/messages/MessageActionBar.tsx
index f534758f7b..1628b1c707 100644
--- a/src/components/views/messages/MessageActionBar.tsx
+++ b/src/components/views/messages/MessageActionBar.tsx
@@ -30,10 +30,10 @@ import {
     DeleteIcon,
     RestartIcon,
     ThreadsIcon,
+    EditIcon,
+    ReactionAddIcon,
 } from "@vector-im/compound-design-tokens/assets/web/icons";
 
-import { Icon as EditIcon } from "../../../../res/img/element-icons/room/message-bar/edit.svg";
-import { Icon as EmojiIcon } from "../../../../res/img/element-icons/room/message-bar/emoji.svg";
 import { Icon as ExpandMessageIcon } from "../../../../res/img/element-icons/expand-message.svg";
 import { Icon as CollapseMessageIcon } from "../../../../res/img/element-icons/collapse-message.svg";
 import { _t } from "../../../languageHandler";
@@ -80,8 +80,8 @@ const OptionsButton: React.FC<IOptionsButtonProps> = ({
     onFocusChange,
     getRelationsForEvent,
 }) => {
-    const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
-    const [onFocus, isActive] = useRovingTabIndex(button);
+    const [onFocus, isActive, buttonRefCallback, buttonRef] = useRovingTabIndex();
+    const [menuDisplayed, , openMenu, closeMenu] = useContextMenu(buttonRef);
     useEffect(() => {
         onFocusChange(menuDisplayed);
     }, [onFocusChange, menuDisplayed]);
@@ -101,11 +101,11 @@ const OptionsButton: React.FC<IOptionsButtonProps> = ({
     );
 
     let contextMenu: ReactElement | undefined;
-    if (menuDisplayed && button.current) {
+    if (menuDisplayed && buttonRef.current) {
         const tile = getTile?.();
         const replyChain = getReplyChain();
 
-        const buttonRect = button.current.getBoundingClientRect();
+        const buttonRect = buttonRef.current.getBoundingClientRect();
         contextMenu = (
             <MessageContextMenu
                 {...aboveLeftOf(buttonRect)}
@@ -127,7 +127,7 @@ const OptionsButton: React.FC<IOptionsButtonProps> = ({
                 onClick={onOptionsClick}
                 onContextMenu={onOptionsClick}
                 isExpanded={menuDisplayed}
-                ref={button}
+                ref={buttonRefCallback}
                 onFocus={onFocus}
                 tabIndex={isActive ? 0 : -1}
                 placement="left"
@@ -146,17 +146,17 @@ interface IReactButtonProps {
 }
 
 const ReactButton: React.FC<IReactButtonProps> = ({ mxEvent, reactions, onFocusChange }) => {
-    const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
-    const [onFocus, isActive] = useRovingTabIndex(button);
+    const [onFocus, isActive, buttonRefCallback, buttonRef] = useRovingTabIndex();
+    const [menuDisplayed, , openMenu, closeMenu] = useContextMenu(buttonRef);
     useEffect(() => {
         onFocusChange(menuDisplayed);
     }, [onFocusChange, menuDisplayed]);
 
     let contextMenu: JSX.Element | undefined;
-    if (menuDisplayed && button.current) {
-        const buttonRect = button.current.getBoundingClientRect();
+    if (menuDisplayed && buttonRef.current) {
+        const buttonRect = buttonRef.current.getBoundingClientRect();
         contextMenu = (
-            <ContextMenu {...aboveLeftOf(buttonRect)} onFinished={closeMenu} managed={false}>
+            <ContextMenu {...aboveLeftOf(buttonRect)} onFinished={closeMenu} managed={false} focusLock>
                 <ReactionPicker mxEvent={mxEvent} reactions={reactions} onFinished={closeMenu} />
             </ContextMenu>
         );
@@ -185,12 +185,12 @@ const ReactButton: React.FC<IReactButtonProps> = ({ mxEvent, reactions, onFocusC
                 onClick={onClick}
                 onContextMenu={onClick}
                 isExpanded={menuDisplayed}
-                ref={button}
+                ref={buttonRefCallback}
                 onFocus={onFocus}
                 tabIndex={isActive ? 0 : -1}
                 placement="left"
             >
-                <EmojiIcon />
+                <ReactionAddIcon />
             </ContextMenuTooltipButton>
 
             {contextMenu}
diff --git a/src/components/views/messages/MessageEvent.tsx b/src/components/views/messages/MessageEvent.tsx
index 231fa7f1fe..6d124c88a8 100644
--- a/src/components/views/messages/MessageEvent.tsx
+++ b/src/components/views/messages/MessageEvent.tsx
@@ -15,7 +15,6 @@ import {
     MatrixEventEvent,
     M_BEACON_INFO,
     M_LOCATION,
-    M_POLL_END,
     M_POLL_START,
     type IContent,
 } from "matrix-js-sdk/src/matrix";
@@ -34,7 +33,6 @@ import MVoiceOrAudioBody from "./MVoiceOrAudioBody";
 import MVideoBody from "./MVideoBody";
 import MStickerBody from "./MStickerBody";
 import MPollBody from "./MPollBody";
-import { MPollEndBody } from "./MPollEndBody";
 import MLocationBody from "./MLocationBody";
 import MjolnirBody from "./MjolnirBody";
 import MBeaconBody from "./MBeaconBody";
@@ -51,6 +49,11 @@ interface IProps extends Omit<IBodyProps, "onMessageAllowed" | "mediaEventHelper
     getRelationsForEvent?: GetRelationsForEvent;
 
     isSeeingThroughMessageHiddenForModeration?: boolean;
+
+    /**
+     * Optional ID for the root element.
+     */
+    id?: string;
 }
 
 export interface IOperableEventTile {
@@ -70,8 +73,6 @@ const baseEvTypes = new Map<string, React.ComponentType<IBodyProps>>([
     [EventType.Sticker, MStickerBody],
     [M_POLL_START.name, MPollBody],
     [M_POLL_START.altName, MPollBody],
-    [M_POLL_END.name, MPollEndBody],
-    [M_POLL_END.altName, MPollEndBody],
     [M_BEACON_INFO.name, MBeaconBody],
     [M_BEACON_INFO.altName, MBeaconBody],
 ]);
@@ -308,6 +309,7 @@ export default class MessageEvent extends React.Component<IProps> implements IMe
             getRelationsForEvent: this.props.getRelationsForEvent,
             isSeeingThroughMessageHiddenForModeration: this.props.isSeeingThroughMessageHiddenForModeration,
             inhibitInteraction: this.props.inhibitInteraction,
+            id: this.props.id,
         };
         if (hasCaption) {
             return <CaptionBody {...bodyProps} WrappedBodyType={BodyType} />;
diff --git a/src/components/views/messages/MessageTimestamp.tsx b/src/components/views/messages/MessageTimestamp.tsx
index 61c9a31641..c2f26f1ffc 100644
--- a/src/components/views/messages/MessageTimestamp.tsx
+++ b/src/components/views/messages/MessageTimestamp.tsx
@@ -24,6 +24,24 @@ interface IProps {
     showFullDate?: boolean;
     showSeconds?: boolean;
     showRelative?: boolean;
+
+    /**
+     * If set to true then no tooltip will be shown
+     */
+    inhibitTooltip?: boolean;
+
+    /**
+     * If specified, will be rendered as an anchor bearing the href, a `span` element will be used otherwise
+     */
+    href?: string;
+    /**
+     * Optional onClick handler to attach to the DOM element
+     */
+    onClick?: React.MouseEventHandler<HTMLElement>;
+    /**
+     * Optional onContextMenu handler to attach to the DOM element
+     */
+    onContextMenu?: React.MouseEventHandler<HTMLElement>;
 }
 
 export default class MessageTimestamp extends React.Component<IProps> {
@@ -52,12 +70,41 @@ export default class MessageTimestamp extends React.Component<IProps> {
             icon = <LateIcon className="mx_MessageTimestamp_lateIcon" width="16" height="16" />;
         }
 
-        return (
-            <Tooltip description={label} caption={caption}>
-                <span className="mx_MessageTimestamp" aria-hidden={true} aria-live="off">
+        let content;
+        if (this.props.href) {
+            content = (
+                <a
+                    href={this.props.href}
+                    onClick={this.props.onClick}
+                    onContextMenu={this.props.onContextMenu}
+                    className="mx_MessageTimestamp"
+                    aria-live="off"
+                >
+                    {icon}
+                    {timestamp}
+                </a>
+            );
+        } else {
+            content = (
+                <span
+                    onClick={this.props.onClick}
+                    onContextMenu={this.props.onContextMenu}
+                    className="mx_MessageTimestamp"
+                    aria-hidden={true}
+                    aria-live="off"
+                    tabIndex={this.props.onClick || !this.props.inhibitTooltip ? 0 : undefined}
+                >
                     {icon}
                     {timestamp}
                 </span>
+            );
+        }
+
+        if (this.props.inhibitTooltip) return content;
+
+        return (
+            <Tooltip description={label} caption={caption}>
+                {content}
             </Tooltip>
         );
     }
diff --git a/src/components/views/messages/PinnedMessageBadge.tsx b/src/components/views/messages/PinnedMessageBadge.tsx
index 2652d84ed8..373e577f63 100644
--- a/src/components/views/messages/PinnedMessageBadge.tsx
+++ b/src/components/views/messages/PinnedMessageBadge.tsx
@@ -5,7 +5,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import React, { type JSX } from "react";
+import React, { type HTMLProps, type JSX } from "react";
 import PinIcon from "@vector-im/compound-design-tokens/assets/web/icons/pin-solid";
 
 import { _t } from "../../../languageHandler";
@@ -13,9 +13,9 @@ import { _t } from "../../../languageHandler";
 /**
  * A badge to indicate that a message is pinned.
  */
-export function PinnedMessageBadge(): JSX.Element {
+export function PinnedMessageBadge(props: Readonly<HTMLProps<HTMLDivElement>>): JSX.Element {
     return (
-        <div className="mx_PinnedMessageBadge">
+        <div {...props} className="mx_PinnedMessageBadge">
             <PinIcon width="16px" height="16px" />
             {_t("room|pinned_message_badge")}
         </div>
diff --git a/src/components/views/messages/ReactionsRow.tsx b/src/components/views/messages/ReactionsRow.tsx
index 0c5dbdd1e2..32f37f4c24 100644
--- a/src/components/views/messages/ReactionsRow.tsx
+++ b/src/components/views/messages/ReactionsRow.tsx
@@ -34,7 +34,7 @@ const ReactButton: React.FC<IProps> = ({ mxEvent, reactions }) => {
     if (menuDisplayed && button.current) {
         const buttonRect = button.current.getBoundingClientRect();
         contextMenu = (
-            <ContextMenu {...aboveLeftOf(buttonRect)} onFinished={closeMenu} managed={false}>
+            <ContextMenu {...aboveLeftOf(buttonRect)} onFinished={closeMenu} managed={false} focusLock>
                 <ReactionPicker mxEvent={mxEvent} reactions={reactions} onFinished={closeMenu} />
             </ContextMenu>
         );
diff --git a/src/components/views/messages/TextualBody.tsx b/src/components/views/messages/TextualBody.tsx
index d0107b31ec..34d6e9be94 100644
--- a/src/components/views/messages/TextualBody.tsx
+++ b/src/components/views/messages/TextualBody.tsx
@@ -384,7 +384,12 @@ export default class TextualBody extends React.Component<IBodyProps, IState> {
 
         if (isEmote) {
             return (
-                <div className="mx_MEmoteBody mx_EventTile_content" onClick={this.onBodyLinkClick} dir="auto">
+                <div
+                    id={this.props.id}
+                    className="mx_MEmoteBody mx_EventTile_content"
+                    onClick={this.onBodyLinkClick}
+                    dir="auto"
+                >
                     *&nbsp;
                     <span className="mx_MEmoteBody_sender" onClick={this.onEmoteSenderClick}>
                         {mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender()}
@@ -397,7 +402,7 @@ export default class TextualBody extends React.Component<IBodyProps, IState> {
         }
         if (isNotice) {
             return (
-                <div className="mx_MNoticeBody mx_EventTile_content" onClick={this.onBodyLinkClick}>
+                <div id={this.props.id} className="mx_MNoticeBody mx_EventTile_content" onClick={this.onBodyLinkClick}>
                     {body}
                     {widgets}
                 </div>
@@ -405,14 +410,14 @@ export default class TextualBody extends React.Component<IBodyProps, IState> {
         }
         if (isCaption) {
             return (
-                <div className="mx_MTextBody mx_EventTile_caption" onClick={this.onBodyLinkClick}>
+                <div id={this.props.id} className="mx_MTextBody mx_EventTile_caption" onClick={this.onBodyLinkClick}>
                     {body}
                     {widgets}
                 </div>
             );
         }
         return (
-            <div className="mx_MTextBody mx_EventTile_content" onClick={this.onBodyLinkClick}>
+            <div id={this.props.id} className="mx_MTextBody mx_EventTile_content" onClick={this.onBodyLinkClick}>
                 {body}
                 {widgets}
             </div>
diff --git a/src/components/views/messages/TextualEvent.tsx b/src/components/views/messages/TextualEvent.tsx
deleted file mode 100644
index 445913bfc6..0000000000
--- a/src/components/views/messages/TextualEvent.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2015-2021 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-import React from "react";
-import { type MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/matrix";
-
-import RoomContext from "../../../contexts/RoomContext";
-import * as TextForEvent from "../../../TextForEvent";
-import { MatrixClientPeg } from "../../../MatrixClientPeg";
-
-interface IProps {
-    mxEvent: MatrixEvent;
-}
-
-export default class TextualEvent extends React.Component<IProps> {
-    public static contextType = RoomContext;
-    declare public context: React.ContextType<typeof RoomContext>;
-
-    public componentDidMount(): void {
-        this.props.mxEvent.on(MatrixEventEvent.SentinelUpdated, this.onEventSentinelUpdated);
-    }
-    public componentWillUnmount(): void {
-        this.props.mxEvent.off(MatrixEventEvent.SentinelUpdated, this.onEventSentinelUpdated);
-    }
-
-    private onEventSentinelUpdated = (): void => {
-        // XXX: this is crap, but we don't have a better way to force a re-render
-        // Many TextForEvent handlers render parts of `event.sender` and `event.target` so ensure they are updated
-        this.forceUpdate();
-    };
-
-    public render(): React.ReactNode {
-        const text = TextForEvent.textForEvent(
-            this.props.mxEvent,
-            MatrixClientPeg.safeGet(),
-            true,
-            this.context?.showHiddenEvents,
-        );
-        if (!text) return null;
-        return <div className="mx_TextualEvent">{text}</div>;
-    }
-}
diff --git a/src/components/views/pips/WidgetPip.tsx b/src/components/views/pips/WidgetPip.tsx
index ed49552cf0..ed8cdb7e95 100644
--- a/src/components/views/pips/WidgetPip.tsx
+++ b/src/components/views/pips/WidgetPip.tsx
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type FC, type RefObject, useCallback, useMemo } from "react";
 import { type Room, RoomEvent } from "matrix-js-sdk/src/matrix";
-import BackIcon from "@vector-im/compound-design-tokens/assets/web/icons/arrow-left";
+import { ArrowLeftIcon, EndCallIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import PersistentApp from "../elements/PersistentApp";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
@@ -20,7 +20,6 @@ import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayo
 import { useTypedEventEmitterState } from "../../../hooks/useEventEmitter";
 import Toolbar from "../../../accessibility/Toolbar";
 import { RovingAccessibleButton } from "../../../accessibility/RovingTabIndex";
-import { Icon as HangupIcon } from "../../../../res/img/element-icons/call/hangup.svg";
 import { _t } from "../../../languageHandler";
 import { WidgetType } from "../../../widgets/WidgetType";
 import { WidgetMessagingStore } from "../../../stores/widgets/WidgetMessagingStore";
@@ -90,7 +89,7 @@ export const WidgetPip: FC<Props> = ({ widgetId, room, viewingRoom, onStartMovin
                 // Assumed to be a Jitsi widget
                 WidgetMessagingStore.instance
                     .getMessagingForUid(WidgetUtils.getWidgetUid(widget))
-                    ?.transport.send(ElementWidgetActions.HangupCall, {})
+                    ?.widgetApi?.transport.send(ElementWidgetActions.HangupCall, {})
                     .catch((e) => console.error("Failed to leave Jitsi", e));
             }
         },
@@ -112,7 +111,7 @@ export const WidgetPip: FC<Props> = ({ widgetId, room, viewingRoom, onStartMovin
                             className="mx_WidgetPip_backButton"
                             aria-label={_t("action|back")}
                         >
-                            <BackIcon className="mx_Icon mx_Icon_16" />
+                            <ArrowLeftIcon className="mx_Icon mx_Icon_16" />
                             {roomName}
                         </RovingAccessibleButton>
                     </Toolbar>
@@ -124,7 +123,7 @@ export const WidgetPip: FC<Props> = ({ widgetId, room, viewingRoom, onStartMovin
                                 aria-label={_t("action|leave")}
                                 placement="top"
                             >
-                                <HangupIcon className="mx_Icon mx_Icon_24" />
+                                <EndCallIcon className="mx_Icon mx_Icon_24" />
                             </RovingAccessibleButton>
                         </Toolbar>
                     )}
diff --git a/src/components/views/polls/PollOption.tsx b/src/components/views/polls/PollOption.tsx
index a8de8fb6ef..277ebc3395 100644
--- a/src/components/views/polls/PollOption.tsx
+++ b/src/components/views/polls/PollOption.tsx
@@ -36,50 +36,67 @@ const PollOptionContent: React.FC<PollOptionContentProps> = ({ isWinner, answer,
 interface PollOptionProps extends PollOptionContentProps {
     pollId: string;
     totalVoteCount: number;
+    optionNumber: number;
     isEnded?: boolean;
     isChecked?: boolean;
     onOptionSelected?: (id: string) => void;
     children?: ReactNode;
 }
 
-const EndedPollOption: React.FC<Omit<PollOptionProps, "voteCount" | "totalVoteCount">> = ({
-    isChecked,
-    children,
-    answer,
-}) => (
-    <div
-        className={classNames("mx_PollOption_endedOption", {
-            mx_PollOption_endedOptionWinner: isChecked,
-        })}
-        data-value={answer.id}
-    >
-        {children}
-    </div>
-);
-
-const ActivePollOption: React.FC<Omit<PollOptionProps, "voteCount" | "totalVoteCount">> = ({
+const ActivePollOption: React.FC<Omit<PollOptionProps, "totalVoteCount"> & { children: ReactNode }> = ({
     pollId,
     isChecked,
+    isEnded,
+    optionNumber,
+    isWinner,
+    voteCount,
+    displayVoteCount,
     children,
     answer,
     onOptionSelected,
-}) => (
-    <StyledRadioButton
-        className="mx_PollOption_live-option"
-        name={`poll_answer_select-${pollId}`}
-        value={answer.id}
-        checked={isChecked}
-        onChange={() => onOptionSelected?.(answer.id)}
-    >
-        {children}
-    </StyledRadioButton>
-);
+}) => {
+    let ariaLabel: string;
+
+    if (displayVoteCount && isWinner) {
+        ariaLabel = _t("poll|option_label_winning_with_total", {
+            number: optionNumber,
+            answer: answer.text,
+            count: voteCount,
+        });
+    } else if (displayVoteCount) {
+        ariaLabel = _t("poll|option_label_with_total", {
+            number: optionNumber,
+            answer: answer.text,
+            count: voteCount,
+        });
+    } else {
+        ariaLabel = _t("poll|option_label", {
+            number: optionNumber,
+            answer: answer.text,
+        });
+    }
+
+    return (
+        <StyledRadioButton
+            className="mx_PollOption_live-option"
+            name={`poll_answer_select-${pollId}`}
+            value={answer.id}
+            checked={isChecked}
+            disabled={isEnded}
+            aria-label={ariaLabel}
+            onChange={() => onOptionSelected?.(answer.id)}
+        >
+            <div aria-hidden="true">{children}</div>
+        </StyledRadioButton>
+    );
+};
 
 export const PollOption: React.FC<PollOptionProps> = ({
     pollId,
     answer,
     voteCount,
     totalVoteCount,
+    optionNumber,
     displayVoteCount,
     isEnded,
     isChecked,
@@ -92,13 +109,17 @@ export const PollOption: React.FC<PollOptionProps> = ({
     });
     const isWinner = isEnded && isChecked;
     const answerPercent = totalVoteCount === 0 ? 0 : Math.round((100.0 * voteCount) / totalVoteCount);
-    const PollOptionWrapper = isEnded ? EndedPollOption : ActivePollOption;
     return (
         <div data-testid={`pollOption-${answer.id}`} className={cls} onClick={() => onOptionSelected?.(answer.id)}>
-            <PollOptionWrapper
+            <ActivePollOption
                 pollId={pollId}
                 answer={answer}
+                optionNumber={optionNumber}
                 isChecked={isChecked}
+                isEnded={isEnded}
+                isWinner={isWinner}
+                voteCount={voteCount}
+                displayVoteCount={displayVoteCount}
                 onOptionSelected={onOptionSelected}
             >
                 <PollOptionContent
@@ -107,7 +128,7 @@ export const PollOption: React.FC<PollOptionProps> = ({
                     voteCount={voteCount}
                     displayVoteCount={displayVoteCount}
                 />
-            </PollOptionWrapper>
+            </ActivePollOption>
             <div className="mx_PollOption_popularityBackground">
                 <div className="mx_PollOption_popularityAmount" style={{ width: `${answerPercent}%` }} />
             </div>
diff --git a/src/components/views/polls/pollHistory/PollHistoryList.tsx b/src/components/views/polls/pollHistory/PollHistoryList.tsx
index 02facc95ae..2370c80ba6 100644
--- a/src/components/views/polls/pollHistory/PollHistoryList.tsx
+++ b/src/components/views/polls/pollHistory/PollHistoryList.tsx
@@ -120,8 +120,8 @@ export const PollHistoryList: React.FC<PollHistoryListProps> = ({
                 value={filter}
                 onFilterChange={onFilterChange}
                 tabs={[
-                    { id: "ACTIVE", label: "Active polls" },
-                    { id: "ENDED", label: "Past polls" },
+                    { id: "ACTIVE", label: _t("right_panel|poll|active_heading") },
+                    { id: "ENDED", label: _t("right_panel|poll|past_heading") },
                 ]}
             />
             {!!pollStartEvents.length && (
diff --git a/src/components/views/polls/pollHistory/PollListItem.tsx b/src/components/views/polls/pollHistory/PollListItem.tsx
index 1824bb38da..d0706c176a 100644
--- a/src/components/views/polls/pollHistory/PollListItem.tsx
+++ b/src/components/views/polls/pollHistory/PollListItem.tsx
@@ -10,8 +10,8 @@ import React from "react";
 import { type PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
 import { type MatrixEvent } from "matrix-js-sdk/src/matrix";
 import { Tooltip } from "@vector-im/compound-web";
+import { PollsIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
-import { Icon as PollIcon } from "../../../../../res/img/element-icons/room/composer/poll.svg";
 import { formatLocalDateShort } from "../../../../DateUtils";
 import { _t } from "../../../../languageHandler";
 
@@ -31,7 +31,7 @@ export const PollListItem: React.FC<Props> = ({ event, onClick }) => {
             <Tooltip label={_t("right_panel|poll|view_poll")} placement="top" isTriggerInteractive={false}>
                 <div className="mx_PollListItem_content">
                     <span>{formattedDate}</span>
-                    <PollIcon className="mx_PollListItem_icon" />
+                    <PollsIcon className="mx_PollListItem_icon" />
                     <span className="mx_PollListItem_question">{pollEvent.question.text}</span>
                 </div>
             </Tooltip>
diff --git a/src/components/views/polls/pollHistory/PollListItemEnded.tsx b/src/components/views/polls/pollHistory/PollListItemEnded.tsx
index 8e2ed22127..39d2d0e07d 100644
--- a/src/components/views/polls/pollHistory/PollListItemEnded.tsx
+++ b/src/components/views/polls/pollHistory/PollListItemEnded.tsx
@@ -10,8 +10,8 @@ import React, { useEffect, useState } from "react";
 import { type PollAnswerSubevent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
 import { type MatrixEvent, type Poll, PollEvent, type Relations } from "matrix-js-sdk/src/matrix";
 import { Tooltip } from "@vector-im/compound-web";
+import { PollsEndIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
-import { Icon as PollIcon } from "../../../../../res/img/element-icons/room/composer/poll.svg";
 import { _t } from "../../../../languageHandler";
 import { formatLocalDateShort } from "../../../../DateUtils";
 import { allVotes, collectUserVotes, countVotes } from "../../messages/MPollBody";
@@ -28,6 +28,7 @@ type EndedPollState = {
     winningAnswers: {
         answer: PollAnswerSubevent;
         voteCount: number;
+        optionNumber: number;
     }[];
     totalVoteCount: number;
 };
@@ -40,10 +41,12 @@ const getWinningAnswers = (poll: Poll, responseRelations: Relations): EndedPollS
     return {
         totalVoteCount,
         winningAnswers: poll.pollEvent.answers
-            .filter((answer) => votes.get(answer.id) === winCount)
-            .map((answer) => ({
+            .map((answer, index) => ({ answerIndex: index, answer })) // keep track of original answer index
+            .filter(({ answer }) => votes.get(answer.id) === winCount)
+            .map(({ answer, answerIndex }) => ({
                 answer,
                 voteCount: votes.get(answer.id) || 0,
+                optionNumber: answerIndex + 1,
             })),
     };
 };
@@ -94,19 +97,20 @@ export const PollListItemEnded: React.FC<Props> = ({ event, poll, onClick }) =>
             <Tooltip label={_t("right_panel|poll|view_poll")} placement="top" isTriggerInteractive={false}>
                 <div className="mx_PollListItemEnded_content">
                     <div className="mx_PollListItemEnded_title">
-                        <PollIcon className="mx_PollListItemEnded_icon" />
+                        <PollsEndIcon className="mx_PollListItemEnded_icon" />
                         <span className="mx_PollListItemEnded_question">{pollEvent.question.text}</span>
                         <Caption>{formattedDate}</Caption>
                     </div>
                     {!!winningAnswers?.length && (
                         <div className="mx_PollListItemEnded_answers">
-                            {winningAnswers?.map(({ answer, voteCount }) => (
+                            {winningAnswers?.map(({ answer, voteCount, optionNumber }) => (
                                 <PollOption
                                     key={answer.id}
                                     answer={answer}
                                     voteCount={voteCount}
                                     totalVoteCount={totalVoteCount!}
                                     pollId={poll.pollId}
+                                    optionNumber={optionNumber}
                                     displayVoteCount
                                     isChecked
                                     isEnded
diff --git a/src/components/views/right_panel/BaseCard.tsx b/src/components/views/right_panel/BaseCard.tsx
index a564a60695..b308e1d973 100644
--- a/src/components/views/right_panel/BaseCard.tsx
+++ b/src/components/views/right_panel/BaseCard.tsx
@@ -76,7 +76,7 @@ const BaseCard: React.FC<IProps> = ({
                 data-testid="base-card-back-button"
                 onClick={onBackClick}
                 tooltip={label}
-                subtleBackground
+                kind="secondary"
             >
                 <ChevronLeftIcon />
             </IconButton>
@@ -92,7 +92,7 @@ const BaseCard: React.FC<IProps> = ({
                 onClick={onClose ?? closeRightPanel}
                 ref={closeButtonRef}
                 tooltip={closeLabel ?? _t("action|close")}
-                subtleBackground
+                kind="secondary"
             >
                 <CloseIcon />
             </IconButton>
diff --git a/src/components/views/right_panel/EmptyState.tsx b/src/components/views/right_panel/EmptyState.tsx
index f6b2a940a6..8037e3673c 100644
--- a/src/components/views/right_panel/EmptyState.tsx
+++ b/src/components/views/right_panel/EmptyState.tsx
@@ -8,8 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type ComponentType } from "react";
 import { Text } from "@vector-im/compound-web";
-
-import { Flex } from "../../utils/Flex";
+import { Flex } from "@element-hq/web-shared-components";
 
 interface Props {
     Icon: ComponentType<React.SVGAttributes<SVGElement>>;
diff --git a/src/components/views/right_panel/EncryptionInfo.tsx b/src/components/views/right_panel/EncryptionInfo.tsx
index f7e4c00c50..b1936cc8aa 100644
--- a/src/components/views/right_panel/EncryptionInfo.tsx
+++ b/src/components/views/right_panel/EncryptionInfo.tsx
@@ -43,7 +43,7 @@ const EncryptionInfo: React.FC<IProps> = ({
 }: IProps) => {
     let content: JSX.Element;
     if (waitingForOtherParty && isSelfVerification) {
-        content = <div>{_t("encryption|verification|self_verification_hint")}</div>;
+        content = <div>{_t("encryption|verification|once_accepted_can_continue")}</div>;
     } else if (waitingForOtherParty || waitingForNetwork) {
         let text: string;
         if (waitingForOtherParty) {
diff --git a/src/components/views/right_panel/EncryptionPanel.tsx b/src/components/views/right_panel/EncryptionPanel.tsx
index 32fc2137dc..53cea715e5 100644
--- a/src/components/views/right_panel/EncryptionPanel.tsx
+++ b/src/components/views/right_panel/EncryptionPanel.tsx
@@ -10,6 +10,9 @@ import React, { useCallback, useEffect, useRef, useState } from "react";
 import { VerificationPhase, type VerificationRequest, VerificationRequestEvent } from "matrix-js-sdk/src/crypto-api";
 import { type RoomMember, type User } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
+// ErrorDialog needs path to the image, not the image node
+// eslint-disable-next-line no-restricted-imports
+import ErrorSolidIcon from "@vector-im/compound-design-tokens/icons/error-solid.svg";
 
 import EncryptionInfo from "./EncryptionInfo";
 import VerificationPanel from "./VerificationPanel";
@@ -21,8 +24,6 @@ import { RightPanelPhases } from "../../../stores/right-panel/RightPanelStorePha
 import RightPanelStore from "../../../stores/right-panel/RightPanelStore";
 import ErrorDialog from "../dialogs/ErrorDialog";
 import { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
-import WarningDeprecatedSvg from "../../../../res/img/e2e/warning-deprecated.svg";
-import WarningSvg from "../../../../res/img/e2e/warning.svg";
 
 // cancellation codes which constitute a key mismatch
 const MISMATCHES = ["m.key_mismatch", "m.user_error", "m.mismatched_sas"];
@@ -81,7 +82,7 @@ const EncryptionPanel: React.FC<IProps> = (props: IProps) => {
         ) {
             isShowingMismatchModal.current = true;
             Modal.createDialog(ErrorDialog, {
-                headerImage: WarningDeprecatedSvg,
+                headerImage: ErrorSolidIcon,
                 title: _t("encryption|messages_not_secure|title"),
                 description: (
                     <div>
@@ -120,7 +121,7 @@ const EncryptionPanel: React.FC<IProps> = (props: IProps) => {
             setRequesting(false);
 
             Modal.createDialog(ErrorDialog, {
-                headerImage: WarningSvg,
+                headerImage: ErrorSolidIcon,
                 title: _t("encryption|verification|error_starting_title"),
                 description: _t("encryption|verification|error_starting_description"),
             });
diff --git a/src/components/views/right_panel/ExtensionsCard.tsx b/src/components/views/right_panel/ExtensionsCard.tsx
index 58c2435e72..448917290a 100644
--- a/src/components/views/right_panel/ExtensionsCard.tsx
+++ b/src/components/views/right_panel/ExtensionsCard.tsx
@@ -27,6 +27,8 @@ import AccessibleButton from "../elements/AccessibleButton";
 import WidgetAvatar from "../avatars/WidgetAvatar";
 import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
 import EmptyState from "./EmptyState";
+import { shouldShowComponent } from "../../../customisations/helpers/UIComponents.ts";
+import { UIComponent } from "../../../settings/UIFeature.ts";
 
 interface Props {
     room: Room;
@@ -191,9 +193,11 @@ const ExtensionsCard: React.FC<Props> = ({ room, onClose }) => {
 
     return (
         <BaseCard header={_t("right_panel|extensions_button")} className="mx_ExtensionsCard" onClose={onClose}>
-            <Button size="sm" onClick={onManageIntegrations} kind="secondary" Icon={PlusIcon}>
-                {_t("right_panel|add_integrations")}
-            </Button>
+            {shouldShowComponent(UIComponent.AddIntegrations) && (
+                <Button size="sm" onClick={onManageIntegrations} kind="secondary" Icon={PlusIcon}>
+                    {_t("right_panel|add_integrations")}
+                </Button>
+            )}
             {body}
         </BaseCard>
     );
diff --git a/src/components/views/right_panel/RoomSummaryCardView.tsx b/src/components/views/right_panel/RoomSummaryCardView.tsx
index d994e697c6..67eea91478 100644
--- a/src/components/views/right_panel/RoomSummaryCardView.tsx
+++ b/src/components/views/right_panel/RoomSummaryCardView.tsx
@@ -39,6 +39,7 @@ import ErrorIcon from "@vector-im/compound-design-tokens/assets/web/icons/error"
 import ErrorSolidIcon from "@vector-im/compound-design-tokens/assets/web/icons/error-solid";
 import ChevronDownIcon from "@vector-im/compound-design-tokens/assets/web/icons/chevron-down";
 import { JoinRule, type Room } from "matrix-js-sdk/src/matrix";
+import { Box, Flex } from "@element-hq/web-shared-components";
 
 import BaseCard from "./BaseCard.tsx";
 import { _t } from "../../../languageHandler.tsx";
@@ -46,10 +47,7 @@ import RoomAvatar from "../avatars/RoomAvatar.tsx";
 import { E2EStatus } from "../../../utils/ShieldUtils.ts";
 import { type RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks.ts";
 import RoomName from "../elements/RoomName.tsx";
-import { Flex } from "../../utils/Flex.tsx";
 import { Linkify, topicToHtml } from "../../../HtmlUtils.tsx";
-import { Box } from "../../utils/Box.tsx";
-import { ReleaseAnnouncement } from "../../structures/ReleaseAnnouncement.tsx";
 import { useRoomSummaryCardViewModel } from "../../viewmodels/right_panel/RoomSummaryCardViewModel.tsx";
 import { useRoomTopicViewModel } from "../../viewmodels/right_panel/RoomSummaryCardTopicViewModel.tsx";
 
@@ -80,7 +78,7 @@ const RoomTopic: React.FC<Pick<IProps, "room">> = ({ room }): JSX.Element | null
                 gap="var(--cpd-space-2x)"
                 className="mx_RoomSummaryCard_topic"
             >
-                <Box flex="1">
+                <Box flex="1" className="mx_RoomSummaryCard_topic_box">
                     <Link kind="primary" onClick={vm.onEditClick}>
                         <Text size="sm" weight="regular">
                             {_t("right_panel|add_topic")}
@@ -103,7 +101,7 @@ const RoomTopic: React.FC<Pick<IProps, "room">> = ({ room }): JSX.Element | null
                 mx_RoomSummaryCard_topic_collapsed: !vm.expanded,
             })}
         >
-            <Box flex="1" className="mx_RoomSummaryCard_topic_container">
+            <Box flex="1" className="mx_RoomSummaryCard_topic_container mx_RoomSummaryCard_topic_box">
                 <Text size="sm" weight="regular" onClick={vm.onTopicLinkClick}>
                     {content}
                 </Text>
@@ -169,8 +167,8 @@ const RoomSummaryCardView: React.FC<IProps> = ({
 
             <Flex as="section" justify="center" gap="var(--cpd-space-2x)" className="mx_RoomSummaryCard_badges">
                 {!vm.isDirectMessage && vm.roomJoinRule === JoinRule.Public && (
-                    <Badge kind="grey">
-                        <PublicIcon width="1em" />
+                    <Badge kind="blue">
+                        <PublicIcon width="1em" color="var(--cpd-color-icon-info-primary)" />
                         {_t("common|public_room")}
                     </Badge>
                 )}
@@ -183,8 +181,8 @@ const RoomSummaryCardView: React.FC<IProps> = ({
                 )}
 
                 {!vm.isRoomEncrypted && (
-                    <Badge kind="grey">
-                        <LockOffIcon width="1em" />
+                    <Badge kind="blue">
+                        <LockOffIcon width="1em" color="var(--cpd-color-icon-info-primary)" />
                         {_t("common|unencrypted")}
                     </Badge>
                 )}
@@ -251,25 +249,15 @@ const RoomSummaryCardView: React.FC<IProps> = ({
                 <MenuItem Icon={ThreadsIcon} label={_t("common|threads")} onSelect={vm.onRoomThreadsClick} />
                 {!vm.isVideoRoom && (
                     <>
-                        <ReleaseAnnouncement
-                            feature="pinningMessageList"
-                            header={_t("right_panel|pinned_messages|release_announcement|title")}
-                            description={_t("right_panel|pinned_messages|release_announcement|description")}
-                            closeLabel={_t("right_panel|pinned_messages|release_announcement|close")}
-                            placement="top"
+                        <MenuItem
+                            Icon={PinIcon}
+                            label={_t("right_panel|pinned_messages_button")}
+                            onSelect={vm.onRoomPinsClick}
                         >
-                            <div>
-                                <MenuItem
-                                    Icon={PinIcon}
-                                    label={_t("right_panel|pinned_messages_button")}
-                                    onSelect={vm.onRoomPinsClick}
-                                >
-                                    <Text as="span" size="sm">
-                                        {vm.pinCount}
-                                    </Text>
-                                </MenuItem>
-                            </div>
-                        </ReleaseAnnouncement>
+                            <Text as="span" size="sm">
+                                {vm.pinCount}
+                            </Text>
+                        </MenuItem>
                         <MenuItem
                             Icon={FilesIcon}
                             label={_t("right_panel|files_button")}
diff --git a/src/components/views/right_panel/TimelineCard.tsx b/src/components/views/right_panel/TimelineCard.tsx
index a7683ae28e..7a56e7c15e 100644
--- a/src/components/views/right_panel/TimelineCard.tsx
+++ b/src/components/views/right_panel/TimelineCard.tsx
@@ -37,7 +37,6 @@ import JumpToBottomButton from "../rooms/JumpToBottomButton";
 import { type ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
 import Measured from "../elements/Measured";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
-import { SdkContextClass } from "../../../contexts/SDKContext";
 import { ScopedRoomContextProvider } from "../../../contexts/ScopedRoomContext.tsx";
 
 interface IProps {
@@ -88,7 +87,7 @@ export default class TimelineCard extends React.Component<IProps, IState> {
     }
 
     public componentDidMount(): void {
-        SdkContextClass.instance.roomViewStore.addListener(UPDATE_EVENT, this.onRoomViewStoreUpdate);
+        this.context.roomViewStore.addListener(UPDATE_EVENT, this.onRoomViewStoreUpdate);
         this.dispatcherRef = dis.register(this.onAction);
         this.readReceiptsSettingWatcher = SettingsStore.watchSetting("showReadReceipts", null, (...[, , , value]) =>
             this.setState({ showReadReceipts: value as boolean }),
@@ -99,7 +98,7 @@ export default class TimelineCard extends React.Component<IProps, IState> {
     }
 
     public componentWillUnmount(): void {
-        SdkContextClass.instance.roomViewStore.removeListener(UPDATE_EVENT, this.onRoomViewStoreUpdate);
+        this.context.roomViewStore.removeListener(UPDATE_EVENT, this.onRoomViewStoreUpdate);
 
         SettingsStore.unwatchSetting(this.readReceiptsSettingWatcher);
         SettingsStore.unwatchSetting(this.layoutWatcherRef);
@@ -109,9 +108,9 @@ export default class TimelineCard extends React.Component<IProps, IState> {
 
     private onRoomViewStoreUpdate = async (_initial?: boolean): Promise<void> => {
         const newState: Pick<IState, any> = {
-            initialEventId: SdkContextClass.instance.roomViewStore.getInitialEventId(),
-            isInitialEventHighlighted: SdkContextClass.instance.roomViewStore.isInitialEventHighlighted(),
-            replyToEvent: SdkContextClass.instance.roomViewStore.getQuotingEvent(),
+            initialEventId: this.context.roomViewStore.getInitialEventId(),
+            isInitialEventHighlighted: this.context.roomViewStore.isInitialEventHighlighted(),
+            replyToEvent: this.context.roomViewStore.getQuotingEvent(),
         };
 
         this.setState(newState);
@@ -234,7 +233,6 @@ export default class TimelineCard extends React.Component<IProps, IState> {
                             membersLoaded={true}
                             editState={this.state.editState}
                             eventId={this.state.initialEventId}
-                            resizeNotifier={this.props.resizeNotifier}
                             highlightedEventId={highlightedEventId}
                             onScroll={this.onScroll}
                         />
diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index 7bba4f0950..086777d141 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -9,80 +9,25 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { type JSX, type ReactNode, useCallback, useContext, useEffect, useMemo, useState } from "react";
+import React, { type JSX, type ReactNode, useContext, useEffect, useMemo, useState } from "react";
 import classNames from "classnames";
-import {
-    ClientEvent,
-    type MatrixClient,
-    RoomMember,
-    type Room,
-    RoomStateEvent,
-    type MatrixEvent,
-    User,
-    type Device,
-    EventType,
-} from "matrix-js-sdk/src/matrix";
-import { KnownMembership } from "matrix-js-sdk/src/types";
+import { type MatrixClient, type RoomMember, type Room, type User, type Device } from "matrix-js-sdk/src/matrix";
 import { type UserVerificationStatus, type VerificationRequest, CryptoEvent } from "matrix-js-sdk/src/crypto-api";
-import { logger } from "matrix-js-sdk/src/logger";
-import { Badge, Button, Heading, InlineSpinner, MenuItem, Text, Tooltip } from "@vector-im/compound-web";
-import VerifiedIcon from "@vector-im/compound-design-tokens/assets/web/icons/verified";
-import ChatIcon from "@vector-im/compound-design-tokens/assets/web/icons/chat";
-import CheckIcon from "@vector-im/compound-design-tokens/assets/web/icons/check";
-import ShareIcon from "@vector-im/compound-design-tokens/assets/web/icons/share";
-import MentionIcon from "@vector-im/compound-design-tokens/assets/web/icons/mention";
-import InviteIcon from "@vector-im/compound-design-tokens/assets/web/icons/user-add";
-import BlockIcon from "@vector-im/compound-design-tokens/assets/web/icons/block";
-import DeleteIcon from "@vector-im/compound-design-tokens/assets/web/icons/delete";
-import CloseIcon from "@vector-im/compound-design-tokens/assets/web/icons/close";
-import ChatProblemIcon from "@vector-im/compound-design-tokens/assets/web/icons/chat-problem";
-import VisibilityOffIcon from "@vector-im/compound-design-tokens/assets/web/icons/visibility-off";
-import LeaveIcon from "@vector-im/compound-design-tokens/assets/web/icons/leave";
 
-import dis from "../../../dispatcher/dispatcher";
 import Modal from "../../../Modal";
-import { _t, UserFriendlyError } from "../../../languageHandler";
-import DMRoomMap from "../../../utils/DMRoomMap";
+import { _t } from "../../../languageHandler";
 import { type ButtonEvent } from "../elements/AccessibleButton";
-import SdkConfig from "../../../SdkConfig";
-import MultiInviter from "../../../utils/MultiInviter";
-import { useTypedEventEmitter } from "../../../hooks/useEventEmitter";
-import { textualPowerLevel } from "../../../Roles";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { RightPanelPhases } from "../../../stores/right-panel/RightPanelStorePhases";
 import EncryptionPanel from "./EncryptionPanel";
-import { useAsyncMemo } from "../../../hooks/useAsyncMemo";
-import { verifyUser } from "../../../verification";
-import { Action } from "../../../dispatcher/actions";
 import { useIsEncrypted } from "../../../hooks/useIsEncrypted";
 import BaseCard from "./BaseCard";
-import ImageView from "../elements/ImageView";
-import Spinner from "../elements/Spinner";
-import PowerSelector from "../elements/PowerSelector";
-import MemberAvatar from "../avatars/MemberAvatar";
-import PresenceLabel from "../rooms/PresenceLabel";
-import BulkRedactDialog from "../dialogs/BulkRedactDialog";
-import { ShareDialog } from "../dialogs/ShareDialog";
-import ErrorDialog from "../dialogs/ErrorDialog";
 import QuestionDialog from "../dialogs/QuestionDialog";
-import ConfirmUserActionDialog from "../dialogs/ConfirmUserActionDialog";
-import { mediaFromMxc } from "../../../customisations/Media";
-import { type ComposerInsertPayload } from "../../../dispatcher/payloads/ComposerInsertPayload";
-import ConfirmSpaceUserActionDialog from "../dialogs/ConfirmSpaceUserActionDialog";
-import { bulkSpaceBehaviour } from "../../../utils/space";
-import { shouldShowComponent } from "../../../customisations/helpers/UIComponents";
-import { UIComponent } from "../../../settings/UIFeature";
-import { TimelineRenderingType } from "../../../contexts/RoomContext";
 import RightPanelStore from "../../../stores/right-panel/RightPanelStore";
 import { type IRightPanelCardState } from "../../../stores/right-panel/RightPanelStoreIPanelState";
-import UserIdentifierCustomisations from "../../../customisations/UserIdentifier";
 import PosthogTrackers from "../../../PosthogTrackers";
-import { type ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
-import { DirectoryMember, startDmOnFirstMessage } from "../../../utils/direct-messages";
-import { SdkContextClass } from "../../../contexts/SDKContext";
-import { Flex } from "../../utils/Flex";
-import CopyableText from "../elements/CopyableText";
-import { useUserTimezone } from "../../../hooks/useUserTimezone";
+import { UserInfoHeaderView } from "./user_info/UserInfoHeaderView";
+import { UserInfoBasicView } from "./user_info/UserInfoBasicView";
 
 export interface IDevice extends Device {
     ambiguous?: boolean;
@@ -105,190 +50,6 @@ export const disambiguateDevices = (devices: IDevice[]): void => {
     }
 };
 
-/**
- * Converts the member to a DirectoryMember and starts a DM with them.
- */
-async function openDmForUser(matrixClient: MatrixClient, user: Member): Promise<void> {
-    const avatarUrl = user instanceof User ? user.avatarUrl : user.getMxcAvatarUrl();
-    const startDmUser = new DirectoryMember({
-        user_id: user.userId,
-        display_name: user.rawDisplayName,
-        avatar_url: avatarUrl,
-    });
-    await startDmOnFirstMessage(matrixClient, [startDmUser]);
-}
-
-const MessageButton = ({ member }: { member: Member }): JSX.Element => {
-    const cli = useContext(MatrixClientContext);
-    const [busy, setBusy] = useState(false);
-
-    return (
-        <MenuItem
-            role="button"
-            onSelect={async (ev) => {
-                ev.preventDefault();
-                if (busy) return;
-                setBusy(true);
-                await openDmForUser(cli, member);
-                setBusy(false);
-            }}
-            disabled={busy}
-            label={_t("user_info|send_message")}
-            Icon={ChatIcon}
-        />
-    );
-};
-
-export const UserOptionsSection: React.FC<{
-    member: Member;
-    canInvite: boolean;
-    isSpace?: boolean;
-    children?: ReactNode;
-}> = ({ member, canInvite, isSpace, children }) => {
-    const cli = useContext(MatrixClientContext);
-
-    let insertPillButton: JSX.Element | undefined;
-    let inviteUserButton: JSX.Element | undefined;
-    let readReceiptButton: JSX.Element | undefined;
-
-    const isMe = member.userId === cli.getUserId();
-    const onShareUserClick = (): void => {
-        Modal.createDialog(ShareDialog, {
-            target: member,
-        });
-    };
-
-    // Only allow the user to ignore the user if its not ourselves
-    // same goes for jumping to read receipt
-    if (!isMe) {
-        const onReadReceiptButton = function (room: Room): void {
-            dis.dispatch<ViewRoomPayload>({
-                action: Action.ViewRoom,
-                highlighted: true,
-                // this could return null, the default prevents a type error
-                event_id: room.getEventReadUpTo(member.userId) || undefined,
-                room_id: room.roomId,
-                metricsTrigger: undefined, // room doesn't change
-            });
-        };
-
-        const room = member instanceof RoomMember ? cli.getRoom(member.roomId) : null;
-        const readReceiptButtonDisabled = isSpace || !room?.getEventReadUpTo(member.userId);
-        readReceiptButton = (
-            <MenuItem
-                role="button"
-                onSelect={async (ev) => {
-                    ev.preventDefault();
-                    if (room && !readReceiptButtonDisabled) {
-                        onReadReceiptButton(room);
-                    }
-                }}
-                label={_t("user_info|jump_to_rr_button")}
-                disabled={readReceiptButtonDisabled}
-                Icon={CheckIcon}
-            />
-        );
-
-        if (member instanceof RoomMember && member.roomId && !isSpace) {
-            const onInsertPillButton = function (): void {
-                dis.dispatch<ComposerInsertPayload>({
-                    action: Action.ComposerInsert,
-                    userId: member.userId,
-                    timelineRenderingType: TimelineRenderingType.Room,
-                });
-            };
-
-            insertPillButton = (
-                <MenuItem
-                    role="button"
-                    onSelect={async (ev) => {
-                        ev.preventDefault();
-                        onInsertPillButton();
-                    }}
-                    label={_t("action|mention")}
-                    Icon={MentionIcon}
-                />
-            );
-        }
-
-        if (
-            member instanceof RoomMember &&
-            canInvite &&
-            (member?.membership ?? KnownMembership.Leave) === KnownMembership.Leave &&
-            shouldShowComponent(UIComponent.InviteUsers)
-        ) {
-            const roomId = member && member.roomId ? member.roomId : SdkContextClass.instance.roomViewStore.getRoomId();
-            const onInviteUserButton = async (ev: Event): Promise<void> => {
-                try {
-                    // We use a MultiInviter to re-use the invite logic, even though we're only inviting one user.
-                    const inviter = new MultiInviter(cli, roomId || "");
-                    await inviter.invite([member.userId]).then(() => {
-                        if (inviter.getCompletionState(member.userId) !== "invited") {
-                            const errorStringFromInviterUtility = inviter.getErrorText(member.userId);
-                            if (errorStringFromInviterUtility) {
-                                throw new Error(errorStringFromInviterUtility);
-                            } else {
-                                throw new UserFriendlyError("slash_command|invite_failed", {
-                                    user: member.userId,
-                                    roomId,
-                                    cause: undefined,
-                                });
-                            }
-                        }
-                    });
-                } catch (err) {
-                    const description = err instanceof Error ? err.message : _t("invite|failed_generic");
-
-                    Modal.createDialog(ErrorDialog, {
-                        title: _t("invite|failed_title"),
-                        description,
-                    });
-                }
-
-                PosthogTrackers.trackInteraction("WebRightPanelRoomUserInfoInviteButton", ev);
-            };
-
-            inviteUserButton = (
-                <MenuItem
-                    role="button"
-                    onSelect={async (ev) => {
-                        ev.preventDefault();
-                        onInviteUserButton(ev);
-                    }}
-                    label={_t("action|invite")}
-                    Icon={InviteIcon}
-                />
-            );
-        }
-    }
-
-    const shareUserButton = (
-        <MenuItem
-            role="button"
-            onSelect={async (ev) => {
-                ev.preventDefault();
-                onShareUserClick();
-            }}
-            label={_t("user_info|share_button")}
-            Icon={ShareIcon}
-        />
-    );
-
-    const directMessageButton =
-        isMe || !shouldShowComponent(UIComponent.CreateRooms) ? null : <MessageButton member={member} />;
-
-    return (
-        <Container>
-            {children}
-            {directMessageButton}
-            {inviteUserButton}
-            {readReceiptButton}
-            {shareUserButton}
-            {insertPillButton}
-        </Container>
-    );
-};
-
 export const warnSelfDemote = async (isSpace: boolean): Promise<boolean> => {
     const { finished } = Modal.createDialog(QuestionDialog, {
         title: _t("user_info|demote_self_confirm_title"),
@@ -306,7 +67,7 @@ export const warnSelfDemote = async (isSpace: boolean): Promise<boolean> => {
     return !!confirmed;
 };
 
-const Container: React.FC<{
+export const Container: React.FC<{
     children: ReactNode;
     className?: string;
 }> = ({ children, className }) => {
@@ -314,7 +75,7 @@ const Container: React.FC<{
     return <div className={classes}>{children}</div>;
 };
 
-interface IPowerLevelsContent {
+export interface IPowerLevelsContent {
     events?: Record<string, number>;
     // eslint-disable-next-line camelcase
     users_default?: number;
@@ -343,714 +104,12 @@ export const isMuted = (member: RoomMember, powerLevelContent: IPowerLevelsConte
     return member.powerLevel < levelToSend;
 };
 
-export const getPowerLevels = (room: Room): IPowerLevelsContent =>
-    room?.currentState?.getStateEvents(EventType.RoomPowerLevels, "")?.getContent() || {};
-
-export const useRoomPowerLevels = (cli: MatrixClient, room: Room): IPowerLevelsContent => {
-    const [powerLevels, setPowerLevels] = useState<IPowerLevelsContent>(getPowerLevels(room));
-
-    const update = useCallback(
-        (ev?: MatrixEvent) => {
-            if (!room) return;
-            if (ev && ev.getType() !== EventType.RoomPowerLevels) return;
-            setPowerLevels(getPowerLevels(room));
-        },
-        [room],
-    );
-
-    useTypedEventEmitter(cli, RoomStateEvent.Events, update);
-    useEffect(() => {
-        update();
-        return () => {
-            setPowerLevels({});
-        };
-    }, [update]);
-    return powerLevels;
-};
-
-interface IBaseProps {
-    member: RoomMember;
-    isUpdating: boolean;
-    startUpdating(): void;
-    stopUpdating(): void;
-}
-
-export const RoomKickButton = ({
-    room,
-    member,
-    isUpdating,
-    startUpdating,
-    stopUpdating,
-}: Omit<IBaseRoomProps, "powerLevels">): JSX.Element | null => {
-    const cli = useContext(MatrixClientContext);
-
-    // check if user can be kicked/disinvited
-    if (member.membership !== KnownMembership.Invite && member.membership !== KnownMembership.Join) return <></>;
-
-    const onKick = async (): Promise<void> => {
-        if (isUpdating) return; // only allow one operation at a time
-        startUpdating();
-
-        const commonProps = {
-            member,
-            action: room.isSpaceRoom()
-                ? member.membership === KnownMembership.Invite
-                    ? _t("user_info|disinvite_button_space")
-                    : _t("user_info|kick_button_space")
-                : member.membership === KnownMembership.Invite
-                  ? _t("user_info|disinvite_button_room")
-                  : _t("user_info|kick_button_room"),
-            title:
-                member.membership === KnownMembership.Invite
-                    ? _t("user_info|disinvite_button_room_name", { roomName: room.name })
-                    : _t("user_info|kick_button_room_name", { roomName: room.name }),
-            askReason: member.membership === KnownMembership.Join,
-            danger: true,
-        };
-
-        let finished: Promise<[success?: boolean, reason?: string, rooms?: Room[]]>;
-
-        if (room.isSpaceRoom()) {
-            ({ finished } = Modal.createDialog(
-                ConfirmSpaceUserActionDialog,
-                {
-                    ...commonProps,
-                    space: room,
-                    spaceChildFilter: (child: Room) => {
-                        // Return true if the target member is not banned and we have sufficient PL to ban them
-                        const myMember = child.getMember(cli.credentials.userId || "");
-                        const theirMember = child.getMember(member.userId);
-                        return (
-                            !!myMember &&
-                            !!theirMember &&
-                            theirMember.membership === member.membership &&
-                            myMember.powerLevel > theirMember.powerLevel &&
-                            child.currentState.hasSufficientPowerLevelFor("kick", myMember.powerLevel)
-                        );
-                    },
-                    allLabel: _t("user_info|kick_button_space_everything"),
-                    specificLabel: _t("user_info|kick_space_specific"),
-                    warningMessage: _t("user_info|kick_space_warning"),
-                },
-                "mx_ConfirmSpaceUserActionDialog_wrapper",
-            ));
-        } else {
-            ({ finished } = Modal.createDialog(ConfirmUserActionDialog, commonProps));
-        }
-
-        const [proceed, reason, rooms = []] = await finished;
-        if (!proceed) {
-            stopUpdating();
-            return;
-        }
-
-        bulkSpaceBehaviour(room, rooms, (room) => cli.kick(room.roomId, member.userId, reason || undefined))
-            .then(
-                () => {
-                    // NO-OP; rely on the m.room.member event coming down else we could
-                    // get out of sync if we force setState here!
-                    logger.log("Kick success");
-                },
-                function (err) {
-                    logger.error("Kick error: " + err);
-                    Modal.createDialog(ErrorDialog, {
-                        title: _t("user_info|error_kicking_user"),
-                        description: err?.message ?? "Operation failed",
-                    });
-                },
-            )
-            .finally(() => {
-                stopUpdating();
-            });
-    };
-
-    const kickLabel = room.isSpaceRoom()
-        ? member.membership === KnownMembership.Invite
-            ? _t("user_info|disinvite_button_space")
-            : _t("user_info|kick_button_space")
-        : member.membership === KnownMembership.Invite
-          ? _t("user_info|disinvite_button_room")
-          : _t("user_info|kick_button_room");
-
-    return (
-        <MenuItem
-            role="button"
-            onSelect={async (ev) => {
-                ev.preventDefault();
-                onKick();
-            }}
-            disabled={isUpdating}
-            label={kickLabel}
-            kind="critical"
-            Icon={LeaveIcon}
-        />
-    );
-};
-
-const RedactMessagesButton: React.FC<IBaseProps> = ({ member }) => {
-    const cli = useContext(MatrixClientContext);
-
-    const onRedactAllMessages = (): void => {
-        const room = cli.getRoom(member.roomId);
-        if (!room) return;
-
-        Modal.createDialog(BulkRedactDialog, {
-            matrixClient: cli,
-            room,
-            member,
-        });
-    };
-
-    return (
-        <MenuItem
-            role="button"
-            onSelect={async (ev) => {
-                ev.preventDefault();
-                onRedactAllMessages();
-            }}
-            label={_t("user_info|redact_button")}
-            kind="critical"
-            Icon={CloseIcon}
-        />
-    );
-};
-
-export const BanToggleButton = ({
-    room,
-    member,
-    isUpdating,
-    startUpdating,
-    stopUpdating,
-}: Omit<IBaseRoomProps, "powerLevels">): JSX.Element => {
-    const cli = useContext(MatrixClientContext);
-
-    const isBanned = member.membership === KnownMembership.Ban;
-    const onBanOrUnban = async (): Promise<void> => {
-        if (isUpdating) return; // only allow one operation at a time
-        startUpdating();
-
-        const commonProps = {
-            member,
-            action: room.isSpaceRoom()
-                ? isBanned
-                    ? _t("user_info|unban_button_space")
-                    : _t("user_info|ban_button_space")
-                : isBanned
-                  ? _t("user_info|unban_button_room")
-                  : _t("user_info|ban_button_room"),
-            title: isBanned
-                ? _t("user_info|unban_room_confirm_title", { roomName: room.name })
-                : _t("user_info|ban_room_confirm_title", { roomName: room.name }),
-            askReason: !isBanned,
-            danger: !isBanned,
-        };
-
-        let finished: Promise<[success?: boolean, reason?: string, rooms?: Room[]]>;
-
-        if (room.isSpaceRoom()) {
-            ({ finished } = Modal.createDialog(
-                ConfirmSpaceUserActionDialog,
-                {
-                    ...commonProps,
-                    space: room,
-                    spaceChildFilter: isBanned
-                        ? (child: Room) => {
-                              // Return true if the target member is banned and we have sufficient PL to unban
-                              const myMember = child.getMember(cli.credentials.userId || "");
-                              const theirMember = child.getMember(member.userId);
-                              return (
-                                  !!myMember &&
-                                  !!theirMember &&
-                                  theirMember.membership === KnownMembership.Ban &&
-                                  myMember.powerLevel > theirMember.powerLevel &&
-                                  child.currentState.hasSufficientPowerLevelFor("ban", myMember.powerLevel)
-                              );
-                          }
-                        : (child: Room) => {
-                              // Return true if the target member isn't banned and we have sufficient PL to ban
-                              const myMember = child.getMember(cli.credentials.userId || "");
-                              const theirMember = child.getMember(member.userId);
-                              return (
-                                  !!myMember &&
-                                  !!theirMember &&
-                                  theirMember.membership !== KnownMembership.Ban &&
-                                  myMember.powerLevel > theirMember.powerLevel &&
-                                  child.currentState.hasSufficientPowerLevelFor("ban", myMember.powerLevel)
-                              );
-                          },
-                    allLabel: isBanned ? _t("user_info|unban_space_everything") : _t("user_info|ban_space_everything"),
-                    specificLabel: isBanned ? _t("user_info|unban_space_specific") : _t("user_info|ban_space_specific"),
-                    warningMessage: isBanned ? _t("user_info|unban_space_warning") : _t("user_info|kick_space_warning"),
-                },
-                "mx_ConfirmSpaceUserActionDialog_wrapper",
-            ));
-        } else {
-            ({ finished } = Modal.createDialog(ConfirmUserActionDialog, commonProps));
-        }
-
-        const [proceed, reason, rooms = []] = await finished;
-        if (!proceed) {
-            stopUpdating();
-            return;
-        }
-
-        const fn = (roomId: string): Promise<unknown> => {
-            if (isBanned) {
-                return cli.unban(roomId, member.userId);
-            } else {
-                return cli.ban(roomId, member.userId, reason || undefined);
-            }
-        };
-
-        bulkSpaceBehaviour(room, rooms, (room) => fn(room.roomId))
-            .then(
-                () => {
-                    // NO-OP; rely on the m.room.member event coming down else we could
-                    // get out of sync if we force setState here!
-                    logger.log("Ban success");
-                },
-                function (err) {
-                    logger.error("Ban error: " + err);
-                    Modal.createDialog(ErrorDialog, {
-                        title: _t("common|error"),
-                        description: _t("user_info|error_ban_user"),
-                    });
-                },
-            )
-            .finally(() => {
-                stopUpdating();
-            });
-    };
-
-    let label = room.isSpaceRoom() ? _t("user_info|ban_button_space") : _t("user_info|ban_button_room");
-    if (isBanned) {
-        label = room.isSpaceRoom() ? _t("user_info|unban_button_space") : _t("user_info|unban_button_room");
-    }
-
-    return (
-        <MenuItem
-            role="button"
-            onSelect={async (ev) => {
-                ev.preventDefault();
-                onBanOrUnban();
-            }}
-            disabled={isUpdating}
-            label={label}
-            kind="critical"
-            Icon={ChatProblemIcon}
-        />
-    );
-};
-
-interface IBaseRoomProps extends IBaseProps {
-    room: Room;
-    powerLevels: IPowerLevelsContent;
-    children?: ReactNode;
-}
-
-// We do not show a Mute button for ourselves so it doesn't need to handle warning self demotion
-const MuteToggleButton: React.FC<IBaseRoomProps> = ({
-    member,
-    room,
-    powerLevels,
-    isUpdating,
-    startUpdating,
-    stopUpdating,
-}) => {
-    const cli = useContext(MatrixClientContext);
-
-    // Don't show the mute/unmute option if the user is not in the room
-    if (member.membership !== KnownMembership.Join) return null;
-
-    const muted = isMuted(member, powerLevels);
-    const onMuteToggle = async (): Promise<void> => {
-        if (isUpdating) return; // only allow one operation at a time
-        startUpdating();
-
-        const roomId = member.roomId;
-        const target = member.userId;
-
-        const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
-        const powerLevels = powerLevelEvent?.getContent();
-        const levelToSend = powerLevels?.events?.["m.room.message"] ?? powerLevels?.events_default;
-        let level;
-        if (muted) {
-            // unmute
-            level = levelToSend;
-        } else {
-            // mute
-            level = levelToSend - 1;
-        }
-        level = parseInt(level);
-
-        if (isNaN(level)) {
-            stopUpdating();
-            return;
-        }
-
-        cli.setPowerLevel(roomId, target, level)
-            .then(
-                () => {
-                    // NO-OP; rely on the m.room.member event coming down else we could
-                    // get out of sync if we force setState here!
-                    logger.log("Mute toggle success");
-                },
-                function (err) {
-                    logger.error("Mute error: " + err);
-                    Modal.createDialog(ErrorDialog, {
-                        title: _t("common|error"),
-                        description: _t("user_info|error_mute_user"),
-                    });
-                },
-            )
-            .finally(() => {
-                stopUpdating();
-            });
-    };
-
-    const muteLabel = muted ? _t("common|unmute") : _t("common|mute");
-    return (
-        <MenuItem
-            role="button"
-            onSelect={async (ev) => {
-                ev.preventDefault();
-                onMuteToggle();
-            }}
-            disabled={isUpdating}
-            label={muteLabel}
-            kind="critical"
-            Icon={VisibilityOffIcon}
-        />
-    );
-};
-
-const IgnoreToggleButton: React.FC<{
-    member: User | RoomMember;
-}> = ({ member }) => {
-    const cli = useContext(MatrixClientContext);
-    const unignore = useCallback(() => {
-        const ignoredUsers = cli.getIgnoredUsers();
-        const index = ignoredUsers.indexOf(member.userId);
-        if (index !== -1) ignoredUsers.splice(index, 1);
-        cli.setIgnoredUsers(ignoredUsers);
-    }, [cli, member]);
-
-    const ignore = useCallback(async () => {
-        const name = (member instanceof User ? member.displayName : member.name) || member.userId;
-        const { finished } = Modal.createDialog(QuestionDialog, {
-            title: _t("user_info|ignore_confirm_title", { user: name }),
-            description: <div>{_t("user_info|ignore_confirm_description")}</div>,
-            button: _t("action|ignore"),
-        });
-        const [confirmed] = await finished;
-
-        if (confirmed) {
-            const ignoredUsers = cli.getIgnoredUsers();
-            ignoredUsers.push(member.userId);
-            cli.setIgnoredUsers(ignoredUsers);
-        }
-    }, [cli, member]);
-
-    // Check whether the user is ignored
-    const [isIgnored, setIsIgnored] = useState(cli.isUserIgnored(member.userId));
-    // Recheck if the user or client changes
-    useEffect(() => {
-        setIsIgnored(cli.isUserIgnored(member.userId));
-    }, [cli, member.userId]);
-    // Recheck also if we receive new accountData m.ignored_user_list
-    const accountDataHandler = useCallback(
-        (ev: MatrixEvent) => {
-            if (ev.getType() === "m.ignored_user_list") {
-                setIsIgnored(cli.isUserIgnored(member.userId));
-            }
-        },
-        [cli, member.userId],
-    );
-    useTypedEventEmitter(cli, ClientEvent.AccountData, accountDataHandler);
-
-    return (
-        <MenuItem
-            role="button"
-            onSelect={async (ev) => {
-                ev.preventDefault();
-                if (isIgnored) {
-                    unignore();
-                } else {
-                    ignore();
-                }
-            }}
-            label={isIgnored ? _t("user_info|unignore_button") : _t("user_info|ignore_button")}
-            kind="critical"
-            Icon={BlockIcon}
-        />
-    );
-};
-
-export const RoomAdminToolsContainer: React.FC<IBaseRoomProps> = ({
-    room,
-    children,
-    member,
-    isUpdating,
-    startUpdating,
-    stopUpdating,
-    powerLevels,
-}) => {
-    const cli = useContext(MatrixClientContext);
-    let kickButton;
-    let banButton;
-    let muteButton;
-    let redactButton;
-
-    const editPowerLevel =
-        (powerLevels.events ? powerLevels.events["m.room.power_levels"] : null) || powerLevels.state_default;
-
-    // if these do not exist in the event then they should default to 50 as per the spec
-    const { ban: banPowerLevel = 50, kick: kickPowerLevel = 50, redact: redactPowerLevel = 50 } = powerLevels;
-
-    const me = room.getMember(cli.getUserId() || "");
-    if (!me) {
-        // we aren't in the room, so return no admin tooling
-        return <div />;
-    }
-
-    const isMe = me.userId === member.userId;
-    const canAffectUser = member.powerLevel < me.powerLevel || isMe;
-
-    if (!isMe && canAffectUser && me.powerLevel >= kickPowerLevel) {
-        kickButton = (
-            <RoomKickButton
-                room={room}
-                member={member}
-                isUpdating={isUpdating}
-                startUpdating={startUpdating}
-                stopUpdating={stopUpdating}
-            />
-        );
-    }
-    if (me.powerLevel >= redactPowerLevel && !room.isSpaceRoom()) {
-        redactButton = (
-            <RedactMessagesButton
-                member={member}
-                isUpdating={isUpdating}
-                startUpdating={startUpdating}
-                stopUpdating={stopUpdating}
-            />
-        );
-    }
-    if (!isMe && canAffectUser && me.powerLevel >= banPowerLevel) {
-        banButton = (
-            <BanToggleButton
-                room={room}
-                member={member}
-                isUpdating={isUpdating}
-                startUpdating={startUpdating}
-                stopUpdating={stopUpdating}
-            />
-        );
-    }
-    if (!isMe && canAffectUser && me.powerLevel >= Number(editPowerLevel) && !room.isSpaceRoom()) {
-        muteButton = (
-            <MuteToggleButton
-                member={member}
-                room={room}
-                powerLevels={powerLevels}
-                isUpdating={isUpdating}
-                startUpdating={startUpdating}
-                stopUpdating={stopUpdating}
-            />
-        );
-    }
-
-    if (kickButton || banButton || muteButton || redactButton || children) {
-        return (
-            <Container>
-                {muteButton}
-                {redactButton}
-                {kickButton}
-                {banButton}
-                {children}
-            </Container>
-        );
-    }
-
-    return <div />;
-};
-
-const useIsSynapseAdmin = (cli?: MatrixClient): boolean => {
-    return useAsyncMemo(async () => (cli ? cli.isSynapseAdministrator().catch(() => false) : false), [cli], false);
-};
-
-const useHomeserverSupportsCrossSigning = (cli: MatrixClient): boolean => {
-    return useAsyncMemo<boolean>(
-        async () => {
-            return cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing");
-        },
-        [cli],
-        false,
-    );
-};
-
-interface IRoomPermissions {
+export interface IRoomPermissions {
     modifyLevelMax: number;
     canEdit: boolean;
     canInvite: boolean;
 }
 
-function useRoomPermissions(cli: MatrixClient, room: Room, user: RoomMember): IRoomPermissions {
-    const [roomPermissions, setRoomPermissions] = useState<IRoomPermissions>({
-        // modifyLevelMax is the max PL we can set this user to, typically min(their PL, our PL) && canSetPL
-        modifyLevelMax: -1,
-        canEdit: false,
-        canInvite: false,
-    });
-
-    const updateRoomPermissions = useCallback(() => {
-        const powerLevels = room?.currentState.getStateEvents(EventType.RoomPowerLevels, "")?.getContent();
-        if (!powerLevels) return;
-
-        const me = room.getMember(cli.getUserId() || "");
-        if (!me) return;
-
-        const them = user;
-        const isMe = me.userId === them.userId;
-        const canAffectUser = them.powerLevel < me.powerLevel || isMe;
-
-        let modifyLevelMax = -1;
-        if (canAffectUser) {
-            const editPowerLevel = powerLevels.events?.[EventType.RoomPowerLevels] ?? powerLevels.state_default ?? 50;
-            if (me.powerLevel >= editPowerLevel) {
-                modifyLevelMax = me.powerLevel;
-            }
-        }
-
-        setRoomPermissions({
-            canInvite: me.powerLevel >= (powerLevels.invite ?? 0),
-            canEdit: modifyLevelMax >= 0,
-            modifyLevelMax,
-        });
-    }, [cli, user, room]);
-
-    useTypedEventEmitter(cli, RoomStateEvent.Update, updateRoomPermissions);
-    useEffect(() => {
-        updateRoomPermissions();
-        return () => {
-            setRoomPermissions({
-                modifyLevelMax: -1,
-                canEdit: false,
-                canInvite: false,
-            });
-        };
-    }, [updateRoomPermissions]);
-
-    return roomPermissions;
-}
-
-const PowerLevelSection: React.FC<{
-    user: RoomMember;
-    room: Room;
-    roomPermissions: IRoomPermissions;
-    powerLevels: IPowerLevelsContent;
-}> = ({ user, room, roomPermissions, powerLevels }) => {
-    if (roomPermissions.canEdit) {
-        return <PowerLevelEditor user={user} room={room} roomPermissions={roomPermissions} />;
-    } else {
-        const powerLevelUsersDefault = powerLevels.users_default || 0;
-        const powerLevel = user.powerLevel;
-        const role = textualPowerLevel(powerLevel, powerLevelUsersDefault);
-        return (
-            <div className="mx_UserInfo_profileField">
-                <div className="mx_UserInfo_roleDescription">{role}</div>
-            </div>
-        );
-    }
-};
-
-export const PowerLevelEditor: React.FC<{
-    user: RoomMember;
-    room: Room;
-    roomPermissions: IRoomPermissions;
-}> = ({ user, room, roomPermissions }) => {
-    const cli = useContext(MatrixClientContext);
-
-    const [selectedPowerLevel, setSelectedPowerLevel] = useState(user.powerLevel);
-    useEffect(() => {
-        setSelectedPowerLevel(user.powerLevel);
-    }, [user]);
-
-    const onPowerChange = useCallback(
-        async (powerLevel: number) => {
-            setSelectedPowerLevel(powerLevel);
-
-            const applyPowerChange = (roomId: string, target: string, powerLevel: number): Promise<unknown> => {
-                return cli.setPowerLevel(roomId, target, powerLevel).then(
-                    function () {
-                        // NO-OP; rely on the m.room.member event coming down else we could
-                        // get out of sync if we force setState here!
-                        logger.log("Power change success");
-                    },
-                    function (err) {
-                        logger.error("Failed to change power level " + err);
-                        Modal.createDialog(ErrorDialog, {
-                            title: _t("common|error"),
-                            description: _t("error|update_power_level"),
-                        });
-                    },
-                );
-            };
-
-            const roomId = user.roomId;
-            const target = user.userId;
-
-            const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
-            if (!powerLevelEvent) return;
-
-            const myUserId = cli.getUserId();
-            const myPower = powerLevelEvent.getContent().users[myUserId || ""];
-            if (myPower && parseInt(myPower) <= powerLevel && myUserId !== target) {
-                const { finished } = Modal.createDialog(QuestionDialog, {
-                    title: _t("common|warning"),
-                    description: (
-                        <div>
-                            {_t("user_info|promote_warning")}
-                            <br />
-                            {_t("common|are_you_sure")}
-                        </div>
-                    ),
-                    button: _t("action|continue"),
-                });
-
-                const [confirmed] = await finished;
-                if (!confirmed) return;
-            } else if (myUserId === target && myPower && parseInt(myPower) > powerLevel) {
-                // If we are changing our own PL it can only ever be decreasing, which we cannot reverse.
-                try {
-                    if (!(await warnSelfDemote(room?.isSpaceRoom()))) return;
-                } catch (e) {
-                    logger.error("Failed to warn about self demotion: ", e);
-                }
-            }
-
-            await applyPowerChange(roomId, target, powerLevel);
-        },
-        [user.roomId, user.userId, cli, room],
-    );
-
-    const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
-    const powerLevelUsersDefault = powerLevelEvent ? powerLevelEvent.getContent().users_default : 0;
-
-    return (
-        <div className="mx_UserInfo_profileField">
-            <PowerSelector
-                label={undefined}
-                value={selectedPowerLevel}
-                maxValue={roomPermissions.modifyLevelMax}
-                usersDefault={powerLevelUsersDefault}
-                onChange={onPowerChange}
-            />
-        </div>
-    );
-};
-
 async function getUserDeviceInfo(
     userId: string,
     cli: MatrixClient,
@@ -1127,313 +186,8 @@ export const useDevices = (userId: string): IDevice[] | undefined | null => {
     return devices;
 };
 
-function useHasCrossSigningKeys(cli: MatrixClient, member: User, canVerify: boolean): boolean | undefined {
-    return useAsyncMemo(async () => {
-        if (!canVerify) return undefined;
-        return await cli.getCrypto()?.userHasCrossSigningKeys(member.userId, true);
-    }, [cli, member, canVerify]);
-}
-
-const VerificationSection: React.FC<{
-    member: User | RoomMember;
-    devices: IDevice[];
-}> = ({ member, devices }) => {
-    const cli = useContext(MatrixClientContext);
-    let content;
-    const homeserverSupportsCrossSigning = useHomeserverSupportsCrossSigning(cli);
-
-    const userTrust = useAsyncMemo<UserVerificationStatus | undefined>(
-        async () => cli.getCrypto()?.getUserVerificationStatus(member.userId),
-        [member.userId],
-        // the user verification status is not initialized
-        undefined,
-    );
-    const hasUserVerificationStatus = Boolean(userTrust);
-    const isUserVerified = Boolean(userTrust?.isVerified());
-    const isMe = member.userId === cli.getUserId();
-    const canVerify =
-        hasUserVerificationStatus &&
-        homeserverSupportsCrossSigning &&
-        !isUserVerified &&
-        !isMe &&
-        devices &&
-        devices.length > 0;
-
-    const hasCrossSigningKeys = useHasCrossSigningKeys(cli, member as User, canVerify);
-
-    if (isUserVerified) {
-        content = (
-            <Badge kind="green" className="mx_UserInfo_verified_badge">
-                <VerifiedIcon className="mx_UserInfo_verified_icon" height="16px" width="16px" />
-                <Text size="sm" weight="medium" className="mx_UserInfo_verified_label">
-                    {_t("common|verified")}
-                </Text>
-            </Badge>
-        );
-    } else if (hasCrossSigningKeys === undefined) {
-        // We are still fetching the cross-signing keys for the user, show spinner.
-        content = <InlineSpinner size={24} />;
-    } else if (canVerify && hasCrossSigningKeys) {
-        content = (
-            <div className="mx_UserInfo_container_verifyButton">
-                <Button
-                    className="mx_UserInfo_verify_button"
-                    kind="tertiary"
-                    size="sm"
-                    onClick={() => verifyUser(cli, member as User)}
-                >
-                    {_t("user_info|verify_button")}
-                </Button>
-            </div>
-        );
-    } else {
-        content = (
-            <Text className="mx_UserInfo_verification_unavailable" size="sm">
-                ({_t("user_info|verification_unavailable")})
-            </Text>
-        );
-    }
-
-    return (
-        <Flex justify="center" align="center" className="mx_UserInfo_verification">
-            {content}
-        </Flex>
-    );
-};
-
-const BasicUserInfo: React.FC<{
-    room: Room;
-    member: User | RoomMember;
-}> = ({ room, member }) => {
-    const cli = useContext(MatrixClientContext);
-
-    const powerLevels = useRoomPowerLevels(cli, room);
-    // Load whether or not we are a Synapse Admin
-    const isSynapseAdmin = useIsSynapseAdmin(cli);
-
-    // Count of how many operations are currently in progress, if > 0 then show a Spinner
-    const [pendingUpdateCount, setPendingUpdateCount] = useState(0);
-    const startUpdating = useCallback(() => {
-        setPendingUpdateCount(pendingUpdateCount + 1);
-    }, [pendingUpdateCount]);
-    const stopUpdating = useCallback(() => {
-        setPendingUpdateCount(pendingUpdateCount - 1);
-    }, [pendingUpdateCount]);
-
-    const roomPermissions = useRoomPermissions(cli, room, member as RoomMember);
-
-    const onSynapseDeactivate = useCallback(async () => {
-        const { finished } = Modal.createDialog(QuestionDialog, {
-            title: _t("user_info|deactivate_confirm_title"),
-            description: <div>{_t("user_info|deactivate_confirm_description")}</div>,
-            button: _t("user_info|deactivate_confirm_action"),
-            danger: true,
-        });
-
-        const [accepted] = await finished;
-        if (!accepted) return;
-        try {
-            await cli.deactivateSynapseUser(member.userId);
-        } catch (err) {
-            logger.error("Failed to deactivate user");
-            logger.error(err);
-
-            const description = err instanceof Error ? err.message : _t("invite|failed_generic");
-
-            Modal.createDialog(ErrorDialog, {
-                title: _t("user_info|error_deactivate"),
-                description,
-            });
-        }
-    }, [cli, member.userId]);
-
-    let synapseDeactivateButton;
-    let spinner;
-
-    // We don't need a perfect check here, just something to pass as "probably not our homeserver". If
-    // someone does figure out how to bypass this check the worst that happens is an error.
-    if (isSynapseAdmin && member.userId.endsWith(`:${cli.getDomain()}`)) {
-        synapseDeactivateButton = (
-            <MenuItem
-                role="button"
-                onSelect={async (ev) => {
-                    ev.preventDefault();
-                    onSynapseDeactivate();
-                }}
-                label={_t("user_info|deactivate_confirm_action")}
-                kind="critical"
-                Icon={DeleteIcon}
-            />
-        );
-    }
-
-    let memberDetails;
-    let adminToolsContainer;
-    if (room && (member as RoomMember).roomId) {
-        // hide the Roles section for DMs as it doesn't make sense there
-        if (!DMRoomMap.shared().getUserIdForRoomId((member as RoomMember).roomId)) {
-            memberDetails = (
-                <PowerLevelSection
-                    powerLevels={powerLevels}
-                    user={member as RoomMember}
-                    room={room}
-                    roomPermissions={roomPermissions}
-                />
-            );
-        }
-
-        adminToolsContainer = (
-            <RoomAdminToolsContainer
-                powerLevels={powerLevels}
-                member={member as RoomMember}
-                room={room}
-                isUpdating={pendingUpdateCount > 0}
-                startUpdating={startUpdating}
-                stopUpdating={stopUpdating}
-            >
-                {synapseDeactivateButton}
-            </RoomAdminToolsContainer>
-        );
-    } else if (synapseDeactivateButton) {
-        adminToolsContainer = <Container>{synapseDeactivateButton}</Container>;
-    }
-
-    if (pendingUpdateCount > 0) {
-        spinner = <Spinner />;
-    }
-
-    const isMe = member.userId === cli.getUserId();
-
-    return (
-        <React.Fragment>
-            <UserOptionsSection
-                canInvite={roomPermissions.canInvite}
-                member={member as RoomMember}
-                isSpace={room?.isSpaceRoom()}
-            >
-                {memberDetails}
-            </UserOptionsSection>
-            {adminToolsContainer}
-            {!isMe && (
-                <Container>
-                    <IgnoreToggleButton member={member} />
-                </Container>
-            )}
-            {spinner}
-        </React.Fragment>
-    );
-};
-
 export type Member = User | RoomMember;
 
-export const UserInfoHeader: React.FC<{
-    member: Member;
-    devices: IDevice[];
-    roomId?: string;
-    hideVerificationSection?: boolean;
-}> = ({ member, devices, roomId, hideVerificationSection }) => {
-    const cli = useContext(MatrixClientContext);
-
-    const onMemberAvatarClick = useCallback(() => {
-        const avatarUrl = (member as RoomMember).getMxcAvatarUrl
-            ? (member as RoomMember).getMxcAvatarUrl()
-            : (member as User).avatarUrl;
-
-        const httpUrl = mediaFromMxc(avatarUrl).srcHttp;
-        if (!httpUrl) return;
-
-        const params = {
-            src: httpUrl,
-            name: (member as RoomMember).name || (member as User).displayName,
-        };
-
-        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox", undefined, true);
-    }, [member]);
-
-    const avatarUrl = (member as User).avatarUrl;
-
-    let presenceState: string | undefined;
-    let presenceLastActiveAgo: number | undefined;
-    let presenceCurrentlyActive: boolean | undefined;
-    if (member instanceof RoomMember && member.user) {
-        presenceState = member.user.presence;
-        presenceLastActiveAgo = member.user.lastActiveAgo;
-        presenceCurrentlyActive = member.user.currentlyActive;
-    }
-
-    const enablePresenceByHsUrl = SdkConfig.get("enable_presence_by_hs_url");
-    let showPresence = true;
-    if (enablePresenceByHsUrl && enablePresenceByHsUrl[cli.baseUrl] !== undefined) {
-        showPresence = enablePresenceByHsUrl[cli.baseUrl];
-    }
-
-    let presenceLabel: JSX.Element | undefined;
-    if (showPresence) {
-        presenceLabel = (
-            <PresenceLabel
-                activeAgo={presenceLastActiveAgo}
-                currentlyActive={presenceCurrentlyActive}
-                presenceState={presenceState}
-                className="mx_UserInfo_profileStatus"
-                coloured
-            />
-        );
-    }
-
-    const timezoneInfo = useUserTimezone(cli, member.userId);
-
-    const userIdentifier = UserIdentifierCustomisations.getDisplayUserIdentifier?.(member.userId, {
-        roomId,
-        withDisplayName: true,
-    });
-    const displayName = (member as RoomMember).rawDisplayName;
-    return (
-        <React.Fragment>
-            <div className="mx_UserInfo_avatar">
-                <div className="mx_UserInfo_avatar_transition">
-                    <div className="mx_UserInfo_avatar_transition_child">
-                        <MemberAvatar
-                            key={member.userId} // to instantly blank the avatar when UserInfo changes members
-                            member={member as RoomMember}
-                            size="120px"
-                            resizeMethod="scale"
-                            fallbackUserId={member.userId}
-                            onClick={onMemberAvatarClick}
-                            urls={avatarUrl ? [avatarUrl] : undefined}
-                        />
-                    </div>
-                </div>
-            </div>
-
-            <Container className="mx_UserInfo_header">
-                <Flex direction="column" align="center" className="mx_UserInfo_profile">
-                    <Heading size="sm" weight="semibold" as="h1" dir="auto">
-                        <Flex className="mx_UserInfo_profile_name" direction="row-reverse" align="center">
-                            {displayName}
-                        </Flex>
-                    </Heading>
-                    {presenceLabel}
-                    {timezoneInfo && (
-                        <Tooltip label={timezoneInfo?.timezone ?? ""}>
-                            <Flex align="center" className="mx_UserInfo_timezone">
-                                <Text size="sm" weight="regular">
-                                    {timezoneInfo?.friendly ?? ""}
-                                </Text>
-                            </Flex>
-                        </Tooltip>
-                    )}
-                    <Text size="sm" weight="semibold" className="mx_UserInfo_profile_mxid">
-                        <CopyableText getTextToCopy={() => userIdentifier} border={false}>
-                            {userIdentifier}
-                        </CopyableText>
-                    </Text>
-                </Flex>
-                {!hideVerificationSection && <VerificationSection member={member} devices={devices} />}
-            </Container>
-        </React.Fragment>
-    );
-};
-
 interface IProps {
     user: Member;
     room?: Room;
@@ -1467,7 +221,7 @@ const UserInfo: React.FC<IProps> = ({ user, room, onClose, phase = RightPanelPha
     let content: JSX.Element | undefined;
     switch (phase) {
         case RightPanelPhases.MemberInfo:
-            content = <BasicUserInfo room={room as Room} member={member as User} />;
+            content = <UserInfoBasicView room={room as Room} member={member as User} />;
             break;
         case RightPanelPhases.EncryptionPanel:
             classes.push("mx_UserInfo_smallAvatar");
@@ -1492,7 +246,7 @@ const UserInfo: React.FC<IProps> = ({ user, room, onClose, phase = RightPanelPha
 
     const header = (
         <>
-            <UserInfoHeader
+            <UserInfoHeaderView
                 hideVerificationSection={phase === RightPanelPhases.EncryptionPanel}
                 member={member}
                 devices={devices}
diff --git a/src/components/views/right_panel/VerificationPanel.tsx b/src/components/views/right_panel/VerificationPanel.tsx
index 1782a52a88..fa3a4dc4db 100644
--- a/src/components/views/right_panel/VerificationPanel.tsx
+++ b/src/components/views/right_panel/VerificationPanel.tsx
@@ -126,7 +126,7 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
                 ) : null;
             return (
                 <div>
-                    {_t("encryption|verification|qr_or_sas_header")}
+                    {_t("encryption|verification|verify_by_completing_one_of")}
                     <div className="mx_VerificationPanel_QRPhase_startOptions">
                         {qrBlockDialog}
                         {or}
@@ -224,7 +224,7 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
     private renderQRReciprocatePhase(): JSX.Element {
         const { member, request } = this.props;
         const description = request.isSelfVerification
-            ? _t("encryption|verification|qr_reciprocate_same_shield_device")
+            ? _t("encryption|verification|qr_reciprocate_check_again_device")
             : _t("encryption|verification|qr_reciprocate_same_shield_user", {
                   displayName: (member as User).displayName || (member as RoomMember).name || member.userId,
               });
@@ -236,19 +236,18 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
                     <p>{description}</p>
                     <E2EIcon isUser={true} status={E2EStatus.Verified} size={128} hideTooltip={true} />
                     <div className="mx_VerificationPanel_reciprocateButtons">
-                        <AccessibleButton
-                            kind="danger"
-                            disabled={this.state.reciprocateButtonClicked}
-                            onClick={this.onReciprocateNoClick}
-                        >
-                            {_t("action|no")}
-                        </AccessibleButton>
                         <AccessibleButton
                             kind="primary"
                             disabled={this.state.reciprocateButtonClicked}
                             onClick={this.onReciprocateYesClick}
                         >
-                            {_t("action|yes")}
+                            {_t("encryption|verification|qr_reciprocate_yes")}
+                        </AccessibleButton>
+                        <AccessibleButton
+                            disabled={this.state.reciprocateButtonClicked}
+                            onClick={this.onReciprocateNoClick}
+                        >
+                            {_t("encryption|verification|qr_reciprocate_no")}
                         </AccessibleButton>
                     </div>
                 </React.Fragment>
@@ -260,12 +259,7 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
                 </p>
             );
         }
-        return (
-            <div className="mx_UserInfo_container mx_VerificationPanel_reciprocate_section">
-                <h3>{_t("encryption|verification|scan_qr")}</h3>
-                {body}
-            </div>
-        );
+        return <div className="mx_UserInfo_container mx_VerificationPanel_reciprocate_section">{body}</div>;
     }
 
     private renderVerifiedPhase(): JSX.Element {
@@ -282,18 +276,7 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
 
         let description: string;
         if (request.isSelfVerification) {
-            const device = this.state.otherDeviceDetails;
-            if (!device) {
-                // This can happen if the device is logged out while we're still showing verification
-                // UI for it.
-                logger.warn("Verified device we don't know about: " + this.props.request.otherDeviceId);
-                description = _t("encryption|verification|successful_own_device");
-            } else {
-                description = _t("encryption|verification|successful_device", {
-                    deviceName: device.displayName,
-                    deviceId: device.deviceId,
-                });
-            }
+            description = _t("encryption|verification|now_you_can");
         } else {
             description = _t("encryption|verification|successful_user", {
                 displayName: (member as User).displayName || (member as RoomMember).name || member.userId,
@@ -313,35 +296,9 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
     }
 
     private renderCancelledPhase(): JSX.Element {
-        const { member, request } = this.props;
-
-        let startAgainInstruction: string;
-        if (request.isSelfVerification) {
-            startAgainInstruction = _t("encryption|verification|prompt_self");
-        } else {
-            startAgainInstruction = _t("encryption|verification|prompt_user");
-        }
-
-        let text: string;
-        if (request.cancellationCode === "m.timeout") {
-            text = _t("encryption|verification|timed_out") + ` ${startAgainInstruction}`;
-        } else if (request.cancellingUserId === request.otherUserId) {
-            if (request.isSelfVerification) {
-                text = _t("encryption|verification|cancelled_self");
-            } else {
-                text = _t("encryption|verification|cancelled_user", {
-                    displayName: (member as User).displayName || (member as RoomMember).name || member.userId,
-                });
-            }
-            text = `${text} ${startAgainInstruction}`;
-        } else {
-            text = _t("encryption|verification|cancelled") + ` ${startAgainInstruction}`;
-        }
-
         return (
             <div className="mx_UserInfo_container">
-                <h3>{_t("common|verification_cancelled")}</h3>
-                <p>{text}</p>
+                <p>{_t("encryption|verification|cancelled_verification")}</p>
 
                 <AccessibleButton kind="primary" className="mx_UserInfo_wideButton" onClick={this.props.onClose}>
                     {_t("action|got_it")}
diff --git a/src/components/views/right_panel/WidgetCard.tsx b/src/components/views/right_panel/WidgetCard.tsx
index bc6b778e26..29a713fdd4 100644
--- a/src/components/views/right_panel/WidgetCard.tsx
+++ b/src/components/views/right_panel/WidgetCard.tsx
@@ -64,7 +64,7 @@ const WidgetCard: React.FC<IProps> = ({ room, widgetId, onClose }) => {
 
     const header = (
         <div className="mx_BaseCard_header_title">
-            <Heading size="4" className="mx_BaseCard_header_title_heading">
+            <Heading size="4" className="mx_BaseCard_header_title_heading" as="h1">
                 {WidgetUtils.getWidgetName(app)}
             </Heading>
             <ContextMenuButton
diff --git a/src/components/views/right_panel/user_info/UserInfoAdminToolsContainer.tsx b/src/components/views/right_panel/user_info/UserInfoAdminToolsContainer.tsx
new file mode 100644
index 0000000000..1f3eeb706d
--- /dev/null
+++ b/src/components/views/right_panel/user_info/UserInfoAdminToolsContainer.tsx
@@ -0,0 +1,220 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React, { type JSX, type ReactNode } from "react";
+import classNames from "classnames";
+import { type RoomMember, type Room } from "matrix-js-sdk/src/matrix";
+import { MenuItem } from "@vector-im/compound-web";
+import CloseIcon from "@vector-im/compound-design-tokens/assets/web/icons/close";
+import ChatProblemIcon from "@vector-im/compound-design-tokens/assets/web/icons/chat-problem";
+import VisibilityOffIcon from "@vector-im/compound-design-tokens/assets/web/icons/visibility-off";
+import LeaveIcon from "@vector-im/compound-design-tokens/assets/web/icons/leave";
+
+import { _t } from "../../../../languageHandler";
+import { type IPowerLevelsContent } from "../UserInfo";
+import { useUserInfoAdminToolsContainerViewModel } from "../../../viewmodels/right_panel/user_info/admin/UserInfoAdminToolsContainerViewModel";
+import { useMuteButtonViewModel } from "../../../viewmodels/right_panel/user_info/admin/UserInfoMuteButtonViewModel";
+import { useBanButtonViewModel } from "../../../viewmodels/right_panel/user_info/admin/UserInfoBanButtonViewModel";
+import { useRoomKickButtonViewModel } from "../../../viewmodels/right_panel/user_info/admin/UserInfoKickButtonViewModel";
+import { useRedactMessagesButtonViewModel } from "../../../viewmodels/right_panel/user_info/admin/UserInfoRedactButtonViewModel";
+
+const Container: React.FC<{
+    children: ReactNode;
+    className?: string;
+}> = ({ children, className }) => {
+    const classes = classNames("mx_UserInfo_container", className);
+    return <div className={classes}>{children}</div>;
+};
+
+interface IBaseProps {
+    member: RoomMember;
+    isUpdating: boolean;
+    startUpdating(): void;
+    stopUpdating(): void;
+}
+
+export const RoomKickButton = ({
+    room,
+    member,
+    isUpdating,
+    startUpdating,
+    stopUpdating,
+}: Omit<IBaseRoomProps, "powerLevels">): JSX.Element | null => {
+    const vm = useRoomKickButtonViewModel({ room, member, isUpdating, startUpdating, stopUpdating });
+    // check if user can be kicked/disinvited
+    if (!vm.canUserBeKicked) return <></>;
+
+    return (
+        <MenuItem
+            role="button"
+            onSelect={async (ev) => {
+                ev.preventDefault();
+                vm.onKickClick();
+            }}
+            disabled={isUpdating}
+            label={vm.kickLabel}
+            kind="critical"
+            Icon={LeaveIcon}
+        />
+    );
+};
+
+const RedactMessagesButton: React.FC<IBaseProps> = ({ member }) => {
+    const vm = useRedactMessagesButtonViewModel(member);
+
+    return (
+        <MenuItem
+            role="button"
+            onSelect={async (ev) => {
+                ev.preventDefault();
+                vm.onRedactAllMessagesClick();
+            }}
+            label={_t("user_info|redact_button")}
+            kind="critical"
+            Icon={CloseIcon}
+        />
+    );
+};
+
+export const BanToggleButton = ({
+    room,
+    member,
+    isUpdating,
+    startUpdating,
+    stopUpdating,
+}: Omit<IBaseRoomProps, "powerLevels">): JSX.Element => {
+    const vm = useBanButtonViewModel({ room, member, isUpdating, startUpdating, stopUpdating });
+
+    return (
+        <MenuItem
+            role="button"
+            onSelect={async (ev) => {
+                ev.preventDefault();
+                vm.onBanOrUnbanClick();
+            }}
+            disabled={isUpdating}
+            label={vm.banLabel}
+            kind="critical"
+            Icon={ChatProblemIcon}
+        />
+    );
+};
+
+interface IBaseRoomProps extends IBaseProps {
+    room: Room;
+    powerLevels: IPowerLevelsContent;
+    children?: ReactNode;
+}
+
+// We do not show a Mute button for ourselves so it doesn't need to handle warning self demotion
+const MuteToggleButton: React.FC<IBaseRoomProps> = ({
+    member,
+    room,
+    powerLevels,
+    isUpdating,
+    startUpdating,
+    stopUpdating,
+}) => {
+    const vm = useMuteButtonViewModel({ room, member, isUpdating, startUpdating, stopUpdating });
+    // Don't show the mute/unmute option if the user is not in the room
+    if (!vm.isMemberInTheRoom) return null;
+
+    return (
+        <MenuItem
+            role="button"
+            onSelect={async (ev) => {
+                ev.preventDefault();
+                vm.onMuteButtonClick();
+            }}
+            disabled={isUpdating}
+            label={vm.muteLabel}
+            kind="critical"
+            Icon={VisibilityOffIcon}
+        />
+    );
+};
+
+export const UserInfoAdminToolsContainer: React.FC<IBaseRoomProps> = ({
+    room,
+    children,
+    member,
+    isUpdating,
+    startUpdating,
+    stopUpdating,
+    powerLevels,
+}) => {
+    let kickButton;
+    let banButton;
+    let muteButton;
+    let redactButton;
+
+    const vm = useUserInfoAdminToolsContainerViewModel({ room, member, powerLevels });
+
+    if (!vm.isCurrentUserInTheRoom) {
+        // we aren't in the room, so return no admin tooling
+        return <div />;
+    }
+
+    if (vm.shouldShowKickButton) {
+        kickButton = (
+            <RoomKickButton
+                room={room}
+                member={member}
+                isUpdating={isUpdating}
+                startUpdating={startUpdating}
+                stopUpdating={stopUpdating}
+            />
+        );
+    }
+    if (vm.shouldShowRedactButton) {
+        redactButton = (
+            <RedactMessagesButton
+                member={member}
+                isUpdating={isUpdating}
+                startUpdating={startUpdating}
+                stopUpdating={stopUpdating}
+            />
+        );
+    }
+    if (vm.shouldShowBanButton) {
+        banButton = (
+            <BanToggleButton
+                room={room}
+                member={member}
+                isUpdating={isUpdating}
+                startUpdating={startUpdating}
+                stopUpdating={stopUpdating}
+            />
+        );
+    }
+    if (vm.shouldShowMuteButton) {
+        muteButton = (
+            <MuteToggleButton
+                member={member}
+                room={room}
+                powerLevels={powerLevels}
+                isUpdating={isUpdating}
+                startUpdating={startUpdating}
+                stopUpdating={stopUpdating}
+            />
+        );
+    }
+
+    if (kickButton || banButton || muteButton || redactButton || children) {
+        return (
+            <Container>
+                {muteButton}
+                {redactButton}
+                {kickButton}
+                {banButton}
+                {children}
+            </Container>
+        );
+    }
+
+    return <div />;
+};
diff --git a/src/components/views/right_panel/user_info/UserInfoBasicOptionsView.tsx b/src/components/views/right_panel/user_info/UserInfoBasicOptionsView.tsx
new file mode 100644
index 0000000000..cd80d77d85
--- /dev/null
+++ b/src/components/views/right_panel/user_info/UserInfoBasicOptionsView.tsx
@@ -0,0 +1,127 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type RoomMember, type User, type Room } from "matrix-js-sdk/src/matrix";
+import React, { type JSX, type ReactNode, useState } from "react";
+import { MenuItem } from "@vector-im/compound-web";
+import { ChatIcon, CheckIcon, MentionIcon, ShareIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
+import InviteIcon from "@vector-im/compound-design-tokens/assets/web/icons/user-add";
+
+import { _t } from "../../../../languageHandler";
+import { useUserInfoBasicOptionsViewModel } from "../../../viewmodels/right_panel/user_info/UserInfoBasicOptionsViewModel";
+import { Container, type Member } from "../UserInfo";
+import { shouldShowComponent } from "../../../../customisations/helpers/UIComponents";
+import { UIComponent } from "../../../../settings/UIFeature";
+
+const MessageButton = ({
+    member,
+    openDMForUser,
+}: {
+    member: Member;
+    openDMForUser: (user: Member) => Promise<void>;
+}): JSX.Element => {
+    const [busy, setBusy] = useState(false);
+
+    return (
+        <MenuItem
+            role="button"
+            onSelect={async (ev) => {
+                ev.preventDefault();
+                if (busy) return;
+                setBusy(true);
+                await openDMForUser(member);
+                setBusy(false);
+            }}
+            disabled={busy}
+            label={_t("user_info|send_message")}
+            Icon={ChatIcon}
+        />
+    );
+};
+
+export const UserInfoBasicOptionsView: React.FC<{
+    member: User | RoomMember;
+    room: Room;
+    children?: ReactNode;
+}> = ({ room, member, children }) => {
+    const vm = useUserInfoBasicOptionsViewModel(room, member);
+
+    let insertPillButton: JSX.Element | undefined;
+    let inviteUserButton: JSX.Element | undefined;
+    let readReceiptButton: JSX.Element | undefined;
+
+    if (!vm.isMe) {
+        readReceiptButton = (
+            <MenuItem
+                role="button"
+                onSelect={async (ev) => {
+                    ev.preventDefault();
+                    vm.onReadReceiptButton();
+                }}
+                label={_t("user_info|jump_to_rr_button")}
+                disabled={vm.readReceiptButtonDisabled}
+                Icon={CheckIcon}
+            />
+        );
+
+        if (vm.showInsertPillButton) {
+            insertPillButton = (
+                <MenuItem
+                    role="button"
+                    onSelect={async (ev) => {
+                        ev.preventDefault();
+                        vm.onInsertPillButton();
+                    }}
+                    label={_t("action|mention")}
+                    Icon={MentionIcon}
+                />
+            );
+        }
+
+        if (vm.showInviteButton && shouldShowComponent(UIComponent.InviteUsers)) {
+            inviteUserButton = (
+                <MenuItem
+                    role="button"
+                    onSelect={async (ev) => {
+                        ev.preventDefault();
+                        vm.onInviteUserButton(room.roomId, ev);
+                    }}
+                    label={_t("action|invite")}
+                    Icon={InviteIcon}
+                />
+            );
+        }
+    }
+
+    const shareUserButton = (
+        <MenuItem
+            role="button"
+            onSelect={async (ev) => {
+                ev.preventDefault();
+                vm.onShareUserClick();
+            }}
+            label={_t("user_info|share_button")}
+            Icon={ShareIcon}
+        />
+    );
+
+    const directMessageButton =
+        vm.isMe || !shouldShowComponent(UIComponent.CreateRooms) ? null : (
+            <MessageButton member={member} openDMForUser={vm.onOpenDmForUser} />
+        );
+
+    return (
+        <Container>
+            {children}
+            {directMessageButton}
+            {inviteUserButton}
+            {readReceiptButton}
+            {shareUserButton}
+            {insertPillButton}
+        </Container>
+    );
+};
diff --git a/src/components/views/right_panel/user_info/UserInfoBasicView.tsx b/src/components/views/right_panel/user_info/UserInfoBasicView.tsx
new file mode 100644
index 0000000000..5a2c9158ff
--- /dev/null
+++ b/src/components/views/right_panel/user_info/UserInfoBasicView.tsx
@@ -0,0 +1,93 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { type RoomMember, type User, type Room } from "matrix-js-sdk/src/matrix";
+import { MenuItem } from "@vector-im/compound-web";
+import { DeleteIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
+
+import { _t } from "../../../../languageHandler";
+import { useUserInfoBasicViewModel } from "../../../viewmodels/right_panel/user_info/UserInfoBasicViewModel";
+import { PowerLevelSection } from "./UserInfoPowerLevels";
+import { Container } from "../UserInfo";
+import { IgnoreToggleButton } from "./UserInfoIgnoreButtonView";
+import Spinner from "../../elements/Spinner";
+import { UserInfoAdminToolsContainer } from "./UserInfoAdminToolsContainer";
+import { UserInfoBasicOptionsView } from "./UserInfoBasicOptionsView";
+
+/**
+ * There are two types of components that can be displayed in the right panel concerning userinfo
+ * Basic info or Encryption Panel
+ */
+export const UserInfoBasicView: React.FC<{
+    room: Room;
+    member: User | RoomMember;
+}> = ({ room, member }) => {
+    const vm = useUserInfoBasicViewModel(room, member);
+    let synapseDeactivateButton;
+    let spinner;
+    let memberDetails;
+    let adminToolsContainer;
+
+    if (vm.showDeactivateButton) {
+        synapseDeactivateButton = (
+            <MenuItem
+                role="button"
+                onSelect={async (ev) => {
+                    ev.preventDefault();
+                    vm.onSynapseDeactivate();
+                }}
+                label={_t("user_info|deactivate_confirm_action")}
+                kind="critical"
+                Icon={DeleteIcon}
+            />
+        );
+    }
+
+    if (room && (member as RoomMember).roomId) {
+        // hide the Roles section for DMs as it doesn't make sense there
+        if (!vm.isRoomDMForMember) {
+            memberDetails = (
+                <PowerLevelSection user={member as RoomMember} room={room} roomPermissions={vm.roomPermissions} />
+            );
+        }
+
+        adminToolsContainer = (
+            <UserInfoAdminToolsContainer
+                powerLevels={vm.powerLevels}
+                member={member as RoomMember}
+                room={room}
+                isUpdating={vm.pendingUpdateCount > 0}
+                startUpdating={vm.startUpdating}
+                stopUpdating={vm.stopUpdating}
+            >
+                {synapseDeactivateButton}
+            </UserInfoAdminToolsContainer>
+        );
+    } else if (synapseDeactivateButton) {
+        adminToolsContainer = <Container>{synapseDeactivateButton}</Container>;
+    }
+
+    if (vm.pendingUpdateCount > 0) {
+        spinner = <Spinner />;
+    }
+
+    return (
+        <React.Fragment>
+            <UserInfoBasicOptionsView room={room} member={member}>
+                {memberDetails}
+            </UserInfoBasicOptionsView>
+            {adminToolsContainer}
+            {!vm.isMe && (
+                <Container>
+                    <IgnoreToggleButton member={member} />
+                </Container>
+            )}
+            {spinner}
+        </React.Fragment>
+    );
+};
diff --git a/src/components/views/right_panel/user_info/UserInfoHeaderVerificationView.tsx b/src/components/views/right_panel/user_info/UserInfoHeaderVerificationView.tsx
new file mode 100644
index 0000000000..eae5101a6f
--- /dev/null
+++ b/src/components/views/right_panel/user_info/UserInfoHeaderVerificationView.tsx
@@ -0,0 +1,63 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { type User, type RoomMember } from "matrix-js-sdk/src/matrix";
+import { Text, Button, InlineSpinner, Badge } from "@vector-im/compound-web";
+import { VerifiedIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
+import { Flex } from "@element-hq/web-shared-components";
+
+import { useUserInfoVerificationViewModel } from "../../../viewmodels/right_panel/user_info/UserInfoHeaderVerificationViewModel";
+import { type IDevice } from "../UserInfo";
+import { _t } from "../../../../languageHandler";
+
+export const UserInfoHeaderVerificationView: React.FC<{
+    member: User | RoomMember;
+    devices: IDevice[];
+}> = ({ member, devices }) => {
+    let content;
+    const vm = useUserInfoVerificationViewModel(member, devices);
+
+    if (vm.isUserVerified) {
+        content = (
+            <Badge kind="green" className="mx_UserInfo_verified_badge">
+                <VerifiedIcon className="mx_UserInfo_verified_icon" height="16px" width="16px" />
+                <Text size="sm" weight="medium" className="mx_UserInfo_verified_label">
+                    {_t("common|verified")}
+                </Text>
+            </Badge>
+        );
+    } else if (vm.hasCrossSigningKeys === undefined) {
+        // We are still fetching the cross-signing keys for the user, show spinner.
+        content = <InlineSpinner size={24} />;
+    } else if (vm.canVerify && vm.hasCrossSigningKeys) {
+        content = (
+            <div className="mx_UserInfo_container_verifyButton">
+                <Button
+                    className="mx_UserInfo_verify_button"
+                    kind="tertiary"
+                    size="sm"
+                    onClick={() => vm.verifySelectedUser()}
+                >
+                    {_t("user_info|verify_button")}
+                </Button>
+            </div>
+        );
+    } else {
+        content = (
+            <Text className="mx_UserInfo_verification_unavailable" size="sm">
+                ({_t("user_info|verification_unavailable")})
+            </Text>
+        );
+    }
+
+    return (
+        <Flex justify="center" align="center" className="mx_UserInfo_verification">
+            {content}
+        </Flex>
+    );
+};
diff --git a/src/components/views/right_panel/user_info/UserInfoHeaderView.tsx b/src/components/views/right_panel/user_info/UserInfoHeaderView.tsx
new file mode 100644
index 0000000000..275175198c
--- /dev/null
+++ b/src/components/views/right_panel/user_info/UserInfoHeaderView.tsx
@@ -0,0 +1,96 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React, { type JSX } from "react";
+import { type User, type RoomMember } from "matrix-js-sdk/src/matrix";
+import { Heading, Tooltip, Text } from "@vector-im/compound-web";
+import { Flex } from "@element-hq/web-shared-components";
+
+import { useUserfoHeaderViewModel } from "../../../viewmodels/right_panel/user_info/UserInfoHeaderViewModel";
+import MemberAvatar from "../../avatars/MemberAvatar";
+import { Container, type Member, type IDevice } from "../UserInfo";
+import PresenceLabel from "../../rooms/PresenceLabel";
+import CopyableText from "../../elements/CopyableText";
+import { UserInfoHeaderVerificationView } from "./UserInfoHeaderVerificationView";
+
+export interface UserInfoHeaderViewProps {
+    member: Member;
+    roomId?: string;
+    devices: IDevice[];
+    hideVerificationSection: boolean;
+}
+
+export const UserInfoHeaderView: React.FC<UserInfoHeaderViewProps> = ({
+    member,
+    devices,
+    roomId,
+    hideVerificationSection,
+}) => {
+    const vm = useUserfoHeaderViewModel({ member, roomId });
+    const avatarUrl = (member as User).avatarUrl;
+    const displayName = (member as RoomMember).rawDisplayName;
+
+    let presenceLabel: JSX.Element | undefined;
+
+    if (vm.showPresence) {
+        presenceLabel = (
+            <PresenceLabel
+                activeAgo={vm.precenseInfo.lastActiveAgo}
+                currentlyActive={vm.precenseInfo.currentlyActive}
+                presenceState={vm.precenseInfo.state}
+                className="mx_UserInfo_profileStatus"
+                coloured
+            />
+        );
+    }
+
+    return (
+        <React.Fragment>
+            <div className="mx_UserInfo_avatar">
+                <div className="mx_UserInfo_avatar_transition">
+                    <div className="mx_UserInfo_avatar_transition_child">
+                        <MemberAvatar
+                            key={member.userId} // to instantly blank the avatar when UserInfo changes members
+                            member={member as RoomMember}
+                            size="120px"
+                            resizeMethod="scale"
+                            fallbackUserId={member.userId}
+                            onClick={vm.onMemberAvatarClick}
+                            urls={avatarUrl ? [avatarUrl] : undefined}
+                        />
+                    </div>
+                </div>
+            </div>
+
+            <Container className="mx_UserInfo_header">
+                <Flex direction="column" align="center" className="mx_UserInfo_profile">
+                    <Heading size="sm" weight="semibold" as="h1" dir="auto">
+                        <Flex className="mx_UserInfo_profile_name" direction="row-reverse" align="center">
+                            {displayName}
+                        </Flex>
+                    </Heading>
+                    {presenceLabel}
+                    {vm.timezoneInfo && (
+                        <Tooltip label={vm.timezoneInfo?.timezone ?? ""}>
+                            <Flex align="center" className="mx_UserInfo_timezone">
+                                <Text size="sm" weight="regular">
+                                    {vm.timezoneInfo?.friendly ?? ""}
+                                </Text>
+                            </Flex>
+                        </Tooltip>
+                    )}
+                    <Text size="sm" weight="semibold" className="mx_UserInfo_profile_mxid">
+                        <CopyableText getTextToCopy={() => vm.userIdentifier} border={false}>
+                            {vm.userIdentifier}
+                        </CopyableText>
+                    </Text>
+                </Flex>
+                {!hideVerificationSection && <UserInfoHeaderVerificationView member={member} devices={devices} />}
+            </Container>
+        </React.Fragment>
+    );
+};
diff --git a/src/components/views/right_panel/user_info/UserInfoIgnoreButtonView.tsx b/src/components/views/right_panel/user_info/UserInfoIgnoreButtonView.tsx
new file mode 100644
index 0000000000..671b2ce4a7
--- /dev/null
+++ b/src/components/views/right_panel/user_info/UserInfoIgnoreButtonView.tsx
@@ -0,0 +1,30 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type RoomMember, type User } from "matrix-js-sdk/src/matrix";
+import React from "react";
+import { MenuItem } from "@vector-im/compound-web";
+import { BlockIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
+
+import { _t } from "../../../../languageHandler";
+import { useUserInfoIgnoreButtonViewModel } from "../../../viewmodels/right_panel/user_info/UserInfoIgnoreButtonViewModel";
+
+export const IgnoreToggleButton: React.FC<{
+    member: User | RoomMember;
+}> = ({ member }) => {
+    const vm = useUserInfoIgnoreButtonViewModel(member);
+
+    return (
+        <MenuItem
+            role="button"
+            onSelect={async (ev) => vm.ignoreButtonClick(ev)}
+            label={vm.isIgnored ? _t("user_info|unignore_button") : _t("user_info|ignore_button")}
+            kind="critical"
+            Icon={BlockIcon}
+        />
+    );
+};
diff --git a/src/components/views/right_panel/user_info/UserInfoPowerLevels.tsx b/src/components/views/right_panel/user_info/UserInfoPowerLevels.tsx
new file mode 100644
index 0000000000..c7c42da559
--- /dev/null
+++ b/src/components/views/right_panel/user_info/UserInfoPowerLevels.tsx
@@ -0,0 +1,53 @@
+/*
+Copyright 2025 New Vector Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { type RoomMember, type Room } from "matrix-js-sdk/src/matrix";
+
+import { textualPowerLevel } from "../../../../Roles";
+import PowerSelector from "../../elements/PowerSelector";
+import { type IRoomPermissions } from "../UserInfo";
+import {
+    type UserInfoPowerLevelState,
+    useUserInfoPowerlevelViewModel,
+} from "../../../viewmodels/right_panel/UserInfoPowerlevelViewModel";
+
+export const PowerLevelSection: React.FC<{
+    user: RoomMember;
+    room: Room;
+    roomPermissions: IRoomPermissions;
+}> = ({ user, room, roomPermissions }) => {
+    const vm = useUserInfoPowerlevelViewModel(user, room);
+
+    if (roomPermissions.canEdit) {
+        return <PowerLevelEditor vm={vm} roomPermissions={roomPermissions} />;
+    }
+
+    const powerLevel = user.powerLevel;
+    const role = textualPowerLevel(powerLevel, vm.powerLevelUsersDefault);
+    return (
+        <div className="mx_UserInfo_profileField">
+            <div className="mx_UserInfo_roleDescription">{role}</div>
+        </div>
+    );
+};
+
+export const PowerLevelEditor: React.FC<{
+    vm: UserInfoPowerLevelState;
+    roomPermissions: IRoomPermissions;
+}> = ({ vm, roomPermissions }) => {
+    return (
+        <div className="mx_UserInfo_profileField">
+            <PowerSelector
+                label={undefined}
+                value={vm.selectedPowerLevel}
+                maxValue={roomPermissions.modifyLevelMax}
+                usersDefault={vm.powerLevelUsersDefault}
+                onChange={vm.onPowerChange}
+            />
+        </div>
+    );
+};
diff --git a/src/components/views/room_settings/RoomProfileSettings.tsx b/src/components/views/room_settings/RoomProfileSettings.tsx
index e7674a109a..ea727122b2 100644
--- a/src/components/views/room_settings/RoomProfileSettings.tsx
+++ b/src/components/views/room_settings/RoomProfileSettings.tsx
@@ -262,7 +262,7 @@ export default class RoomProfileSettings extends React.Component<IProps, IState>
                                 ? undefined
                                 : (this.state.avatarFile ?? this.state.originalAvatarUrl ?? undefined)
                         }
-                        avatarAltText={_t("room_settings|general|avatar_field_label")}
+                        avatarAccessibleName={_t("room_settings|general|avatar_field_label")}
                         disabled={!this.state.canSetAvatar}
                         onChange={this.onAvatarChanged}
                         removeAvatar={canRemove ? this.removeAvatar : undefined}
diff --git a/src/components/views/room_settings/RoomPublishSetting.tsx b/src/components/views/room_settings/RoomPublishSetting.tsx
index 5147945c36..cac8a55e24 100644
--- a/src/components/views/room_settings/RoomPublishSetting.tsx
+++ b/src/components/views/room_settings/RoomPublishSetting.tsx
@@ -6,10 +6,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React from "react";
+import React, { type ChangeEventHandler } from "react";
 import { JoinRule, Visibility } from "matrix-js-sdk/src/matrix";
+import { SettingsToggleInput } from "@vector-im/compound-web";
+import { logger } from "matrix-js-sdk/src/logger";
 
-import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import DirectoryCustomisations from "../../../customisations/Directory";
@@ -24,6 +25,7 @@ interface IProps {
 
 interface IState {
     isRoomPublished: boolean;
+    busy: boolean;
 }
 
 export default class RoomPublishSetting extends React.PureComponent<IProps, IState> {
@@ -32,6 +34,7 @@ export default class RoomPublishSetting extends React.PureComponent<IProps, ISta
 
         this.state = {
             isRoomPublished: false,
+            busy: false,
         };
     }
 
@@ -42,19 +45,23 @@ export default class RoomPublishSetting extends React.PureComponent<IProps, ISta
         });
     }
 
-    private onRoomPublishChange = (): void => {
-        const valueBefore = this.state.isRoomPublished;
-        const newValue = !valueBefore;
-        this.setState({ isRoomPublished: newValue });
+    private onRoomPublishChange: ChangeEventHandler<HTMLInputElement> = async (evt): Promise<void> => {
+        const newValue = evt.target.checked;
+        this.setState({ busy: true });
         const client = MatrixClientPeg.safeGet();
 
-        client
-            .setRoomDirectoryVisibility(this.props.roomId, newValue ? Visibility.Public : Visibility.Private)
-            .catch(() => {
-                this.showError();
-                // Roll back the local echo on the change
-                this.setState({ isRoomPublished: valueBefore });
-            });
+        try {
+            await client.setRoomDirectoryVisibility(
+                this.props.roomId,
+                newValue ? Visibility.Public : Visibility.Private,
+            );
+            this.setState({ isRoomPublished: newValue });
+        } catch (ex) {
+            logger.error("Error while setting room directory visibility", ex);
+            this.showError();
+        } finally {
+            this.setState({ busy: false });
+        }
     };
 
     public componentDidMount(): void {
@@ -69,17 +76,26 @@ export default class RoomPublishSetting extends React.PureComponent<IProps, ISta
 
         const room = client.getRoom(this.props.roomId);
         const isRoomPublishable = room && room.getJoinRule() !== JoinRule.Invite;
+        const canSetCanonicalAlias =
+            DirectoryCustomisations.requireCanonicalAliasAccessToPublish?.() === false ||
+            this.props.canSetCanonicalAlias;
 
-        const enabled =
-            (DirectoryCustomisations.requireCanonicalAliasAccessToPublish?.() === false ||
-                this.props.canSetCanonicalAlias) &&
-            (isRoomPublishable || this.state.isRoomPublished);
+        let disabledMessage;
+        if (!isRoomPublishable) {
+            disabledMessage = _t("room_settings|general|publish_warn_invite_only");
+        } else if (!canSetCanonicalAlias) {
+            disabledMessage = _t("room_settings|general|publish_warn_no_canonical_permission");
+        }
+
+        const enabled = canSetCanonicalAlias && (isRoomPublishable || this.state.isRoomPublished);
 
         return (
-            <LabelledToggleSwitch
-                value={this.state.isRoomPublished}
+            <SettingsToggleInput
+                name="room-publish"
+                checked={this.state.isRoomPublished}
                 onChange={this.onRoomPublishChange}
-                disabled={!enabled}
+                disabled={!enabled || this.state.busy}
+                disabledMessage={disabledMessage}
                 label={_t("room_settings|general|publish_toggle", {
                     domain: client.getDomain(),
                 })}
diff --git a/src/components/views/rooms/AppsDrawer.tsx b/src/components/views/rooms/AppsDrawer.tsx
index a5c869c0c3..b4b62e9763 100644
--- a/src/components/views/rooms/AppsDrawer.tsx
+++ b/src/components/views/rooms/AppsDrawer.tsx
@@ -11,6 +11,7 @@ import classNames from "classnames";
 import { Resizable, type Size } from "re-resizable";
 import { type Room } from "matrix-js-sdk/src/matrix";
 import { type IWidget } from "matrix-widget-api";
+import { clamp, percentageOf, percentageWithin } from "@element-hq/web-shared-components";
 
 import AppTile from "../elements/AppTile";
 import dis from "../../../dispatcher/dispatcher";
@@ -22,16 +23,15 @@ import ResizeHandle from "../elements/ResizeHandle";
 import Resizer, { type IConfig } from "../../../resizer/resizer";
 import PercentageDistributor from "../../../resizer/distributors/percentage";
 import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
-import { clamp, percentageOf, percentageWithin } from "../../../utils/numbers";
 import UIStore from "../../../stores/UIStore";
 import { type ActionPayload } from "../../../dispatcher/payloads";
 import Spinner from "../elements/Spinner";
 import SdkConfig from "../../../SdkConfig";
+import { SDKContext } from "../../../contexts/SDKContext";
 
 interface IProps {
     userId: string;
     room: Room;
-    resizeNotifier: ResizeNotifier;
     showApps?: boolean; // Should apps be rendered
     maxHeight: number;
     role?: AriaRole;
@@ -57,8 +57,11 @@ export default class AppsDrawer extends React.Component<IProps, IState> {
         showApps: true,
     };
 
-    public constructor(props: IProps) {
-        super(props);
+    public static contextType = SDKContext;
+    declare public context: React.ContextType<typeof SDKContext>;
+
+    public constructor(props: IProps, context: React.ContextType<typeof SDKContext>) {
+        super(props, context);
 
         this.state = {
             apps: this.getApps(),
@@ -73,7 +76,7 @@ export default class AppsDrawer extends React.Component<IProps, IState> {
     public componentDidMount(): void {
         this.unmounted = false;
 
-        this.props.resizeNotifier.on("isResizing", this.onIsResizing);
+        this.context.resizeNotifier.on("isResizing", this.onIsResizing);
 
         ScalarMessaging.startListening();
         WidgetLayoutStore.instance.on(WidgetLayoutStore.emissionForRoom(this.props.room), this.updateApps);
@@ -88,7 +91,7 @@ export default class AppsDrawer extends React.Component<IProps, IState> {
         if (this.resizeContainer) {
             this.resizer.detach();
         }
-        this.props.resizeNotifier.off("isResizing", this.onIsResizing);
+        this.context.resizeNotifier.off("isResizing", this.onIsResizing);
     }
 
     private onIsResizing = (resizing: boolean): void => {
@@ -281,7 +284,7 @@ export default class AppsDrawer extends React.Component<IProps, IState> {
                     className="mx_AppsDrawer_resizer"
                     handleWrapperClass="mx_AppsDrawer_resizer_container"
                     handleClass="mx_AppsDrawer_resizer_container_handle"
-                    resizeNotifier={this.props.resizeNotifier}
+                    resizeNotifier={this.context.resizeNotifier}
                 >
                     {appContainers}
                 </PersistentVResizer>
diff --git a/src/components/views/rooms/AuxPanel.tsx b/src/components/views/rooms/AuxPanel.tsx
index 9e34a6f40d..f547c29d2e 100644
--- a/src/components/views/rooms/AuxPanel.tsx
+++ b/src/components/views/rooms/AuxPanel.tsx
@@ -13,7 +13,6 @@ import AppsDrawer from "./AppsDrawer";
 import SettingsStore from "../../../settings/SettingsStore";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 import { UIFeature } from "../../../settings/UIFeature";
-import type ResizeNotifier from "../../../utils/ResizeNotifier";
 import LegacyCallViewForRoom from "../voip/LegacyCallViewForRoom";
 import { objectHasDiff } from "../../../utils/objects";
 
@@ -22,7 +21,6 @@ interface IProps {
     room: Room;
     userId: string;
     showApps: boolean; // Render apps
-    resizeNotifier: ResizeNotifier;
     children?: ReactNode;
 }
 
@@ -36,23 +34,12 @@ export default class AuxPanel extends React.Component<IProps> {
     }
 
     public render(): React.ReactNode {
-        const callView = (
-            <LegacyCallViewForRoom
-                roomId={this.props.room.roomId}
-                resizeNotifier={this.props.resizeNotifier}
-                showApps={this.props.showApps}
-            />
-        );
+        const callView = <LegacyCallViewForRoom roomId={this.props.room.roomId} showApps={this.props.showApps} />;
 
         let appsDrawer;
         if (SettingsStore.getValue(UIFeature.Widgets)) {
             appsDrawer = (
-                <AppsDrawer
-                    room={this.props.room}
-                    userId={this.props.userId}
-                    showApps={this.props.showApps}
-                    resizeNotifier={this.props.resizeNotifier}
-                />
+                <AppsDrawer room={this.props.room} userId={this.props.userId} showApps={this.props.showApps} />
             );
         }
 
diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx
index 23111939c2..d15e90e394 100644
--- a/src/components/views/rooms/BasicMessageComposer.tsx
+++ b/src/components/views/rooms/BasicMessageComposer.tsx
@@ -244,7 +244,10 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         if (isTyping && this.props.model.parts[0].type === "command") {
             const { cmd } = parseCommandString(this.props.model.parts[0].text);
             const command = CommandMap.get(cmd!);
-            if (!command?.isEnabled(MatrixClientPeg.get()) || command.category !== CommandCategories.messages) {
+            if (
+                !command?.isEnabled(MatrixClientPeg.get(), this.props.room.roomId) ||
+                command.category !== CommandCategories.messages
+            ) {
                 isTyping = false;
             }
         }
@@ -479,6 +482,11 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
 
     private onKeyDown = (event: React.KeyboardEvent): void => {
         if (!this.editorRef.current) return;
+        // Ignore any keypress while doing IME compositions to prevent cursor position issues
+        // This matches the behavior in SendMessageComposer and EditMessageComposer
+        if (this.isComposing(event)) {
+            return;
+        }
         if (this.isSafari && event.which == 229) {
             // Swallow the extra keyDown by Safari
             event.stopPropagation();
diff --git a/src/components/views/rooms/CollapsibleButton.tsx b/src/components/views/rooms/CollapsibleButton.tsx
index 60d82eb27f..158a4e426b 100644
--- a/src/components/views/rooms/CollapsibleButton.tsx
+++ b/src/components/views/rooms/CollapsibleButton.tsx
@@ -7,7 +7,6 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type RefObject, useContext } from "react";
-import classNames from "classnames";
 
 import AccessibleButton, { type ButtonProps } from "../elements/AccessibleButton";
 import { OverflowMenuContext } from "./MessageComposerButtons";
@@ -16,24 +15,16 @@ import { IconizedContextMenuOption } from "../context_menus/IconizedContextMenu"
 interface Props extends Omit<ButtonProps<"div">, "element"> {
     inputRef?: RefObject<HTMLElement | null>;
     title: string;
-    iconClassName: string;
 }
 
-export const CollapsibleButton: React.FC<Props> = ({
-    title,
-    children,
-    className,
-    iconClassName,
-    inputRef,
-    ...props
-}) => {
+export const CollapsibleButton: React.FC<Props> = ({ title, children, className, inputRef, ...props }) => {
     const inOverflowMenu = !!useContext(OverflowMenuContext);
     if (inOverflowMenu) {
-        return <IconizedContextMenuOption {...props} iconClassName={iconClassName} label={title} inputRef={inputRef} />;
+        return <IconizedContextMenuOption {...props} icon={children} label={title} inputRef={inputRef} />;
     }
 
     return (
-        <AccessibleButton {...props} title={title} className={classNames(className, iconClassName)} ref={inputRef}>
+        <AccessibleButton {...props} title={title} className={className} ref={inputRef}>
             {children}
         </AccessibleButton>
     );
diff --git a/src/components/views/rooms/E2EIcon.tsx b/src/components/views/rooms/E2EIcon.tsx
index e4f19762ff..72b4b36bd3 100644
--- a/src/components/views/rooms/E2EIcon.tsx
+++ b/src/components/views/rooms/E2EIcon.tsx
@@ -10,6 +10,7 @@ Please see LICENSE files in the repository root for full details.
 import React, { type JSX, type ComponentProps, type CSSProperties } from "react";
 import classNames from "classnames";
 import { Tooltip } from "@vector-im/compound-web";
+import { ErrorSolidIcon, ShieldIcon, LockSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t, _td, type TranslationKey } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
@@ -32,31 +33,20 @@ interface Props {
     onClick?: () => void;
     hideTooltip?: boolean;
     tooltipPlacement?: ComponentProps<typeof Tooltip>["placement"];
-    bordered?: boolean;
     status: E2EStatus;
     isUser?: boolean;
 }
 
-const E2EIcon: React.FC<Props> = ({
-    isUser,
-    status,
-    className,
-    size,
-    onClick,
-    hideTooltip,
-    tooltipPlacement,
-    bordered,
-}) => {
-    const classes = classNames(
-        {
-            mx_E2EIcon: true,
-            mx_E2EIcon_bordered: bordered,
-            mx_E2EIcon_warning: status === E2EStatus.Warning,
-            mx_E2EIcon_normal: status === E2EStatus.Normal,
-            mx_E2EIcon_verified: status === E2EStatus.Verified,
-        },
-        className,
-    );
+const icons: Record<E2EStatus, JSX.Element> = {
+    [E2EStatus.Warning]: <ErrorSolidIcon className="mx_E2EIcon_warning" />,
+    [E2EStatus.Normal]: <LockSolidIcon className="mx_E2EIcon_normal" />,
+    [E2EStatus.Verified]: <ShieldIcon className="mx_E2EIcon_verified" />,
+};
+
+const E2EIcon: React.FC<Props> = ({ isUser, status, className, size, onClick, hideTooltip, tooltipPlacement }) => {
+    const icon = icons[status];
+
+    const classes = classNames("mx_E2EIcon", className);
 
     let e2eTitle: TranslationKey | undefined;
     if (isUser) {
@@ -74,9 +64,17 @@ const E2EIcon: React.FC<Props> = ({
 
     let content: JSX.Element;
     if (onClick) {
-        content = <AccessibleButton onClick={onClick} className={classes} style={style} />;
+        content = (
+            <AccessibleButton onClick={onClick} className={classes} style={style} data-testid="e2e-icon">
+                {icon}
+            </AccessibleButton>
+        );
     } else {
-        content = <div className={classes} style={style} />;
+        content = (
+            <div className={classes} style={style} data-testid="e2e-icon">
+                {icon}
+            </div>
+        );
     }
 
     if (!e2eTitle || hideTooltip) {
diff --git a/src/components/views/rooms/EditMessageComposer.tsx b/src/components/views/rooms/EditMessageComposer.tsx
index 92d60b7571..51cd5093bf 100644
--- a/src/components/views/rooms/EditMessageComposer.tsx
+++ b/src/components/views/rooms/EditMessageComposer.tsx
@@ -43,7 +43,7 @@ import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { PosthogAnalytics } from "../../../PosthogAnalytics";
 import { editorRoomKey, editorStateKey } from "../../../Editing";
 import type DocumentOffset from "../../../editor/offset";
-import { attachMentions, attachRelation } from "./SendMessageComposer";
+import { attachMentions, attachRelation } from "../../../utils/messages";
 import { filterBoolean } from "../../../utils/arrays";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 
@@ -312,7 +312,7 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
         if (this.isContentModified(newContent)) {
             const roomId = editedEvent.getRoomId()!;
             if (!containsEmote(this.model) && isSlashCommand(this.model)) {
-                const [cmd, args, commandText] = getSlashCommand(this.model);
+                const [cmd, args, commandText] = getSlashCommand(roomId, this.model);
                 if (cmd) {
                     const threadId = editedEvent?.getThread()?.id || null;
                     const [content, commandSuccessful] = await runSlashCommand(
diff --git a/src/components/views/rooms/EmojiButton.tsx b/src/components/views/rooms/EmojiButton.tsx
index 9da01ae92f..bc973d7b57 100644
--- a/src/components/views/rooms/EmojiButton.tsx
+++ b/src/components/views/rooms/EmojiButton.tsx
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import classNames from "classnames";
 import React, { type JSX, useContext } from "react";
+import { ReactionIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import ContextMenu, { aboveLeftOf, type MenuProps, useContextMenu } from "../../structures/ContextMenu";
@@ -34,7 +35,7 @@ export function EmojiButton({ addEmoji, menuPosition, className }: IEmojiButtonP
         };
 
         contextMenu = (
-            <ContextMenu {...position} onFinished={onFinished} managed={false}>
+            <ContextMenu {...position} onFinished={onFinished} managed={false} focusLock>
                 <EmojiPicker onChoose={addEmoji} onFinished={onFinished} />
             </ContextMenu>
         );
@@ -50,11 +51,12 @@ export function EmojiButton({ addEmoji, menuPosition, className }: IEmojiButtonP
         <>
             <CollapsibleButton
                 className={computedClassName}
-                iconClassName="mx_EmojiButton_icon"
                 onClick={openMenu}
                 title={_t("common|emoji")}
                 inputRef={button}
-            />
+            >
+                <ReactionIcon />
+            </CollapsibleButton>
 
             {contextMenu}
         </>
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index a744464cba..996b19de4d 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -34,13 +34,13 @@ import {
     type UserVerificationStatus,
 } from "matrix-js-sdk/src/crypto-api";
 import { Tooltip } from "@vector-im/compound-web";
+import { uniqueId } from "lodash";
 import { throttle } from "lodash";
 
 import ReplyChain from "../elements/ReplyChain";
 import { _t } from "../../../languageHandler";
 import dis from "../../../dispatcher/dispatcher";
 import { Layout } from "../../../settings/enums/Layout";
-import { formatTime } from "../../../DateUtils";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { DecryptionFailureBody } from "../messages/DecryptionFailureBody";
 import RoomAvatar from "../avatars/RoomAvatar";
@@ -65,7 +65,7 @@ import { getEventDisplayInfo } from "../../../utils/EventRenderingUtils";
 import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext";
 import { MediaEventHelper } from "../../../utils/MediaEventHelper";
 import { type ButtonEvent } from "../elements/AccessibleButton";
-import { copyPlaintext, getSelectedText } from "../../../utils/strings";
+import { copyPlaintext } from "../../../utils/strings";
 import { DecryptionFailureTracker } from "../../../DecryptionFailureTracker";
 import RedactedBody from "../messages/RedactedBody";
 import { type ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
@@ -77,13 +77,13 @@ import ThreadSummary, { ThreadMessagePreview } from "./ThreadSummary";
 import { ReadReceiptGroup } from "./ReadReceiptGroup";
 import { type ShowThreadPayload } from "../../../dispatcher/payloads/ShowThreadPayload";
 import { isLocalRoom } from "../../../utils/localRoom/isLocalRoom";
-import { ElementCall } from "../../../models/Call";
 import { UnreadNotificationBadge } from "./NotificationBadge/UnreadNotificationBadge";
 import { EventTileThreadToolbar } from "./EventTile/EventTileThreadToolbar";
 import { getLateEventInfo } from "../../structures/grouper/LateEventGrouper";
 import PinningUtils from "../../../utils/PinningUtils";
 import { PinnedMessageBadge } from "../messages/PinnedMessageBadge";
 import { EventPreview } from "./EventPreview";
+import { ElementCallEventType } from "../../../call-types";
 
 export type GetRelationsForEvent = (
     eventId: string,
@@ -253,6 +253,7 @@ interface IState {
     reactions?: Relations | null | undefined;
 
     hover: boolean;
+    focusWithin: boolean;
 
     // Position of the context menu
     contextMenu?: {
@@ -301,6 +302,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
     declare public context: React.ContextType<typeof RoomContext>;
 
     private unmounted = false;
+    private readonly id = uniqueId();
 
     public constructor(props: EventTileProps, context: React.ContextType<typeof RoomContext>) {
         super(props, context);
@@ -318,6 +320,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
             reactions: this.getReactions(),
 
             hover: false,
+            focusWithin: false,
 
             thread,
 
@@ -364,6 +367,9 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
         // We only show the 'sent' receipt on the last successful event.
         if (!this.props.lastSuccessful) return false;
 
+        // Don't show this in the thread view as it conflicts with the thread counter.
+        if (this.context.timelineRenderingType === TimelineRenderingType.ThreadsList) return false;
+
         // Check to make sure the sending state is appropriate. A null/undefined send status means
         // that the message is 'sent', so we're just double checking that it's explicitly not sent.
         if (this.props.eventSendStatus && this.props.eventSendStatus !== EventStatus.SENT) return false;
@@ -671,6 +677,8 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
         if (this.context.timelineRenderingType === TimelineRenderingType.Notification) return false;
         if (this.context.timelineRenderingType === TimelineRenderingType.ThreadsList) return false;
 
+        if (this.props.isRedacted) return false;
+
         const cli = MatrixClientPeg.safeGet();
         const actions = cli.getPushActionsForEvent(this.props.mxEvent.replacingEvent() || this.props.mxEvent);
         // get the actions for the previous version of the event too if it is an edit
@@ -734,11 +742,6 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
         if (this.state.shieldColour !== EventShieldColour.NONE) {
             let shieldReasonMessage: string;
             switch (this.state.shieldReason) {
-                case null:
-                case EventShieldReason.UNKNOWN:
-                    shieldReasonMessage = _t("error|unknown");
-                    break;
-
                 case EventShieldReason.UNVERIFIED_IDENTITY:
                     shieldReasonMessage = _t("encryption|event_shield_reason_unverified_identity");
                     break;
@@ -766,6 +769,14 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                 case EventShieldReason.VERIFICATION_VIOLATION:
                     shieldReasonMessage = _t("timeline|decryption_failure|sender_identity_previously_verified");
                     break;
+
+                case EventShieldReason.MISMATCHED_SENDER:
+                    shieldReasonMessage = _t("encryption|event_shield_reason_mismatched_sender");
+                    break;
+
+                default:
+                    shieldReasonMessage = _t("error|unknown");
+                    break;
             }
 
             if (this.state.shieldColour === EventShieldColour.GREY) {
@@ -857,10 +868,8 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
         // Electron layer (webcontents-handler.ts)
         if (clickTarget instanceof HTMLImageElement) return;
 
-        // Return if we're in a browser and click either an a tag or we have
-        // selected text, as in those cases we want to use the native browser
-        // menu
-        if (!PlatformPeg.get()?.allowOverridingNativeContextMenus() && (getSelectedText() || anchorElement)) return;
+        // Return if we're in a browser and click either an a tag, as in those cases we want to use the native browser menu
+        if (!PlatformPeg.get()?.allowOverridingNativeContextMenus() && anchorElement) return;
 
         // We don't want to show the menu when editing a message
         if (this.props.editState) return;
@@ -932,6 +941,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
     public render(): ReactNode {
         const msgtype = this.props.mxEvent.getContent().msgtype;
         const eventType = this.props.mxEvent.getType();
+
         const {
             hasRenderer,
             isBubbleMessage,
@@ -1000,7 +1010,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
             mx_EventTile_highlight: this.shouldHighlight(),
             mx_EventTile_selected: this.props.isSelectedEvent || this.state.contextMenu,
             mx_EventTile_continuation:
-                isContinuation || eventType === EventType.CallInvite || ElementCall.CALL_EVENT_TYPE.matches(eventType),
+                isContinuation || eventType === EventType.CallInvite || ElementCallEventType.matches(eventType),
             mx_EventTile_last: this.props.last,
             mx_EventTile_lastInSection: this.props.lastInSection,
             mx_EventTile_contextual: this.props.contextual,
@@ -1053,7 +1063,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
         } else if (
             (this.props.continuation && this.context.timelineRenderingType !== TimelineRenderingType.File) ||
             eventType === EventType.CallInvite ||
-            ElementCall.CALL_EVENT_TYPE.matches(eventType)
+            ElementCallEventType.matches(eventType)
         ) {
             // no avatar or sender profile for continuation messages and call tiles
             avatarSize = null;
@@ -1133,6 +1143,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
             (this.props.alwaysShowTimestamps ||
                 this.props.last ||
                 this.state.hover ||
+                this.state.focusWithin ||
                 this.state.actionBarFocused ||
                 Boolean(this.state.contextMenu));
 
@@ -1146,20 +1157,32 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
             ts = this.props.mxEvent.getTs();
         }
 
-        const messageTimestamp = (
+        const messageTimestampProps = {
+            showRelative: this.context.timelineRenderingType === TimelineRenderingType.ThreadsList,
+            showTwelveHour: this.props.isTwelveHour,
+            ts,
+            receivedTs: getLateEventInfo(this.props.mxEvent)?.received_ts,
+        };
+        const messageTimestamp = <MessageTimestamp {...messageTimestampProps} />;
+        const linkedMessageTimestamp = (
             <MessageTimestamp
-                showRelative={this.context.timelineRenderingType === TimelineRenderingType.ThreadsList}
-                showTwelveHour={this.props.isTwelveHour}
-                ts={ts}
-                receivedTs={getLateEventInfo(this.props.mxEvent)?.received_ts}
+                {...messageTimestampProps}
+                href={permalink}
+                onClick={this.onPermalinkClicked}
+                onContextMenu={this.onTimestampContextMenu}
             />
         );
 
-        const timestamp = showTimestamp && ts ? messageTimestamp : null;
+        const useIRCLayout = this.props.layout === Layout.IRC;
+        // Used to simplify the UI layout where necessary by not conditionally rendering an element at the start
+        const dummyTimestamp = useIRCLayout ? <span className="mx_MessageTimestamp" /> : null;
+        const timestamp = showTimestamp && ts ? messageTimestamp : dummyTimestamp;
+        const linkedTimestamp =
+            timestamp !== dummyTimestamp && !this.props.hideTimestamp ? linkedMessageTimestamp : dummyTimestamp;
 
         let pinnedMessageBadge: JSX.Element | undefined;
         if (PinningUtils.isPinned(MatrixClientPeg.safeGet(), this.props.mxEvent)) {
-            pinnedMessageBadge = <PinnedMessageBadge />;
+            pinnedMessageBadge = <PinnedMessageBadge aria-describedby={this.id} tabIndex={0} />;
         }
 
         let reactionsRow: JSX.Element | undefined;
@@ -1176,21 +1199,8 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
         // If we have reactions or a pinned message badge, we need a footer
         const hasFooter = Boolean((reactionsRow && this.state.reactions) || pinnedMessageBadge);
 
-        const linkedTimestamp = !this.props.hideTimestamp ? (
-            <a
-                href={permalink}
-                onClick={this.onPermalinkClicked}
-                aria-label={formatTime(new Date(this.props.mxEvent.getTs()), this.props.isTwelveHour)}
-                onContextMenu={this.onTimestampContextMenu}
-            >
-                {timestamp}
-            </a>
-        ) : null;
-
-        const useIRCLayout = this.props.layout === Layout.IRC;
         const groupTimestamp = !useIRCLayout ? linkedTimestamp : null;
         const ircTimestamp = useIRCLayout ? linkedTimestamp : null;
-        const bubbleTimestamp = this.props.layout === Layout.Bubble ? messageTimestamp : undefined;
         const groupPadlock = !useIRCLayout && !isBubbleMessage && this.renderE2EPadlock();
         const ircPadlock = useIRCLayout && !isBubbleMessage && this.renderE2EPadlock();
 
@@ -1221,7 +1231,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                     forExport={this.props.forExport}
                     permalinkCreator={this.props.permalinkCreator}
                     layout={this.props.layout}
-                    alwaysShowTimestamps={this.props.alwaysShowTimestamps || this.state.hover}
+                    alwaysShowTimestamps={this.props.alwaysShowTimestamps || this.state.hover || this.state.focusWithin}
                     isQuoteExpanded={isQuoteExpanded}
                     setQuoteExpanded={this.setQuoteExpanded}
                     getRelationsForEvent={this.props.getRelationsForEvent}
@@ -1246,37 +1256,39 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                         "data-layout": this.props.layout,
                         "data-self": isOwnEvent,
                         "data-event-id": this.props.mxEvent.getId(),
-                        "onMouseEnter": this.onMouseEnter,
-                        "onMouseLeave": this.onMouseLeave,
+                        "onMouseEnter": () => this.setState({ hover: true }),
+                        "onMouseLeave": () => this.setState({ hover: false }),
+                        "onFocus": () => this.setState({ focusWithin: true }),
+                        "onBlur": () => this.setState({ focusWithin: false }),
                     },
                     [
                         <div className="mx_EventTile_senderDetails" key="mx_EventTile_senderDetails">
                             {avatar}
                             {sender}
                         </div>,
-                        <div className={lineClasses} key="mx_EventTile_line" onContextMenu={this.onContextMenu}>
+                        <div
+                            id={this.id}
+                            className={lineClasses}
+                            key="mx_EventTile_line"
+                            onContextMenu={this.onContextMenu}
+                        >
                             {this.renderContextMenu()}
                             {replyChain}
-                            {renderTile(
-                                TimelineRenderingType.Thread,
-                                {
-                                    ...this.props,
+                            {renderTile(TimelineRenderingType.Thread, {
+                                ...this.props,
 
-                                    // overrides
-                                    ref: this.tile,
-                                    isSeeingThroughMessageHiddenForModeration,
+                                // overrides
+                                ref: this.tile,
+                                isSeeingThroughMessageHiddenForModeration,
 
-                                    // appease TS
-                                    highlights: this.props.highlights,
-                                    highlightLink: this.props.highlightLink,
-                                    permalinkCreator: this.props.permalinkCreator!,
-                                },
-                                this.context.showHiddenEvents,
-                            )}
+                                // appease TS
+                                highlights: this.props.highlights,
+                                highlightLink: this.props.highlightLink,
+                                permalinkCreator: this.props.permalinkCreator!,
+                                showHiddenEvents: this.context.showHiddenEvents,
+                            })}
                             {actionBar}
-                            <a href={permalink} onClick={this.onPermalinkClicked}>
-                                {timestamp}
-                            </a>
+                            {linkedTimestamp}
                             {msgOption}
                         </div>,
                         hasFooter && (
@@ -1306,8 +1318,10 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                         "data-shape": this.context.timelineRenderingType,
                         "data-self": isOwnEvent,
                         "data-has-reply": !!replyChain,
-                        "onMouseEnter": this.onMouseEnter,
-                        "onMouseLeave": this.onMouseLeave,
+                        "onMouseEnter": () => this.setState({ hover: true }),
+                        "onMouseLeave": () => this.setState({ hover: false }),
+                        "onFocus": () => this.setState({ focusWithin: true }),
+                        "onBlur": () => this.setState({ focusWithin: false }),
                         "onClick": (ev: MouseEvent) => {
                             const target = ev.currentTarget as HTMLElement;
                             let index = -1;
@@ -1403,22 +1417,19 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                         </a>,
                         <div className={lineClasses} key="mx_EventTile_line" onContextMenu={this.onContextMenu}>
                             {this.renderContextMenu()}
-                            {renderTile(
-                                TimelineRenderingType.File,
-                                {
-                                    ...this.props,
+                            {renderTile(TimelineRenderingType.File, {
+                                ...this.props,
 
-                                    // overrides
-                                    ref: this.tile,
-                                    isSeeingThroughMessageHiddenForModeration,
+                                // overrides
+                                ref: this.tile,
+                                isSeeingThroughMessageHiddenForModeration,
 
-                                    // appease TS
-                                    highlights: this.props.highlights,
-                                    highlightLink: this.props.highlightLink,
-                                    permalinkCreator: this.props.permalinkCreator,
-                                },
-                                this.context.showHiddenEvents,
-                            )}
+                                // appease TS
+                                highlights: this.props.highlights,
+                                highlightLink: this.props.highlightLink,
+                                permalinkCreator: this.props.permalinkCreator,
+                                showHiddenEvents: this.context.showHiddenEvents,
+                            })}
                         </div>,
                     ],
                 );
@@ -1440,36 +1451,39 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                         "data-self": isOwnEvent,
                         "data-event-id": this.props.mxEvent.getId(),
                         "data-has-reply": !!replyChain,
-                        "onMouseEnter": this.onMouseEnter,
-                        "onMouseLeave": this.onMouseLeave,
+                        "onMouseEnter": () => this.setState({ hover: true }),
+                        "onMouseLeave": () => this.setState({ hover: false }),
+                        "onFocus": () => this.setState({ focusWithin: true }),
+                        "onBlur": () => this.setState({ focusWithin: false }),
                     },
                     <>
                         {ircTimestamp}
                         {sender}
                         {ircPadlock}
                         {avatar}
-                        <div className={lineClasses} key="mx_EventTile_line" onContextMenu={this.onContextMenu}>
+                        <div
+                            id={this.id}
+                            className={lineClasses}
+                            key="mx_EventTile_line"
+                            onContextMenu={this.onContextMenu}
+                        >
                             {this.renderContextMenu()}
                             {groupTimestamp}
                             {groupPadlock}
                             {replyChain}
-                            {renderTile(
-                                this.context.timelineRenderingType,
-                                {
-                                    ...this.props,
+                            {renderTile(this.context.timelineRenderingType, {
+                                ...this.props,
 
-                                    // overrides
-                                    ref: this.tile,
-                                    isSeeingThroughMessageHiddenForModeration,
-                                    timestamp: bubbleTimestamp,
+                                // overrides
+                                ref: this.tile,
+                                isSeeingThroughMessageHiddenForModeration,
 
-                                    // appease TS
-                                    highlights: this.props.highlights,
-                                    highlightLink: this.props.highlightLink,
-                                    permalinkCreator: this.props.permalinkCreator,
-                                },
-                                this.context.showHiddenEvents,
-                            )}
+                                // appease TS
+                                highlights: this.props.highlights,
+                                highlightLink: this.props.highlightLink,
+                                permalinkCreator: this.props.permalinkCreator,
+                                showHiddenEvents: this.context.showHiddenEvents,
+                            })}
                             {actionBar}
                             {this.props.layout === Layout.IRC && (
                                 <>
diff --git a/src/components/views/rooms/JumpToBottomButton.tsx b/src/components/views/rooms/JumpToBottomButton.tsx
index b2a69cb5fe..7ea7a7c692 100644
--- a/src/components/views/rooms/JumpToBottomButton.tsx
+++ b/src/components/views/rooms/JumpToBottomButton.tsx
@@ -7,6 +7,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import classNames from "classnames";
+import { ChevronDownIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import AccessibleButton, { type ButtonEvent } from "../elements/AccessibleButton";
@@ -32,7 +33,9 @@ const JumpToBottomButton: React.FC<IProps> = (props) => {
                 className="mx_JumpToBottomButton_scrollDown"
                 title={_t("room|jump_to_bottom_button")}
                 onClick={props.onScrollToBottomClick}
-            />
+            >
+                <ChevronDownIcon />
+            </AccessibleButton>
             {badge}
         </div>
     );
diff --git a/src/components/views/rooms/LegacyRoomList.tsx b/src/components/views/rooms/LegacyRoomList.tsx
index 6be226a172..95b62cf4c9 100644
--- a/src/components/views/rooms/LegacyRoomList.tsx
+++ b/src/components/views/rooms/LegacyRoomList.tsx
@@ -8,6 +8,13 @@ Please see LICENSE files in the repository root for full details.
 
 import { EventType, type Room, RoomType } from "matrix-js-sdk/src/matrix";
 import React, { type JSX, type ComponentType, createRef, type ReactComponentElement, type SyntheticEvent } from "react";
+import {
+    PlusIcon,
+    UserAddSolidIcon,
+    RoomIcon,
+    SearchIcon,
+    ShareIcon,
+} from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { type IState as IRovingTabIndexState, RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex.tsx";
 import MatrixClientContext from "../../../contexts/MatrixClientContext.tsx";
@@ -67,6 +74,7 @@ import { getKeyBindingsManager } from "../../../KeyBindingsManager.ts";
 import AccessibleButton from "../elements/AccessibleButton.tsx";
 import { Landmark, LandmarkNavigation } from "../../../accessibility/LandmarkNavigation.ts";
 import LegacyCallHandler, { LegacyCallHandlerEvent } from "../../../LegacyCallHandler.tsx";
+import { Icon as HashVideoIcon } from "../../../../res/img/element-icons/roomlist/hash-video.svg";
 
 interface IProps {
     onKeyDown: (ev: React.KeyboardEvent, state: IRovingTabIndexState) => void;
@@ -142,7 +150,7 @@ const DmAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex, dispatcher = default
                         {showCreateRooms && (
                             <IconizedContextMenuOption
                                 label={_t("action|start_new_chat")}
-                                iconClassName="mx_LegacyRoomList_iconStartChat"
+                                icon={<UserAddSolidIcon />}
                                 onClick={(e) => {
                                     e.preventDefault();
                                     e.stopPropagation();
@@ -158,7 +166,7 @@ const DmAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex, dispatcher = default
                         {showInviteUsers && (
                             <IconizedContextMenuOption
                                 label={_t("action|invite_to_space")}
-                                iconClassName="mx_LegacyRoomList_iconInvite"
+                                icon={<ShareIcon />}
                                 onClick={(e) => {
                                     e.preventDefault();
                                     e.stopPropagation();
@@ -230,7 +238,7 @@ const UntaggedAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex }) => {
             <IconizedContextMenuOptionList first>
                 <IconizedContextMenuOption
                     label={_t("action|explore_rooms")}
-                    iconClassName="mx_LegacyRoomList_iconExplore"
+                    icon={<SearchIcon />}
                     onClick={(e) => {
                         e.preventDefault();
                         e.stopPropagation();
@@ -247,7 +255,7 @@ const UntaggedAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex }) => {
                     <>
                         <IconizedContextMenuOption
                             label={_t("action|new_room")}
-                            iconClassName="mx_LegacyRoomList_iconNewRoom"
+                            icon={<PlusIcon />}
                             onClick={(e) => {
                                 e.preventDefault();
                                 e.stopPropagation();
@@ -261,7 +269,7 @@ const UntaggedAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex }) => {
                         {videoRoomsEnabled && (
                             <IconizedContextMenuOption
                                 label={_t("action|new_video_room")}
-                                iconClassName="mx_LegacyRoomList_iconNewVideoRoom"
+                                icon={<HashVideoIcon />}
                                 onClick={(e) => {
                                     e.preventDefault();
                                     e.stopPropagation();
@@ -279,7 +287,7 @@ const UntaggedAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex }) => {
                         )}
                         <IconizedContextMenuOption
                             label={_t("action|add_existing_room")}
-                            iconClassName="mx_LegacyRoomList_iconAddExistingRoom"
+                            icon={<RoomIcon />}
                             onClick={(e) => {
                                 e.preventDefault();
                                 e.stopPropagation();
@@ -300,7 +308,7 @@ const UntaggedAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex }) => {
                     <>
                         <IconizedContextMenuOption
                             label={_t("action|new_room")}
-                            iconClassName="mx_LegacyRoomList_iconNewRoom"
+                            icon={<PlusIcon />}
                             onClick={(e) => {
                                 e.preventDefault();
                                 e.stopPropagation();
@@ -312,7 +320,7 @@ const UntaggedAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex }) => {
                         {videoRoomsEnabled && (
                             <IconizedContextMenuOption
                                 label={_t("action|new_video_room")}
-                                iconClassName="mx_LegacyRoomList_iconNewVideoRoom"
+                                icon={<HashVideoIcon />}
                                 onClick={(e) => {
                                     e.preventDefault();
                                     e.stopPropagation();
@@ -333,7 +341,7 @@ const UntaggedAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex }) => {
                 {showExploreRooms ? (
                     <IconizedContextMenuOption
                         label={_t("action|explore_public_rooms")}
-                        iconClassName="mx_LegacyRoomList_iconExplore"
+                        icon={<SearchIcon />}
                         onClick={(e) => {
                             e.preventDefault();
                             e.stopPropagation();
diff --git a/src/components/views/rooms/LegacyRoomListHeader.tsx b/src/components/views/rooms/LegacyRoomListHeader.tsx
index 719831d865..a3c96ff60f 100644
--- a/src/components/views/rooms/LegacyRoomListHeader.tsx
+++ b/src/components/views/rooms/LegacyRoomListHeader.tsx
@@ -9,6 +9,12 @@ Please see LICENSE files in the repository root for full details.
 import { ClientEvent, EventType, type Room, RoomEvent, RoomType } from "matrix-js-sdk/src/matrix";
 import React, { type JSX, useContext, useEffect, useState } from "react";
 import { Tooltip } from "@vector-im/compound-web";
+import {
+    PlusIcon,
+    UserAddSolidIcon,
+    SearchIcon,
+    UserAddIcon,
+} from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { shouldShowComponent } from "../../../customisations/helpers/UIComponents";
@@ -51,6 +57,7 @@ import IconizedContextMenu, {
 import SpaceContextMenu from "../context_menus/SpaceContextMenu";
 import InlineSpinner from "../elements/InlineSpinner";
 import { HomeButtonContextMenu } from "../spaces/SpacePanel";
+import { Icon as HashVideoIcon } from "../../../../res/img/element-icons/roomlist/hash-video.svg";
 
 const contextMenuBelow = (elementRect: DOMRect): MenuProps => {
     // align the context menu's icons with the icon which opened the context menu
@@ -178,7 +185,7 @@ const LegacyRoomListHeader: React.FC<IProps> = ({ onVisibilityChange }) => {
             inviteOption = (
                 <IconizedContextMenuOption
                     label={_t("action|invite")}
-                    iconClassName="mx_LegacyRoomListHeader_iconInvite"
+                    icon={<UserAddIcon />}
                     onClick={(e) => {
                         e.preventDefault();
                         e.stopPropagation();
@@ -194,7 +201,7 @@ const LegacyRoomListHeader: React.FC<IProps> = ({ onVisibilityChange }) => {
             newRoomOptions = (
                 <>
                     <IconizedContextMenuOption
-                        iconClassName="mx_LegacyRoomListHeader_iconNewRoom"
+                        icon={<PlusIcon />}
                         label={_t("action|new_room")}
                         onClick={(e) => {
                             e.preventDefault();
@@ -206,7 +213,7 @@ const LegacyRoomListHeader: React.FC<IProps> = ({ onVisibilityChange }) => {
                     />
                     {videoRoomsEnabled && (
                         <IconizedContextMenuOption
-                            iconClassName="mx_LegacyRoomListHeader_iconNewVideoRoom"
+                            icon={<HashVideoIcon />}
                             label={_t("action|new_video_room")}
                             onClick={(e) => {
                                 e.preventDefault();
@@ -236,7 +243,7 @@ const LegacyRoomListHeader: React.FC<IProps> = ({ onVisibilityChange }) => {
                     {newRoomOptions}
                     <IconizedContextMenuOption
                         label={_t("action|explore_rooms")}
-                        iconClassName="mx_LegacyRoomListHeader_iconExplore"
+                        icon={<SearchIcon />}
                         onClick={(e) => {
                             e.preventDefault();
                             e.stopPropagation();
@@ -251,7 +258,7 @@ const LegacyRoomListHeader: React.FC<IProps> = ({ onVisibilityChange }) => {
                     />
                     <IconizedContextMenuOption
                         label={_t("action|add_existing_room")}
-                        iconClassName="mx_LegacyRoomListHeader_iconPlus"
+                        icon={<PlusIcon />}
                         onClick={(e) => {
                             e.preventDefault();
                             e.stopPropagation();
@@ -264,7 +271,7 @@ const LegacyRoomListHeader: React.FC<IProps> = ({ onVisibilityChange }) => {
                     {canCreateSpaces && (
                         <IconizedContextMenuOption
                             label={_t("room_list|add_space_label")}
-                            iconClassName="mx_LegacyRoomListHeader_iconPlus"
+                            icon={<PlusIcon />}
                             onClick={(e) => {
                                 e.preventDefault();
                                 e.stopPropagation();
@@ -289,7 +296,7 @@ const LegacyRoomListHeader: React.FC<IProps> = ({ onVisibilityChange }) => {
                 <>
                     <IconizedContextMenuOption
                         label={_t("action|start_new_chat")}
-                        iconClassName="mx_LegacyRoomListHeader_iconStartChat"
+                        icon={<UserAddSolidIcon />}
                         onClick={(e) => {
                             e.preventDefault();
                             e.stopPropagation();
@@ -300,7 +307,7 @@ const LegacyRoomListHeader: React.FC<IProps> = ({ onVisibilityChange }) => {
                     />
                     <IconizedContextMenuOption
                         label={_t("action|new_room")}
-                        iconClassName="mx_LegacyRoomListHeader_iconNewRoom"
+                        icon={<PlusIcon />}
                         onClick={(e) => {
                             e.preventDefault();
                             e.stopPropagation();
@@ -312,7 +319,7 @@ const LegacyRoomListHeader: React.FC<IProps> = ({ onVisibilityChange }) => {
                     {videoRoomsEnabled && (
                         <IconizedContextMenuOption
                             label={_t("action|new_video_room")}
-                            iconClassName="mx_LegacyRoomListHeader_iconNewVideoRoom"
+                            icon={<HashVideoIcon />}
                             onClick={(e) => {
                                 e.preventDefault();
                                 e.stopPropagation();
@@ -333,7 +340,7 @@ const LegacyRoomListHeader: React.FC<IProps> = ({ onVisibilityChange }) => {
             joinRoomOpt = (
                 <IconizedContextMenuOption
                     label={_t("room_list|join_public_room_label")}
-                    iconClassName="mx_LegacyRoomListHeader_iconExplore"
+                    icon={<SearchIcon />}
                     onClick={(e) => {
                         e.preventDefault();
                         e.stopPropagation();
diff --git a/src/components/views/rooms/LinkPreviewGroup.tsx b/src/components/views/rooms/LinkPreviewGroup.tsx
index 69c98cb6c9..471220bfeb 100644
--- a/src/components/views/rooms/LinkPreviewGroup.tsx
+++ b/src/components/views/rooms/LinkPreviewGroup.tsx
@@ -30,7 +30,7 @@ interface IProps {
 const LinkPreviewGroup: React.FC<IProps> = ({ links, mxEvent, onCancelClick }) => {
     const cli = useContext(MatrixClientContext);
     const [expanded, toggleExpanded] = useStateToggle();
-    const [mediaVisible] = useMediaVisible(mxEvent.getId(), mxEvent.getRoomId());
+    const [mediaVisible] = useMediaVisible(mxEvent);
 
     const ts = mxEvent.getTs();
     const previews = useAsyncMemo<[string, IPreviewUrlResponse][]>(
diff --git a/src/components/views/rooms/LiveContentSummary.tsx b/src/components/views/rooms/LiveContentSummary.tsx
index 1f5d36e8d0..ada3209f07 100644
--- a/src/components/views/rooms/LiveContentSummary.tsx
+++ b/src/components/views/rooms/LiveContentSummary.tsx
@@ -10,12 +10,10 @@ import React, { type FC } from "react";
 import classNames from "classnames";
 
 import { _t } from "../../../languageHandler";
-import { type Call } from "../../../models/Call";
-import { useParticipantCount } from "../../../hooks/useCall";
 
 export enum LiveContentType {
     Video,
-    // More coming soon
+    Voice,
 }
 
 interface Props {
@@ -33,6 +31,7 @@ export const LiveContentSummary: FC<Props> = ({ type, text, active, participantC
         <span
             className={classNames("mx_LiveContentSummary_text", {
                 mx_LiveContentSummary_text_video: type === LiveContentType.Video,
+                mx_LiveContentSummary_text_voice: type === LiveContentType.Voice,
                 mx_LiveContentSummary_text_active: active,
             })}
         >
@@ -51,16 +50,3 @@ export const LiveContentSummary: FC<Props> = ({ type, text, active, participantC
         )}
     </span>
 );
-
-interface LiveContentSummaryWithCallProps {
-    call: Call;
-}
-
-export const LiveContentSummaryWithCall: FC<LiveContentSummaryWithCallProps> = ({ call }) => (
-    <LiveContentSummary
-        type={LiveContentType.Video}
-        text={_t("common|video")}
-        active={false}
-        participantCount={useParticipantCount(call)}
-    />
-);
diff --git a/src/components/views/rooms/MemberList/MemberListHeaderView.tsx b/src/components/views/rooms/MemberList/MemberListHeaderView.tsx
index 88fc07881c..af8fe831cf 100644
--- a/src/components/views/rooms/MemberList/MemberListHeaderView.tsx
+++ b/src/components/views/rooms/MemberList/MemberListHeaderView.tsx
@@ -7,10 +7,10 @@ Please see LICENSE files in the repository root for full details.
 
 import { Search, Text, Button, Tooltip, InlineSpinner } from "@vector-im/compound-web";
 import React from "react";
-import InviteIcon from "@vector-im/compound-design-tokens/assets/web/icons/user-add-solid";
+import InviteIcon from "@vector-im/compound-design-tokens/assets/web/icons/user-add";
 import { UserAddIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
+import { Flex } from "@element-hq/web-shared-components";
 
-import { Flex } from "../../../utils/Flex";
 import { type MemberListViewState } from "../../../viewmodels/memberlist/MemberListViewModel";
 import { _t } from "../../../../languageHandler";
 
@@ -19,10 +19,10 @@ interface TooltipProps {
     children: React.ReactNode;
 }
 
-const OptionalTooltip: React.FC<TooltipProps> = ({ canInvite, children }) => {
-    if (canInvite) return children;
+const InviteTooltip: React.FC<TooltipProps> = ({ canInvite, children }) => {
+    const description: string = canInvite ? _t("action|invite") : _t("member_list|invite_button_no_perms_tooltip");
     // If the user isn't allowed to invite others to this room, wrap with a relevant tooltip.
-    return <Tooltip description={_t("member_list|invite_button_no_perms_tooltip")}>{children}</Tooltip>;
+    return <Tooltip description={description}>{children}</Tooltip>;
 };
 
 interface Props {
@@ -42,10 +42,10 @@ const InviteButton: React.FC<Props> = ({ vm }) => {
     if (shouldShowSearch) {
         /// When rendered alongside a search box, the invite button is just an icon.
         return (
-            <OptionalTooltip canInvite={vm.canInvite}>
+            <InviteTooltip canInvite={vm.canInvite}>
                 <Button
                     className="mx_MemberListHeaderView_invite_small"
-                    kind="primary"
+                    kind="secondary"
                     onClick={vm.onInviteButtonClick}
                     size="sm"
                     iconOnly={true}
@@ -54,13 +54,13 @@ const InviteButton: React.FC<Props> = ({ vm }) => {
                     aria-label={_t("action|invite")}
                     type="button"
                 />
-            </OptionalTooltip>
+            </InviteTooltip>
         );
     }
 
     // Without a search box, invite button is a full size button.
     return (
-        <OptionalTooltip canInvite={vm.canInvite}>
+        <InviteTooltip canInvite={vm.canInvite}>
             <Button
                 kind="secondary"
                 size="sm"
@@ -72,7 +72,7 @@ const InviteButton: React.FC<Props> = ({ vm }) => {
             >
                 {_t("action|invite")}
             </Button>
-        </OptionalTooltip>
+        </InviteTooltip>
     );
 };
 
diff --git a/src/components/views/rooms/MemberList/MemberListView.tsx b/src/components/views/rooms/MemberList/MemberListView.tsx
index 0b5629685c..298a9ae19c 100644
--- a/src/components/views/rooms/MemberList/MemberListView.tsx
+++ b/src/components/views/rooms/MemberList/MemberListView.tsx
@@ -6,11 +6,9 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { Form } from "@vector-im/compound-web";
-import React, { type JSX } from "react";
-import { List, type ListRowProps } from "react-virtualized/dist/commonjs/List";
-import { AutoSizer } from "react-virtualized";
+import React, { type JSX, useCallback } from "react";
+import { Flex } from "@element-hq/web-shared-components";
 
-import { Flex } from "../../../utils/Flex";
 import {
     type MemberWithSeparator,
     SEPARATOR,
@@ -21,62 +19,82 @@ import { ThreePidInviteTileView } from "./tiles/ThreePidInviteTileView";
 import { MemberListHeaderView } from "./MemberListHeaderView";
 import BaseCard from "../../right_panel/BaseCard";
 import { _t } from "../../../../languageHandler";
-import { RovingTabIndexProvider } from "../../../../accessibility/RovingTabIndex";
+import { type ListContext, ListView } from "../../../utils/ListView";
 
 interface IProps {
     roomId: string;
     onClose: () => void;
 }
 
+/**
+ * Height of a single member list item
+ */
+const MEMBER_LIST_ITEM_HEIGHT = 56;
+/**
+ * Amount to extend the top and bottom of the viewport by.
+ * From manual testing 15 items seems to be enough to never really see the blank space when scrolling.
+ */
+const EXTENDED_VIEWPORT_HEIGHT = 15 * MEMBER_LIST_ITEM_HEIGHT;
+
 const MemberListView: React.FC<IProps> = (props: IProps) => {
     const vm = useMemberListViewModel(props.roomId);
+    const { isPresenceEnabled, memberCount } = vm;
 
-    const totalRows = vm.members.length;
-
-    const getRowComponent = (item: MemberWithSeparator): JSX.Element => {
+    const getItemKey = useCallback((item: MemberWithSeparator): string => {
         if (item === SEPARATOR) {
-            return <hr className="mx_MemberListView_separator" />;
+            return "separator";
         } else if (item.member) {
-            return <RoomMemberTileView member={item.member} showPresence={vm.isPresenceEnabled} />;
+            return `member-${item.member.userId}`;
         } else {
-            return <ThreePidInviteTileView threePidInvite={item.threePidInvite} />;
+            return `threePidInvite-${item.threePidInvite.event.getContent().public_key}`;
         }
-    };
+    }, []);
 
-    const getRowHeight = ({ index }: { index: number }): number => {
-        if (vm.members[index] === SEPARATOR) {
-            /**
-             * This is a separator of 2px height rendered between
-             * joined and invited members.
-             */
-            return 2;
-        } else if (totalRows && index === totalRows) {
-            /**
-             * The empty spacer div rendered at the bottom should
-             * have a height of 32px.
-             */
-            return 32;
-        } else {
-            /**
-             * The actual member tiles have a height of 56px.
-             */
-            return 56;
-        }
-    };
+    const getItemComponent = useCallback(
+        (
+            index: number,
+            item: MemberWithSeparator,
+            context: ListContext<any>,
+            onFocus: (item: MemberWithSeparator, e: React.FocusEvent) => void,
+        ): JSX.Element => {
+            const itemKey = getItemKey(item);
+            const isRovingItem = itemKey === context.tabIndexKey;
+            const focused = isRovingItem && context.focused;
+            if (item === SEPARATOR) {
+                return <hr className="mx_MemberListView_separator" />;
+            } else if (item.member) {
+                return (
+                    <RoomMemberTileView
+                        item={item}
+                        member={item.member}
+                        showPresence={isPresenceEnabled}
+                        focused={focused}
+                        tabIndex={isRovingItem ? 0 : -1}
+                        index={index}
+                        memberCount={memberCount}
+                        onFocus={onFocus}
+                    />
+                );
+            } else {
+                return (
+                    <ThreePidInviteTileView
+                        item={item}
+                        threePidInvite={item.threePidInvite}
+                        focused={focused}
+                        tabIndex={isRovingItem ? 0 : -1}
+                        memberIndex={index - 1} // Adjust as invites are below the separator
+                        memberCount={memberCount}
+                        onFocus={onFocus}
+                    />
+                );
+            }
+        },
+        [isPresenceEnabled, getItemKey, memberCount],
+    );
 
-    const rowRenderer = ({ key, index, style }: ListRowProps): JSX.Element => {
-        if (index === totalRows) {
-            // We've rendered all the members,
-            // now we render an empty div to add some space to the end of the list.
-            return <div key={key} style={style} />;
-        }
-        const item = vm.members[index];
-        return (
-            <div key={key} style={style}>
-                {getRowComponent(item)}
-            </div>
-        );
-    };
+    const isItemFocusable = useCallback((item: MemberWithSeparator): boolean => {
+        return item !== SEPARATOR;
+    }, []);
 
     return (
         <BaseCard
@@ -87,34 +105,24 @@ const MemberListView: React.FC<IProps> = (props: IProps) => {
             header={_t("common|people")}
             onClose={props.onClose}
         >
-            <RovingTabIndexProvider handleUpDown scrollIntoView>
-                {({ onKeyDownHandler }) => (
-                    <Flex
-                        align="stretch"
-                        direction="column"
-                        className="mx_MemberListView_container"
-                        onKeyDown={onKeyDownHandler}
-                    >
-                        <Form.Root>
-                            <MemberListHeaderView vm={vm} />
-                        </Form.Root>
-                        <AutoSizer>
-                            {({ height, width }) => (
-                                <List
-                                    rowRenderer={rowRenderer}
-                                    rowHeight={getRowHeight}
-                                    // The +1 refers to the additional empty div that we render at the end of the list.
-                                    rowCount={totalRows + 1}
-                                    // Subtract the height of MemberlistHeaderView so that the parent div does not overflow.
-                                    height={height - 113}
-                                    width={width}
-                                    overscanRowCount={15}
-                                />
-                            )}
-                        </AutoSizer>
-                    </Flex>
-                )}
-            </RovingTabIndexProvider>
+            <Flex align="stretch" direction="column" className="mx_MemberListView_container">
+                <Form.Root onSubmit={(e) => e.preventDefault()}>
+                    <MemberListHeaderView vm={vm} />
+                </Form.Root>
+                <ListView
+                    items={vm.members}
+                    getItemComponent={getItemComponent}
+                    getItemKey={getItemKey}
+                    isItemFocusable={isItemFocusable}
+                    role="listbox"
+                    aria-label={_t("member_list|list_title")}
+                    fixedItemHeight={MEMBER_LIST_ITEM_HEIGHT}
+                    increaseViewportBy={{
+                        bottom: EXTENDED_VIEWPORT_HEIGHT,
+                        top: EXTENDED_VIEWPORT_HEIGHT,
+                    }}
+                />
+            </Flex>
         </BaseCard>
     );
 };
diff --git a/src/components/views/rooms/MemberList/tiles/RoomMemberTileView.tsx b/src/components/views/rooms/MemberList/tiles/RoomMemberTileView.tsx
index f5fd5203a5..34c85af7b1 100644
--- a/src/components/views/rooms/MemberList/tiles/RoomMemberTileView.tsx
+++ b/src/components/views/rooms/MemberList/tiles/RoomMemberTileView.tsx
@@ -16,10 +16,20 @@ import BaseAvatar from "../../../avatars/BaseAvatar";
 import { _t } from "../../../../../languageHandler";
 import { MemberTileView } from "./common/MemberTileView";
 import { InvitedIconView } from "./common/InvitedIconView";
+import { type MemberWithSeparator } from "../../../../viewmodels/memberlist/MemberListViewModel";
 
 interface IProps {
+    /**
+     * Needed for `onFocus`
+     */
+    item: MemberWithSeparator;
     member: RoomMember;
+    index: number;
+    memberCount: number;
     showPresence?: boolean;
+    focused?: boolean;
+    tabIndex?: number;
+    onFocus: (item: MemberWithSeparator, e: React.FocusEvent) => void;
 }
 
 export function RoomMemberTileView(props: IProps): JSX.Element {
@@ -36,7 +46,7 @@ export function RoomMemberTileView(props: IProps): JSX.Element {
         />
     );
     const name = vm.name;
-    const nameJSX = <DisambiguatedProfile member={member} fallbackName={name || ""} />;
+    const nameJSX = <DisambiguatedProfile withTooltip member={member} fallbackName={name || ""} />;
 
     const presenceState = member.presenceState;
     let presenceJSX: JSX.Element | undefined;
@@ -54,13 +64,18 @@ export function RoomMemberTileView(props: IProps): JSX.Element {
 
     return (
         <MemberTileView
-            title={vm.title}
             onClick={vm.onClick}
+            onFocus={(e) => props.onFocus(props.item, e)}
             avatarJsx={av}
             presenceJsx={presenceJSX}
             nameJsx={nameJSX}
             userLabel={vm.userLabel}
+            ariaLabel={name}
             iconJsx={iconJsx}
+            focused={props.focused}
+            tabIndex={props.tabIndex}
+            memberIndex={props.index - (member.isInvite ? 1 : 0)} // Adjust as invites are below the seperator
+            memberCount={props.memberCount}
         />
     );
 }
diff --git a/src/components/views/rooms/MemberList/tiles/ThreePidInviteTileView.tsx b/src/components/views/rooms/MemberList/tiles/ThreePidInviteTileView.tsx
index 4f6caf06f6..22be2fd4af 100644
--- a/src/components/views/rooms/MemberList/tiles/ThreePidInviteTileView.tsx
+++ b/src/components/views/rooms/MemberList/tiles/ThreePidInviteTileView.tsx
@@ -12,23 +12,40 @@ import { type ThreePIDInvite } from "../../../../../models/rooms/ThreePIDInvite"
 import BaseAvatar from "../../../avatars/BaseAvatar";
 import { MemberTileView } from "./common/MemberTileView";
 import { InvitedIconView } from "./common/InvitedIconView";
+import { type MemberWithSeparator } from "../../../../viewmodels/memberlist/MemberListViewModel";
 
 interface Props {
+    /**
+     * Needed for `onFocus`
+     */
+    item: MemberWithSeparator;
     threePidInvite: ThreePIDInvite;
+    memberIndex: number;
+    memberCount: number;
+    focused?: boolean;
+    tabIndex?: number;
+    onFocus: (item: MemberWithSeparator, e: React.FocusEvent) => void;
 }
 
 export function ThreePidInviteTileView(props: Props): JSX.Element {
     const vm = useThreePidTileViewModel(props);
     const av = <BaseAvatar name={vm.name} size="32px" aria-hidden="true" />;
     const iconJsx = <InvitedIconView isThreePid={true} />;
+    const name = vm.name;
 
     return (
         <MemberTileView
-            nameJsx={vm.name}
+            nameJsx={name}
             avatarJsx={av}
             onClick={vm.onClick}
+            memberIndex={props.memberIndex}
+            memberCount={props.memberCount}
+            ariaLabel={name}
             userLabel={vm.userLabel}
             iconJsx={iconJsx}
+            focused={props.focused}
+            tabIndex={props.tabIndex}
+            onFocus={(e) => props.onFocus(props.item, e)}
         />
     );
 }
diff --git a/src/components/views/rooms/MemberList/tiles/common/InvitedIconView.tsx b/src/components/views/rooms/MemberList/tiles/common/InvitedIconView.tsx
index 8a7f0e06a4..35ac0ce899 100644
--- a/src/components/views/rooms/MemberList/tiles/common/InvitedIconView.tsx
+++ b/src/components/views/rooms/MemberList/tiles/common/InvitedIconView.tsx
@@ -8,8 +8,7 @@ Please see LICENSE files in the repository root for full details.
 import React, { type JSX } from "react";
 import EmailIcon from "@vector-im/compound-design-tokens/assets/web/icons/email-solid";
 import UserAddIcon from "@vector-im/compound-design-tokens/assets/web/icons/user-add-solid";
-
-import { Flex } from "../../../../../utils/Flex";
+import { Flex } from "@element-hq/web-shared-components";
 
 interface Props {
     isThreePid: boolean;
diff --git a/src/components/views/rooms/MemberList/tiles/common/MemberTileView.tsx b/src/components/views/rooms/MemberList/tiles/common/MemberTileView.tsx
index 480c3d31e4..cb0cec74d9 100644
--- a/src/components/views/rooms/MemberList/tiles/common/MemberTileView.tsx
+++ b/src/components/views/rooms/MemberList/tiles/common/MemberTileView.tsx
@@ -5,18 +5,23 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { type JSX } from "react";
+import React, { useEffect, useRef, type JSX } from "react";
 
-import { RovingAccessibleButton } from "../../../../../../accessibility/RovingTabIndex";
+import AccessibleButton from "../../../../elements/AccessibleButton";
 
 interface Props {
     avatarJsx: JSX.Element;
     nameJsx: JSX.Element | string;
     onClick: () => void;
-    title?: string;
+    onFocus: (e: React.FocusEvent) => void;
+    memberIndex: number;
+    memberCount: number;
+    ariaLabel?: string;
     presenceJsx?: JSX.Element;
     userLabel?: React.ReactNode;
     iconJsx?: JSX.Element;
+    tabIndex?: number;
+    focused?: boolean;
 }
 
 export function MemberTileView(props: Props): JSX.Element {
@@ -24,22 +29,37 @@ export function MemberTileView(props: Props): JSX.Element {
     if (props.userLabel) {
         userLabelJsx = <div className="mx_MemberTileView_userLabel">{props.userLabel}</div>;
     }
-
+    const ref = useRef<HTMLDivElement | null>(null);
+    useEffect(() => {
+        if (props.focused) {
+            ref.current?.focus({ preventScroll: true, focusVisible: true });
+        }
+    }, [props.focused]);
     return (
         // The wrapping div is required to make the magic mouse listener work, for some reason.
         <div>
-            <RovingAccessibleButton className="mx_MemberTileView" title={props.title} onClick={props.onClick}>
-                <div className="mx_MemberTileView_left">
+            <AccessibleButton
+                ref={ref}
+                className="mx_MemberTileView"
+                onClick={props.onClick}
+                onFocus={props.onFocus}
+                aria-label={props?.ariaLabel}
+                tabIndex={props.tabIndex}
+                role="option"
+                aria-posinset={props.memberIndex + 1}
+                aria-setsize={props.memberCount}
+            >
+                <div aria-hidden className="mx_MemberTileView_left">
                     <div className="mx_MemberTileView_avatar">
                         {props.avatarJsx} {props.presenceJsx}
                     </div>
                     <div className="mx_MemberTileView_name">{props.nameJsx}</div>
                 </div>
-                <div className="mx_MemberTileView_right">
+                <div aria-hidden className="mx_MemberTileView_right">
                     {userLabelJsx}
                     {props.iconJsx}
                 </div>
-            </RovingAccessibleButton>
+            </AccessibleButton>
         </div>
     );
 }
diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx
index 02ebd2d594..6a102098b5 100644
--- a/src/components/views/rooms/MessageComposer.tsx
+++ b/src/components/views/rooms/MessageComposer.tsx
@@ -16,9 +16,9 @@ import {
     EventType,
     THREAD_RELATION_TYPE,
 } from "matrix-js-sdk/src/matrix";
-import { type Optional } from "matrix-events-sdk";
 import { Tooltip } from "@vector-im/compound-web";
 import { logger } from "matrix-js-sdk/src/logger";
+import { LockOffIcon, SendSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
@@ -36,7 +36,7 @@ import VoiceRecordComposerTile from "./VoiceRecordComposerTile";
 import { VoiceRecordingStore } from "../../../stores/VoiceRecordingStore";
 import { RecordingState } from "../../../audio/VoiceRecording";
 import type ResizeNotifier from "../../../utils/ResizeNotifier";
-import { type E2EStatus } from "../../../utils/ShieldUtils";
+import { E2EStatus } from "../../../utils/ShieldUtils";
 import SendMessageComposer, { type SendMessageComposer as SendMessageComposerClass } from "./SendMessageComposer";
 import { type ComposerInsertPayload } from "../../../dispatcher/payloads/ComposerInsertPayload";
 import { Action } from "../../../dispatcher/actions";
@@ -54,6 +54,7 @@ import { type MatrixClientProps, withMatrixClientHOC } from "../../../contexts/M
 import { UIFeature } from "../../../settings/UIFeature";
 import { formatTimeLeft } from "../../../DateUtils";
 import RoomReplacedSvg from "../../../../res/img/room_replaced.svg";
+import { HistoryVisibleBanner } from "../composer/HistoryVisibleBanner";
 
 // The prefix used when persisting editor drafts to localstorage.
 export const WYSIWYG_EDITOR_STATE_STORAGE_PREFIX = "mx_wysiwyg_state_";
@@ -72,7 +73,9 @@ function SendButton(props: ISendButtonProps): JSX.Element {
             onClick={props.onClick}
             title={props.title ?? _t("composer|send_button_title")}
             data-testid="sendmessagebtn"
-        />
+        >
+            <SendSolidIcon />
+        </AccessibleButton>
     );
 }
 
@@ -116,7 +119,7 @@ export class MessageComposer extends React.Component<IProps, IState> {
     private ref = createRef<HTMLDivElement>();
     private instanceId: number;
 
-    private _voiceRecording: Optional<VoiceMessageRecording>;
+    private _voiceRecording?: VoiceMessageRecording;
 
     public static contextType = RoomContext;
     declare public context: React.ContextType<typeof RoomContext>;
@@ -206,11 +209,11 @@ export class MessageComposer extends React.Component<IProps, IState> {
         localStorage.removeItem(this.editorStateKey);
     }
 
-    private get voiceRecording(): Optional<VoiceMessageRecording> {
+    private get voiceRecording(): VoiceMessageRecording | undefined {
         return this._voiceRecording;
     }
 
-    private set voiceRecording(rec: Optional<VoiceMessageRecording>) {
+    private set voiceRecording(rec: VoiceMessageRecording | undefined) {
         if (this._voiceRecording) {
             this._voiceRecording.off(RecordingState.Started, this.onRecordingStarted);
             this._voiceRecording.off(RecordingState.EndingSoon, this.onRecordingEndingSoon);
@@ -340,7 +343,7 @@ export class MessageComposer extends React.Component<IProps, IState> {
         window.removeEventListener("beforeunload", this.saveWysiwygEditorState);
         this.saveWysiwygEditorState();
         // clean up our listeners by setting our cached recording to falsy (see internal setter)
-        this.voiceRecording = null;
+        this.voiceRecording = undefined;
     }
 
     private onTombstoneClick = (ev: ButtonEvent): void => {
@@ -561,12 +564,35 @@ export class MessageComposer extends React.Component<IProps, IState> {
     };
 
     public render(): React.ReactNode {
-        const hasE2EIcon = Boolean(!this.state.isWysiwygLabEnabled && this.props.e2eStatus);
-        const e2eIcon = hasE2EIcon && (
-            <div className="mx_MessageComposer_e2eIconWrapper">
-                <E2EIcon key="e2eIcon" status={this.props.e2eStatus!} className="mx_MessageComposer_e2eIcon" />
-            </div>
-        );
+        let leftIcon: false | JSX.Element = false;
+        if (!this.state.isWysiwygLabEnabled) {
+            if (!this.props.e2eStatus) {
+                leftIcon = (
+                    <div className="mx_MessageComposer_e2eIconWrapper">
+                        <Tooltip label={_t("composer|room_unencrypted")}>
+                            <LockOffIcon
+                                aria-label={_t("composer|room_unencrypted")}
+                                width="12px"
+                                height="12px"
+                                color="var(--cpd-color-icon-info-primary)"
+                                className="mx_E2EIcon mx_MessageComposer_e2eIcon"
+                            />
+                        </Tooltip>
+                    </div>
+                );
+            } else if (this.props.e2eStatus !== E2EStatus.Normal) {
+                leftIcon = (
+                    <div className="mx_MessageComposer_e2eIconWrapper">
+                        <E2EIcon
+                            key="e2eIcon"
+                            status={this.props.e2eStatus}
+                            className="mx_MessageComposer_e2eIcon"
+                            size={12}
+                        />
+                    </div>
+                );
+            }
+        }
 
         const controls: ReactNode[] = [];
         const menuPosition = this.getMenuPosition();
@@ -605,14 +631,20 @@ export class MessageComposer extends React.Component<IProps, IState> {
                 );
             }
 
+            const isTooltipOpen = Boolean(this.state.recordingTimeLeftSeconds);
+            const secondsLeft = this.state.recordingTimeLeftSeconds
+                ? Math.round(this.state.recordingTimeLeftSeconds)
+                : 0;
             controls.push(
-                <VoiceRecordComposerTile
-                    key="controls_voice_record"
-                    ref={this.voiceRecordingButton}
-                    room={this.props.room}
-                    relation={this.props.relation}
-                    replyToEvent={this.props.replyToEvent}
-                />,
+                <Tooltip open={isTooltipOpen} description={formatTimeLeft(secondsLeft)} placement="bottom">
+                    <VoiceRecordComposerTile
+                        key="controls_voice_record"
+                        ref={this.voiceRecordingButton}
+                        room={this.props.room}
+                        relation={this.props.relation}
+                        replyToEvent={this.props.replyToEvent}
+                    />
+                </Tooltip>,
             );
         } else if (this.context.tombstone) {
             const replacementRoomId = this.context.tombstone.getContent()["replacement_room"];
@@ -654,9 +686,6 @@ export class MessageComposer extends React.Component<IProps, IState> {
             );
         }
 
-        const isTooltipOpen = Boolean(this.state.recordingTimeLeftSeconds);
-        const secondsLeft = this.state.recordingTimeLeftSeconds ? Math.round(this.state.recordingTimeLeftSeconds) : 0;
-
         const threadId =
             this.props.relation?.rel_type === THREAD_RELATION_TYPE.name ? this.props.relation.event_id : null;
 
@@ -676,62 +705,65 @@ export class MessageComposer extends React.Component<IProps, IState> {
         const classes = classNames({
             "mx_MessageComposer": true,
             "mx_MessageComposer--compact": this.props.compact,
-            "mx_MessageComposer_e2eStatus": hasE2EIcon,
+            "mx_MessageComposer_e2eStatus": leftIcon,
             "mx_MessageComposer_wysiwyg": this.state.isWysiwygLabEnabled,
         });
 
         return (
-            <Tooltip open={isTooltipOpen} description={formatTimeLeft(secondsLeft)} placement="bottom">
-                <div className={classes} ref={this.ref} role="region" aria-label={_t("a11y|message_composer")}>
-                    <div className="mx_MessageComposer_wrapper">
-                        <UserIdentityWarning room={this.props.room} key={this.props.room.roomId} />
-                        <ReplyPreview
-                            replyToEvent={this.props.replyToEvent}
-                            permalinkCreator={this.props.permalinkCreator}
-                        />
-                        <div className="mx_MessageComposer_row">
-                            {e2eIcon}
-                            {composer}
-                            <div className="mx_MessageComposer_actions">
-                                {controls}
-                                {canSendMessages && (
-                                    <MessageComposerButtons
-                                        addEmoji={this.addEmoji}
-                                        addGif={this.addGif}
-                                        haveRecording={this.state.haveRecording}
-                                        isMenuOpen={this.state.isMenuOpen}
-                                        isStickerPickerOpen={this.state.isStickerPickerOpen}
-                                        isGifPickerOpen={this.state.isGifPickerOpen}
-                                        menuPosition={menuPosition}
-                                        relation={this.props.relation}
-                                        onRecordStartEndClick={this.onRecordStartEndClick}
-                                        setStickerPickerOpen={this.setStickerPickerOpen}
-                                        setGifPickerOpen={this.setGifPickerOpen}
-                                        showLocationButton={!window.electron && SettingsStore.getValue(UIFeature.LocationSharing)}
-                                        showPollsButton={this.state.showPollsButton}
-                                        showStickersButton={this.showStickersButton}
-                                        showGifButton={this.state.showGifButton}
-                                        isRichTextEnabled={this.state.isRichTextEnabled}
-                                        onComposerModeClick={this.onRichTextToggle}
-                                        toggleButtonMenu={this.toggleButtonMenu}
-                                    />
-                                )}
-                                {showSendButton && (
-                                    <SendButton
-                                        key="controls_send"
-                                        onClick={this.sendMessage}
-                                        title={
-                                            this.state.haveRecording
-                                                ? _t("composer|send_button_voice_message")
-                                                : undefined
-                                        }
-                                    />
-                                )}
-                            </div>
+            <div className={classes} ref={this.ref} role="region" aria-label={_t("a11y|message_composer")}>
+                <HistoryVisibleBanner
+                    room={this.props.room}
+                    canSendMessages={canSendMessages}
+                    threadId={threadId ?? null}
+                />
+                <div className="mx_MessageComposer_wrapper">
+                    <UserIdentityWarning room={this.props.room} key={this.props.room.roomId} />
+                    <ReplyPreview
+                        replyToEvent={this.props.replyToEvent}
+                        permalinkCreator={this.props.permalinkCreator}
+                    />
+                    <div className="mx_MessageComposer_row">
+                        {leftIcon}
+                        {composer}
+                        <div className="mx_MessageComposer_actions">
+                            {controls}
+                            {canSendMessages && (
+                                <MessageComposerButtons
+                                    addEmoji={this.addEmoji}
+                                    addGif={this.addGif}
+                                    haveRecording={this.state.haveRecording}
+                                    isMenuOpen={this.state.isMenuOpen}
+                                    isStickerPickerOpen={this.state.isStickerPickerOpen}
+                                    isGifPickerOpen={this.state.isGifPickerOpen}
+                                    menuPosition={menuPosition}
+                                    relation={this.props.relation}
+                                    onRecordStartEndClick={this.onRecordStartEndClick}
+                                    setStickerPickerOpen={this.setStickerPickerOpen}
+                                    setGifPickerOpen={this.setGifPickerOpen}
+                                    showLocationButton={
+                                        !window.electron && SettingsStore.getValue(UIFeature.LocationSharing)
+                                    }
+                                    showPollsButton={this.state.showPollsButton}
+                                    showStickersButton={this.showStickersButton}
+                                    isRichTextEnabled={this.state.isRichTextEnabled}
+                                    showGifButton={this.state.showGifButton}
+                                    onComposerModeClick={this.onRichTextToggle}
+                                    toggleButtonMenu={this.toggleButtonMenu}
+                                />
+                            )}
+                            {showSendButton && (
+                                <SendButton
+                                    key="controls_send"
+                                    onClick={this.sendMessage}
+                                    title={
+                                        this.state.haveRecording ? _t("composer|send_button_voice_message") : undefined
+                                    }
+                                />
+                            )}
                         </div>
                     </div>
                 </div>
-            </Tooltip>
+            </div>
         );
     }
 }
diff --git a/src/components/views/rooms/MessageComposerButtons.tsx b/src/components/views/rooms/MessageComposerButtons.tsx
index 2d7da7fc3a..ccf060e354 100644
--- a/src/components/views/rooms/MessageComposerButtons.tsx
+++ b/src/components/views/rooms/MessageComposerButtons.tsx
@@ -15,6 +15,14 @@ import {
     M_POLL_START,
 } from "matrix-js-sdk/src/matrix";
 import React, { type JSX, createContext, type ReactElement, type ReactNode, useContext, useRef } from "react";
+import {
+    AttachmentIcon,
+    MicOnIcon,
+    OverflowHorizontalIcon,
+    PollsIcon,
+    StickerIcon,
+    TextFormattingIcon,
+} from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import { CollapsibleButton } from "./CollapsibleButton";
@@ -130,7 +138,9 @@ const MessageComposerButtons: React.FC<IProps> = (props: IProps) => {
                     className={moreOptionsClasses}
                     onClick={props.toggleButtonMenu}
                     title={_t("quick_settings|sidebar_settings")}
-                />
+                >
+                    <OverflowHorizontalIcon />
+                </AccessibleButton>
             )}
             {props.isMenuOpen && (
                 <IconizedContextMenu
@@ -190,7 +200,7 @@ interface IUploadButtonProps {
 // We put the file input outside the UploadButton component so that it doesn't get killed when the context menu closes.
 const UploadButtonContextProvider: React.FC<IUploadButtonProps> = ({ roomId, relation, children }) => {
     const cli = useContext(MatrixClientContext);
-    const roomContext = useScopedRoomContext("timelineRenderingType");
+    const roomContext = useScopedRoomContext("timelineRenderingType", "replyToEvent");
     const uploadInput = useRef<HTMLInputElement>(null);
 
     const onUploadClick = (): void => {
@@ -215,6 +225,7 @@ const UploadButtonContextProvider: React.FC<IUploadButtonProps> = ({ roomId, rel
             Array.from(ev.target.files!),
             roomId,
             relation,
+            roomContext.replyToEvent,
             cli,
             roomContext.timelineRenderingType,
         );
@@ -254,12 +265,9 @@ const UploadButton: React.FC = () => {
     };
 
     return (
-        <CollapsibleButton
-            className="mx_MessageComposer_button"
-            iconClassName="mx_MessageComposer_upload"
-            onClick={onClick}
-            title={_t("common|attachment")}
-        />
+        <CollapsibleButton className="mx_MessageComposer_button" onClick={onClick} title={_t("common|attachment")}>
+            <AttachmentIcon />
+        </CollapsibleButton>
     );
 };
 
@@ -269,10 +277,11 @@ function showStickersButton(props: IProps): ReactElement | null {
             id="stickersButton"
             key="controls_stickers"
             className="mx_MessageComposer_button"
-            iconClassName="mx_MessageComposer_stickers"
             onClick={() => props.setStickerPickerOpen(!props.isStickerPickerOpen)}
             title={props.isStickerPickerOpen ? _t("composer|close_sticker_picker") : _t("common|sticker")}
-        />
+        >
+            <StickerIcon />
+        </CollapsibleButton>
     ) : null;
 }
 
@@ -282,10 +291,11 @@ function voiceRecordingButton(props: IProps, narrow: boolean): ReactElement | nu
         <CollapsibleButton
             key="voice_message_send"
             className="mx_MessageComposer_button"
-            iconClassName="mx_MessageComposer_voiceMessage"
             onClick={props.onRecordStartEndClick}
             title={_t("composer|voice_message_button")}
-        />
+        >
+            <MicOnIcon />
+        </CollapsibleButton>
     );
 }
 
@@ -337,10 +347,11 @@ class PollButton extends React.PureComponent<IPollButtonProps> {
         return (
             <CollapsibleButton
                 className="mx_MessageComposer_button"
-                iconClassName="mx_MessageComposer_poll"
                 onClick={this.onCreateClick}
                 title={_t("composer|poll_button")}
-            />
+            >
+                <PollsIcon />
+            </CollapsibleButton>
         );
     }
 }
@@ -368,15 +379,9 @@ function ComposerModeButton({ isRichTextEnabled, onClick }: WysiwygToggleButtonP
     const title = isRichTextEnabled ? _t("composer|mode_plain") : _t("composer|mode_rich_text");
 
     return (
-        <CollapsibleButton
-            className="mx_MessageComposer_button"
-            iconClassName={classNames({
-                mx_MessageComposer_plain_text: !isRichTextEnabled,
-                mx_MessageComposer_rich_text: isRichTextEnabled,
-            })}
-            onClick={onClick}
-            title={title}
-        />
+        <CollapsibleButton className="mx_MessageComposer_button" onClick={onClick} title={title}>
+            <TextFormattingIcon />
+        </CollapsibleButton>
     );
 }
 
diff --git a/src/components/views/rooms/MessageComposerFormatBar.tsx b/src/components/views/rooms/MessageComposerFormatBar.tsx
index 855c7c1d40..0957aa9721 100644
--- a/src/components/views/rooms/MessageComposerFormatBar.tsx
+++ b/src/components/views/rooms/MessageComposerFormatBar.tsx
@@ -6,8 +6,16 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { createRef } from "react";
+import React, { createRef, type JSX } from "react";
 import classNames from "classnames";
+import {
+    BoldIcon,
+    ItalicIcon,
+    StrikethroughIcon,
+    InlineCodeIcon,
+    QuoteIcon,
+    LinkIcon,
+} from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import { RovingAccessibleButton } from "../../../accessibility/RovingTabIndex";
@@ -54,41 +62,41 @@ export default class MessageComposerFormatBar extends React.PureComponent<IProps
                 <FormatButton
                     label={_t("composer|format_bold")}
                     onClick={() => this.props.onAction(Formatting.Bold)}
-                    icon="Bold"
+                    icon={<BoldIcon />}
                     shortcut={this.props.shortcuts.bold}
                     visible={this.state.visible}
                 />
                 <FormatButton
                     label={_t("composer|format_italics")}
                     onClick={() => this.props.onAction(Formatting.Italics)}
-                    icon="Italic"
+                    icon={<ItalicIcon />}
                     shortcut={this.props.shortcuts.italics}
                     visible={this.state.visible}
                 />
                 <FormatButton
                     label={_t("composer|format_strikethrough")}
                     onClick={() => this.props.onAction(Formatting.Strikethrough)}
-                    icon="Strikethrough"
+                    icon={<StrikethroughIcon />}
                     visible={this.state.visible}
                 />
                 <FormatButton
                     label={_t("composer|format_code_block")}
                     onClick={() => this.props.onAction(Formatting.Code)}
-                    icon="Code"
+                    icon={<InlineCodeIcon />}
                     shortcut={this.props.shortcuts.code}
                     visible={this.state.visible}
                 />
                 <FormatButton
                     label={_t("action|quote")}
                     onClick={() => this.props.onAction(Formatting.Quote)}
-                    icon="Quote"
+                    icon={<QuoteIcon />}
                     shortcut={this.props.shortcuts.quote}
                     visible={this.state.visible}
                 />
                 <FormatButton
                     label={_t("composer|format_insert_link")}
                     onClick={() => this.props.onAction(Formatting.InsertLink)}
-                    icon="InsertLink"
+                    icon={<LinkIcon />}
                     shortcut={this.props.shortcuts.insert_link}
                     visible={this.state.visible}
                 />
@@ -116,7 +124,7 @@ export default class MessageComposerFormatBar extends React.PureComponent<IProps
 
 interface IFormatButtonProps {
     label: string;
-    icon: string;
+    icon: JSX.Element;
     shortcut?: string;
     visible?: boolean;
     onClick(): void;
@@ -124,8 +132,6 @@ interface IFormatButtonProps {
 
 class FormatButton extends React.PureComponent<IFormatButtonProps> {
     public render(): React.ReactNode {
-        const className = `mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIcon${this.props.icon}`;
-
         // element="button" and type="button" are necessary for the buttons to work on WebKit,
         // otherwise the text is deselected before onClick can ever be called
         return (
@@ -136,8 +142,10 @@ class FormatButton extends React.PureComponent<IFormatButtonProps> {
                 aria-label={this.props.label}
                 title={this.props.label}
                 caption={this.props.shortcut}
-                className={className}
-            />
+                className="mx_MessageComposerFormatBar_button"
+            >
+                {this.props.icon}
+            </RovingAccessibleButton>
         );
     }
 }
diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx
index f12b03e288..67daec115d 100644
--- a/src/components/views/rooms/NewRoomIntro.tsx
+++ b/src/components/views/rooms/NewRoomIntro.tsx
@@ -30,6 +30,8 @@ import { privateShouldBeEncrypted } from "../../../utils/rooms";
 import { LocalRoom } from "../../../models/LocalRoom";
 import { shouldEncryptRoomWithSingle3rdPartyInvite } from "../../../utils/room/shouldEncryptRoomWithSingle3rdPartyInvite";
 import { useScopedRoomContext } from "../../../contexts/ScopedRoomContext.tsx";
+import { useTopic } from "../../../hooks/room/useTopic";
+import { topicToHtml, Linkify } from "../../../HtmlUtils";
 
 function hasExpectedEncryptionSettings(matrixClient: MatrixClient, room: Room): boolean {
     const isEncrypted: boolean = matrixClient.isRoomEncrypted(room.roomId);
@@ -52,6 +54,7 @@ const determineIntroMessage = (room: Room, encryptedSingle3rdPartyInvite: boolea
 const NewRoomIntro: React.FC = () => {
     const cli = useContext(MatrixClientContext);
     const { room, roomId } = useScopedRoomContext("room", "roomId");
+    const topic = useTopic(room);
 
     if (!room || !roomId) {
         throw new Error("Unable to create a NewRoomIntro without room and roomId");
@@ -106,7 +109,6 @@ const NewRoomIntro: React.FC = () => {
         );
     } else {
         const inRoom = room && room.getMyMembership() === KnownMembership.Join;
-        const topic = room.currentState.getStateEvents(EventType.RoomTopic, "")?.getContent()?.topic;
         const canAddTopic = inRoom && room.currentState.maySendStateEvent(EventType.RoomTopic, cli.getSafeUserId());
 
         const onTopicClick = (): void => {
@@ -126,18 +128,23 @@ const NewRoomIntro: React.FC = () => {
         let topicText;
         if (canAddTopic && topic) {
             topicText = _t(
-                "room|intro|topic_edit",
-                { topic },
+                "room|intro|edit_topic",
+                {},
                 {
                     a: (sub) => (
                         <AccessibleButton element="a" kind="link_inline" onClick={onTopicClick}>
                             {sub}
                         </AccessibleButton>
                     ),
+                    topic: () => <Linkify>{topicToHtml(topic?.text, topic?.html)}</Linkify>,
                 },
             );
         } else if (topic) {
-            topicText = _t("room|intro|topic", { topic });
+            topicText = _t(
+                "room|intro|display_topic",
+                {},
+                { topic: () => <Linkify>{topicToHtml(topic?.text, topic?.html)}</Linkify> },
+            );
         } else if (canAddTopic) {
             topicText = _t(
                 "room|intro|no_topic",
@@ -245,7 +252,7 @@ const NewRoomIntro: React.FC = () => {
                         },
                     )}
                 </p>
-                <p>{topicText}</p>
+                <p data-testid="topic">{topicText}</p>
                 {buttons}
             </React.Fragment>
         );
diff --git a/src/components/views/rooms/NotificationDecoration.tsx b/src/components/views/rooms/NotificationDecoration.tsx
index a93f1428fd..321625adb1 100644
--- a/src/components/views/rooms/NotificationDecoration.tsx
+++ b/src/components/views/rooms/NotificationDecoration.tsx
@@ -12,8 +12,10 @@ import NotificationOffIcon from "@vector-im/compound-design-tokens/assets/web/ic
 import VideoCallIcon from "@vector-im/compound-design-tokens/assets/web/icons/video-call-solid";
 import EmailIcon from "@vector-im/compound-design-tokens/assets/web/icons/email-solid";
 import { UnreadCounter, Unread } from "@vector-im/compound-web";
+import VoiceCallIcon from "@vector-im/compound-design-tokens/assets/web/icons/voice-call-solid";
+import { CallType } from "matrix-js-sdk/src/webrtc/call";
+import { Flex } from "@element-hq/web-shared-components";
 
-import { Flex } from "../../utils/Flex";
 import { type RoomNotificationState } from "../../../stores/notifications/RoomNotificationState";
 import { useTypedEventEmitterState } from "../../../hooks/useEventEmitter";
 import { NotificationStateEvents } from "../../../stores/notifications/NotificationState";
@@ -24,9 +26,9 @@ interface NotificationDecorationProps extends HTMLProps<HTMLDivElement> {
      */
     notificationState: RoomNotificationState;
     /**
-     * Whether the room has a video call.
+     * Whether the room has a voice or video call.
      */
-    hasVideoCall: boolean;
+    callType?: CallType;
 }
 
 /**
@@ -34,7 +36,7 @@ interface NotificationDecorationProps extends HTMLProps<HTMLDivElement> {
  */
 export function NotificationDecoration({
     notificationState,
-    hasVideoCall,
+    callType,
     ...props
 }: NotificationDecorationProps): JSX.Element | null {
     // Listen to the notification state and update the component when it changes
@@ -58,7 +60,7 @@ export function NotificationDecoration({
         muted: notificationState.muted,
     }));
 
-    if (!hasAnyNotificationOrActivity && !muted && !hasVideoCall) return null;
+    if (!hasAnyNotificationOrActivity && !muted && !callType) return null;
 
     return (
         <Flex
@@ -69,7 +71,12 @@ export function NotificationDecoration({
             data-testid="notification-decoration"
         >
             {isUnsentMessage && <ErrorIcon width="20px" height="20px" fill="var(--cpd-color-icon-critical-primary)" />}
-            {hasVideoCall && <VideoCallIcon width="20px" height="20px" fill="var(--cpd-color-icon-accent-primary)" />}
+            {callType === CallType.Video && (
+                <VideoCallIcon width="20px" height="20px" fill="var(--cpd-color-icon-accent-primary)" />
+            )}
+            {callType === CallType.Voice && (
+                <VoiceCallIcon width="20px" height="20px" fill="var(--cpd-color-icon-accent-primary)" />
+            )}
             {invited && <EmailIcon width="20px" height="20px" fill="var(--cpd-color-icon-accent-primary)" />}
             {isMention && <MentionIcon width="20px" height="20px" fill="var(--cpd-color-icon-accent-primary)" />}
             {(isMention || isNotification) && <UnreadCounter count={count || null} />}
diff --git a/src/components/views/rooms/OverflowTileView.tsx b/src/components/views/rooms/OverflowTileView.tsx
index c825406904..d082821dee 100644
--- a/src/components/views/rooms/OverflowTileView.tsx
+++ b/src/components/views/rooms/OverflowTileView.tsx
@@ -6,7 +6,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
-import Icon from "@vector-im/compound-design-tokens/assets/web/icons/overflow-horizontal";
+import { ChevronRightIcon, OverflowHorizontalIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
@@ -24,9 +24,10 @@ export const OverflowTileView: React.FC<Props> = ({ remaining, onClick }) => {
     return (
         <AccessibleButton onClick={onClick} className="mx_OverflowTileView">
             <div className="mx_OverflowTileView_icon">
-                <Icon height="36px" width="36px" />
+                <OverflowHorizontalIcon height="36px" width="36px" />
             </div>
             <div className="mx_OverflowTileView_text">{_t("common|and_n_others", { count: remaining })}</div>
+            <ChevronRightIcon className="mx_OverflowTileView_chevron" />
         </AccessibleButton>
     );
 };
diff --git a/src/components/views/rooms/PinnedEventTile.tsx b/src/components/views/rooms/PinnedEventTile.tsx
index afb612c397..8324d357c5 100644
--- a/src/components/views/rooms/PinnedEventTile.tsx
+++ b/src/components/views/rooms/PinnedEventTile.tsx
@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { type JSX, useCallback, useState } from "react";
+import React, { type JSX, useCallback, useId, useState } from "react";
 import { EventTimeline, EventType, type MatrixEvent, type Room } from "matrix-js-sdk/src/matrix";
 import { IconButton, Menu, MenuItem, Separator, Tooltip } from "@vector-im/compound-web";
 import ViewIcon from "@vector-im/compound-design-tokens/assets/web/icons/visibility-on";
@@ -67,6 +67,7 @@ export function PinnedEventTile({ event, room, permalinkCreator }: PinnedEventTi
 
     const isInThread = Boolean(event.threadRootId);
     const displayThreadInfo = !event.isThreadRoot && isInThread;
+    const id = useId();
 
     return (
         <div className="mx_PinnedEventTile" role="listitem">
@@ -85,9 +86,10 @@ export function PinnedEventTile({ event, room, permalinkCreator }: PinnedEventTi
                             {event.sender?.name || sender}
                         </span>
                     </Tooltip>
-                    <PinMenu event={event} room={room} permalinkCreator={permalinkCreator} />
+                    <PinMenu event={event} room={room} permalinkCreator={permalinkCreator} contentId={id} />
                 </div>
                 <MessageEvent
+                    id={id}
                     mxEvent={event}
                     maxImageHeight={150}
                     permalinkCreator={permalinkCreator}
@@ -131,12 +133,17 @@ export function PinnedEventTile({ event, room, permalinkCreator }: PinnedEventTi
 /**
  * Properties for {@link PinMenu}.
  */
-interface PinMenuProps extends PinnedEventTileProps {}
+interface PinMenuProps extends PinnedEventTileProps {
+    /**
+     * HTML ID of the pinned message content.
+     */
+    contentId: string;
+}
 
 /**
  * A popover menu with actions on the pinned event
  */
-function PinMenu({ event, room, permalinkCreator }: PinMenuProps): JSX.Element {
+function PinMenu({ event, room, permalinkCreator, contentId }: PinMenuProps): JSX.Element {
     const [open, setOpen] = useState(false);
     const matrixClient = useMatrixClientContext();
 
@@ -217,7 +224,11 @@ function PinMenu({ event, room, permalinkCreator }: PinMenuProps): JSX.Element {
             side="right"
             align="start"
             trigger={
-                <IconButton size="24px" aria-label={_t("right_panel|pinned_messages|menu")}>
+                <IconButton
+                    size="24px"
+                    aria-label={_t("right_panel|pinned_messages|menu")}
+                    aria-describedby={contentId}
+                >
                     <TriggerIcon />
                 </IconButton>
             }
diff --git a/src/components/views/rooms/PinnedMessageBanner.tsx b/src/components/views/rooms/PinnedMessageBanner.tsx
index 2b9f335c7f..552aa2a4b2 100644
--- a/src/components/views/rooms/PinnedMessageBanner.tsx
+++ b/src/components/views/rooms/PinnedMessageBanner.tsx
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import React, { type JSX, useEffect, useRef, useState } from "react";
+import React, { type JSX, useContext, useEffect, useId, useRef, useState } from "react";
 import PinIcon from "@vector-im/compound-design-tokens/assets/web/icons/pin-solid";
 import { Button } from "@vector-im/compound-web";
 import { type MatrixEvent, type Room } from "matrix-js-sdk/src/matrix";
@@ -25,7 +25,7 @@ import { Action } from "../../../dispatcher/actions";
 import MessageEvent from "../messages/MessageEvent";
 import PosthogTrackers from "../../../PosthogTrackers.ts";
 import { EventPreview } from "./EventPreview.tsx";
-import type ResizeNotifier from "../../../utils/ResizeNotifier";
+import { SDKContext } from "../../../contexts/SDKContext.ts";
 
 /**
  * The props for the {@link PinnedMessageBanner} component.
@@ -39,20 +39,12 @@ interface PinnedMessageBannerProps {
      * The room where the banner is displayed
      */
     room: Room;
-    /**
-     * The resize notifier to notify the timeline to resize itself when the banner is displayed or hidden.
-     */
-    resizeNotifier: ResizeNotifier;
 }
 
 /**
  * A banner that displays the pinned messages in a room.
  */
-export function PinnedMessageBanner({
-    room,
-    permalinkCreator,
-    resizeNotifier,
-}: PinnedMessageBannerProps): JSX.Element | null {
+export function PinnedMessageBanner({ room, permalinkCreator }: PinnedMessageBannerProps): JSX.Element | null {
     const pinnedEventIds = usePinnedEvents(room);
     const pinnedEvents = useSortedFetchedPinnedEvents(room, pinnedEventIds);
     const eventCount = pinnedEvents.length;
@@ -64,8 +56,12 @@ export function PinnedMessageBanner({
         setCurrentEventIndex(() => eventCount - 1);
     }, [eventCount]);
 
+    const isLastMessage = currentEventIndex === eventCount - 1;
+
     const pinnedEvent = pinnedEvents[currentEventIndex];
-    useNotifyTimeline(pinnedEvent, resizeNotifier);
+    useNotifyTimeline(pinnedEvent);
+
+    const id = useId();
 
     if (!pinnedEvent) return null;
 
@@ -90,18 +86,24 @@ export function PinnedMessageBanner({
 
     return (
         <div
+            role="region"
             className="mx_PinnedMessageBanner"
             data-single-message={isSinglePinnedEvent}
             aria-label={_t("room|pinned_message_banner|description")}
             data-testid="pinned-message-banner"
         >
             <button
-                aria-label={_t("room|pinned_message_banner|go_to_message")}
+                aria-label={
+                    isLastMessage
+                        ? _t("room|pinned_message_banner|go_to_newest_message")
+                        : _t("room|pinned_message_banner|go_to_next_message")
+                }
+                aria-describedby={id}
                 type="button"
                 className="mx_PinnedMessageBanner_main"
                 onClick={onBannerClick}
             >
-                <div className="mx_PinnedMessageBanner_content">
+                <div className="mx_PinnedMessageBanner_content" id={id}>
                     <Indicators count={eventCount} currentIndex={currentEventIndex} />
                     <PinIcon width="20px" height="20px" className="mx_PinnedMessageBanner_PinIcon" />
                     {!isSinglePinnedEvent && (
@@ -142,9 +144,10 @@ export function PinnedMessageBanner({
 /**
  * When the banner is displayed or hidden, we want to notify the timeline to resize itself.
  * @param pinnedEvent
- * @param resizeNotifier
  */
-function useNotifyTimeline(pinnedEvent: MatrixEvent | null, resizeNotifier: ResizeNotifier): void {
+function useNotifyTimeline(pinnedEvent: MatrixEvent | null): void {
+    const resizeNotifier = useContext(SDKContext).resizeNotifier;
+
     const previousEvent = useRef<MatrixEvent | null>(null);
     useEffect(() => {
         // If we switch from a pinned message to no pinned message or the opposite, we want to resize the timeline
diff --git a/src/components/views/rooms/ReadReceiptGroup.tsx b/src/components/views/rooms/ReadReceiptGroup.tsx
index 22d2f03697..910e0cfb52 100644
--- a/src/components/views/rooms/ReadReceiptGroup.tsx
+++ b/src/components/views/rooms/ReadReceiptGroup.tsx
@@ -212,38 +212,41 @@ export function ReadReceiptPerson({
     onAfterClick,
 }: ReadReceiptPersonProps): JSX.Element {
     return (
-        <Tooltip description={roomMember?.rawDisplayName ?? userId} caption={userId} placement="top">
-            <div>
-                <MenuItem
-                    className="mx_ReadReceiptGroup_person"
-                    onClick={() => {
-                        dis.dispatch({
-                            action: Action.ViewUser,
-                            // XXX: We should be using a real member object and not assuming what the receiver wants.
-                            // The ViewUser action leads to the RightPanelStore, and RightPanelStoreIPanelState defines the
-                            // member property of IRightPanelCardState as `RoomMember | User`, so we’re fine for now, but we
-                            // should definitely clean this up later
-                            member: roomMember ?? ({ userId } as User),
-                            push: false,
-                        });
-                        onAfterClick?.();
-                    }}
-                >
-                    <MemberAvatar
-                        member={roomMember}
-                        fallbackUserId={userId}
-                        size="24px"
-                        aria-hidden="true"
-                        aria-live="off"
-                        resizeMethod="crop"
-                        hideTitle
-                    />
-                    <div className="mx_ReadReceiptGroup_name">
-                        <p>{roomMember?.name ?? userId}</p>
-                        <p className="mx_ReadReceiptGroup_secondary">{formatDate(new Date(ts), isTwelveHour)}</p>
-                    </div>
-                </MenuItem>
-            </div>
+        <Tooltip
+            description={roomMember?.rawDisplayName ?? userId}
+            caption={userId}
+            placement="top"
+            isTriggerInteractive={false}
+        >
+            <MenuItem
+                className="mx_ReadReceiptGroup_person"
+                onClick={() => {
+                    dis.dispatch({
+                        action: Action.ViewUser,
+                        // XXX: We should be using a real member object and not assuming what the receiver wants.
+                        // The ViewUser action leads to the RightPanelStore, and RightPanelStoreIPanelState defines the
+                        // member property of IRightPanelCardState as `RoomMember | User`, so we’re fine for now, but we
+                        // should definitely clean this up later
+                        member: roomMember ?? ({ userId } as User),
+                        push: false,
+                    });
+                    onAfterClick?.();
+                }}
+            >
+                <MemberAvatar
+                    member={roomMember}
+                    fallbackUserId={userId}
+                    size="24px"
+                    aria-hidden="true"
+                    aria-live="off"
+                    resizeMethod="crop"
+                    hideTitle
+                />
+                <div className="mx_ReadReceiptGroup_name">
+                    <p>{roomMember?.name ?? userId}</p>
+                    <p className="mx_ReadReceiptGroup_secondary">{formatDate(new Date(ts), isTwelveHour)}</p>
+                </div>
+            </MenuItem>
         </Tooltip>
     );
 }
diff --git a/src/components/views/rooms/ReplyPreview.tsx b/src/components/views/rooms/ReplyPreview.tsx
index db8f6f4a9e..13616b1fba 100644
--- a/src/components/views/rooms/ReplyPreview.tsx
+++ b/src/components/views/rooms/ReplyPreview.tsx
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type JSX } from "react";
 import { type MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { CloseIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import dis from "../../../dispatcher/dispatcher";
 import { _t } from "../../../languageHandler";
@@ -44,7 +45,9 @@ export default class ReplyPreview extends React.Component<IProps> {
                         <AccessibleButton
                             className="mx_ReplyPreview_header_cancel"
                             onClick={() => cancelQuoting(this.context.timelineRenderingType)}
-                        />
+                        >
+                            <CloseIcon />
+                        </AccessibleButton>
                     </div>
                     <ReplyTile mxEvent={this.props.replyToEvent} permalinkCreator={this.props.permalinkCreator} />
                 </div>
diff --git a/src/components/views/rooms/ReplyTile.tsx b/src/components/views/rooms/ReplyTile.tsx
index 2db56e397e..cf80b38272 100644
--- a/src/components/views/rooms/ReplyTile.tsx
+++ b/src/components/views/rooms/ReplyTile.tsx
@@ -163,6 +163,7 @@ export default class ReplyTile extends React.PureComponent<IProps> {
                             highlights: this.props.highlights,
                             highlightLink: this.props.highlightLink,
                             permalinkCreator: this.props.permalinkCreator,
+                            showHiddenEvents: false,
                         },
                         false /* showHiddenEvents shouldn't be relevant */,
                     )}
diff --git a/src/components/views/rooms/RoomHeader/RoomHeader.tsx b/src/components/views/rooms/RoomHeader/RoomHeader.tsx
index 663c8e9ff0..e2cc00abda 100644
--- a/src/components/views/rooms/RoomHeader/RoomHeader.tsx
+++ b/src/components/views/rooms/RoomHeader/RoomHeader.tsx
@@ -1,4 +1,5 @@
 /*
+Copyright (C) 2025 Element Creations Ltd
 Copyright 2024 New Vector Ltd.
 Copyright 2023 The Matrix.org Foundation C.I.C.
 
@@ -6,8 +7,8 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { type JSX, useCallback, useMemo, useState } from "react";
-import { Body as BodyText, Button, IconButton, Menu, MenuItem, Tooltip } from "@vector-im/compound-web";
+import React, { type JSX, useCallback, useState } from "react";
+import { Text, Button, IconButton, Menu, MenuItem, Tooltip } from "@vector-im/compound-web";
 import VideoCallIcon from "@vector-im/compound-design-tokens/assets/web/icons/video-call-solid";
 import VoiceCallIcon from "@vector-im/compound-design-tokens/assets/web/icons/voice-call-solid";
 import CloseCallIcon from "@vector-im/compound-design-tokens/assets/web/icons/close";
@@ -19,18 +20,16 @@ import ErrorIcon from "@vector-im/compound-design-tokens/assets/web/icons/error-
 import PublicIcon from "@vector-im/compound-design-tokens/assets/web/icons/public";
 import { JoinRule, type Room } from "matrix-js-sdk/src/matrix";
 import { type ViewRoomOpts } from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle";
+import { Flex, Box } from "@element-hq/web-shared-components";
 
 import { useRoomName } from "../../../../hooks/useRoomName.ts";
 import { RightPanelPhases } from "../../../../stores/right-panel/RightPanelStorePhases.ts";
 import { useMatrixClientContext } from "../../../../contexts/MatrixClientContext.tsx";
 import { useRoomMemberCount, useRoomMembers } from "../../../../hooks/useRoomMembers.ts";
 import { _t } from "../../../../languageHandler.tsx";
-import { Flex } from "../../../utils/Flex.tsx";
-import { Box } from "../../../utils/Box.tsx";
 import { getPlatformCallTypeProps, useRoomCall } from "../../../../hooks/room/useRoomCall.tsx";
 import { useRoomThreadNotifications } from "../../../../hooks/room/useRoomThreadNotifications.ts";
 import { useGlobalNotificationState } from "../../../../hooks/useGlobalNotificationState.ts";
-import SdkConfig from "../../../../SdkConfig.ts";
 import { useFeatureEnabled } from "../../../../hooks/useSettings.ts";
 import { useEncryptionStatus } from "../../../../hooks/useEncryptionStatus.ts";
 import { E2EStatus } from "../../../../utils/ShieldUtils.ts";
@@ -54,23 +53,17 @@ import { RoomSettingsTab } from "../../dialogs/RoomSettingsDialog.tsx";
 import { useScopedRoomContext } from "../../../../contexts/ScopedRoomContext.tsx";
 import { ToggleableIcon } from "./toggle/ToggleableIcon.tsx";
 import { CurrentRightPanelPhaseContextProvider } from "../../../../contexts/CurrentRightPanelPhaseContext.tsx";
+import { LocalRoom } from "../../../../models/LocalRoom.ts";
 
-export default function RoomHeader({
+function RoomHeaderButtons({
     room,
     additionalButtons,
-    oobData,
 }: {
     room: Room;
     additionalButtons?: ViewRoomOpts["buttons"];
-    oobData?: IOOBData;
 }): JSX.Element {
-    const client = useMatrixClientContext();
-
-    const roomName = useRoomName(room);
-    const joinRule = useRoomState(room, (state) => state.getJoinRule());
-
     const members = useRoomMembers(room, 2500);
-    const memberCount = useRoomMemberCount(room, { throttleWait: 2500 });
+    const memberCount = useRoomMemberCount(room, { throttleWait: 2500, includeInvited: true });
 
     const {
         voiceCallDisabledReason,
@@ -85,32 +78,24 @@ export default function RoomHeader({
         showVoiceCallButton,
         showVideoCallButton,
     } = useRoomCall(room);
-
-    const groupCallsEnabled = useFeatureEnabled("feature_group_calls");
-    /**
-     * A special mode where only Element Call is used. In this case we want to
-     * hide the voice call button
-     */
-    const useElementCallExclusively = useMemo(() => {
-        return SdkConfig.get("element_call").use_exclusively && groupCallsEnabled;
-    }, [groupCallsEnabled]);
-
     const threadNotifications = useRoomThreadNotifications(room);
     const globalNotificationState = useGlobalNotificationState();
 
     const dmMember = useDmMember(room);
     const isDirectMessage = !!dmMember;
-    const e2eStatus = useEncryptionStatus(client, room);
 
     const notificationsEnabled = useFeatureEnabled("feature_notifications");
 
-    const askToJoinEnabled = useFeatureEnabled("feature_ask_to_join");
-
     const videoClick = useCallback(
         (ev: React.MouseEvent) => videoCallClick(ev, callOptions[0]),
         [callOptions, videoCallClick],
     );
 
+    const voiceClick = useCallback(
+        (ev: React.MouseEvent) => voiceCallClick(ev, callOptions[0]),
+        [callOptions, voiceCallClick],
+    );
+
     const toggleCallButton = (
         <Tooltip label={isViewingCall ? _t("voip|minimise_call") : _t("voip|maximise_call")}>
             <IconButton onClick={toggleCall}>
@@ -129,41 +114,57 @@ export default function RoomHeader({
                 disabled={!!videoCallDisabledReason}
                 color="primary"
                 aria-label={videoCallDisabledReason ?? _t("action|join")}
+                data-testId="join-call-button"
             >
                 {_t("action|join")}
             </Button>
         </Tooltip>
     );
 
-    const callIconWithTooltip = (
+    const videoCallIconWithTooltip = (
         <Tooltip label={videoCallDisabledReason ?? _t("voip|video_call")}>
             <VideoCallIcon />
         </Tooltip>
     );
 
-    const [menuOpen, setMenuOpen] = useState(false);
+    const voiceCallIconWithTooltip = (
+        <Tooltip label={videoCallDisabledReason ?? _t("voip|voice_call")}>
+            <VoiceCallIcon />
+        </Tooltip>
+    );
 
-    const onOpenChange = useCallback(
+    const [videoMenuOpen, setVideoMenuOpen] = useState(false);
+
+    const onVideoOpenChange = useCallback(
         (newOpen: boolean) => {
-            if (!videoCallDisabledReason) setMenuOpen(newOpen);
+            if (!videoCallDisabledReason) setVideoMenuOpen(newOpen);
         },
         [videoCallDisabledReason],
     );
 
+    const [voiceMenuOpen, setVoiceMenuOpen] = useState(false);
+
+    const onVoiceOpenChange = useCallback(
+        (newOpen: boolean) => {
+            if (!voiceCallDisabledReason) setVoiceMenuOpen(newOpen);
+        },
+        [voiceCallDisabledReason],
+    );
+
     const startVideoCallButton = (
         <>
             {/* Can be either a menu or just a button depending on the number of call options.*/}
             {callOptions.length > 1 ? (
                 <Menu
-                    open={menuOpen}
-                    onOpenChange={onOpenChange}
+                    open={videoMenuOpen}
+                    onOpenChange={onVideoOpenChange}
                     title={_t("voip|video_call_using")}
                     trigger={
                         <IconButton
                             disabled={!!videoCallDisabledReason}
                             aria-label={videoCallDisabledReason ?? _t("voip|video_call")}
                         >
-                            {callIconWithTooltip}
+                            {videoCallIconWithTooltip}
                         </IconButton>
                     }
                     side="left"
@@ -179,7 +180,7 @@ export default function RoomHeader({
                                 children={children}
                                 className="mx_RoomHeader_videoCallOption"
                                 onClick={(ev) => {
-                                    setMenuOpen(false);
+                                    setVideoMenuOpen(false);
                                     videoCallClick(ev, option);
                                 }}
                                 Icon={VideoCallIcon}
@@ -194,25 +195,61 @@ export default function RoomHeader({
                     aria-label={videoCallDisabledReason ?? _t("voip|video_call")}
                     onClick={videoClick}
                 >
-                    {callIconWithTooltip}
+                    {videoCallIconWithTooltip}
                 </IconButton>
             )}
         </>
     );
-    let voiceCallButton: JSX.Element | undefined = (
-        <Tooltip label={voiceCallDisabledReason ?? _t("voip|voice_call")}>
-            <IconButton
-                // We need both: isViewingCall and isConnectedToCall
-                //  - in the Lobby we are viewing a call but are not connected to it.
-                //  - in pip view we are connected to the call but not viewing it.
-                disabled={!!voiceCallDisabledReason || isViewingCall || isConnectedToCall}
-                aria-label={voiceCallDisabledReason ?? _t("voip|voice_call")}
-                onClick={(ev) => voiceCallClick(ev, callOptions[0])}
-            >
-                <VoiceCallIcon />
-            </IconButton>
-        </Tooltip>
+    const startVoiceCallButton = (
+        <>
+            {/* Can be either a menu or just a button depending on the number of call options.*/}
+            {callOptions.length > 1 ? (
+                <Menu
+                    open={voiceMenuOpen}
+                    onOpenChange={onVoiceOpenChange}
+                    title={_t("voip|voice_call_using")}
+                    trigger={
+                        <IconButton
+                            disabled={!!voiceCallDisabledReason}
+                            aria-label={voiceCallDisabledReason ?? _t("voip|voice_call")}
+                        >
+                            {voiceCallIconWithTooltip}
+                        </IconButton>
+                    }
+                    side="left"
+                    align="start"
+                >
+                    {callOptions.map((option) => {
+                        const { label, children } = getPlatformCallTypeProps(option);
+                        return (
+                            <MenuItem
+                                key={option}
+                                label={label}
+                                aria-label={label}
+                                children={children}
+                                className="mx_RoomHeader_videoCallOption"
+                                onClick={(ev) => {
+                                    setVoiceMenuOpen(false);
+                                    voiceCallClick(ev, option);
+                                }}
+                                Icon={VoiceCallIcon}
+                                onSelect={() => {} /* Dummy handler since we want the click event.*/}
+                            />
+                        );
+                    })}
+                </Menu>
+            ) : (
+                <IconButton
+                    disabled={!!voiceCallDisabledReason}
+                    aria-label={voiceCallDisabledReason ?? _t("voip|voice_call")}
+                    onClick={voiceClick}
+                >
+                    {voiceCallIconWithTooltip}
+                </IconButton>
+            )}
+        </>
     );
+
     const closeLobbyButton = (
         <Tooltip label={_t("voip|close_lobby")}>
             <IconButton onClick={toggleCall}>
@@ -221,15 +258,19 @@ export default function RoomHeader({
         </Tooltip>
     );
     let videoCallButton: JSX.Element | undefined = startVideoCallButton;
+    let voiceCallButton: JSX.Element | undefined = startVoiceCallButton;
     if (isConnectedToCall) {
         videoCallButton = toggleCallButton;
+        voiceCallButton = undefined;
     } else if (isViewingCall) {
         videoCallButton = closeLobbyButton;
+        voiceCallButton = undefined;
     }
 
     if (!showVideoCallButton) {
         videoCallButton = undefined;
     }
+
     if (!showVoiceCallButton) {
         voiceCallButton = undefined;
     }
@@ -240,7 +281,118 @@ export default function RoomHeader({
         isVideoRoom ||
         roomContext.mainSplitContentType === MainSplitContentType.MaximisedWidget ||
         roomContext.mainSplitContentType === MainSplitContentType.Call;
+    return (
+        <>
+            {additionalButtons?.map((props) => {
+                const label = props.label();
 
+                return (
+                    <Tooltip label={label} key={props.id}>
+                        <IconButton
+                            aria-label={label}
+                            onClick={(event) => {
+                                event.stopPropagation();
+                                props.onClick();
+                            }}
+                        >
+                            {typeof props.icon === "function" ? props.icon() : props.icon}
+                        </IconButton>
+                    </Tooltip>
+                );
+            })}
+
+            {isViewingCall && <CallGuestLinkButton room={room} />}
+
+            {hasActiveCallSession && !isConnectedToCall && !isViewingCall ? (
+                joinCallButton
+            ) : (
+                <>
+                    {!isVideoRoom && videoCallButton}
+                    {!isVideoRoom && voiceCallButton}
+                </>
+            )}
+
+            {showChatButton && <VideoRoomChatButton room={room} />}
+
+            <Tooltip label={_t("common|threads")}>
+                <IconButton
+                    indicator={notificationLevelToIndicator(threadNotifications)}
+                    onClick={(evt) => {
+                        evt.stopPropagation();
+                        RightPanelStore.instance.showOrHidePhase(RightPanelPhases.ThreadPanel);
+                        PosthogTrackers.trackInteraction("WebRoomHeaderButtonsThreadsButton", evt);
+                    }}
+                    aria-label={_t("common|threads")}
+                >
+                    <ToggleableIcon Icon={ThreadsIcon} phase={RightPanelPhases.ThreadPanel} />
+                </IconButton>
+            </Tooltip>
+            {notificationsEnabled && (
+                <Tooltip label={_t("notifications|enable_prompt_toast_title")}>
+                    <IconButton
+                        indicator={notificationLevelToIndicator(globalNotificationState.level)}
+                        onClick={(evt) => {
+                            evt.stopPropagation();
+                            RightPanelStore.instance.showOrHidePhase(RightPanelPhases.NotificationPanel);
+                        }}
+                        aria-label={_t("notifications|enable_prompt_toast_title")}
+                    >
+                        <ToggleableIcon Icon={NotificationsIcon} phase={RightPanelPhases.NotificationPanel} />
+                    </IconButton>
+                </Tooltip>
+            )}
+
+            <Tooltip label={_t("right_panel|room_summary_card|title")}>
+                <IconButton
+                    onClick={(evt) => {
+                        evt.stopPropagation();
+                        RightPanelStore.instance.showOrHidePhase(RightPanelPhases.RoomSummary);
+                    }}
+                    aria-label={_t("right_panel|room_summary_card|title")}
+                >
+                    <ToggleableIcon Icon={RoomInfoIcon} phase={RightPanelPhases.RoomSummary} />
+                </IconButton>
+            </Tooltip>
+
+            {!isDirectMessage && (
+                <Text as="div" size="sm" weight="medium">
+                    <FacePile
+                        className="mx_RoomHeader_members"
+                        members={members.slice(0, 3)}
+                        size="20px"
+                        overflow={false}
+                        viewUserOnClick={false}
+                        tooltipLabel={_t("room|header_face_pile_tooltip")}
+                        onClick={(e: ButtonEvent) => {
+                            RightPanelStore.instance.showOrHidePhase(RightPanelPhases.MemberList);
+                            e.stopPropagation();
+                        }}
+                        aria-label={_t("common|n_members", { count: memberCount })}
+                    >
+                        {formatCount(memberCount)}
+                    </FacePile>
+                </Text>
+            )}
+        </>
+    );
+}
+
+export default function RoomHeader({
+    room,
+    additionalButtons,
+    oobData,
+}: {
+    room: Room | LocalRoom;
+    additionalButtons?: ViewRoomOpts["buttons"];
+    oobData?: IOOBData;
+}): JSX.Element {
+    const client = useMatrixClientContext();
+    const roomName = useRoomName(room);
+    const joinRule = useRoomState(room, (state) => state.getJoinRule());
+    const dmMember = useDmMember(room);
+    const isDirectMessage = !!dmMember;
+    const e2eStatus = useEncryptionStatus(client, room);
+    const askToJoinEnabled = useFeatureEnabled("feature_ask_to_join");
     const onAvatarClick = (): void => {
         defaultDispatcher.dispatch({
             action: "open_room_settings",
@@ -254,23 +406,29 @@ export default function RoomHeader({
                 <Flex as="header" align="center" gap="var(--cpd-space-3x)" className="mx_RoomHeader light-panel">
                     <WithPresenceIndicator room={room} size="8px">
                         {/* We hide this from the tabIndex list as it is a pointer shortcut and superfluous for a11y */}
+                        {/* Disable on-click actions until the room is created */}
                         <RoomAvatar
                             room={room}
                             size="40px"
                             oobData={oobData}
-                            onClick={onAvatarClick}
+                            onClick={room instanceof LocalRoom ? undefined : onAvatarClick}
                             tabIndex={-1}
                             aria-label={_t("room|header_avatar_open_settings_label")}
                         />
                     </WithPresenceIndicator>
+                    {/* Disable on-click actions until the room is created */}
                     <button
                         aria-label={_t("right_panel|room_summary_card|title")}
                         tabIndex={0}
-                        onClick={() => RightPanelStore.instance.showOrHidePhase(RightPanelPhases.RoomSummary)}
+                        onClick={
+                            room instanceof LocalRoom
+                                ? undefined
+                                : () => RightPanelStore.instance.showOrHidePhase(RightPanelPhases.RoomSummary)
+                        }
                         className="mx_RoomHeader_infoWrapper"
                     >
                         <Box flex="1" className="mx_RoomHeader_info">
-                            <BodyText
+                            <Text
                                 as="div"
                                 size="lg"
                                 weight="semibold"
@@ -286,7 +444,8 @@ export default function RoomHeader({
                                         <PublicIcon
                                             width="16px"
                                             height="16px"
-                                            className="mx_RoomHeader_icon text-secondary"
+                                            className="mx_RoomHeader_icon"
+                                            color="var(--cpd-color-icon-info-primary)"
                                             aria-label={_t("common|public_room")}
                                         />
                                     </Tooltip>
@@ -313,99 +472,12 @@ export default function RoomHeader({
                                         />
                                     </Tooltip>
                                 )}
-                            </BodyText>
+                            </Text>
                         </Box>
                     </button>
-
-                    {additionalButtons?.map((props) => {
-                        const label = props.label();
-
-                        return (
-                            <Tooltip label={label} key={props.id}>
-                                <IconButton
-                                    aria-label={label}
-                                    onClick={(event) => {
-                                        event.stopPropagation();
-                                        props.onClick();
-                                    }}
-                                >
-                                    {typeof props.icon === "function" ? props.icon() : props.icon}
-                                </IconButton>
-                            </Tooltip>
-                        );
-                    })}
-
-                    {isViewingCall && <CallGuestLinkButton room={room} />}
-
-                    {hasActiveCallSession && !isConnectedToCall && !isViewingCall ? (
-                        joinCallButton
-                    ) : (
-                        <>
-                            {!isVideoRoom && videoCallButton}
-                            {!useElementCallExclusively && !isVideoRoom && voiceCallButton}
-                        </>
-                    )}
-
-                    {showChatButton && <VideoRoomChatButton room={room} />}
-
-                    <Tooltip label={_t("common|threads")}>
-                        <IconButton
-                            indicator={notificationLevelToIndicator(threadNotifications)}
-                            onClick={(evt) => {
-                                evt.stopPropagation();
-                                RightPanelStore.instance.showOrHidePhase(RightPanelPhases.ThreadPanel);
-                                PosthogTrackers.trackInteraction("WebRoomHeaderButtonsThreadsButton", evt);
-                            }}
-                            aria-label={_t("common|threads")}
-                        >
-                            <ToggleableIcon Icon={ThreadsIcon} phase={RightPanelPhases.ThreadPanel} />
-                        </IconButton>
-                    </Tooltip>
-                    {notificationsEnabled && (
-                        <Tooltip label={_t("notifications|enable_prompt_toast_title")}>
-                            <IconButton
-                                indicator={notificationLevelToIndicator(globalNotificationState.level)}
-                                onClick={(evt) => {
-                                    evt.stopPropagation();
-                                    RightPanelStore.instance.showOrHidePhase(RightPanelPhases.NotificationPanel);
-                                }}
-                                aria-label={_t("notifications|enable_prompt_toast_title")}
-                            >
-                                <ToggleableIcon Icon={NotificationsIcon} phase={RightPanelPhases.NotificationPanel} />
-                            </IconButton>
-                        </Tooltip>
-                    )}
-
-                    <Tooltip label={_t("right_panel|room_summary_card|title")}>
-                        <IconButton
-                            onClick={(evt) => {
-                                evt.stopPropagation();
-                                RightPanelStore.instance.showOrHidePhase(RightPanelPhases.RoomSummary);
-                            }}
-                            aria-label={_t("right_panel|room_summary_card|title")}
-                        >
-                            <ToggleableIcon Icon={RoomInfoIcon} phase={RightPanelPhases.RoomSummary} />
-                        </IconButton>
-                    </Tooltip>
-
-                    {!isDirectMessage && (
-                        <BodyText as="div" size="sm" weight="medium">
-                            <FacePile
-                                className="mx_RoomHeader_members"
-                                members={members.slice(0, 3)}
-                                size="20px"
-                                overflow={false}
-                                viewUserOnClick={false}
-                                tooltipLabel={_t("room|header_face_pile_tooltip")}
-                                onClick={(e: ButtonEvent) => {
-                                    RightPanelStore.instance.showOrHidePhase(RightPanelPhases.MemberList);
-                                    e.stopPropagation();
-                                }}
-                                aria-label={_t("common|n_members", { count: memberCount })}
-                            >
-                                {formatCount(memberCount)}
-                            </FacePile>
-                        </BodyText>
+                    {/* If the room is local-only then we don't want to show any additional buttons, as it won't work */}
+                    {room instanceof LocalRoom === false && (
+                        <RoomHeaderButtons room={room} additionalButtons={additionalButtons} />
                     )}
                 </Flex>
                 {askToJoinEnabled && <RoomKnocksBar room={room} />}
diff --git a/src/components/views/rooms/RoomInfoLine.tsx b/src/components/views/rooms/RoomInfoLine.tsx
index dd5a113ecb..687c41da34 100644
--- a/src/components/views/rooms/RoomInfoLine.tsx
+++ b/src/components/views/rooms/RoomInfoLine.tsx
@@ -9,6 +9,7 @@ Please see LICENSE files in the repository root for full details.
 import React, { type JSX, type FC } from "react";
 import { type Room, JoinRule, type MatrixClient } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
+import { LockSolidIcon, VideoCallSolidIcon, PublicIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import RightPanelStore from "../../../stores/right-panel/RightPanelStore";
@@ -39,16 +40,16 @@ const RoomInfoLine: FC<IProps> = ({ room }) => {
 
     const isVideoRoom = calcIsVideoRoom(room);
 
-    let iconClass: string;
+    let icon: JSX.Element;
     let roomType: string;
     if (isVideoRoom) {
-        iconClass = "mx_RoomInfoLine_video";
+        icon = <VideoCallSolidIcon />;
         roomType = _t("common|video_room");
     } else if (joinRule === JoinRule.Public) {
-        iconClass = "mx_RoomInfoLine_public";
+        icon = <PublicIcon />;
         roomType = room.isSpaceRoom() ? _t("common|public_space") : _t("common|public_room");
     } else {
-        iconClass = "mx_RoomInfoLine_private";
+        icon = <LockSolidIcon />;
         roomType = room.isSpaceRoom() ? _t("common|private_space") : _t("common|private_room");
     }
 
@@ -75,7 +76,8 @@ const RoomInfoLine: FC<IProps> = ({ room }) => {
     }
 
     return (
-        <div className={`mx_RoomInfoLine ${iconClass}`}>
+        <div className="mx_RoomInfoLine">
+            {icon}
             {roomType}
             {members}
         </div>
diff --git a/src/components/views/rooms/RoomListPanel/EmptyRoomList.tsx b/src/components/views/rooms/RoomListPanel/EmptyRoomList.tsx
index 1f04e4c86e..8c1d04b8c5 100644
--- a/src/components/views/rooms/RoomListPanel/EmptyRoomList.tsx
+++ b/src/components/views/rooms/RoomListPanel/EmptyRoomList.tsx
@@ -7,11 +7,11 @@
 
 import React, { type JSX, type PropsWithChildren } from "react";
 import { Button } from "@vector-im/compound-web";
-import UserAddIcon from "@vector-im/compound-design-tokens/assets/web/icons/user-add";
+import ChatIcon from "@vector-im/compound-design-tokens/assets/web/icons/chat";
 import RoomIcon from "@vector-im/compound-design-tokens/assets/web/icons/room";
+import { Flex } from "@element-hq/web-shared-components";
 
 import type { RoomListViewState } from "../../../viewmodels/roomlist/RoomListViewModel";
-import { Flex } from "../../../utils/Flex";
 import { _t } from "../../../../languageHandler";
 import { FilterKey } from "../../../../stores/room-list-v3/skip-list/filters";
 import { type PrimaryFilter } from "../../../viewmodels/roomlist/useFilteredRooms";
@@ -76,6 +76,14 @@ export function EmptyRoomList({ vm }: EmptyRoomListProps): JSX.Element | undefin
                     filter={vm.activePrimaryFilter}
                 />
             );
+        case FilterKey.LowPriorityFilter:
+            return (
+                <ActionPlaceholder
+                    title={_t("room_list|empty|no_lowpriority")}
+                    action={_t("room_list|empty|show_activity")}
+                    filter={vm.activePrimaryFilter}
+                />
+            );
         default:
             return undefined;
     }
@@ -140,8 +148,8 @@ function DefaultPlaceholder({ vm }: DefaultPlaceholderProps): JSX.Element {
                 direction="column"
                 gap="var(--cpd-space-4x)"
             >
-                <Button size="sm" kind="secondary" Icon={UserAddIcon} onClick={vm.createChatRoom}>
-                    {_t("action|new_message")}
+                <Button size="sm" kind="secondary" Icon={ChatIcon} onClick={vm.createChatRoom}>
+                    {_t("action|start_chat")}
                 </Button>
                 {vm.canCreateRoom && (
                     <Button size="sm" kind="secondary" Icon={RoomIcon} onClick={vm.createRoom}>
diff --git a/src/components/views/rooms/RoomListPanel/RoomList.tsx b/src/components/views/rooms/RoomListPanel/RoomList.tsx
index f5f610f5ae..c1c081ca9c 100644
--- a/src/components/views/rooms/RoomListPanel/RoomList.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomList.tsx
@@ -5,13 +5,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import React, { useCallback, type JSX } from "react";
-import { AutoSizer, List, type ListRowProps } from "react-virtualized";
+import React, { useCallback, useRef, type JSX } from "react";
+import { type Room } from "matrix-js-sdk/src/matrix";
+import { type ScrollIntoViewLocation } from "react-virtuoso";
+import { isEqual } from "lodash";
 
 import { type RoomListViewState } from "../../../viewmodels/roomlist/RoomListViewModel";
 import { _t } from "../../../../languageHandler";
 import { RoomListItemView } from "./RoomListItemView";
-import { RovingTabIndexProvider } from "../../../../accessibility/RovingTabIndex";
+import { type ListContext, ListView } from "../../../utils/ListView";
+import { type FilterKey } from "../../../../stores/room-list-v3/skip-list/filters";
 import { getKeyBindingsManager } from "../../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../../accessibility/KeyboardShortcuts";
 import { Landmark, LandmarkNavigation } from "../../../../accessibility/LandmarkNavigation";
@@ -22,59 +25,112 @@ interface RoomListProps {
      */
     vm: RoomListViewState;
 }
-
+/**
+ * Height of a single room list item
+ */
+const ROOM_LIST_ITEM_HEIGHT = 48;
+/**
+ * Amount to extend the top and bottom of the viewport by.
+ * From manual testing and user feedback 25 items is reported to be enough to avoid blank space when using the mouse wheel,
+ * and the trackpad scrolling at a slow to moderate speed where you can still see/read the content.
+ * Using the trackpad to sling through a large percentage of the list quickly will still show blank space.
+ * We would likely need to simplify the item content to improve this case.
+ */
+const EXTENDED_VIEWPORT_HEIGHT = 25 * ROOM_LIST_ITEM_HEIGHT;
 /**
  * A virtualized list of rooms.
  */
-export function RoomList({ vm: { rooms, activeIndex } }: RoomListProps): JSX.Element {
-    const roomRendererMemoized = useCallback(
-        ({ key, index, style }: ListRowProps) => (
-            <RoomListItemView room={rooms[index]} key={key} style={style} isSelected={activeIndex === index} />
-        ),
-        [rooms, activeIndex],
+export function RoomList({ vm: { roomsResult, activeIndex } }: RoomListProps): JSX.Element {
+    const lastSpaceId = useRef<string | undefined>(undefined);
+    const lastFilterKeys = useRef<FilterKey[] | undefined>(undefined);
+    const roomCount = roomsResult.rooms.length;
+    const getItemComponent = useCallback(
+        (
+            index: number,
+            item: Room,
+            context: ListContext<{
+                spaceId: string;
+                filterKeys: FilterKey[] | undefined;
+            }>,
+            onFocus: (item: Room, e: React.FocusEvent) => void,
+        ): JSX.Element => {
+            const itemKey = item.roomId;
+            const isRovingItem = itemKey === context.tabIndexKey;
+            const isFocused = isRovingItem && context.focused;
+            const isSelected = activeIndex === index;
+            return (
+                <RoomListItemView
+                    room={item}
+                    key={itemKey}
+                    isSelected={isSelected}
+                    isFocused={isFocused}
+                    tabIndex={isRovingItem ? 0 : -1}
+                    roomIndex={index}
+                    roomCount={roomCount}
+                    onFocus={onFocus}
+                />
+            );
+        },
+        [activeIndex, roomCount],
     );
 
-    // The first div is needed to make the virtualized list take all the remaining space and scroll correctly
+    const getItemKey = useCallback((item: Room): string => {
+        return item.roomId;
+    }, []);
+
+    const scrollIntoViewOnChange = useCallback(
+        (params: {
+            context: ListContext<{ spaceId: string; filterKeys: FilterKey[] | undefined }>;
+        }): ScrollIntoViewLocation | null | undefined | false | void => {
+            const { spaceId, filterKeys } = params.context.context;
+            const shouldScrollIndexIntoView =
+                lastSpaceId.current !== spaceId || !isEqual(lastFilterKeys.current, filterKeys);
+            lastFilterKeys.current = filterKeys;
+            lastSpaceId.current = spaceId;
+
+            if (shouldScrollIndexIntoView) {
+                return {
+                    align: `start`,
+                    index: activeIndex || 0,
+                    behavior: "auto",
+                };
+            }
+            return false;
+        },
+        [activeIndex],
+    );
+
+    const keyDownCallback = useCallback((ev: React.KeyboardEvent) => {
+        const navAction = getKeyBindingsManager().getNavigationAction(ev);
+        if (navAction === KeyBindingAction.NextLandmark || navAction === KeyBindingAction.PreviousLandmark) {
+            LandmarkNavigation.findAndFocusNextLandmark(
+                Landmark.ROOM_LIST,
+                navAction === KeyBindingAction.PreviousLandmark,
+            );
+            ev.stopPropagation();
+            ev.preventDefault();
+            return;
+        }
+    }, []);
+
     return (
-        <RovingTabIndexProvider handleHomeEnd={true} handleUpDown={true}>
-            {({ onKeyDownHandler }) => (
-                <div
-                    className="mx_RoomList"
-                    data-testid="room-list"
-                    onKeyDown={(ev) => {
-                        const navAction = getKeyBindingsManager().getNavigationAction(ev);
-                        if (
-                            navAction === KeyBindingAction.NextLandmark ||
-                            navAction === KeyBindingAction.PreviousLandmark
-                        ) {
-                            LandmarkNavigation.findAndFocusNextLandmark(
-                                Landmark.ROOM_LIST,
-                                navAction === KeyBindingAction.PreviousLandmark,
-                            );
-                            ev.stopPropagation();
-                            ev.preventDefault();
-                            return;
-                        }
-                        onKeyDownHandler(ev);
-                    }}
-                >
-                    <AutoSizer>
-                        {({ height, width }) => (
-                            <List
-                                aria-label={_t("room_list|list_title")}
-                                className="mx_RoomList_List"
-                                rowRenderer={roomRendererMemoized}
-                                rowCount={rooms.length}
-                                rowHeight={48}
-                                height={height}
-                                width={width}
-                                scrollToIndex={activeIndex ?? 0}
-                                tabIndex={-1}
-                            />
-                        )}
-                    </AutoSizer>
-                </div>
-            )}
-        </RovingTabIndexProvider>
+        <ListView
+            context={{ spaceId: roomsResult.spaceId, filterKeys: roomsResult.filterKeys }}
+            scrollIntoViewOnChange={scrollIntoViewOnChange}
+            initialTopMostItemIndex={activeIndex}
+            data-testid="room-list"
+            role="listbox"
+            aria-label={_t("room_list|list_title")}
+            fixedItemHeight={ROOM_LIST_ITEM_HEIGHT}
+            items={roomsResult.rooms}
+            getItemComponent={getItemComponent}
+            getItemKey={getItemKey}
+            isItemFocusable={() => true}
+            onKeyDown={keyDownCallback}
+            increaseViewportBy={{
+                bottom: EXTENDED_VIEWPORT_HEIGHT,
+                top: EXTENDED_VIEWPORT_HEIGHT,
+            }}
+        />
     );
 }
diff --git a/src/components/views/rooms/RoomListPanel/RoomListHeaderView.tsx b/src/components/views/rooms/RoomListPanel/RoomListHeaderView.tsx
index 752f065fd4..5fdc5e4bc4 100644
--- a/src/components/views/rooms/RoomListPanel/RoomListHeaderView.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomListHeaderView.tsx
@@ -14,9 +14,10 @@ import HomeIcon from "@vector-im/compound-design-tokens/assets/web/icons/home";
 import PreferencesIcon from "@vector-im/compound-design-tokens/assets/web/icons/preferences";
 import SettingsIcon from "@vector-im/compound-design-tokens/assets/web/icons/settings";
 import VideoCallIcon from "@vector-im/compound-design-tokens/assets/web/icons/video-call";
+import ChatIcon from "@vector-im/compound-design-tokens/assets/web/icons/chat";
+import { Flex } from "@element-hq/web-shared-components";
 
 import { _t } from "../../../../languageHandler";
-import { Flex } from "../../../utils/Flex";
 import {
     type RoomListHeaderViewState,
     useRoomListHeaderViewModel,
@@ -44,15 +45,23 @@ export function RoomListHeaderView(): JSX.Element {
                 {vm.displaySpaceMenu && <SpaceMenu vm={vm} />}
             </Flex>
             <Flex align="center" gap="var(--cpd-space-2x)">
-                <RoomListOptionsMenu vm={vm} />
+                <div className="mx_RoomListHeaderView_ReleaseAnnouncementAnchor">
+                    <RoomListOptionsMenu vm={vm} />
+                </div>
+
                 {/* If we don't display the compose menu, it means that the user can only send DM */}
-                {vm.displayComposeMenu ? (
-                    <ComposeMenu vm={vm} />
-                ) : (
-                    <IconButton aria-label={_t("action|new_message")} onClick={(e) => vm.createChatRoom(e.nativeEvent)}>
-                        <ComposeIcon color="var(--cpd-color-icon-secondary)" />
-                    </IconButton>
-                )}
+                <div className="mx_RoomListHeaderView_ReleaseAnnouncementAnchor">
+                    {vm.displayComposeMenu ? (
+                        <ComposeMenu vm={vm} />
+                    ) : (
+                        <IconButton
+                            onClick={(e) => vm.createChatRoom(e.nativeEvent)}
+                            tooltip={_t("action|new_conversation")}
+                        >
+                            <ComposeIcon color="var(--cpd-color-icon-secondary)" aria-hidden />
+                        </IconButton>
+                    )}
+                </div>
             </Flex>
         </Flex>
     );
@@ -138,17 +147,12 @@ function ComposeMenu({ vm }: ComposeMenuProps): JSX.Element {
             side="right"
             align="start"
             trigger={
-                <IconButton aria-label={_t("action|add")}>
-                    <ComposeIcon color="var(--cpd-color-icon-secondary)" />
+                <IconButton tooltip={_t("action|new_conversation")}>
+                    <ComposeIcon color="var(--cpd-color-icon-secondary)" aria-hidden />
                 </IconButton>
             }
         >
-            <MenuItem
-                Icon={UserAddIcon}
-                label={_t("action|new_message")}
-                onSelect={vm.createChatRoom}
-                hideChevron={true}
-            />
+            <MenuItem Icon={ChatIcon} label={_t("action|start_chat")} onSelect={vm.createChatRoom} hideChevron={true} />
             {vm.canCreateRoom && (
                 <MenuItem Icon={RoomIcon} label={_t("action|new_room")} onSelect={vm.createRoom} hideChevron={true} />
             )}
diff --git a/src/components/views/rooms/RoomListPanel/RoomListItemContextMenuView.tsx b/src/components/views/rooms/RoomListPanel/RoomListItemContextMenuView.tsx
new file mode 100644
index 0000000000..f3ba4167e7
--- /dev/null
+++ b/src/components/views/rooms/RoomListPanel/RoomListItemContextMenuView.tsx
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { type Room } from "matrix-js-sdk/src/matrix";
+import { type JSX, type PropsWithChildren } from "react";
+import { ContextMenu } from "@vector-im/compound-web";
+import React from "react";
+
+import { _t } from "../../../../languageHandler";
+import { MoreOptionContent } from "./RoomListItemMenuView";
+import { useRoomListItemMenuViewModel } from "../../../viewmodels/roomlist/RoomListItemMenuViewModel";
+
+interface RoomListItemContextMenuViewProps {
+    /**
+     * The room to display the menu for.
+     */
+    room: Room;
+}
+
+/**
+ * A view for the room list item context menu.
+ */
+export function RoomListItemContextMenuView({
+    room,
+    children,
+}: PropsWithChildren<RoomListItemContextMenuViewProps>): JSX.Element {
+    const vm = useRoomListItemMenuViewModel(room);
+
+    return (
+        <ContextMenu
+            title={_t("room_list|room|more_options")}
+            showTitle={false}
+            // To not mess with the roving tab index of the button
+            hasAccessibleAlternative={true}
+            trigger={children}
+        >
+            <MoreOptionContent vm={vm} />
+        </ContextMenu>
+    );
+}
diff --git a/src/components/views/rooms/RoomListPanel/RoomListItemMenuView.tsx b/src/components/views/rooms/RoomListPanel/RoomListItemMenuView.tsx
index 07b7be4b43..1162d07e9a 100644
--- a/src/components/views/rooms/RoomListPanel/RoomListItemMenuView.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomListItemMenuView.tsx
@@ -5,8 +5,8 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import React, { type ComponentProps, type JSX, type Ref, useState } from "react";
-import { IconButton, Menu, MenuItem, Separator, ToggleMenuItem, Tooltip } from "@vector-im/compound-web";
+import React, { type JSX, useState } from "react";
+import { IconButton, Menu, MenuItem, Separator, ToggleMenuItem } from "@vector-im/compound-web";
 import MarkAsReadIcon from "@vector-im/compound-design-tokens/assets/web/icons/mark-as-read";
 import MarkAsUnreadIcon from "@vector-im/compound-design-tokens/assets/web/icons/mark-as-unread";
 import FavouriteIcon from "@vector-im/compound-design-tokens/assets/web/icons/favourite";
@@ -19,9 +19,10 @@ import NotificationIcon from "@vector-im/compound-design-tokens/assets/web/icons
 import NotificationOffIcon from "@vector-im/compound-design-tokens/assets/web/icons/notifications-off-solid";
 import CheckIcon from "@vector-im/compound-design-tokens/assets/web/icons/check";
 import { type Room } from "matrix-js-sdk/src/matrix";
+import { Flex } from "@element-hq/web-shared-components";
+import classNames from "classnames";
 
 import { _t } from "../../../../languageHandler";
-import { Flex } from "../../../utils/Flex";
 import {
     type RoomListItemMenuViewState,
     useRoomListItemMenuViewModel,
@@ -29,27 +30,27 @@ import {
 import { RoomNotifState } from "../../../../RoomNotifs";
 
 interface RoomListItemMenuViewProps {
+    /**
+     * Additional class name for the root element.
+     */
+    className?: string;
+
     /**
      * The room to display the menu for.
      */
     room: Room;
-    /**
-     * Set the menu open state.
-     * @param isOpen
-     */
-    setMenuOpen: (isOpen: boolean) => void;
 }
 
 /**
  * A view for the room list item menu.
  */
-export function RoomListItemMenuView({ room, setMenuOpen }: RoomListItemMenuViewProps): JSX.Element {
+export function RoomListItemMenuView({ room, className }: RoomListItemMenuViewProps): JSX.Element {
     const vm = useRoomListItemMenuViewModel(room);
 
     return (
-        <Flex className="mx_RoomListItemMenuView" align="center" gap="var(--cpd-space-1x)">
-            {vm.showMoreOptionsMenu && <MoreOptionsMenu setMenuOpen={setMenuOpen} vm={vm} />}
-            {vm.showNotificationMenu && <NotificationMenu setMenuOpen={setMenuOpen} vm={vm} />}
+        <Flex className={classNames("mx_RoomListItemMenuView", className)} align="center" gap="var(--cpd-space-1x)">
+            {vm.showMoreOptionsMenu && <MoreOptionsMenu vm={vm} />}
+            {vm.showNotificationMenu && <NotificationMenu vm={vm} />}
         </Flex>
     );
 }
@@ -59,30 +60,48 @@ interface MoreOptionsMenuProps {
      * The view model state for the menu.
      */
     vm: RoomListItemMenuViewState;
-    /**
-     * Set the menu open state.
-     * @param isOpen
-     */
-    setMenuOpen: (isOpen: boolean) => void;
 }
 
 /**
  * The more options menu for the room list item.
  */
-function MoreOptionsMenu({ vm, setMenuOpen }: MoreOptionsMenuProps): JSX.Element {
+function MoreOptionsMenu({ vm }: MoreOptionsMenuProps): JSX.Element {
     const [open, setOpen] = useState(false);
 
     return (
         <Menu
             open={open}
-            onOpenChange={(isOpen) => {
-                setOpen(isOpen);
-                setMenuOpen(isOpen);
-            }}
+            onOpenChange={setOpen}
             title={_t("room_list|room|more_options")}
             showTitle={false}
             align="start"
-            trigger={<MoreOptionsButton size="24px" />}
+            trigger={
+                <IconButton
+                    tooltip={_t("room_list|room|more_options")}
+                    aria-label={_t("room_list|room|more_options")}
+                    size="24px"
+                >
+                    <OverflowIcon />
+                </IconButton>
+            }
+        >
+            <MoreOptionContent vm={vm} />
+        </Menu>
+    );
+}
+
+interface MoreOptionContentProps {
+    /**
+     * The view model state for the menu.
+     */
+    vm: RoomListItemMenuViewState;
+}
+
+export function MoreOptionContent({ vm }: MoreOptionContentProps): JSX.Element {
+    return (
+        <div
+            // We don't want keyboard navigation events to bubble up to the ListView changing the focused item
+            onKeyDown={(e) => e.stopPropagation()}
         >
             {vm.canMarkAsRead && (
                 <MenuItem
@@ -109,12 +128,12 @@ function MoreOptionsMenu({ vm, setMenuOpen }: MoreOptionsMenuProps): JSX.Element
                 onSelect={vm.toggleFavorite}
                 onClick={(evt) => evt.stopPropagation()}
             />
-            <MenuItem
+            <ToggleMenuItem
+                checked={vm.isLowPriority}
                 Icon={ArrowDownIcon}
                 label={_t("room_list|more_options|low_priority")}
                 onSelect={vm.toggleLowPriority}
                 onClick={(evt) => evt.stopPropagation()}
-                hideChevron={true}
             />
             {vm.canInvite && (
                 <MenuItem
@@ -143,117 +162,79 @@ function MoreOptionsMenu({ vm, setMenuOpen }: MoreOptionsMenuProps): JSX.Element
                 onClick={(evt) => evt.stopPropagation()}
                 hideChevron={true}
             />
-        </Menu>
+        </div>
     );
 }
 
-interface MoreOptionsButtonProps extends ComponentProps<typeof IconButton> {
-    ref?: Ref<HTMLButtonElement>;
-}
-
-/**
- * A button to trigger the more options menu.
- */
-export const MoreOptionsButton = function MoreOptionsButton(props: MoreOptionsButtonProps): JSX.Element {
-    return (
-        <Tooltip label={_t("room_list|room|more_options")}>
-            <IconButton aria-label={_t("room_list|room|more_options")} {...props}>
-                <OverflowIcon />
-            </IconButton>
-        </Tooltip>
-    );
-};
-
 interface NotificationMenuProps {
     /**
      * The view model state for the menu.
      */
     vm: RoomListItemMenuViewState;
-    /**
-     * Set the menu open state.
-     * @param isOpen
-     */
-    setMenuOpen: (isOpen: boolean) => void;
 }
 
-function NotificationMenu({ vm, setMenuOpen }: NotificationMenuProps): JSX.Element {
+function NotificationMenu({ vm }: NotificationMenuProps): JSX.Element {
     const [open, setOpen] = useState(false);
-
     const checkComponent = <CheckIcon width="24px" height="24px" color="var(--cpd-color-icon-primary)" />;
 
     return (
         <Menu
             open={open}
-            onOpenChange={(isOpen) => {
-                setOpen(isOpen);
-                setMenuOpen(isOpen);
-            }}
+            onOpenChange={setOpen}
             title={_t("room_list|notification_options")}
             showTitle={false}
             align="start"
-            trigger={<NotificationButton isRoomMuted={vm.isNotificationMute} size="24px" />}
+            trigger={
+                <IconButton
+                    size="24px"
+                    tooltip={_t("room_list|notification_options")}
+                    aria-label={_t("room_list|notification_options")}
+                >
+                    {vm.isNotificationMute ? <NotificationOffIcon /> : <NotificationIcon />}
+                </IconButton>
+            }
         >
-            <MenuItem
-                aria-selected={vm.isNotificationAllMessage}
-                hideChevron={true}
-                label={_t("notifications|default_settings")}
-                onSelect={() => vm.setRoomNotifState(RoomNotifState.AllMessages)}
-                onClick={(evt) => evt.stopPropagation()}
+            <div
+                // We don't want keyboard navigation events to bubble up to the ListView changing the focused item
+                onKeyDown={(e) => e.stopPropagation()}
             >
-                {vm.isNotificationAllMessage && checkComponent}
-            </MenuItem>
-            <MenuItem
-                aria-selected={vm.isNotificationAllMessageLoud}
-                hideChevron={true}
-                label={_t("notifications|all_messages")}
-                onSelect={() => vm.setRoomNotifState(RoomNotifState.AllMessagesLoud)}
-                onClick={(evt) => evt.stopPropagation()}
-            >
-                {vm.isNotificationAllMessageLoud && checkComponent}
-            </MenuItem>
-            <MenuItem
-                aria-selected={vm.isNotificationMentionOnly}
-                hideChevron={true}
-                label={_t("notifications|mentions_keywords")}
-                onSelect={() => vm.setRoomNotifState(RoomNotifState.MentionsOnly)}
-                onClick={(evt) => evt.stopPropagation()}
-            >
-                {vm.isNotificationMentionOnly && checkComponent}
-            </MenuItem>
-            <MenuItem
-                aria-selected={vm.isNotificationMute}
-                hideChevron={true}
-                label={_t("notifications|mute_room")}
-                onSelect={() => vm.setRoomNotifState(RoomNotifState.Mute)}
-                onClick={(evt) => evt.stopPropagation()}
-            >
-                {vm.isNotificationMute && checkComponent}
-            </MenuItem>
+                <MenuItem
+                    aria-selected={vm.isNotificationAllMessage}
+                    hideChevron={true}
+                    label={_t("notifications|default_settings")}
+                    onSelect={() => vm.setRoomNotifState(RoomNotifState.AllMessages)}
+                    onClick={(evt) => evt.stopPropagation()}
+                >
+                    {vm.isNotificationAllMessage && checkComponent}
+                </MenuItem>
+                <MenuItem
+                    aria-selected={vm.isNotificationAllMessageLoud}
+                    hideChevron={true}
+                    label={_t("notifications|all_messages")}
+                    onSelect={() => vm.setRoomNotifState(RoomNotifState.AllMessagesLoud)}
+                    onClick={(evt) => evt.stopPropagation()}
+                >
+                    {vm.isNotificationAllMessageLoud && checkComponent}
+                </MenuItem>
+                <MenuItem
+                    aria-selected={vm.isNotificationMentionOnly}
+                    hideChevron={true}
+                    label={_t("notifications|mentions_keywords")}
+                    onSelect={() => vm.setRoomNotifState(RoomNotifState.MentionsOnly)}
+                    onClick={(evt) => evt.stopPropagation()}
+                >
+                    {vm.isNotificationMentionOnly && checkComponent}
+                </MenuItem>
+                <MenuItem
+                    aria-selected={vm.isNotificationMute}
+                    hideChevron={true}
+                    label={_t("notifications|mute_room")}
+                    onSelect={() => vm.setRoomNotifState(RoomNotifState.Mute)}
+                    onClick={(evt) => evt.stopPropagation()}
+                >
+                    {vm.isNotificationMute && checkComponent}
+                </MenuItem>
+            </div>
         </Menu>
     );
 }
-
-interface NotificationButtonProps extends ComponentProps<typeof IconButton> {
-    /**
-     * Whether the room is muted.
-     */
-    isRoomMuted: boolean;
-    ref?: Ref<HTMLButtonElement>;
-}
-
-/**
- * A button to trigger the notification menu.
- */
-export const NotificationButton = function MoreOptionsButton({
-    isRoomMuted,
-    ref,
-    ...props
-}: NotificationButtonProps): JSX.Element {
-    return (
-        <Tooltip label={_t("room_list|notification_options")}>
-            <IconButton aria-label={_t("room_list|notification_options")} {...props} ref={ref}>
-                {isRoomMuted ? <NotificationOffIcon /> : <NotificationIcon />}
-            </IconButton>
-        </Tooltip>
-    );
-};
diff --git a/src/components/views/rooms/RoomListPanel/RoomListItemView.tsx b/src/components/views/rooms/RoomListPanel/RoomListItemView.tsx
index ac4d72ec57..d87da9c034 100644
--- a/src/components/views/rooms/RoomListPanel/RoomListItemView.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomListItemView.tsx
@@ -5,18 +5,18 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import React, { type JSX, memo, useCallback, useRef, useState } from "react";
+import React, { type JSX, memo, useEffect, useRef } from "react";
 import { type Room } from "matrix-js-sdk/src/matrix";
 import classNames from "classnames";
+import { Flex } from "@element-hq/web-shared-components";
 
 import { useRoomListItemViewModel } from "../../../viewmodels/roomlist/RoomListItemViewModel";
-import { Flex } from "../../../utils/Flex";
 import { RoomListItemMenuView } from "./RoomListItemMenuView";
 import { NotificationDecoration } from "../NotificationDecoration";
 import { RoomAvatarView } from "../../avatars/RoomAvatarView";
-import { useRovingTabIndex } from "../../../../accessibility/RovingTabIndex";
+import { RoomListItemContextMenuView } from "./RoomListItemContextMenuView";
 
-interface RoomListItemViewProps extends React.HTMLAttributes<HTMLButtonElement> {
+interface RoomListItemViewProps extends Omit<React.HTMLAttributes<HTMLButtonElement>, "onFocus"> {
     /**
      * The room to display
      */
@@ -25,6 +25,22 @@ interface RoomListItemViewProps extends React.HTMLAttributes<HTMLButtonElement>
      * Whether the room is selected
      */
     isSelected: boolean;
+    /**
+     * Whether the room is focused
+     */
+    isFocused: boolean;
+    /**
+     * A callback that indicates the item has received focus
+     */
+    onFocus: (room: Room, e: React.FocusEvent) => void;
+    /**
+     * The index of the room in the list
+     */
+    roomIndex: number;
+    /**
+     * The total number of rooms in the list
+     */
+    roomCount: number;
 }
 
 /**
@@ -33,121 +49,76 @@ interface RoomListItemViewProps extends React.HTMLAttributes<HTMLButtonElement>
 export const RoomListItemView = memo(function RoomListItemView({
     room,
     isSelected,
+    isFocused,
+    onFocus,
+    roomIndex: index,
+    roomCount: count,
     ...props
 }: RoomListItemViewProps): JSX.Element {
-    const buttonRef = useRef<HTMLButtonElement>(null);
-    const [onFocus, isActive, ref] = useRovingTabIndex(buttonRef);
-
+    const ref = useRef<HTMLButtonElement>(null);
     const vm = useRoomListItemViewModel(room);
 
-    const [isHover, setIsHoverWithDelay] = useIsHover();
-    const [isMenuOpen, setIsMenuOpen] = useState(false);
-    // The compound menu in RoomListItemMenuView needs to be rendered when the hover menu is shown
-    // Using display: none; and then display:flex when hovered in CSS causes the menu to be misaligned
-    const showHoverDecoration = isMenuOpen || isHover;
-    const showHoverMenu = showHoverDecoration && vm.showHoverMenu;
+    useEffect(() => {
+        if (isFocused) {
+            ref.current?.focus({ preventScroll: true, focusVisible: true });
+        }
+    }, [isFocused]);
 
-    return (
-        <button
+    const content = (
+        <Flex
+            as="button"
             ref={ref}
             className={classNames("mx_RoomListItemView", {
-                mx_RoomListItemView_hover: showHoverDecoration,
-                mx_RoomListItemView_menu_open: showHoverMenu,
+                mx_RoomListItemView_has_menu: vm.showHoverMenu,
                 mx_RoomListItemView_selected: isSelected,
                 mx_RoomListItemView_bold: vm.isBold,
             })}
+            gap="var(--cpd-space-3x)"
+            align="center"
             type="button"
+            role="option"
+            aria-posinset={index + 1}
+            aria-setsize={count}
             aria-selected={isSelected}
             aria-label={vm.a11yLabel}
             onClick={() => vm.openRoom()}
-            onMouseOver={() => setIsHoverWithDelay(true)}
-            onMouseOut={() => setIsHoverWithDelay(false)}
-            onFocus={() => {
-                setIsHoverWithDelay(true);
-                onFocus();
-            }}
-            // Adding a timeout because when tabbing to go to the more options and notification menu, the focus moves out of the button
-            // The blur makes the button lose the hover state and these menu are not shown
-            // We delay the blur event to give time to the focus to move to the menu
-            onBlur={() => setIsHoverWithDelay(false, 10)}
-            tabIndex={isActive ? 0 : -1}
+            onFocus={(e: React.FocusEvent<HTMLButtonElement>) => onFocus(room, e)}
+            tabIndex={isFocused ? 0 : -1}
             {...props}
         >
-            {/* We need this extra div between the button and the content in order to add a padding which is not messing with the virtualized list */}
-            <Flex className="mx_RoomListItemView_container" gap="var(--cpd-space-3x)" align="center">
-                <RoomAvatarView room={room} />
-                <Flex
-                    className="mx_RoomListItemView_content"
-                    gap="var(--cpd-space-2x)"
-                    align="center"
-                    justify="space-between"
-                >
-                    {/* We truncate the room name when too long. Title here is to show the full name on hover */}
-                    <div className="mx_RoomListItemView_text">
-                        <div className="mx_RoomListItemView_roomName" title={vm.name}>
-                            {vm.name}
-                        </div>
-                        <div className="mx_RoomListItemView_messagePreview">{vm.messagePreview}</div>
+            <RoomAvatarView room={room} />
+            <Flex
+                className="mx_RoomListItemView_content"
+                gap="var(--cpd-space-2x)"
+                align="center"
+                justify="space-between"
+            >
+                {/* We truncate the room name when too long. Title here is to show the full name on hover */}
+                <div className="mx_RoomListItemView_text">
+                    <div className="mx_RoomListItemView_roomName" title={vm.name}>
+                        {vm.name}
                     </div>
-                    {showHoverMenu ? (
-                        <RoomListItemMenuView
-                            room={room}
-                            setMenuOpen={(isOpen) => {
-                                if (isOpen) {
-                                    setIsMenuOpen(isOpen);
-                                } else {
-                                    // To avoid icon blinking when closing the menu, we delay the state update
-                                    setTimeout(() => setIsMenuOpen(isOpen), 0);
-                                    // After closing the menu, we need to set the focus back to the button
-                                    // 10ms because the focus moves to the body and we put back the focus on the button
-                                    setTimeout(() => buttonRef.current?.focus(), 10);
-                                }
-                            }}
-                        />
-                    ) : (
-                        <>
-                            {/* aria-hidden because we summarise the unread count/notification status in a11yLabel variable */}
-                            {vm.showNotificationDecoration && (
-                                <NotificationDecoration
-                                    notificationState={vm.notificationState}
-                                    aria-hidden={true}
-                                    hasVideoCall={vm.hasParticipantInCall}
-                                />
-                            )}
-                        </>
+                    {vm.messagePreview && (
+                        <div className="mx_RoomListItemView_messagePreview" title={vm.messagePreview}>
+                            {vm.messagePreview}
+                        </div>
                     )}
-                </Flex>
+                </div>
+                {vm.showHoverMenu && <RoomListItemMenuView className="mx_RoomListItemView_menu" room={room} />}
+
+                {/* aria-hidden because we summarise the unread count/notification status in a11yLabel variable */}
+                {vm.showNotificationDecoration && (
+                    <NotificationDecoration
+                        className="mx_RoomListItemView_notificationDecoration"
+                        notificationState={vm.notificationState}
+                        aria-hidden={true}
+                        callType={vm.callType}
+                    />
+                )}
             </Flex>
-        </button>
+        </Flex>
     );
+
+    if (!vm.showContextMenu) return content;
+    return <RoomListItemContextMenuView room={room}>{content}</RoomListItemContextMenuView>;
 });
-
-/**
- * Custom hook to manage the hover state of the room list item
- * If the timeout is set, it will set the hover state after the timeout
- * If the timeout is not set, it will set the hover state immediately
- * When the set method is called, it will clear any existing timeout
- *
- * @returns {boolean} isHover - The hover state
- */
-function useIsHover(): [boolean, (value: boolean, timeout?: number) => void] {
-    const [isHover, setIsHover] = useState(false);
-    // Store the timeout ID
-    const timeoutRef = useRef<number | undefined>(undefined);
-
-    const setIsHoverWithDelay = useCallback((value: boolean, timeout?: number): void => {
-        // Clear the timeout if it exists
-        clearTimeout(timeoutRef.current);
-
-        // No delay, set the value immediately
-        if (timeout === undefined) {
-            setIsHover(value);
-            return;
-        }
-
-        // Set a timeout to set the value after the delay
-        timeoutRef.current = setTimeout(() => setIsHover(value), timeout);
-    }, []);
-
-    return [isHover, setIsHoverWithDelay];
-}
diff --git a/src/components/views/rooms/RoomListPanel/RoomListOptionsMenu.tsx b/src/components/views/rooms/RoomListPanel/RoomListOptionsMenu.tsx
index a78c1dd994..d851ca34b5 100644
--- a/src/components/views/rooms/RoomListPanel/RoomListOptionsMenu.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomListOptionsMenu.tsx
@@ -5,9 +5,9 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import { IconButton, Menu, MenuTitle, CheckboxMenuItem, Tooltip, RadioMenuItem } from "@vector-im/compound-web";
+import { IconButton, Menu, MenuTitle, Tooltip, RadioMenuItem } from "@vector-im/compound-web";
 import React, { type Ref, type JSX, useState, useCallback } from "react";
-import FilterIcon from "@vector-im/compound-design-tokens/assets/web/icons/filter";
+import OverflowHorizontalIcon from "@vector-im/compound-design-tokens/assets/web/icons/overflow-horizontal";
 
 import { _t } from "../../../../languageHandler";
 import { SortOption } from "../../../viewmodels/roomlist/useSorter";
@@ -20,7 +20,7 @@ interface MenuTriggerProps extends React.ComponentProps<typeof IconButton> {
 const MenuTrigger = ({ ref, ...props }: MenuTriggerProps): JSX.Element => (
     <Tooltip label={_t("room_list|room_options")}>
         <IconButton aria-label={_t("room_list|room_options")} {...props} ref={ref}>
-            <FilterIcon color="var(--cpd-color-icon-secondary)" />
+            <OverflowHorizontalIcon color="var(--cpd-color-icon-secondary)" />
         </IconButton>
     </Tooltip>
 );
@@ -63,12 +63,6 @@ export function RoomListOptionsMenu({ vm }: Props): JSX.Element {
                 checked={vm.activeSortOption === SortOption.AToZ}
                 onSelect={onAtoZSelected}
             />
-            <MenuTitle title={_t("room_list|appearance")} />
-            <CheckboxMenuItem
-                label={_t("room_list|show_message_previews")}
-                onSelect={vm.toggleMessagePreview}
-                checked={vm.shouldShowMessagePreview}
-            />
         </Menu>
     );
 }
diff --git a/src/components/views/rooms/RoomListPanel/RoomListPanel.tsx b/src/components/views/rooms/RoomListPanel/RoomListPanel.tsx
index 291794399f..5701cea905 100644
--- a/src/components/views/rooms/RoomListPanel/RoomListPanel.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomListPanel.tsx
@@ -5,14 +5,19 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React from "react";
+import React, { useState, useCallback } from "react";
+import { Flex } from "@element-hq/web-shared-components";
 
 import { shouldShowComponent } from "../../../../customisations/helpers/UIComponents";
 import { UIComponent } from "../../../../settings/UIFeature";
 import { RoomListSearch } from "./RoomListSearch";
 import { RoomListHeaderView } from "./RoomListHeaderView";
 import { RoomListView } from "./RoomListView";
-import { Flex } from "../../../utils/Flex";
+import { _t } from "../../../../languageHandler";
+import { getKeyBindingsManager } from "../../../../KeyBindingsManager";
+import { KeyBindingAction } from "../../../../accessibility/KeyboardShortcuts";
+import { Landmark, LandmarkNavigation } from "../../../../accessibility/LandmarkNavigation";
+import { type IState as IRovingTabIndexState } from "../../../../accessibility/RovingTabIndex";
 
 type RoomListPanelProps = {
     /**
@@ -27,14 +32,42 @@ type RoomListPanelProps = {
  */
 export const RoomListPanel: React.FC<RoomListPanelProps> = ({ activeSpace }) => {
     const displayRoomSearch = shouldShowComponent(UIComponent.FilterContainer);
+    const [focusedElement, setFocusedElement] = useState<Element | null>(null);
+
+    const onFocus = useCallback((ev: React.FocusEvent): void => {
+        setFocusedElement(ev.target as Element);
+    }, []);
+
+    const onBlur = useCallback((): void => {
+        setFocusedElement(null);
+    }, []);
+
+    const onKeyDown = useCallback(
+        (ev: React.KeyboardEvent, state?: IRovingTabIndexState): void => {
+            if (!focusedElement) return;
+            const navAction = getKeyBindingsManager().getNavigationAction(ev);
+            if (navAction === KeyBindingAction.PreviousLandmark || navAction === KeyBindingAction.NextLandmark) {
+                ev.stopPropagation();
+                ev.preventDefault();
+                LandmarkNavigation.findAndFocusNextLandmark(
+                    Landmark.ROOM_SEARCH,
+                    navAction === KeyBindingAction.PreviousLandmark,
+                );
+            }
+        },
+        [focusedElement],
+    );
 
     return (
         <Flex
-            as="section"
+            as="nav"
             className="mx_RoomListPanel"
-            data-testid="room-list-panel"
             direction="column"
             align="stretch"
+            aria-label={_t("room_list|list_title")}
+            onFocus={onFocus}
+            onBlur={onBlur}
+            onKeyDown={onKeyDown}
         >
             {displayRoomSearch && <RoomListSearch activeSpace={activeSpace} />}
             <RoomListHeaderView />
diff --git a/src/components/views/rooms/RoomListPanel/RoomListPrimaryFilters.tsx b/src/components/views/rooms/RoomListPanel/RoomListPrimaryFilters.tsx
index ebf972d361..44f19a86da 100644
--- a/src/components/views/rooms/RoomListPanel/RoomListPrimaryFilters.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomListPrimaryFilters.tsx
@@ -5,11 +5,12 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import React, { type JSX } from "react";
-import { ChatFilter } from "@vector-im/compound-web";
+import React, { type JSX, useEffect, useId, useRef, useState, type RefObject } from "react";
+import { ChatFilter, IconButton } from "@vector-im/compound-web";
+import ChevronDownIcon from "@vector-im/compound-design-tokens/assets/web/icons/chevron-down";
+import { Flex } from "@element-hq/web-shared-components";
 
 import type { RoomListViewState } from "../../../viewmodels/roomlist/RoomListViewModel";
-import { Flex } from "../../../utils/Flex";
 import { _t } from "../../../../languageHandler";
 
 interface RoomListPrimaryFiltersProps {
@@ -23,23 +24,146 @@ interface RoomListPrimaryFiltersProps {
  * The primary filters for the room list
  */
 export function RoomListPrimaryFilters({ vm }: RoomListPrimaryFiltersProps): JSX.Element {
+    const id = useId();
+    const [isExpanded, setIsExpanded] = useState(false);
+
+    const { ref, isWrapping: displayChevron, wrappingIndex } = useCollapseFilters<HTMLUListElement>(isExpanded);
+    const filters = useVisibleFilters(vm.primaryFilters, wrappingIndex);
+
     return (
         <Flex
-            as="ul"
-            role="listbox"
-            aria-label={_t("room_list|primary_filters")}
             className="mx_RoomListPrimaryFilters"
-            align="center"
-            gap="var(--cpd-space-2x)"
-            wrap="wrap"
+            data-testid="primary-filters"
+            gap="var(--cpd-space-3x)"
+            direction="row-reverse"
+            justify="space-between"
         >
-            {vm.primaryFilters.map((filter) => (
-                <li role="option" aria-selected={filter.active} key={filter.name}>
-                    <ChatFilter selected={filter.active} onClick={filter.toggle}>
+            {displayChevron && (
+                <IconButton
+                    kind="secondary"
+                    aria-expanded={isExpanded}
+                    aria-controls={id}
+                    className="mx_RoomListPrimaryFilters_IconButton"
+                    aria-label={isExpanded ? _t("room_list|collapse_filters") : _t("room_list|expand_filters")}
+                    size="28px"
+                    onClick={() => setIsExpanded((_expanded) => !_expanded)}
+                >
+                    <ChevronDownIcon />
+                </IconButton>
+            )}
+            <Flex
+                id={id}
+                as="div"
+                role="listbox"
+                aria-label={_t("room_list|primary_filters")}
+                align="center"
+                gap="var(--cpd-space-2x)"
+                wrap="wrap"
+                className="mx_RoomListPrimaryFilters_list"
+                ref={ref}
+            >
+                {filters.map((filter, i) => (
+                    <ChatFilter key={i} role="option" selected={filter.active} onClick={() => filter.toggle()}>
                         {filter.name}
                     </ChatFilter>
-                </li>
-            ))}
+                ))}
+            </Flex>
         </Flex>
     );
 }
+
+/**
+ * A hook to manage the wrapping of filters in the room list.
+ * It observes the filter list and hides filters that are wrapping when the list is not expanded.
+ * @param isExpanded
+ * @returns an object containing:
+ * - `ref`: a ref to put on the filter list element
+ * - `isWrapping`: a boolean indicating if the filters are wrapping
+ * - `wrappingIndex`: the index of the first filter that is wrapping
+ */
+function useCollapseFilters<T extends HTMLElement>(
+    isExpanded: boolean,
+): { ref: RefObject<T | null>; isWrapping: boolean; wrappingIndex: number } {
+    const ref = useRef<T>(null);
+    const [isWrapping, setIsWrapping] = useState(false);
+    const [wrappingIndex, setWrappingIndex] = useState(-1);
+
+    useEffect(() => {
+        if (!ref.current) return;
+
+        const hideFilters = (list: Element): void => {
+            let isWrapping = false;
+            Array.from(list.children).forEach((node, i): void => {
+                const child = node as HTMLElement;
+                const wrappingClass = "mx_RoomListPrimaryFilters_wrapping";
+                child.setAttribute("aria-hidden", "false");
+                child.classList.remove(wrappingClass);
+
+                // If the filter list is expanded, all filters are visible
+                if (isExpanded) return;
+
+                // If the previous element is on the left element of the current one, it means that the filter is wrapping
+                const previousSibling = child.previousElementSibling as HTMLElement | null;
+                if (previousSibling && child.offsetLeft <= previousSibling.offsetLeft) {
+                    if (!isWrapping) setWrappingIndex(i);
+                    isWrapping = true;
+                }
+
+                // If the filter is wrapping, we hide it
+                child.classList.toggle(wrappingClass, isWrapping);
+                child.setAttribute("aria-hidden", isWrapping.toString());
+            });
+
+            if (!isWrapping) setWrappingIndex(-1);
+            setIsWrapping(isExpanded || isWrapping);
+        };
+
+        hideFilters(ref.current);
+        const observer = new ResizeObserver((entries) => entries.forEach((entry) => hideFilters(entry.target)));
+
+        observer.observe(ref.current);
+        return () => {
+            observer.disconnect();
+        };
+    }, [isExpanded]);
+
+    return { ref, isWrapping, wrappingIndex };
+}
+
+/**
+ * A hook to sort the filters by active state.
+ * The list is sorted if the current filter index is greater than or equal to the wrapping index.
+ * If the wrapping index is -1, the filters are not sorted.
+ *
+ * @param filters - the list of filters to sort.
+ * @param wrappingIndex - the index of the first filter that is wrapping.
+ */
+export function useVisibleFilters(
+    filters: RoomListViewState["primaryFilters"],
+    wrappingIndex: number,
+): RoomListViewState["primaryFilters"] {
+    // By default, the filters are not sorted
+    const [sortedFilters, setSortedFilters] = useState(filters);
+
+    useEffect(() => {
+        const isActiveFilterWrapping = filters.findIndex((f) => f.active) >= wrappingIndex;
+        // If the active filter is not wrapping, we don't need to sort the filters
+        if (!isActiveFilterWrapping || wrappingIndex === -1) {
+            setSortedFilters(filters);
+            return;
+        }
+
+        // Sort the filters with the current filter at first position
+        setSortedFilters(
+            filters.slice().sort((filterA, filterB) => {
+                // If the filter is active, it should be at the top of the list
+                if (filterA.active && !filterB.active) return -1;
+                if (!filterA.active && filterB.active) return 1;
+                // If both filters are active or not, keep their original order
+                return 0;
+            }),
+        );
+    }, [filters, wrappingIndex]);
+
+    return sortedFilters;
+}
diff --git a/src/components/views/rooms/RoomListPanel/RoomListSearch.tsx b/src/components/views/rooms/RoomListPanel/RoomListSearch.tsx
index 26f0ff8bae..0354831a9e 100644
--- a/src/components/views/rooms/RoomListPanel/RoomListSearch.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomListSearch.tsx
@@ -5,24 +5,10 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import React, { type JSX } from "react";
-import { Button } from "@vector-im/compound-web";
-import ExploreIcon from "@vector-im/compound-design-tokens/assets/web/icons/explore";
-import SearchIcon from "@vector-im/compound-design-tokens/assets/web/icons/search";
-import DialPadIcon from "@vector-im/compound-design-tokens/assets/web/icons/dial-pad";
+import React, { useEffect, type JSX } from "react";
+import { RoomListSearchView, useCreateAutoDisposedViewModel } from "@element-hq/web-shared-components";
 
-import { IS_MAC, Key } from "../../../../Keyboard";
-import { _t } from "../../../../languageHandler";
-import { ALTERNATE_KEY_NAME } from "../../../../accessibility/KeyboardShortcuts";
-import { shouldShowComponent } from "../../../../customisations/helpers/UIComponents";
-import { UIComponent } from "../../../../settings/UIFeature";
-import { MetaSpace } from "../../../../stores/spaces";
-import { Action } from "../../../../dispatcher/actions";
-import PosthogTrackers from "../../../../PosthogTrackers";
-import defaultDispatcher from "../../../../dispatcher/dispatcher";
-import { Flex } from "../../../utils/Flex";
-import { useTypedEventEmitterState } from "../../../../hooks/useEventEmitter";
-import LegacyCallHandler, { LegacyCallHandlerEvent } from "../../../../LegacyCallHandler";
+import { RoomListSearchViewModel } from "../../../../viewmodels/room-list/RoomListSearchViewModel";
 
 type RoomListSearchProps = {
     /**
@@ -37,55 +23,10 @@ type RoomListSearchProps = {
  * The `Explore` button is displayed only in the Home meta space and when UIComponent.ExploreRooms is enabled.
  */
 export function RoomListSearch({ activeSpace }: RoomListSearchProps): JSX.Element {
-    const displayExploreButton = activeSpace === MetaSpace.Home && shouldShowComponent(UIComponent.ExploreRooms);
-    // We only display the dial button if the user is can make PSTN calls
-    const displayDialButton = useTypedEventEmitterState(
-        LegacyCallHandler.instance,
-        LegacyCallHandlerEvent.ProtocolSupport,
-        () => LegacyCallHandler.instance.getSupportsPstnProtocol(),
-    );
+    const vm = useCreateAutoDisposedViewModel(() => new RoomListSearchViewModel({ activeSpace }));
+    useEffect(() => {
+        vm.setActiveSpace(activeSpace);
+    }, [activeSpace, vm]);
 
-    return (
-        <Flex className="mx_RoomListSearch" role="search" gap="var(--cpd-space-2x)" align="center">
-            <Button
-                className="mx_RoomListSearch_search"
-                kind="secondary"
-                size="sm"
-                Icon={SearchIcon}
-                onClick={() => defaultDispatcher.fire(Action.OpenSpotlight)}
-            >
-                <Flex as="span" justify="space-between">
-                    <span className="mx_RoomListSearch_search_text">{_t("action|search")}</span>
-                    <kbd>{IS_MAC ? "⌘ K" : _t(ALTERNATE_KEY_NAME[Key.CONTROL]) + " K"}</kbd>
-                </Flex>
-            </Button>
-            {displayDialButton && (
-                <Button
-                    className="mx_RoomListSearch_button"
-                    kind="secondary"
-                    size="sm"
-                    Icon={DialPadIcon}
-                    iconOnly={true}
-                    aria-label={_t("left_panel|open_dial_pad")}
-                    onClick={(ev) => {
-                        defaultDispatcher.fire(Action.OpenDialPad);
-                    }}
-                />
-            )}
-            {displayExploreButton && (
-                <Button
-                    className="mx_RoomListSearch_button"
-                    kind="secondary"
-                    size="sm"
-                    Icon={ExploreIcon}
-                    iconOnly={true}
-                    aria-label={_t("action|explore_rooms")}
-                    onClick={(ev) => {
-                        defaultDispatcher.fire(Action.ViewRoomDirectory);
-                        PosthogTrackers.trackInteraction("WebLeftPanelExploreRoomsButton", ev);
-                    }}
-                />
-            )}
-        </Flex>
-    );
+    return <RoomListSearchView vm={vm} />;
 }
diff --git a/src/components/views/rooms/RoomListPanel/RoomListView.tsx b/src/components/views/rooms/RoomListPanel/RoomListView.tsx
index f6d99625aa..b29affc0be 100644
--- a/src/components/views/rooms/RoomListPanel/RoomListView.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomListView.tsx
@@ -17,7 +17,7 @@ import { RoomListPrimaryFilters } from "./RoomListPrimaryFilters";
  */
 export function RoomListView(): JSX.Element {
     const vm = useRoomListViewModel();
-    const isRoomListEmpty = vm.rooms.length === 0;
+    const isRoomListEmpty = vm.roomsResult.rooms.length === 0;
     let listBody;
     if (vm.isLoadingRooms) {
         listBody = <div className="mx_RoomListSkeleton" />;
@@ -28,7 +28,9 @@ export function RoomListView(): JSX.Element {
     }
     return (
         <>
-            <RoomListPrimaryFilters vm={vm} />
+            <div>
+                <RoomListPrimaryFilters vm={vm} />
+            </div>
             {listBody}
         </>
     );
diff --git a/src/components/views/rooms/RoomPreviewBar.tsx b/src/components/views/rooms/RoomPreviewBar.tsx
index 6939fec099..01ef84d8b8 100644
--- a/src/components/views/rooms/RoomPreviewBar.tsx
+++ b/src/components/views/rooms/RoomPreviewBar.tsx
@@ -15,6 +15,7 @@ import {
     RoomViewLifecycle,
 } from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle";
 import { Button } from "@vector-im/compound-web";
+import { AskToJoinIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher/dispatcher";
@@ -29,8 +30,8 @@ import RoomAvatar from "../avatars/RoomAvatar";
 import SettingsStore from "../../../settings/SettingsStore";
 import { UIFeature } from "../../../settings/UIFeature";
 import { ModuleRunner } from "../../../modules/ModuleRunner";
-import { Icon as AskToJoinIcon } from "../../../../res/img/element-icons/ask-to-join.svg";
 import Field from "../elements/Field";
+import { ModuleApi } from "../../../modules/Api.ts";
 
 const MemberEventHtmlReasonField = "io.element.html_reason";
 
@@ -116,7 +117,7 @@ interface IState {
     reason?: string;
 }
 
-export default class RoomPreviewBar extends React.Component<IProps, IState> {
+class RoomPreviewBar extends React.Component<IProps, IState> {
     public static defaultProps = {
         onJoinClick() {},
     };
@@ -370,7 +371,7 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
                 if (this.props.previewLoading) {
                     footer = (
                         <div>
-                            <Spinner w={20} h={20} />
+                            <Spinner size={20} />
                             {_t("room|loading_preview")}
                         </div>
                     );
@@ -747,3 +748,21 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
         );
     }
 }
+
+const WrappedRoomPreviewBar = (props: IProps): JSX.Element => {
+    const moduleRenderer = ModuleApi.instance.customComponents.roomPreviewBarRenderer;
+    if (moduleRenderer) {
+        return moduleRenderer(
+            {
+                ...props,
+                roomId: props.room?.roomId ?? props.roomId,
+                roomAlias: props.room?.getCanonicalAlias() ?? props.roomAlias,
+            },
+            (props) => <RoomPreviewBar {...props} />,
+        );
+    }
+
+    return <RoomPreviewBar {...props} />;
+};
+
+export default WrappedRoomPreviewBar;
diff --git a/src/components/views/rooms/RoomPreviewCard.tsx b/src/components/views/rooms/RoomPreviewCard.tsx
index 21f6e09a6d..5ddce5264b 100644
--- a/src/components/views/rooms/RoomPreviewCard.tsx
+++ b/src/components/views/rooms/RoomPreviewCard.tsx
@@ -9,6 +9,7 @@ Please see LICENSE files in the repository root for full details.
 import React, { type JSX, type FC, useContext, useState } from "react";
 import { type Room, JoinRule } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
+import { InfoSolidIcon, VideoCallSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
@@ -152,7 +153,9 @@ const RoomPreviewCard: FC<IProps> = ({ room, onJoinButtonClicked, onRejectButton
         avatarRow = (
             <>
                 <RoomAvatar room={room} size="50px" viewAvatarOnClick />
-                <div className="mx_RoomPreviewCard_video" />
+                <div className="mx_RoomPreviewCard_video">
+                    <VideoCallSolidIcon />
+                </div>
                 <BetaPill onClick={viewLabs} tooltipTitle={_t("labs|video_rooms_beta")} />
             </>
         );
@@ -174,6 +177,7 @@ const RoomPreviewCard: FC<IProps> = ({ room, onJoinButtonClicked, onRejectButton
             {room.getJoinRule() === "public" && <RoomFacePile room={room} />}
             {cannotJoin ? (
                 <div className="mx_RoomPreviewCard_notice">
+                    <InfoSolidIcon />
                     {_t("room|join_failed_needs_invite", { roomName: room.name })}
                 </div>
             ) : null}
diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
index 3eafb671cb..8d019a705f 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -11,6 +11,7 @@ import React, { createRef } from "react";
 import { type Room, RoomEvent } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import classNames from "classnames";
+import { OverflowHorizontalIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import type { Call } from "../../../models/Call";
 import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
@@ -44,6 +45,7 @@ import { shouldShowComponent } from "../../../customisations/helpers/UIComponent
 import { UIComponent } from "../../../settings/UIFeature";
 import { isKnockDenied } from "../../../utils/membership";
 import SettingsStore from "../../../settings/SettingsStore";
+import { getNotificationIcon } from "../dialogs/spotlight/RoomResultContextMenus.tsx";
 
 interface Props {
     room: Room;
@@ -292,12 +294,6 @@ class RoomTile extends React.PureComponent<Props, State> {
         const state = this.roomProps.notificationVolume;
 
         const classes = classNames("mx_RoomTile_notificationsButton", {
-            // Show bell icon for the default case too.
-            mx_RoomNotificationContextMenu_iconBell: state === RoomNotifState.AllMessages,
-            mx_RoomNotificationContextMenu_iconBellDot: state === RoomNotifState.AllMessagesLoud,
-            mx_RoomNotificationContextMenu_iconBellMentions: state === RoomNotifState.MentionsOnly,
-            mx_RoomNotificationContextMenu_iconBellCrossed: state === RoomNotifState.Mute,
-
             // Only show the icon by default if the room is overridden to muted.
             // TODO: [FTUE Notifications] Probably need to detect global mute state
             mx_RoomTile_notificationsButton_show: state === RoomNotifState.Mute,
@@ -311,7 +307,9 @@ class RoomTile extends React.PureComponent<Props, State> {
                     title={_t("room_list|notification_options")}
                     isExpanded={!!this.state.notificationsMenuPosition}
                     tabIndex={isActive ? 0 : -1}
-                />
+                >
+                    {getNotificationIcon(state!)}
+                </ContextMenuTooltipButton>
                 {this.state.notificationsMenuPosition && (
                     <RoomNotificationContextMenu
                         {...contextMenuBelow(this.state.notificationsMenuPosition)}
@@ -332,7 +330,9 @@ class RoomTile extends React.PureComponent<Props, State> {
                     onClick={this.onGeneralMenuOpenClick}
                     title={_t("room|context_menu|title")}
                     isExpanded={!!this.state.generalMenuPosition}
-                />
+                >
+                    <OverflowHorizontalIcon />
+                </ContextMenuTooltipButton>
                 {this.state.generalMenuPosition && (
                     <RoomGeneralContextMenu
                         {...contextMenuBelow(this.state.generalMenuPosition)}
diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx
index aae9cfd0d0..122048d85a 100644
--- a/src/components/views/rooms/SendMessageComposer.tsx
+++ b/src/components/views/rooms/SendMessageComposer.tsx
@@ -8,10 +8,8 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { createRef, type KeyboardEvent, type SyntheticEvent } from "react";
 import {
-    type IContent,
     type MatrixEvent,
     type IEventRelation,
-    type IMentions,
     type Room,
     EventType,
     MsgType,
@@ -35,7 +33,7 @@ import {
     unescapeMessage,
 } from "../../../editor/serialize";
 import BasicMessageComposer, { REGEX_EMOTICON } from "./BasicMessageComposer";
-import { CommandPartCreator, type Part, type PartCreator, type SerializedPart, Type } from "../../../editor/parts";
+import { CommandPartCreator, type Part, type PartCreator, type SerializedPart } from "../../../editor/parts";
 import { findEditableEvent } from "../../../utils/EventUtils";
 import SendHistoryManager from "../../../SendHistoryManager";
 import { CommandCategories } from "../../../SlashCommands";
@@ -61,108 +59,11 @@ import { type Caret } from "../../../editor/caret";
 import { type IDiff } from "../../../editor/diff";
 import { getBlobSafeMimeType } from "../../../utils/blobs";
 import { EMOJI_REGEX } from "../../../HtmlUtils";
+import { attachMentions, attachRelation } from "../../../utils/messages";
 
 // The prefix used when persisting editor drafts to localstorage.
 export const EDITOR_STATE_STORAGE_PREFIX = "mx_cider_state_";
 
-/**
- * Build the mentions information based on the editor model (and any related events):
- *
- * 1. Search the model parts for room or user pills and fill in the mentions object.
- * 2. If this is a reply to another event, include any user mentions from that
- *    (but do not include a room mention).
- *
- * @param sender - The Matrix ID of the user sending the event.
- * @param content - The event content.
- * @param model - The editor model to search for mentions, null if there is no editor.
- * @param replyToEvent - The event being replied to or undefined if it is not a reply.
- * @param editedContent - The content of the parent event being edited.
- */
-export function attachMentions(
-    sender: string,
-    content: IContent,
-    model: EditorModel | null,
-    replyToEvent: MatrixEvent | undefined,
-    editedContent: IContent | null = null,
-): void {
-    // We always attach the mentions even if the home server doesn't yet support
-    // intentional mentions. This is safe because m.mentions is an additive change
-    // that should simply be ignored by incapable home servers.
-
-    // The mentions property *always* gets included to disable legacy push rules.
-    const mentions: IMentions = (content["m.mentions"] = {});
-
-    const userMentions = new Set<string>();
-    let roomMention = false;
-
-    // If there's a reply, initialize the mentioned users as the sender of that event.
-    if (replyToEvent) {
-        userMentions.add(replyToEvent.sender!.userId);
-    }
-
-    // If user provided content is available, check to see if any users are mentioned.
-    if (model) {
-        // Add any mentioned users in the current content.
-        for (const part of model.parts) {
-            if (part.type === Type.UserPill) {
-                userMentions.add(part.resourceId);
-            } else if (part.type === Type.AtRoomPill) {
-                roomMention = true;
-            }
-        }
-    }
-
-    // Ensure the *current* user isn't listed in the mentioned users.
-    userMentions.delete(sender);
-
-    // Finally, if this event is editing a previous event, only include users who
-    // were not previously mentioned and a room mention if the previous event was
-    // not a room mention.
-    if (editedContent) {
-        // First, the new event content gets the *full* set of users.
-        const newContent = content["m.new_content"];
-        const newMentions: IMentions = (newContent["m.mentions"] = {});
-
-        // Only include the users/room if there is any content.
-        if (userMentions.size) {
-            newMentions.user_ids = [...userMentions];
-        }
-        if (roomMention) {
-            newMentions.room = true;
-        }
-
-        // Fetch the mentions from the original event and remove any previously
-        // mentioned users.
-        const prevMentions = editedContent["m.mentions"];
-        if (Array.isArray(prevMentions?.user_ids)) {
-            prevMentions!.user_ids.forEach((userId) => userMentions.delete(userId));
-        }
-
-        // If the original event mentioned the room, nothing to do here.
-        if (prevMentions?.room) {
-            roomMention = false;
-        }
-    }
-
-    // Only include the users/room if there is any content.
-    if (userMentions.size) {
-        mentions.user_ids = [...userMentions];
-    }
-    if (roomMention) {
-        mentions.room = true;
-    }
-}
-
-// Merges favouring the given relation
-export function attachRelation(content: IContent, relation?: IEventRelation): void {
-    if (relation) {
-        content["m.relates_to"] = {
-            ...(content["m.relates_to"] || {}),
-            ...relation,
-        };
-    }
-}
-
 // exported for tests
 export function createMessageContent(
     sender: string,
@@ -455,7 +356,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
         let content: RoomMessageEventContent | null = null;
 
         if (!containsEmote(model) && isSlashCommand(this.model)) {
-            const [cmd, args, commandText] = getSlashCommand(this.model);
+            const [cmd, args, commandText] = getSlashCommand(this.props.room.roomId, this.model);
             if (cmd) {
                 const threadId =
                     this.props.relation?.rel_type === THREAD_RELATION_TYPE.name ? this.props.relation?.event_id : null;
@@ -664,6 +565,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
                 Array.from(data.files),
                 this.props.room.roomId,
                 this.props.relation,
+                this.context.replyToEvent,
                 this.props.mxClient,
                 this.context.timelineRenderingType,
             );
diff --git a/src/components/views/rooms/Stickerpicker.tsx b/src/components/views/rooms/Stickerpicker.tsx
index 6281f287ba..bbf3f49685 100644
--- a/src/components/views/rooms/Stickerpicker.tsx
+++ b/src/components/views/rooms/Stickerpicker.tsx
@@ -224,8 +224,8 @@ export default class Stickerpicker extends React.PureComponent<IProps, IState> {
         const messaging = WidgetMessagingStore.instance.getMessagingForUid(
             WidgetUtils.calcWidgetUid(this.state.stickerpickerWidget.id),
         );
-        if (messaging && visible !== this.prevSentVisibility) {
-            messaging.updateVisibility(visible).catch((err) => {
+        if (messaging?.widgetApi && visible !== this.prevSentVisibility) {
+            messaging.widgetApi.updateVisibility(visible).catch((err) => {
                 logger.error("Error updating widget visibility: ", err);
             });
             this.prevSentVisibility = visible;
diff --git a/src/components/views/rooms/ThirdPartyMemberInfo.tsx b/src/components/views/rooms/ThirdPartyMemberInfo.tsx
index da626992a1..5e90152673 100644
--- a/src/components/views/rooms/ThirdPartyMemberInfo.tsx
+++ b/src/components/views/rooms/ThirdPartyMemberInfo.tsx
@@ -10,6 +10,7 @@ import React, { type JSX } from "react";
 import { EventType, type MatrixEvent, type Room, RoomStateEvent } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import { Button, Text } from "@vector-im/compound-web";
+import { Flex } from "@element-hq/web-shared-components";
 
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { _t } from "../../../languageHandler";
@@ -19,7 +20,6 @@ import { isValid3pidInvite } from "../../../RoomInvite";
 import { Action } from "../../../dispatcher/actions";
 import ErrorDialog from "../dialogs/ErrorDialog";
 import BaseCard from "../right_panel/BaseCard";
-import { Flex } from "../../utils/Flex";
 
 interface IProps {
     event: MatrixEvent;
diff --git a/src/components/views/rooms/ThreadSummary.tsx b/src/components/views/rooms/ThreadSummary.tsx
index f56ffc43cb..6ad91d7022 100644
--- a/src/components/views/rooms/ThreadSummary.tsx
+++ b/src/components/views/rooms/ThreadSummary.tsx
@@ -9,7 +9,7 @@ Please see LICENSE files in the repository root for full details.
 import React, { useContext } from "react";
 import { type Thread, ThreadEvent, type MatrixEvent } from "matrix-js-sdk/src/matrix";
 import { IndicatorIcon } from "@vector-im/compound-web";
-import ThreadIconSolid from "@vector-im/compound-design-tokens/assets/web/icons/threads-solid";
+import { ThreadsSolidIcon, ChevronRightIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import { CardContext } from "../right_panel/context";
@@ -58,11 +58,13 @@ const ThreadSummary: React.FC<IProps> = ({ mxEvent, thread, ...props }) => {
             aria-label={_t("threads|open_thread")}
         >
             <IndicatorIcon size="24px" indicator={notificationLevelToIndicator(level)}>
-                <ThreadIconSolid />
+                <ThreadsSolidIcon />
             </IndicatorIcon>
             <span className="mx_ThreadSummary_replies_amount">{countSection}</span>
             <ThreadMessagePreview thread={thread} showDisplayname={!roomContext.narrow} />
-            <div className="mx_ThreadSummary_chevron" />
+            <div className="mx_ThreadSummary_chevron">
+                <ChevronRightIcon />
+            </div>
         </AccessibleButton>
     );
 };
diff --git a/src/components/views/rooms/TopUnreadMessagesBar.tsx b/src/components/views/rooms/TopUnreadMessagesBar.tsx
index 71960c9e25..6bd9f59869 100644
--- a/src/components/views/rooms/TopUnreadMessagesBar.tsx
+++ b/src/components/views/rooms/TopUnreadMessagesBar.tsx
@@ -7,6 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
+import { ChevronUpIcon, CloseIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import AccessibleButton, { type ButtonEvent } from "../elements/AccessibleButton";
@@ -24,12 +25,16 @@ export default class TopUnreadMessagesBar extends React.PureComponent<IProps> {
                     className="mx_TopUnreadMessagesBar_scrollUp"
                     title={_t("room|jump_read_marker")}
                     onClick={this.props.onScrollUpClick}
-                />
+                >
+                    <ChevronUpIcon />
+                </AccessibleButton>
                 <AccessibleButton
                     className="mx_TopUnreadMessagesBar_markAsRead"
                     title={_t("notifications|mark_all_read")}
                     onClick={this.props.onCloseClick}
-                />
+                >
+                    <CloseIcon />
+                </AccessibleButton>
             </div>
         );
     }
diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx
index b329cd84ea..ab69536578 100644
--- a/src/components/views/rooms/VoiceRecordComposerTile.tsx
+++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx
@@ -9,7 +9,7 @@ Please see LICENSE files in the repository root for full details.
 import React, { type ReactNode } from "react";
 import { type Room, type IEventRelation, type MatrixEvent } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { type Optional } from "matrix-events-sdk";
+import { DeleteIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import { RecordingState } from "../../../audio/VoiceRecording";
@@ -29,7 +29,7 @@ import InlineSpinner from "../elements/InlineSpinner";
 import { PlaybackManager } from "../../../audio/PlaybackManager";
 import { doMaybeLocalRoomAction } from "../../../utils/local-room";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
-import { attachMentions, attachRelation } from "./SendMessageComposer";
+import { attachMentions, attachRelation } from "../../../utils/messages";
 import { addReplyToMessageContent } from "../../../utils/Reply";
 import RoomContext from "../../../contexts/RoomContext";
 import { type IUpload, type VoiceMessageRecording } from "../../../audio/VoiceMessageRecording";
@@ -216,7 +216,7 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
         }
     };
 
-    private bindNewRecorder(recorder: Optional<VoiceMessageRecording>): void {
+    private bindNewRecorder(recorder: VoiceMessageRecording | null): void {
         if (this.state.recorder) {
             this.state.recorder.off(UPDATE_EVENT, this.onRecordingUpdate);
         }
@@ -275,7 +275,9 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
                     className="mx_VoiceRecordComposerTile_delete"
                     title={_t("action|delete")}
                     onClick={this.onCancel}
-                />
+                >
+                    <DeleteIcon />
+                </AccessibleButton>
             );
         }
 
diff --git a/src/components/views/rooms/wysiwyg_composer/SendWysiwygComposer.tsx b/src/components/views/rooms/wysiwyg_composer/SendWysiwygComposer.tsx
index 9b21eef545..dac930e6e1 100644
--- a/src/components/views/rooms/wysiwyg_composer/SendWysiwygComposer.tsx
+++ b/src/components/views/rooms/wysiwyg_composer/SendWysiwygComposer.tsx
@@ -8,12 +8,13 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type JSX, type RefObject, useMemo, type ReactNode } from "react";
 import { type IEventRelation } from "matrix-js-sdk/src/matrix";
+import LockOffIcon from "@vector-im/compound-design-tokens/assets/web/icons/lock-off";
 
 import { useWysiwygSendActionHandler } from "./hooks/useWysiwygSendActionHandler";
 import { WysiwygComposer } from "./components/WysiwygComposer";
 import { PlainTextComposer } from "./components/PlainTextComposer";
 import { type ComposerFunctions } from "./types";
-import { type E2EStatus } from "../../../../utils/ShieldUtils";
+import { E2EStatus } from "../../../../utils/ShieldUtils";
 import E2EIcon from "../E2EIcon";
 import { type MenuProps } from "../../../structures/ContextMenu";
 import { Emoji } from "./components/Emoji";
@@ -55,11 +56,25 @@ export default function SendWysiwygComposer({
         [props.eventRelation],
     );
 
+    let leftIcon: false | JSX.Element = false;
+    if (!e2eStatus) {
+        leftIcon = (
+            <LockOffIcon
+                data-testid="e2e-icon"
+                width={12}
+                height={12}
+                color="var(--cpd-color-icon-info-primary)"
+                className="mx_E2EIcon"
+            />
+        );
+    } else if (e2eStatus !== E2EStatus.Normal) {
+        leftIcon = <E2EIcon status={e2eStatus} size={12} />;
+    }
     return (
         <ComposerContext.Provider value={defaultContextValue}>
             <Composer
                 className="mx_SendWysiwygComposer"
-                leftComponent={e2eStatus && <E2EIcon status={e2eStatus} />}
+                leftComponent={leftIcon}
                 rightComponent={<Emoji menuPosition={menuPosition} />}
                 {...props}
             >
diff --git a/src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx b/src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx
index 27301110f3..15d6405d87 100644
--- a/src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx
+++ b/src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx
@@ -43,6 +43,7 @@ function Button({ label, keyCombo, onClick, actionState, icon }: ButtonProps): J
             element="button"
             onClick={onClick as (e: ButtonEvent) => void}
             aria-label={label}
+            disabled={actionState === "disabled"}
             className={classNames("mx_FormattingButtons_Button", {
                 mx_FormattingButtons_active: actionState === "reversed",
                 mx_FormattingButtons_Button_hover: actionState === "enabled",
@@ -64,55 +65,59 @@ function Button({ label, keyCombo, onClick, actionState, icon }: ButtonProps): J
 interface FormattingButtonsProps {
     composer: FormattingFunctions;
     actionStates: AllActionStates;
+    /**
+     * Whether all buttons should be disabled
+     */
+    disabled?: boolean;
 }
 
-export function FormattingButtons({ composer, actionStates }: FormattingButtonsProps): JSX.Element {
+export function FormattingButtons({ composer, actionStates, disabled }: FormattingButtonsProps): JSX.Element {
     const composerContext = useComposerContext();
     const isInList = actionStates.unorderedList === "reversed" || actionStates.orderedList === "reversed";
     return (
         <div className="mx_FormattingButtons">
             <Button
-                actionState={actionStates.bold}
+                actionState={disabled ? "disabled" : actionStates.bold}
                 label={_t("composer|format_bold")}
                 keyCombo={{ ctrlOrCmdKey: true, key: "b" }}
                 onClick={() => composer.bold()}
                 icon={<BoldIcon className="mx_FormattingButtons_Icon" />}
             />
             <Button
-                actionState={actionStates.italic}
+                actionState={disabled ? "disabled" : actionStates.italic}
                 label={_t("composer|format_italic")}
                 keyCombo={{ ctrlOrCmdKey: true, key: "i" }}
                 onClick={() => composer.italic()}
                 icon={<ItalicIcon className="mx_FormattingButtons_Icon" />}
             />
             <Button
-                actionState={actionStates.underline}
+                actionState={disabled ? "disabled" : actionStates.underline}
                 label={_t("composer|format_underline")}
                 keyCombo={{ ctrlOrCmdKey: true, key: "u" }}
                 onClick={() => composer.underline()}
                 icon={<UnderlineIcon className="mx_FormattingButtons_Icon" />}
             />
             <Button
-                actionState={actionStates.strikeThrough}
+                actionState={disabled ? "disabled" : actionStates.strikeThrough}
                 label={_t("composer|format_strikethrough")}
                 onClick={() => composer.strikeThrough()}
                 icon={<StrikeThroughIcon className="mx_FormattingButtons_Icon" />}
             />
             <Button
-                actionState={actionStates.unorderedList}
+                actionState={disabled ? "disabled" : actionStates.unorderedList}
                 label={_t("composer|format_unordered_list")}
                 onClick={() => composer.unorderedList()}
                 icon={<BulletedListIcon className="mx_FormattingButtons_Icon" />}
             />
             <Button
-                actionState={actionStates.orderedList}
+                actionState={disabled ? "disabled" : actionStates.orderedList}
                 label={_t("composer|format_ordered_list")}
                 onClick={() => composer.orderedList()}
                 icon={<NumberedListIcon className="mx_FormattingButtons_Icon" />}
             />
             {isInList && (
                 <Button
-                    actionState={actionStates.indent}
+                    actionState={disabled ? "disabled" : actionStates.indent}
                     label={_t("composer|format_increase_indent")}
                     onClick={() => composer.indent()}
                     icon={<IndentIcon className="mx_FormattingButtons_Icon" />}
@@ -120,33 +125,33 @@ export function FormattingButtons({ composer, actionStates }: FormattingButtonsP
             )}
             {isInList && (
                 <Button
-                    actionState={actionStates.unindent}
+                    actionState={disabled ? "disabled" : actionStates.unindent}
                     label={_t("composer|format_decrease_indent")}
                     onClick={() => composer.unindent()}
                     icon={<UnIndentIcon className="mx_FormattingButtons_Icon" />}
                 />
             )}
             <Button
-                actionState={actionStates.quote}
+                actionState={disabled ? "disabled" : actionStates.quote}
                 label={_t("action|quote")}
                 onClick={() => composer.quote()}
                 icon={<QuoteIcon className="mx_FormattingButtons_Icon" />}
             />
             <Button
-                actionState={actionStates.inlineCode}
+                actionState={disabled ? "disabled" : actionStates.inlineCode}
                 label={_t("composer|format_inline_code")}
                 keyCombo={{ ctrlOrCmdKey: true, key: "e" }}
                 onClick={() => composer.inlineCode()}
                 icon={<InlineCodeIcon className="mx_FormattingButtons_Icon" />}
             />
             <Button
-                actionState={actionStates.codeBlock}
+                actionState={disabled ? "disabled" : actionStates.codeBlock}
                 label={_t("composer|format_code_block")}
                 onClick={() => composer.codeBlock()}
                 icon={<CodeBlockIcon className="mx_FormattingButtons_Icon" />}
             />
             <Button
-                actionState={actionStates.link}
+                actionState={disabled ? "disabled" : actionStates.link}
                 label={_t("composer|format_link")}
                 onClick={() => openLinkModal(composer, composerContext, actionStates.link === "reversed")}
                 icon={<LinkIcon className="mx_FormattingButtons_Icon" />}
diff --git a/src/components/views/rooms/wysiwyg_composer/components/PlainTextComposer.tsx b/src/components/views/rooms/wysiwyg_composer/components/PlainTextComposer.tsx
index 33d8e88e03..aadb3c0e78 100644
--- a/src/components/views/rooms/wysiwyg_composer/components/PlainTextComposer.tsx
+++ b/src/components/views/rooms/wysiwyg_composer/components/PlainTextComposer.tsx
@@ -60,6 +60,7 @@ export function PlainTextComposer({
         handleCommand,
         handleMention,
         handleAtRoomMention,
+        handleEmoji,
     } = usePlainTextListeners(initialContent, onChange, onSend, eventRelation, isAutoReplaceEmojiEnabled);
     const composerFunctions = useComposerFunctions(editorRef, setContent);
     usePlainTextInitialization(initialContent, editorRef);
@@ -84,6 +85,7 @@ export function PlainTextComposer({
                 handleMention={handleMention}
                 handleCommand={handleCommand}
                 handleAtRoomMention={handleAtRoomMention}
+                handleEmoji={handleEmoji}
             />
             <Editor
                 ref={editorRef}
diff --git a/src/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete.tsx b/src/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete.tsx
index 9446a32a7b..6b5dfff955 100644
--- a/src/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete.tsx
+++ b/src/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete.tsx
@@ -40,6 +40,12 @@ interface WysiwygAutocompleteProps {
      */
     handleAtRoomMention: FormattingFunctions["mentionAtRoom"];
 
+    /**
+     * This handler will be called with the emoji character on clicking
+     * an emoji in the autocomplete list or pressing enter on a selected item
+     */
+    handleEmoji: FormattingFunctions["emoji"];
+
     ref?: Ref<Autocomplete>;
 }
 
@@ -55,6 +61,7 @@ const WysiwygAutocomplete = ({
     handleMention,
     handleCommand,
     handleAtRoomMention,
+    handleEmoji,
     ref,
 }: WysiwygAutocompleteProps): JSX.Element | null => {
     const { room } = useScopedRoomContext("room");
@@ -89,7 +96,14 @@ const WysiwygAutocomplete = ({
                 return;
             }
             // TODO - handle "community" type
+            case "community": {
+                return; // no-op until we decide how to handle community in the wysiwyg composer
+            }
             default:
+                {
+                    // similar to the cider editor we handle emoji and other plain text replacement in the default case
+                    handleEmoji(completion.completion);
+                }
                 return;
         }
     }
diff --git a/src/components/views/rooms/wysiwyg_composer/components/WysiwygComposer.tsx b/src/components/views/rooms/wysiwyg_composer/components/WysiwygComposer.tsx
index 4c8ba0834f..b0696143aa 100644
--- a/src/components/views/rooms/wysiwyg_composer/components/WysiwygComposer.tsx
+++ b/src/components/views/rooms/wysiwyg_composer/components/WysiwygComposer.tsx
@@ -25,6 +25,7 @@ import { parsePermalink } from "../../../../../utils/permalinks/Permalinks";
 import { isNotNull } from "../../../../../Typeguards";
 import { useSettingValue } from "../../../../../hooks/useSettings";
 import { useScopedRoomContext } from "../../../../../contexts/ScopedRoomContext.tsx";
+import { useContainsCommand } from "../hooks/useContainsCommand.ts";
 
 interface WysiwygComposerProps {
     disabled?: boolean;
@@ -83,6 +84,9 @@ export const WysiwygComposer = memo(function WysiwygComposer({
         }
     }, [onChange, messageContent, disabled]);
 
+    // Disable formatting buttons if the message content contains a slash command
+    const disableFormatting = useContainsCommand(content, room);
+
     useEffect(() => {
         function handleClick(e: Event): void {
             e.preventDefault();
@@ -123,8 +127,9 @@ export const WysiwygComposer = memo(function WysiwygComposer({
                 handleMention={wysiwyg.mention}
                 handleAtRoomMention={wysiwyg.mentionAtRoom}
                 handleCommand={wysiwyg.command}
+                handleEmoji={wysiwyg.emoji}
             />
-            <FormattingButtons composer={wysiwyg} actionStates={actionStates} />
+            <FormattingButtons composer={wysiwyg} actionStates={actionStates} disabled={disableFormatting} />
             <Editor
                 ref={ref}
                 disabled={!isReady}
diff --git a/src/components/views/rooms/wysiwyg_composer/hooks/useContainsCommand.ts b/src/components/views/rooms/wysiwyg_composer/hooks/useContainsCommand.ts
new file mode 100644
index 0000000000..f6ed1dd778
--- /dev/null
+++ b/src/components/views/rooms/wysiwyg_composer/hooks/useContainsCommand.ts
@@ -0,0 +1,53 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type Room } from "matrix-js-sdk/src/matrix";
+import { useEffect, useState, useRef } from "react";
+
+import CommandProvider from "../../../../../autocomplete/CommandProvider";
+
+/**
+ * A hook which determines if the given content contains a slash command.
+ * @returns true if the content contains a slash command, false otherwise.
+ * @param content The content to check for commands.
+ * @param room The current room.
+ */
+export function useContainsCommand(content: string | null, room: Room | undefined): boolean {
+    const [contentContainsCommands, setContentContainsCommands] = useState(false);
+    const providerRef = useRef<CommandProvider | null>(null);
+    const currentRoomIdRef = useRef<string | null>(null);
+
+    useEffect(() => {
+        if (!room || !content) {
+            setContentContainsCommands(false);
+            return;
+        }
+
+        // Create or reuse CommandProvider for the current room
+        if (!providerRef.current || currentRoomIdRef.current !== room.roomId) {
+            providerRef.current = new CommandProvider(room);
+            currentRoomIdRef.current = room.roomId;
+        }
+
+        const provider = providerRef.current;
+        provider
+            .getCompletions(content, { start: 0, end: 0 })
+            .then((results) => {
+                if (results.length > 0) {
+                    setContentContainsCommands(true);
+                } else {
+                    setContentContainsCommands(false);
+                }
+            })
+            .catch(() => {
+                // If there's an error getting completions, assume no commands
+                setContentContainsCommands(false);
+            });
+    }, [content, room]);
+
+    return contentContainsCommands;
+}
diff --git a/src/components/views/rooms/wysiwyg_composer/hooks/usePlainTextListeners.ts b/src/components/views/rooms/wysiwyg_composer/hooks/usePlainTextListeners.ts
index 57a5d1d653..be91c9ccf3 100644
--- a/src/components/views/rooms/wysiwyg_composer/hooks/usePlainTextListeners.ts
+++ b/src/components/views/rooms/wysiwyg_composer/hooks/usePlainTextListeners.ts
@@ -60,6 +60,7 @@ export function usePlainTextListeners(
     handleMention: (link: string, text: string, attributes: AllowedMentionAttributes) => void;
     handleAtRoomMention: (attributes: AllowedMentionAttributes) => void;
     handleCommand: (text: string) => void;
+    handleEmoji: (emoji: string) => void;
     onSelect: (event: SyntheticEvent<HTMLDivElement>) => void;
     suggestion: MappedSuggestion | null;
 } {
@@ -95,8 +96,15 @@ export function usePlainTextListeners(
     // For separation of concerns, the suggestion handling is kept in a separate hook but is
     // nested here because we do need to be able to update the `content` state in this hook
     // when a user selects a suggestion from the autocomplete menu
-    const { suggestion, onSelect, handleCommand, handleMention, handleAtRoomMention, handleEmojiReplacement } =
-        useSuggestion(ref, setText, isAutoReplaceEmojiEnabled);
+    const {
+        suggestion,
+        onSelect,
+        handleCommand,
+        handleMention,
+        handleAtRoomMention,
+        handleEmojiSuggestion,
+        handleEmojiReplacement,
+    } = useSuggestion(ref, setText, isAutoReplaceEmojiEnabled);
 
     const onInput = useCallback(
         (event: SyntheticEvent<HTMLDivElement, InputEvent | ClipboardEvent>) => {
@@ -178,5 +186,6 @@ export function usePlainTextListeners(
         handleCommand,
         handleMention,
         handleAtRoomMention,
+        handleEmoji: handleEmojiSuggestion,
     };
 }
diff --git a/src/components/views/rooms/wysiwyg_composer/hooks/useSuggestion.ts b/src/components/views/rooms/wysiwyg_composer/hooks/useSuggestion.ts
index 89d189257a..2aae412eb7 100644
--- a/src/components/views/rooms/wysiwyg_composer/hooks/useSuggestion.ts
+++ b/src/components/views/rooms/wysiwyg_composer/hooks/useSuggestion.ts
@@ -52,6 +52,7 @@ export function useSuggestion(
     handleMention: (href: string, displayName: string, attributes: AllowedMentionAttributes) => void;
     handleAtRoomMention: (attributes: AllowedMentionAttributes) => void;
     handleCommand: (text: string) => void;
+    handleEmojiSuggestion: (text: string) => void;
     handleEmojiReplacement: () => void;
     onSelect: (event: SyntheticEvent<HTMLDivElement>) => void;
     suggestion: MappedSuggestion | null;
@@ -86,11 +87,15 @@ export function useSuggestion(
 
     const handleEmojiReplacement = (): void => processEmojiReplacement(suggestionData, setSuggestionData, setText);
 
+    const handleEmojiSuggestion = (emoji: string): void =>
+        processTextReplacement(emoji, suggestionData, setSuggestionData, setText);
+
     return {
         suggestion: suggestionData?.mappedSuggestion ?? null,
         handleCommand,
         handleMention,
         handleAtRoomMention,
+        handleEmojiSuggestion,
         handleEmojiReplacement,
         onSelect,
     };
@@ -260,10 +265,31 @@ export function processEmojiReplacement(
     setText: (text?: string) => void,
 ): void {
     // if we do not have a suggestion of the correct type, return early
-    if (suggestionData === null || suggestionData.mappedSuggestion.type !== `custom`) {
+    if (suggestionData?.mappedSuggestion?.type !== `custom`) {
         return;
     }
-    const { node, mappedSuggestion } = suggestionData;
+
+    processTextReplacement(suggestionData.mappedSuggestion.text, suggestionData, setSuggestionData, setText);
+}
+
+/**
+ * Replaces the relevant part of the editor text, replacing the suggestionData selection with the replacement text.
+ * @param replacementText - the text that we will insert into the DOM
+ * @param suggestionData - representation of the part of the DOM that will be replaced
+ * @param setSuggestionData - setter function to set the suggestion state
+ * @param setText - setter function to set the content of the composer
+ */
+export function processTextReplacement(
+    replacementText: string,
+    suggestionData: SuggestionState,
+    setSuggestionData: React.Dispatch<React.SetStateAction<SuggestionState>>,
+    setText: (text?: string) => void,
+): void {
+    // if we do not have suggestion data return early
+    if (suggestionData === null) {
+        return;
+    }
+    const { node } = suggestionData;
     const existingContent = node.textContent;
 
     if (existingContent == null) {
@@ -273,7 +299,7 @@ export function processEmojiReplacement(
     // replace the emoticon with the suggesed emoji
     const newContent =
         existingContent.slice(0, suggestionData.startOffset) +
-        mappedSuggestion.text +
+        replacementText +
         existingContent.slice(suggestionData.endOffset);
 
     node.textContent = newContent;
@@ -405,6 +431,8 @@ export function getMappedSuggestion(text: string, isAutoReplaceEmojiEnabled?: bo
         case "#":
         case "@":
             return { keyChar: firstChar, text: restOfString, type: "mention" };
+        case ":":
+            return { keyChar: firstChar, text: restOfString, type: "emoji" };
         default:
             return null;
     }
diff --git a/src/components/views/rooms/wysiwyg_composer/hooks/utils.ts b/src/components/views/rooms/wysiwyg_composer/hooks/utils.ts
index d3c1505049..0a34cf0940 100644
--- a/src/components/views/rooms/wysiwyg_composer/hooks/utils.ts
+++ b/src/components/views/rooms/wysiwyg_composer/hooks/utils.ts
@@ -148,7 +148,14 @@ export function handleClipboardEvent(
     // it puts the filename in as text/plain which we want to ignore.
     if (data.files.length && !data.types.includes("text/rtf")) {
         ContentMessages.sharedInstance()
-            .sendContentListToRoom(Array.from(data.files), room.roomId, eventRelation, mxClient, timelineRenderingType)
+            .sendContentListToRoom(
+                Array.from(data.files),
+                room.roomId,
+                eventRelation,
+                roomContext.replyToEvent,
+                mxClient,
+                timelineRenderingType,
+            )
             .catch(handleError);
         return true;
     }
diff --git a/src/components/views/rooms/wysiwyg_composer/utils/message.ts b/src/components/views/rooms/wysiwyg_composer/utils/message.ts
index b794ba6fe4..ace513947b 100644
--- a/src/components/views/rooms/wysiwyg_composer/utils/message.ts
+++ b/src/components/views/rooms/wysiwyg_composer/utils/message.ts
@@ -33,7 +33,7 @@ import { CommandCategories, getCommand } from "../../../../../SlashCommands";
 import { runSlashCommand, shouldSendAnyway } from "../../../../../editor/commands";
 import { Action } from "../../../../../dispatcher/actions";
 import { addReplyToMessageContent } from "../../../../../utils/Reply";
-import { attachRelation } from "../../SendMessageComposer";
+import { attachRelation } from "../../../../../utils/messages";
 
 export interface SendMessageParams {
     mxClient: MatrixClient;
@@ -76,7 +76,7 @@ export async function sendMessage(
     // Slash command handling here approximates what can be found in SendMessageComposer.sendMessage()
     // but note that the /me and // special cases are handled by the call to createMessageContent
     if (message.startsWith("/") && !message.startsWith("//") && !message.startsWith(EMOTE_PREFIX)) {
-        const { cmd, args } = getCommand(message);
+        const { cmd, args } = getCommand(roomId, message);
         if (cmd) {
             const threadId = relation?.rel_type === THREAD_RELATION_TYPE.name ? relation?.event_id : null;
             let commandSuccessful: boolean;
diff --git a/src/components/views/settings/AvatarSetting.tsx b/src/components/views/settings/AvatarSetting.tsx
index 9992e3691b..2c8dac96d7 100644
--- a/src/components/views/settings/AvatarSetting.tsx
+++ b/src/components/views/settings/AvatarSetting.tsx
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { type JSX, type ReactNode, createRef, useCallback, useEffect, useState, useId } from "react";
+import React, { type JSX, type ReactNode, createRef, useCallback, useEffect, useState } from "react";
 import EditIcon from "@vector-im/compound-design-tokens/assets/web/icons/edit";
 import UploadIcon from "@vector-im/compound-design-tokens/assets/web/icons/share";
 import DeleteIcon from "@vector-im/compound-design-tokens/assets/web/icons/delete";
@@ -89,9 +89,9 @@ interface IProps {
     removeAvatar?: () => void;
 
     /**
-     * The alt text for the avatar
+     * The accessible name for the avatar, eg: "Foo's Profile Picture"
      */
-    avatarAltText: string;
+    avatarAccessibleName: string;
 
     /**
      * String to use for computing the colour of the placeholder avatar if no avatar is set
@@ -121,7 +121,7 @@ export function getFileChanged(e: React.ChangeEvent<HTMLInputElement>): File | n
  */
 const AvatarSetting: React.FC<IProps> = ({
     avatar,
-    avatarAltText,
+    avatarAccessibleName,
     onChange,
     removeAvatar,
     disabled,
@@ -147,9 +147,6 @@ const AvatarSetting: React.FC<IProps> = ({
         }
     }, [avatar]);
 
-    // Prevents ID collisions when this component is used more than once on the same page.
-    const a11yId = useId();
-
     const onFileChanged = useCallback(
         (e: React.ChangeEvent<HTMLInputElement>) => {
             const file = getFileChanged(e);
@@ -170,33 +167,26 @@ const AvatarSetting: React.FC<IProps> = ({
         setMenuOpen(newOpen);
     }, []);
 
-    let avatarElement = (
+    const avatarElement = (
         <AccessibleButton
             element="div"
-            onClick={uploadAvatar}
+            /**
+             * This button will open a menu. That is done by passing this element as trigger
+             * to the menu component, hence the empty onClick.
+             */
+            onClick={() => {}}
             className="mx_AvatarSetting_avatarPlaceholder mx_AvatarSetting_avatarDisplay"
-            aria-labelledby={disabled ? undefined : a11yId}
-            // Inhibit tab stop as we have explicit upload/remove buttons
-            tabIndex={-1}
             disabled={disabled}
         >
-            <BaseAvatar idName={placeholderId} name={placeholderName} size="90px" />
+            <BaseAvatar
+                idName={placeholderId}
+                name={placeholderName}
+                size="90px"
+                url={avatarURL}
+                altText={avatarAccessibleName}
+            />
         </AccessibleButton>
     );
-    if (avatarURL) {
-        avatarElement = (
-            <AccessibleButton
-                element="img"
-                className="mx_AvatarSetting_avatarDisplay"
-                src={avatarURL}
-                alt={avatarAltText}
-                onClick={uploadAvatar}
-                // Inhibit tab stop as we have explicit upload/remove buttons
-                tabIndex={-1}
-                disabled={disabled}
-            />
-        );
-    }
 
     let uploadAvatarBtn: JSX.Element | undefined;
     if (!disabled) {
@@ -204,14 +194,20 @@ const AvatarSetting: React.FC<IProps> = ({
             mx_AvatarSetting_uploadButton_active: menuOpen,
         });
         uploadAvatarBtn = (
-            <div className={uploadButtonClasses}>
-                <EditIcon width="20px" height="20px" />
+            <div
+                className={uploadButtonClasses}
+                role="button"
+                aria-label={_t("settings|general|avatar_open_menu")}
+                tabIndex={0}
+                aria-haspopup="menu"
+            >
+                <EditIcon aria-hidden={true} width="20px" height="20px" />
             </div>
         );
     }
 
     const content = (
-        <div className="mx_AvatarSetting_avatar" role="group" aria-label={avatarAltText}>
+        <div className="mx_AvatarSetting_avatar" role="group" aria-label={avatarAccessibleName}>
             {avatarElement}
             {uploadAvatarBtn}
         </div>
diff --git a/src/components/views/settings/EventIndexPanel.tsx b/src/components/views/settings/EventIndexPanel.tsx
index fe19aa0580..98332dbe4f 100644
--- a/src/components/views/settings/EventIndexPanel.tsx
+++ b/src/components/views/settings/EventIndexPanel.tsx
@@ -132,7 +132,7 @@ export default class EventIndexPanel extends React.Component<EmptyObject, IState
 
     public render(): React.ReactNode {
         let eventIndexingSettings: JSX.Element | undefined;
-        const brand = SdkConfig.get().brand;
+        const { brand, desktop_builds: desktopBuilds } = SdkConfig.get();
 
         if (EventIndexPeg.get() !== null) {
             eventIndexingSettings = (
@@ -196,11 +196,7 @@ export default class EventIndexPanel extends React.Component<EmptyObject, IState
                         },
                         {
                             desktopLink: (sub) => (
-                                <ExternalLink
-                                    href="https://element.io/get-started"
-                                    target="_blank"
-                                    rel="noreferrer noopener"
-                                >
+                                <ExternalLink href={desktopBuilds.url} target="_blank" rel="noreferrer noopener">
                                     {sub}
                                 </ExternalLink>
                             ),
diff --git a/src/components/views/settings/JoinRuleSettings.tsx b/src/components/views/settings/JoinRuleSettings.tsx
index 43f8ab9ff6..f3189b3fcf 100644
--- a/src/components/views/settings/JoinRuleSettings.tsx
+++ b/src/components/views/settings/JoinRuleSettings.tsx
@@ -18,7 +18,7 @@ import SpaceStore from "../../../stores/spaces/SpaceStore";
 import Modal from "../../../Modal";
 import ManageRestrictedJoinRuleDialog from "../dialogs/ManageRestrictedJoinRuleDialog";
 import RoomUpgradeWarningDialog, { type IFinishedOpts } from "../dialogs/RoomUpgradeWarningDialog";
-import { upgradeRoom } from "../../../utils/RoomUpgrade";
+import { type RoomUpgradeProgress, upgradeRoom } from "../../../utils/RoomUpgrade";
 import { arrayHasDiff } from "../../../utils/arrays";
 import { useLocalEcho } from "../../../hooks/useLocalEcho";
 import dis from "../../../dispatcher/dispatcher";
@@ -35,7 +35,6 @@ export interface JoinRuleSettingsProps {
     closeSettingsFn(): void;
     onError(error: unknown): void;
     beforeChange?(joinRule: JoinRule): Promise<boolean>; // if returns false then aborts the change
-    aliasWarning?: ReactNode;
     disabledOptions?: Set<JoinRule>;
     hiddenOptions?: Set<JoinRule>;
     recommendedOption?: JoinRule;
@@ -44,7 +43,6 @@ export interface JoinRuleSettingsProps {
 const JoinRuleSettings: React.FC<JoinRuleSettingsProps> = ({
     room,
     promptUpgrade,
-    aliasWarning,
     onError,
     beforeChange,
     closeSettingsFn,
@@ -120,7 +118,7 @@ const JoinRuleSettings: React.FC<JoinRuleSettingsProps> = ({
                 opts: IFinishedOpts,
                 fn: (progressText: string, progress: number, total: number) => void,
             ): Promise<void> => {
-                const roomId = await upgradeRoom(room, targetVersion, opts.invite, true, true, true, (progress) => {
+                const progressCallback = (progress: RoomUpgradeProgress): void => {
                     const total = 2 + progress.updateSpacesTotal + progress.inviteUsersTotal;
                     if (!progress.roomUpgraded) {
                         fn(_t("room_settings|security|join_rule_upgrade_upgrading_room"), 0, total);
@@ -151,7 +149,20 @@ const JoinRuleSettings: React.FC<JoinRuleSettingsProps> = ({
                             total,
                         );
                     }
-                });
+                };
+                const roomId = await upgradeRoom(
+                    room,
+                    targetVersion,
+                    opts.invite,
+                    true,
+                    true,
+                    true,
+                    progressCallback,
+
+                    // We want to keep the RoomUpgradeDialog open during the upgrade, so don't replace it with the
+                    // invite progress dialog.
+                    /* inhibitInviteProgressDialog: */ true,
+                );
 
                 closeSettingsFn?.();
 
@@ -196,12 +207,7 @@ const JoinRuleSettings: React.FC<JoinRuleSettingsProps> = ({
         {
             value: JoinRule.Public,
             label: withRecommendLabel(_t("common|public"), JoinRule.Public),
-            description: (
-                <>
-                    {_t("room_settings|security|join_rule_public_description")}
-                    {aliasWarning}
-                </>
-            ),
+            description: <>{_t("room_settings|security|join_rule_public_description")}</>,
         },
     ];
 
diff --git a/src/components/views/settings/Notifications.tsx b/src/components/views/settings/Notifications.tsx
index e337b6b3ce..15e530c57b 100644
--- a/src/components/views/settings/Notifications.tsx
+++ b/src/components/views/settings/Notifications.tsx
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { type JSX, type ReactNode } from "react";
+import React, { type ChangeEvent, type ChangeEventHandler, type JSX, type ReactNode } from "react";
 import {
     type IAnnotatedPushRule,
     type IPusher,
@@ -19,6 +19,7 @@ import {
     type EmptyObject,
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
+import { Form, SettingsToggleInput } from "@vector-im/compound-web";
 
 import Spinner from "../elements/Spinner";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
@@ -31,7 +32,6 @@ import {
     type VectorPushRuleDefinition,
 } from "../../../notifications";
 import { _t, type TranslatedString } from "../../../languageHandler";
-import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import SettingsStore from "../../../settings/SettingsStore";
 import StyledRadioButton from "../elements/StyledRadioButton";
 import { SettingLevel } from "../../../settings/SettingLevel";
@@ -122,9 +122,6 @@ interface IState {
     threepids?: IThreepid[];
 
     deviceNotificationsEnabled: boolean;
-    desktopNotifications: boolean;
-    desktopShowBody: boolean;
-    audioNotifications: boolean;
 
     clearingNotifications: boolean;
 
@@ -194,10 +191,15 @@ const maximumVectorState = (
 
 const NotificationActivitySettings = (): JSX.Element => {
     return (
-        <div>
+        <Form.Root
+            onSubmit={(evt) => {
+                evt.preventDefault();
+                evt.stopPropagation();
+            }}
+        >
             <SettingsFlag name="Notifications.showbold" level={SettingLevel.DEVICE} />
             <SettingsFlag name="Notifications.tac_only_notifications" level={SettingLevel.DEVICE} />
-        </div>
+        </Form.Root>
     );
 };
 
@@ -213,9 +215,6 @@ export default class Notifications extends React.PureComponent<EmptyObject, ISta
         this.state = {
             phase: Phase.Loading,
             deviceNotificationsEnabled: SettingsStore.getValue("deviceNotificationsEnabled") ?? true,
-            desktopNotifications: SettingsStore.getValue("notificationsEnabled"),
-            desktopShowBody: SettingsStore.getValue("notificationBodyEnabled"),
-            audioNotifications: SettingsStore.getValue("audioNotificationsEnabled"),
             clearingNotifications: false,
             ruleIdsWithError: {},
         };
@@ -231,18 +230,9 @@ export default class Notifications extends React.PureComponent<EmptyObject, ISta
 
     public componentDidMount(): void {
         this.settingWatchers = [
-            SettingsStore.watchSetting("notificationsEnabled", null, (...[, , , , value]) =>
-                this.setState({ desktopNotifications: value as boolean }),
-            ),
             SettingsStore.watchSetting("deviceNotificationsEnabled", null, (...[, , , , value]) => {
                 this.setState({ deviceNotificationsEnabled: value as boolean });
             }),
-            SettingsStore.watchSetting("notificationBodyEnabled", null, (...[, , , , value]) =>
-                this.setState({ desktopShowBody: value as boolean }),
-            ),
-            SettingsStore.watchSetting("audioNotificationsEnabled", null, (...[, , , , value]) =>
-                this.setState({ audioNotifications: value as boolean }),
-            ),
         ];
 
         // noinspection JSIgnoredPromiseFromCall
@@ -286,7 +276,7 @@ export default class Notifications extends React.PureComponent<EmptyObject, ISta
         const settingsEvent = cli.getAccountData(getLocalNotificationAccountDataEventType(cli.deviceId));
         if (settingsEvent) {
             const notificationsEnabled = !(settingsEvent.getContent() as LocalNotificationSettings).is_silenced;
-            await this.updateDeviceNotifications(notificationsEnabled);
+            await SettingsStore.setValue("deviceNotificationsEnabled", null, SettingLevel.DEVICE, notificationsEnabled);
         }
     }
 
@@ -410,7 +400,8 @@ export default class Notifications extends React.PureComponent<EmptyObject, ISta
         });
     }
 
-    private onMasterRuleChanged = async (checked: boolean): Promise<void> => {
+    private onMasterRuleChanged: ChangeEventHandler<HTMLInputElement> = async (evt): Promise<void> => {
+        const { checked } = evt.target;
         this.setState({ phase: Phase.Persisting });
 
         const masterRule = this.state.masterPushRule!;
@@ -431,11 +422,8 @@ export default class Notifications extends React.PureComponent<EmptyObject, ISta
         }));
     };
 
-    private updateDeviceNotifications = async (checked: boolean): Promise<void> => {
-        await SettingsStore.setValue("deviceNotificationsEnabled", null, SettingLevel.DEVICE, checked);
-    };
-
-    private onEmailNotificationsChanged = async (email: string, checked: boolean): Promise<void> => {
+    private onEmailNotificationsChanged = async (email: string, evt: ChangeEvent<HTMLInputElement>): Promise<void> => {
+        const { checked } = evt.target;
         this.setState({ phase: Phase.Persisting });
 
         try {
@@ -470,18 +458,6 @@ export default class Notifications extends React.PureComponent<EmptyObject, ISta
         }
     };
 
-    private onDesktopNotificationsChanged = async (checked: boolean): Promise<void> => {
-        await SettingsStore.setValue("notificationsEnabled", null, SettingLevel.DEVICE, checked);
-    };
-
-    private onDesktopShowBodyChanged = async (checked: boolean): Promise<void> => {
-        await SettingsStore.setValue("notificationBodyEnabled", null, SettingLevel.DEVICE, checked);
-    };
-
-    private onAudioNotificationsChanged = async (checked: boolean): Promise<void> => {
-        await SettingsStore.setValue("audioNotificationsEnabled", null, SettingLevel.DEVICE, checked);
-    };
-
     private onRadioChecked = async (rule: IVectorPushRule, checkedState: VectorState): Promise<void> => {
         this.setState(({ ruleIdsWithError }) => ({
             phase: Phase.Persisting,
@@ -663,11 +639,11 @@ export default class Notifications extends React.PureComponent<EmptyObject, ISta
 
     private renderTopSection(): JSX.Element {
         const masterSwitch = (
-            <LabelledToggleSwitch
-                data-testid="notif-master-switch"
-                value={!this.isInhibited}
+            <SettingsToggleInput
+                checked={!this.isInhibited}
+                name="notif-master-switch"
                 label={_t("settings|notifications|enable_notifications_account")}
-                caption={_t("settings|notifications|enable_notifications_account_detail")}
+                helpMessage={_t("settings|notifications|enable_notifications_account_detail")}
                 onChange={this.onMasterRuleChanged}
                 disabled={this.state.phase === Phase.Persisting}
             />
@@ -681,10 +657,10 @@ export default class Notifications extends React.PureComponent<EmptyObject, ISta
         const emailSwitches = (this.state.threepids || [])
             .filter((t) => t.medium === ThreepidMedium.Email)
             .map((e) => (
-                <LabelledToggleSwitch
-                    data-testid="notif-email-switch"
+                <SettingsToggleInput
+                    name="notif-email-switch"
                     key={e.address}
-                    value={!!this.state.pushers?.some((p) => p.kind === "email" && p.pushkey === e.address)}
+                    checked={!!this.state.pushers?.some((p) => p.kind === "email" && p.pushkey === e.address)}
                     label={_t("settings|notifications|enable_email_notifications", { email: e.address })}
                     onChange={this.onEmailNotificationsChanged.bind(this, e.address)}
                     disabled={this.state.phase === Phase.Persisting}
@@ -695,37 +671,13 @@ export default class Notifications extends React.PureComponent<EmptyObject, ISta
             <SettingsSubsection>
                 {masterSwitch}
 
-                <LabelledToggleSwitch
-                    data-testid="notif-device-switch"
-                    value={this.state.deviceNotificationsEnabled}
-                    label={_t("settings|notifications|enable_notifications_device")}
-                    onChange={(checked) => this.updateDeviceNotifications(checked)}
-                    disabled={this.state.phase === Phase.Persisting}
-                />
+                <SettingsFlag name="deviceNotificationsEnabled" level={SettingLevel.DEVICE} />
 
                 {this.state.deviceNotificationsEnabled && (
                     <>
-                        <LabelledToggleSwitch
-                            data-testid="notif-setting-notificationsEnabled"
-                            value={this.state.desktopNotifications}
-                            onChange={this.onDesktopNotificationsChanged}
-                            label={_t("settings|notifications|enable_desktop_notifications_session")}
-                            disabled={this.state.phase === Phase.Persisting}
-                        />
-                        <LabelledToggleSwitch
-                            data-testid="notif-setting-notificationBodyEnabled"
-                            value={this.state.desktopShowBody}
-                            onChange={this.onDesktopShowBodyChanged}
-                            label={_t("settings|notifications|show_message_desktop_notification")}
-                            disabled={this.state.phase === Phase.Persisting}
-                        />
-                        <LabelledToggleSwitch
-                            data-testid="notif-setting-audioNotificationsEnabled"
-                            value={this.state.audioNotifications}
-                            onChange={this.onAudioNotificationsChanged}
-                            label={_t("settings|notifications|enable_audible_notifications_session")}
-                            disabled={this.state.phase === Phase.Persisting}
-                        />
+                        <SettingsFlag name="notificationsEnabled" level={SettingLevel.DEVICE} />
+                        <SettingsFlag name="notificationBodyEnabled" level={SettingLevel.DEVICE} />
+                        <SettingsFlag name="audioNotificationsEnabled" level={SettingLevel.DEVICE} />
                     </>
                 )}
 
@@ -807,7 +759,7 @@ export default class Notifications extends React.PureComponent<EmptyObject, ISta
         return (
             <div>
                 <div data-testid={`notif-section-${category}`} className="mx_UserNotifSettings_grid">
-                    <SettingsSubsectionHeading heading={sectionName} />
+                    <SettingsSubsectionHeading heading={sectionName} as="h2" />
                     <span className="mx_UserNotifSettings_gridColumnLabel">{VectorStateToLabel[VectorState.Off]}</span>
                     <span className="mx_UserNotifSettings_gridColumnLabel">{VectorStateToLabel[VectorState.On]}</span>
                     <span className="mx_UserNotifSettings_gridColumnLabel">{VectorStateToLabel[VectorState.Loud]}</span>
diff --git a/src/components/views/settings/SetIntegrationManager.tsx b/src/components/views/settings/SetIntegrationManager.tsx
index 98066bc0a4..44507067ad 100644
--- a/src/components/views/settings/SetIntegrationManager.tsx
+++ b/src/components/views/settings/SetIntegrationManager.tsx
@@ -9,7 +9,7 @@ Please see LICENSE files in the repository root for full details.
 import React from "react";
 import { logger } from "matrix-js-sdk/src/logger";
 import { type EmptyObject } from "matrix-js-sdk/src/matrix";
-import { Root, InlineField, Label, ToggleInput } from "@vector-im/compound-web";
+import { Form, SettingsToggleInput } from "@vector-im/compound-web";
 
 import { _t } from "../../../languageHandler";
 import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
@@ -66,33 +66,31 @@ export default class SetIntegrationManager extends React.Component<EmptyObject,
         if (!SettingsStore.getValue(UIFeature.Widgets)) return null;
 
         return (
-            <div className="mx_SetIntegrationManager" data-testid="mx_SetIntegrationManager">
+            <Form.Root
+                onSubmit={(evt) => {
+                    evt.preventDefault();
+                    evt.stopPropagation();
+                }}
+                className="mx_SetIntegrationManager"
+                data-testid="mx_SetIntegrationManager"
+            >
                 <div className="mx_SettingsFlag">
                     <div className="mx_SetIntegrationManager_heading_manager">
                         <Heading size="3">{_t("integration_manager|manage_title")}</Heading>
-                        <Heading size="4">{managerName}</Heading>
+                        <Heading id="mx_SetIntegrationManager_ManagerName" size="4">
+                            {managerName}
+                        </Heading>
                     </div>
                 </div>
-                <SettingsSubsectionText>{bodyText}</SettingsSubsectionText>
+                <SettingsSubsectionText id="mx_SetIntegrationManager_BodyText">{bodyText}</SettingsSubsectionText>
                 <SettingsSubsectionText>{_t("integration_manager|explainer")}</SettingsSubsectionText>
-                <Root>
-                    <InlineField
-                        name="enable_im"
-                        control={
-                            <ToggleInput
-                                role="switch"
-                                id="mx_SetIntegrationManager_Toggle"
-                                checked={this.state.provisioningEnabled}
-                                onChange={this.onProvisioningToggled}
-                            />
-                        }
-                    >
-                        <Label htmlFor="mx_SetIntegrationManager_Toggle">
-                            {_t("integration_manager|toggle_label")}
-                        </Label>
-                    </InlineField>
-                </Root>
-            </div>
+                <SettingsToggleInput
+                    name="enable_im"
+                    label={_t("integration_manager|toggle_label")}
+                    checked={this.state.provisioningEnabled}
+                    onChange={this.onProvisioningToggled}
+                />
+            </Form.Root>
         );
     }
 }
diff --git a/src/components/views/settings/SettingsHeader.tsx b/src/components/views/settings/SettingsHeader.tsx
index 10534958f4..1db7fc9027 100644
--- a/src/components/views/settings/SettingsHeader.tsx
+++ b/src/components/views/settings/SettingsHeader.tsx
@@ -6,10 +6,9 @@
  */
 
 import React, { type JSX } from "react";
+import classNames from "classnames";
 import { Heading } from "@vector-im/compound-web";
 
-import { _t } from "../../../languageHandler";
-
 /**
  * The heading for a settings section.
  */
@@ -25,9 +24,12 @@ interface SettingsHeaderProps {
 }
 
 export function SettingsHeader({ hasRecommendedTag = false, label }: SettingsHeaderProps): JSX.Element {
+    const classes = classNames("mx_SettingsHeader", {
+        mx_SettingsHeader_recommended: hasRecommendedTag,
+    });
     return (
-        <Heading className="mx_SettingsHeader" as="h2" size="sm" weight="semibold">
-            {label} {hasRecommendedTag && <span>{_t("common|recommended")}</span>}
+        <Heading className={classes} as="h2" size="sm" weight="semibold">
+            {label}
         </Heading>
     );
 }
diff --git a/src/components/views/settings/UserProfileSettings.tsx b/src/components/views/settings/UserProfileSettings.tsx
index 11b6a5bb69..75e1ff0377 100644
--- a/src/components/views/settings/UserProfileSettings.tsx
+++ b/src/components/views/settings/UserProfileSettings.tsx
@@ -11,6 +11,7 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { EditInPlace, Alert, ErrorMessage } from "@vector-im/compound-web";
 import PopOutIcon from "@vector-im/compound-design-tokens/assets/web/icons/pop-out";
 import SignOutIcon from "@vector-im/compound-design-tokens/assets/web/icons/sign-out";
+import { Flex } from "@element-hq/web-shared-components";
 
 import { _t } from "../../../languageHandler";
 import { OwnProfileStore } from "../../../stores/OwnProfileStore";
@@ -26,7 +27,6 @@ import AccessibleButton from "../elements/AccessibleButton";
 import LogoutDialog, { shouldShowLogoutDialog } from "../dialogs/LogoutDialog";
 import Modal from "../../../Modal";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
-import { Flex } from "../../utils/Flex";
 
 const SpinnerToast: React.FC<{ children?: ReactNode }> = ({ children }) => (
     <>
@@ -203,7 +203,7 @@ const UserProfileSettings: React.FC<UserProfileSettingsProps> = ({
             <div className="mx_UserProfileSettings_profile">
                 <AvatarSetting
                     avatar={avatarURL ?? undefined}
-                    avatarAltText={_t("common|user_avatar")}
+                    avatarAccessibleName={_t("common|user_avatar")}
                     onChange={onAvatarChange}
                     removeAvatar={avatarURL ? onAvatarRemove : undefined}
                     placeholderName={displayName}
diff --git a/src/components/views/settings/devices/DeviceDetailHeading.tsx b/src/components/views/settings/devices/DeviceDetailHeading.tsx
index 78c9574486..7d3019ab6f 100644
--- a/src/components/views/settings/devices/DeviceDetailHeading.tsx
+++ b/src/components/views/settings/devices/DeviceDetailHeading.tsx
@@ -103,7 +103,7 @@ const DeviceNameEditor: React.FC<Props & { stopEditing: () => void }> = ({ devic
                 >
                     {_t("action|cancel")}
                 </AccessibleButton>
-                {isLoading && <Spinner w={16} h={16} />}
+                {isLoading && <Spinner size={16} />}
             </div>
         </form>
     );
diff --git a/src/components/views/settings/devices/DeviceDetails.tsx b/src/components/views/settings/devices/DeviceDetails.tsx
index 52f5800dac..55fa8cca32 100644
--- a/src/components/views/settings/devices/DeviceDetails.tsx
+++ b/src/components/views/settings/devices/DeviceDetails.tsx
@@ -195,7 +195,7 @@ const DeviceDetails: React.FC<Props> = ({
                     >
                         <span className="mx_DeviceDetails_signOutButtonContent">
                             {_t("settings|sessions|sign_out")}
-                            {isSigningOut && <Spinner w={16} h={16} />}
+                            {isSigningOut && <Spinner size={16} />}
                         </span>
                     </AccessibleButton>
                 )}
diff --git a/src/components/views/settings/devices/DeviceSecurityCard.tsx b/src/components/views/settings/devices/DeviceSecurityCard.tsx
index 2de343d51b..61d527e60f 100644
--- a/src/components/views/settings/devices/DeviceSecurityCard.tsx
+++ b/src/components/views/settings/devices/DeviceSecurityCard.tsx
@@ -8,11 +8,11 @@ Please see LICENSE files in the repository root for full details.
 
 import classNames from "classnames";
 import React from "react";
+import { ShieldIcon, ErrorSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
-import { Icon as VerifiedIcon } from "../../../../../res/img/e2e/verified.svg";
-import { Icon as UnverifiedIcon } from "../../../../../res/img/e2e/warning.svg";
 import { Icon as InactiveIcon } from "../../../../../res/img/element-icons/settings/inactive.svg";
 import { DeviceSecurityVariation } from "./types";
+
 interface Props {
     variation: DeviceSecurityVariation;
     heading: string;
@@ -22,9 +22,9 @@ interface Props {
 
 const VariationIcon: Record<DeviceSecurityVariation, React.FC<React.SVGProps<SVGSVGElement>>> = {
     [DeviceSecurityVariation.Inactive]: InactiveIcon,
-    [DeviceSecurityVariation.Verified]: VerifiedIcon,
-    [DeviceSecurityVariation.Unverified]: UnverifiedIcon,
-    [DeviceSecurityVariation.Unverifiable]: UnverifiedIcon,
+    [DeviceSecurityVariation.Verified]: ShieldIcon,
+    [DeviceSecurityVariation.Unverified]: ErrorSolidIcon,
+    [DeviceSecurityVariation.Unverifiable]: ErrorSolidIcon,
 };
 
 const DeviceSecurityIcon: React.FC<{ variation: DeviceSecurityVariation }> = ({ variation }) => {
diff --git a/src/components/views/settings/devices/DeviceTypeIcon.tsx b/src/components/views/settings/devices/DeviceTypeIcon.tsx
index 994a40f250..8b716af1ee 100644
--- a/src/components/views/settings/devices/DeviceTypeIcon.tsx
+++ b/src/components/views/settings/devices/DeviceTypeIcon.tsx
@@ -8,13 +8,12 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import classNames from "classnames";
+import { ShieldIcon, ErrorSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { Icon as UnknownDeviceIcon } from "../../../../../res/img/element-icons/settings/unknown-device.svg";
 import { Icon as DesktopIcon } from "../../../../../res/img/element-icons/settings/desktop.svg";
 import { Icon as WebIcon } from "../../../../../res/img/element-icons/settings/web.svg";
 import { Icon as MobileIcon } from "../../../../../res/img/element-icons/settings/mobile.svg";
-import { Icon as VerifiedIcon } from "../../../../../res/img/e2e/verified.svg";
-import { Icon as UnverifiedIcon } from "../../../../../res/img/e2e/warning.svg";
 import { _t, _td, type TranslationKey } from "../../../../languageHandler";
 import { type ExtendedDevice } from "./types";
 import { DeviceType } from "../../../../utils/device/parseUserAgent";
@@ -51,13 +50,13 @@ export const DeviceTypeIcon: React.FC<Props> = ({ isVerified, isSelected, device
                 <Icon className="mx_DeviceTypeIcon_deviceIcon" role="img" aria-label={label} />
             </div>
             {isVerified ? (
-                <VerifiedIcon
+                <ShieldIcon
                     className={classNames("mx_DeviceTypeIcon_verificationIcon", "verified")}
                     role="img"
                     aria-label={_t("common|verified")}
                 />
             ) : (
-                <UnverifiedIcon
+                <ErrorSolidIcon
                     className={classNames("mx_DeviceTypeIcon_verificationIcon", "unverified")}
                     role="img"
                     aria-label={_t("common|unverified")}
diff --git a/src/components/views/settings/devices/FilteredDeviceList.tsx b/src/components/views/settings/devices/FilteredDeviceList.tsx
index fd30091106..84283ab5b4 100644
--- a/src/components/views/settings/devices/FilteredDeviceList.tsx
+++ b/src/components/views/settings/devices/FilteredDeviceList.tsx
@@ -195,7 +195,7 @@ const DeviceListItem: React.FC<{
 }) => {
     const tileContent = (
         <>
-            {isSigningOut && <Spinner w={16} h={16} />}
+            {isSigningOut && <Spinner size={16} />}
             <DeviceExpandDetailsButton isExpanded={isExpanded} onClick={onDeviceExpandToggle} />
         </>
     );
@@ -325,7 +325,7 @@ export const FilteredDeviceList = ({
                             onClick={() => onSignOutDevices(selectedDeviceIds)}
                             className="mx_FilteredDeviceList_headerButton"
                         >
-                            {isSigningOut && <Spinner w={16} h={16} />}
+                            {isSigningOut && <Spinner size={16} />}
                             {_t("action|sign_out")}
                         </AccessibleButton>
                         <AccessibleButton
diff --git a/src/components/views/settings/encryption/AdvancedPanel.tsx b/src/components/views/settings/encryption/AdvancedPanel.tsx
index d5e8954705..a0e7669aef 100644
--- a/src/components/views/settings/encryption/AdvancedPanel.tsx
+++ b/src/components/views/settings/encryption/AdvancedPanel.tsx
@@ -74,7 +74,7 @@ function EncryptionDetails({ onResetIdentityClick }: EncryptionDetails): JSX.Ele
                 <Button
                     size="sm"
                     kind="secondary"
-                    Icon={ShareIcon}
+                    Icon={DownloadIcon}
                     onClick={() =>
                         Modal.createDialog(
                             lazy(
@@ -89,7 +89,7 @@ function EncryptionDetails({ onResetIdentityClick }: EncryptionDetails): JSX.Ele
                 <Button
                     size="sm"
                     kind="secondary"
-                    Icon={DownloadIcon}
+                    Icon={ShareIcon}
                     onClick={() =>
                         Modal.createDialog(
                             lazy(
diff --git a/src/components/views/settings/encryption/ChangeRecoveryKey.tsx b/src/components/views/settings/encryption/ChangeRecoveryKey.tsx
index 58efc80afb..21ff7437d8 100644
--- a/src/components/views/settings/encryption/ChangeRecoveryKey.tsx
+++ b/src/components/views/settings/encryption/ChangeRecoveryKey.tsx
@@ -1,11 +1,12 @@
 /*
+ * Copyright 2025 Element Creations Ltd.
  * Copyright 2024 New Vector Ltd.
  *
  * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
  * Please see LICENSE files in the repository root for full details.
  */
 
-import React, { type FormEventHandler, type JSX, type MouseEventHandler, useState } from "react";
+import React, { type JSX, type MouseEventHandler, useState } from "react";
 import {
     Breadcrumb,
     Button,
@@ -13,9 +14,9 @@ import {
     Field,
     IconButton,
     Label,
+    PasswordControl,
     Root,
     Text,
-    TextControl,
 } from "@vector-im/compound-web";
 import CopyIcon from "@vector-im/compound-design-tokens/assets/web/icons/copy";
 import KeyIcon from "@vector-im/compound-design-tokens/assets/web/icons/key-solid";
@@ -29,6 +30,8 @@ import { initialiseDehydrationIfEnabled } from "../../../../utils/device/dehydra
 import { withSecretStorageKeyCache } from "../../../../SecurityManager";
 import { EncryptionCardButtons } from "./EncryptionCardButtons";
 import { logErrorAndShowErrorDialog } from "../../../../utils/ErrorUtils.tsx";
+import DeviceListener, { RECOVERY_ACCOUNT_DATA_KEY } from "../../../../DeviceListener";
+import { resetKeyBackupAndWait } from "../../../../utils/crypto/resetKeyBackup";
 
 /**
  * The possible states of the component.
@@ -122,15 +125,32 @@ export function ChangeRecoveryKey({
                         if (!crypto) return onFinish();
 
                         try {
-                            // We need to enable the cache to avoid to prompt the user to enter the new key
-                            // when we will try to access the secret storage during the bootstrap
-                            await withSecretStorageKeyCache(async () => {
-                                await crypto.bootstrapSecretStorage({
-                                    setupNewSecretStorage: true,
-                                    createSecretStorageKey: async () => recoveryKey,
+                            const deviceListener = DeviceListener.sharedInstance();
+
+                            // we need to call keyStorageOutOfSyncNeedsBackupReset here because
+                            // deviceListener.whilePaused() sets its client to undefined, so
+                            // keyStorageOutOfSyncNeedsBackupReset won't be able to check
+                            // the backup state.
+                            const needsBackupReset = await deviceListener.keyStorageOutOfSyncNeedsBackupReset(true);
+                            await deviceListener.whilePaused(async () => {
+                                // We need to enable the cache to avoid to prompt the user to enter the new key
+                                // when we will try to access the secret storage during the bootstrap
+                                await withSecretStorageKeyCache(async () => {
+                                    await crypto.bootstrapSecretStorage({
+                                        setupNewSecretStorage: true,
+                                        createSecretStorageKey: async () => recoveryKey,
+                                    });
+                                    // Reset the key backup if needed
+                                    if (needsBackupReset) {
+                                        await resetKeyBackupAndWait(crypto);
+                                    }
+                                    await initialiseDehydrationIfEnabled(matrixClient, { createNewKey: true });
                                 });
-                                await initialiseDehydrationIfEnabled(matrixClient, { createNewKey: true });
                             });
+
+                            // Record the fact that the user explicitly enabled recovery.
+                            await matrixClient.setAccountData(RECOVERY_ACCOUNT_DATA_KEY, { enabled: true });
+
                             onFinish();
                         } catch (e) {
                             logErrorAndShowErrorDialog("Failed to set up secret storage", e);
@@ -305,7 +325,7 @@ interface KeyFormProps {
     /**
      * Called when the form is submitted.
      */
-    onSubmit: FormEventHandler;
+    onSubmit: () => Promise<void>;
     /**
      * The recovery key to confirm.
      */
@@ -324,6 +344,7 @@ interface KeyFormProps {
 function KeyForm({ onCancelClick, onSubmit, recoveryKey, submitButtonLabel }: KeyFormProps): JSX.Element {
     // Undefined by default, as the key is not filled yet
     const [isKeyValid, setIsKeyValid] = useState<boolean>();
+    const [isKeyChangeInProgress, setIsKeyChangeInProgress] = useState<boolean>(false);
     const isKeyInvalidAndFilled = isKeyValid === false;
 
     return (
@@ -331,7 +352,14 @@ function KeyForm({ onCancelClick, onSubmit, recoveryKey, submitButtonLabel }: Ke
             className="mx_KeyForm"
             onSubmit={(evt) => {
                 evt.preventDefault();
-                onSubmit(evt);
+                if (isKeyChangeInProgress) {
+                    // Don't allow repeated attempts.
+                    return;
+                }
+                setIsKeyChangeInProgress(true);
+                onSubmit().finally(() => {
+                    setIsKeyChangeInProgress(false);
+                });
             }}
             onChange={async (evt) => {
                 evt.preventDefault();
@@ -345,13 +373,17 @@ function KeyForm({ onCancelClick, onSubmit, recoveryKey, submitButtonLabel }: Ke
             <Field name="recoveryKey" serverInvalid={isKeyInvalidAndFilled}>
                 <Label>{_t("settings|encryption|recovery|enter_recovery_key")}</Label>
 
-                <TextControl required={true} />
+                <PasswordControl
+                    required={true}
+                    title={_t("settings|encryption|recovery|enter_recovery_key")}
+                    className="mx_KeyForm_password mx_no_textinput"
+                />
                 {isKeyInvalidAndFilled && (
                     <ErrorMessage>{_t("settings|encryption|recovery|enter_key_error")}</ErrorMessage>
                 )}
             </Field>
             <EncryptionCardButtons>
-                <Button disabled={!isKeyValid}>{submitButtonLabel}</Button>
+                <Button disabled={!isKeyValid || isKeyChangeInProgress}>{submitButtonLabel}</Button>
                 <Button kind="tertiary" onClick={onCancelClick}>
                     {_t("action|cancel")}
                 </Button>
diff --git a/src/components/views/settings/encryption/EncryptionCardEmphasisedContent.tsx b/src/components/views/settings/encryption/EncryptionCardEmphasisedContent.tsx
index e630ebaa9f..2e705021bc 100644
--- a/src/components/views/settings/encryption/EncryptionCardEmphasisedContent.tsx
+++ b/src/components/views/settings/encryption/EncryptionCardEmphasisedContent.tsx
@@ -6,8 +6,7 @@
  */
 
 import React, { type JSX, type PropsWithChildren } from "react";
-
-import { Flex } from "../../../utils/Flex";
+import { Flex } from "@element-hq/web-shared-components";
 
 /**
  * A component for emphasised text within an {@link EncryptionCard}
diff --git a/src/components/views/settings/encryption/KeyStoragePanel.tsx b/src/components/views/settings/encryption/KeyStoragePanel.tsx
index 0de55942a7..4443232495 100644
--- a/src/components/views/settings/encryption/KeyStoragePanel.tsx
+++ b/src/components/views/settings/encryption/KeyStoragePanel.tsx
@@ -13,6 +13,7 @@ import { SettingsSection } from "../shared/SettingsSection";
 import { _t } from "../../../../languageHandler";
 import { SettingsHeader } from "../SettingsHeader";
 import { useKeyStoragePanelViewModel } from "../../../viewmodels/settings/encryption/KeyStoragePanelViewModel";
+import SdkConfig from "../../../../SdkConfig";
 
 interface Props {
     /**
@@ -55,7 +56,7 @@ export const KeyStoragePanel: React.FC<Props> = ({ onKeyStorageDisableClick }) =
             }
             subHeading={_t("settings|encryption|key_storage|description", undefined, {
                 a: (sub) => (
-                    <a href="https://element.io/help#encryption5" target="_blank" rel="noreferrer noopener">
+                    <a href={SdkConfig.get("help_encryption_url")} target="_blank" rel="noreferrer noopener">
                         {sub}
                     </a>
                 ),
diff --git a/src/components/views/settings/encryption/RecoveryPanelOutOfSync.tsx b/src/components/views/settings/encryption/RecoveryPanelOutOfSync.tsx
index a5d47100d6..16ab517d32 100644
--- a/src/components/views/settings/encryption/RecoveryPanelOutOfSync.tsx
+++ b/src/components/views/settings/encryption/RecoveryPanelOutOfSync.tsx
@@ -12,13 +12,20 @@ import KeyIcon from "@vector-im/compound-design-tokens/assets/web/icons/key";
 import { SettingsSection } from "../shared/SettingsSection";
 import { _t } from "../../../../languageHandler";
 import { SettingsSubheader } from "../SettingsSubheader";
-import { accessSecretStorage } from "../../../../SecurityManager";
+import { AccessCancelledError, accessSecretStorage } from "../../../../SecurityManager";
+import DeviceListener from "../../../../DeviceListener";
+import { useMatrixClientContext } from "../../../../contexts/MatrixClientContext";
+import { resetKeyBackupAndWait } from "../../../../utils/crypto/resetKeyBackup";
 
 interface RecoveryPanelOutOfSyncProps {
     /**
      * Callback for when the user has finished entering their recovery key.
      */
     onFinish: () => void;
+    /**
+     * Callback for when accessing secret storage fails.
+     */
+    onAccessSecretStorageFailed: () => void;
     /**
      * Callback for when the user clicks on the "Forgot recovery key?" button.
      */
@@ -32,7 +39,13 @@ interface RecoveryPanelOutOfSyncProps {
  * It prompts the user to enter their recovery key so that the secrets can be loaded from 4S into
  * the client.
  */
-export function RecoveryPanelOutOfSync({ onForgotRecoveryKey, onFinish }: RecoveryPanelOutOfSyncProps): JSX.Element {
+export function RecoveryPanelOutOfSync({
+    onForgotRecoveryKey,
+    onAccessSecretStorageFailed,
+    onFinish,
+}: RecoveryPanelOutOfSyncProps): JSX.Element {
+    const matrixClient = useMatrixClientContext();
+
     return (
         <SettingsSection
             legacy={false}
@@ -55,7 +68,39 @@ export function RecoveryPanelOutOfSync({ onForgotRecoveryKey, onFinish }: Recove
                     kind="primary"
                     Icon={KeyIcon}
                     onClick={async () => {
-                        await accessSecretStorage();
+                        const crypto = matrixClient.getCrypto()!;
+
+                        const deviceListener = DeviceListener.sharedInstance();
+
+                        // we need to call keyStorageOutOfSyncNeedsBackupReset here because
+                        // deviceListener.whilePaused() sets its client to undefined, so
+                        // keyStorageOutOfSyncNeedsBackupReset won't be able to check
+                        // the backup state.
+                        const needsBackupReset = await deviceListener.keyStorageOutOfSyncNeedsBackupReset(false);
+
+                        try {
+                            // pause the device listener because we could be making lots
+                            // of changes, and don't want toasts to pop up and disappear
+                            // while we're doing it
+                            await deviceListener.whilePaused(async () => {
+                                await accessSecretStorage(async () => {
+                                    // Reset backup if needed.
+                                    if (needsBackupReset) {
+                                        await resetKeyBackupAndWait(crypto);
+                                    } else if (await matrixClient.isKeyBackupKeyStored()) {
+                                        await crypto.loadSessionBackupPrivateKeyFromSecretStorage();
+                                    }
+                                });
+                            });
+                        } catch (error) {
+                            if (error instanceof AccessCancelledError) {
+                                // The user cancelled the dialog - just allow it to
+                                // close, and return to this panel
+                            } else {
+                                onAccessSecretStorageFailed();
+                            }
+                            return;
+                        }
                         onFinish();
                     }}
                 >
diff --git a/src/components/views/settings/encryption/ResetIdentityBody.tsx b/src/components/views/settings/encryption/ResetIdentityBody.tsx
index a6b0b2c12e..91b7d65b5d 100644
--- a/src/components/views/settings/encryption/ResetIdentityBody.tsx
+++ b/src/components/views/settings/encryption/ResetIdentityBody.tsx
@@ -48,8 +48,12 @@ interface ResetIdentityBodyProps {
  * "forgot" is shown when the user chose 'Forgot recovery key?' during `SetupEncryptionToast`.
  *
  * "confirm" is shown when the user chose 'Reset all' during `SetupEncryptionBody`.
+ *
+ * "no_verification_method" is shown when the device is unverified and has no way of
+ * obtaining the existing keys, and hence the identity needs to be reset to have
+ * a cross-signed device.
  */
-export type ResetIdentityBodyVariant = "compromised" | "forgot" | "sync_failed" | "confirm";
+export type ResetIdentityBodyVariant = "compromised" | "forgot" | "sync_failed" | "confirm" | "no_verification_method";
 
 /**
  * User interface component allowing the user to reset their cryptographic identity.
@@ -124,5 +128,7 @@ function titleForVariant(variant: ResetIdentityBodyVariant): string {
             return _t("settings|encryption|advanced|breadcrumb_title_sync_failed");
         case "forgot":
             return _t("settings|encryption|advanced|breadcrumb_title_forgot");
+        case "no_verification_method":
+            return _t("settings|encryption|advanced|breadcrumb_title_cant_confirm");
     }
 }
diff --git a/src/components/views/settings/notifications/NotificationPusherSettings.tsx b/src/components/views/settings/notifications/NotificationPusherSettings.tsx
index a0560dc9ca..f7b21efbd6 100644
--- a/src/components/views/settings/notifications/NotificationPusherSettings.tsx
+++ b/src/components/views/settings/notifications/NotificationPusherSettings.tsx
@@ -86,6 +86,7 @@ export function NotificationPusherSettings(): JSX.Element {
             <SettingsSubsection
                 className="mx_NotificationPusherSettings"
                 heading={_t("settings|notifications|email_section")}
+                legacy={false}
             >
                 <SettingsSubsectionText className="mx_NotificationPusherSettings_description">
                     {_t("settings|notifications|email_description")}
@@ -109,7 +110,7 @@ export function NotificationPusherSettings(): JSX.Element {
                 </SettingsIndent>
             </SettingsSubsection>
             {notificationTargets.length > 0 && (
-                <SettingsSubsection heading={_t("settings|notifications|push_targets")}>
+                <SettingsSubsection heading={_t("settings|notifications|push_targets")} legacy={false}>
                     <ul>
                         {pushers
                             .filter((it) => it.kind !== "email")
diff --git a/src/components/views/settings/notifications/NotificationSettings2.tsx b/src/components/views/settings/notifications/NotificationSettings2.tsx
index 4e91bebf7b..c316d46129 100644
--- a/src/components/views/settings/notifications/NotificationSettings2.tsx
+++ b/src/components/views/settings/notifications/NotificationSettings2.tsx
@@ -7,11 +7,11 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type JSX, useState } from "react";
+import { SettingsToggleInput } from "@vector-im/compound-web";
 
 import NewAndImprovedIcon from "../../../../../res/img/element-icons/new-and-improved.svg";
 import { useMatrixClientContext } from "../../../../contexts/MatrixClientContext";
 import { useNotificationSettings } from "../../../../hooks/useNotificationSettings";
-import { useSettingValue } from "../../../../hooks/useSettings";
 import { _t } from "../../../../languageHandler";
 import {
     DefaultNotificationSettings,
@@ -19,13 +19,11 @@ import {
 } from "../../../../models/notificationsettings/NotificationSettings";
 import { RoomNotifState } from "../../../../RoomNotifs";
 import { SettingLevel } from "../../../../settings/SettingLevel";
-import SettingsStore from "../../../../settings/SettingsStore";
 import { NotificationLevel } from "../../../../stores/notifications/NotificationLevel";
 import { clearAllNotifications } from "../../../../utils/notifications";
 import AccessibleButton from "../../elements/AccessibleButton";
 import ExternalLink from "../../elements/ExternalLink";
 import LabelledCheckbox from "../../elements/LabelledCheckbox";
-import LabelledToggleSwitch from "../../elements/LabelledToggleSwitch";
 import StyledRadioGroup from "../../elements/StyledRadioGroup";
 import TagComposer from "../../elements/TagComposer";
 import { StatelessNotificationBadge } from "../../rooms/NotificationBadge/StatelessNotificationBadge";
@@ -34,6 +32,7 @@ import { SettingsSection } from "../shared/SettingsSection";
 import { SettingsSubsection } from "../shared/SettingsSubsection";
 import { NotificationPusherSettings } from "./NotificationPusherSettings";
 import SettingsFlag from "../../elements/SettingsFlag";
+import { SettingsSubsectionHeading } from "../shared/SettingsSubsectionHeading";
 
 enum NotificationDefaultLevels {
     AllMessages = "all_messages",
@@ -70,10 +69,6 @@ function useHasUnreadNotifications(): boolean {
 export default function NotificationSettings2(): JSX.Element {
     const cli = useMatrixClientContext();
 
-    const desktopNotifications = useSettingValue("notificationsEnabled");
-    const desktopShowBody = useSettingValue("notificationBodyEnabled");
-    const audioNotifications = useSettingValue("audioNotificationsEnabled");
-
     const { model, hasPendingChanges, reconcile } = useNotificationSettings(cli);
 
     const disabled = model === null || hasPendingChanges;
@@ -117,41 +112,33 @@ export default function NotificationSettings2(): JSX.Element {
             )}
             <SettingsSection>
                 <div className="mx_SettingsSubsection_content mx_NotificationSettings2_flags">
-                    <LabelledToggleSwitch
+                    <SettingsToggleInput
+                        name="enable_notifications_account"
                         label={_t("settings|notifications|enable_notifications_account")}
-                        value={!settings.globalMute}
+                        checked={!settings.globalMute}
                         disabled={disabled}
-                        onChange={(value) => {
+                        onChange={(evt) => {
                             reconcile({
                                 ...model!,
-                                globalMute: !value,
+                                globalMute: !evt.target.checked,
                             });
                         }}
                     />
-                    <LabelledToggleSwitch
-                        label={_t("settings|notifications|enable_desktop_notifications_session")}
-                        value={desktopNotifications}
-                        onChange={(value) =>
-                            SettingsStore.setValue("notificationsEnabled", null, SettingLevel.DEVICE, value)
-                        }
-                    />
-                    <LabelledToggleSwitch
+                    <SettingsFlag name="notificationsEnabled" level={SettingLevel.DEVICE} />
+                    <SettingsFlag
+                        name="notificationBodyEnabled"
                         label={_t("settings|notifications|desktop_notification_message_preview")}
-                        value={desktopShowBody}
-                        onChange={(value) =>
-                            SettingsStore.setValue("notificationBodyEnabled", null, SettingLevel.DEVICE, value)
-                        }
-                    />
-                    <LabelledToggleSwitch
-                        label={_t("settings|notifications|enable_audible_notifications_session")}
-                        value={audioNotifications}
-                        onChange={(value) =>
-                            SettingsStore.setValue("audioNotificationsEnabled", null, SettingLevel.DEVICE, value)
-                        }
+                        level={SettingLevel.DEVICE}
                     />
+                    <SettingsFlag name="audioNotificationsEnabled" level={SettingLevel.DEVICE} />
                 </div>
                 <SettingsSubsection
-                    heading={_t("settings|notifications|default_setting_section")}
+                    heading={
+                        <SettingsSubsectionHeading
+                            heading={_t("settings|notifications|default_setting_section")}
+                            as="h2"
+                        />
+                    }
                     description={_t("settings|notifications|default_setting_description")}
                 >
                     <StyledRadioGroup
@@ -178,11 +165,16 @@ export default function NotificationSettings2(): JSX.Element {
                     />
                 </SettingsSubsection>
                 <SettingsSubsection
-                    heading={_t("settings|notifications|play_sound_for_section")}
+                    heading={
+                        <SettingsSubsectionHeading
+                            heading={_t("settings|notifications|play_sound_for_section")}
+                            as="h2"
+                        />
+                    }
                     description={_t("settings|notifications|play_sound_for_description")}
                 >
                     <LabelledCheckbox
-                        label="People"
+                        label={_t("common|people")}
                         value={settings.sound.people !== undefined}
                         disabled={disabled || settings.defaultLevels.dm === RoomNotifState.MentionsOnly}
                         onChange={(value) => {
@@ -224,7 +216,9 @@ export default function NotificationSettings2(): JSX.Element {
                         }}
                     />
                 </SettingsSubsection>
-                <SettingsSubsection heading={_t("settings|notifications|other_section")}>
+                <SettingsSubsection
+                    heading={<SettingsSubsectionHeading heading={_t("settings|notifications|other_section")} as="h2" />}
+                >
                     <LabelledCheckbox
                         label={_t("settings|notifications|invites")}
                         value={settings.activity.invite}
@@ -269,7 +263,9 @@ export default function NotificationSettings2(): JSX.Element {
                     />
                 </SettingsSubsection>
                 <SettingsSubsection
-                    heading={_t("settings|notifications|mentions_keywords")}
+                    heading={
+                        <SettingsSubsectionHeading heading={_t("settings|notifications|mentions_keywords")} as="h2" />
+                    }
                     description={_t(
                         "settings|notifications|keywords",
                         {},
@@ -302,6 +298,7 @@ export default function NotificationSettings2(): JSX.Element {
                         label={_t("settings|notifications|notify_mention", {
                             mxid: cli.getUserId()!,
                         })}
+                        id="mx_NotificationSettings2_MentionCheckbox"
                         value={settings.mentions.user}
                         disabled={disabled}
                         onChange={(value) => {
diff --git a/src/components/views/settings/shared/SettingsSubsection.tsx b/src/components/views/settings/shared/SettingsSubsection.tsx
index 6f7fdde1f0..ac4872f598 100644
--- a/src/components/views/settings/shared/SettingsSubsection.tsx
+++ b/src/components/views/settings/shared/SettingsSubsection.tsx
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import classNames from "classnames";
 import React, { type HTMLAttributes } from "react";
-import { Separator } from "@vector-im/compound-web";
+import { Form, Separator } from "@vector-im/compound-web";
 
 import { SettingsSubsectionHeading } from "./SettingsSubsectionHeading";
 
@@ -23,6 +23,11 @@ export interface SettingsSubsectionProps extends HTMLAttributes<HTMLDivElement>
      * @default true
      */
     legacy?: boolean;
+
+    /**
+     * Wrap in a Form Root component, for compatibility with compound components.
+     */
+    formWrap?: boolean;
 }
 
 export const SettingsSubsectionText: React.FC<HTMLAttributes<HTMLDivElement>> = ({ children, ...rest }) => (
@@ -37,31 +42,48 @@ export const SettingsSubsection: React.FC<SettingsSubsectionProps> = ({
     children,
     stretchContent,
     legacy = true,
+    formWrap,
     ...rest
-}) => (
-    <div
-        {...rest}
-        className={classNames("mx_SettingsSubsection", {
-            mx_SettingsSubsection_newUi: !legacy,
-        })}
-    >
-        {typeof heading === "string" ? <SettingsSubsectionHeading heading={heading} /> : <>{heading}</>}
-        {!!description && (
-            <div className="mx_SettingsSubsection_description">
-                <SettingsSubsectionText>{description}</SettingsSubsectionText>
-            </div>
-        )}
-        {!!children && (
-            <div
-                className={classNames("mx_SettingsSubsection_content", {
-                    mx_SettingsSubsection_contentStretch: !!stretchContent,
-                    mx_SettingsSubsection_noHeading: !heading && !description,
-                    mx_SettingsSubsection_content_newUi: !legacy,
-                })}
+}) => {
+    const content = (
+        <div
+            {...rest}
+            className={classNames("mx_SettingsSubsection", {
+                mx_SettingsSubsection_newUi: !legacy,
+            })}
+        >
+            {typeof heading === "string" ? <SettingsSubsectionHeading heading={heading} /> : <>{heading}</>}
+            {!!description && (
+                <div className="mx_SettingsSubsection_description">
+                    <SettingsSubsectionText>{description}</SettingsSubsectionText>
+                </div>
+            )}
+            {!!children && (
+                <div
+                    className={classNames("mx_SettingsSubsection_content", {
+                        mx_SettingsSubsection_contentStretch: !!stretchContent,
+                        mx_SettingsSubsection_noHeading: !heading && !description,
+                        mx_SettingsSubsection_content_newUi: !legacy,
+                    })}
+                >
+                    {children}
+                </div>
+            )}
+            {!legacy && <Separator />}
+        </div>
+    );
+
+    if (formWrap) {
+        return (
+            <Form.Root
+                onSubmit={(evt) => {
+                    evt.preventDefault();
+                    evt.stopPropagation();
+                }}
             >
-                {children}
-            </div>
-        )}
-        {!legacy && <Separator />}
-    </div>
-);
+                {content}
+            </Form.Root>
+        );
+    }
+    return content;
+};
diff --git a/src/components/views/settings/shared/SettingsSubsectionHeading.tsx b/src/components/views/settings/shared/SettingsSubsectionHeading.tsx
index 63fb79c637..1be143504c 100644
--- a/src/components/views/settings/shared/SettingsSubsectionHeading.tsx
+++ b/src/components/views/settings/shared/SettingsSubsectionHeading.tsx
@@ -12,13 +12,19 @@ import Heading from "../../typography/Heading";
 
 export interface SettingsSubsectionHeadingProps extends HTMLAttributes<HTMLDivElement> {
     heading: string;
+    as?: React.ComponentProps<typeof Heading>["as"];
     children?: React.ReactNode;
 }
 
-export const SettingsSubsectionHeading: React.FC<SettingsSubsectionHeadingProps> = ({ heading, children, ...rest }) => {
+export const SettingsSubsectionHeading: React.FC<SettingsSubsectionHeadingProps> = ({
+    heading,
+    as = "h3",
+    children,
+    ...rest
+}) => {
     return (
         <div {...rest} className="mx_SettingsSubsectionHeading">
-            <Heading className="mx_SettingsSubsectionHeading_heading" size="4" as="h3">
+            <Heading className="mx_SettingsSubsectionHeading_heading" size="4" as={as}>
                 {heading}
             </Heading>
             {children}
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx
index b50eb22a7c..4b04e4bcf3 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 import React, { type ContextType } from "react";
 import { type Room } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
+import { Form } from "@vector-im/compound-web";
 
 import { _t } from "../../../../../languageHandler";
 import RoomProfileSettings from "../../../room_settings/RoomProfileSettings";
@@ -78,26 +79,33 @@ export default class GeneralRoomSettingsTab extends React.Component<IProps, ISta
 
         return (
             <SettingsTab data-testid="General">
-                <SettingsSection heading={_t("common|general")}>
-                    <RoomProfileSettings roomId={room.roomId} />
-                </SettingsSection>
+                <Form.Root
+                    onSubmit={(evt) => {
+                        evt.preventDefault();
+                        evt.stopPropagation();
+                    }}
+                >
+                    <SettingsSection heading={_t("common|general")}>
+                        <RoomProfileSettings roomId={room.roomId} />
+                    </SettingsSection>
 
-                <SettingsSection heading={_t("room_settings|general|aliases_section")}>
-                    <AliasSettings
-                        roomId={room.roomId}
-                        canSetCanonicalAlias={canSetCanonical}
-                        canSetAliases={canSetAliases}
-                        canonicalAliasEvent={canonicalAliasEv}
-                    />
-                </SettingsSection>
+                    <SettingsSection heading={_t("room_settings|general|aliases_section")}>
+                        <AliasSettings
+                            roomId={room.roomId}
+                            canSetCanonicalAlias={canSetCanonical}
+                            canSetAliases={canSetAliases}
+                            canonicalAliasEvent={canonicalAliasEv}
+                        />
+                    </SettingsSection>
 
-                <SettingsSection heading={_t("room_settings|general|other_section")}>
-                    {urlPreviewSettings}
-                    <SettingsSubsection heading={_t("common|moderation_and_safety")} legacy={false}>
-                        <MediaPreviewAccountSettings roomId={room.roomId} />
-                    </SettingsSubsection>
-                    {leaveSection}
-                </SettingsSection>
+                    <SettingsSection heading={_t("room_settings|general|other_section")}>
+                        {urlPreviewSettings}
+                        <SettingsSubsection heading={_t("common|moderation_and_safety")} legacy={false}>
+                            <MediaPreviewAccountSettings roomId={room.roomId} />
+                        </SettingsSubsection>
+                        {leaveSection}
+                    </SettingsSection>
+                </Form.Root>
             </SettingsTab>
         );
     }
diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
index c44812d618..4c720a2372 100644
--- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
@@ -7,16 +7,9 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type JSX } from "react";
-import {
-    EventType,
-    type RoomMember,
-    type RoomState,
-    RoomStateEvent,
-    type Room,
-    type IContent,
-} from "matrix-js-sdk/src/matrix";
+import { EventType, type RoomMember, type RoomState, RoomStateEvent, type Room } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { throttle, get } from "lodash";
+import { throttle, get, set } from "lodash";
 import { KnownMembership, type RoomPowerLevelsEventContent } from "matrix-js-sdk/src/types";
 
 import { _t, _td, type TranslationKey } from "../../../../../languageHandler";
@@ -26,13 +19,13 @@ import ErrorDialog from "../../../dialogs/ErrorDialog";
 import PowerSelector from "../../../elements/PowerSelector";
 import SettingsFieldset from "../../SettingsFieldset";
 import SettingsStore from "../../../../../settings/SettingsStore";
-import { ElementCall } from "../../../../../models/Call";
 import SdkConfig, { DEFAULTS } from "../../../../../SdkConfig";
 import { AddPrivilegedUsers } from "../../AddPrivilegedUsers";
 import SettingsTab from "../SettingsTab";
 import { SettingsSection } from "../../shared/SettingsSection";
 import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
 import { PowerLevelSelector } from "../../PowerLevelSelector";
+import { ElementCallEventType, ElementCallMemberEventType } from "../../../../../call-types";
 
 interface IEventShowOpts {
     isState?: boolean;
@@ -63,8 +56,8 @@ const plEventsToShow: Record<string, IEventShowOpts> = {
     [EventType.RoomRedaction]: { isState: false, hideForSpace: true },
 
     // MSC3401: Native Group VoIP signaling
-    [ElementCall.CALL_EVENT_TYPE.name]: { isState: true, hideForSpace: true },
-    [ElementCall.MEMBER_EVENT_TYPE.name]: { isState: true, hideForSpace: true },
+    [ElementCallEventType.name]: { isState: true, hideForSpace: true },
+    [ElementCallMemberEventType.name]: { isState: true, hideForSpace: true },
 
     // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
     "im.vector.modular.widgets": { isState: true, hideForSpace: true },
@@ -137,6 +130,8 @@ interface RolesRoomSettingsTabState {
     isReady: boolean;
 }
 
+const EVENTS_LEVEL_PREFIX = "event_levels_";
+
 export default class RolesRoomSettingsTab extends React.Component<IProps, RolesRoomSettingsTabState> {
     public static contextType = MatrixClientContext;
     declare public context: React.ContextType<typeof MatrixClientContext>;
@@ -199,24 +194,10 @@ export default class RolesRoomSettingsTab extends React.Component<IProps, RolesR
         // Clone the power levels just in case
         plContent = Object.assign({}, plContent);
 
-        const eventsLevelPrefix = "event_levels_";
-
-        if (powerLevelKey.startsWith(eventsLevelPrefix)) {
-            // deep copy "events" object, Object.assign itself won't deep copy
-            plContent["events"] = Object.assign({}, plContent["events"] || {});
-            plContent["events"][powerLevelKey.slice(eventsLevelPrefix.length)] = value;
+        if (powerLevelKey.startsWith(EVENTS_LEVEL_PREFIX)) {
+            set(plContent, ["events", powerLevelKey.slice(EVENTS_LEVEL_PREFIX.length)], value);
         } else {
-            const keyPath = powerLevelKey.split(".");
-            let parentObj: IContent = {};
-            let currentObj: IContent = plContent;
-            for (const key of keyPath) {
-                if (!currentObj[key]) {
-                    currentObj[key] = {};
-                }
-                parentObj = currentObj;
-                currentObj = currentObj[key];
-            }
-            parentObj[keyPath[keyPath.length - 1]] = value;
+            set(plContent, powerLevelKey.split("."), value);
         }
 
         try {
@@ -298,8 +279,8 @@ export default class RolesRoomSettingsTab extends React.Component<IProps, RolesR
 
         // MSC3401: Native Group VoIP signaling
         if (SettingsStore.getValue("feature_group_calls")) {
-            plEventsToLabels[ElementCall.CALL_EVENT_TYPE.name] = _td("room_settings|permissions|m.call");
-            plEventsToLabels[ElementCall.MEMBER_EVENT_TYPE.name] = _td("room_settings|permissions|m.call.member");
+            plEventsToLabels[ElementCallEventType.name] = _td("room_settings|permissions|m.call");
+            plEventsToLabels[ElementCallMemberEventType.name] = _td("room_settings|permissions|m.call.member");
         }
 
         const powerLevelDescriptors: Record<string, IPowerLevelDescriptor> = {
@@ -348,10 +329,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps, RolesR
             powerLevelDescriptors.users_default.defaultValue,
         );
 
-        let currentUserLevel = userLevels[client.getUserId()!];
-        if (currentUserLevel === undefined) {
-            currentUserLevel = defaultUserLevel;
-        }
+        const currentUserLevel = room.getMember(client.getSafeUserId())?.powerLevel ?? defaultUserLevel;
 
         this.populateDefaultPlEvents(
             eventsLevels,
@@ -465,7 +443,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps, RolesR
                             value={eventsLevels[eventType]}
                             usersDefault={defaultUserLevel}
                             disabled={!canChangeLevels || currentUserLevel < eventsLevels[eventType]}
-                            powerLevelKey={"event_levels_" + eventType}
+                            powerLevelKey={EVENTS_LEVEL_PREFIX + eventType}
                             onChange={this.onPowerLevelsChanged}
                         />
                     </div>
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
index 89ae96f8a4..5f71ecd81a 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { type JSX, type ReactNode } from "react";
+import React, { type ChangeEventHandler, type JSX, type ReactNode } from "react";
 import {
     GuestAccess,
     HistoryVisibility,
@@ -17,11 +17,10 @@ import {
     EventType,
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { InlineSpinner } from "@vector-im/compound-web";
+import { Form, InlineSpinner, SettingsToggleInput } from "@vector-im/compound-web";
 
 import { Icon as WarningIcon } from "../../../../../../res/img/warning.svg";
 import { _t } from "../../../../../languageHandler";
-import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import Modal from "../../../../../Modal";
 import QuestionDialog from "../../../dialogs/QuestionDialog";
 import StyledRadioGroup from "../../../elements/StyledRadioGroup";
@@ -55,6 +54,7 @@ interface IState {
     history: HistoryVisibility;
     hasAliases: boolean;
     encrypted: boolean | null;
+    stateEncrypted: boolean | null;
     showAdvancedSection: boolean;
 }
 
@@ -80,6 +80,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
             ),
             hasAliases: false, // async loaded in componentDidMount
             encrypted: null, // async loaded in componentDidMount
+            stateEncrypted: null, // async loaded in componentDidMount
             showAdvancedSection: false,
         };
     }
@@ -90,6 +91,9 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
         this.setState({
             hasAliases: await this.hasAliases(),
             encrypted: Boolean(await this.context.getCrypto()?.isEncryptionEnabledInRoom(this.props.room.roomId)),
+            stateEncrypted: Boolean(
+                await this.context.getCrypto()?.isStateEncryptionEnabledInRoom(this.props.room.roomId),
+            ),
         });
     }
 
@@ -184,7 +188,8 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
         });
     };
 
-    private onGuestAccessChange = (allowed: boolean): void => {
+    private onGuestAccessChange: ChangeEventHandler<HTMLInputElement> = (evt): void => {
+        const allowed = evt.target.checked;
         const guestAccess = allowed ? GuestAccess.CanJoin : GuestAccess.Forbidden;
         const beforeGuestAccess = this.state.guestAccess;
         if (beforeGuestAccess === guestAccess) return;
@@ -251,19 +256,28 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
 
     private renderJoinRule(): JSX.Element {
         const room = this.props.room;
-
-        let aliasWarning: JSX.Element | undefined;
-        if (room.getJoinRule() === JoinRule.Public && !this.state.hasAliases) {
-            aliasWarning = (
-                <div className="mx_SecurityRoomSettingsTab_warning">
-                    <WarningIcon width={15} height={15} />
-                    <span>{_t("room_settings|security|public_without_alias_warning")}</span>
-                </div>
-            );
-        }
-        const description = _t("room_settings|security|join_rule_description", {
-            roomName: room.name,
-        });
+        const isPublic = room.getJoinRule() === JoinRule.Public;
+        const description = (
+            <>
+                <p>
+                    {_t("room_settings|security|join_rule_description", {
+                        roomName: room.name,
+                    })}
+                </p>
+                {isPublic && this.state.history === HistoryVisibility.WorldReadable && (
+                    <div className="mx_SecurityRoomSettingsTab_warning">
+                        <WarningIcon width={15} height={15} />
+                        <span>{_t("room_settings|security|join_rule_world_readable_description")}</span>
+                    </div>
+                )}
+                {isPublic && !this.state.hasAliases && (
+                    <div className="mx_SecurityRoomSettingsTab_warning">
+                        <WarningIcon width={15} height={15} />
+                        <span>{_t("room_settings|security|public_without_alias_warning")}</span>
+                    </div>
+                )}
+            </>
+        );
 
         let advanced: JSX.Element | undefined;
         if (room.getJoinRule() === JoinRule.Public) {
@@ -290,7 +304,6 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
                     onError={this.onJoinRuleChangeError}
                     closeSettingsFn={this.props.closeSettingsFn}
                     promptUpgrade={true}
-                    aliasWarning={aliasWarning}
                 />
                 {advanced}
             </SettingsFieldset>
@@ -342,6 +355,57 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
             if (!confirm) return false;
         }
 
+        // If the room is going from public to private AND the room is join readable, we want to encourage the user
+        // to change the history visibility.
+        const currentlyPublic = this.props.room.getJoinRule() === JoinRule.Public;
+        if (this.state.history === HistoryVisibility.WorldReadable && currentlyPublic && joinRule !== JoinRule.Public) {
+            const client = this.context;
+            const canChangeHistory = this.props.room.currentState?.mayClientSendStateEvent(
+                EventType.RoomHistoryVisibility,
+                client,
+            );
+
+            // If we can't change the history visibility, then don't allow the join rule transition. This is a unlikely occurance
+            // and if this is the case, a room administator should step in.
+            if (!canChangeHistory) {
+                const dialog = Modal.createDialog(ErrorDialog, {
+                    title: _t(
+                        "room_settings|security|cannot_change_to_private_due_to_missing_history_visiblity_permissions|title",
+                    ),
+                    description: (
+                        <p>
+                            {_t(
+                                "room_settings|security|cannot_change_to_private_due_to_missing_history_visiblity_permissions|description",
+                            )}
+                        </p>
+                    ),
+                });
+                await dialog.finished;
+                return false;
+            }
+
+            // Adjust the history visibility first.
+            try {
+                await this.context.sendStateEvent(
+                    this.props.room.roomId,
+                    EventType.RoomHistoryVisibility,
+                    {
+                        history_visibility: HistoryVisibility.Shared,
+                    },
+                    "",
+                );
+                this.setState({ history: HistoryVisibility.Shared });
+            } catch (ex) {
+                logger.error("Failed to change history visibility", ex);
+                Modal.createDialog(ErrorDialog, {
+                    title: _t("common|error"),
+                    description: _t("error|update_history_visibility"),
+                });
+                // If we fail to update the history visibility
+                return false;
+            }
+        }
+
         return true;
     };
 
@@ -405,13 +469,14 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
 
         return (
             <div className="mx_SecurityRoomSettingsTab_advancedSection">
-                <LabelledToggleSwitch
-                    value={guestAccess === GuestAccess.CanJoin}
+                <SettingsToggleInput
+                    name="guest-access"
+                    checked={guestAccess === GuestAccess.CanJoin}
                     onChange={this.onGuestAccessChange}
                     disabled={!canSetGuestAccess}
                     label={_t("room_settings|visibility|guest_access_label")}
+                    helpMessage={_t("room_settings|security|guest_access_warning")}
                 />
-                <p>{_t("room_settings|security|guest_access_warning")}</p>
             </div>
         );
     }
@@ -420,6 +485,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
         const client = this.context;
         const room = this.props.room;
         const isEncrypted = this.state.encrypted;
+        const isStateEncrypted = this.state.stateEncrypted;
         const isEncryptionLoading = isEncrypted === null;
         const hasEncryptionPermission = room.currentState.mayClientSendStateEvent(EventType.RoomEncryption, client);
         const isEncryptionForceDisabled = shouldForceDisableEncryption(client);
@@ -444,35 +510,51 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
 
         return (
             <SettingsTab>
-                <SettingsSection heading={_t("room_settings|security|title")}>
-                    <SettingsFieldset
-                        legend={_t("settings|security|encryption_section")}
-                        description={
-                            isEncryptionForceDisabled && !isEncrypted
-                                ? undefined
-                                : _t("room_settings|security|encryption_permanent")
-                        }
-                    >
-                        {isEncryptionLoading ? (
-                            <InlineSpinner />
-                        ) : (
-                            <>
-                                <LabelledToggleSwitch
-                                    value={isEncrypted}
-                                    onChange={this.onEncryptionChange}
-                                    label={_t("common|encrypted")}
-                                    disabled={!canEnableEncryption}
-                                />
-                                {isEncryptionForceDisabled && !isEncrypted && (
-                                    <Caption>{_t("room_settings|security|encryption_forced")}</Caption>
-                                )}
-                                {encryptionSettings}
-                            </>
-                        )}
-                    </SettingsFieldset>
-                    {this.renderJoinRule()}
-                    {historySection}
-                </SettingsSection>
+                <Form.Root
+                    onSubmit={(evt) => {
+                        evt.preventDefault();
+                        evt.stopPropagation();
+                    }}
+                >
+                    <SettingsSection heading={_t("room_settings|security|title")}>
+                        <SettingsFieldset
+                            legend={_t("settings|security|encryption_section")}
+                            description={
+                                isEncryptionForceDisabled && !isEncrypted
+                                    ? undefined
+                                    : _t("room_settings|security|encryption_permanent")
+                            }
+                        >
+                            {isEncryptionLoading ? (
+                                <InlineSpinner />
+                            ) : (
+                                <>
+                                    <SettingsToggleInput
+                                        name="enable-encryption"
+                                        checked={isEncrypted}
+                                        onChange={this.onEncryptionChange}
+                                        label={_t("common|encrypted")}
+                                        disabled={!canEnableEncryption}
+                                    />
+                                    {isEncryptionForceDisabled && !isEncrypted && (
+                                        <Caption>{_t("room_settings|security|encryption_forced")}</Caption>
+                                    )}
+                                    {isStateEncrypted && (
+                                        <SettingsToggleInput
+                                            name="enable-state-encryption"
+                                            checked={isStateEncrypted}
+                                            label={_t("common|state_encryption_enabled")}
+                                            disabled={true}
+                                        />
+                                    )}
+                                    {encryptionSettings}
+                                </>
+                            )}
+                        </SettingsFieldset>
+                        {this.renderJoinRule()}
+                        {historySection}
+                    </SettingsSection>
+                </Form.Root>
             </SettingsTab>
         );
     }
diff --git a/src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx
index 3583179b92..6c28105060 100644
--- a/src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx
@@ -6,18 +6,18 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { useCallback, useMemo, useState } from "react";
+import React, { type ChangeEventHandler, useCallback, useMemo, useState } from "react";
 import { JoinRule, EventType, type RoomState, type Room } from "matrix-js-sdk/src/matrix";
 import { type RoomPowerLevelsEventContent } from "matrix-js-sdk/src/types";
+import { Form, SettingsToggleInput } from "@vector-im/compound-web";
 
 import { _t } from "../../../../../languageHandler";
-import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import { SettingsSubsection } from "../../shared/SettingsSubsection";
 import SettingsTab from "../SettingsTab";
-import { ElementCall } from "../../../../../models/Call";
 import { useRoomState } from "../../../../../hooks/useRoomState";
 import SdkConfig, { DEFAULTS } from "../../../../../SdkConfig";
 import { SettingsSection } from "../../shared/SettingsSection";
+import { ElementCallEventType, ElementCallMemberEventType } from "../../../../../call-types";
 
 interface ElementCallSwitchProps {
     room: Room;
@@ -42,11 +42,12 @@ const ElementCallSwitch: React.FC<ElementCallSwitchProps> = ({ room }) => {
     );
 
     const [elementCallEnabled, setElementCallEnabled] = useState<boolean>(() => {
-        return content.events?.[ElementCall.MEMBER_EVENT_TYPE.name] === 0;
+        return content.events?.[ElementCallMemberEventType.name] === 0;
     });
 
-    const onChange = useCallback(
-        (enabled: boolean): void => {
+    const onChange = useCallback<ChangeEventHandler<HTMLInputElement>>(
+        (evt): void => {
+            const enabled = evt.target.checked;
             setElementCallEnabled(enabled);
 
             // Take a copy to avoid mutating the original
@@ -56,13 +57,13 @@ const ElementCallSwitch: React.FC<ElementCallSwitchProps> = ({ room }) => {
                 const userLevel = newContent.events[EventType.RoomMessage] ?? content.users_default ?? 0;
                 const moderatorLevel = content.kick ?? 50;
 
-                newContent.events[ElementCall.CALL_EVENT_TYPE.name] = isPublic ? moderatorLevel : userLevel;
-                newContent.events[ElementCall.MEMBER_EVENT_TYPE.name] = userLevel;
+                newContent.events[ElementCallEventType.name] = isPublic ? moderatorLevel : userLevel;
+                newContent.events[ElementCallMemberEventType.name] = userLevel;
             } else {
                 const adminLevel = newContent.events[EventType.RoomPowerLevels] ?? content.state_default ?? 100;
 
-                newContent.events[ElementCall.CALL_EVENT_TYPE.name] = adminLevel;
-                newContent.events[ElementCall.MEMBER_EVENT_TYPE.name] = adminLevel;
+                newContent.events[ElementCallEventType.name] = adminLevel;
+                newContent.events[ElementCallMemberEventType.name] = adminLevel;
             }
 
             room.client.sendStateEvent(room.roomId, EventType.RoomPowerLevels, newContent);
@@ -73,16 +74,17 @@ const ElementCallSwitch: React.FC<ElementCallSwitchProps> = ({ room }) => {
     const brand = SdkConfig.get("element_call").brand ?? DEFAULTS.element_call.brand;
 
     return (
-        <LabelledToggleSwitch
-            data-testid="element-call-switch"
+        <SettingsToggleInput
+            name="element-call-switch"
+            data-test-id="element-call-switch"
             label={_t("room_settings|voip|enable_element_call_label", { brand })}
-            caption={_t("room_settings|voip|enable_element_call_caption", {
+            helpMessage={_t("room_settings|voip|enable_element_call_caption", {
                 brand,
             })}
-            value={elementCallEnabled}
+            checked={elementCallEnabled}
             onChange={onChange}
             disabled={!maySend}
-            tooltip={_t("room_settings|voip|enable_element_call_no_permissions_tooltip")}
+            disabledMessage={_t("room_settings|voip|enable_element_call_no_permissions_tooltip")}
         />
     );
 };
@@ -95,9 +97,16 @@ export const VoipRoomSettingsTab: React.FC<Props> = ({ room }) => {
     return (
         <SettingsTab>
             <SettingsSection heading={_t("settings|voip|title")}>
-                <SettingsSubsection heading={_t("room_settings|voip|call_type_section")}>
-                    <ElementCallSwitch room={room} />
-                </SettingsSubsection>
+                <Form.Root
+                    onSubmit={(evt) => {
+                        evt.preventDefault();
+                        evt.stopPropagation();
+                    }}
+                >
+                    <SettingsSubsection heading={_t("room_settings|voip|call_type_section")}>
+                        <ElementCallSwitch room={room} />
+                    </SettingsSubsection>
+                </Form.Root>
             </SettingsSection>
         </SettingsTab>
     );
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index 7d46cf72da..4a8cecc204 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -9,9 +9,9 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type ChangeEvent, type ReactNode } from "react";
 import { type EmptyObject } from "matrix-js-sdk/src/matrix";
+import { Form } from "@vector-im/compound-web";
 
 import { _t } from "../../../../../languageHandler";
-import SdkConfig from "../../../../../SdkConfig";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import SettingsFlag from "../../../elements/SettingsFlag";
 import Field from "../../../elements/Field";
@@ -48,7 +48,6 @@ export default class AppearanceUserSettingsTab extends React.Component<EmptyObje
     private renderAdvancedSection(): ReactNode {
         if (!SettingsStore.getValue(UIFeature.AdvancedSettings)) return null;
 
-        const brand = SdkConfig.get().brand;
         const toggle = (
             <AccessibleButton
                 kind="link"
@@ -62,21 +61,23 @@ export default class AppearanceUserSettingsTab extends React.Component<EmptyObje
         let advanced: React.ReactNode;
 
         if (this.state.showAdvanced) {
-            const tooltipContent = _t("settings|appearance|custom_font_description", { brand });
             advanced = (
-                <>
-                    <SettingsFlag name="useCompactLayout" level={SettingLevel.DEVICE} useCheckbox={true} />
+                <Form.Root
+                    onSubmit={(evt) => {
+                        evt.preventDefault();
+                        evt.stopPropagation();
+                    }}
+                >
+                    <SettingsFlag name="useCompactLayout" level={SettingLevel.DEVICE} />
 
                     <SettingsFlag
                         name="useBundledEmojiFont"
                         level={SettingLevel.DEVICE}
-                        useCheckbox={true}
                         onChange={(checked) => this.setState({ useBundledEmojiFont: checked })}
                     />
                     <SettingsFlag
                         name="useSystemFont"
                         level={SettingLevel.DEVICE}
-                        useCheckbox={true}
                         onChange={(checked) => this.setState({ useSystemFont: checked })}
                     />
                     <Field
@@ -89,12 +90,10 @@ export default class AppearanceUserSettingsTab extends React.Component<EmptyObje
 
                             SettingsStore.setValue("systemFont", null, SettingLevel.DEVICE, value.target.value);
                         }}
-                        tooltipContent={tooltipContent}
-                        forceTooltipVisible={true}
                         disabled={!this.state.useSystemFont}
                         value={this.state.systemFont}
                     />
-                </>
+                </Form.Root>
             );
         }
         return (
diff --git a/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx b/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx
index dea28628fb..ddc594a0b0 100644
--- a/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx
@@ -5,15 +5,13 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import React, { type JSX, useCallback, useEffect, useState } from "react";
-import { Button, InlineSpinner, Separator } from "@vector-im/compound-web";
+import React, { type JSX, useState } from "react";
+import { Button, Separator } from "@vector-im/compound-web";
 import ComputerIcon from "@vector-im/compound-design-tokens/assets/web/icons/computer";
-import { CryptoEvent } from "matrix-js-sdk/src/crypto-api";
 
 import SettingsTab from "../SettingsTab";
 import { RecoveryPanel } from "../../encryption/RecoveryPanel";
 import { ChangeRecoveryKey } from "../../encryption/ChangeRecoveryKey";
-import { useMatrixClientContext } from "../../../../../contexts/MatrixClientContext";
 import { _t } from "../../../../../languageHandler";
 import Modal from "../../../../../Modal";
 import SetupEncryptionDialog from "../../../dialogs/security/SetupEncryptionDialog";
@@ -23,17 +21,15 @@ import { AdvancedPanel } from "../../encryption/AdvancedPanel";
 import { ResetIdentityPanel } from "../../encryption/ResetIdentityPanel";
 import { type ResetIdentityBodyVariant } from "../../encryption/ResetIdentityBody";
 import { RecoveryPanelOutOfSync } from "../../encryption/RecoveryPanelOutOfSync";
-import { useTypedEventEmitter } from "../../../../../hooks/useEventEmitter";
+import { useTypedEventEmitterState } from "../../../../../hooks/useEventEmitter";
 import { KeyStoragePanel } from "../../encryption/KeyStoragePanel";
 import { DeleteKeyStoragePanel } from "../../encryption/DeleteKeyStoragePanel";
+import DeviceListener, { DeviceListenerEvents, type DeviceState } from "../../../../../DeviceListener";
+import { useKeyStoragePanelViewModel } from "../../../../viewmodels/settings/encryption/KeyStoragePanelViewModel";
 
 /**
  * The state in the encryption settings tab.
- *  - "loading": We are checking if the device is verified.
  *  - "main": The main panel with all the sections (Key storage, recovery, advanced).
- *  - "key_storage_disabled": The user has chosen to disable key storage and options are unavailable as a result.
- *  - "set_up_encryption": The panel to show when the user is setting up their encryption.
- *                         This happens when the user doesn't have cross-signing enabled, or their current device is not verified.
  *  - "change_recovery_key": The panel to show when the user is changing their recovery key.
  *                           This happens when the user has a recovery key and the user clicks on "Change recovery key" button of the RecoveryPanel.
  *  - "set_recovery_key": The panel to show when the user is setting up their recovery key.
@@ -41,21 +37,17 @@ import { DeleteKeyStoragePanel } from "../../encryption/DeleteKeyStoragePanel";
  *  - "reset_identity_compromised": The panel to show when the user is resetting their identity, in the case where their key is compromised.
  *  - "reset_identity_forgot": The panel to show when the user is resetting their identity, in the case where they forgot their recovery key.
  *  - "reset_identity_sync_failed": The panel to show when the user us resetting their identity, in the case where recovery failed.
- *  - "secrets_not_cached": The secrets are not cached locally. This can happen if we verified another device and secret-gossiping failed, or the other device itself lacked the secrets.
- *                          If the "set_up_encryption" and "secrets_not_cached" conditions are both filled, "set_up_encryption" prevails.
+ *  - "reset_identity_cant_recover": The panel to show when the user is resetting their identity, in the case where they can't use recovery.
  *  - "key_storage_delete": The confirmation page asking if the user really wants to turn off key storage.
  */
 export type State =
-    | "loading"
     | "main"
-    | "key_storage_disabled"
-    | "set_up_encryption"
     | "change_recovery_key"
     | "set_recovery_key"
     | "reset_identity_compromised"
     | "reset_identity_forgot"
     | "reset_identity_sync_failed"
-    | "secrets_not_cached"
+    | "reset_identity_cant_recover"
     | "key_storage_delete";
 
 interface Props {
@@ -68,48 +60,69 @@ interface Props {
 /**
  * The encryption settings tab.
  */
-export function EncryptionUserSettingsTab({ initialState = "loading" }: Props): JSX.Element {
+export function EncryptionUserSettingsTab({ initialState = "main" }: Readonly<Props>): JSX.Element {
     const [state, setState] = useState<State>(initialState);
 
-    const checkEncryptionState = useCheckEncryptionState(state, setState);
+    const deviceState = useTypedEventEmitterState(
+        DeviceListener.sharedInstance(),
+        DeviceListenerEvents.DeviceState,
+        (state?: DeviceState): DeviceState => {
+            return state ?? DeviceListener.sharedInstance().getDeviceState();
+        },
+    );
+
+    const { isEnabled: isBackupEnabled } = useKeyStoragePanelViewModel();
 
     let content: JSX.Element;
 
     switch (state) {
-        case "loading":
-            content = <InlineSpinner aria-label={_t("common|loading")} />;
-            break;
-        case "set_up_encryption":
-            content = <SetUpEncryptionPanel onFinish={checkEncryptionState} />;
-            break;
-        case "secrets_not_cached":
-            content = (
-                <RecoveryPanelOutOfSync
-                    onFinish={checkEncryptionState}
-                    onForgotRecoveryKey={() => setState("reset_identity_forgot")}
-                />
-            );
-            break;
-        case "key_storage_disabled":
         case "main":
-            content = (
-                <>
-                    <KeyStoragePanel onKeyStorageDisableClick={() => setState("key_storage_delete")} />
-                    <Separator kind="section" />
-                    {/* We only show the "Recovery" panel if key storage is enabled.*/}
-                    {state === "main" && (
+            switch (deviceState) {
+                // some device states require action from the user rather than showing the main settings screen
+                case "verify_this_session":
+                    content = <SetUpEncryptionPanel onFinish={() => setState("main")} />;
+                    break;
+                case "key_storage_out_of_sync":
+                    content = (
+                        <RecoveryPanelOutOfSync
+                            onFinish={() => setState("main")}
+                            onForgotRecoveryKey={() => setState("reset_identity_forgot")}
+                            onAccessSecretStorageFailed={async () => {
+                                const needsCrossSigningReset =
+                                    await DeviceListener.sharedInstance().keyStorageOutOfSyncNeedsCrossSigningReset(
+                                        true,
+                                    );
+                                setState(needsCrossSigningReset ? "reset_identity_sync_failed" : "change_recovery_key");
+                            }}
+                        />
+                    );
+                    break;
+                case "identity_needs_reset":
+                    content = (
+                        <IdentityNeedsResetNoticePanel onContinue={() => setState("reset_identity_cant_recover")} />
+                    );
+                    break;
+                default:
+                    content = (
                         <>
-                            <RecoveryPanel
-                                onChangeRecoveryKeyClick={(setupNewKey) =>
-                                    setupNewKey ? setState("set_recovery_key") : setState("change_recovery_key")
-                                }
-                            />
+                            <KeyStoragePanel onKeyStorageDisableClick={() => setState("key_storage_delete")} />
                             <Separator kind="section" />
+                            {/* We only show the "Recovery" panel if key storage is enabled.*/}
+                            {isBackupEnabled && (
+                                <>
+                                    <RecoveryPanel
+                                        onChangeRecoveryKeyClick={(setupNewKey) =>
+                                            setupNewKey ? setState("set_recovery_key") : setState("change_recovery_key")
+                                        }
+                                    />
+                                    <Separator kind="section" />
+                                </>
+                            )}
+                            <AdvancedPanel onResetIdentityClick={() => setState("reset_identity_compromised")} />
                         </>
-                    )}
-                    <AdvancedPanel onResetIdentityClick={() => setState("reset_identity_compromised")} />
-                </>
-            );
+                    );
+                    break;
+            }
             break;
         case "change_recovery_key":
         case "set_recovery_key":
@@ -124,16 +137,17 @@ export function EncryptionUserSettingsTab({ initialState = "loading" }: Props):
         case "reset_identity_compromised":
         case "reset_identity_forgot":
         case "reset_identity_sync_failed":
+        case "reset_identity_cant_recover":
             content = (
                 <ResetIdentityPanel
                     variant={findResetVariant(state)}
-                    onCancelClick={checkEncryptionState}
-                    onReset={checkEncryptionState}
+                    onCancelClick={() => setState("main")}
+                    onReset={() => setState("main")}
                 />
             );
             break;
         case "key_storage_delete":
-            content = <DeleteKeyStoragePanel onFinish={checkEncryptionState} />;
+            content = <DeleteKeyStoragePanel onFinish={() => setState("main")} />;
             break;
     }
 
@@ -154,6 +168,8 @@ function findResetVariant(state: State): ResetIdentityBodyVariant {
             return "compromised";
         case "reset_identity_sync_failed":
             return "sync_failed";
+        case "reset_identity_cant_recover":
+            return "no_verification_method";
 
         default:
         case "reset_identity_forgot":
@@ -161,63 +177,6 @@ function findResetVariant(state: State): ResetIdentityBodyVariant {
     }
 }
 
-/**
- * Hook to check if the user needs:
- * - to go through the SetupEncryption flow.
- * - to enter their recovery key, if the secrets are not cached locally.
- * ...and also whether megolm key backup is enabled on this device (which we use to set the state of the 'allow key storage' toggle)
- *
- * If cross signing is set up, key backup is enabled and the secrets are cached, the state will be set to "main".
- * If cross signing is not set up, the state will be set to "set_up_encryption".
- * If key backup is not enabled, the state will be set to "key_storage_disabled".
- * If secrets are missing, the state will be set to "secrets_not_cached".
- *
- * The state is set once when the component is first mounted.
- * Also returns a callback function which can be called to re-run the logic.
- *
- * @param setState - callback passed from the EncryptionUserSettingsTab to set the current `State`.
- * @returns a callback function, which will re-run the logic and update the state.
- */
-function useCheckEncryptionState(state: State, setState: (state: State) => void): () => Promise<void> {
-    const matrixClient = useMatrixClientContext();
-
-    const checkEncryptionState = useCallback(async () => {
-        const crypto = matrixClient.getCrypto()!;
-        const isCrossSigningReady = await crypto.isCrossSigningReady();
-
-        // Check if the secrets are cached
-        const cachedSecrets = (await crypto.getCrossSigningStatus()).privateKeysCachedLocally;
-        const secretsOk = cachedSecrets.masterKey && cachedSecrets.selfSigningKey && cachedSecrets.userSigningKey;
-
-        // Also check the key backup status
-        const activeBackupVersion = await crypto.getActiveSessionBackupVersion();
-
-        const keyStorageEnabled = activeBackupVersion !== null;
-
-        if (isCrossSigningReady && keyStorageEnabled && secretsOk) setState("main");
-        else if (!isCrossSigningReady) setState("set_up_encryption");
-        else if (!keyStorageEnabled) setState("key_storage_disabled");
-        else setState("secrets_not_cached");
-    }, [matrixClient, setState]);
-
-    // Initialise the state when the component is mounted
-    useEffect(() => {
-        if (state === "loading") checkEncryptionState();
-    }, [checkEncryptionState, state]);
-
-    useTypedEventEmitter(matrixClient, CryptoEvent.KeyBackupStatus, (): void => {
-        // Recheck the status if the key backup status has changed so we can keep the page up to date.
-        // Note that this could potentially update the UI while the user is trying to do something, although
-        // if their key backup status is changing then they're changing encryption related things
-        // on another device. This code is written with the assumption that it's better for the UI to refresh
-        // and be up to date with whatever changes they've made.
-        checkEncryptionState();
-    });
-
-    // Also return the callback so that the component can re-run the logic.
-    return checkEncryptionState;
-}
-
 interface SetUpEncryptionPanelProps {
     /**
      * Callback to call when the user has finished setting up encryption.
@@ -257,3 +216,31 @@ function SetUpEncryptionPanel({ onFinish }: SetUpEncryptionPanelProps): JSX.Elem
         </SettingsSection>
     );
 }
+
+interface IdentityNeedsResetNoticePanelProps {
+    /**
+     * Callback to call when the user has finished setting up encryption.
+     */
+    onContinue: () => void;
+}
+
+/**
+ * Panel to tell the user that they need to reset their identity.
+ */
+function IdentityNeedsResetNoticePanel({ onContinue }: Readonly<IdentityNeedsResetNoticePanelProps>): JSX.Element {
+    return (
+        <SettingsSection
+            legacy={false}
+            heading={_t("encryption|key_storage_out_of_sync")}
+            subHeading={
+                <SettingsSubheader state="error" stateMessage={_t("encryption|identity_needs_reset_description")} />
+            }
+        >
+            <div>
+                <Button size="sm" kind="primary" onClick={onContinue}>
+                    {_t("encryption|continue_with_reset")}
+                </Button>
+            </div>
+        </SettingsSection>
+    );
+}
diff --git a/src/components/views/settings/tabs/user/InviteRulesAccountSettings.tsx b/src/components/views/settings/tabs/user/InviteRulesAccountSettings.tsx
new file mode 100644
index 0000000000..715da57346
--- /dev/null
+++ b/src/components/views/settings/tabs/user/InviteRulesAccountSettings.tsx
@@ -0,0 +1,78 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React, { type ChangeEvent, type FC, useCallback, useState } from "react";
+import { Form, SettingsToggleInput } from "@vector-im/compound-web";
+import { logger } from "matrix-js-sdk/src/logger";
+
+import { _t } from "../../../../../languageHandler";
+import { useSettingValue } from "../../../../../hooks/useSettings";
+import SettingsStore from "../../../../../settings/SettingsStore";
+import { SettingLevel } from "../../../../../settings/SettingLevel";
+
+/**
+ * A settings component which allows the user to enable/disable invite blocking.
+ *
+ * Uses whichever of MSC4155 and MSC4380 is available on the server; if neither is available, the toggle is disabled. If
+ * both are available, the toggle will use MSC4380 to block invites.
+ */
+export const InviteRulesAccountSetting: FC = () => {
+    const msc4155Rules = useSettingValue("inviteRules");
+    const msc4380BlockInvites = useSettingValue("blockInvites");
+
+    const msc4155Disabled = SettingsStore.disabledMessage("inviteRules");
+    const msc4380Disabled = SettingsStore.disabledMessage("blockInvites");
+
+    const [busy, setBusy] = useState(false);
+
+    const onChange = useCallback(
+        async (e: ChangeEvent<HTMLInputElement>) => {
+            try {
+                setBusy(true);
+                if (e.target.checked) {
+                    // When allowing invites, clear the block setting on both bits of account data.
+                    await SettingsStore.setValue("blockInvites", null, SettingLevel.ACCOUNT, false);
+                    await SettingsStore.setValue("inviteRules", null, SettingLevel.ACCOUNT, { allBlocked: false });
+                } else {
+                    // When blocking invites, prefer MSC4380 over MSC4155.
+                    if (!msc4380Disabled) {
+                        await SettingsStore.setValue("blockInvites", null, SettingLevel.ACCOUNT, true);
+                    } else if (!msc4155Disabled) {
+                        await SettingsStore.setValue("inviteRules", null, SettingLevel.ACCOUNT, { allBlocked: true });
+                    }
+                }
+            } catch (ex) {
+                logger.error(`Unable to set invite rules`, ex);
+            } finally {
+                setBusy(false);
+            }
+        },
+        [msc4155Disabled, msc4380Disabled, setBusy],
+    );
+
+    const disabledMessage = msc4155Disabled && msc4380Disabled;
+    const invitesBlocked = (!msc4155Disabled && msc4155Rules.allBlocked) || (!msc4380Disabled && msc4380BlockInvites);
+    return (
+        <Form.Root
+            className="mx_MediaPreviewAccountSetting_Form"
+            onSubmit={(evt) => {
+                evt.preventDefault();
+                evt.stopPropagation();
+            }}
+        >
+            <SettingsToggleInput
+                name="invite_controls"
+                label={_t("settings|invite_controls|default_label")}
+                checked={!invitesBlocked}
+                onChange={onChange}
+                className="mx_MediaPreviewAccountSetting_ToggleSwitch"
+                disabled={!!disabledMessage || busy}
+                disabledMessage={disabledMessage}
+            />
+        </Form.Root>
+    );
+};
diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx b/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx
index 622343b287..85d41cbf0d 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 import React, { type JSX } from "react";
 import { sortBy } from "lodash";
 import { type EmptyObject } from "matrix-js-sdk/src/matrix";
+import { Form } from "@vector-im/compound-web";
 
 import { _t } from "../../../../../languageHandler";
 import SettingsStore from "../../../../../settings/SettingsStore";
@@ -106,37 +107,44 @@ export default class LabsUserSettingsTab extends React.Component<EmptyObject> {
 
         return (
             <SettingsTab>
-                <SettingsSection heading={_t("labs|beta_section")}>
-                    <SettingsSubsectionText>
-                        {_t("labs|beta_description", { brand: SdkConfig.get("brand") })}
-                    </SettingsSubsectionText>
-                    {betaSection}
-                </SettingsSection>
-
-                {labsSections && (
-                    <SettingsSection heading={_t("labs|experimental_section")}>
+                <Form.Root
+                    onSubmit={(evt) => {
+                        evt.preventDefault();
+                        evt.stopPropagation();
+                    }}
+                >
+                    <SettingsSection heading={_t("labs|beta_section")}>
                         <SettingsSubsectionText>
-                            {_t(
-                                "labs|experimental_description",
-                                {},
-                                {
-                                    a: (sub) => {
-                                        return (
-                                            <a
-                                                href="https://github.com/vector-im/element-web/blob/develop/docs/labs.md"
-                                                rel="noreferrer noopener"
-                                                target="_blank"
-                                            >
-                                                {sub}
-                                            </a>
-                                        );
-                                    },
-                                },
-                            )}
+                            {_t("labs|beta_description", { brand: SdkConfig.get("brand") })}
                         </SettingsSubsectionText>
-                        {labsSections}
+                        {betaSection}
                     </SettingsSection>
-                )}
+
+                    {labsSections && (
+                        <SettingsSection heading={_t("labs|experimental_section")}>
+                            <SettingsSubsectionText>
+                                {_t(
+                                    "labs|experimental_description",
+                                    {},
+                                    {
+                                        a: (sub) => {
+                                            return (
+                                                <a
+                                                    href="https://github.com/vector-im/element-web/blob/develop/docs/labs.md"
+                                                    rel="noreferrer noopener"
+                                                    target="_blank"
+                                                >
+                                                    {sub}
+                                                </a>
+                                            );
+                                        },
+                                    },
+                                )}
+                            </SettingsSubsectionText>
+                            {labsSections}
+                        </SettingsSection>
+                    )}
+                </Form.Root>
             </SettingsTab>
         );
     }
diff --git a/src/components/views/settings/tabs/user/MediaPreviewAccountSettings.tsx b/src/components/views/settings/tabs/user/MediaPreviewAccountSettings.tsx
index f6a2b7cf38..1194f2fd02 100644
--- a/src/components/views/settings/tabs/user/MediaPreviewAccountSettings.tsx
+++ b/src/components/views/settings/tabs/user/MediaPreviewAccountSettings.tsx
@@ -6,9 +6,8 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type ChangeEventHandler, useCallback } from "react";
-import { Field, HelpMessage, InlineField, Label, RadioInput, Root } from "@vector-im/compound-web";
+import { Field, HelpMessage, InlineField, Label, RadioInput, Root, SettingsToggleInput } from "@vector-im/compound-web";
 
-import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import { type MediaPreviewConfig, MediaPreviewValue } from "../../../../../@types/media_preview";
 import { _t } from "../../../../../languageHandler";
 import { useSettingValue } from "../../../../../hooks/useSettings";
@@ -30,12 +29,12 @@ export const MediaPreviewAccountSettings: React.FC<{ roomId?: string }> = ({ roo
         [roomId],
     );
 
-    const avatarOnChange = useCallback(
-        (c: boolean) => {
+    const avatarOnChange = useCallback<ChangeEventHandler<HTMLInputElement>>(
+        (evt) => {
             changeSetting({
                 ...currentMediaPreview,
                 // Switch is inverted. "Hide avatars..."
-                invite_avatars: c ? MediaPreviewValue.Off : MediaPreviewValue.On,
+                invite_avatars: evt.target.checked ? MediaPreviewValue.Off : MediaPreviewValue.On,
             });
         },
         [changeSetting, currentMediaPreview],
@@ -83,10 +82,10 @@ export const MediaPreviewAccountSettings: React.FC<{ roomId?: string }> = ({ roo
     return (
         <Root className="mx_MediaPreviewAccountSetting_Form">
             {!roomId && (
-                <LabelledToggleSwitch
-                    className="mx_MediaPreviewAccountSetting_ToggleSwitch"
+                <SettingsToggleInput
+                    name="hide_avatars"
                     label={_t("settings|media_preview|hide_avatars")}
-                    value={currentMediaPreview.invite_avatars === MediaPreviewValue.Off}
+                    checked={currentMediaPreview.invite_avatars === MediaPreviewValue.Off}
                     onChange={avatarOnChange}
                 />
             )}
diff --git a/src/components/views/settings/tabs/user/NotificationUserSettingsTab.tsx b/src/components/views/settings/tabs/user/NotificationUserSettingsTab.tsx
index b63e790736..6d6c25e122 100644
--- a/src/components/views/settings/tabs/user/NotificationUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/NotificationUserSettingsTab.tsx
@@ -7,6 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
+import { Form } from "@vector-im/compound-web";
 
 import { Features } from "../../../../../settings/Settings";
 import SettingsStore from "../../../../../settings/SettingsStore";
@@ -21,13 +22,20 @@ export default class NotificationUserSettingsTab extends React.Component {
 
         return (
             <SettingsTab>
-                {newNotificationSettingsEnabled ? (
-                    <NotificationSettings2 />
-                ) : (
-                    <SettingsSection>
-                        <Notifications />
-                    </SettingsSection>
-                )}
+                <Form.Root
+                    onSubmit={(evt) => {
+                        evt.preventDefault();
+                        evt.stopPropagation();
+                    }}
+                >
+                    {newNotificationSettingsEnabled ? (
+                        <NotificationSettings2 />
+                    ) : (
+                        <SettingsSection>
+                            <Notifications />
+                        </SettingsSection>
+                    )}
+                </Form.Root>
             </SettingsTab>
         );
     }
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
index fa72cfe28e..cab58ee085 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
@@ -7,7 +7,8 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { type JSX, type ReactElement, useCallback, useEffect, useState } from "react";
+import React, { type ChangeEvent, type JSX, type ReactElement, useCallback, useEffect, useState } from "react";
+import { SettingsToggleInput } from "@vector-im/compound-web";
 
 import { type NonEmptyArray } from "../../../../../@types/common";
 import { _t, getCurrentLanguage } from "../../../../../languageHandler";
@@ -29,10 +30,11 @@ import LanguageDropdown from "../../../elements/LanguageDropdown";
 import PlatformPeg from "../../../../../PlatformPeg";
 import { IS_MAC } from "../../../../../Keyboard";
 import SpellCheckSettings from "../../SpellCheckSettings";
-import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import * as TimezoneHandler from "../../../../../TimezoneHandler";
 import { type BooleanSettingKey } from "../../../../../settings/Settings.tsx";
 import { MediaPreviewAccountSettings } from "./MediaPreviewAccountSettings.tsx";
+import { InviteRulesAccountSetting } from "./InviteRulesAccountSettings.tsx";
+import SettingsDropdown from "../../../elements/SettingsDropdown.tsx";
 
 interface IProps {
     closeSettingsFn(success: boolean): void;
@@ -90,7 +92,8 @@ const SpellCheckSection: React.FC = () => {
         })();
     }, []);
 
-    const onSpellCheckEnabledChange = useCallback((enabled: boolean) => {
+    const onSpellCheckEnabledChange = useCallback((e: ChangeEvent<HTMLInputElement>) => {
+        const enabled = e.target.checked;
         setSpellCheckEnabled(enabled);
         PlatformPeg.get()?.setSpellCheckEnabled(enabled);
     }, []);
@@ -104,10 +107,11 @@ const SpellCheckSection: React.FC = () => {
 
     return (
         <>
-            <LabelledToggleSwitch
+            <SettingsToggleInput
+                name="allow_spellcheck"
                 label={_t("settings|general|allow_spellcheck")}
-                value={Boolean(spellCheckEnabled)}
                 onChange={onSpellCheckEnabledChange}
+                checked={Boolean(spellCheckEnabled)}
             />
             {spellCheckEnabled && spellCheckLanguages !== undefined && !IS_MAC && (
                 <SpellCheckSettings languages={spellCheckLanguages} onLanguagesChange={onSpellCheckLanguagesChange} />
@@ -242,34 +246,51 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
     };
 
     public render(): React.ReactNode {
-        const roomListSettings = PreferencesUserSettingsTab.ROOM_LIST_SETTINGS;
-
         const browserTimezoneLabel: string = _t("settings|preferences|default_timezone", {
             timezone: TimezoneHandler.shortBrowserTimezone(),
         });
 
-        // Always Preprend the default option
+        const newRoomListEnabled = SettingsStore.getValue("feature_new_room_list");
+        const brand = SdkConfig.get().brand;
+
         const timezones = this.state.timezones.map((tz) => {
             return <div key={tz}>{tz}</div>;
         });
+        // Always prepend the default option
         timezones.unshift(<div key="">{browserTimezoneLabel}</div>);
 
         return (
             <SettingsTab data-testid="mx_PreferencesUserSettingsTab">
                 <SettingsSection>
                     {/* The heading string is still 'general' from where it was moved, but this section should become 'general' */}
-                    <SettingsSubsection heading={_t("settings|general|language_section")}>
+                    <SettingsSubsection heading={_t("settings|general|language_section")} formWrap>
                         <LanguageSection />
                         <SpellCheckSection />
                     </SettingsSubsection>
 
-                    {roomListSettings.length > 0 && (
-                        <SettingsSubsection heading={_t("settings|preferences|room_list_heading")}>
-                            {this.renderGroup(roomListSettings)}
+                    {SettingsStore.canSetValue("Electron.autoLaunch", null, SettingLevel.PLATFORM) && (
+                        <SettingsSubsection
+                            heading={_t("settings|preferences|startup_window_behaviour_label")}
+                            formWrap
+                        >
+                            <SettingsDropdown
+                                settingKey="Electron.autoLaunch"
+                                label={_t("settings|start_automatically|label", { brand })}
+                                level={SettingLevel.PLATFORM}
+                                hideIfCannotSet
+                            />
                         </SettingsSubsection>
                     )}
 
-                    <SettingsSubsection heading={_t("common|spaces")}>
+                    <SettingsSubsection heading={_t("settings|preferences|room_list_heading")} formWrap>
+                        {!newRoomListEnabled && this.renderGroup(PreferencesUserSettingsTab.ROOM_LIST_SETTINGS)}
+                        {/* The settings is on device level where the other room list settings are on account level  */}
+                        {newRoomListEnabled && (
+                            <SettingsFlag name="RoomList.showMessagePreview" level={SettingLevel.DEVICE} />
+                        )}
+                    </SettingsSubsection>
+
+                    <SettingsSubsection heading={_t("common|spaces")} formWrap>
                         {this.renderGroup(PreferencesUserSettingsTab.SPACES_SETTINGS, SettingLevel.ACCOUNT)}
                     </SettingsSubsection>
 
@@ -286,11 +307,12 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
                                 ),
                             },
                         )}
+                        formWrap
                     >
                         {this.renderGroup(PreferencesUserSettingsTab.KEYBINDINGS_SETTINGS)}
                     </SettingsSubsection>
 
-                    <SettingsSubsection heading={_t("settings|preferences|time_heading")}>
+                    <SettingsSubsection heading={_t("settings|preferences|time_heading")} formWrap>
                         <div className="mx_SettingsSubsection_dropdown">
                             {_t("settings|preferences|user_timezone")}
                             <Dropdown
@@ -315,35 +337,37 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
                     <SettingsSubsection
                         heading={_t("common|presence")}
                         description={_t("settings|preferences|presence_description")}
+                        formWrap
                     >
                         {this.renderGroup(PreferencesUserSettingsTab.PRESENCE_SETTINGS)}
                     </SettingsSubsection>
 
-                    <SettingsSubsection heading={_t("settings|preferences|composer_heading")}>
+                    <SettingsSubsection heading={_t("settings|preferences|composer_heading")} formWrap>
                         {this.renderGroup(PreferencesUserSettingsTab.COMPOSER_SETTINGS)}
                     </SettingsSubsection>
 
-                    <SettingsSubsection heading={_t("settings|preferences|code_blocks_heading")}>
+                    <SettingsSubsection heading={_t("settings|preferences|code_blocks_heading")} formWrap>
                         {this.renderGroup(PreferencesUserSettingsTab.CODE_BLOCKS_SETTINGS)}
                     </SettingsSubsection>
 
-                    <SettingsSubsection heading={_t("settings|preferences|media_heading")}>
+                    <SettingsSubsection heading={_t("settings|preferences|media_heading")} formWrap>
                         {this.renderGroup(PreferencesUserSettingsTab.IMAGES_AND_VIDEOS_SETTINGS)}
                     </SettingsSubsection>
 
-                    <SettingsSubsection heading={_t("common|timeline")}>
+                    <SettingsSubsection heading={_t("common|timeline")} formWrap>
                         {this.renderGroup(PreferencesUserSettingsTab.TIMELINE_SETTINGS)}
                     </SettingsSubsection>
 
                     <SettingsSubsection heading={_t("common|moderation_and_safety")} legacy={false}>
                         <MediaPreviewAccountSettings />
+                        <InviteRulesAccountSetting />
                     </SettingsSubsection>
 
-                    <SettingsSubsection heading={_t("settings|preferences|room_directory_heading")}>
+                    <SettingsSubsection heading={_t("settings|preferences|room_directory_heading")} formWrap>
                         {this.renderGroup(PreferencesUserSettingsTab.ROOM_DIRECTORY_SETTINGS)}
                     </SettingsSubsection>
 
-                    <SettingsSubsection heading={_t("common|general")} stretchContent>
+                    <SettingsSubsection heading={_t("common|general")} stretchContent formWrap>
                         {this.renderGroup(PreferencesUserSettingsTab.GENERAL_SETTINGS)}
 
                         <SettingsFlag name="Electron.showTrayIcon" level={SettingLevel.PLATFORM} hideIfCannotSet />
@@ -352,11 +376,16 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
                             level={SettingLevel.PLATFORM}
                             hideIfCannotSet
                             label={_t("settings|preferences|Electron.enableHardwareAcceleration", {
-                                appName: SdkConfig.get().brand,
+                                appName: brand,
                             })}
                         />
+                        <SettingsFlag
+                            name="Electron.enableContentProtection"
+                            level={SettingLevel.PLATFORM}
+                            hideIfCannotSet
+                            label={_t("settings|preferences|Electron.enableContentProtection")}
+                        />
                         <SettingsFlag name="Electron.alwaysShowMenuBar" level={SettingLevel.PLATFORM} hideIfCannotSet />
-                        <SettingsFlag name="Electron.autoLaunch" level={SettingLevel.PLATFORM} hideIfCannotSet />
                         <SettingsFlag name="Electron.warnBeforeExit" level={SettingLevel.PLATFORM} hideIfCannotSet />
 
                         <Field
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
index 1c85aada34..d301f9daab 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
@@ -11,6 +11,8 @@ import { sleep } from "matrix-js-sdk/src/utils";
 import { type Room, RoomEvent, type IServerVersions } from "matrix-js-sdk/src/matrix";
 import { KnownMembership, type Membership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
+import { WarningIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
+import { Form } from "@vector-im/compound-web";
 
 import { _t } from "../../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
@@ -305,6 +307,7 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
         if (!privateShouldBeEncrypted(MatrixClientPeg.safeGet())) {
             warning = (
                 <div className="mx_SecurityUserSettingsTab_warning">
+                    <WarningIcon />
                     {_t("settings|security|e2ee_default_disabled_warning")}
                 </div>
             );
@@ -319,7 +322,13 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
                 });
             };
             posthogSection = (
-                <>
+                <Form.Root
+                    onSubmit={(evt) => {
+                        evt.preventDefault();
+                        evt.stopPropagation();
+                    }}
+                    className="mx_SecurityUserSettingsTab_posthogSection"
+                >
                     <SettingsSubsection
                         heading={_t("common|analytics")}
                         description={_t("settings|security|analytics_description")}
@@ -334,7 +343,7 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
                     <SettingsSubsection heading={_t("settings|sessions|title")}>
                         <SettingsFlag name="deviceClientInformationOptIn" level={SettingLevel.ACCOUNT} />
                     </SettingsSubsection>
-                </>
+                </Form.Root>
             );
         }
 
diff --git a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx
index 84b4ec778f..b1b47788a5 100644
--- a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx
@@ -7,10 +7,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { type JSX, type ReactNode } from "react";
+import React, { type ChangeEventHandler, type JSX, type ReactNode } from "react";
 import { logger } from "matrix-js-sdk/src/logger";
 import { FALLBACK_ICE_SERVER } from "matrix-js-sdk/src/webrtc/call";
 import { type EmptyObject } from "matrix-js-sdk/src/matrix";
+import { Form, SettingsToggleInput } from "@vector-im/compound-web";
 
 import { _t } from "../../../../../languageHandler";
 import MediaDeviceHandler, { type IMediaDevices, MediaDeviceKindEnum } from "../../../../../MediaDeviceHandler";
@@ -18,7 +19,6 @@ import Field from "../../../elements/Field";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import { SettingLevel } from "../../../../../settings/SettingLevel";
 import SettingsFlag from "../../../elements/SettingsFlag";
-import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import { requestMediaPermissions } from "../../../../../utils/media/requestMediaPermissions";
 import SettingsTab from "../SettingsTab";
 import { SettingsSection } from "../../shared/SettingsSection";
@@ -140,6 +140,24 @@ export default class VoiceUserSettingsTab extends React.Component<EmptyObject, I
         );
     }
 
+    private onAutoGainChanged: ChangeEventHandler<HTMLInputElement> = async (event) => {
+        const enable = event.target.checked;
+        await MediaDeviceHandler.setAudioAutoGainControl(enable);
+        this.setState({ audioAutoGainControl: MediaDeviceHandler.getAudioAutoGainControl() });
+    };
+
+    private onNoiseSuppressionChanged: ChangeEventHandler<HTMLInputElement> = async (event) => {
+        const enable = event.target.checked;
+        await MediaDeviceHandler.setAudioNoiseSuppression(enable);
+        this.setState({ audioNoiseSuppression: MediaDeviceHandler.getAudioNoiseSuppression() });
+    };
+
+    private onEchoCancellationChanged: ChangeEventHandler<HTMLInputElement> = async (event) => {
+        const enable = event.target.checked;
+        await MediaDeviceHandler.setAudioEchoCancellation(enable);
+        this.setState({ audioEchoCancellation: MediaDeviceHandler.getAudioEchoCancellation() });
+    };
+
     public render(): ReactNode {
         let requestButton: ReactNode | undefined;
         let speakerDropdown: ReactNode | undefined;
@@ -169,64 +187,62 @@ export default class VoiceUserSettingsTab extends React.Component<EmptyObject, I
 
         return (
             <SettingsTab>
-                <SettingsSection>
-                    {requestButton}
-                    <SettingsSubsection heading={_t("settings|voip|voice_section")} stretchContent>
-                        {speakerDropdown}
-                        {microphoneDropdown}
-                        <LabelledToggleSwitch
-                            value={this.state.audioAutoGainControl}
-                            onChange={async (v): Promise<void> => {
-                                await MediaDeviceHandler.setAudioAutoGainControl(v);
-                                this.setState({ audioAutoGainControl: MediaDeviceHandler.getAudioAutoGainControl() });
-                            }}
-                            label={_t("settings|voip|voice_agc")}
-                            data-testid="voice-auto-gain"
-                        />
-                    </SettingsSubsection>
-                    <SettingsSubsection heading={_t("settings|voip|video_section")} stretchContent>
-                        {webcamDropdown}
-                        <SettingsFlag name="VideoView.flipVideoHorizontally" level={SettingLevel.ACCOUNT} />
-                    </SettingsSubsection>
-                </SettingsSection>
+                <Form.Root
+                    onSubmit={(evt) => {
+                        evt.preventDefault();
+                        evt.stopPropagation();
+                    }}
+                >
+                    <SettingsSection>
+                        {requestButton}
+                        <SettingsSubsection heading={_t("settings|voip|voice_section")} stretchContent>
+                            {speakerDropdown}
+                            {microphoneDropdown}
+                            <SettingsToggleInput
+                                name="voice-auto-gain"
+                                label={_t("settings|voip|voice_agc")}
+                                checked={this.state.audioAutoGainControl}
+                                onChange={this.onAutoGainChanged}
+                            />
+                        </SettingsSubsection>
+                        <SettingsSubsection heading={_t("settings|voip|video_section")} stretchContent>
+                            {webcamDropdown}
+                            <SettingsFlag name="VideoView.flipVideoHorizontally" level={SettingLevel.ACCOUNT} />
+                        </SettingsSubsection>
+                    </SettingsSection>
 
-                <SettingsSection heading={_t("common|advanced")}>
-                    <SettingsSubsection heading={_t("settings|voip|voice_processing")}>
-                        <LabelledToggleSwitch
-                            value={this.state.audioNoiseSuppression}
-                            onChange={async (v): Promise<void> => {
-                                await MediaDeviceHandler.setAudioNoiseSuppression(v);
-                                this.setState({ audioNoiseSuppression: MediaDeviceHandler.getAudioNoiseSuppression() });
-                            }}
-                            label={_t("settings|voip|noise_suppression")}
-                            data-testid="voice-noise-suppression"
-                        />
-                        <LabelledToggleSwitch
-                            value={this.state.audioEchoCancellation}
-                            onChange={async (v): Promise<void> => {
-                                await MediaDeviceHandler.setAudioEchoCancellation(v);
-                                this.setState({ audioEchoCancellation: MediaDeviceHandler.getAudioEchoCancellation() });
-                            }}
-                            label={_t("settings|voip|echo_cancellation")}
-                            data-testid="voice-echo-cancellation"
-                        />
-                    </SettingsSubsection>
-                    <SettingsSubsection heading={_t("settings|voip|connection_section")}>
-                        <SettingsFlag
-                            name="webRtcAllowPeerToPeer"
-                            level={SettingLevel.DEVICE}
-                            onChange={this.changeWebRtcMethod}
-                        />
-                        <SettingsFlag
-                            name="fallbackICEServerAllowed"
-                            label={_t("settings|voip|enable_fallback_ice_server", {
-                                server: new URL(FALLBACK_ICE_SERVER).pathname,
-                            })}
-                            level={SettingLevel.DEVICE}
-                            hideIfCannotSet
-                        />
-                    </SettingsSubsection>
-                </SettingsSection>
+                    <SettingsSection heading={_t("common|advanced")}>
+                        <SettingsSubsection heading={_t("settings|voip|voice_processing")}>
+                            <SettingsToggleInput
+                                name="voice-noise-suppression"
+                                label={_t("settings|voip|noise_suppression")}
+                                checked={this.state.audioNoiseSuppression}
+                                onChange={this.onNoiseSuppressionChanged}
+                            />
+                            <SettingsToggleInput
+                                name="voice-echo-cancellation"
+                                label={_t("settings|voip|echo_cancellation")}
+                                checked={this.state.audioEchoCancellation}
+                                onChange={this.onEchoCancellationChanged}
+                            />
+                        </SettingsSubsection>
+                        <SettingsSubsection heading={_t("settings|voip|connection_section")}>
+                            <SettingsFlag
+                                name="webRtcAllowPeerToPeer"
+                                level={SettingLevel.DEVICE}
+                                onChange={this.changeWebRtcMethod}
+                            />
+                            <SettingsFlag
+                                name="fallbackICEServerAllowed"
+                                label={_t("settings|voip|enable_fallback_ice_server", {
+                                    server: new URL(FALLBACK_ICE_SERVER).pathname,
+                                })}
+                                level={SettingLevel.DEVICE}
+                                hideIfCannotSet
+                            />
+                        </SettingsSubsection>
+                    </SettingsSection>
+                </Form.Root>
             </SettingsTab>
         );
     }
diff --git a/src/components/views/spaces/QuickSettingsButton.tsx b/src/components/views/spaces/QuickSettingsButton.tsx
index 7132032a18..1bd3c49291 100644
--- a/src/components/views/spaces/QuickSettingsButton.tsx
+++ b/src/components/views/spaces/QuickSettingsButton.tsx
@@ -13,7 +13,9 @@ import {
     UserProfileSolidIcon,
     FavouriteSolidIcon,
     PinSolidIcon,
+    SettingsSolidIcon,
 } from "@vector-im/compound-design-tokens/assets/web/icons";
+import { IconButton, Text, Tooltip } from "@vector-im/compound-web";
 
 import { _t } from "../../../languageHandler";
 import ContextMenu, { alwaysAboveRightOf, ChevronFace, useContextMenu } from "../../structures/ContextMenu";
@@ -33,7 +35,7 @@ import { SdkContextClass } from "../../../contexts/SDKContext";
 const QuickSettingsButton: React.FC<{
     isPanelCollapsed: boolean;
 }> = ({ isPanelCollapsed = false }) => {
-    const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu<HTMLDivElement>();
+    const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu<HTMLButtonElement>();
 
     const { [MetaSpace.Favourites]: favouritesEnabled, [MetaSpace.People]: peopleEnabled } =
         useSettingValue("Spaces.enabledMetaSpaces");
@@ -135,19 +137,38 @@ const QuickSettingsButton: React.FC<{
         );
     }
 
+    let button = (
+        <IconButton
+            aria-label={_t("quick_settings|title")}
+            className={classNames("mx_QuickSettingsButton", { expanded: !isPanelCollapsed })}
+            onClick={openMenu}
+            title={isPanelCollapsed ? _t("quick_settings|title") : undefined}
+            ref={handle}
+            aria-expanded={!isPanelCollapsed}
+        >
+            <>
+                <SettingsSolidIcon />
+                {/* This is dirty, but we need to add the label to the indicator icon */}
+                {!isPanelCollapsed && (
+                    <Text className="mx_QuickSettingsButton_label" as="span" size="md" title={_t("common|settings")}>
+                        {_t("common|settings")}
+                    </Text>
+                )}
+            </>
+        </IconButton>
+    );
+
+    if (isPanelCollapsed) {
+        button = (
+            <Tooltip label={_t("quick_settings|title")} placement="right">
+                {button}
+            </Tooltip>
+        );
+    }
+
     return (
         <>
-            <AccessibleButton
-                className={classNames("mx_QuickSettingsButton", { expanded: !isPanelCollapsed })}
-                onClick={openMenu}
-                aria-label={_t("quick_settings|title")}
-                title={isPanelCollapsed ? _t("quick_settings|title") : undefined}
-                ref={handle}
-                aria-expanded={!isPanelCollapsed}
-            >
-                {!isPanelCollapsed ? _t("common|settings") : null}
-            </AccessibleButton>
-
+            {button}
             {contextMenu}
         </>
     );
diff --git a/src/components/views/spaces/SpaceBasicSettings.tsx b/src/components/views/spaces/SpaceBasicSettings.tsx
index fb841e9360..f00ab96521 100644
--- a/src/components/views/spaces/SpaceBasicSettings.tsx
+++ b/src/components/views/spaces/SpaceBasicSettings.tsx
@@ -7,6 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type ChangeEvent, useRef, useState } from "react";
+import { TakePhotoSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
@@ -71,7 +72,9 @@ export const SpaceAvatar: React.FC<Pick<IProps, "avatarUrl" | "avatarDisabled" |
                     <AccessibleButton
                         className="mx_SpaceBasicSettings_avatar"
                         onClick={() => avatarUploadRef.current?.click()}
-                    />
+                    >
+                        <TakePhotoSolidIcon />
+                    </AccessibleButton>
                     <AccessibleButton
                         onClick={() => avatarUploadRef.current?.click()}
                         kind="link"
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index fd5b0cb1c0..bed090b164 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -18,7 +18,6 @@ import React, {
     type ReactNode,
     useEffect,
 } from "react";
-import classNames from "classnames";
 import {
     RoomType,
     HistoryVisibility,
@@ -28,6 +27,7 @@ import {
     type ICreateRoomOpts,
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
+import { LockSolidIcon, PublicIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import ContextMenu, { ChevronFace } from "../../structures/ContextMenu";
@@ -45,6 +45,9 @@ import defaultDispatcher from "../../../dispatcher/dispatcher";
 import { Action } from "../../../dispatcher/actions";
 import { Filter } from "../dialogs/spotlight/Filter";
 import { type OpenSpotlightPayload } from "../../../dispatcher/payloads/OpenSpotlightPayload.ts";
+import { useSettingValue } from "../../../hooks/useSettings.ts";
+import { UIFeature } from "../../../settings/UIFeature.ts";
+import SpacePillButton from "../../structures/SpacePillButton.tsx";
 
 export const createSpace = async (
     client: MatrixClient,
@@ -84,20 +87,6 @@ export const createSpace = async (
     });
 };
 
-const SpaceCreateMenuType: React.FC<{
-    title: string;
-    description: string;
-    className: string;
-    onClick(): void;
-}> = ({ title, description, className, onClick }) => {
-    return (
-        <AccessibleButton className={classNames("mx_SpaceCreateMenuType", className)} onClick={onClick}>
-            {title}
-            <div>{description}</div>
-        </AccessibleButton>
-    );
-};
-
 const spaceNameValidator = withValidation({
     rules: [
         {
@@ -212,7 +201,10 @@ const SpaceCreateMenu: React.FC<{
     onFinished(): void;
 }> = ({ onFinished }) => {
     const cli = useMatrixClientContext();
-    const [visibility, setVisibility] = useState<Visibility | null>(null);
+    const settingAllowPublicSpaces = useSettingValue(UIFeature.AllowCreatingPublicSpaces);
+    const [visibility, setVisibility] = useState<Visibility | null>(
+        settingAllowPublicSpaces === false ? Visibility.Private : null,
+    );
     const [busy, setBusy] = useState<boolean>(false);
 
     const [name, setName] = useState("");
@@ -280,16 +272,16 @@ const SpaceCreateMenu: React.FC<{
                 <h2>{_t("create_space|label")}</h2>
                 <p>{_t("create_space|explainer")}</p>
 
-                <SpaceCreateMenuType
+                <SpacePillButton
+                    icon={<PublicIcon />}
                     title={_t("common|public")}
                     description={_t("create_space|public_description")}
-                    className="mx_SpaceCreateMenuType_public"
                     onClick={() => setVisibility(Visibility.Public)}
                 />
-                <SpaceCreateMenuType
+                <SpacePillButton
+                    icon={<LockSolidIcon />}
                     title={_t("common|private")}
                     description={_t("create_space|private_description")}
-                    className="mx_SpaceCreateMenuType_private"
                     onClick={() => setVisibility(Visibility.Private)}
                 />
 
@@ -303,16 +295,20 @@ const SpaceCreateMenu: React.FC<{
     } else {
         body = (
             <React.Fragment>
-                <AccessibleButton
-                    className="mx_SpaceCreateMenu_back"
-                    onClick={() => setVisibility(null)}
-                    title={_t("action|go_back")}
-                />
+                {settingAllowPublicSpaces && (
+                    <AccessibleButton
+                        className="mx_SpaceCreateMenu_back"
+                        onClick={() => setVisibility(null)}
+                        title={_t("action|go_back")}
+                    />
+                )}
 
                 <h2>
                     {visibility === Visibility.Public
                         ? _t("create_space|public_heading")
-                        : _t("create_space|private_heading")}
+                        : settingAllowPublicSpaces
+                          ? _t("create_space|private_heading")
+                          : _t("create_space|private_only_heading")}
                 </h2>
                 <p>
                     {_t("create_space|add_details_prompt")} {_t("create_space|add_details_prompt_2")}
diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx
index 9f0d534767..7a51cfe0c6 100644
--- a/src/components/views/spaces/SpacePanel.tsx
+++ b/src/components/views/spaces/SpacePanel.tsx
@@ -22,6 +22,15 @@ import React, {
 import { DragDropContext, Draggable, Droppable, type DroppableProvidedProps } from "react-beautiful-dnd";
 import classNames from "classnames";
 import { type Room } from "matrix-js-sdk/src/matrix";
+import {
+    FavouriteSolidIcon,
+    HomeSolidIcon,
+    RoomIcon,
+    VideoCallSolidIcon,
+    UserProfileSolidIcon,
+    PlusIcon,
+    ChevronRightIcon,
+} from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
 import { useContextMenu } from "../../structures/ContextMenu";
@@ -68,6 +77,8 @@ import { ThreadsActivityCentre } from "./threads-activity-centre/";
 import AccessibleButton from "../elements/AccessibleButton";
 import { Landmark, LandmarkNavigation } from "../../../accessibility/LandmarkNavigation";
 import { KeyboardShortcut } from "../settings/KeyboardShortcut";
+import { ModuleApi } from "../../../modules/Api.ts";
+import { useModuleSpacePanelItems } from "../../../modules/ExtrasApi.ts";
 
 const useSpaces = (): [Room[], MetaSpace[], Room[], SpaceKey] => {
     const invites = useEventEmitterState<Room[]>(SpaceStore.instance, UPDATE_INVITED_SPACES, () => {
@@ -96,7 +107,6 @@ export const HomeButtonContextMenu: React.FC<ComponentProps<typeof SpaceContextM
             {!hideHeader && <div className="mx_SpacePanel_contextMenu_header">{_t("common|home")}</div>}
             <IconizedContextMenuOptionList first>
                 <IconizedContextMenuCheckbox
-                    iconClassName="mx_SpacePanel_noIcon"
                     label={_t("settings|sidebar|metaspaces_home_all_rooms")}
                     active={allRoomsInHome}
                     onClick={() => {
@@ -112,6 +122,7 @@ export const HomeButtonContextMenu: React.FC<ComponentProps<typeof SpaceContextM
 interface IMetaSpaceButtonProps extends ComponentProps<typeof SpaceButton> {
     selected: boolean;
     isPanelCollapsed: boolean;
+    icon: JSX.Element;
 }
 
 type MetaSpaceButtonProps = Pick<IMetaSpaceButtonProps, "selected" | "isPanelCollapsed">;
@@ -150,7 +161,6 @@ const HomeButton: React.FC<MetaSpaceButtonProps> = ({ selected, isPanelCollapsed
     return (
         <MetaSpaceButton
             spaceKey={MetaSpace.Home}
-            className="mx_SpaceButton_home"
             selected={selected}
             isPanelCollapsed={isPanelCollapsed}
             label={getMetaSpaceName(MetaSpace.Home, allRoomsInHome)}
@@ -158,6 +168,7 @@ const HomeButton: React.FC<MetaSpaceButtonProps> = ({ selected, isPanelCollapsed
             ContextMenuComponent={HomeButtonContextMenu}
             contextMenuTooltip={_t("common|options")}
             size="32px"
+            icon={<HomeSolidIcon />}
         />
     );
 };
@@ -166,12 +177,12 @@ const FavouritesButton: React.FC<MetaSpaceButtonProps> = ({ selected, isPanelCol
     return (
         <MetaSpaceButton
             spaceKey={MetaSpace.Favourites}
-            className="mx_SpaceButton_favourites"
             selected={selected}
             isPanelCollapsed={isPanelCollapsed}
             label={getMetaSpaceName(MetaSpace.Favourites)}
             notificationState={SpaceStore.instance.getNotificationState(MetaSpace.Favourites)}
             size="32px"
+            icon={<FavouriteSolidIcon />}
         />
     );
 };
@@ -180,12 +191,12 @@ const PeopleButton: React.FC<MetaSpaceButtonProps> = ({ selected, isPanelCollaps
     return (
         <MetaSpaceButton
             spaceKey={MetaSpace.People}
-            className="mx_SpaceButton_people"
             selected={selected}
             isPanelCollapsed={isPanelCollapsed}
             label={getMetaSpaceName(MetaSpace.People)}
             notificationState={SpaceStore.instance.getNotificationState(MetaSpace.People)}
             size="32px"
+            icon={<UserProfileSolidIcon />}
         />
     );
 };
@@ -194,12 +205,12 @@ const OrphansButton: React.FC<MetaSpaceButtonProps> = ({ selected, isPanelCollap
     return (
         <MetaSpaceButton
             spaceKey={MetaSpace.Orphans}
-            className="mx_SpaceButton_orphans"
             selected={selected}
             isPanelCollapsed={isPanelCollapsed}
             label={getMetaSpaceName(MetaSpace.Orphans)}
             notificationState={SpaceStore.instance.getNotificationState(MetaSpace.Orphans)}
             size="32px"
+            icon={<RoomIcon />}
         />
     );
 };
@@ -208,12 +219,12 @@ const VideoRoomsButton: React.FC<MetaSpaceButtonProps> = ({ selected, isPanelCol
     return (
         <MetaSpaceButton
             spaceKey={MetaSpace.VideoRooms}
-            className="mx_SpaceButton_videoRooms"
             selected={selected}
             isPanelCollapsed={isPanelCollapsed}
             label={getMetaSpaceName(MetaSpace.VideoRooms)}
             notificationState={SpaceStore.instance.getNotificationState(MetaSpace.VideoRooms)}
             size="32px"
+            icon={<VideoCallSolidIcon />}
         />
     );
 };
@@ -260,6 +271,7 @@ const CreateSpaceButton: React.FC<Pick<IInnerSpacePanelProps, "isPanelCollapsed"
                 isNarrow={isPanelCollapsed}
                 innerRef={handle}
                 size="32px"
+                icon={<PlusIcon />}
             />
 
             {contextMenu}
@@ -289,6 +301,8 @@ const InnerSpacePanel = React.memo<IInnerSpacePanelProps>(
         const [invites, metaSpaces, actualSpaces, activeSpace] = useSpaces();
         const activeSpaces = activeSpace ? [activeSpace] : [];
 
+        const moduleSpaceItems = useModuleSpacePanelItems(ModuleApi.instance.extras);
+
         const metaSpacesSection = metaSpaces
             .filter((key) => !(key === MetaSpace.VideoRooms && !SettingsStore.getValue("feature_video_rooms")))
             .map((key) => {
@@ -340,6 +354,27 @@ const InnerSpacePanel = React.memo<IInnerSpacePanelProps>(
                     </Draggable>
                 ))}
                 {children}
+                {moduleSpaceItems.map((item) => (
+                    <li
+                        key={item.spaceKey}
+                        className={classNames("mx_SpaceItem", {
+                            collapsed: isPanelCollapsed,
+                        })}
+                        role="treeitem"
+                        aria-selected={false} // TODO
+                    >
+                        <SpaceButton
+                            {...item}
+                            isNarrow={isPanelCollapsed}
+                            size="32px"
+                            selected={activeSpace === item.spaceKey}
+                            onClick={() => {
+                                SpaceStore.instance.setActiveSpace(item.spaceKey);
+                                item.onSelected?.();
+                            }}
+                        />
+                    </li>
+                ))}
                 {shouldShowComponent(UIComponent.CreateSpaces) && (
                     <CreateSpaceButton isPanelCollapsed={isPanelCollapsed} setPanelCollapsed={setPanelCollapsed} />
                 )}
@@ -405,7 +440,9 @@ const SpacePanel: React.FC = () => {
                     >
                         <UserMenu isPanelCollapsed={isPanelCollapsed}>
                             <AccessibleButton
-                                className={classNames("mx_SpacePanel_toggleCollapse", { expanded: !isPanelCollapsed })}
+                                className={classNames("mx_SpacePanel_toggleCollapse", {
+                                    expanded: !isPanelCollapsed,
+                                })}
                                 onClick={() => setPanelCollapsed(!isPanelCollapsed)}
                                 title={isPanelCollapsed ? _t("action|expand") : _t("action|collapse")}
                                 caption={
@@ -414,7 +451,9 @@ const SpacePanel: React.FC = () => {
                                         className="mx_SpacePanel_Tooltip_KeyboardShortcut"
                                     />
                                 }
-                            />
+                            >
+                                <ChevronRightIcon />
+                            </AccessibleButton>
                         </UserMenu>
                         <Droppable droppableId="top-level-spaces">
                             {(provided, snapshot) => (
diff --git a/src/components/views/spaces/SpacePublicShare.tsx b/src/components/views/spaces/SpacePublicShare.tsx
index c3a9fae562..18345ab230 100644
--- a/src/components/views/spaces/SpacePublicShare.tsx
+++ b/src/components/views/spaces/SpacePublicShare.tsx
@@ -9,15 +9,16 @@ Please see LICENSE files in the repository root for full details.
 import React, { useState } from "react";
 import { type Room } from "matrix-js-sdk/src/matrix";
 import { sleep } from "matrix-js-sdk/src/utils";
+import { LinkIcon, UserAddIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../../../languageHandler";
-import AccessibleButton from "../elements/AccessibleButton";
 import { copyPlaintext } from "../../../utils/strings";
 import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
 import { showRoomInviteDialog } from "../../../RoomInvite";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { shouldShowComponent } from "../../../customisations/helpers/UIComponents";
 import { UIComponent } from "../../../settings/UIFeature";
+import SpacePillButton from "../../structures/SpacePillButton.tsx";
 
 interface IProps {
     space: Room;
@@ -29,8 +30,10 @@ const SpacePublicShare: React.FC<IProps> = ({ space, onFinished }) => {
 
     return (
         <div className="mx_SpacePublicShare">
-            <AccessibleButton
-                className="mx_SpacePublicShare_shareButton"
+            <SpacePillButton
+                icon={<LinkIcon />}
+                title={_t("space|invite_link")}
+                description={copiedText}
                 onClick={async (): Promise<void> => {
                     const permalinkCreator = new RoomPermalinkCreator(space);
                     permalinkCreator.load();
@@ -43,22 +46,18 @@ const SpacePublicShare: React.FC<IProps> = ({ space, onFinished }) => {
                         setCopiedText(_t("action|click_to_copy"));
                     }
                 }}
-            >
-                {_t("space|invite_link")}
-                <div>{copiedText}</div>
-            </AccessibleButton>
+            />
             {space.canInvite(MatrixClientPeg.safeGet().getSafeUserId()) &&
             shouldShowComponent(UIComponent.InviteUsers) ? (
-                <AccessibleButton
-                    className="mx_SpacePublicShare_inviteButton"
+                <SpacePillButton
+                    icon={<UserAddIcon />}
+                    title={_t("space|invite")}
+                    description={_t("space|invite_description")}
                     onClick={() => {
                         if (onFinished) onFinished();
                         showRoomInviteDialog(space.roomId);
                     }}
-                >
-                    {_t("space|invite")}
-                    <div>{_t("space|invite_description")}</div>
-                </AccessibleButton>
+                />
             ) : null}
         </div>
     );
diff --git a/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx b/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
index e456070cce..a148608790 100644
--- a/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
+++ b/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { type JSX, useState } from "react";
+import React, { type ChangeEventHandler, type JSX, useCallback, useState } from "react";
 import {
     type Room,
     EventType,
@@ -15,12 +15,12 @@ import {
     JoinRule,
     type MatrixClient,
 } from "matrix-js-sdk/src/matrix";
+import { Form, SettingsToggleInput } from "@vector-im/compound-web";
 
 import { _t } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
 import AliasSettings from "../room_settings/AliasSettings";
 import { useStateToggle } from "../../../hooks/useStateToggle";
-import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import { useLocalEcho } from "../../../hooks/useLocalEcho";
 import JoinRuleSettings from "../settings/JoinRuleSettings";
 import { useRoomState } from "../../../hooks/useRoomState";
@@ -50,6 +50,7 @@ const SpaceSettingsVisibilityTab: React.FC<IProps> = ({ matrixClient: cli, space
     const userId = cli.getUserId()!;
 
     const joinRule = useRoomState(space, (state) => state.getJoinRule());
+
     const [guestAccessEnabled, setGuestAccessEnabled] = useLocalEcho<boolean>(
         () =>
             space.currentState.getStateEvents(EventType.RoomGuestAccess, "")?.getContent()?.guest_access ===
@@ -65,6 +66,10 @@ const SpaceSettingsVisibilityTab: React.FC<IProps> = ({ matrixClient: cli, space
             ),
         () => setError(_t("room_settings|visibility|error_update_guest_access")),
     );
+    const onGuestAccessEnabledChanged = useCallback<ChangeEventHandler<HTMLInputElement>>(
+        (e) => setGuestAccessEnabled(e.target.checked),
+        [setGuestAccessEnabled],
+    );
     const [historyVisibility, setHistoryVisibility] = useLocalEcho<HistoryVisibility>(
         () =>
             space.currentState.getStateEvents(EventType.RoomHistoryVisibility, "")?.getContent()?.history_visibility ||
@@ -103,19 +108,15 @@ const SpaceSettingsVisibilityTab: React.FC<IProps> = ({ matrixClient: cli, space
                 </AccessibleButton>
 
                 {showAdvancedSection && (
-                    <div className="mx_SettingsTab_toggleWithDescription">
-                        <LabelledToggleSwitch
-                            value={guestAccessEnabled}
-                            onChange={setGuestAccessEnabled}
-                            disabled={!canSetGuestAccess}
-                            label={_t("room_settings|visibility|guest_access_label")}
-                        />
-                        <p>
-                            {_t("room_settings|visibility|guest_access_explainer")}
-                            <br />
-                            {_t("room_settings|visibility|guest_access_explainer_public_space")}
-                        </p>
-                    </div>
+                    <SettingsToggleInput
+                        name="guest-access-enabled"
+                        checked={guestAccessEnabled}
+                        onChange={onGuestAccessEnabledChanged}
+                        disabled={!canSetGuestAccess}
+                        disabledMessage={_t("room_settings|visibility|guest_access_disabled")}
+                        helpMessage={_t("room_settings|visibility|guest_access_explainer")}
+                        label={_t("room_settings|visibility|guest_access_label")}
+                    />
                 )}
             </div>
         );
@@ -155,26 +156,32 @@ const SpaceSettingsVisibilityTab: React.FC<IProps> = ({ matrixClient: cli, space
                         onError={(): void => setError(_t("room_settings|visibility|error_failed_save"))}
                         closeSettingsFn={closeSettingsFn}
                     />
-                    {advancedSection}
-                    <div className="mx_SettingsTab_toggleWithDescription">
-                        <LabelledToggleSwitch
-                            value={historyVisibility === HistoryVisibility.WorldReadable}
-                            onChange={(checked: boolean): void => {
+                    <Form.Root
+                        onSubmit={(evt) => {
+                            evt.preventDefault();
+                            evt.stopPropagation();
+                        }}
+                    >
+                        {advancedSection}
+                        <SettingsToggleInput
+                            name="space-history-visibility"
+                            checked={historyVisibility === HistoryVisibility.WorldReadable}
+                            onChange={(evt): void => {
                                 setHistoryVisibility(
-                                    checked ? HistoryVisibility.WorldReadable : HistoryVisibility.Shared,
+                                    evt.target.checked ? HistoryVisibility.WorldReadable : HistoryVisibility.Shared,
                                 );
                             }}
+                            helpMessage={_t("room_settings|visibility|history_visibility_anyone_space_description")}
                             disabled={!canSetHistoryVisibility}
+                            disabledMessage={_t("room_settings|visibility|history_visibility_anyone_space_disabled")}
                             label={_t("room_settings|visibility|history_visibility_anyone_space")}
                         />
                         <p>
-                            {_t("room_settings|visibility|history_visibility_anyone_space_description")}
-                            <br />
                             <strong>
                                 {_t("room_settings|visibility|history_visibility_anyone_space_recommendation")}
                             </strong>
                         </p>
-                    </div>
+                    </Form.Root>
                 </SettingsFieldset>
 
                 {addressesSection}
diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx
index d03ac8a1e2..94ba7cff3e 100644
--- a/src/components/views/spaces/SpaceTreeLevel.tsx
+++ b/src/components/views/spaces/SpaceTreeLevel.tsx
@@ -20,6 +20,11 @@ import classNames from "classnames";
 import { type Room, RoomEvent } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { type DraggableProvidedDragHandleProps } from "react-beautiful-dnd";
+import {
+    ChevronDownIcon,
+    ChevronRightIcon,
+    OverflowHorizontalIcon,
+} from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import RoomAvatar from "../avatars/RoomAvatar";
 import SpaceStore from "../../../stores/spaces/SpaceStore";
@@ -52,6 +57,7 @@ type ButtonProps<T extends keyof HTMLElementTagNameMap> = Omit<
     className?: string;
     selected?: boolean;
     label: string;
+    icon?: JSX.Element;
     contextMenuTooltip?: string;
     notificationState?: NotificationState;
     isNarrow?: boolean;
@@ -65,6 +71,7 @@ export const SpaceButton = <T extends keyof HTMLElementTagNameMap>({
     space,
     spaceKey: _spaceKey,
     className,
+    icon,
     selected,
     label,
     contextMenuTooltip,
@@ -84,7 +91,7 @@ export const SpaceButton = <T extends keyof HTMLElementTagNameMap>({
 
     let avatar = (
         <div className="mx_SpaceButton_avatarPlaceholder">
-            <div className="mx_SpaceButton_icon" />
+            <div className="mx_SpaceButton_icon">{icon}</div>
         </div>
     );
     if (space) {
@@ -143,6 +150,7 @@ export const SpaceButton = <T extends keyof HTMLElementTagNameMap>({
                 mx_SpaceButton_active: selected,
                 mx_SpaceButton_hasMenuOpen: menuDisplayed,
                 mx_SpaceButton_narrow: isNarrow,
+                mx_SpaceButton_withIcon: Boolean(icon),
             })}
             aria-label={label}
             title={!isNarrow || menuDisplayed ? undefined : label}
@@ -166,7 +174,9 @@ export const SpaceButton = <T extends keyof HTMLElementTagNameMap>({
                         onClick={openMenu}
                         title={contextMenuTooltip}
                         isExpanded={menuDisplayed}
-                    />
+                    >
+                        <OverflowHorizontalIcon />
+                    </ContextMenuTooltipButton>
                 )}
 
                 {contextMenu}
@@ -346,7 +356,9 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
                 onClick={this.toggleCollapse}
                 tabIndex={-1}
                 aria-label={collapsed ? _t("action|expand") : _t("action|collapse")}
-            />
+            >
+                {collapsed ? <ChevronRightIcon /> : <ChevronDownIcon />}
+            </AccessibleButton>
         ) : null;
 
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
diff --git a/src/components/views/toasts/VerificationRequestToast.tsx b/src/components/views/toasts/VerificationRequestToast.tsx
index 12843c0b87..74db50d632 100644
--- a/src/components/views/toasts/VerificationRequestToast.tsx
+++ b/src/components/views/toasts/VerificationRequestToast.tsx
@@ -177,7 +177,7 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
                 detail={detail}
                 primaryLabel={
                     request.isSelfVerification || !request.roomId
-                        ? _t("encryption|verification|request_toast_accept")
+                        ? _t("encryption|verification|request_toast_start_verification")
                         : _t("encryption|verification|request_toast_accept_user")
                 }
                 onPrimaryClick={this.accept}
diff --git a/src/components/views/verification/VerificationShowSas.tsx b/src/components/views/verification/VerificationShowSas.tsx
index 2292aad090..0f6272a885 100644
--- a/src/components/views/verification/VerificationShowSas.tsx
+++ b/src/components/views/verification/VerificationShowSas.tsx
@@ -107,7 +107,9 @@ export default class VerificationShowSas extends React.Component<IProps, IState>
         if (this.props.sas.emoji) {
             const emojiBlocks = this.props.sas.emoji.map((emoji, i) => (
                 <div className="mx_VerificationShowSas_emojiSas_block" key={i}>
-                    <div className="mx_VerificationShowSas_emojiSas_emoji">{emoji[0]}</div>
+                    <div className="mx_VerificationShowSas_emojiSas_emoji" aria-hidden={true}>
+                        {emoji[0]}
+                    </div>
                     <div className="mx_VerificationShowSas_emojiSas_label">{tEmoji(emoji, locale)}</div>
                 </div>
             ));
@@ -119,7 +121,7 @@ export default class VerificationShowSas extends React.Component<IProps, IState>
                 </div>
             );
             sasCaption = this.props.isSelf
-                ? _t("encryption|verification|sas_emoji_caption_self")
+                ? _t("encryption|verification|confirm_the_emojis")
                 : _t("encryption|verification|sas_emoji_caption_user");
         } else if (this.props.sas.decimal) {
             const numberBlocks = this.props.sas.decimal.map((num, i) => <span key={i}>{num}</span>);
diff --git a/src/components/views/voip/CallView.tsx b/src/components/views/voip/CallView.tsx
index 87bf84d8c4..8067cc065c 100644
--- a/src/components/views/voip/CallView.tsx
+++ b/src/components/views/voip/CallView.tsx
@@ -21,12 +21,11 @@ interface JoinCallViewProps {
     room: Room;
     resizing: boolean;
     call: Call;
-    skipLobby?: boolean;
     role?: AriaRole;
     onClose: () => void;
 }
 
-const JoinCallView: FC<JoinCallViewProps> = ({ room, resizing, call, skipLobby, role, onClose }) => {
+const JoinCallView: FC<JoinCallViewProps> = ({ room, resizing, call, role, onClose }) => {
     const cli = useContext(MatrixClientContext);
     useTypedEventEmitter(call, CallEvent.Close, onClose);
 
@@ -35,12 +34,6 @@ const JoinCallView: FC<JoinCallViewProps> = ({ room, resizing, call, skipLobby,
         call.clean();
     }, [call]);
 
-    useEffect(() => {
-        // Always update the widget data so that we don't ignore "skipLobby" accidentally.
-        call.widget.data ??= {};
-        call.widget.data.skipLobby = skipLobby;
-    }, [call.widget, skipLobby]);
-
     const disconnectAllOtherCalls: () => Promise<void> = useCallback(async () => {
         // The stickyPromise has to resolve before the widget actually becomes sticky.
         // We only let the widget become sticky after disconnecting all other active calls.
@@ -69,7 +62,6 @@ const JoinCallView: FC<JoinCallViewProps> = ({ room, resizing, call, skipLobby,
 interface CallViewProps {
     room: Room;
     resizing: boolean;
-    skipLobby?: boolean;
     role?: AriaRole;
     /**
      * Callback for when the user closes the call.
@@ -77,19 +69,8 @@ interface CallViewProps {
     onClose: () => void;
 }
 
-export const CallView: FC<CallViewProps> = ({ room, resizing, skipLobby, role, onClose }) => {
+export const CallView: FC<CallViewProps> = ({ room, resizing, role, onClose }) => {
     const call = useCall(room.roomId);
 
-    return (
-        call && (
-            <JoinCallView
-                room={room}
-                resizing={resizing}
-                call={call}
-                skipLobby={skipLobby}
-                role={role}
-                onClose={onClose}
-            />
-        )
-    );
+    return call && <JoinCallView room={room} resizing={resizing} call={call} role={role} onClose={onClose} />;
 };
diff --git a/src/components/views/voip/LegacyCallView.tsx b/src/components/views/voip/LegacyCallView.tsx
index 255b1ab0f4..e6da10e520 100644
--- a/src/components/views/voip/LegacyCallView.tsx
+++ b/src/components/views/voip/LegacyCallView.tsx
@@ -50,6 +50,10 @@ interface IProps {
     onMouseDownOnHeader?: (event: React.MouseEvent<Element, MouseEvent>) => void;
 
     showApps?: boolean;
+
+    sidebarShown: boolean;
+
+    setSidebarShown?: (sidebarShown: boolean) => void;
 }
 
 interface IState {
@@ -62,7 +66,6 @@ interface IState {
     primaryFeed?: CallFeed;
     secondaryFeed?: CallFeed;
     sidebarFeeds: Array<CallFeed>;
-    sidebarShown: boolean;
 }
 
 function getFullScreenElement(): Element | null {
@@ -97,7 +100,6 @@ export default class LegacyCallView extends React.Component<IProps, IState> {
             primaryFeed: primary,
             secondaryFeed: secondary,
             sidebarFeeds: sidebar,
-            sidebarShown: true,
         };
     }
 
@@ -269,8 +271,9 @@ export default class LegacyCallView extends React.Component<IProps, IState> {
             isScreensharing = await this.props.call.setScreensharingEnabled(true);
         }
 
+        this.props.setSidebarShown?.(true);
+
         this.setState({
-            sidebarShown: true,
             screensharing: isScreensharing,
         });
     };
@@ -320,12 +323,12 @@ export default class LegacyCallView extends React.Component<IProps, IState> {
     };
 
     private onToggleSidebar = (): void => {
-        this.setState({ sidebarShown: !this.state.sidebarShown });
+        this.props.setSidebarShown?.(!this.props.sidebarShown);
     };
 
     private renderCallControls(): JSX.Element {
-        const { call, pipMode } = this.props;
-        const { callState, micMuted, vidMuted, screensharing, sidebarShown, secondaryFeed, sidebarFeeds } = this.state;
+        const { call, pipMode, sidebarShown } = this.props;
+        const { callState, micMuted, vidMuted, screensharing, secondaryFeed, sidebarFeeds } = this.state;
 
         // If SDPStreamMetadata isn't supported don't show video mute button in voice calls
         const vidMuteButtonShown = call.opponentSupportsSDPStreamMetadata() || call.hasLocalUserMediaVideoTrack;
@@ -337,7 +340,8 @@ export default class LegacyCallView extends React.Component<IProps, IState> {
             (call.opponentSupportsSDPStreamMetadata() || call.hasLocalUserMediaVideoTrack) &&
             call.state === CallState.Connected;
         // Show the sidebar button only if there is something to hide/show
-        const sidebarButtonShown = (secondaryFeed && !secondaryFeed.isVideoMuted()) || sidebarFeeds.length > 0;
+        const sidebarButtonShown =
+            !pipMode && ((secondaryFeed && !secondaryFeed.isVideoMuted()) || sidebarFeeds.length > 0);
         // The dial pad & 'more' button actions are only relevant in a connected call
         const contextMenuButtonShown = callState === CallState.Connected;
         const dialpadButtonShown = callState === CallState.Connected && call.opponentSupportsDTMF();
@@ -372,7 +376,7 @@ export default class LegacyCallView extends React.Component<IProps, IState> {
     }
 
     private renderToast(): JSX.Element | null {
-        const { call } = this.props;
+        const { call, sidebarShown } = this.props;
         const someoneIsScreensharing = call.getFeeds().some((feed) => {
             return feed.purpose === SDPStreamMetadataPurpose.Screenshare;
         });
@@ -380,7 +384,7 @@ export default class LegacyCallView extends React.Component<IProps, IState> {
         if (!someoneIsScreensharing) return null;
 
         const isScreensharing = call.isScreensharing();
-        const { primaryFeed, sidebarShown } = this.state;
+        const { primaryFeed } = this.state;
         const sharerName = primaryFeed?.getMember()?.name;
         if (!sharerName) return null;
 
@@ -393,8 +397,8 @@ export default class LegacyCallView extends React.Component<IProps, IState> {
     }
 
     private renderContent(): JSX.Element {
-        const { pipMode, call, onResize } = this.props;
-        const { isLocalOnHold, isRemoteOnHold, sidebarShown, primaryFeed, secondaryFeed, sidebarFeeds } = this.state;
+        const { pipMode, call, onResize, sidebarShown } = this.props;
+        const { isLocalOnHold, isRemoteOnHold, primaryFeed, secondaryFeed, sidebarFeeds } = this.state;
 
         const callRoomId = LegacyCallHandler.instance.roomIdForCall(call);
         const callRoom = (callRoomId ? MatrixClientPeg.safeGet().getRoom(callRoomId) : undefined) ?? undefined;
@@ -537,8 +541,8 @@ export default class LegacyCallView extends React.Component<IProps, IState> {
     }
 
     public render(): React.ReactNode {
-        const { call, secondaryCall, pipMode, showApps, onMouseDownOnHeader } = this.props;
-        const { sidebarShown, sidebarFeeds } = this.state;
+        const { call, secondaryCall, pipMode, showApps, onMouseDownOnHeader, sidebarShown } = this.props;
+        const { sidebarFeeds } = this.state;
 
         const client = MatrixClientPeg.safeGet();
         const callRoomId = LegacyCallHandler.instance.roomIdForCall(call);
diff --git a/src/components/views/voip/LegacyCallViewForRoom.tsx b/src/components/views/voip/LegacyCallViewForRoom.tsx
index bd44af5fa5..d996fe98d6 100644
--- a/src/components/views/voip/LegacyCallViewForRoom.tsx
+++ b/src/components/views/voip/LegacyCallViewForRoom.tsx
@@ -12,19 +12,18 @@ import { Resizable } from "re-resizable";
 
 import LegacyCallHandler, { LegacyCallHandlerEvent } from "../../../LegacyCallHandler";
 import LegacyCallView from "./LegacyCallView";
-import type ResizeNotifier from "../../../utils/ResizeNotifier";
+import { SDKContext } from "../../../contexts/SDKContext";
 
 interface IProps {
     // What room we should display the call for
     roomId: string;
 
-    resizeNotifier: ResizeNotifier;
-
     showApps?: boolean;
 }
 
 interface IState {
     call: MatrixCall | null;
+    sidebarShown: boolean;
 }
 
 /*
@@ -32,21 +31,28 @@ interface IState {
  * or nothing if there is no call in that room.
  */
 export default class LegacyCallViewForRoom extends React.Component<IProps, IState> {
-    public constructor(props: IProps) {
-        super(props);
+    public static contextType = SDKContext;
+    declare public context: React.ContextType<typeof SDKContext>;
+
+    public constructor(props: IProps, context: React.ContextType<typeof SDKContext>) {
+        super(props, context);
+        const call = this.getCall();
         this.state = {
-            call: this.getCall(),
+            call,
+            sidebarShown: !!call && LegacyCallHandler.instance.isCallSidebarShown(call.callId),
         };
     }
 
     public componentDidMount(): void {
         LegacyCallHandler.instance.addListener(LegacyCallHandlerEvent.CallState, this.updateCall);
         LegacyCallHandler.instance.addListener(LegacyCallHandlerEvent.CallChangeRoom, this.updateCall);
+        LegacyCallHandler.instance.addListener(LegacyCallHandlerEvent.ShownSidebarsChanged, this.updateCall);
     }
 
     public componentWillUnmount(): void {
         LegacyCallHandler.instance.removeListener(LegacyCallHandlerEvent.CallState, this.updateCall);
         LegacyCallHandler.instance.removeListener(LegacyCallHandlerEvent.CallChangeRoom, this.updateCall);
+        LegacyCallHandler.instance.removeListener(LegacyCallHandlerEvent.ShownSidebarsChanged, this.updateCall);
     }
 
     private updateCall = (): void => {
@@ -54,6 +60,10 @@ export default class LegacyCallViewForRoom extends React.Component<IProps, IStat
         if (newCall !== this.state.call) {
             this.setState({ call: newCall });
         }
+        const newSidebarShown = !!newCall && LegacyCallHandler.instance.isCallSidebarShown(newCall.callId);
+        if (newSidebarShown !== this.state.sidebarShown) {
+            this.setState({ sidebarShown: newSidebarShown });
+        }
     };
 
     private getCall(): MatrixCall | null {
@@ -64,15 +74,20 @@ export default class LegacyCallViewForRoom extends React.Component<IProps, IStat
     }
 
     private onResizeStart = (): void => {
-        this.props.resizeNotifier.startResizing();
+        this.context.resizeNotifier.startResizing();
     };
 
     private onResize = (): void => {
-        this.props.resizeNotifier.notifyTimelineHeightChanged();
+        this.context.resizeNotifier.notifyTimelineHeightChanged();
     };
 
     private onResizeStop = (): void => {
-        this.props.resizeNotifier.stopResizing();
+        this.context.resizeNotifier.stopResizing();
+    };
+
+    private setSidebarShown = (sidebarShown: boolean): void => {
+        if (!this.state.call) return;
+        LegacyCallHandler.instance.setCallSidebarShown(this.state.call.callId, sidebarShown);
     };
 
     public render(): React.ReactNode {
@@ -99,7 +114,13 @@ export default class LegacyCallViewForRoom extends React.Component<IProps, IStat
                     className="mx_LegacyCallViewForRoom_ResizeWrapper"
                     handleClasses={{ bottom: "mx_LegacyCallViewForRoom_ResizeHandle" }}
                 >
-                    <LegacyCallView call={this.state.call} pipMode={false} showApps={this.props.showApps} />
+                    <LegacyCallView
+                        call={this.state.call}
+                        pipMode={false}
+                        showApps={this.props.showApps}
+                        sidebarShown={this.state.sidebarShown}
+                        setSidebarShown={this.setSidebarShown}
+                    />
                 </Resizable>
             </div>
         );
diff --git a/src/components/views/voip/VideoFeed.tsx b/src/components/views/voip/VideoFeed.tsx
index 3db168d097..87bee5c4ad 100644
--- a/src/components/views/voip/VideoFeed.tsx
+++ b/src/components/views/voip/VideoFeed.tsx
@@ -13,6 +13,7 @@ import React from "react";
 import { type CallFeed, CallFeedEvent } from "matrix-js-sdk/src/webrtc/callFeed";
 import { logger } from "matrix-js-sdk/src/logger";
 import { SDPStreamMetadataPurpose } from "matrix-js-sdk/src/webrtc/callEventTypes";
+import { MicOffSolidIcon, MicOnSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import SettingsStore from "../../../settings/SettingsStore";
 import LegacyCallHandler from "../../../LegacyCallHandler";
@@ -179,14 +180,14 @@ export default class VideoFeed extends React.PureComponent<IProps, IState> {
             mx_VideoFeed_secondary: secondary,
             mx_VideoFeed_voice: this.state.videoMuted,
         });
-        const micIconClasses = classnames("mx_VideoFeed_mic", {
-            mx_VideoFeed_mic_muted: this.state.audioMuted,
-            mx_VideoFeed_mic_unmuted: !this.state.audioMuted,
-        });
 
         let micIcon;
         if (feed.purpose !== SDPStreamMetadataPurpose.Screenshare && !pipMode) {
-            micIcon = <div className={micIconClasses} />;
+            micIcon = (
+                <div className="mx_VideoFeed_mic">
+                    {this.state.audioMuted ? <MicOffSolidIcon /> : <MicOnSolidIcon />}
+                </div>
+            );
         }
 
         let content;
diff --git a/src/contexts/RoomContext.ts b/src/contexts/RoomContext.ts
index 95e21fb0b8..c4a4d45c5d 100644
--- a/src/contexts/RoomContext.ts
+++ b/src/contexts/RoomContext.ts
@@ -10,6 +10,7 @@ import { createContext } from "react";
 
 import { type IRoomState } from "../components/structures/RoomView";
 import { Layout } from "../settings/enums/Layout";
+import { type RoomViewStore } from "../stores/RoomViewStore";
 
 export enum TimelineRenderingType {
     Room = "Room",
@@ -29,11 +30,12 @@ export enum MainSplitContentType {
     Call,
 }
 
-const RoomContext = createContext<
-    IRoomState & {
-        threadId?: string;
-    }
->({
+export interface RoomContextType extends IRoomState {
+    threadId?: string;
+    roomViewStore: RoomViewStore;
+}
+
+const RoomContext = createContext<RoomContextType>({
     roomLoading: true,
     peekLoading: false,
     shouldPeek: true,
@@ -75,6 +77,9 @@ const RoomContext = createContext<
     promptAskToJoin: false,
     viewRoomOpts: { buttons: [] },
     isRoomEncrypted: null,
+    // roomViewStore should always be present as it is passed to RoomView constructor.
+    // In time when we migrate the RoomView to MVVM it will cease to exist(become a ViewModel).
+    roomViewStore: undefined!,
 });
 RoomContext.displayName = "RoomContext";
 export default RoomContext;
diff --git a/src/contexts/SDKContext.ts b/src/contexts/SDKContext.ts
index 1b8ede3efd..bb59610771 100644
--- a/src/contexts/SDKContext.ts
+++ b/src/contexts/SDKContext.ts
@@ -24,6 +24,8 @@ import { WidgetLayoutStore } from "../stores/widgets/WidgetLayoutStore";
 import { WidgetPermissionStore } from "../stores/widgets/WidgetPermissionStore";
 import { OidcClientStore } from "../stores/oidc/OidcClientStore";
 import WidgetStore from "../stores/WidgetStore";
+import ResizeNotifier from "../utils/ResizeNotifier";
+import { MultiRoomViewStore } from "../stores/MultiRoomViewStore";
 
 // This context is available to components under MatrixChat,
 // the context must not be used by components outside a SdkContextClass tree.
@@ -64,6 +66,8 @@ export class SdkContextClass {
     protected _TypingStore?: TypingStore;
     protected _UserProfilesStore?: UserProfilesStore;
     protected _OidcClientStore?: OidcClientStore;
+    protected _ResizeNotifier?: ResizeNotifier;
+    protected _MultiRoomViewStore?: MultiRoomViewStore;
 
     /**
      * Automatically construct stores which need to be created eagerly so they can register with
@@ -171,6 +175,23 @@ export class SdkContextClass {
         return this._OidcClientStore;
     }
 
+    // This is getting increasingly tenuous to have here but we still have class components so it's
+    // awkward to consume multiple contexts in them. This should be replaced with ResizeObservers
+    // anyway really.
+    public get resizeNotifier(): ResizeNotifier {
+        if (!this._ResizeNotifier) {
+            this._ResizeNotifier = new ResizeNotifier();
+        }
+        return this._ResizeNotifier;
+    }
+
+    public get multiRoomViewStore(): MultiRoomViewStore {
+        if (!this._MultiRoomViewStore) {
+            this._MultiRoomViewStore = new MultiRoomViewStore(defaultDispatcher, this);
+        }
+        return this._MultiRoomViewStore;
+    }
+
     public onLoggedOut(): void {
         this._UserProfilesStore = undefined;
     }
diff --git a/src/createRoom.ts b/src/createRoom.ts
index df0f90b91f..30020bc2ce 100644
--- a/src/createRoom.ts
+++ b/src/createRoom.ts
@@ -1,4 +1,5 @@
 /*
+Copyright 2025 Element Creations Ltd.
 Copyright 2024 New Vector Ltd.
 Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 Copyright 2015, 2016 OpenMarket Ltd
@@ -15,13 +16,17 @@ import {
     RoomCreateTypeField,
     RoomType,
     type ICreateRoomOpts,
-    HistoryVisibility,
+    type HistoryVisibility,
     JoinRule,
     Preset,
     RestrictedAllowType,
     Visibility,
+    Direction,
+    RoomStateEvent,
+    type RoomState,
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
+import { type RoomEncryptionEventContent } from "matrix-js-sdk/src/types";
 
 import Modal, { type IHandle } from "./Modal";
 import { _t, UserFriendlyError } from "./languageHandler";
@@ -39,19 +44,37 @@ import { findDMForUser } from "./utils/dm/findDMForUser";
 import { privateShouldBeEncrypted } from "./utils/rooms";
 import { shouldForceDisableEncryption } from "./utils/crypto/shouldForceDisableEncryption";
 import { waitForMember } from "./utils/membership";
-import { PreferredRoomVersions } from "./utils/PreferredRoomVersions";
+import { doesRoomVersionSupport, PreferredRoomVersions } from "./utils/PreferredRoomVersions";
 import SettingsStore from "./settings/SettingsStore";
 import { MEGOLM_ENCRYPTION_ALGORITHM } from "./utils/crypto";
+import { ElementCallMemberEventType } from "./call-types";
+import { htmlSerializeFromMdIfNeeded } from "./editor/serialize";
 
 // we define a number of interfaces which take their names from the js-sdk
 /* eslint-disable camelcase */
 
 export interface IOpts {
     dmUserId?: string;
-    createOpts?: ICreateRoomOpts;
+    /**
+     * The name of the room to be created.
+     */
+    name?: string;
+    /**
+     * The topic for the room.
+     */
+    topic?: string;
+    /**
+     * Additional options to pass to the room creation API.
+     * Note: "name", "topic", and "avatar" should be set via their respective properties in IOpts.
+     */
+    createOpts?: Omit<ICreateRoomOpts, "name" | "topic" | "avatar">;
     spinner?: boolean;
     guestAccess?: boolean;
     encryption?: boolean;
+    /**
+     * Encrypt state events as per MSC4362
+     */
+    stateEncryption?: boolean;
     inlineErrors?: boolean;
     andView?: boolean;
     avatar?: File | string; // will upload if given file, else mxcUrl is needed
@@ -99,6 +122,7 @@ export default async function createRoom(client: MatrixClient, opts: IOpts): Pro
     if (opts.spinner === undefined) opts.spinner = true;
     if (opts.guestAccess === undefined) opts.guestAccess = true;
     if (opts.encryption === undefined) opts.encryption = false;
+    if (opts.stateEncryption === undefined) opts.stateEncryption = false;
 
     if (client.isGuest()) {
         dis.dispatch({ action: "require_registration" });
@@ -146,32 +170,19 @@ export default async function createRoom(client: MatrixClient, opts: IOpts): Pro
         };
 
         // Video rooms require custom power levels
-        if (opts.roomType === RoomType.ElementVideo) {
+        if (opts.roomType === RoomType.ElementVideo || opts.roomType === RoomType.UnstableCall) {
             createOpts.power_level_content_override = {
                 events: {
                     ...DEFAULT_EVENT_POWER_LEVELS,
                     // Allow all users to send call membership updates
-                    [JitsiCall.MEMBER_EVENT_TYPE]: 0,
-                    // Make widgets immutable, even to admins
-                    "im.vector.modular.widgets": 200,
-                },
-                users: {
-                    // Temporarily give ourselves the power to set up a widget
-                    [client.getSafeUserId()]: 200,
-                },
-            };
-        } else if (opts.roomType === RoomType.UnstableCall) {
-            createOpts.power_level_content_override = {
-                events: {
-                    ...DEFAULT_EVENT_POWER_LEVELS,
-                    // Allow all users to send call membership updates
-                    [ElementCall.MEMBER_EVENT_TYPE.name]: 0,
-                    // Make calls immutable, even to admins
-                    [ElementCall.CALL_EVENT_TYPE.name]: 200,
-                },
-                users: {
-                    // Temporarily give ourselves the power to set up a call
-                    [client.getSafeUserId()]: 200,
+                    [opts.roomType === RoomType.ElementVideo
+                        ? JitsiCall.MEMBER_EVENT_TYPE
+                        : ElementCallMemberEventType.name]: 0,
+                    // Ensure all but admins can't change widgets
+                    // A previous version of the code prevented even administrators
+                    // from changing this, but this is not possible now that room creators
+                    // have an immutable power level
+                    ["im.vector.modular.widgets"]: 100,
                 },
             };
         }
@@ -180,9 +191,7 @@ export default async function createRoom(client: MatrixClient, opts: IOpts): Pro
             events: {
                 ...DEFAULT_EVENT_POWER_LEVELS,
                 // It should always (including non video rooms) be possible to join a group call.
-                [ElementCall.MEMBER_EVENT_TYPE.name]: 0,
-                // Make sure only admins can enable it (DEPRECATED)
-                [ElementCall.CALL_EVENT_TYPE.name]: 100,
+                [ElementCallMemberEventType.name]: 0,
             },
         };
     }
@@ -208,28 +217,35 @@ export default async function createRoom(client: MatrixClient, opts: IOpts): Pro
     }
 
     if (opts.encryption) {
+        const content: RoomEncryptionEventContent = {
+            algorithm: MEGOLM_ENCRYPTION_ALGORITHM,
+        };
+        if (opts.stateEncryption) {
+            content["io.element.msc4362.encrypt_state_events"] = true;
+        }
         createOpts.initial_state.push({
             type: "m.room.encryption",
             state_key: "",
-            content: {
-                algorithm: MEGOLM_ENCRYPTION_ALGORITHM,
-            },
+            content,
         });
     }
 
-    if (opts.joinRule === JoinRule.Knock) {
+    const defaultRoomVersion = (await client.getCapabilities())["m.room_versions"]?.default ?? "1";
+
+    if (
+        opts.joinRule === JoinRule.Knock &&
+        !doesRoomVersionSupport(defaultRoomVersion, PreferredRoomVersions.KnockRooms)
+    ) {
         createOpts.room_version = PreferredRoomVersions.KnockRooms;
     }
 
     if (opts.parentSpace) {
         createOpts.initial_state.push(makeSpaceParentEvent(opts.parentSpace, true));
-        if (!opts.historyVisibility) {
-            opts.historyVisibility =
-                createOpts.preset === Preset.PublicChat ? HistoryVisibility.WorldReadable : HistoryVisibility.Invited;
-        }
 
         if (opts.joinRule === JoinRule.Restricted) {
-            createOpts.room_version = PreferredRoomVersions.RestrictedRooms;
+            if (!doesRoomVersionSupport(defaultRoomVersion, PreferredRoomVersions.KnockRooms)) {
+                createOpts.room_version = PreferredRoomVersions.RestrictedRooms;
+            }
 
             createOpts.initial_state.push({
                 type: EventType.RoomJoinRules,
@@ -254,16 +270,28 @@ export default async function createRoom(client: MatrixClient, opts: IOpts): Pro
         });
     }
 
-    if (opts.avatar) {
-        let url = opts.avatar;
-        if (opts.avatar instanceof File) {
-            ({ content_uri: url } = await client.uploadContent(opts.avatar));
+    // If we are not encrypting state, copy name, topic, avatar over to
+    // createOpts so we pass them in when we call Client.createRoom().
+    if (!opts.stateEncryption) {
+        if (opts.name) {
+            createOpts.name = opts.name;
         }
 
-        createOpts.initial_state.push({
-            type: EventType.RoomAvatar,
-            content: { url },
-        });
+        if (opts.topic) {
+            createOpts.topic = opts.topic;
+        }
+
+        if (opts.avatar) {
+            let url = opts.avatar;
+            if (opts.avatar instanceof File) {
+                ({ content_uri: url } = await client.uploadContent(opts.avatar));
+            }
+
+            createOpts.initial_state.push({
+                type: EventType.RoomAvatar,
+                content: { url },
+            });
+        }
     }
 
     if (opts.historyVisibility) {
@@ -299,9 +327,6 @@ export default async function createRoom(client: MatrixClient, opts: IOpts): Pro
                 return Promise.reject(err);
             }
         })
-        .finally(function () {
-            if (modal) modal.close();
-        })
         .then(async (res): Promise<void> => {
             roomId = res.room_id;
 
@@ -323,6 +348,16 @@ export default async function createRoom(client: MatrixClient, opts: IOpts): Pro
 
             if (opts.dmUserId) await Rooms.setDMRoom(client, roomId, opts.dmUserId);
         })
+        .then(async () => {
+            // We need to set up initial state manually if state encryption is enabled, since it needs
+            // to be encrypted.
+            if (opts.encryption && opts.stateEncryption) {
+                await enableStateEventEncryption(client, await room, opts);
+            }
+        })
+        .finally(function () {
+            if (modal) modal.close();
+        })
         .then(() => {
             if (opts.parentSpace) {
                 return SpaceStore.instance.addRoomToSpace(
@@ -337,15 +372,9 @@ export default async function createRoom(client: MatrixClient, opts: IOpts): Pro
             if (opts.roomType === RoomType.ElementVideo) {
                 // Set up this video room with a Jitsi call
                 await JitsiCall.create(await room);
-
-                // Reset our power level back to admin so that the widget becomes immutable
-                await client.setPowerLevel(roomId, client.getUserId()!, 100);
             } else if (opts.roomType === RoomType.UnstableCall) {
                 // Set up this video room with an Element call
                 ElementCall.create(await room);
-
-                // Reset our power level back to admin so that the call becomes immutable
-                await client.setPowerLevel(roomId, client.getUserId()!, 100);
             }
         })
         .then(
@@ -397,6 +426,73 @@ export default async function createRoom(client: MatrixClient, opts: IOpts): Pro
         );
 }
 
+async function enableStateEventEncryption(client: MatrixClient, room: Room, opts: IOpts): Promise<void> {
+    // Don't send our state events until encryption is enabled. If this times
+    // out after 30 seconds, we throw since we don't want to send the events
+    // unencrypted.
+    await waitForRoomEncryption(room, 30000);
+
+    // Set room name
+    if (opts.name) {
+        await client.setRoomName(room.roomId, opts.name);
+    }
+
+    // Set room topic
+    if (opts.topic) {
+        const htmlTopic = htmlSerializeFromMdIfNeeded(opts.topic, { forceHTML: false });
+        await client.setRoomTopic(room.roomId, opts.topic, htmlTopic);
+    }
+
+    // Set room avatar
+    if (opts.avatar) {
+        let url: string;
+        if (opts.avatar instanceof File) {
+            ({ content_uri: url } = await client.uploadContent(opts.avatar));
+        } else {
+            url = opts.avatar;
+        }
+        await client.sendStateEvent(room.roomId, EventType.RoomAvatar, { url }, "");
+    }
+}
+
+/**
+ * Wait until the supplied room has an `m.room.encryption` event, or time out
+ * after 30 seconds.
+ */
+export async function waitForRoomEncryption(room: Room, waitTimeMs: number): Promise<void> {
+    if (room.hasEncryptionStateEvent()) {
+        return;
+    }
+
+    // Start a 30s timeout and return "timed_out" if we hit it
+    const { promise: timeoutPromise, resolve: timeoutResolve } = Promise.withResolvers();
+    const timeout = setTimeout(timeoutResolve, waitTimeMs, "timed_out");
+
+    // Listen for a RoomEncryption state update and return
+    // "received_encryption_state" if we get it
+    const roomState = room.getLiveTimeline().getState(Direction.Forward)!;
+    const { promise: stateUpdatePromise, resolve: stateUpdateResolve } = Promise.withResolvers();
+    const onRoomStateUpdate = (state: RoomState): void => {
+        if (state.getStateEvents(EventType.RoomEncryption, "")) {
+            stateUpdateResolve("received_encryption_state");
+        }
+    };
+    roomState.on(RoomStateEvent.Update, onRoomStateUpdate);
+
+    // Wait for one of the above to happen
+    const resolution = await Promise.race([timeoutPromise, stateUpdatePromise]);
+
+    // Clear the listener and the timeout
+    roomState.off(RoomStateEvent.Update, onRoomStateUpdate);
+    clearTimeout(timeout);
+
+    // Fail if we hit the timeout
+    if (resolution === "timed_out") {
+        logger.warn("Timed out while waiting for room to enable encryption");
+        throw new Error("Timed out while waiting for room to enable encryption");
+    }
+}
+
 /*
  * Ensure that for every user in a room, there is at least one device that we
  * can encrypt to.
diff --git a/src/customisations/Media.ts b/src/customisations/Media.ts
index 1763ade3a8..20b6c816db 100644
--- a/src/customisations/Media.ts
+++ b/src/customisations/Media.ts
@@ -8,7 +8,6 @@
 
 import { type MatrixClient, parseErrorResponse, type ResizeMethod } from "matrix-js-sdk/src/matrix";
 import { type MediaEventContent } from "matrix-js-sdk/src/types";
-import { type Optional } from "matrix-events-sdk";
 
 import type { MediaCustomisations, Media } from "@element-hq/element-web-module-api";
 import { MatrixClientPeg } from "../MatrixClientPeg";
@@ -58,7 +57,7 @@ class MediaImplementation implements Media {
      * The MXC URI of the thumbnail media, if a thumbnail is recorded. Null/undefined
      * otherwise.
      */
-    public get thumbnailMxc(): Optional<string> {
+    public get thumbnailMxc(): string | undefined {
         return this.prepared.thumbnail?.mxc;
     }
 
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index e6616a7e21..50f9c3497a 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -121,7 +121,7 @@ export enum Action {
     UpdateSystemFont = "update_system_font",
 
     /**
-     * Changes room based on payload parameters. Should be used with JoinRoomPayload.
+     * Changes room based on payload parameters. Should be used with ViewRoomPayload.
      */
     ViewRoom = "view_room",
 
@@ -316,27 +316,44 @@ export enum Action {
      */
     ShowRoomTopic = "show_room_topic",
 
+    /**
+     * Fired when the client is no longer viable to use: specifically, that we have been "soft-logged out".
+     */
+    ClientNotViable = "client_not_viable",
+
     /**
      * Fired when the client was logged out. No additional payload information required.
      */
     OnLoggedOut = "on_logged_out",
 
     /**
-     * Fired when the client was logged in. No additional payload information required.
+     * Fired when the client was logged in, or has otherwise been set up with authentication data (e.g., by loading the
+     * access token from local storage). Note that this does not necessarily mean that a login action has happened,
+     * just that authentication creds have been set up.
+     *
+     * No additional payload information required.
      */
     OnLoggedIn = "on_logged_in",
 
+    /**
+     * Fired when the client is about to be started, shortly after {@link OnLoggedIn}.
+     *
+     * No additional payload information required.
+     */
+    WillStartClient = "will_start_client",
+
+    /**
+     * Fired when the client has started, shortly after {@link WillStartClient}.
+     *
+     * No additional payload information required.
+     */
+    ClientStarted = "client_started",
+
     /**
      * Overwrites the existing login with fresh session credentials. Use with a OverwriteLoginPayload.
      */
     OverwriteLogin = "overwrite_login",
 
-    /**
-     * Fired when the PlatformPeg gets a new platform set upon it, should only happen once per app load lifecycle.
-     * Fires with the PlatformSetPayload.
-     */
-    PlatformSet = "platform_set",
-
     /**
      * Fired when we want to view a thread, either a new one or an existing one
      */
@@ -386,4 +403,10 @@ export enum Action {
      * Open the create room dialog
      */
     CreateRoom = "view_create_room",
+
+    /**
+     * The `UserActivity` tracker determined that there was some activity from the user (typically a mouse movement
+     * or keyboard event).
+     */
+    UserActivity = "user_activity",
 }
diff --git a/src/dispatcher/payloads/ActiveRoomChangedPayload.ts b/src/dispatcher/payloads/ActiveRoomChangedPayload.ts
index 68d55c3b52..5995d42d70 100644
--- a/src/dispatcher/payloads/ActiveRoomChangedPayload.ts
+++ b/src/dispatcher/payloads/ActiveRoomChangedPayload.ts
@@ -6,14 +6,12 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { type Optional } from "matrix-events-sdk";
-
 import { type Action } from "../actions";
 import { type ActionPayload } from "../payloads";
 
 export interface ActiveRoomChangedPayload extends ActionPayload {
     action: Action.ActiveRoomChanged;
 
-    oldRoomId: Optional<string>;
-    newRoomId: Optional<string>;
+    oldRoomId: string | null;
+    newRoomId: string | null;
 }
diff --git a/src/dispatcher/payloads/OpenForwardDialogPayload.ts b/src/dispatcher/payloads/OpenForwardDialogPayload.ts
index a883a8bdc1..2f8688061c 100644
--- a/src/dispatcher/payloads/OpenForwardDialogPayload.ts
+++ b/src/dispatcher/payloads/OpenForwardDialogPayload.ts
@@ -7,7 +7,6 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { type MatrixEvent } from "matrix-js-sdk/src/matrix";
-import { type Optional } from "matrix-events-sdk";
 
 import { type Action } from "../actions";
 import { type ActionPayload } from "../payloads";
@@ -17,5 +16,5 @@ export interface OpenForwardDialogPayload extends ActionPayload {
     action: Action.OpenForwardDialog;
 
     event: MatrixEvent;
-    permalinkCreator: Optional<RoomPermalinkCreator>;
+    permalinkCreator: RoomPermalinkCreator | null;
 }
diff --git a/src/dispatcher/payloads/OpenInviteDialogPayload.ts b/src/dispatcher/payloads/OpenInviteDialogPayload.ts
index 77973c239f..0e94465dc5 100644
--- a/src/dispatcher/payloads/OpenInviteDialogPayload.ts
+++ b/src/dispatcher/payloads/OpenInviteDialogPayload.ts
@@ -6,7 +6,6 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { type Optional } from "matrix-events-sdk";
 import { type MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 
 import { type ActionPayload } from "../payloads";
@@ -17,7 +16,7 @@ export interface OpenInviteDialogPayload extends ActionPayload {
     action: Action.OpenInviteDialog;
 
     kind: InviteKind;
-    onFinishedCallback: Optional<(results: boolean[]) => void>;
+    onFinishedCallback?: (results: boolean[]) => void;
 
     call?: MatrixCall;
     roomId?: string;
diff --git a/src/dispatcher/payloads/PlatformSetPayload.ts b/src/dispatcher/payloads/PlatformSetPayload.ts
deleted file mode 100644
index 6d12978f8f..0000000000
--- a/src/dispatcher/payloads/PlatformSetPayload.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2022 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-import { type Action } from "../actions";
-import { type ActionPayload } from "../payloads";
-import type BasePlatform from "../../BasePlatform";
-
-export interface PlatformSetPayload extends ActionPayload {
-    action: Action.PlatformSet;
-    platform: BasePlatform;
-}
diff --git a/src/dispatcher/payloads/ViewRoomPayload.ts b/src/dispatcher/payloads/ViewRoomPayload.ts
index 525dd50d62..c1dba33feb 100644
--- a/src/dispatcher/payloads/ViewRoomPayload.ts
+++ b/src/dispatcher/payloads/ViewRoomPayload.ts
@@ -39,6 +39,7 @@ interface BaseViewRoomPayload extends Pick<ActionPayload, "action"> {
     clear_search?: boolean; // Whether to clear the room list search
     view_call?: boolean; // Whether to view the call or call lobby for the room
     skipLobby?: boolean; // Whether to skip the call lobby when showing the call (only supported for element calls)
+    voiceOnly?: boolean; // Whether the call is voice only (only supported for element calls)
     opts?: JoinRoomPayload["opts"];
 
     deferred_action?: ActionPayload; // Action to fire after MatrixChat handles this ViewRoom action
diff --git a/src/editor/commands.tsx b/src/editor/commands.tsx
index f24e1307cb..6346785755 100644
--- a/src/editor/commands.tsx
+++ b/src/editor/commands.tsx
@@ -38,7 +38,13 @@ export function isSlashCommand(model: EditorModel): boolean {
     return false;
 }
 
-export function getSlashCommand(model: EditorModel): [Command | undefined, string | undefined, string] {
+/**
+ * Get the slash command and its arguments from the editor model
+ * @param roomId - The room ID to check whether the command is enabled
+ * @param model - The editor model
+ * @returns A tuple of the command (or undefined if not found), the arguments (or undefined), and the full command text
+ */
+export function getSlashCommand(roomId: string, model: EditorModel): [Command | undefined, string | undefined, string] {
     const commandText = model.parts.reduce((text, part) => {
         // use mxid to textify user pills in a command and room alias/id for room pills
         if (part.type === Type.UserPill || part.type === Type.RoomPill) {
@@ -46,7 +52,7 @@ export function getSlashCommand(model: EditorModel): [Command | undefined, strin
         }
         return text + part.text;
     }, "");
-    const { cmd, args } = getCommand(commandText);
+    const { cmd, args } = getCommand(roomId, commandText);
     return [cmd, args, commandText];
 }
 
diff --git a/src/editor/parts.ts b/src/editor/parts.ts
index ad49058609..9e476ffaf8 100644
--- a/src/editor/parts.ts
+++ b/src/editor/parts.ts
@@ -297,7 +297,12 @@ export abstract class PillPart extends BasePart implements IPillPart {
     }
 
     // helper method for subclasses
-    protected setAvatarVars(node: HTMLElement, avatarUrl: string, initialLetter: string): void {
+    protected setAvatarVars(
+        node: HTMLElement,
+        avatarUrl: string,
+        initialLetter: string,
+        avatarTextColor?: string,
+    ): void {
         const avatarBackground = `url('${avatarUrl}')`;
         const avatarLetter = `'${initialLetter}'`;
         // check if the value is changing,
@@ -308,6 +313,9 @@ export abstract class PillPart extends BasePart implements IPillPart {
         if (node.style.getPropertyValue("--avatar-letter") !== avatarLetter) {
             node.style.setProperty("--avatar-letter", avatarLetter);
         }
+        if (avatarTextColor && node.style.getPropertyValue("--avatar-color") !== avatarTextColor) {
+            node.style.setProperty("--avatar-color", avatarTextColor);
+        }
     }
 
     public serialize(): ISerializedPillPart {
@@ -421,11 +429,13 @@ class RoomPillPart extends PillPart {
     protected setAvatar(node: HTMLElement): void {
         let initialLetter = "";
         let avatarUrl = Avatar.avatarUrlForRoom(this.room ?? null, 16, 16, "crop");
+        let avatarTextColor: string | undefined;
         if (!avatarUrl) {
             initialLetter = Avatar.getInitialLetter(this.room?.name || this.resourceId) ?? "";
             avatarUrl = Avatar.defaultAvatarUrlForString(this.room?.roomId ?? this.resourceId);
+            avatarTextColor = Avatar.getAvatarTextColor(this.room?.roomId ?? this.resourceId);
         }
-        this.setAvatarVars(node, avatarUrl, initialLetter);
+        this.setAvatarVars(node, avatarUrl, initialLetter, avatarTextColor);
     }
 
     public get type(): IPillPart["type"] {
@@ -479,10 +489,12 @@ class UserPillPart extends PillPart {
         const defaultAvatarUrl = Avatar.defaultAvatarUrlForString(this.member.userId);
         const avatarUrl = Avatar.avatarUrlForMember(this.member, 16, 16, "crop");
         let initialLetter = "";
+        let avatarTextColor: string | undefined;
         if (avatarUrl === defaultAvatarUrl) {
             initialLetter = Avatar.getInitialLetter(name) ?? "";
+            avatarTextColor = Avatar.getAvatarTextColor(this.member.userId);
         }
-        this.setAvatarVars(node, avatarUrl, initialLetter);
+        this.setAvatarVars(node, avatarUrl, initialLetter, avatarTextColor);
     }
 
     protected onClick = (): void => {
diff --git a/src/events/EventTileFactory.tsx b/src/events/EventTileFactory.tsx
index f1fc224471..3bec221c7a 100644
--- a/src/events/EventTileFactory.tsx
+++ b/src/events/EventTileFactory.tsx
@@ -17,7 +17,7 @@ import {
     M_POLL_END,
     M_POLL_START,
 } from "matrix-js-sdk/src/matrix";
-import { type Optional } from "matrix-events-sdk";
+import { TextualEventView } from "@element-hq/web-shared-components";
 
 import SettingsStore from "../settings/SettingsStore";
 import type LegacyCallEventGrouper from "../components/structures/LegacyCallEventGrouper";
@@ -26,7 +26,6 @@ import { TimelineRenderingType } from "../contexts/RoomContext";
 import MessageEvent from "../components/views/messages/MessageEvent";
 import LegacyCallEvent from "../components/views/messages/LegacyCallEvent";
 import { CallEvent } from "../components/views/messages/CallEvent";
-import TextualEvent from "../components/views/messages/TextualEvent";
 import EncryptionEvent from "../components/views/messages/EncryptionEvent";
 import { RoomPredecessorTile } from "../components/views/messages/RoomPredecessorTile";
 import RoomAvatarEvent from "../components/views/messages/RoomAvatarEvent";
@@ -41,31 +40,32 @@ import { getMessageModerationState, MessageModerationState } from "../utils/Even
 import HiddenBody from "../components/views/messages/HiddenBody";
 import ViewSourceEvent from "../components/views/messages/ViewSourceEvent";
 import { shouldDisplayAsBeaconTile } from "../utils/beacon/timeline";
-import { ElementCall } from "../models/Call";
 import { type IBodyProps } from "../components/views/messages/IBodyProps";
+import { ModuleApi } from "../modules/Api";
+import { TextualEventViewModel } from "../viewmodels/event-tiles/TextualEventViewModel";
+import { ElementCallEventType } from "../call-types";
 
 // Subset of EventTile's IProps plus some mixins
-export interface EventTileTypeProps
-    extends Pick<
-        EventTileProps,
-        | "mxEvent"
-        | "highlights"
-        | "highlightLink"
-        | "showUrlPreview"
-        | "forExport"
-        | "getRelationsForEvent"
-        | "editState"
-        | "replacingEventId"
-        | "permalinkCreator"
-        | "callEventGrouper"
-        | "isSeeingThroughMessageHiddenForModeration"
-        | "inhibitInteraction"
-    > {
+export interface EventTileTypeProps extends Pick<
+    EventTileProps,
+    | "mxEvent"
+    | "highlights"
+    | "highlightLink"
+    | "showUrlPreview"
+    | "forExport"
+    | "getRelationsForEvent"
+    | "editState"
+    | "replacingEventId"
+    | "permalinkCreator"
+    | "callEventGrouper"
+    | "isSeeingThroughMessageHiddenForModeration"
+    | "inhibitInteraction"
+> {
     ref?: React.RefObject<any>; // `any` because it's effectively impossible to convince TS of a reasonable type
-    timestamp?: JSX.Element;
     maxImageHeight?: number; // pixels
     overrideBodyTypes?: Record<string, React.ComponentType<IBodyProps>>;
     overrideEventTypes?: Record<string, React.ComponentType<IBodyProps>>;
+    showHiddenEvents: boolean;
 }
 
 type FactoryProps = Omit<EventTileTypeProps, "ref">;
@@ -76,7 +76,10 @@ const LegacyCallEventFactory: Factory<FactoryProps & { callEventGrouper: LegacyC
     <LegacyCallEvent ref={ref} {...props} />
 );
 const CallEventFactory: Factory = (ref, props) => <CallEvent ref={ref} {...props} />;
-export const TextualEventFactory: Factory = (ref, props) => <TextualEvent ref={ref} {...props} />;
+export const TextualEventFactory: Factory = (ref, props) => {
+    const vm = new TextualEventViewModel(props);
+    return <TextualEventView vm={vm} />;
+};
 const VerificationReqFactory: Factory = (_ref, props) => <MKeyVerificationRequest {...props} />;
 const HiddenEventFactory: Factory = (ref, props) => <HiddenBody ref={ref} {...props} />;
 
@@ -116,7 +119,7 @@ const STATE_EVENT_TILE_TYPES = new Map<string, Factory>([
     [EventType.RoomGuestAccess, TextualEventFactory],
 ]);
 
-for (const evType of ElementCall.CALL_EVENT_TYPE.names) {
+for (const evType of ElementCallEventType.names) {
     STATE_EVENT_TILE_TYPES.set(evType, CallEventFactory);
 }
 
@@ -149,14 +152,14 @@ const SINGULAR_STATE_EVENTS = new Set([
  * @param cli The matrix client to reference when needed.
  * @param showHiddenEvents Whether hidden events should be shown.
  * @param asHiddenEv When true, treat the event as always hidden.
- * @returns The factory, or falsy if not possible.
+ * @returns The factory, or undefined if not possible.
  */
 export function pickFactory(
     mxEvent: MatrixEvent,
     cli: MatrixClient,
     showHiddenEvents: boolean,
     asHiddenEv?: boolean,
-): Optional<Factory> {
+): Factory | undefined {
     const evType = mxEvent.getType(); // cache this to reduce call stack execution hits
 
     // Note: we avoid calling SettingsStore unless absolutely necessary - this code is on the critical path.
@@ -165,7 +168,7 @@ export function pickFactory(
         return JSONEventFactory;
     }
 
-    const noEventFactoryFactory: () => Optional<Factory> = () => (showHiddenEvents ? JSONEventFactory : undefined); // just don't render things that we shouldn't render
+    const noEventFactoryFactory: () => Factory | undefined = () => (showHiddenEvents ? JSONEventFactory : undefined); // just don't render things that we shouldn't render
 
     // We run all the event type checks first as they might override the factory entirely.
 
@@ -244,20 +247,25 @@ export function pickFactory(
  * Render an event as a tile
  * @param renderType The render type. Used to inform properties given to the eventual component.
  * @param props The properties to provide to the eventual component.
- * @param showHiddenEvents Whether hidden events should be shown.
  * @param cli Optional client instance to use, otherwise the default MatrixClientPeg will be used.
- * @returns The tile as JSX, or falsy if unable to render.
+ * @returns The tile as JSX, or null if unable to render.
  */
 export function renderTile(
     renderType: TimelineRenderingType,
     props: EventTileTypeProps,
-    showHiddenEvents: boolean,
     cli?: MatrixClient,
-): Optional<JSX.Element> {
+): JSX.Element | null {
     cli = cli ?? MatrixClientPeg.safeGet(); // because param defaults don't do the correct thing
 
-    const factory = pickFactory(props.mxEvent, cli, showHiddenEvents);
-    if (!factory) return undefined;
+    const factory = pickFactory(props.mxEvent, cli, props.showHiddenEvents);
+    if (!factory) {
+        // If we don't have a factory for this event, attempt
+        // to find a custom component that can render it.
+        // Will return null if no custom component can render it.
+        return ModuleApi.instance.customComponents.renderMessage({
+            mxEvent: props.mxEvent,
+        });
+    }
 
     // Note that we split off the ones we actually care about here just to be sure that we're
     // not going to accidentally send things we shouldn't from lazy callers. Eg: EventTile's
@@ -276,44 +284,57 @@ export function renderTile(
         callEventGrouper,
         getRelationsForEvent,
         isSeeingThroughMessageHiddenForModeration,
-        timestamp,
         inhibitInteraction,
+        showHiddenEvents,
     } = props;
 
     switch (renderType) {
         case TimelineRenderingType.File:
         case TimelineRenderingType.Notification:
         case TimelineRenderingType.Thread:
-            // We only want a subset of props, so we don't end up causing issues for downstream components.
-            return factory(props.ref, {
-                mxEvent,
-                highlights,
-                highlightLink,
-                showUrlPreview,
-                editState,
-                replacingEventId,
-                getRelationsForEvent,
-                isSeeingThroughMessageHiddenForModeration,
-                permalinkCreator,
-                inhibitInteraction,
-            });
+            return ModuleApi.instance.customComponents.renderMessage(
+                {
+                    mxEvent: props.mxEvent,
+                },
+                (origProps) =>
+                    factory(props.ref, {
+                        // We only want a subset of props, so we don't end up causing issues for downstream components.
+                        mxEvent,
+                        highlights,
+                        highlightLink,
+                        showUrlPreview: origProps?.showUrlPreview ?? showUrlPreview,
+                        editState,
+                        replacingEventId,
+                        getRelationsForEvent,
+                        isSeeingThroughMessageHiddenForModeration,
+                        permalinkCreator,
+                        inhibitInteraction,
+                        showHiddenEvents,
+                    }),
+            );
         default:
-            // NEARLY ALL THE OPTIONS!
-            return factory(ref, {
-                mxEvent,
-                forExport,
-                replacingEventId,
-                editState,
-                highlights,
-                highlightLink,
-                showUrlPreview,
-                permalinkCreator,
-                callEventGrouper,
-                getRelationsForEvent,
-                isSeeingThroughMessageHiddenForModeration,
-                timestamp,
-                inhibitInteraction,
-            });
+            return ModuleApi.instance.customComponents.renderMessage(
+                {
+                    mxEvent: props.mxEvent,
+                },
+                (origProps) =>
+                    factory(ref, {
+                        // NEARLY ALL THE OPTIONS!
+                        mxEvent,
+                        forExport,
+                        replacingEventId,
+                        editState,
+                        highlights,
+                        highlightLink,
+                        showUrlPreview: origProps?.showUrlPreview ?? showUrlPreview,
+                        permalinkCreator,
+                        callEventGrouper,
+                        getRelationsForEvent,
+                        isSeeingThroughMessageHiddenForModeration,
+                        inhibitInteraction,
+                        showHiddenEvents,
+                    }),
+            );
     }
 }
 
@@ -328,11 +349,18 @@ export function renderReplyTile(
     props: EventTileTypeProps,
     showHiddenEvents: boolean,
     cli?: MatrixClient,
-): Optional<JSX.Element> {
+): JSX.Element | null {
     cli = cli ?? MatrixClientPeg.safeGet(); // because param defaults don't do the correct thing
 
     const factory = pickFactory(props.mxEvent, cli, showHiddenEvents);
-    if (!factory) return undefined;
+    if (!factory) {
+        // If we don't have a factory for this event, attempt
+        // to find a custom component that can render it.
+        // Will return null if no custom component can render it.
+        return ModuleApi.instance.customComponents.renderMessage({
+            mxEvent: props.mxEvent,
+        });
+    }
 
     // See renderTile() for why we split off so much
     const {
@@ -350,19 +378,26 @@ export function renderReplyTile(
         permalinkCreator,
     } = props;
 
-    return factory(ref, {
-        mxEvent,
-        highlights,
-        highlightLink,
-        showUrlPreview,
-        overrideBodyTypes,
-        overrideEventTypes,
-        replacingEventId,
-        maxImageHeight,
-        getRelationsForEvent,
-        isSeeingThroughMessageHiddenForModeration,
-        permalinkCreator,
-    });
+    return ModuleApi.instance.customComponents.renderMessage(
+        {
+            mxEvent: props.mxEvent,
+        },
+        (origProps) =>
+            factory(ref, {
+                mxEvent,
+                highlights,
+                highlightLink,
+                showUrlPreview: origProps?.showUrlPreview ?? showUrlPreview,
+                overrideBodyTypes,
+                overrideEventTypes,
+                replacingEventId,
+                maxImageHeight,
+                getRelationsForEvent,
+                isSeeingThroughMessageHiddenForModeration,
+                permalinkCreator,
+                showHiddenEvents,
+            }),
+    );
 }
 
 // XXX: this'll eventually be dynamic based on the fields once we have extensible event types
@@ -386,6 +421,12 @@ export function haveRendererForEvent(
         return false;
     }
 
+    // Check to see if we have any hints for this message, which indicates
+    // there is a custom renderer for the event.
+    if (ModuleApi.instance.customComponents.getHintsForMessage(mxEvent)) {
+        return true;
+    }
+
     // No tile for replacement events since they update the original tile
     if (mxEvent.isRelation(RelationType.Replace)) return false;
 
@@ -397,9 +438,7 @@ export function haveRendererForEvent(
         const dynamicPredecessorsEnabled = SettingsStore.getValue("feature_dynamic_room_predecessors");
         const predecessor = matrixClient.getRoom(mxEvent.getRoomId())?.findPredecessor(dynamicPredecessorsEnabled);
         return Boolean(predecessor);
-    } else if (
-        ElementCall.CALL_EVENT_TYPE.names.some((eventType) => handler === STATE_EVENT_TILE_TYPES.get(eventType))
-    ) {
+    } else if (ElementCallEventType.names.some((eventType) => handler === STATE_EVENT_TILE_TYPES.get(eventType))) {
         const intent = mxEvent.getContent()["m.intent"];
         const newlyStarted = Object.keys(mxEvent.getPrevContent()).length === 0;
         // Only interested in events that mark the start of a non-room call
diff --git a/src/favicon.ts b/src/favicon.ts
index e109c73460..8d014157f6 100644
--- a/src/favicon.ts
+++ b/src/favicon.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2020-2024 New Vector Ltd.
+Copyright 2020-2025 New Vector Ltd.
 
 SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE files in the repository root for full details.
@@ -28,56 +28,19 @@ const defaults: IParams = {
     isLeft: false,
 };
 
-// Allows dynamic rendering of a circular badge atop the loaded favicon
-// supports colour, font and basic positioning parameters.
-// Based upon https://github.com/ejci/favico.js/blob/master/favico.js [MIT license]
-export default class Favicon {
-    private readonly browser = {
-        ff: typeof window.InstallTrigger !== "undefined",
-        opera: !!window.opera || navigator.userAgent.includes("Opera"),
-    };
-
-    private readonly params: IParams;
-    private readonly canvas: HTMLCanvasElement;
-    private readonly baseImage: HTMLImageElement;
-    private context!: CanvasRenderingContext2D;
-    private icons: HTMLLinkElement[];
-
-    private isReady = false;
-    // callback to run once isReady is asserted, allows for a badge to be queued for when it can be shown
-    private readyCb?: () => void;
-
-    public constructor(params: Partial<IParams> = {}) {
-        this.params = { ...defaults, ...params };
-
-        this.icons = Favicon.getIcons();
-        // create work canvas
+abstract class IconRenderer {
+    protected readonly canvas: HTMLCanvasElement;
+    protected readonly context: CanvasRenderingContext2D;
+    public constructor(
+        protected readonly params: IParams = defaults,
+        protected readonly baseImage?: HTMLImageElement,
+    ) {
         this.canvas = document.createElement("canvas");
-        // create clone of favicon as a base
-        this.baseImage = document.createElement("img");
-
-        const lastIcon = this.icons[this.icons.length - 1];
-        if (lastIcon.hasAttribute("href")) {
-            this.baseImage.setAttribute("crossOrigin", "anonymous");
-            this.baseImage.onload = (): void => {
-                // get height and width of the favicon
-                this.canvas.height = this.baseImage.height > 0 ? this.baseImage.height : 32;
-                this.canvas.width = this.baseImage.width > 0 ? this.baseImage.width : 32;
-                this.context = this.canvas.getContext("2d")!;
-                this.ready();
-            };
-            this.baseImage.setAttribute("src", lastIcon.getAttribute("href")!);
-        } else {
-            this.canvas.height = this.baseImage.height = 32;
-            this.canvas.width = this.baseImage.width = 32;
-            this.context = this.canvas.getContext("2d")!;
-            this.ready();
+        const context = this.canvas.getContext("2d");
+        if (!context) {
+            throw Error("Could not get canvas context");
         }
-    }
-
-    private reset(): void {
-        this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
-        this.context.drawImage(this.baseImage, 0, 0, this.canvas.width, this.canvas.height);
+        this.context = context;
     }
 
     private options(
@@ -125,11 +88,23 @@ export default class Favicon {
         return opt;
     }
 
-    private circle(n: number | string, opts?: Partial<IParams>): void {
+    /**
+     * Draws a circualr status icon, usually over the top of the application icon.
+     * @param n The content of the circle. Should be a number or a single character.
+     * @param opts Options to adjust.
+     */
+    protected circle(n: number | string, opts?: Partial<IParams>): void {
         const params = { ...this.params, ...opts };
         const opt = this.options(n, params);
 
         let more = false;
+        if (!this.baseImage) {
+            // If we omit the background, assume the entire canvas is our target.
+            opt.x = 0;
+            opt.y = 0;
+            opt.w = this.canvas.width;
+            opt.h = this.canvas.height;
+        }
         if (opt.len === 2) {
             opt.x = opt.x - opt.w * 0.4;
             opt.w = opt.w * 1.4;
@@ -141,7 +116,9 @@ export default class Favicon {
         }
 
         this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
-        this.context.drawImage(this.baseImage, 0, 0, this.canvas.width, this.canvas.height);
+        if (this.baseImage) {
+            this.context.drawImage(this.baseImage, 0, 0, this.canvas.width, this.canvas.height);
+        }
         this.context.beginPath();
         const fontSize = Math.floor(opt.h * (typeof opt.n === "number" && opt.n > 99 ? 0.85 : 1)) + "px";
         this.context.font = `${params.fontWeight} ${fontSize} ${params.fontFamily}`;
@@ -177,6 +154,90 @@ export default class Favicon {
 
         this.context.closePath();
     }
+}
+
+export class BadgeOverlayRenderer extends IconRenderer {
+    public constructor() {
+        super();
+        // Overlays are 16x16 https://www.electronjs.org/docs/latest/api/browser-window#winsetoverlayiconoverlay-description-windows
+        this.canvas.width = 16;
+        this.canvas.height = 16;
+    }
+
+    /**
+     * Generate an overlay badge without the application icon, and export
+     * as an ArrayBuffer
+     * @param contents The content of the circle. Should be a number or a single character.
+     * @param bgColor Optional alternative background colo.r
+     * @returns An ArrayBuffer representing a 16x16 icon in `image/png` format, or `null` if no badge should be drawn.
+     */
+    public async render(contents: number | string, bgColor?: string): Promise<ArrayBuffer | null> {
+        if (contents === 0) {
+            return null;
+        }
+
+        this.circle(contents, { ...(bgColor ? { bgColor } : undefined) });
+        return new Promise((resolve, reject) => {
+            this.canvas.toBlob(
+                (blob) => {
+                    if (blob) {
+                        resolve(blob.arrayBuffer());
+                    }
+                    reject(new Error("Could not render badge overlay as blob"));
+                },
+                "image/png",
+                1,
+            );
+        });
+    }
+}
+
+// multiple of 48 as per Google guidelines
+// multiple of 16 for higher quality scaling for small display
+const DEFAULT_FAVICON_SIZE = 144;
+
+// Allows dynamic rendering of a circular badge atop the loaded favicon
+// supports colour, font and basic positioning parameters.
+// Based upon https://github.com/ejci/favico.js/blob/master/favico.js [MIT license]
+export default class Favicon extends IconRenderer {
+    private readonly browser = {
+        ff: typeof window.InstallTrigger !== "undefined",
+        opera: !!window.opera || navigator.userAgent.includes("Opera"),
+    };
+
+    private icons: HTMLLinkElement[];
+
+    private isReady = false;
+    // callback to run once isReady is asserted, allows for a badge to be queued for when it can be shown
+    private readyCb?: () => void;
+
+    public constructor() {
+        const baseImage = document.createElement("img");
+        super(defaults, baseImage);
+
+        this.icons = Favicon.getIcons();
+
+        const lastIcon = this.icons[this.icons.length - 1];
+        if (lastIcon.hasAttribute("href")) {
+            baseImage.setAttribute("crossOrigin", "anonymous");
+            baseImage.onload = (): void => {
+                // get height and width of the favicon
+                this.canvas.height = baseImage.height > 0 ? baseImage.height : DEFAULT_FAVICON_SIZE;
+                this.canvas.width = baseImage.width > 0 ? baseImage.width : DEFAULT_FAVICON_SIZE;
+                this.ready();
+            };
+            baseImage.setAttribute("src", lastIcon.getAttribute("href")!);
+        } else {
+            this.canvas.height = baseImage.height = DEFAULT_FAVICON_SIZE;
+            this.canvas.width = baseImage.width = DEFAULT_FAVICON_SIZE;
+            this.ready();
+        }
+    }
+
+    private reset(): void {
+        this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
+        this.context.drawImage(this.baseImage!, 0, 0, this.canvas.width, this.canvas.height);
+    }
 
     private ready(): void {
         if (this.isReady) return;
@@ -245,10 +306,6 @@ export default class Favicon {
             elms[0].setAttribute("rel", "icon");
             window.document.getElementsByTagName("head")[0].appendChild(elms[0]);
         }
-
-        elms.forEach((item) => {
-            item.setAttribute("type", "image/png");
-        });
         return elms;
     }
 }
diff --git a/src/hooks/room/useRoomCall.tsx b/src/hooks/room/useRoomCall.tsx
index 8d7667aa7d..97b30dea0d 100644
--- a/src/hooks/room/useRoomCall.tsx
+++ b/src/hooks/room/useRoomCall.tsx
@@ -7,9 +7,10 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { type Room } from "matrix-js-sdk/src/matrix";
-import React, { type ReactNode, useCallback, useEffect, useMemo, useState } from "react";
 import { CallType } from "matrix-js-sdk/src/webrtc/call";
+import { type ReactNode, useCallback, useEffect, useMemo, useState } from "react";
 
+import type React from "react";
 import { useFeatureEnabled, useSettingValue } from "../useSettings";
 import SdkConfig from "../../SdkConfig";
 import { useEventEmitter, useEventEmitterState } from "../useEventEmitter";
@@ -18,24 +19,24 @@ import { useWidgets } from "../../utils/WidgetUtils";
 import { WidgetType } from "../../widgets/WidgetType";
 import { useCall, useConnectionState, useParticipantCount } from "../useCall";
 import { useRoomMemberCount } from "../useRoomMembers";
-import { ConnectionState, ElementCall } from "../../models/Call";
+import { ConnectionState } from "../../models/Call";
 import { placeCall } from "../../utils/room/placeCall";
 import { Container, WidgetLayoutStore } from "../../stores/widgets/WidgetLayoutStore";
 import { useRoomState } from "../useRoomState";
 import { _t } from "../../languageHandler";
 import { isManagedHybridWidget, isManagedHybridWidgetEnabled } from "../../widgets/ManagedHybrid";
 import { type IApp } from "../../stores/WidgetStore";
-import { SdkContextClass } from "../../contexts/SDKContext";
 import { UPDATE_EVENT } from "../../stores/AsyncStore";
 import defaultDispatcher from "../../dispatcher/dispatcher";
 import { type ViewRoomPayload } from "../../dispatcher/payloads/ViewRoomPayload";
 import { Action } from "../../dispatcher/actions";
 import { CallStore, CallStoreEvent } from "../../stores/CallStore";
 import { isVideoRoom } from "../../utils/video-rooms";
-import { useGuestAccessInformation } from "./useGuestAccessInformation";
 import { UIFeature } from "../../settings/UIFeature";
-import { BetaPill } from "../../components/views/beta/BetaCard";
 import { type InteractionName } from "../../PosthogTrackers";
+import { ElementCallMemberEventType } from "../../call-types";
+import { LocalRoom, LocalRoomState } from "../../models/LocalRoom";
+import { useScopedRoomContext } from "../../contexts/ScopedRoomContext";
 
 export enum PlatformCallType {
     ElementCall,
@@ -55,7 +56,6 @@ export const getPlatformCallTypeProps = (
             return {
                 label: _t("voip|element_call"),
                 analyticsName: "WebVoipOptionElementCall",
-                children: <BetaPill />,
             };
         case PlatformCallType.JitsiCall:
             return {
@@ -72,7 +72,6 @@ export const getPlatformCallTypeProps = (
 
 const enum State {
     NoCall,
-    NoOneHere,
     NoPermission,
     Unpinned,
     Ongoing,
@@ -85,7 +84,7 @@ const enum State {
  * @returns the call button attributes for the given room
  */
 export const useRoomCall = (
-    room: Room,
+    room: Room | LocalRoom,
 ): {
     voiceCallDisabledReason: string | null;
     voiceCallClick(evt: React.MouseEvent | undefined, selectedType: PlatformCallType): void;
@@ -99,6 +98,7 @@ export const useRoomCall = (
     showVideoCallButton: boolean;
     showVoiceCallButton: boolean;
 } => {
+    const roomViewStore = useScopedRoomContext("roomViewStore").roomViewStore;
     // settings
     const groupCallsEnabled = useFeatureEnabled("feature_group_calls");
     const widgetsFeatureEnabled = useSettingValue(UIFeature.Widgets);
@@ -125,9 +125,9 @@ export const useRoomCall = (
     const hasGroupCall = groupCall !== null;
     const hasActiveCallSession = useParticipantCount(groupCall) > 0;
     const isViewingCall = useEventEmitterState(
-        SdkContextClass.instance.roomViewStore,
+        roomViewStore,
         UPDATE_EVENT,
-        () => SdkContextClass.instance.roomViewStore.isViewingCall() || isVideoRoom(room),
+        () => roomViewStore.isViewingCall() || isVideoRoom(room),
     );
 
     // room
@@ -135,18 +135,13 @@ export const useRoomCall = (
 
     const [mayEditWidgets, mayCreateElementCalls] = useRoomState(room, () => [
         room.currentState.mayClientSendStateEvent("im.vector.modular.widgets", room.client),
-        room.currentState.mayClientSendStateEvent(ElementCall.MEMBER_EVENT_TYPE.name, room.client),
+        room.currentState.mayClientSendStateEvent(ElementCallMemberEventType.name, room.client),
     ]);
 
     // The options provided to the RoomHeader.
     // If there are multiple options, the user will be prompted to choose.
     const callOptions = useMemo((): PlatformCallType[] => {
         const options: PlatformCallType[] = [];
-        if (memberCount <= 2) {
-            options.push(PlatformCallType.LegacyCall);
-        } else if (mayEditWidgets || hasJitsiWidget) {
-            options.push(PlatformCallType.JitsiCall);
-        }
         if (groupCallsEnabled) {
             if (hasGroupCall || mayCreateElementCalls) {
                 options.push(PlatformCallType.ElementCall);
@@ -155,6 +150,11 @@ export const useRoomCall = (
                 return [PlatformCallType.ElementCall];
             }
         }
+        if (memberCount <= 2) {
+            options.push(PlatformCallType.LegacyCall);
+        } else if (mayEditWidgets || hasJitsiWidget) {
+            options.push(PlatformCallType.JitsiCall);
+        }
         if (hasGroupCall && WidgetType.CALL.matches(groupCall.widget.type)) {
             // only allow joining the ongoing Element call if there is one.
             return [PlatformCallType.ElementCall];
@@ -196,7 +196,6 @@ export const useRoomCall = (
     const connectedCalls = useEventEmitterState(CallStore.instance, CallStoreEvent.ConnectedCalls, () =>
         Array.from(CallStore.instance.connectedCalls),
     );
-    const { canInviteGuests } = useGuestAccessInformation(room);
 
     const state = useMemo((): State => {
         if (connectedCalls.find((call) => call.roomId != room.roomId)) {
@@ -208,24 +207,20 @@ export const useRoomCall = (
         if (hasLegacyCall) {
             return State.Ongoing;
         }
-        if (memberCount <= 1 && !canInviteGuests) {
-            return State.NoOneHere;
-        }
 
-        if (!mayCreateElementCalls && !mayEditWidgets) {
+        if (!callOptions.includes(PlatformCallType.LegacyCall) && !mayCreateElementCalls && !mayEditWidgets) {
             return State.NoPermission;
         }
         return State.NoCall;
     }, [
+        callOptions,
         connectedCalls,
-        canInviteGuests,
         hasGroupCall,
         hasJitsiWidget,
         hasLegacyCall,
         hasManagedHybridWidget,
         mayCreateElementCalls,
         mayEditWidgets,
-        memberCount,
         promptPinWidget,
         room.roomId,
     ]);
@@ -236,7 +231,7 @@ export const useRoomCall = (
             if (widget && promptPinWidget) {
                 WidgetLayoutStore.instance.moveToContainer(room, widget, Container.Top);
             } else {
-                placeCall(room, CallType.Voice, callPlatformType, evt?.shiftKey ?? false);
+                placeCall(room, CallType.Voice, callPlatformType, evt?.shiftKey || undefined, true);
             }
         },
         [promptPinWidget, room, widget],
@@ -247,7 +242,9 @@ export const useRoomCall = (
             if (widget && promptPinWidget) {
                 WidgetLayoutStore.instance.moveToContainer(room, widget, Container.Top);
             } else {
-                placeCall(room, CallType.Video, callPlatformType, evt?.shiftKey ?? false);
+                // If we have pressed shift then always skip the lobby, otherwise `undefined` will defer
+                // to the defaults of the call implementation.
+                placeCall(room, CallType.Video, callPlatformType, evt?.shiftKey || undefined, false);
             }
         },
         [widget, promptPinWidget, room],
@@ -264,10 +261,6 @@ export const useRoomCall = (
             voiceCallDisabledReason = _t("voip|disabled_ongoing_call");
             videoCallDisabledReason = _t("voip|disabled_ongoing_call");
             break;
-        case State.NoOneHere:
-            voiceCallDisabledReason = _t("voip|disabled_no_one_here");
-            videoCallDisabledReason = _t("voip|disabled_no_one_here");
-            break;
         case State.Unpinned:
         case State.NotJoined:
         case State.NoCall:
@@ -283,11 +276,22 @@ export const useRoomCall = (
         });
     }, [isViewingCall, room.roomId]);
 
+    const roomDoesNotExist = room instanceof LocalRoom && room.state !== LocalRoomState.CREATED;
+
     // We hide the voice call button if it'd have the same effect as the video call button
-    let hideVoiceCallButton = isManagedHybridWidgetEnabled(room) || !callOptions.includes(PlatformCallType.LegacyCall);
+    let hideVoiceCallButton =
+        isManagedHybridWidgetEnabled(room) ||
+        // Disable voice calls if Legacy calls are disabled
+        (!callOptions.includes(PlatformCallType.LegacyCall) &&
+            // Disable voice calls in ECall if the room is a group (we only present video calls for groups of users)
+            (!callOptions.includes(PlatformCallType.ElementCall) || memberCount > 2));
+
     let hideVideoCallButton = false;
-    // We hide both buttons if they require widgets but widgets are disabled, or if the Voip feature is disabled.
-    if ((memberCount > 2 && !widgetsFeatureEnabled) || !voipFeatureEnabled) {
+    // We hide both buttons if:
+    // - they require widgets but widgets are disabled
+    // - if the Voip feature is disabled.
+    // - The room is not created yet (rendering "send first message view")
+    if ((memberCount > 2 && !widgetsFeatureEnabled) || !voipFeatureEnabled || roomDoesNotExist) {
         hideVoiceCallButton = true;
         hideVideoCallButton = true;
     }
diff --git a/src/hooks/room/useTopic.ts b/src/hooks/room/useTopic.ts
index e254e7a4ea..b38c2e9421 100644
--- a/src/hooks/room/useTopic.ts
+++ b/src/hooks/room/useTopic.ts
@@ -15,11 +15,10 @@ import {
     ContentHelpers,
     type MRoomTopicEventContent,
 } from "matrix-js-sdk/src/matrix";
-import { type Optional } from "matrix-events-sdk";
 
 import { useTypedEventEmitter } from "../useEventEmitter";
 
-export const getTopic = (room?: Room): Optional<ContentHelpers.TopicState> => {
+export const getTopic = (room?: Room): ContentHelpers.TopicState | null => {
     const content = room?.currentState?.getStateEvents(EventType.RoomTopic, "")?.getContent<MRoomTopicEventContent>();
     return !!content ? ContentHelpers.parseTopicContent(content) : null;
 };
@@ -29,7 +28,7 @@ export const getTopic = (room?: Room): Optional<ContentHelpers.TopicState> => {
  * @param room
  * @returns the raw text and an html parsion version of the room topic
  */
-export function useTopic(room?: Room): Optional<ContentHelpers.TopicState> {
+export function useTopic(room?: Room): ContentHelpers.TopicState | null {
     const [topic, setTopic] = useState(getTopic(room));
     useTypedEventEmitter(room?.currentState, RoomStateEvent.Events, (ev: MatrixEvent) => {
         if (ev.getType() !== EventType.RoomTopic) return;
diff --git a/src/hooks/useDownloadMedia.ts b/src/hooks/useDownloadMedia.ts
new file mode 100644
index 0000000000..ae2ca6c3ce
--- /dev/null
+++ b/src/hooks/useDownloadMedia.ts
@@ -0,0 +1,97 @@
+/*
+Copyright 2024 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { parseErrorResponse } from "matrix-js-sdk/src/matrix";
+import { useRef, useState, useMemo, useEffect } from "react";
+import { type MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { logger } from "matrix-js-sdk/src/logger";
+
+import ErrorDialog from "../components/views/dialogs/ErrorDialog";
+import { _t } from "../languageHandler";
+import Modal from "../Modal";
+import { FileDownloader } from "../utils/FileDownloader";
+import { MediaEventHelper } from "../utils/MediaEventHelper";
+import { ModuleApi } from "../modules/Api";
+
+export interface UseDownloadMediaReturn {
+    download: () => Promise<void>;
+    loading: boolean;
+    canDownload: boolean;
+}
+
+export function useDownloadMedia(url: string, fileName?: string, mxEvent?: MatrixEvent): UseDownloadMediaReturn {
+    const downloader = useRef(new FileDownloader()).current;
+    const blobRef = useRef<Blob>(null);
+    const [loading, setLoading] = useState(false);
+    const [canDownload, setCanDownload] = useState<boolean>(true);
+
+    const mediaEventHelper = useMemo(() => (mxEvent ? new MediaEventHelper(mxEvent) : undefined), [mxEvent]);
+
+    useEffect(() => {
+        if (!mxEvent) return;
+
+        const hints = ModuleApi.instance.customComponents.getHintsForMessage(mxEvent);
+        if (hints?.allowDownloadingMedia) {
+            setCanDownload(false);
+            hints
+                .allowDownloadingMedia()
+                .then(setCanDownload)
+                .catch((err: any) => {
+                    logger.error(`Failed to check media download permission for ${mxEvent.event.event_id}`, err);
+
+                    setCanDownload(false);
+                });
+        } else {
+            setCanDownload(true);
+        }
+    }, [mxEvent]);
+
+    const download = async (): Promise<void> => {
+        if (loading) return;
+        try {
+            setLoading(true);
+
+            if (blobRef.current) {
+                return downloadBlob(blobRef.current);
+            }
+
+            // We must download via the mediaEventHelper if given as the file may need decryption.
+            if (mediaEventHelper) {
+                blobRef.current = await mediaEventHelper.sourceBlob.value;
+            } else {
+                const res = await fetch(url);
+                if (!res.ok) {
+                    throw parseErrorResponse(res, await res.text());
+                }
+
+                blobRef.current = await res.blob();
+            }
+
+            await downloadBlob(blobRef.current);
+        } catch (e) {
+            showError(e);
+        }
+    };
+
+    const downloadBlob = async (blob: Blob): Promise<void> => {
+        await downloader.download({
+            blob,
+            name: mediaEventHelper?.fileName ?? fileName ?? _t("common|image"),
+        });
+        setLoading(false);
+    };
+
+    const showError = (e: unknown): void => {
+        Modal.createDialog(ErrorDialog, {
+            title: _t("timeline|download_failed"),
+            description: `${_t("timeline|download_failed_description")}\n\n${String(e)}`,
+        });
+        setLoading(false);
+    };
+
+    return { download, loading, canDownload };
+}
diff --git a/src/hooks/useEventEmitter.ts b/src/hooks/useEventEmitter.ts
index 67049195a0..12bb57a1ee 100644
--- a/src/hooks/useEventEmitter.ts
+++ b/src/hooks/useEventEmitter.ts
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { useRef, useEffect, useState, useCallback } from "react";
+import { useRef, useEffect, useState, useCallback, type DependencyList } from "react";
 import { type ListenerMap, type TypedEventEmitter } from "matrix-js-sdk/src/matrix";
 
 import type { EventEmitter } from "events";
@@ -93,3 +93,100 @@ export function useEventEmitterState<T>(
     useEventEmitter(emitter, eventName, handler);
     return value;
 }
+
+/**
+ * The return value of the callback function for `useEventEmitterAsyncState`.
+ */
+export type AsyncStateCallbackResult<T> = Promise<T | NoChange>;
+
+/**
+ * Creates a state, which is computed asynchronously, and can be updated by events.
+ *
+ * Similar to `useEventEmitterState`, but the callback is `async`.
+ *
+ * If the event is emitted while the callback is running, it will wait until
+ * after the callback completes before calling the callback again. If the event
+ * is emitted multiple times while the callback is running, the callback will be
+ * called once for each time the event was emitted, in the order that the events
+ * were emitted.
+ *
+ * @param emitter The emitter sending the event
+ * @param eventName Event name to listen for
+ * @param fn The callback function, that should return the state value.
+ *           It should have the signature of the event callback, except that all
+ *           parameters are optional. If the params are not set, a default value
+ *           for the state should be returned. If the state value should not
+ *           change from its previous value, the function can return a `NoChange`
+ *           object.
+ * @param deps The dependencies of the callback function.
+ * @param initialValue The initial value of the state, before the callback finishes its initial run.
+ * @returns State
+ */
+export function useEventEmitterAsyncState<T, Events extends string, Arguments extends ListenerMap<Events>>(
+    emitter: TypedEventEmitter<Events, Arguments> | undefined,
+    eventName: string | symbol,
+    fn: Mapper<AsyncStateCallbackResult<T>>,
+    deps: DependencyList,
+    initialValue: T,
+): T;
+export function useEventEmitterAsyncState<T, Events extends string, Arguments extends ListenerMap<Events>>(
+    emitter: TypedEventEmitter<Events, Arguments> | undefined,
+    eventName: string | symbol,
+    fn: Mapper<AsyncStateCallbackResult<T>>,
+    deps: DependencyList,
+    initialValue?: T,
+): T | undefined;
+export function useEventEmitterAsyncState<T, Events extends string, Arguments extends ListenerMap<Events>>(
+    emitter: TypedEventEmitter<Events, Arguments> | undefined,
+    eventName: string | symbol,
+    fn: Mapper<AsyncStateCallbackResult<T>>,
+    deps: DependencyList,
+    initialValue?: T,
+): T | undefined {
+    const [value, setValue] = useState<T | undefined>(initialValue);
+
+    let running = false;
+    // If the handler is called while it's already running, we remember the
+    // arguments that it was called with, and call the handler again when the
+    // first call is done.
+    const rerunArgs: any[] = [];
+
+    const handler = useCallback(
+        (...args: any[]) => {
+            if (running) {
+                // We're already running, so remember the arguments we were
+                // called with, so that we can call the handler again when we're
+                // done.
+                rerunArgs.push(args);
+                return;
+            }
+            running = true; // eslint-disable-line react-hooks/exhaustive-deps
+            // Note: We need to use .then notation instead of async/await,
+            // because async/await would cause this function to return a
+            // promise, which `useEffect` doesn't like.
+            fn(...args)
+                .then((v) => {
+                    if (!(v instanceof NoChange)) {
+                        setValue(v);
+                    }
+                })
+                .finally(() => {
+                    running = false;
+                    if (rerunArgs.length != 0) {
+                        handler(...rerunArgs.shift());
+                    }
+                });
+        },
+        [fn, ...deps], // eslint-disable-line react-compiler/react-compiler
+    );
+
+    // re-run when the emitter changes
+    useEffect(handler, [emitter, handler, ...deps]);
+    useEventEmitter(emitter, eventName, handler);
+    return value;
+}
+
+/**
+ * Indicates that the callback for `useEventEmitterAsyncState` is not changing the value of the state.
+ */
+export class NoChange {}
diff --git a/src/hooks/useIsEncrypted.ts b/src/hooks/useIsEncrypted.ts
index 75c43958dc..f5209ff065 100644
--- a/src/hooks/useIsEncrypted.ts
+++ b/src/hooks/useIsEncrypted.ts
@@ -7,9 +7,29 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { type MatrixClient, type MatrixEvent, type Room, EventType } from "matrix-js-sdk/src/matrix";
+import { type CryptoApi } from "matrix-js-sdk/src/crypto-api";
 
 import { useRoomState } from "./useRoomState.ts";
 import { useAsyncMemo } from "./useAsyncMemo.ts";
+import { LocalRoom } from "../models/LocalRoom.ts";
+
+/**
+ * Check if a room is encrypted.
+ * If the room is a LocalRoom, check the state directly.
+ * Otherwise, use the crypto API to check if encryption is enabled in the room.
+ *
+ * @param room - The room to check.
+ * @param cryptoApi - The crypto API from the Matrix client.
+ */
+export async function isRoomEncrypted(room: Room, cryptoApi: CryptoApi): Promise<boolean> {
+    if (room instanceof LocalRoom) {
+        // For local room check the state.
+        // The crypto check fails because the room ID is not valid (it is a local id)
+        return (room as LocalRoom).isEncryptionEnabled();
+    }
+
+    return await cryptoApi.isEncryptionEnabledInRoom(room.roomId);
+}
 
 // Hook to simplify watching whether a Matrix room is encrypted, returns null if room is undefined or the state is loading
 export function useIsEncrypted(cli: MatrixClient, room?: Room): boolean | null {
@@ -22,7 +42,7 @@ export function useIsEncrypted(cli: MatrixClient, room?: Room): boolean | null {
             const crypto = cli.getCrypto();
             if (!room || !crypto) return null;
 
-            return crypto.isEncryptionEnabledInRoom(room.roomId);
+            return isRoomEncrypted(room, crypto);
         },
         [room, encryptionStateEvent],
         null,
diff --git a/src/hooks/useMediaVisible.ts b/src/hooks/useMediaVisible.ts
index f367e87c4f..de0b0fbf6d 100644
--- a/src/hooks/useMediaVisible.ts
+++ b/src/hooks/useMediaVisible.ts
@@ -6,7 +6,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { useCallback } from "react";
-import { JoinRule } from "matrix-js-sdk/src/matrix";
+import { JoinRule, type MatrixEvent } from "matrix-js-sdk/src/matrix";
 
 import { SettingLevel } from "../settings/SettingLevel";
 import { useSettingValue } from "./useSettings";
@@ -19,14 +19,25 @@ const PRIVATE_JOIN_RULES: JoinRule[] = [JoinRule.Invite, JoinRule.Knock, JoinRul
 
 /**
  * Should the media event be visible in the client, or hidden.
- * @param eventId The eventId of the media event.
- * @returns A boolean describing the hidden status, and a function to set the visiblity.
+ *
+ * This function uses the `mediaPreviewConfig` setting to determine the rules for the room
+ * along with the `showMediaEventIds` setting for specific events.
+ *
+ * A function may be provided to alter the visible state.
+ *
+ * @param The event that contains the media. If not provided, the global rule is used.
+ *
+ * @returns Returns a tuple of:
+ *          A boolean describing the hidden status.
+ *          A function to show or hide the event.
  */
-export function useMediaVisible(eventId?: string, roomId?: string): [boolean, (visible: boolean) => void] {
-    const mediaPreviewSetting = useSettingValue("mediaPreviewConfig", roomId);
+export function useMediaVisible(mxEvent?: MatrixEvent): [boolean, (visible: boolean) => void] {
+    const eventId = mxEvent?.getId();
+    const mediaPreviewSetting = useSettingValue("mediaPreviewConfig", mxEvent?.getRoomId());
     const client = useMatrixClientContext();
     const eventVisibility = useSettingValue("showMediaEventIds");
-    const joinRule = useRoomState(client.getRoom(roomId) ?? undefined, (state) => state.getJoinRule());
+    const room = client.getRoom(mxEvent?.getRoomId()) ?? undefined;
+    const joinRule = useRoomState(room, (state) => state.getJoinRule());
     const setMediaVisible = useCallback(
         (visible: boolean) => {
             SettingsStore.setValue("showMediaEventIds", null, SettingLevel.DEVICE, {
@@ -43,6 +54,9 @@ export function useMediaVisible(eventId?: string, roomId?: string): [boolean, (v
     // Always prefer the explicit per-event user preference here.
     if (explicitEventVisiblity !== undefined) {
         return [explicitEventVisiblity, setMediaVisible];
+    } else if (mxEvent?.getSender() === client.getUserId()) {
+        // If this event is ours and we've not set an explicit visibility, default to on.
+        return [true, setMediaVisible];
     } else if (mediaPreviewSetting.media_previews === MediaPreviewValue.Off) {
         return [false, setMediaVisible];
     } else if (mediaPreviewSetting.media_previews === MediaPreviewValue.On) {
diff --git a/src/hooks/usePinnedEvents.ts b/src/hooks/usePinnedEvents.ts
index f563211129..98f544097b 100644
--- a/src/hooks/usePinnedEvents.ts
+++ b/src/hooks/usePinnedEvents.ts
@@ -38,6 +38,10 @@ function getPinnedEventIds(room?: Room): string[] {
             .getState(EventTimeline.FORWARDS)
             ?.getStateEvents(EventType.RoomPinnedEvents, "")
             ?.getContent()?.pinned ?? [];
+    if (!Array.isArray(eventIds)) {
+        logger.warn("Encountered invalid pinned events state in room", room?.roomId, eventIds);
+        return [];
+    }
     // Limit the number of pinned events to 100
     return eventIds.slice(0, 100);
 }
diff --git a/src/hooks/useRoomMembers.ts b/src/hooks/useRoomMembers.ts
index 14448ba307..44007c82e1 100644
--- a/src/hooks/useRoomMembers.ts
+++ b/src/hooks/useRoomMembers.ts
@@ -38,6 +38,11 @@ type RoomMemberCountOpts = {
      * Wait time between room member count update
      */
     throttleWait?: number;
+    /**
+     * Whether to include invited members in the count
+     * @default false
+     */
+    includeInvited?: boolean;
 };
 
 /**
@@ -48,19 +53,21 @@ type RoomMemberCountOpts = {
  */
 export const useRoomMemberCount = (
     room: Room,
-    { throttleWait }: RoomMemberCountOpts = { throttleWait: 250 },
+    { throttleWait, includeInvited }: RoomMemberCountOpts = { throttleWait: 250, includeInvited: false },
 ): number => {
-    const [count, setCount] = useState<number>(room.getJoinedMemberCount());
+    const [count, setCount] = useState<number>(
+        includeInvited ? room.getInvitedAndJoinedMemberCount() : room.getJoinedMemberCount(),
+    );
     const throttledUpdate = useMemo(
         () =>
             throttle(
                 () => {
-                    setCount(room.getJoinedMemberCount());
+                    setCount(includeInvited ? room.getInvitedAndJoinedMemberCount() : room.getJoinedMemberCount());
                 },
                 throttleWait,
                 { leading: true, trailing: true },
             ),
-        [room, throttleWait],
+        [room, throttleWait, includeInvited],
     );
 
     useTypedEventEmitter(room.currentState, RoomStateEvent.Members, throttledUpdate);
diff --git a/src/hooks/useUserTimezone.ts b/src/hooks/useUserTimezone.ts
index 0e5f046d74..04de7c60e1 100644
--- a/src/hooks/useUserTimezone.ts
+++ b/src/hooks/useUserTimezone.ts
@@ -5,11 +5,19 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 import { useEffect, useState } from "react";
-import { type MatrixClient, MatrixError } from "matrix-js-sdk/src/matrix";
+import {
+    type MatrixClient,
+    MatrixError,
+    ProfileKeyMSC4175Timezone,
+    ProfileKeyTimezone,
+} from "matrix-js-sdk/src/matrix";
+import { logger } from "matrix-js-sdk/src/logger";
 
 import { getTwelveHourOptions } from "../DateUtils.ts";
 import { useSettingValue } from "./useSettings.ts";
 
+const log = logger.getChild("useUserTimezone");
+
 /**
  * Fetch a user's delclared timezone through their profile, and return
  * a friendly string of the current time for that user. This will keep
@@ -52,11 +60,13 @@ export const useUserTimezone = (cli: MatrixClient, userId: string): { timezone:
             return;
         }
         (async () => {
-            console.log("Trying to fetch TZ");
+            log.debug("Trying to fetch TZ for", userId);
             try {
-                const tz = await cli.getExtendedProfileProperty(userId, "us.cloke.msc4175.tz");
+                const userProfile = await cli.getExtendedProfile(userId);
+                // In a future spec release, remove support for legacy key.
+                const tz = userProfile[ProfileKeyTimezone] ?? userProfile[ProfileKeyMSC4175Timezone];
                 if (typeof tz !== "string") {
-                    // Err, definitely not a tz.
+                    // Definitely not a tz.
                     throw Error("Timezone value was not a string");
                 }
                 // This will validate the timezone for us.
@@ -85,7 +95,7 @@ export const useUserTimezone = (cli: MatrixClient, userId: string): { timezone:
                     // No timezone set, ignore.
                     return;
                 }
-                console.error("Could not render current timezone for user", ex);
+                log.warn(`Could not render current timezone for ${userId}`, ex);
             }
         })();
     }, [supported, userId, cli, showTwelveHour]);
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index f454a2f1e4..19f2321f14 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -95,7 +95,7 @@
         "maximise": "Maximalizovat",
         "mention": "Zmínit",
         "minimise": "Minimalizovat",
-        "new_message": "Nová zpráva",
+        "new_conversation": "Nová konverzace",
         "new_room": "Nová místnost",
         "new_video_room": "Nová video místnost",
         "next": "Další",
@@ -242,8 +242,7 @@
             "setup_key_backup_title": "Přijdete o přístup k šifrovaným zprávám",
             "setup_secure_backup_description_1": "Šifrované zprávy jsou zabezpečené koncovým šifrováním. Klíče pro jejich dešifrování máte jen vy a příjemci zpráv.",
             "setup_secure_backup_description_2": "Po odhlášení budou tyto klíče z tohoto zařízení odstraněny, což znamená, že nebudete moci číst zašifrované zprávy, pokud k nim nemáte klíče v jiných zařízeních nebo je nemáte zálohované na serveru.",
-            "skip_key_backup": "Už své zašifrované zprávy nechci",
-            "use_key_backup": "Začít používat zálohu klíčů"
+            "skip_key_backup": "Už své zašifrované zprávy nechci"
         },
         "misconfigured_body": "Požádejte správce vašeho %(brand)su, aby zkontroloval <a>vaši konfiguraci</a>. Pravděpodobně obsahuje chyby nebo duplicity.",
         "misconfigured_title": "%(brand)s je špatně nakonfigurován",
@@ -602,12 +601,12 @@
         "user": "Uživatel",
         "user_avatar": "Profilový obrázek",
         "username": "Uživatelské jméno",
-        "verification_cancelled": "Oveření bylo zrušeno",
         "verified": "Ověřeno",
         "version": "Verze",
         "video": "Video",
         "video_room": "Video místnost",
         "view_message": "Zobrazit zprávu",
+        "voice": "Hlas",
         "warning": "Upozornění"
     },
     "composer": {
@@ -648,16 +647,17 @@
         "mode_plain": "Skrýt formátování",
         "mode_rich_text": "Zobrazit formátování",
         "no_perms_notice": "Nemáte oprávnění zveřejňovat příspěvky v této místnosti",
-        "placeholder": "Odeslat zprávu…",
-        "placeholder_encrypted": "Odeslat šifrovanou zprávu…",
-        "placeholder_reply": "Odpovědět…",
-        "placeholder_reply_encrypted": "Odeslat šifrovanou odpověď…",
-        "placeholder_thread": "Odpovědět na vlákno…",
-        "placeholder_thread_encrypted": "Odpovědět na zašifrované vlákno…",
+        "placeholder": "Odeslat nešifrovanou zprávu…",
+        "placeholder_encrypted": "Odeslat zprávu...",
+        "placeholder_reply": "Odeslat nešifrovanou odpověď…",
+        "placeholder_reply_encrypted": "Odeslat odpověď…",
+        "placeholder_thread": "Odpovědět v nešifrovaném vláknu…",
+        "placeholder_thread_encrypted": "Odpovědět ve vláknu…",
         "poll_button": "Hlasování",
         "poll_button_no_perms_description": "Nemáte oprávnění zahajovat hlasování v této místnosti.",
         "poll_button_no_perms_title": "Vyžaduje oprávnění",
         "replying_title": "Odpovídá",
+        "room_unencrypted": "Zprávy v této místnosti nejsou koncově šifrované.",
         "room_upgraded_link": "Konverzace pokračuje zde.",
         "room_upgraded_notice": "Tato místnost byla nahrazena a už není používaná.",
         "send_button_title": "Poslat zprávu",
@@ -721,6 +721,7 @@
         "personal_space_description": "Soukromý prostor pro uspořádání vašich místností",
         "private_description": "Pouze pozvat, nejlepší pro sebe nebo pro týmy",
         "private_heading": "Váš soukromý prostor",
+        "private_only_heading": "Váš prostor",
         "private_personal_description": "Zajistěte, aby do %(name)s měli přístup správní lidé",
         "private_personal_heading": "S kým pracujete?",
         "private_space": "Já a moji spolupracovníci",
@@ -788,6 +789,7 @@
             "cross_signing_status": "Stav křížového podepisování:",
             "cross_signing_untrusted": "Váš účet má v bezpečném úložišti identitu pro křížový podpis, ale v této relaci jí zatím nevěříte.",
             "crypto_not_available": "Kryptografický modul není k dispozici",
+            "device_id": "ID zařízení",
             "key_backup_active_version": "Verze aktivní zálohy:",
             "key_backup_active_version_none": "Žádné",
             "key_backup_inactive_warning": "Vaše klíče nejsou z této relace zálohovány.",
@@ -800,11 +802,24 @@
             "secret_storage_ready": "připraveno",
             "secret_storage_status": "Bezpečné úložiště:",
             "self_signing_private_key_cached_status": "Soukromý klíč s vlastním podpisem:",
+            "session": "Relace",
+            "session_fingerprint": "Otisk prstu (klíč relace)",
             "title": "Koncové šifrování",
             "user_signing_private_key_cached_status": "Podpisový soukromý klíč uživatele:"
         },
         "developer_mode": "Vývojářský režim",
         "developer_tools": "Nástroje pro vývojáře",
+        "device_dehydrated_no": "Dehydratované: Ne",
+        "device_dehydrated_yes": "Dehydratované: Ano",
+        "device_id": "ID zařízení: %(deviceId)s",
+        "device_keys": "Klíče zařízení",
+        "device_verification_status": {
+            "signed_by_owner": "Stav ověření: <E2EIcon /> Podepsáno vlastníkem",
+            "unknown": "Stav ověření: Neznámý",
+            "unverified": "Stav ověření: <E2EIcon /> Není podepsáno vlastníkem",
+            "verified": "Stav ověření: <E2EIcon /> Ověřeno křížovým podpisem"
+        },
+        "devices": "Kryptografická zařízení (%(count)s)",
         "edit_setting": "Upravit nastavení",
         "edit_values": "Upravit hodnoty",
         "empty_string": "<prázdný řetězec>",
@@ -820,15 +835,18 @@
         "failed_to_save": "Nepodařilo se uložit nastavení.",
         "failed_to_send": "Nepodařilo se odeslat událost!",
         "id": "ID: ",
+        "invalid_device_key_id": "Neplatné ID klíče zařízení",
         "invalid_json": "Nevypadá to jako platný JSON.",
         "level": "Úroveň",
         "low_bandwidth_mode": "Režim malé šířky pásma",
         "low_bandwidth_mode_description": "Vyžaduje kompatibilní domovský server.",
         "main_timeline": "Hlavní časová osa",
+        "manual_device_verification": "Ruční ověření zařízení",
         "no_receipt_found": "Žádné potvrzení o přečtení",
         "notification_state": "Stav oznámení je <strong>%(notificationState)s</strong>",
         "notifications_debug": "Ladění oznámení",
         "number_of_users": "Počet uživatelů",
+        "only_joined_members": "Pouze připojení uživatelé",
         "original_event_source": "Původní zdroj události",
         "room_encrypted": "Místnost je <strong>šifrovaná ✅</strong>",
         "room_id": "ID místnosti: %(roomId)s",
@@ -862,6 +880,7 @@
             "elementCallUrl": "Element Call URL"
         },
         "settings_explorer": "Průzkumník nastavení",
+        "show_empty_content_events": "Zobrazit události s prázdným obsahem",
         "show_hidden_events": "Zobrazovat v časové ose skryté události",
         "spaces": {
             "one": "<mezera>",
@@ -874,10 +893,23 @@
         "toggle_event": "přepnout událost",
         "toolbox": "Sada nástrojů",
         "use_at_own_risk": "Toto uživatelské rozhraní NEKONTROLUJE typy hodnot. Použití na vlastní nebezpečí.",
+        "user_avatar": "Avatar: %(avatar)s",
+        "user_displayname": "Zobrazované jméno: %(displayname)s",
+        "user_id": "ID uživatele: %(userId)s",
+        "user_no_avatar": "Avatar: <i>Žádný</i>",
+        "user_no_displayname": "Zobrazované jméno: <i>Žádné</i>",
         "user_read_up_to": "Uživatel přečetl až: ",
         "user_read_up_to_ignore_synthetic": "Uživatel čte až do (ignoreSynthetic): ",
         "user_read_up_to_private": "Uživatel čte až do (m.read.private): ",
         "user_read_up_to_private_ignore_synthetic": "Uživatel čte až do (m.read.private;ignoreSynthetic): ",
+        "user_room_membership": "Členství: %(membership)s",
+        "user_verification_status": {
+            "identity_changed": "Stav ověření: <E2EIcon /> Neověřeno a identita změněna",
+            "unverified": "Stav ověření: <E2EIcon /> Neověřeno",
+            "verified": "Stav ověření: <E2EIcon /> Ověřeno",
+            "was_verified": "Stav ověření:<E2EIcon /> Bylo ověřeno, ale identita se změnila."
+        },
+        "users": "Uživatelé",
         "value": "Hodnota",
         "value_colon": "Hodnota:",
         "value_in_this_room": "Hodnota v této místnosti",
@@ -919,11 +951,10 @@
             },
             "privacy_warning": "Ujistěte se, že tuto obrazovku nikdo nevidí!",
             "restoring": "Obnovení klíčů ze zálohy",
-            "security_key_title": "Klíč pro obnovení"
+            "security_key_label": "Klíč pro obnovení",
+            "security_key_title": "Zadejte klíč pro obnovení"
         },
         "bootstrap_title": "Příprava klíčů",
-        "cancel_entering_passphrase_description": "Chcete určitě zrušit zadávání přístupové fráze?",
-        "cancel_entering_passphrase_title": "Zrušit zadávání přístupové fráze?",
         "confirm_encryption_setup_body": "Kliknutím na tlačítko níže potvrďte nastavení šifrování.",
         "confirm_encryption_setup_title": "Potvrďte nastavení šifrování",
         "cross_signing_room_normal": "Místnost je koncově šifrovaná",
@@ -934,6 +965,7 @@
         "cross_signing_user_warning": "Tento uživatel zatím neověřil všechny své relace.",
         "enter_recovery_key": "Zadejte klíč pro obnovení",
         "event_shield_reason_authenticity_not_guaranteed": "Pravost této šifrované zprávy nelze na tomto zařízení ověřit.",
+        "event_shield_reason_mismatched_sender": "Odesílatel události se neshoduje s vlastníkem zařízení, které ji odeslalo.",
         "event_shield_reason_mismatched_sender_key": "Šifrované neověřenou relací",
         "event_shield_reason_unknown_device": "Šifrováno neznámým nebo smazaným zařízením.",
         "event_shield_reason_unsigned_device": "Šifrováno zařízením, které nebylo ověřeno jeho vlastníkem.",
@@ -966,11 +998,8 @@
             "title": "Záloha klíčů byla odstraněna",
             "warning": "Pokud jste způsob obnovy neodstranili vy, mohou se pokoušet k vašemu účtu dostat útočníci. Změňte si raději ihned heslo a nastavte nový způsob obnovy v Nastavení."
         },
-        "reset_all_button": "Zapomněli nebo ztratili jste všechny metody obnovy? <a>Resetovat vše</a>",
         "set_up_recovery": "Nastavení obnovení",
-        "set_up_recovery_later": "Teď ne",
         "set_up_recovery_toast_description": "Vygenerujte klíč pro obnovení, který lze použít k obnovení historie šifrovaných zpráv v případě, že ztratíte přístup k zařízením.",
-        "set_up_toast_description": "Zabezpečení proti ztrátě přístupu k šifrovaným zprávám a datům",
         "set_up_toast_title": "Nastavení zabezpečené zálohy",
         "setup_secure_backup": {
             "explainer": "Před odhlášením si zazálohujte klíče abyste o ně nepřišli."
@@ -991,16 +1020,17 @@
             "after_new_login": {
                 "device_verified": "Zařízení ověřeno",
                 "skip_verification": "Prozatím přeskočit ověřování",
-                "unable_to_verify": "Nelze ověřit toto zařízení",
                 "verify_this_device": "Ověřit toto zařízení"
             },
-            "cancelled": "Zrušili jste proces ověření.",
-            "cancelled_self": "Ověřování na jiném zařízení jste zrušili.",
-            "cancelled_user": "%(displayName)s zrušil(a) proces ověření.",
+            "cancelled_verification": "Buď vypršel časový limit požadavku, požadavek byl zamítnut, nebo došlo k nesouladu ověření.",
             "cancelling": "Rušení…",
+            "cant_confirm": "Nemůžete potvrdit?",
             "complete_action": "OK",
             "complete_description": "Uživatel úspěšně ověřen.",
             "complete_title": "Ověřeno!",
+            "confirm_identity_description": "Ověřte toto zařízení a nastavte zabezpečené zasílání zpráv.",
+            "confirm_identity_title": "Potvrďte svou totožnost",
+            "confirm_the_emojis": "Zkontrolujte, zda se níže uvedené emotikony shodují s emotikony zobrazenými na vašem druhém zařízení.",
             "error_starting_description": "Nepodařilo se zahájit chat s druhým uživatelem.",
             "error_starting_title": "Chyba při zahájení ověření",
             "explainer": "Bezpečné zprávy s tímto uživatelem jsou koncově šifrované a nikdo další je nemůže číst.",
@@ -1011,58 +1041,72 @@
             "incoming_sas_dialog_waiting": "Čekání na potvrzení partnerem…",
             "incoming_sas_user_dialog_text_1": "Po ověření bude uživatel označen jako důvěryhodný. Ověřování uživatelů vám dává větší jistotu, že je komunikace důvěrná.",
             "incoming_sas_user_dialog_text_2": "Ověření uživatele označí jeho relace za důvěryhodné a vaše relace budou důvěryhodné pro něj.",
-            "no_key_or_device": "Vypadá to, že nemáte klíč pro obnovení ani žádné jiné zařízení, které byste mohli ověřit.  Toto zařízení nebude mít přístup ke starým zašifrovaným zprávám. Abyste mohli na tomto zařízení ověřit svou identitu, budete muset obnovit ověřovací klíče.",
+            "manual": {
+                "already_verified": "Toto zařízení je již ověřeno",
+                "already_verified_and_wrong_fingerprint": "Zadaný otisk prstu se neshoduje, ale zařízení je již ověřené!",
+                "device_id": "ID zařízení",
+                "failure_description": "Nepodařilo se ověřit '%(deviceId)s': %(error)s",
+                "failure_title": "Ověření se nezdařilo",
+                "fingerprint": "Otisk prstu (klíč relace)",
+                "no_crypto": "Nelze ověřit zařízení - šifrování není povoleno",
+                "no_device": "Nelze ověřit zařízení - zařízení '%(deviceId)s' nebylo nalezeno",
+                "no_userid": "Nelze ověřit zařízení - nelze najít naše ID uživatele",
+                "success_description": "Zařízení (%(deviceId)s) je nyní křížově podepsáno",
+                "success_title": "Ověření proběhlo úspěšně",
+                "text": "Zadejte ID a otisk prstu jednoho ze svých vlastních zařízení a ověřte jej. POZNÁMKA to umožňuje druhému zařízení odesílat a přijímat zprávy jako vy. POKUD VÁM NĚKDO ŘEKL, ABYSTE SEM NĚCO VLOŽILI, JE PRAVDĚPODOBNÉ, ŽE JSTE PODVEDENI!",
+                "wrong_fingerprint": "Nelze ověřit zařízení '%(deviceId)s' - zadaný otisk prstu '%(fingerprint)s' neodpovídá otisku prstu zařízení, '%(fprint)s'"
+            },
             "no_support_qr_emoji": "Zařízení, které se snažíte ověřit, neumožňuje ověření QR kódem ani pomocí emotikonů, které %(brand)s podporuje. Zkuste použít jiného klienta.",
+            "now_you_can": "Nyní můžete bezpečně číst nebo odesílat zprávy a tomuto zařízení může důvěřovat kdokoli, s kým si povídáte.",
+            "once_accepted_can_continue": "Po přijetí budete moci pokračovat s ověřením.",
             "other_party_cancelled": "Druhá strana ověření zrušila.",
             "prompt_encrypted": "Ověřit všechny uživatele v místnosti, abyste se přesvědčili o bezpečnosti.",
-            "prompt_self": "Začít proces ověření znovu pomocí notifikace.",
             "prompt_unencrypted": "V šifrovaných místnostech ověřte všechny uživatele, abyste zajistili bezpečnost komunikace.",
-            "prompt_user": "Proces ověření začněte znovu z profilu kontaktu.",
             "qr_or_sas": "%(qrCode)s nebo %(emojiCompare)s",
-            "qr_or_sas_header": "Ověřte toto zařízení dokončením jedné z následujících položek:",
             "qr_prompt": "Naskenujte tento jedinečný kód",
-            "qr_reciprocate_same_shield_device": "Už to skoro je! Zobrazuje vaše druhé zařízení stejný štít?",
+            "qr_reciprocate_check_again_device": "Zkontrolujte znovu na svém druhém zařízení, abyste dokončili ověření.",
+            "qr_reciprocate_no": "Ne, nevidím zelený štít",
             "qr_reciprocate_same_shield_user": "Téměř hotovo! Je relace %(displayName)s také ověřená?",
-            "request_toast_accept": "Ověřit relaci",
+            "qr_reciprocate_yes": "Ano, vidím zelený štít",
             "request_toast_accept_user": "Ověřit uživatele",
             "request_toast_decline_counter": "Ignorovat (%(counter)s)",
             "request_toast_detail": "%(deviceId)s z %(ip)s",
-            "reset_proceed_prompt": "Pokračovat v resetování",
+            "request_toast_start_verification": "Zahájit ověření",
             "sas_caption_self": "Ověřte toto zařízení tak, že potvrdíte, že se na jeho obrazovce zobrazí následující číslo.",
             "sas_caption_user": "Ověřte uživatele zkontrolováním, že se na obrazovce objevila stejná čísla.",
             "sas_description": "Pokud na žádném zařízení nemáte kameru, porovnejte jedinečnou kombinaci emoji",
-            "sas_emoji_caption_self": "Potvrďte, že se následující emotikony zobrazují na obou zařízeních ve stejném pořadí:",
             "sas_emoji_caption_user": "Ověřte uživatele zkontrolováním, že se mu na obrazovce objevily stejné emoji.",
             "sas_match": "Shodují se",
             "sas_no_match": "Neshodují se",
             "sas_prompt": "Porovnejte jedinečnou kombinaci emoji",
             "scan_qr": "Ověřte naskenováním",
             "scan_qr_explainer": "Požádejte uživatele %(displayName)s o naskenování tohoto kódu pro vaše ověření:",
-            "self_verification_hint": "Pro pokračování, přijměte žádost o ověření na svém dalším zařízení.",
             "start_button": "Zahájit ověření",
-            "successful_device": "Ověřili jste %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "Úspěšně jste ověřili vaše zařízení!",
             "successful_user": "Úspěšně jste ověřili uživatele %(displayName)s!",
-            "timed_out": "Ověření vypršelo.",
             "unsupported_method": "Nepovedlo se nám najít podporovanou metodu ověření.",
             "unverified_session_toast_accept": "Ano, to jsem byl já",
             "unverified_session_toast_title": "Nové přihlášní. Jste to vy?",
             "unverified_sessions_toast_description": "Zkontrolujte, zda je váš účet v bezpečí",
             "unverified_sessions_toast_reject": "Později",
             "unverified_sessions_toast_title": "Máte neověřené relace",
-            "verification_description": "Ověřte svou identitu, abyste získali přístup k šifrovaným zprávám a prokázali svou identitu ostatním. Pokud používáte také mobilní zařízení, před pokračováním otevřete aplikaci.",
+            "use_another_device": "Použít jiné zařízení",
+            "use_recovery_key": "Použít klíč pro obnovení",
+            "verification_dialog_title_choose": "Vyberte způsob ověření",
+            "verification_dialog_title_compare_emojis": "Porovnejte emotikony",
+            "verification_dialog_title_confirm_green_shield": "Potvrďte, že na druhém zařízení vidíte zelený štít",
             "verification_dialog_title_device": "Ověřit jiné zařízení",
+            "verification_dialog_title_failed": "Ověření se nezdařilo",
+            "verification_dialog_title_start_on_other_device": "Spusťte ověření na druhém zařízení",
             "verification_dialog_title_user": "Požadavek na ověření",
+            "verification_dialog_title_verified": "Zařízení ověřeno",
             "verification_skip_warning": "Bez ověření nebudete mít přístup ke všem svým zprávám a můžete se ostatním jevit jako nedůvěryhodní.",
             "verification_success_with_backup": "Vaše nové zařízení je nyní ověřeno. Má přístup k vašim zašifrovaným zprávám a ostatní uživatelé jej budou považovat za důvěryhodné.",
             "verification_success_without_backup": "Vaše nové zařízení je nyní ověřeno. Ostatní uživatelé jej uvidí jako důvěryhodné.",
+            "verify_by_completing_one_of": "Ověřte provedením jedné z následujících akcí:",
             "verify_emoji": "Ověřit pomocí emoji",
             "verify_emoji_prompt": "Ověření porovnáním několika emoji.",
             "verify_emoji_prompt_qr": "Pokud vám skenování kódů nefunguje, ověřte se porovnáním emoji.",
             "verify_later": "Ověřím se později",
-            "verify_using_device": "Ověřit pomocí jiného zařízení",
-            "verify_using_key": "Ověřit pomocí klíče pro obnovení",
-            "verify_using_key_or_phrase": "Ověření pomocí klíče pro obnovení nebo fráze",
             "waiting_for_user_accept": "Čekáme, než %(displayName)s výzvu přijme…",
             "waiting_other_device": "Čekáme na ověření na jiném zařízení…",
             "waiting_other_device_details": "Čekáme na ověření na vašem dalším zařízení, %(deviceName)s (%(deviceId)s)…",
@@ -1112,6 +1156,7 @@
         "tls": "Nelze se připojit k domovskému serveru – zkontrolujte prosím své připojení, prověřte, zda je <a>SSL certifikát</a> vašeho domovského serveru důvěryhodný, a že některé z rozšíření prohlížeče neblokuje komunikaci.",
         "unknown": "Neznámá chyba",
         "unknown_error_code": "neznámý kód chyby",
+        "update_history_visibility": "Nepodařilo se změnit viditelnost historie",
         "update_power_level": "Nepodařilo se změnit úroveň oprávnění"
     },
     "error_app_open_in_another_tab": "Přepněte na jiný panel a připojte se k %(brand)s. Tuto kartu nyní můžete zavřít.",
@@ -1158,7 +1203,7 @@
             "audio": "Zvuk",
             "file": "Soubor",
             "image": "Obrázek",
-            "poll": "Anketa",
+            "poll": "Hlasování",
             "video": "Video"
         },
         "preview": "<bold>%(prefix)s: </bold> %(preview)s"
@@ -1352,6 +1397,10 @@
         "name_email_mxid_share_space": "Pozvěte někoho pomocí jeho jména, e-mailové adresy, uživatelského jména (například <userId/>) nebo <a>sdílejte tento prostor</a>.",
         "name_mxid_share_room": "Pozvěte někoho pomocí svého jména, uživatelského jména (například <userId />) nebo <a>sdílejte tuto místnost</a>.",
         "name_mxid_share_space": "Pozvěte někoho pomocí jeho jména, uživatelského jména (například <userId/>) nebo <a>sdílejte tento prostor</a>.",
+        "progress": {
+            "dont_close": "Nezavírejte aplikaci, dokud neskončíte.",
+            "preparing": "Příprava pozvánek..."
+        },
         "recents_section": "Nedávné konverzace",
         "room_failed_partial": "Poslali jsme ostatním, ale níže uvedení lidé nemohli být pozváni do <RoomName/>",
         "room_failed_partial_title": "Některé pozvánky nebylo možné odeslat",
@@ -1438,6 +1487,7 @@
         "room_list_navigate_down": "Přejít dolů v seznamu místností",
         "room_list_navigate_up": "Přejít nahoru v seznamu místností",
         "room_list_select_room": "Vybrat místnost v seznamu",
+        "save": "Uložit",
         "scroll_down_timeline": "Posunout se na časové ose dolů",
         "scroll_up_timeline": "Posunout se na časové ose nahoru",
         "search": "Hledat (musí být povoleno)",
@@ -1454,7 +1504,6 @@
         "upload_file": "Nahrát soubor"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Povolit režim pouze sdílení obrazovky",
         "ask_to_join": "Umožnit požádat o vstup",
         "automatic_debug_logs": "Automaticky odesílat ladící protokoly při jakékoli chybě",
         "automatic_debug_logs_decryption": "Automaticky odesílat ladící protokoly při chybách dešifrování",
@@ -1519,6 +1568,9 @@
         "render_reaction_images_description": "Někdy se označují jako \"vlastní emoji\".",
         "report_to_moderators": "Nahlásit moderátorům",
         "report_to_moderators_description": "V místnostech, které podporují moderování, můžete pomocí tlačítka \"Nahlásit\" nahlásit zneužití moderátorům místnosti.",
+        "share_history_on_invite": "Sdílet šifrovanou historii s novými členy",
+        "share_history_on_invite_description": "Při pozvání uživatele do šifrované místnosti, u které je viditelnost historie nastavena na „sdílená“, sdílet šifrovanou historii s tímto uživatelem a přijmout šifrovanou historii, když jste pozváni do takové místnosti.",
+        "share_history_on_invite_warning": "Tato funkce je EXPERIMENTÁLNÍ a nejsou v ní implementována všechna bezpečnostní opatření. Neaktivujte ji na produkčních účtech.",
         "sliding_sync": "Režim klouzavé synchronizace",
         "sliding_sync_description": "V aktivním vývoji, nelze zakázat.",
         "sliding_sync_disabled_notice": "Pro vypnutí se odhlaste a znovu přihlaste",
@@ -1548,22 +1600,22 @@
         "explainer_1": "Sem přídejte servery a uživatele, které chcete ignorovat. Hvězdička pro %(brand)s zastupuje libovolný počet kterýchkoliv znaků. Např. <code>@bot:*</code> bude ignorovat všechny uživatele se jménem „bot“ na kterémkoliv serveru.",
         "explainer_2": "Lidé a servery jsou blokováni pomocí seznamů obsahující pravidla koho blokovat. Odebírání blokovacího seznamu znamená, že neuvidíte uživatele a servery na něm uvedené.",
         "lists": "Odebíráte:",
-        "lists_description_1": "Odebíráním seznamu zablokovaných uživatelů se přidáte do jeho místnosti!",
+        "lists_description_1": "Odebíráním seznamu vykázaných uživatelů se přidáte do jeho místnosti!",
         "lists_description_2": "Pokud to nechcete, tak prosím použijte jiný nástroj na blokování uživatelů.",
         "lists_heading": "Odebírané seznamy",
-        "lists_new_label": "ID nebo adresa seznamu zablokovaných",
+        "lists_new_label": "ID nebo adresa seznamu vykázaných",
         "no_lists": "Neodebíráte žádné seznamy",
         "personal_description": "Váš osobní seznam vykázaných obsahuje všechny uživatele/servery, od kterých osobně nechcete vidět zprávy. Po ignorování prvního uživatele/serveru se ve vašem seznamu místností objeví nová místnost s názvem \"%(myBanList)s\" - v této místnosti zůstaňte, aby seznam zákazů zůstal v platnosti.",
         "personal_empty": "Nikoho neignorujete.",
-        "personal_heading": "Osobní seznam blokací",
+        "personal_heading": "Osobní seznam vykázání",
         "personal_new_label": "Server nebo ID uživatele",
         "personal_new_placeholder": "např.: @bot:* nebo example.org",
         "personal_section": "Ignorujete:",
-        "room_name": "Můj seznam zablokovaných",
+        "room_name": "Můj seznam vykázaných",
         "room_topic": "Toto je váš seznam blokovaných uživatelů/serverů - neopouštějte tuto místnost!",
         "rules_empty": "Žádné",
         "rules_server": "Pravidla serveru",
-        "rules_title": "Pravidla blokování - %(roomName)s",
+        "rules_title": "Pravidla vykázání - %(roomName)s",
         "rules_user": "Pravidla uživatele",
         "something_went_wrong": "Něco se nepovedlo. Zkuste pro prosím znovu nebo se podívejte na detaily do konzole.",
         "title": "Ignorovaní uživatelé",
@@ -1641,8 +1693,8 @@
         "filter_placeholder": "Najít člena místnosti",
         "invite_button_no_perms_tooltip": "Nemáte oprávnění zvát uživatele",
         "invited_label": "Pozván",
-        "no_matches": "Žádné shody",
-        "power_label": "%(userName)s (oprávnění %(powerLevelNumber)s)"
+        "list_title": "Seznam členů",
+        "no_matches": "Žádné shody"
     },
     "member_list_back_action_label": "Členové místnosti",
     "message_edit_dialog_title": "Úpravy zpráv",
@@ -1746,6 +1798,7 @@
     },
     "power_level": {
         "admin": "Správce",
+        "creator": "Vlastník",
         "custom": "Vlastní (%(level)s)",
         "custom_level": "Vlastní úroveň",
         "default": "Výchozí",
@@ -1854,11 +1907,6 @@
                 "other": "Můžete připnout až %(count)s widgetů"
             },
             "menu": "Otevřít menu",
-            "release_announcement": {
-                "close": "OK",
-                "description": "Všechny připnuté zprávy najdete zde. Přejděte na libovolnou zprávu a výběrem možnosti \"Připnout\" ji přidejte.",
-                "title": "Všechny nové připnuté zprávy"
-            },
             "reply_thread": "Odpověď na <link>vlákno zprávy</link>",
             "unpin_all": {
                 "button": "Odepnout všechny zprávy",
@@ -1892,7 +1940,7 @@
             "view_in_timeline": "Zobrazit hlasování na časové ose",
             "view_poll": "Zobrazit hlasování"
         },
-        "polls_button": "Ankety",
+        "polls_button": "Hlasování",
         "room_summary_card": {
             "title": "Informace o místnosti"
         },
@@ -1960,6 +2008,7 @@
         },
         "face_pile_tooltip_shortcut": "Včetně %(commaSeparatedMembers)s",
         "face_pile_tooltip_shortcut_joined": "Včetně vás, %(commaSeparatedMembers)s",
+        "failed_determine_user": "Nelze určit, kterého uživatele ignorovat, protože se změnila událost člena.",
         "failed_reject_invite": "Nepodařilo se odmítnout pozvánku",
         "forget_room": "Zapomenout na tuto místnost",
         "forget_space": "Zapomenout tento prostor",
@@ -1979,7 +2028,9 @@
         "inaccessible_subtitle_1": "Zkuste to později nebo požádejte správce místnosti či prostoru, aby zkontroloval, zda máte přístup.",
         "inaccessible_subtitle_2": "Při pokusu o přístup do místnosti nebo prostoru bylo vráceno %(errcode)s. Pokud si myslíte, že se vám tato zpráva zobrazuje chybně, pošlete prosím <issueLink>hlášení o chybě</issueLink>.",
         "intro": {
+            "display_topic": "Téma: <topic/>",
             "dm_caption": "V této konverzaci jste pouze vy dva, dokud někdo z vás nepozve někoho dalšího.",
+            "edit_topic": "Téma: <topic/> (<a>upravit</a>)",
             "enable_encryption_prompt": "Povolte šifrování v nastavení.",
             "encrypted_3pid_dm_pending_join": "Jakmile se všichni připojí, budete moci konverzovat",
             "no_avatar_label": "Přidejte fotografii, aby lidé mohli snadno najít váši místnost.",
@@ -1989,8 +2040,6 @@
             "send_message_start_dm": "Odesláním první zprávy pozvete <displayName/> do chatu",
             "start_of_dm_history": "Toto je začátek historie vašich přímých zpráv s uživatelem <displayName />.",
             "start_of_room": "Toto je začátek místnosti <roomName/>.",
-            "topic": "Téma: %(topic)s ",
-            "topic_edit": "Téma: %(topic)s (<a>upravit</a>)",
             "unencrypted_warning": "Koncové šifrování není povoleno",
             "user_created": "%(displayName)s vytvořil tuto místnost.",
             "you_created": "Vytvořili jste tuto místnost."
@@ -2045,13 +2094,16 @@
         "pinned_message_banner": {
             "button_close_list": "Zavřít seznam",
             "button_view_all": "Zobrazit vše",
-            "description": "Tato místnost má připnuté zprávy. Kliknutím je zobrazíte.",
-            "go_to_message": "Zobrazit připnutou zprávu na časové ose.",
+            "description": "Připnuté zprávy",
+            "go_to_newest_message": "Zobrazit připnutou zprávu na časové ose a nejnovější připnutou zprávu zde",
+            "go_to_next_message": "Zobrazit připnutou zprávu na časové ose a další nejstarší připnutou zprávu zde",
             "title": "<bold>%(index)sz%(length)s</bold> Připnuté zprávy"
         },
         "read_topic": "Klikněte pro přečtení tématu",
         "rejecting": "Odmítání pozvánky…",
         "rejoin_button": "Znovu vstoupit",
+        "room_content": "Obsah místnosti",
+        "room_is_low_priority": "Toto je místnost s nízkou prioritou",
         "search": {
             "all_rooms_button": "Vyhledávat ve všech místnostech",
             "placeholder": "Hledat zprávy…",
@@ -2100,9 +2152,9 @@
     "room_list": {
         "add_room_label": "Přidat místnost",
         "add_space_label": "Přidat prostor",
-        "appearance": "Vzhled",
         "breadcrumbs_empty": "Žádné nedávno navštívené místnosti",
         "breadcrumbs_label": "Nedávno navštívené místnosti",
+        "collapse_filters": "Sbalit seznam filtrů",
         "empty": {
             "no_chats": "Zatím žádné chaty",
             "no_chats_description": "Začněte tím, že někomu pošlete zprávu nebo vytvoříte místnost",
@@ -2110,6 +2162,7 @@
             "no_favourites": "Zatím nemáte oblíbený chat",
             "no_favourites_description": "Chat si můžete přidat do oblíbených v nastavení chatu",
             "no_invites": "Nemáte žádné nepřečtené pozvánky",
+            "no_lowpriority": "Nemáte žádné místnosti s nízkou prioritou",
             "no_mentions": "Nemáte žádné nepřečtené zmínky",
             "no_people": "Zatím s nikým nemáte přímé chaty",
             "no_people_description": "Můžete zrušit výběr filtrů, abyste viděli ostatní chaty",
@@ -2119,12 +2172,14 @@
             "show_activity": "Zobrazit veškerou aktivitu",
             "show_chats": "Zobrazit všechny chaty"
         },
+        "expand_filters": "Rozbalit seznam filtrů",
         "failed_add_tag": "Nepodařilo se přidat štítek %(tagName)s k místnosti",
         "failed_remove_tag": "Nepodařilo se odstranit štítek %(tagName)s z místnosti",
         "failed_set_dm_tag": "Nepodařilo se nastavit značku přímé zprávy",
         "filters": {
             "favourite": "Oblíbené",
             "invites": "Pozvánky",
+            "low_priority": "Nízká priorita",
             "mentions": "Zmínky",
             "people": "Lidé",
             "rooms": "Místnosti",
@@ -2158,7 +2213,6 @@
         },
         "room_options": "Možnosti místnosti",
         "show_less": "Zobrazit méně",
-        "show_message_previews": "Zobrazit náhledy zpráv",
         "show_n_more": {
             "other": "Zobrazit %(count)s dalších",
             "one": "Zobrazit %(count)s další"
@@ -2342,6 +2396,10 @@
             "users_default": "Výchozí role"
         },
         "security": {
+            "cannot_change_to_private_due_to_missing_history_visiblity_permissions": {
+                "description": "Nemáte oprávnění měnit viditelnost historie místnosti. To je nebezpečné, protože by to mohlo umožnit uživatelům, kteří nejsou členy, číst zprávy.",
+                "title": "Nelze nastavit místnost jako soukromou"
+            },
             "enable_encryption_confirm_description": "Po zapnutí již nelze šifrování v této místnosti vypnout. Zprávy v šifrovaných místnostech mohou číst jen členové místnosti, server se k obsahu nedostane. Šifrování místností nepodporuje většina botů a propojení. <a>Více informací o šifrování.</a>",
             "enable_encryption_confirm_title": "Povolit šifrování?",
             "enable_encryption_public_room_confirm_description_1": "<b>Nedoporučuje se šifrovat veřejné místnosti.</b>Veřejné místnosti může najít a připojit se k nim kdokoli, takže si v nich může číst zprávy kdokoli. Nezískáte tak žádnou z výhod šifrování a nebudete ho moci později vypnout. Šifrování zpráv ve veřejné místnosti zpomalí příjem a odesílání zpráv.",
@@ -2359,7 +2417,7 @@
             "history_visibility_joined": "Pouze členové (od chvíle jejich vstupu)",
             "history_visibility_legend": "Kdo může číst historii?",
             "history_visibility_shared": "Pouze členové (od chvíle vybrání této volby)",
-            "history_visibility_warning": "Změny viditelnosti historie této místnosti ovlivní jenom nové zprávy. Viditelnost starších zpráv zůstane, jaká byla v době jejich odeslání.",
+            "history_visibility_warning": "Viditelnost stávající historie se nezmění.",
             "history_visibility_world_readable": "Kdokoliv",
             "join_rule_description": "Rozhodněte, kdo se může připojit k místnosti %(roomName)s.",
             "join_rule_invite": "Soukromý (pouze pro pozvané)",
@@ -2402,6 +2460,7 @@
                 "other": "Aktualizace prostorů... (%(progress)s z %(count)s)"
             },
             "join_rule_upgrade_upgrading_room": "Aktualizace místnosti",
+            "join_rule_world_readable_description": "Změna toho, kdo může vstoupit do místnosti, změní také viditelnost budoucích zpráv.",
             "public_without_alias_warning": "Přidejte prosím místnosti adresu aby na ní šlo odkazovat.",
             "publish_room": "Zviditelněte tuto místnost ve veřejném adresáři místností.",
             "publish_space": "Zviditelněte tento prostor ve veřejném adresáři místností.",
@@ -2416,7 +2475,6 @@
             "error_update_guest_access": "Nepodařilo se aktualizovat přístup hosta do tohoto prostoru",
             "error_update_history_visibility": "Nepodařilo se aktualizovat viditelnost historie tohoto prostoru",
             "guest_access_explainer": "Hosté se mohou připojit k prostoru, aniž by měli účet.",
-            "guest_access_explainer_public_space": "To může být užitečné pro veřejné prostory.",
             "guest_access_label": "Povolit přístup hostům",
             "history_visibility_anyone_space": "Nahlédnout do prostoru",
             "history_visibility_anyone_space_description": "Umožněte lidem prohlédnout si váš prostor ještě předtím, než se připojí.",
@@ -2540,6 +2598,7 @@
                 "breadcrumb_second_description": "Ztratíte veškerou historii zpráv, která je uložena pouze na serveru",
                 "breadcrumb_third_description": "Budete muset znovu ověřit všechna svá stávající zařízení a kontakty",
                 "breadcrumb_title": "Opravdu chcete obnovit svou identitu?",
+                "breadcrumb_title_cant_confirm": "Musíte resetovat svou totožnost",
                 "breadcrumb_title_forgot": "Zapomněli jste klíč pro obnovení? Budete muset obnovit svou identitu.",
                 "breadcrumb_title_sync_failed": "Synchronizace úložiště klíčů se nezdařila. Musíte obnovit svou identitu.",
                 "breadcrumb_warning": "Udělejte to pouze v případě, že se domníváte, že váš účet byl napaden.",
@@ -2547,7 +2606,7 @@
                 "do_not_close_warning": "Nezavírejte toto okno, dokud není resetování dokončeno",
                 "export_keys": "Exportovat klíče",
                 "import_keys": "Importovat klíče",
-                "other_people_device_description": "Upozornění: Uživatelé, kteří s vámi výslovně neověřili (např. pomocí emotikonů), nedostanou vaše šifrované zprávy. Také neověřená zařízení ověřených uživatelů nebudou přijímat vaše šifrované zprávy.",
+                "other_people_device_description": "Upozornění: Uživatelé, kteří s vámi výslovně neověřili (např. pomocí emotikonů), nedostanou vaše šifrované zprávy. Také neověřená zařízení ověřených uživatelů nebudou přijímat vaše šifrované zprávy. Aby se změny projevily, je nutné restartovat aplikaci.",
                 "other_people_device_label": "V šifrovaných místnostech posílat zprávy pouze ověřeným uživatelům",
                 "other_people_device_title": "Zařízení ostatních uživatelů",
                 "reset_identity": "Obnovit kryptografickou identitu",
@@ -2616,6 +2675,7 @@
             "allow_spellcheck": "Povolit kontrolu pravopisu",
             "application_language": "Jazyk aplikace",
             "application_language_reload_hint": "Po výběru jiného jazyka se aplikace znovu načte.",
+            "avatar_open_menu": "Otevřít nabídku avatara",
             "avatar_remove_progress": "Odstranění obrázku...",
             "avatar_save_progress": "Nahrávání obrázku...",
             "avatar_upload_error_text": "Formát souboru není podporován nebo je obrázek větší než %(size)s.",
@@ -2693,13 +2753,11 @@
         "inline_url_previews_room": "Povolit náhledy URL adres pro členy této místnosti jako výchozí",
         "inline_url_previews_room_account": "Povolit náhledy URL adres pro tuto místnost (ovlivňuje pouze vás)",
         "insert_trailing_colon_mentions": "Vložit dvojtečku za zmínku o uživateli na začátku zprávy",
+        "invite_controls": {
+            "default_label": "Povolit uživatelům pozvat vás do místností"
+        },
         "jump_to_bottom_on_send": "Po odeslání zprávy přejít na konec časové osy",
         "key_backup": {
-            "backup_in_progress": "Klíče se zálohují (první záloha může trvat pár minut).",
-            "backup_starting": "Zahájení zálohování…",
-            "backup_success": "Úspěch!",
-            "cannot_create_backup": "Nepovedlo se vyrobit zálohů klíčů",
-            "create_title": "Vytvořit zálohu klíčů",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Vaše klíče jsou nyní zálohovány z tohoto zařízení.",
                 "backup_setup_success_title": "Bezpečné zálohování bylo úspěšné",
@@ -2759,6 +2817,7 @@
             "show_in_private": "V soukromých místnostech",
             "show_media": "Vždy zobrazit"
         },
+        "not_supported": "Váš server tuto funkci neimplementuje.",
         "notifications": {
             "default_setting_description": "Toto nastavení se ve výchozím stavu použije pro všechny vaše místnosti.",
             "default_setting_section": "Chci být upozorňován na (Výchozí nastavení)",
@@ -2816,6 +2875,7 @@
             "voip": "Hlasové a video hovory"
         },
         "preferences": {
+            "Electron.enableContentProtection": "Zabraňte zachycení obsahu okna jinými aplikacemi",
             "Electron.enableHardwareAcceleration": "Povolit hardwarovou akceleraci (restaurtujte %(appName)s, aby se změna projevila)",
             "always_show_menu_bar": "Vždy zobrazovat horní lištu okna",
             "autocomplete_delay": "Zpožnění našeptávače (ms)",
@@ -2824,6 +2884,7 @@
             "composer_heading": "Editor zpráv",
             "default_timezone": "Výchozí nastavení prohlížeče (%(timezone)s )",
             "dialog_title": "<strong>Nastavení:</strong> Předvolby",
+            "enable_content_protection": "Povolit ochranu obsahu",
             "enable_hardware_acceleration": "Povolit hardwarovou akceleraci",
             "enable_tray_icon": "Zobrazit ikonu v oznamovací oblasti a minimalizivat při zavření okna",
             "keyboard_heading": "Klávesové zkratky",
@@ -2837,6 +2898,7 @@
             "room_list_heading": "Seznam místností",
             "show_avatars_pills": "Zobrazovat avatary ve zmínkách o uživatelích, místnostech a událostech",
             "show_polls_button": "Zobrazit tlačítko hlasování",
+            "startup_window_behaviour_label": "Spuštění a chování okna",
             "surround_text": "Ohraničit označený text při psaní speciálních znaků",
             "time_heading": "Zobrazování času",
             "user_timezone": "Nastavit časové pásmo"
@@ -2857,7 +2919,6 @@
             "ignore_users_empty": "Nemáte žádné ignorované uživatele.",
             "ignore_users_section": "Ignorovaní uživatelé",
             "key_backup_algorithm": "Algoritmus:",
-            "key_backup_connect": "Připojit k zálohování klíčů",
             "message_search_disable_warning": "Když je to zakázané, zprávy v šifrovaných místnostech se nebudou objevovat ve výsledcích vyhledávání.",
             "message_search_disabled": "Bezpečně uchovávat zprávy na tomto zařízení aby se v nich dalo vyhledávat.",
             "message_search_enabled": {
@@ -2989,6 +3050,7 @@
         "show_chat_effects": "Zobrazit efekty chatu (animace např. při přijetí konfet)",
         "show_displayname_changes": "Zobrazovat změny zobrazovaného jména",
         "show_join_leave": "Zobrazit zprávy o vstupu/odchodu (pozvánky/odebrání/vykázání nejsou ovlivněny)",
+        "show_message_previews": "Zobrazit náhledy zpráv",
         "show_nsfw_content": "Zobrazit NSFW obsah",
         "show_read_receipts": "Zobrazovat potvrzení o přečtení",
         "show_redaction_placeholder": "Zobrazovat smazané zprávy",
@@ -3011,7 +3073,12 @@
             "spaces_explainer": "Prostory jsou způsoby, jak seskupit místnosti a lidi. Kromě prostor, ve kterých se nacházíte, můžete použít i některé předem vytvořené.",
             "title": "Postranní panel"
         },
-        "start_automatically": "Zahájit automaticky po přihlášení do systému",
+        "start_automatically": {
+            "disabled": "Ne",
+            "enabled": "Ano",
+            "label": "Spustit %(brand)s když se přihlásíte k počítači",
+            "minimised": "Minimalizováno"
+        },
         "tac_only_notifications": "Zobrazení oznámení pouze v centru aktivity vlákna",
         "use_12_hour_format": "Zobrazovat čas v 12hodinovém formátu (např. 2:30 odp.)",
         "use_command_enter_send_message": "K odeslání zprávy použijte Command + Enter",
@@ -3095,6 +3162,8 @@
         "jumptodate": "Přejít na zadané datum na časové ose",
         "jumptodate_invalid_input": "Nebyli jsme schopni porozumět zadanému datu (%(inputDate)s). Zkuste použít formát RRRR-MM-DD.",
         "lenny": "Vloží ( ͡° ͜ʖ ͡°) na začátek zprávy",
+        "manual_device_verification_confirm_description": "To umožní jinému zařízení odesílat a přijímat zprávy jako vy. POKUD VÁM NĚKDO ŘEKL, ABYSTE SEM NĚCO VLOŽILI, JE PRAVDĚPODOBNÉ, ŽE JSTE PODVEDENI! Opravdu chcete ověřit toto další zařízení?",
+        "manual_device_verification_confirm_title": "Upozornění: ruční ověření zařízení",
         "me": "Zobrazí akci",
         "msg": "Pošle zprávu danému uživateli",
         "myavatar": "Změní váš profilový obrázek ve všech místnostech",
@@ -3135,6 +3204,7 @@
         "upgraderoom": "Aktualizuje místnost na novou verzi",
         "upgraderoom_permission_error": "Na provedení tohoto příkazu nemáte dostatečná oprávnění.",
         "usage": "Použití",
+        "verify": "Ruční ověření jednoho ze svých vlastních zařízení",
         "view": "Zobrazí místnost s danou adresou",
         "whois": "Zobrazuje informace o uživateli"
     },
@@ -3376,6 +3446,7 @@
             "unable_to_find": "Pokusili jste se načíst bod na časové ose místnosti, ale nepodařilo se ho najít."
         },
         "m.audio": {
+            "audio_player": "Audio přehrávač",
             "error_downloading_audio": "Chyba při stahování audia",
             "error_processing_audio": "Došlo k chybě při zpracovávání hlasové zprávy",
             "error_processing_voice_message": "Chyba při zpracování hlasové zprávy",
@@ -3437,7 +3508,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Ukončil hlasování",
             "sender_ended": "%(senderName)s ukončil(a) hlasování"
         },
         "m.poll.start": "%(senderName)s zahájil(a) hlasování - %(pollQuestion)s",
@@ -3582,7 +3652,7 @@
             "changed_rule_rooms": "%(senderName)s změnil(a) pravidlo blokující místnosti odpovídající %(oldGlob)s na místnosti odpovídající %(newGlob)s z důvodu %(reason)s",
             "changed_rule_servers": "%(senderName)s změnil(a) pravidlo blokující servery odpovídající %(oldGlob)s na servery odpovídající %(newGlob)s z důvodu %(reason)s",
             "changed_rule_users": "%(senderName)s změnil(a) pravidlo blokující uživatele odpovídající %(oldGlob)s na uživatele odpovídající %(newGlob)s z důvodu %(reason)s",
-            "created_rule": "%(senderName)s vytvořil blokovací pravidlo odpovídající %(glob)s z důvodu %(reason)s",
+            "created_rule": "%(senderName)s vytvořil pravidlo vykázání odpovídající %(glob)s z důvodu %(reason)s",
             "created_rule_rooms": "%(senderName)s vytvořil pravidlo blokující místnosti odpovídající %(glob)s z důvodu %(reason)s",
             "created_rule_servers": "%(senderName)s vytvořil pravidlo blokující servery odpovídající %(glob)s z důvodu %(reason)s",
             "created_rule_users": "%(senderName)s vytvořil(a) pravidlo blokující uživatele odpovídající %(glob)s z důvodu %(reason)s",
@@ -3591,8 +3661,8 @@
             "removed_rule_rooms": "%(senderName)s odstranil pravidlo blokující místnosti odpovídající %(glob)s",
             "removed_rule_servers": "%(senderName)s odstranil pravidlo blokující servery odpovídající %(glob)s",
             "removed_rule_users": "%(senderName)s odstranil(a) pravidlo blokující uživatele odpovídající %(glob)s",
-            "updated_invalid_rule": "%(senderName)s aktualizoval neplatné pravidlo blokování",
-            "updated_rule": "%(senderName)s aktualizoval blokovací pravidlo odpovídající %(glob)s z důvodu %(reason)s",
+            "updated_invalid_rule": "%(senderName)s aktualizoval neplatné pravidlo vykázání",
+            "updated_rule": "%(senderName)s aktualizoval pravidlo vykázání odpovídající %(glob)s z důvodu %(reason)s",
             "updated_rule_rooms": "%(senderName)s aktualizoval pravidlo blokující místnosti odpovídající %(glob)s z důvodu %(reason)s",
             "updated_rule_servers": "%(senderName)s aktualizoval pravidlo blokující servery odpovídající %(glob)s z důvodu %(reason)s",
             "updated_rule_users": "%(senderName)s aktualizoval(a) pravidlo blokující uživatele odpovídající %(glob)s z důvodu %(reason)s"
@@ -3936,12 +4006,12 @@
         "connection_lost": "Došlo ke ztrátě připojení k serveru",
         "connection_lost_description": "Bez připojení k serveru nelze uskutečňovat hovory.",
         "consulting": "Konzultace s %(transferTarget)s. <a>Převod na %(transferee)s</a>",
+        "decline_call": "Odmítnout",
         "default_device": "Výchozí zařízení",
         "dial": "Vytočit",
         "dialpad": "Číselník",
         "disable_camera": "Vypnout kameru",
         "disable_microphone": "Ztlumit mikrofon",
-        "disabled_no_one_here": "Není tu nikdo, komu zavolat",
         "disabled_no_perms_start_video_call": "Nemáte oprávnění ke spuštění videohovorů",
         "disabled_no_perms_start_voice_call": "Nemáte oprávnění k zahájení hlasových hovorů",
         "disabled_ongoing_call": "Průběžný hovor",
@@ -3988,6 +4058,7 @@
         "show_sidebar_button": "Zobrazit postranní panel",
         "silence": "Ztlumit zvonění",
         "silenced": "Oznámení ztlumena",
+        "skip_lobby_toggle_option": "Připojte se ihned",
         "start_screenshare": "Začít sdílet obrazovku",
         "stop_screenshare": "Ukončit sdílení obrazovky",
         "too_many_calls": "Přiliš mnoho hovorů",
@@ -4008,9 +4079,11 @@
         "user_busy_description": "Volaný uživatel je zaneprázdněn.",
         "user_is_presenting": "%(sharerName)s prezentuje",
         "video_call": "Videohovor",
+        "video_call_incoming": "Příchozí videohovor",
         "video_call_started": "Videohovor byl zahájen",
         "video_call_using": "Videohovor pomocí:",
         "voice_call": "Hlasový hovor",
+        "voice_call_incoming": "Příchozí hlasový hovor",
         "you_are_presenting": "Prezentujete"
     },
     "web_default_device_name": "%(appName)s: %(browserName)s na %(osName)s",
diff --git a/src/i18n/strings/cy.json b/src/i18n/strings/cy.json
index d73c13a384..e1f8ea0e3e 100644
--- a/src/i18n/strings/cy.json
+++ b/src/i18n/strings/cy.json
@@ -97,7 +97,6 @@
         "maximise": "Mwyhau",
         "mention": "Crybwyll",
         "minimise": "Lleihau",
-        "new_message": "Neges newydd",
         "new_room": "Ystafell newydd",
         "new_video_room": "Ystafell fideo newydd",
         "next": "Nesaf",
@@ -244,8 +243,7 @@
             "setup_key_backup_title": "Byddwch yn colli mynediad i'ch negeseuon wedi'u hamgryptio",
             "setup_secure_backup_description_1": "Mae negeseuon wedi'u hamgryptio yn cael eu diogelu gydag amgryptio o'r dechrau i'r diwedd. Dim ond chi a'r derbynwyr sydd â'r allweddi i ddarllen y negeseuon hyn.",
             "setup_secure_backup_description_2": "Pan fyddwch yn allgofnodi, bydd yr allweddi hyn yn cael eu dileu o'r ddyfais hon, sy'n golygu na fyddwch yn gallu darllen negeseuon wedi'u hamgryptio oni bai bod gennych yr allweddi ar eu cyfer ar eich dyfeisiau eraill, neu eu bod wedi'u gwneud wrth gefn i'r gweinydd.",
-            "skip_key_backup": "Dydw i ddim eisiau fy negeseuon wedi'u hamgryptio",
-            "use_key_backup": "Dechreuwch ddefnyddio Key Backup"
+            "skip_key_backup": "Dydw i ddim eisiau fy negeseuon wedi'u hamgryptio"
         },
         "misconfigured_body": "Gofynnwch i'ch gweinyddwr %(brand)s wirio'ch <a>ffurfweddiad</a> am gofnodion anghywir neu ddyblyg.",
         "misconfigured_title": "Mae eich %(brand)s wedi'i gam ffurfweddu",
@@ -476,6 +474,11 @@
         "advanced": "Uwch",
         "all_chats": "Pob Sgwrs",
         "analytics": "Dadansoddi Gwe",
+        "and_n_others": {
+            "a dim arall...": "zero",
+            "ac un arall...": "one",
+            "a %(count)s arall...": "other"
+        },
         "appearance": "Gwedd",
         "application": "Rhaglen",
         "are_you_sure": "Ydych chi'n siŵr?",
@@ -530,6 +533,14 @@
         "moderation_and_safety": "Cymedroli a diogelwch",
         "modern": "Modern",
         "mute": "Tewi",
+        "n_members": {
+            "%(count)s aelodau": "zero",
+            "%(count)s aelod": "other"
+        },
+        "n_rooms": {
+            "%(count)s ystafelloedd": "zero",
+            "%(count)s ystafell": "other"
+        },
         "name": "Enw",
         "no_results": "Dim canlyniadau",
         "no_results_found": "Heb ganfod canlyniad",
@@ -592,7 +603,6 @@
         "user": "Defnyddwyr",
         "user_avatar": "Llun proffil",
         "username": "Enw defnyddiwr",
-        "verification_cancelled": "Dilysiad wedi'i ddiddymu",
         "verified": "Wedi ei wirio",
         "version": "Fersiwn",
         "video": "Fideo",
@@ -638,16 +648,17 @@
         "mode_plain": "Cuddio fformatio",
         "mode_rich_text": "Dangos fformatio",
         "no_perms_notice": "Nid oes gennych ganiatâd i bostio i'r ystafell hon",
-        "placeholder": "Anfon neges…",
-        "placeholder_encrypted": "Anfon neges wedi'i hamgryptio…",
-        "placeholder_reply": "Anfon ateb…",
-        "placeholder_reply_encrypted": "Anfon ateb wedi'i amgryptio…",
-        "placeholder_thread": "Ateb i edefyn…",
-        "placeholder_thread_encrypted": "Ymateb i edefyn wedi'i amgryptio…",
+        "placeholder": "Anfon message heb ei hamgryptio …",
+        "placeholder_encrypted": "Anfon neges…",
+        "placeholder_reply": "Anfonwch ateb heb ei amgryptio…",
+        "placeholder_reply_encrypted": "Anfon ateb…",
+        "placeholder_thread": "Ymateb i'r edefyn heb ei hamgryptio …",
+        "placeholder_thread_encrypted": "Ymateb i'r edefyn…",
         "poll_button": "Arolwg",
         "poll_button_no_perms_description": "Nid oes gennych ganiatâd i ddechrau pleidleisio yn yr ystafell hon.",
         "poll_button_no_perms_title": "Angen Caniatâd",
         "replying_title": "Yn ateb",
+        "room_unencrypted": "Nid yw negeseuon yn yr ystafell hon wedi'u hamgryptio o ben-i-ben",
         "room_upgraded_link": "Mae'r sgwrs yn parhau yma.",
         "room_upgraded_notice": "Mae'r ystafell hon wedi'i hadnewyddu ac nid yw'n weithredol mwyach.",
         "send_button_title": "Anfon neges",
@@ -711,6 +722,7 @@
         "personal_space_description": "Man preifat i drefnu eich ystafelloedd",
         "private_description": "Gwahoddiad yn unig, sydd orau i chi'ch hun neu dimau",
         "private_heading": "Eich lle preifat",
+        "private_only_heading": "Eich gofod",
         "private_personal_description": "Sicrhewch fod gan y bobl iawn fynediad i %(matere)s",
         "private_personal_heading": "Gyda phwy ydych chi'n gweithio?",
         "private_space": "Fi a fy nghyd-chwaraewyr",
@@ -778,6 +790,7 @@
             "cross_signing_status": "Statws traws-arwyddo:",
             "cross_signing_untrusted": "Mae gan eich cyfrif hunaniaeth traws-lofnodi mewn storfa gyfrinachol, ond nid yw'r sesiwn hon yn ymddiried ynddo eto.",
             "crypto_not_available": "Nid yw'r modiwl cryptograffig ar gael",
+            "device_id": "ID dyfais",
             "key_backup_active_version": "Fersiwn wrth gefn gweithredol:",
             "key_backup_active_version_none": "Dim",
             "key_backup_inactive_warning": "Nid yw'ch allweddi'n cael eu gwneud wrth gefn o'r sesiwn hon.",
@@ -790,11 +803,17 @@
             "secret_storage_ready": "barod",
             "secret_storage_status": "Storfa cyfrinachol:",
             "self_signing_private_key_cached_status": "Allwedd breifat hunan-lofnodi:",
+            "session": "Sesiwn",
+            "session_fingerprint": "Bysbrint (allwedd sesiwn)",
             "title": "Amgryptio o ben i ben",
             "user_signing_private_key_cached_status": "Allwedd breifat llofnodi'r defnyddiwr:"
         },
         "developer_mode": "Modd datblygwr",
         "developer_tools": "Offer Datblygwr",
+        "device_dehydrated_no": "Dadhydredig: Na",
+        "device_dehydrated_yes": "Dadhydredig: Ydyw",
+        "device_id": "ID dyfais: %(deviceId)s",
+        "device_keys": "Allweddi dyfais",
         "edit_setting": "Golygu gosodiad",
         "edit_values": "Golygu gwerthoedd",
         "empty_string": "<empty string>",
@@ -815,6 +834,7 @@
         "low_bandwidth_mode": "Modd lled band isel",
         "low_bandwidth_mode_description": "Angen gweinydd cartref cydnaws.",
         "main_timeline": "Prif linell amser",
+        "manual_device_verification": "Dilysu dyfais â llaw",
         "no_receipt_found": "Heb ganfod derbynneb",
         "notification_state": "Y cyflwr hysbysu yw <strong>%(notificationState)s</strong>",
         "notifications_debug": "Dadfygio hysbysiadau",
@@ -831,6 +851,10 @@
         "room_notifications_total": "Cyfanswm: ",
         "room_notifications_type": "Math: ",
         "room_status": "Statws ystafell",
+        "room_unread_status_count": {
+            "Statws heb eu darllen yn yr ystafell:<strong>%(status)s</strong> , cyfrif:<strong>%(count)s</strong>": "other",
+            "Statws heb ei ddarllen yn yr ystafell:<strong>%(status)s</strong> , cyfrif:<strong>%(count)s</strong>": "one"
+        },
         "save_setting_values": "Cadw gwerthoedd gosod",
         "see_history": "Gweld hanes",
         "send_custom_account_data_event": "Anfon digwyddiad data cyfrif personol",
@@ -848,7 +872,14 @@
             "elementCallUrl": "URL Galwad Element"
         },
         "settings_explorer": "Archwiliwr gosodiadau",
+        "show_empty_content_events": "Dangos digwyddiadau gyda chynnwys gwag",
         "show_hidden_events": "Dangos digwyddiadau cudd yn y llinell amser",
+        "spaces": {
+            "<%(count) s gofodau>": "zero",
+            "<space>": "one",
+            "<%(count) s ofod>": "two",
+            "<%(count) s gofod>": "other"
+        },
         "state_key": "Allwedd Cyflwr",
         "thread_root_id": "ID Gwraidd Edefyn: %(threadRootId)s",
         "threads_timeline": "Llinell amser edafedd",
@@ -895,15 +926,16 @@
     "empty_room_was_name": "Ystafell wag (roedd yn %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
+            "alternatives": "Os oes gennych allwedd ddiogelwch neu ymadrodd diogelwch, bydd hyn yn gweithio hefyd.",
             "key_validation_text": {
-                "wrong_security_key": "Allwedd Adfer Anghywir"
+                "wrong_security_key": "Nid yw'r allwedd adfer rydych wedi'i roi yn gywir."
             },
+            "privacy_warning": "Gwnewch yn siŵr nad oes neb yn gallu gweld y sgrin hon!",
             "restoring": "Adfer allweddi o'r copi wrth gefn",
-            "security_key_title": "Allwedd Adfer"
+            "security_key_label": "Allwedd adfer",
+            "security_key_title": "Rhowch eich allwedd adfer"
         },
         "bootstrap_title": "Gosod  allweddi",
-        "cancel_entering_passphrase_description": "Ydych chi'n siŵr eich bod am ddiddymu'r cyfrinymadrodd?",
-        "cancel_entering_passphrase_title": "Diddymu cyflwyno cyfrinymadrodd?",
         "confirm_encryption_setup_body": "Clicio'r botwm isod i gadarnhau gosod amgryptio.",
         "confirm_encryption_setup_title": "Cadarnhau gosodiad amgryptio",
         "cross_signing_room_normal": "Mae'r ystafell hon wedi'i hamgryptio o ben-i-ben",
@@ -914,6 +946,7 @@
         "cross_signing_user_warning": "Nid yw'r defnyddiwr hwn wedi gwirio eu holl sesiynau.",
         "enter_recovery_key": "Rhowch allwedd adfer",
         "event_shield_reason_authenticity_not_guaranteed": "Nid oes modd gwarantu dilysrwydd y neges hon sydd wedi'i hamgryptio ar y ddyfais hon.",
+        "event_shield_reason_mismatched_sender": "Nid yw anfonwr y digwyddiad yn cyfateb i berchennog y ddyfais a'i hanfonodd.",
         "event_shield_reason_mismatched_sender_key": "Wedi'i amgryptio gan sesiwn heb ei wirio",
         "event_shield_reason_unknown_device": "Wedi'i amgryptio gan ddyfais anhysbys neu wedi'i dileu.",
         "event_shield_reason_unsigned_device": "Wedi'i amgryptio gan ddyfais nad yw wedi'i dilysu gan ei pherchennog.",
@@ -946,11 +979,8 @@
             "title": "Dull Adfer Wedi'i Dynnu",
             "warning": "Os na wnaethoch chi ddileu'r dull adfer, mae'n bosibl bod ymosodwr yn ceisio cael mynediad i'ch cyfrif. Newidiwch eich cyfrinair cyfrif a gosodwch ddull adfer newydd ar unwaith yn y Gosodiadau."
         },
-        "reset_all_button": "Wedi anghofio neu golli pob dull adfer? <a>Ailosod y cyfan</a>",
         "set_up_recovery": "Gosod  adfer",
-        "set_up_recovery_later": "Nid nawr",
         "set_up_recovery_toast_description": "Cynhyrchwch allwedd adfer y mae modd ei defnyddio i adfer hanes eich neges wedi'i hamgryptio rhag ofn i chi golli mynediad i'ch dyfeisiau.",
-        "set_up_toast_description": "Diogelu rhag colli mynediad i negeseuon a data wedi'u hamgryptio",
         "set_up_toast_title": "Gosod Copi Wrth Gefn Diogel",
         "setup_secure_backup": {
             "explainer": "Gwnewch gopi wrth gefn o'ch allweddi cyn allgofnodi er mwyn osgoi eu colli."
@@ -971,16 +1001,15 @@
             "after_new_login": {
                 "device_verified": "Dyfais wedi'i dilysu",
                 "skip_verification": "Hepgor dilysu am y tro",
-                "unable_to_verify": "Methu â gwirio'r ddyfais hon",
                 "verify_this_device": "Dilyswch y ddyfais hon"
             },
-            "cancelled": "Rydych chi wedi diddymu'r dilysiad.",
-            "cancelled_self": "Rydych chi wedi diddymu dilysiad ar eich dyfais arall.",
-            "cancelled_user": "%(displayName)s dilysiad wedi'i ddiddymu.",
             "cancelling": "Wrthi'n diddymu…",
+            "cant_confirm": "Methu cadarnhau?",
             "complete_action": "Iawn",
             "complete_description": "Rydych chi wedi dilysu'r defnyddiwr hwn yn llwyddiannus.",
             "complete_title": "Gwirwyd!",
+            "confirm_identity_description": "Gwiriwch y ddyfais hon i osod negesu diogel",
+            "confirm_identity_title": "Cadarnhewch eich hunaniaeth",
             "error_starting_description": "Nid oeddem yn gallu dechrau sgwrs gyda'r defnyddiwr arall.",
             "error_starting_title": "Gwall wrth gychwyn y dilysu",
             "explainer": "Mae negeseuon diogel gyda'r defnyddiwr hwn wedi'u hamgryptio pen-i-ben ac ni all trydydd parti eu darllen.",
@@ -991,47 +1020,52 @@
             "incoming_sas_dialog_waiting": "Yn aros i bartner gadarnhau…",
             "incoming_sas_user_dialog_text_1": "Dilyswch y defnyddiwr hwn i'w nodi fel un y mae modd ymddiried ynddo. Mae ymddiried mewn defnyddwyr yn rhoi tawelwch meddwl ychwanegol i chi wrth ddefnyddio negeseuon wedi'u hamgryptio o'r dechrau i'r diwedd.",
             "incoming_sas_user_dialog_text_2": "Bydd dilysu'r defnyddiwr hwn yn nodi ei sesiwn fel un y mae modd ymddiried ynddi, a hefyd yn nodi bod eich sesiwn yn ymddiried ynddo.",
-            "no_key_or_device": "Mae'n ymddangos nad oes gennych Allwedd Adfer nac unrhyw ddyfeisiau eraill y gallwch wirio yn eu herbyn.  Ni fydd y ddyfais hon yn gallu cyrchu hen negeseuon wedi'u hamgryptio. Er mwyn gwirio pwy ydych ar y ddyfais hon, bydd angen i chi ailosod eich allweddi dilysu.",
+            "manual": {
+                "already_verified": "Mae'r ddyfais hon eisoes wedi'i gwirio",
+                "already_verified_and_wrong_fingerprint": "Nid yw'r bysbrintiau a gyflenwyd yn cyfateb, ond mae'r ddyfais eisoes wedi'i gwirio!",
+                "device_id": "ID dyfais",
+                "failure_description": "Methwyd gwirio '%(deviceId)s': %(error)s",
+                "failure_title": "Methodd y dilysu",
+                "fingerprint": "Bysbrint (allwedd sesiwn)",
+                "no_crypto": "Methu gwirio dyfais - nid yw crypto wedi'i alluogi",
+                "no_device": "Methu gwirio dyfais - heb ganfod dyfais '%(deviceId)s'",
+                "no_userid": "Methu gwirio dyfais - methu canfod ein ID Defnyddiwr",
+                "success_description": "Mae'r ddyfais (%(deviceId)s) bellach wedi'i chroes-lofnodi",
+                "success_title": "Dilysu llwyddiannus",
+                "text": "Rhowch ID ac olion bysedd un o'ch dyfeisiau eich hun i'w wirio. NODER bod hyn yn caniatáu i'r ddyfais arall anfon a derbyn negeseuon fel chi. OS DYWEDODD RHYWUN WRTHYCH CHI AM GLUDO RHYWBETH YMA, MAE'N DEBYGOL EICH BOD CHI'N CAEL EICH SGAMIO!",
+                "wrong_fingerprint": "Methu gwirio dyfais '%(deviceId)s' - nid yw'r bysbrintiau a ddarparwyd '%(fingerprint)s' yn cyfateb i fysbrintiau'r ddyfais, '%(fprint)s'"
+            },
             "no_support_qr_emoji": "Nid yw'r ddyfais rydych chi'n ceisio'i dilysu yn cefnogi sganio cod QR na dilysiad emoji, sef yr hyn y mae %(brand)s yn ei gefnogi. Ceisiwch gyda chleient gwahanol.",
             "other_party_cancelled": "Mae'r parti arall wedi diddymu'r dilysiad.",
             "prompt_encrypted": "Gwiriwch yr holl ddefnyddwyr mewn ystafell i sicrhau ei bod yn ddiogel.",
-            "prompt_self": "Dechreuwch ddilysu eto o'r hysbysiad.",
             "prompt_unencrypted": "Mewn ystafelloedd wedi'u hamgryptio, gwiriwch bob defnyddiwr i sicrhau ei fod yn ddiogel.",
-            "prompt_user": "Dechrau dilysu eto o'u proffil.",
             "qr_or_sas": "%(qrCode)s neu %(emojiCompare)s",
-            "qr_or_sas_header": "Dilyswch y ddyfais hon trwy gwblhau un o'r canlynol:",
             "qr_prompt": "Sganiwch y cod unigryw hwn",
-            "qr_reciprocate_same_shield_device": "Bron yno! A yw eich dyfais arall yn dangos yr un darian?",
             "qr_reciprocate_same_shield_user": "Bron yno! Ydy %(displayName)s yn dangos yr un darian?",
-            "request_toast_accept": "Dilysu Sesiwn",
             "request_toast_accept_user": "Dilysu Defnyddiwr",
             "request_toast_decline_counter": "Anwybyddu (%(counter)s)",
             "request_toast_detail": "%(deviceId)s oddi wrth %(ip)s",
-            "reset_proceed_prompt": "Mynd ymlaen i ailosod",
             "sas_caption_self": "Dilyswch y ddyfais hon trwy gadarnhau bod y rhif canlynol yn ymddangos ar ei sgrin.",
             "sas_caption_user": "Dilyswch y defnyddiwr hwn trwy gadarnhau bod y rhif canlynol yn ymddangos ar eu sgrin.",
             "sas_description": "Cymharwch set unigryw o emoji os nad oes gennych gamera ar y naill ddyfais na'r llall",
-            "sas_emoji_caption_self": "Cadarnhewch fod yr emoji isod yn cael eu harddangos ar y ddwy ddyfais, yn yr un drefn:",
             "sas_emoji_caption_user": "Dilyswch y defnyddiwr hwn trwy gadarnhau bod yr emoji canlynol yn ymddangos ar eu sgrin.",
             "sas_match": "Maen nhw'n cyfateb",
             "sas_no_match": "D'yn nhw ddim yn cyfateb",
             "sas_prompt": "Cymharu emoji unigryw",
             "scan_qr": "Gwirio trwy sganio",
             "scan_qr_explainer": "Gofynnwch i %(displayName)s sganio'ch cod:",
-            "self_verification_hint": "I symud ymlaen, derbyniwch y cais dilysu ar eich dyfais arall.",
             "start_button": "Dechrau Dilysu",
-            "successful_device": "Rydych chi wedi dilysu %(deviceName)s (%(deviceId)s) yn llwyddiannus!",
-            "successful_own_device": "Rydych chi wedi dilysu'ch dyfais yn llwyddiannus!",
             "successful_user": "Rydych chi wedi dilysu %(displayName)s yn llwyddiannus!",
-            "timed_out": "Daeth y cyfnod dilysu i ben.",
             "unsupported_method": "Methu dod o hyd i ddull dilysu a gefnogir.",
             "unverified_session_toast_accept": "Ie, fi wnaeth",
             "unverified_session_toast_title": "Mewngofnod newydd. Ai chi oedd hwn?",
             "unverified_sessions_toast_description": "Adolygwch i sicrhau bod eich cyfrif yn ddiogel",
             "unverified_sessions_toast_reject": "Yn hwyrach",
             "unverified_sessions_toast_title": "Mae gennych sesiynau heb eu gwirio",
-            "verification_description": "Dilyswch eich hunaniaeth i gael mynediad at negeseuon wedi'u hamgryptio a phrofwch eich hunaniaeth i eraill. Os ydych hefyd yn defnyddio dyfais symudol, a fyddech cystal ag agor yr ap yno cyn i chi fynd ymlaen.",
+            "use_another_device": "Defnyddiwch ddyfais arall",
+            "use_recovery_key": "Defnyddiwch yr allwedd adfer",
             "verification_dialog_title_device": "Dilysu dyfais arall",
+            "verification_dialog_title_failed": "Methodd y dilysu",
             "verification_dialog_title_user": "Cais Dilysu",
             "verification_skip_warning": "Heb ddilysu, ni fydd gennych fynediad i'ch holl negeseuon a gallech ymddangos fel rhai nad ydych yn ymddiried ynddynt i eraill.",
             "verification_success_with_backup": "Mae eich dyfais newydd bellach wedi'i dilysu. Mae ganddo fynediad i'ch negeseuon wedi'u hamgryptio, a bydd defnyddwyr eraill yn ei ystyried yn rhai y mae modd ymddiried ynddynt.",
@@ -1040,9 +1074,6 @@
             "verify_emoji_prompt": "Gwiriwch trwy gymharu emoji unigryw.",
             "verify_emoji_prompt_qr": "Os na allwch sganio'r cod uchod, gwiriwch trwy gymharu emoji unigryw.",
             "verify_later": "Byddaf yn gwirio yn ddiweddarach",
-            "verify_using_device": "Gwiriwch gyda dyfais arall",
-            "verify_using_key": "Dilyswch gydag Allwedd Adfer",
-            "verify_using_key_or_phrase": "Dilyswch gydag Allwedd Adfer neu Ymadrodd",
             "waiting_for_user_accept": "Yn aros i %(displayName)s dderbyn…",
             "waiting_other_device": "Yn aros i chi wirio ar eich dyfais arall…",
             "waiting_other_device_details": "Yn aros i chi wirio ar eich dyfais arall, %(deviceName)s (%(deviceId)s)…",
@@ -1092,6 +1123,7 @@
         "tls": "Methu cysylltu â homeserver - gwiriwch eich cysylltedd, sicrhewch eich bod yn ymddiried yn <a>nhystysgrif SSL eich gweinyddwr cartref</a> , ac nad yw estyniad porwr yn rhwystro ceisiadau.",
         "unknown": "Gwall anhysbys",
         "unknown_error_code": "cod gwall anhysbys",
+        "update_history_visibility": "Methwyd newid gwelededd hanes",
         "update_power_level": "Wedi methu â newid lefel pŵer"
     },
     "error_app_open_in_another_tab": "Newidiwch i'r tab arall i gysylltu â %(brand)s. Gellir cau'r tab hwn nawr.",
@@ -1155,7 +1187,28 @@
         "error_fetching_file": "Gwall wrth nôl ffeil",
         "export_info": "Dyma ddechrau allforio o<roomName/>. Wedi'i allforio gan<exporterDetails/> yn %(exportDate)s.",
         "export_successful": "Allforio yn llwyddiannus!",
+        "exported_n_events_in_time": {
+            "Wedi nôl %(count)s digwyddiadau o fewn %(seconds)s e": "zero",
+            "Wedi allforio %(count)s digwyddiad o fewn %(seconds)s e": "one",
+            "Wedi nôl %(count)s ddigwyddiad o fewn %(seconds)s e": "two",
+            "Wedi nôl %(count)s digwyddiad o fewn %(seconds)s e": "other"
+        },
         "exporting_your_data": "Allforio eich data",
+        "fetched_n_events": {
+            "Wedi nôl %(count)s digwyddiadau hyd yn hyn": "zero",
+            "Wedi nôl %(count)s digwyddiad hyd yn hyn": "other",
+            "Wedi nôl %(count)s ddigwyddiad hyd yn hyn": "two"
+        },
+        "fetched_n_events_in_time": {
+            "Wedi nôl %(count)s digwyddiadau o fewn %(seconds)s e": "zero",
+            "Wedi nôl %(count)s digwyddiad o fewn %(seconds)s e": "other",
+            "Wedi nôl %(count)s ddigwyddiad o fewn %(seconds)s e": "two"
+        },
+        "fetched_n_events_with_total": {
+            "Wedi nôl %(count)s digwyddiadau allan o %(total)s": "zero",
+            "Wedi nôl %(count)s digwyddiad allan o %(total)s": "other",
+            "Wedi nôl %(count)s ddigwyddiad allan o %(total)s": "two"
+        },
         "fetching_events": "Wrthi'n nôl digwyddiadau…",
         "file_attached": "Ffeil wedi'i Atodi",
         "format": "Fformat",
@@ -1244,6 +1297,11 @@
     },
     "in_space": "Yn %(spaceName)s.",
     "in_space1_and_space2": "Mewn gofodau %(space1Name)s a %(space2Name)s.",
+    "in_space_and_n_other_spaces": {
+        "Yn %(spaceName)s a %(count)s gofodau eraill.": "zero",
+        "Yn %(spaceName)s ac un gofod arall": "one",
+        "Yn %(spaceName)s a %(count)s gofod arall.": "other"
+    },
     "incompatible_browser": {
         "continue": "Parhau beth bynnag",
         "description": "Mae %(brand)s yn defnyddio rhai nodweddion porwr nad ydyn nhw ar gael yn eich porwr presennol. %(detail)s",
@@ -1312,6 +1370,10 @@
         "name_email_mxid_share_space": "Gwahoddwch rywun i ddefnyddio ei enw, cyfeiriad e-bost, enw defnyddiwr (fel <userId/>) neu <a>rhannu'r gofod hwn</a>.",
         "name_mxid_share_room": "Gwahoddwch rywun i ddefnyddio eu henw, enw defnyddiwr (fel <userId/>) neu <a>rannu'r ystafell hon</a>.",
         "name_mxid_share_space": "Gwahoddwch rywun i ddefnyddio eu henw, enw defnyddiwr (fel <userId/>) neu <a>rhannu'r gofod hwn</a>.",
+        "progress": {
+            "dont_close": "Peidiwch â chau'r ap nes ei fod wedi gorffen.",
+            "preparing": "Wrthi'n paratoi gwahoddiadau..."
+        },
         "recents_section": "Sgyrsiau Diweddar",
         "room_failed_partial": "Rydym wedi anfon y lleill, ond nid oes modd gwahodd y bobl isod i <RoomName/>",
         "room_failed_partial_title": "Nid oedd modd anfon rhai gwahoddiadau",
@@ -1333,6 +1395,15 @@
         "unban_first_title": "Nid oes modd gwahodd defnyddiwr nes ei fod heb ei ddad-wahardd"
     },
     "inviting_user1_and_user2": "Yn gwahodd %(user1)s a %(user2)s",
+    "inviting_user_and_n_others": {
+        "Yn gwahodd %(user)s ac un arall": "one",
+        "Yn gwahodd %(user)s a %(count)s arall": "other"
+    },
+    "items_and_n_others": {
+        "<Items/> a dim arall": "zero",
+        "<Items/> ac un arall": "one",
+        "<Items/> a %(count)s arall": "other"
+    },
     "keyboard": {
         "activate_button": "Agor y botwm hwn",
         "alt": "Alt",
@@ -1390,6 +1461,7 @@
         "room_list_navigate_down": "Symud i lawr yn y rhestr ystafelloedd",
         "room_list_navigate_up": "Symud i fyny yn y rhestr ystafelloedd",
         "room_list_select_room": "Dewis ystafell o'r rhestr ystafelloedd",
+        "save": "Cadw",
         "scroll_down_timeline": "Sgrolio i lawr yn y llinell amser",
         "scroll_up_timeline": "Sgrolio i fyny yn y llinell amser",
         "search": "Chwilio (rhaid ei alluogi)",
@@ -1406,7 +1478,6 @@
         "upload_file": "Llwytho ffeil i fyny"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Caniatáu modd rhannu sgrin yn unig",
         "ask_to_join": "Galluogi gofyn i ymuno",
         "automatic_debug_logs": "Anfon logiau dadfygio yn awtomatig ar unrhyw wall",
         "automatic_debug_logs_decryption": "Anfon logiau dadgryptio yn awtomatig ar wallau dadgryptio",
@@ -1471,6 +1542,9 @@
         "render_reaction_images_description": "Weithiau'n cael eu hadnabod fel \"emojis cyfaddas\".",
         "report_to_moderators": "Adrodd i cymedrolwyr",
         "report_to_moderators_description": "Mewn ystafelloedd sy'n cefnogi cymedroli, bydd y botwm “Adrodd” yn gadael i chi adrodd ar gam-drin i gymedrolwyr ystafelloedd.",
+        "share_history_on_invite": "Rhannwch hanes wedi'i amgryptio gydag aelodau newydd",
+        "share_history_on_invite_description": "Wrth wahodd defnyddiwr i ystafell wedi'i hamgryptio sydd â gwelededd hanes wedi'i osod i \"rhannu\", rhannwch hanes wedi'i amgryptio gyda'r defnyddiwr hwnnw, a derbyniwch hanes wedi'i amgryptio pan gewch eich gwahodd i ystafell o'r fath.",
+        "share_history_on_invite_warning": "Mae'r nodwedd hon yn ARBROFOL ac nid yw pob rhagofal diogelwch wedi'i weithredu. Peidiwch â'i galluogi ar gyfrifon cynhyrchu.",
         "sliding_sync": "Modd Cydweddu Llithro",
         "sliding_sync_description": "Wrthi'n datblygu, nid oes modd ei analluogi.",
         "sliding_sync_disabled_notice": "Allgofnodwch a mewngofnodi i analluogi",
@@ -1585,11 +1659,15 @@
         "toggle_attribution": "Toglo priodoli"
     },
     "member_list": {
+        "count": {
+            "%(count)s Aelodau": "zero",
+            "%(count)s Aelod": "other"
+        },
         "filter_placeholder": "Hidlo aelodau'r ystafell",
         "invite_button_no_perms_tooltip": "Nid oes gennych ganiatâd i wahodd defnyddwyr",
         "invited_label": "Gwahoddwyd",
-        "no_matches": "Dim cyfatebiaeth",
-        "power_label": "%(userName)s (power %(powerLevelNumber)s)"
+        "list_title": "Rhestr aelodau",
+        "no_matches": "Dim cyfatebiaeth"
     },
     "member_list_back_action_label": "Aelodau'r ystafell",
     "message_edit_dialog_title": "Golygiadau neges",
@@ -1675,6 +1753,13 @@
         "topic_label": "Cwestiwn neu bwnc",
         "topic_placeholder": "Ysgrifennu rhywbeth…",
         "total_decryption_errors": "Oherwydd gwallau dadgryptio, efallai na fydd rhai pleidleisiau'n cael eu cyfrif",
+        "total_n_votes": {
+            "%(count)s pleidlais wedi'u bwrw. Pleidleisiwch i weld y canlyniadau.": "other",
+            "%(count)s pleidlais wedi'i bwrw. Pleidleisiwch i weld y canlyniadau.": "one"
+        },
+        "total_n_votes_voted": {
+            "Ar sail %(count)s pleidlais": "other"
+        },
         "total_no_votes": "Dim pleidleisiau wedi'u bwrw",
         "total_not_ended": "Bydd y canlyniadau i'w gweld pan ddaw'r bleidlais i ben",
         "type_closed": "Arolwg wedi'i chau",
@@ -1685,6 +1770,7 @@
     },
     "power_level": {
         "admin": "Gweinyddwr",
+        "creator": "Perchennog",
         "custom": "(%(level)s) cyfaddas",
         "custom_level": "Lefel Cyfaddas",
         "default": "Rhagosodedig",
@@ -1748,7 +1834,7 @@
         "toxic_behaviour": "Ymddygiad Gwenwynig"
     },
     "report_room": {
-        "description": "Adroddwch ar yr ystafell hon i weinyddwr eich gweinydd cartref. Bydd hyn yn anfon ID unigryw'r ystafell, ond os yw negeseuon wedi'u hamgryptio, fydd y gweinyddwr ddim yn gallu eu darllen na gweld ffeiliau sy'n cael eu rhannu.",
+        "description": "Rhowch wybod am yr ystafell hon i ddarparwr eich cyfrif. Os yw'r neges wedi'i amgryptio, ni fydd eich gweinyddwr yn gallu eu darllen.",
         "reason_label": "Disgrifiwch y rheswm"
     },
     "restore_key_backup_dialog": {
@@ -1784,12 +1870,14 @@
         "pinned_messages": {
             "empty_description": "Dewiswch neges a dewiswch “%(pinAction)s” i'w chynnwys yma.",
             "empty_title": "Pinio negeseuon pwysig fel y mae modd eu darganfod yn hawdd",
-            "menu": "Agor dewislen",
-            "release_announcement": {
-                "close": "Iawn",
-                "description": "Dewch o hyd i'r holl negeseuon sydd wedi'u pinio yma. Rhedwch y cyrchwr dros unrhyw neges a dewiswch \"Pinio\" i'w hychwanegu.",
-                "title": "Pob neges newydd wedi'u pinio"
+            "header": {
+                "%(count)s Neges wedi'u pinio": "other",
+                "1 Neges wedi'i binio": "one"
             },
+            "limits": {
+                "Dim ond hyd at %(count)s teclyn y gallwch eu pinio": "other"
+            },
+            "menu": "Agor dewislen",
             "reply_thread": "Ymateb i a <link>neges edefyn</link>",
             "unpin_all": {
                 "button": "Dad-binio pob neges",
@@ -1803,8 +1891,26 @@
             "active_heading": "Arolygon gweithredol",
             "empty_active": "Nid oes unrhyw arolygon gweithredol yn yr ystafell hon",
             "empty_active_load_more": "Nid oes unrhyw arolygon gweithredol. Llwythwch fwy o arolygon barn y misoedd blaenorol",
+            "empty_active_load_more_n_days": {
+                "Does dim polau gweithredol ar gyfer y dyddiau diwethaf. Llwythwch ragor o bolau i weld polau'r misoedd blaenorol": "zero",
+                "Does dim polau gweithredol ar gyfer y diwrnod diwethaf. Llwythwch ragor o bolau i weld polau'r misoedd blaenorol": "one",
+                "Does dim polau gweithredol ar gyfer y %(count)s ddiwrnod diwethaf. Llwythwch ragor o bolau i weld polau'r misoedd blaenorol": "two",
+                "Does dim polau gweithredol ar gyfer y %(count)s diwrnod diwethaf. Llwythwch ragor o bolau i weld polau'r misoedd blaenorol": "other"
+            },
             "empty_past": "Nid oes arolygon o'r gorffennol yn yr ystafell hon",
             "empty_past_load_more": "Nid oes unrhyw arolygon o'r gorffennol. Llwythwch fwy o arolygon barn ar gyfer y misoedd blaenorol",
+            "empty_past_load_more_n_days": {
+                "Does dim polau'r gorffennol ar gyfer y dyddiau diwethaf. Llwythwch ragor o bolau i weld polau'r misoedd blaenorol": "zero",
+                "Does dim polau'r gorffennol ar gyfer y diwrnod diwethaf. Llwythwch ragor o bolau i weld polau'r misoedd blaenorol": "one",
+                "Does dim polau'r gorffennol ar gyfer y %(count)s ddiwrnod diwethaf. Llwythwch ragor o bolau i weld polau'r misoedd blaenorol": "two",
+                "Does dim polau'r gorffennol ar gyfer y %(count)s diwrnod diwethaf. Llwythwch ragor o bolau i weld polau'r misoedd blaenorol": "other"
+            },
+            "final_result": {
+                "Canlyniadau terfynol yn seiliedig ar %(count)s pleidleisiau": "zero",
+                "Canlyniadau terfynol yn seiliedig ar %(count)s pleidlais": "other",
+                "Canlyniadau terfynol yn seiliedig ar %(count)s bleidlais": "two",
+                "Canlyniadau terfynol yn seiliedig ar %(count)s phleidlais": "many"
+            },
             "load_more": "Llwytho mwy o arolygon barn",
             "loading": "Wrthi'n llwytho arolygon",
             "past_heading": "Arolygon y gorffennol",
@@ -1869,12 +1975,27 @@
         "error_jump_to_date_not_found": "Nid oeddem yn gallu dod o hyd i ddigwyddiad yn edrych ymlaen o %(dateString)s. Ceisiwch ddewis dyddiad cynharach.",
         "error_jump_to_date_send_logs_prompt": "Cyflwynwch <debugLogsLink>logiau dadfygio</debugLogsLink> i'n helpu i ddod o hyd i'r broblem.",
         "error_jump_to_date_title": "Methu dod o hyd i ddigwyddiad ar y dyddiad hwnnw",
+        "face_pile_summary": {
+            "Y %(count)s personau rydych chi'n ei adnabod sydd eisoes wedi ymuno": "zero",
+            "Yr %(count)s person rydych chi'n ei adnabod sydd eisoes wedi ymuno": "one",
+            "Y %(count)s person rydych chi'n ei adnabod sydd eisoes wedi ymuno": "other"
+        },
+        "face_pile_tooltip_label": {
+            "Gweld y cyfan o'r %(count)s aelod": "other",
+            "Gweld 1 aelod": "one"
+        },
         "face_pile_tooltip_shortcut": "Gan gynnwys %(commaSeparatedMembers)s",
         "face_pile_tooltip_shortcut_joined": "Gan eich cynnwys chi, %(commaSeparatedMembers)s",
+        "failed_determine_user": "Nid oes modd pennu pa ddefnyddiwr i'w anwybyddu gan fod y digwyddiad aelod wedi newid.",
         "failed_reject_invite": "Wedi methu â gwrthod gwahoddiad",
         "forget_room": "Anghofiwch yr ystafell hon",
         "forget_space": "Anghofiwch y gofod hwn",
         "header": {
+            "n_people_asking_to_join": {
+                "%(count)s personau'n gofyn i ymuno": "zero",
+                "Yn gofyn i ymuno": "one",
+                "%(count)s person yn gofyn i ymuno": "other"
+            },
             "room_is_public": "Mae'r ystafell hon yn gyhoeddus"
         },
         "header_avatar_open_settings_label": "Agor gosodiadau ystafell",
@@ -1885,7 +2006,9 @@
         "inaccessible_subtitle_1": "Ceisiwch eto yn nes ymlaen, neu gofynnwch i weinyddwr ystafell neu ofod wirio a oes gennych fynediad.",
         "inaccessible_subtitle_2": "Cafodd %(errcode)s ei ddychwelyd wrth geisio cael mynediad i'r ystafell neu'r gofod. Os ydych yn meddwl eich bod yn gweld y neges hon ar gam, <issueLink>cyflwynwch adroddiad gwall</issueLink>.",
         "intro": {
+            "display_topic": "Pwnc: <topic/>",
             "dm_caption": "Dim ond y ddau ohonoch sydd yn y sgwrs hon, oni bai bod y naill neu'r llall ohonoch yn gwahodd unrhyw un i ymuno.",
+            "edit_topic": "Pwnc: <topic/> (<a>golygu</a>)",
             "enable_encryption_prompt": "Galluogi amgryptio yn y gosodiadau.",
             "encrypted_3pid_dm_pending_join": "Unwaith y bydd pawb wedi ymuno, byddwch yn gallu sgwrsio",
             "no_avatar_label": "Ychwanegwch lun, fel bod pobl yn gallu gweld eich ystafell yn hawdd.",
@@ -1895,8 +2018,6 @@
             "send_message_start_dm": "Anfonwch eich neges gyntaf i wahodd <displayName/> i sgwrsio",
             "start_of_dm_history": "Dyma ddechrau eich hanes neges uniongyrchol gyda <displayName/>.",
             "start_of_room": "Dyma ddechrau <roomName/>.",
-            "topic": "Pwnc: %(topic)s ",
-            "topic_edit": "Pwnc: %(topic)s ( <a>golygu</a> )",
             "unencrypted_warning": "Nid yw amgryptio pen-i-ben wedi'i alluogi",
             "user_created": "Creodd %(displayName)s yr ystafell hon.",
             "you_created": "Chi sydd wedi creu'r ystafell hon."
@@ -1951,16 +2072,23 @@
         "pinned_message_banner": {
             "button_close_list": "Cau'r rhestr",
             "button_view_all": "Gweld popeth",
-            "description": "Mae negeseuon wedi'u pinio yn yr ystafell hon. Cliciwch i'w gweld.",
-            "go_to_message": "Gweld y neges sydd wedi'i phinnio yn y llinell amser.",
+            "description": "Negeseuon wedi'u pinio",
+            "go_to_newest_message": "Gweld y neges wedi'i phinio yn y llinell amser a'r neges newydd wedi'i phinio yma",
+            "go_to_next_message": "Gweld y neges wedi'i phinio yn y llinell amser a'r neges hynaf nesaf wedi'i phinio yma",
             "title": "<bold>%(index)s o %(length)s</bold> Neges wedi'u pinio"
         },
         "read_topic": "Cliciwch i ddarllen y pwnc",
         "rejecting": "Wrthi'n gwrthod gwahoddiad…",
         "rejoin_button": "Ail-ymuno",
+        "room_content": "Cynnwys yr ystafell",
+        "room_is_low_priority": "Mae hon yn ystafell â blaenoriaeth isel",
         "search": {
             "all_rooms_button": "Chwiliwch bob ystafell",
             "placeholder": "Chwilio negeseuon…",
+            "summary": {
+                "%(count)s canlyniad wedi'u canfod ar gyfer “<query/>\"": "other",
+                "1 canlyniad wedi'i ganfod ar gyfer “<query/>\"": "one"
+            },
             "this_room_button": "Chwiliwch yr ystafell hon"
         },
         "status_bar": {
@@ -1976,6 +2104,11 @@
             "some_messages_not_sent": "Nid yw rhai o'ch negeseuon wedi'u hanfon"
         },
         "unknown_status_code_for_timeline_jump": "cod statws anhysbys",
+        "unread_notifications_predecessor": {
+            "Does gennych %(count)s hysbysiad heb eu darllen mewn fersiwn flaenorol o'r ystafell hon": "zero",
+            "Mae gennych %(count)s hysbysiad heb ei ddarllen mewn fersiwn flaenorol o'r ystafell hon.": "one",
+            "Mae gennych %(count)s hysbysiad heb eu darllen mewn fersiwn flaenorol o'r ystafell hon": "other"
+        },
         "upgrade_error_description": "Gwiriwch ddwywaith bod eich gweinydd yn cefnogi'r fersiwn ystafell a ddewiswyd a rhowch gynnig arall arni.",
         "upgrade_error_title": "Gwall wrth uwchraddio'r ystafell",
         "upgrade_warning_bar": "Bydd uwchraddio'r ystafell hon yn cau enghraifft bresennol yr ystafell ac yn creu ystafell wedi'i huwchraddio gyda'r un enw.",
@@ -1983,6 +2116,9 @@
         "upgrade_warning_bar_unstable": "Mae'r ystafell hon yn fersiwn ystafell redeg<roomVersion /> , y mae'r gweinydd cartref hwn wedi'i nodi'n <i>ansefydlog</i>.",
         "upgrade_warning_bar_upgraded": "Mae'r ystafell hon eisoes wedi'i huwchraddio.",
         "upload": {
+            "uploading_multiple_file": {
+                "Wrthi'n llwytho i fyny %(filename)s a %(count)s arall": "other"
+            },
             "uploading_single_file": "Wrthi'n llwytho %(filematere)s"
         },
         "video_room": "Mae'r ystafell hon yn ystafell fideo",
@@ -1992,9 +2128,9 @@
     "room_list": {
         "add_room_label": "Ychwanegu ystafell",
         "add_space_label": "Ychwanegu gofod",
-        "appearance": "Gwedd",
         "breadcrumbs_empty": "Dim ystafelloedd yr ymwelwyd â nhw yn ddiweddar",
         "breadcrumbs_label": "Ymwelwyd ag ystafelloedd yn ddiweddar",
+        "collapse_filters": "Cwympo rhestr hidlo",
         "empty": {
             "no_chats": "Dim sgyrsiau eto",
             "no_chats_description": "Dechreuwch drwy anfon neges at rywun neu drwy greu ystafell",
@@ -2002,6 +2138,7 @@
             "no_favourites": "Nid oes gennych hoff sgwrs eto",
             "no_favourites_description": "Gallwch ychwanegu sgwrs at eich ffefrynnau yn y gosodiadau sgwrsio",
             "no_invites": "Does gennych chi ddim gwahoddiadau heb eu darllen",
+            "no_lowpriority": "Nid oes gennych unrhyw ystafelloedd blaenoriaeth isel",
             "no_mentions": "Does gennych chi ddim crybwylliadau heb eu darllen",
             "no_people": "Nid oes gennych chi sgyrsiau uniongyrchol gydag unrhyw un eto",
             "no_people_description": "Gallwch ddad-ddewis hidlwyr er mwyn gweld eich sgyrsiau eraill",
@@ -2011,19 +2148,24 @@
             "show_activity": "Gweld yr holl weithgarwch",
             "show_chats": "Dangos pob sgwrs"
         },
+        "expand_filters": "Ehangu rhestr hidlo",
         "failed_add_tag": "Wedi methu ag ychwanegu tag %(tagName)s i'r ystafell",
         "failed_remove_tag": "Wedi methu â thynnu'r tag %(tagName)s o'r ystafell",
         "failed_set_dm_tag": "Wedi methu gosod tag neges uniongyrchol",
         "filters": {
             "favourite": "Ffefrynnau",
             "invites": "Gwahoddiadau",
+            "low_priority": "Blaenoriaeth isel",
             "mentions": "Crybwylliadau",
             "people": "Pobl",
             "rooms": "Ystafelloedd",
-            "unread": "Heb ei ddarllen"
+            "unread": "Heb eu darllen"
         },
         "home_menu_label": "Dewisiadau cartref",
         "join_public_room_label": "Ymuno â'r ystafell gyhoeddus",
+        "joining_rooms_status": {
+            "Yn ymuno â %(count)s ystafell ar hyn o bryd": "other"
+        },
         "list_title": "Rhestr ystafelloedd",
         "more_options": {
             "copy_link": "Copïo dolen ystafell",
@@ -2036,13 +2178,18 @@
         "notification_options": "Dewisiadau hysbysu",
         "open_space_menu": "Agor dewislen gofod",
         "primary_filters": "Hidlau rhestr ystafelloedd",
+        "redacting_messages_status": {
+            "Yn tynnu negeseuon mewn %(count)s ystafell": "other"
+        },
         "room": {
             "more_options": "Rhagor o Ddewisiadau",
             "open_room": "Agor ystafell %(roomName)s"
         },
         "room_options": "Dewisiadau Ystafelloedd",
         "show_less": "Dangos llai",
-        "show_message_previews": "Dangos rhagolygon negeseuon",
+        "show_n_more": {
+            "Dangos %(count)s yn rhagor": "other"
+        },
         "show_previews": "Dangos rhagolwg o negeseuon",
         "sort": "Trefnu",
         "sort_by": "Trefnu yn ôl",
@@ -2222,6 +2369,10 @@
             "users_default": "Rôl rhagosodedig"
         },
         "security": {
+            "cannot_change_to_private_due_to_missing_history_visiblity_permissions": {
+                "description": "Nid oes gennych ganiatâd i newid gwelededd hanes yr ystafell. Mae hyn yn beryglus gan y gallai ganiatáu i ddefnyddwyr sydd heb ymuno ddarllen negeseuon.",
+                "title": "Nid oes modd gwneud yr ystafell yn breifat"
+            },
             "enable_encryption_confirm_description": "Unwaith y bydd wedi'i alluogi, nid oes modd analluogi amgryptio ar gyfer ystafell. Fydd y gweinydd ddim yn gallu gweld negeseuon wedi'u hanfon mewn ystafell wedi'i hamgryptio, dim ond cyfranogwyr yr ystafell. Gall galluogi amgryptio atal llawer o fotiau a phontydd rhag gweithio'n gywir. <a>Dysgu rhagor am amgryptio.</a>",
             "enable_encryption_confirm_title": "Galluogi amgryptio?",
             "enable_encryption_public_room_confirm_description_1": "<b>Nid yw'n cael ei argymell i ychwanegu amgryptio i ystafelloedd cyhoeddus.</b> Gall unrhyw un ddod o hyd i ystafelloedd cyhoeddus ac ymuno â nhw, felly gall unrhyw un ddarllen negeseuon ynddynt. Chewch chi ddim unrhyw un o fanteision amgryptio, nac yn gallu ei ddiffodd yn ddiweddarach. Bydd amgryptio negeseuon mewn ystafell gyhoeddus yn gwneud derbyn ac anfon negeseuon yn arafach.",
@@ -2239,7 +2390,7 @@
             "history_visibility_joined": "Aelodau yn unig (ers iddynt ymuno)",
             "history_visibility_legend": "Pwy all ddarllen hanes?",
             "history_visibility_shared": "Aelodau yn unig (ers yr adeg pan ddewiswyd yr opsiwn hwn)",
-            "history_visibility_warning": "Dim ond i negeseuon yn y dyfodol yn yr ystafell hon y bydd newidiadau i bwy all ddarllen hanes yn berthnasol. Ni fydd amlygrwydd yr hanes presennol yn newid.",
+            "history_visibility_warning": "Ni fydd gwelededd hanes presennol yn cael ei newid.",
             "history_visibility_world_readable": "Unrhyw un",
             "join_rule_description": "Penderfynwch pwy all ymuno â %(roomName)s.",
             "join_rule_invite": "Preifat (gwahoddiad yn unig)",
@@ -2261,11 +2412,27 @@
             "join_rule_restricted_dialog_heading_space": "Gofodau rydych yn eu hadnabod sy'n cynnwys y gofod hwn",
             "join_rule_restricted_dialog_heading_unknown": "Mae'r rhain yn debygol o fod yn rhai y mae gweinyddwyr ystafell eraill yn rhan ohonyn nhw.",
             "join_rule_restricted_dialog_title": "Dewiswch ofodau",
+            "join_rule_restricted_n_more": {
+                "a %(count)s yn rhagor": "other"
+            },
+            "join_rule_restricted_summary": {
+                "Ar hyn o bryd, mae gan %(count)s gofod fynediad": "other",
+                "Ar hyn o bryd, mae gan ofod fynediad": "one"
+            },
             "join_rule_restricted_upgrade_description": "Bydd yr uwchraddiad hwn yn caniatáu i aelodau o ofodau penodol gael mynediad i'r ystafell hon heb wahoddiad.",
             "join_rule_restricted_upgrade_warning": "Mae'r ystafell hon mewn rhai gofodau nad ydych chi'n weinyddwr iddynt. Yn y gofodau hynny, bydd yr hen ystafell yn dal i gael ei dangos, ond bydd pobl yn cael eu hannog i ymuno â'r un newydd.",
             "join_rule_upgrade_awaiting_room": "Wrthi'n llwytho ystafell newydd",
             "join_rule_upgrade_required": "Angen uwchraddio",
+            "join_rule_upgrade_sending_invites": {
+                "Yn anfon gwahoddiad... (%(progress)s o %(count)s)": "other",
+                "Yn anfon gwahoddiad...": "one"
+            },
+            "join_rule_upgrade_updating_spaces": {
+                "Yn diweddaru gofod... (%(progress)s o %(count)s)": "other",
+                "Yn diweddaru gofod...": "one"
+            },
             "join_rule_upgrade_upgrading_room": "Ystafell uwchraddio",
+            "join_rule_world_readable_description": "Bydd newid pwy all ymuno â'r ystafell yn newid gwelededd negeseuon yn y dyfodol hefyd.",
             "public_without_alias_warning": "I gysylltu â'r ystafell hon, ychwanegwch gyfeiriad.",
             "publish_room": "Gwnewch yr ystafell hon yn weladwy yn y cyfeiriadur ystafelloedd cyhoeddus.",
             "publish_space": "Gwnewch y gofod hwn yn weladwy yn y cyfeiriadur ystafelloedd cyhoeddus.",
@@ -2280,7 +2447,6 @@
             "error_update_guest_access": "Wedi methu â diweddaru mynediad gwesteion y gofod hwn",
             "error_update_history_visibility": "Wedi methu â diweddaru gwelededd hanes y gofod hwn",
             "guest_access_explainer": "Gall gwesteion ymuno â gofod heb gyfrif.",
-            "guest_access_explainer_public_space": "Gall hyn fod yn ddefnyddiol ar gyfer gofodau cyhoeddus.",
             "guest_access_label": "Galluogi mynediad gwestai",
             "history_visibility_anyone_space": "Gofod Rhagolwg",
             "history_visibility_anyone_space_description": "Caniatáu i bobl gael rhagolwg o'ch gofod cyn iddynt ymuno.",
@@ -2404,6 +2570,7 @@
                 "breadcrumb_second_description": "Byddwch yn colli unrhyw hanes neges sydd wedi'i storio ar y gweinydd yn unig",
                 "breadcrumb_third_description": "Bydd angen i chi wirio'ch holl ddyfeisiau a chysylltiadau presennol eto",
                 "breadcrumb_title": "Ydych chi'n siŵr eich bod am ailosod eich hunaniaeth?",
+                "breadcrumb_title_cant_confirm": "Mae angen i chi ailosod eich hunaniaeth",
                 "breadcrumb_title_forgot": "Wedi anghofio eich allwedd adfer? Bydd angen i chi ailosod eich hunaniaeth.",
                 "breadcrumb_title_sync_failed": "Wedi methu cysoni storfa allwedd. Mae angen i chi ailosod eich hunaniaeth.",
                 "breadcrumb_warning": "Gwnewch hyn dim ond os ydych chi'n credu bod eich cyfrif wedi'i beryglu.",
@@ -2412,7 +2579,7 @@
                 "export_keys": "Allforio allweddi",
                 "import_keys": "Mewnforio bysellau",
                 "other_people_device_description": "Rhybudd: fydd defnyddwyr sydd heb eu gwirio'n benodol gyda chi (e.e. gan ddefnyddio emoji) yn derbyn eich negeseuon wedi'u hamgryptio. Hefyd, fydd dyfeisiau defnyddwyr sydd wedi'u gwirio heb eu gwirio ddim yn derbyn eich negeseuon wedi'u hamgryptio.",
-                "other_people_device_label": "Peidiwch byth ag anfon negeseuon wedi'u hamgryptio i ddyfeisiau heb eu gwirio",
+                "other_people_device_label": "Mewn ystafelloedd amgryptiedig, anfonwch negeseuon ddim ond at ddefnyddwyr wedi'u gwirio",
                 "other_people_device_title": "Dyfeisiau pobl eraill",
                 "reset_identity": "Ailosod hunaniaeth cryptograffig",
                 "reset_in_progress": "Wrthi'n ailosod...",
@@ -2557,13 +2724,11 @@
         "inline_url_previews_room": "Galluogi rhagolygon URL fel rhagosodiad ar gyfer cyfranogwyr yn yr ystafell hon",
         "inline_url_previews_room_account": "Galluogi rhagolygon URL ar gyfer yr ystafell hon (yn effeithio arnoch chi yn unig)",
         "insert_trailing_colon_mentions": "Mewnosod colon sy'n llusgo ar ôl i'r defnyddiwr sôn amdano ar ddechrau neges",
+        "invite_controls": {
+            "default_label": "Caniatáu i ddefnyddwyr eich gwahodd i ystafelloedd"
+        },
         "jump_to_bottom_on_send": "Symud i waelod y llinell amser pan fyddwch chi'n anfon neges",
         "key_backup": {
-            "backup_in_progress": "Mae copi wrth gefn o'ch allweddi (gallai'r copi wrth gefn cyntaf gymryd ychydig funudau).",
-            "backup_starting": "Yn dechrau gwneud copi wrth gefn…",
-            "backup_success": "Llwyddiant!",
-            "cannot_create_backup": "Methu creu copi wrth gefn o'r allwedd",
-            "create_title": "Creu copi wrth gefn allweddol",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Mae'ch allweddi bellach yn cael eu gwneud wrth gefn o'r ddyfais hon.",
                 "backup_setup_success_title": "Copi Wrth Gefn Diogel yn llwyddiannus",
@@ -2623,6 +2788,7 @@
             "show_in_private": "Mewn ystafelloedd preifat",
             "show_media": "Dangos bob tro"
         },
+        "not_supported": "Nid yw eich gweinydd yn gweithredu'r nodwedd hon.",
         "notifications": {
             "default_setting_description": "Bydd y gosodiad hwn yn cael ei osod fel rhagosodiad i'ch holl ystafelloedd.",
             "default_setting_section": "Rwyf am gael fy hysbysu am (Gosodiad Rhagosodedig)",
@@ -2680,6 +2846,7 @@
             "voip": "Galwadau Sain a Fideo"
         },
         "preferences": {
+            "Electron.enableContentProtection": "Atal cynnwys y ffenestr rhag cael ei gipio gan apiau eraill",
             "Electron.enableHardwareAcceleration": "Galluogi cyflymiad caledwedd (ailgychwyn %(appName)s i ddod i rym)",
             "always_show_menu_bar": "Dangos far dewislen y ffenestr bob amser",
             "autocomplete_delay": "Oedi awtogwblhau (ms)",
@@ -2688,6 +2855,7 @@
             "composer_heading": "Cyfansoddwr",
             "default_timezone": "Porwr rhagosodedig (%(timezone)s)",
             "dialog_title": "<strong>Gosodiadau:</strong> Dewisiadau",
+            "enable_content_protection": "Galluogi diogelu cynnwys",
             "enable_hardware_acceleration": "Galluogi cyflymiad caledwedd",
             "enable_tray_icon": "Dangos eicon hambwrdd a lleihau ffenestr iddo ar agos",
             "keyboard_heading": "Bysellau brys",
@@ -2721,9 +2889,11 @@
             "ignore_users_empty": "Nid oes gennych unrhyw ddefnyddwyr sydd wedi'u hanwybyddu.",
             "ignore_users_section": "Defnyddwyr wedi'u hanwybyddu",
             "key_backup_algorithm": "Algorithm:",
-            "key_backup_connect": "Cysylltwch y sesiwn hon i Bysell Wrth Gefn",
             "message_search_disable_warning": "Os yw wedi'i analluogi, ni fydd negeseuon o ystafelloedd wedi'u hamgryptio yn ymddangos yn y canlyniadau chwilio.",
             "message_search_disabled": "Cadwch negeseuon wedi'u hamgryptio'n ddiogel yn lleol er mwyn iddyn nhw ymddangos yn y canlyniadau chwilio.",
+            "message_search_enabled": {
+                "Cadw negeseuon wedi'u hamgryptio yn ddiogel yn y storfa leol er mwyn iddyn nhw ymddangos mewn canlyniadau chwilio, gan ddefnyddio %(size)s i storio negeseuon o %(rooms)s ystafell.": "other"
+            },
             "message_search_failed": "Methwyd cychwyn chwiliad neges",
             "message_search_indexed_messages": "Negeseuon wedi'u mynegeio:",
             "message_search_indexed_rooms": "Ystafelloedd wedi'u mynegeio:",
@@ -2738,7 +2908,7 @@
             "message_search_unsupported_web": "Ni all %(brand)s storio negeseuon wedi'u hamgryptio'n ddiogel yn lleol tra'n rhedeg mewn porwr gwe. Defnydd<desktopLink> %(brand)s Bwrdd Gwaith</desktopLink> i negeseuon wedi'u hamgryptio ymddangos yn y canlyniadau chwilio.",
             "record_session_details": "Cofnodwch enw'r cleient, y fersiwn, a'r url i adnabod sesiynau'n haws yn y rheolwr sesiwn",
             "send_analytics": "Anfon data dadansoddeg",
-            "strict_encryption": "Peidio byth anfon negeseuon wedi'u hamgryptio i sesiynau heb eu gwirio o'r sesiwn hon"
+            "strict_encryption": "Anfon negeseuon dim ond at ddefnyddwyr sydd wedi'u dilysu"
         },
         "send_read_receipts": "Anfon derbynebau darllen",
         "send_read_receipts_unsupported": "Nid yw eich gweinydd yn cefnogi analluogi anfon derbynebau wedi'u darllen.",
@@ -2746,6 +2916,22 @@
         "sessions": {
             "best_security_note": "Er mwyn sicrhau'r diogelwch gorau, gwiriwch eich sesiynau ac allgofnodwch o unrhyw sesiwn nad ydych yn ei hadnabod nac yn ei defnyddio mwyach.",
             "browser": "Porwr",
+            "confirm_sign_out": {
+                "Cadarnhau allgofnodi o'r ddyfeisiau hyn": "other",
+                "Cadarnhau allgofnodi o'r ddyfais hon": "one"
+            },
+            "confirm_sign_out_body": {
+                "Cliciwch y botwm isod i gadarnhau allgofnodi o'r dyfeisiau hyn.": "other",
+                "Cliciwch y botwm isod i gadarnhau allgofnodi o'r ddyfais hon.": "one"
+            },
+            "confirm_sign_out_continue": {
+                "Allgofnodi o ddyfeisiau": "other",
+                "Allgofnodi o ddyfais": "one"
+            },
+            "confirm_sign_out_sso": {
+                "Cadarnhau allgofnodi o'r ddyfeisiau hyn trwy ddefnyddio Mewngofnodi Sengl i brofi pwy ydych chi.": "other",
+                "Cadarnhau allgofnodi o'r ddyfais hon trwy ddefnyddio Mewngofnodi Sengl i brofi pwy ydych chi.": "one"
+            },
             "current_session": "Y sesiwn gyfredol",
             "desktop_session": "Sesiwn bwrdd gwaith",
             "details_heading": "Manylion y sesiwn",
@@ -2772,6 +2958,10 @@
             "last_activity": "Gweithgaredd ddiwethaf",
             "manage": "Rheoli'r sesiwn hon",
             "mobile_session": "Sesiwn symudol",
+            "n_sessions_selected": {
+                "%(count)s sesiwn wedi'u dewis": "other",
+                "%(count)s sesiwn wedi'i ddewis": "one"
+            },
             "no_inactive_sessions": "Heb ganfod unrhyw sesiynau anweithredol.",
             "no_sessions": "Heb ganfod sesiynau.",
             "no_unverified_sessions": "Heb ganfod unrhyw sesiynau heb eu gwirio.",
@@ -2796,6 +2986,12 @@
             "sign_in_with_qr_unsupported": "Nid yw'n cael ei gefnogi gan ddarparwr eich cyfrif",
             "sign_out": "Allgofnodwch o'r sesiwn hon",
             "sign_out_all_other_sessions": "Allgofnodi o bob sesiwn arall (%(otherSessionsCount)s)",
+            "sign_out_confirm_description": {
+                "Ydych chi'n siŵr eich bod chi eisiau allgofnodi o %(count)s sesiwn?": "other"
+            },
+            "sign_out_n_sessions": {
+                "Allgofnodi o %(count)s sesiwn": "other"
+            },
             "title": "Sesiynau",
             "unknown_session": "Math o sesiwn anhysbys",
             "unverified_session": "Sesiwn heb ei wirio",
@@ -2820,6 +3016,7 @@
         "show_chat_effects": "Dangos effeithiau sgwrsio (animeiddiadau wrth dderbyn e.e. conffeti)",
         "show_displayname_changes": "Dangos newidiadau enw dangos",
         "show_join_leave": "Dangos negeseuon ymuno/gadael (gwahoddiadau/dileu/gwaharddiadau heb eu heffeithio)",
+        "show_message_previews": "Dangos rhagolygon negeseuon",
         "show_nsfw_content": "Dangos cynnwys NSFW",
         "show_read_receipts": "Dangos derbynebau darllen a anfonwyd gan ddefnyddwyr eraill",
         "show_redaction_placeholder": "Dangos dalfan ar gyfer negeseuon sydd wedi'u dileu",
@@ -2842,7 +3039,6 @@
             "spaces_explainer": "Mae gofodau yn ffyrdd o grwpio ystafelloedd a phobl. Ochr yn ochr â'r lleoedd rydych chi ynddynt, gallwch chi ddefnyddio rhai sydd wedi'u hadeiladu ymlaen llaw hefyd.",
             "title": "Bar Ochr"
         },
-        "start_automatically": "Dechrau'n awtomatig ar ôl mewngofnodi i'r system",
         "tac_only_notifications": "Dim ond dangos hysbysiadau yng nghanolfan gweithgaredd yr edefyn",
         "use_12_hour_format": "Dangos stampiau amser mewn fformat 12 awr (e.e. 2:30pm)",
         "use_command_enter_send_message": "Defnyddiwch Command + Enter i anfon neges",
@@ -2926,6 +3122,8 @@
         "jumptodate": "Symud i'r dyddiad a roddwyd yn y llinell amser",
         "jumptodate_invalid_input": "Nid oeddem yn gallu deall y dyddiad a roddwyd (%(inputDate)s). Ceisiwch ddefnyddio'r fformat BBBB-MM-DD.",
         "lenny": "Rhagflaenu ( ͡° ͜ʖ ͡°) i neges destun plaen",
+        "manual_device_verification_confirm_description": "Bydd hyn yn caniatáu i ddyfais arall anfon a derbyn negeseuon fel chi. OS BYDD RHYWUN WEDI DWEUD WRTHYCH CHI AM GLUDO RHYWBETH YMA, MAE'N DEBYGOL EICH BOD CHI'N CAEL EICH SGAMIO! Ydych chi'n siŵr eich bod chi eisiau gwirio'r ddyfais arall hon?",
+        "manual_device_verification_confirm_title": "Rhybudd: gwirio dyfais â llaw",
         "me": "Yn dangos gweithredu",
         "msg": "Yn anfon neges at y defnyddiwr a roddwyd",
         "myavatar": "Yn newid eich llun proffil ym mhob ystafell",
@@ -2966,6 +3164,7 @@
         "upgraderoom": "Yn uwchraddio ystafell i fersiwn newydd",
         "upgraderoom_permission_error": "Nid oes gennych y caniatâd gofynnol i ddefnyddio'r gorchymyn hwn.",
         "usage": "Defnydd",
+        "verify": "Yn dilysu â llaw un o'ch defnyddwyr",
         "view": "Ystafell golygfeydd gyda chyfeiriad a roddwyd",
         "whois": "Yn arddangos gwybodaeth am ddefnyddiwr"
     },
@@ -2976,6 +3175,10 @@
             "create_prompt": "Creu ystafell newydd",
             "dm_heading": "Negeseuon Uniongyrchol",
             "error_heading": "Ni ychwanegwyd pob un a ddewiswyd",
+            "progress_text": {
+                "Yn ychwanegu ystafell...(%(progress)s o %(count)s)": "other",
+                "Yn ychwanegu ystafell...": "one"
+            },
             "space_dropdown_label": "Dewis gofod",
             "space_dropdown_title": "Ychwanegu ystafelloedd presennol",
             "subspace_moved_note": "Mae ychwanegu gofodau wedi symud."
@@ -3058,6 +3261,9 @@
         "cant_find_person_helpful_hint": "Os na allwch weld pwy rydych yn chwilio amdano, anfonwch eich dolen wahoddiad atynt.",
         "cant_find_room_helpful_hint": "Os na allwch ddod o hyd i'r ystafell yr ydych yn chwilio amdani, gofynnwch am wahoddiad neu crëwch ystafell newydd.",
         "copy_link_text": "Copïo dolen y gwahoddiad",
+        "count_of_members": {
+            "%(count)s Aelod": "other"
+        },
         "create_new_room_button": "Creu ystafell newydd",
         "failed_querying_public_rooms": "Wedi methu â holi ystafelloedd cyhoeddus",
         "failed_querying_public_spaces": "Wedi methu cwestiynu gofodau cyhoeddus",
@@ -3108,6 +3314,9 @@
     "threads": {
         "all_threads": "Pob edefyn",
         "all_threads_description": "Yn dangos pob edefyn o'r ystafell gyfredol",
+        "count_of_reply": {
+            "%(count)s ateb": "other"
+        },
         "empty_description": "Defnyddio “%(replyInThread)s” wrth hofran dros neges.",
         "empty_title": "Mae edafedd yn helpu i gadw'ch sgyrsiau ar y pwnc ac yn hawdd eu holrhain.",
         "error_start_thread_existing_relation": "Methu â chreu edefyn o ddigwyddiad gyda pherthynas sy'n bodoli eisoes",
@@ -3168,7 +3377,7 @@
             "historical_event_no_key_backup": "Nid yw negeseuon hanesyddol ar gael ar y ddyfais hon",
             "historical_event_unverified_device": "Mae angen i chi wirio'r ddyfais hon ar gyfer mynediad i negeseuon hanesyddol",
             "historical_event_user_not_joined": "Nid oes gennych fynediad i'r neges hon",
-            "sender_identity_previously_verified": "Mae hunaniaeth yr anfonwr wedi'i wirio wedi newid",
+            "sender_identity_previously_verified": "Cafodd hunaniaeth yr anfonwr ei hailosod",
             "sender_unsigned_device": "Wedi'i anfon o ddyfais ansicr.",
             "unable_to_decrypt": "Methu dadgryptio'r neges"
         },
@@ -3195,6 +3404,7 @@
             "unable_to_find": "Wedi ceisio llwytho pwynt penodol yn llinell amser yr ystafell hon, ond ni lwyddodd i ddod o hyd iddo."
         },
         "m.audio": {
+            "audio_player": "Chwaraewr sain",
             "error_downloading_audio": "Gwall wrth llwytho i lawrsain",
             "error_processing_audio": "Gwall wrth brosesu neges sain",
             "error_processing_voice_message": "Gwall wrth brosesu neges llais",
@@ -3249,8 +3459,12 @@
             "location": "Wedi rhannu lleoliad: ",
             "self_location": "Wedi rhannu eu lleoliad: "
         },
+        "m.poll": {
+            "count_of_votes": {
+                "%(count)s pleidlais": "other"
+            }
+        },
         "m.poll.end": {
-            "ended": "Daeth arolwg i ben",
             "sender_ended": "Mae %(senderName)s wedi dod ag arolwg i ben"
         },
         "m.poll.start": "Mae %(senderName)s wedi dechrau arolwg - %(pollQuestion)s",
@@ -3261,6 +3475,14 @@
             "removed": "Mae %(senderDisplayName)s wedi tynnu afatar yr ystafell."
         },
         "m.room.canonical_alias": {
+            "alt_added": {
+                "Mae %(senderName)s wedi ychwanegu cyfeiriadau eraill %(addresses)s ar gyfer yr ystafell hon.": "other",
+                "Mae %(senderName)s wedi ychwanegu cyfeiriad arall %(addresses)s ar gyfer yr ystafell hon.": "one"
+            },
+            "alt_removed": {
+                "Mae %(senderName)s wedi tynnu cyfeiriadau eraill %(addresses)s ar gyfer yr ystafell hon.": "other",
+                "Mae %(senderName)s wedi tynnu cyfeiriad arall %(addresses)s ar gyfer yr ystafell hon.": "one"
+            },
             "changed": "Newidiodd %(senderName)s y cyfeiriadau ar gyfer yr ystafell hon.",
             "changed_alternative": "Mae %(senderName)s wedi newid y cyfeiriadau amgen ar gyfer yr ystafell hon.",
             "changed_main_and_alternative": "Newidiodd %(senderName)s y prif gyfeiriadau a chyfeiriadau amgen ar gyfer yr ystafell hon.",
@@ -3412,6 +3634,9 @@
             "label": "Ymatebodd %(reactors)s gyda %(content)s",
             "tooltip_caption": "wedi ymateb gyda %(shortName)s"
         },
+        "read_receipt_title": {
+            "Wedi'i weld gan %(count)s person": "other"
+        },
         "read_receipts_label": "Derbynebau darllen",
         "redacted": {
             "tooltip": "Neges wedi'i dileu ar %(date)s"
@@ -3432,18 +3657,173 @@
         "send_state_sending": "Wrthi'n anfon eich neges…",
         "send_state_sent": "Anfonwyd eich neges",
         "summary": {
-            "format": "%(matereList)s %(transitionList)s"
+            "banned": {
+                "wedi'u gwahardd": "zero",
+                "wedi'i wahardd": "one",
+                "wedi&#39;u gwahardd %(count)s gwaith": "other"
+            },
+            "banned_multiple": {
+                "wedi&#39;u gwahardd": "zero",
+                "wedi'i wahardd": "one",
+                "wedi&#39;u gwahardd %(count)s gwaith": "other"
+            },
+            "changed_avatar": {
+                "Does %(count)s %(oneUser)s wedi newid eu llun proffil": "zero",
+                "Mae %(oneUser)s wedi newid eu llun proffil %(count)s gwaith": "other"
+            },
+            "changed_avatar_multiple": {
+                "Does %(count)s o %(severalUsers)s wedi newid eu llun proffil": "zero",
+                "Mae %(severalUsers)s wedi newid ei lun proffil": "one",
+                "Mae %(severalUsers)s wedi newid eu llun proffil %(count)s gwaith": "other"
+            },
+            "changed_name": {
+                "Mae %(oneUser)s wedi newid ei enw %(count)s gwaith": "other",
+                "Mae %(oneUser)s wedi newid ei enw": "one"
+            },
+            "changed_name_multiple": {
+                "Mae %(severalUsers)s wedi newid eu henwau %(count)s gwaith": "other",
+                "Mae %(severalUsers)s wedi newid ei enw": "one"
+            },
+            "format": "%(matereList)s %(transitionList)s",
+            "hidden_event": {
+                "Anfonodd %(oneUser)s %(count)s negeseuon cudd": "zero",
+                "Anfonodd %(oneUser)s neges gudd": "one",
+                "Anfonodd %(oneUser)s %(count)s neges gudd": "other"
+            },
+            "hidden_event_multiple": {
+                "Anfonodd %(severalUsers)s %(count)s negeseuon cudd ": "zero",
+                "Anfonodd %(severalUsers)s neges gudd": "one",
+                "Anfonodd %(severalUsers)s %(count)s neges gudd": "other"
+            },
+            "invite_withdrawn": {
+                "Mae %(oneUser)swedi cael eu gwahoddiadau wedi&#39;i dynnu&#39;n ôl": "zero",
+                "Mae %(oneUser)swedi cael ei gwahoddiad wedi&#39;i dynnu&#39;n ôl": "one",
+                "Mae %(oneUser)swedi cael eu gwahoddiad wedi&#39;i dynnu&#39;n ôl %(count)s gwaith": "other"
+            },
+            "invite_withdrawn_multiple": {
+                "Cafodd %(severalUsers)s eu gwahoddiadau eu dileu": "one",
+                "Cafodd %(severalUsers)s eu gwahoddiadau eu dileu %(count)s gwaith": "other"
+            },
+            "invited": {
+                "wedi'u gwahodd": "zero",
+                "wedi'i wahodd": "one",
+                "wedi'u gwahodd %(count)s gwaith": "other"
+            },
+            "invited_multiple": {
+                "wedi'u gwahodd": "zero",
+                "wedi'i wahodd": "one",
+                "wedi'u gwahodd %(count)s gwaith": "other"
+            },
+            "joined": {
+                "Ymunodd %(oneUser)s %(count)s gwaith": "other",
+                "Ymunodd %(oneUser)s": "one"
+            },
+            "joined_and_left": {
+                "Ymunodd a gadawodd %(oneUser)s %(count)s gwaith": "other"
+            },
+            "joined_and_left_multiple": {
+                "Ymunodd a gadawodd %(severalUsers)s": "one",
+                "Ymunodd a gadawodd %(severalUsers)s %(count)s gwaith": "other"
+            },
+            "joined_multiple": {
+                "Ymunodd %(severalUsers)s": "zero",
+                "Ymunodd %(severalUsers)s %(count)s gwaith": "other"
+            },
+            "kicked": {
+                "wedi'u tynnu %(count)s gwaith": "other",
+                "wedi'u tynnu": "one"
+            },
+            "kicked_multiple": {
+                "wedi'u tynnu %(count)s gwaith": "other",
+                "wedi'u tynnu": "one"
+            },
+            "left": {
+                "Gadawodd %(oneUser)s": "one",
+                "Gadawodd %(oneUser)s %(count)s gwaith": "other"
+            },
+            "left_multiple": {
+                "Gadawodd %(severalUsers)s": "one",
+                "Gadawodd %(severalUsers)s %(count)s gwaith": "other"
+            },
+            "no_change": {
+                "Dyw %(oneUser)s heb wneud unrhyw newidiadau %(count)s gwaith": "other",
+                "Dyw %(oneUser)s heb wneud unrhyw newidiadau": "one"
+            },
+            "no_change_multiple": {
+                "Dyw %(severalUsers)s heb wneud unrhyw newidiadau %(count)s gwaith": "other",
+                "Dyw %(severalUsers)s heb wneud unrhyw newidiadau": "one"
+            },
+            "pinned_events": {
+                "Newidiodd %(oneUser)s y <a>negeseuon wedi'u pinio</a> yr ystafell %(count)s gwaith": "other",
+                "Newidiodd %(oneUser)s y <a>negeseuon wedi'u pinio</a> yr ystafell": "one"
+            },
+            "pinned_events_multiple": {
+                "Newidiodd %(severalUsers)s y <a>negeseuon wedi'u pinio</a> yr ystafell %(count)s gwaith": "other",
+                "Newidiodd %(severalUsers)s y <a>negeseuon wedi'u pinio</a> yr ystafell": "one"
+            },
+            "redacted": {
+                "Tynnodd %(oneUser)s %(count)s neges": "other",
+                "Tynnodd %(oneUser)s neges": "one"
+            },
+            "redacted_multiple": {
+                "Tynnodd %(severalUsers)s %(count)s neges": "other",
+                "Tynnodd %(severalUsers)s neges": "one"
+            },
+            "rejected_invite": {
+                "Gwrthododd %(severalUsers)s eu gwahoddiadau": "zero",
+                "Gwrthododd %(oneUser)s ei wahoddiad": "one",
+                "Gwrthododd %(oneUser)s eu gwahoddiadau %(count)s gwaith": "other"
+            },
+            "rejected_invite_multiple": {
+                "Gwrthododd %(severalUsers)s eu gwahoddiadau": "one",
+                "Gwrthododd %(severalUsers)s eu gwahoddiadau %(count)s gwaith": "other"
+            },
+            "rejoined": {
+                "Ymunodd a gadawodd %(oneUser)s": "one",
+                "Ymunodd a gadawodd %(oneUser)s %(count)s gwaith": "other"
+            },
+            "rejoined_multiple": {
+                "Ymunodd a gadawodd %(severalUsers)s": "one",
+                "Ymunodd a gadawodd %(severalUsers)s %(count)s gwaith": "other"
+            },
+            "server_acls": {
+                "Mae %(oneUser)s wedi newid ACLs y gweinydd %(count)s gwaith": "other",
+                "Mae %(oneUser)s wedi newid ACLs y gweinydd": "one"
+            },
+            "server_acls_multiple": {
+                "Mae %(severalUsers)s wedi newid ACLs y gweinydd %(count)s gwaith": "other",
+                "Mae %(severalUsers)s wedi newid ACLs y gweinydd": "one"
+            },
+            "unbanned": {
+                "wedi'u dadwahardd %(count)s gwaith": "other",
+                "wedi'u dadwahardd": "one"
+            },
+            "unbanned_multiple": {
+                "wedi'u dadwahardd %(count)s gwaith\n ": "zero",
+                "wedi'i ddadwahardd": "one",
+                "wedi'u dadwahardd %(count)s gwaith": "other"
+            }
         },
         "thread_info_basic": "O edefyn",
         "typing_indicator": {
+            "more_users": {
+                "Mae %(names)s ac mae %(count)s eraill yn teipio...": "other",
+                "Mae %(names)s ac mae un arall yn teipio...": "one"
+            },
             "one_user": "Mae %(displayName)s yn teipio…",
             "two_users": "Mae %(materes)s a %(lastPerson)s yn teipio…"
         },
         "undecryptable_tooltip": "Nid oedd modd dadgryptio'r neges hon",
         "url_preview": {
-            "close": "Cau rhagolwg"
+            "close": "Cau rhagolwg",
+            "show_n_more": {
+                "Dangos %(count)s rhagolwg arall": "other"
+            }
         }
     },
+    "truncated_list_n_more": {
+        "A %(count)s yn rhagor...": "other"
+    },
     "unsupported_browser": {
         "description": "Os byddwch yn parhau, efallai na fydd rhai nodweddion yn gweithio ac mae risg y gallech golli data yn y dyfodol. Diweddarwch eich porwr i barhau i ddefnyddio %(brand)s.",
         "title": "Nid yw %(brand)s yn cefnogi'r porwr hwn"
@@ -3466,11 +3846,11 @@
         "unavailable": "Dim ar gael"
     },
     "update_room_access_modal": {
-        "description": "I greu dolen rhannu, mae angen i chi ganiatáu i westeion ymuno â'r ystafell hon. Gall hyn wneud yr ystafell yn llai diogel. Pan fyddwch wedi gorffen gyda'r alwad, gallwch wneud yr ystafell yn breifat eto.",
-        "dont_change_description": "Fel arall, gallwch gynnal yr alwad mewn ystafell ar wahân.",
+        "description": "I greu dolen rhannu, gwnewch yr ystafell hon yn un <b>cyhoeddus</b> neu alluogi'r dewis i ddefnyddwyr <b>ofyn i ymuno</b> Mae hyn yn caniatáu i westeion ymuno heb gael eu gwahodd.",
+        "dont_change_description": "Os nad ydych chi eisiau newid mynediad i'r ystafell hon, gallwch greu ystafell newydd ar gyfer dolen yr alwad.",
         "no_change": "Dydw i ddim eisiau newid y lefel mynediad.",
-        "revert_access_description": "(Mae modddychwelyd hwn i&#39;r gwerth blaenorol yng Ngosodiadau&#39;r Ystafell: <b>Diogelwch a Phreifatrwydd</b> / <b>Mynediad</b> )",
-        "title": "Newid lefel mynediad yr ystafell"
+        "revert_access_description": "(Mae modddychwelyd hwn i'r gwerth blaenorol yng Ngosodiadau'r Ystafell: <b>Diogelwch a Phreifatrwydd</b> / <b>Mynediad</b> )",
+        "title": "Caniatáu i westeion ymuno â'r ystafell hon"
     },
     "upload_failed_generic": "Methodd y ffeil '%(fileName)s' â llwytho i fyny.",
     "upload_failed_size": "Mae'r ffeil '%(fileName)s' yn fwy na chyfyngiad maint llwytho'r gweinydd cartref",
@@ -3484,7 +3864,10 @@
         "not_image": "Nid yw'r ffeil rydych chi wedi'i dewis yn ffeil delwedd ddilys.",
         "title": "Llwytho ffeiliau",
         "title_progress": "Llwytho ffeiliau (%(current)s o %(total)s)",
-        "upload_all_button": "Llwytho'r cyfan"
+        "upload_all_button": "Llwytho'r cyfan",
+        "upload_n_others_button": {
+            "Llwytho %(count)s ffeil arall": "other"
+        }
     },
     "user_info": {
         "admin_tools_section": "Offer Gweinyddol",
@@ -3522,6 +3905,13 @@
         "kick_space_warning": "Byddan nhw'n dal i allu cael mynediad at beth bynnag nad ydych yn weinyddwr iddo.",
         "promote_warning": "Fyddwch chi ddim yn gallu dadwneud y newid hwn gan eich bod yn hyrwyddo'r defnyddiwr i gael yr un lefel pŵer â chi'ch hun.",
         "redact": {
+            "confirm_button": {
+                "Tynnu %(count)s neges": "other",
+                "Tynnu 1 neges": "one"
+            },
+            "confirm_description_1": {
+                "Rydych chi ar fin tynnu %(count)s neges gan %(user)s. Bydd hyn yn eu tynnu'n barhaol i bawb yn y sgwrs. ​​Ydych chi am barhau?": "other"
+            },
             "confirm_description_2": "Ar gyfer llawer iawn o negeseuon, gallai hyn gymryd peth amser. Peidiwch ag adnewyddu eich cleient yn y cyfamser.",
             "confirm_keep_state_explainer": "Dad-diciwch a ydych hefyd am ddileu negeseuon system ar y defnyddiwr hwn (e.e. newid aelodaeth, newid proffil…)",
             "confirm_keep_state_label": "Cadw negeseuon system",
@@ -3578,12 +3968,12 @@
         "connection_lost": "Mae cysylltedd â'r gweinydd wedi'i golli",
         "connection_lost_description": "Allwch chi ddim osod galwadau heb gysylltiad â'r gweinydd.",
         "consulting": "Ymgynghori â %(transferTarget)s. <a>Trosglwyddo i %(transferee)s</a>",
+        "decline_call": "Gwrthod",
         "default_device": "Dyfais Rhagosodedig",
         "dial": "Deial",
         "dialpad": "Pad Deialu",
         "disable_camera": "Diffoddwch y camera",
         "disable_microphone": "Tewi meicroffon",
-        "disabled_no_one_here": "Nid oes neb yma i alw",
         "disabled_no_perms_start_video_call": "Nid oes gennych ganiatâd i ddechrau galwadau fideo",
         "disabled_no_perms_start_voice_call": "Nid oes gennych ganiatâd i ddechrau galwadau llais",
         "disabled_ongoing_call": "Galwad cyfredol",
@@ -3612,6 +4002,10 @@
         "msisdn_lookup_failed": "Methu chwilio am y rhif ffôn",
         "msisdn_lookup_failed_description": "Bu gwall wrth chwilio am y rhif ffôn",
         "msisdn_transfer_failed": "Methu trosglwyddo galwad",
+        "n_people_joined": {
+            "Does %(count)s person wedi ymuno": "zero",
+            "Mae %(count)s person wedi ymuno": "other"
+        },
         "no_audio_input_description": "Heb ddod o hyd i feicroffon ar eich dyfais. Gwiriwch eich gosodiadau a cheisiwch eto.",
         "no_audio_input_title": "Heb ganfod meicroffon",
         "no_media_perms_description": "Mae'n bosibl y bydd angen i chi ganiatáu i %(brand)s gael mynediad i'ch meicroffon/gwegamera â llaw",
@@ -3626,6 +4020,7 @@
         "show_sidebar_button": "Dangos y bar ochr",
         "silence": "Distewi galwad",
         "silenced": "Hysbysiadau wedi'u distewi",
+        "skip_lobby_toggle_option": "Ymunwch ar unwaith",
         "start_screenshare": "Dechreuwch rannu'ch sgrin",
         "stop_screenshare": "Stopiwch rannu'ch sgrin",
         "too_many_calls": "Gormod o Alwadau",
@@ -3747,7 +4142,7 @@
         "error_need_to_be_logged_in": "Mae angen i chi fod wedi mewngofnodi.",
         "error_unable_start_audio_stream_description": "Methu dechrau ffrydio sain.",
         "error_unable_start_audio_stream_title": "Methu cychwyn llif byw",
-        "modal_data_warning": "Mae data ar y sgrin hon yn cael ei rannu â %(widgetDomain)s",
+        "modal_data_warning": "Mae data isod yn cael ei rannu â %(widgetDomain)s",
         "modal_title_default": "Teclyn Modal",
         "no_name": "Ap Anhysbys",
         "open_id_permissions_dialog": {
@@ -3766,7 +4161,7 @@
         "shared_data_theme": "Eich thema",
         "shared_data_url": "URL %(brand)s",
         "shared_data_warning": "Gall defnyddio'r teclyn hwn rannu data<helpIcon /> gyda %(widgetDomain)s.",
-        "shared_data_warning_im": "Gall defnyddio&#39;r teclyn hwn rannu data<helpIcon /> gyda %(widgetDomain)s a&#39;ch rheolwr integreiddio.",
+        "shared_data_warning_im": "Gall defnyddio'r teclyn hwn rannu data<helpIcon /> gyda %(widgetDomain)s a'ch rheolwr integreiddio.",
         "shared_data_widget_id": "ID teclyn",
         "unencrypted_warning": "Nid yw teclynnau'n defnyddio amgryptio negeseuon.",
         "unmaximise": "Dad-wneud mwyaf",
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
new file mode 100644
index 0000000000..00bc5734a8
--- /dev/null
+++ b/src/i18n/strings/da.json
@@ -0,0 +1,3717 @@
+{
+    "a11y": {
+        "emoji_picker": "Emoji-vælger",
+        "jump_first_invite": "Gå til første invitation.",
+        "message_composer": "Skriv besked",
+        "n_unread_messages": {
+            "one": "1 ulæst besked.",
+            "other": "%(count)s ulæste beskeder."
+        },
+        "n_unread_messages_mentions": {
+            "one": "1 ulæst omtale.",
+            "other": "%(count)s ulæste beskeder, herunder omtaler."
+        },
+        "recent_rooms": "Nylige rum",
+        "room_messsage_not_sent": "Åbent rum %(roomName)s med en usendt besked.",
+        "room_n_unread_invite": "Invitation til det åbne rum %(roomName)s.",
+        "room_name": "Rum %(name)s",
+        "room_status_bar": "Statusbjælke for rum",
+        "seek_bar_label": "Progressionsmarkør for lydafspiller",
+        "unread_messages": "Ulæste beskeder.",
+        "user_menu": "Brugermenu"
+    },
+    "a11y_jump_first_unread_room": "Gå til første ulæste rum.",
+    "action": {
+        "accept": "Accepter",
+        "add": "Tilføj",
+        "add_existing_room": "Tilføj eksisterende rum",
+        "add_people": "Tilføj personer",
+        "apply": "Anvend",
+        "approve": "Godkend",
+        "ask_to_join": "Bed om at blive medlem",
+        "back": "Tilbage",
+        "call": "Opkald",
+        "cancel": "Afbryd",
+        "change": "Skift",
+        "clear": "Ryd",
+        "click": "Klik",
+        "click_to_copy": "Klik for at kopiere",
+        "close": "Luk",
+        "collapse": "Fold sammen",
+        "complete": "Færdiggør",
+        "confirm": "Bekræft",
+        "continue": "Fortsæt",
+        "copy": "Kopiér",
+        "copy_link": "Kopiér link",
+        "create": "Opret",
+        "create_a_room": "Opret et rum",
+        "create_account": "Opret konto",
+        "decline": "Afvis",
+        "decline_and_block": "Afvis og blokér",
+        "decline_invite": "Afvis invitation",
+        "delete": "Slet",
+        "deny": "Nægt",
+        "disable": "Deaktiver",
+        "disconnect": "Afbryd forbindelsen",
+        "dismiss": "Afvis",
+        "done": "Færdig",
+        "download": "Hent",
+        "edit": "Rediger",
+        "enable": "Aktivér",
+        "enter_fullscreen": "Fuldskærmsvisning",
+        "exit_fullscreeen": "Afslut fuldskærmsvisning",
+        "expand": "Udvid",
+        "explore_public_rooms": "Udforsk offentlige rum",
+        "explore_rooms": "Udforsk rum",
+        "export": "Eksporter",
+        "forward": "Videresend",
+        "go": "Start",
+        "go_back": "Gå tilbage",
+        "got_it": "Forstået",
+        "hide": "Skjul",
+        "hide_advanced": "Skjul avanceret",
+        "hold": "Pausér",
+        "ignore": "Ignorere",
+        "import": "Importér",
+        "invite": "Invitere",
+        "invite_to_space": "Invitér til gruppe",
+        "invites_list": "Invitationer",
+        "join": "Deltag",
+        "learn_more": "Få mere at vide",
+        "leave": "Forlad",
+        "leave_room": "Forlad rummet",
+        "logout": "Log ud",
+        "manage": "Administrer",
+        "maximise": "Maksimer",
+        "mention": "Nævn",
+        "minimise": "Minimér",
+        "new_room": "Nyt rum",
+        "new_video_room": "Nyt videorum",
+        "next": "Næste",
+        "no": "Nej",
+        "ok": "OK",
+        "open": "Åbn",
+        "open_menu": "Åbn menu",
+        "pause": "Pausér",
+        "pin": "Fastgør",
+        "play": "Afspil",
+        "proceed": "Fortsæt",
+        "quote": "Citat",
+        "react": "Reager",
+        "refresh": "Genopfrisk",
+        "register": "Registrér",
+        "reload": "Genindlæs",
+        "remove": "Fjern",
+        "rename": "Omdøb",
+        "reply": "Besvar",
+        "reply_in_thread": "Svar i tråd",
+        "report_content": "Anmeld indhold",
+        "resend": "Send igen",
+        "reset": "Nulstil",
+        "resume": "Genoptag",
+        "retry": "Forsøg igen",
+        "review": "Kontrollér",
+        "revoke": "Tilbagekald",
+        "save": "Gem",
+        "search": "Søg",
+        "send_report": "Send rapport",
+        "set_avatar": "Sæt profilbillede",
+        "share": "Del",
+        "show": "Vis",
+        "show_advanced": "Vis avanceret",
+        "show_all": "Vis alle",
+        "sign_in": "Log ind",
+        "sign_out": "Log ud",
+        "skip": "Spring over",
+        "start": "Start",
+        "start_chat": "Start samtale",
+        "start_new_chat": "Start ny samtale",
+        "stop": "Stop",
+        "submit": "Indsend",
+        "subscribe": "Abonnér",
+        "transfer": "Overfør",
+        "trust": "Hav tillid til",
+        "try_again": "Prøv igen",
+        "unban": "Fjern spærring af",
+        "unignore": "Fjern ignorering",
+        "unpin": "Frigør",
+        "unsubscribe": "Afmeld",
+        "update": "Opdater",
+        "upgrade": "Opgradér",
+        "upload": "Upload",
+        "upload_file": "Upload fil",
+        "verify": "Verificér",
+        "view": "Se",
+        "view_all": "Se alle",
+        "view_list": "Se liste",
+        "view_message": "Se besked",
+        "view_source": "Se Kilde",
+        "yes": "Ja",
+        "yes_dismiss": "Ja, afvis",
+        "zoom_in": "Zoom ind",
+        "zoom_out": "Zoom ud"
+    },
+    "analytics": {
+        "accept_button": "Det er i orden",
+        "bullet_1": "Vi registrerer eller profilerer <Bold>ikke</Bold> nogen kontodata",
+        "bullet_2": "Vi deler <Bold>ikke</Bold> oplysninger med tredjeparter",
+        "consent_migration": "Du har tidligere givet samtykke til at dele anonyme brugsdata med os. Vi opdaterer, hvordan det fungerer.",
+        "disable_prompt": "Du kan slå dette fra når som helst under \"indstillinger\"",
+        "enable_prompt": "Hjælp med at forbedre %(analyticsOwner)s",
+        "learn_more": "Del anonyme data for at hjælpe os med at identificere problemer. Intet personligt. Ingen tredjeparter. <LearnMoreLink>Få mere at vide </LearnMoreLink>",
+        "privacy_policy": "Du kan læse alle vores vilkår <PrivacyPolicyUrl>her</PrivacyPolicyUrl>",
+        "pseudonymous_usage_data": "Hjælp os med at identificere problemer og forbedre %(analyticsOwner)s ved at dele anonyme brugsdata. For at forstå, hvordan folk bruger flere enheder, genererer vi en tilfældig identifikator, der deles af dine enheder.",
+        "shared_data_heading": "Alle følgende data kan deles:"
+    },
+    "auth": {
+        "3pid_in_use": "E-mailadressen eller telefonnummeret er allerede i brug.",
+        "account_clash": "Din nye konto (%(newAccountId)s) er registreret, men du er allerede logget ind på en anden konto (%(loggedInUserId)s).",
+        "account_clash_previous_account": "Fortsæt med tidligere konto",
+        "account_deactivated": "Denne konto er blevet deaktiveret.",
+        "autodiscovery_generic_failure": "Kunne ikke hente konfiguration til automatisk opdagelse fra serveren",
+        "autodiscovery_hs_incompatible": "Din hjemmeserver er for gammel og understøtter ikke minimumskravet til den krævede API version. Kontakt venligst ejeren af din server, eller opgradér den selv.",
+        "autodiscovery_invalid": "Ugyldigt svar fra hjemmeserver",
+        "autodiscovery_invalid_hs": "Hjemmeserver-URL'en ser ikke ud til at være en gyldig Matrix hjemmeserver",
+        "autodiscovery_invalid_hs_base_url": "Ugyldig base_url for homeserver",
+        "autodiscovery_invalid_is": "Identitetsserver-URL ser ikke ud til at være en gyldig identitetsserver.",
+        "autodiscovery_invalid_is_base_url": "Ugyldig base_url for m.identity_server",
+        "autodiscovery_invalid_is_response": "Ugyldigt svar fra identitetsserveren",
+        "autodiscovery_invalid_json": "Ugyldig JSON",
+        "autodiscovery_no_well_known": "Ingen .well-known JSON-fil fundet",
+        "autodiscovery_unexpected_error_hs": "Uventet fejl ved indlæsning af homeserver-konfigurationen",
+        "autodiscovery_unexpected_error_is": "Uventet fejl ved indlæsning af identitetsserver-konfigurationen",
+        "captcha_description": "Denne hjemmeserver vil gerne sikre sig, at du ikke er en robot.",
+        "change_password_action": "Skift adgangskode",
+        "change_password_confirm_invalid": "Adgangskoderne matcher ikke",
+        "change_password_confirm_label": "Bekræft adgangskode",
+        "change_password_current_label": "Nuværende adgangskode",
+        "change_password_empty": "Adgangskoder kan ikke være tomme",
+        "change_password_error": "Fejl ved ændring af adgangskode: %(error)s",
+        "change_password_mismatch": "De nye adgangskoder stemmer ikke overens",
+        "change_password_new_label": "Ny adgangskode",
+        "check_email_explainer": "Følg instruktionerne, der er sendt til<b>%(email)s</b>",
+        "check_email_resend_prompt": "Har du ikke modtaget den?",
+        "check_email_resend_tooltip": "Bekræftelseslink sendt igen!",
+        "check_email_wrong_email_button": "Indtast e-mailadressen igen",
+        "check_email_wrong_email_prompt": "Forkert e-mailadresse?",
+        "continue_with_idp": "Fortsæt med %(provider)s",
+        "continue_with_sso": "Fortsæt med %(ssoButtons)s",
+        "country_dropdown": "Lande-rullemenu",
+        "create_account_prompt": "Ny her? <a>Opret en konto</a>",
+        "create_account_title": "Opret konto",
+        "email_discovery_text": "Brug e-mail for eventuelt at kunne findes af eksisterende kontakter.",
+        "email_field_label": "E-mail",
+        "email_field_label_invalid": "Ligner ikke en gyldig e-mailadresse",
+        "email_field_label_required": "Indtast e-mailadresse",
+        "email_help_text": "Tilføj en e-mailadresse for at kunne nulstille din adgangskode.",
+        "email_phone_discovery_text": "Brug e-mail eller telefonnummer for at gøre det muligt for eksisterende kontakter at finde dig.",
+        "enter_email_explainer": "<b>%(homeserver)s</b> vil sende dig et link, som du kan nulstille din password med.",
+        "enter_email_heading": "Indtast din e-mail for at nulstille adgangskoden",
+        "failed_connect_identity_server": "Identitetsserveren kan ikke kontaktes",
+        "failed_connect_identity_server_other": "Du kan logge på, men nogle funktioner vil ikke være tilgængelige inden identitetsserveren er online igen. Hvis du bliver ved med at se denne advarsel, tjek din konfiguration eller kontakt en serveradministrator.",
+        "failed_connect_identity_server_register": "Du kan registrere dig, men nogle funktioner vil ikke være tilgængelige inden identitetsserveren er online igen. Hvis du bliver ved med at se denne advarsel, tjek din konfiguration eller kontakt en serveradministrator.",
+        "failed_connect_identity_server_reset_password": "Du kan nulstille dit kodeord, men nogle funktioner vil ikke være tilgængelige inden identitetsserveren er online igen. Hvis du bliver ved med at se denne advarsel, tjek din konfiguration eller kontakt en serveradministrator.",
+        "failed_homeserver_discovery": "Det lykkedes ikke at finde hjemmeserveren",
+        "failed_query_registration_methods": "Kan ikke søge efter understøttede registreringsmetoder.",
+        "failed_soft_logout_auth": "Kunne ikke re-verificere",
+        "failed_soft_logout_homeserver": "Kunne ikke re-verificere på grund af et problem med hjemmeserveren",
+        "forgot_password_email_invalid": "E-mailadressen ser ikke ud til at være gyldig.",
+        "forgot_password_email_required": "Den emailadresse, der tilhører til din adgang, skal indtastes.",
+        "forgot_password_prompt": "Har du glemt din adgangskode?",
+        "forgot_password_send_email": "Send e-mail",
+        "identifier_label": "Log ind med",
+        "incorrect_credentials": "Forkert brugernavn og/eller adgangskode.",
+        "incorrect_credentials_detail": "Bemærk, at du logger ind på %(hs)s -serveren, ikke matrix.org.",
+        "incorrect_password": "Forkert adgangskode",
+        "log_in_new_account": "<a>Log ind</a> på din nye konto.",
+        "logout_dialog": {
+            "description": "Er du sikker på, at du vil logge ud?",
+            "megolm_export": "Eksporter nøgler manuelt",
+            "setup_key_backup_title": "Du vil miste adgang til dine krypterede beskeder",
+            "setup_secure_backup_description_1": "Krypterede beskeder er sikret med end-to-end encryption. Kun du og din(e) modpart(er) har nøglerne til at læse disse beskeder.",
+            "setup_secure_backup_description_2": "Når du logger ud, slettes disse nøgler fra denne enhed, hvilket betyder, at du ikke kan læse krypterede beskeder, medmindre du har nøglerne til dem på dine andre enheder eller har sikkerhedskopieret dem til serveren.",
+            "skip_key_backup": "Jeg vil ikke have mine krypterede beskeder"
+        },
+        "misconfigured_body": "Bed din %(brand)s administrator om at kontrollere <a>din konfiguration</a> for forkerte eller dobbelte poster.",
+        "misconfigured_title": "Din %(brand)s er konfigureret forkert",
+        "mobile_create_account_title": "Du skal til at oprette en konto på %(hsName)s",
+        "msisdn_field_description": "Andre brugere kan invitere dig til rum ved hjælp af dine kontaktoplysninger",
+        "msisdn_field_label": "Telefon",
+        "msisdn_field_number_invalid": "Det telefonnummer ser ikke helt rigtigt ud. Undersøg det venligt og forsøg igen.",
+        "msisdn_field_required_invalid": "Indtast telefonnummer",
+        "no_hs_url_provided": "Ingen homeserver URL oplyst",
+        "oidc": {
+            "error_title": "Vi kunne ikke logge dig ind",
+            "generic_auth_error": "Noget gik galt under verifikationen. Gå til login siden og prøv igen.",
+            "missing_or_invalid_stored_state": "Vi spurgte din browser om at huske hvilken homeserver du bruger for at logge på, men din browser har desværre glemt det. Gå til log ind siden og prøv igen."
+        },
+        "password_field_keep_going_prompt": "Fortsæt...",
+        "password_field_label": "Indtast adgangskode",
+        "password_field_strong_label": "Godt stærkt password!",
+        "password_field_weak_label": "Passwordet er tilladt, men usikkert",
+        "phone_label": "Telefon",
+        "phone_optional_label": "Telefon (valgfrit)",
+        "qr_code_login": {
+            "completing_setup": "Afslut opsætningen af din nye enhed",
+            "error_expired": "Login er udløbet. Prøv venligst igen.",
+            "error_expired_title": "Login blev ikke gennemført i tide",
+            "error_insecure_channel_detected_instructions": "Hvad nu?",
+            "error_insecure_channel_detected_instructions_3": "Log ind manuelt, hvis det ikke virker",
+            "error_other_device_already_signed_in_title": "Din anden enhed er allerede logget ind",
+            "error_unexpected": "Der opstod en uventet fejl. Anmodningen om at forbinde din anden enhed er blevet annulleret.",
+            "error_user_cancelled": "Login blev annulleret på den anden enhed.",
+            "error_user_cancelled_title": "Anmodningen om login blev annulleret",
+            "error_user_declined": "Du eller kontoudbyderen har afvist anmodningen on login.",
+            "error_user_declined_title": "Login afvist",
+            "scan_code_instruction": "Scan QR-koden med en anden enhed",
+            "scan_qr_code": "Log ind med QR-kode",
+            "select_qr_code": "Vælg \"%(scanQRCode)s\"",
+            "unsupported_explainer": "Din kontoudbyder understøtter ikke, at man kan logge ind på en ny enhed med en QR-kode",
+            "waiting_for_device": "Venter på, at enheden logger ind"
+        },
+        "register_action": "Opret brugerkonto",
+        "registration": {
+            "continue_without_email_description": "Bare en advarsel: hvis du ikke tilføjer en e-mail og glemmer dit password, kan du <b> miste adgangen til din konto permanent</b> .",
+            "continue_without_email_field_label": "Email (valgfri)",
+            "continue_without_email_title": "Fortsætter uden e-mail"
+        },
+        "registration_disabled": "Registrering er deaktiveret på denne hjemmeserver.",
+        "registration_msisdn_field_required_invalid": "Indtast telefonnummer (kræves på denne hjemmeserver)",
+        "registration_successful": "Registreringen blev fuldført!",
+        "registration_username_in_use": "Nogen har allerede det brugernavn. Prøv et andet, eller hvis det er dig, så log ind nedenfor.",
+        "registration_username_unable_check": "Ude af stand til at kontrollere om brugernavnet allerede er taget. Forsøg igen senere.",
+        "registration_username_validation": "Brug kun små bogstaver, tal, bindestreger og underscores",
+        "reset_password": {
+            "confirm_new_password": "Bekræft ny adgangskode",
+            "devices_logout_success": "Du er blevet logget ud af alle enheder og vil ikke længere modtage push-notifikationer. For at genaktivere meddelelser skal du logge ind igen på hver enhed.",
+            "other_devices_logout_warning_1": "Når du logger ud af dine enheder, slettes de krypteringsnøgler, der er gemt på dem, hvilket gør den krypterede chat-historik ulæselig.",
+            "other_devices_logout_warning_2": "Hvis du vil bevare adgangen til din chathistorik i krypterede rum, skal du konfigurere nøglebackup eller eksportere dine meddelelsesnøgler fra en af dine andre enheder, før du fortsætter.",
+            "password_not_entered": "Der skal indtastes en ny adgangskode.",
+            "passwords_mismatch": "Nye adgangskoder skal matche hinanden.",
+            "rate_limit_error": "For mange forsøg på kort tid. Vent lidt, før du prøver igen.",
+            "rate_limit_error_with_time": "For mange forsøg på kort tid. Prøv igen efter %(timeout)s.",
+            "reset_successful": "Din adgangskode er blevet nulstillet.",
+            "return_to_login": "Gå tilbage til loginskærmen",
+            "sign_out_other_devices": "Log ud af alle enheder"
+        },
+        "reset_password_action": "Nulstil adgangskode",
+        "reset_password_button": "Har du glemt din adgangskode?",
+        "reset_password_email_field_description": "Brug en e-mailadresse til at gendanne din konto",
+        "reset_password_email_field_required_invalid": "Indtast e-mailadresse (kræves på denne hjemmeserver)",
+        "reset_password_email_not_associated": "Din e-mailadresse ser ikke ud til at være tilknyttet et Matrix-ID på denne hjemmeserver.",
+        "reset_password_email_not_found_title": "Denne emailadresse blev ikke fundet",
+        "reset_password_title": "Nulstil din adgangskode",
+        "server_picker_custom": "Anden hjemmeserver",
+        "server_picker_description": "Du kan bruge de brugerdefinerede serverindstillinger til at logge ind på andre Matrix-servere ved at angive en anden hjemmeserver-URL. Dette giver dig mulighed for at bruge %(brand)s med en eksisterende Matrix-konto på en anden homeserver.",
+        "server_picker_description_matrix.org": "Tilslut dig millioner af brugere på den største offentlige server",
+        "server_picker_dialog_title": "Beslut, hvor din konto skal hostes",
+        "server_picker_explainer": "Brug din foretrukne Matrix-hjemmeserver, hvis du har en, eller host din egen.",
+        "server_picker_failed_validate_homeserver": "Kan ikke validere hjemmeserver",
+        "server_picker_intro": "Vi kalder de steder, hvor du kan hoste din konto, for 'hjemmeservere'.",
+        "server_picker_invalid_url": "Ugyldig URL",
+        "server_picker_learn_more": "Om hjemmeservere",
+        "server_picker_matrix.org": "Matrix.org er den største offentlige hjemmeserver i verden, så det er et godt sted at begynde for mange.",
+        "server_picker_required": "Angiv en hjemmeserver",
+        "server_picker_title": "Log ind på din hjemmeserver",
+        "server_picker_title_default": "Serverindstillinger",
+        "server_picker_title_registration": "Opret konto på",
+        "session_logged_out_description": "Af sikkerhedsmæssige årsager er denne session blevet logget ud. Log venligst ind igen.",
+        "session_logged_out_title": "Logget ud",
+        "set_email": {
+            "description": "Dette giver dig mulighed for at nulstille din adgangskode og modtage notifikationer.",
+            "verification_pending_description": "Tjek din e-mail og klik på linket i den. Når du har gjort det, skal du klikke på Fortsæt.",
+            "verification_pending_title": "Bekræftelse afventer"
+        },
+        "set_email_prompt": "Vil du angive en e-mailadresse?",
+        "sign_in_description": "Brug din konto for at fortsætte.",
+        "sign_in_instead": "Log ind i stedet",
+        "sign_in_instead_prompt": "Har du allerede en konto? <a>Log ind her</a>",
+        "sign_in_or_register": "Log ind eller Opret bruger",
+        "sign_in_or_register_description": "Brug din konto eller opret en ny for at fortsætte.",
+        "sign_in_prompt": "Har du en konto? <a>Log ind</a>",
+        "sign_in_with_sso": "Log ind med single sign-on",
+        "signing_in": "Logger ind…",
+        "soft_logout": {
+            "clear_data_button": "Ryd alle data",
+            "clear_data_description": "Sletning af alle data fra denne session er permanent. Krypterede beskeder vil gå tabt, medmindre deres nøgler er blevet sikkerhedskopieret.",
+            "clear_data_title": "Ryd alle data i denne session?"
+        },
+        "soft_logout_heading": "Du er logget ud",
+        "soft_logout_intro_password": "Indtast din password for at logge ind og få adgang til din konto igen.",
+        "soft_logout_intro_sso": "Log ind og få adgang til din konto igen.",
+        "soft_logout_intro_unsupported_auth": "Du kan ikke logge ind på din konto. Kontakt din hjemmeserveradministrator for mere information.",
+        "soft_logout_subheading": "Ryd personlige data",
+        "soft_logout_warning": "Advarsel: dine personlige data (inklusiv krypteringsnøgler) er stadig gemt i denne session. Ryd den, hvis du er færdig med at bruge sessionen eller ønsker at logge ind på en anden konto.",
+        "sso": "Engangs login",
+        "sso_complete_in_browser_dialog_title": "Gå til din browser for at gennemføre login",
+        "sso_failed_missing_storage": "Vi spurgte din browser om at huske hvilken homeserver du bruger for at logge på, men din browser har desværre glemt det. Gå til log ind siden og prøv igen.",
+        "sso_or_username_password": "%(ssoButtons)s Eller %(usernamePassword)s",
+        "sync_footer_subtitle": "Hvis du har tilmeldt dig mange rum, kan det her tage et stykke tid.",
+        "syncing": "Synkroniserer…",
+        "uia": {
+            "code": "Kode",
+            "email": "For at oprette din konto skal du åbne linket i den e-mail, vi lige har sendt til %(emailAddress)s.",
+            "email_auth_header": "Tjek din e-mail for at fortsætte",
+            "email_resend_prompt": "Har du ikke modtaget den? <a>Send den igen</a>",
+            "email_resent": "Genfremsendt!",
+            "fallback_button": "Start godkendelse",
+            "mas_cross_signing_reset_cta": "Fortsæt til konto",
+            "msisdn": "Der er sendt en sms til %(msisdn)s",
+            "msisdn_token_incorrect": "Forkert token",
+            "msisdn_token_prompt": "Indtast den kode, der står i den:",
+            "password_prompt": "Bekræft din identitet ved at indtaste din adgangskode til kontoen nedenfor.",
+            "recaptcha_missing_params": "Mangler captcha offentlig nøgle i homeserver. Rapporter venligst dette til administratoren af din hjemmeserver .",
+            "registration_token_label": "Registreringstoken",
+            "registration_token_prompt": "Indtast et registreringstoken fra hjemmeserverens administrator.",
+            "sso_body": "Bekræft tilføjelsen af denne email adresse ved at bruge Single Sign On til at bevise din identitet.",
+            "sso_failed": "Noget gik galt under bekræftelsen af din identitet. Annuller og prøv igen.",
+            "sso_postauth_body": "Klik på knappen herunder for at bekræfte din identitet.",
+            "sso_postauth_title": "Bekræft for at fortsætte",
+            "sso_preauth_body": "For at fortsætte skal du bruge Single Sign On til at bekræfte din identitet.",
+            "sso_title": "Brug engangs login for at fortsætte",
+            "terms": "Læs og accepter venligst brugervilkårene for denne hjemmeserver:",
+            "terms_invalid": "Gennemgå venligst alle hjemmeserverens brugervilkår og accepter dem"
+        },
+        "unsupported_auth": "Denne hjemmeserver tilbyder ingen login-flows, der understøttes af denne klient.",
+        "unsupported_auth_email": "Denne hjemmeserver understøtter ikke login med e-mailadresse.",
+        "unsupported_auth_msisdn": "Denne server understøtter ikke godkendelse med et telefonnummer.",
+        "username_field_required_invalid": "Indtast brugernavn",
+        "username_in_use": "Nogen har allerede det brugernavn, prøv venligst et andet.",
+        "verify_email_explainer": "Vi skal vide, at du er dig, før vi nulstiller dit password. Klik på linket i den e-mail, vi lige har sendt til <b>%(email)s</b>",
+        "verify_email_heading": "Bekræft din e-mail for at fortsætte"
+    },
+    "bug_reporting": {
+        "additional_context": "Hvis der er yderligere kontekst, der kan hjælpe med at analysere problemet, såsom hvad du lavede på det pågældende tidspunkt, rum-ID'er, bruger-ID'er osv., bedes du nævne disse ting her.",
+        "before_submitting": "Vi anbefaler, at du <a> opretter et GitHub-problem</a> for at sikre, at din rapport bliver gennemgået.",
+        "collecting_information": "Indsamler app versionsoplysninger",
+        "collecting_logs": "Indsamler logfiler",
+        "create_new_issue": "<newIssueLink>Opret venligst et nyt problem</newIssueLink> på GitHub, så vi kan undersøge denne fejl.",
+        "description": "Debug-logfiler indeholder data om applikationsbrugen, herunder dit brugernavn, ID'erne eller aliasserne for de rum, du har besøgt, hvilke UI-elementer du sidst har interageret med, og andre brugeres brugernavne. De indeholder ikke beskeder.",
+        "download_logs": "Download logfiler",
+        "downloading_logs": "Downloader logfiler",
+        "error_empty": "Fortæl os venligst, hvad der gik galt, eller endnu bedre, opret et issue på GitHub, der beskriver problemet.",
+        "failed_send_logs_causes": {
+            "disallowed_app": "Din fejlrapport blev afvist. Rageshake-serveren understøtter ikke denne applikation.",
+            "rejected_generic": "Din fejlrapport blev afvist. RageShake-serveren afviste indholdet af rapporten på grund af en politik.",
+            "rejected_recovery_key": "Din fejlrapport blev afvist af sikkerhedsmæssige årsager, da den indeholdt en gendannelsesnøgle.",
+            "rejected_version": "Din fejlrapport blev afvist, da den app-version, du kører, er for gammel."
+        },
+        "github_issue": "GitHub problem",
+        "introduction": "Hvis du har indsendt en fejl via GitHub, kan fejlsøgningslogfiler hjælpe os med at spore problemet. ",
+        "log_request": "For at hjælpe os med at forhindre dette i fremtiden, bedes du <a>sende os logfiler</a>.",
+        "logs_sent": "Logfiler sendt",
+        "matrix_security_issue": "Hvis du ønsker at rapportere et Matrix-relateret sikkerhedsproblem, læs da venligst Matrix.org<a> Sikkerhedspolitik for offentliggørelse</a> .",
+        "preparing_download": "Forbereder download af logfiler",
+        "preparing_logs": "Forbereder afsendelse af logfiler",
+        "send_logs": "Send logfiler",
+        "submit_debug_logs": "Indsend debug-logfiler",
+        "textarea_label": "Noter",
+        "thank_you": "Tak!",
+        "title": "Fejlrapportering",
+        "unsupported_browser": "Påmindelse: Din browser er ikke understøttet, så din oplevelse kan være uforudsigelig.",
+        "uploading_logs": "Uploader logfiler",
+        "waiting_for_server": "Venter på svar fra server"
+    },
+    "cannot_invite_without_identity_server": "Du kan ikke invitere brugere via e-mail uden at være forbundet til en identitetsserver. Du kan oprette forbindelse til en under \"Indstillinger\".",
+    "cannot_reach_homeserver": "Homeserveren kan ikke kontaktes",
+    "cannot_reach_homeserver_detail": "Vær sikker at du har en stabil internetforbindelse, eller kontakt serveradministratoren",
+    "chat_card_back_action_label": "Tilbage til chat",
+    "chat_effects": {
+        "confetti_description": "Sender den givne besked med konfetti",
+        "confetti_message": "sender konfetti",
+        "fireworks_description": "Sender den angivne besked med fyrværkeri",
+        "fireworks_message": "sender fyrværkeri",
+        "hearts_description": "Sender den angivne besked med hjerter",
+        "hearts_message": "sender hjerter",
+        "rainfall_description": "Sender den angivne besked med regnfald",
+        "rainfall_message": "sender regn",
+        "snowfall_description": "Sender den angivne besked med snefald",
+        "snowfall_message": "sender snefald",
+        "spaceinvaders_description": "Sender den pågældende besked med en effekt der har rumrejse tema.",
+        "spaceinvaders_message": "sender space invaders"
+    },
+    "common": {
+        "access_token": "Adgangstoken",
+        "accessibility": "Tilgængelighed",
+        "advanced": "Avanceret",
+        "analytics": "Analyse data",
+        "and_n_others": {
+            "one": "og en anden...",
+            "other": "og %(count)s andre..."
+        },
+        "appearance": "Udseende",
+        "application": "Program",
+        "are_you_sure": "Er du sikker?",
+        "attachment": "Vedhæftning",
+        "authentication": "Godkendelse",
+        "avatar": "Profilbillede",
+        "beta": "Beta",
+        "camera": "Kamera",
+        "cameras": "Kameraer",
+        "capabilities": "Evner",
+        "copied": "Kopieret!",
+        "credits": "Tak til",
+        "dark": "Mørkt tema",
+        "description": "Beskrivelse",
+        "deselect_all": "Fravælg alle",
+        "device": "Enhed",
+        "edited": "redigeret",
+        "email_address": "E-mailadresse",
+        "emoji": "Emoji",
+        "encrypted": "Krypteret",
+        "encryption_enabled": "Kryptering aktiveret",
+        "error": "Fejl",
+        "faq": "Ofte stillede spørgsmål",
+        "favourites": "Favoritter",
+        "feedback": "Feedback",
+        "filter_results": "Filtrér resultater",
+        "forward_message": "Videresend besked",
+        "general": "Generel",
+        "go_to_settings": "Gå til Indstillinger",
+        "guest": "Gæst",
+        "help": "Hjælp",
+        "historical": "Historisk",
+        "home": "Hjem",
+        "homeserver": "Hjemmeserver",
+        "identity_server": "Identitetsserver",
+        "image": "Billede",
+        "integration_manager": "Integration manager",
+        "joined": "Deltager",
+        "labs": "Laboratorier",
+        "legal": "Juridisk",
+        "light": "Lyst tema",
+        "loading": "Indlæser...",
+        "location": "Lokation",
+        "low_priority": "Lav prioritet",
+        "matrix": "Matrix",
+        "message": "Besked",
+        "message_layout": "Besked-layout",
+        "microphone": "Mikrofon",
+        "model": "Model",
+        "modern": "Moderne",
+        "mute": "Sæt på lydløs",
+        "n_members": {
+            "one": "%(count)s medlem",
+            "other": "%(count)s medlemmer"
+        },
+        "n_rooms": {
+            "one": "%(count)s rum",
+            "other": "%(count)s rum"
+        },
+        "name": "Navn",
+        "no_results": "Ingen resultater",
+        "no_results_found": "Ingen resultater fundet",
+        "not_trusted": "Ikke betroet",
+        "off": "Slukket",
+        "offline": "Offline",
+        "on": "Tændt",
+        "options": "Valgmuligheder",
+        "orphan_rooms": "Andre rum",
+        "password": "Adgangskode",
+        "people": "Brugere",
+        "preferences": "Indstillinger",
+        "presence": "Tilstedeværelse",
+        "preview_message": "Hej med dig. Du er den bedste!",
+        "privacy": "Privatliv",
+        "private": "Privat",
+        "private_room": "Private rum",
+        "private_space": "Privat gruppe",
+        "profile": "Profil",
+        "public": "Offentlig",
+        "public_room": "Offentlige rum",
+        "public_space": "Offentlig gruppe",
+        "qr_code": "QR-kode",
+        "random": "Tilfældig",
+        "reactions": "Reaktioner",
+        "report_a_bug": "Rapporter en fejl",
+        "room": "Rum",
+        "room_name": "Navn på rum",
+        "rooms": "Rum",
+        "save": "Gem",
+        "saved": "Gemt",
+        "saving": "Gemmer...",
+        "secure_backup": "Sikker backup",
+        "select_all": "Vælg alle",
+        "server": "Server",
+        "settings": "Indstillinger",
+        "setup_secure_messages": "Opsæt sikre beskeder",
+        "show_more": "Vis mere",
+        "someone": "Nogen",
+        "space": "Gruppe",
+        "spaces": "Grupper",
+        "sticker": "Klistermærke",
+        "stickerpack": "Klistermærkepakke",
+        "success": "Succes",
+        "suggestions": "Forslag",
+        "support": "Support",
+        "system_alerts": "Systemadvarsler",
+        "theme": "Tema",
+        "thread": "Tråd",
+        "threads": "Tråde",
+        "timeline": "Tidslinje",
+        "unavailable": "ikke tilgængelig",
+        "unencrypted": "Ikke krypteret",
+        "unmute": "Slå lyden til",
+        "unnamed_room": "Unavngivet rum",
+        "unnamed_space": "Unavngivet gruppe",
+        "unverified": "Ubekræftet",
+        "updating": "Opdaterer...",
+        "user": "Bruger",
+        "user_avatar": "Profilbillede",
+        "username": "Brugernavn",
+        "verified": "Bekræftet",
+        "version": "Version",
+        "video": "Video",
+        "video_room": "Videorum",
+        "view_message": "Se besked",
+        "warning": "Advarsel"
+    },
+    "composer": {
+        "autocomplete": {
+            "@room_description": "Giv hele rummet besked",
+            "command_a11y": "Autofuldførelse af kommandoer",
+            "command_description": "Kommandoer",
+            "emoji_a11y": "Emoji-autofuldførelse",
+            "notification_a11y": "Autofuldførelse af notifikationer",
+            "notification_description": "",
+            "room_a11y": "Autofuldførelse af rum",
+            "space_a11y": "Autocomplete ved tryk på mellemrum",
+            "user_a11y": "Automatisk udfyldning af brugeroplysninger",
+            "user_description": "Brugere"
+        },
+        "close_sticker_picker": "Skjul klistermærker",
+        "edit_composer_label": "Redigér besked",
+        "format_bold": "Fed",
+        "format_code_block": "Kodeblok",
+        "format_decrease_indent": "Reducering af indrykning",
+        "format_increase_indent": "Forøgelse af indrykning",
+        "format_inline_code": "Kode",
+        "format_insert_link": "Indsæt link",
+        "format_italic": "Kursiveret",
+        "format_italics": "Kursiv",
+        "format_link": "Link",
+        "format_ordered_list": "Nummereret liste",
+        "format_strikethrough": "Gennemstreget",
+        "format_underline": "Understregning",
+        "format_unordered_list": "Punktliste",
+        "formatting_toolbar_label": "Formatering",
+        "link_modal": {
+            "link_field_label": "Link",
+            "text_field_label": "Tekst",
+            "title_create": "Opret et link",
+            "title_edit": "Rediger link"
+        },
+        "mode_plain": "Skjul formatering",
+        "mode_rich_text": "Vis formatering",
+        "no_perms_notice": "Du har ikke tilladelse til at slå noget op i dette rum",
+        "placeholder": "Send en ukrypteret besked…",
+        "placeholder_encrypted": "Send en besked",
+        "placeholder_reply": "Send et ukrypteret svar…",
+        "placeholder_reply_encrypted": "Send et svar...",
+        "placeholder_thread": "Svar på ukrypteret tråd...",
+        "placeholder_thread_encrypted": "Svar på tråd...",
+        "poll_button": "Afstemning",
+        "poll_button_no_perms_description": "Du har ikke tilladelse til at starte afstemninger i dette rum.",
+        "poll_button_no_perms_title": "Tilladelse påkrævet",
+        "replying_title": "Svarer",
+        "room_unencrypted": "Beskeder i dette rum er ikke end-to-end krypteret",
+        "room_upgraded_link": "Samtalen fortsætter her.",
+        "room_upgraded_notice": "Dette rum er blevet erstattet og er ikke længere aktivt.",
+        "send_button_title": "Send besked",
+        "send_button_voice_message": "Send talebesked",
+        "send_voice_message": "Send talebesked",
+        "stop_voice_message": "Stop optagelsen",
+        "voice_message_button": "Talebesked"
+    },
+    "console_wait": "Vent!",
+    "create_room": {
+        "action_create_room": "Opret rum",
+        "action_create_video_room": "Opret videorum",
+        "encrypted_video_room_warning": "Du kan ikke deaktivere dette senere. Rummet vil blive krypteret, men det indlejrede opkald vil ikke blive det.",
+        "encrypted_warning": "Du kan ikke deaktivere dette senere. Broer og de fleste bots vil ikke virke endnu.",
+        "encryption_forced": "Din server kræver, at kryptering er aktiveret i private rum.",
+        "encryption_label": "Aktivér end-to-end kryptering",
+        "error_title": "Gruppen kunne ikke oprettes",
+        "generic_error": "Serveren kan være utilgængelig, overbelastet, eller også har du fundet en fejl.",
+        "join_rule_change_notice": "Du kan ændre dette nårsomhelst fra rummets indstillinger",
+        "join_rule_invite": "Privat rum (kun tilgængeligt med invitation)",
+        "join_rule_invite_label": "Kun inviterede personer vil kunne se og deltage i dette rum.",
+        "join_rule_knock_label": "Alle kan anmode om at blive medlem, men administratorer eller moderatorer skal give adgang. Du kan ændre dette senere.",
+        "join_rule_public_label": "Enhver vil kunne finde og tilslutte sig dette rum.",
+        "join_rule_public_parent_space_label": "Hvem som helst vil være in stand til at finde og tilslutte sig dette rum, bortset fra medlemmer af <SpaceName/>",
+        "join_rule_restricted": "Synlig for medlemmer af gruppen",
+        "join_rule_restricted_label": "Alle i <SpaceName/> vil kunne finde og tilslutte sig dette rum.",
+        "name_validation_required": "Indtast venligst et navn for gruppen",
+        "room_visibility_label": "Rummets synlighed",
+        "title_private_room": "Opret et privat rum",
+        "title_public_room": "Opret et offentligt rum",
+        "title_video_room": "Opret et videorum",
+        "topic_label": "Emne (valgfrit)",
+        "unfederated": "Bloker alle, der ikke er en del af %(serverName)s fra nogensinde at deltage i dette rum.",
+        "unfederated_label_default_off": "Du kan vælge at aktivere dette, hvis rummet kun skal bruges til samarbejde med interne teams på din hjemmeserver. Dette kan ikke ændres senere.",
+        "unfederated_label_default_on": "Du kan vælge at deaktivere dette, hvis rummet skal bruges til samarbejde med eksterne teams, der har deres egen hjemmeserver. Dette kan ikke ændres senere.",
+        "unsupported_version": "Serveren understøtter ikke den oplyste gruppeversion."
+    },
+    "create_space": {
+        "add_details_prompt": "Tilføj nogle detaljer, for at hjælpe andre brugere med at genkende den.",
+        "add_details_prompt_2": "Du kan ændre disse nårsomhelst",
+        "add_existing_rooms_description": "Vælg rum eller samtaler at tilføje, dette er en gruppe kun for dig, ingen får besked om den. Du kan tilføje flere senere.",
+        "add_existing_rooms_heading": "Hvad ønsker du at organisere?",
+        "address_label": "Adresse",
+        "address_placeholder": "f.eks. min-gruppe",
+        "creating": "Opretter...",
+        "creating_rooms": "Opretter rum...",
+        "done_action": "Gå til min gruppe",
+        "done_action_first_room": "Gå til min første rum",
+        "explainer": "Grupper er en ny måde at samle rum og personer på. Hvilken type gruppe vil du gerne lave? Du kan ændre dette senere.",
+        "failed_create_initial_rooms": "Kunne ikke oprette de første rum i gruppen",
+        "failed_invite_users": "Det lykkedes ikke at invitere følgende brugere til din gruppe: %(csvUsers)s",
+        "invite_teammates_by_username": "Invitér med brugernavn",
+        "invite_teammates_description": "Sørg for, at de rette mennesker har adgang. Du kan invitere flere senere.",
+        "invite_teammates_heading": "Invitér dine holdkammerater",
+        "inviting_users": "Inviterer...",
+        "label": "Opret en gruppe",
+        "name_required": "Indtast et navn til gruppen",
+        "personal_space": "Bare mig",
+        "personal_space_description": "En privat gruppe til at organisere dine rum i",
+        "private_description": "Kun for inviterede, bedst til dig selv eller lukkede fællesskaber",
+        "private_heading": "Din private gruppe",
+        "private_only_heading": "Din gruppe",
+        "private_personal_description": "Sørg for at de rette mennesker har adgang til %(name)s",
+        "private_personal_heading": "Hvem arbejder du sammen med?",
+        "private_space": "Mig og mine holdkammerater",
+        "private_space_description": "En privat gruppe for dig selv og dine holdkammerater",
+        "public_description": "Åben gruppe for alle, bedst til åbne fællesskaber",
+        "public_heading": "Din offentlige gruppe",
+        "search_public_button": "Søg efter offentlige grupper",
+        "setup_rooms_community_description": "Lad os oprette et rum til hver af dem.",
+        "setup_rooms_community_heading": "Hvad er nogle af de ting, du ønsker at diskutere i %(spaceName)s?",
+        "setup_rooms_description": "Du kan også tilføje flere senere, herunder allerede eksisterende.",
+        "setup_rooms_private_description": "Vi opretter rum for hver af dem.",
+        "setup_rooms_private_heading": "Hvilke projekter arbejder dit hold på?",
+        "share_description": "Der er kun dig herinde i øjeblikket. Det bliver endnu bedre med andre.",
+        "share_heading": "Del %(name)s",
+        "skip_action": "Spring over for nu",
+        "subspace_adding": "Tilføjer...",
+        "subspace_beta_notice": "Tilføj en gruppe til en gruppe som du styrer",
+        "subspace_dropdown_title": "Opret en gruppe",
+        "subspace_existing_space_prompt": "Ønsker du at tilføje en eksisterende gruppe i stedet?",
+        "subspace_join_rule_invite_description": "Det er kun inviterede vil være i stand til at se og deltage i denne gruppe.",
+        "subspace_join_rule_invite_only": "Privat gruppe (kun for inviterede)",
+        "subspace_join_rule_label": "Gruppens synlighed",
+        "subspace_join_rule_public_description": "Alle vil kunne finde og deltage i denne gruppe, ikke kun medlemmer af<SpaceName/> .",
+        "subspace_join_rule_restricted_description": "Enhver i <SpaceName/> vil kunne finde og deltage."
+    },
+    "credits": {
+        "default_cover_photo": "Standardforsidebilledet <photo></photo> er © <author>Jesús Roncero</author> brugt under betingelserne i <terms>CC-BY-SA 4.0</terms>.",
+        "twemoji": "<twemoji>Twemoji</twemoji> emoji-kunsten er © <author>Twitter, Inc og andre bidragydere</author> brugt under vilkårene i <terms>CC-BY 4.0</terms>.",
+        "twemoji_colr": "<colr>twemoji-colr</colr> fonten er © <author>Mozilla Foundation</author> brugt under betingelserne i <terms>Apache 2.0</terms>."
+    },
+    "decline_invitation_dialog": {
+        "title": "Afvis invitation"
+    },
+    "devtools": {
+        "active_widgets": "Aktive widgets",
+        "category_other": "Andre",
+        "category_room": "Rum",
+        "caution_colon": "Vær forsigtig:",
+        "client_versions": "Klientversioner",
+        "crypto": {
+            "4s_public_key_not_in_account_data": "ikke fundet",
+            "backup_key_not_stored": "ikke gemt",
+            "cross_signing_untrusted": "Din konto har en krydssigneringsidentitet i hemmeligt lager, men denne session har endnu ikke tillid til den.",
+            "key_backup_inactive_warning": "Dine krypteringsnøgler fra denne session bliver ikke sikkerhedskopieret.",
+            "title": "End-to-end kryptering"
+        },
+        "developer_mode": "Udviklertilstand",
+        "developer_tools": "Udviklingsværktøjer",
+        "edit_setting": "Rediger indstilling",
+        "edit_values": "Rediger værdier",
+        "empty_string": "<empty string>",
+        "event_content": "Begivenhedsindhold",
+        "event_id": "Hændelses-id: %(eventId)s",
+        "event_sent": "Begivenhed sendt!",
+        "event_type": "Begivenhedstype",
+        "explore_account_data": "Undersøg kontodata",
+        "explore_room_account_data": "Undersøg rummets kontodata",
+        "explore_room_state": "Undersøg rummets tilstand",
+        "failed_to_find_widget": "Der opstod en fejl under søgningen efter denne widget.",
+        "failed_to_load": "Kunne ikke indlæse.",
+        "failed_to_save": "Indstillingerne kunne ikke gemmes.",
+        "failed_to_send": "Lykkedes ikke med at sende hændelse!",
+        "id": "ID: ",
+        "invalid_json": "Ser ikke ud som gyldig JSON.",
+        "level": "Niveau",
+        "low_bandwidth_mode": "Lav båndbredde-tilstand",
+        "low_bandwidth_mode_description": "Kræver kompatibel hjemmeserver.",
+        "main_timeline": "Vigtigste tidslinje",
+        "no_receipt_found": "Ingen kvittering fundet",
+        "notification_state": "Meddelelsestilstand er <strong> %(notificationState)s </strong>",
+        "notifications_debug": "Fejlfinding af meddelelser",
+        "number_of_users": "Antal brugere",
+        "original_event_source": "Oprindelig begivenhedskilde",
+        "room_encrypted": "Rummet er<strong> krypteret ✅</strong>",
+        "room_id": "Rummets ID: %(roomId)s",
+        "room_not_encrypted": "Rummet er <strong> ikke krypteret 🚨 </strong>",
+        "room_notifications_dot": "Punkt: ",
+        "room_notifications_highlight": "Fremhæv: ",
+        "room_notifications_last_event": "Seneste hændelse:",
+        "room_notifications_sender": "Afsender: ",
+        "room_notifications_thread_id": "ID for tråd: ",
+        "room_notifications_total": "I alt: ",
+        "room_notifications_type": "Type: ",
+        "room_status": "Status på rummet",
+        "room_unread_status_count": {
+            "one": "Rummets ulæste status: <strong> %(status)s</strong>, antal: <strong> %(count)s </strong>",
+            "other": "Rummets ulæste status: <strong> %(status)s</strong>, antal: <strong> %(count)s </strong>"
+        },
+        "save_setting_values": "Gem indstillingsværdier",
+        "see_history": "Se historie",
+        "send_custom_account_data_event": "Send brugerdefineret kontodatahændelse",
+        "send_custom_room_account_data_event": "Send brugerdefineret datahændelse om rumkonto",
+        "send_custom_state_event": "Send brugerdefineret tilstandshændelse",
+        "send_custom_timeline_event": "Send tilpasset tidslinjehændelse",
+        "server_info": "Serverinfo",
+        "server_versions": "Serverversioner",
+        "settable_global": "Kan indstilles på global",
+        "settable_room": "Kan indstilles på rum",
+        "setting_colon": "Indstilling:",
+        "setting_definition": "Indstillingsdefinition:",
+        "setting_id": "Indstiller ID",
+        "settings_explorer": "Indstillings-søger",
+        "show_hidden_events": "Vis skjulte begivenheder i tidslinjen",
+        "spaces": {
+            "one": "<space>",
+            "other": "<%(count)s spaces>"
+        },
+        "state_key": "Tilstandsnøgle",
+        "thread_root_id": "Trådens root-ID: %(threadRootId)s",
+        "threads_timeline": "Tidslinje for tråde",
+        "title": "Udviklerværktøjer",
+        "toggle_event": "slå begivenhed til/fra",
+        "toolbox": "Værktøjer",
+        "use_at_own_risk": "Denne brugergrænseflade kontrollerer IKKE værdityperne. Brug på eget ansvar.",
+        "user_read_up_to": "Bruger læser op til: ",
+        "user_read_up_to_ignore_synthetic": "Bruger læser op til (IgnoreSynthetic): ",
+        "user_read_up_to_private": "Bruger læser op til (m.read.private): ",
+        "user_read_up_to_private_ignore_synthetic": "Bruger læser op til (m.read.private; IgnoreSynthetic): ",
+        "value": "Værdi",
+        "value_colon": "Værdi:",
+        "value_in_this_room": "Værdi i dette rum",
+        "value_this_room_colon": "Værdi i dette rum:",
+        "values_explicit": "Værdier på eksplicitte niveauer",
+        "values_explicit_colon": "Værdier på eksplicitte niveauer:",
+        "values_explicit_room": "Værdier på eksplicitte niveauer i dette rum",
+        "values_explicit_this_room_colon": "Værdier på eksplicitte niveauer i dette rum:",
+        "view_servers_in_room": "Se hvilke servere der er repræsenteret i rummet",
+        "view_source_decrypted_event_source": "Dekrypteret begivenhedskilde",
+        "view_source_decrypted_event_source_unavailable": "Dekrypteret kilde ikke tilgængelig",
+        "widget_screenshots": "Aktivér widget-skærmbilleder på understøttede widgets"
+    },
+    "dialog_close_label": "Luk dialogboksen",
+    "emoji": {
+        "categories": "Kategorier",
+        "category_activities": "Aktiviteter",
+        "category_animals_nature": "Dyr og natur",
+        "category_flags": "Flag",
+        "category_food_drink": "Mad og drikke",
+        "category_frequently_used": "Ofte brugt",
+        "category_objects": "Objekter",
+        "category_smileys_people": "Smileys og mennesker",
+        "category_symbols": "Symboler",
+        "category_travel_places": "Rejser og steder",
+        "quick_reactions": "Hurtige reaktioner"
+    },
+    "emoji_picker": {
+        "cancel_search_label": "Annullér søgning"
+    },
+    "empty_room": "Tom gruppe",
+    "empty_room_was_name": "Tomt rum (var %(oldName)s)",
+    "encryption": {
+        "access_secret_storage_dialog": {
+            "key_validation_text": {
+                "wrong_security_key": "Den indtastede gendannelsesnøgle er ikke korrekt."
+            },
+            "restoring": "Gendanner nøgler fra sikkerhedskopi",
+            "security_key_title": "Indtast din gendannelsesnøgle"
+        },
+        "bootstrap_title": "Sætter nøgler op",
+        "confirm_encryption_setup_body": "Klik på knappen nedenfor for at bekræfte opsætning af kryptering.",
+        "confirm_encryption_setup_title": "Bekræft krypteringsopsætning",
+        "cross_signing_room_normal": "Dette rum er krypteret fra ende til ende.",
+        "cross_signing_room_verified": "Alle i dette rum er verificeret",
+        "cross_signing_room_warning": "Nogen bruger en ukendt session",
+        "cross_signing_user_normal": "Du har ikke verificeret denne bruger.",
+        "cross_signing_user_verified": "Du har verificeret denne bruger. Denne bruger har verificeret alle sine sessioner.",
+        "cross_signing_user_warning": "Denne bruger har ikke verificeret alle sine sessioner.",
+        "event_shield_reason_authenticity_not_guaranteed": "Ægtheden af denne krypterede besked kan ikke garanteres på denne enhed.",
+        "event_shield_reason_mismatched_sender_key": "Krypteret af en ubekræftet session",
+        "event_shield_reason_unknown_device": "Krypteret af en ukendt eller slettet enhed.",
+        "event_shield_reason_unsigned_device": "Krypteret af en enhed, der ikke er verificeret af sin ejer.",
+        "event_shield_reason_unverified_identity": "Krypteret af en ikke-verificeret bruger.",
+        "export_unsupported": "Din browser understøtter ikke de påkrævede kryptografiske udvidelser",
+        "import_invalid_keyfile": "Ikke en gyldig %(brand)s nøglefil",
+        "import_invalid_passphrase": "Godkendelse mislykkedes: forkert adgangskode?",
+        "key_storage_out_of_sync": "Dit nøglelager er ikke synkroniseret.",
+        "messages_not_secure": {
+            "cause_1": "Din hjemmeserver",
+            "cause_2": "Den hjemmeserver, som den bruger, du er i færd med at verificere, er forbundet til",
+            "cause_3": "Din egen eller den anden brugers internetforbindelse",
+            "cause_4": "Din egen eller den anden brugers session",
+            "heading": "Et af følgende kan være kompromitteret:",
+            "title": "Dine beskeder er ikke sikre"
+        },
+        "new_recovery_method_detected": {
+            "description_1": "En ny sikkerhedsfrase og -nøgle til sikre beskeder er blevet fundet.",
+            "description_2": "Denne session krypterer historikken ved hjælp af den nye gendannelsesmetode.",
+            "title": "Ny gendannelsesmetode",
+            "warning": "Hvis du ikke har angivet en ny gendannelsesmetode, kan det være en hacker forsøger at få adgang til din konto. Skift adgangskoden og angiv straks en ny gendannelsesmetode under Indstillinger."
+        },
+        "recovery_method_removed": {
+            "description_1": "Denne session har registreret, at din sikkerhedssætning og nøgle til sikre beskeder er blevet fjernet.",
+            "description_2": "Hvis du gjorde dette ved et uheld, kan du opsætte sikre beskeder i denne session, hvilket vil kryptere sessionens beskedhistorik med en ny gendannelsesmetode.",
+            "title": "Gendannelsesmetode fjernet",
+            "warning": "Hvis du ikke har fjernet gendannelsesmetoden, kan det være en hacker forsøger at få adgang til din konto. Skift din kontos adgangskode og indstil straks en ny gendannelsesmetode under Indstillinger."
+        },
+        "set_up_toast_title": "Opsæt sikkerhedskopiering",
+        "setup_secure_backup": {
+            "explainer": "Sikkerhedskopier dine nøgler før du logger ud, for at undgå at miste dem."
+        },
+        "udd": {
+            "interactive_verification_button": "Bekræft interaktivt med emoji",
+            "other_ask_verify_text": "Bed denne bruger om at bekræfte sin session, eller bekræft den manuelt nedenfor.",
+            "other_new_session_text": "%(name)s (%(userId)s) loggede ind på en ny session uden at verificere den:",
+            "own_ask_verify_text": "Bekræft din anden session ved hjælp af en af ​​mulighederne herunder.",
+            "own_new_session_text": "Du loggede på en ny session uden at bekræfte den:",
+            "title": "Ikke betroet"
+        },
+        "unable_to_setup_keys_error": "Nøgler kunne ikke konfigureres",
+        "verification": {
+            "accepting": "Accepterer…",
+            "after_new_login": {
+                "device_verified": "Enhed verificeret",
+                "skip_verification": "Spring verifikationen over for nu",
+                "verify_this_device": "Verificér denne enhed"
+            },
+            "cancelling": "Annullerer…",
+            "complete_action": "Forstået",
+            "complete_description": "Du lykkedes med at verificere denne bruger.",
+            "complete_title": "Bekræftet!",
+            "error_starting_description": "Vi kunne ikke starte en samtale med den anden bruger.",
+            "error_starting_title": "Fejl ved påbegyndelse af verifikation",
+            "explainer": "Sikre beskeder mellem dig og denne bruger er end-to-end krypteret og kan ikke læses af tredjeparter.",
+            "in_person": "For at være sikker bør du gøre dette ansigt-til-ansigt eller bruge en pålidelig måde at kommunikere på.",
+            "incoming_sas_device_dialog_text_1": "Verificér denne enhed for at markere den som pålidelig. Når du stoler på denne enhed, kan du og andre brugere føle jer mere trygge, når I bruger end-to-end krypterede beskeder.",
+            "incoming_sas_device_dialog_text_2": "Når du bekræfter denne enhed, markeres den som pålidelig, og brugere, der har bekræftet med dig, vil stole på den.",
+            "incoming_sas_dialog_title": "Modtaget bekræftelsesanmodning",
+            "incoming_sas_dialog_waiting": "Venter på partnerens bekræftelse…",
+            "incoming_sas_user_dialog_text_1": "Verificér denne bruger for at markere dem som betroede. At have tillid til brugere giver dig ekstra ro i sindet, når du bruger end-to-end krypterede beskeder.",
+            "incoming_sas_user_dialog_text_2": "Verificering af denne bruger vil markere deres session som betroet, og også markere din session som betroet hos dem.",
+            "no_support_qr_emoji": "Den enhed, du forsøger at bekræfte, understøtter ikke scanning af en QR-kode eller emoji-bekræftelse, hvilket er det, %(brand)s understøtter. Prøv med en anden klient.",
+            "other_party_cancelled": "Den anden part annullerede verifikationen.",
+            "prompt_encrypted": "Bekræft alle brugere i et rum for at sikre, at det er sikkert.",
+            "prompt_unencrypted": "I krypterede rum skal du verificere alle brugere for at sikre, at det er sikkert.",
+            "qr_or_sas": "%(qrCode)s eller %(emojiCompare)s",
+            "qr_prompt": "Scan denne unikke kode",
+            "qr_reciprocate_same_shield_user": "Næsten færdig! Viser %(displayName)s det samme skjold?",
+            "request_toast_decline_counter": "Ignorér (%(counter)s)",
+            "request_toast_detail": "%(deviceId)s fra %(ip)s",
+            "sas_caption_self": "Bekræft denne enhed ved at kontrollere, at følgende nummer vises på skærmen.",
+            "sas_caption_user": "Bekræft denne bruger ved at kontrollere, at følgende nummer vises på deres skærm.",
+            "sas_description": "Sammenlign et unikt sæt emoji, hvis du ikke har et kamera på nogen af enhederne",
+            "sas_emoji_caption_user": "Bekræft denne bruger ved at bekræfte, at følgende emojis modsvarer dem på deres skærm.",
+            "sas_match": "De matcher",
+            "sas_no_match": "De matcher ikke",
+            "sas_prompt": "Sammenlign unikke emoji",
+            "scan_qr": "Bekræft ved at scanne",
+            "scan_qr_explainer": "Bed %(displayName)s om at scanne din kode:",
+            "start_button": "Begynd verifikation",
+            "successful_user": "Du har bekræftet %(displayName)s!",
+            "unsupported_method": "Kan ikke finde en understøttet bekræftelsesmetode.",
+            "unverified_session_toast_accept": "Ja, det var mig",
+            "unverified_session_toast_title": "Nyt login. Var det dig?",
+            "unverified_sessions_toast_description": "Gennemgå for at bekræfte at din konto er sikker",
+            "unverified_sessions_toast_reject": "Senere",
+            "unverified_sessions_toast_title": "Du har ubekræftede sessioner",
+            "verification_dialog_title_device": "Bekræft anden enhed",
+            "verification_dialog_title_user": "Bekræftelsesanmodning",
+            "verification_skip_warning": "Uden verifikation vil du ikke have adgang til alle dine beskeder og kan fremstå som upålidelig over for andre.",
+            "verification_success_with_backup": "Din nye enhed er nu bekræftet. Den har adgang til dine krypterede meddelelser, og andre brugere vil se den som betroet.",
+            "verification_success_without_backup": "Din enhed er nu verificeret. Andre brugere vil se den som betroet.",
+            "verify_emoji": "Bekræft med emoji",
+            "verify_emoji_prompt": "Bekræft ved at sammenligne unikke emoji.",
+            "verify_emoji_prompt_qr": "Hvis du ikke kan scanne koden ovenfor, kan du bekræfte ved at sammenligne unikke emoji.",
+            "verify_later": "Jeg bekræfter senere",
+            "waiting_for_user_accept": "Venter på, at %(displayName)s accepterer...",
+            "waiting_other_device": "Venter på, at du bekræfter på din anden enhed...",
+            "waiting_other_device_details": "Vi venter på, at du bekræfter på din anden enhed, %(deviceName)s (%(deviceId)s)…",
+            "waiting_other_user": "Venter på, at %(displayName)s bekræfter..."
+        },
+        "verification_requested_toast_title": "Anmodet om verifikation",
+        "verify_toast_description": "Andre brugere har måske ikke tillid til den",
+        "verify_toast_title": "Verificér denne session"
+    },
+    "error": {
+        "admin_contact": "<a>Kontakt din serviceadministrator</a> for at fortsætte med at bruge denne service.",
+        "admin_contact_short": "Kontakt din <a>serveradministrator</a>.",
+        "connection": "Der opstod et problem i kommunikationen med hjemmeserveren. Prøv igen senere.",
+        "dialog_description_default": "Der er opstået en fejl.",
+        "download_media": "Det lykkedes ikke at downloade kildemedie, der blev ikke fundet nogen kilde-URL",
+        "edit_history_unsupported": "Din hjemmeserver ser ikke ud til at understøtte denne funktion.",
+        "failed_copy": "Kopiering mislykkedes",
+        "hs_blocked": "Denne hjemmeserver er blevet blokeret af sin administrator.",
+        "invalid_json": "Din Element konfiguration indeholder ugyldig JSON. Ret venligst problemet, og indlæs siden igen.",
+        "mau": "Denne homeserver har nået sin begrænsning for antallet af aktive brugere per måned.",
+        "misconfigured": "Din Element er fejlkonfigureret",
+        "mixed_content": "Kan ikke oprette forbindelse til hjemmeserveren via HTTP, når der er en HTTPS-URL i browserens adresselinje. Brug enten HTTPS eller <a>aktiver usikre scripts</a>.",
+        "non_urgent_echo_failure_toast": "Din server svarer ikke på visse <a>forespørgsler</a>.",
+        "resource_limits": "Denne homeserver har overskredet en af dens ressourcegrænser.",
+        "session_restore": {
+            "clear_storage_button": "Ryd lagerplads og log ud",
+            "clear_storage_description": "Log ud og fjern krypteringsnøgler?",
+            "description_1": "Der opstod en fejl under forsøget på at gendanne din tidligere session.",
+            "description_2": "Hvis du tidligere har brugt en nyere version af %(brand)s, kan din session være uforenelig med denne version. Luk dette vindue og vend tilbage til den nyere version.",
+            "description_3": "At rydde din browsers lagerplads kan muligvis løse problemet, men det vil logge dig ud og gøre al krypteret chathistorik ulæselig for dig.",
+            "title": "Kan ikke gendanne sessionen"
+        },
+        "something_went_wrong": "Noget gik galt!",
+        "storage_evicted_description_1": "Nogle sessionsdata, herunder nøgler til krypterede beskeder, mangler. Log ud og log ind for at løse problemet ved at gendanne nøglerne fra backup.",
+        "storage_evicted_description_2": "Din browser fjernede sandsynligvis denne data da den manglede diskplads.",
+        "storage_evicted_title": "Manglende sessionsdata",
+        "sync": "Kan ikke oprette forbindelse til hjemmeserver. Forsøger igen...",
+        "tls": "Kan ikke oprette forbindelse til hjemmeserveren - tjek venligst din forbindelse, sørg for at din <a>hjemmeservers SSL-certifikat</a> er betroet, og at der ikke er en browserudvidelse der blokerer for anmodninger.",
+        "unknown": "Ukendt fejl",
+        "unknown_error_code": "Ukendt fejlkode",
+        "update_power_level": "Kunne ikke ændre effektniveau"
+    },
+    "error_database_closed_description": {
+        "for_desktop": "Din disk er måske fyldt. Vær venlig at rydde noget plads og genindlæse.",
+        "for_web": "Hvis du har ryddet browserdata, er denne meddelelse forventet. %(brand)s kan også være åben i en anden fane, eller din disk er fuld. Ryd venligst lidt plads og genindlæs"
+    },
+    "error_database_closed_title": "%(brand)s holdt op med at fungere",
+    "error_dialog": {
+        "forget_room_failed": "Kunne ikke glemme gruppen %(errCode)s"
+    },
+    "error_user_not_logged_in": "Brugeren er ikke logget ind",
+    "event_preview": {
+        "m.call.answer": {
+            "dm": "Opkald i gang",
+            "user": "%(senderName)s tilsluttede sig opkaldet",
+            "you": "Du tilsluttede dig opkaldet"
+        },
+        "m.call.hangup": {
+            "user": "%(senderName)s afsluttede opkaldet",
+            "you": "Du afsluttede opkaldet"
+        },
+        "m.call.invite": {
+            "dm_receive": "%(senderName)s ringer",
+            "dm_send": "Venter på svar",
+            "user": "%(senderName)s startede et opkald",
+            "you": "Du startede et opkald"
+        },
+        "m.emote": "* %(senderName)s %(emote)s",
+        "m.reaction": {
+            "user": "%(sender)s reagerede %(reaction)s på %(message)s",
+            "you": "Du reagerede %(reaction)s på %(message)s"
+        },
+        "m.sticker": "%(senderName)s: %(stickerName)s",
+        "m.text": "%(senderName)s: %(message)s",
+        "prefix": {
+            "audio": "Lyd",
+            "image": "Billede",
+            "poll": "Afstemning",
+            "video": "Video"
+        }
+    },
+    "export_chat": {
+        "cancelled": "Eksport annulleret",
+        "cancelled_detail": "Eksporten blev annulleret",
+        "confirm_stop": "Er du sikker på, at du vil stoppe eksporten af dine data? Hvis du gør det, skal du starte forfra.",
+        "creating_html": "Opretter HTML...",
+        "creating_output": "Opretter output...",
+        "creator_summary": "%(creatorName)s oprettede dette rum.",
+        "current_timeline": "Nuværende tidslinje",
+        "enter_number_between_min_max": "Indtast et tal mellem %(min)s og %(max)s",
+        "error_fetching_file": "Fejl ved hentning af fil",
+        "export_info": "Dette er starten på eksporten af <roomName/>. Eksporteret af <exporterDetails/> den %(exportDate)s.",
+        "export_successful": "Eksport lykkedes!",
+        "exported_n_events_in_time": {
+            "one": "Eksporterede %(count)s hændelse på %(seconds)s sekunder",
+            "other": "Eksporterede %(count)s hændelser på %(seconds)s sekunder"
+        },
+        "exporting_your_data": "Eksport af dine data",
+        "fetched_n_events": {
+            "one": "Hentet %(count)s begivenhed indtil videre",
+            "other": "Hentet %(count)s begivenheder indtil videre"
+        },
+        "fetched_n_events_in_time": {
+            "one": "Hentet %(count)s hændelse i %(seconds)ss",
+            "other": "Hentede %(count)s hændelser i %(seconds)ss"
+        },
+        "fetched_n_events_with_total": {
+            "one": "Hentet %(count)s begivenhed ud af %(total)s",
+            "other": "Hentet %(count)s begivenheder ud af %(total)s"
+        },
+        "fetching_events": "Henter begivenheder...",
+        "file_attached": "Fil vedhæftet",
+        "format": "Format",
+        "from_the_beginning": "Fra begyndelsen",
+        "generating_zip": "Generering af en ZIP",
+        "html": "HTML",
+        "html_title": "Eksporterede data",
+        "include_attachments": "Inkluder vedhæftede filer",
+        "json": "JSON",
+        "media_omitted": "Medier udeladt",
+        "media_omitted_file_size": "Medie udeladt - filstørrelsesgrænsen er overskredet",
+        "messages": "Beskeder",
+        "next_page": "Næste gruppe af meddelelser",
+        "num_messages": "Antal beskeder",
+        "num_messages_min_max": "Antallet af beskeder kan kun være et tal mellem %(min)s og %(max)s",
+        "number_of_messages": "Angiv et antal meddelelser",
+        "previous_page": "Forrige gruppe af meddelelser",
+        "processing": "Forarbejdning…",
+        "processing_event_n": "Behandler begivenhed %(number)s ud af %(total)s",
+        "select_option": "Vælg blandt de nedenstående muligheder for at eksportere chats fra din tidslinje",
+        "size_limit": "Størrelsesbegrænsning",
+        "size_limit_min_max": "Størrelsen kan kun være et tal mellem %(min)s MB og %(max)s MB",
+        "size_limit_postfix": "MB",
+        "starting_export": "Begynder eksport...",
+        "successful": "Eksporten lykkedes",
+        "successful_detail": "Din eksport lykkedes. Find den i din mappe til hentede filer.",
+        "text": "Ren Tekst",
+        "title": "Eksportér chat",
+        "topic": "Emne: %(topic)s",
+        "unload_confirm": "Er du sikker på, at du vil afslutte under denne eksport?"
+    },
+    "failed_load_async_component": "Kunne ikke hente! Tjek din netværksforbindelse og prøv igen.",
+    "feedback": {
+        "can_contact_label": "Du kan kontakte mig, hvis du har opfølgende spørgsmål.",
+        "comment_label": "Kommentar",
+        "existing_issue_link": "Tjek venligst <existingIssuesLink>eksisterende fejl på Github</existingIssuesLink> først. Intet match? <newIssueLink>Opret en ny</newIssueLink>.",
+        "may_contact_label": "I må gerne kontakte mig, hvis I ønsker at følge op eller lade mig afprøve kommende idéer.",
+        "platform_username": "Din platform og dit brugernavn vil blive noteret for at hjælpe os med at bruge din feedback så godt som muligt.",
+        "pro_type": "PRO-TIP: Hvis du finder en fejl, bedes du indsende <debugLogsLink>fejlfindingslogfiler</debugLogsLink>, så vi kan finde frem til problemet.",
+        "send_feedback_action": "Send feedback",
+        "sent": "Feedback sendt! Tak, vi sætter pris på det!"
+    },
+    "forward": {
+        "filter_placeholder": "Søg efter rum eller personer",
+        "message_preview_heading": "Forhåndsvisning af besked",
+        "no_perms_title": "Du har ikke tilladelse til at gøre dette.",
+        "open_room": "Åbn rummet",
+        "send_label": "Send",
+        "sending": "Sender",
+        "sent": "Sendt"
+    },
+    "identity_server": {
+        "change": "Skift identitetsserver",
+        "change_prompt": "Afbryd forbindelsen til identitetsserveren <current /> og opret i stedet forbindelse til <new />?",
+        "change_server_prompt": "Hvis du ikke ønsker at bruge <server /> til at finde og blive fundet af eksisterende kontakter som du kender, skal du indtaste en anden identitetsserver nedenfor.",
+        "changed": "Din identitet er blevet ændret",
+        "checking": "Tjekker server",
+        "description_connected": "Du bruger i øjeblikket <server></server> til at finde og blive fundet af eksisterende kontakter, du kender. Du kan ændre din identitetsserver nedenfor.",
+        "description_disconnected": "Du bruger ikke en identitetsserver i øjeblikket. Tilføj en nedenfor for at finde og blive synlig for kontakter, du kender.",
+        "description_optional": "Det er valgfrit om man vil benytte en identitetsserver. Hvis du vælger ikke at bruge en identitetsserver, kan andre brugere ikke finde dig, og du kan ikke invitere andre via e-mail eller telefon.",
+        "disconnect": "Afbryd forbindelse til identitetsserver",
+        "disconnect_anyway": "Afbryd alligevel",
+        "disconnect_offline_warning": "Du bør <b>fjerne dine personlige data</b> fra identitetsserveren <idserver />, inden du afbryder forbindelsen. Desværre er identitetsserveren <idserver /> i øjeblikket offline eller kan ikke nås.",
+        "disconnect_personal_data_warning_1": "Du <b>deler stadig dine personlige data</b> på identitetsserveren <idserver />",
+        "disconnect_personal_data_warning_2": "Vi anbefaler, at du fjerner dine e-mailadresser og telefonnumre fra identitetsserveren, inden du afbryder forbindelsen.",
+        "disconnect_server": "Afbryd forbindelsen til identitetsserveren <idserver />?",
+        "disconnect_warning": "Hvis du afbryder forbindelsen til din identitetsserver, vil du ikke være synlig for andre brugere, og du vil ikke kunne invitere andre via e-mail eller telefon.",
+        "do_not_use": "Brug ikke en identitetsserver",
+        "error_connection": "Kunne ikke oprette forbindelse til identitetsserveren",
+        "error_invalid": "Ikke en gyldig identitetsserver (statuskode %(code)s)",
+        "error_invalid_or_terms": "Servicevilkårene er ikke accepteret, eller identitetsserveren er ugyldig.",
+        "no_terms": "Den identitetsserver, du har valgt, har ingen servicevilkår.",
+        "suggestions": "Du bør:",
+        "suggestions_1": "kontrollér dine browser-plugins for alt hvad der kan blokere for identitetsserveren (f.eks. Privacy Badger).",
+        "suggestions_2": "kontakt administratorerne af identitetsserveren <idserver />",
+        "suggestions_3": "vent og prøv igen senere",
+        "url": "Identitetsserver (%(server)s )",
+        "url_field_label": "Indtast en ny identitetsserver",
+        "url_not_https": "Identitetsserverens URL skal være HTTPS"
+    },
+    "in_space": "I %(spaceName)s.",
+    "in_space1_and_space2": "I grupperne %(space1Name)s og %(space2Name)s.",
+    "in_space_and_n_other_spaces": {
+        "one": "I %(spaceName)s og én anden gruppe.",
+        "other": "I %(spaceName)s og %(count)s andre grupper."
+    },
+    "incompatible_browser": {
+        "continue": "Fortsæt alligevel",
+        "linux": "Linux",
+        "macos": "Mac",
+        "windows_64bit": "Windows (64-bit)",
+        "windows_arm_64bit": "Windows (ARM 64-bit)"
+    },
+    "info_tooltip_title": "Oplysninger",
+    "integration_manager": {
+        "connecting": "Forbinder til integrationsadministrator…",
+        "error_connecting": "Integrationsadministratoren er offline, eller den kan ikke få kontakt med din hjemmeserver.",
+        "error_connecting_heading": "Kan ikke oprette forbindelse til integrationsadministratoren",
+        "explainer": "Integrationsadministratorer modtager konfigurationsdata og kan ændre widgets, sende ruminvitationer og indstille effektniveauer på dine vegne.",
+        "manage_title": "Administrer integrationer",
+        "use_im": "Brug en integrationsadministrator til at administrere bots, widgets og klistermærkepakker.",
+        "use_im_default": "Brug en integrationsadministrator <b>(%(serverName)s)</b> til at administrere bots, widgets og klistermærkepakker."
+    },
+    "integrations": {
+        "disabled_dialog_description": "Aktivér '%(manageIntegrations)s' under Indstillinger for at gøre dette.",
+        "disabled_dialog_title": "Integrationer er deaktiveret",
+        "impossible_dialog_description": "Din %(brand)s tillader ikke, at du bruger en integrationsadministrator til at gøre dette. Kontakt en administrator.",
+        "impossible_dialog_title": "Integrationer er ikke tilladt"
+    },
+    "invite": {
+        "ask_anyway_description": "Kan ikke finde profiler for nedenstående Matrix-id'er – vil du alligevel starte en samtale?",
+        "ask_anyway_label": "Start samtale alligevel",
+        "ask_anyway_never_warn_label": "Start samtale alligevel og advar mig aldrig igen",
+        "email_caption": "Invitér via e-mail",
+        "email_limit_one": "Invitationer via e-mail kan kun sendes én ad gangen",
+        "email_use_default_is": "Brug en identitetsserver til at invitere via e-mail. <default>Brug standardindstillingen (%(defaultIdentityServerName)s)</default> eller administrer den i <settings>Indstillinger</settings>.",
+        "email_use_is": "Brug en identitetsserver til at invitere via e-mail. Bestem hvilken under <settings>Indstillinger</settings>.",
+        "error_already_invited_room": "Brugeren er allerede inviteret til rummet",
+        "error_already_invited_space": "Brugeren er allerede inviteret til gruppen",
+        "error_already_joined_room": "Brugeren er allerede i rummet",
+        "error_already_joined_space": "Brugeren er allerede i gruppen",
+        "error_bad_state": "Brugerens spærring skal ophæves inden de kan blive inviteret.",
+        "error_dm": "Vi kunne ikke oprette din samtale",
+        "error_find_room": "Noget gik galt under forsøget på at invitere brugerne.",
+        "error_find_user_description": "Følgende brugere findes muligvis ikke eller er ugyldige og kan ikke inviteres:%(csvNames)s",
+        "error_find_user_title": "Kunne ikke finde følgende brugere",
+        "error_invite": "Vi kunne ikke invitere disse brugere. Markér venligst de brugere, du vil invitere, og prøv igen.",
+        "error_permissions_room": "Du har ikke tilladelse til at invitere personer til denne gruppe.",
+        "error_permissions_space": "Du har ikke tilladelse til at invitere brugere til denne gruppe.",
+        "error_profile_undisclosed": "Brugeren findes måske eller måske ikke",
+        "error_transfer_multiple_target": "Et opkald kan kun viderestilles til én bruger.",
+        "error_unfederated_space": "Denne gruppe er ikke fødereret. Du kan ikke invitere brugere fra eksterne servere.",
+        "error_unknown": "Ukendt serverfejl",
+        "error_user_not_found": "Brugeren findes ikke",
+        "error_version_unsupported_room": "Brugerens homeserver understøtter ikke versionen af denne gruppe.",
+        "error_version_unsupported_space": "Brugerens hjemmeserver understøtter ikke denne version af gruppen.",
+        "failed_generic": "Operation mislykkedes",
+        "failed_title": "Kunne ikke invitere",
+        "invalid_address": "Ukendt adresse",
+        "name_email_mxid_share_room": "Inviter andre ved hjælp af deres navn, e-mailadresse, brugernavn (f.eks. <userId/>) eller <a>del dette rum</a>.",
+        "name_email_mxid_share_space": "Invitér nogen ved at bruge deres navn, e-mail adresse, brugernavn (som <userId/> eller <a>del denne gruppe</a>",
+        "name_mxid_share_room": "Inviter andre ved at bruge deres navn, brugernavn (f.eks. <userId/>) eller <a>del dette rum</a> .",
+        "name_mxid_share_space": "Invitér nogen ved at bruge deres navn, brugernavn (som <userId/> eller <a>del denne gruppe</a>",
+        "recents_section": "Seneste samtaler",
+        "room_failed_partial": "Vi har sendt til de andre, men nedenstående personer kunne ikke blive inviteret til <RoomName/>",
+        "room_failed_partial_title": "Nogle invitationer kunne ikke blive sendt",
+        "room_failed_title": "Kunne ikke invitere brugere til %(roomName)s",
+        "send_link_prompt": "Eller send invitationslink",
+        "start_conversation_name_email_mxid_prompt": "Start en samtale med en person ved hjælp af deres navn, e-mailadresse eller brugernavn (f.eks.<userId/> ).",
+        "start_conversation_name_mxid_prompt": "Start en samtale med en person ved at bruge deres navn eller brugernavn (f.eks.<userId/> ).",
+        "suggestions_disclaimer": "Nogle forslag kan være skjult af hensyn til privatlivets fred.",
+        "suggestions_disclaimer_prompt": "Hvis du ikke kan se den person, du leder efter, kan du sende vedkommende dit invitationslink nedenfor.",
+        "suggestions_section": "Seneste direkte beskeder",
+        "to_room": "Inviter til %(roomName)s",
+        "to_space": "Invitér til %(spaceName)s",
+        "transfer_dial_pad_tab": "Numerisk tastatur",
+        "transfer_user_directory_tab": "Brugeroversigt",
+        "unable_find_profiles_description_default": "Det var ikke muligt at finde profiler for nedenstående Matrix-id'er. Vil du alligevel invitere dem?",
+        "unable_find_profiles_invite_label_default": "Invitér alligevel",
+        "unable_find_profiles_invite_never_warn_label_default": "Invitér alligevel, og advar mig aldrig igen",
+        "unable_find_profiles_title": "Følgende brugere findes muligvis ikke",
+        "unban_first_title": "Brugeren kan ikke inviteres, før deres blokering bliver ophævet."
+    },
+    "inviting_user1_and_user2": "Inviterer %(user1)s og %(user2)s",
+    "inviting_user_and_n_others": {
+        "one": "Inviterer %(user)s og en anden",
+        "other": "Inviterer %(user)s og %(count)s andre"
+    },
+    "items_and_n_others": {
+        "other": "<Items/> og %(count)s andre",
+        "one": "<Items/> og en anden"
+    },
+    "keyboard": {
+        "activate_button": "Aktivér den valgte knap",
+        "alt": "Alt",
+        "autocomplete_cancel": "Annuller autofuldførelse",
+        "autocomplete_force": "Gennemtving fuldførelse",
+        "autocomplete_navigate_next": "Næste forslag til autofuldførelse",
+        "autocomplete_navigate_prev": "Forrige forslag til autofuldførelse",
+        "backspace": "Slet",
+        "cancel_reply": "Annullér svar på en besked",
+        "category_autocomplete": "Autofuldførelse",
+        "category_calls": "Opkald",
+        "category_navigation": "Navigation",
+        "category_room_list": "Oversigt over rum",
+        "close_dialog_menu": "Luk dialogboks eller kontekstmenu",
+        "composer_jump_end": "Hop til slutningen af tekstfeltet",
+        "composer_jump_start": "Gå til begyndelsen af tekstfeltet",
+        "composer_navigate_next_history": "Gå til næste besked i tekstfeltets historik",
+        "composer_navigate_prev_history": "Gå til forrige besked i tekstfeltets historik",
+        "composer_new_line": "Ny linje",
+        "composer_redo": "Gentag redigering",
+        "composer_toggle_bold": "Slå fed skrift til/fra",
+        "composer_toggle_code_block": "Slå kodeblok til/fra",
+        "composer_toggle_italics": "Slå kursiv til/fra",
+        "composer_toggle_link": "Slå link til/fra",
+        "composer_toggle_quote": "Slå citation til/fra",
+        "composer_undo": "Fortryd redigering",
+        "control": "Ctrl",
+        "dismiss_read_marker_and_jump_bottom": "Fjern læsemarkering og spring til bunden",
+        "end": "Slut",
+        "enter": "Enter",
+        "escape": "Esc",
+        "go_home_view": "Gå til startvisning",
+        "home": "Hjem",
+        "jump_first_message": "Gå til første besked",
+        "jump_last_message": "Gå til sidste besked",
+        "jump_room_search": "Gå til søgning i rum",
+        "jump_to_read_marker": "Hop til den ældste, ulæste besked",
+        "keyboard_shortcuts_tab": "Åbn denne indstillingsfane",
+        "navigate_next_history": "Næste nyligt besøgte rum eller gruppe",
+        "navigate_next_message_edit": "Gå til næste besked at redigere",
+        "navigate_prev_history": "Forrige nyligt besøgte rum eller gruppe",
+        "navigate_prev_message_edit": "Gå til forrige besked for at redigere",
+        "next_room": "Næste rum eller samtale",
+        "next_unread_room": "Næste ulæste rum eller samtale",
+        "number": "[tal]",
+        "open_user_settings": "Åbn brugerindstillinger",
+        "page_down": "Side ned",
+        "page_up": "Side op",
+        "prev_room": "Forrige rum eller samtale",
+        "prev_unread_room": "Forrige ulæste rum eller samtale",
+        "room_list_collapse_section": "Skjul sektionen med rumlisten",
+        "room_list_expand_section": "Udvid sektionen med rumlisten",
+        "room_list_navigate_down": "Naviger ned i rumlisten",
+        "room_list_navigate_up": "Naviger op i rumlisten",
+        "room_list_select_room": "Vælg rum fra listen",
+        "scroll_down_timeline": "Rul ned i tidslinjen",
+        "scroll_up_timeline": "Rul op i tidslinjen",
+        "search": "Søg (skal være aktiveret)",
+        "send_sticker": "Send et klistermærke",
+        "shift": "Skift",
+        "space": "Mellemrum",
+        "switch_to_space": "Skift til gruppe efter nummer",
+        "toggle_hidden_events": "Slå synligheden af ​​skjulte begivenheder til/fra",
+        "toggle_microphone_mute": "Slå mikrofonlyd fra",
+        "toggle_right_panel": "Slå højre panel til/fra",
+        "toggle_space_panel": "Slå panelet for grupper til/fra",
+        "toggle_top_left_menu": "Slå menuen øverst til venstre til/fra",
+        "toggle_webcam_mute": "Slå webcam til/fra",
+        "upload_file": "Upload fil"
+    },
+    "labs": {
+        "ask_to_join": "Aktivér spørg om at deltage",
+        "automatic_debug_logs": "Send automatisk fejlfindingslogfiler ved enhver fejl",
+        "automatic_debug_logs_decryption": "Send automatisk fejlfindingslogfiler ved dekrypteringsfejl",
+        "automatic_debug_logs_key_backup": "Send automatisk fejlfindingslogfiler, når nøglebackup ikke fungerer",
+        "beta_description": "Hvad er det næste skridt for %(brand)s? Labs er den bedste måde at få adgang til tingene tidligt, afprøve nye funktioner og være med til at forme dem, inden de faktisk lanceres.",
+        "beta_feature": "Dette er en betafunktion",
+        "beta_feedback_leave_button": "For at forlade betaversionen skal du gå til dine indstillinger.",
+        "beta_feedback_title": "%(featureName)s Beta-feedback",
+        "beta_section": "Kommende funktioner",
+        "bridge_state": "Vis info om broer i rumindstillinger",
+        "bridge_state_channel": "Kanal: <channelLink/>",
+        "bridge_state_creator": "Denne bro blev sat op af <user />.",
+        "bridge_state_manager": "Denne bro administreres af <user />.",
+        "bridge_state_workspace": "Arbejdsområde: <networkLink/>",
+        "click_for_info": "Klik for mere info",
+        "currently_experimental": "I øjeblikket eksperimentel.",
+        "custom_themes": "Understøtter tilføjelse af brugerdefinerede temaer",
+        "dynamic_room_predecessors": "Dynamiske rumforgængere",
+        "dynamic_room_predecessors_description": "Aktivér MSC3946 (for at understøtte forsinkede rumarkiver)",
+        "element_call_video_rooms": "Element Call video-rum",
+        "experimental_description": "Er du i humør til at eksperimentere? Afprøv vores nyeste ideer, som stadig er under udvikling. Disse funktioner er ikke færdigukviklende; de kan være ustabile, kan ændres eller kan blive droppet helt. <a>Få mere at vide</a>.",
+        "experimental_section": "Tidlige forhåndsvisninger",
+        "feature_wysiwyg_composer_description": "Brug RTF-tekst i stedet for Markdown i meddelelseskomponisten.",
+        "group_calls": "Ny fællesopkaldsoplevelse",
+        "group_developer": "Udvikler",
+        "group_encryption": "Kryptering",
+        "group_experimental": "Eksperimentel",
+        "group_messaging": "Beskeder",
+        "group_moderation": "Moderering",
+        "group_profile": "Profil",
+        "group_rooms": "Rum",
+        "group_spaces": "Grupper",
+        "group_themes": "Temaer",
+        "group_threads": "Tråde",
+        "group_ui": "Brugergrænseflade",
+        "group_voip": "Stemme & Video",
+        "group_widgets": "Widgets",
+        "hidebold": "Skjul notifikationsprik (vis kun tællerbadges)",
+        "html_topic": "Vis HTML-repræsentation af rumemner",
+        "join_beta": "Deltag i beta-versionen",
+        "join_beta_reload": "Tilmelding til betaversionen vil genindlæse %(brand)s.",
+        "jump_to_date": "Gå til dato (tilføjer /jumptodate og springer til datooverskrifter)",
+        "jump_to_date_msc_support": "Kræver, at din server understøtter MSC3030",
+        "latex_maths": "Render LaTeX-matematik i beskeder",
+        "leave_beta": "Forlad betaversionen",
+        "leave_beta_reload": "Hvis du forlader betaversionen, genindlæses %(brand)s.",
+        "location_share_live": "Live placeringsdeling",
+        "location_share_live_description": "Midlertidig implementering. Placeringerne bevares i rummets historik.",
+        "mjolnir": "Nye måder at ignorere brugere på",
+        "msc3531_hide_messages_pending_moderation": "Lad moderatorer skjule meddelelser, der afventer moderering.",
+        "notification_settings": "Nye indstillinger for notifikationer",
+        "notification_settings_beta_caption": "Vi introducerer en enklere måde at ændre dine notifikationsindstillinger på. Tilpas %(brand)s, præcis som du ønsker.",
+        "notification_settings_beta_title": "Notifikationsindstillinger",
+        "notifications": "Aktivér meddelelsespanelet i rumoverskriften",
+        "render_reaction_images": "Gengiv brugerdefinerede billeder i reaktioner",
+        "render_reaction_images_description": "Somme tider kaldet \"brugerdefinerede emojis\".",
+        "report_to_moderators": "Rapporter til moderatorer",
+        "report_to_moderators_description": "I rum, der understøtter moderering, kan du bruge knappen \"Rapporter\" til at rapportere misbrug til rummoderatorerne.",
+        "sliding_sync": "Sliding Sync-tilstand",
+        "sliding_sync_description": "Under aktiv udvikling, kan ikke deaktiveres.",
+        "sliding_sync_disabled_notice": "Log ud og ind igen for at deaktivere",
+        "sliding_sync_server_no_support": "Din server er ikke understøttet",
+        "under_active_development": "Under aktiv udvikling.",
+        "unrealiable_e2e": "Ustabil i krypterede rum",
+        "video_rooms": "Videorum",
+        "video_rooms_a_new_way_to_chat": "En ny måde at chatte over stemme og video på%(brand)s.",
+        "video_rooms_always_on_voip_channels": "Videorum er altid aktive VoIP-kanaler, der er indlejret i et rum i %(brand)s.",
+        "video_rooms_beta": "Video-rum er en betafunktion",
+        "video_rooms_faq1_answer": "Brug knappen „+“ i rumsektionen i venstre panel.",
+        "video_rooms_faq1_question": "Hvordan kan jeg oprette et videorum?",
+        "video_rooms_faq2_answer": "Ja, chattidslinjen vises ved siden af videoen.",
+        "video_rooms_faq2_question": "Kan jeg bruge tekstchat sammen med videoopkaldet?",
+        "video_rooms_feedbackSubheading": "Tak fordi du prøvede betaversionen. Giv os venligst så mange detaljer som muligt, så vi kan forbedre den.",
+        "wysiwyg_composer": "Rich text editor"
+    },
+    "labs_mjolnir": {
+        "advanced_warning": "⚠ Disse indstillinger er beregnet til avancerede brugere.",
+        "ban_reason": "Ignoreret/blokeret",
+        "error_adding_ignore": "Fejl ved tilføjelse af ignoreret bruger/server",
+        "error_adding_list_description": "Kontroller rummets ID eller adresse, og prøv igen.",
+        "error_adding_list_title": "Fejl ved tilmelding til listen",
+        "error_removing_ignore": "Fejl ved fjernelse af ignoreret bruger/server",
+        "error_removing_list_description": "Prøv igen, eller kig i din konsol for at få tips.",
+        "error_removing_list_title": "Fejl ved afmelding fra listen",
+        "explainer_1": "Tilføj brugere og servere, du vil ignorere, her. Brug stjerner for at få %(brand)s til at matche et hvilket som helst tegn. For eksempel vil <code>@bot:*</code> ignorere alle brugere, der har navnet 'bot' på en hvilken som helst server.",
+        "explainer_2": "Man kan ignorere folk ved hjælp af blokeringslister, der indeholder regler for, hvem der skal blokeres. Hvis du abonnerer på en blokeringsliste, vil de brugere/servere, der er blokeret af den liste, blive skjult for dig.",
+        "lists": "Du abonnerer i øjeblikket på:",
+        "lists_description_1": "Hvis du abonnerer på en baneliste, bliver du automatisk medlem af den!",
+        "lists_description_2": "Hvis dette ikke er hvad du ønsker, skal du bruge et andet værktøj til at ignorere brugere.",
+        "lists_heading": "Abonnerede lister",
+        "lists_new_label": "Rum-ID eller adresse på udelukkelsesliste",
+        "no_lists": "Du abonnerer ikke på nogen lister",
+        "personal_description": "Din personlige spærringsliste indeholder alle de brugere/servere, du personligt ikke ønsker at se beskeder fra. Når du har ignoreret din første bruger/server, vil et nyt rum dukke op på din rumliste med navnet '%(myBanList)s' - bliv i dette rum for at holde udelukkelseslisten i kørende.",
+        "personal_empty": "Du har ikke ignoreret nogen.",
+        "personal_heading": "Personlig spærringsliste",
+        "personal_new_label": "Server- eller bruger-ID, der skal ignoreres",
+        "personal_new_placeholder": "f.eks.: @bot:* eller example.org",
+        "personal_section": "Du ignorerer i øjeblikket:",
+        "room_name": "Min spærringsliste",
+        "room_topic": "Dette er din liste over brugere/servere, du har blokeret – forlad ikke dette rum!",
+        "rules_empty": "Ingen",
+        "rules_server": "Serverregler",
+        "rules_title": "Regler for udelukkelseslisten - %(roomName)s",
+        "rules_user": "Brugerregler",
+        "something_went_wrong": "Noget gik galt. Prøv igen, eller se din konsol for at få tips.",
+        "title": "Ignorerede brugere",
+        "view_rules": "Se regler"
+    },
+    "language_dropdown_label": "Rullemenu for sprog",
+    "leave_room_dialog": {
+        "room_leave_admin_warning": "Du er den eneste administrator i dette rum. Hvis du forlader det, vil ingen være i stand til at ændre dets indstillinger eller foretage andre vigtige handlinger.",
+        "room_leave_mod_warning": "Du er den eneste moderator i dette rum. Hvis du forlader det, vil ingen kunne ændre rummets indstillinger eller foretage andre vigtige handlinger.",
+        "space_rejoin_warning": "Denne gruppe er ikke offentlig. Du har ikke mulighed for at tilslutte dig uden en invitation."
+    },
+    "lightbox": {
+        "rotate_left": "Roter mod venstre",
+        "rotate_right": "Roter mod højre",
+        "title": "Billedvisning"
+    },
+    "location_sharing": {
+        "MapStyleUrlNotConfigured": "Denne hjemmeserver er ikke konfigureret til at vise kort.",
+        "MapStyleUrlNotReachable": "Denne hjemmeserver er ikke konfigureret korrekt til at vise kort, eller den konfigurerede kortserver kan være utilgængelig.",
+        "WebGLNotEnabled": "WebGL er påkrævet for at vise kort. Aktivér det venligst i dine browserindstillinger.",
+        "click_drop_pin": "Klik for at placere en nål",
+        "click_move_pin": "Klik for at flytte nålen",
+        "close_sidebar": "Luk sidebjælke",
+        "error_fetch_location": "Kunne ikke hente placering",
+        "error_no_perms_description": "Du skal have de rette tilladelser for at kunne dele lokationer i dette rum.",
+        "error_no_perms_title": "Du har ikke tilladelse til at dele lokationer",
+        "error_send_description": "%(brand)s Kunne ikke sende din placering. Prøv igen senere.",
+        "error_send_title": "Vi kunne ikke sende din placering",
+        "error_sharing_live_location": "Der opstod en fejl under deling af din live-placering",
+        "error_stopping_live_location": "Der opstod en fejl under afbrydelse af din live-placering",
+        "expand_map": "Udvid kort",
+        "failed_generic": "Det lykkedes ikke at hente din placering. Prøv igen senere.",
+        "failed_load_map": "Kortet kunne ikke indlæses",
+        "failed_permission": "%(brand)s fik ikke tilladelse til at hente din placering. Tillad venligst adgang til placering i dine browserindstillinger.",
+        "failed_timeout": "Der opstod timeout under forsøg på at hente din placering. Prøv igen senere.",
+        "failed_unknown": "Ukendt fejl ved hentning af placering. Prøv igen senere.",
+        "find_my_location": "Find min placering",
+        "live_description": "%(displayName)s's live placering",
+        "live_enable_description": "Bemærk: Dette er en Labs-funktion, der bruger en midlertidig implementering. Det betyder, at du ikke vil kunne slette din placeringshistorik, og avancerede brugere vil kunne se din placeringshistorik selv efter du stopper med at dele din liveplacering med dette rum.",
+        "live_enable_heading": "Live lokationsdeling",
+        "live_location_active": "Du deler din live-placering",
+        "live_location_enabled": "Live-placering aktiveret",
+        "live_location_ended": "Live-placering afsluttet",
+        "live_location_error": "Fejl i live-placering",
+        "live_locations_empty": "Ingen live-placeringer",
+        "live_share_button": "Del i %(duration)s",
+        "live_toggle_label": "Aktivér live placeringsdeling",
+        "live_until": "Live indtil %(expiryTime)s",
+        "live_update_time": "Opdateret %(humanizedUpdateTime)s",
+        "loading_live_location": "Indlæser live-placering...",
+        "location_not_available": "Placering ikke tilgængelig",
+        "map_feedback": "Feedback på kort",
+        "mapbox_logo": "Mapbox-logo",
+        "reset_bearing": "Nulstil pejling til nord",
+        "share_button": "Del lokation",
+        "share_type_live": "Min live-placering",
+        "share_type_own": "Mit aktuelle sted",
+        "share_type_pin": "Sæt en nål",
+        "share_type_prompt": "Hvilken type placering vil du dele?",
+        "toggle_attribution": "Slå tilskrivning til/fra"
+    },
+    "member_list": {
+        "filter_placeholder": "Filter medlemmer",
+        "invite_button_no_perms_tooltip": "Du har ikke tilladelse til at invitere brugere"
+    },
+    "member_list_back_action_label": "Medlemmer af rummet",
+    "message_edit_dialog_title": "Redigering af beskeder",
+    "mobile_guide": {
+        "toast_accept": "Brug appen",
+        "toast_description": "%(brand)s er eksperimentel på en mobil webbrowser. For en bedre oplevelse og adgang til de nyeste funktioner, skal du bruge vores gratis dedikerede app.",
+        "toast_title": "Brug appen for en bedre oplevelse"
+    },
+    "name_and_id": "%(name)s (%(userId)s)",
+    "notif_panel": {
+        "empty_heading": "Du er helt ajour."
+    },
+    "notifications": {
+        "all_messages": "Alle beskeder",
+        "all_messages_description": "Få notifikationer for hver besked",
+        "class_global": "Global",
+        "class_other": "Andre",
+        "default": "Standard",
+        "email_pusher_app_display_name": "E-mail-notifikationer",
+        "enable_prompt_toast_description": "Aktivér skrivebordsnotifikationer",
+        "enable_prompt_toast_title": "Notifikationer",
+        "enable_prompt_toast_title_from_message_send": "Gå ikke glip af et svar",
+        "error_change_title": "Skift notifikations indstillinger",
+        "keyword": "Nøgleord",
+        "keyword_new": "Nyt nøgleord",
+        "level_notification": "Notifikation",
+        "mark_all_read": "Markér alle som læst",
+        "mentions_and_keywords": "@omtaler og søgeord",
+        "mentions_and_keywords_description": "Få kun notifikationer for omtaler og søgeord som konfigureret under <a>indstillinger</a>",
+        "mentions_keywords": "Omtaler og nøgleord",
+        "message_didnt_send": "Beskeden blev ikke sendt. Klik for mere information.",
+        "mute_description": "Du vil ikke modtage nogen notifikationer"
+    },
+    "notifier": {
+        "m.key.verification.request": "%(name)s beder om verifikation"
+    },
+    "onboarding": {
+        "create_room": "Opret en gruppechat",
+        "explore_rooms": "Udforsk offentlige rum",
+        "has_avatar_label": "Alle tiders. Det vil hjælpe andre med at vide det er dig",
+        "intro_byline": "Ej dine samtaler.",
+        "intro_welcome": "Velkommen til %(appName)s",
+        "no_avatar_label": "Tilføj et billede, så andre ved du er dig.",
+        "send_dm": "Send en Direkte Besked",
+        "welcome_detail": "Lad os hjælpe dig godt i gang",
+        "welcome_user": "Velkommen %(name)s"
+    },
+    "pill": {
+        "permalink_other_room": "Besked i %(room)s",
+        "permalink_this_room": "Besked fra %(user)s"
+    },
+    "poll": {
+        "create_poll_action": "Opret afstemning",
+        "create_poll_title": "Opret afstemning",
+        "disclosed_notes": "Deltagerne ser resultaterne, så snart de har stemt",
+        "edit_poll_title": "Redigér afstemning",
+        "end_description": "Er du sikker på, at du ønsker at afslutte afstemningen? Dette vil vise de endelige resultater og lukke for afgivelse af flere stemmer.",
+        "end_message": "Afstemningen er afsluttet. Mest populære svar: %(topAnswer)s",
+        "end_message_no_votes": "Afstemningen er afsluttet. Der blev ikke afgivet nogen stemmer.",
+        "end_title": "Afslut afstemning",
+        "error_ending_description": "Beklager, afstemningen blev ikke afsluttet. Prøv igen.",
+        "error_ending_title": "Afstemningen kunne ikke afsluttes",
+        "error_voting_description": "Beklager, din stemme blev ikke registreret. Prøv igen.",
+        "error_voting_title": "Stemmen blev ikke registreret",
+        "failed_send_poll_description": "Beklager, den afstemning, du forsøgte at oprette, blev ikke offentliggjort.",
+        "failed_send_poll_title": "Kunne ikke oprette afstemning",
+        "notes": "Resultaterne afsløres først, når du afslutter afstemningen",
+        "options_add_button": "Tilføj mulighed",
+        "options_heading": "Opret muligheder",
+        "options_label": "Valgmulighed %(number)s",
+        "options_placeholder": "Skriv en mulighed",
+        "topic_heading": "Hvad er dit spørgsmål eller emne for afstemningen?",
+        "topic_label": "Spørgsmål eller emne",
+        "topic_placeholder": "Skriv noget…",
+        "total_decryption_errors": "På grund af dekrypteringsfejl tælles nogle stemmer muligvis ikke med",
+        "total_n_votes": {
+            "one": "%(count)s afgivet stemme. Stem for at se resultaterne",
+            "other": "%(count)s afgivne stemmer. Stem for at se resultaterne"
+        },
+        "total_n_votes_voted": {
+            "one": "Baseret på %(count)s stemme",
+            "other": "Baseret på %(count)s stemmer"
+        },
+        "total_no_votes": "Ingen stemmer afgivet",
+        "total_not_ended": "Resultaterne vil blive vist, når afstemningen er afsluttet.",
+        "type_closed": "Lukket afstemning",
+        "type_heading": "Afstemningstype",
+        "type_open": "Åben afstemning",
+        "unable_edit_description": "Beklager, du kan ikke redigere en afstemning, efter at der er afgivet stemmer.",
+        "unable_edit_title": "Kan ikke redigere afstemningen"
+    },
+    "power_level": {
+        "admin": "Administrator",
+        "custom": "Kustomiseret %(level)s",
+        "custom_level": "Brugerdefineret niveau",
+        "default": "Standard",
+        "label": "Effektniveau",
+        "moderator": "Moderator",
+        "restricted": "Begrænset"
+    },
+    "presence": {
+        "away": "Fraværende",
+        "busy": "Optaget",
+        "idle": "Inaktiv",
+        "idle_for": "Inaktiv i %(duration)s",
+        "offline": "Offline",
+        "offline_for": "Offline i %(duration)s",
+        "online": "Online",
+        "online_for": "Online i %(duration)s",
+        "unknown": "Ukendt",
+        "unknown_for": "Ukendt i %(duration)s"
+    },
+    "quick_settings": {
+        "all_settings": "Alle indstillinger",
+        "metaspace_section": "Fastgør til sidebar",
+        "sidebar_settings": "Flere muligheder",
+        "title": "Hurtige indstillinger"
+    },
+    "redact": {
+        "confirm_button": "Bekræft fjernelse",
+        "confirm_description": "Er du sikker på, at du vil fjerne (slette) denne begivenhed?",
+        "confirm_description_state": "Bemærk, at fjernelse af rumændringer som denne kan omgøre selve ændringen.",
+        "error": "Du kan ikke slette denne besked. (%(code)s)",
+        "ongoing": "Fjerner…",
+        "reason_label": "Årsag (valgfri)"
+    },
+    "report_content": {
+        "description": "Indrapportering af denne besked vil sende dens unikke 'hændelses-ID' til administratoren af din hjemmeserver. Hvis beskeder i dette rum er krypteret, vil administratoren ikke være i stand til at læse beskedens indhold eller se filer eller billeder.",
+        "disagree": "Uenig",
+        "error_create_room_moderation_bot": "Kunne ikke oprette rum med moderationsbot",
+        "hide_messages_from_user": "Marker, hvis du vil skjule alle nuværende og fremtidige beskeder fra denne bruger",
+        "ignore_user": "Ignorér bruger",
+        "illegal_content": "Ulovligt indhold",
+        "missing_reason": "Udfyld venligst årsagen til din indrapportering.",
+        "nature": "Vælg en kategori og beskriv hvad der gør denne besked krænkende.",
+        "nature_disagreement": "Det, denne bruger skriver, er forkert.\nDette vil blive rapporteret til rummets moderatorer.",
+        "nature_illegal": "Denne bruger udviser ulovlig adfærd, for eksempel ved at doxe andre eller true med vold.\nDette vil blive rapporteret til rum-moderatorerne, der kan tage det til de relevante myndigheder.",
+        "nature_nonstandard_admin": "Dette rum er dedikeret til ulovligt eller skadeligt indhold, eller moderatorerne undlader at moderere ulovligt eller skadeligt indhold.\nDette vil blive rapporteret til administratorerne af %(homeserver)s.",
+        "nature_nonstandard_admin_encrypted": "Dette rum er dedikeret til ulovligt eller skadeligt indhold, eller moderatorerne undlader at moderere ulovligt eller skadeligt indhold.\nDette vil blive rapporteret til administratorerne af %(homeserver)s. Administratorerne vil IKKE være i stand til at læse det krypterede indhold i dette rum.",
+        "nature_other": "Enhver anden årsag. Beskriv venligst problemet. \nDette vil blive rapporteret til rummets moderatorer.",
+        "nature_spam": "Denne bruger spammer rummet med reklamer, links til reklamer eller propaganda.\nDette vil blive rapporteret til rummets moderatorer.",
+        "nature_toxic": "Denne bruger udviser skadelig adfærd, for eksempel ved at fornærme andre brugere eller dele indhold kun for voksne i et familievenligt rum eller på anden måde overtræde reglerne for dette rum.\nDette vil blive rapporteret til rummoderatorerne.",
+        "other_label": "Andre",
+        "report_content_to_homeserver": "Rapportér indhold til din hjemmeservers administrator",
+        "report_entire_room": "Rapportér hele rummet",
+        "spam_or_propaganda": "Spam eller propaganda",
+        "toxic_behaviour": "Skadelig adfærd"
+    },
+    "restore_key_backup_dialog": {
+        "count_of_decryption_failures": "Kunne ikke dekryptere %(failedCount)s sessioner!",
+        "count_of_successfully_restored_keys": "%(sessionCount)s nøgler blev gendannet",
+        "enter_key_title": "Indtast gendannelsesnøgle",
+        "enter_phrase_description": "Få adgang til historikken for dine sikre beskeder og opsæt sikker beskedfunktion ved at indtaste din sikkerhedskode.",
+        "enter_phrase_title": "Indtast adgangsfrase",
+        "incorrect_security_phrase_dialog": "Sikkerhedskopien kunne ikke dekrypteres med denne adgangsfrase: Kontrollér, at du har indtastet den korrekte.",
+        "incorrect_security_phrase_title": "Forkert adgangsfrase",
+        "key_backup_warning": "<b>Advarsel</b>: Du bør kun konfigurere nøglebackup fra en computer du stoler på.",
+        "key_fetch_in_progress": "Henter nøgler fra serveren...",
+        "key_is_invalid": "Ikke en gyldig gendannelsesnøgle",
+        "key_is_valid": "Dette ser ud til at være en gyldig gendannelsesnøgle!",
+        "keys_restored_title": "Nøgler gendannet",
+        "load_error_content": "Status for sikkerhedskopiering kunne ikke indlæses",
+        "load_keys_progress": "%(completed)s af i alt %(total)s nøgler er restaureret",
+        "no_backup_error": "Der blev ikke fundet nogen sikkerhedskopi",
+        "phrase_forgotten_text": "Hvis du har glemt din sikkerhedsfrase, kan du <button1>bruge din gendannelsesnøgle</button1> eller <button2>oprette nye gendannelsesmuligheder</button2>",
+        "recovery_key_mismatch_description": "Sikkerhedskopien kunne ikke dekrypteres med denne gendannelsesnøgle: Bekræft venligst, at du har indtastet den korrekte gendannelsesnøgle.",
+        "recovery_key_mismatch_title": "Uoverensstemmelse med gendannelsesnøgle",
+        "restore_failed_error": "Kan ikke gendanne sikkerhedskopien"
+    },
+    "right_panel": {
+        "add_integrations": "Tilføj udvidelser",
+        "extensions_button": "Udvidelser",
+        "extensions_empty_description": "Vælg \"%(addIntegrations)s\" for at gennemse og tilføje udvidelser til dette rum",
+        "extensions_empty_title": "Øg produktiviteten med flere værktøjer, widgets og bots",
+        "files_button": "Filer",
+        "pinned_messages": {
+            "limits": {
+                "one": "",
+                "other": "Du kan kun fastgøre op til %(count)s widgets"
+            }
+        },
+        "pinned_messages_button": "Fastgjorte beskeder",
+        "poll": {
+            "active_heading": "Aktive afstemninger",
+            "empty_active": "Der er ingen aktive afstemninger i dette rum",
+            "empty_active_load_more": "Der er ingen aktive afstemninger. Indlæs flere afstemninger for at se afstemninger fra tidligere måneder.",
+            "empty_active_load_more_n_days": {
+                "one": "Der er ingen aktive afstemninger for den seneste dag. Indlæs flere afstemninger for at se afstemninger for tidligere måneder",
+                "other": "Der er ingen aktive afstemninger for de sidste %(count)s dage. Indlæs flere afstemninger for at se afstemninger for tidligere måneder."
+            },
+            "empty_past": "Der er ingen tidligere afstemninger i dette rum",
+            "empty_past_load_more": "Der er ingen tidligere afstemninger. Indlæs flere afstemninger for at se afstemninger fra tidligere måneder.",
+            "empty_past_load_more_n_days": {
+                "one": "Der er ingen tidligere afstemninger for den forløbne dag. Indlæs flere afstemninger for at se afstemninger for tidligere måneder",
+                "other": "Der er ingen tidligere afstemninger for de sidste %(count)s dage. Indlæs flere afstemninger for at se afstemninger for tidligere måneder."
+            },
+            "final_result": {
+                "one": "Endeligt resultat, baseret på %(count)s stemme",
+                "other": "Endeligt resultat, baseret på %(count)s stemmer"
+            },
+            "load_more": "Indlæs flere afstemninger",
+            "loading": "Indlæser afstemninger",
+            "past_heading": "Tidligere afstemninger",
+            "view_in_timeline": "Se afstemning i tidslinjen",
+            "view_poll": "Se afstemning"
+        },
+        "polls_button": "Afstemninger",
+        "room_summary_card": {
+            "title": "Informationer om rummet"
+        },
+        "thread_list": {
+            "context_menu_label": "Trådindstillinger"
+        },
+        "video_room_chat": {
+            "title": "Samtale"
+        }
+    },
+    "room": {
+        "3pid_invite_email_not_found_account": "Denne invitation blev sendt til %(email)s, som ikke er tilknyttet din konto.",
+        "3pid_invite_email_not_found_account_room": "Denne invitation til %(roomName)s blev sendt til %(email)s, som ikke er tilknyttet din konto.",
+        "3pid_invite_error_description": "Der opstod en fejl (%(errcode)s), da vi forsøgte at validere din invitation. Du kan prøve at videregive denne information til den person, der inviterede dig.",
+        "3pid_invite_error_invite_action": "Prøv alligevel at deltage",
+        "3pid_invite_error_invite_subtitle": "Du kan kun deltage med en gyldig invitation.",
+        "3pid_invite_error_public_subtitle": "Du kan stadig tilmelde dig her.",
+        "3pid_invite_error_title": "Der opstod en fejl med din invitation.",
+        "3pid_invite_error_title_room": "Der opstod en fejl med din invitation til %(roomName)s",
+        "3pid_invite_no_is_subtitle": "Brug en identitetsserver i Indstillinger for at modtage invitationer direkte i %(brand)s.",
+        "banned_by": "Du blev udelukket af %(memberName)s",
+        "banned_from_room_by": "Du blev udelukket fra %(roomName)s af %(memberName)s",
+        "context_menu": {
+            "copy_link": "Kopiér link til rummet",
+            "favourite": "Favorit",
+            "forget": "Glem rummet",
+            "low_priority": "Lav prioritet",
+            "mark_read": "Markér som læst",
+            "notifications_default": "Match standardindstillingen",
+            "notifications_mute": "Sæt rummet på lydløs",
+            "title": "Muligheder for rum",
+            "unfavourite": "Favoritmarkeret"
+        },
+        "creating_room_text": "Vi opretter et rum med %(names)s",
+        "dm_invite_action": "Start chat",
+        "dm_invite_subtitle": "<userName/> ønsker at chatte",
+        "dm_invite_title": "Vil du chatte med %(user)s?",
+        "drop_file_prompt": "Slip filen her for at uploade",
+        "edit_topic": "Redigér emne",
+        "error_3pid_invite_email_lookup": "Kan ikke finde brugeren via e-mail",
+        "error_cancel_knock_title": "Kunne ikke annullere",
+        "error_join_403": "Du skal bruge en invitation for at få adgang til dette rum.",
+        "error_join_404_1": "Du forsøgte at deltage ved hjælp af et rum-ID uden at angive en liste over servere at deltage igennem. Rum-ID'er er interne identifikatorer og kan ikke bruges til at deltage i et rum uden yderligere oplysninger.",
+        "error_join_404_2": "Hvis du kender en rum-adresse, kan du prøve at tilslutte dig via den i stedet.",
+        "error_join_404_invite": "Den person, der inviterede dig, er allerede gået, eller deres server er offline.",
+        "error_join_404_invite_same_hs": "Den person, der inviterede dig, er allerede gået.",
+        "error_join_connection": "Der opstod en fejl under tilslutningen.",
+        "error_join_incompatible_version_1": "Beklager, din hjemmeserver er for gammel til at kunne deltage her.",
+        "error_join_incompatible_version_2": "Kontakt venligst administratoren af din hjemmeserver.",
+        "error_join_title": "Lykkedes ikke med at deltage",
+        "error_jump_to_date": "Serveren returnerede %(statusCode)s med fejlkode %(errorCode)s",
+        "error_jump_to_date_connection": "Der opstod en netværksfejl, da der blev forsøgt at finde og springe til den angivne dato. Din hjemmeserver er muligvis nede, eller der var bare et midlertidigt problem med din internetforbindelse. Prøv venligst igen. Hvis problemet fortsætter, skal du kontakte administratoren af din hjemmeserver.",
+        "error_jump_to_date_details": "Fejloplysninger",
+        "error_jump_to_date_not_found": "Vi kunne ikke finde en begivenhed ved at kigge fremad fra %(dateString)s Prøv at vælge en tidligere dato.",
+        "error_jump_to_date_send_logs_prompt": "Send venligst <debugLogsLink>fejlfindingslogfilerne</debugLogsLink> for at hjælpe os med at finde fejlen.",
+        "error_jump_to_date_title": "Kunne ikke finde begivenhed på den dato",
+        "face_pile_summary": {
+            "one": "%(count)s bruger du kender har allerede tilmeldt sig",
+            "other": "%(count)s brugere du kender har allerede tilmeldt sig"
+        },
+        "face_pile_tooltip_label": {
+            "one": "Se 1 medlem",
+            "other": "Se alle %(count)s medlemmer"
+        },
+        "face_pile_tooltip_shortcut": "Inklusiv %(commaSeparatedMembers)s",
+        "face_pile_tooltip_shortcut_joined": "Inklusive dig, %(commaSeparatedMembers)s",
+        "failed_reject_invite": "Lykkedes ikke med at afvise invitation",
+        "forget_room": "Glem dette rum",
+        "forget_space": "Glem denne gruppe",
+        "header": {
+            "n_people_asking_to_join": {
+                "one": "Beder om at deltage",
+                "other": "%(count)s personer, der beder om at deltage"
+            },
+            "room_is_public": "Dette rum er offentligt"
+        },
+        "header_face_pile_tooltip": "Brugere",
+        "header_untrusted_label": "Upålidelig",
+        "inaccessible": "Rummet eller gruppen er ikke tilgængelig lige nu.",
+        "inaccessible_name": "%(roomName)s er ikke tilgængelig på nuværende tidspunkt.",
+        "inaccessible_subtitle_1": "Prøv igen senere, eller bed en administrator af rummet om at tjekke, om du har adgang.",
+        "inaccessible_subtitle_2": "%(errcode)s blev returneret, mens du forsøgte at få adgang til rummet eller gruppen. Hvis du mener, at denne besked vises ved en fejl, bedes du <issueLink>indsende en fejlrapport</issueLink>.",
+        "intro": {
+            "dm_caption": "Kun I to deltager i denne samtale, medmindre en af ​​jer inviterer andre til at deltage.",
+            "enable_encryption_prompt": "Aktivér kryptering i indstillingerne.",
+            "encrypted_3pid_dm_pending_join": "Så snart alle er kommet ind i rummet, vil I kunne skrive sammen",
+            "no_avatar_label": "Tilføj et billede, så andre nemt kan få øje på dit rum.",
+            "no_topic": "<a>Tilføj et emne </a> for at hjælpe andre med at vide, hvad det handler om.",
+            "private_unencrypted_warning": "Dine private beskeder er normalt krypteret, men dette rum er ikke. Sædvanligvis skyldes det at en ikke-undersøttet enhed eller metode bliver anvendt, som for eksempel e-mail invitationer.",
+            "room_invite": "Invitér kun til dette rum",
+            "send_message_start_dm": "Send din første besked for at invitere <displayName/> til at chatte",
+            "start_of_dm_history": "Dette er starten på din historik for direkte beskeder med<displayName/> .",
+            "start_of_room": "Dette er begyndelsen på <roomName/>.",
+            "unencrypted_warning": "End-to-end kryptering er ikke aktiveret",
+            "user_created": "%(displayName)s oprettede dette rum.",
+            "you_created": "Du oprettede dette rum."
+        },
+        "invite_email_mismatch_suggestion": "Del denne e-mail i Indstillinger for at modtage invitationer direkte i %(brand)s.",
+        "invite_sent_to_email": "Denne invitation blev sendt til %(email)s",
+        "invite_sent_to_email_room": "Denne invitation til %(roomName)s blev sendt til %(email)s",
+        "invite_subtitle": "Inviteret af <userName/>",
+        "invite_this_room": "Inviter til denne gruppe",
+        "invite_title": "Vil du være med i %(roomName)s?",
+        "inviter_unknown": "Ukendt",
+        "invites_you_text": "<inviter/> inviterer dig",
+        "join_button_account": "Tilmeld dig",
+        "join_failed_needs_invite": "For at se %(roomName)s skal du have en invitation.",
+        "join_the_discussion": "Deltag i diskussionen",
+        "join_title": "Tilslut dig rummet, for at deltage",
+        "join_title_account": "Deltag i samtalen med en konto",
+        "joining": "Tilslutter...",
+        "joining_room": "Tilslutter til rummet...",
+        "joining_space": "Tilslutter til gruppe...",
+        "jump_read_marker": "Gå til første ulæste besked.",
+        "jump_to_bottom_button": "Rul ned til de seneste beskeder",
+        "jump_to_date": "Gå til dato",
+        "jump_to_date_beginning": "Begyndelsen af rummet",
+        "jump_to_date_prompt": "Vælg en dato at gå til",
+        "kick_reason": "Årsag: %(reason)s",
+        "kicked_by": "Du blev fjernet af %(memberName)s",
+        "kicked_from_room_by": "Du blev fjernet fra %(roomName)s af %(memberName)s",
+        "knock_cancel_action": "Annuller anmodning",
+        "knock_denied_subtitle": "Da du er blevet nægtet adgang, kan du ikke tilmelde dig igen, medmindre du bliver inviteret af gruppens administrator eller moderator.",
+        "knock_denied_title": "Du er blevet nægtet adgang",
+        "knock_message_field_placeholder": "Besked (valgfrit)",
+        "knock_prompt": "Vil du bede om at deltage?",
+        "knock_prompt_name": "Anmod om at blive medlem af %(roomName)s ?",
+        "knock_send_action": "Anmod om adgang",
+        "knock_sent": "Anmodning om deltagelse sendt",
+        "knock_sent_subtitle": "Din anmodning om at deltage afventer.",
+        "knock_subtitle": "Du skal have adgang til dette rum for at kunne se eller deltage i samtalen. Du kan sende en anmodning om at deltage nedenfor.",
+        "leave_error_title": "Fejl under forladelse af rummet",
+        "leave_server_notices_description": "Dette rum bruges til vigtige beskeder fra hjemmeserveren, så du kan ikke forlade det.",
+        "leave_server_notices_title": "Kan ikke forlade rummet Servermeddelelser",
+        "leave_unexpected_error": "Uventet serverfejl ved forsøg på at forlade rummet",
+        "link_email_to_receive_3pid_invite": "Forbind denne e-mail til din konto under Indstillinger for at modtage invitationer direkte i %(brand)s.",
+        "loading_preview": "Indlæser forhåndsvisning",
+        "no_peek_join_prompt": "%(roomName)s kan ikke forhåndsvises. Ønsker du at tilslutte dig det?",
+        "no_peek_no_name_join_prompt": "Der er ingen forhåndsvisning tilgængelig, vil du tilmelde dig alligevel?",
+        "not_found_subtitle": "Er du sikker på, at du er på det rigtige sted?",
+        "not_found_title": "Rummet eller gruppen eksisterer ikke.",
+        "not_found_title_name": "%(roomName)s findes ikke.",
+        "peek_join_prompt": "Du ser en forhåndsvisning af %(roomName)s. Ønsker du at deltage i det?",
+        "pinned_message_banner": {
+            "button_view_all": "Se alle",
+            "description": "Fastgjorte beskeder"
+        },
+        "read_topic": "Klik for at læse hvad emnet er",
+        "rejecting": "Afviser invitation...",
+        "rejoin_button": "Tilslut igen",
+        "search": {
+            "all_rooms_button": "Søg i alle rum",
+            "this_room_button": "Søg i dette rum"
+        },
+        "status_bar": {
+            "delete_all": "Slet alle",
+            "exceeded_resource_limit": "Din besked blev ikke sendt, fordi denne hjemmeserver har overskredet en ressourcegrænse. <a>Kontakt din serviceadministrator </a> for at fortsætte med at bruge tjenesten.",
+            "homeserver_blocked": "Din besked blev ikke sendt, fordi denne hjemmeserver er blevet blokeret af dens administrator. <a>Kontakt din serviceadministrator </a> for at fortsætte med at bruge tjenesten.",
+            "monthly_user_limit_reached": "Din besked blev ikke sendt, fordi denne hjemmeserver har nået sin månedlige aktive brugergrænse. <a>Kontakt din serviceadministrator </a> for at fortsætte med at bruge tjenesten.",
+            "requires_consent_agreement": "Du kan ikke sende nogen beskeder, før du har gennemgået og accepteret <consentLink>vores vilkår og betingelser</consentLink>.",
+            "retry_all": "Prøv alle igen",
+            "select_messages_to_retry": "Du kan vælge alle eller enkelte beskeder, for at forsøge med dem igen eller slette dem.",
+            "server_connectivity_lost_description": "Sendte beskeder vil blive gemt, indtil din forbindelse er genoprettet.",
+            "server_connectivity_lost_title": "Forbindelsen til serveren er gået tabt.",
+            "some_messages_not_sent": "Nogle af dine beskeder er ikke blevet sendt"
+        },
+        "unknown_status_code_for_timeline_jump": "ukendt statuskode",
+        "unread_notifications_predecessor": {
+            "one": "Du har %(count)s ulæst notifikation i en tidligere version af dette rum.",
+            "other": "Du har %(count)s ulæste notifikationer i en tidligere version af dette rum."
+        },
+        "upgrade_error_description": "Dobbelt-tjek at din server understøtter den valgte gruppeversion og forsøg igen.",
+        "upgrade_error_title": "Fejl under opgradering af gruppe",
+        "upgrade_warning_bar": "Opgradering af dette rum vil lukke den nuværende instans af rummet ned og oprette et opgraderet rum med samme navn.",
+        "upgrade_warning_bar_admins": "Kun rummets administratorer vil se denne advarsel.",
+        "upgrade_warning_bar_unstable": "Dette rum kører version <roomVersion />, som denne hjemmeserver har markeret som <i>ustabil</i>.",
+        "upgrade_warning_bar_upgraded": "Dette rum er allerede blevet opgraderet.",
+        "upload": {
+            "uploading_multiple_file": {
+                "one": "Uploader %(filename)s og %(count)s anden",
+                "other": "Uploader %(filename)s og %(count)s andre"
+            },
+            "uploading_single_file": "Uploading %(filename)s"
+        },
+        "waiting_for_join_subtitle": "Når inviterede brugere har tilmeldt sig %(brand)s, kan I chatte, og rummet vil være krypteret fra ende til ende.",
+        "waiting_for_join_title": "Venter på, at brugere deltager via %(brand)s"
+    },
+    "room_list": {
+        "add_room_label": "Tilføj rum",
+        "add_space_label": "Tilføj gruppe",
+        "breadcrumbs_empty": "Ingen nyligt besøgte rum",
+        "breadcrumbs_label": "Nyligt besøgte rum",
+        "empty": {
+            "no_rooms": "Du er ikke i noget rum endnu"
+        },
+        "failed_add_tag": "Kunne ikke tilføje tag(s): %(tagName)s til gruppen",
+        "failed_remove_tag": "Kunne ikke fjerne tag(s): %(tagName)s fra gruppen",
+        "failed_set_dm_tag": "Kunne ikke indstille tagget til direkte beskeder",
+        "filters": {
+            "people": "Brugere"
+        },
+        "home_menu_label": "Hjemmeindstillinger",
+        "join_public_room_label": "Deltag i offentligt rum",
+        "joining_rooms_status": {
+            "one": "Tilslutter sig i øjeblikket %(count)s rum",
+            "other": "Tilslutter sig i øjeblikket %(count)s rum"
+        },
+        "notification_options": "Notifikationsindstillinger",
+        "open_space_menu": "Åbn menu for gruppe",
+        "redacting_messages_status": {
+            "one": "Fjerner i øjeblikket beskeder i %(count)s rum",
+            "other": "Fjerner i øjeblikket beskeder i %(count)s rum"
+        },
+        "show_less": "Vis mindre",
+        "show_n_more": {
+            "one": "Vis %(count)s mere",
+            "other": "Vis %(count)s mere"
+        },
+        "show_previews": "Vis forhåndsvisninger af beskeder",
+        "sort_by": "Sortér efter",
+        "sort_by_activity": "Aktivitet",
+        "sort_by_alphabet": "A-Å",
+        "sort_unread_first": "Vis rum med ulæste beskeder først",
+        "space_menu": {
+            "home": "Hjem for gruppe",
+            "space_settings": "Indstillinger for grupper"
+        },
+        "space_menu_label": "%(spaceName)s menu",
+        "sublist_options": "Liste over muligheder",
+        "suggested_rooms_heading": "Foreslåede rum"
+    },
+    "room_settings": {
+        "access": {
+            "description_space": "Bestem, hvem der kan se og deltage%(spaceName)s .",
+            "title": "Adgang"
+        },
+        "advanced": {
+            "error_upgrade_description": "Opgraderingen af rummet kunne ikke gennemføres",
+            "error_upgrade_title": "Det lykkedes ikke at opgradere rummet",
+            "information_section_room": "Information om rummet",
+            "information_section_space": "Information om gruppen",
+            "room_id": "Internt rum-ID",
+            "room_predecessor": "Se ældre beskeder i %(roomName)s.",
+            "room_upgrade_button": "Opgrader dette rum til den anbefalede rumversion",
+            "room_upgrade_warning": "<b>Advarsel</b>: Opgradering af et rum vil <i>ikke automatisk migrere rummets medlemmer til den nye version af rummet.</i> Vi lægger i stedet et link til det nye rum i den gamle version af rummet - rummets medlemmer skal klikke på dette link for at blive medlem af det nye rum.",
+            "room_version": "Version af rum:",
+            "room_version_section": "Version af rum",
+            "space_predecessor": "Se ældre version af %(spaceName)s.",
+            "space_upgrade_button": "Opgradér denne gruppe til den anbefalede rumversion",
+            "unfederated": "Dette rum er ikke tilgængeligt via eksterne Matrix-servere.",
+            "upgrade_button": "Opgrader dette rum til version %(version)s",
+            "upgrade_dialog_description": "For at opgradere dette rum skal den nuværende instans af rummet lukkes, og der skal oprettes et nyt rum i stedet. For at give rummets medlemmer den bedst mulige oplevelse vil vi:",
+            "upgrade_dialog_description_1": "Oprette et nyt rum med samme navn, beskrivelse og avatar",
+            "upgrade_dialog_description_2": "Opdatere eventuelle lokale rum-aliasser, så de peger på det nye rum.",
+            "upgrade_dialog_description_3": "Forhindre brugere i at tale i den gamle version af rummet, og dele en besked, som opfordrer brugerne til at flytte til det nye rum.",
+            "upgrade_dialog_description_4": "Sætte et link tilbage til det gamle rum i starten af det nye rum, så folk kan se gamle beskeder.",
+            "upgrade_dialog_title": "Opgrader rumversion",
+            "upgrade_dwarning_ialog_title_public": "Opgradér offentligt rum",
+            "upgrade_warning_dialog_description": "Opgradering af et rum er en avanceret handling og anbefales normalt, når et rum er ustabilt på grund af fejl, manglende funktioner eller sikkerhedsrisici.",
+            "upgrade_warning_dialog_explainer": "<b>Bemærk venligst, at opgraderingen vil skabe en ny version af rummet</b> Alle aktuelle beskeder forbliver i dette arkiverede rum.",
+            "upgrade_warning_dialog_footer": "Du opgraderer dette rum fra <oldVersion /> til<newVersion />.",
+            "upgrade_warning_dialog_invite_label": "Automatisk invitere medlemmer fra dette rum til det nye",
+            "upgrade_warning_dialog_report_bug_prompt": "Dette påvirker normalt kun, hvordan rummet håndteres på serveren. Hvis du har problemer med %(brand)s, bedes du rapportere en fejl.",
+            "upgrade_warning_dialog_report_bug_prompt_link": "Dette påvirker normalt kun, hvordan rummet håndteres på serveren. Hvis du har problemer med %(brand)s, bedes du <a>rapportere en fejl.</a>",
+            "upgrade_warning_dialog_title": "Opgradér rummet",
+            "upgrade_warning_dialog_title_private": "Opgradér privat rum"
+        },
+        "alias_not_specified": "ikke angivet",
+        "bridges": {
+            "description": "Dette rum deler beskeder med følgende platforme. <a>Lær mere.</a>",
+            "empty": "Dette rum deler ikke beskeder til nogen platforme. <a>Lær mere.</a>",
+            "title": "Broer"
+        },
+        "delete_avatar_label": "Slet avatar",
+        "general": {
+            "alias_field_has_domain_invalid": "Manglende domæneseparator, f.eks. (:domain.org)",
+            "alias_field_has_localpart_invalid": "Manglende rumnavn eller separator, f.eks. (my-room:domain.org)",
+            "alias_field_matches_invalid": "Denne adresse peger ikke på dette rum",
+            "alias_field_placeholder_default": "f.eks. mit-rum",
+            "alias_field_required_invalid": "Angiv venligst en adresse",
+            "alias_field_safe_localpart_invalid": "Nogle af tegnene er ikke tilladt",
+            "alias_field_taken_invalid": "Denne adresse havde en ugyldig server eller er allerede i brug",
+            "alias_field_taken_invalid_domain": "Denne adresse er allerede i brug",
+            "alias_field_taken_valid": "Denne adresse er tilgængelig til brug",
+            "alias_heading": "Rummets adresse",
+            "aliases_items_label": "Andre offentliggjorte adresser:",
+            "aliases_no_items_label": "Der er endnu ikke offentliggjort andre adresser. Tilføj en nedenfor.",
+            "aliases_section": "Rummets adresser",
+            "avatar_field_label": "Avatar for rummet",
+            "canonical_alias_field_label": "Hovedadresse",
+            "default_url_previews_off": "URL-forhåndsvisninger er som standard deaktiveret for deltagere i dette rum.",
+            "default_url_previews_on": "URL-forhåndsvisninger er som standard aktiveret for deltagere i dette rum.",
+            "description_space": "Redigér indstillinger for din gruppe.",
+            "error_creating_alias_description": "Der opstod en fejl under oprettelsen af ​​adressen. Den er muligvis ikke tilladt af serveren, eller der er opstået en midlertidig fejl.",
+            "error_creating_alias_title": "Fejl ved oprettelse af adresse",
+            "error_deleting_alias_description": "Der opstod en fejl ved fjernelsen af den adresse. Den findes muligvis ikke længere, eller der opstod en midlertidig fejl.",
+            "error_deleting_alias_description_forbidden": "Du har ikke tilladelse til at slette adressen.",
+            "error_deleting_alias_title": "Fejl ved fjernelse af adresse",
+            "error_save_space_settings": "Kunne ikke gemme gruppens indstillinger.",
+            "error_updating_alias_description": "Der opstod en fejl under opdateringen af ​​rummets alternative adresser. Serveren tillader det muligvis ikke, eller der er opstået en midlertidig fejl.",
+            "error_updating_canonical_alias_description": "Der opstod en fejl under opdatering af rummets primære adresse. Serveren tillader muligvis ikke opdateringen, eller der er opstået en midlertidig fejl.",
+            "error_updating_canonical_alias_title": "Fejl ved opdatering af hovedadresse",
+            "leave_space": "Forlad gruppe",
+            "local_alias_field_label": "Lokal adresse",
+            "local_aliases_explainer_room": "Angiv adresser til dette rum, så brugerne kan finde det via din hjemmeserver (%(localDomain)s )",
+            "local_aliases_explainer_space": "Angiv adresser til denne gruppe, så brugerne kan finde den via din hjemmeserver (%(localDomain)s )",
+            "local_aliases_section": "Lokale adresser",
+            "name_field_label": "Rummets navn",
+            "new_alias_placeholder": "Ny offentliggjort adresse (f.eks. #alias:server)",
+            "no_aliases_room": "Denne gruppe har ingen lokal adresse",
+            "no_aliases_space": "Denne gruppe har ingen lokale adresser",
+            "other_section": "Andre",
+            "publish_toggle": "Offentliggør dette rum i %(domain)s's oversigt over rum?",
+            "published_aliases_description": "For at offentliggøre en adresse skal den først indstilles som en lokal adresse.",
+            "published_aliases_explainer_room": "Offentliggjorte adresser kan bruges af alle på enhver server til at deltage i dit rum.",
+            "published_aliases_explainer_space": "Publicerede adresser kan bruges af alle til at tilslutte sig din gruppe.",
+            "published_aliases_section": "Offentliggjorte adresser",
+            "save": "Gem ændringer",
+            "topic_field_label": "Rummets emne",
+            "url_preview_encryption_warning": "I krypterede rum, som dette, er URL-forhåndsvisninger som standard deaktiveret for at sikre, at din hjemmeserver (hvor forhåndsvisningerne genereres) ikke kan indsamle oplysninger om links, du ser i dette rum.",
+            "url_preview_explainer": "Når nogen indtaster en URL i sin besked, kan der vises en forhåndsvisning af URL'en, der giver flere oplysninger om linket, f.eks. titel, beskrivelse og et billede fra webstedet.",
+            "url_previews_section": "URL-forhåndsvisninger",
+            "user_url_previews_default_off": "Du har <a>deaktiveret</a> URL-forhåndsvisning som standard.",
+            "user_url_previews_default_on": "Du har <a>aktiveret</a> URL-forhåndsvisninger som standard."
+        },
+        "notifications": {
+            "browse_button": "Gennemse",
+            "custom_sound_prompt": "Sæt en ny brugerdefineret lyd",
+            "notification_sound": "Notifikationslyd",
+            "settings_link": "Få notifikationer som angivet i dine <a>indstillinger</a>",
+            "sounds_section": "Lyde",
+            "upload_sound_label": "Upload brugerdefineret lyd",
+            "uploaded_sound": "Uploadet lyd"
+        },
+        "people": {
+            "knock_empty": "Ingen anmodninger",
+            "knock_section": "Anmoder om tilladelse til at deltage",
+            "see_less": "Vis mindre",
+            "see_more": "Vis mere"
+        },
+        "permissions": {
+            "add_privileged_user_description": "Giv en eller flere brugere i dette rum flere privilegier",
+            "add_privileged_user_filter_placeholder": "Søg efter brugere i dette rum…",
+            "add_privileged_user_heading": "Tilføj privilegerede brugere",
+            "ban": "Spær brugere",
+            "ban_reason": "Årsag",
+            "banned_by": "Spærret af %(displayName)s",
+            "banned_users_section": "Spærrede brugere",
+            "error_changing_pl_description": "Der opstod en fejl ved ændring af brugerens effektniveau. Sørg for, at du har tilstrækkelige tilladelser, og prøv igen.",
+            "error_changing_pl_reqs_description": "Der opstod en fejl ved ændring af rummets krav til effektniveauer. Sørg for, at du har tilstrækkelige tilladelser, og prøv igen.",
+            "error_changing_pl_reqs_title": "Fejl under ændring af krav til effektniveau",
+            "error_changing_pl_title": "Fejl ved ændring af effektniveau",
+            "error_unbanning": "Var ikke i stand til at ophæve spærringen",
+            "events_default": "Send beskeder",
+            "invite": "Inviter brugere",
+            "kick": "Fjern brugere",
+            "m.call": "Start %(brand)s opkald",
+            "m.call.member": "Deltag i %(brand)s opkald",
+            "m.reaction": "Send reaktioner",
+            "m.room.avatar": "Skift rummets avatar",
+            "m.room.avatar_space": "Skift gruppens avatar",
+            "m.room.canonical_alias": "Skift hovedadresse for rummet",
+            "m.room.canonical_alias_space": "Skift hovedadresse for gruppen",
+            "m.room.encryption": "Aktivér kryptering af rummet",
+            "m.room.history_visibility": "Skift historikkens synlighed",
+            "m.room.name": "Skift rummets navn",
+            "m.room.name_space": "Skift gruppens navn",
+            "m.room.pinned_events": "Administrer fastgjorte begivenheder",
+            "m.room.power_levels": "Skift tilladelser",
+            "m.room.redaction": "Fjern beskeder sendt af mig",
+            "m.room.server_acl": "Ændre serverens ACL'er",
+            "m.room.tombstone": "Opgrader rummet",
+            "m.room.topic": "Skift emne",
+            "m.room.topic_space": "Lav ændringer i beskrivelsen",
+            "m.space.child": "Administrer rummene i denne gruppe",
+            "m.widget": "Rediger widgets",
+            "muted_users_section": "Brugere, der er slået fra",
+            "no_privileged_users": "Ingen brugere har særlige rettigheder i dette rum.",
+            "notifications.room": "Underret alle",
+            "permissions_section": "Tilladelser",
+            "permissions_section_description_room": "Vælg de roller, der kræves for at ændre forskellige dele af rummet",
+            "permissions_section_description_space": "Indstil de nødvendige roller der er påkrævet for at kunne ændre på forskellige dele af gruppen",
+            "privileged_users_section": "Privilegerede brugere",
+            "redact": "Fjern beskeder sendt af andre",
+            "send_event_type": "Sende %(eventType)s begivenheder",
+            "state_default": "Skift indstillinger",
+            "title": "Roller og tilladelser",
+            "users_default": "Standardrolle"
+        },
+        "security": {
+            "enable_encryption_confirm_description": "Når kryptering først er aktiveret for et rum, kan det ikke deaktiveres igen. Beskeder, der sendes i et krypteret rum, kan ikke ses af serveren, kun af deltagerne i rummet. Aktivering af kryptering kan forhindre mange bots og broer i at fungere korrekt. <a>Få mere at vide om kryptering.</a>",
+            "enable_encryption_confirm_title": "Aktiver kryptering?",
+            "enable_encryption_public_room_confirm_description_1": "<b>Det anbefales ikke at tilføje kryptering til offentlige rum. </b>Alle kan finde og deltage i offentlige rum, så alle kan læse beskeder i dem. Du får ingen af fordelene ved kryptering, og du kan ikke slå den fra senere. Kryptering af meddelelser i et offentligt rum vil gøre modtagelse og afsendelse af meddelelser langsommere.",
+            "enable_encryption_public_room_confirm_description_2": "For at undgå disse problemer skal du oprette  <a>et nyt krypteret rum</a> til den samtale, du planlægger at have.",
+            "enable_encryption_public_room_confirm_title": "Er du sikker på, at du vil tilføje kryptering til dette offentlige rum?",
+            "encrypted_room_public_confirm_description_1": "<b>Det anbefales ikke at gøre krypterede rum offentlige. </b>Det betyder, at alle kan finde og deltage i rummet, så alle kan læse beskederne. Du får ingen af fordelene ved kryptering. Kryptering af meddelelser i et offentligt rum vil gøre modtagelse og afsendelse af meddelelser langsommere.",
+            "encrypted_room_public_confirm_description_2": "For at undgå disse problemer skal du oprette et <a>nyt offentligt rum</a> til den samtale, du planlægger at have.",
+            "encrypted_room_public_confirm_title": "Er du sikker på, at du vil gøre dette krypterede rum offentligt?",
+            "encryption_forced": "Din server kræver at kryptering er deaktiveret.",
+            "encryption_permanent": "Efter aktivering er det ikke muligt at slå kryptering fra.",
+            "error_join_rule_change_title": "Kunne ikke opdatere reglerne for tilmelding",
+            "error_join_rule_change_unknown": "Ukendt fejl",
+            "guest_access_warning": "Personer med understøttede klienter, vil kunne tilslutte sig rummet uden at have en registreret konto.",
+            "history_visibility_invited": "Kun medlemmer (siden de blev inviteret)",
+            "history_visibility_joined": "Kun medlemmer (fra de kom ind)",
+            "history_visibility_legend": "Hvem kan læse historikken?",
+            "history_visibility_shared": "Kun medlemmer (siden det tidspunkt, hvor denne indstilling blev valgt)",
+            "history_visibility_warning": "Synligheden af ​​den eksisterende historik vil ikke blive ændret.",
+            "history_visibility_world_readable": "Enhver",
+            "join_rule_description": "Bestem hvem der kan deltage i %(roomName)s .",
+            "join_rule_invite": "Privat (kun tilgængeligt med invitation)",
+            "join_rule_invite_description": "Kun inviterede personer kan deltage i dette rum.",
+            "join_rule_knock": "Bed om at deltage",
+            "join_rule_knock_description": "Andre kan ikke tilslutte sig, medmindre der gives adgang.",
+            "join_rule_public_description": "Enhver kan finde og tilslutte sig.",
+            "join_rule_restricted": "Medlemmer af gruppen",
+            "join_rule_restricted_description": "Alle i en gruppe kan finde og deltage. <a>Rediger hvilke grupper der har adgang her.</a>",
+            "join_rule_restricted_description_active_space": "Enhver i <spaceName/> kan finde og deltage. Du kan også vælge andre grupper.",
+            "join_rule_restricted_description_prompt": "Alle i en gruppe kan finde og deltage. Du kan vælge flere grupper.",
+            "join_rule_restricted_description_spaces": "Grupper med adgang",
+            "join_rule_restricted_dialog_description": "Bestem hvilke grupper der har adgang til dette rum. Hvis en gruppe bliver valgt, vil dens medlemmer kunne finde og deltage i <RoomName/>.",
+            "join_rule_restricted_dialog_empty_warning": "Du er i færd med at fjerne alle grupper. Adgang vil falde tilbage på: \"kun for inviterede\".",
+            "join_rule_restricted_dialog_filter_placeholder": "Søg i grupper",
+            "join_rule_restricted_dialog_heading_known": "Andre grupper du kender",
+            "join_rule_restricted_dialog_heading_other": "Andre grupper eller rum, du måske ikke kender til",
+            "join_rule_restricted_dialog_heading_room": "Grupper, du kender, der indeholder dette rum",
+            "join_rule_restricted_dialog_heading_space": "Grupper, du kender, der indeholder denne gruppe",
+            "join_rule_restricted_dialog_heading_unknown": "Det er sandsynligvis nogle, som andre rumadministratorer er en del af.",
+            "join_rule_restricted_dialog_title": "Udvælg grupper",
+            "join_rule_restricted_n_more": {
+                "one": "& %(count)s mere",
+                "other": "& %(count)s mere"
+            },
+            "join_rule_restricted_summary": {
+                "one": "I øjeblikket har et rum adgang",
+                "other": "I øjeblikket har %(count)s rum adgang"
+            },
+            "join_rule_restricted_upgrade_description": "Denne opgradering vil tillade medlemmer af udvalgte grupper at tilgå dette rum uden invitation.",
+            "join_rule_restricted_upgrade_warning": "Dette rum er i nogle grupper, som du ikke er admin i. I de rum, vil det gamle rum stadig blive vist, men brugere vil blive foreslået at tilslutte sig det nye.",
+            "join_rule_upgrade_awaiting_room": "Indlæser nyt rum",
+            "join_rule_upgrade_required": "Opgradering påkrævet",
+            "join_rule_upgrade_sending_invites": {
+                "one": "Sender invitation...",
+                "other": "Sender invitationer ... (%(progress)s ud af %(count)s)"
+            },
+            "join_rule_upgrade_updating_spaces": {
+                "one": "Opdaterer gruppe...",
+                "other": "Opdaterer grupper... (%(progress)s ud af %(count)s)"
+            },
+            "join_rule_upgrade_upgrading_room": "Opgradering af rum",
+            "public_without_alias_warning": "For at kunne linke til dette rum, bedes du tilføje en adresse.",
+            "publish_room": "Gør dette rum synligt i det offentlige rum-oversigt.",
+            "publish_space": "Gør denne gruppe synlig i det offentlige register.",
+            "strict_encryption": "Send kun beskeder til verificerede brugere",
+            "title": "Sikkerhed & Privatliv"
+        },
+        "title": "Indstillinger for rum -%(roomName)s",
+        "upload_avatar_label": "Upload avatar",
+        "visibility": {
+            "alias_section": "Adresse",
+            "error_failed_save": "Kunne ikke opdatere visningen af denne gruppe",
+            "error_update_guest_access": "Det lykkedes ikke at opdatere gæsteadgangen til dette rum.",
+            "error_update_history_visibility": "Det lykkedes ikke at opdatere synligheden af historikken i denne gruppe.",
+            "guest_access_explainer": "Gæster kan tilslutte sig en gruppe uden at have en konto.",
+            "guest_access_label": "Aktivér gæsteadgang",
+            "history_visibility_anyone_space": "Forhåndsvis gruppe",
+            "history_visibility_anyone_space_description": "Tillad andre at få forhåndsvist din gruppe før de tilslutter sig.",
+            "history_visibility_anyone_space_recommendation": "Anbefalet for offentlige grupper.",
+            "title": "Synlighed"
+        },
+        "voip": {
+            "call_type_section": "Opkaldstype",
+            "enable_element_call_caption": "%(brand)ser end-to-end krypteret, men er i øjeblikket begrænset til et mindre antal brugere.",
+            "enable_element_call_label": "Aktivér %(brand)s som en ekstra opkaldsmulighed i dette rum",
+            "enable_element_call_no_permissions_tooltip": "Du har ikke tilstrækkelige rettigheder til at ændre dette."
+        }
+    },
+    "room_summary_card_back_action_label": "Informationer om rummet",
+    "scalar": {
+        "error_create": "Kunne ikke lave widget.",
+        "error_membership": "Du er ikke i denne gruppe.",
+        "error_missing_room_id": "roomId mangler.",
+        "error_missing_room_id_request": "Mangler room_id i forespørgsel",
+        "error_missing_user_id_request": "Manglende user_id i forespørgsel",
+        "error_permission": "Du har ikke tilladelse til at gøre dét i denne gruppe.",
+        "error_power_level_invalid": "Magtniveau skal være positivt heltal.",
+        "error_room_not_visible": "Gruppe %(roomId)s ikke synlig",
+        "error_room_unknown": "Denne gruppe kan ikke genkendes.",
+        "error_send_request": "Kunne ikke sende forespørgsel.",
+        "failed_read_event": "Kunne ikke læse begivenheder",
+        "failed_send_event": "Lykkedes ikke med at sende hændelse!"
+    },
+    "server_offline": {
+        "description": "Din server svarer ikke på visse af dine forespørgsler. Herunder kan du se nogle af de mest sandsynlige grunde.",
+        "description_1": "Serveren (%(serverName)s) tog for lang tid om at svare.",
+        "description_2": "Din firewall eller anti-virus blokerer for anmodningen.",
+        "description_3": "En browserudvidelse forhindrer anmodningen.",
+        "description_4": "Serveren er offline.",
+        "description_5": "Serveren har afvist din anmodning.",
+        "description_6": "Der er problemer med at forbinde til internettet i dit område.",
+        "description_7": "Der opstod en forbindelsesfejl under forsøget på at kontakte serveren.",
+        "description_8": "Serveren er ikke konfigureret til at angive, hvad problemet er (CORS).",
+        "empty_timeline": "Du er helt ajour.",
+        "recent_changes_heading": "Seneste ændringer, der endnu ikke er modtaget",
+        "title": "Serveren svarer ikke"
+    },
+    "seshat": {
+        "error_initialising": "Påbegyndelse af beskedsøgning fejlede. Tjek <a>dine indstillinger</a> for yderligere information",
+        "reset_button": "Nulstil begivenhedslager",
+        "reset_description": "Du ønsker sandsynligvis ikke at nulstille lageret for dit begivenhedsindex.",
+        "reset_explainer": "Hvis du gør, skal du være opmærksom på, at ingen af dine beskeder vil blive slettet, men at søgefunktionen kan være forringet i et kort øjeblik, imens indekset genoprettes.",
+        "reset_title": "Nulstil begivenhedsarkiv?",
+        "warning_kind_files": "Denne version af %(brand)s understøtter ikke visning af visse krypterede filer.",
+        "warning_kind_files_app": "Benyt <a>skrivebordsapplikationen</a> for at se alle krypterede filer",
+        "warning_kind_search": "Denne version af %(brand)s understøtter ikke søgning i krypterede beskeder.",
+        "warning_kind_search_app": "Benyt <a>skrivebordsapplikationen</a> til at søge i krypterede beskeder"
+    },
+    "setting": {
+        "help_about": {
+            "access_token_detail": "Dit adgangstoken giver fuld adgang til din konto. Del det ikke med nogen.",
+            "brand_version": "%(brand)s version:",
+            "clear_cache_reload": "Ryd cache og genindlæs",
+            "help_link": "For hjælp til brug af %(brand)s, klik <a>her</a>.",
+            "homeserver": "Hjemmeserveren er <code>%(homeserverUrl)s</code>",
+            "identity_server": "Identitetsserveren er <code>%(identityServerUrl)s</code>",
+            "title": "Hjælp og Informationer",
+            "versions": "Versioner"
+        }
+    },
+    "settings": {
+        "all_rooms_home": "Vis alle rum i Home",
+        "all_rooms_home_description": "Alle rum, du er i, vises i Home.",
+        "always_show_message_timestamps": "Vis altid tidsstempler for beskeder",
+        "appearance": {
+            "custom_font": "Brug en systemskrifttype",
+            "custom_font_description": "Indstil navnet på en skrifttype installeret på dit system og %(brand)s vil forsøge at bruge den.",
+            "custom_font_name": "Navn på systemskrifttype",
+            "custom_font_size": "Brug brugerdefineret størrelse",
+            "custom_theme_error_downloading": "Fejl ved download af tema",
+            "custom_theme_invalid": "Ugyldigt temaskema.",
+            "font_size": "Skriftstørrelse",
+            "image_size_default": "Standard",
+            "image_size_large": "Stor",
+            "layout_bubbles": "Beskedbobler",
+            "layout_irc": "IRC (eksperimentel)",
+            "match_system_theme": "Match systemets tema",
+            "timeline_image_size": "Billedstørrelse på tidslinjen"
+        },
+        "automatic_language_detection_syntax_highlight": "Aktiver automatisk sprogregistrering for syntaksfremhævning",
+        "autoplay_gifs": "Automatisk afspilning af GIF'er",
+        "autoplay_videos": "Automatisk afspilning af videoer",
+        "big_emoji": "Aktivér store emoji i chat",
+        "code_block_expand_default": "Udvid kodeblokke som standard",
+        "code_block_line_numbers": "Vis linjenumre i kodeblokke",
+        "disable_historical_profile": "Vis aktuelt profilbillede og navn for brugere i meddelelseshistorikken",
+        "emoji_autocomplete": "Aktiver emoji forslag under indtastning",
+        "enable_markdown": "Aktivér Markdown",
+        "enable_markdown_description": "Start beskeder med <code> /plain </code> for at sende uden markdown.",
+        "encryption": {
+            "advanced": {
+                "breadcrumb_first_description": "Dine kontodetaljer, kontakter, foretrukne valg og chats vil blive beholdt",
+                "breadcrumb_page": "Nulstil kryptering",
+                "other_people_device_title": "Andre personers enheder"
+            },
+            "delete_key_storage": {
+                "list_first": "Du vil ikke kunne se historikken for krypterede beskeder på nye enheder"
+            },
+            "recovery": {
+                "key_storage_warning": "Dit nøglelager er ikke synkroniseret. Klik på en af knapperne herunder for at løse problemet.",
+                "set_up_recovery_description": "Din nøgleopbevaring er beskyttet af en genoprettelsesnøgle. Hvis du har brug for en ny genoprettelsesnøgle efter opsætningen, kan du genskabe den ved at vælge '%(changeRecoveryKeyButton)s'."
+            }
+        },
+        "general": {
+            "account_management_section": "Administration af konto",
+            "account_section": "Konto",
+            "add_email_dialog_title": "Tilføj e-mail adresse",
+            "add_email_failed_verification": "Kunne ikke bekræfte emailaddressen: vær sikker på at klikke på linket i e-mailen",
+            "add_email_instructions": "Vi har sendt dig en mail for at bekræfte din e-mailadresse. Følg instruktionerne i den, og klik så på knappen herunder.",
+            "add_msisdn_confirm_body": "Klik på knappen herunder for at bekræfte tilføjelsen af dette telefonnummer.",
+            "add_msisdn_confirm_button": "Bekræft tilføjelse af telefonnummer",
+            "add_msisdn_confirm_sso_button": "Bekræft tilføjelsen af dette telefonnummer ved at bruge Single Sign On til at bevise din identitet.",
+            "add_msisdn_dialog_title": "Tilføj telefonnummer",
+            "add_msisdn_instructions": "Der er sendt en sms til +%(msisdn)s. Indtast den bekræftelseskode, den indeholder.",
+            "add_msisdn_misconfigured": "Tilføj/bind med MSISDN-flow er forkert konfigureret",
+            "confirm_adding_email_body": "Klik på knappen herunder for at bekræfte tilføjelsen af denne email adresse.",
+            "confirm_adding_email_title": "Bekræft tilføjelse af email",
+            "deactivate_confirm_body": "Er du sikker på, at du vil deaktivere din konto? Det kan ikke omgøres.",
+            "deactivate_confirm_body_sso": "Bekræft deaktivering af din konto ved at bruge Single Sign On for at bevise din identitet.",
+            "deactivate_confirm_content": "Bekræft, at du gerne vil deaktivere din konto. Hvis du fortsætter:",
+            "deactivate_confirm_content_1": "Vil du ikke være i stand til at genaktivere din konto",
+            "deactivate_confirm_content_2": "Vil du ikke længere kunne logge ind",
+            "deactivate_confirm_content_3": "Vil ingen være i stand til at genbruge dit brugernavn (MXID), inklusive dig: dette brugernavn forbliver utilgængeligt",
+            "deactivate_confirm_content_4": "Forlader du alle rum og samtaler, du er i",
+            "deactivate_confirm_content_5": "Vil du blive fjernet fra identitetsserveren: dine venner kan ikke længere finde dig med din e-mail eller telefonnummer",
+            "deactivate_confirm_content_6": "Dine gamle beskeder vil stadig være synlige for brugere der har modtaget dem, ligesom e-mails, du har sendt tidligere er det. Vil du skjule dine sendte beskeder fra brugere, der tilslutter sig rummet i fremtiden?",
+            "deactivate_confirm_continue": "Bekræft deaktivering af konto",
+            "deactivate_confirm_erase_label": "Skjul mine beskeder for nye deltagere",
+            "deactivate_section": "Deaktiver brugerkonto",
+            "deactivate_warning": "Deaktivering af din konto er en permanent handling - pas på!",
+            "discovery_email_empty": "Opdagelsesmuligheder vil blive vist, når du har tilføjet en e-mail.",
+            "discovery_email_verification_instructions": "Verificér via linket i din indbakke",
+            "discovery_msisdn_empty": "Opdagelsesmuligheder vises, når du har tilføjet et telefonnummer.",
+            "discovery_needs_terms": "Accepter identitetsserveren %(serverName)s)s Servicevilkår for at blive synliggjort via e-mail-adresse eller telefonnummer.",
+            "discovery_needs_terms_title": "Lad andre finde dig",
+            "display_name": "Viste navn",
+            "display_name_error": "Kunne ikke ændre det viste navn",
+            "email_address_in_use": "Denne email adresse er allerede i brug",
+            "email_address_label": "E-mail adresse",
+            "email_not_verified": "Din e-mailadresse er ikke blevet verificeret endnu",
+            "email_verification_instructions": "Klik på linket i den e-mail, du har modtaget, for at verificere dig, og klik derefter på Fortsæt igen.",
+            "emails_heading": "E-mailadresser",
+            "error_add_email": "Kan ikke tilføje e-mailadresse",
+            "error_deactivate_communication": "Der opstod et problem med at kommunikere med serveren. Prøv venligst igen.",
+            "error_deactivate_invalid_auth": "Serveren returnerede ikke gyldige godkendelsesoplysninger.",
+            "error_deactivate_no_auth": "Serveren krævede ingen godkendelse",
+            "error_email_verification": "Kunne ikke bekræfte e-mail-adresse.",
+            "error_invalid_email": "Ugyldig e-mailadresse",
+            "error_invalid_email_detail": "Dette ser ikke ud til at være en gyldig e-mailadresse",
+            "error_msisdn_verification": "Kunne ikke bekræfte telefonnummer.",
+            "error_password_change_403": "Kunne ikke ændre adgangskoden. Er din adgangskode rigtig?",
+            "error_password_change_http": "%(errorMessage)s (HTTP-status %(httpStatus)s)",
+            "error_password_change_title": "Fejl ved ændring af adgangskode",
+            "error_password_change_unknown": "Fejl ved ukendt ændring af adgangskode (%(stringifiedError)s)",
+            "error_remove_3pid": "Kontaktoplysninger kan ikke fjernes",
+            "error_revoke_email_discovery": "Kan ikke tilbagekalde deling for e-mail-adresse",
+            "error_revoke_msisdn_discovery": "Kan ikke tilbagekalde deling af telefonnummer",
+            "error_share_email_discovery": "Kan ikke dele e-mailadresse",
+            "error_share_msisdn_discovery": "Kan ikke dele telefonnummer",
+            "identity_server_no_token": "Der blev ikke fundet noget identitets-adgangstoken",
+            "identity_server_not_set": "Identitetsserver er ikke indstillet",
+            "language_section": "Sprog",
+            "msisdn_in_use": "Dette telefonnummer er allerede i brug",
+            "msisdn_label": "Telefonnummer",
+            "msisdn_verification_field_label": "Verifikationskode",
+            "msisdn_verification_instructions": "Indtast bekræftelseskoden der er sendt via sms.",
+            "msisdns_heading": "Telefonnumre",
+            "oidc_manage_button": "Administrer konto",
+            "password_change_section": "Indstil en ny adgangskode til kontoen...",
+            "password_change_success": "Din adgangskode blev ændret.",
+            "profile_subtitle_oidc": "Din konto administreres separat af en identitetsudbyder, og derfor kan nogle af dine personlige oplysninger ikke ændres her.",
+            "remove_email_prompt": "Fjern %(email)s?",
+            "remove_msisdn_prompt": "Fjern %(phone)s?",
+            "spell_check_locale_placeholder": "Vælg en lokalitet"
+        },
+        "inline_url_previews_default": "Aktivér indbyggede URL-forhåndsvisninger som standard",
+        "inline_url_previews_room": "Aktivér forhåndsvisning af URL-adresser som standard for deltagere i dette rum",
+        "inline_url_previews_room_account": "Aktivér forhåndsvisning af URL-adresser for dette rum (påvirker kun dig)",
+        "insert_trailing_colon_mentions": "Indsæt et afsluttende kolon efter brugeromtaler i starten af en meddelelse",
+        "jump_to_bottom_on_send": "Gå til bunden af tidslinjen, når du sender en besked",
+        "key_backup": {
+            "setup_secure_backup": {
+                "backup_setup_success_description": "Dine krypteringsnøgler på denne enhed bliver nu sikkerhedskopieret.",
+                "backup_setup_success_title": "Sikker backup gennemført",
+                "cancel_warning": "Hvis du annullerer nu, kan du miste krypterede beskeder og data, hvis du mister adgangen til dine logins.",
+                "confirm_security_phrase": "Bekræft din sikkerhedsfrase",
+                "description": "Beskyt dig mod at miste adgangen til krypterede meddelelser og data ved at sikkerhedskopiere krypteringsnøgler på din server.",
+                "download_or_copy": "%(downloadButton)s eller %(copyButton)s",
+                "enter_phrase_description": "Indtast en sikkerhedsfrase, som kun du kender, da den bruges til at beskytte dine data. For at være sikker bør du ikke genbruge adgangskoden til din konto.",
+                "enter_phrase_title": "Indtast en sikkerhedsfrase",
+                "enter_phrase_to_confirm": "Indtast din sikkerhedsfrase een gang til for at bekræfte den.",
+                "generate_security_key_description": "Vi genererer en gendannelsesnøgle, som du kan gemme et sikkert sted, f.eks. i en password manager eller et pengeskab.",
+                "generate_security_key_title": "Generer en gendannelsesnøgle",
+                "pass_phrase_match_failed": "Det stemmer ikke overens.",
+                "pass_phrase_match_success": "Det matcher!",
+                "phrase_strong_enough": "Fantastisk! Denne sikkerhedsfrase ser stærk nok ud.",
+                "secret_storage_query_failure": "Kan ikke forespørge om status for hemmelig lagring",
+                "security_key_safety_reminder": "Opbevar din gendannelsesnøgle et sikkert sted, f.eks. i en password manager eller et pengeskab, da den bruges til at beskytte dine krypterede data.",
+                "set_phrase_again": "Gå tilbage for at indtaste det igen.",
+                "settings_reminder": "Du kan også konfigurere sikker backup og administrere dine nøgler under Indstillinger.",
+                "title_confirm_phrase": "Bekræft sikkerhedsfrase",
+                "title_save_key": "Gem din gendannelsesnøgle",
+                "title_set_phrase": "Angiv en sikkerhedsfrase",
+                "unable_to_setup": "Kunne ikke oprette hemmelig lagring",
+                "use_different_passphrase": "Brug en anden adgangskode?",
+                "use_phrase_only_you_know": "Brug en hemmelig sætning, som kun du kender, og gem eventuelt en gendannelsesnøgle til brug som backup."
+            }
+        },
+        "key_export_import": {
+            "confirm_passphrase": "Bekræft adgangskode",
+            "enter_passphrase": "Indtast kodeord",
+            "export_description_1": "Denne proces giver dig mulighed for at eksportere nøglerne til beskeder som du har modtaget i krypterede rum, til en lokal fil. Du vil derefter kunne importere filen til en anden Matrix-klient i fremtiden, så den klient også vil kunne dekryptere disse beskeder.",
+            "export_description_2": "Den eksporterede fil giver alle, der kan læse den, mulighed for at dekryptere alle de krypterede beskeder du kan se, så du skal sørge for at opbevare den sikkert. For at hjælpe med det, bør du indtaste en unik adgangskode nedenfor, som kun vil blive brugt til at kryptere de eksporterede data. Det vil så kun være muligt at importere dataene ved hjælp af den samme adgangskode.",
+            "export_title": "Eksportér nøgler til rummet",
+            "file_to_import": "Fil, der skal importeres",
+            "import_description_1": "Denne proces giver dig mulighed for at importere krypteringsnøgler, som du tidligere har eksporteret fra en anden Matrix-klient. Du vil derefter kunne dekryptere alle de beskeder, som den anden klient kunne dekryptere.",
+            "import_description_2": "Eksportfilen vil blive beskyttet med en adgangskode. Du skal indtaste adgangskoden her for at dekryptere filen.",
+            "import_title": "Importér rum-nøgler",
+            "phrase_cannot_be_empty": "Adgangskoden må ikke være tom",
+            "phrase_must_match": "Adgangskoder skal stemme overens",
+            "phrase_strong_enough": "Fantastisk! Denne adgangskode ser stærk nok ud"
+        },
+        "keyboard": {
+            "title": "Tastatur"
+        },
+        "not_supported": "Din server har ikke implementeret denne funktion.",
+        "notifications": {
+            "default_setting_description": "Denne indstilling anvendes som standard på alle dine rum.",
+            "default_setting_section": "Jeg vil gerne have besked om (standardindstilling)",
+            "desktop_notification_message_preview": "Vis forhåndsvisning af besked i skrivebordsnotifikation",
+            "email_description": "Modtag en e-mailoversigt over missede notifikationer",
+            "email_section": "E-mail oversigt",
+            "email_select": "Vælg, hvilke e-mails du vil sende resuméer til. Administrer dine e-mails under <button> generelt</button>.",
+            "enable_audible_notifications_session": "Aktivér hørbare notifikationer for denne session",
+            "enable_desktop_notifications_session": "Aktivér skrivebordsmeddelelser for denne session",
+            "enable_email_notifications": "Aktivér e-mail underretninger for %(email)s",
+            "enable_notifications_account": "Aktivér notifikationer for denne konto",
+            "enable_notifications_account_detail": "Slå fra for at deaktivere underretninger på alle dine enheder og sessioner",
+            "enable_notifications_device": "Aktivér meddelelser på denne enhed",
+            "error_loading": "Der opstod en fejl ved indlæsning af dine notifikationsindstillinger.",
+            "error_permissions_denied": "%(brand)s har ikke tilladelse til at sende dig notifikationer - tjek venligst dine browserindstillinger",
+            "error_permissions_missing": "%(brand)s fik ikke tilladelse til at sende notifikationer - Vær sød at prøve igen",
+            "error_saving": "Fejl ved lagring af meddelelsespræferencer",
+            "error_saving_detail": "Der opstod en fejl under lagringen af dine meddelelsespræferencer.",
+            "error_title": "Kunne ikke slå Notifikationer til",
+            "error_updating": "Der opstod en fejl under opdatering af dine meddelelsespræferencer. Prøv venligst at skifte din indstilling igen.",
+            "invites": "Inviteret til et rum",
+            "keywords": "Vis et badge, <badge/> når nøgleord bruges i et rum.",
+            "keywords_prompt": "Indtast nøgleord her, eller brug dem til stavevariationer eller kaldenavne",
+            "labs_notice_prompt": "<strong>Opdatering: </strong> Vi har forenklet notifikationsindstillinger for at gøre indstillingerne lettere at finde. Nogle brugerdefinerede indstillinger, du tidligere har valgt, vises ikke her, men de er stadig aktive. Hvis du fortsætter, kan nogle af dine indstillinger ændre sig. <a>Få mere at vide </a>",
+            "mentions_keywords": "Omtaler og nøgleord",
+            "mentions_keywords_only": "Kun omtaler og nøgleord",
+            "messages_containing_keywords": "Meddelelser, der indeholder nøgleord",
+            "noisy": "Støjende",
+            "notices": "Beskeder sendt af bots",
+            "notify_at_room": "Giv besked, når nogen nævner at bruge @room",
+            "notify_keyword": "Giv besked, når nogen bruger et nøgleord",
+            "notify_mention": "Giv besked, når nogen nævner at bruge @displayname eller %(mxid)s",
+            "other_section": "Andre ting, vi tror, du måske er interesseret i:",
+            "people_mentions_keywords": "Personer, omtaler og nøgleord",
+            "play_sound_for_description": "Anvendes som standard på alle rum på alle enheder.",
+            "play_sound_for_section": "Afspil en lyd for",
+            "push_targets": "Meddelelsesmål",
+            "quick_actions_mark_all_read": "Marker alle beskeder som læst",
+            "quick_actions_reset": "Nulstil til standardindstillinger",
+            "quick_actions_section": "Hurtige handlinger",
+            "room_activity": "Ny rumaktivitet, opgraderinger og statusmeddelelser forekommer",
+            "rule_call": "Opkalds invitation",
+            "rule_contains_display_name": "Beskeder der indeholder mit viste navn",
+            "rule_contains_user_name": "Beskeder, der indeholder mit brugernavn",
+            "rule_encrypted": "Krypterede meddelelser i gruppechats",
+            "rule_encrypted_room_one_to_one": "Krypterede beskeder i en-til-en-chats",
+            "rule_invite_for_me": "Når jeg bliver inviteret til et rum",
+            "rule_message": "Beskeder i gruppechats",
+            "rule_room_one_to_one": "Beskeder i en-til-en chats",
+            "rule_roomnotif": "Beskeder, der indeholder @room",
+            "rule_suppress_notices": "Beskeder sendt af en bot",
+            "rule_tombstone": "Når rummene opgraderes",
+            "show_message_desktop_notification": "Vis besked i skrivebordsnotifikation",
+            "voip": "Lyd- og videoopkald"
+        },
+        "preferences": {
+            "Electron.enableHardwareAcceleration": "Aktivér hardwareacceleration (genstart %(appName)s for at få effekt)",
+            "always_show_menu_bar": "Vis altid vinduets menulinje",
+            "autocomplete_delay": "Forsinkelse ved autofuldførelse (ms)",
+            "code_blocks_heading": "Kodeblokke",
+            "compact_modern": "Brug et mere kompakt 'moderne' layout",
+            "composer_heading": "Teksteditor",
+            "enable_hardware_acceleration": "Aktivér hardwareacceleration",
+            "enable_tray_icon": "Vis bakkeikon og minimer vinduet til det ved lukning",
+            "keyboard_heading": "Tastaturgenveje",
+            "keyboard_view_shortcuts_button": "Klik <a>her</a> for at se alle tastaturgenveje",
+            "media_heading": "Billeder, GIF'er og videoer",
+            "presence_description": "Del din aktivitet og status med andre.",
+            "rm_lifetime": "Levetid for læsemarkør (ms)",
+            "rm_lifetime_offscreen": "Læs markørens levetid uden for skærmen (ms)",
+            "room_directory_heading": "Rumoversigt",
+            "room_list_heading": "Oversigt over rum",
+            "show_avatars_pills": "Vis avatarer i bruger-, rum- og begivenhedshenvisninger",
+            "show_polls_button": "Vis afstemningsknappen",
+            "surround_text": "Omring markeret tekst, når du skriver specialtegn",
+            "time_heading": "Visning af tid"
+        },
+        "prompt_invite": "Spørg, før du sender invitationer til potentielt ugyldige matrix-id'er",
+        "replace_plain_emoji": "Udskift automatisk almindelig tekst-emoji",
+        "security": {
+            "analytics_description": "Del anonyme data for at hjælpe os med at identificere problemer. Intet personligt. Ingen tredjeparter.",
+            "bulk_options_accept_all_invites": "Accepter alle %(invitedRooms)s invitationer",
+            "bulk_options_reject_all_invites": "Afvis alle %(invitedRooms)s invitationer",
+            "bulk_options_section": "Masseindstillinger",
+            "dialog_title": "<strong>Indstillinger: </strong> Sikkerhed og privatliv",
+            "e2ee_default_disabled_warning": "Din serveradministrator har deaktiveret automatisk end-to-end kryptering for private rum og direkte beskeder.",
+            "enable_message_search": "Aktivér beskedsøgning i krypterede rum",
+            "encryption_section": "Kryptering",
+            "ignore_users_empty": "Du har ingen ignorerede brugere.",
+            "ignore_users_section": "Ignorerede brugere",
+            "key_backup_algorithm": "Algoritme:",
+            "message_search_disable_warning": "Hvis deaktiveret, vises beskeder fra krypterede rum ikke i søgeresultaterne.",
+            "message_search_disabled": "Gem krypterede meddelelser sikkert lokalt, så de kan vises i søgeresultaterne.",
+            "message_search_enabled": {
+                "one": "Gem krypterede meddelelser sikkert lokalt, så de kan vises i søgeresultaterne, og brug %(size)s til at gemme meddelelser fra %(rooms)s rummet.",
+                "other": "Gem krypterede meddelelser sikkert lokalt, så de kan vises i søgeresultaterne, og brug %(size)s til at gemme meddelelser fra %(rooms)s rum."
+            },
+            "message_search_failed": "Initialisering af beskedsøgning mislykkedes",
+            "message_search_indexed_messages": "Indekserede meddelelser:",
+            "message_search_indexed_rooms": "Indekserede rum:",
+            "message_search_indexing": "Indekserer i øjeblikket: %(currentRoom)s",
+            "message_search_indexing_idle": "Indekserer i øjeblikket ikke meddelelser for noget rum.",
+            "message_search_intro": "%(brand)s gemmer krypterede beskeder lokalt og sikkert, så de kan vises i søgeresultaterne:",
+            "message_search_room_progress": "%(doneRooms)s ud af %(totalRooms)s",
+            "message_search_section": "Beskedsøgning",
+            "message_search_sleep_time": "Hvor hurtigt skal beskeder downloades.",
+            "message_search_space_used": "Anvendt plads:",
+            "message_search_unsupported": "%(brand)smangler nogle komponenter, der er nødvendige for sikker lokal caching af krypterede meddelelser. Hvis du gerne vil eksperimentere med denne funktion, skal du oprette et brugerdefineret %(brand)s skrivebord med <nativeLink> søgekomponenter tilføjet</nativeLink>.",
+            "message_search_unsupported_web": "%(brand)s kan ikke sikkert cache krypterede meddelelser lokalt, mens de kører i en webbrowser. Brug <desktopLink> %(brand)s skrivebord </desktopLink> til, at sørge for at krypterede meddelelser vises i søgeresultaterne.",
+            "record_session_details": "Registrer klientens navn, version og url for lettere at kunne genkende sessioner i session manager",
+            "send_analytics": "Send analysedata",
+            "strict_encryption": "Send kun beskeder til verificerede brugere"
+        },
+        "send_read_receipts": "Send kvitteringer for læsning",
+        "send_read_receipts_unsupported": "Din server understøtter ikke deaktivering af at sende æsekvitteringer.",
+        "send_typing_notifications": "Send indtastningsmeddelelser",
+        "sessions": {
+            "best_security_note": "For at opnå den bedste sikkerhed skal du bekræfte dine sessioner og logge ud fra enhver session, som du ikke genkender eller bruger længere.",
+            "browser": "Browser",
+            "confirm_sign_out": {
+                "one": "Bekræft, at du logger af denne enhed",
+                "other": "Bekræft, at du logger af disse enheder"
+            },
+            "confirm_sign_out_body": {
+                "one": "Klik på knappen herunder for at bekræfte, at du logger af denne enhed.",
+                "other": "Klik på knappen herunder for at bekræfte, at du logger af disse enheder."
+            },
+            "confirm_sign_out_continue": {
+                "one": "Log ud af enheden",
+                "other": "Log ud af enheder"
+            },
+            "confirm_sign_out_sso": {
+                "one": "Bekræft, at du logger af denne enhed ved at bruge Single Sign On for at bevise din identitet.",
+                "other": "Bekræft, at du logger af disse enheder ved at bruge Single Sign On for at bevise din identitet."
+            },
+            "current_session": "Nuværende session",
+            "desktop_session": "Skrivebordssession",
+            "details_heading": "Oplysninger om sessionen",
+            "device_unverified_description": "Verificér eller log ud af denne session for at opnå den bedste sikkerhed og pålidelighed.",
+            "device_unverified_description_current": "Verificér din aktuelle session for øget sikkerhed i samtaler.",
+            "device_verified_description": "Denne session er klar til sikre samtaler.",
+            "device_verified_description_current": "Din igangværende session er klar til sikker kommunikation",
+            "error_pusher_state": "Kunne ikke indstille push-tilstand",
+            "error_set_name": "Kunne ikke angive sessionsnavn",
+            "filter_all": "Alle",
+            "filter_inactive": "Inaktiv",
+            "filter_inactive_description": "Inaktiv i %(inactiveAgeDays)s dage eller længere",
+            "filter_label": "Filtrer enheder",
+            "filter_unverified_description": "Ikke klar til sikker kommunikation",
+            "filter_verified_description": "Klar til sikker kommunikation",
+            "hide_details": "Skjul detaljer",
+            "inactive_days": "Inaktiv i %(inactiveAgeDays)s + dage",
+            "inactive_sessions": "Inaktive sessioner",
+            "inactive_sessions_explainer_1": "Inaktive sessioner er sessioner, du ikke har brugt i noget tid. De modtager fortsat krypteringsnøgler.",
+            "inactive_sessions_explainer_2": "Fjernelse af inaktive sessioner forbedrer sikkerheden og ydeevnen og gør det lettere for dig at identificere, om en ny session er mistænkelig.",
+            "inactive_sessions_list_description": "Overvej at logge ud af gamle sessioner (%(inactiveAgeDays)s dage eller ældre) som du ikke bruger længere.",
+            "ip": "IP-adresse",
+            "last_activity": "Sidste aktivitet",
+            "mobile_session": "Mobil session",
+            "n_sessions_selected": {
+                "one": "%(count)s session valgt",
+                "other": "%(count)s sessioner valgt"
+            },
+            "no_inactive_sessions": "Der blev ikke fundet nogen inaktive sessioner.",
+            "no_sessions": "Der blev ikke fundet nogen sessioner",
+            "no_unverified_sessions": "Ingen ikke-verificerede sessioner fundet.",
+            "no_verified_sessions": "Ingen verificerede sessioner fundet.",
+            "os": "Operativsystem",
+            "other_sessions_heading": "Andre sessioner",
+            "push_heading": "Push-meddelelser",
+            "push_subheading": "Modtag push-meddelelser for denne session.",
+            "push_toggle": "Slå push-beskeder til/fra for denne session.",
+            "rename_form_caption": "Vær opmærksom på at sessionsnavne også er synlige for personer, du kommunikerer med.",
+            "rename_form_heading": "Omdøb session",
+            "rename_form_learn_more": "Omdøbning af sessioner",
+            "rename_form_learn_more_description_1": "Andre brugere i direkte beskeder og rum, som du deltager i, kan se en komplet liste over dine sessioner.",
+            "rename_form_learn_more_description_2": "Dette giver dem tillid til, at de virkelig taler til dig, men det betyder også, at de kan se det sessionsnavn, du indtaster her.",
+            "security_recommendations": "Sikkerhedsanbefalinger",
+            "security_recommendations_description": "Øg sikkerheden på din konto ved at følge disse anbefalinger.",
+            "session_id": "Sessions ID",
+            "show_details": "Vis detaljer",
+            "sign_in_with_qr": "Forbind ny enhed",
+            "sign_in_with_qr_button": "Vis QR-kode",
+            "sign_in_with_qr_description": "Brug en QR-kode til at logge ind på en anden enhed og opsætte sikker beskedkommunikation.",
+            "sign_out": "Log ud af denne session",
+            "sign_out_all_other_sessions": "Log ud af alle andre sessioner (%(otherSessionsCount)s)",
+            "sign_out_confirm_description": {
+                "one": "Er du sikker på, at du vil logge ud af %(count)s sessionen?",
+                "other": "Er du sikker på, at du vil logge ud af %(count)s sessioner?"
+            },
+            "sign_out_n_sessions": {
+                "one": "Log ud af %(count)s session",
+                "other": "Log ud af %(count)s sessioner"
+            },
+            "title": "Sessioner",
+            "unknown_session": "Ukendt sessionstype",
+            "unverified_session": "Ubekræftet session",
+            "unverified_session_explainer_1": "Denne session understøtter ikke kryptering og kan derfor ikke verificeres.",
+            "unverified_session_explainer_2": "Du vil ikke kunne deltage i krypterede rum, fra denne session.",
+            "unverified_session_explainer_3": "For at opnå den bedste sikkerhed og privatliv anbefales det at bruge Matrix-klienter, der understøtter kryptering.",
+            "unverified_sessions": "Uverificerede sessioner",
+            "unverified_sessions_explainer_1": "U-verificerede sessioner er sessioner, der er logget ind med dine legitimationsoplysninger, men som ikke er blevet krydsverificeret.",
+            "unverified_sessions_explainer_2": "Du bør især sikre dig, at du genkender disse sessioner, da de kan repræsentere en uautoriseret brug af din konto.",
+            "unverified_sessions_list_description": "Bekræft dine sessioner for at få forbedret sikker kommunikation, eller log ud af de sessioner, du ikke genkender eller ikke længere bruger.",
+            "url": "URL",
+            "verified_session": "Verificeret session",
+            "verified_sessions": "Verificerede sessioner",
+            "verified_sessions_explainer_1": "Verificerede sessioner er overalt, hvor du bruger denne konto efter at have indtastet din adgangssætning eller bekræftet din identitet med en anden bekræftet session.",
+            "verified_sessions_explainer_2": "Det betyder, at du har alle de nødvendige nøgler til at låse dine krypterede meddelelser op og bekræfte over for andre brugere, at du har tillid til denne session.",
+            "verified_sessions_list_description": "For at opnå den bedste sikkerhed bør du logge ud fra enhver session, som du ikke genkender eller bruger længere.",
+            "verify_session": "Verificér sessionen",
+            "web_session": "Websession"
+        },
+        "show_avatar_changes": "Vis ændringer af profilbillede",
+        "show_breadcrumbs": "Vis genveje til senest viste rum over rumlisten",
+        "show_chat_effects": "Vis chateffekter (animationer, når du modtager f.eks. konfetti)",
+        "show_displayname_changes": "Vis ændringer af det viste navn",
+        "show_join_leave": "Vis tilmeldings-/forladelsesbeskeder (invitationer/fjernelser/forbud påvirkes ikke)",
+        "show_nsfw_content": "Vis NSFW-indhold",
+        "show_read_receipts": "Vis læsekvitteringer sendt af andre brugere",
+        "show_redaction_placeholder": "Vis en pladsholder for fjernede beskeder",
+        "show_stickers_button": "Vis klistermærkeknappen",
+        "show_typing_notifications": "Vis indtastningsmeddelelser",
+        "sidebar": {
+            "metaspaces_favourites_description": "Saml alle dine yndlingsrum og -personer på ét sted.",
+            "metaspaces_home_all_rooms": "Vis alle rum",
+            "metaspaces_home_all_rooms_description": "Vi alle dine rum i Hjem, selv hvis de er i en gruppe",
+            "metaspaces_home_description": "Hjem er godt til at få et overblik over det hele.",
+            "metaspaces_orphans": "Rum udenfor en gruppe",
+            "metaspaces_orphans_description": "Saml alle dine grupper, der ikke er en del af et rum, på ét sted.",
+            "metaspaces_people_description": "Saml alle dine forbindelser på ét sted.",
+            "metaspaces_subsection": "Grupper at vise",
+            "metaspaces_video_rooms": "Video-rum og konferencer",
+            "metaspaces_video_rooms_description": "Saml alle private video-rum og konferencer.",
+            "metaspaces_video_rooms_description_invite_extension": "I konferencer kan du invitere andre, der ikke er på matrix.",
+            "spaces_explainer": "Grupper er en måde at samle rum og brugere på. Ud over de grupper du er i, kan du også benytte nogle nogle forhåndskonstruerede.",
+            "title": "Sidemenu"
+        },
+        "start_automatically": {
+            "disabled": "Nej",
+            "enabled": "Ja",
+            "label": "Åbn %(brand)s når du logger ind på din computer",
+            "minimised": "Minimeret"
+        },
+        "use_12_hour_format": "Vis tidsstempler i 12-timers format (f.eks. 2:30pm)",
+        "use_command_enter_send_message": "Brug Command + Enter for at sende en besked",
+        "use_command_f_search": "Brug Command + F til at søge på tidslinjen",
+        "use_control_enter_send_message": "Brug Ctrl + Enter til at sende en besked",
+        "use_control_f_search": "Brug Ctrl + F til at søge på tidslinjen",
+        "voip": {
+            "allow_p2p": "Tillad peer-to-peer til 1:1 opkald",
+            "allow_p2p_description": "Når den er aktiveret, kan den anden part muligvis se din IP-adresse",
+            "audio_input_empty": "Ingen mikrofoner registreret",
+            "audio_output": "Lydudgang",
+            "audio_output_empty": "Ingen lydudgange registreret",
+            "auto_gain_control": "Automatisk gain-kontrol",
+            "connection_section": "Forbindelse",
+            "echo_cancellation": "Fjernelse af ekko",
+            "enable_fallback_ice_server": "Tillad hjælpeserver som fallback til opkald (%(server)s)",
+            "enable_fallback_ice_server_description": "Gælder kun, hvis din hjemmeserver ikke tilbyder en. Din IP-adresse vil blive delt under et opkald.",
+            "mirror_local_feed": "Spejl lokalt videofeed",
+            "missing_permissions_prompt": "Manglende medietilladelser, klik på knappen nedenfor for at anmode om dem.",
+            "noise_suppression": "Undertrykkelse af støj",
+            "request_permissions": "Anmod om medietilladelser",
+            "title": "Stemme & Video",
+            "video_input_empty": "Ingen webkameraer fundet",
+            "video_section": "Videoindstillinger",
+            "voice_agc": "Juster mikrofonens lydstyrke automatisk",
+            "voice_processing": "Stemmebehandling",
+            "voice_section": "Stemmeindstillinger"
+        },
+        "warn_quit": "Advar før du lukker",
+        "warning": "<w>ADVARSEL:</w> <description/>"
+    },
+    "share": {
+        "permalink_message": "Link til den valgte besked",
+        "permalink_most_recent": "Link til den seneste besked",
+        "share_call_subtitle": "Link så eksterne brugere kan deltage i opkaldet uden en matrix-konto:",
+        "title_message": "Del besked",
+        "title_room": "Del rum",
+        "title_user": "Del bruger"
+    },
+    "slash_command": {
+        "addwidget": "Tilføjer en widget til rummet ved hjælp af URL",
+        "addwidget_iframe_missing_src": "iframe har ingen src-attribut",
+        "addwidget_invalid_protocol": "Oplys venligst en https:// eller http:// widget URL",
+        "addwidget_missing_url": "Angiv en widget-URL eller indlejringskode",
+        "addwidget_no_permissions": "Du kan ikke ændre widgets i dette rum.",
+        "ban": "Spærrer bruger med oplyst ID",
+        "category_actions": "Handlinger",
+        "category_admin": "Administrator",
+        "category_advanced": "Avanceret",
+        "category_effects": "Effekter",
+        "category_messages": "Beskeder",
+        "category_other": "Andre",
+        "command_error": "Kommandofejl",
+        "converttodm": "Konverterer rummet til en direkte samtale",
+        "converttoroom": "Konverterer den direkte samtale til et rum",
+        "could_not_find_room": "Kunne ikke finde rum",
+        "deop": "Fjerner OP af bruger med givet id",
+        "devtools": "Åbner dialogen med udviklerværktøjer",
+        "discardsession": "Tvinger den nuværende udgående fælles-session i et krypteret rum til at blive kasseret",
+        "error_invalid_rendering_type": "Kommandofejl: Kan ikke finde renderingstype (%(renderingType)s)",
+        "error_invalid_room": "Kommando mislykkedes: Kan ikke finde rum (%(roomId)s)",
+        "error_invalid_runfn": "Kommandofejl: Kan ikke håndtere skråstregskommando.",
+        "error_invalid_user_in_room": "Kunne ikke finde brugeren i rummet",
+        "help": "Viser en liste over kommandoer med beskrivelser",
+        "help_dialog_title": "Hjælp til kommandoer",
+        "holdcall": "Sætter opkaldet i det aktuelle rum på hold",
+        "html": "Sender besked som html, uden at tolke den som markdown",
+        "ignore": "Ignorerer en bruger og skjuler dennes beskeder fra dig",
+        "ignore_dialog_description": "Du ignorerer nu %(userId)s",
+        "ignore_dialog_title": "Ignoreret bruger",
+        "invite": "Inviterer bruger med givet id til nuværende rum",
+        "invite_3pid_needs_is_error": "Brug en identitetsserver for at invitere pr. mail. Administrer dette under Indstillinger.",
+        "invite_3pid_use_default_is_title": "Brug en identitetsserver",
+        "invite_3pid_use_default_is_title_description": "Brug en identitetsserver for at invitere pr. mail. Tryk på Fortsæt for at bruge den almindelige identitetsserver (%(defaultIdentityServerName)s) eller indtast en anden under Indstillinger.",
+        "invite_failed": "Brugeren (%(user)s) blev ikke inviteret til %(roomId)s, men der blev ikke vist nogen fejlmeddelelse fra invitationsværktøjet.",
+        "join": "Deltager i rummet med den givne adresse",
+        "jumptodate": "Gå til den givne dato i tidslinjen",
+        "jumptodate_invalid_input": "Vi var ikke i stand til at forstå den angivne dato (%(inputDate)s). Prøv at bruge formatet ÅÅÅÅ-MM-DD.",
+        "lenny": "Sætter ( ͡° ͜ʖ ͡°) foran en ren tekstbesked",
+        "me": "Viser handling",
+        "msg": "Sender en besked til den givne bruger",
+        "myavatar": "Ændrer dit profilbillede i alle rum",
+        "myroomavatar": "Ændrer kun dit profilbillede i det aktuelle rum",
+        "myroomnick": "Ændrer kun dit viste navn for det nuværende rum",
+        "nick": "Ændrer dit viste navn",
+        "no_active_call": "Der er ingen aktive opkald i dette rum.",
+        "op": "Indstil rettighedsniveau for en bruger",
+        "part_unknown_alias": "Ukendt rumadresse: %(roomAlias)s",
+        "plain": "Sender en besked som ren tekst, uden at fortolke den som markdown",
+        "query": "Åbner chat med den angivne bruger",
+        "query_not_found_phone_number": "Kan ikke finde Matrix-ID for telefonnummer",
+        "rageshake": "Send en fejlrapport med logfiler",
+        "rainbow": "Sender beskeden med regnbuefarver",
+        "rainbowme": "Sender emoji'en med regnbuefarver",
+        "remove": "Fjerner bruger med angivet id fra dette rum",
+        "roomavatar": "Ændrer avataren i det nuværende rum",
+        "roomname": "Sætter rumnavnet",
+        "server_error": "Serverfejl",
+        "server_error_detail": "Serveren er ikke tilgængelig, den kan være overbelastet, eller noget andet kan være galt.",
+        "shrug": "Tilføjer ¯\\_(ツ)_/¯ i starten af beskeder i ren tekst",
+        "spoiler": "Sender den givne besked som en spoiler",
+        "tableflip": "Antag (╯°□°）╯︵ ┻━┻ til en ren tekstbesked",
+        "topic": "Henter eller sætter rummets emne",
+        "topic_none": "Dette rum har intet emne.",
+        "topic_room_error": "Kunne ikke hente rummets emne: Kan ikke finde rummet (%(roomId)s",
+        "unban": "Fjerner spærring fra brugeren med det oplyste ID",
+        "unflip": "Tilføjer ┬──┬ ノ( ゜-゜ノ) til en ren tekstbesked",
+        "unholdcall": "Tager opkaldet i det aktuelle rum ud af venteposition",
+        "unignore": "Stopper med at ignorere en bruger og viser deres beskeder igen fra nu af",
+        "unignore_dialog_description": "Du ignorerer ikke længere %(userId)s",
+        "unignore_dialog_title": "Holdt op med at ignorere bruger",
+        "unknown_command": "Ukendt kommando",
+        "unknown_command_button": "Send som besked",
+        "unknown_command_detail": "Ukendt kommando: %(commandText)s",
+        "unknown_command_help": "Du kan bruge <code>/hjælp</code> for at liste tilgængelige kommandoer. Ville du sende dette som en besked?",
+        "unknown_command_hint": "Tip: Begynd din besked med <code>//</code> for at starte den med en skråstreg.",
+        "upgraderoom": "Opgraderer et rum til en ny version",
+        "upgraderoom_permission_error": "Du har ikke de nødvendige rettigheder for at udføre denne kommando.",
+        "usage": "Brug",
+        "verify": "Bekræft manuelt en af dine egne enheder",
+        "view": "Viser rummet med den angivne adresse",
+        "whois": "Viser information om en bruger"
+    },
+    "space": {
+        "add_existing_room_space": {
+            "create": "Vil du hellere tilføje et nyt rum?",
+            "create_prompt": "Opret et nyt rum",
+            "dm_heading": "Direkte beskeder",
+            "error_heading": "Ikke alle valgte blev tilføjet",
+            "progress_text": {
+                "one": "Tilføjer rum...",
+                "other": "Tilføjer rum... (%(progress)s ud af %(count)s)"
+            },
+            "space_dropdown_label": "Valg af gruppe",
+            "space_dropdown_title": "Tilføj eksisterende rum",
+            "subspace_moved_note": "Tilføjelse af grupper er flyttet"
+        },
+        "add_existing_subspace": {
+            "create_button": "Opret en ny gruppe",
+            "create_prompt": "Vil du tilføje en ny gruppe i stedet?",
+            "filter_placeholder": "Søg efter grupper",
+            "space_dropdown_title": "Tilføj eksisterende gruppe"
+        },
+        "context_menu": {
+            "devtools_open_timeline": "Se rummets tidslinje (devtools)",
+            "explore": "Udforsk rum",
+            "home": "Hjem for gruppen",
+            "manage_and_explore": "Bestyr og udforsk rum",
+            "options": "Valgmuligheder for gruppe"
+        },
+        "failed_load_rooms": "Kunne ikke indlæse listen over rum.",
+        "failed_remove_rooms": "Kunne ikke fjerne nogle rum. Prøv igen senere.",
+        "incompatible_server_hierarchy": "Din server understøtter ikke visning af gruppehierarkier.",
+        "invite": "Invitér brugere",
+        "invite_description": "Invitér med email eller brugernavn",
+        "invite_link": "Del invitationslink",
+        "joining_space": "Tilslutter",
+        "landing_welcome": "Velkommen til <name/>",
+        "leave_dialog_action": "Forlad gruppe",
+        "leave_dialog_description": "Du er i færd med at forlade <spaceName/>.",
+        "leave_dialog_only_admin_room_warning": "Du er den eneste admin i nogle af de rum eller grupper som du ønsker at forlade. Hvis du forlader dem, står de uden nogen administratorer.",
+        "leave_dialog_only_admin_warning": "Du er den eneste administrator af denne gruppe. Hvis du forlader den, medfører det, at ingen længere har kontrol over den.",
+        "leave_dialog_option_all": "Forlad alle rum",
+        "leave_dialog_option_intro": "Ønsker du at forlade rummene i denne gruppe?",
+        "leave_dialog_option_none": "Forlad ikke nogen rum",
+        "leave_dialog_option_specific": "Forlad visse rum",
+        "leave_dialog_public_rejoin_warning": "Du kan ikke tilslutte dig igen, medmindre du modtager en ny invitation.",
+        "leave_dialog_title": "Forlad %(spaceName)s",
+        "mark_suggested": "Markér som foreslået",
+        "no_search_result_hint": "Du kan prøve med en anden søgning eller tjekke denne for stavefejl.",
+        "preferences": {
+            "sections_section": "Sektioner, der skal vises",
+            "show_people_in_space": "Dette samler dine chats med medlemmer af denne gruppe. Hvis du slår denne funktion fra, bliver disse chats skjult fra din visning af %(spaceName)s."
+        },
+        "room_filter_placeholder": "Søg efter rum",
+        "search_children": "Søg i %(spaceName)s",
+        "search_placeholder": "Søg efter navne og beskrivelser",
+        "select_room_below": "Vælg først et rum nedenfor",
+        "share_public": "Del din offentlige gruppe",
+        "suggested": "Forslag",
+        "suggested_tooltip": "Dette rum anbefales som et godt et at deltage i",
+        "title_when_query_available": "Resultater",
+        "title_when_query_unavailable": "Rum og grupper",
+        "unmark_suggested": "Markér som ikke foreslået",
+        "user_lacks_permission": "Du har ikke tilladelse"
+    },
+    "space_settings": {
+        "title": "Indstillinger - %(spaceName)s"
+    },
+    "spaces": {
+        "error_no_permission_add_room": "Du har ikke tilladelse til at tilføje rum til denne gruppe",
+        "error_no_permission_add_space": "Du har ikke tilladelse til at tilføje andre grupper til denne gruppe.",
+        "error_no_permission_create_room": "Du har ikke tilladelse til at oprette nye rum i denne gruppe",
+        "error_no_permission_invite": "Du har ikke tilladelse til at invitere brugere til denne gruppe"
+    },
+    "spotlight": {
+        "public_rooms": {
+            "network_dropdown_add_dialog_description": "Indtast navnet på en ny server, du ønsker at udforske.",
+            "network_dropdown_add_dialog_placeholder": "Servernavn",
+            "network_dropdown_add_dialog_title": "Tilføj en ny server",
+            "network_dropdown_add_server_option": "Tilføj ny server...",
+            "network_dropdown_available_invalid": "Kunne ikke finde denne server eller dens rumliste",
+            "network_dropdown_available_invalid_forbidden": "Du har ikke tilladelse til at se denne servers rumliste.",
+            "network_dropdown_available_valid": "Det ser fint ud",
+            "network_dropdown_remove_server_adornment": "Fjern serveren \"%(roomServer)s\"",
+            "network_dropdown_required_invalid": "Indtast et servernavn",
+            "network_dropdown_selected_label": "Vis: Matrix-rum",
+            "network_dropdown_selected_label_instance": "Vis: %(instance)s rum (%(server)s)",
+            "network_dropdown_your_server_description": "Din server"
+        }
+    },
+    "spotlight_dialog": {
+        "cant_find_person_helpful_hint": "Hvis du ikke kan se den du leder efter, så send dem et invitationslink.",
+        "cant_find_room_helpful_hint": "Hvis du ikke kan finde det rum, du leder efter, kan du bede om en invitation eller oprette et nyt rum.",
+        "copy_link_text": "Kopiér invitationslinket",
+        "count_of_members": {
+            "one": "%(count)s Medlem",
+            "other": "%(count)s Medlemmer"
+        },
+        "create_new_room_button": "Opret nyt rum",
+        "failed_querying_public_rooms": "Kunne ikke forespørge på offentlige rum",
+        "failed_querying_public_spaces": "Kunne ikke forespørge på offentlige grupper",
+        "group_chat_section_title": "Andre indstillinger",
+        "heading_with_query": "Brug \"%(query)s\" til at søge",
+        "heading_without_query": "Søg efter",
+        "join_button_text": "Deltag i %(roomAddress)s",
+        "keyboard_scroll_hint": "Brug <arrows/> til at rulle",
+        "other_rooms_in_space": "Andre rum i %(spaceName)s",
+        "public_rooms_label": "Offentlige rum",
+        "public_spaces_label": "Offentlige grupper",
+        "recent_searches_section_title": "Seneste søgninger",
+        "recently_viewed_section_title": "Senest besøgt",
+        "remove_filter": "Fjern søgefilter for %(filter)s",
+        "result_may_be_hidden_privacy_warning": "Nogle resultater kan være skjult af hensyn til privatlivets fred",
+        "result_may_be_hidden_warning": "Nogle resultater kan være skjult",
+        "search_dialog": "Dialogboks til søgning",
+        "spaces_title": "Grupper, du er med i",
+        "start_group_chat_button": "Start en fælles samtale"
+    },
+    "stickers": {
+        "empty": "Du har i øjeblikket ingen klistermærkepakker aktiveret.",
+        "empty_add_prompt": "Tilføj nogle nu"
+    },
+    "terms": {
+        "column_document": "Dokument",
+        "column_service": "Tjeneste",
+        "column_summary": "Resumé",
+        "identity_server_no_terms_description_1": "Denne handling kræver adgang til default identitets serveren <server /> for at validere en email adresse eller et telefonnummer, men serveren har ingen terms of service.",
+        "identity_server_no_terms_description_2": "Fortsæt kun hvis du stoler på ejeren af denne server.",
+        "identity_server_no_terms_title": "Identity serveren har ingen terms of service",
+        "inline_intro_text": "Acceptér <policyLink /> for at fortsætte:",
+        "integration_manager": "Brug bots, broer, widgets og klistermærkepakker",
+        "intro": "For at fortsætte skal du acceptere vilkårene for denne tjeneste.",
+        "summary_identity_server_1": "Find andre via telefon eller e-mail",
+        "summary_identity_server_2": "Bliv fundet via telefon eller e-mail",
+        "tac_button": "Gennemgå vilkår og betingelser",
+        "tac_description": "For at fortsætte med at bruge %(homeserverDomain)s hjemmeserveren skal du gennemgå og acceptere vores vilkår og betingelser.",
+        "tac_title": "Vilkår og betingelser",
+        "tos": "Vilkår for brug"
+    },
+    "theme": {
+        "light_high_contrast": "Lys høj kontrast",
+        "match_system": "Match system"
+    },
+    "thread_view_back_action_label": "Tilbage til tråden",
+    "threads": {
+        "all_threads": "Alle tråde",
+        "all_threads_description": "Viser alle tråde fra det aktuelle rum",
+        "count_of_reply": {
+            "one": "%(count)s svar",
+            "other": "%(count)s svar"
+        },
+        "error_start_thread_existing_relation": "Kan ikke oprette en tråd fra en begivenhed med en eksisterende relation",
+        "my_threads": "Mine tråde",
+        "my_threads_description": "Viser alle de tråde, du har deltaget i",
+        "open_thread": "Åbn tråd",
+        "show_thread_filter": "Vis:"
+    },
+    "time": {
+        "about_day_ago": "omkring en dag siden",
+        "about_hour_ago": "for omkring en time siden",
+        "about_minute_ago": "for omkring et minut siden",
+        "date_at_time": "%(date)s om %(time)s",
+        "few_seconds_ago": "for et par sekunder siden",
+        "hours_minutes_seconds_left": "%(hours)st %(minutes)sm %(seconds)ss tilbage",
+        "in_about_day": "om cirka en dag fra nu",
+        "in_about_hour": "omkring en time fra nu",
+        "in_about_minute": "omkring et minut fra nu",
+        "in_few_seconds": "et par sekunder fra nu",
+        "in_n_days": "%(num)s dage fra nu",
+        "in_n_hours": "%(num)s timer fra nu",
+        "in_n_minutes": "%(num)s minutter fra nu",
+        "left": "%(timeRemaining)s tilbage",
+        "minutes_seconds_left": "%(minutes)sm %(seconds)ss tilbage",
+        "n_days_ago": "%(num)s dage siden",
+        "n_hours_ago": "%(num)s timer siden",
+        "n_minutes_ago": "%(num)s minutter siden",
+        "seconds_left": "%(seconds)ss tilbage",
+        "short_days": "%(value)sd",
+        "short_days_hours_minutes_seconds": "%(days)sd %(hours)st %(minutes)sm %(seconds)ss",
+        "short_hours": "%(value)st",
+        "short_hours_minutes_seconds": "%(hours)st %(minutes)sm %(seconds)ss",
+        "short_minutes": "%(value)sm",
+        "short_minutes_seconds": "%(minutes)sm %(seconds)ss",
+        "short_seconds": "%(value)ss"
+    },
+    "timeline": {
+        "context_menu": {
+            "collapse_reply_thread": "Skjul svar-tråd",
+            "external_url": "Kilde URL",
+            "open_in_osm": "Åbn i OpenStreetMap",
+            "report": "Anmeld",
+            "resent_unsent_reactions": "Send %(unsentCount)s reaktion(er) igen",
+            "show_url_preview": "Vis forhåndsvisning",
+            "view_related_event": "Se relateret begivenhed",
+            "view_source": "Se kilde"
+        },
+        "creation_summary_dm": "%(creator)s oprettede denne samtale.",
+        "creation_summary_room": "%(creator)s oprettede og konfigurerede rummet.",
+        "decryption_failure": {
+            "historical_event_user_not_joined": "Du har ikke adgang til denne besked"
+        },
+        "disambiguated_profile": "%(displayName)s (%(matrixId)s)",
+        "download_action_decrypting": "Dekrypterer",
+        "download_action_downloading": "Downloader",
+        "e2e_state": "Tilstand på end-to-end krypteringen",
+        "edits": {
+            "tooltip_label": "Redigeret %(date)s. Klik for at se redigeringer.",
+            "tooltip_sub": "Klik for at se redigeringer",
+            "tooltip_title": "Redigeret %(date)s"
+        },
+        "error_no_renderer": "Denne begivenhed kunne ikke vises",
+        "error_rendering_message": "Kan ikke indlæse denne besked",
+        "historical_messages_unavailable": "Du kan ikke se tidligere beskeder",
+        "in_room_name": " i <strong>%(room)s</strong>",
+        "io.element.widgets.layout": "%(senderName)s har opdateret rummets layout",
+        "load_error": {
+            "no_permission": "Forsøgte at indlæse et bestemt punkt på dette rums tidslinje, men du har ikke tilladelse til at se den pågældende besked.",
+            "title": "Kunne ikke indlæse tidslinjeposition",
+            "unable_to_find": "Jeg prøvede at indlæse et specifikt punkt på dette rums tidslinje, men kunne ikke finde det."
+        },
+        "m.audio": {
+            "error_downloading_audio": "Fejl ved download af lyd",
+            "error_processing_audio": "Fejl ved behandling af lydbesked",
+            "error_processing_voice_message": "Fejl ved behandling af talebesked",
+            "unnamed_audio": "Unavngiven lyd"
+        },
+        "m.beacon_info": {
+            "view_live_location": "Se live lokation"
+        },
+        "m.call": {
+            "video_call_ended": "Videoopkald afsluttet",
+            "video_call_started": "Videoopkald startede i %(roomName)s.",
+            "video_call_started_text": "%(name)s startede et videoopkald",
+            "video_call_started_unsupported": "Videoopkald startede i %(roomName)s. (understøttes ikke af denne browser)"
+        },
+        "m.call.hangup": {
+            "dm": "Opkaldet er afsluttet"
+        },
+        "m.call.invite": {
+            "answered_elsewhere": "Besvaret andetsteds",
+            "call_back_prompt": "Ring tilbage",
+            "declined": "Opkald afvist",
+            "failed_connect_media": "Kunne ikke oprette forbindelse til medie",
+            "failed_connection": "Forbindelse mislykkedes",
+            "failed_opponent_media": "Deres enhed kunne ikke starte kameraet eller mikrofonen",
+            "missed_call": "Ubesvaret opkald",
+            "no_answer": "Intet svar",
+            "unknown_error": "Der opstod en ukendt fejl",
+            "unknown_failure": "Ukendt fejl: %(reason)s",
+            "unknown_state": "Opkaldet er i en ukendt tilstand!",
+            "video_call": "%(senderName)s foretog et videoopkald.",
+            "video_call_unsupported": "%(senderName)s foretog et videoopkald. (ikke understøttet af denne browser)",
+            "voice_call": "%(senderName)s foretog et stemmeopkald.",
+            "voice_call_unsupported": "%(senderName)s foretog et stemmeopkald. (ikke understøttet af denne browser)"
+        },
+        "m.file": {
+            "error_decrypting": "Fejl ved dekryptering af vedhæftet fil",
+            "error_invalid": "Ugyldig fil"
+        },
+        "m.image": {
+            "error": "Billedet kunne ikke vises på grund af en fejl",
+            "error_decrypting": "Fejl ved dekryptering af billede",
+            "error_downloading": "Fejl ved download af billede",
+            "sent": "%(senderDisplayName)s sendte et billed.",
+            "show_image": "Vis billede"
+        },
+        "m.key.verification.request": {
+            "user_wants_to_verify": "%(name)s ønsker at verificere",
+            "you_started": "Du har sendt en bekræftelsesanmodning"
+        },
+        "m.location": {
+            "full": "%(senderName)s har delt sin placering",
+            "location": "Delte en placering: ",
+            "self_location": "Delte sin placering: "
+        },
+        "m.poll": {
+            "count_of_votes": {
+                "one": "%(count)s stemme",
+                "other": "%(count)s stemmer"
+            }
+        },
+        "m.poll.end": {
+            "sender_ended": "%(senderName)s har afsluttet en afstemning"
+        },
+        "m.poll.start": "%(senderName)s har startet en afstemning - %(pollQuestion)s",
+        "m.room.avatar": {
+            "changed": "%(senderDisplayName)s ændrede rummets avatar.",
+            "changed_img": "%(senderDisplayName)s ændrede rumavataren til <img/>",
+            "lightbox_title": "%(senderDisplayName)s ændrede avataren for %(roomName)s",
+            "removed": "%(senderDisplayName)s fjernede rummets avatar."
+        },
+        "m.room.canonical_alias": {
+            "alt_added": {
+                "one": "%(senderName)s tilføjede alternative adresser %(addresses)s til denne gruppe.",
+                "other": "%(senderName)s tilføjede de alternative adresser %(addresses)s til denne gruppe."
+            },
+            "alt_removed": {
+                "one": "%(senderName)s fjernede alternative adresser %(addresses)s til denne gruppe.",
+                "other": "%(senderName)s fjernede de alternative adresser %(addresses)s til denne gruppe."
+            },
+            "changed": "%(senderName)s ændrede adresserne til dette rum.",
+            "changed_alternative": "%(senderName)s ændrede de alternative adresser til dette rum.",
+            "changed_main_and_alternative": "%(senderName)s ændrede hoved- og alternative adresser til dette rum.",
+            "removed": "%(senderName)s fjernede hovedadressen for dette rum.",
+            "set": "%(senderName)s satte hovedadressen af dette rum til %(address)s."
+        },
+        "m.room.create": {
+            "continuation": "Dette rum er en fortsættelse af en anden samtale.",
+            "see_older_messages": "Klik her for at se ældre beskeder.",
+            "unknown_predecessor": "Kan ikke finde den gamle version af dette rum (rum-ID: %(roomId)s), og vi har ikke fået 'via_servers' til at kunne søge efter det med.",
+            "unknown_predecessor_guess_server": "Kan ikke finde den gamle version af dette rum (rum-ID: %(roomId)s), og vi har ikke fået adgang til 'via_servers' for at kunne søge efter det. Det er muligt, at det vil fungere at gætte serveren ud fra rum-ID'et. Hvis du vil prøve, skal du klikke på dette link:"
+        },
+        "m.room.encryption": {
+            "disable_attempt": "Ignoreret forsøg på at deaktivere kryptering",
+            "disabled": "Kryptering er ikke aktiveret",
+            "enabled": "Beskeder i dette rum er end-to-end krypteret. Når folk tilmelder sig, kan du verificere dem via deres profil ved at trykke på deres profilbillede.",
+            "enabled_dm": "Beskeder her er end-to-end krypteret. Verificér %(displayName)s via deres profil – tryk på deres profilbillede.",
+            "enabled_local": "Beskeder i denne samtale vil blive krypteret fra ende til ende.",
+            "parameters_changed": "Nogle krypteringsparametre er blevet ændret.",
+            "unsupported": "Krypteringen, der bruges af dette rum, understøttes ikke."
+        },
+        "m.room.guest_access": {
+            "can_join": "%(senderDisplayName)s har givet gæster adgang til rummet.",
+            "forbidden": "%(senderDisplayName)s har forhindret gæster i at tilgå rummet.",
+            "unknown": "%(senderDisplayName)s ændrede gæsteadgang til %(rule)s"
+        },
+        "m.room.history_visibility": {
+            "invited": "%(senderName)s gjorde fremtidig historik synligt for nye medlemmer, fra det tidspunkt de blev inviteret til rummet.",
+            "joined": "%(senderName)s gjorde fremtidig rumhistorik synligt for alle rummedlemmer, fra det tidspunkt de blev medlem.",
+            "shared": "%(senderName)s gjorde fremtidig rumhistorik synligt for alle rummedlemmer.",
+            "unknown": "%(senderName)s gjorde fremtidig rumhistorik synligt for ukendt (%(visibility)s).",
+            "world_readable": "%(senderName)s gjorde fremtidig rumhistorik synligt for alle."
+        },
+        "m.room.join_rules": {
+            "invite": "%(senderDisplayName)s begrænsede adgang til rummet til kun inviterede.",
+            "knock": "%(senderDisplayName)s ændrede join-reglen til at spørge om at være med.",
+            "public": "%(senderDisplayName)s gjorde rummet offentligt for alle som kender linket.",
+            "restricted": "%(senderDisplayName)s ændrede, hvem der kan deltage i dette rum.",
+            "restricted_settings": "%(senderDisplayName)s ændrede, hvem der kan deltage i dette rum. <a>Se indstillinger</a>.",
+            "unknown": "%(senderDisplayName)s ændrede adgangsreglen til %(rule)s"
+        },
+        "m.room.member": {
+            "accepted_3pid_invite": "%(targetName)s accepterede invitationen til %(displayName)s",
+            "accepted_invite": "%(targetName)s accepterede en invitation",
+            "ban": "%(senderName)s spærrede %(targetName)s",
+            "ban_reason": "%(senderName)s spærrede %(targetName)s: %(reason)s",
+            "change_avatar": "%(senderName)s har ændret sit profilbillede",
+            "change_name": "%(oldDisplayName)s ændrede deres viste navn til %(displayName)s",
+            "change_name_avatar": "%(oldDisplayName)s ændrede deres viste navn og profilbillede",
+            "invite": "%(senderName)s inviterede %(targetName)s",
+            "join": "%(targetName)s tilsluttede sig rummet",
+            "kick": "%(senderName)s fjernede %(targetName)s",
+            "kick_reason": "%(senderName)s fjernede %(targetName)s :%(reason)s",
+            "left": "%(targetName)s forlod rummet",
+            "left_reason": "%(targetName)s forlod rummet: %(reason)s",
+            "no_change": "%(senderName)s lavede ingen ændring",
+            "reject_invite": "%(targetName)s afviste invitationen",
+            "remove_avatar": "%(senderName)s fjernede deres profilbillede",
+            "remove_name": "%(senderName)s fjernede deres viste navn (%(oldDisplayName)s )",
+            "set_avatar": "%(senderName)s har valgt et profilbillede",
+            "set_name": "%(senderName)s indstillede deres viste navn til %(displayName)s",
+            "unban": "%(senderName)s ophævede spærring af %(targetName)s",
+            "withdrew_invite": "%(senderName)s trak %(targetName)ss invitation tilbage",
+            "withdrew_invite_reason": "%(senderName)s trak %(targetName)s's invitation tilbage: %(reason)s"
+        },
+        "m.room.name": {
+            "change": "%(senderDisplayName)s ændrede rumnavnet fra %(oldRoomName)s til %(newRoomName)s.",
+            "remove": "%(senderDisplayName)s fjernede rumnavnet.",
+            "set": "%(senderDisplayName)s ændrede rumnavnet til %(roomName)s."
+        },
+        "m.room.pinned_events": {
+            "changed": "%(senderName)s ændrede de fastgjorte beskeder for rummet.",
+            "changed_link": "%(senderName)s ændrede <a>fastgjorte meddelelser</a> for rummet.",
+            "pinned": "%(senderName)s har fastgjort en besked til dette rum. Se alle fastgjorte beskeder.",
+            "pinned_link": "%(senderName)sf astgjorde <a>en besked</a> til dette rum. Se alle <b>fastgjorte beskeder</b> .",
+            "unpinned": "%(senderName)s frigjorde en besked fra dette rum. Se alle fastgjorte beskeder.",
+            "unpinned_link": "%(senderName)s frigjorde <a>en besked</a> fra dette rum. Se alle <b>fastgjorte beskeder</b> ."
+        },
+        "m.room.power_levels": {
+            "changed": "%(senderName)s ændrede rettighedsniveau af %(powerLevelDiffText)s.",
+            "user_from_to": "%(userId)s fra %(fromPowerLevel)s til %(toPowerLevel)s"
+        },
+        "m.room.server_acl": {
+            "all_servers_banned": "🎉 Alle servere er udelukket fra at deltage! Dette rum kan ikke længere bruges.",
+            "changed": "%(senderDisplayName)s ændrede server-ACL'erne for dette rum.",
+            "set": "%(senderDisplayName)s indstillede serverens ACL'er for dette rum."
+        },
+        "m.room.third_party_invite": {
+            "revoked": "%(senderName)s tilbagetrak invitationen til %(targetDisplayName)s om at deltage i rummet.",
+            "sent": "%(senderName)s inviterede %(targetDisplayName)s til rummet."
+        },
+        "m.room.tombstone": "%(senderDisplayName)s opgraderede dette rum.",
+        "m.sticker": "%(senderDisplayName)s sendte et klistermærke.",
+        "m.video": {
+            "error_decrypting": "Fejl ved dekryptering af video"
+        },
+        "m.widget": {
+            "added": "%(widgetName)s widget tilføjet af %(senderName)s",
+            "jitsi_ended": "Videokonferencen sluttede kl. %(senderName)s",
+            "jitsi_join_right_prompt": "Deltag i konferencen fra rummets informationsmenu til højre",
+            "jitsi_join_top_prompt": "Deltag i konferencen øverst i dette rum",
+            "jitsi_started": "Videokonference startet af %(senderName)s",
+            "jitsi_updated": "Videokonference opdateret af %(senderName)s",
+            "modified": "%(widgetName)s ændret af %(senderName)s",
+            "removed": "%(widgetName)s fjernet af %(senderName)s"
+        },
+        "mab": {
+            "collapse_reply_chain": "Skjul citater",
+            "copy_link_thread": "Kopiér link til tråd",
+            "expand_reply_chain": "Udvid citater",
+            "label": "Beskedhandlinger",
+            "view_in_room": "Vis i rum"
+        },
+        "mjolnir": {
+            "changed_rule_glob": "%(senderName)s opdaterede en udelukkelsesregel, der matchede %(oldGlob)s at matche %(newGlob)s af %(reason)s",
+            "changed_rule_rooms": "%(senderName)s ændrede en regel, som forbød rum, der matchede %(oldGlob)s, til at matche %(newGlob)s af %(reason)s",
+            "changed_rule_servers": "%(senderName)s ændrede en regel, som forbød servere, der matchede %(oldGlob)s, til at matche %(newGlob)s af %(reason)s",
+            "changed_rule_users": "%(senderName)s ændrede en regel, som forbød brugere, der matchede %(oldGlob)s at matche %(newGlob)s af %(reason)s",
+            "created_rule": "%(senderName)s oprettede en udelukkelsesregel der matcher %(glob)s af %(reason)s",
+            "created_rule_rooms": "%(senderName)s oprettede en regel, som spærrer for rum, der matcher %(glob)s af %(reason)s",
+            "created_rule_servers": "%(senderName)s oprettede en regel, som spærrer servere, der matcher %(glob)s af %(reason)s",
+            "created_rule_users": "%(senderName)s oprettede en regel, som spærrer for brugere, der matcher %(glob)s af %(reason)s",
+            "message_hidden": "Du har ignoreret denne bruger, så deres besked er skjult. <a>Vis alligevel.</a>",
+            "removed_rule": "%(senderName)s fjernede en spærringsregel der matcher %(glob)s",
+            "removed_rule_rooms": "%(senderName)s fjernede den regel der spærrede brugere der matcher %(glob)s",
+            "removed_rule_servers": "%(senderName)s fjernede den regel der spærrede servere som matcher %(glob)s",
+            "removed_rule_users": "%(senderName)s fjernede den regel der spærrede brugere der matcher %(glob)s",
+            "updated_invalid_rule": "%(senderName)s opdaterede en ugyldig spærringsregel",
+            "updated_rule": "%(senderName)s opdaterede en spærringsregel der matcher %(glob)s på grund af %(reason)s",
+            "updated_rule_rooms": "%(senderName)s opdaterede den regel der banner rum som matcher %(glob)s på grund af %(reason)s",
+            "updated_rule_servers": "%(senderName)s opdaterede den regel der banner servere der matcher %(glob)s på grund af %(reason)s",
+            "updated_rule_users": "%(senderName)s opdaterede den regel der banner brugere som matcher %(glob)s på grund af %(reason)s"
+        },
+        "no_permission_messages_before_invite": "Du har ikke tilladelse til at se beskeder fra før du blev inviteret.",
+        "no_permission_messages_before_join": "Du har ikke tilladelse til at se beskeder fra før du deltog.",
+        "pending_moderation": "Besked afventer moderering",
+        "pending_moderation_reason": "Besked afventer moderering: %(reason)s",
+        "reactions": {
+            "add_reaction_prompt": "Tilføj en reaktion",
+            "custom_reaction_fallback_label": "Brugerdefineret reaktion",
+            "label": "%(reactors)s reagerede med %(content)s"
+        },
+        "read_receipt_title": {
+            "one": "Set af %(count)s person",
+            "other": "Set af %(count)s personer"
+        },
+        "read_receipts_label": "Kvitteringer​•​for​•​læsning",
+        "redacted": {
+            "tooltip": "Besked slettet d. %(date)s"
+        },
+        "redaction": "Besked slettet af %(name)s",
+        "reply": {
+            "error_loading": "Kunne ikke indlæse den begivenhed, der blev besvaret. Enten findes den ikke, eller du har ikke tilladelse til at se den.",
+            "in_reply_to": "<a>Som svar til</a> <pill>",
+            "in_reply_to_for_export": "Som svar på <a>denne besked</a>"
+        },
+        "scalar_starter_link": {
+            "dialog_description": "Du bliver nu omdirigeret til et tredjepartswebsted, hvor du kan godkende din konto til brug med %(integrationsUrl)s. Ønsker du at fortsætte?",
+            "dialog_title": "Tilføj en integration"
+        },
+        "self_redaction": "Besked slettet",
+        "send_state_encrypting": "Krypterer din besked…",
+        "send_state_failed": "Afsendelse mislykkedes",
+        "send_state_sending": "Sender din besked…",
+        "send_state_sent": "Din besked blev sendt",
+        "summary": {
+            "banned": {
+                "one": "blev spærret",
+                "other": "blev spærret %(count)s gange"
+            },
+            "banned_multiple": {
+                "one": "blev spærret",
+                "other": "blev spærret %(count)s gange"
+            },
+            "changed_avatar": {
+                "one": "%(oneUser)sændrede sit profilbillede",
+                "other": "%(oneUser)shar ændret sit profilbillede %(count)s gange"
+            },
+            "changed_avatar_multiple": {
+                "one": "%(severalUsers)sændrede sit profilbillede",
+                "other": "%(severalUsers)sændrede sit profilbillede %(count)s gange"
+            },
+            "changed_name": {
+                "one": "%(oneUser)sændrede sit navn",
+                "other": "%(oneUser)sændrede sit navn %(count)s gange"
+            },
+            "changed_name_multiple": {
+                "one": "%(severalUsers)sændrede deres navn",
+                "other": "%(severalUsers)shar skiftet navn %(count)s gange"
+            },
+            "format": "%(nameList)s%(transitionList)s",
+            "hidden_event": {
+                "one": "%(oneUser)ssendte en skjult besked",
+                "other": "%(oneUser)ssendte %(count)s skjulte beskeder"
+            },
+            "hidden_event_multiple": {
+                "one": "%(severalUsers)ssendte en skjult besked",
+                "other": "%(severalUsers)ssendte %(count)s skjulte beskeder"
+            },
+            "invite_withdrawn": {
+                "one": "%(oneUser)sfik deres invitation tilbagetrukket",
+                "other": "%(oneUser)sfik deres invitation tilbagetrukket %(count)s gange"
+            },
+            "invite_withdrawn_multiple": {
+                "one": "%(severalUsers)sfik deres invitationer tilbagetrukket",
+                "other": "%(severalUsers)sfik deres invitationer tilbagetrukket %(count)s gange"
+            },
+            "invited": {
+                "one": "blev inviteret",
+                "other": "blev inviteret %(count)s gange"
+            },
+            "invited_multiple": {
+                "one": "blev inviteret",
+                "other": "blev inviteret %(count)s gange"
+            },
+            "joined": {
+                "one": "%(oneUser)s tilsluttede sig",
+                "other": "%(oneUser)s tilsluttede sig %(count)s gange"
+            },
+            "joined_and_left": {
+                "one": "%(oneUser)stilsluttede sig og forlod",
+                "other": "%(oneUser)stilsluttede sig og forlod %(count)s gange"
+            },
+            "joined_and_left_multiple": {
+                "one": "%(severalUsers)stilsluttede sig og forlod",
+                "other": "%(severalUsers)stilsluttede sig og forlod %(count)s gang"
+            },
+            "joined_multiple": {
+                "one": "%(severalUsers)s tilsluttede sig",
+                "other": "%(severalUsers)s tilsluttede sig %(count)s gange"
+            },
+            "kicked": {
+                "one": "blev fjernet",
+                "other": "blev fjernet %(count)s gange"
+            },
+            "kicked_multiple": {
+                "one": "blev fjernet",
+                "other": "blev fjernet %(count)s gange"
+            },
+            "left": {
+                "one": "%(oneUser)sforlod",
+                "other": "%(oneUser)sforlod %(count)s gange"
+            },
+            "left_multiple": {
+                "one": "%(severalUsers)sforlod",
+                "other": "%(severalUsers)sforlod %(count)s gange"
+            },
+            "no_change": {
+                "one": "%(oneUser)slavede ingen ændringer",
+                "other": "%(oneUser)slavede ingen ændringer%(count)s gange"
+            },
+            "no_change_multiple": {
+                "one": "%(severalUsers)slavede ingen ændringer",
+                "other": "%(severalUsers)slavede ingen ændringer %(count)s gange"
+            },
+            "pinned_events": {
+                "one": "%(oneUser)s har ændret de <a> fastgjorte beskeder</a> for rummet",
+                "other": "%(oneUser)s har ændret de <a> fastgjorte beskeder</a> for rummet %(count)s gange"
+            },
+            "pinned_events_multiple": {
+                "one": "%(severalUsers)s har ændret de <a>fastgjorte beskeder</a> for rummet",
+                "other": "%(severalUsers)s har ændret de <a>fastgjorte beskeder</a> for rummet %(count)s gange"
+            },
+            "redacted": {
+                "one": "%(oneUser)s har fjernet en besked",
+                "other": "%(oneUser)s har fjernet %(count)s beskeder"
+            },
+            "redacted_multiple": {
+                "one": "%(severalUsers)s har fjernet en besked",
+                "other": "%(severalUsers)s har fjernet %(count)s beskeder"
+            },
+            "rejected_invite": {
+                "one": "%(oneUser)safviste deres invitation",
+                "other": "%(oneUser)safviste deres invitation %(count)s gange"
+            },
+            "rejected_invite_multiple": {
+                "one": "%(severalUsers)sAfviste deres invitationer",
+                "other": "%(severalUsers)safviste deres invitation %(count)s gange"
+            },
+            "rejoined": {
+                "one": "%(oneUser)sforlod og sluttede sig til",
+                "other": "%(oneUser)sforlod og sluttede sig til%(count)s gange"
+            },
+            "rejoined_multiple": {
+                "one": "%(severalUsers)sforlod og sluttede sig til igen",
+                "other": "%(severalUsers)sforlod og gentilsluttede sig %(count)s gange"
+            },
+            "server_acls": {
+                "one": "%(oneUser)s har ændret serverens ACL'er",
+                "other": "%(oneUser)s har ændret serveres ACL'er %(count)s gange"
+            },
+            "server_acls_multiple": {
+                "one": "%(severalUsers)sændrede serverens ACL'er",
+                "other": "%(severalUsers)sændrede serverens ACL'er %(count)s gange"
+            },
+            "unbanned": {
+                "one": "fik fjernet sin spærring",
+                "other": "fik fjernet sin spærring %(count)s gange"
+            },
+            "unbanned_multiple": {
+                "one": "fik fjernet spærringen",
+                "other": "fik fjernet spærringen %(count)s gange"
+            }
+        },
+        "thread_info_basic": "Fra en tråd",
+        "typing_indicator": {
+            "more_users": {
+                "other": "%(names)s og %(count)s andre skriver …",
+                "one": "%(names)s og en anden skriver …"
+            },
+            "one_user": "%(displayName)s skriver …",
+            "two_users": "%(names)s og %(lastPerson)s skriver …"
+        },
+        "undecryptable_tooltip": "Denne besked kunne ikke dekrypteres",
+        "url_preview": {
+            "close": "Luk forhåndsvisning",
+            "show_n_more": {
+                "one": "Vis %(count)s anden forhåndsvisning",
+                "other": "Vis %(count)s andre forhåndsvisninger"
+            }
+        }
+    },
+    "truncated_list_n_more": {
+        "one": "",
+        "other": "Og %(count)s mere..."
+    },
+    "unsupported_server_description": "Denne server bruger en ældre version af Matrix. Opgrader til Matrix %(version)s for at kunne bruge %(brand)s uden fejl.",
+    "unsupported_server_title": "Din server er ikke understøttet",
+    "update": {
+        "changelog": "Ændringslog",
+        "check_action": "Søg efter opdateringer",
+        "checking": "Søger efter en opdatering…",
+        "downloading": "Downloader opdatering...",
+        "error_encountered": "En fejl er opstået (%(errorDetail)s).",
+        "error_unable_load_commit": "Kan ikke indlæse commit-detaljer: %(msg)s",
+        "new_version_available": "Ny version tilgængelig. <a>Opdatér nu.</a>",
+        "no_update": "Ingen opdatering tilgængelig.",
+        "release_notes_toast_title": "Hvad er nyt",
+        "see_changes_button": "Hvad er nyt?",
+        "toast_description": "Ny version af %(brand)s er tilgængelig",
+        "toast_title": "Opdater %(brand)s",
+        "unavailable": "Utilgængelig"
+    },
+    "update_room_access_modal": {
+        "dont_change_description": "Hvis du ikke ønsker at ændre adgangen til dette rum, kan du oprette et nyt rum til opkaldslinket."
+    },
+    "upload_failed_generic": "Filen '%(fileName)s' kunne ikke uploades.",
+    "upload_failed_size": "Filen '%(fileName)s' overstiger homeserverens størrelsesbegrænsning for uploads",
+    "upload_failed_title": "Upload Fejlede",
+    "upload_file": {
+        "cancel_all_button": "Annullér alle",
+        "error_file_too_large": "Denne fil er <b>for stor</b> til at kunne uploades. Filstørrelsesgrænsen er %(limit)s, men denne fil er %(sizeOfThisFile)s.",
+        "error_files_too_large": "Disse filer er <b>for store</b> at kunne uploades. Filstørrelsesgrænsen er%(limit)s .",
+        "error_some_files_too_large": "Nogle filer er <b>for store</b> til at kunne uploades. Filstørrelsesgrænsen er %(limit)s.",
+        "error_title": "Overførselsfejl",
+        "title": "Upload filer",
+        "title_progress": "Upload filer (%(current)s af i alt %(total)s)",
+        "upload_all_button": "Upload alle",
+        "upload_n_others_button": {
+            "one": "Upload %(count)s anden fil",
+            "other": "Upload %(count)s e andre filer"
+        }
+    },
+    "user_info": {
+        "admin_tools_section": "Administrationsværktøjer",
+        "ban_button_room": "Spær fra rum",
+        "ban_button_space": "Spær fra gruppe",
+        "ban_room_confirm_title": "Spær fra %(roomName)s",
+        "ban_space_everything": "Spær dem fra alle de steder hvor jeg kan",
+        "ban_space_specific": "Spær dem fra specifikke steder hvor jeg kan",
+        "deactivate_confirm_action": "Deaktiver bruger",
+        "deactivate_confirm_description": "Deaktivering af denne bruger vil logge vedkommende ud og forhindre vedkommende i at logge ind igen. Derudover vil vedkommende forlade alle de rum, de er i. Denne handling kan ikke fortrydes. Er du sikker på, at du vil deaktivere denne bruger?",
+        "deactivate_confirm_title": "Deaktiver bruger?",
+        "demote_button": "Nedgradering",
+        "demote_self_confirm_description_space": "Du vil ikke kunne fortryde denne ændring, da du degraderer dig selv. Hvis du er den sidste bruger med priviligerede rettigheder i rummet, vil det være umuligt at genvinde rettighederne.",
+        "demote_self_confirm_room": "Du vil ikke være i stand til at fortryde denne ændring, da du degraderer dig selv. Hvis du er den sidste privilegerede bruger i rummet, vil det være umuligt at genvinde privilegier.",
+        "demote_self_confirm_title": "Nedgrader dig selv?",
+        "disinvite_button_room": "Fjern invitation til rum",
+        "disinvite_button_room_name": "Fjern invitation til %(roomName)s",
+        "disinvite_button_space": "Tilbagekald invitation til gruppen",
+        "error_ban_user": "Kunne ikke spærre bruger",
+        "error_deactivate": "Det lykkedes ikke at deaktivere brugeren",
+        "error_kicking_user": "Brugeren kunne ikke fjernes",
+        "error_mute_user": "Bruger kunne ikke slås fra",
+        "error_revoke_3pid_invite_description": "Kunne ikke tilbagekalde invitationen. Serveren har muligvis et midlertidigt problem, eller du har ikke tilstrækkelige rettigheder til at tilbagekalde invitationen.",
+        "error_revoke_3pid_invite_title": "Kunne ikke tilbagekalde invitation",
+        "ignore_confirm_description": "Alle beskeder og invitationer fra denne bruger vil blive skjult. Er du sikker på, at du vil ignorere dem?",
+        "ignore_confirm_title": "Ignorer %(user)s",
+        "invited_by": "Inviteret af %(sender)s",
+        "jump_to_rr_button": "Gå til læsekvittering",
+        "kick_button_room": "Fjern fra rummet",
+        "kick_button_room_name": "Fjern fra %(roomName)s",
+        "kick_button_space": "Spær fra gruppe",
+        "kick_button_space_everything": "Fjern dem fra alle de steder, hvor jeg har beføjelser til det",
+        "kick_space_specific": "Fjern dem fra specifikke steder, hvor jeg har beføjelser til det",
+        "kick_space_warning": "De vil stadig have adgang til de steder, du ikke er administrator for.",
+        "promote_warning": "Du vil ikke kunne omgøre denne ændring fordi du nu giver brugeren den samme magt som du selv har.",
+        "redact": {
+            "confirm_button": {
+                "one": "Fjern 1 besked",
+                "other": "Fjern %(count)s beskeder"
+            },
+            "confirm_description_1": {
+                "one": "Du er ved at slette %(count)s besked, sendt af %(user)s. Dette vil slette beskeden permanent for alle i samtalen. Ønsker du at fortsætte?",
+                "other": "Du er ved at slette %(count)s beskeder fra %(user)s. Dette vil slette beskederne permanent for alle i samtalen. Ønsker du at fortsætte?"
+            },
+            "confirm_description_2": "For et stort antal beskeder kan dette tage lidt tid. Opdater venligst ikke din klient i mellemtiden.",
+            "confirm_keep_state_explainer": "Fjern markeringen, hvis du også vil fjerne systemmeddelelser for denne bruger (f.eks. ændring af medlemskab, ændring af profil ...).",
+            "confirm_keep_state_label": "Bevar systemmeddelelser",
+            "confirm_title": "Fjern seneste beskeder fra %(user)s",
+            "no_recent_messages_description": "Prøv at rulle op i tidslinjen for at se, om der er nogle tidligere.",
+            "no_recent_messages_title": "Der blev ikke fundet nogen nye beskeder fra %(user)s."
+        },
+        "redact_button": "Fjern beskeder",
+        "revoke_invite": "Tilbagekald invitation",
+        "room_encrypted": "Beskeder i dette rum er end-to-end krypteret.",
+        "room_encrypted_detail": "Dine beskeder er sikret, og kun du og modtageren har de unikke nøgler til at låse dem op.",
+        "room_unencrypted": "Beskeder i dette rum er ikke end-to-end krypteret.",
+        "room_unencrypted_detail": "I krypterede rum er dine beskeder sikret, og kun du og modtageren har de unikke nøgler til at låse dem op.",
+        "share_button": "Del profil",
+        "unban_button_room": "Fjern brugerens spærring fra rummet",
+        "unban_button_space": "Fjern brugerens spærring fra gruppen",
+        "unban_room_confirm_title": "Fjern brugerens spærring fra %(roomName)s",
+        "unban_space_everything": "Fjern spærring af dem alle steder hvor jeg kan",
+        "unban_space_specific": "Fjern spærring af dem fra specifikke ting, jeg er i stand til",
+        "unban_space_warning": "De vil ikke være i stand til at tilgå noget du ikke er admin for.",
+        "verify_button": "Verificér bruger",
+        "verify_explainer": "For ekstra sikkerhed skal du verificere denne bruger ved at kontrollere en engangskode på begge jeres enheder."
+    },
+    "user_menu": {
+        "link_new_device": "Forbind ny enhed",
+        "settings": "Alle indstillinger"
+    },
+    "voip": {
+        "already_in_call": "Allerede i et opkald",
+        "already_in_call_person": "Du har allerede i et opkald med denne person.",
+        "answered_elsewhere": "Svaret andensteds",
+        "answered_elsewhere_description": "Opkaldet var svaret på en anden enhed.",
+        "call_failed": "Opkald mislykkedes",
+        "call_failed_description": "Opkaldet kunne ikke etableres",
+        "call_failed_media": "Opkald fejlede på grund af kamera og mikrofon ikke kunne nås. Tjek dette:",
+        "call_failed_media_applications": "Ingen anden application bruger kameraet",
+        "call_failed_media_connected": "En mikrofon og kamera er tilsluttet og sat op rigtigt",
+        "call_failed_media_permissions": "Tilladelse er givet til brug af webcam",
+        "call_failed_microphone": "Opkald fejlede på grund af mikrofon ikke kunne nås. Tjek at din mikrofon er tilsluttet og sat op rigtigt.",
+        "call_held": "%(peerName)s satte opkaldet på hold",
+        "call_held_resume": "Du satte opkaldet på hold <a>Genoptag</a>",
+        "call_held_switch": "Du satte opkaldet på hold <a>Skift</a>",
+        "call_toast_unknown_room": "Ukendt rum",
+        "camera_disabled": "Dit kamera er slukket",
+        "camera_enabled": "Dit kamera er stadig aktiveret",
+        "cannot_call_yourself_description": "Du kan ikke ringe til dig selv.",
+        "connecting": "Opretter forbindelse…",
+        "connection_lost": "Forbindelsen til serveren er tabt",
+        "connection_lost_description": "Du kan ikke lave et opkald uden en forbindelse til serveren.",
+        "consulting": "Konfererer med %(transferTarget)s. <a> Overfør til %(transferee)s</a>",
+        "decline_call": "Afvis",
+        "default_device": "Standardenhed",
+        "dial": "Ring",
+        "dialpad": "Tastatur",
+        "disable_camera": "Sluk for kameraet",
+        "disable_microphone": "Slå mikrofonen fra",
+        "disabled_no_perms_start_video_call": "Du har ikke tilladelse til at starte videosamtaler",
+        "disabled_no_perms_start_voice_call": "Du har ikke tilladelse til at starte taleopkald",
+        "disabled_ongoing_call": "Igangværende opkald",
+        "element_call": "Element Call",
+        "enable_camera": "Tænd for kameraet",
+        "enable_microphone": "Aktiver mikrofonen",
+        "expand": "Tilbage til opkald",
+        "get_call_link": "Del link til opkald",
+        "hangup": "Læg på",
+        "hide_sidebar_button": "Skjul sidebjælke",
+        "input_devices": "Inputenheder",
+        "jitsi_call": "Jitsi fællesopkald",
+        "join_button_tooltip_call_full": "Beklager - dette opkald er i øjeblikket fuldt",
+        "legacy_call": "Gammel opkaldsmetode",
+        "maximise": "Udfyld skærmen",
+        "maximise_call": "Maksimér opkaldet",
+        "minimise_call": "Minimér opkaldet",
+        "misconfigured_server": "Opkaldet mislykkedes pga. fejlkonfigureret server",
+        "misconfigured_server_description": "Bed administratoren af din homeserver (<code>%(homeserverDomain)s</code>) om at konfigurere en TURN server for at opkald virker pålideligt.",
+        "misconfigured_server_fallback": "Alternativt kan du prøve at bruge den offentlige server på <server/>, men dette er ikke lige så pålideligt, og den vil dele din IP-adresse med den pågældende server. Du kan også administrere dette under Indstillinger.",
+        "misconfigured_server_fallback_accept": "Prøv at bruge %(server)s",
+        "more_button": "Mere",
+        "msisdn_lookup_failed": "Kan ikke slå telefonnummer op",
+        "msisdn_lookup_failed_description": "Der opstod en fejl ved at slå telefonnummeret op",
+        "msisdn_transfer_failed": "Kan ikke omstille opkald",
+        "n_people_joined": {
+            "one": "%(count)s person deltog",
+            "other": "%(count)s personer deltog"
+        },
+        "no_audio_input_description": "Vi fandt ingen mikrofon på din enhed. Kontroller venligst dine indstillinger, og prøv igen.",
+        "no_audio_input_title": "Ingen mikrofon fundet",
+        "no_media_perms_description": "Du skal muligvis manuelt give %(brand)s tilladelse til at få adgang til din mikrofon/webcam.",
+        "no_media_perms_title": "Ingen medietilladelser",
+        "no_permission_conference": "Tilladelse påkrævet",
+        "no_permission_conference_description": "Du har ikke rettighed til at starte et gruppekald i dette rum",
+        "on_hold": "%(name)s i venteposition",
+        "output_devices": "Output-enheder",
+        "screenshare_monitor": "Del hele skærmen",
+        "screenshare_title": "Del indhold",
+        "screenshare_window": "Applikationsvindue",
+        "show_sidebar_button": "Vis sidebjælke",
+        "silence": "Sluk lyden på opkaldet",
+        "silenced": "Meddelelser dæmpet",
+        "start_screenshare": "Begynd at dele din skærm",
+        "stop_screenshare": "Hold op med at dele din skærm",
+        "too_many_calls": "For mange opkald",
+        "too_many_calls_description": "Du er nået til det maksimale antal igangværende opkald på en gang.",
+        "transfer_consult_first_label": "Konsultér først",
+        "transfer_failed": "Omstilling fejlede",
+        "transfer_failed_description": "Kunne ikke omstille opkald",
+        "unable_to_access_audio_input_description": "Vi kunne ikke få adgang til din mikrofon. Tjek venligst dine browserindstillinger, og prøv igen.",
+        "unable_to_access_audio_input_title": "Kan ikke få adgang til din mikrofon",
+        "unable_to_access_media": "Kan ikke tilgå webcam / mikrofon",
+        "unable_to_access_microphone": "Kan ikke tilgå mikrofonen",
+        "unknown_caller": "Ukendt opkald",
+        "unknown_person": "ukendt person",
+        "unsilence": "Lyd tændt",
+        "unsupported": "Opkald er ikke understøttet",
+        "unsupported_browser": "Du kan ikke lave opkald i denne browser.",
+        "user_busy": "Bruger optaget",
+        "user_busy_description": "Brugeren du ringede til er optaget.",
+        "user_is_presenting": "%(sharerName)s præsenterer",
+        "video_call": "Videoopkald",
+        "video_call_started": "Videoopkald startet",
+        "video_call_using": "Videoopkald med:",
+        "voice_call": "Stemmeopkald",
+        "you_are_presenting": "Du præsenterer"
+    },
+    "welcome_to_element": "Velkommen til Element",
+    "widget": {
+        "added_by": "Widget tilføjet af",
+        "capabilities_dialog": {
+            "content_starting_text": "Denne widget vil gerne:",
+            "decline_all_permission": "Afvis det hele",
+            "remember_Selection": "Husk mit valg for denne widget",
+            "title": "Godkend widget-tilladelser"
+        },
+        "capability": {
+            "always_on_screen_generic": "Bliv på skærmen, imens det forløber",
+            "always_on_screen_viewing_another_room": "Forbliv på skærmen, også når du ser et andet rum imens det forløber.",
+            "any_room": "Ovenstående, men også i ethvert rum, du bliver tilføjet eller inviteret til.",
+            "byline_empty_state_key": "med en tom tilstandsnøgle",
+            "byline_state_key": "med tilstandsnøgle %(stateKey)s",
+            "capability": "<b>%(capability)s</b> -funktionen",
+            "change_avatar_active_room": "Skift avataren for dit aktive rum",
+            "change_avatar_this_room": "Skift avataren for dette rum",
+            "change_name_active_room": "Skift navnet på dit aktive rum",
+            "change_name_this_room": "Skift navnet på dette rum",
+            "change_topic_active_room": "Skift emnet for dit aktive rum",
+            "change_topic_this_room": "Skift emne for dette rum",
+            "receive_membership_active_room": "Se når brugere tilslutter sig, forlader eller bliver inviteret til dit aktive rum.",
+            "receive_membership_this_room": "Se når andre tilslutter sig, forlader eller bliver inviteret til dette rum",
+            "remove_ban_invite_leave_active_room": "Fjern, spær eller inviter andre til dit aktive rum, og få dig til at forlade det",
+            "remove_ban_invite_leave_this_room": "Fjern, spær eller inviter andre til dette rum, og få dig til at forlade det",
+            "see_avatar_change_active_room": "Se hvornår avataren ændrer sig i dit aktive rum",
+            "see_avatar_change_this_room": "Se når avataren ændrer sig for dette rum",
+            "see_event_type_sent_active_room": "Se <b>%(eventType)s</b> begivenheder, der er offentliggjort i dit aktive rum",
+            "see_event_type_sent_this_room": "Se <b>%(eventType)s</b> begivenheder, der er offentliggjort i dette rum",
+            "see_images_sent_active_room": "Se billeder der er lagt ud i dit aktive rum",
+            "see_images_sent_this_room": "Se billeder, der er lagt ud i dette rum",
+            "see_messages_sent_active_room": "Se beskeder, der er sendt til dit aktive rum",
+            "see_messages_sent_this_room": "Se beskeder, der er sendt til dette rum",
+            "see_msgtype_sent_active_room": "Se <b>%(msgtype)s</b> beskeder, der er sendt til dit aktive rum",
+            "see_msgtype_sent_this_room": "Se <b>%(msgtype)s</b> beskeder sendt til dette room",
+            "see_name_change_active_room": "Se, hvornår navnet på dit aktive rum bliver ændret",
+            "see_name_change_this_room": "Se når navnet på dette rum ændres",
+            "see_sent_emotes_active_room": "Se emojis, der er sendt til dit aktive rum",
+            "see_sent_emotes_this_room": "Se emojis, der er sendt til dette rum",
+            "see_sent_files_active_room": "Se generelle filer, der er lagt ud i dit aktive rum",
+            "see_sent_files_this_room": "Se generelle filer, der er lagt ud i dette rum",
+            "see_sticker_posted_active_room": "Se, når nogen poster et klistermærke i dit aktive rum",
+            "see_sticker_posted_this_room": "Se, når der bliver postet et klistermærke i dette rum",
+            "see_text_messages_sent_active_room": "Se tekstbeskeder, der er sendt til dit aktive rum",
+            "see_text_messages_sent_this_room": "Se tekstbeskeder, der er sendt til dette rum",
+            "see_topic_change_active_room": "Se hvornår emnet ændrer sig for dit aktive rum",
+            "see_topic_change_this_room": "Se når emnet skifter for dette rum",
+            "see_videos_sent_active_room": "Se videoer der er lagt ud i dit aktive rum",
+            "see_videos_sent_this_room": "Se videoer, der er lagt ud i dette rum",
+            "send_emotes_active_room": "Sende emojis, mens du er i dit aktive rum",
+            "send_emotes_this_room": "Sende emojis som dig i dette rum",
+            "send_event_type_active_room": "Sende <b>%(eventType)s</b> begivenheder, som dig i dit aktive rum",
+            "send_event_type_this_room": "Sende <b>%(eventType)s</b> begivenheder, som dig i dette rum",
+            "send_files_active_room": "Sende generelle filer som dig i dit aktive rum",
+            "send_files_this_room": "Sende generelle filer som dig i dette rum",
+            "send_images_active_room": "Sende billeder som dig i dit aktive rum",
+            "send_images_this_room": "Sende billeder som dig i dette rum",
+            "send_messages_active_room": "Sende beskeder som dig i dit aktive rum",
+            "send_messages_this_room": "Sende beskeder som dig i dette rum",
+            "send_msgtype_active_room": "Sende <b>%(msgtype)s</b> beskeder, som dig i dit aktive rum",
+            "send_msgtype_this_room": "Sende <b>%(msgtype)s</b> beskeder som dig i dette rum",
+            "send_stickers_active_room": "Send klistermærker til dit aktive rum",
+            "send_stickers_active_room_as_you": "Send klistermærker til dit aktive rum, mens du",
+            "send_stickers_this_room": "Send klistermærker ind i dette rum",
+            "send_stickers_this_room_as_you": "Send klistermærker til dette rum, når du",
+            "send_text_messages_active_room": "Sende tekstbeskeder som dig i dit aktive rum",
+            "send_text_messages_this_room": "Sende tekstbeskeder som dig i dette rum",
+            "send_videos_active_room": "Sende videoer som dig i dit aktive rum",
+            "send_videos_this_room": "Sende videoer som dig i dette rum",
+            "specific_room": "Ovenstående, men også i <Room />",
+            "switch_room": "Skift hvilket rum du ser",
+            "switch_room_message_user": "Skift det rum, den besked eller den bruger, du ser"
+        },
+        "close_to_view_right_panel": "Luk denne widget for at se den i dette panel",
+        "context_menu": {
+            "delete": "Slet widget",
+            "delete_warning": "Hvis du sletter en widget, fjernes den for alle brugere i dette rum. Er du sikker på, at du vil slette denne widget?",
+            "move_left": "Flyt til venstre",
+            "move_right": "Flyt til højre",
+            "remove": "Fjern for alle",
+            "revoke": "Tilbagekald tilladelser",
+            "screenshot": "Tag et billede",
+            "start_audio_stream": "Start lydstream"
+        },
+        "cookie_warning": "Denne widget kan bruge cookies.",
+        "error_hangup_description": "Du blev afbrudt fra opkaldet. (Fejl:%(message)s )",
+        "error_hangup_title": "Forbindelsen blev afbrudt",
+        "error_loading": "Fejl ved indlæsning af widget.",
+        "error_mixed_content": "Fejl - Blandet indhold",
+        "error_need_invite_permission": "Du skal kunne invitere brugere for at gøre dette.",
+        "error_need_kick_permission": "Du skal kunne smide brugere ud for at gøre det.",
+        "error_need_to_be_logged_in": "Du skal være logget ind.",
+        "error_unable_start_audio_stream_description": "Kunne ikke starte lydstreaming.",
+        "error_unable_start_audio_stream_title": "Kunne ikke starte livestream",
+        "modal_data_warning": "Nedenstående data deles med %(widgetDomain)s",
+        "modal_title_default": "Modal widget",
+        "no_name": "Ukendt app",
+        "open_id_permissions_dialog": {
+            "remember_selection": "Husk dette",
+            "starting_text": "Widgeten verificerer dit bruger-ID, men kan ikke udføre handlinger for dig:",
+            "title": "Tillad denne widget at bekræfte din identitet"
+        },
+        "popout": "Popout-widget",
+        "set_room_layout": "Indstil layout for alle",
+        "shared_data_avatar": "Dit profilbilledes URL",
+        "shared_data_device_id": "Dit enheds-ID",
+        "shared_data_lang": "Dit sprog",
+        "shared_data_mxid": "Dit bruger-ID",
+        "shared_data_name": "Dit viste navn",
+        "shared_data_room_id": "Rum-ID",
+        "shared_data_theme": "Dit tema",
+        "shared_data_url": "%(brand)s URL",
+        "shared_data_warning": "Brug af denne widget kan dele data <helpIcon /> med%(widgetDomain)s .",
+        "shared_data_warning_im": "Brug af denne widget kan medføre deling af data <helpIcon /> med %(widgetDomain)s og din integrationsmanager.",
+        "shared_data_widget_id": "Widget-ID",
+        "unencrypted_warning": "Widgets bruger ikke beskedkryptering.",
+        "unmaximise": "Fjern maksimering",
+        "unpin_to_view_right_panel": "Frigør denne widget for at se den i dette panel"
+    },
+    "zxcvbn": {
+        "suggestions": {
+            "allUppercase": "\"Alt med store bogstaver\" er næsten lige så nemt at gætte som alt med små bogstaver",
+            "anotherWord": "Tilføj et ekstra ord eller to. Ualmindelige ord er bedre.",
+            "associatedYears": "Undgå årstal med forbindelse til dig",
+            "capitalization": "Store bogstaver hjælper ikke specielt meget",
+            "dates": "Undgå datoer og årstal med forbindelse til dig",
+            "l33t": "Forudsigelige erstatninger som '@' i stedet for 'a' hjælper ikke specielt meget",
+            "longerKeyboardPattern": "Brug et længere tastaturmønster med flere skift",
+            "noNeed": "Symboler, tal eller store bogstaver behøves ikke",
+            "pwned": "Hvis du bruger denne adgangskode et andet sted, bør du ændre den.",
+            "recentYears": "Undgå nylige år",
+            "repeated": "Undgå gentagne ord og tegn",
+            "reverseWords": "Omvendt stavede ord er ikke meget sværere at gætte sig til",
+            "sequences": "Undgå tegn i række",
+            "useWords": "Brug nogle få ord, undgå hyppige udtryk"
+        },
+        "warnings": {
+            "common": "Dette er et meget almindeligt kodeord",
+            "commonNames": "Almindelige navne og efternavne er nemme at gætte",
+            "dates": "Datoer er often nemme at gætte",
+            "extendedRepeat": "Gentagelser som \"abcabcabc\" er kun ubetydeligt sværere at gætte end \"abc\"",
+            "keyPattern": "Korte tastaturmønstre er nemme at gætte",
+            "namesByThemselves": "Enkelte navne og efternavne er nemme at gætte",
+            "pwned": "Din adgangskode er blevet kompromitteret af et datalæk på internettet.",
+            "recentYears": "Nylige årstal er nemme at gætte",
+            "sequences": "Sekvenser som abc eller 6543 er nemme at gætte",
+            "similarToCommon": "Dette ligner et ofte brugt kodeord",
+            "simpleRepeat": "Gentagelser som \"aaa\" er nemme at gætte",
+            "straightRow": "Bogstaver i en række på tastaturet er nemme at gætte",
+            "topHundred": "Dette er et af de 100 mest almindelige kodeord",
+            "topTen": "Dette er et af de 10 mest almindelige kodeord",
+            "userInputs": "Der bør ikke være nogen personlige eller siderelaterede data.",
+            "wordByItself": "Et enkelt ord er nem at gætte"
+        }
+    }
+}
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index e1de098662..ecdd47ccac 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1,8 +1,8 @@
 {
     "a11y": {
-        "emoji_picker": "Emoji-Picker",
+        "emoji_picker": "Emoji-Auswahl",
         "jump_first_invite": "Zur ersten Einladung springen.",
-        "message_composer": "Nachrichteneingabe-Feld",
+        "message_composer": "Texteingabefeld",
         "n_unread_messages": {
             "other": "%(count)s ungelesene Nachrichten.",
             "one": "1 ungelesene Nachricht."
@@ -11,37 +11,37 @@
             "other": "%(count)s ungelesene Nachrichten einschließlich Erwähnungen.",
             "one": "1 ungelesene Erwähnung."
         },
-        "recent_rooms": "Kürzlich besuchte Chatrooms",
-        "room_messsage_not_sent": "Öffnen Sie den Chatroom %(roomName)s mit einer nicht gesendeten Nachricht.",
-        "room_n_unread_invite": "%(roomName)s Einladung zum Raum öffnen.",
+        "recent_rooms": "Zuletzt besuchte Chats",
+        "room_messsage_not_sent": "Öffne den Chat „%(roomName)s” mit einer ungesendeten Nachricht.",
+        "room_n_unread_invite": "Offene Einladung zum Chat %(roomName)s",
         "room_n_unread_messages": {
-            "one": "Raum %(roomName)s öffnen mit 1 ungelesenen Nachricht.",
-            "other": "Raum %(roomName)s öffnen mit %(count)s ungelesene Nachrichten."
+            "one": "Chat %(roomName)s öffnen mit 1 ungelesenen Nachricht.",
+            "other": "Chat %(roomName)s öffnen mit %(count)s ungelesene Nachrichten."
         },
         "room_n_unread_messages_mentions": {
-            "one": "Öffnen Sie den Raum %(roomName)s mit 1 ungelesenen Erwähnung.",
-            "other": "Öffnen Sie den Raum %(roomName)s mit %(count)s ungelesenen Nachrichten einschließlich Erwähnungen."
+            "one": "Öffne den den Chat %(roomName)s mit 1 ungelesenen Erwähnung.",
+            "other": "Öffne den Chat %(roomName)s mit %(count)s ungelesenen Nachrichten einschließlich Erwähnungen."
         },
-        "room_name": "Raum %(name)s",
-        "room_status_bar": "Statusleiste des Chatrooms",
+        "room_name": "Chat %(name)s",
+        "room_status_bar": "Chat-Statusleiste",
         "seek_bar_label": "Audio-Suchleiste",
         "unread_messages": "Ungelesene Nachrichten.",
         "user_menu": "Benutzermenü"
     },
-    "a11y_jump_first_unread_room": "Springen Sie zum ersten ungelesenen Chatroom.",
+    "a11y_jump_first_unread_room": "Springe zum ersten ungelesenen Chat",
     "action": {
-        "accept": "Annehmen",
+        "accept": "Akzeptieren",
         "add": "Hinzufügen",
-        "add_existing_room": "Existierenden Raum hinzufügen",
+        "add_existing_room": "Vorhandenen Chat hinzufügen",
         "add_people": "Personen hinzufügen",
         "apply": "Anwenden",
-        "approve": "Zustimmen",
-        "ask_to_join": "Beitrittsanfragen",
+        "approve": "Genehmigen",
+        "ask_to_join": "Um Beitritt bitten",
         "back": "Zurück",
-        "call": "Anruf",
+        "call": "Anrufen",
         "cancel": "Abbrechen",
         "change": "Ändern",
-        "clear": "Löschen",
+        "clear": "Zurücksetzen",
         "click": "Klick",
         "click_to_copy": "Klicken um zu kopieren",
         "close": "Schließen",
@@ -52,7 +52,7 @@
         "copy": "Kopieren",
         "copy_link": "Link kopieren",
         "create": "Erstellen",
-        "create_a_room": "Raum erstellen",
+        "create_a_room": "Chat erstellen",
         "create_account": "Konto erstellen",
         "decline": "Ablehnen",
         "decline_and_block": "Ablehnen und blockieren",
@@ -69,8 +69,8 @@
         "enter_fullscreen": "Vollbild",
         "exit_fullscreeen": "Vollbild verlassen",
         "expand": "Ausklappen",
-        "explore_public_rooms": "Öffentliche Räume erkunden",
-        "explore_rooms": "Räume erkunden",
+        "explore_public_rooms": "Öffentliche Chats erkunden",
+        "explore_rooms": "Chats erkunden",
         "export": "Exportieren",
         "forward": "Weiterleiten",
         "go": "Los",
@@ -79,7 +79,7 @@
         "hide": "Verstecken",
         "hide_advanced": "Erweiterte Einstellungen ausblenden",
         "hold": "Halten",
-        "ignore": "Blockieren",
+        "ignore": "Ignorieren",
         "import": "Importieren",
         "invite": "Einladen",
         "invite_to_space": "In Space einladen",
@@ -87,15 +87,14 @@
         "join": "Betreten",
         "learn_more": "Mehr erfahren",
         "leave": "Verlassen",
-        "leave_room": "Raum verlassen",
+        "leave_room": "Chat verlassen",
         "logout": "Abmelden",
         "manage": "Verwalten",
         "maximise": "Maximieren",
         "mention": "Erwähnen",
         "minimise": "Minimieren",
-        "new_message": "Neue Nachricht",
-        "new_room": "Neuer Raum",
-        "new_video_room": "Neuer Videoraum",
+        "new_room": "Neue Gruppe",
+        "new_video_room": "Neuer Videochat",
         "next": "Weiter",
         "no": "Nein",
         "ok": "Ok",
@@ -115,7 +114,7 @@
         "reply": "Antworten",
         "reply_in_thread": "In Thread antworten",
         "report_content": "Inhalt melden",
-        "report_room": "Raum melden",
+        "report_room": "Chat melden",
         "resend": "Erneut senden",
         "reset": "Zurücksetzen",
         "resume": "Fortsetzen",
@@ -134,7 +133,7 @@
         "sign_out": "Abmelden",
         "skip": "Überspringen",
         "start": "Starte",
-        "start_chat": "Unterhaltung beginnen",
+        "start_chat": "Neuer Chat",
         "start_new_chat": "Neue Direktnachricht",
         "stop": "Beenden",
         "submit": "Absenden",
@@ -142,8 +141,8 @@
         "transfer": "Übertragen",
         "trust": "Vertrauen",
         "try_again": "Erneut versuchen",
-        "unban": "Verbannung aufheben",
-        "unignore": "Freigeben",
+        "unban": "Entsperren",
+        "unignore": "Ignorieren aufheben",
         "unpin": "Loslösen",
         "unsubscribe": "Deabonnieren",
         "update": "Aktualisieren",
@@ -240,13 +239,12 @@
             "setup_key_backup_title": "Du wirst den Zugang zu deinen verschlüsselten Nachrichten verlieren",
             "setup_secure_backup_description_1": "Verschlüsselte Nachrichten sind mit Ende-zu-Ende-Verschlüsselung gesichert. Nur du und der/die Empfänger haben die Schlüssel um diese Nachrichten zu lesen.",
             "setup_secure_backup_description_2": "Wenn du dich abmeldest, werden die Schlüssel auf diesem Gerät gelöscht. Das bedeutet, dass du keine verschlüsselten Nachrichten mehr lesen kannst, wenn du die Schlüssel nicht auf einem anderen Gerät oder eine Sicherung auf dem Server hast.",
-            "skip_key_backup": "Ich möchte meine verschlüsselten Nachrichten nicht",
-            "use_key_backup": "Beginne Schlüsselsicherung zu nutzen"
+            "skip_key_backup": "Ich möchte meine verschlüsselten Nachrichten nicht"
         },
         "misconfigured_body": "Wende dich an deinen %(brand)s-Admin um <a>deine Konfiguration</a> auf ungültige oder doppelte Einträge zu überprüfen.",
         "misconfigured_title": "Dein %(brand)s ist falsch konfiguriert",
         "mobile_create_account_title": "Du bist dabei, auf %(hsName)s ein Konto anzulegen",
-        "msisdn_field_description": "Andere Personen können dich mit deinen Kontaktdaten in Räume einladen",
+        "msisdn_field_description": "Andere Nutzer können dich mit deinen Kontaktdaten in Chats einladen",
         "msisdn_field_label": "Telefon",
         "msisdn_field_number_invalid": "Diese Telefonummer sieht nicht ganz richtig aus. Bitte überprüfe deine Eingabe und versuche es erneut",
         "msisdn_field_required_invalid": "Telefonnummer eingeben",
@@ -263,37 +261,37 @@
         "phone_label": "Telefon",
         "phone_optional_label": "Telefon (optional)",
         "qr_code_login": {
-            "check_code_explainer": "Hierdurch wird überprüft, ob die Verbindung zu Ihrem anderen Gerät sicher ist.",
+            "check_code_explainer": "Damit prüfst du, ob die Verbindung zu deinem anderen Gerät sicher ist.",
             "check_code_heading": "Gib die Nummer ein, die am anderen Gerät angezeigt wird",
             "check_code_input_label": "zweistelliger Code",
             "check_code_mismatch": "Die Zahlen stimmen nicht überein",
             "completing_setup": "Schließe Anmeldung deines neuen Gerätes ab",
             "error_etag_missing": "Ein unerwarteter Fehler ist aufgetreten. Dies kann an einer Browsererweiterung, einem Proxyserver oder einer fehlerhaften Serverkonfiguration liegen.",
-            "error_expired": "Die Anmeldung ist abgelaufen. Bitte versuchen Sie es erneut.",
+            "error_expired": "Die Anmeldung ist abgelaufen. Bitte versuche es erneut.",
             "error_expired_title": "Die Anmeldung wurde nicht rechtzeitig abgeschlossen",
-            "error_insecure_channel_detected": "Eine sichere Verbindung zum neuen Gerät konnte nicht hergestellt werden. Ihre vorhandenen Geräte sind weiterhin sicher und Sie müssen sich keine Sorgen um sie machen.",
+            "error_insecure_channel_detected": "Eine sichere Verbindung zum neuen Gerät konnte nicht hergestellt werden. Deine vorhandenen Geräte sind weiterhin sicher und Du musst dir keine Sorgen um sie machen.",
             "error_insecure_channel_detected_instructions": "Was jetzt?",
-            "error_insecure_channel_detected_instructions_1": "Versuchen Sie erneut, sich mit einem QR-Code auf dem anderen Gerät anzumelden, falls dies ein Netzwerkproblem war",
-            "error_insecure_channel_detected_instructions_2": "Falls das gleiche Problem auftritt, probiere Sie es bitte mit einem anderen WLAN-Netzwerk oder verwenden Sie Ihre mobilen Daten anstelle von WLAN",
-            "error_insecure_channel_detected_instructions_3": "Falls das nicht funktioniert, melden Sie sich bitte manuell an.",
+            "error_insecure_channel_detected_instructions_1": "Versuche erneut, dich mit einem QR-Code auf dem anderen Gerät anzumelden, falls dies ein Netzwerkproblem war",
+            "error_insecure_channel_detected_instructions_2": "Falls das gleiche Problem noch einmal auftritt, probiere es bitte mit einem anderen WLAN-Netzwerk oder verwende mobilen Daten anstelle von WLAN",
+            "error_insecure_channel_detected_instructions_3": "Falls das nicht funktioniert, melde dich bitte manuell an.",
             "error_insecure_channel_detected_title": "Die Verbindung ist nicht sicher",
-            "error_other_device_already_signed_in": "Sie brauchen nichts weiter zu tun.",
+            "error_other_device_already_signed_in": "Du brauchst nichts weiter zu tun.",
             "error_other_device_already_signed_in_title": "Ihr anderes Gerät ist bereits angemeldet",
             "error_rate_limited": "Zu viele Versuche in zu kurzer Zeit. Warte ein wenig, bevor du es erneut versuchst.",
-            "error_unexpected": "Es ist ein unerwarteter Fehler aufgetreten. Ihre Anfrage zum Verbinden des anderen Geräts wurde abgebrochen.",
+            "error_unexpected": "Es ist ein unerwarteter Fehler aufgetreten. Die Anfrage zum Verbinden mit dem anderen Gerät wurde abgebrochen.",
             "error_unsupported_protocol": "Dieses Gerät unterstützt die Anmeldung auf einem anderen Gerät mit einem QR-Code nicht.",
             "error_unsupported_protocol_title": "Anderes Gerät nicht kompatibel",
             "error_user_cancelled": "Der Anmeldevorgang wurde am anderen Gerät abgebrochen.",
             "error_user_cancelled_title": "Anmeldungsanfrage abgebrochen",
-            "error_user_declined": "Sie oder der Kontoanbieter haben die Anmeldeanfrage abgelehnt.",
+            "error_user_declined": "Du oder der Konto-Anbieter haben die Anmeldeanfrage abgelehnt.",
             "error_user_declined_title": "Anmeldung abgelehnt",
-            "follow_remaining_instructions": "Folgen Sie den restlichen Anweisungen.",
-            "open_element_other_device": "Öffnen Sie %(brand)s auf Ihren anderen Gerät",
+            "follow_remaining_instructions": "Folge den restlichen Anweisungen",
+            "open_element_other_device": "Öffne %(brand)s auf deinem anderen Gerät",
             "point_the_camera": "Scanne den hier angezeigten QR-Code",
             "scan_code_instruction": "Scanne den QR-Code mit einem weiteren Gerät.",
             "scan_qr_code": "Anmeldung mit QR-Code",
             "security_code": "Sicherheitscode",
-            "security_code_prompt": "Wenn Sie dazu aufgefordert werden, geben Sie den folgenden Code auf Ihrem anderen Gerät ein.",
+            "security_code_prompt": "Wenn du dazu aufgefordert wirst, gib den folgenden Code auf deinem anderen Gerät ein.",
             "select_qr_code": "Wähle \"%(scanQRCode)s\"",
             "unsupported_explainer": "Dein Kontoanbieter unterstützt keine Anmeldung bei einem neuen Gerät per QR-Code.",
             "unsupported_heading": "QR-Code nicht unterstützt",
@@ -308,8 +306,8 @@
         "registration_disabled": "Registrierungen wurden auf diesem Heim-Server deaktiviert.",
         "registration_msisdn_field_required_invalid": "Telefonnummer eingeben (auf diesem Heim-Server erforderlich)",
         "registration_successful": "Registrierung erfolgreich",
-        "registration_username_in_use": "Dieser Benutzername wird bereits verwendet. Wählen Sie einen anderen Benutzernamen oder melden Sie sich unten an.",
-        "registration_username_unable_check": "Es kann nicht überprüft werden, ob der Benutzername bereits vergeben ist. Bitte versuchen Sie es später erneut.",
+        "registration_username_in_use": "Dieser Nutzername wird bereits verwendet. Wähle einen anderen Nutzernamen oder melde dich unten an, sollte es dein Name sein.",
+        "registration_username_unable_check": "Es kann nicht überprüft werden, ob der Nutzername bereits vergeben ist. Bitte versuche es später erneut.",
         "registration_username_validation": "Verwende nur Kleinbuchstaben, Zahlen, Bindestriche und Unterstriche",
         "reset_password": {
             "confirm_new_password": "Neues Passwort bestätigen",
@@ -376,7 +374,7 @@
         "sso_complete_in_browser_dialog_title": "Browser öffnen, um die Anmeldung abzuschließen",
         "sso_failed_missing_storage": "Wir haben deinen Browser gebeten, sich zu merken, bei welchem Heim-Server du dich anmeldest, aber dein Browser hat dies leider vergessen. Gehe zur Anmeldeseite und versuche es erneut.",
         "sso_or_username_password": "%(ssoButtons)s oder %(usernamePassword)s",
-        "sync_footer_subtitle": "Du bist einer Menge Räumen beigetreten, das kann eine Weile dauern",
+        "sync_footer_subtitle": "Du bist einer Menge Chats beigetreten, das kann eine Weile dauern",
         "syncing": "Synchronisiere …",
         "uia": {
             "code": "Code",
@@ -385,9 +383,9 @@
             "email_resend_prompt": "Nicht angekommen? <a>Erneut senden</a>",
             "email_resent": "Verschickt!",
             "fallback_button": "Authentifizierung beginnen",
-            "mas_cross_signing_reset_cta": "Gehen Sie zu Ihren Konto",
-            "mas_cross_signing_reset_description": "Setzen Sie Ihre Identität über Ihren Kontoanbieter zurück. Kommen Sie dann zurück und klicken Sie auf „Wiederholen“.",
-            "mas_cross_signing_reset_title": "Gehen sie zu ihrem Konto, um ihre Identität zurückzusetzen",
+            "mas_cross_signing_reset_cta": "Weiter zum Konto",
+            "mas_cross_signing_reset_description": "Du wirst zu deinem %(serverName)s Konto weitergeleitet, um deine Identität zurückzusetzen. Sobald die Rücksetzung des Kontos abgeschlossen ist, kehre hierher zurück und klicke auf „Wiederholen“.",
+            "mas_cross_signing_reset_title": "Gehe zum Konto, um deine Identität zurückzusetzen",
             "msisdn": "Eine Textnachricht wurde an %(msisdn)s gesendet",
             "msisdn_token_incorrect": "Token fehlerhaft",
             "msisdn_token_prompt": "Bitte gib den darin enthaltenen Code ein:",
@@ -401,24 +399,24 @@
             "sso_postauth_title": "Bestätige um fortzufahren",
             "sso_preauth_body": "Zum Fortfahren, nutze „Single Sign-On“ um deine Identität zu bestätigen.",
             "sso_title": "Einmalanmeldung zum Fortfahren nutzen",
-            "terms": "Bitte sieh dir alle Bedingungen dieses Heim-Servers an und akzeptiere sie:",
+            "terms": "Bitte sieh dir alle Bedingungen dieses Konto-Anbieters an und akzeptiere sie:",
             "terms_invalid": "Bitte prüfe und akzeptiere alle Richtlinien des Heim-Servers"
         },
         "unsupported_auth": "Dieser Heim-Server verfügt über keines von dieser Anwendung unterstütztes Anmeldeverfahren.",
         "unsupported_auth_email": "Dieser Heim-Server unterstützt die Anmeldung per E-Mail-Adresse nicht.",
         "unsupported_auth_msisdn": "Dieser Server unterstützt keine Authentifizierung per Telefonnummer.",
         "username_field_required_invalid": "Benutzername eingeben",
-        "username_in_use": "Dieser Benutzername wird bereits verwendet. Bitte wählen Sie einen anderen Benutzernamen.",
+        "username_in_use": "Dieser Nutzername wird bereits verwendet. Bitte wähle einen anderen.",
         "verify_email_explainer": "Wir müssen wissen, dass du es auch wirklich bist, bevor wir dein Passwort zurücksetzen. Klicke auf den Link in der E-Mail, die wir gerade an <b>%(email)s</b> gesendet haben",
         "verify_email_heading": "Verifiziere deine E-Mail, um fortzufahren"
     },
     "bug_reporting": {
-        "additional_context": "Wenn es mehr Informationen gibt, die uns bei der Auswertung des Problems würden – z. B. was du getan hast, Raum- oder Benutzer-IDs … – gib sie bitte hier an.",
+        "additional_context": "Wenn es mehr Informationen für die Auswertung des Problems gibt – z. B. was du getan hast, Chat- oder Benutzer-IDs … – gib sie bitte hier an.",
         "before_submitting": "Bevor du Protokolldateien übermittelst, musst du <a>auf GitHub einen \"Issue\" erstellen</a> um dein Problem zu beschreiben.",
         "collecting_information": "App-Versionsinformationen werden abgerufen",
         "collecting_logs": "Protokolle werden abgerufen",
         "create_new_issue": "Bitte <newIssueLink>erstelle ein neues Issue</newIssueLink> auf GitHub damit wir diesen Fehler untersuchen können.",
-        "description": "Fehlerberichte enthalten Applikationsnutzungsdaten wie Ihren Benutzernamen and Ihre Pseudonyme oder jene Ihrer Chatpartner, die IDs und Namen von Chaträumen, in denen Sie Mitglied sind und Elementen der Benutzeroberfläche mit denen Sie kürzlich interagiert haben. Fehlerberichte enthalten keine Nachrichten.",
+        "description": "Fehlerberichte enthalten Nutzungsdaten der App, wie den Nutzernamen, die IDs und Namen von Chats, die du besucht hast, die kürzlich verwendeten Bedienelement im Interface und die Namen anderer Nutzer. Fehlerberichte enthalten keine Nachrichten.",
         "download_logs": "Protokolle herunterladen",
         "downloading_logs": "Lade Protokolle herunter",
         "error_empty": "Bitte teile uns mit, was schief lief - oder besser, beschreibe das Problem auf GitHub in einem \"Issue\".",
@@ -535,8 +533,8 @@
             "one": "%(count)s Mitglied"
         },
         "n_rooms": {
-            "one": "%(count)s Raum",
-            "other": "%(count)s Räume"
+            "one": "%(count)s Chat",
+            "other": "%(count)s Chats"
         },
         "name": "Name",
         "no_results": "Keine Ergebnisse",
@@ -546,7 +544,7 @@
         "offline": "Offline",
         "on": "An",
         "options": "Optionen",
-        "orphan_rooms": "Andere Räume",
+        "orphan_rooms": "Andere Chats",
         "password": "Passwort",
         "people": "Personen",
         "preferences": "Präferenzen",
@@ -554,20 +552,20 @@
         "preview_message": "Hey du. Du bist großartig!",
         "privacy": "Privatsphäre",
         "private": "Privat",
-        "private_room": "Privater Raum",
+        "private_room": "Privater Chat",
         "private_space": "Privater Space",
         "profile": "Profil",
         "public": "Öffentlich",
-        "public_room": "Öffentlicher Raum",
+        "public_room": "Öffentlicher Chat",
         "public_space": "Öffentlicher Space",
         "qr_code": "QR-Code",
         "random": "Ohne Thema",
         "reactions": "Reaktionen",
         "recommended": "Empfohlen",
         "report_a_bug": "Einen Fehler melden",
-        "room": "Raum",
-        "room_name": "Raumname",
-        "rooms": "Räume",
+        "room": "Chat",
+        "room_name": "Chatname",
+        "rooms": "Chats",
         "save": "Speichern",
         "saved": "Gespeichert",
         "saving": "Speichere …",
@@ -575,10 +573,10 @@
         "select_all": "Alle auswählen",
         "server": "Server",
         "settings": "Einstellungen",
-        "setup_secure_messages": "Richte sichere Nachrichten ein",
+        "setup_secure_messages": "Sichere Nachrichten einrichten",
         "show_more": "Mehr zeigen",
         "someone": "Jemand",
-        "space": "Raum",
+        "space": "Space",
         "spaces": "Spaces",
         "sticker": "Sticker",
         "stickerpack": "Sticker-Paket",
@@ -593,30 +591,29 @@
         "unavailable": "Nicht verfügbar",
         "unencrypted": "Unverschlüsselt",
         "unmute": "Stummschalten aufheben",
-        "unnamed_room": "Unbenannter Raum",
+        "unnamed_room": "Unbenannter Chat",
         "unnamed_space": "Unbenannter Space",
         "unverified": "Nicht verifiziert",
         "updating": "Aktualisieren...",
         "user": "Benutzer",
         "user_avatar": "Profilbild",
         "username": "Benutzername",
-        "verification_cancelled": "Verifikation abgebrochen",
         "verified": "Verifiziert",
         "version": "Version",
         "video": "Video",
-        "video_room": "Videoraum",
+        "video_room": "Videochat",
         "view_message": "Nachricht anzeigen",
         "warning": "Warnung"
     },
     "composer": {
         "autocomplete": {
-            "@room_description": "Alle im Raum benachrichtigen",
+            "@room_description": "Alle im Chat benachrichtigen",
             "command_a11y": "Autovervollständigung aktivieren",
             "command_description": "Befehle",
             "emoji_a11y": "Emoji-Auto-Vervollständigung",
             "notification_a11y": "Benachrichtigung Autovervollständigen",
-            "notification_description": "Raum-Benachrichtigung",
-            "room_a11y": "Raum-Auto-Vervollständigung",
+            "notification_description": "Chat-Benachrichtigung",
+            "room_a11y": "Chat-Auto-Vervollständigung",
             "space_a11y": "Spaces automatisch vervollständigen",
             "user_a11y": "Nutzer-Auto-Vervollständigung",
             "user_description": "Benutzer"
@@ -645,19 +642,20 @@
         },
         "mode_plain": "Formatierung ausblenden",
         "mode_rich_text": "Formatierung anzeigen",
-        "no_perms_notice": "Du hast keine Berechtigung, etwas in diesen Raum zu senden",
-        "placeholder": "Nachricht senden …",
-        "placeholder_encrypted": "Verschlüsselte Nachricht senden …",
-        "placeholder_reply": "Antwort senden …",
-        "placeholder_reply_encrypted": "Verschlüsselte Antwort senden …",
-        "placeholder_thread": "Nachricht an Thread senden …",
-        "placeholder_thread_encrypted": "Verschlüsselte Nachricht an Thread senden …",
+        "no_perms_notice": "Du darfst in diesem Chat nichts schreiben",
+        "placeholder": "Unverschlüsselte Nachricht senden...",
+        "placeholder_encrypted": "Nachricht senden …",
+        "placeholder_reply": "Unverschlüsselte Antwort senden…",
+        "placeholder_reply_encrypted": "Antwort senden…",
+        "placeholder_thread": "Antwort auf unverschlüsselten Thread…",
+        "placeholder_thread_encrypted": "Auf Thread antworten…",
         "poll_button": "Umfrage",
-        "poll_button_no_perms_description": "Du bist nicht berechtigt, Umfragen in diesem Raum zu beginnen.",
+        "poll_button_no_perms_description": "Du darfst in diesem Chat keine Umfragen erstellen.",
         "poll_button_no_perms_title": "Berechtigung benötigt",
         "replying_title": "Antwortet",
-        "room_upgraded_link": "Die Konversation wird hier fortgesetzt.",
-        "room_upgraded_notice": "Dieser Raum wurde ersetzt und ist nicht länger aktiv.",
+        "room_unencrypted": "Nachrichten in diesem Chat sind nicht Ende-zu-Ende verschlüsselt",
+        "room_upgraded_link": "Der Chat geht hier weiter.",
+        "room_upgraded_notice": "Dieser Chat wurde ersetzt und ist nicht länger aktiv.",
         "send_button_title": "Nachricht senden",
         "send_button_voice_message": "Sprachnachricht senden",
         "send_voice_message": "Sprachnachricht senden",
@@ -668,45 +666,45 @@
     "console_scam_warning": "Wenn dir jemand gesagt hat, dass du hier etwas einfügen sollst, ist die Wahrscheinlichkeit sehr groß, dass du von der Person betrogen wirst!",
     "console_wait": "Warte!",
     "create_room": {
-        "action_create_room": "Raum erstellen",
-        "action_create_video_room": "Videoraum erstellen",
-        "encrypted_video_room_warning": "Dies kann später nicht deaktiviert werden. Der Raum wird verschlüsselt sein, nicht aber der eingebettete Anruf.",
+        "action_create_room": "Chat erstellen",
+        "action_create_video_room": "Videochat erstellen",
+        "encrypted_video_room_warning": "Dies kann später nicht deaktiviert werden. Der Chat wird verschlüsselt, nicht aber der eingebettete Anruf.",
         "encrypted_warning": "Du kannst dies später nicht deaktivieren. Brücken und die meisten Bots werden noch nicht funktionieren.",
-        "encryption_forced": "Für deinen Server muss die Verschlüsselung in privaten Räumen aktiviert sein.",
+        "encryption_forced": "Dein Server erfordert die Verschlüsselung in privaten Chats.",
         "encryption_label": "Ende-zu-Ende-Verschlüsselung aktivieren",
-        "error_title": "Raumerstellung fehlgeschlagen",
+        "error_title": "Chaterstellung fehlgeschlagen",
         "generic_error": "Server ist nicht verfügbar, überlastet oder du bist auf einen Programmfehler gestoßen.",
-        "join_rule_change_notice": "Du kannst das jederzeit in den Raumeinstellungen ändern.",
-        "join_rule_invite": "Privater Raum (Einladung erforderlich)",
-        "join_rule_invite_label": "Nur eingeladene Personen können den Raum finden und betreten.",
-        "join_rule_knock_label": "Jeder kann Anfragen beizutreten, aber Admins oder Moderatoren müssen dies bestätigen. Du kannst dies später ändern.",
-        "join_rule_public_label": "Alle können diesen Raum finden und betreten.",
-        "join_rule_public_parent_space_label": "Finden und Betreten ist allen, nicht nur Mitgliedern von <SpaceName/>, möglich.",
+        "join_rule_change_notice": "Du kannst das jederzeit in den Chat Einstellungen ändern.",
+        "join_rule_invite": "Privater Chat (Einladung erforderlich)",
+        "join_rule_invite_label": "Nur eingeladene Personen können den Chat finden und ihm beitreten.",
+        "join_rule_knock_label": "Jeder kann den Beitritt zum Chat erbitten, aber ein Admin oder Moderator muss die Anfrage akzeptieren. Du kannst dies später ändern.",
+        "join_rule_public_label": "Alle können diesen Chat finden und ihm beitreten.",
+        "join_rule_public_parent_space_label": "Jeder kann den Chat finden oder ihm beitreten, nicht nur Mitglieder von <SpaceName/>.",
         "join_rule_restricted": "Für Space-Mitglieder sichtbar",
-        "join_rule_restricted_label": "Mitglieder von <SpaceName/> können diesen Raum finden und betreten.",
-        "name_validation_required": "Bitte gib einen Namen für den Raum ein",
-        "room_visibility_label": "Raumsichtbarkeit",
-        "title_private_room": "Einen privaten Raum erstellen",
-        "title_public_room": "Öffentlichen Raum erstellen",
-        "title_video_room": "Videoraum erstellen",
+        "join_rule_restricted_label": "Mitglieder von <SpaceName/> können diesen Chat finden und ihm beitreten.",
+        "name_validation_required": "Bitte gib einen Namen für den Chat ein",
+        "room_visibility_label": "Chat Sichtbarkeit",
+        "title_private_room": "Erstelle einen privaten Chat",
+        "title_public_room": "Erstelle einen öffentlichen Chat",
+        "title_video_room": "Videochat erstellen",
         "topic_label": "Thema (optional)",
         "unfederated": "Betreten nur für Nutzer von %(serverName)s erlauben.",
-        "unfederated_label_default_off": "Du solltest dies aktivieren, wenn der Raum nur für die Zusammenarbeit mit Benutzern von deinem Heim-Server verwendet werden soll. Dies kann später nicht mehr geändert werden.",
-        "unfederated_label_default_on": "Du solltest dies deaktivieren, wenn der Raum für die Zusammenarbeit mit Benutzern von anderen Heim-Server verwendet werden soll. Dies kann später nicht mehr geändert werden.",
-        "unsupported_version": "Der Server unterstützt die angegebene Raumversion nicht."
+        "unfederated_label_default_off": "Du solltest dies aktivieren, wenn der Chat ausschließlich für die Zusammenarbeit mit Nutzern deines Homeservers verwendet werden soll. Dies kann später nicht mehr geändert werden.",
+        "unfederated_label_default_on": "Du solltest dies deaktivieren, wenn der Chat für die Zusammenarbeit mit Nutzern von anderen Homeservern verwendet werden soll. Dies kann später nicht mehr geändert werden.",
+        "unsupported_version": "Der Server unterstützt die angegebene Chat-Version nicht."
     },
     "create_space": {
         "add_details_prompt": "Gib einige Infos über deinen neuen Space an.",
         "add_details_prompt_2": "Du kannst diese jederzeit ändern.",
-        "add_existing_rooms_description": "Wähle Räume oder Konversationen die du hinzufügen willst. Dieser Space ist nur für dich, niemand wird informiert. Du kannst später mehr hinzufügen.",
+        "add_existing_rooms_description": "Wähle Chats, die du hinzufügen willst. Dieser Space ist nur für dich, niemand wird informiert. Du kannst später mehr hinzufügen.",
         "add_existing_rooms_heading": "Was willst du organisieren?",
         "address_label": "Adresse",
         "address_placeholder": "z. B. mein-space",
         "creating": "Erstelle …",
-        "creating_rooms": "Erstelle Räume …",
+        "creating_rooms": "Erstelle Chats …",
         "done_action": "Zu meinem Space",
-        "done_action_first_room": "Zum ersten Raum springen",
-        "explainer": "Spaces sind eine neue Möglichkeit, Räume und Personen zu gruppieren. Welche Art von Space willst du erstellen? Du kannst dies später ändern.",
+        "done_action_first_room": "Zum ersten Chat springen",
+        "explainer": "Spaces sind eine neue Möglichkeit, Chats zu gruppieren. Welche Art von Space willst du erstellen? Du kannst dies später ändern.",
         "failed_create_initial_rooms": "Fehler beim Initialisieren des Space",
         "failed_invite_users": "Die folgenden Leute konnten nicht eingeladen werden: %(csvUsers)s",
         "invite_teammates_by_username": "Mit Benutzername einladen",
@@ -716,9 +714,10 @@
         "label": "Neuen Space erstellen",
         "name_required": "Gib den Namen des Spaces ein",
         "personal_space": "Nur für mich",
-        "personal_space_description": "Ein privater Space zum Organisieren deiner Räume",
+        "personal_space_description": "Ein privater Space zum Organisieren deiner Chats",
         "private_description": "Nur für Eingeladene – optimal für dich selbst oder Teams",
         "private_heading": "Dein privater Space",
+        "private_only_heading": "Dein Space",
         "private_personal_description": "Stelle sicher, dass die richtigen Personen Zugriff auf %(name)s haben",
         "private_personal_heading": "Für wen ist dieser Space gedacht?",
         "private_space": "Für mich und meine Kollegen",
@@ -726,10 +725,10 @@
         "public_description": "Öffne den Space für alle - am besten für Communitys",
         "public_heading": "Dein öffentlicher Space",
         "search_public_button": "Öffentliche Spaces suchen",
-        "setup_rooms_community_description": "Lass uns für jedes einen Raum erstellen.",
+        "setup_rooms_community_description": "Lass uns für jedes einen Chat erstellen.",
         "setup_rooms_community_heading": "Welche Themen willst du in %(spaceName)s besprechen?",
         "setup_rooms_description": "Du kannst später weitere hinzufügen, auch bereits bestehende.",
-        "setup_rooms_private_description": "Wir werden für jedes einen Raum erstellen.",
+        "setup_rooms_private_description": "Wir werden für jedes einen Chat erstellen.",
         "setup_rooms_private_heading": "Welche Projekte bearbeitet euer Team?",
         "share_description": "Momentan bist nur du hier. Mit anderen Leuten wird es noch viel besser.",
         "share_heading": "%(name)s teilen",
@@ -750,17 +749,17 @@
         "twemoji_colr": "Die Schriftart <colr>twemoji-colr</colr> ist © <author>Mozilla Foundation</author> und wird unter den Bedingungen von <terms>Apache 2.0</terms> verwendet."
     },
     "decline_invitation_dialog": {
-        "confirm": "Sind Sie sicher, dass Sie die Einladung zur Teilnahme an \"%(roomName)s\" ablehnen möchten?",
-        "ignore_user_help": "Von diesem Benutzer werden Ihnen keine Nachrichten oder Chatroomeinladungen angezeigt.",
-        "reason_description": "Beschreiben Sie den Grund für die Meldung dieses Chatrooms.",
-        "report_room_description": "Melden Sie diesen Raum Ihrem Kontoanbieter.",
+        "confirm": "Möchtest du wirklich die Einladung zu \"%(roomName)s\" ablehnen?",
+        "ignore_user_help": "Von diesem Nutzer werden keine Nachrichten oder Chateinladungen angezeigt.",
+        "reason_description": "Beschreibe den Grund für die Meldung dieses Chats.",
+        "report_room_description": "Melde diesen Chat deinem Konto-Anbieter.",
         "title": "Einladung ablehnen"
     },
     "desktop_default_device_name": "%(brand)s Desktop: %(platformName)s",
     "devtools": {
         "active_widgets": "Aktive Widgets",
         "category_other": "Sonstiges",
-        "category_room": "Raum",
+        "category_room": "Chat",
         "caution_colon": "Vorsicht:",
         "client_versions": "Anwendungsversionen",
         "crypto": {
@@ -786,6 +785,7 @@
             "cross_signing_status": "Status der Kreuzsignatur",
             "cross_signing_untrusted": "Ihr Konto hat eine Cross-Signing-Identität im sicheren Speicher, der von dieser Sitzung jedoch noch nicht als vertrauenswürdig eingestuft wird.",
             "crypto_not_available": "Das kryptografische Modul ist nicht verfügbar",
+            "device_id": "Geräte-ID",
             "key_backup_active_version": "Aktive Backup Version:",
             "key_backup_active_version_none": "Keine",
             "key_backup_inactive_warning": "Für die Schlüssel dieser Session gibt es kein Backup",
@@ -798,11 +798,24 @@
             "secret_storage_ready": "bereit",
             "secret_storage_status": "Geheimer Speicher:",
             "self_signing_private_key_cached_status": "Selbstsignierender privater Schlüssel:",
+            "session": "Sitzung",
+            "session_fingerprint": "Fingerabdruck (Sitzungsschlüssel)",
             "title": "Ende-zu-Ende Verschlüsselung",
             "user_signing_private_key_cached_status": "Privater Schlüssel zur Benutzersignatur:"
         },
         "developer_mode": "Entwicklungsmodus",
         "developer_tools": "Entwicklungswerkzeuge",
+        "device_dehydrated_no": "Dehydriert: Nein",
+        "device_dehydrated_yes": "Dehydriert: Ja",
+        "device_id": "Geräte-ID:%(deviceId)s",
+        "device_keys": "Geräteschlüssel",
+        "device_verification_status": {
+            "signed_by_owner": "Verifizierungsstatus:<E2EIcon /> Vom Eigentümer signiert",
+            "unknown": "Verifizierungsstatus: Unbekannt",
+            "unverified": "Verifizierungsstatus:<E2EIcon /> Nicht vom Eigentümer signiert",
+            "verified": "Verifizierungsstatus:<E2EIcon /> Durch Cross-Signing bestätigt"
+        },
+        "devices": "Kryptografische Geräte (%(count)s )",
         "edit_setting": "Einstellung bearbeiten",
         "edit_values": "Werte bearbeiten",
         "empty_string": "<Leere Zeichenkette>",
@@ -811,26 +824,29 @@
         "event_sent": "Ereignis gesendet!",
         "event_type": "Eventtyp",
         "explore_account_data": "Kontodaten erkunden",
-        "explore_room_account_data": "Erkunde Raumkontodaten",
-        "explore_room_state": "Raumstatus erkunden",
+        "explore_room_account_data": "Erkunde Chat-Kontodaten",
+        "explore_room_state": "Chatstatus erkunden",
         "failed_to_find_widget": "Fehler beim Finden dieses Widgets.",
         "failed_to_load": "Fehler beim Laden.",
         "failed_to_save": "Speichern der Einstellungen fehlgeschlagen.",
         "failed_to_send": "Übertragung des Ereignisses fehlgeschlagen!",
         "id": "ID: ",
+        "invalid_device_key_id": "Ungültige Geräteschlüssel-ID",
         "invalid_json": "Scheint kein gültiges JSON zu sein.",
         "level": "Level",
         "low_bandwidth_mode": "Modus für geringe Bandbreite",
         "low_bandwidth_mode_description": "Benötigt kompatiblen Heim-Server.",
         "main_timeline": "Hauptverlauf",
+        "manual_device_verification": "Manuelle Verifizierung des Geräts",
         "no_receipt_found": "Keine Bestätigung gefunden",
         "notification_state": "Benachrichtigungsstand ist <strong>%(notificationState)s</strong>",
         "notifications_debug": "Debug-Modus für Benachrichtigungen",
         "number_of_users": "Benutzeranzahl",
+        "only_joined_members": "Nur Mitglieder",
         "original_event_source": "Ursprüngliche Rohdaten",
-        "room_encrypted": "Raum ist <strong>verschlüsselt ✅</strong>",
-        "room_id": "Raum-ID: %(roomId)s",
-        "room_not_encrypted": "Raum ist <strong>nicht verschlüsselt 🚨</strong>",
+        "room_encrypted": "Chat ist <strong>verschlüsselt ✅</strong>",
+        "room_id": "Chat-ID: %(roomId)s",
+        "room_not_encrypted": "Chat ist <strong>nicht verschlüsselt 🚨</strong>",
         "room_notifications_dot": "Punkt: ",
         "room_notifications_highlight": "Höhepunkt: ",
         "room_notifications_last_event": "Neuestes Ereignis:",
@@ -838,21 +854,21 @@
         "room_notifications_thread_id": "Thread-ID: ",
         "room_notifications_total": "Insgesamt: ",
         "room_notifications_type": "Typ: ",
-        "room_status": "Raumstatus",
+        "room_status": "Chatstatus",
         "room_unread_status_count": {
-            "one": "Ungelesen Status des ChatRooms: <strong>%(status)s</strong>, Anzahl: <strong>%(count)s</strong>",
-            "other": "Ungelesen-Status im Raum: <strong>%(status)s</strong>, Anzahl: <strong>%(count)s</strong>"
+            "one": "Ungelesen Status des Chats: <strong>%(status)s</strong>, Anzahl: <strong>%(count)s</strong>",
+            "other": "Ungelesen-Status des Chats: <strong>%(status)s</strong>, Anzahl: <strong>%(count)s</strong>"
         },
         "save_setting_values": "Einstellungswerte speichern",
         "see_history": "Verlauf anzeigen",
         "send_custom_account_data_event": "Sende benutzerdefiniertes Kontodatenereignis",
-        "send_custom_room_account_data_event": "Sende benutzerdefiniertes Raumdatenereignis",
+        "send_custom_room_account_data_event": "Sende benutzerdefiniertes Chat Daten Event",
         "send_custom_state_event": "Benutzerdefiniertes Status-Event senden",
         "send_custom_timeline_event": "Sende benutzerdefiniertes Ereignis",
         "server_info": "Server-Info",
         "server_versions": "Server-Versionen",
         "settable_global": "Global einstellbar",
-        "settable_room": "Für den Raum einstellbar",
+        "settable_room": "Für den Chat einstellbar",
         "setting_colon": "Einstellung:",
         "setting_definition": "Definition der Einstellung:",
         "setting_id": "Einstellungs-ID",
@@ -860,6 +876,7 @@
             "elementCallUrl": "Element Call URL"
         },
         "settings_explorer": "Einstellungsübersicht",
+        "show_empty_content_events": "Events mit leerem Inhalt anzeigen",
         "show_hidden_events": "Versteckte Ereignisse im Verlauf anzeigen",
         "spaces": {
             "one": "<Leerzeichen>",
@@ -872,19 +889,32 @@
         "toggle_event": "Event umschalten",
         "toolbox": "Werkzeugkasten",
         "use_at_own_risk": "Diese Benutzeroberfläche prüft nicht auf richtige Datentypen. Benutzung auf eigene Gefahr.",
+        "user_avatar": "Avatar: %(avatar)s",
+        "user_displayname": "Anzeigename: %(displayname)s",
+        "user_id": "Nutzer-ID: %(userId)s",
+        "user_no_avatar": "Avatar: <i> Keiner</i>",
+        "user_no_displayname": "Anzeigename: <i> Keiner</i>",
         "user_read_up_to": "Der Benutzer hat gelesen bis: ",
-        "user_read_up_to_ignore_synthetic": "Der Benutzer hat bis (ignoreSynthetic) gelesen: ",
+        "user_read_up_to_ignore_synthetic": "Der Nutzer hat bis (ignoreSynthetic) gelesen: ",
         "user_read_up_to_private": "Benutzer las bis (m.read.private): ",
-        "user_read_up_to_private_ignore_synthetic": "Benutzer las bis (m.read.private;ignoreSynthetic): ",
+        "user_read_up_to_private_ignore_synthetic": "Der Nutzer hat bis (m.read.private;ignoreSynthetic) gelesen: ",
+        "user_room_membership": "Mitgliedschaft: %(membership)s",
+        "user_verification_status": {
+            "identity_changed": "Verifizierungsstatus: <E2EIcon /> Nicht verifiziert und Identität geändert",
+            "unverified": "Verifizierungsstatus: <E2EIcon /> Nicht verifiziert",
+            "verified": "Verifizierungsstatus: <E2EIcon /> Verifiziert",
+            "was_verified": "Verifizierungsstatus: <E2EIcon /> Wurde verifiziert, aber die Identität hat sich geändert."
+        },
+        "users": "Nutzer",
         "value": "Wert",
         "value_colon": "Wert:",
-        "value_in_this_room": "Wert in diesem Raum",
-        "value_this_room_colon": "Wert in diesem Raum:",
+        "value_in_this_room": "Wert in diesem Chat",
+        "value_this_room_colon": "Wert in diesem Chat:",
         "values_explicit": "Werte für explizite Stufen",
         "values_explicit_colon": "Werte für explizite Stufen:",
-        "values_explicit_room": "Werte für explizite Stufen in diesem Raum",
-        "values_explicit_this_room_colon": "Werte für explizite Stufen in diesem Raum:",
-        "view_servers_in_room": "Zeige Server im Raum",
+        "values_explicit_room": "Werte für explizite Stufen in diesem Chat",
+        "values_explicit_this_room_colon": "Werte für explizite Stufen in diesem Chat:",
+        "view_servers_in_room": "Zeige Server im Chat",
         "view_source_decrypted_event_source": "Entschlüsselte Rohdaten",
         "view_source_decrypted_event_source_unavailable": "Entschlüsselte Quelle nicht verfügbar",
         "widget_screenshots": "Bildschirmfotos für unterstützte Widgets"
@@ -907,29 +937,31 @@
     "emoji_picker": {
         "cancel_search_label": "Suche abbrechen"
     },
-    "empty_room": "Leerer Raum",
-    "empty_room_was_name": "Leerer Raum (war %(oldName)s)",
+    "empty_room": "Leerer Chat",
+    "empty_room_was_name": "Leerer Chat (war %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
+            "alternatives": "Sicherheitsschlüssel oder Sicherheitsphrase funktionieren auch.",
             "key_validation_text": {
-                "wrong_security_key": "Falscher Wiederherstellungsschlüssel"
+                "wrong_security_key": "Der eingegebene Wiederherstellungsschlüssel ist nicht korrekt."
             },
+            "privacy_warning": "Stelle sich, dass niemand diesen Bildschirm sehen kann!",
             "restoring": "Schlüssel aus der Sicherung wiederherstellen",
-            "security_key_title": "Wiederherstellungsschlüssel"
+            "security_key_label": "Wiederherstellungsschlüssel",
+            "security_key_title": "Gib deinen Wiederherstellungsschlüssel ein"
         },
         "bootstrap_title": "Schlüssel werden eingerichtet",
-        "cancel_entering_passphrase_description": "Bist du sicher, dass du die Eingabe der Passphrase abbrechen möchtest?",
-        "cancel_entering_passphrase_title": "Eingabe der Passphrase abbrechen?",
         "confirm_encryption_setup_body": "Klick die Schaltfläche unten um die Einstellungen der Verschlüsselung zu bestätigen.",
         "confirm_encryption_setup_title": "Bestätige die Einrichtung der Verschlüsselung",
-        "cross_signing_room_normal": "Dieser Raum ist Ende-zu-Ende verschlüsselt",
-        "cross_signing_room_verified": "Alle in diesem Raum sind verifiziert",
+        "cross_signing_room_normal": "Dieser Chat ist Ende-zu-Ende verschlüsselt",
+        "cross_signing_room_verified": "Alle in diesem Chat sind verifiziert",
         "cross_signing_room_warning": "Jemand verwendet eine unbekannte Sitzung",
         "cross_signing_user_normal": "Du hast diesen Nutzer nicht verifiziert.",
         "cross_signing_user_verified": "Du hast diesen Nutzer verifiziert. Der Nutzer hat alle seine Sitzungen verifiziert.",
         "cross_signing_user_warning": "Dieser Benutzer hat nicht alle seine Sitzungen verifiziert.",
-        "enter_recovery_key": "Geben Sie den Wiederherstellungsschlüssel ein",
+        "enter_recovery_key": "Gib den Wiederherstellungsschlüssel ein",
         "event_shield_reason_authenticity_not_guaranteed": "Die Echtheit dieser verschlüsselten Nachricht kann auf diesem Gerät nicht garantiert werden.",
+        "event_shield_reason_mismatched_sender": "Der Absender des Events passt nicht zum Besitzer des Geräts, das es gesendet hat.",
         "event_shield_reason_mismatched_sender_key": "Von einer nicht verifizierten Sitzung verschlüsselt",
         "event_shield_reason_unknown_device": "Durch ein unbekanntes oder gelöschtes Gerät verschlüsselt.",
         "event_shield_reason_unsigned_device": "Durch ein von Besitzer nicht verifiziertes Gerät verschlüsselt.",
@@ -939,7 +971,7 @@
         "import_invalid_keyfile": "Keine gültige %(brand)s-Schlüsseldatei",
         "import_invalid_passphrase": "Authentifizierung fehlgeschlagen: Falsches Passwort?",
         "key_storage_out_of_sync": "Ihr Schlüsselspeicher ist nicht synchronisiert.",
-        "key_storage_out_of_sync_description": "Bestätigen Sie Ihren Wiederherstellungsschlüssel, um weiterhin auf Ihren Schlüsselspeicher und den Nachrichtenverlauf zugreifen zu können.",
+        "key_storage_out_of_sync_description": "Bestätige deinen Wiederherstellungsschlüssel, um weiterhin Zugriff auf den Schlüsselspeicher und den Nachrichtenverlauf zu haben.",
         "messages_not_secure": {
             "cause_1": "Dein Heim-Server",
             "cause_2": "Der Heim-Server der Person, die du verifizierst",
@@ -962,11 +994,8 @@
             "title": "Wiederherstellungsmethode gelöscht",
             "warning": "Wenn du die Wiederherstellungsmethode nicht gelöscht hast, kann ein Angreifer versuchen, Zugang zu deinem Konto zu bekommen. Ändere dein Passwort und richte sofort eine neue Wiederherstellungsmethode in den Einstellungen ein."
         },
-        "reset_all_button": "Hast du alle Wiederherstellungsmethoden vergessen? <a>Setze sie hier zurück</a>",
         "set_up_recovery": "Wiederherstellung einrichten",
-        "set_up_recovery_later": "Nicht jetzt",
-        "set_up_recovery_toast_description": "Generieren Sie einen Wiederherstellungsschlüssel, damit Sie Ihren verschlüsselten Nachrichtenverlauf wiederherstellen können, falls Sie den Zugriff auf Ihre Geräte verlieren.",
-        "set_up_toast_description": "Schütze dich vor dem Verlust verschlüsselter Nachrichten und Daten",
+        "set_up_recovery_toast_description": "Erzeuge einen Wiederherstellungsschlüssel. Er wird verwendet, um den verschlüsselten Nachrichtenverlauf wiederherzustellen, falls du den Zugriff auf deine Geräte verlierst.",
         "set_up_toast_title": "Schlüsselsicherung einrichten",
         "setup_secure_backup": {
             "explainer": "Um deine Schlüssel nicht zu verlieren, musst du sie vor der Abmeldung sichern."
@@ -987,16 +1016,17 @@
             "after_new_login": {
                 "device_verified": "Gerät verifiziert",
                 "skip_verification": "Verifizierung vorläufig überspringen",
-                "unable_to_verify": "Gerät konnte nicht verifiziert werden",
                 "verify_this_device": "Dieses Gerät verifizieren"
             },
-            "cancelled": "Du hast die Verifikation abgebrochen.",
-            "cancelled_self": "Verifizierung am anderen Gerät abgebrochen.",
-            "cancelled_user": "%(displayName)s hat die Verifikationsanfrage abgelehnt.",
+            "cancelled_verification": "Entweder ist die Anforderung abgelaufen, wurde abgelehnt oder es liegt eine Fehler bei der Verifizierung vor.",
             "cancelling": "Abbrechen…",
+            "cant_confirm": "Bestätigung nicht möglich?",
             "complete_action": "Verstanden",
             "complete_description": "Du hast diesen Benutzer erfolgreich verifiziert.",
             "complete_title": "Verifiziert!",
+            "confirm_identity_description": "Verifiziere dieses Gerät, um sichere Nachrichten einzurichten",
+            "confirm_identity_title": "Bestätige deine Identität",
+            "confirm_the_emojis": "Vergewissere dich, dass die unten stehenden Emojis mit denen auf dem anderen Gerät übereinstimmen.",
             "error_starting_description": "Der Unterhaltungsbeginn mit dem anderen Benutzer war uns nicht möglich.",
             "error_starting_title": "Verifizierungbeginn fehlgeschlagen",
             "explainer": "Sichere Nachrichten mit diesem Benutzer sind Ende-zu-Ende-verschlüsselt und können nicht von Dritten gelesen werden.",
@@ -1007,66 +1037,80 @@
             "incoming_sas_dialog_waiting": "Warte auf Bestätigung des Gesprächspartners …",
             "incoming_sas_user_dialog_text_1": "Überprüfe diesen Benutzer, um ihn als vertrauenswürdig zu kennzeichnen. Benutzern zu vertrauen gibt dir zusätzliche Sicherheit bei der Verwendung von Ende-zu-Ende-verschlüsselten Nachrichten.",
             "incoming_sas_user_dialog_text_2": "Wenn du diesen Benutzer verifizierst werden seine Sitzungen für dich und deine Sitzungen für ihn als vertrauenswürdig markiert.",
-            "no_key_or_device": "Es sieht so aus, als hätten Sie weder einen Wiederherstellungsschlüssel noch andere Geräte, mit denen Sie Ihre Identität bestätigen können. Dieses Gerät kann nicht auf alte verschlüsselte Nachrichten zugreifen. Um Ihre Identität auf diesem Gerät zu bestätigen, müssen Sie Ihre Bestätigungsschlüssel zurücksetzen.",
+            "manual": {
+                "already_verified": "Dieses Gerät ist bereits verifiziert worden",
+                "already_verified_and_wrong_fingerprint": "Der angegebene Fingerabdruck passt nicht, aber das Gerät ist bereits verifiziert!",
+                "device_id": "Geräte-ID",
+                "failure_description": "Fehler beim Verifizieren von „%(deviceId)s“: %(error)s",
+                "failure_title": "Verifizierung fehlgeschlagen",
+                "fingerprint": "Fingerabdruck (Sitzungsschlüssel)",
+                "no_crypto": "Gerät kann nicht verifiziert werden – Verschlüsselung ist nicht aktiviert",
+                "no_device": "Gerät kann nicht verifiziert werden – Gerät „%(deviceId)s“ wurde nicht gefunden.",
+                "no_userid": "Gerät kann nicht verifiziert werden – Nutzer-ID wurde nicht gefunden",
+                "success_description": "Das Gerät (%(deviceId)s) ist jetzt verifiziert",
+                "success_title": "Verifizierung erfolgreich",
+                "text": "Gib die Geräte-ID und den Fingerabdruck eines deiner eigenen Geräte zur Verifizierung ein. HINWEIS: Dadurch kann das andere Gerät Nachrichten in deinem Namen senden und empfangen. WENN DICH JEMAND AUFGEFORDERT HAT, HIER ETWAS EINZUFÜGEN, WIRST DU WAHRSCHEINLICH BETROGEN!",
+                "wrong_fingerprint": "Das Gerät „%(deviceId)s” kann nicht verifiziert werden – der angegebene Fingerabdruck „%(fingerprint)s” stimmt nicht mit dem Fingerabdruck des Geräts „%(fprint)s” überein"
+            },
             "no_support_qr_emoji": "Das Gerät unterstützt weder Verifizieren mittels QR-Code noch Emoji-Verifizierung. %(brand)s benötigt dies jedoch. Bitte verwende eine andere Anwendung.",
+            "now_you_can": "Jetzt kannst du Nachrichten sicher lesen oder senden, und alle, mit denen du chattest, können diesem Gerät auch vertrauen.",
+            "once_accepted_can_continue": "Nach der Annahme kannst du mit der Verifizierung fortfahren.",
             "other_party_cancelled": "Die Gegenstelle hat die Überprüfung abgebrochen.",
-            "prompt_encrypted": "Verifiziere alle Benutzer in einem Raum um die vollständige Sicherheit zu gewährleisten.",
-            "prompt_self": "Starte die Verifikation aus der Benachrichtigung erneut.",
-            "prompt_unencrypted": "Verifiziere alle Benutzer in verschlüsselten Räumen, um die Sicherheit zu garantieren.",
-            "prompt_user": "Starte die Verifikation aus dem Benutzerprofil erneut.",
+            "prompt_encrypted": "Verifiziere alle Nutzer in einem Chat um vollständige Sicherheit zu gewährleisten.",
+            "prompt_unencrypted": "Verifiziere alle Nutzer in verschlüsselten Chats, um die Sicherheit zu garantieren.",
             "qr_or_sas": "%(qrCode)s oder %(emojiCompare)s",
-            "qr_or_sas_header": "Verifiziere dieses Gerät mit einer der folgenden Möglichkeiten:",
             "qr_prompt": "Lese diesen eindeutigen Code ein",
-            "qr_reciprocate_same_shield_device": "Fast geschafft! Zeigen beide Geräte das selbe Wappen an?",
+            "qr_reciprocate_check_again_device": "Schau nochmal auf deinem anderen Gerät nach, um die Verifizierung abzuschließen.",
+            "qr_reciprocate_no": "Nein, ich sehe kein grünes Schild",
             "qr_reciprocate_same_shield_user": "Fast geschafft! Wird bei %(displayName)s das gleiche Schild angezeigt?",
-            "request_toast_accept": "Sitzung verifizieren",
+            "qr_reciprocate_yes": "Ja, ich sehe ein grünes Schild",
             "request_toast_accept_user": "Benutzer verifizieren",
-            "request_toast_decline_counter": "Blockiert (%(counter)s)",
+            "request_toast_decline_counter": "Ignoriere (%(counter)s)",
             "request_toast_detail": "%(deviceId)s von %(ip)s",
-            "reset_proceed_prompt": "Mit Zurücksetzen fortfahren",
+            "request_toast_start_verification": "Verifizierung starten",
             "sas_caption_self": "Verifiziere dieses Gerät, indem du überprüfst, dass die folgende Zahl auf dem Bildschirm erscheint.",
             "sas_caption_user": "Verifiziere diesen Nutzer, indem du bestätigst, dass die folgende Nummer auf dessen Bildschirm erscheint.",
             "sas_description": "Vergleiche eine einmalige Reihe von Emojis, sofern du an keinem Gerät eine Kamera hast",
-            "sas_emoji_caption_self": "Bestätige, dass die folgenden Emoji auf beiden Geräten in der gleichen Reihenfolge angezeigt werden:",
             "sas_emoji_caption_user": "Verifiziere diesen Nutzer, indem du bestätigst, dass folgende Emojis auf dessen Bildschirm erscheinen.",
             "sas_match": "Sie stimmen überein",
             "sas_no_match": "Sie stimmen nicht überein",
             "sas_prompt": "Vergleiche einzigartige Emojis",
             "scan_qr": "Verifizierung durch Scannen eines QR-Codes",
             "scan_qr_explainer": "Bitte %(displayName)s, deinen Code zu scannen:",
-            "self_verification_hint": "Akzeptiere die Verifizierungsanfrage am anderen Gerät, um fortzufahren.",
             "start_button": "Verifizierung starten",
-            "successful_device": "Du hast %(deviceName)s (%(deviceId)s) erfolgreich verifiziert!",
-            "successful_own_device": "Du hast dein Gerät erfolgreich verifiziert!",
             "successful_user": "Du hast %(displayName)s erfolgreich verifiziert!",
-            "timed_out": "Verifikationsanfrage abgelaufen.",
             "unsupported_method": "Konnte keine unterstützte Verifikationsmethode finden.",
             "unverified_session_toast_accept": "Ja, das war ich",
             "unverified_session_toast_title": "Neue Anmeldung. Warst du das?",
-            "unverified_sessions_toast_description": "Überprüfe sie, um ein sicheres Konto gewährleisten zu können",
+            "unverified_sessions_toast_description": "Überprüfe, um dein Konto sicher zu halten",
             "unverified_sessions_toast_reject": "Später",
             "unverified_sessions_toast_title": "Du hast nicht verifizierte Sitzungen",
-            "verification_description": "Verifizieren Sie Ihre Identität, um auf verschlüsselte Nachrichten zuzugreifen und sich gegenüber anderen Benutzern zu verifizieren. Falls Sie einen Handy oder ein anderes mobiles Gerät verwenden, öffnen Sie die App dort and fahren sie mit Ihrer Identifikation fort.",
+            "use_another_device": "Nimm ein anderes Gerät",
+            "use_recovery_key": "Wiederherstellungsschlüssel verwenden",
+            "verification_dialog_title_choose": "Wähle aus, wie du dich verifizieren willst",
+            "verification_dialog_title_compare_emojis": "Emojis vergleichen",
+            "verification_dialog_title_confirm_green_shield": "Vergewissern dich, dass auf dem anderen Gerät ein grünes Schild angezeigt wird.",
             "verification_dialog_title_device": "Anderes Gerät verifizieren",
+            "verification_dialog_title_failed": "Verifizierung fehlgeschlagen",
+            "verification_dialog_title_start_on_other_device": "Starte die Verifizierung auf dem anderen Gerät",
             "verification_dialog_title_user": "Verifizierungsanfrage",
+            "verification_dialog_title_verified": "Gerät verifiziert",
             "verification_skip_warning": "Ohne dich zu verifizieren wirst du keinen Zugriff auf alle deine Nachrichten haben und könntest für andere als nicht vertrauenswürdig erscheinen.",
             "verification_success_with_backup": "Dein neues Gerät ist jetzt verifiziert und hat Zugriff auf deine verschlüsselten Nachrichten und anderen wird es als vertrauenswürdig angezeigt werden.",
             "verification_success_without_backup": "Dein neues Gerät ist jetzt verifiziert. Anderen wird es als vertrauenswürdig angezeigt werden.",
+            "verify_by_completing_one_of": "Führe zur Verifizierung einen der folgenden Schritte aus:",
             "verify_emoji": "Mit Emojis verifizieren",
             "verify_emoji_prompt": "Durch den Vergleich einzigartiger Emojis verifizieren.",
             "verify_emoji_prompt_qr": "Wenn du obigen Code nicht erfassen kannst, verifiziere stattdessen durch den Vergleich von Emojis.",
             "verify_later": "Später verifizieren",
-            "verify_using_device": "Mit anderem Gerät verifizieren",
-            "verify_using_key": "Mit Wiederherstellungsschlüssel verifizieren",
-            "verify_using_key_or_phrase": "Mit Wiederherstellungsschlüssel oder Wiederherstellungsphrase verifizieren",
             "waiting_for_user_accept": "Warte auf die Annahme von %(displayName)s …",
             "waiting_other_device": "Warten darauf, dass du das auf deinem anderen Gerät bestätigst…",
             "waiting_other_device_details": "Warten, dass du auf deinem anderen Gerät %(deviceName)s (%(deviceId)s) verifizierst…",
             "waiting_other_user": "Warte darauf, dass %(displayName)s bestätigt…"
         },
         "verification_requested_toast_title": "Verifizierung angefragt",
-        "verified_identity_changed": "%(displayName)s's (<b>%(userId)s</b>) Identität wurde zurückgesetzt. <a>Erfahren Sie mehr </a>",
-        "verified_identity_changed_no_displayname": "<b>%(userId)s</b>Die Identität wurde zurückgesetzt. <a>Erfahren Sie mehr </a>",
+        "verified_identity_changed": "%(displayName)s's (<b>%(userId)s</b>) kryptografische Identität wurde zurückgesetzt. <a>Erfahre mehr</a>",
+        "verified_identity_changed_no_displayname": "Die Identität von <b>%(userId)s</b> wurde zurückgesetzt. <a>Erfahre mehr</a>",
         "verify_toast_description": "Andere Benutzer vertrauen ihr vielleicht nicht",
         "verify_toast_title": "Sitzung verifizieren",
         "withdraw_verification_action": "Verifizierung zurückziehen"
@@ -1108,6 +1152,7 @@
         "tls": "Verbindung zum Heim-Server fehlgeschlagen – bitte überprüfe die Internetverbindung und stelle sicher, dass dem <a>SSL-Zertifikat deines Heimservers</a> vertraut wird und dass Anfragen nicht durch eine Browser-Erweiterung blockiert werden.",
         "unknown": "Unbekannter Fehler",
         "unknown_error_code": "Unbekannter Fehlercode",
+        "update_history_visibility": "Die Sichtbarkeit des Nachrichtenverlaufs konnte nicht geändert werden",
         "update_power_level": "Ändern der Berechtigungsstufe fehlgeschlagen"
     },
     "error_app_open_in_another_tab": "Wechsle zu einem anderen Tab um mit %(brand)s zu verbinden. Dieser Tab kann jetzt geschlossen werden.",
@@ -1115,16 +1160,16 @@
     "error_app_opened_in_another_window": "%(brand)s läuft bereit in einem anderen Fenster. Klicke \"%(label)s um %(brand)s hier zu nutzen und beende das andere Fenster.",
     "error_database_closed_description": {
         "for_desktop": "Deine Festplatte scheint voll zu sein. Mache Speicherplatz frei und lade erneut.",
-        "for_web": "Diese Meldung wird erwartet, wenn Sie die Browserdaten gelöscht haben. %(brand)s ist möglicherweise auch in einem anderen Tab geöffnet oder Ihre Festplatte ist voll. Bitte machen Sie etwas Speicherplatz frei und laden Sie die Seite neu."
+        "for_web": "Diese Meldung wird angezeigt, wenn du die Browserdaten löschst. %(brand)s ist möglicherweise auch in einem anderen Tab geöffnet oder der Speicherplatz ist voll. Bitte mache etwas Speicherplatz frei und lade die Seite neu."
     },
     "error_database_closed_title": "%(brand)s funktioniert nicht mehr",
     "error_dialog": {
         "copy_room_link_failed": {
-            "description": "Der Link zum Raum konnte nicht kopiert werden.",
-            "title": "Raumlink konnte nicht kopiert werden"
+            "description": "Der Link zum Chat konnte nicht kopiert werden.",
+            "title": "Chat-Link konnte nicht kopiert werden"
         },
         "error_loading_user_profile": "Konnte Nutzerprofil nicht laden",
-        "forget_room_failed": "Das Entfernen des Raums ist fehlgeschlagen %(errCode)s"
+        "forget_room_failed": "Das Entfernen des Chat ist fehlgeschlagen %(errCode)s"
     },
     "error_user_not_logged_in": "Benutzer ist nicht angemeldet",
     "event_preview": {
@@ -1165,7 +1210,7 @@
         "confirm_stop": "Willst du das Exportieren deiner Daten wirklich abbrechen? Falls ja, musst du komplett von neu beginnen.",
         "creating_html": "Erstelle HTML …",
         "creating_output": "Erstelle Ausgabe …",
-        "creator_summary": "%(creatorName)s hat diesen Raum erstellt.",
+        "creator_summary": "%(creatorName)s hat diesen Chat erstellt.",
         "current_timeline": "Aktueller Verlauf",
         "enter_number_between_min_max": "Gib eine Zahl zwischen %(min)s und %(max)s ein",
         "error_fetching_file": "Fehler beim Laden der Datei",
@@ -1231,16 +1276,16 @@
         "sent": "Rückmeldung gesendet"
     },
     "file_panel": {
-        "empty_description": "Hänge Dateien aus der Unterhaltung an oder ziehe sie einfach an eine beliebige Stelle im Raum.",
-        "empty_heading": "Keine Dateien in diesem Raum",
+        "empty_description": "Hänge Dateien aus dem Chat an oder ziehe sie per Drag &amp; Drop an eine beliebige Stelle in einem Chat.",
+        "empty_heading": "Keine Dateien in diesem Chat",
         "guest_note": "Du musst dich <a>registrieren</a>, um diese Funktionalität nutzen zu können",
-        "peek_note": "Du musst den Raum betreten, um die verknüpften Dateien sehen zu können"
+        "peek_note": "Du musst dem Chat beitreten, um seine Dateien sehen zu können"
     },
     "forward": {
-        "filter_placeholder": "Räume oder Leute suchen",
+        "filter_placeholder": "Suche nach Gruppen oder Personen",
         "message_preview_heading": "Nachrichtenvorschau",
         "no_perms_title": "Du bist dazu nicht berechtigt",
-        "open_room": "Raum öffnen",
+        "open_room": "Chat öffnen",
         "send_label": "Senden",
         "sending": "Senden",
         "sent": "Gesendet"
@@ -1283,12 +1328,12 @@
     "incompatible_browser": {
         "continue": "Trotzdem fortfahren",
         "description": "%(brand)s verwendet einige Browser-Funktionen, die von deinem aktuellen Browser nicht unterstützt werden. %(detail)s",
-        "detail_can_continue": "Wenn Sie fortfahren, funktionieren einige Funktionen möglicherweise nicht mehr und es besteht das Risiko, dass Sie in Zukunft Daten verlieren.",
-        "detail_no_continue": "Versuchen Sie, diesen Browser zu aktualisieren, wenn Sie nicht die neueste Version verwenden, und versuchen Sie es erneut.",
+        "detail_can_continue": "Wenn du fortfährst könnten einige Funktionen möglicherweise ausfallen und es besteht das Risiko, in Zukunft Daten zu verlieren.",
+        "detail_no_continue": "Aktualisiere diesen Browser, wenn es nicht die neueste Version ist, und versuche es erneut.",
         "learn_more": "Mehr erfahren",
         "linux": "Linux",
         "macos": "Mac",
-        "supported_browsers": "Verwenden Sie <Chrome>Chrome</Chrome>, <Firefox> Firefox</Firefox>, <Edge>Edge</Edge> oder <Safari>Safari</Safari>, um das beste Erlebnis zu erzielen.",
+        "supported_browsers": "Verwende <Chrome>Chrome</Chrome>, <Firefox>Firefox</Firefox>, <Edge>Edge</Edge> oder <Safari>Safari</Safari> für das beste Erlebnis.",
         "title": "Nicht unterstützter Browser",
         "use_desktop_heading": "Verwende stattdessen %(brand)s Desktop",
         "use_mobile_heading": "Stattdessen %(brand)s am Smartphone benutzen",
@@ -1301,16 +1346,16 @@
         "connecting": "Verbinde mit Integrationsassistent …",
         "error_connecting": "Der Integrationsassistent ist außer Betrieb oder kann deinen Heim-Server nicht erreichen.",
         "error_connecting_heading": "Verbindung zum Integrationsassistenten fehlgeschlagen",
-        "explainer": "Integrationsassistenten erhalten Konfigurationsdaten und können Widgets modifizieren, Raumeinladungen verschicken und in deinem Namen Berechtigungslevel setzen.",
+        "explainer": "Integrations-Manager erhalten Konfigurationsdaten, können Widgets modifizieren, Chat-Einladungen verschicken und in deinem Namen Berechtigungen setzen.",
         "manage_title": "Integrationen verwalten",
-        "toggle_label": "Aktivieren Sie den Integrationsmanager",
+        "toggle_label": "Aktiviere den Integrations-Manager",
         "use_im": "Verwende einen Integrations-Server, um Bots, Widgets und Sticker-Pakete zu verwalten.",
         "use_im_default": "Nutze einen Integrations-Server <b>(%(serverName)s)</b>, um Bots, Widgets und Sticker-Pakete zu verwalten."
     },
     "integrations": {
         "disabled_dialog_description": "Aktiviere „%(manageIntegrations)s“ in den Einstellungen, um dies zu tun.",
         "disabled_dialog_title": "Integrationen sind deaktiviert",
-        "impossible_dialog_description": "%(brand)s erlaubt es Ihnen nicht, eine Integrationsverwaltung zu verwenden. Bitte kontaktieren Sie einen Administrator.",
+        "impossible_dialog_description": "%(brand)s erlaubt es nicht, den Integrations-Manager zu verwenden. Bitte kontaktiere einen Admin.",
         "impossible_dialog_title": "Integrationen sind nicht erlaubt"
     },
     "invite": {
@@ -1323,31 +1368,35 @@
         "email_use_is": "Verwende einen Identitäts-Server, um per E-Mail-Adresse einladen zu können. Lege einen in den <settings>Einstellungen</settings> fest.",
         "error_already_invited_room": "Die Person wurde bereits eingeladen",
         "error_already_invited_space": "Die Person wurde bereits eingeladen",
-        "error_already_joined_room": "Die Person ist bereits im Raum",
+        "error_already_joined_room": "Die Person ist bereits im Chat",
         "error_already_joined_space": "Die Person ist bereits im Space",
-        "error_bad_state": "Gesperrte Benutzer können nicht eingeladen werden.",
+        "error_bad_state": "Gesperrte Nutzer können nicht eingeladen werden.",
         "error_dm": "Wir konnten deine Direktnachricht nicht erstellen.",
         "error_find_room": "Beim Einladen der Nutzer lief etwas schief.",
         "error_find_user_description": "Folgende Nutzer konnten nicht eingeladen werden, da sie nicht existieren oder ungültig sind: %(csvNames)s",
         "error_find_user_title": "Folgenden Nutzer konnten nicht gefunden werden",
-        "error_invite": "Wir konnten diese Personen nicht einladen. Bitte überprüfe sie und versuche es erneut.",
-        "error_permissions_room": "Du hast keine Berechtigung, Personen in diesen Raum einzuladen.",
+        "error_invite": "Diese Personen konnten nicht einladen werden. Bitte überprüfe sie und versuche es erneut.",
+        "error_permissions_room": "Du hast keine Berechtigung, Personen in diesen Chat einzuladen.",
         "error_permissions_space": "Du hast keine Berechtigung, Personen in diesen Space einzuladen.",
         "error_profile_undisclosed": "Diese Person existiert möglicherweise nicht",
         "error_transfer_multiple_target": "Ein Anruf kann nur auf einen einzelnen Nutzer übertragen werden.",
-        "error_unfederated_room": "Dieser Raum förderiert nicht. Du kannst keine Personen von externen Servern einladen.",
+        "error_unfederated_room": "Dieser Chat förderiert nicht. Du kannst keine Personen von externen Servern einladen.",
         "error_unfederated_space": "Dieser Space förderiert nicht. Du kannst keine Personen von externen Servern einladen.",
         "error_unknown": "Unbekannter Server-Fehler",
         "error_user_not_found": "Diese Person existiert nicht",
-        "error_version_unsupported_room": "Die Raumversion wird vom Heim-Server des Benutzers nicht unterstützt.",
+        "error_version_unsupported_room": "Die Chat-Version wird vom Homeserver des Nutzers nicht unterstützt.",
         "error_version_unsupported_space": "Die Space-Version wird vom Heim-Server des Benutzers nicht unterstützt.",
         "failed_generic": "Aktion fehlgeschlagen",
         "failed_title": "Einladen fehlgeschlagen",
         "invalid_address": "Nicht erkannte Adresse",
-        "name_email_mxid_share_room": "Lade jemanden mittels Name, E-Mail-Adresse oder Benutzername (wie <userId/>) ein, oder <a>teile diesen Raum</a>.",
+        "name_email_mxid_share_room": "Lade jemanden mittels Name, E-Mail-Adresse oder Nutzername (wie <userId/>) ein, oder <a>teile diesen Chat</a>.",
         "name_email_mxid_share_space": "Lade Leute mittels Anzeigename, E-Mail-Adresse oder Benutzername (z. B. <userId/>) ein oder <a>teile diesen Space</a>.",
-        "name_mxid_share_room": "Lade jemanden mittels Name oder Benutzername (z. B. <userId/>) ein oder <a>teile diesen Raum</a>.",
+        "name_mxid_share_room": "Lade jemanden mittels Name oder Nutzername (z. B. <userId/>) ein oder <a>teile diesen Chat</a>.",
         "name_mxid_share_space": "Lade Leute mittels Anzeigename oder Benutzername (z. B. <userId/>) ein oder <a>teile diesen Space</a>.",
+        "progress": {
+            "dont_close": "Schließe die App nicht, bevor der Vorgang abgeschlossen ist.",
+            "preparing": "Einladungen werden vorbereitet..."
+        },
         "recents_section": "Letzte Unterhaltungen",
         "room_failed_partial": "Die anderen wurden gesendet, aber die folgenden Leute konnten leider nicht in <RoomName/> eingeladen werden",
         "room_failed_partial_title": "Einige Einladungen konnten nicht versendet werden",
@@ -1362,11 +1411,11 @@
         "to_space": "In %(spaceName)s einladen",
         "transfer_dial_pad_tab": "Wähltastatur",
         "transfer_user_directory_tab": "Benutzerverzeichnis",
-        "unable_find_profiles_description_default": "Profile für die nachfolgenden Matrix-IDs wurden nicht gefunden – willst du sie dennoch einladen?",
+        "unable_find_profiles_description_default": "Profile für die folgenden Matrix-IDs wurden nicht gefunden – willst du sie dennoch einladen?",
         "unable_find_profiles_invite_label_default": "Dennoch einladen",
         "unable_find_profiles_invite_never_warn_label_default": "Trotzdem einladen und mich nicht mehr warnen",
         "unable_find_profiles_title": "Eventuell existieren folgende Benutzer nicht",
-        "unban_first_title": "Benutzer kann nicht eingeladen werden, solange die Sperre nicht aufgehoben worden ist."
+        "unban_first_title": "Nutzer kann nicht eingeladen werden, solange die Sperre nicht aufgehoben worden ist."
     },
     "inviting_user1_and_user2": "Lade %(user1)s und %(user2)s ein",
     "inviting_user_and_n_others": {
@@ -1374,8 +1423,8 @@
         "one": "Lade %(user)s und eine weitere Person ein"
     },
     "items_and_n_others": {
-        "other": "<Items/> und %(count)s andere",
-        "one": "<Items/> und ein weiteres Raummitglied"
+        "one": "<Items/> und ein anderer",
+        "other": "<Items/> und %(count)s andere"
     },
     "keyboard": {
         "activate_button": "Ausgewählten Button aktivieren",
@@ -1389,7 +1438,7 @@
         "category_autocomplete": "Autovervollständigung",
         "category_calls": "Anrufe",
         "category_navigation": "Navigation",
-        "category_room_list": "Raumliste",
+        "category_room_list": "Chatliste",
         "close_dialog_menu": "Dialog oder Kontextmenü schließen",
         "composer_jump_end": "Zum Ende des Eingabefelds springen",
         "composer_jump_start": "Zum Anfang des Eingabefelds springen",
@@ -1412,12 +1461,12 @@
         "home": "Startseite",
         "jump_first_message": "Zur ersten Nachricht springen",
         "jump_last_message": "Zur letzten Nachricht springen",
-        "jump_room_search": "Zur Raumsuche springen",
+        "jump_room_search": "Springe zur Chat Suche",
         "jump_to_read_marker": "Zur ältesten ungelesenen Nachricht springen",
         "keyboard_shortcuts_tab": "Den Einstellungen-Tab öffnen",
-        "navigate_next_history": "Nächster kürzlich besuchter Raum oder Space",
+        "navigate_next_history": "Nächster kürzlich besuchter Chat oder Space",
         "navigate_next_message_edit": "Nächste Nachricht bearbeiten",
-        "navigate_prev_history": "Vorheriger kürzlich besuchter Raum oder Space",
+        "navigate_prev_history": "Vorheriger kürzlich besuchter Chat oder Space",
         "navigate_prev_message_edit": "Vorherige Nachricht bearbeiten",
         "next_landmark": "Zur nächsten Landmark springen",
         "next_room": "Nächste Unterhaltung",
@@ -1429,11 +1478,12 @@
         "prev_landmark": "Zur vorherigen Landmark springen",
         "prev_room": "Vorherige Unterhaltung",
         "prev_unread_room": "Vorherige ungelesene Nachricht",
-        "room_list_collapse_section": "Raumliste einklappen",
-        "room_list_expand_section": "Raumliste ausklappen",
-        "room_list_navigate_down": "Nächster Eintrag der Raumliste",
-        "room_list_navigate_up": "Vorheriger Eintrag der Raumliste",
-        "room_list_select_room": "Wähle eine Raum aus der Raumliste",
+        "room_list_collapse_section": "Chatliste einklappen",
+        "room_list_expand_section": "Chatliste ausklappen",
+        "room_list_navigate_down": "Nächster Eintrag der Chatliste",
+        "room_list_navigate_up": "Vorheriger Eintrag der Chatliste",
+        "room_list_select_room": "Wähle eine Chat aus der Chatliste",
+        "save": "Speichern",
         "scroll_down_timeline": "Im Verlauf nach unten springen",
         "scroll_up_timeline": "Im Verlauf nach oben springen",
         "search": "Suchen (muss in den Einstellungen aktiviert sein)",
@@ -1450,7 +1500,6 @@
         "upload_file": "Eine Datei hochladen"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Nur-Bildschirm-Teilen-Modus erlauben",
         "ask_to_join": "Beitrittsanfragen erlauben",
         "automatic_debug_logs": "Sende bei Fehlern automatisch Protokolle zur Fehlerkorrektur",
         "automatic_debug_logs_decryption": "Sende bei Entschlüsselungsfehlern automatisch Protokolle zur Fehlerkorrektur",
@@ -1460,19 +1509,19 @@
         "beta_feedback_leave_button": "Du kannst die Beta in den Einstellungen deaktivieren.",
         "beta_feedback_title": "Rückmeldung zur %(featureName)s-Beta",
         "beta_section": "Zukünftige Funktionen",
-        "bridge_state": "Informationen zu Brücken im Raum",
+        "bridge_state": "Zeige Informationen zu Brücken im Chat Einstellungen",
         "bridge_state_channel": "Kanal: <channelLink/>",
         "bridge_state_creator": "Diese Brücke wurde von <user /> bereitgestellt.",
         "bridge_state_manager": "Diese Brücke wird von <user /> verwaltet.",
-        "bridge_state_workspace": "Arbeitsraum: <networkLink/>",
+        "bridge_state_workspace": "Workspace: <networkLink/>",
         "click_for_info": "Klicke für mehr Infos",
         "currently_experimental": "Aktuell experimentell.",
         "custom_themes": "Selbstdefinierte Designs",
-        "dynamic_room_predecessors": "Veränderbare Raumvorgänger",
-        "dynamic_room_predecessors_description": "MSC3946 aktivieren (zur Verknüpfung von Raumarchiven nach der Raumerstellung)",
-        "element_call_video_rooms": "Element Call-Videoräume",
+        "dynamic_room_predecessors": "Veränderbare Chat Vorgänger",
+        "dynamic_room_predecessors_description": "MSC3946 aktivieren (zur Verknüpfung von Chat Archiven nach der Chat Erstellung)",
+        "element_call_video_rooms": "Element Call-Videochats",
         "exclude_insecure_devices": "Unsichere Geräte ausschließen beim senden/empfangen von Nachrichten",
-        "exclude_insecure_devices_description": "Bei Aktivierung dieses Modus werden verschlüsselte Nachrichten nicht mehr mit unverifizierten Geräten geteilt und Nachrichten von unverifizierten Geräten werden als Fehler angezeigt. Beachten Sie, dass bei Aktivierung dieses Modus es nicht möglich ist, mit Benutzern, die keine verifizierten Geräte haben, zu kommunizieren.",
+        "exclude_insecure_devices_description": "Bei Aktivierung dieser Einstellung werden verschlüsselte Nachrichten nicht mehr mit unverifizierten Geräten geteilt und Nachrichten von unverifizierten Geräten werden als Fehler angezeigt. Beachte, dass es bei Aktivierung dieser Einstellung nicht mehr möglich ist, mit Nutzern zu kommunizieren, die keine verifizierten Geräte haben.",
         "experimental_description": "Experimentierfreudig? Probiere unsere neuesten, sich in Entwicklung befindlichen Ideen aus. Diese Funktionen sind nicht final; Sie könnten instabil sein, sich verändern oder sogar ganz entfernt werden. <a>Erfahre mehr</a>.",
         "experimental_section": "Frühe Vorschauen",
         "extended_profiles_msc_support": "Erfordert die Unterstützung von MSC4133 durch den Server",
@@ -1485,7 +1534,7 @@
         "group_messaging": "Kommunikation",
         "group_moderation": "Moderation",
         "group_profile": "Profil",
-        "group_rooms": "Räume",
+        "group_rooms": "Chats",
         "group_spaces": "Spaces",
         "group_themes": "Themen",
         "group_threads": "Themen",
@@ -1493,7 +1542,7 @@
         "group_voip": "Anrufe",
         "group_widgets": "Widgets",
         "hidebold": "Benachrichtigungspunkt ausblenden (nur Zähler zeigen)",
-        "html_topic": "Zeige die HTML-Darstellung von Raumthemen",
+        "html_topic": "Zeige die HTML-Darstellung von Chat Themen",
         "join_beta": "Beta beitreten",
         "join_beta_reload": "Die Teilnahme an der Beta wird %(brand)s neustarten.",
         "jump_to_date": "Zu Datum springen ( /jumptodate bzw. Zu Datum springen im Header)",
@@ -1502,31 +1551,34 @@
         "leave_beta": "Beta verlassen",
         "leave_beta_reload": "Das Verlassen der Beta wird %(brand)s neustarten.",
         "location_share_live": "Echtzeit-Standortfreigabe",
-        "location_share_live_description": "Vorläufige Implementierung: Standorte verbleiben im Raumverlauf.",
-        "mjolnir": "Neue Methoden, Personen zu blockieren",
+        "location_share_live_description": "Vorläufige Implementierung: Standorte verbleiben im Nachrichtenverlauf.",
+        "mjolnir": "Neue Methoden, Personen zu ignorieren",
         "msc3531_hide_messages_pending_moderation": "Erlaube Moderatoren, noch nicht moderierte Nachrichten auszublenden.",
         "new_room_list": "Neue Chatroomliste aktivieren",
         "notification_settings": "Neue Benachrichtigungseinstellungen",
         "notification_settings_beta_caption": "Einen einfacheren Weg um die Einstellungen für Benachrichtigungen zu ändern vorstellen. Passe Deine %(brand)s so an wie Du willst.",
         "notification_settings_beta_title": "Benachrichtigungseinstellungen",
-        "notifications": "Benachrichtigungen in der Kopfleiste des Raums anschalten",
+        "notifications": "Benachrichtigungen in der Chat-Kopfzeile einschalten",
         "release_announcement": "Release Ankündigung",
         "render_reaction_images": "Benutzerdefinierte Bilder in Reaktionen anzeigen",
         "render_reaction_images_description": "Werden manchmal auch als „benutzerdefinierte Emojis“ bezeichnet.",
-        "report_to_moderators": "An Raummoderation melden",
-        "report_to_moderators_description": "In Räumen, die Moderation unterstützen, lässt dich die Schaltfläche „Melden“ missbräuchliche Verwendung an die Raummoderation melden.",
+        "report_to_moderators": "An Moderatoren melden",
+        "report_to_moderators_description": "In Chats, die Moderation unterstützen, kannst du mit der Schaltfläche „Melden“ missbräuchliche Verwendung an die Moderatoren melden.",
+        "share_history_on_invite": "Teile den verschlüsselten Nachrichtenverlauf mit neuen Mitgliedern",
+        "share_history_on_invite_description": "Wenn du einen Nutzer in einen Chat einlädst, bei dem die die Sichtbarkeit der Historie auf \"geteilt\" eingestellt ist, wird der verschlüsselte Nachrichtenverlauf mit diesem Nutzer geteilt. Du akzeptierst damit auch, einen solchen verschlüsselten Nachrichtenverlauf zu empfangen, wenn du selbst in einen solchen Chat eingeladen wirst.",
+        "share_history_on_invite_warning": "Diese Funktion ist EXPERIMENTELL und nicht alle Sicherheitsmaßnahmen sind aktiviert. Bitte nicht auf Konten verwenden, die für den Produktions-Betrieb gedacht sind.",
         "sliding_sync": "Sliding-Sync-Modus",
-        "sliding_sync_description": "In aktiver Entwicklung, kann nicht deaktiviert werden.",
+        "sliding_sync_description": "In aktiver Entwicklung, kann nicht deaktiviert werden. Derzeit nicht mit Element Call kompatibel.",
         "sliding_sync_disabled_notice": "Zum Deaktivieren, melde dich ab und erneut an",
         "sliding_sync_server_no_support": "Dein Server wird hier nicht unterstützt.",
         "under_active_development": "In aktiver Entwicklung.",
-        "unrealiable_e2e": "Nicht zuverlässig in verschlüsselten Räumen",
-        "video_rooms": "Videoräume",
+        "unrealiable_e2e": "Nicht zuverlässig in verschlüsselten Chats",
+        "video_rooms": "Videochats",
         "video_rooms_a_new_way_to_chat": "Eine neue Möglichkeit in %(brand)s über Audio und Video zu kommunizieren.",
-        "video_rooms_always_on_voip_channels": "Videoräume sind dauerhaft aktive VoIP-Kanäle, die in einem Raum in %(brand)s eingebettet sind.",
-        "video_rooms_beta": "Videoräume sind eine Betafunktion",
-        "video_rooms_faq1_answer": "Verwende die „+“-Schaltfläche des Räumebereichs der linken Seitenleiste.",
-        "video_rooms_faq1_question": "Wie kann ich einen Videoraum erstellen?",
+        "video_rooms_always_on_voip_channels": "Videochats sind dauerhaft aktive VoIP-Kanäle, die in einem Chat in %(brand)s eingebettet sind.",
+        "video_rooms_beta": "Videochats sind eine Beta-Funktion",
+        "video_rooms_faq1_answer": "Verwende die „+“-Schaltfläche des Chat-Bereichs der linken Seitenleiste.",
+        "video_rooms_faq1_question": "Wie kann ich einen Videochat erstellen?",
         "video_rooms_faq2_answer": "Ja, der Verlauf wird neben dem Videoanruf angezeigt.",
         "video_rooms_faq2_question": "Kann ich während Videoanrufen auch Textnachrichten verschicken?",
         "video_rooms_feedbackSubheading": "Danke, dass Du die Beta ausprobierst. Bitte gehe soweit wie Du kannst ins Detail damit wird genau überprüfen können.",
@@ -1535,44 +1587,44 @@
     "labs_mjolnir": {
         "advanced_warning": "⚠ Diese Einstellungen sind für fortgeschrittene Nutzer gedacht.",
         "ban_reason": "Ignoriert/Blockiert",
-        "error_adding_ignore": "Fehler beim Blockieren eines Nutzers/Servers",
-        "error_adding_list_description": "Bitte überprüfe die Raum-ID oder -adresse und versuche es erneut.",
+        "error_adding_ignore": "Fehler beim Ignorieren eines Nutzers/Servers",
+        "error_adding_list_description": "Bitte überprüfe die Chat-ID oder -adresse und versuche es erneut.",
         "error_adding_list_title": "Fehler beim Abonnieren der Liste",
-        "error_removing_ignore": "Fehler beim Entfernen eines blockierten Benutzers/Servers",
-        "error_removing_list_description": "Bitte versuche es erneut oder sieh für weitere Hinweise in deine Konsole.",
+        "error_removing_ignore": "Fehler beim Entfernen eines ignorierten Nutzers/Servers",
+        "error_removing_list_description": "Bitte versuche es erneut oder beachte weitere Hinweise in der Konsole.",
         "error_removing_list_title": "Fehler beim Deabonnieren der Liste",
-        "explainer_1": "Füge hier die Benutzer und Server hinzu, die du blockieren willst. Verwende Sternchen, um %(brand)s alle Zeichen abgleichen zu lassen. So würde <code>@bot:*</code> alle Benutzer mit dem Namen „bot“, auf jedem beliebigen Server, blockieren.",
+        "explainer_1": "Füge hier die Nutzer und Server hinzu, die du ignorieren willst. Verwende Sternchen, um %(brand)s alle Zeichen abgleichen zu lassen. So würde <code>@bot:*</code> alle Nutzer mit dem Namen „bot“ auf jedem beliebigen Server blockieren.",
         "explainer_2": "Das Ignorieren von Personen erfolgt über Sperrlisten. Wenn eine Sperrliste abonniert wird, werden die von dieser Liste blockierten Benutzer und Server ausgeblendet.",
         "lists": "Du abonnierst momentan:",
         "lists_description_1": "Eine Verbotsliste abonnieren bedeutet ihr beizutreten!",
-        "lists_description_2": "Wenn dies nicht das ist, was du willst, verwende ein anderes Werkzeug, um Benutzer zu blockieren.",
+        "lists_description_2": "Wenn dies nicht das ist, was du willst, verwende eine andere Funktion, um Nutzer zu blockieren.",
         "lists_heading": "Abonnierte Listen",
-        "lists_new_label": "Raum-ID oder Adresse der Verbotsliste",
+        "lists_new_label": "Chat-ID oder Adresse der Sperrliste",
         "no_lists": "Du hast keine Listen abonniert",
-        "personal_description": "Deine persönliche Sperrliste enthält alle Benutzer/Server, von denen du keine Nachrichten erhalten möchtest. Nachdem du den ersten Benutzer/Server ignoriert hast, wird ein neuer Raum namens „%(myBanList)s“ erstellt – bleibe in diesem Raum, um die Sperrliste zu erhalten.",
-        "personal_empty": "Du hast niemanden blockiert.",
+        "personal_description": "Deine persönliche Sperrliste enthält alle Nutzer/Server, von denen du keine Nachrichten erhalten möchtest. Nachdem du den ersten Nutzer/Server ignoriert hast, wird ein neuer Chat namens „%(myBanList)s“ erstellt – bleibe in diesem Chat, um die Sperrliste zu erhalten.",
+        "personal_empty": "Du hast niemanden ignoriert.",
         "personal_heading": "Persönliche Sperrliste",
-        "personal_new_label": "Zu blockierende Server- oder Benutzer-ID",
+        "personal_new_label": "Zu ignorierende Server- oder Nutzer-ID",
         "personal_new_placeholder": "z. B. @bot:* oder example.org",
         "personal_section": "Du ignorierst momentan:",
         "room_name": "Meine Bannliste",
-        "room_topic": "Dies ist die Liste von Benutzer und Servern, die du blockiert hast – verlasse diesen Raum nicht!",
+        "room_topic": "Dies ist die Liste von Nutzern und Servern, die du gesperrt hast – verlasse diesen Chat nicht!",
         "rules_empty": "Nichts",
         "rules_server": "Server-Regeln",
         "rules_title": "Verbotslistenregeln - %(roomName)s",
         "rules_user": "Nutzerregeln",
         "something_went_wrong": "Etwas ist schief gelaufen. Bitte versuche es erneut oder sieh für weitere Hinweise in deiner Konsole nach.",
-        "title": "Blockierte Benutzer",
+        "title": "Ignorierte Nutzer",
         "view_rules": "Regeln öffnen"
     },
     "language_dropdown_label": "Sprachauswahl",
     "leave_room_dialog": {
-        "last_person_warning": "Du bist die einzige Person im Raum. Sobald du ihn verlässt, wird niemand mehr hineingelangen, auch du nicht.",
-        "leave_room_question": "Bist du sicher, dass du den Raum „%(roomName)s“ verlassen möchtest?",
+        "last_person_warning": "Du bist die einzige Person hier. Wenn du gehst, kann in Zukunft niemand mehr eintreten, auch du nicht.",
+        "leave_room_question": "Bist du sicher, dass du den Chat „%(roomName)s“ verlassen möchtest?",
         "leave_space_question": "Bist du sicher, dass du den Space „%(spaceName)s“ verlassen möchtest?",
-        "room_leave_admin_warning": "Sie sind der einzige Administrator in diesem Chatroom. Wenn Sie den Chatroom verlassen, wird niemand in der Lage sein, die Chatroommeinstellungen zu ändern oder andere wichtige Maßnahmen zu ergreifen.",
-        "room_leave_mod_warning": "Sie sind der einzige Moderator in diesem Chatroom. Wenn Sie den Chatroom verlassen, kann niemand die Raumeinstellungen ändern oder andere wichtige Maßnahmen ergreifen.",
-        "room_rejoin_warning": "Dieser Raum ist nicht öffentlich. Du wirst ihn nicht ohne erneute Einladung betreten können.",
+        "room_leave_admin_warning": "Du bist der einzige Admin in diesem Chat. Wenn du den Chat verlässt, wird niemand mehr in der Lage sein, die Chat-Einstellungen zu ändern oder andere wichtige Aktionen durchzuführen.",
+        "room_leave_mod_warning": "Du bist der einzige Moderator in diesem Chat. Wenn du den Chat verlässt, kann niemand mehr die Chat-Einstellungen ändern oder andere wichtige Aktionen durchführen.",
+        "room_rejoin_warning": "Dieser Chat ist nicht öffentlich und du kannst ihm ohne Einladung nicht erneut beitreten.",
         "space_rejoin_warning": "Du wirst diesen privaten Space nur mit einer Einladung wieder betreten können."
     },
     "left_panel": {
@@ -1591,7 +1643,7 @@
         "click_move_pin": "Klicke, um den Standort zu bewegen",
         "close_sidebar": "Seitenleiste schließen",
         "error_fetch_location": "Standort konnte nicht abgerufen werden",
-        "error_no_perms_description": "Du benötigst die entsprechenden Berechtigungen, um deinen Echtzeit-Standort in diesem Raum freizugeben.",
+        "error_no_perms_description": "Du benötigst die entsprechenden Berechtigungen, um deinen Echtzeit-Standort in diesem Chat freizugeben.",
         "error_no_perms_title": "Dir fehlt die Berechtigung, Echtzeit-Standorte freigeben zu dürfen",
         "error_send_description": "%(brand)s konnte deinen Standort nicht senden. Bitte versuche es später erneut.",
         "error_send_title": "Wir konnten deinen Standort nicht senden",
@@ -1605,7 +1657,7 @@
         "failed_unknown": "Beim Abruf deines Standortes ist ein unbekannter Fehler aufgetreten. Bitte versuche es später erneut.",
         "find_my_location": "Zeige meinen Standort",
         "live_description": "Echtzeit-Standort von %(displayName)s",
-        "live_enable_description": "Bitte beachte: Dies ist eine experimentelle Funktion, die eine temporäre Implementierung nutzt. Das bedeutet, dass du deinen Standortverlauf nicht löschen kannst und erfahrene Nutzer ihn sehen können, selbst wenn du deinen Echtzeit-Standort nicht mehr mit diesem Raum teilst.",
+        "live_enable_description": "Bitte beachte: Dies ist eine experimentelle Funktion, die eine temporäre Implementierung nutzt. Das bedeutet, dass du deinen Standortverlauf nicht löschen kannst und erfahrene Nutzer ihn sehen können, selbst wenn du deinen Echtzeit-Standort nicht mehr mit diesem Chat teilst.",
         "live_enable_heading": "Echtzeit-Standortfreigabe",
         "live_location_active": "Du teilst deinen Echtzeit-Standort",
         "live_location_enabled": "Echtzeit-Standort aktiviert",
@@ -1633,13 +1685,13 @@
             "one": "%(count)s Mitglied",
             "other": "%(count)s Mitglieder"
         },
-        "filter_placeholder": "Raummitglieder filtern",
+        "filter_placeholder": "Chatmitglieder filtern",
         "invite_button_no_perms_tooltip": "Du bist nicht berechtigt, Benutzer einzuladen",
         "invited_label": "Eingeladen",
-        "no_matches": "Keine Treffer",
-        "power_label": "%(userName)s (Berechtigungslevel %(powerLevelNumber)s)"
+        "list_title": "Mitgliederliste",
+        "no_matches": "Keine Treffer"
     },
-    "member_list_back_action_label": "Raummitglieder",
+    "member_list_back_action_label": "Chatmitglieder",
     "message_edit_dialog_title": "Nachrichtenänderungen",
     "migrating_crypto": "Bleib dran. Wir aktualisieren%(brand)s, um die Verschlüsselung schneller und zuverlässiger zu machen.",
     "mobile_guide": {
@@ -1679,20 +1731,20 @@
         "mentions_keywords": "Erwähnungen und Schlüsselwörter",
         "message_didnt_send": "Nachricht nicht gesendet. Klicke für Details.",
         "mute_description": "Du wirst keine Benachrichtigungen erhalten",
-        "mute_room": "Raum stummschalten"
+        "mute_room": "Chat stummschalten"
     },
     "notifier": {
         "m.key.verification.request": "%(name)s fordert eine Verifizierung an"
     },
     "onboarding": {
-        "create_room": "Gruppenraum erstellen",
-        "explore_rooms": "Öffentliche Räume erkunden",
+        "create_room": "Gruppen Chat erstellen",
+        "explore_rooms": "Öffentliche Chats erkunden",
         "has_avatar_label": "Großartig, das wird anderen helfen, dich zu erkennen",
         "intro_byline": "Besitze deine Unterhaltungen.",
         "intro_welcome": "Willkommen bei %(appName)s",
         "no_avatar_label": "Füge ein Bild hinzu, damit andere dich erkennen können.",
         "send_dm": "Direkt­­nachricht senden",
-        "welcome_detail": "Nun, lassen Sie uns Ihnen den Einstieg erleichtern",
+        "welcome_detail": "Los geht’s – wir helfen dir beim Einstieg",
         "welcome_user": "Willkommen %(name)s"
     },
     "pill": {
@@ -1741,6 +1793,7 @@
     },
     "power_level": {
         "admin": "Administrator",
+        "creator": "Eigentümer",
         "custom": "Benutzerdefiniert (%(level)s)",
         "custom_level": "Selbstdefiniertes Berechtigungslevel",
         "default": "Standard",
@@ -1749,7 +1802,7 @@
         "restricted": "Eingeschränkt"
     },
     "powered_by_matrix": "Betrieben mit Matrix",
-    "powered_by_matrix_with_logo": "Dezentralisierter, verschlüsselter Chat &amp; Zusammenarbeit unterstützt von $matrixLogo",
+    "powered_by_matrix_with_logo": "Dezentraler, verschlüsselter Chat &amp; Zusammenarbeit auf Basis von $matrixLogo",
     "presence": {
         "away": "Abwesend",
         "busy": "Beschäftigt",
@@ -1776,57 +1829,57 @@
     "redact": {
         "confirm_button": "Entfernen bestätigen",
         "confirm_description": "Möchtest du dieses Ereignis wirklich entfernen (löschen)?",
-        "confirm_description_state": "Beachte, dass das Entfernen von Raumänderungen diese rückgängig machen könnte.",
+        "confirm_description_state": "Beachte, dass das Entfernen von Änderungen im Chat diese rückgängig machen könnte.",
         "error": "Diese Nachricht kann nicht gelöscht werden. (%(code)s)",
         "ongoing": "Löschen…",
         "reason_label": "Grund (optional)"
     },
     "report_content": {
-        "description": "Wenn du diese Nachricht meldest, wird die eindeutige Ereignis-ID an die Administration deines Heim-Servers übermittelt. Wenn die Nachrichten in diesem Raum verschlüsselt sind, wird deine Heim-Server-Administration nicht in der Lage sein, Nachrichten zu lesen oder Medien einzusehen.",
+        "description": "Wenn du diese Nachricht meldest, wird die eindeutige Ereignis-ID an den Administrator deines Homeserver übermittelt. Wenn die Nachrichten verschlüsselt sind, kann dein Administrator sie nicht lesen und auch keine Dateien oder Bilder einsehen.",
         "disagree": "Ablehnen",
-        "error_create_room_moderation_bot": "Erstellen des Raums mit Moderations-Bot nicht möglich",
+        "error_create_room_moderation_bot": "Erstellen des Chats mit Moderations-Bot nicht möglich",
         "hide_messages_from_user": "Prüfe, ob du alle aktuellen und zukünftigen Nachrichten dieses Nutzers verstecken willst.",
-        "ignore_user": "Benutzer blockieren",
+        "ignore_user": "Nutzer ignorieren",
         "illegal_content": "Illegale Inhalte",
         "missing_reason": "Bitte gib an, weshalb du einen Fehler meldest.",
         "nature": "Bitte wähle eine Kategorie aus und beschreibe, was die Nachricht missbräuchlich macht.",
-        "nature_disagreement": "Die Person verbreitet Falschinformation.\nDies wird an die Raummoderation gemeldet.",
-        "nature_illegal": "Diese Person verhält sich illegal, beispielsweise durch das Veröffentlichen persönlicher Daten oder Gewaltdrohungen.\nDies wird an die Raummoderation gemeldet, welche dies an die Behörden weitergeben kann.",
-        "nature_nonstandard_admin": "Dieser Raum wurde wegen illegalem oder toxischem Inhalt oder fehlender Moderation an den Administrator von %(homeserver)s gemeldet. ",
-        "nature_nonstandard_admin_encrypted": "Dieser Raum wurde wegen illegalem oder toxischem Inhalt oder fehlender Moderation an den Administrator von %(homeserver)s gemeldet. Der Administrator wird KEINE verschlüsselten Inhalte in diesem Raum lesen können.",
-        "nature_other": "Anderer Grund. Bitte beschreibe das Problem.\nDies wird an die Raummoderation gemeldet.",
-        "nature_spam": "Dieser Benutzer spammt den Raum mit Werbung, Links zu Werbung oder Propaganda.\nDies wird an die Raummoderation gemeldet.",
-        "nature_toxic": "Dieser Benutzer zeigt toxisches Verhalten, etwa durch Beleidigen anderer Personen, Teilen von Erwachseneninhalten in familienfreundlichen Räumen oder anderweitiges Missachten von Raumregeln.\nDies wird an die Raummoderatoren gemeldet.",
+        "nature_disagreement": "Dieser Nutzer verbreitet Falschinformation.\nDies wird an die Moderatoren des Chats gemeldet.",
+        "nature_illegal": "Dieser Nutzer verhält sich illegal, beispielsweise durch das Veröffentlichen persönlicher Daten oder Gewaltdrohungen.\nDies wird an die Moderatoren des Chats gemeldet, welche dies an die Behörden weitergeben können.",
+        "nature_nonstandard_admin": "Dieser Chat wurde wegen illegalem oder toxischem Inhalt oder fehlender Moderation an den Administrator von %(homeserver)s gemeldet.",
+        "nature_nonstandard_admin_encrypted": "Dieser Chat wurde wegen illegalem oder toxischem Inhalt oder fehlender Moderation an den Administrator von %(homeserver)s gemeldet. Der Administrator wird KEINE verschlüsselten Inhalte in diesem Chat lesen können.",
+        "nature_other": "Anderer Grund. Bitte beschreibe das Problem.\nDies wird an die Moderatoren des Chats gemeldet.",
+        "nature_spam": "Dieser Nutzer spammt den Chat mit Werbung, Links zu Werbung oder Propaganda.\nDies wird an die Moderatoren des Chats gemeldet.",
+        "nature_toxic": "Dieser Benutzer zeigt toxisches Verhalten, etwa durch Beleidigen anderer Personen, Teilen von Erwachseneninhalten in familienfreundlichen Chat oder anderweitiges Missachten von Regeln.\nDies wird an die Moderatoren des Chats gemeldet.",
         "other_label": "Sonstiges",
         "report_content_to_homeserver": "Inhalte an die Administration deines Heim-Servers melden",
-        "report_entire_room": "Den ganzen Raum melden",
+        "report_entire_room": "Den ganzen Chat melden",
         "spam_or_propaganda": "Spam oder Propaganda",
         "toxic_behaviour": "Toxisches Verhalten"
     },
     "report_room": {
-        "description": "Melden Sie diesen Raum Ihrem Kontoanbieter. Wenn die Nachrichten verschlüsselt sind, kann Ihr Administrator sie nicht lesen.",
-        "reason_label": "Beschreiben Sie den Grund"
+        "description": "Melde diesen Chat deinem Konto-Anbieter. Wenn die Nachrichten verschlüsselt sind, kann dein Administrator sie nicht lesen.",
+        "reason_label": "Beschreibe den Grund"
     },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "Konnte %(failedCount)s Sitzungen nicht entschlüsseln!",
         "count_of_successfully_restored_keys": "%(sessionCount)s Schlüssel erfolgreich wiederhergestellt",
-        "enter_key_description": "Greifen Sie auf Ihren verschlüsselten Nachrichtenverlauf zu und richten Sie sichere Nachrichtensendung ein, indem Sie Ihren Wiederherstellungsschlüssel eingeben.",
-        "enter_key_title": "Geben Sie den Wiederherstellungsschlüssel ein",
+        "enter_key_description": "Gib deinen Wiederherstellungsschlüssel ein, um auf den verschlüsselten Nachrichtenverlauf zuzugreifen und sichere Nachrichten einzurichten.",
+        "enter_key_title": "Gib den Wiederherstellungsschlüssel ein",
         "enter_phrase_description": "Greife auf deinen verschlüsselten Nachrichtenverlauf zu und richte die sichere Kommunikation ein, indem du deine Sicherheitsphrase eingibst.",
         "enter_phrase_title": "Sicherheitsphrase eingeben",
         "incorrect_security_phrase_dialog": "Das Backup konnte mit dieser Sicherheitsphrase nicht entschlüsselt werden: Bitte überprüfe, ob du die richtige eingegeben hast.",
         "incorrect_security_phrase_title": "Falsche Sicherheitsphrase",
         "key_backup_warning": "<b>Warnung</b>: Du solltest die Schlüsselsicherung nur auf einem vertrauenswürdigen Gerät einrichten.",
         "key_fetch_in_progress": "Lade Schlüssel vom Server …",
-        "key_forgotten_text": "Für den Fall, dass Sie Ihren Wiederherstellungsschlüssel vergessen haben, können Sie <button> Neue Wiederherstellungsoptionen einrichten </button>",
+        "key_forgotten_text": "Solltest du den Wiederherstellungsschlüssel vergessen haben, kannst du <button> neue Wiederherstellungsoptionen einrichten</button>",
         "key_is_invalid": "Kein gültiger Wiederherstellungsschlüssel",
-        "key_is_valid": "Das sieht nach einem gültigen Wiederherstellungsschlüssel aus!",
+        "key_is_valid": "Möglicher Wiederherstellungsschlüssel",
         "keys_restored_title": "Schlüssel wiederhergestellt",
         "load_error_content": "Konnte Sicherungsstatus nicht laden",
         "load_keys_progress": "%(completed)s von %(total)s Schlüsseln wiederhergestellt",
         "no_backup_error": "Keine Schlüsselsicherung gefunden!",
-        "phrase_forgotten_text": "Wenn Sie Ihre Sicherheitsphrase vergessen haben, können Sie Ihren Wiederherstellungsschlüssel <button1> verwenden </button1> oder neue Wiederherstellungsoptionen <button2> einrichten </button2>",
-        "recovery_key_mismatch_description": "Das Backup konnte mit diesem Wiederherstellungsschlüssel nicht entschlüsselt werden: Bitte überprüfen Sie, ob Sie den richtigen Wiederherstellungsschlüssel eingegeben haben.",
+        "phrase_forgotten_text": "Solltest du deine Sicherheitsphrase vergessen haben, kannst du deinen <button1>Wiederherstellungsschlüssel verwenden</button1> oder <button2>neue Wiederherstellungsoptionen einrichten</button2>",
+        "recovery_key_mismatch_description": "Das Backup konnte mit diesem Wiederherstellungsschlüssel nicht entschlüsselt werden: Bitte überprüfe, ob du den richtigen Wiederherstellungsschlüssel eingegeben hast.",
         "recovery_key_mismatch_title": "Nicht übereinstimmende Sicherheitsschlüssel",
         "restore_failed_error": "Konnte Schlüsselsicherung nicht wiederherstellen"
     },
@@ -1834,12 +1887,12 @@
         "add_integrations": "Erweiterungen hinzufügen",
         "add_topic": "Thema hinzufügen",
         "extensions_button": "Erweiterungen",
-        "extensions_empty_description": "Wählen Sie \"%(addIntegrations)s\" um Erweiterungen zu suchen und diesem Chatroom hinzuzufügen",
-        "extensions_empty_title": "Steigern Sie die Produktivität mit mehr Tools, Widgets und Bots",
+        "extensions_empty_description": "Wähle \"%(addIntegrations)s\" um Erweiterungen zu suchen und diesem Chat hinzuzufügen",
+        "extensions_empty_title": "Steigere die Produktivität mit mehr Tools, Widgets und Bots",
         "files_button": "Dateien",
         "pinned_messages": {
-            "empty_description": "Wählen Sie eine Nachricht aus und wählen Sie „%(pinAction)s “, um sie hier einzuschließen.",
-            "empty_title": "Hefte wichtige Nachrichten an, damit sie leicht gefunden werden können.",
+            "empty_description": "Wähle „%(pinAction)s“ an einer Nachricht, um sie hier einzufügen.",
+            "empty_title": "Fixiere wichtige Nachrichten, damit sie leicht gefunden werden können.",
             "header": {
                 "one": "1 angeheftete Nachricht",
                 "other": "%(count)s angeheftete Nachrichten"
@@ -1848,15 +1901,10 @@
                 "other": "Du kannst nur %(count)s Widgets anheften"
             },
             "menu": "Menü öffnen",
-            "release_announcement": {
-                "close": "Ok",
-                "description": "Alle angepinnten Nachrichten finden Sie hier. Bewegen Sie den Mauszeiger über eine beliebige Nachricht und wählen Sie „Pin“, um die Nachricht hinzuzufügen.",
-                "title": "Alle neuen angehefteten Nachrichten"
-            },
             "reply_thread": "Auf <link>Nachricht im Thread</link> antworten",
             "unpin_all": {
                 "button": "Alle Nachrichten loslösen",
-                "content": "Stellen Sie sicher, dass Sie wirklich alle angehefteten Nachrichten entfernen möchten. Diese Aktion kann nicht rückgängig gemacht werden.",
+                "content": "Alle fixierten Nachrichten lösen? Diese Aktion kann nicht rückgängig gemacht werden.",
                 "title": "Alle Nachrichten loslösen?"
             },
             "view": "Im Nachrichtenverlauf ansehen"
@@ -1864,13 +1912,13 @@
         "pinned_messages_button": "Angeheftete Nachrichten",
         "poll": {
             "active_heading": "Aktive Umfragen",
-            "empty_active": "In diesem Raum gibt es keine aktiven Umfragen",
+            "empty_active": "In diesem Chat gibt es keine aktiven Umfragen",
             "empty_active_load_more": "Es sind keine aktiven Umfragen verfügbar. Lade weitere Umfragen, um die der vorherigen Monate zu sehen",
             "empty_active_load_more_n_days": {
                 "one": "Für den vergangenen Tag sind keine aktiven Umfragen verfügbar. Lade weitere Umfragen, um die der vorherigen Monate zu sehen",
                 "other": "Für die vergangenen %(count)s Tage sind keine aktiven Umfragen verfügbar. Lade weitere Umfragen, um die der vorherigen Monate zu sehen"
             },
-            "empty_past": "In diesem Raum gibt es keine abgeschlossenen Umfragen",
+            "empty_past": "In diesem Chat gibt es keine beendeten Umfragen",
             "empty_past_load_more": "Es sind keine vergangenen Umfragen verfügbar. Lade weitere Umfragen, um die der vorherigen Monate zu sehen",
             "empty_past_load_more_n_days": {
                 "one": "Für den vergangenen Tag sind keine beendeten Umfragen verfügbar. Lade weitere Umfragen, um die der vorherigen Monate zu sehen",
@@ -1888,7 +1936,7 @@
         },
         "polls_button": "Umfragen",
         "room_summary_card": {
-            "title": "Raum-Info"
+            "title": "Chat-Info"
         },
         "thread_list": {
             "context_menu_label": "Thread-Optionen"
@@ -1910,30 +1958,30 @@
         "banned_by": "Du wurdest von %(memberName)s gebannt",
         "banned_from_room_by": "Du wurdest von %(memberName)s aus %(roomName)s verbannt",
         "context_menu": {
-            "copy_link": "Raumlink kopieren",
+            "copy_link": "Chatlink kopieren",
             "favourite": "Favorit",
-            "forget": "Raum vergessen",
+            "forget": "Chat vergessen",
             "low_priority": "Niedrige Priorität",
             "mark_read": "Als gelesen markieren",
             "mark_unread": "Als ungelesen markieren",
             "notifications_default": "Standardeinstellung verwenden",
-            "notifications_mute": "Raum stumm stellen",
-            "title": "Raumoptionen",
+            "notifications_mute": "Chat stumm stellen",
+            "title": "Chatoptionen",
             "unfavourite": "Favorisiert"
         },
-        "creating_room_text": "Wir erstellen einen Raum mit %(names)s",
-        "dm_invite_action": "Unterhaltung beginnen",
+        "creating_room_text": "Chat mit %(names)s wird erstellt",
+        "dm_invite_action": "Neue Direktnachricht",
         "dm_invite_subtitle": "<userName/> möchte mit dir schreiben",
         "dm_invite_title": "Möchtest du mit %(user)s schreiben?",
         "drop_file_prompt": "Datei hier loslassen zum hochladen",
         "edit_topic": "Thema bearbeiten",
         "error_3pid_invite_email_lookup": "Kann Benutzer nicht via E-Mail-Adresse finden",
         "error_cancel_knock_title": "Abbrechen gescheitert",
-        "error_join_403": "Du kannst diesen Raum nur auf Einladung betreten.",
-        "error_join_404_1": "Du hast versucht einen Raum via Raum-ID, aber ohne Angabe von Servern zu betreten. Raum-IDs sind interne Kennungen und können nicht ohne weitere Informationen zum Betreten von Räumen genutzt werden.",
-        "error_join_404_2": "Falls du eine Adresse kennst, versuche den Raum mit dieser zu betreten.",
-        "error_join_404_invite": "Die dich einladende Person hat den Raum verlassen oder ihr Heim-Server ist außer Betrieb.",
-        "error_join_404_invite_same_hs": "Die Person, die dich eingeladen hat, hat den Raum wieder verlassen.",
+        "error_join_403": "Du kannst diesem Chat nur auf Einladung beitreten.",
+        "error_join_404_1": "Du hast versucht einen Chat via Chat-ID, aber ohne Angabe von Servern zu betreten. Chat-IDs sind interne Kennungen und können nicht ohne weitere Informationen zum Beitritt von Chats genutzt werden.",
+        "error_join_404_2": "Falls du eine Adresse kennst, versuche den Chat mit dieser zu betreten.",
+        "error_join_404_invite": "Die dich einladende Person hat den Chat verlassen oder ihr Homeserver ist offline.",
+        "error_join_404_invite_same_hs": "Die Person, die dich eingeladen hat, hat den Chat wieder verlassen.",
         "error_join_connection": "Es gab einen Fehler beim Betreten.",
         "error_join_incompatible_version_1": "Verzeihung, dein Heim-Server ist hierfür zu alt.",
         "error_join_incompatible_version_2": "Bitte setze dich mit der Administration deines Heim-Servers in Verbindung.",
@@ -1954,60 +2002,61 @@
         },
         "face_pile_tooltip_shortcut": "Inklusive %(commaSeparatedMembers)s",
         "face_pile_tooltip_shortcut_joined": "Mit dir, %(commaSeparatedMembers)s",
+        "failed_determine_user": "Es kann nicht ermittelt werden, welcher Nutzer ignoriert werden soll, da sich die Mitgliedschaft geändert hat.",
         "failed_reject_invite": "Ablehnen der Einladung ist fehlgeschlagen",
-        "forget_room": "Diesen Raum entfernen",
+        "forget_room": "Diesen Chat entfernen",
         "forget_space": "Diesen Space vergessen",
         "header": {
             "n_people_asking_to_join": {
                 "one": "Möchte beitreten",
                 "other": "%(count)s Personen möchten beitreten"
             },
-            "room_is_public": "Dieser Raum ist öffentlich"
+            "room_is_public": "Dieser Chat ist öffentlich"
         },
-        "header_avatar_open_settings_label": "Raumeinstellungen öffnen",
+        "header_avatar_open_settings_label": "Chateinstellungen öffnen",
         "header_face_pile_tooltip": "Personen",
         "header_untrusted_label": "Nicht vertrauenswürdig",
-        "inaccessible": "Dieser Raum oder Space ist im Moment nicht zugänglich.",
+        "inaccessible": "Dieser Chat oder Space ist im Moment nicht zugänglich.",
         "inaccessible_name": "Auf %(roomName)s kann momentan nicht zugegriffen werden.",
-        "inaccessible_subtitle_1": "Versuche es später erneut oder bitte einen Raum- oder Space-Admin um eine Zutrittserlaubnis.",
+        "inaccessible_subtitle_1": "Versuche es später erneut oder bitte einen Chat- oder Space-Admin um Erlaubnis für Zugriff.",
         "inaccessible_subtitle_2": "%(errcode)s wurde während des Betretens zurückgegeben. Wenn du denkst, dass diese Meldung nicht korrekt ist, <issueLink>reiche bitte einen Fehlerbericht ein</issueLink>.",
         "intro": {
+            "display_topic": "Thema: <topic/>",
             "dm_caption": "Nur ihr beide nehmt an dieser Konversation teil, es sei denn, ihr ladet jemanden ein.",
+            "edit_topic": "Thema: <topic/> (<a>bearbeiten</a>)",
             "enable_encryption_prompt": "Aktiviere Verschlüsselung in den Einstellungen.",
-            "encrypted_3pid_dm_pending_join": "Sobald alle den Raum betreten hat, könnt ihr euch unterhalten",
-            "no_avatar_label": "Füge ein Bild hinzu, damit andere deinen Raum besser erkennen können.",
+            "encrypted_3pid_dm_pending_join": "Sobald alle den Chat betreten hat, könnt ihr euch unterhalten",
+            "no_avatar_label": "Füge ein Bild hinzu, damit andere deinen Chat besser erkennen können.",
             "no_topic": "<a>Füge ein Thema hinzu</a>, damit andere wissen, worum es hier geht.",
-            "private_unencrypted_warning": "Dieser Raum ist nicht verschlüsselt. Oft ist dies aufgrund eines nicht unterstützten Geräts oder Methode wie E-Mail-Einladungen der Fall.",
-            "room_invite": "Nur in diesen Raum einladen",
+            "private_unencrypted_warning": "Dieser Chat ist nicht verschlüsselt. Oft ist dies aufgrund eines nicht unterstützten Geräts oder Methode wie E-Mail-Einladungen der Fall.",
+            "room_invite": "Nur in diesen Chat einladen",
             "send_message_start_dm": "Schreibe deine erste Nachricht, um <displayName/> zur Unterhaltung einzuladen",
             "start_of_dm_history": "Dies ist der Beginn deiner Direktnachrichten mit <displayName/>.",
             "start_of_room": "Dies ist der Beginn von <roomName/>.",
-            "topic": "Thema: %(topic)s ",
-            "topic_edit": "Thema: %(topic)s (<a>ändern</a>)",
             "unencrypted_warning": "Ende-zu-Ende-Verschlüsselung ist deaktiviert",
-            "user_created": "%(displayName)s hat diesen Raum erstellt.",
-            "you_created": "Du hast diesen Raum erstellt."
+            "user_created": "%(displayName)s hat diesen Chat erstellt.",
+            "you_created": "Du hast diesen Chat erstellt."
         },
         "invite_email_mismatch_suggestion": "Teile diese E-Mail-Adresse in den Einstellungen, um Einladungen direkt in %(brand)s zu erhalten.",
         "invite_sent_to_email": "Einladung an %(email)s gesendet",
         "invite_sent_to_email_room": "Diese Einladung zu %(roomName)s wurde an %(email)s gesendet",
         "invite_subtitle": "Eingeladen von <userName/>",
-        "invite_this_room": "In diesen Raum einladen",
+        "invite_this_room": "In diesen Chat einladen",
         "invite_title": "Möchtest du %(roomName)s betreten?",
         "inviter_unknown": "Unbekannt",
         "invites_you_text": "Du wirst von <inviter/> eingeladen",
         "join_button_account": "Registrieren",
         "join_failed_needs_invite": "Um %(roomName)s zu betrachten, benötigst du eine Einladung",
         "join_the_discussion": "An Diskussion teilnehmen",
-        "join_title": "Betrete den Raum, um teilzunehmen",
+        "join_title": "Betrete den Chat, um teilzunehmen",
         "join_title_account": "An Unterhaltung mit einem Konto teilnehmen",
-        "joining": "Betrete …",
-        "joining_room": "Betrete Raum …",
+        "joining": "Trete bei …",
+        "joining_room": "Trete dem Chat bei …",
         "joining_space": "Betrete Space …",
         "jump_read_marker": "Zur ersten ungelesenen Nachricht springen.",
         "jump_to_bottom_button": "Zur neusten Nachricht springen",
         "jump_to_date": "Zu Datum springen",
-        "jump_to_date_beginning": "Der Anfang des Raums",
+        "jump_to_date_beginning": "Der Anfang des Chats",
         "jump_to_date_prompt": "Wähle eine Datum aus",
         "kick_reason": "Grund: %(reason)s",
         "kicked_by": "Du wurdest von %(memberName)s entfernt",
@@ -2021,38 +2070,41 @@
         "knock_send_action": "Beitrittsanfrage stellen",
         "knock_sent": "Beitrittsanfrage gestellt",
         "knock_sent_subtitle": "Deine Beitrittsanfrage wurde noch nicht bearbeitet.",
-        "knock_subtitle": "Du benötigst eine Beitrittsberechtigung, um den Raum betrachten oder an der Unterhaltung teilnehmen zu können. Du kannst nachstehend eine Beitrittsanfrage stellen.",
-        "leave_error_title": "Fehler beim Verlassen des Raums",
-        "leave_server_notices_description": "Du kannst diesen Raum nicht verlassen, da dieser Raum für wichtige Mitteilungen vom Heim-Server verwendet wird.",
-        "leave_server_notices_title": "Der Raum für Server-Mitteilungen kann nicht verlassen werden",
-        "leave_unexpected_error": "Unerwarteter Server-Fehler beim Versuch den Raum zu verlassen",
+        "knock_subtitle": "Du benötigst eine Beitrittsberechtigung, um den Chat betrachten oder an der Unterhaltung teilnehmen zu können. Du kannst nachstehend eine Beitrittsanfrage stellen.",
+        "leave_error_title": "Fehler beim Verlassen des Chats",
+        "leave_server_notices_description": "Du kannst diesen Chat nicht verlassen, da dieser Chat für wichtige Mitteilungen vom Homeserver verwendet wird.",
+        "leave_server_notices_title": "Der Chat für Server-Mitteilungen kann nicht verlassen werden",
+        "leave_unexpected_error": "Unerwarteter Server-Fehler beim Versuch den Chat zu verlassen",
         "link_email_to_receive_3pid_invite": "Verbinde diese E-Mail-Adresse in den Einstellungen mit deinem Konto, um die Einladungen direkt in %(brand)s zu erhalten.",
         "loading_preview": "Lade Vorschau",
-        "no_peek_join_prompt": "Vorschau von %(roomName)s kann nicht angezeigt werden. Möchtest du den Raum betreten?",
+        "no_peek_join_prompt": "Vorschau von %(roomName)s kann nicht angezeigt werden. Möchtest du dem Chat beitreten?",
         "no_peek_no_name_join_prompt": "Es gibt keine Vorschau, dennoch betreten?",
         "not_found_subtitle": "Bist du sicher am richtigen Ort?",
-        "not_found_title": "Dieser Raum oder Space existiert nicht.",
+        "not_found_title": "Dieser Chat oder Space existiert nicht.",
         "not_found_title_name": "%(roomName)s existiert nicht.",
-        "peek_join_prompt": "Du erkundest den Raum %(roomName)s. Willst du ihn betreten?",
+        "peek_join_prompt": "Du erkundest den Chat %(roomName)s. Willst du ihm beitreten?",
         "pinned_message_badge": "Fixierte Nachrichten",
         "pinned_message_banner": {
             "button_close_list": "Liste schließen",
             "button_view_all": "Alle anzeigen",
-            "description": "In diesem Raum sind Nachrichten angeheftet. Klicken Sie hier, um sie anzusehen.",
-            "go_to_message": "Fixierte Nachrichten im Nachrichtenverlauf anzeigen.",
+            "description": "Fixierte Nachrichten",
+            "go_to_newest_message": "Schau die fixierte Nachricht im Nachrichtenverlauf an und die neueste fixierte Nachricht hier an.",
+            "go_to_next_message": "Schau dir die fixierte Nachricht im Nachrichtenverlauf an und die nächst ältere Nachricht hier an",
             "title": "<bold>%(index)s of %(length)s</bold> Fixierte Nachrichten"
         },
         "read_topic": "Klicke, um das Thema zu lesen",
         "rejecting": "Lehne Einladung ab …",
         "rejoin_button": "Erneut betreten",
+        "room_content": "Chat-Inhalt",
+        "room_is_low_priority": "Dieser Chat hat niedrige Priorität",
         "search": {
-            "all_rooms_button": "Alle Räume durchsuchen",
+            "all_rooms_button": "Durchsuche alle Chats",
             "placeholder": "Nachrichten durchsuchen...",
             "summary": {
                 "one": "1 Ergebnis für \"<query/>\" gefunden",
                 "other": "%(count)s Ergebnisse für \"<query/>\" gefunden"
             },
-            "this_room_button": "Diesen Raum durchsuchen"
+            "this_room_button": "Diesen Chat durchsuchen"
         },
         "status_bar": {
             "delete_all": "Alle löschen",
@@ -2068,15 +2120,15 @@
         },
         "unknown_status_code_for_timeline_jump": "unbekannter Statuscode",
         "unread_notifications_predecessor": {
-            "one": "Du hast %(count)s ungelesene Benachrichtigungen in einer früheren Version dieses Raumes.",
-            "other": "Du hast %(count)s ungelesene Benachrichtigungen in einer früheren Version dieses Raums."
+            "one": "Du hast %(count)s ungelesene Benachrichtigungen in einer früheren Version dieses Chats.",
+            "other": "Du hast %(count)s ungelesene Benachrichtigungen in einer früheren Version dieses Chats."
         },
-        "upgrade_error_description": "Überprüfe nochmal ob dein Server die ausgewählte Raumversion unterstützt und versuche es nochmal.",
-        "upgrade_error_title": "Fehler bei Raumaktualisierung",
-        "upgrade_warning_bar": "Die Aktualisierung dieses Raums deaktiviert die aktuelle Instanz des Raums und erstellt einen aktualisierten Raum mit demselben Namen.",
-        "upgrade_warning_bar_admins": "Nur Raumadministratoren werden diese Nachricht sehen",
-        "upgrade_warning_bar_unstable": "Dieser Raum läuft mit der Raumversion <roomVersion />, welche dieser Heim-Server als <i>instabil</i> markiert hat.",
-        "upgrade_warning_bar_upgraded": "Dieser Raum wurde bereits aktualisiert.",
+        "upgrade_error_description": "Überprüfe nochmal ob dein Server die ausgewählte Chat-Version unterstützt und versuche es nochmal.",
+        "upgrade_error_title": "Fehler bei Aktualisierung der Chat-Version",
+        "upgrade_warning_bar": "Um diesen Chat zu aktualisieren, muss der aktuelle Chat geschlossen werden und ein neuer Chat mit dem gleichen Namen angelegt werden.",
+        "upgrade_warning_bar_admins": "Nur Chat Administratoren werden diese Nachricht sehen",
+        "upgrade_warning_bar_unstable": "Dieser Chat läuft mit der Chat-Version <roomVersion />, welche dieser Homeserver als <i>instabil</i> markiert hat.",
+        "upgrade_warning_bar_upgraded": "Dieser Chat wurde bereits aktualisiert.",
         "upload": {
             "uploading_multiple_file": {
                 "one": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
@@ -2084,72 +2136,74 @@
             },
             "uploading_single_file": "%(filename)s wird hochgeladen"
         },
-        "video_room": "Dieser Raum ist ein Videoraum",
-        "waiting_for_join_subtitle": "Sobald eingeladene Benutzer %(brand)s beigetreten sind, werdet ihr euch unterhalten können und der Raum wird Ende-zu-Ende-verschlüsselt sein",
+        "video_room": "Dieser Chat ist ein Videochat",
+        "waiting_for_join_subtitle": "Sobald eingeladene Nutzer %(brand)s beigetreten sind, werdet ihr euch Ende-zu-Ende-verschlüsselt unterhalten können",
         "waiting_for_join_title": "Warte darauf, dass Benutzer %(brand)s beitreten"
     },
     "room_list": {
-        "add_room_label": "Raum hinzufügen",
+        "add_room_label": "Chat hinzufügen",
         "add_space_label": "Space hinzufügen",
-        "appearance": "Erscheinungsbild",
-        "breadcrumbs_empty": "Keine kürzlich besuchten Räume",
-        "breadcrumbs_label": "Kürzlich besuchte Räume",
+        "breadcrumbs_empty": "Keine kürzlich besuchten Chats",
+        "breadcrumbs_label": "Kürzlich besuchte Chats",
+        "collapse_filters": "Filterliste einklappen",
         "empty": {
             "no_chats": "Noch keine Chats",
-            "no_chats_description": "Beginnen Sie, indem Sie jemandem eine Nachricht senden oder einen Raum erstellen",
-            "no_chats_description_no_room_rights": "Beginnen Sie damit, jemandem eine Nachricht zu senden",
-            "no_favourites": "Sie haben noch keinen Lieblingschat",
-            "no_favourites_description": "Sie können einen Chat in den Chat-Einstellungen zu Ihren Favoriten hinzufügen",
-            "no_invites": "Sie haben keine ungelesenen Einladungen",
-            "no_mentions": "Sie haben keine ungelesenen Erwähnungen",
-            "no_people": "Sie haben noch keine direkten Chats",
-            "no_people_description": "Sie können Filter deaktivieren, um Ihre anderen Chats anzuzeigen",
-            "no_rooms": "Sie sind noch in keinem Raum",
-            "no_rooms_description": "Sie können Filter deaktivieren, um Ihre anderen Chats anzuzeigen",
-            "no_unread": "Glückwunsch! Sie haben keine ungelesenen Nachrichten",
+            "no_chats_description": "Leg los, indem du jemandem eine Nachricht schickst oder einen Chat erstellst",
+            "no_chats_description_no_room_rights": "Leg los, indem du jemandem eine Nachricht schickst",
+            "no_favourites": "Du hast noch keine Chats als Favorit markiert",
+            "no_favourites_description": "In den Chat Einstellungen kannst du einen Chat als Favorit markieren",
+            "no_invites": "Du hast keine ungelesenen Einladungen",
+            "no_lowpriority": "Du hast keine Chats mit niedriger Priorität.",
+            "no_mentions": "Du hast keine ungelesenen Erwähnungen",
+            "no_people": "Du hast noch keine Direktnachrichten",
+            "no_people_description": "Wähle Filter ab, um Chats zu sehen.",
+            "no_rooms": "Du bist noch in keinem Chat",
+            "no_rooms_description": "Wähle Filter ab, um Chats zu sehen.",
+            "no_unread": "Glückwunsch! Du hast keine ungelesenen Nachrichten.",
             "show_activity": "Alle Aktivitäten ansehen",
             "show_chats": "Alle Chats anzeigen"
         },
-        "failed_add_tag": "Fehler beim Hinzufügen des \"%(tagName)s\"-Tags an dem Raum",
-        "failed_remove_tag": "Entfernen der Raum-Kennzeichnung %(tagName)s fehlgeschlagen",
+        "expand_filters": "Filterliste ausklappen",
+        "failed_add_tag": "Fehler beim Hinzufügen des \"%(tagName)s\"-Tags an den Chat",
+        "failed_remove_tag": "Entfernen des Chat-Tags %(tagName)s fehlgeschlagen",
         "failed_set_dm_tag": "Fehler beim Setzen der Nachrichtenmarkierung",
         "filters": {
             "favourite": "Favoriten",
             "invites": "Einladungen",
+            "low_priority": "Niedrige Priorität",
             "mentions": "Erwähnungen",
             "people": "Personen",
-            "rooms": "Räume",
-            "unread": "Ungelesene"
+            "rooms": "Gruppen",
+            "unread": "Ungelesen"
         },
         "home_menu_label": "Startseiteneinstellungen",
-        "join_public_room_label": "Öffentlichen Raum betreten",
+        "join_public_room_label": "Öffentlichem Chat beitreten",
         "joining_rooms_status": {
-            "one": "Betrete %(count)s Raum",
-            "other": "Betrete %(count)s Räume"
+            "one": "Trete %(count)s Chat bei",
+            "other": "Trete %(count)s Chats bei"
         },
-        "list_title": "Raumliste",
+        "list_title": "Chatliste",
         "more_options": {
-            "copy_link": "Raumlink kopieren",
+            "copy_link": "Chatlink kopieren",
             "favourited": "Favorisiert",
-            "leave_room": "Raum verlassen",
+            "leave_room": "Chat verlassen",
             "low_priority": "Niedrige Priorität",
             "mark_read": "Als gelesen markieren",
             "mark_unread": "Als ungelesen markieren"
         },
         "notification_options": "Benachrichtigungsoptionen",
-        "open_space_menu": "Menü „Raum öffnen“",
-        "primary_filters": "Filter für die Raumliste",
+        "open_space_menu": "Öffne Menü für Spaces",
+        "primary_filters": "Filter für die Chatliste",
         "redacting_messages_status": {
-            "one": "Entferne Nachrichten in %(count)s Raum",
-            "other": "Entferne Nachrichten in %(count)s Räumen"
+            "one": "Entferne Nachrichten in %(count)s Chat",
+            "other": "Entferne Nachrichten in %(count)s Chats"
         },
         "room": {
             "more_options": "Weitere Optionen",
-            "open_room": "Raum öffnen %(roomName)s"
+            "open_room": "Öffne Chat %(roomName)s"
         },
         "room_options": "Chatroomoptionen",
         "show_less": "Weniger anzeigen",
-        "show_message_previews": "Nachrichtenvorschau anzeigen",
         "show_n_more": {
             "other": "%(count)s weitere anzeigen",
             "one": "%(count)s weitere anzeigen"
@@ -2163,14 +2217,14 @@
             "activity": "Aktivität",
             "atoz": "A–Z"
         },
-        "sort_unread_first": "Räume mit ungelesenen Nachrichten zuerst zeigen",
+        "sort_unread_first": "Zeige Chats mit ungelesenen Nachrichten zuerst",
         "space_menu": {
             "home": "Space-Übersicht",
-            "space_settings": "Raumeinstellungen"
+            "space_settings": "Space Einstellungen"
         },
         "space_menu_label": "%(spaceName)s-Menü",
         "sublist_options": "Optionen anzeigen",
-        "suggested_rooms_heading": "Vorgeschlagene Räume"
+        "suggested_rooms_heading": "Vorgeschlagene Chats"
     },
     "room_settings": {
         "access": {
@@ -2178,61 +2232,61 @@
             "title": "Zutritt"
         },
         "advanced": {
-            "error_upgrade_description": "Die Raumaktualisierung konnte nicht fertiggestellt werden",
-            "error_upgrade_title": "Raumaktualisierung fehlgeschlagen",
-            "information_section_room": "Rauminformationen",
+            "error_upgrade_description": "Die Chat-Version konnte nicht aktualisiert werden.",
+            "error_upgrade_title": "Aktualisierung der Chat-Version fehlgeschlagen",
+            "information_section_room": "Chatinformationen",
             "information_section_space": "Information über den Space",
-            "room_id": "Interne Raum-ID",
+            "room_id": "Interne Chat-ID",
             "room_predecessor": "Alte Nachrichten in %(roomName)s anzeigen.",
-            "room_upgrade_button": "Raum auf die empfohlene Raumversion aktualisieren",
-            "room_upgrade_warning": "<b>Achtung</b>: Eine Raumaktualisierung wird <i>Raummitglieder nicht automatisch in die neue Raumversion umziehen.</i> In der alten Raumversion wird ein Link zum neuen Raum veröffentlicht ­− Raummitglieder müssen auf diesen klicken, um den neuen Raum zu betreten.",
-            "room_version": "Raumversion:",
-            "room_version_section": "Raumversion",
+            "room_upgrade_button": "Aktualisiere auf die empfohlene Chat-Version",
+            "room_upgrade_warning": "<b>Achtung</b>: eine Aktualisierung der Chat-Version legt einen neuen Chat an. Die bestehenden Mitglieder werden jedoch <i>nicht automatisch eingeladen</i>. Im aktuellen Chat wird ein Link zum neuen Chat veröffentlicht. Mitglieder können diesem folgen, um dem neuen Chat zu beizutreten.",
+            "room_version": "Chat-Version:",
+            "room_version_section": "Chatversion",
             "space_predecessor": "Alte Version von %(spaceName)s anzeigen.",
             "space_upgrade_button": "Space auf die empfohlene Version aktualisieren",
-            "unfederated": "Dieser Raum ist von Personen auf anderen Matrix-Servern nicht betretbar",
-            "upgrade_button": "Raum auf Version %(version)s aktualisieren",
-            "upgrade_dialog_description": "Um diesen Raum zu aktualisieren, muss die aktuelle Instanz des Raums geschlossen und an ihrer Stelle ein neuer Raum erstellt werden. Um den Raummitgliedern die bestmögliche Erfahrung zu bieten, werden wir:",
-            "upgrade_dialog_description_1": "Einen neuen Raum mit demselben Namen, Beschreibung und Profilbild erstellen",
-            "upgrade_dialog_description_2": "Alle lokalen Raumaliase aktualisieren, damit sie auf den neuen Raum zeigen",
-            "upgrade_dialog_description_3": "Nutzern verbieten in dem Raum mit der alten Version zu schreiben und eine Nachricht senden, die den Nutzern rät in den neuen Raum zu wechseln",
-            "upgrade_dialog_description_4": "Zu Beginn des neuen Raumes einen Link zum alten Raum setzen, damit Personen die alten Nachrichten sehen können",
-            "upgrade_dialog_title": "Raumversion aktualisieren",
-            "upgrade_dwarning_ialog_title_public": "Öffentlichen Raum aktualisieren",
-            "upgrade_warning_dialog_description": "Eine Raumaktualisierung ist ein komplexer Vorgang, der üblicherweise empfohlen wird, wenn ein Raum aufgrund von Fehlern, fehlenden Funktionen oder Sicherheitslücken instabil ist.",
-            "upgrade_warning_dialog_explainer": "<b>Die Aktualisierung wird eine neue Version des Raums erstellen</b>. Die bisherigen Nachrichten verbleiben im archivierten Raum.",
-            "upgrade_warning_dialog_footer": "Du wirst diesen Raum von <oldVersion /> zu <newVersion /> aktualisieren.",
-            "upgrade_warning_dialog_invite_label": "Mitglieder automatisch in den neuen Raum einladen",
-            "upgrade_warning_dialog_report_bug_prompt": "Dies beeinflusst meistens nur, wie der Raum auf dem Server verarbeitet wird. Solltest du Probleme mit %(brand)s haben, erstelle bitte einen Fehlerbericht.",
-            "upgrade_warning_dialog_report_bug_prompt_link": "Dies beeinflusst meistens nur, wie der Raum auf dem Server verarbeitet wird. Solltest du Probleme mit %(brand)s haben, <a>melde bitte einen Programmfehler</a>.",
-            "upgrade_warning_dialog_title": "Raum aktualisieren",
-            "upgrade_warning_dialog_title_private": "Privaten Raum aktualisieren"
+            "unfederated": "Nutzer von anderen Matrix Homeservern können diesem Chat nicht beitreten",
+            "upgrade_button": "Chat auf Version %(version)s aktualisieren",
+            "upgrade_dialog_description": "Um diesen Chat zu aktualisieren, muss der aktuelle Chat geschlossen werden und ein neuer Chat angelegt werden. Um den Mitgliedern den Umstieg zu erleichtern, werden wir:",
+            "upgrade_dialog_description_1": "Erstelle einen neuen Chat mit demselben Namen, Beschreibung und Avatar",
+            "upgrade_dialog_description_2": "Alle lokalen Chat-Aliase aktualisieren, damit sie auf den neuen Chat verweisen",
+            "upgrade_dialog_description_3": "Nutzern verbieten in dem Chat mit der alten Version zu schreiben und eine Nachricht senden, die den Nutzern rät, in den aktualisierten Chat zu wechseln",
+            "upgrade_dialog_description_4": "Zu Beginn des neuen Chats einen Link zum alten Chat setzen, damit Nutzer die alten Nachrichten sehen können",
+            "upgrade_dialog_title": "Chat-Version aktualisieren",
+            "upgrade_dwarning_ialog_title_public": "Öffentlichen Chat aktualisieren",
+            "upgrade_warning_dialog_description": "Die Aktualisierung der Chat-Version ist ein komplexer Vorgang, der üblicherweise empfohlen wird, wenn ein Chat aufgrund von Fehlern, fehlenden Funktionen oder Sicherheitslücken instabil ist.",
+            "upgrade_warning_dialog_explainer": "<b>Die Aktualisierung wird eine neue Version des Chats erstellen</b>. Die bisherigen Nachrichten verbleiben in diesem archivierten Chat.",
+            "upgrade_warning_dialog_footer": "Du wirst diesen Chat von Version <oldVersion /> zu <newVersion /> aktualisieren.",
+            "upgrade_warning_dialog_invite_label": "Mitglieder automatisch in den neuen Chat einladen",
+            "upgrade_warning_dialog_report_bug_prompt": "Dies beeinflusst meistens nur, wie der Chat auf dem Server verarbeitet wird. Solltest du Probleme mit %(brand)s haben, erstelle bitte einen Fehlerbericht.",
+            "upgrade_warning_dialog_report_bug_prompt_link": "Dies beeinflusst meistens nur, wie der Chat auf dem Server verarbeitet wird. Solltest du Probleme mit %(brand)s haben, <a>melde bitte einen Programmfehler</a>.",
+            "upgrade_warning_dialog_title": "Chat-Version aktualisieren",
+            "upgrade_warning_dialog_title_private": "Chat-Version des privaten Chats aktualisieren"
         },
         "alias_not_specified": "nicht angegeben",
         "bridges": {
-            "description": "Dieser Raum leitet Nachrichten von/an folgende(n) Plattformen weiter. <a>Mehr erfahren.</a>",
-            "empty": "Dieser Raum leitet keine Nachrichten von/an andere(n) Plattformen weiter. <a>Mehr erfahren.</a>",
+            "description": "Dieser Chat leitet Nachrichten von/an folgende(n) Plattformen weiter. <a>Mehr erfahren.</a>",
+            "empty": "Dieser Chat leitet keine Nachrichten von/an andere(n) Plattformen weiter. <a>Mehr erfahren.</a>",
             "title": "Brücken"
         },
         "delete_avatar_label": "Avatar löschen",
         "general": {
             "alias_field_has_domain_invalid": "Fehlender Doppelpunkt vor Server (z. B. :domain.org)",
-            "alias_field_has_localpart_invalid": "Fehlender Raumname oder Doppelpunkt (z. B. dein-raum:domain.org)",
-            "alias_field_matches_invalid": "Diese Adresse verweist nicht auf diesen Raum",
-            "alias_field_placeholder_default": "z. B. mein-raum",
+            "alias_field_has_localpart_invalid": "Fehlender Chatname oder Doppelpunkt (z. B. dein-chat:domain.org)",
+            "alias_field_matches_invalid": "Diese Adresse verweist nicht auf diesen Chat",
+            "alias_field_placeholder_default": "z. B. mein-chat",
             "alias_field_required_invalid": "Bitte gib eine Adresse an",
             "alias_field_safe_localpart_invalid": "Einige Zeichen sind nicht erlaubt",
             "alias_field_taken_invalid": "Diese Adresse hat einen ungültigen Server oder wird bereits verwendet",
             "alias_field_taken_invalid_domain": "Diese Adresse wird bereits verwendet",
             "alias_field_taken_valid": "Diese Adresse ist verfügbar",
-            "alias_heading": "Raumadresse",
+            "alias_heading": "Chatadresse",
             "aliases_items_label": "Andere öffentliche Adressen:",
             "aliases_no_items_label": "Keine anderen öffentlichen Adressen vorhanden. Du kannst weiter unten eine hinzufügen",
-            "aliases_section": "Raumadressen",
-            "avatar_field_label": "Raumbild",
+            "aliases_section": "Chatadressen",
+            "avatar_field_label": "Chat Avatar",
             "canonical_alias_field_label": "Primäre Adresse",
-            "default_url_previews_off": "URL-Vorschau ist für Mitglieder des Raumes standardmäßig deaktiviert.",
-            "default_url_previews_on": "URL-Vorschau ist für Mitglieder des Raumes standardmäßig aktiviert.",
+            "default_url_previews_off": "URL-Vorschau ist für Mitglieder des Chats standardmäßig deaktiviert.",
+            "default_url_previews_on": "URL-Vorschau ist für Mitglieder des Chats standardmäßig aktiviert.",
             "description_space": "Einstellungen vom Space bearbeiten.",
             "error_creating_alias_description": "Es gab einen Fehler beim Anlegen der Adresse. Entweder erlaubt es der Server nicht oder es gab ein temporäres Problem.",
             "error_creating_alias_title": "Fehler beim Anlegen der Adresse",
@@ -2242,27 +2296,27 @@
             "error_publishing": "Chatroom konnte nicht auf öffentlich gestellt werden",
             "error_publishing_detail": "Beim Veröffentlichen dieses Chatrooms ist ein Fehler aufgetreten",
             "error_save_space_settings": "Spaceeinstellungen konnten nicht gespeichert werden.",
-            "error_updating_alias_description": "Es gab einen Fehler beim Ändern des Raumalias. Entweder erlaubt es der Server nicht oder es gab ein temporäres Problem.",
-            "error_updating_canonical_alias_description": "Es gab ein Problem beim Aktualisieren der Raum-Hauptadresse. Es kann sein, dass der Server dies verbietet oder ein temporäres Problem aufgetreten ist.",
+            "error_updating_alias_description": "Es gab einen Fehler beim Ändern der alternativen Adresse des Chat. Entweder erlaubt es der Server nicht oder es gab ein temporäres Problem.",
+            "error_updating_canonical_alias_description": "Es gab ein Problem beim Aktualisieren der Hauptadresse des Chats. Es kann sein, dass der Server dies verbietet oder ein temporäres Problem aufgetreten ist.",
             "error_updating_canonical_alias_title": "Fehler beim Aktualisieren der Hauptadresse",
             "leave_space": "Space verlassen",
             "local_alias_field_label": "Lokale Adresse",
-            "local_aliases_explainer_room": "Erstelle Adressen für diesen Raum, damit andere Benutzer den Raum auf deinem Heim-Server (%(localDomain)s) finden können",
+            "local_aliases_explainer_room": "Erstelle Adressen für diesen Chat, damit andere Nutzer den Chat auf deinem Homeserver (%(localDomain)s) finden können",
             "local_aliases_explainer_space": "Füge Adressen für diesen Space hinzu, damit andere Leute ihn über deinen Heim-Server (%(localDomain)s) finden können",
             "local_aliases_section": "Lokale Adressen",
-            "name_field_label": "Raumname",
+            "name_field_label": "Chatname",
             "new_alias_placeholder": "Neue öffentliche Adresse (z. B. #alias:server)",
-            "no_aliases_room": "Dieser Raum hat keine lokale Adresse",
+            "no_aliases_room": "Dieser Chat hat keine lokale Adresse",
             "no_aliases_space": "Dieser Space hat keine lokale Adresse",
             "other_section": "Sonstiges",
-            "publish_toggle": "Diesen Raum im Raumverzeichnis von %(domain)s veröffentlichen?",
+            "publish_toggle": "Diesen Chat im Chat-Verzeichnis von %(domain)s veröffentlichen?",
             "published_aliases_description": "Damit du die Adresse veröffentlichen kannst, musst du sie zuerst als lokale Adresse hinzufügen.",
-            "published_aliases_explainer_room": "Veröffentlichte Adressen erlauben jedem, den Raum zu betreten.",
+            "published_aliases_explainer_room": "Veröffentlichte Adressen erlauben jedem, dem Chat zu beizutreten.",
             "published_aliases_explainer_space": "Veröffentlichte Adressen erlauben jedem, den Space zu betreten.",
             "published_aliases_section": "Öffentliche Adresse",
             "save": "Speichern",
-            "topic_field_label": "Raumthema",
-            "url_preview_encryption_warning": "In verschlüsselten Räumen wie diesem ist die Linkvorschau standardmäßig deaktiviert, damit dein Heim-Server (der die Vorschau erzeugt) keine Informationen über Links in diesem Raum erhält.",
+            "topic_field_label": "Chat-Thema",
+            "url_preview_encryption_warning": "In verschlüsselten Chats wie diesem ist die Linkvorschau standardmäßig deaktiviert, damit dein Homeserver (der die Vorschau erzeugt) keine Informationen über Links in diesem Chat erhält.",
             "url_preview_explainer": "Die URL-Vorschau kann Informationen wie den Titel, die Beschreibung sowie ein Vorschaubild der Website enthalten.",
             "url_previews_section": "URL-Vorschau",
             "user_url_previews_default_off": "Du hast die URL-Vorschau <a>standardmäßig deaktiviert</a>.",
@@ -2284,8 +2338,8 @@
             "see_more": "Mehr"
         },
         "permissions": {
-            "add_privileged_user_description": "Einem oder mehreren Benutzern im Raum mehr Berechtigungen geben",
-            "add_privileged_user_filter_placeholder": "Benutzer im Raum suchen …",
+            "add_privileged_user_description": "Erteile einem oder mehreren Nutzern im Chat mehr Berechtigungen",
+            "add_privileged_user_filter_placeholder": "Suche Mitglieder im Chat...",
             "add_privileged_user_heading": "Berechtigten Benutzer hinzufügen",
             "ban": "Benutzer verbannen",
             "ban_reason": "Grund",
@@ -2295,35 +2349,35 @@
             "error_changing_pl_reqs_description": "Beim Ändern der Anforderungen für Benutzerrechte ist ein Fehler aufgetreten. Stelle sicher, dass du die nötigen Berechtigungen besitzt und versuche es erneut.",
             "error_changing_pl_reqs_title": "Fehler beim Ändern der Anforderungen für Benutzerrechte",
             "error_changing_pl_title": "Fehler beim Ändern der Benutzerrechte",
-            "error_unbanning": "Aufheben der Verbannung fehlgeschlagen",
+            "error_unbanning": "Aufheben der Sperre fehlgeschlagen",
             "events_default": "Nachrichten senden",
             "invite": "Person einladen",
             "kick": "Benutzer entfernen",
             "m.call": "Beginne %(brand)s-Anrufe",
             "m.call.member": "Trete %(brand)s-Anrufen bei",
             "m.reaction": "Reaktionen senden",
-            "m.room.avatar": "Raumbild ändern",
+            "m.room.avatar": "Ändere den Chat Avatar",
             "m.room.avatar_space": "Space-Icon ändern",
             "m.room.canonical_alias": "Hauptadresse ändern",
             "m.room.canonical_alias_space": "Hauptadresse des Space ändern",
-            "m.room.encryption": "Raumverschlüsselung aktivieren",
+            "m.room.encryption": "Chatverschlüsselung aktivieren",
             "m.room.history_visibility": "Sichtbarkeit des Verlaufs ändern",
-            "m.room.name": "Raumname ändern",
+            "m.room.name": "Ändere den Chat Namen",
             "m.room.name_space": "Name des Space ändern",
             "m.room.pinned_events": "Angeheftete Nachrichten verwalten",
             "m.room.power_levels": "Berechtigungen ändern",
             "m.room.redaction": "Vom mir gesendete Nachrichten löschen",
             "m.room.server_acl": "Server-ACLs bearbeiten",
-            "m.room.tombstone": "Raum aktualisieren",
+            "m.room.tombstone": "Chat-Version aktualisieren",
             "m.room.topic": "Thema ändern",
             "m.room.topic_space": "Beschreibung bearbeiten",
-            "m.space.child": "Räume in diesem Space verwalten",
+            "m.space.child": "Verwalte Chats in diesem Space",
             "m.widget": "Widgets bearbeiten",
             "muted_users_section": "Stummgeschaltete Benutzer",
-            "no_privileged_users": "Keine Nutzer haben in diesem Raum privilegierte Berechtigungen",
+            "no_privileged_users": "Keine Nutzer haben in diesem Chat privilegierte Berechtigungen",
             "notifications.room": "Alle benachrichtigen",
             "permissions_section": "Berechtigungen",
-            "permissions_section_description_room": "Wähle Rollen, die benötigt werden, um einige Teile des Raumes zu ändern",
+            "permissions_section_description_room": "Wähle Rollen, die benötigt werden, um einige Teile des Chat zu ändern",
             "permissions_section_description_space": "Wähle, von wem folgende Aktionen ausgeführt werden können",
             "privileged_users_section": "Privilegierte Benutzer",
             "redact": "Nachrichten von anderen löschen",
@@ -2333,44 +2387,48 @@
             "users_default": "Standard-Rolle"
         },
         "security": {
-            "enable_encryption_confirm_description": "Sobald aktiviert, kann die Verschlüsselung für einen Raum nicht mehr deaktiviert werden. Nachrichten in einem verschlüsselten Raum können nur noch von Teilnehmern, aber nicht mehr vom Server gelesen werden. Einige Bots und Brücken werden vielleicht nicht mehr funktionieren. <a>Erfahre mehr über Verschlüsselung.</a>",
+            "cannot_change_to_private_due_to_missing_history_visiblity_permissions": {
+                "description": "Du hast keine Berechtigung, die Sichtbarkeit des Nachrichtenverlaufs des Chats zu ändern. Das ist gefährlich, weil es nicht angemeldeten Nutzern ermöglichen könnte, Nachrichten zu lesen.",
+                "title": "Chat kann nicht \"privat\" gemacht werden"
+            },
+            "enable_encryption_confirm_description": "Die Verschlüsselung für einen Chat kann nicht mehr deaktiviert werden sobald sie aktiv ist. Nachrichten in einem verschlüsselten Chat können nur noch von Mitgliedern, aber nicht mehr vom Server gelesen werden. Einige Bots und Brücken werden vielleicht nicht mehr funktionieren. <a>Erfahre mehr über Verschlüsselung.</a>",
             "enable_encryption_confirm_title": "Verschlüsselung aktivieren?",
-            "enable_encryption_public_room_confirm_description_1": "<b>Verschlüsselung ist für öffentliche Räume nicht empfohlen.</b> Jeder kann öffentliche Räume finden und betreten, also kann auch jeder die Nachrichten lesen. Du wirst keine der Vorteile von Verschlüsselung erhalten und kannst sie später auch nicht mehr deaktivieren. Nachrichten in öffentlichen Räumen zu verschlüsseln, wird das empfangen und senden verlangsamen.",
-            "enable_encryption_public_room_confirm_description_2": "Um dieses Problem zu vermeiden, <a>erstelle einen neuen verschlüsselten Raum</a> für deine Konversation.",
-            "enable_encryption_public_room_confirm_title": "Dieser Raum ist öffentlich. Willst du die Verschlüsselung wirklich aktivieren?",
-            "encrypted_room_public_confirm_description_1": "<b>Es ist nicht sinnvoll, verschlüsselte Räume öffentlich zu machen.</b> Das würde bedeuten, dass alle den Raum finden und betreten, also auch Nachrichten lesen könnten. Du erhältst also keinen Vorteil der Verschlüsselung, während sie das Senden und Empfangen von Nachrichten langsamer macht.",
-            "encrypted_room_public_confirm_description_2": "<a>Erstelle einen neuen Raum für deine Konversation</a>, um diese Probleme zu umgehen.",
-            "encrypted_room_public_confirm_title": "Willst du diesen verschlüsselten Raum wirklich öffentlich machen?",
+            "enable_encryption_public_room_confirm_description_1": "<b>Verschlüsselung wird für öffentliche Chats nicht empfohlen.</b> Jeder kann öffentliche Chats finden und ihnen beitreten, also kann auch jeder die Nachrichten lesen. Die Verschlüsselung bringt keine Vorteile und lässt sich später auch nicht mehr deaktivieren. Außerdem verlangsamt die Verschlüsselung das Senden und Empfangen von Nachrichten in öffentlichen Chats.",
+            "enable_encryption_public_room_confirm_description_2": "<a>Erstelle einen neuen verschlüsselten Chat</a>, um dieses Problem zu beheben.",
+            "enable_encryption_public_room_confirm_title": "Dieser Chat ist öffentlich. Willst du die Verschlüsselung wirklich aktivieren?",
+            "encrypted_room_public_confirm_description_1": "<b>Es ist nicht sinnvoll, verschlüsselte Chats öffentlich zu machen.</b> Das würde bedeuten, dass jeder den Chat finden und ihm beitreten kann, also auch Nachrichten lesen kann. Du erhältst also keinen Vorteil von der Verschlüsselung, während sie das Senden und Empfangen von Nachrichten langsamer macht.",
+            "encrypted_room_public_confirm_description_2": "<a>Erstelle einen neuen Chat</a>, um diese Probleme zu umgehen.",
+            "encrypted_room_public_confirm_title": "Willst du diesen verschlüsselten Chat wirklich öffentlich machen?",
             "encryption_forced": "Dein Server erfordert die Deaktivierung der Verschlüsselung.",
-            "encryption_permanent": "Sobald du die Verschlüsselung aktivierst, kannst du sie nicht mehr deaktivieren.",
+            "encryption_permanent": "Sobald die Verschlüsselung aktiviert ist, kann sie nicht mehr deaktiviert werden.",
             "error_join_rule_change_title": "Fehler beim Aktualisieren der Beitrittsregeln",
             "error_join_rule_change_unknown": "Unbekannter Fehler",
-            "guest_access_warning": "Personen mit unterstützter Anwendung werden diesen Raum ohne registriertes Konto betreten können.",
+            "guest_access_warning": "Personen mit unterstützter Anwendung werden diesem Chat ohne registriertes Konto beitreten können.",
             "history_visibility_invited": "Mitglieder (ab Einladung)",
             "history_visibility_joined": "Mitglieder (ab Betreten)",
             "history_visibility_legend": "Wer kann den bisherigen Verlauf lesen?",
             "history_visibility_shared": "Mitglieder",
-            "history_visibility_warning": "Änderungen an der Sichtbarkeit des Verlaufs gelten nur für zukünftige Nachrichten. Die Sichtbarkeit des existierenden Verlaufs bleibt unverändert.",
+            "history_visibility_warning": "Die Sichtbarkeit des existierenden Nachrichtenverlaufs bleibt unverändert.",
             "history_visibility_world_readable": "Alle",
             "join_rule_description": "Entscheide, wer %(roomName)s betreten kann.",
             "join_rule_invite": "Privat (Betreten mit Einladung)",
             "join_rule_invite_description": "Nur Eingeladene können betreten.",
             "join_rule_knock": "Beitrittsanfragen",
-            "join_rule_knock_description": "Personen können den Raum nur betreten, wenn sie Zutritt erhalten.",
+            "join_rule_knock_description": "Personen können den Chat nur betreten, wenn sie Zutritt erhalten.",
             "join_rule_public_description": "Sichtbar und zugänglich für jeden.",
             "join_rule_restricted": "Spacemitglieder",
             "join_rule_restricted_description": "Das Betreten ist allen in diesen Spaces möglich. <a>Ändere, welche Spaces Zutritt haben.</a>",
             "join_rule_restricted_description_active_space": "Finden und betreten ist Mitgliedern von <spaceName/> erlaubt. Du kannst auch weitere Spaces wählen.",
             "join_rule_restricted_description_prompt": "Das Betreten ist allen in den gewählten Spaces möglich.",
             "join_rule_restricted_description_spaces": "Spaces mit Zutritt",
-            "join_rule_restricted_dialog_description": "Entscheide, welche Spaces auf den Raum zugreifen können. Mitglieder ausgewählter Spaces können <RoomName/> betreten.",
+            "join_rule_restricted_dialog_description": "Entscheide, welche Spaces auf den Chat zugreifen können. Mitglieder der ausgewählten Spaces können <RoomName/> beitreten.",
             "join_rule_restricted_dialog_empty_warning": "Du entfernst alle Spaces. Der Zutritt wird auf den Standard (Privat) zurückgesetzt",
             "join_rule_restricted_dialog_filter_placeholder": "Spaces durchsuchen",
             "join_rule_restricted_dialog_heading_known": "Andere dir bekannte Spaces",
             "join_rule_restricted_dialog_heading_other": "Andere Spaces, die du möglicherweise nicht kennst",
-            "join_rule_restricted_dialog_heading_room": "Spaces, in denen du Mitglied bist und die diesen Raum enthalten",
+            "join_rule_restricted_dialog_heading_room": "Spaces, in denen du Mitglied bist und die diesen Chat enthalten",
             "join_rule_restricted_dialog_heading_space": "Spaces, die diesen Space enthalten und in denen du Mitglied bist",
-            "join_rule_restricted_dialog_heading_unknown": "Das sind vermutliche solche, in denen andere Raumadministratoren Mitglieder sind.",
+            "join_rule_restricted_dialog_heading_unknown": "Das sind vermutliche solche, in denen andere Chat Administratoren Mitglieder sind.",
             "join_rule_restricted_dialog_title": "Spaces wählen",
             "join_rule_restricted_n_more": {
                 "other": "und %(count)s weitere",
@@ -2380,9 +2438,9 @@
                 "other": "%(count)s Spaces haben Zutritt",
                 "one": "Derzeit hat ein Space Zutritt"
             },
-            "join_rule_restricted_upgrade_description": "Diese Aktualisierung gewährt Mitgliedern der ausgewählten Spaces Zugang zu diesem Raum ohne Einladung.",
-            "join_rule_restricted_upgrade_warning": "Dieser Raum ist Teil von Spaces von denen du kein Administrator bist. In diesen Räumen wird der alte Raum weiter angezeigt werden, aber Personen werden aufgefordert werden, dem neuen Raum beizutreten.",
-            "join_rule_upgrade_awaiting_room": "Neuer Raum wird geladen",
+            "join_rule_restricted_upgrade_description": "Diese Aktualisierung gewährt Mitgliedern der ausgewählten Spaces ohne weitere Einladung Zugang zu diesem Chat.",
+            "join_rule_restricted_upgrade_warning": "Dieser Chat ist Teil von Spaces von denen du kein Administrator bist. In diesen Spaces wird der alte Chat weiter angezeigt werden, aber Personen werden aufgefordert werden, dem neuen Chat beizutreten.",
+            "join_rule_upgrade_awaiting_room": "Neuer Chat wird geladen",
             "join_rule_upgrade_required": "Aktualisierung erforderlich",
             "join_rule_upgrade_sending_invites": {
                 "one": "Einladung senden …",
@@ -2392,14 +2450,15 @@
                 "one": "Space aktualisieren …",
                 "other": "Spaces aktualisieren … (%(progress)s von %(count)s)"
             },
-            "join_rule_upgrade_upgrading_room": "Raum wird aktualisiert",
-            "public_without_alias_warning": "Um den Raum zu verlinken, füge bitte eine Adresse hinzu.",
-            "publish_room": "Diesen Raum im Raumverzeichnis veröffentlichen.",
-            "publish_space": "Diesen Space im Raumverzeichnis veröffentlichen.",
-            "strict_encryption": "Senden Sie Nachrichten nur an verifizierte Benutzer.",
+            "join_rule_upgrade_upgrading_room": "Chat-Version wird aktualisiert",
+            "join_rule_world_readable_description": "Wenn du änderst, wer dem Chat beitreten darf, ändert sich auch, wer zukünftige Nachrichten sehen kann.",
+            "public_without_alias_warning": "Um den Chat zu verlinken, füge bitte eine Adresse hinzu.",
+            "publish_room": "Veröffentliche diesen Chat im Chat Verzeichnis.",
+            "publish_space": "Veröffentliche diesen Space im Chat Verzeichnis.",
+            "strict_encryption": "Erlaube Nachrichtenversand nur an verifizierte Nutzer.",
             "title": "Sicherheit"
         },
-        "title": "Raumeinstellungen - %(roomName)s",
+        "title": "Chateinstellungen - %(roomName)s",
         "upload_avatar_label": "Profilbild hochladen",
         "visibility": {
             "alias_section": "Adresse",
@@ -2407,7 +2466,6 @@
             "error_update_guest_access": "Gastzutritt zum Space konnte nicht geändert werden",
             "error_update_history_visibility": "Verlaufssichtbarkeit des Space konnte nicht geändert werden",
             "guest_access_explainer": "Gäste ohne Konto können den Space betreten.",
-            "guest_access_explainer_public_space": "Sinnvoll für öffentliche Spaces.",
             "guest_access_label": "Gastzutritt",
             "history_visibility_anyone_space": "Space-Vorschau erlauben",
             "history_visibility_anyone_space_description": "Personen können den Space vor dem Betreten erkunden.",
@@ -2417,21 +2475,21 @@
         "voip": {
             "call_type_section": "Anrufart",
             "enable_element_call_caption": "%(brand)s ist Ende-zu-Ende-verschlüsselt, allerdings noch auf eine geringere Anzahl Benutzer beschränkt.",
-            "enable_element_call_label": "Verwende %(brand)s als alternative Anrufoption in diesem Raum",
+            "enable_element_call_label": "Verwende %(brand)s als alternative Anrufoption in diesem Chat",
             "enable_element_call_no_permissions_tooltip": "Du hast nicht die erforderlichen Berechtigungen, um dies zu ändern."
         }
     },
-    "room_summary_card_back_action_label": "Rauminformationen",
+    "room_summary_card_back_action_label": "Chatinformationen",
     "scalar": {
         "error_create": "Widget kann nicht erstellt werden.",
-        "error_membership": "Du bist nicht in diesem Raum.",
-        "error_missing_room_id": "Fehlende Raum-ID.",
+        "error_membership": "Du bist nicht in diesem Chat.",
+        "error_missing_room_id": "Fehlende Chat-ID.",
         "error_missing_room_id_request": "user_id fehlt in der Anfrage",
         "error_missing_user_id_request": "user_id fehlt in der Anfrage",
         "error_permission": "Du hast dafür keine Berechtigung.",
         "error_power_level_invalid": "Berechtigungslevel muss eine positive ganze Zahl sein.",
-        "error_room_not_visible": "Raum %(roomId)s ist nicht sichtbar",
-        "error_room_unknown": "Dieser Raum wurde nicht erkannt.",
+        "error_room_not_visible": "Chat %(roomId)s ist nicht sichtbar",
+        "error_room_unknown": "Dieser Chat wurde nicht erkannt.",
         "error_send_request": "Übertragung der Anfrage fehlgeschlagen.",
         "failed_read_event": "Lesen der Ereignisse fehlgeschlagen",
         "failed_send_event": "Übertragung des Ereignisses fehlgeschlagen"
@@ -2451,15 +2509,15 @@
         "title": "Server reagiert nicht"
     },
     "service_worker_error": {
-        "description": "%(brand)s benötigt einen Service Worker zum Laden authentifizierter Medien aus Matrix-Inhaltsrepositorys. Dies wird von Ihrem Browser nicht unterstützt, sodass Medien möglicherweise nicht geladen werden können.",
+        "description": "%(brand)s benötigt einen Service Worker um authentifizierte Medien aus dem Speicher zu laden. Dies wird vom Browser nicht unterstützt, so dass Fehler auftreten können.",
         "title": "Service Worker konnte nicht geladen werden"
     },
     "seshat": {
         "error_initialising": "Initialisierung der Suche fehlgeschlagen, für weitere Informationen öffne <a>deine Einstellungen</a>",
-        "reset_button": "Ereignisspeicher zurück setzen",
+        "reset_button": "Ereignisspeicher zurücksetzen",
         "reset_description": "Es ist wahrscheinlich, dass du den Ereignis-Indexspeicher nicht zurück setzen möchtest",
         "reset_explainer": "Falls du es wirklich willst: Es werden keine Nachrichten gelöscht. Außerdem wird die Suche, während der Index erstellt wird, etwas langsamer sein",
-        "reset_title": "Ereignisspeicher zurück setzen?",
+        "reset_title": "Ereignisspeicher zurücksetzen?",
         "warning_kind_files": "Diese Version von %(brand)s kann nicht alle verschlüsselten Dateien anzuzeigen",
         "warning_kind_files_app": "Nutze die <a>Desktop-App</a> um alle verschlüsselten Dateien zu sehen",
         "warning_kind_search": "Diese Version von %(brand)s kann verschlüsselte Nachrichten nicht durchsuchen",
@@ -2484,8 +2542,8 @@
             "dialog_title": "<strong>Einstellungen:</strong> Konto",
             "title": "Konto"
         },
-        "all_rooms_home": "Alle Räume auf Startseite anzeigen",
-        "all_rooms_home_description": "Alle Räume, denen du beigetreten bist, werden auf der Startseite erscheinen.",
+        "all_rooms_home": "Zeige alle Chats auf der Startseite",
+        "all_rooms_home_description": "Alle Chats, denen du beigetreten bist, werden auf der Startseite erscheinen.",
         "always_show_message_timestamps": "Nachrichtenzeitstempel immer anzeigen",
         "appearance": {
             "bundled_emoji_font": "Mitgelieferte Emoji-Schriftart verwenden",
@@ -2498,17 +2556,17 @@
             "custom_theme_add": "Benutzerdefiniertes Design hinzufügen",
             "custom_theme_downloading": "Benutzerdefiniertes Design wird heruntergeladen...",
             "custom_theme_error_downloading": "Fehler beim Herunterladen des Designs.",
-            "custom_theme_help": "Geben Sie die URL eines benutzerdefinierten Designs ein, das Sie anwenden möchten.",
+            "custom_theme_help": "Gib die URL eines benutzerdefinierten Designs ein, das du anwenden möchten.",
             "custom_theme_invalid": "Ungültiges Designschema.",
             "dialog_title": "<strong>Einstellungen:</strong> Erscheinungsbild",
             "font_size": "Schriftgröße",
             "font_size_default": "%(fontSize)s (Standard)",
-            "high_contrast": "Hochkontrast",
+            "high_contrast": "Hoher Kontrast",
             "image_size_default": "Standard",
             "image_size_large": "Groß",
-            "layout_bubbles": "Nachrichtenblasen",
+            "layout_bubbles": "Sprechblasen",
             "layout_irc": "IRC (Experimentell)",
-            "match_system_theme": "An Systemdesign anpassen",
+            "match_system_theme": "An Design des Betriebssystems anpassen",
             "timeline_image_size": "Bildgröße im Verlauf"
         },
         "automatic_language_detection_syntax_highlight": "Automatische Spracherkennung für die Syntaxhervorhebung",
@@ -2519,27 +2577,28 @@
         "code_block_line_numbers": "Zeilennummern in Quelltextblöcken",
         "disable_historical_profile": "Aktuelle Profilbilder und Anzeigenamen im Verlauf anzeigen",
         "discovery": {
-            "title": "Wie man Sie findet"
+            "title": "So findet man dich"
         },
         "emoji_autocomplete": "Emoji-Vorschläge während Eingabe",
         "enable_markdown": "Markdown aktivieren",
         "enable_markdown_description": "Beginne Nachrichten mit <code>/plain</code>, um sie ohne Markdown zu senden.",
         "encryption": {
             "advanced": {
-                "breadcrumb_first_description": "Ihre Kontodaten, Kontakte, Einstellungen und Chat-Liste werden gespeichert",
+                "breadcrumb_first_description": "Deine Kontodaten, Kontakte, Einstellungen und Chatlisten werden gespeichert",
                 "breadcrumb_page": "Verschlüsselung zurücksetzen",
-                "breadcrumb_second_description": "Sie verlieren jeglichen Nachrichtenverlauf, der nur auf dem Server gespeichert ist",
-                "breadcrumb_third_description": "Sie müssen alle Ihre vorhandenen Geräte und Kontakte erneut verifizieren",
-                "breadcrumb_title": "Sind Sie sicher, dass Sie Ihre Identität zurücksetzen möchten?",
-                "breadcrumb_title_forgot": "Haben Sie Ihren Wiederherstellungsschlüssel vergessen? Sie müssen Ihre Identität zurücksetzen.",
-                "breadcrumb_title_sync_failed": "Der Schlüsselspeicher konnte nicht synchronisiert werden. Sie müssen Ihre Identität zurücksetzen.",
-                "breadcrumb_warning": "Tun Sie dies nur, wenn Sie glauben, dass Ihr Konto kompromittiert wurde.",
+                "breadcrumb_second_description": "Du verlierst den Nachrichtenverlauf, der nur auf dem Server gespeichert ist",
+                "breadcrumb_third_description": "Du musst alle deine Geräte und Kontakte erneut verifizieren",
+                "breadcrumb_title": "Möchtest du deine kryptografische Identität wirklich zurücksetzen?",
+                "breadcrumb_title_cant_confirm": "Du musst deine Identität zurücksetzen.",
+                "breadcrumb_title_forgot": "Falls du deinen Wiederherstellungsschlüssel vergessen hast, musst du deine Identität zurücksetzen.",
+                "breadcrumb_title_sync_failed": "Der Schlüsselspeicher konnte nicht synchronisiert werden. Du musst deine kryptografische Identität zurücksetzen.",
+                "breadcrumb_warning": "Tu dies nur, wenn du befürchtest, dass dein Konto gehackt wurde.",
                 "details_title": "Angaben zur Verschlüsselung",
-                "do_not_close_warning": "Schließen Sie dieses Fenster nicht, bis der Reset abgeschlossen ist",
+                "do_not_close_warning": "Schließe dieses Fenster nicht, bis der Reset abgeschlossen ist",
                 "export_keys": "Schlüssel exportieren",
                 "import_keys": "Schlüssel importieren",
-                "other_people_device_description": "Warnung: Benutzer, die sich nicht explizit bei Ihnen verifiziert haben (z. B. mit Emojis), erhalten Ihre verschlüsselten Nachrichten nicht. Außerdem erhalten nicht verifizierte Geräte von verifizierten Benutzern Ihre verschlüsselten Nachrichten nicht.",
-                "other_people_device_label": "Senden Sie in verschlüsselten Räumen Nachrichten nur an verifizierte Benutzer",
+                "other_people_device_description": "Warnung: Nur verifizierte Nutzer erhalten verschlüsselte Nachrichten und ausschließlich auf ihren verifizierten Geräten.",
+                "other_people_device_label": "In verschlüsselten Chats dürfen Nachrichten nur an verifizierte Nutzer gesendet werden.",
                 "other_people_device_title": "Geräte anderer Personen",
                 "reset_identity": "Kryptografische Identität zurücksetzen",
                 "reset_in_progress": "Der Reset wird ausgeführt",
@@ -2548,46 +2607,46 @@
                 "title": "Advanced"
             },
             "confirm_key_storage_off": "Soll die Speicherung der Schlüssel wirklich deaktiviert sein?",
-            "confirm_key_storage_off_description": "Wenn Sie sich von all Ihren Geräten abmelden, verlieren Sie Ihren Nachrichtenverlauf und müssen alle Ihre vorhandenen Kontakte erneut überprüfen. <a>Erfahre mehr </a>",
+            "confirm_key_storage_off_description": "Wenn du dich von allen Geräten abmeldest, verlierst du deinen Nachrichtenverlauf und musst alle Kontakte erneut verifizieren. <a>Erfahre mehr</a>",
             "delete_key_storage": {
                 "breadcrumb_page": "Schlüsselspeicher löschen",
                 "confirm": "Schlüsselspeicher löschen",
-                "description": "Durch das Löschen des Schlüsselspeichers werden Ihre kryptografische Identität und Ihre Nachrichtenschlüssel vom Server entfernt und die folgenden Sicherheitsfunktionen werden deaktiviert:",
-                "list_first": "Sie werden auf neuen Geräten keinen verschlüsselten Nachrichtenverlauf haben",
-                "list_second": "Sie verlieren den Zugriff auf Ihre verschlüsselten Nachrichten, wenn Sie von %(brand)s überall abgemeldet sind",
-                "title": "Möchten Sie den Schlüsselspeicher wirklich ausschalten und löschen?"
+                "description": "Das Löschen des Schlüsselspeichers entfernt deine kryptografische Identität und deine Nachrichtenschlüssel vom Server. Die folgenden Sicherheitsfunktionen werden deaktiviert:",
+                "list_first": "Auf neuen Geräten ist kein verschlüsselter Nachrichtenverlauf verfügbar.",
+                "list_second": "Kein Zugriff auf verschlüsselten Nachrichten, wenn du überall von %(brand)s abgemeldet bist",
+                "title": "Möchtest du die Speicherung der Schlüssel wirklich deaktivieren und entfernen?"
             },
             "device_not_verified_button": "Dieses Gerät verifizieren",
-            "device_not_verified_description": "Sie müssen dieses Gerät verifizieren, um Ihre Verschlüsselungseinstellungen einsehen zu können.",
+            "device_not_verified_description": "Du musst dieses Gerät verifizieren, um deine Verschlüsselungseinstellungen sehen zu können.",
             "device_not_verified_title": "Gerät nicht verifiziert",
             "dialog_title": "<strong>Einstellungen:</strong> Verschlüsselung",
             "key_storage": {
                 "allow_key_storage": "Schlüsselspeicherung zulassen",
-                "description": "Speichern Sie Ihre kryptografische Identität und Ihre Nachrichtenschlüssel sicher auf dem Server. Auf diese Weise können Sie Ihren Nachrichtenverlauf auf allen neuen Geräten einsehen. <a>Erfahre mehr </a>",
+                "description": "Speichere deine kryptographische Identität und die Nachrichtenschlüssel auf dem Server. Auf diese Weise kannst du deinen Nachrichtenverlauf auf neuen Geräten einsehen. <a>Erfahre mehr</a>",
                 "title": "Schlüsselspeicher"
             },
             "recovery": {
-                "change_recovery_confirm_button": "Bestätigen Sie den neuen Wiederherstellungsschlüssel",
-                "change_recovery_confirm_description": "Geben Sie unten Ihren neuen Wiederherstellungsschlüssel ein, um den Vorgang abzuschließen. Ihr alter Wiederherstellungsschlüssel funktioniert nicht mehr.",
-                "change_recovery_confirm_title": "Geben Sie Ihren neuen Wiederherstellungsschlüssel ein",
+                "change_recovery_confirm_button": "Bestätige den neuen Wiederherstellungsschlüssel",
+                "change_recovery_confirm_description": "Gib unten deinen neuen Wiederherstellungsschlüssel ein, um den Vorgang abzuschließen. Dein alter Schlüssel funktioniert nicht mehr.",
+                "change_recovery_confirm_title": "Gib deinen neuen Wiederherstellungsschlüssel ein",
                 "change_recovery_key": "Wiederherstellungsschlüssel ändern",
-                "change_recovery_key_description": "Notieren Sie sich diesen neuen Wiederherstellungsschlüssel an einem sicheren Ort. Klicken Sie anschließend auf Weiter, um die Änderung zu bestätigen.",
+                "change_recovery_key_description": "Speichere diesen neuen Wiederherstellungsschlüssel an einem sicheren Ort. Klicke anschließend auf Weiter, um die Änderung zu bestätigen.",
                 "change_recovery_key_title": "Wiederherstellungsschlüssel ändern?",
-                "description": "Falls Sie alle Ihre Geräte verloren haben. stellen Sie Ihre kryptografische Identität und Ihren Nachrichtenverlauf mit einem Wiederherstellungsschlüssel wieder her.",
+                "description": "Solltest du alle Geräte verloren haben, kannst du deine kryptographische Identität und den Nachrichtenverlauf mit einem Wiederherstellungsschlüssel wieder herstellen.",
                 "enter_key_error": "Der eingegebene Wiederherstellungsschlüssel ist nicht korrekt.",
-                "enter_recovery_key": "Geben Sie den Wiederherstellungsschlüssel ein",
+                "enter_recovery_key": "Gib den Wiederherstellungsschlüssel ein",
                 "forgot_recovery_key": "Wiederherstellungsschlüssel vergessen?",
-                "key_storage_warning": "Ihr Schlüsselspeicher ist nicht synchronisiert. Klicken Sie auf die Schaltfläche unten, um das Problem zu beheben.",
-                "save_key_description": "Teilen Sie dies mit niemandem!",
+                "key_storage_warning": "Der Schlüsselspeicher ist nicht synchronisiert. Klicke auf die Schaltfläche unten, um das Problem zu beheben.",
+                "save_key_description": "Teile dies mit niemandem!",
                 "save_key_title": "Wiederherstellungsschlüssel",
                 "set_up_recovery": "Wiederherstellung einrichten",
                 "set_up_recovery_confirm_button": "Einrichtung abschließen",
-                "set_up_recovery_confirm_description": "Geben Sie den auf dem vorherigen Bildschirm angezeigten Wiederherstellungsschlüssel ein, um die Einrichtung der Wiederherstellung abzuschließen.",
-                "set_up_recovery_confirm_title": "Geben Sie zur Bestätigung Ihren Wiederherstellungsschlüssel ein",
-                "set_up_recovery_description": "Ihr Schlüsselspeicher ist durch einen Wiederherstellungsschlüssel geschützt. Wenn Sie nach der Installation einen neuen Wiederherstellungsschlüssel benötigen, können Sie ihn neu erstellen, indem Sie '%(changeRecoveryKeyButton)s' auswählen.",
-                "set_up_recovery_save_key_description": "Notieren Sie sich diesen Wiederherstellungsschlüssel an einem sicheren Ort, z. B. in einem Passwort-Manager, einer verschlüsselten Notiz oder einem Safe.",
-                "set_up_recovery_save_key_title": "Bewahren Sie Ihren Wiederherstellungsschlüssel an einem sicheren Ort auf",
-                "set_up_recovery_secondary_description": "Nachdem Sie auf Weiter geklickt haben, generieren wir einen Wiederherstellungsschlüssel für Sie.",
+                "set_up_recovery_confirm_description": "Gib den auf dem vorherigen Bildschirm angezeigten Wiederherstellungsschlüssel ein, um die Einrichtung abzuschließen.",
+                "set_up_recovery_confirm_title": "Gib zur Bestätigung deinen Wiederherstellungsschlüssel ein",
+                "set_up_recovery_description": "Dein Schlüsselspeicher wird durch einen Wiederherstellungsschlüssel geschützt. Wenn du nach der Einrichtung einen neuen Wiederherstellungsschlüssel benötigst, kannst du durch Auswahl von „%(changeRecoveryKeyButton)s“ einen neuen erzeugen.",
+                "set_up_recovery_save_key_description": "Bewahre den Wiederherstellungsschlüssel an einer sicheren Stelle auf, wie zum Beispiel in einem Passwort-Manager, in einer verschlüsselten Datei oder in einem Safe.",
+                "set_up_recovery_save_key_title": "Bewahre den Wiederherstellungsschlüssel an einer sicheren Stelle auf",
+                "set_up_recovery_secondary_description": "Der Wiederherstellungsschlüssel wird erzeugt, wenn du auf \"Weiter\" klickst.",
                 "title": "Wiederherstellung"
             },
             "title": "Verschlüsselung"
@@ -2607,6 +2666,7 @@
             "allow_spellcheck": "Rechtschreibprüfung zulassen",
             "application_language": "Anwendungssprache",
             "application_language_reload_hint": "Nach Änderung der Sprache wird die App neu gestartet",
+            "avatar_open_menu": "Avatar-Menü öffnen",
             "avatar_remove_progress": "Bild wird entfernt...",
             "avatar_save_progress": "Bild wird hochgeladen...",
             "avatar_upload_error_text": "Das Dateiformat wird nicht unterstützt oder das Bild ist größer als %(size)s.",
@@ -2619,22 +2679,22 @@
             "deactivate_confirm_content": "Bestätige, dass du dein Konto deaktivieren möchtest. Wenn du fortfährst, tritt folgendes ein:",
             "deactivate_confirm_content_1": "Du wirst dein Konto nicht reaktivieren können",
             "deactivate_confirm_content_2": "Du wirst dich nicht mehr anmelden können",
-            "deactivate_confirm_content_3": "Niemand wird in der Lage sein, Ihren Benutzernamen (MXID) wiederzuverwenden, Sie eingeschlossen: Der Benutzername wird insgesamt nur einmal vergeben.",
+            "deactivate_confirm_content_3": "Niemand wird in der Lage sein, deinen Nutzernamen (MXID) wiederzuverwenden, nicht einmal du selbst: Der Nutzername wird insgesamt nur einmal vergeben.",
             "deactivate_confirm_content_4": "Du wirst alle Unterhaltungen verlassen, in denen du dich befindest",
             "deactivate_confirm_content_5": "Du wirst vom Identitäts-Server entfernt: Deine Freunde werden nicht mehr in der Lage sein, dich über deine E-Mail-Adresse oder Telefonnummer zu finden",
-            "deactivate_confirm_content_6": "Deine alten Nachrichten werden weiterhin für Personen sichtbar bleiben, die sie erhalten haben, so wie es bei E-Mails der Fall ist. Möchtest du deine Nachrichten vor Personen verbergen, die Räume in der Zukunft betreten?",
+            "deactivate_confirm_content_6": "Deine alten Nachrichten werden weiterhin für Personen sichtbar bleiben, die sie erhalten haben, so wie es bei E-Mails der Fall ist. Möchtest du deine Nachrichten vor Personen verbergen, die Chats in der Zukunft betreten?",
             "deactivate_confirm_continue": "Deaktivierung des Kontos bestätigen",
             "deactivate_confirm_erase_label": "Meine Nachrichten vor neuen Teilnehmern verstecken",
             "deactivate_section": "Benutzerkonto deaktivieren",
             "deactivate_warning": "Die Deaktivierung deines Kontos ist unwiderruflich — sei vorsichtig!",
-            "discovery_email_empty": "Optionen zum Entdecken anderer Benutzer werden angezeigt, sobald Sie Ihre E-Mail Adresse zu Ihrem Konto hinzugefügt haben,",
+            "discovery_email_empty": "Sobald du eine E-Mail Adresse hinzufügst werden Optionen zum Entdecken anderer Nutzer angezeigt.",
             "discovery_email_verification_instructions": "Verifiziere den Link in deinem Posteingang",
-            "discovery_msisdn_empty": "Optionen zum Entdecken anderer Benutzer werden angezeigt, sobald Sie Ihre Telefonnummer zu Ihrem Konto hinzugefügt haben",
+            "discovery_msisdn_empty": "Sobald du eine Telefonnummer hinzufügst werden Optionen zum Entdecken anderer Nutzer angezeigt.",
             "discovery_needs_terms": "Stimme den Nutzungsbedingungen des Identitäts-Servers %(serverName)s zu, um per E-Mail-Adresse oder Telefonnummer auffindbar zu werden.",
-            "discovery_needs_terms_title": "Lassen Sie sich von anderen finden",
+            "discovery_needs_terms_title": "Lass dich finden",
             "display_name": "Anzeigename",
             "display_name_error": "Anzeigename konnte nicht gesetzt werden",
-            "email_adding_unsupported_by_hs": "Dieser Homeserver unterstützt das Hinzufügen von E-Mail-Adressen zu Ihrem Konto nicht.",
+            "email_adding_unsupported_by_hs": "Dieser Homeserver unterstützt das Hinzufügen von E-Mail-Adressen zu deinem Konto nicht.",
             "email_address_in_use": "Diese E-Mail-Adresse wird bereits verwendet",
             "email_address_label": "E-Mail-Adresse",
             "email_not_verified": "Deine E-Mail-Adresse wurde noch nicht verifiziert",
@@ -2661,7 +2721,7 @@
             "identity_server_not_set": "Kein Identitäts-Server festgelegt",
             "invalid_phone_number": "Die angegebene Telefonnummer scheint nicht gültig zu sein.",
             "language_section": "Sprache",
-            "msisdn_adding_unsupported_by_hs": "Dieser Homeserver unterstützt das Hinzufügen von Telefonnummern zu Ihrem Konto nicht.",
+            "msisdn_adding_unsupported_by_hs": "Dieser Homeserver unterstützt das Hinzufügen von Telefonnummern zu deinem Konto nicht.",
             "msisdn_in_use": "Diese Telefonnummer wird bereits verwendet",
             "msisdn_label": "Telefonnummer",
             "msisdn_verification_field_label": "Bestätigungscode",
@@ -2671,7 +2731,7 @@
             "password_change_section": "Passwort des Nutzerkontos ändern...",
             "password_change_success": "Dein Passwort wurde erfolgreich geändert.",
             "personal_info": "Persönliche Daten",
-            "profile_subtitle": "So werden Sie von anderen in der App gesehen",
+            "profile_subtitle": "So erscheinst du anderen in der App.",
             "profile_subtitle_oidc": "Ihr Konto wird separat durch einen Identitätsanbieter verwaltet. Einige persönliche Daten können deswegen hier nicht geändert werden.",
             "remove_email_prompt": "%(email)s entfernen?",
             "remove_msisdn_prompt": "%(phone)s entfernen?",
@@ -2681,16 +2741,14 @@
             "username": "Benutzername"
         },
         "inline_url_previews_default": "URL-Vorschau standardmäßig aktivieren",
-        "inline_url_previews_room": "URL-Vorschau für Raummitglieder",
-        "inline_url_previews_room_account": "URL-Vorschau für dich in diesem Raum",
+        "inline_url_previews_room": "URL-Vorschau für Chat Mitglieder",
+        "inline_url_previews_room_account": "URL-Vorschau für dich in diesem Chat",
         "insert_trailing_colon_mentions": "Doppelpunkt nach Erwähnungen einfügen",
+        "invite_controls": {
+            "default_label": "Nutzern erlauben, dich in Chats einzuladen"
+        },
         "jump_to_bottom_on_send": "Nach Senden einer Nachricht im Verlauf nach unten springen",
         "key_backup": {
-            "backup_in_progress": "Deine Schlüssel werden gesichert (Das erste Backup könnte ein paar Minuten in Anspruch nehmen).",
-            "backup_starting": "Beginne Sicherung …",
-            "backup_success": "Erfolgreich!",
-            "cannot_create_backup": "Konnte Schlüsselsicherung nicht erstellen",
-            "create_title": "Schlüsselsicherung erstellen",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Deine Schlüssel werden nun von dieser Sitzung gesichert.",
                 "backup_setup_success_title": "Verschlüsselte Sicherung erfolgreich",
@@ -2701,35 +2759,35 @@
                 "enter_phrase_description": "Gib eine nur dir bekannte Sicherheitsphrase ein, die dem Schutz deiner Daten dient. Um die Sicherheit zu gewährleisten, sollte dies nicht dein Kontopasswort sein.",
                 "enter_phrase_title": "Sicherheitsphrase eingeben",
                 "enter_phrase_to_confirm": "Gib dein Kennwort ein zweites Mal zur Bestätigung ein.",
-                "generate_security_key_description": "Wir generieren einen Wiederherstellungsschlüssel, den Sie an einem sicheren Ort aufbewahren können, z. B. in einem Passwort-Manager oder einem Safe.",
-                "generate_security_key_title": "Generieren Sie einen Wiederherstellungsschlüssel",
+                "generate_security_key_description": "Es wird ein Wiederherstellungsschlüssel erzeugt, den du an einer sicheren Stelle aufbewahren solltest, wie zum Beispiel in einem Passwort-Manager oder in einem Safe.",
+                "generate_security_key_title": "Erzeuge einen Wiederherstellungsschlüssel",
                 "pass_phrase_match_failed": "Das passt nicht.",
                 "pass_phrase_match_success": "Das passt!",
-                "phrase_strong_enough": "Großartig! Diese Sicherheitsphrase sieht stark genug aus.",
+                "phrase_strong_enough": "Gut, diese Sicherheitsphrase sieht stark genug aus.",
                 "secret_storage_query_failure": "Status des sicheren Speichers kann nicht gelesen werden",
-                "security_key_safety_reminder": "Bewahren Sie Ihren Wiederherstellungsschlüssel an einem sicheren Ort auf, z. B. in einem Passwort-Manager oder einem Safe, da er zum Schutz Ihrer verschlüsselten Daten verwendet wird.",
+                "security_key_safety_reminder": "Bewahre den Wiederherstellungsschlüssel an einer sicheren Stelle auf, wie zum Beispiel in einem Passwort-Manager oder in einem Safe. Er schützt deine verschlüsselten Daten.",
                 "set_phrase_again": "Gehe zurück und setze es erneut.",
                 "settings_reminder": "Du kannst auch in den Einstellungen Sicherungen einrichten und deine Schlüssel verwalten.",
                 "title_confirm_phrase": "Sicherheitsphrase bestätigen",
-                "title_save_key": "Speichern Sie Ihren Wiederherstellungsschlüssel",
+                "title_save_key": "Speichere deinen Wiederherstellungsschlüssel",
                 "title_set_phrase": "Sicherheitsphrase setzen",
                 "unable_to_setup": "Sicherer Speicher kann nicht eingerichtet werden",
                 "use_different_passphrase": "Eine andere Passphrase verwenden?",
-                "use_phrase_only_you_know": "Verwenden Sie eine geheime Phrase, die nur Sie kennen, und speichern Sie optional einen Wiederherstellungsschlüssel, um ihn für Backups zu verwenden."
+                "use_phrase_only_you_know": "Verwende eine Sicherheitsphrase, die nur dir bekannt ist. Speichere optional einen Wiederherstellungsschlüssel als Backup."
             }
         },
         "key_export_import": {
             "confirm_passphrase": "Passphrase bestätigen",
             "enter_passphrase": "Passphrase eingeben",
-            "export_description_1": "Dieser Prozess erlaubt es dir, die Schlüssel für die in verschlüsselten Räumen empfangenen Nachrichten in eine lokale Datei zu exportieren. In Zukunft wird es möglich sein, diese Datei in eine andere Matrix-Anwendung zu importieren, sodass diese die Nachrichten ebenfalls entschlüsseln kann.",
+            "export_description_1": "Dieser Prozess exportiert die Schlüssel für die in verschlüsselten Chats empfangenen Nachrichten in eine lokale Datei. In Zukunft wird es möglich sein, diese Datei in eine andere Matrix-Anwendung zu importieren, sodass diese die Nachrichten ebenfalls entschlüsseln kann.",
             "export_description_2": "Die exportierte Datei erlaubt Unbefugten, jede Nachricht zu entschlüsseln, sei also vorsichtig und halte sie versteckt. Um dies zu verhindern, empfiehlt es sich eine einzigartige Passphrase unten einzugeben, die nur für das Entschlüsseln der exportierten Datei genutzt wird. Es ist nur möglich, diese Datei mit der selben Passphrase zu importieren.",
-            "export_title": "Raum-Schlüssel exportieren",
+            "export_title": "Chat-Schlüssel exportieren",
             "file_to_import": "Zu importierende Datei",
             "import_description_1": "Dieser Prozess erlaubt es dir, die zuvor von einer anderen Matrix-Anwendung exportierten Verschlüsselungs-Schlüssel zu importieren. Danach kannst du alle Nachrichten entschlüsseln, die auch bereits auf der anderen Anwendung entschlüsselt werden konnten.",
             "import_description_2": "Die exportierte Datei ist mit einer Passphrase geschützt. Du kannst die Passphrase hier eingeben, um die Datei zu entschlüsseln.",
-            "import_title": "Raum-Schlüssel importieren",
+            "import_title": "Chat-Schlüssel importieren",
             "phrase_cannot_be_empty": "Passphrase darf nicht leer sein",
-            "phrase_must_match": "Passphrases müssen übereinstimmen",
+            "phrase_must_match": "Passphrasen müssen übereinstimmen",
             "phrase_strong_enough": "Super! Diese Passphrase wirkt stark genug"
         },
         "keyboard": {
@@ -2740,30 +2798,31 @@
             "dialog_title": "<strong>Einstellungen:</strong> Labor"
         },
         "labs_mjolnir": {
-            "dialog_title": "<strong>Einstellungen:</strong> Blockierte Benutzer"
+            "dialog_title": "<strong>Einstellungen:</strong> Ignorierte Nutzer"
         },
         "media_preview": {
-            "hide_avatars": "Verstecken Sie die Avatare von Chatroom und Einladung",
-            "hide_media": "Verstecke Sie sich immer",
-            "media_preview_description": "Ein verstecktes Medium kann immer angezeigt werden, indem Sie darauf tippen",
+            "hide_avatars": "Blende die Avatare des Chats und des Einladenden aus",
+            "hide_media": "Immer ausblenden",
+            "media_preview_description": "Ausgeblendete Medien können immer durch Antippen angezeigt werden",
             "media_preview_label": "Medien in der Zeitleiste anzeigen",
             "show_in_private": "In privaten Chatrooms",
             "show_media": "Immer anzeigen"
         },
+        "not_supported": "Der Konto-Provider hat diese Funktion nicht implementiert.",
         "notifications": {
-            "default_setting_description": "Diese Einstellung wird standardmäßig für all deine Räume übernommen.",
+            "default_setting_description": "Gilt für alle Chats auf allen Geräten.",
             "default_setting_section": "Ich möchte benachrichtigt werden für (Standardeinstellung)",
             "desktop_notification_message_preview": "Nachrichtenvorschau in der Desktopbenachrichtigung anzeigen",
             "dialog_title": "<strong>Einstellungen:</strong> Benachrichtigungen",
             "email_description": "E-Mail-Zusammenfassung für verpasste Benachrichtigungen erhalten",
             "email_section": "E-Mail-Zusammenfassung",
             "email_select": "Wähle, an welche E-Mail-Adresse die Zusammenfassungen gesendet werden. Verwalte deine E-Mail-Adressen unter <button>Allgemein</button>.",
-            "enable_audible_notifications_session": "Benachrichtigungstöne in dieser Sitzung",
-            "enable_desktop_notifications_session": "Desktopbenachrichtigungen in dieser Sitzung",
+            "enable_audible_notifications_session": "Akustische Benachrichtigungen für diese Sitzung aktivieren",
+            "enable_desktop_notifications_session": "Desktop-Benachrichtigungen für diese Sitzung aktivieren",
             "enable_email_notifications": "E-Mail-Benachrichtigungen für %(email)s aktivieren",
-            "enable_notifications_account": "Aktiviere Benachrichtigungen für dieses Konto",
+            "enable_notifications_account": "Benachrichtigungen für dieses Konto aktivieren",
             "enable_notifications_account_detail": "Ausschalten, um Benachrichtigungen auf all deinen Geräten und Sitzungen zu deaktivieren",
-            "enable_notifications_device": "Aktiviere Benachrichtigungen für dieses Gerät",
+            "enable_notifications_device": "Benachrichtigungen für dieses Gerät aktivieren",
             "error_loading": "Fehler beim Laden der Benachrichtigungseinstellungen.",
             "error_permissions_denied": "%(brand)s hat keine Berechtigung, Benachrichtigungen zu senden - Bitte überprüfe deine Browsereinstellungen",
             "error_permissions_missing": "%(brand)s hat keine Berechtigung für das Senden von Benachrichtigungen erhalten - Bitte versuche es erneut",
@@ -2771,8 +2830,8 @@
             "error_saving_detail": "Beim Speichern der Benachrichtigungseinstellungen ist ein Fehler aufgetreten.",
             "error_title": "Benachrichtigungen konnten nicht aktiviert werden",
             "error_updating": "Ein Fehler ist während der Aktualisierung deiner Benachrichtigungseinstellungen aufgetreten. Bitte versuche die Option erneut umzuschalten.",
-            "invites": "In einen Raum eingeladen",
-            "keywords": "Zeige einen Hinweis <badge/>, wenn Schlüsselwörter in einem Raum verwendet werden.",
+            "invites": "In einen Chat eingeladen",
+            "keywords": "Zeige einen Hinweis <badge/>, wenn Schlüsselwörter in einem Chat verwendet werden.",
             "keywords_prompt": "Schlüsselwörter, Variationen dieser oder Anzeigenamen eingeben",
             "labs_notice_prompt": "<strong>Aktualisierung:</strong> Wir haben die Benachrichtigungseinstellungen vereinfacht, damit Optionen schneller zu finden sind. Einige benutzerdefinierte Einstellungen werden hier nicht angezeigt, sind aber dennoch aktiv. Wenn du fortfährst, könnten sich einige Einstellungen ändern. <a>Erfahre mehr</a>",
             "mentions_keywords": "Erwähnungen und Schlüsselwörter",
@@ -2785,13 +2844,13 @@
             "notify_mention": "Benachrichtigen, wenn jemand @anzeigename oder %(mxid)s erwähnt",
             "other_section": "Andere Dinge, an denen du interessiert sein könntest:",
             "people_mentions_keywords": "Personen, Erwähnungen und Schlüsselwörter",
-            "play_sound_for_description": "Standardmäßig übernommen für alle Räume auf allen Geräten.",
+            "play_sound_for_description": "Gilt für alle Chats auf allen Geräten.",
             "play_sound_for_section": "Spiele einen Ton für",
             "push_targets": "Benachrichtigungsziele",
             "quick_actions_mark_all_read": "Alle Nachrichten als gelesen markieren",
             "quick_actions_reset": "Standardeinstellungen wiederherstellen",
             "quick_actions_section": "Schnellaktionen",
-            "room_activity": "Neue Raumaktivitäten, -aktualisierungen und -statusmeldungen",
+            "room_activity": "Neue Chataktivitäten, -aktualisierungen und -statusmeldungen",
             "rule_call": "Anrufe",
             "rule_contains_display_name": "Nachrichten mit meinem Anzeigenamen",
             "rule_contains_user_name": "Nachrichten mit meinem Benutzernamen",
@@ -2802,11 +2861,12 @@
             "rule_room_one_to_one": "Direktnachrichten",
             "rule_roomnotif": "Nachrichten mit @room",
             "rule_suppress_notices": "Nachrichten von Bots",
-            "rule_tombstone": "Raumaktualisierungen",
+            "rule_tombstone": "Wenn die Chat-Version aktualisiert wird",
             "show_message_desktop_notification": "Nachrichteninhalt in der Desktopbenachrichtigung anzeigen",
             "voip": "Audio- und Videoanrufe"
         },
         "preferences": {
+            "Electron.enableContentProtection": "Verhindert Bildschirmaufnahmen durch andere Apps",
             "Electron.enableHardwareAcceleration": "Hardwarebeschleunigung einschalten (Neustart von %(appName)s notwendig)",
             "always_show_menu_bar": "Fenstermenüleiste immer anzeigen",
             "autocomplete_delay": "Verzögerung vor Autovervollständigung (ms)",
@@ -2815,6 +2875,7 @@
             "composer_heading": "Nachrichteneingabe",
             "default_timezone": "Browser-Standard (%(timezone)s )",
             "dialog_title": "<strong>Einstellungen:</strong> Präferenzen",
+            "enable_content_protection": "Schutz des Inhalts aktivieren",
             "enable_hardware_acceleration": "Aktiviere die Hardwarebeschleunigung",
             "enable_tray_icon": "Fenster beim Schließen in die Symbolleiste minimieren",
             "keyboard_heading": "Tastenkombinationen",
@@ -2824,10 +2885,11 @@
             "publish_timezone": "Zeitzone auf öffentlichem Profil anzeigen lassen",
             "rm_lifetime": "Gültigkeitsdauer der Gelesen-Markierung (ms)",
             "rm_lifetime_offscreen": "Gültigkeitsdauer der Gelesen-Markierung außerhalb des Bildschirms (ms)",
-            "room_directory_heading": "Raumverzeichnis",
-            "room_list_heading": "Raumliste",
-            "show_avatars_pills": "Profilbilder in Benutzer-, Raum- und Ereigniserwähnungen anzeigen",
+            "room_directory_heading": "Chat Verzeichnis",
+            "room_list_heading": "Chatliste",
+            "show_avatars_pills": "Avatare in Nutzer-, Chat- und Ereigniserwähnungen anzeigen",
             "show_polls_button": "Zeige Pol button",
+            "startup_window_behaviour_label": "Start- und Fensterverhalten",
             "surround_text": "Sonderzeichen automatisch vor und hinter Textauswahl setzen",
             "time_heading": "Zeitanzeige",
             "user_timezone": "Zeitzone festlegen"
@@ -2839,27 +2901,26 @@
             "bulk_options_accept_all_invites": "Akzeptiere alle %(invitedRooms)s Einladungen",
             "bulk_options_reject_all_invites": "Alle %(invitedRooms)s Einladungen ablehnen",
             "bulk_options_section": "Sammeloptionen",
-            "dehydrated_device_description": "Die Offline-Gerätefunktion ermöglicht es Ihnen, verschlüsselte Nachrichten zu empfangen, auch wenn Sie an keinem Gerät angemeldet sind",
+            "dehydrated_device_description": "Die Offline Funktion ermöglicht es, verschlüsselte Nachrichten zu empfangen, selbst wenn du an keinem Gerät angemeldet bist",
             "dehydrated_device_enabled": "Offline-Gerät aktiviert",
             "dialog_title": "<strong>Einstellungen </strong> Sicherheit & Datenschutz",
-            "e2ee_default_disabled_warning": "Deine Server-Administration hat die Ende-zu-Ende-Verschlüsselung für private Räume und Direktnachrichten standardmäßig deaktiviert.",
-            "enable_message_search": "Nachrichtensuche in verschlüsselten Räumen aktivieren",
+            "e2ee_default_disabled_warning": "Deine Server Administrator hat die Ende-zu-Ende-Verschlüsselung für private Chats und Direktnachrichten standardmäßig deaktiviert.",
+            "enable_message_search": "Aktiviere die Nachrichtensuche in verschlüsselten Chats",
             "encryption_section": "Verschlüsselung",
-            "ignore_users_empty": "Sie haben keinen Benutzer blockiert.",
-            "ignore_users_section": "Blockierte Benutzer",
+            "ignore_users_empty": "Du hast keine Nutzer ignoriert.",
+            "ignore_users_section": "Ignorierte Nutzer",
             "key_backup_algorithm": "Algorithmus:",
-            "key_backup_connect": "Verbinde diese Sitzung mit einer Schlüsselsicherung",
-            "message_search_disable_warning": "Wenn deaktiviert, werden Nachrichten von verschlüsselten Räumen nicht in den Ergebnissen auftauchen.",
+            "message_search_disable_warning": "Wenn deaktiviert, werden Nachrichten von verschlüsselten Chats nicht in den Ergebnissen auftauchen.",
             "message_search_disabled": "Speichere verschlüsselte Nachrichten lokal, sodass sie deinen Suchergebnissen erscheinen können.",
             "message_search_enabled": {
-                "other": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten von %(rooms)s Räumen zu speichern.",
-                "one": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten vom Raum %(rooms)s zu speichern."
+                "one": "Halte verschlüsselte Nachrichten sicher lokal vor, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten von %(rooms)s Chat zu speichern.",
+                "other": "Halte verschlüsselte Nachrichten sicher lokal vor, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten von %(rooms)s Chats zu speichern."
             },
             "message_search_failed": "Initialisierung der Nachrichtensuche fehlgeschlagen",
             "message_search_indexed_messages": "Indizierte Nachrichten:",
-            "message_search_indexed_rooms": "Indizierte Räume:",
+            "message_search_indexed_rooms": "Indizierte Chats:",
             "message_search_indexing": "Indiziere: %(currentRoom)s",
-            "message_search_indexing_idle": "Derzeit werden keine Nachrichten für Räume indiziert.",
+            "message_search_indexing_idle": "Derzeit werden keine Nachrichten für Chats indiziert.",
             "message_search_intro": "%(brand)s verwendet einen sicheren Zwischenspeicher für verschlüsselte Nachrichten, damit sie in den Suchergebnissen angezeigt werden:",
             "message_search_room_progress": "%(doneRooms)s von %(totalRooms)s",
             "message_search_section": "Nachrichtensuche",
@@ -2875,7 +2936,7 @@
         "send_read_receipts_unsupported": "Dein Server unterstützt das Deaktivieren von Lesebestätigungen nicht.",
         "send_typing_notifications": "Tippbenachrichtigungen senden",
         "sessions": {
-            "best_security_note": "Um die beste Sicherheit zu gewährleisten, verifizieren Sie Ihre Sitzungen und melden Sie sich von jeder Sitzung ab, die Sie nicht mehr kennen oder nicht mehr verwenden.",
+            "best_security_note": "Für beste Sicherheit verifiziere deine Sitzungen und melde dich von allen Sitzungen ab, die du nicht erkennst oder nicht mehr verwendest.",
             "browser": "Internet Browser",
             "confirm_sign_out": {
                 "one": "Abmelden des Geräts bestätigen",
@@ -2896,7 +2957,7 @@
             "current_session": "Aktuelle Sitzung",
             "desktop_session": "Desktop-Sitzung",
             "details_heading": "Sitzungsdetails",
-            "device_unverified_description": "Für bestmögliche Sicherheit und Zuverlässigkeit verifiziere diese Sitzung oder melde sie ab.",
+            "device_unverified_description": "Verifiziere diese Sitzung für bestmögliche Sicherheit und Zuverlässigkeit oder melde dich ab.",
             "device_unverified_description_current": "Verifiziere deine aktuelle Sitzung für besonders sichere Kommunikation.",
             "device_verified_description": "Diese Sitzung ist für sichere Kommunikation bereit.",
             "device_verified_description_current": "Deine aktuelle Sitzung ist für sichere Kommunikation bereit.",
@@ -2912,9 +2973,9 @@
             "hide_details": "Details ausblenden",
             "inactive_days": "Seit %(inactiveAgeDays)s+ Tagen inaktiv",
             "inactive_sessions": "Inaktive Sitzungen",
-            "inactive_sessions_explainer_1": "Inaktive Sitzungen sind jene, die du schon seit geraumer Zeit nicht mehr verwendet hast, aber nach wie vor Verschlüsselungs-Schlüssel erhalten.",
+            "inactive_sessions_explainer_1": "Inaktive Sitzungen sind jene, die du schon seit geraumer Zeit nicht mehr verwendet hast, die aber nach wie vor Verschlüsselungs-Schlüssel erhalten.",
             "inactive_sessions_explainer_2": "Das Entfernen inaktiver Sitzungen verbessert Sicherheit, Leistung und das Erkennen von dubiosen neuen Sitzungen.",
-            "inactive_sessions_list_description": "Erwäge, dich aus alten (%(inactiveAgeDays)s Tage oder mehr), nicht mehr verwendeten Sitzungen abzumelden.",
+            "inactive_sessions_list_description": "Du solltest dich aus alten Sitzungen (%(inactiveAgeDays)s Tage oder mehr) abmelden, wenn du sie nicht mehr benötigst.",
             "ip": "IP-Adresse",
             "last_activity": "Neueste Aktivität",
             "manage": "Diese Sitzung verwalten",
@@ -2935,16 +2996,16 @@
             "rename_form_caption": "Sei dir bitte bewusst, dass Sitzungsnamen auch für Personen, mit denen du kommunizierst, sichtbar sind.",
             "rename_form_heading": "Sitzung umbenennen",
             "rename_form_learn_more": "Sitzungen umbenennen",
-            "rename_form_learn_more_description_1": "Andere Benutzer in Direktnachrichten oder von dir betretenen Räumen können die volle Liste deiner Sitzungen sehen.",
+            "rename_form_learn_more_description_1": "Andere Nutzer in Direktnachrichten oder Gruppen können die volle Liste deiner Sitzungen sehen.",
             "rename_form_learn_more_description_2": "Dies gibt ihnen die Gewissheit, dass sie auch wirklich mit dir kommunizieren, allerdings bedeutet es auch, dass sie die Sitzungsnamen sehen können, die du hier eingibst.",
             "security_recommendations": "Sicherheitsempfehlungen",
-            "security_recommendations_description": "Verbessere deine Kontosicherheit, indem du diese Empfehlungen beherzigst.",
+            "security_recommendations_description": "Verbessere mit diesen Empfehlungen deine Kontosicherheit",
             "session_id": "Sitzungs-ID",
             "show_details": "Details anzeigen",
             "sign_in_with_qr": "Neues Gerät verknüpfen",
             "sign_in_with_qr_button": "QR-Code anzeigen",
-            "sign_in_with_qr_description": "Sie können dieses Gerät dazu verwenden, um ein neues Gerät per QR-Code anzumelden und verschlüsselte Nachrichtenübermittlung einzurichten.",
-            "sign_in_with_qr_unsupported": "Wird von Ihrem Kontoanbieter nicht unterstützt",
+            "sign_in_with_qr_description": "Verwende einen QR-Code, um dich auf einem anderen Gerät anzumelden und sichere Nachrichten einzurichten.",
+            "sign_in_with_qr_unsupported": "Wird vom Konto-Anbieter nicht unterstützt",
             "sign_out": "Von dieser Sitzung abmelden",
             "sign_out_all_other_sessions": "Von allen anderen Sitzungen abmelden (%(otherSessionsCount)s)",
             "sign_out_confirm_description": {
@@ -2959,7 +3020,7 @@
             "unknown_session": "Unbekannter Sitzungstyp",
             "unverified_session": "Nicht verifizierte Sitzung",
             "unverified_session_explainer_1": "Diese Sitzung unterstützt keine Verschlüsselung und kann deshalb nicht verifiziert werden.",
-            "unverified_session_explainer_2": "Du wirst dich mit dieser Sitzung nicht an Unterhaltungen in Räumen mit aktivierter Verschlüsselung beteiligen können.",
+            "unverified_session_explainer_2": "Du wirst dich mit dieser Sitzung nicht an Unterhaltungen in Chats mit aktivierter Verschlüsselung beteiligen können.",
             "unverified_session_explainer_3": "Aus Sicherheits- und Datenschutzgründen, wird die Nutzung von verschlüsselungsfähigen Matrix-Anwendungen empfohlen.",
             "unverified_sessions": "Nicht verifizierte Sitzungen",
             "unverified_sessions_explainer_1": "Nicht verifizierte Sitzungen sind jene, die mit deinen Daten angemeldet, aber nicht quer signiert wurden.",
@@ -2975,10 +3036,11 @@
             "web_session": "Web-Sitzung"
         },
         "show_avatar_changes": "Profilbildänderungen anzeigen",
-        "show_breadcrumbs": "Kürzlich besuchte Räume anzeigen",
+        "show_breadcrumbs": "Kürzlich besuchte Chats anzeigen",
         "show_chat_effects": "Effekte bei manchen Emojis (z. B. Konfetti)",
         "show_displayname_changes": "Änderungen von Anzeigenamen",
         "show_join_leave": "Bei-/Austrittsnachrichten (Einladung/Entfernen/Bann nicht betroffen)",
+        "show_message_previews": "Nachrichtenvorschau anzeigen",
         "show_nsfw_content": "NSFW-Inhalte anzeigen",
         "show_read_receipts": "Lesebestätigungen von anderen Benutzern anzeigen",
         "show_redaction_placeholder": "Platzhalter für gelöschte Nachrichten",
@@ -2987,21 +3049,26 @@
         "showbold": "Alle Aktivitäten in der Chatroommliste anzeigen (Ausführungspunkte oder Anzahl ungelesener Nachrichten)",
         "sidebar": {
             "dialog_title": "<strong>Einstellungen:</strong> Seitenleiste",
-            "metaspaces_favourites_description": "Gruppiere all deine favorisierten Unterhaltungen an einem Ort.",
-            "metaspaces_home_all_rooms": "Alle Räume anzeigen",
-            "metaspaces_home_all_rooms_description": "Alle Räume auf der Startseite anzeigen, auch wenn sie Teil eines Space sind.",
+            "metaspaces_favourites_description": "Sammle alle deinen favorisierten Chats an einem Ort.",
+            "metaspaces_home_all_rooms": "Alle Chats anzeigen",
+            "metaspaces_home_all_rooms_description": "Alle Chats auf der Startseite anzeigen, auch wenn sie Teil eines Space sind.",
             "metaspaces_home_description": "Die Startseite bietet dir einen Überblick über deine Unterhaltungen.",
-            "metaspaces_orphans": "Räume außerhalb von Spaces",
-            "metaspaces_orphans_description": "Gruppiere all deine Räume, die nicht Teil eines Spaces sind, an einem Ort.",
+            "metaspaces_orphans": "Chats außerhalb von Spaces",
+            "metaspaces_orphans_description": "Gruppiere all deine Chats, die nicht Teil eines Spaces sind, an einem Ort.",
             "metaspaces_people_description": "Gruppiere all deine Direktnachrichten an einem Ort.",
             "metaspaces_subsection": "Anzuzeigende Spaces",
-            "metaspaces_video_rooms": "Videoräume und -konferenzen",
-            "metaspaces_video_rooms_description": "Gruppiere alle privaten Videoräume und -konferenzen.",
-            "metaspaces_video_rooms_description_invite_extension": "Sie können Personen außerhalb von Matrix zu Konferenzen einladen.",
-            "spaces_explainer": "Räume sind eine Möglichkeit, Chatrooms und Personen zu gruppieren. Abgesehen von den Räumen, in denen Sie sich gerade befinden, können Sie auch einige vorgefertigte Räume verwenden.",
+            "metaspaces_video_rooms": "Videochats und -konferenzen",
+            "metaspaces_video_rooms_description": "Gruppiere alle privaten Videochats und -konferenzen.",
+            "metaspaces_video_rooms_description_invite_extension": "Du kannst in Konferenzen auch Personen außerhalb von Matrix einladen.",
+            "spaces_explainer": "Spaces sind eine Möglichkeit, Gruppen und Personen zu bündeln. Neben den Spaces, in denen du dich befindest, kannst du auch einige vorgefertigte verwenden.",
             "title": "Seitenleiste"
         },
-        "start_automatically": "Nach Systemstart automatisch starten",
+        "start_automatically": {
+            "disabled": "Nein",
+            "enabled": "Ja",
+            "label": "Öffne %(brand)s, wenn du dich an deinem Computer anmeldest",
+            "minimised": "Minimiert"
+        },
         "tac_only_notifications": "Benachrichtigungen nur im Thread Aktivitätszentrum anzeigen",
         "use_12_hour_format": "Uhrzeiten im 12-Stundenformat (z. B. 2:30 p. m.)",
         "use_command_enter_send_message": "Benutze Betriebssystemtaste + Eingabe um eine Nachricht zu senden",
@@ -3021,7 +3088,7 @@
             "enable_fallback_ice_server": "Ersatz-Anrufassistenz-Server erlauben (%(server)s)",
             "enable_fallback_ice_server_description": "Dieser wird nur verwendet, sollte dein Heim-Server keinen bieten. Deine IP-Adresse würde während eines Anrufs geteilt werden.",
             "mirror_local_feed": "Lokalen Video-Feed spiegeln",
-            "missing_permissions_prompt": "Fehlende Medienberechtigungen. Verwende die nachfolgende Schaltfläche, um sie anzufordern.",
+            "missing_permissions_prompt": "Fehlende Medienberechtigungen, klicke auf die Schaltfläche unten, um sie anzufordern.",
             "noise_suppression": "Rauschreduzierung",
             "request_permissions": "Medienberechtigungen anfordern",
             "title": "Anrufe",
@@ -3041,16 +3108,16 @@
         "share_call": "Konferenzeinladungslink",
         "share_call_subtitle": "Link für externe Benutzer, um dem Anruf ohne Matrixkonto beizutreten:",
         "title_link": "Link teilen",
-        "title_message": "Raumnachricht teilen",
-        "title_room": "Raum teilen",
+        "title_message": "Teile die Nachricht",
+        "title_room": "Teile den Chat",
         "title_user": "Teile Benutzer"
     },
     "slash_command": {
-        "addwidget": "Fügt dem Raum ein individuelles Widget per URL hinzu",
+        "addwidget": "Fügt dem Chat ein individuelles Widget per URL hinzu",
         "addwidget_iframe_missing_src": "iFrame hat kein src-Attribut",
         "addwidget_invalid_protocol": "Bitte gib eine mit https:// oder http:// beginnende Widget-URL an",
         "addwidget_missing_url": "Bitte gib eine Widget-URL oder einen Einbettungscode an",
-        "addwidget_no_permissions": "Du darfst in diesem Raum keine Widgets verändern.",
+        "addwidget_no_permissions": "Du darfst in diesem Chat keine Widgets verändern.",
         "ban": "Verbannt den Benutzer mit der angegebenen ID",
         "category_actions": "Aktionen",
         "category_admin": "Administrator",
@@ -3059,88 +3126,91 @@
         "category_messages": "Nachrichten",
         "category_other": "Sonstiges",
         "command_error": "Fehler im Befehl",
-        "converttodm": "Wandelt den Raum in eine Direktnachricht um",
-        "converttoroom": "Wandelt die Direktnachricht in einen Raum um",
-        "could_not_find_room": "Konnte Raum nicht finden",
+        "converttodm": "Wandelt die Gruppe in eine Direktnachricht um",
+        "converttoroom": "Wandelt die Direktnachricht in eine Gruppe um",
+        "could_not_find_room": "Konnte Chat nicht finden",
         "deop": "Setzt das Berechtigungslevel beim Benutzer mit der angegebenen ID zurück",
         "devtools": "Öffnet die Entwicklungswerkzeuge",
-        "discardsession": "Erzwingt, dass die aktuell ausgehende Gruppensitzung in einem verschlüsseltem Raum verworfen wird",
+        "discardsession": "Verwirft die aktuell ausgehende Gruppensitzung in einem verschlüsseltem Chat",
         "error_invalid_rendering_type": "Befehlsfehler: Rendering-Typ kann nicht gefunden werden (%(renderingType)s)",
-        "error_invalid_room": "Eingabe fehlgeschlagen: Raum (%(roomId)s) nicht auffindbar",
+        "error_invalid_room": "Eingabe fehlgeschlagen: Chat (%(roomId)s) nicht auffindbar",
         "error_invalid_runfn": "Befehlsfehler: Slash-Befehl kann nicht verarbeitet werden.",
-        "error_invalid_user_in_room": "Kann Benutzer in Raum nicht finden",
+        "error_invalid_user_in_room": "Kann Nutzer im Chat nicht finden",
         "help": "Zeigt die Liste verfügbarer Befehle mit Verwendungen und Beschreibungen an",
         "help_dialog_title": "Befehl Hilfe",
         "holdcall": "Den aktuellen Anruf halten",
         "html": "Sendet eine Nachricht als HTML, ohne sie als Markdown darzustellen",
-        "ignore": "Benutzer blockieren und dessen Nachrichten ausblenden",
-        "ignore_dialog_description": "%(userId)s ist jetzt blockiert",
-        "ignore_dialog_title": "Benutzer blockiert",
-        "invite": "Lädt den Benutzer mit der angegebenen ID in den aktuellen Raum ein",
+        "ignore": "Ignoriert einen Nutzer und blendet dessen Nachrichten aus",
+        "ignore_dialog_description": "%(userId)s wird ab jetzt ignoriert",
+        "ignore_dialog_title": "Nutzer ignoriert",
+        "invite": "Lädt den Nutzer mit der angegebenen ID in den aktuellen Chat ein",
         "invite_3pid_needs_is_error": "Verwende einen Identitäts-Server, um per E-Mail einladen zu können. Lege einen in den Einstellungen fest.",
         "invite_3pid_use_default_is_title": "Benutze einen Identitäts-Server",
         "invite_3pid_use_default_is_title_description": "Benutze einen Identitäts-Server, um andere mittels E-Mail einzuladen. Klicke auf fortfahren, um den Standard-Identitäts-Server (%(defaultIdentityServerName)s) zu benutzen oder ändere ihn in den Einstellungen.",
         "invite_failed": "Der Benutzer (%(user)s) wurde nicht in %(roomId)s eingeladen, aber das Einladungsprogramm meldete keinen Fehler",
-        "join": "Tritt dem Raum mit der angegebenen Adresse bei",
+        "join": "Tritt dem Chat mit der angegebenen Adresse bei",
         "jumptodate": "Zu einem Zeitpunkt im Verlauf springen",
         "jumptodate_invalid_input": "Ups! Leider können wir das Datum \"%(inputDate)s\" nicht verstehen. Bitte gib es im Format JJJJ-MM-TT (Jahr-Monat-Tag) ein.",
         "lenny": "Stellt ( ͡° ͜ʖ ͡°) einer Klartextnachricht voran",
+        "manual_device_verification_confirm_description": "Dadurch kann ein anderes Gerät Nachrichten in deinem Namen senden und empfangen. WENN JEMAND DIR GESAGT HAT, DU SOLLST HIER ETWAS EINFÜGEN, WIRST DU VERMUTLICH BETROGEN! Bist du sicher, dass du dieses andere Gerät verifizieren möchtest?",
+        "manual_device_verification_confirm_title": "Vorsicht: manuelle Verifizierung des Geräts",
         "me": "Als Aktionen anzeigen",
         "msg": "Sendet diesem Benutzer eine Nachricht",
-        "myavatar": "Ändert dein Profilbild in allen Räumen",
-        "myroomavatar": "Ändert dein Profilbild ausschließlich im aktuellen Raum",
-        "myroomnick": "Ändert den Anzeigenamen ausschließlich für den aktuellen Raum",
+        "myavatar": "Ändert dein Profilbild in allen Chats",
+        "myroomavatar": "Ändert dein Profilbild ausschließlich im aktuellen Chat",
+        "myroomnick": "Ändert den Anzeigenamen ausschließlich für den aktuellen Chat",
         "nick": "Ändert deinen Anzeigenamen",
-        "no_active_call": "Kein aktiver Anruf in diesem Raum",
+        "no_active_call": "Kein aktiver Anruf in diesem Chat",
         "op": "Berechtigungsstufe einers Benutzers setzen",
-        "part_unknown_alias": "Nicht erkannte Raumadresse: %(roomAlias)s",
+        "part_unknown_alias": "Nicht erkannte Chatadresse: %(roomAlias)s",
         "plain": "Sendet eine Nachricht als Klartext, ohne sie als Markdown darzustellen",
         "query": "Öffnet eine Unterhaltung mit dieser Person",
         "query_not_found_phone_number": "Dieser Telefonnummer kann keine Matrix-ID zugeordnet werden",
         "rageshake": "Einen Fehlerbericht mit der Protokolldatei senden",
         "rainbow": "Sendet die Nachricht in Regenbogenfarben",
         "rainbowme": "Zeigt Aktionen in Regenbogenfarben",
-        "remove": "Entfernt den Benutzer mit der angegebenen ID aus diesem Raum",
-        "roomavatar": "Ändert das Icon vom Raum",
-        "roomname": "Setze einen Raumnamen",
+        "remove": "Entfernt den Nutzer mit der angegebenen ID aus diesem Chat",
+        "roomavatar": "Ändert den Avatar vom aktuellen Chat",
+        "roomname": "Setze einen Chatnamen",
         "server_error": "Server-Fehler",
         "server_error_detail": "Server ist nicht verfügbar, überlastet oder ein anderer Fehler ist aufgetreten.",
         "shrug": "Stellt ¯\\_(ツ)_/¯ einer Klartextnachricht voran",
         "spoiler": "Die gegebene Nachricht als Spoiler senden",
         "tableflip": "Stellt (╯°□°）╯︵ ┻━┻ einer Klartextnachricht voran",
-        "topic": "Raumthema anzeigen oder ändern",
-        "topic_none": "Dieser Raum hat kein Thema.",
-        "topic_room_error": "Thema des Raums konnte nicht ermittelt werden: Raum kann nicht gefunden werden (%(roomId)s",
-        "unban": "Entsperrt den Benutzer mit der angegebenen ID",
+        "topic": "Chat Thema anzeigen oder ändern",
+        "topic_none": "Dieser Chat hat kein Thema.",
+        "topic_room_error": "Thema des Chats konnte nicht ermittelt werden: Chat (%(roomId)s kann nicht gefunden werden",
+        "unban": "Entsperrt den Nutzer mit der angegebenen ID",
         "unflip": "Stellt ┬──┬ ノ( ゜-゜ノ) einer Klartextnachricht voran",
         "unholdcall": "Beendet das Halten des Anrufs",
-        "unignore": "Benutzer freigeben und ihre neuen Nachrichten wieder anzeigen",
-        "unignore_dialog_description": "%(userId)s wird nicht mehr blockiert",
-        "unignore_dialog_title": "Benutzer nicht mehr blockiert",
+        "unignore": "Nutzer wird nicht mehr ignoriert und neuen Nachrichten werden wieder angezeigt",
+        "unignore_dialog_description": "%(userId)s wird nicht mehr ignoriert",
+        "unignore_dialog_title": "Nutzer nicht mehr ignoriert",
         "unknown_command": "Unbekannter Befehl",
         "unknown_command_button": "Als Nachricht senden",
         "unknown_command_detail": "Unbekannter Befehl: %(commandText)s",
         "unknown_command_help": "Du kannst <code>/help</code> benutzen, um alle verfügbaren Befehle aufzulisten. Willst du es stattdessen als Nachricht senden?",
         "unknown_command_hint": "Hinweis: Beginne deine Nachricht mit <code>//</code>, um sie mit einem Schrägstrich zu beginnen.",
-        "upgraderoom": "Aktualisiert den Raum auf eine neue Version",
+        "upgraderoom": "Aktualisiert den Chat auf eine neue Chat-Version",
         "upgraderoom_permission_error": "Du hast nicht die erforderlichen Berechtigungen, diesen Befehl zu verwenden.",
         "usage": "Verwendung",
-        "view": "Raum mit angegebener Adresse betrachten",
+        "verify": "Verifiziere eines deiner eigenen Geräte manuell",
+        "view": "Chat mit angegebener Adresse betrachten",
         "whois": "Zeigt Informationen über Benutzer"
     },
-    "sliding_sync_legacy_no_longer_supported": "Legacy Sliding Sync wird nicht mehr unterstützt: Bitte melden Sie sich ab und wieder an, um das neue Sliding Sync-Flag zu aktivieren",
+    "sliding_sync_legacy_no_longer_supported": "Das alte Sliding Sync wird nicht mehr unterstützt: Bitte melde dich ab und wieder an, um das neue Sliding Sync zu aktivieren",
     "space": {
         "add_existing_room_space": {
-            "create": "Willst du einen neuen Raum hinzufügen?",
-            "create_prompt": "Neuen Raum erstellen",
+            "create": "Willst du stattdessen einen neuen Chat hinzufügen?",
+            "create_prompt": "Erstelle einen neuen Chat",
             "dm_heading": "Direktnachrichten",
             "error_heading": "Nicht alle Ausgewählten konnten hinzugefügt werden",
             "progress_text": {
-                "one": "Raum hinzufügen …",
-                "other": "Räume hinzufügen … (%(progress)s von %(count)s)"
+                "one": "Chat hinzufügen …",
+                "other": "Chats hinzufügen … (%(progress)s von %(count)s)"
             },
             "space_dropdown_label": "Space-Auswahl",
-            "space_dropdown_title": "Bestehende Räume hinzufügen",
+            "space_dropdown_title": "Bestehende Chats hinzufügen",
             "subspace_moved_note": "Das Hinzufügen von Spaces ist umgezogen."
         },
         "add_existing_subspace": {
@@ -3151,13 +3221,13 @@
         },
         "context_menu": {
             "devtools_open_timeline": "Nachrichtenverlauf anzeigen (Entwicklungswerkzeuge)",
-            "explore": "Räume erkunden",
+            "explore": "Erkunde Chats",
             "home": "Space-Übersicht",
-            "manage_and_explore": "Räume erkunden und verwalten",
+            "manage_and_explore": "Erkunde und verwalte Chats",
             "options": "Space-Optionen"
         },
-        "failed_load_rooms": "Fehler beim Laden der Raumliste.",
-        "failed_remove_rooms": "Einige Räume konnten nicht entfernt werden. Versuche es bitte später nocheinmal",
+        "failed_load_rooms": "Fehler beim Laden der Chatliste.",
+        "failed_remove_rooms": "Einige Chats konnten nicht entfernt werden. Versuche es bitte später noch einmal",
         "incompatible_server_hierarchy": "Dein Home-Server unterstützt hierarchische Spaces nicht.",
         "invite": "Personen einladen",
         "invite_description": "Personen mit E-Mail oder Benutzernamen einladen",
@@ -3166,12 +3236,12 @@
         "landing_welcome": "Willkommen bei <name/>",
         "leave_dialog_action": "Space verlassen",
         "leave_dialog_description": "Du bist dabei, <spaceName/> zu verlassen.",
-        "leave_dialog_only_admin_room_warning": "Du bist der einzige Admin einiger Räume oder Spaces, die du verlassen willst. Dadurch werden diese keine Admins mehr haben.",
+        "leave_dialog_only_admin_room_warning": "Du bist der einzige Admin einiger Chats oder Spaces, die du verlassen willst. Dadurch werden diese keine Admins mehr haben.",
         "leave_dialog_only_admin_warning": "Du bist der letzte Admin in diesem Space. Wenn du ihn jetzt verlässt, hat niemand mehr die Kontrolle über ihn.",
-        "leave_dialog_option_all": "Alle Räume verlassen",
-        "leave_dialog_option_intro": "Willst du die Räume in diesem Space verlassen?",
-        "leave_dialog_option_none": "Keine Räume und Subspaces verlassen",
-        "leave_dialog_option_specific": "Zu verlassende Räume auswählen",
+        "leave_dialog_option_all": "Verlasse alle Chats",
+        "leave_dialog_option_intro": "Willst du die Chats in diesem Space verlassen?",
+        "leave_dialog_option_none": "Keine Chats und Subspaces verlassen",
+        "leave_dialog_option_specific": "Zu verlassende Chats auswählen",
         "leave_dialog_public_rejoin_warning": "Das Betreten wird dir ohne erneute Einladung nicht möglich sein.",
         "leave_dialog_title": "%(spaceName)s verlassen",
         "mark_suggested": "Als vorgeschlagen markieren",
@@ -3180,15 +3250,15 @@
             "sections_section": "Anzuzeigende Bereiche",
             "show_people_in_space": "Gruppiere Unterhaltungen mit Mitgliedern dieses Spaces. Diese Option zu deaktivieren, wird die Unterhaltungen aus %(spaceName)s ausblenden."
         },
-        "room_filter_placeholder": "Räume suchen",
+        "room_filter_placeholder": "Gruppen suchen",
         "search_children": "%(spaceName)s durchsuchen",
         "search_placeholder": "Nach Name und Beschreibung filtern",
-        "select_room_below": "Wähle vorher einen Raum aus",
+        "select_room_below": "Wähle vorher einen Chat aus",
         "share_public": "Teile deinen öffentlichen Space mit der Welt",
         "suggested": "Vorgeschlagen",
-        "suggested_tooltip": "Dieser Raum wird vorgeschlagen",
+        "suggested_tooltip": "Dieser Chat wird vorgeschlagen",
         "title_when_query_available": "Ergebnisse",
-        "title_when_query_unavailable": "Räume und Spaces",
+        "title_when_query_unavailable": "Chats und Spaces",
         "unmark_suggested": "Als nicht vorgeschlagen markieren",
         "user_lacks_permission": "Du hast dazu keine Berechtigung"
     },
@@ -3196,9 +3266,9 @@
         "title": "Einstellungen - %(spaceName)s"
     },
     "spaces": {
-        "error_no_permission_add_room": "Du hast keine Berechtigung, Räume zu diesem Space hinzuzufügen",
+        "error_no_permission_add_room": "Du hast keine Berechtigung, Chats zu diesem Space hinzuzufügen",
         "error_no_permission_add_space": "Du hast keine Berechtigung, Spaces zu diesem Space hinzuzufügen",
-        "error_no_permission_create_room": "Du hast keine Berechtigung, neue Räume in diesem Space zu erstellen",
+        "error_no_permission_create_room": "Du hast keine Berechtigung, neue Chats in diesem Space zu erstellen",
         "error_no_permission_invite": "Du hast keine Berechtigung, Personen in diesen Space einzuladen"
     },
     "spotlight": {
@@ -3207,26 +3277,26 @@
             "network_dropdown_add_dialog_placeholder": "Server-Name",
             "network_dropdown_add_dialog_title": "Einen Server hinzufügen",
             "network_dropdown_add_server_option": "Neuen Server hinzufügen …",
-            "network_dropdown_available_invalid": "Kann diesen Server oder seine Raumliste nicht finden",
-            "network_dropdown_available_invalid_forbidden": "Du darfst diese Raumliste nicht sehen",
+            "network_dropdown_available_invalid": "Dieser Server oder seine Chatliste kann nicht gefunden werden",
+            "network_dropdown_available_invalid_forbidden": "Du darfst diese Chatliste nicht sehen",
             "network_dropdown_available_valid": "Das sieht gut aus",
             "network_dropdown_remove_server_adornment": "Server „%(roomServer)s“ entfernen",
             "network_dropdown_required_invalid": "Gib einen Server-Namen ein",
-            "network_dropdown_selected_label": "Zeige: Matrix-Räume",
-            "network_dropdown_selected_label_instance": "%(instance)s Räume zeigen (%(server)s)",
+            "network_dropdown_selected_label": "Zeige: Matrix-Chats",
+            "network_dropdown_selected_label_instance": "Zeige %(instance)s Chats auf %(server)s",
             "network_dropdown_your_server_description": "Dein Server"
         }
     },
     "spotlight_dialog": {
         "cant_find_person_helpful_hint": "Falls du nicht findest wen du suchst, send ihnen deinen Einladungslink.",
-        "cant_find_room_helpful_hint": "Falls du den Raum nicht findest, frag nach einer Einladung oder erstelle einen neuen Raum.",
+        "cant_find_room_helpful_hint": "Falls du den Chat nicht findest, frag nach einer Einladung oder erstelle einen neuen Chat.",
         "copy_link_text": "Einladungslink kopieren",
         "count_of_members": {
             "one": "%(count)s Mitglied",
             "other": "%(count)s Mitglieder"
         },
-        "create_new_room_button": "Neuer Raum",
-        "failed_querying_public_rooms": "Abfrage öffentlicher Räume fehlgeschlagen",
+        "create_new_room_button": "Starte neuen Chat",
+        "failed_querying_public_rooms": "Abfrage öffentlicher Chats fehlgeschlagen",
         "failed_querying_public_spaces": "Abfrage der öffentlichen Spaces fehlgeschlagen",
         "group_chat_section_title": "Andere Optionen",
         "heading_with_query": "Nutze \"%(query)s\" zum Suchen",
@@ -3234,8 +3304,8 @@
         "join_button_text": "%(roomAddress)s betreten",
         "keyboard_scroll_hint": "Benutze <arrows/> zum Scrollen",
         "messages_label": "Nachrichten",
-        "other_rooms_in_space": "Andere Räume in %(spaceName)s",
-        "public_rooms_label": "Öffentliche Räume",
+        "other_rooms_in_space": "Andere Chats in %(spaceName)s",
+        "public_rooms_label": "Öffentliche Chats",
         "public_spaces_label": "Öffentliche Spaces",
         "recent_searches_section_title": "Kürzliche Gesucht",
         "recently_viewed_section_title": "Kürzlich besucht",
@@ -3244,7 +3314,7 @@
         "result_may_be_hidden_warning": "Einige Ergebnisse können ausgeblendet sein",
         "search_dialog": "Suchdialog",
         "spaces_title": "Spaces, in denen du Mitglied bist",
-        "start_group_chat_button": "Gruppenunterhaltung beginnen"
+        "start_group_chat_button": "Neue Gruppe"
     },
     "stickers": {
         "empty": "Keine Sticker-Pakete aktiviert",
@@ -3269,18 +3339,18 @@
     },
     "theme": {
         "light_high_contrast": "Hell kontrastreich",
-        "match_system": "An System anpassen"
+        "match_system": "Systemeinstellung"
     },
     "thread_view_back_action_label": "Zurück zum Thread",
     "threads": {
         "all_threads": "Alle Threads",
-        "all_threads_description": "Alle Threads des Raums anzeigen",
+        "all_threads_description": "Alle Threads des Chats anzeigen",
         "count_of_reply": {
             "one": "%(count)s Antwort",
             "other": "%(count)s Antworten"
         },
         "empty_description": "Verwende \"%(replyInThread)s\" beim Hovern über eine Nachricht.",
-        "empty_title": "Threads helfen Ihnen, Ihre Unterhaltungen beim Thema zu halten, and sie sind auch leichter zu verfolgen.",
+        "empty_title": "Threads helfen, Unterhaltungen beim Thema zu halten und sie leichter zu verfolgen.",
         "error_start_thread_existing_relation": "Du kannst keinen Thread in einem Thread starten",
         "mark_all_read": "Alle als gelesen markieren",
         "my_threads": "Meine Threads",
@@ -3290,8 +3360,8 @@
     },
     "threads_activity_centre": {
         "header": "Thread-Aktivität",
-        "no_rooms_with_threads_notifs": "Sie haben noch keine Chatrooms mit Thread-Benachrichtigungen.",
-        "no_rooms_with_unread_threads": "Sie haben noch keine Chatrooms mit ungelesenen Threads."
+        "no_rooms_with_threads_notifs": "Es gibt keine Chats mit Thread-Benachrichtigungen.",
+        "no_rooms_with_unread_threads": "Es gibt keine Chats mit ungelesenen Threads."
     },
     "time": {
         "about_day_ago": "vor etwa einem Tag",
@@ -3333,12 +3403,12 @@
             "view_source": "Rohdaten anzeigen"
         },
         "creation_summary_dm": "%(creator)s hat diese Direktnachricht erstellt.",
-        "creation_summary_room": "%(creator)s hat den Raum erstellt und konfiguriert.",
+        "creation_summary_room": "%(creator)s hat den Chat erstellt und konfiguriert.",
         "decryption_failure": {
             "blocked": "Der Absender hat den Empfang dieser Nachricht blockiert, da Ihr Gerät nicht verifiziert ist.",
             "historical_event_no_key_backup": "Der historische Nachrichtenverlauf ist auf diesem Gerät nicht verfügbar.",
-            "historical_event_unverified_device": "Sie müssen dieses Gerät verifizieren, um auf den Nachrichtenverlauf zugreifen zu können",
-            "historical_event_user_not_joined": "Sie haben keinen Zugriff auf diese Nachricht",
+            "historical_event_unverified_device": "Für den Zugriff auf den Nachrichtenverlauf musst du dieses Gerät verifizieren",
+            "historical_event_user_not_joined": "Du hast keinen Zugriff auf diese Nachricht",
             "sender_identity_previously_verified": "Die verifizierte Identität des Absenders wurde zurückgesetzt",
             "sender_unsigned_device": "Von einem unsicheren Gerät verschickt.",
             "unable_to_decrypt": "Entschlüsselung der Nachricht nicht möglich"
@@ -3358,14 +3428,15 @@
         "error_rendering_message": "Diese Nachricht kann nicht geladen werden",
         "historical_messages_unavailable": "Du kannst keine älteren Nachrichten lesen",
         "in_room_name": " in <strong>%(room)s</strong>",
-        "io.element.widgets.layout": "%(senderName)s hat das Raumlayout geändert",
+        "io.element.widgets.layout": "%(senderName)s hat das Layout des Chats geändert",
         "late_event_separator": "Ursprünglich gesendet %(dateTime)s",
         "load_error": {
             "no_permission": "Dir fehlt die Berechtigung, diese alten Nachrichten zu lesen.",
             "title": "Laden der Verlaufsposition fehlgeschlagen",
-            "unable_to_find": "Das Laden einer bestimmten Stelle im Verlauf des Raumes zu laden ist gescheitert, da sie nicht gefunden wurde."
+            "unable_to_find": "Der Sprung an eine bestimmte Stelle im Nachrichtenverlauf dieses Chats ist gescheitert. Die Stelle konnte nicht gefunden werden."
         },
         "m.audio": {
+            "audio_player": "Audio-Player",
             "error_downloading_audio": "Fehler beim Herunterladen der Audiodatei",
             "error_processing_audio": "Fehler beim Verarbeiten der Audionachricht",
             "error_processing_voice_message": "Fehler beim Verarbeiten der Sprachnachricht",
@@ -3427,64 +3498,63 @@
             }
         },
         "m.poll.end": {
-            "ended": "Eine Umfrage beendet",
             "sender_ended": "%(senderName)s hat eine Abstimmung beendet"
         },
         "m.poll.start": "%(senderName)s hat eine Umfrage begonnen – %(pollQuestion)s",
         "m.room.avatar": {
-            "changed": "%(senderDisplayName)s hat das Raumbild geändert.",
-            "changed_img": "%(senderDisplayName)s hat das Raumbild zu <img/> geändert",
-            "lightbox_title": "%(senderDisplayName)s hat das Raumbild von %(roomName)s geändert",
-            "removed": "%(senderDisplayName)s hat das Raumbild entfernt."
+            "changed": "%(senderDisplayName)s hat den Avatar des Chats geändert.",
+            "changed_img": "%(senderDisplayName)s hat den Avatar des Chats zu <img/> geändert",
+            "lightbox_title": "%(senderDisplayName)s hat den Avatar des Chats %(roomName)s geändert",
+            "removed": "%(senderDisplayName)s hat den Avatar des Chats entfernt."
         },
         "m.room.canonical_alias": {
             "alt_added": {
-                "one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt.",
-                "other": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt."
+                "one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Chat hinzugefügt.",
+                "other": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Chat hinzugefügt."
             },
             "alt_removed": {
-                "other": "%(senderName)s hat die alternativen Adressen %(addresses)s für diesen Raum entfernt.",
-                "one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum entfernt."
+                "one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Chat entfernt.",
+                "other": "%(senderName)s hat die alternativen Adressen %(addresses)s für diesen Chat entfernt."
             },
-            "changed": "%(senderName)s hat die Adresse für diesen Raum geändert.",
-            "changed_alternative": "%(senderName)s hat die alternative Adresse für diesen Raum geändert.",
-            "changed_main_and_alternative": "%(senderName)s hat die Haupt- und Alternativadressen für diesen Raum geändert.",
-            "removed": "%(senderName)s hat die Hauptadresse von diesem Raum entfernt.",
-            "set": "%(senderName)s hat als Hauptadresse des Raums %(address)s festgelegt."
+            "changed": "%(senderName)s hat die Adresse für diesen Chat geändert.",
+            "changed_alternative": "%(senderName)s hat die alternative Adresse für diesen Chat geändert.",
+            "changed_main_and_alternative": "%(senderName)s hat die Haupt- und Alternativadressen für diesen Chat geändert.",
+            "removed": "%(senderName)s hat die Hauptadresse von diesem Chat entfernt.",
+            "set": "%(senderName)s hat als Hauptadresse des Chats %(address)s festgelegt."
         },
         "m.room.create": {
-            "continuation": "Dieser Raum ist eine Fortsetzung einer anderen Konversation.",
+            "continuation": "Dieser Chat ist eine Fortsetzung einer anderen Unterhaltung.",
             "see_older_messages": "Klicke hier, um ältere Nachrichten zu sehen.",
-            "unknown_predecessor": "Konnte die alte Version dieses Raumes nicht finden (Raum-ID: %(roomId)s) und uns wurde „via_servers“ nicht mitgeteilt, um danach zu suchen.",
-            "unknown_predecessor_guess_server": "Konnte die alte Version dieses Raumes nicht finden (Raum-ID: %(roomId)s) und uns wurde „via_servers“ nicht mitgeteilt, um danach zu suchen. Es ist möglich, dass das Erraten des Servers basierend auf der Raum-ID funktioniert. Wenn du dies probieren möchtest, klicke auf folgenden Link:"
+            "unknown_predecessor": "Die alte Version dieses Chats (ID: %(roomId)s) kann nicht gefunden werden. Es gibt auch keine „via_servers“ Information für eine Suche.",
+            "unknown_predecessor_guess_server": "Die alte Version dieses Chats (ID: %(roomId)s) kann nicht gefunden werden. Es gibt auch keine „via_servers“ Information für eine Suche. Möglicherweise kann der Server auf Basis der ID erraten werden. Wenn du dies probieren möchtest, klicke diesen Link:"
         },
         "m.room.encryption": {
             "disable_attempt": "Versuch, die Verschlüsselung zu deaktivieren, wurde ignoriert",
             "disabled": "Verschlüsselung nicht aktiviert",
-            "enabled": "Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt. Wenn Personen beitreten, kannst du sie in ihrem Profil verifizieren, indem du auf deren Profilbild klickst.",
+            "enabled": "Nachrichten in diesem Chat sind Ende-zu-Ende-verschlüsselt. Wenn Personen beitreten, kannst du sie in ihrem Profil verifizieren, indem du auf deren Profilbild klickst.",
             "enabled_dm": "Nachrichten hier sind Ende-zu-Ende-verschlüsselt. Verifiziere %(displayName)s in deren Profil – klicke auf deren Profilbild.",
             "enabled_local": "Nachrichten in dieser Unterhaltung werden Ende-zu-Ende-verschlüsselt.",
             "parameters_changed": "Einige Verschlüsselungsoptionen wurden geändert.",
-            "unsupported": "Die von diesem Raum verwendete Verschlüsselung wird nicht unterstützt."
+            "unsupported": "Die von diesem Chat verwendete Verschlüsselung wird nicht unterstützt."
         },
         "m.room.guest_access": {
-            "can_join": "%(senderDisplayName)s erlaubte Gäste diesem Raum beizutreten.",
-            "forbidden": "%(senderDisplayName)s hat Gästen verboten, diesem Raum beizutreten.",
+            "can_join": "%(senderDisplayName)s hat Gästen erlaubt, diesem Chat beizutreten.",
+            "forbidden": "%(senderDisplayName)s hat Gästen verboten, diesem Chat beizutreten.",
             "unknown": "%(senderDisplayName)s änderte den Gastzutritt auf „%(rule)s“"
         },
         "m.room.history_visibility": {
-            "invited": "%(senderName)s hat den Verlauf für alle Raummitglieder ab ihrer Einladung sichtbar gemacht.",
-            "joined": "%(senderName)s hat den Verlauf für alle Raummitglieder ab ihrem Betreten sichtbar gemacht.",
-            "shared": "%(senderName)s hat den zukünftigen Verlauf für alle Raummitglieder sichtbar gemacht.",
+            "invited": "%(senderName)s hat den künftigen Nachrichtenverlauf für alle neuen Mitglieder ab dem Zeitpunkt ihrer Einladung sichtbar gemacht.",
+            "joined": "%(senderName)s hat den Nachrichten-Verlauf für alle Mitglieder ab ihrem Beitritt sichtbar gemacht.",
+            "shared": "%(senderName)s hat den zukünftigen Nachrichtenverlauf für alle Mitglieder des Chats sichtbar gemacht.",
             "unknown": "%(senderName)s hat den zukünftigen Verlauf für Unbekannte sichtbar gemacht (%(visibility)s).",
             "world_readable": "%(senderName)s hat den zukünftigen Verlauf für alle sichtbar gemacht."
         },
         "m.room.join_rules": {
-            "invite": "%(senderDisplayName)s hat den Raum auf eingeladene Benutzer beschränkt.",
+            "invite": "%(senderDisplayName)s hat den Chat auf eingeladene Nutzer beschränkt.",
             "knock": "%(senderDisplayName)s hat die Zutrittsregel auf Beitrittsanfragen geändert.",
-            "public": "%(senderDisplayName)s hat den Raum für jeden, der den Link kennt, öffentlich gemacht.",
-            "restricted": "%(senderDisplayName)s hat geändert, wer diesen Raum betreten darf.",
-            "restricted_settings": "%(senderDisplayName)s hat geändert, wer diesen Raum betreten darf. <a>Einstellungen anzeigen</a>.",
+            "public": "%(senderDisplayName)s hat den Chat für jeden, der den Link kennt, öffentlich gemacht.",
+            "restricted": "%(senderDisplayName)s hat geändert, wer diesem Chat beitreten darf.",
+            "restricted_settings": "%(senderDisplayName)s hat geändert, wer diesem Chat beitreten darf. <a>Einstellungen anzeigen</a>.",
             "unknown": "%(senderDisplayName)s hat die Zutrittsregel auf „%(rule)s“ geändert"
         },
         "m.room.member": {
@@ -3496,11 +3566,11 @@
             "change_name": "%(oldDisplayName)s hat den Anzeigenamen zu %(displayName)s geändert",
             "change_name_avatar": "%(oldDisplayName)s hat den Anzeigenamen und das Profilbild geändert",
             "invite": "%(senderName)s hat %(targetName)s eingeladen",
-            "join": "%(targetName)s hat den Raum betreten",
+            "join": "%(targetName)s ist dem Chat beigetreten",
             "kick": "%(senderName)s hat %(targetName)s entfernt",
             "kick_reason": "%(senderName)s hat %(targetName)s entfernt: %(reason)s",
-            "left": "%(targetName)s hat den Raum verlassen",
-            "left_reason": "%(targetName)s hat den Raum verlassen: %(reason)s",
+            "left": "%(targetName)s hat den Chat verlassen",
+            "left_reason": "%(targetName)s hat den Chat verlassen: %(reason)s",
             "no_change": "%(senderName)s hat keine Änderungen gemacht",
             "reject_invite": "%(targetName)s hat die Einladung abgelehnt",
             "reject_invite_reason": "%(targetName)slehnte die Einladung ab: %(reason)s",
@@ -3508,14 +3578,14 @@
             "remove_name": "%(senderName)s hat den alten Anzeigenamen %(oldDisplayName)s entfernt",
             "set_avatar": "%(senderName)s hat das Profilbild gesetzt",
             "set_name": "%(senderName)s hat den Anzeigenamen zu %(displayName)s geändert",
-            "unban": "%(senderName)s hat die Verbannung von %(targetName)s aufgehoben",
+            "unban": "%(senderName)s hat die Sperre von %(targetName)s aufgehoben",
             "withdrew_invite": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen",
             "withdrew_invite_reason": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen: %(reason)s"
         },
         "m.room.name": {
-            "change": "%(senderDisplayName)s hat den Raumnamen von %(oldRoomName)s zu %(newRoomName)s geändert.",
-            "remove": "%(senderDisplayName)s hat den Raumnamen entfernt.",
-            "set": "%(senderDisplayName)s hat den Raumnamen geändert zu %(roomName)s."
+            "change": "%(senderDisplayName)s hat den Namen des Chats von %(oldRoomName)s zu %(newRoomName)s geändert.",
+            "remove": "%(senderDisplayName)s hat den Namen des Chats entfernt.",
+            "set": "%(senderDisplayName)s hat den Namen des Chats zu %(roomName)s geändert ."
         },
         "m.room.pinned_events": {
             "changed": "%(senderName)s hat die fixierte Nachrichten für diesen Chatroom geändert.",
@@ -3530,15 +3600,15 @@
             "user_from_to": "%(userId)s von %(fromPowerLevel)s zu %(toPowerLevel)s"
         },
         "m.room.server_acl": {
-            "all_servers_banned": "🎉 Alle Server sind von der Teilnahme ausgeschlossen! Dieser Raum kann nicht mehr genutzt werden.",
-            "changed": "%(senderDisplayName)s hat die Server-ACLs für diesen Raum geändert.",
-            "set": "%(senderDisplayName)s hat die Server-ACLs für diesen Raum gesetzt."
+            "all_servers_banned": "🎉 Alle Server sind für eine Teilnahme gesperrt! Dieser Chat kann nicht mehr genutzt werden.",
+            "changed": "%(senderDisplayName)s hat die Server-ACLs für diesen Chat geändert.",
+            "set": "%(senderDisplayName)s hat die Server-ACLs für diesen Chat gesetzt."
         },
         "m.room.third_party_invite": {
             "revoked": "%(senderName)s hat die Einladung für %(targetDisplayName)s zurückgezogen.",
-            "sent": "%(senderName)s hat %(targetDisplayName)s in diesen Raum eingeladen."
+            "sent": "%(senderName)s hat %(targetDisplayName)s in diesen Chat eingeladen."
         },
-        "m.room.tombstone": "%(senderDisplayName)s hat diesen Raum aktualisiert.",
+        "m.room.tombstone": "%(senderDisplayName)s hat die Chat-Version aktualisiert.",
         "m.room.topic": {
             "changed": "%(senderDisplayName)s hat das Thema geändert in \"%(topic)s\".",
             "removed": "%(senderDisplayName)shat das Thema entfernt."
@@ -3551,7 +3621,7 @@
         "m.widget": {
             "added": "%(senderName)s hat das Widget %(widgetName)s hinzugefügt",
             "jitsi_ended": "Videokonferenz von %(senderName)s beendet",
-            "jitsi_join_right_prompt": "An der Konferenz kannst du über die rechte Seitenleiste (Rauminfo) teilnehmen",
+            "jitsi_join_right_prompt": "An der Konferenz kannst du über die rechte Seitenleiste (Chatinfo) teilnehmen",
             "jitsi_join_top_prompt": "An Konferenz oberhalb des Verlaufs teilnehmen",
             "jitsi_started": "Videokonferenz von %(senderName)s gestartet",
             "jitsi_updated": "Videokonferenz wurde von %(senderName)s aktualisiert",
@@ -3563,29 +3633,29 @@
             "copy_link_thread": "Link zu Thread kopieren",
             "expand_reply_chain": "Zitate ausklappen",
             "label": "Nachrichtenaktionen",
-            "view_in_room": "Im Raum anzeigen"
+            "view_in_room": "Im Chat anzeigen"
         },
         "message_timestamp_received_at": "Empfangen am: %(dateTime)s",
         "message_timestamp_sent_at": "Gesendet am: %(dateTime)s",
         "mjolnir": {
-            "changed_rule_glob": "%(senderName)s aktualisierte eine Ausschlussregel von %(oldGlob)s nach %(newGlob)s wegen %(reason)s",
-            "changed_rule_rooms": "%(senderName)s ändert eine Ausschlussregel für Räume von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s",
+            "changed_rule_glob": "%(senderName)s hat die Regel für Sperren von %(oldGlob)s auf %(newGlob)s aktualisiert. Grund: %(reason)s",
+            "changed_rule_rooms": "%(senderName)s hat eine Sperr-Regel für Chats von %(oldGlob)s nach %(newGlob)s wegen %(reason)s geändert",
             "changed_rule_servers": "%(senderName)s änderte eine Ausschlussregel für Server von %(oldGlob)s nach %(newGlob)s wegen %(reason)s",
             "changed_rule_users": "%(senderName)s ändert eine Ausschlussregel von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s",
             "created_rule": "%(senderName)s erstellte eine Ausschlussregel, die aufgrund von %(reason)s %(glob)s entspricht",
-            "created_rule_rooms": "%(senderName)s erstellt eine Ausschlussregel für Räume, die %(glob)s aufgrund von %(reason)s entspricht",
+            "created_rule_rooms": "%(senderName)s hat eine Sperr-Regel für Chats erstellt, die %(glob)s aufgrund von %(reason)s entspricht",
             "created_rule_servers": "%(senderName)s erstellte eine Ausschlussregel für Server, die aufgrund von %(reason)s %(glob)s entsprechen",
             "created_rule_users": "%(senderName)s hat eine Ausschlussregel für Nutzer erstellt, die aufgrund %(reason)s %(glob)s entsprechen",
-            "message_hidden": "Du blockierst diesen Benutzer, deshalb werden seine Nachrichten nicht angezeigt. <a>Trotzdem anzeigen.</a>",
+            "message_hidden": "Du ignorierst diesen Nutzer, so dass dessen Nachrichten verborgen werden. <a>Trotzdem anzeigen.</a>",
             "removed_rule": "%(senderName)s entfernte die Ausschlussregel, die %(glob)s entspricht",
-            "removed_rule_rooms": "%(senderName)s entfernte die Ausschlussregel für Räume, die %(glob)s entsprechen",
+            "removed_rule_rooms": "%(senderName)s hat die Sperr-Regel für Chats entfernt, die %(glob)s entsprechen",
             "removed_rule_servers": "%(senderName)s entfernte die Ausschlussregel für Server, die %(glob)s entsprechen",
             "removed_rule_users": "%(senderName)s entfernte die Ausschlussregel für Benutzer, die %(glob)s entsprechen",
-            "updated_invalid_rule": "%(senderName)s aktualisierte eine ungültige Ausschlussregel",
-            "updated_rule": "%(senderName)s aktualisierte eine Ausschlussregel, die wegen %(reason)s %(glob)s entspricht",
-            "updated_rule_rooms": "%(senderName)s aktualisierte die Ausschlussregel für Räume, die aufgrund von %(reason)s %(glob)s entsprechen",
-            "updated_rule_servers": "%(senderName)s aktualisierte die Ausschlussregel für Server, die aufgrund von %(reason)s %(glob)s entsprechen",
-            "updated_rule_users": "%(senderName)s aktualisierte die Ausschlussregel für Benutzer, die aufgrund von %(reason)s %(glob)s entsprechen"
+            "updated_invalid_rule": "%(senderName)s aktualisierte eine ungültige Regel für Sperren",
+            "updated_rule": "%(senderName)s aktualisierte eine Regel für Sperren, die wegen %(reason)s %(glob)s entspricht",
+            "updated_rule_rooms": "%(senderName)s aktualisierte die Regel für Sperren für Chats, die aufgrund von %(reason)s %(glob)s entsprechen",
+            "updated_rule_servers": "%(senderName)s aktualisierte die Regel für Sperren für Server, die aufgrund von %(reason)s %(glob)s entsprechen",
+            "updated_rule_users": "%(senderName)s aktualisierte die Regel für Sperren für Nutzer, die aufgrund von %(reason)s %(glob)s entsprechen"
         },
         "no_permission_messages_before_invite": "Du kannst keine Nachrichten lesen, die gesendet wurden, bevor du eingeladen wurdest.",
         "no_permission_messages_before_join": "Du kannst keine Nachrichten lesen, die gesendet wurden, bevor du beigetreten bist.",
@@ -3642,8 +3712,8 @@
                 "one": "%(oneUser)shat den Namen geändert"
             },
             "changed_name_multiple": {
-                "other": "%(severalUsers)s haben %(count)s-mal ihren Namen geändert",
-                "one": "%(severalUsers)shaben ihren Namen geändert"
+                "one": "%(severalUsers)s haben den Namen geändert",
+                "other": "%(severalUsers)s haben %(count)s-mal den Namen geändert"
             },
             "format": "%(nameList)s %(transitionList)s",
             "hidden_event": {
@@ -3671,20 +3741,20 @@
                 "one": "wurden eingeladen"
             },
             "joined": {
-                "other": "%(oneUser)shat den Raum %(count)s-mal betreten",
-                "one": "%(oneUser)shat den Raum betreten"
+                "one": "%(oneUser)s ist dem Chat beigetreten",
+                "other": "%(oneUser)s ist dem Chat %(count)s-mal beigetreten"
             },
             "joined_and_left": {
-                "other": "%(oneUser)shat den Raum %(count)s-mal betreten und wieder verlassen",
-                "one": "%(oneUser)shat den Raum betreten und wieder verlassen"
+                "one": "%(oneUser)s ist dem Chat beigetreten und hat ihn wieder verlassen",
+                "other": "%(oneUser)s ist dem Chat %(count)s-mal beigetreten und hat ihn wieder verlassen"
             },
             "joined_and_left_multiple": {
-                "other": "%(severalUsers)shaben %(count)s-mal den Raum betreten und verlassen",
-                "one": "%(severalUsers)shaben den Raum betreten und wieder verlassen"
+                "one": "%(severalUsers)s sind dem Chat beigetreten und haben ihn wieder verlassen",
+                "other": "%(severalUsers)s sind dem Chat %(count)s-mal beigetreten und haben ihn wieder verlassen"
             },
             "joined_multiple": {
-                "other": "%(severalUsers)shaben den Raum %(count)s-mal betreten",
-                "one": "%(severalUsers)shaben den Raum betreten"
+                "one": "%(severalUsers)s sind dem Chat beigetreten",
+                "other": "%(severalUsers)s sind dem Chat %(count)s-mal beigetreten"
             },
             "kicked": {
                 "other": "wurde %(count)s mal entfernt",
@@ -3695,12 +3765,12 @@
                 "other": "wurden %(count)s mal entfernt"
             },
             "left": {
-                "other": "%(oneUser)shat den Raum %(count)s-mal verlassen",
-                "one": "%(oneUser)shat den Raum verlassen"
+                "one": "%(oneUser)s hat den Chat verlassen",
+                "other": "%(oneUser)s hat den Chat %(count)s-mal verlassen"
             },
             "left_multiple": {
-                "other": "%(severalUsers)shaben den Raum %(count)s-mal verlassen",
-                "one": "%(severalUsers)shaben den Raum verlassen"
+                "one": "%(severalUsers)s haben den Chat verlassen",
+                "other": "%(severalUsers)s haben den Chat %(count)s-mal verlassen"
             },
             "no_change": {
                 "other": "%(oneUser)shat %(count)s mal keine Änderung vorgenommen",
@@ -3711,12 +3781,12 @@
                 "other": "%(severalUsers)s haben %(count)s mal nichts geändert"
             },
             "pinned_events": {
-                "one": "%(oneUser)s hat die <a>angehefteten Nachrichten</a> des Raumes bearbeitet",
-                "other": "%(oneUser)s hat die <a>angehefteten Nachrichten</a> des Raumes %(count)s-Mal bearbeitet"
+                "one": "%(oneUser)s hat die <a>fixierten Nachrichten</a> des Chat bearbeitet",
+                "other": "%(oneUser)s hat die <a>fixierten Nachrichten</a> des Chat %(count)s-Mal bearbeitet"
             },
             "pinned_events_multiple": {
-                "one": "%(severalUsers)s hat die <a>angehefteten Nachrichten</a> des Raumes bearbeitet",
-                "other": "%(severalUsers)s haben die <a>angehefteten Nachrichten</a> des Raumes %(count)s-Mal bearbeitet"
+                "one": "%(severalUsers)s haben die <a>fixierten Nachrichten</a> des Chat bearbeitet",
+                "other": "%(severalUsers)s haben die <a>fixierten Nachrichten</a> des Chat %(count)s-Mal bearbeitet"
             },
             "redacted": {
                 "one": "%(oneUser)s hat eine Nachricht gelöscht",
@@ -3731,16 +3801,16 @@
                 "one": "%(oneUser)shat die Einladung abgelehnt"
             },
             "rejected_invite_multiple": {
-                "one": "%(severalUsers)shaben ihre Einladungen abgelehnt",
-                "other": "%(severalUsers)shaben ihre Einladungen %(count)s-mal abgelehnt"
+                "one": "%(severalUsers)s haben Einladungen abgelehnt",
+                "other": "%(severalUsers)s haben %(count)s-mal Einladungen abgelehnt"
             },
             "rejoined": {
-                "other": "%(oneUser)shat den Raum %(count)s-mal verlassen und wieder betreten",
-                "one": "%(oneUser)shat den Raum verlassen und wieder betreten"
+                "one": "%(oneUser)s hat den Chat verlassen und ist ihm wieder beigetreten",
+                "other": "%(oneUser)s hat den Chat %(count)s-mal verlassen und ist ihm wieder beigetreten"
             },
             "rejoined_multiple": {
-                "other": "%(severalUsers)shaben den Raum %(count)s-mal verlassen und wieder betreten",
-                "one": "%(severalUsers)shaben den Raum verlassen und wieder betreten"
+                "one": "%(severalUsers)s haben den Chat verlassen und sind ihm wieder beigetreten",
+                "other": "%(severalUsers)s haben den Chat %(count)s-mal verlassen und sind ihm wieder beigetreten"
             },
             "server_acls": {
                 "one": "%(oneUser)s hat die Server-ACLs geändert",
@@ -3751,12 +3821,12 @@
                 "other": "%(severalUsers)s haben die Server-ACLs %(count)s Mal geändert"
             },
             "unbanned": {
-                "other": "wurde %(count)s-mal entbannt",
-                "one": "wurde entbannt"
+                "one": "wurde entsperrt",
+                "other": "wurde %(count)s-mal entsperrt"
             },
             "unbanned_multiple": {
-                "other": "wurden %(count)s-mal entbannt",
-                "one": "wurden entbannt"
+                "one": "wurden entsperrt",
+                "other": "wurden %(count)s-mal entsperrt"
             }
         },
         "thread_info_basic": "Aus einem Thread",
@@ -3781,7 +3851,7 @@
         "other": "Und %(count)s weitere …"
     },
     "unsupported_browser": {
-        "description": "Wenn Sie fortfahren, funktionieren einige Funktionen möglicherweise nicht mehr und es besteht das Risiko, dass Sie in Zukunft Daten verlieren. Aktualisieren Sie Ihren Browser, um die Nutzung von %(brand)s fortzusetzen.",
+        "description": "Wenn du fortfährst könnten einige Funktionen möglicherweise ausfallen und es besteht das Risiko, in Zukunft Daten zu verlieren. Aktualisiere den Browser, um die Nutzung von %(brand)s fortzusetzen.",
         "title": "%(brand)s unterstützt diesen Browser nicht"
     },
     "unsupported_server_description": "Dieser Server nutzt eine ältere Matrix-Version. Aktualisiere auf Matrix %(version)s, um %(brand)s fehlerfrei nutzen zu können.",
@@ -3803,10 +3873,10 @@
     },
     "update_room_access_modal": {
         "description": "Um einen Link zum Teilen zu erstellen, mache diesen Chatroom <b> öffentlich </b> oder erlaube <b>Beitrittsanfragen</b>. Auf diese Weise können Gäste beitreten, ohne eingeladen zu werden.",
-        "dont_change_description": "Andernfalls, wenn Sie den Zugang dieses Raumes nicht anpassen möchten, können sie einen neuen Raum für den Anruflink erstellen.",
+        "dont_change_description": "Solltest du die Zugangsberechtigung für diesen Chat nicht anpassen wollen, kannst du auch einen neuen Chat für den Anruflink erstellen.",
         "no_change": "Ich möchte die Zugriffsebene nicht ändern.",
-        "revert_access_description": "(Dies kann in den Raumeinstellungen auf den vorherigen Wert zurückgesetzt werden: <b> Sicherheit & Datenschutz</b>/<b>Zutritt</b>)",
-        "title": "Gastbenutzern erlauben, diesem Raum beizutreten"
+        "revert_access_description": "(Dies kann in den Chateinstellungen auf den vorherigen Wert zurückgesetzt werden: <b> Sicherheit & Datenschutz</b>/<b>Zutritt</b>)",
+        "title": "Gastnutzern erlauben, diesem Chat beizutreten"
     },
     "upload_failed_generic": "Die Datei „%(fileName)s“ konnte nicht hochgeladen werden.",
     "upload_failed_size": "Die Datei „%(fileName)s“ überschreitet das Hochladelimit deines Heim-Servers",
@@ -3832,9 +3902,9 @@
         "ban_button_space": "Bannen",
         "ban_room_confirm_title": "Aus %(roomName)s verbannen",
         "ban_space_everything": "Überall sperren, wo ich die Rechte dazu habe",
-        "ban_space_specific": "Sperre sie in ausgewählten Chatrooms und Spaces",
+        "ban_space_specific": "Sperre sie in ausgewählten Chats und Spaces",
         "deactivate_confirm_action": "Konto deaktivieren",
-        "deactivate_confirm_description": "Beim Deaktivieren wirst du abgemeldet und ein erneutes Anmelden verhindert. Zusätzlich wirst du aus allen Räumen entfernt. Diese Aktion kann nicht rückgängig gemacht werden. Bist du sicher, dass du dieses Konto deaktivieren willst?",
+        "deactivate_confirm_description": "Das Deaktivieren dieses Nutzers wird zu einer Abmeldung führen ein erneutes Anmelden verhindern. Zusätzlich wird die Mitgliedschaft aus allen Chats entfernt. Diese Aktion kann nicht rückgängig gemacht werden. Bist du sicher, dass du diesen Nutzer deaktivieren willst?",
         "deactivate_confirm_title": "Konto deaktivieren?",
         "demote_button": "Zurückstufen",
         "demote_self_confirm_description_space": "Das Entfernen von Rechten kann nicht rückgängig gemacht werden. Falls sie dir niemand anderer zurückgeben kann, kannst du sie nie wieder erhalten.",
@@ -3849,12 +3919,12 @@
         "error_mute_user": "Stummschalten des Nutzers fehlgeschlagen",
         "error_revoke_3pid_invite_description": "Die Einladung konnte nicht zurückgezogen werden. Der Server hat möglicherweise ein vorübergehendes Problem oder du hast nicht ausreichende Berechtigungen, um die Einladung zurückzuziehen.",
         "error_revoke_3pid_invite_title": "Einladung konnte nicht zurückgezogen werden",
-        "ignore_button": "Blockieren",
+        "ignore_button": "Ignorieren",
         "ignore_confirm_description": "Alle Nachrichten und Einladungen der Person werden verborgen. Bist du sicher, dass du sie ignorieren möchtest?",
         "ignore_confirm_title": "%(user)s ignorieren",
         "invited_by": "%(sender)s eingeladen",
         "jump_to_rr_button": "Zur Lesebestätigung springen",
-        "kick_button_room": "Aus Raum entfernen",
+        "kick_button_room": "Aus Chat entfernen",
         "kick_button_room_name": "Aus %(roomName)s entfernen",
         "kick_button_space": "Aus Space entfernen",
         "kick_button_space_everything": "Person aus allen, mir möglichen Bereichen entfernen",
@@ -3879,18 +3949,18 @@
         },
         "redact_button": "Nachrichten entfernen",
         "revoke_invite": "Einladung zurückziehen",
-        "room_encrypted": "Nachrichten in diesem Raum sind Ende-zu-Ende verschlüsselt.",
-        "room_encrypted_detail": "Diese Nachricht ist verschlüsselt. Nur Sie und der Empfänger haben den Schlüssel, um die Nachricht zu entschlüsseln.",
-        "room_unencrypted": "Nachrichten in diesem Raum sind nicht Ende-zu-Ende verschlüsselt.",
-        "room_unencrypted_detail": "Nachrichten in verschlüsselten Räumen können nur von dir und vom Empfänger gelesen werden.",
+        "room_encrypted": "Nachrichten in diesem Chat sind Ende-zu-Ende verschlüsselt.",
+        "room_encrypted_detail": "Diese Nachricht ist verschlüsselt. Nur du und der Empfänger haben Schlüssel, um die Nachricht zu entschlüsseln.",
+        "room_unencrypted": "Nachrichten in diesem Chat sind nicht Ende-zu-Ende verschlüsselt.",
+        "room_unencrypted_detail": "Nachrichten in verschlüsselten Chats können nur von dir und vom Empfänger gelesen werden.",
         "send_message": "Nachricht senden",
         "share_button": "Profil teilen",
-        "unban_button_room": "Sperrung für den Chatroom aufheben",
+        "unban_button_room": "Sperrung für den Chat aufheben",
         "unban_button_space": "Sperrung aus Space aufheben",
         "unban_room_confirm_title": "Sperrung für %(roomName)s aufheben",
-        "unban_space_everything": "Die Verbannung überall aufheben wo ich die Rechte dazu habe",
-        "unban_space_specific": "In ausgewählten Chatrooms und Spaces die Sperrung für sie aufheben",
-        "unban_space_warning": "Die Person wird keinen Zutritt zu Bereichen haben, in denen du nicht administrierst.",
+        "unban_space_everything": "Entsperre sie überall dort, wo du die Rechte dazu hast",
+        "unban_space_specific": "Entsperre in ausgewählten Chats und Spaces",
+        "unban_space_warning": "Die Person wird keinen Zutritt zu Bereichen haben, in denen du nicht Administrator bist.",
         "unignore_button": "Nicht mehr ignorieren",
         "verification_unavailable": "Benutzerverifizierung nicht verfügbar",
         "verify_button": "Nutzer verifizieren",
@@ -3917,21 +3987,21 @@
         "call_held": "%(peerName)s hält den Anruf",
         "call_held_resume": "Du hältst den Anruf <a>Fortsetzen</a>",
         "call_held_switch": "Du hältst den Anruf <a>Wechseln</a>",
-        "call_toast_unknown_room": "Unbekannter Raum",
+        "call_toast_unknown_room": "Unbekannter Chat",
         "camera_disabled": "Deine Kamera ist ausgeschaltet",
         "camera_enabled": "Deine Kamera ist noch aktiv",
         "cannot_call_yourself_description": "Du kannst keinen Anruf mit dir selbst starten.",
         "close_lobby": "Lobby schließen",
         "connecting": "Verbinden",
         "connection_lost": "Verbindung zum Server unterbrochen",
-        "connection_lost_description": "Ohne Verbindung zum Server können Sie keine Anrufe tätigen.",
+        "connection_lost_description": "Du kannst ohne Verbindung zum Server keine Anrufe tätigen.",
         "consulting": "%(transferTarget)s wird angefragt. <a>Übertragung zu %(transferee)s</a>",
+        "decline_call": "Ablehnen",
         "default_device": "Standardgerät",
         "dial": "Wählen",
         "dialpad": "Telefontastatur",
         "disable_camera": "Kamera deaktivieren",
         "disable_microphone": "Mikrofon stummschalten",
-        "disabled_no_one_here": "Hier ist niemand zum Anrufen",
         "disabled_no_perms_start_video_call": "Dir fehlt die Berechtigung, um Videoanrufe zu beginnen",
         "disabled_no_perms_start_voice_call": "Dir fehlt die Berechtigung, um Audioanrufe zu beginnen",
         "disabled_ongoing_call": "laufender Anruf",
@@ -3969,7 +4039,7 @@
         "no_media_perms_description": "Gegebenenfalls kann es notwendig sein, dass du %(brand)s manuell den Zugriff auf dein Mikrofon bzw. deine Webcam gewähren musst",
         "no_media_perms_title": "Keine Medienberechtigungen",
         "no_permission_conference": "Berechtigung benötigt",
-        "no_permission_conference_description": "Du hast keine Berechtigung, ein Konferenzgespräch in diesem Raum zu starten",
+        "no_permission_conference_description": "Du hast keine Berechtigung, einen Konferenz Anruf in diesem Chat zu starten",
         "on_hold": "%(name)s wird gehalten",
         "output_devices": "Ausgabegeräte",
         "screenshare_monitor": "Vollständigen Bildschirm teilen",
@@ -3978,6 +4048,7 @@
         "show_sidebar_button": "Seitenleiste anzeigen",
         "silence": "Anruf stummschalten",
         "silenced": "Benachrichtigungen stummgeschaltet",
+        "skip_lobby_toggle_option": "Sofort beitreten",
         "start_screenshare": "Bildschirmfreigabe starten",
         "stop_screenshare": "Bildschirmfreigabe beenden",
         "too_many_calls": "Zu viele Anrufe",
@@ -3998,9 +4069,11 @@
         "user_busy_description": "Die angerufene Person ist momentan beschäftigt.",
         "user_is_presenting": "%(sharerName)s präsentiert",
         "video_call": "Videoanruf",
+        "video_call_incoming": "Eingehender Videoanruf",
         "video_call_started": "Videoanruf hat begonnen",
         "video_call_using": "Videoanruf mit:",
         "voice_call": "Sprachanruf",
+        "voice_call_incoming": "Eingehender Anruf",
         "you_are_presenting": "Du präsentierst"
     },
     "web_default_device_name": "%(appName)s: %(browserName)s auf %(osName)s",
@@ -4015,73 +4088,73 @@
         },
         "capability": {
             "always_on_screen_generic": "Bleib auf deinem Bildschirm während der Ausführung von",
-            "always_on_screen_viewing_another_room": "Sichtbar bleiben, wenn es ausgeführt und ein anderer Raum angezeigt wird",
-            "any_room": "Wie oben, nur zusätzlich in allen Räumen denen du beigetreten oder in die du eingeladen wurdest",
+            "always_on_screen_viewing_another_room": "Sichtbar bleiben, wenn es ausgeführt und ein anderer Chat angezeigt wird",
+            "any_room": "Wie oben, nur zusätzlich in allen Chats denen du beigetreten oder in die du eingeladen wurdest",
             "byline_empty_state_key": "mit einem leeren Zustandsschlüssel",
             "byline_state_key": "mit Zustandsschlüssel %(stateKey)s",
             "capability": "Die <b>%(capability)s</b>-Fähigkeit",
-            "change_avatar_active_room": "Den Avatar deines aktiven Raums ändern",
-            "change_avatar_this_room": "Icon von diesem Raum ändern",
-            "change_name_active_room": "Den Namen deines aktiven Raums ändern",
-            "change_name_this_room": "Name von diesem Raum ändern",
-            "change_topic_active_room": "Das Thema von deinem aktiven Raum ändern",
-            "change_topic_this_room": "Das Thema von diesem Raum ändern",
-            "receive_membership_active_room": "Anzeigen, wenn Leute den aktuellen Raum betreten, verlassen oder in ihn eingeladen werden",
-            "receive_membership_this_room": "Anzeigen, wenn Leute eingeladen werden, den Raum betreten oder verlassen",
-            "remove_ban_invite_leave_active_room": "Entferne, verbanne oder lade andere in deinen aktiven Raum ein und verlasse den Raum selbst",
-            "remove_ban_invite_leave_this_room": "Entferne, verbanne oder lade andere in diesen Raum ein und verlasse den Raum selbst",
-            "see_avatar_change_active_room": "Sehen, wenn das Icon in deinem aktiven Raum geändert wird",
-            "see_avatar_change_this_room": "Sehen, wenn sich das Icon des Raums ändert",
-            "see_event_type_sent_active_room": "In deinen aktiven Raum gesendete <b>%(eventType)s</b>-Ereignisse anzeigen",
-            "see_event_type_sent_this_room": "In diesen Raum gesendete <b>%(eventType)s</b>-Ereignisse anzeigen",
-            "see_images_sent_active_room": "In deinen aktiven Raum gesendete Bilder anzeigen",
-            "see_images_sent_this_room": "In diesen Raum gesendete Bilder anzeigen",
-            "see_messages_sent_active_room": "In deinen aktiven Raum gesendete Nachrichten anzeigen",
-            "see_messages_sent_this_room": "In diesen Raum gesendete Nachrichten anzeigen",
-            "see_msgtype_sent_active_room": "Zeige <b>%(msgtype)s</b> Nachrichten, welche in deinen aktiven Raum gesendet worden sind",
-            "see_msgtype_sent_this_room": "Zeige <b>%(msgtype)s</b> Nachrichten, welche in diesen Raum gesendet worden sind",
-            "see_name_change_active_room": "Sehen wenn der Name sich in deinem aktiven Raum ändert",
-            "see_name_change_this_room": "Sehen wenn sich der Name in diesem Raum ändert",
-            "see_sent_emotes_active_room": "In deinen aktiven Raum gesendete Emojis anzeigen",
-            "see_sent_emotes_this_room": "In diesen Raum gesendete Emojis anzeigen",
-            "see_sent_files_active_room": "Allgemeine in deinen aktiven Raum gesendete Dateien anzeigen",
-            "see_sent_files_this_room": "Allgemeine in diesen Raum gesendete Dateien anzeigen",
-            "see_sticker_posted_active_room": "Sehen, wenn jemand einen Sticker in deinen aktiven Raum sendet",
-            "see_sticker_posted_this_room": "Sehe wenn ein Sticker in diesen Raum gesendet wird",
-            "see_text_messages_sent_active_room": "In deinen aktiven Raum gesendete Textnachrichten anzeigen",
-            "see_text_messages_sent_this_room": "In diesen Raum gesendete Textnachrichten anzeigen",
-            "see_topic_change_active_room": "Sehen, wenn sich das Thema im aktuellen Raum ändert",
-            "see_topic_change_this_room": "Sehen, wenn sich das Thema in diesem Raum ändert",
-            "see_videos_sent_active_room": "In deinen aktiven Raum gesendete Videos anzeigen",
-            "see_videos_sent_this_room": "In diesen Raum gesendete Videos anzeigen",
-            "send_emotes_active_room": "Emojis als du in deinen aktiven Raum senden",
-            "send_emotes_this_room": "Emojis als du in diesen Raum senden",
-            "send_event_type_active_room": "Sende <b>%(eventType)s</b>-Ereignisse als du in deinen aktiven Raum",
-            "send_event_type_this_room": "Sende <b>%(eventType)s</b>-Ereignisse mit deiner Identität in diesen Raum",
-            "send_files_active_room": "Allgemeine Dateien als du in deinen aktiven Raum senden",
-            "send_files_this_room": "Allgemeine Dateien als du in diesen Raum senden",
-            "send_images_active_room": "Sende Bilder in den aktuellen Raum",
-            "send_images_this_room": "Bilder als du in diesen Raum senden",
-            "send_messages_active_room": "Eine Nachricht als du in deinen aktiven Raum senden",
-            "send_messages_this_room": "Nachrichten als du in diesem Raum senden",
-            "send_msgtype_active_room": "Sende <b>%(msgtype)s</b> Nachrichten als du in deinen aktiven Raum",
-            "send_msgtype_this_room": "Sende <b>%(msgtype)s</b> Nachrichten als du in diesen Raum",
-            "send_stickers_active_room": "Sticker in deinen aktiven Raum senden",
-            "send_stickers_active_room_as_you": "Einen Sticker als du in deinen aktiven Raum senden",
-            "send_stickers_this_room": "Sticker in diesen Raum senden",
-            "send_stickers_this_room_as_you": "Einen Sticker in diesen Raum senden",
-            "send_text_messages_active_room": "Textnachrichten als du in deinen aktiven Raum senden",
-            "send_text_messages_this_room": "Textnachrichten als du in diesen Raum senden",
-            "send_videos_active_room": "Videos als du in deinen aktiven Raum senden",
-            "send_videos_this_room": "Videos als du in diesen Raum senden",
+            "change_avatar_active_room": "Ändere den Avatar deines aktiven Chats",
+            "change_avatar_this_room": "Ändere den Avatar dieses Chats",
+            "change_name_active_room": "Ändere den Namen deines aktiven Chats",
+            "change_name_this_room": "Ändere den Namen von diesem Chat",
+            "change_topic_active_room": "Ändere das Thema von deinem aktiven Chat",
+            "change_topic_this_room": "Ändere das Thema von diesem Chat",
+            "receive_membership_active_room": "Anzeigen, wenn Nutzer den aktuellen Chat betreten, verlassen oder zu ihm eingeladen werden",
+            "receive_membership_this_room": "Anzeigen, wenn Nutzer zu diesem Chat eingeladen werden, ihm beitreten oder verlassen",
+            "remove_ban_invite_leave_active_room": "Entferne, sperre oder lade andere zu deinem aktiven Chat ein und verlasse den Chat selbst",
+            "remove_ban_invite_leave_this_room": "Entferne, sperre oder lade andere zu diesem Chat ein und verlasse den Chat selbst",
+            "see_avatar_change_active_room": "Sehen, wenn der Avatar in deinem aktiven Chat geändert wird",
+            "see_avatar_change_this_room": "Sehen, wenn sich der Avatar des Chats ändert",
+            "see_event_type_sent_active_room": "In deinen aktiven Chat gesendete <b>%(eventType)s</b>-Ereignisse anzeigen",
+            "see_event_type_sent_this_room": "In diesen Chat gesendete <b>%(eventType)s</b>-Ereignisse anzeigen",
+            "see_images_sent_active_room": "Zeige Bilder an, die in deinen aktiven Chat gesendete werden",
+            "see_images_sent_this_room": "Zeige Bilder an, die in diesen Chat gesendet werden",
+            "see_messages_sent_active_room": "Zeige Nachrichten an, die in deinen aktiven Chat gesendet werden",
+            "see_messages_sent_this_room": "Zeige Nachrichten an, die in diesen Chat gesendet werden",
+            "see_msgtype_sent_active_room": "Zeige <b>%(msgtype)s</b> Nachrichten, die in deinen aktiven Chat gesendet werden",
+            "see_msgtype_sent_this_room": "Zeige <b>%(msgtype)s</b> Nachrichten, die in diesen Chat gesendet werden",
+            "see_name_change_active_room": "Zeige, wenn der Name des aktiven Chat sich ändert",
+            "see_name_change_this_room": "Zeige, wenn der Name sich in diesem Chat ändert",
+            "see_sent_emotes_active_room": "Zeige Emojis an, die in deinen aktiven Chat gesendet werden",
+            "see_sent_emotes_this_room": "Zeige Emojis an, die in diesen Chat gesendet werden",
+            "see_sent_files_active_room": "Zeige allgemeine Dateien an, die in deinen aktiven Chat gesendet werden",
+            "see_sent_files_this_room": "Zeige allgemeine Dateien an, die in diesen Chat gesendet werden",
+            "see_sticker_posted_active_room": "Zeige Sticker an, die in deinen aktiven Chat gesendet werden",
+            "see_sticker_posted_this_room": "Zeige Sticker an, die in diesen Chat gesendet werden",
+            "see_text_messages_sent_active_room": "Zeige Nachrichten an, die in deinen aktiven Chat gesendet werden",
+            "see_text_messages_sent_this_room": "Zeige Nachrichten an, die in diesen Chat gesendet werden",
+            "see_topic_change_active_room": "Zeige das Thema an, wenn es in deinem aktiven Chat geändert wird",
+            "see_topic_change_this_room": "Zeige das Thema an, wenn es in deinem aktiven Chat geändert wird",
+            "see_videos_sent_active_room": "Zeige Videos an, wenn sie in deinen aktiven Chat gesendet werden",
+            "see_videos_sent_this_room": "Zeige Videos an, wenn sie in diesen Chat gesendet werden",
+            "send_emotes_active_room": "Sende Emojis unter deinem Namen in den aktiven Chat",
+            "send_emotes_this_room": "Sende Emojis unter deinem Namen in den diesen Chat",
+            "send_event_type_active_room": "Sende <b>%(eventType)s</b>-Ereignisse unter deinem Namen in deinen aktiven Chat",
+            "send_event_type_this_room": "Sende <b>%(eventType)s</b>-Ereignisse unter deinem Namen in diesen Chat",
+            "send_files_active_room": "Sende allgemeine Dateien unter deinem Namen in deinen aktiven Chat",
+            "send_files_this_room": "Sende allgemeine Dateien unter deinem Namen in diesen Chat",
+            "send_images_active_room": "Sende Bilder unter deinem Namen in den aktuellen Chat",
+            "send_images_this_room": "Sende Bilder unter deinem Namen in diesen Chat",
+            "send_messages_active_room": "Sende Nachrichten unter deinem Namen in deinen aktiven Chat",
+            "send_messages_this_room": "Sende Nachrichten unter deinem Namen in diesem Chat",
+            "send_msgtype_active_room": "Sende <b>%(msgtype)s</b> Nachrichten unter deinem Namen in deinen aktiven Chat",
+            "send_msgtype_this_room": "Sende <b>%(msgtype)s</b> Nachrichten unter deinem Namen in diesen Chat",
+            "send_stickers_active_room": "Sende Sticker in deinen aktiven Chat",
+            "send_stickers_active_room_as_you": "Sende Sticker unter deinem Namen in deinen aktiven Chat",
+            "send_stickers_this_room": "Sende Sticker in diesen Chat",
+            "send_stickers_this_room_as_you": "Sende Sticker unter deinem Namen in diesen Chat",
+            "send_text_messages_active_room": "Sende Nachrichten unter deinem Namen in deinen aktiven Chat",
+            "send_text_messages_this_room": "Sende Nachrichten unter deinem Namen in diesen Chat",
+            "send_videos_active_room": "Sende Videos unter deinem Namen in deinen aktiven Chat",
+            "send_videos_this_room": "Sende Videos unter deinem Namen in diesen Chat",
             "specific_room": "Wie oben, nur zusätzlich in <Room />",
-            "switch_room": "Ändern, welchen Raum du siehst",
-            "switch_room_message_user": "Ändere den sichtbaren Raum, Nachricht oder Nutzer"
+            "switch_room": "Ändere, welchen Chat du siehst",
+            "switch_room_message_user": "Ändere den sichtbaren Chat, Nachricht oder Nutzer"
         },
         "close_to_view_right_panel": "Widget schließen und in diesem Panel anzeigen",
         "context_menu": {
             "delete": "Widget entfernen",
-            "delete_warning": "Das Löschen des Widgets entfernt es für alle in diesem Raum. Wirklich löschen?",
+            "delete_warning": "Das Löschen des Widgets entfernt es für alle in diesem Chat. Wirklich löschen?",
             "move_left": "Nach links schieben",
             "move_right": "Nach rechts schieben",
             "remove": "Für alle entfernen",
@@ -4114,7 +4187,7 @@
         "shared_data_lang": "Deine Sprache",
         "shared_data_mxid": "Deine Nutzer-ID",
         "shared_data_name": "Dein Anzeigename",
-        "shared_data_room_id": "Raum-ID",
+        "shared_data_room_id": "Chat-ID",
         "shared_data_theme": "Dein Design",
         "shared_data_url": "%(brand)s URL",
         "shared_data_warning": "Wenn du dieses Widget verwendest, können Daten <helpIcon /> zu %(widgetDomain)s übertragen werden.",
@@ -4134,7 +4207,7 @@
             "l33t": "Vorhersagbare Ersetzungen wie „@“ anstelle von „a“ helfen nicht besonders",
             "longerKeyboardPattern": "Nutze ein längeres Tastaturmuster mit mehr Abwechslung",
             "noNeed": "Kein Bedarf an Symbolen, Zahlen oder Großbuchstaben",
-            "pwned": "Falls Sie dieses Passwort anderweitig verwenden, sollten Sie es ändern.",
+            "pwned": "Falls du dieses Passwort anderweitig verwendest, solltest du es ändern.",
             "recentYears": "Vermeide die letzten Jahre",
             "repeated": "Vermeide wiederholte Worte und Zeichen",
             "reverseWords": "Umgedrehte Worte sind nicht schwerer zu erraten",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 662d56b6d5..8289ac7347 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -50,6 +50,8 @@
         "download": "Λήψη",
         "edit": "Επεξεργασία",
         "enable": "Ενεργοποίηση",
+        "enter_fullscreen": "Είσοδος σε πλήρη οθόνη",
+        "exit_fullscreeen": "Έξοδος από την πλήρη οθόνη",
         "expand": "Επέκταση",
         "explore_public_rooms": "Εξερευνήστε δημόσιες αίθουσες",
         "explore_rooms": "Εξερευνήστε αίθουσες",
@@ -149,10 +151,12 @@
         "shared_data_heading": "Οποιοδήποτε από τα ακόλουθα δεδομένα μπορεί να κοινοποιηθεί:"
     },
     "auth": {
+        "3pid_in_use": "Αυτή η διεύθυνση ηλεκτρονικού ταχυδρομείου ή ο αριθμός τηλεφώνου χρησιμοποιείται ήδη.",
         "account_clash": "Ο νέος λογαριασμός σας (%(newAccountId)s) έχει εγγραφεί, αλλά έχετε ήδη συνδεθεί με διαφορετικό λογαριασμό (%(loggedInUserId)s).",
         "account_clash_previous_account": "Συνέχεια με τον προηγούμενο λογαριασμό",
         "account_deactivated": "Αυτός ο λογαριασμός έχει απενεργοποιηθεί.",
         "autodiscovery_generic_failure": "Απέτυχε η λήψη της διαμόρφωσης αυτόματης ανακάλυψης από τον διακομιστή",
+        "autodiscovery_hs_incompatible": "Ο αρχικός σας διακομιστής είναι πολύ παλιός και δεν υποστηρίζει την ελάχιστη απαιτούμενη έκδοση API. Παρακαλούμε επικοινωνήστε με τον ιδιοκτήτη του διακομιστή σας ή αναβαθμίστε τον διακομιστή σας.",
         "autodiscovery_invalid": "Μη έγκυρη απόκριση εντοπισμού κεντρικού διακομιστή",
         "autodiscovery_invalid_hs": "Η διεύθυνση URL του κεντρικού διακομιστή δε φαίνεται να αντιστοιχεί σε έγκυρο διακομιστή Matrix",
         "autodiscovery_invalid_hs_base_url": "Μη έγκυρο base_url για m.homeserver",
@@ -160,6 +164,7 @@
         "autodiscovery_invalid_is_base_url": "Μη έγκυρο base_url για m.identity_server",
         "autodiscovery_invalid_is_response": "Μη έγκυρη απόκριση εντοπισμού διακομιστή ταυτότητας",
         "autodiscovery_invalid_json": "Μη έγκυρο JSON",
+        "autodiscovery_no_well_known": "Δεν βρέθηκε αρχείο .well-known JSON",
         "autodiscovery_unexpected_error_hs": "Μη αναμενόμενο σφάλμα κατά την επίλυση της διαμόρφωσης του κεντρικού διακομιστή",
         "autodiscovery_unexpected_error_is": "Μη αναμενόμενο σφάλμα κατά την επίλυση της διαμόρφωσης διακομιστή ταυτότητας",
         "captcha_description": "Αυτός ο κεντρικός διακομιστής θα ήθελε να βεβαιωθεί ότι δεν είστε ρομπότ.",
@@ -168,8 +173,14 @@
         "change_password_confirm_label": "Επιβεβαίωση κωδικού πρόσβασης",
         "change_password_current_label": "Τωρινός κωδικός πρόσβασης",
         "change_password_empty": "Οι κωδικοί πρόσβασης δεν γίνετε να είναι κενοί",
+        "change_password_error": "Σφάλμα κατά την αλλαγή κωδικού πρόσβασης: %(error)s",
         "change_password_mismatch": "Οι νέοι κωδικοί πρόσβασης είναι διαφορετικοί",
         "change_password_new_label": "Νέος κωδικός πρόσβασης",
+        "check_email_explainer": "Ακολουθήστε τις οδηγίες που στάλθηκαν στο <b>%(email)s</b>",
+        "check_email_resend_prompt": "Δεν το λάβατε;",
+        "check_email_resend_tooltip": "Επανεστάλη email με τον συνδέσμο επαλήθευσης!",
+        "check_email_wrong_email_button": "Εισαγάγετε ξανά τη διεύθυνση ηλεκτρονικού ταχυδρομείου",
+        "check_email_wrong_email_prompt": "Λάθος διεύθυνση ηλεκτρονικού ταχυδρομείου;",
         "continue_with_idp": "Συνεχίστε με %(provider)s",
         "continue_with_sso": "Συνέχεια με %(ssoButtons)s",
         "country_dropdown": "Αναπτυσσόμενο μενού Χώρας",
@@ -181,6 +192,8 @@
         "email_field_label_required": "Εισάγετε διεύθυνση email",
         "email_help_text": "Προσθέστε ένα email για να μπορείτε να κάνετε επαναφορά του κωδικού πρόσβασης σας.",
         "email_phone_discovery_text": "Χρησιμοποιήστε email ή τηλέφωνο για να είστε προαιρετικά ανιχνεύσιμος από υπάρχουσες επαφές.",
+        "enter_email_explainer": "Το <b>%(homeserver)s</b> θα σας στείλει έναν σύνδεσμο επαλήθευσης για να επαναφέρετε τον κωδικό πρόσβασής σας.",
+        "enter_email_heading": "Εισάγετε το email σας για να επαναφέρετε τον κωδικό πρόσβασης",
         "failed_connect_identity_server": "Δεν είναι δυνατή η πρόσβαση στον διακομιστή ταυτότητας",
         "failed_connect_identity_server_other": "Μπορείτε να συνδεθείτε, αλλά ορισμένες λειτουργίες δε θα είναι διαθέσιμες μέχρι να συνδεθεί ξανά ο διακομιστής ταυτότητας. Εάν εξακολουθείτε να βλέπετε αυτήν την προειδοποίηση, ελέγξτε τις ρυθμίσεις σας ή επικοινωνήστε με έναν διαχειριστή του διακομιστή σας.",
         "failed_connect_identity_server_register": "Μπορείτε να εγγραφείτε, αλλά ορισμένες λειτουργίες δεν θα είναι διαθέσιμες μέχρι να συνδεθεί ξανά ο διακομιστής ταυτότητας. Εάν εξακολουθείτε να βλέπετε αυτήν την ειδοποίηση, ελέγξτε τις ρυθμίσεις σας ή επικοινωνήστε με έναν διαχειριστή διακομιστή.",
@@ -192,6 +205,7 @@
         "forgot_password_email_invalid": "Η διεύθυνση email δε φαίνεται να είναι έγκυρη.",
         "forgot_password_email_required": "Πρέπει να εισηχθεί η διεύθυνση ηλ. αλληλογραφίας που είναι συνδεδεμένη με τον λογαριασμό σας.",
         "forgot_password_prompt": "Ξεχάσετε τον κωδικό σας;",
+        "forgot_password_send_email": "Αποστολή email",
         "identifier_label": "Συνδεθείτε με",
         "incorrect_credentials": "Λανθασμένο όνομα χρήστη και/ή κωδικός.",
         "incorrect_credentials_detail": "Σημειώστε ότι συνδέεστε στον διακομιστή %(hs)s, όχι στο matrix.org.",
@@ -202,8 +216,8 @@
             "megolm_export": "Μη αυτόματη εξαγωγή κλειδιών",
             "setup_key_backup_title": "Θα χάσετε την πρόσβαση στα κρυπτογραφημένα μηνύματά σας",
             "setup_secure_backup_description_1": "Τα κρυπτογραφημένα μηνύματα προστατεύονται με κρυπτογράφηση από άκρο σε άκρο. Μόνο εσείς και οι παραλήπτες έχετε τα κλειδιά για να διαβάσετε αυτά τα μηνύματα.",
-            "skip_key_backup": "Δε θέλω τα κρυπτογραφημένα μηνύματά μου",
-            "use_key_backup": "Ξεκινήστε να χρησιμοποιείτε το αντίγραφο ασφαλείας κλειδιού"
+            "setup_secure_backup_description_2": "Όταν αποσυνδεθείτε, αυτά τα κλειδιά θα διαγραφούν από αυτήν τη συσκευή, πράγμα που σημαίνει ότι δεν θα μπορείτε να διαβάσετε κρυπτογραφημένα μηνύματα, εκτός εάν έχετε τα κλειδιά για αυτά στις άλλες συσκευές σας ή έχετε δημιουργήσει αντίγραφα ασφαλείας τους στον διακομιστή.",
+            "skip_key_backup": "Δε θέλω τα κρυπτογραφημένα μηνύματά μου"
         },
         "misconfigured_body": "Ζητήστε από τον %(brand)s διαχειριστή σας να ελέγξει <a>τις ρυθμίσεις σας</a> για λανθασμένες ή διπλότυπες καταχωρίσεις.",
         "misconfigured_title": "Οι παράμετροι του %(brand)s σας είναι λανθασμένα ρυθμισμένοι",
@@ -216,11 +230,20 @@
             "error_title": "Δεν μπορέσαμε να σας συνδέσουμε",
             "missing_or_invalid_stored_state": "Ζητήσαμε από το πρόγραμμα περιήγησης να θυμάται τον διακομιστή που χρησιμοποιείτε για να συνδέεστε, αλλά το πρόγραμμα περιήγησης δεν το έχει αποθηκεύσει. Πηγαίνετε στην σελίδα σύνδεσεις για να προσπαθήσετε ξανά."
         },
+        "password_field_keep_going_prompt": "Συνεχίστε...",
         "password_field_label": "Εισάγετε τον κωδικό πρόσβασης",
         "password_field_strong_label": "Πολύ καλά, ισχυρός κωδικός πρόσβασης!",
         "password_field_weak_label": "Έγκυρος κωδικός πρόσβασης, αλλά δεν είναι ασφαλής",
         "phone_label": "Τηλέφωνο",
         "phone_optional_label": "Τηλέφωνο (προαιρετικό)",
+        "qr_code_login": {
+            "completing_setup": "Ολοκλήρωση της ρύθμισης της νέας συσκευής σας",
+            "error_unexpected": "Παρουσιάστηκε μη αναμενόμενο σφάλμα. Το αίτημα σύνδεσης της άλλης συσκευής σας ακυρώθηκε.",
+            "scan_code_instruction": "Σαρώστε τον κωδικό QR με άλλη συσκευή",
+            "scan_qr_code": "Συνδεθείτε με κωδικό QR",
+            "select_qr_code": "Επιλέξτε \"%(scanQRCode)s\"",
+            "waiting_for_device": "Αναμονή για σύνδεση της συσκευής"
+        },
         "register_action": "Δημιουργία Λογαριασμού",
         "registration": {
             "continue_without_email_description": "Μια προειδοποίηση, αν δεν προσθέσετε ένα email και ξεχάσετε τον κωδικό πρόσβασης, ενδέχεται να <b>χάσετε οριστικά την πρόσβαση στον λογαριασμό σας</b>.",
@@ -234,14 +257,25 @@
         "registration_username_unable_check": "Δεν είναι δυνατός ο έλεγχος εάν το όνομα χρήστη είναι διαθέσιμο. Δοκιμάστε ξανά αργότερα.",
         "registration_username_validation": "Χρησιμοποιήστε μόνο πεζά γράμματα, αριθμούς, παύλες και κάτω παύλες",
         "reset_password": {
+            "confirm_new_password": "Επιβεβαίωση νέου κωδικού πρόσβασης",
+            "devices_logout_success": "Έχετε αποσυνδεθεί από όλες τις συσκευές και δεν θα λαμβάνετε πλέον ειδοποιήσεις push. Για να ενεργοποιήσετε ξανά τις ειδοποιήσεις, συνδεθείτε ξανά σε κάθε συσκευή.",
+            "other_devices_logout_warning_1": "Η αποσύνδεση των συσκευών σας θα διαγράψει τα κλειδιά κρυπτογράφησης μηνυμάτων που είναι αποθηκευμένα σε αυτές, καθιστώντας το κρυπτογραφημένο ιστορικό συνομιλιών μη αναγνώσιμο.",
+            "other_devices_logout_warning_2": "Αν θέλετε να διατηρήσετε πρόσβαση στο ιστορικό των συνομιλιών σας σε κρυπτογραφημένες αίθουσες, ρυθμίστε τη δημιουργία αντιγράφων ασφαλείας κλειδιών ή εξάγετε τα κλειδιά των μηνυμάτων σας από μία από τις άλλες συσκευές σας πριν προχωρήσετε.",
             "password_not_entered": "Ο νέος κωδικός πρόσβασης πρέπει να εισαχθεί.",
             "passwords_mismatch": "Οι νέοι κωδικοί πρόσβασης πρέπει να ταιριάζουν.",
+            "rate_limit_error": "Πάρα πολλές προσπάθειες σε σύντομο χρονικό διάστημα. Περιμένετε λίγο πριν προσπαθήσετε ξανά.",
+            "rate_limit_error_with_time": "Πάρα πολλές προσπάθειες σε σύντομο χρονικό διάστημα. Δοκιμάστε ξανά μετά από %(timeout)s.",
             "reset_successful": "Ο κωδικός πρόσβασής σας επαναφέρθηκε.",
-            "return_to_login": "Επιστροφή στην οθόνη σύνδεσης"
+            "return_to_login": "Επιστροφή στην οθόνη σύνδεσης",
+            "sign_out_other_devices": "Αποσύνδεση από όλες τις συσκευές"
         },
+        "reset_password_action": "Επαναφορά κωδικού πρόσβασης",
+        "reset_password_button": "Ξέχασες τον κωδικό πρόσβασης;",
         "reset_password_email_field_description": "Χρησιμοποιήστε μια διεύθυνση email για να ανακτήσετε τον λογαριασμό σας",
         "reset_password_email_field_required_invalid": "Εισαγάγετε τη διεύθυνση email (απαιτείται σε αυτόν τον κεντρικό διακομιστή)",
+        "reset_password_email_not_associated": "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σας δεν φαίνεται να σχετίζεται με κάποιο αναγνωριστικό Matrix σε αυτόν τον αρχικό διακομιστή.",
         "reset_password_email_not_found_title": "Δεν βρέθηκε η διεύθυνση ηλ. αλληλογραφίας",
+        "reset_password_title": "Επαναφέρετε τον κωδικό πρόσβασής σας",
         "server_picker_custom": "Άλλος κεντρικός διακομιστής",
         "server_picker_description": "Μπορείτε να χρησιμοποιήσετε τις προσαρμοσμένες επιλογές διακομιστή για να συνδεθείτε σε άλλους διακομιστές Matrix, καθορίζοντας μια διαφορετική διεύθυνση URL του κεντρικού διακομιστή. Αυτό σας επιτρέπει να χρησιμοποιείτε το %(brand)s με έναν υπάρχοντα λογαριασμό Matrix σε διαφορετικό τοπικό διακομιστή.",
         "server_picker_description_matrix.org": "Συμμετέχετε δωρεάν στον μεγαλύτερο δημόσιο διακομιστή",
@@ -264,11 +298,14 @@
             "verification_pending_title": "Εκκρεμεί επιβεβαίωση"
         },
         "set_email_prompt": "Θέλετε να ορίσετε μια διεύθυνση ηλεκτρονικής αλληλογραφίας;",
+        "sign_in_description": "Χρησιμοποιήστε τον λογαριασμό σας για να συνεχίσετε.",
+        "sign_in_instead": "Συνδεθείτε αντ' αυτού",
         "sign_in_instead_prompt": "Έχετε ήδη λογαριασμό; <a>Συνδεθείτε εδώ</a>",
         "sign_in_or_register": "Συνδεθείτε ή Δημιουργήστε Λογαριασμό",
         "sign_in_or_register_description": "Χρησιμοποιήστε τον λογαριασμό σας ή δημιουργήστε νέο για να συνεχίσετε.",
         "sign_in_prompt": "Έχετε λογαριασμό; <a>Συνδεθείτε</a>",
         "sign_in_with_sso": "Συνδεθείτε με απλή σύνδεση",
+        "signing_in": "Σύνδεση...",
         "soft_logout": {
             "clear_data_button": "Εκκαθάριση όλων των δεδομένων",
             "clear_data_description": "Η εκκαθάριση όλων των δεδομένων από αυτήν τη συνεδρία είναι μόνιμη. Τα κρυπτογραφημένα μηνύματα θα χαθούν εκτός εάν έχουν δημιουργηθεί αντίγραφα ασφαλείας των κλειδιών τους.",
@@ -279,19 +316,27 @@
         "soft_logout_intro_sso": "Συνδεθείτε και αποκτήστε ξανά πρόσβαση στον λογαριασμό σας.",
         "soft_logout_intro_unsupported_auth": "Δεν μπορείτε να συνδεθείτε στον λογαριασμό σας. Επικοινωνήστε με τον διαχειριστή του κεντρικού διακομιστή σας για περισσότερες πληροφορίες.",
         "soft_logout_subheading": "Εκκαθάριση προσωπικών δεδομένων",
+        "soft_logout_warning": "Προειδοποίηση: τα προσωπικά σας δεδομένα (συμπεριλαμβανομένων των κλειδιών κρυπτογράφησης) εξακολουθούν να είναι αποθηκευμένα σε αυτήν την συνεδρία. Διαγράψτε τα εάν ολοκληρώσατε τη χρήση αυτής της συνεδρίας ή θέλετε να συνδεθείτε σε άλλον λογαριασμό.",
+        "sso": "Ενιαία Σύνδεση",
         "sso_complete_in_browser_dialog_title": "Μεταβείτε στο πρόγραμμα περιήγησής σας για να ολοκληρώσετε τη σύνδεση",
         "sso_failed_missing_storage": "Ζητήσαμε από το πρόγραμμα περιήγησης να θυμάται τον διακομιστή που χρησιμοποιείτε για να συνδέεστε, αλλά το πρόγραμμα περιήγησης δεν το έχει αποθηκεύσει. Πηγαίνετε στην σελίδα σύνδεσεις για να προσπαθήσετε ξανά.",
         "sso_or_username_password": "%(ssoButtons)s Ή %(usernamePassword)s",
         "sync_footer_subtitle": "Εάν έχετε συμμετάσχει σε πολλές αίθουσες, αυτό μπορεί να διαρκέσει λίγο",
+        "syncing": "Συγχρονισμός...",
         "uia": {
             "code": "Κωδικός",
+            "email": "Για να δημιουργήσετε τον λογαριασμό σας, ανοίξτε τον σύνδεσμο στο email που μόλις στείλαμε στο %(emailAddress)s.",
             "email_auth_header": "Ελέγξτε το email σας για να συνεχίσετε",
+            "email_resend_prompt": "Δεν το λάβατε; <a>Στείλτε το ξανά</a>",
+            "email_resent": "Επαναστάλθηκε!",
             "fallback_button": "Έναρξη πιστοποίησης",
             "msisdn": "Ένα μήνυμα κειμένου έχει σταλεί στη διεύθυνση %(msisdn)s",
             "msisdn_token_incorrect": "Εσφαλμένο διακριτικό",
             "msisdn_token_prompt": "Παρακαλούμε εισάγετε τον κωδικό που περιέχει:",
             "password_prompt": "Ταυτοποιηθείτε εισάγοντας παρακάτω τον κωδικό πρόσβασης του λογαριασμού σας.",
             "recaptcha_missing_params": "Λείπει το δημόσιο κλειδί captcha από τη διαμόρφωση του κεντρικού διακομιστή. Αναφέρετε αυτό στον διαχειριστή του.",
+            "registration_token_label": "Διακριτικό εγγραφής",
+            "registration_token_prompt": "Εισάγετε ένα διακριτικό εγγραφής που παρέχεται από τον διαχειριστή του αρχικού διακομιστή.",
             "sso_body": "Επιβεβαιώστε την προσθήκη αυτής της διεύθυνσης ηλ. ταχυδρομείου με την χρήση Single Sign On για να επικυρώσετε την ταυτότητα σας.",
             "sso_failed": "Κάτι πήγε στραβά στην επιβεβαίωση της ταυτότητάς σας. Ακυρώστε και δοκιμάστε ξανά.",
             "sso_postauth_body": "Κλικ στο κουμπί παρακάτω για να επιβεβαιώσετε την ταυτότητά σας.",
@@ -301,10 +346,13 @@
             "terms": "Παρακαλώ διαβάστε και αποδεχτείτε όλες τις πολιτικές αυτού του κεντρικού διακομιστή:",
             "terms_invalid": "Παρακαλώ διαβάστε και αποδεχτείτε όλες τις πολιτικές του κεντρικού διακομιστή"
         },
+        "unsupported_auth": "Αυτός ο αρχικός διακομιστής δεν προσφέρει καμία ροή σύνδεσης που υποστηρίζεται από αυτήν την εφαρμογή.",
         "unsupported_auth_email": "Αυτός ο κεντρικός διακομιστής δεν υποστηρίζει σύνδεση με χρήση διεύθυνσης email.",
         "unsupported_auth_msisdn": "Αυτός ο διακομιστής δεν υποστηρίζει πιστοποίηση με αριθμό τηλεφώνου.",
         "username_field_required_invalid": "Εισάγετε όνομα χρήστη",
-        "username_in_use": "Κάποιος έχει ήδη αυτό το όνομα χρήστη, δοκιμάστε ένα άλλο."
+        "username_in_use": "Κάποιος έχει ήδη αυτό το όνομα χρήστη, δοκιμάστε ένα άλλο.",
+        "verify_email_explainer": "Πρέπει να γνωρίζουμε ότι είστε εσείς πριν επαναφέρουμε τον κωδικό πρόσβασής σας. Κάντε κλικ στον σύνδεσμο στο email που μόλις στείλαμε στη διεύθυνση <b>%(email)s</b>",
+        "verify_email_heading": "Επαληθεύστε το email σας για να συνεχίσετε"
     },
     "bug_reporting": {
         "additional_context": "Εάν υπάρχουν πρόσθετες πληροφορίες που θα βοηθούσαν στην ανάλυση του ζητήματος, όπως τι κάνατε εκείνη τη στιγμή, αναγνωριστικά αιθουσών, αναγνωριστικά χρηστών κ.λπ., συμπεριλάβετέ τα εδώ.",
@@ -332,6 +380,7 @@
         "uploading_logs": "Μεταφόρτωση αρχείων καταγραφής",
         "waiting_for_server": "Αναμονή απάντησης από τον διακομιστή"
     },
+    "cannot_invite_without_identity_server": "Δεν είναι δυνατή η πρόσκληση χρήστη μέσω email χωρίς διακομιστή ταυτότητας. Μπορείτε να συνδεθείτε σε έναν από τις \"Ρυθμίσεις\".",
     "cannot_reach_homeserver": "Δεν είναι δυνατή η πρόσβαση στον κεντρικό διακομιστή",
     "cannot_reach_homeserver_detail": "Βεβαιωθείτε ότι έχετε σταθερή σύνδεση στο διαδίκτυο ή επικοινωνήστε με τον διαχειριστή του διακομιστή",
     "cant_load_page": "Δεν ήταν δυνατή η φόρτωση της σελίδας",
@@ -362,6 +411,7 @@
         "are_you_sure": "Είστε σίγουροι;",
         "attachment": "Επισύναψη",
         "authentication": "Πιστοποίηση",
+        "avatar": "Εικόνα Προφίλ",
         "beta": "Beta",
         "camera": "Κάμερα",
         "cameras": "Κάμερες",
@@ -444,6 +494,7 @@
         "room": "Αίθουσα",
         "room_name": "Όνομα αίθουσας",
         "rooms": "Αίθουσες",
+        "saving": "Γίνεται αποθήκευση...",
         "secure_backup": "Ασφαλές αντίγραφο ασφαλείας",
         "select_all": "Επιλογή όλων",
         "server": "Διακομιστής",
@@ -463,6 +514,7 @@
         "thread": "Νήμα",
         "threads": "Νήμα εκτέλεσης",
         "timeline": "Χρονολόγιο",
+        "unavailable": "μη διαθέσιμο",
         "unencrypted": "Μη κρυπτογραφημένο",
         "unmute": "Άρση σίγασης",
         "unnamed_room": "Ανώνυμη αίθουσα",
@@ -471,7 +523,6 @@
         "user": "Χρήστης",
         "user_avatar": "Εικόνα προφίλ",
         "username": "Όνομα χρήστη",
-        "verification_cancelled": "Η επαλήθευση ακυρώθηκε",
         "verified": "Επαληθευμένη",
         "version": "Έκδοση",
         "video": "Βίντεο",
@@ -532,6 +583,7 @@
     "create_room": {
         "action_create_room": "Δημιουργία δωματίου",
         "action_create_video_room": "Δημιουργία δωματίου βίντεο",
+        "encrypted_video_room_warning": "Δεν μπορείτε να το απενεργοποιήσετε αργότερα. Η αίθουσα θα κρυπτογραφηθεί, αλλά η ενσωματωμένη κλήση όχι.",
         "encrypted_warning": "Δεν μπορείτε να το απενεργοποιήσετε αργότερα. Οι γέφυρες και τα περισσότερα ρομπότ δεν μπορούν να λειτουργήσουν ακόμα.",
         "encryption_forced": "Ο διακομιστής σας απαιτεί την ενεργοποίηση της κρυπτογράφησης σε ιδιωτικά δωμάτια.",
         "encryption_label": "Ενεργοποίηση κρυπτογράφησης από άκρο-σε-άκρο",
@@ -540,6 +592,7 @@
         "join_rule_change_notice": "Μπορείτε να το αλλάξετε ανά πάσα στιγμή από τις ρυθμίσεις δωματίου.",
         "join_rule_invite": "Ιδιωτικό δωμάτιο (μόνο με πρόσκληση)",
         "join_rule_invite_label": "Μόνο τα άτομα που έχουν προσκληθεί θα μπορούν να βρουν και να εγγραφούν σε αυτό τον δωμάτιο.",
+        "join_rule_knock_label": "Οποιοσδήποτε μπορεί να ζητήσει να συμμετάσχει, αλλά οι διαχειριστές ή οι συντονιστές πρέπει να χορηγήσουν πρόσβαση. Μπορείτε να το αλλάξετε αργότερα.",
         "join_rule_public_label": "Οποιοσδήποτε θα μπορεί να βρει και να εγγραφεί σε αυτό το δωμάτιο.",
         "join_rule_public_parent_space_label": "Οποιοσδήποτε θα μπορεί να βρει και να εγγραφεί σε αυτόν τον χώρο, όχι μόνο μέλη του <SpaceName/>.",
         "join_rule_restricted": "Ορατό στα μέλη του χώρου",
@@ -711,17 +764,16 @@
         "cancel_search_label": "Ακύρωση αναζήτησης"
     },
     "empty_room": "Άδειο δωμάτιο",
+    "empty_room_was_name": "Άδεια αίθουσα (ήταν %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
             "key_validation_text": {
-                "wrong_security_key": "Λάθος Κλειδί Ασφαλείας"
+                "wrong_security_key": "Το κλειδί ανάκτησης που εισαγάγατε δεν είναι σωστό."
             },
             "restoring": "Επαναφορά κλειδιών από αντίγραφο ασφαλείας",
-            "security_key_title": "Κλειδί Ασφαλείας"
+            "security_key_title": "Κλειδί Ανάκτησης"
         },
         "bootstrap_title": "Ρύθμιση κλειδιών",
-        "cancel_entering_passphrase_description": "Είστε σίγουρος/η ότι θέλετε να ακυρώσετε την εισαγωγή κωδικού;",
-        "cancel_entering_passphrase_title": "Ακύρωση εισαγωγής κωδικού;",
         "confirm_encryption_setup_body": "Κάντε κλικ στο κουμπί παρακάτω για να επιβεβαιώσετε τη ρύθμιση της κρυπτογράφησης.",
         "confirm_encryption_setup_title": "Επιβεβαιώστε τη ρύθμιση κρυπτογράφησης",
         "cross_signing_room_normal": "Αυτό το δωμάτιο έχει κρυπτογράφηση από άκρο σε άκρο",
@@ -732,6 +784,9 @@
         "cross_signing_user_warning": "Αυτός ο χρήστης δεν έχει επαληθεύσει όλες τις συνεδρίες του.",
         "event_shield_reason_authenticity_not_guaranteed": "Η αυθεντικότητα αυτού του κρυπτογραφημένου μηνύματος δεν είναι εγγυημένη σε αυτήν τη συσκευή.",
         "event_shield_reason_mismatched_sender_key": "Κρυπτογραφήθηκε από μια μη επαληθευμένη συνεδρία",
+        "event_shield_reason_unknown_device": "Κρυπτογραφημένο από άγνωστη ή διαγραμμένη συσκευή.",
+        "event_shield_reason_unsigned_device": "Κρυπτογραφημένο από συσκευή που δεν έχει επαληθευτεί από τον κάτοχό της.",
+        "event_shield_reason_unverified_identity": "Κρυπτογραφημένο από μη επαληθευμένο χρήστη.",
         "export_unsupported": "Ο περιηγητής σας δεν υποστηρίζει τα απαιτούμενα πρόσθετα κρυπτογράφησης",
         "import_invalid_keyfile": "Μη έγκυρο αρχείο κλειδιού %(brand)s",
         "import_invalid_passphrase": "Αποτυχία ελέγχου πιστοποίησης: λανθασμένος κωδικός πρόσβασης;",
@@ -755,13 +810,12 @@
             "title": "Η Μέθοδος Ανάκτησης Καταργήθηκε",
             "warning": "Εάν δεν καταργήσατε τη μέθοδο ανάκτησης, ένας εισβολέας μπορεί να προσπαθεί να αποκτήσει πρόσβαση στον λογαριασμό σας. Αλλάξτε τον κωδικό πρόσβασης του λογαριασμού σας και ορίστε μια νέα μέθοδο ανάκτησης αμέσως στις Ρυθμίσεις."
         },
-        "reset_all_button": "Ξεχάσατε ή χάσατε όλες τις μεθόδους ανάκτησης; <a>Επαναφορά όλων</a>",
-        "set_up_toast_description": "Προστατευτείτε από την απώλεια πρόσβασης σε κρυπτογραφημένα μηνύματα και δεδομένα",
         "set_up_toast_title": "Ρυθμίστε το αντίγραφο ασφαλείας",
         "setup_secure_backup": {
             "explainer": "Δημιουργήστε αντίγραφα ασφαλείας των κλειδιών σας πριν αποσυνδεθείτε για να μην τα χάσετε."
         },
         "udd": {
+            "interactive_verification_button": "Διαδραστική επαλήθευση με emoji",
             "other_ask_verify_text": "Ζητήστε από αυτόν τον χρήστη να επιβεβαιώσει την συνεδρία του, ή επιβεβαιώστε την χειροκίνητα παρακάτω.",
             "other_new_session_text": "Ο %(name)s (%(userId)s) συνδέθηκε σε μία νέα συνεδρία χωρίς να την επιβεβαιώσει:",
             "own_ask_verify_text": "Επιβεβαιώστε την άλλη σας συνεδρία χρησιμοποιώντας μία από τις παρακάτω επιλογές.",
@@ -774,58 +828,48 @@
             "after_new_login": {
                 "device_verified": "Η συσκευή επαληθεύτηκε",
                 "skip_verification": "Παράβλεψη επαλήθευσης προς το παρόν",
-                "unable_to_verify": "Αδυναμία επαλήθευσης αυτής της συσκευής",
                 "verify_this_device": "Επαληθεύστε αυτήν τη συσκευή"
             },
-            "cancelled": "Ακυρώσατε την επαλήθευση.",
-            "cancelled_self": "Ακυρώσατε την επαλήθευση στην άλλη συσκευή σας.",
-            "cancelled_user": "%(displayName)s ακύρωσε την επαλύθευση.",
             "cancelling": "Ακύρωση…",
             "complete_action": "Κατανοώ",
             "complete_description": "Επαληθεύσατε με επιτυχία αυτόν τον χρήστη.",
             "complete_title": "Επαληθεύτηκε!",
+            "error_starting_description": "Δεν ήταν δυνατή η έναρξη συνομιλίας με τον άλλο χρήστη.",
+            "error_starting_title": "Σφάλμα κατά την έναρξη της επαλήθευσης",
             "explainer": "Τα ασφαλή μηνύματα με αυτόν τον χρήστη είναι κρυπτογραφημένα από άκρο σε άκρο και δεν μπορούν να διαβαστούν από τρίτους.",
             "in_person": "Για να είστε ασφαλείς, κάντε το αυτοπροσώπως ή χρησιμοποιήστε έναν αξιόπιστο τρόπο επικοινωνίας.",
             "incoming_sas_device_dialog_text_1": "Επαληθεύστε αυτήν τη συσκευή για να την επισημάνετε ως αξιόπιστη. Η εμπιστοσύνη αυτής της συσκευής προσφέρει σε εσάς και σε άλλους χρήστες επιπλέον ηρεμία όταν χρησιμοποιείτε μηνύματα με κρυπτογράφηση από άκρο σε άκρο.",
             "incoming_sas_device_dialog_text_2": "Η επαλήθευση αυτής της συσκευής θα την επισημάνει ως αξιόπιστη και οι χρήστες που έχουν επαληθευτεί μαζί σας θα εμπιστεύονται αυτήν τη συσκευή.",
             "incoming_sas_dialog_title": "Εισερχόμενο Αίτημα Επαλήθευσης",
+            "incoming_sas_dialog_waiting": "Αναμονή επιβεβαίωσης από τον συνεργάτη…",
             "incoming_sas_user_dialog_text_1": "Επαληθεύστε αυτόν τον χρήστη για να τον επισημάνετε ως αξιόπιστο. Η εμπιστοσύνη των χρηστών σάς προσφέρει επιπλέον ηρεμία όταν χρησιμοποιείτε μηνύματα με κρυπτογράφηση από άκρο σε άκρο.",
             "incoming_sas_user_dialog_text_2": "Η επαλήθευση αυτού του χρήστη θα επισημάνει τη συνεδρία του ως αξιόπιστη και θα επισημάνει επίσης τη συνεδρία σας ως αξιόπιστη σε αυτόν.",
-            "no_key_or_device": "Φαίνεται ότι δε διαθέτετε Κλειδί Ασφαλείας ή άλλες συσκευές με τις οποίες μπορείτε να επαληθεύσετε. Αυτή η συσκευή δε θα έχει πρόσβαση σε παλιά κρυπτογραφημένα μηνύματα. Για να επαληθεύσετε την ταυτότητά σας σε αυτήν τη συσκευή, θα πρέπει να επαναφέρετε τα κλειδιά επαλήθευσης.",
             "no_support_qr_emoji": "Η συσκευή που προσπαθείτε να επαληθεύσετε δεν υποστηρίζει τη σάρωση κωδικού QR ή επαλήθευσης emoji, κάτι που υποστηρίζει το %(brand)s. Δοκιμάστε με διαφορετικό πρόγραμμα-πελάτη.",
             "other_party_cancelled": "Το άλλο μέρος ακύρωσε την επαλήθευση.",
             "prompt_encrypted": "Επαληθεύστε όλους τους χρήστες σε ένα δωμάτιο για να βεβαιωθείτε ότι είναι ασφαλές.",
-            "prompt_self": "Ξεκινήστε ξανά την επαλήθευση από την ειδοποίηση.",
             "prompt_unencrypted": "Σε κρυπτογραφημένα δωμάτια, επαληθεύστε όλους τους χρήστες για να βεβαιωθείτε ότι είναι ασφαλές.",
-            "prompt_user": "Ξεκινήστε ξανά την επαλήθευση από το προφίλ τους.",
             "qr_or_sas": "%(qrCode)s ή %(emojiCompare)s",
-            "qr_or_sas_header": "Επαληθεύστε αυτήν τη συσκευή συμπληρώνοντας ένα από τα παρακάτω:",
             "qr_prompt": "Σαρώστε αυτόν τον μοναδικό κωδικό",
-            "qr_reciprocate_same_shield_device": "Σχεδόν έτοιμοι! Εμφανίζεται η ίδια ασπίδα και στην άλλη συσκευή σας;",
             "qr_reciprocate_same_shield_user": "Σχεδόν έτοιμοι! Εμφανίζεται η ίδια ασπίδα και στον χρήστη %(displayName)s;",
+            "request_toast_decline_counter": "Παράβλεψη (%(counter)s)",
             "request_toast_detail": "%(deviceId)s από %(ip)s",
-            "reset_proceed_prompt": "Προχωρήστε με την επαναφορά",
             "sas_caption_self": "Επαληθεύστε αυτήν τη συσκευή επιβεβαιώνοντας ότι ο ακόλουθος αριθμός εμφανίζεται στην οθόνη της.",
             "sas_caption_user": "Επαληθεύστε αυτόν τον χρήστη επιβεβαιώνοντας ότι ο ακόλουθος αριθμός εμφανίζεται στην οθόνη του.",
             "sas_description": "Συγκρίνετε ένα μοναδικό σύνολο emoji εάν δεν έχετε κάμερα σε καμία από τις δύο συσκευές",
-            "sas_emoji_caption_self": "Επιβεβαιώστε ότι τα παρακάτω emoji εμφανίζονται και στις δύο συσκευές, με την ίδια σειρά:",
             "sas_emoji_caption_user": "Επαληθεύστε αυτόν τον χρήστη επιβεβαιώνοντας ότι τα ακόλουθα emoji εμφανίζονται στην οθόνη του.",
             "sas_match": "Ταιριάζουν",
             "sas_no_match": "Δεν ταιριάζουν",
             "sas_prompt": "Συγκρίνετε μοναδικά emoji",
             "scan_qr": "Επαλήθευση με σάρωση",
             "scan_qr_explainer": "Ζητήστε από τον χρήστη %(displayName)s να σαρώσει τον κωδικό σας:",
-            "self_verification_hint": "Για να συνεχίσετε, αποδεχτείτε το αίτημα επαλήθευσης στην άλλη συσκευή σας.",
             "start_button": "Έναρξη επαλήθευσης",
-            "successful_device": "Επαληθεύσατε με επιτυχία το %(deviceName)s %(deviceId)s!",
-            "successful_own_device": "Επαληθεύσατε με επιτυχία τη συσκευή σας!",
             "successful_user": "Επαληθεύσατε με επιτυχία τον χρήστη %(displayName)s!",
-            "timed_out": "Η επαλήθευση έληξε.",
             "unsupported_method": "Δεν είναι δυνατή η εύρεση μιας υποστηριζόμενης μεθόδου επαλήθευσης.",
+            "unverified_session_toast_accept": "Ναι, ήμουν εγώ",
             "unverified_session_toast_title": "Νέα σύνδεση. Ήσουν εσύ;",
             "unverified_sessions_toast_description": "Ελέγξτε για να βεβαιωθείτε ότι ο λογαριασμός σας είναι ασφαλής",
             "unverified_sessions_toast_reject": "Αργότερα",
-            "verification_description": "Επαληθεύστε την ταυτότητά σας για να αποκτήσετε πρόσβαση σε κρυπτογραφημένα μηνύματα και να αποδείξετε την ταυτότητά σας σε άλλους.",
+            "unverified_sessions_toast_title": "Έχετε μη επαληθευμένες συνεδρίες",
             "verification_dialog_title_device": "Επαλήθευση άλλης συσκευής",
             "verification_dialog_title_user": "Αίτημα επαλήθευσης",
             "verification_skip_warning": "Χωρίς επαλήθευση, δε θα έχετε πρόσβαση σε όλα τα μηνύματά σας και ενδέχεται να φαίνεστε ως αναξιόπιστος στους άλλους.",
@@ -835,9 +879,6 @@
             "verify_emoji_prompt": "Επαληθεύστε συγκρίνοντας μοναδικά emoji.",
             "verify_emoji_prompt_qr": "Εάν δεν μπορείτε να σαρώσετε τον παραπάνω κώδικα, επαληθεύστε το συγκρίνοντας μοναδικά emoji.",
             "verify_later": "Θα επαληθεύσω αργότερα",
-            "verify_using_device": "Επαλήθευση με άλλη συσκευή",
-            "verify_using_key": "Επαλήθευση με Κλειδί ασφαλείας",
-            "verify_using_key_or_phrase": "Επαλήθευση με Κλειδί Ασφαλείας ή Φράση Ασφαλείας",
             "waiting_for_user_accept": "Αναμονή αποδοχής από %(displayName)s…",
             "waiting_other_device": "Αναμονή για επαλήθευση στην άλλη συσκευή σας…",
             "waiting_other_device_details": "Αναμονή για επαλήθευση στην άλλη συσκευή σας, %(deviceName)s (%(deviceId)s)…",
@@ -883,6 +924,7 @@
         "unknown_error_code": "άγνωστος κωδικός σφάλματος",
         "update_power_level": "Δεν ήταν δυνατή η αλλαγή του επιπέδου δύναμης"
     },
+    "error_database_closed_title": "Το %(brand)s σταμάτησε να λειτουργεί",
     "error_dialog": {
         "copy_room_link_failed": {
             "description": "Αδυναμία αντιγραφής στο πρόχειρο του συνδέσμου δωματίου.",
@@ -891,6 +933,7 @@
         "error_loading_user_profile": "Αδυναμία φόρτωσης του προφίλ χρήστη",
         "forget_room_failed": "Δεν ήταν δυνατή η διαγραφή του δωματίου (%(errCode)s)"
     },
+    "error_user_not_logged_in": "Ο χρήστης δεν είναι συνδεδεμένος",
     "event_preview": {
         "m.call.answer": {
             "dm": "Κλήση σε εξέλιξη",
@@ -1044,7 +1087,11 @@
         "impossible_dialog_title": "Δεν επιτρέπονται πρόσθετα"
     },
     "invite": {
+        "ask_anyway_description": "Δεν είναι δυνατή η εύρεση προφίλ για τα αναγνωριστικά Matrix που αναφέρονται παρακάτω - θα θέλατε να ξεκινήσετε μία συνομιλία ούτως ή άλλως;",
+        "ask_anyway_label": "Έναρξη συνομιλίας ούτως ή άλλως",
+        "ask_anyway_never_warn_label": "Έναρξη συνομιλίας ούτως ή άλλως και μην με προειδοποιήσετε ξανά",
         "email_caption": "Πρόσκληση μέσω email",
+        "email_limit_one": "Οι προσκλήσεις μέσω email μπορούν να αποστέλλονται μόνο μία κάθε φορά",
         "email_use_default_is": "Χρησιμοποιήστε έναν διακομιστή ταυτότητας για πρόσκληση μέσω email. <default> Χρησιμοποιήστε τον προεπιλεγμένο (%(defaultIdentityServerName)s)</default> ή διαμορφώστε στις <settings>Ρυθμίσεις</settings>.",
         "email_use_is": "Χρησιμοποιήστε έναν διακομιστή ταυτότητας για πρόσκληση μέσω email. Διαχείριση στις <settings>Ρυθμίσεις</settings>.",
         "error_already_invited_room": "Ο χρήστης έχει ήδη προσκληθεί στο δωμάτιο",
@@ -1089,7 +1136,13 @@
         "unable_find_profiles_description_default": "Δεν είναι δυνατή η εύρεση προφίλ για τα αναγνωριστικά Matrix που αναφέρονται παρακάτω - θα θέλατε να τα προσκαλέσετε ούτως ή άλλως;",
         "unable_find_profiles_invite_label_default": "Πρόσκληση ούτως ή άλλως",
         "unable_find_profiles_invite_never_warn_label_default": "Προσκαλέστε ούτως ή άλλως και μην με προειδοποιήσετε ποτέ ξανά",
-        "unable_find_profiles_title": "Οι παρακάτω χρήστες ενδέχεται να μην υπάρχουν"
+        "unable_find_profiles_title": "Οι παρακάτω χρήστες ενδέχεται να μην υπάρχουν",
+        "unban_first_title": "Δεν είναι δυνατή η πρόσκληση χρήστη μέχρι να αρθεί ο αποκλεισμός του"
+    },
+    "inviting_user1_and_user2": "Πρόσκληση %(user1)s και %(user2)s",
+    "inviting_user_and_n_others": {
+        "one": "Πρόσκληση %(user)s και ενός άλλου",
+        "other": "Πρόσκληση %(user)s και %(count)s άλλων"
     },
     "items_and_n_others": {
         "one": "<Items/> και ένα ακόμα",
@@ -1166,7 +1219,6 @@
         "upload_file": "Μεταφόρτωση αρχείου"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Να επιτρέπεται μόνο η λειτουργία κοινής χρήσης οθόνης",
         "ask_to_join": "Ενεργοποίηση αίτησης συμμετοχής",
         "automatic_debug_logs": "Αυτόματη αποστολή αρχείων καταγραφής εντοπισμού σφαλμάτων για οποιοδήποτε σφάλμα",
         "automatic_debug_logs_decryption": "Αυτόματη αποστολή αρχείων καταγραφής εντοπισμού σφαλμάτων για σφάλματα αποκρυπτογράφησης",
@@ -1295,8 +1347,7 @@
         "share_type_prompt": "Τι τύπο τοποθεσίας θέλετε να μοιραστείτε;"
     },
     "member_list": {
-        "filter_placeholder": "Φιλτράρισμα μελών",
-        "power_label": "%(userName)s (δύναμη %(powerLevelNumber)s)"
+        "filter_placeholder": "Φιλτράρισμα μελών"
     },
     "member_list_back_action_label": "Μέλη δωματίου",
     "message_edit_dialog_title": "Επεξεργασίες μηνυμάτων",
@@ -1545,8 +1596,6 @@
             "room_invite": "Προσκαλέστε μόνο σε αυτό το δωμάτιο",
             "start_of_dm_history": "Αυτή είναι η αρχή του ιστορικού των άμεσων μηνυμάτων σας με <displayName/>.",
             "start_of_room": "Αυτή είναι η αρχή του <roomName/>.",
-            "topic": "Θέμα: %(topic)s ",
-            "topic_edit": "Θέμα: %(topic)s (<a>επεξεργασία</a>)",
             "unencrypted_warning": "Η κρυπτογράφηση από άκρο σε άκρο δεν είναι ενεργοποιημένη",
             "user_created": "%(displayName)s δημιούργησε αυτό το δωμάτιο.",
             "you_created": "Δημιουργήσατε αυτό το δωμάτιο."
@@ -1584,9 +1633,6 @@
         "not_found_title": "Αυτό το δωμάτιο ή ο χώρος δεν υπάρχει.",
         "not_found_title_name": "Το %(roomName)s δεν υπάρχει.",
         "peek_join_prompt": "Κάνετε προεπισκόπηση στο %(roomName)s. Θέλετε να συμμετάσχετε;",
-        "pinned_message_banner": {
-            "go_to_message": "Εμφάνιση καρφιτσωμένου μηνύματος στο χρονολόγιο."
-        },
         "rejoin_button": "Επανασύνδεση",
         "status_bar": {
             "delete_all": "Διαγραφή όλων",
@@ -1852,7 +1898,7 @@
             },
             "join_rule_upgrade_upgrading_room": "Αναβάθμιση δωματίου",
             "public_without_alias_warning": "Για να δημιουργήσετε σύνδεσμο σε αυτό το δωμάτιο, παρακαλώ προσθέστε μια διεύθυνση.",
-            "strict_encryption": "Μη στέλνετε ποτέ κρυπτογραφημένα μηνύματα σε μη επαληθευμένες συνεδρίες σε αυτό το δωμάτιο από αυτή τη συνεδρία",
+            "strict_encryption": "Αποστολή μηνυμάτων μόνο σε επαληθευμένους χρήστες.",
             "title": "Ασφάλεια & Απόρρητο"
         },
         "title": "Ρυθμίσεις Δωματίου - %(roomName)s",
@@ -1863,7 +1909,6 @@
             "error_update_guest_access": "Αποτυχία ενημέρωσης της πρόσβασης επισκέπτη σε αυτόν τον χώρο",
             "error_update_history_visibility": "Αποτυχία ενημέρωσης της ορατότητας του ιστορικού αυτού του χώρου",
             "guest_access_explainer": "Οι επισκέπτες μπορούν να εγγραφούν σε ένα χώρο χωρίς να έχουν λογαριασμό.",
-            "guest_access_explainer_public_space": "Αυτό μπορεί να είναι χρήσιμο για δημόσιους χώρους.",
             "guest_access_label": "Ενεργοποίηση πρόσβασης επισκέπτη",
             "history_visibility_anyone_space": "Προεπισκόπηση Χώρου",
             "history_visibility_anyone_space_description": "Επιτρέψτε στους χρήστες να κάνουν προεπισκόπηση του χώρου σας προτού να εγγραφούν.",
@@ -1882,7 +1927,9 @@
         "error_power_level_invalid": "Το επίπεδο δύναμης πρέπει να είναι ένας θετικός ακέραιος.",
         "error_room_not_visible": "Η αίθουσα %(roomId)s δεν είναι ορατή",
         "error_room_unknown": "Αυτό το δωμάτιο δεν αναγνωρίζεται.",
-        "error_send_request": "Δεν ήταν δυνατή η αποστολή αιτήματος."
+        "error_send_request": "Δεν ήταν δυνατή η αποστολή αιτήματος.",
+        "failed_read_event": "Αποτυχία ανάγνωσης συμβάντων",
+        "failed_send_event": "Αποτυχία αποστολής συμβάντος"
     },
     "server_offline": {
         "description": "Ο διακομιστής σας δεν ανταποκρίνεται σε ορισμένα από τα αιτήματά σας. Παρακάτω είναι μερικοί από τους πιο πιθανούς λόγους.",
@@ -2022,44 +2069,46 @@
         "insert_trailing_colon_mentions": "Εισαγάγετε άνω και κάτω τελεία μετά την αναφορά του χρήστη στην αρχή ενός μηνύματος",
         "jump_to_bottom_on_send": "Μεταβείτε στο τέλος του χρονολογίου όταν στέλνετε ένα μήνυμα",
         "key_backup": {
-            "backup_in_progress": "Δημιουργούνται αντίγραφα ασφαλείας των κλειδιών σας (το πρώτο αντίγραφο ασφαλείας μπορεί να διαρκέσει μερικά λεπτά).",
-            "backup_success": "Επιτυχία!",
-            "cannot_create_backup": "Δεν είναι δυνατή η δημιουργία αντιγράφου ασφαλείας κλειδιού",
-            "create_title": "Δημιουργία αντιγράφου ασφαλείας κλειδιού",
             "setup_secure_backup": {
+                "backup_setup_success_description": "Τώρα δημιουργούνται αντίγραφα ασφαλείας των κλειδιών σας από αυτήν τη συσκευή.",
+                "backup_setup_success_title": "Επιτυχής δημιουργία ασφαλούς αντιγράφου ασφαλείας",
                 "cancel_warning": "Εάν ακυρώσετε τώρα, ενδέχεται να χάσετε κρυπτογραφημένα μηνύματα και δεδομένα εάν χάσετε την πρόσβαση στα στοιχεία σύνδεσής σας.",
                 "confirm_security_phrase": "Επιβεβαιώστε τη Φράση Ασφαλείας σας",
                 "description": "Προστατευτείτε από την απώλεια πρόσβασης σε κρυπτογραφημένα μηνύματα και δεδομένα, δημιουργώντας αντίγραφα ασφαλείας των κλειδιών κρυπτογράφησης στον διακομιστή σας.",
+                "download_or_copy": "%(downloadButton)s ή %(copyButton)s",
+                "enter_phrase_description": "Εισαγάγετε μια φράση ασφαλείας που γνωρίζετε μόνο εσείς, καθώς χρησιμοποιείται για την προστασία των δεδομένων σας. Για να είστε ασφαλείς, δεν πρέπει να χρησιμοποιήσετε ξανά τον κωδικό πρόσβασης του λογαριασμού σας.",
                 "enter_phrase_title": "Εισαγάγετε τη Φράση Ασφαλείας",
                 "enter_phrase_to_confirm": "Εισαγάγετε τη Φράση Ασφαλείας σας για δεύτερη φορά για να την επιβεβαιώσετε.",
-                "generate_security_key_description": "Θα δημιουργήσουμε ένα κλειδί ασφαλείας για να το αποθηκεύσετε σε ασφαλές μέρος, όπως έναν διαχειριστή κωδικών πρόσβασης ή ένα χρηματοκιβώτιο.",
-                "generate_security_key_title": "Δημιουργήστε ένα κλειδί ασφαλείας",
+                "generate_security_key_description": "Θα δημιουργήσουμε ένα κλειδί ανάκτησης για να το αποθηκεύσετε σε ασφαλές μέρος, όπως έναν διαχειριστή κωδικών πρόσβασης ή ένα χρηματοκιβώτιο.",
+                "generate_security_key_title": "Δημιουργήστε ένα Κλειδί Ανάκτησης",
                 "pass_phrase_match_failed": "Αυτό δεν ταιριάζει.",
                 "pass_phrase_match_success": "Ταιριάζει!",
                 "phrase_strong_enough": "Τέλεια! Αυτή η Φράση Ασφαλείας φαίνεται αρκετά ισχυρή.",
                 "secret_storage_query_failure": "Δεν είναι δυνατή η υποβολή ερωτήματος για την κατάσταση του μυστικού χώρου αποθήκευσης",
-                "security_key_safety_reminder": "Αποθηκεύστε το Κλειδί ασφαλείας σας σε ασφαλές μέρος, όπως έναν διαχείριστη κωδικών πρόσβασης ή ένα χρηματοκιβώτιο, καθώς χρησιμοποιείται για την προστασία των κρυπτογραφημένων δεδομένων σας.",
+                "security_key_safety_reminder": "Αποθηκεύστε το Κλειδί Ανάκτησης σε ασφαλές μέρος, όπως έναν διαχειριστή κωδικών πρόσβασης ή ένα χρηματοκιβώτιο, καθώς χρησιμοποιείται για την προστασία των κρυπτογραφημένων δεδομένων σας.",
                 "set_phrase_again": "Επιστρέψτε για να το ρυθμίσετε ξανά.",
                 "settings_reminder": "Μπορείτε επίσης να ρυθμίσετε το Ασφαλές αντίγραφο ασφαλείας και να διαχειριστείτε τα κλειδιά σας στις Ρυθμίσεις.",
                 "title_confirm_phrase": "Επιβεβαίωση Φράσης Ασφαλείας",
-                "title_save_key": "Αποθηκεύστε το κλειδί ασφαλείας σας",
+                "title_save_key": "Αποθηκεύστε το Κλειδί Ανάκτησης",
                 "title_set_phrase": "Ορίστε μια Φράση Ασφαλείας",
                 "unable_to_setup": "Δεν είναι δυνατή η ρύθμιση του μυστικού χώρου αποθήκευσης",
                 "use_different_passphrase": "Να χρησιμοποιηθεί διαφορετική φράση;",
-                "use_phrase_only_you_know": "Χρησιμοποιήστε μια μυστική φράση που γνωρίζετε μόνο εσείς και προαιρετικά αποθηκεύστε ένα κλειδί ασφαλείας για να το χρησιμοποιήσετε για τη δημιουργία αντιγράφων ασφαλείας."
+                "use_phrase_only_you_know": "Χρησιμοποιήστε μια μυστική φράση που γνωρίζετε μόνο εσείς και, προαιρετικά, αποθηκεύστε ένα Κλειδί Ανάκτησης για να το χρησιμοποιήσετε ως αντίγραφο ασφαλείας."
             }
         },
         "key_export_import": {
             "confirm_passphrase": "Επιβεβαίωση συνθηματικού",
             "enter_passphrase": "Εισαγωγή συνθηματικού",
             "export_description_1": "Αυτή η διαδικασία σας επιτρέπει να εξαγάγετε τα κλειδιά για τα μηνύματα που έχετε λάβει σε κρυπτογραφημένα δωμάτια σε ένα τοπικό αρχείο. Στη συνέχεια, θα μπορέσετε να εισάγετε το αρχείο σε άλλο πρόγραμμα του Matrix, έτσι ώστε το πρόγραμμα να είναι σε θέση να αποκρυπτογραφήσει αυτά τα μηνύματα.",
+            "export_description_2": "Το εξαγόμενο αρχείο θα επιτρέψει σε οποιονδήποτε μπορεί να το διαβάσει να αποκρυπτογραφήσει τυχόν κρυπτογραφημένα μηνύματα που μπορείτε να δείτε, οπότε θα πρέπει να είστε προσεκτικοί για να το διατηρήσετε ασφαλές. Για να βοηθήσετε σε αυτό, θα πρέπει να εισαγάγετε μια μοναδική φράση πρόσβασης παρακάτω, η οποία θα χρησιμοποιηθεί μόνο για την κρυπτογράφηση των εξαγόμενων δεδομένων. Η εισαγωγή των δεδομένων θα είναι δυνατή μόνο χρησιμοποιώντας την ίδια φράση πρόσβασης.",
             "export_title": "Εξαγωγή κλειδιών δωματίου",
             "file_to_import": "Αρχείο για εισαγωγή",
             "import_description_1": "Αυτή η διαδικασία σας επιτρέπει να εισαγάγετε κλειδιά κρυπτογράφησης που έχετε προηγουμένως εξάγει από άλλο πρόγραμμα του Matrix. Στη συνέχεια, θα μπορέσετε να αποκρυπτογραφήσετε τυχόν μηνύματα που το άλλο πρόγραμμα θα μπορούσε να αποκρυπτογραφήσει.",
             "import_description_2": "Το αρχείο εξαγωγής θα είναι προστατευμένο με συνθηματικό. Θα χρειαστεί να πληκτρολογήσετε το συνθηματικό εδώ για να αποκρυπτογραφήσετε το αρχείο.",
             "import_title": "Εισαγωγή κλειδιών δωματίου",
             "phrase_cannot_be_empty": "Το συνθηματικό δεν πρέπει να είναι κενό",
-            "phrase_must_match": "Δεν ταιριάζουν τα συνθηματικά"
+            "phrase_must_match": "Δεν ταιριάζουν τα συνθηματικά",
+            "phrase_strong_enough": "Υπέροχα! Αυτή η φράση πρόσβασης φαίνεται αρκετά ισχυρή"
         },
         "keyboard": {
             "title": "Πληκτρολόγιο"
@@ -2147,6 +2196,7 @@
         "prompt_invite": "Ερώτηση πριν από την αποστολή προσκλήσεων σε δυνητικά μη έγκυρα αναγνωριστικά matrix",
         "replace_plain_emoji": "Αυτόματη αντικατάσταση απλού κειμένου Emoji",
         "security": {
+            "analytics_description": "Μοιραστείτε ανώνυμα δεδομένα για να μας βοηθήσετε να εντοπίσουμε προβλήματα. Τίποτα προσωπικό. Χωρίς τρίτους.",
             "bulk_options_accept_all_invites": "Αποδεχτείτε όλες τις %(invitedRooms)sπροσκλήσεις",
             "bulk_options_reject_all_invites": "Απόρριψη όλων των προσκλήσεων %(invitedRooms)s",
             "bulk_options_section": "Μαζικές επιλογές",
@@ -2156,7 +2206,6 @@
             "ignore_users_empty": "Δεν έχετε χρήστες που έχετε αγνοήσει.",
             "ignore_users_section": "Χρήστες που αγνοήθηκαν",
             "key_backup_algorithm": "Αλγόριθμος:",
-            "key_backup_connect": "Συνδέστε αυτήν την συνεδρία με το αντίγραφο ασφαλείας κλειδιού",
             "message_search_disable_warning": "Εάν απενεργοποιηθεί, τα μηνύματα από κρυπτογραφημένα δωμάτια δε θα εμφανίζονται στα αποτελέσματα αναζήτησης.",
             "message_search_disabled": "Αποθηκεύστε με ασφάλεια κρυπτογραφημένα μηνύματα τοπικά για να εμφανίζονται στα αποτελέσματα αναζήτησης.",
             "message_search_enabled": {
@@ -2177,12 +2226,14 @@
             "message_search_unsupported_web": "Το %(brand)s δεν μπορεί να αποθηκεύσει με ασφάλεια κρυπτογραφημένα μηνύματα τοπικά ενώ εκτελείται σε πρόγραμμα περιήγησης ιστού. Χρησιμοποιήστε την <desktopLink>%(brand)s Επιφάνεια εργασίας</desktopLink> για να εμφανίζονται κρυπτογραφημένα μηνύματα στα αποτελέσματα αναζήτησης.",
             "record_session_details": "Κατέγραψε το όνομα του πελάτη, την έκδοση και τη διεύθυνση URL για να αναγνωρίζεις τις συνεδρίες πιο εύκολα στον διαχειριστή συνεδρίας",
             "send_analytics": "Αποστολή δεδομένων αναλυτικών στοιχείων",
-            "strict_encryption": "Μη στέλνετε ποτέ κρυπτογραφημένα μηνύματα σε μη επαληθευμένες συνεδρίες από αυτήν τη συνεδρία"
+            "strict_encryption": "Αποστολή μηνυμάτων μόνο σε επαληθευμένους χρήστες"
         },
         "send_read_receipts": "Αποστολή αποδείξεων ανάγνωσης",
         "send_read_receipts_unsupported": "Ο διακομιστής σου δεν υποστηρίζει την απενεργοποίηση αποστολής αποδείξεων ανάγνωσης.",
         "send_typing_notifications": "Αποστολή ειδοποιήσεων πληκτρολόγησης",
         "sessions": {
+            "best_security_note": "Για τη βέλτιστη ασφάλεια, επαληθεύστε τις συνεδρίες σας και αποσυνδεθείτε από οποιαδήποτε συνεδρία που δεν αναγνωρίζετε ή χρησιμοποιείτε πλέον.",
+            "browser": "Πρόγραμμα περιήγησης",
             "confirm_sign_out": {
                 "one": "Επιβεβαιώστε την αποσύνδεση αυτής της συσκευής",
                 "other": "Επιβεβαιώστε την αποσύνδεση αυτών των συσκευών"
@@ -2199,8 +2250,83 @@
                 "one": "Επιβεβαιώστε ότι αποσυνδέεστε από αυτήν τη συσκευή χρησιμοποιώντας Single Sign On για να αποδείξετε την ταυτότητά σας.",
                 "other": "Επιβεβαιώστε την αποσύνδεση από αυτές τις συσκευές χρησιμοποιώντας Single Sign On για να αποδείξετε την ταυτότητά σας."
             },
+            "current_session": "Τρέχουσα συνεδρία",
+            "desktop_session": "Συνεδρία εφαρμογής υπολογιστή",
+            "details_heading": "Λεπτομέρειες συνεδρίας",
+            "device_unverified_description": "Επαληθεύστε ή αποσυνδεθείτε από αυτήν τη συνεδρία για βέλτιστη ασφάλεια και αξιοπιστία.",
+            "device_unverified_description_current": "Επαληθεύστε την τρέχουσα συνεδρία σας για βελτιωμένα ασφαλή μηνύματα.",
+            "device_verified_description": "Αυτή η συνεδρία είναι έτοιμη για ασφαλή ανταλλαγή μηνυμάτων.",
+            "device_verified_description_current": "Η τρέχουσα συνεδρία σας είναι έτοιμη για ασφαλή ανταλλαγή μηνυμάτων.",
+            "error_pusher_state": "Αποτυχία ορισμού κατάστασης pusher",
+            "error_set_name": "Αποτυχία ορισμού ονόματος συνεδρίας",
+            "filter_all": "Όλα",
+            "filter_inactive": "Ανενεργό",
+            "filter_inactive_description": "Ανενεργό για%(inactiveAgeDays)s ημέρες ή και περισσότερο",
+            "filter_label": "Φιλτράρισμα συσκευών",
+            "filter_unverified_description": "Δεν είναι έτοιμο για ασφαλή ανταλλαγή μηνυμάτων",
+            "filter_verified_description": "Έτοιμο για ασφαλή ανταλλαγή μηνυμάτων",
+            "hide_details": "Απόκρυψη λεπτομερειών",
+            "inactive_days": "Ανενεργό για %(inactiveAgeDays)s+ ημέρες",
+            "inactive_sessions": "Ανενεργές συνεδρίες",
+            "inactive_sessions_explainer_1": "Οι ανενεργές συνεδρίες είναι συνεδρίες που δεν έχετε χρησιμοποιήσει για κάποιο χρονικό διάστημα, αλλά συνεχίζουν να λαμβάνουν κλειδιά κρυπτογράφησης.",
+            "inactive_sessions_explainer_2": "Η αφαίρεση ανενεργών συνεδριών βελτιώνει την ασφάλεια και την απόδοση και σας διευκολύνει να εντοπίσετε αν μια νέα συνεδρία είναι ύποπτη.",
+            "inactive_sessions_list_description": "Εξετάστε το ενδεχόμενο να αποσυνδεθείτε από παλιές συνεδρίες (%(inactiveAgeDays)s ημέρες ή παλαιότερες) που δεν χρησιμοποιείτε πλέον.",
+            "ip": "Διεύθυνση IP",
+            "last_activity": "Τελευταία δραστηριότητα",
+            "mobile_session": "Συνεδρία κινητού",
+            "n_sessions_selected": {
+                "one": "%(count)s επιλεγμένη συνεδρία",
+                "other": "%(count)s επιλεγμένες συνεδρίες"
+            },
+            "no_inactive_sessions": "Δεν βρέθηκαν ανενεργές συνεδρίες.",
+            "no_sessions": "Δεν βρέθηκαν συνεδρίες.",
+            "no_unverified_sessions": "Δεν βρέθηκαν μη επαληθευμένες συνεδρίες.",
+            "no_verified_sessions": "Δεν βρέθηκαν επαληθευμένες συνεδρίες.",
+            "os": "Λειτουργικό σύστημα",
+            "other_sessions_heading": "Άλλες συνεδρίες",
+            "push_heading": "Ειδοποιήσεις push",
+            "push_subheading": "Λάβετε ειδοποιήσεις push σε αυτήν τη συνεδρία.",
+            "push_toggle": "Ενεργοποίηση/απενεργοποίηση ειδοποιήσεων push σε αυτήν τη συνεδρία.",
+            "rename_form_caption": "Λάβετε υπόψη ότι τα ονόματα των συνεδριών είναι επίσης ορατά στα άτομα με τα οποία επικοινωνείτε.",
+            "rename_form_heading": "Μετονομασία συνεδρίας",
+            "rename_form_learn_more": "Μετονομασία συνεδριών",
+            "rename_form_learn_more_description_1": "Άλλοι χρήστες σε απευθείας μηνύματα και αίθουσες στις οποίες συμμετέχετε μπορούν να δουν μια πλήρη λίστα των συνεδριών σας.",
+            "rename_form_learn_more_description_2": "Αυτό τους παρέχει την εμπιστοσύνη ότι πραγματικά μιλούν με εσάς, αλλά σημαίνει επίσης ότι μπορούν να δουν το όνομα της συνεδρίας που εισάγετε εδώ.",
+            "security_recommendations": "Συστάσεις ασφαλείας",
+            "security_recommendations_description": "Βελτιώστε την ασφάλεια του λογαριασμού σας ακολουθώντας αυτές τις συστάσεις.",
             "session_id": "Αναγνωριστικό συνεδρίας",
-            "verify_session": "Επαλήθευση συνεδρίας"
+            "show_details": "Εμφάνιση λεπτομερειών",
+            "sign_in_with_qr": "Σύνδεση νέας συσκευής",
+            "sign_in_with_qr_button": "Εμφάνιση κωδικού QR",
+            "sign_in_with_qr_description": "Χρησιμοποιήστε έναν κωδικό QR για να συνδεθείτε σε άλλη συσκευή και να ρυθμίσετε την ασφαλή ανταλλαγή μηνυμάτων.",
+            "sign_out": "Αποσυνδεθείτε από αυτήν τη συνεδρία",
+            "sign_out_all_other_sessions": "Αποσύνδεση από όλες τις άλλες συνεδρίες (%(otherSessionsCount)s)",
+            "sign_out_confirm_description": {
+                "one": "Είστε βέβαιοι ότι θέλετε να αποσυνδεθείτε από τη %(count)s συνεδρία;",
+                "other": "Είστε βέβαιοι ότι θέλετε να αποσυνδεθείτε από τις %(count)s συνεδρίες;"
+            },
+            "sign_out_n_sessions": {
+                "one": "Αποσύνδεση από %(count)s συνεδρία",
+                "other": "Αποσύνδεση από %(count)s συνεδρίες"
+            },
+            "title": "Συνεδρίες",
+            "unknown_session": "Άγνωστος τύπος συνεδρίας",
+            "unverified_session": "Μη επαληθευμένη συνεδρία",
+            "unverified_session_explainer_1": "Αυτή η συνεδρία δεν υποστηρίζει κρυπτογράφηση και συνεπώς δεν μπορεί να επαληθευτεί.",
+            "unverified_session_explainer_2": "Δεν θα μπορείτε να συμμετάσχετε σε αίθουσες όπου είναι ενεργοποιημένη η κρυπτογράφηση κατά τη χρήση αυτής της συνεδρίας.",
+            "unverified_session_explainer_3": "Για καλύτερη ασφάλεια και ιδιωτικότητα, συνιστάται να χρησιμοποιείτε εφαρμογές Matrix που υποστηρίζουν κρυπτογράφηση.",
+            "unverified_sessions": "Μη επαληθευμένες συνεδρίες",
+            "unverified_sessions_explainer_1": "Οι μη επαληθευμένες συνεδρίες είναι συνεδρίες στις οποίες έχετε συνδεθεί με τα διαπιστευτήριά σας, αλλά δεν έχουν επαληθευτεί.",
+            "unverified_sessions_explainer_2": "Θα πρέπει να βεβαιωθείτε ιδιαίτερα ότι αναγνωρίζετε αυτές τις συνεδρίες, καθώς ενδέχεται να αποτελούν μη εξουσιοδοτημένη χρήση του λογαριασμού σας.",
+            "unverified_sessions_list_description": "Επαληθεύστε τις συνεδρίες σας για βελτιωμένα ασφαλή μηνύματα ή αποσυνδεθείτε από αυτές που δεν αναγνωρίζετε ή χρησιμοποιείτε πλέον.",
+            "url": "URL",
+            "verified_session": "Επαληθευμένη συνεδρία",
+            "verified_sessions": "Επαληθευμένες συνεδρίες",
+            "verified_sessions_explainer_1": "Οι επαληθευμένες συνεδρίες είναι οπουδήποτε χρησιμοποιείτε αυτόν τον λογαριασμό αφού εισαγάγετε τη φράση πρόσβασής σας ή επιβεβαιώσετε την ταυτότητά σας με άλλη επαληθευμένη συνεδρία.",
+            "verified_sessions_explainer_2": "Αυτό σημαίνει ότι έχετε όλα τα κλειδιά που απαιτούνται για να ξεκλειδώσετε τα κρυπτογραφημένα μηνύματά σας και να επιβεβαιώσετε σε άλλους χρήστες ότι εμπιστεύεστε αυτήν τη συνεδρία.",
+            "verified_sessions_list_description": "Για βέλτιστη ασφάλεια, αποσυνδεθείτε από οποιαδήποτε συνεδρία που δεν αναγνωρίζετε ή χρησιμοποιείτε πλέον.",
+            "verify_session": "Επαλήθευση συνεδρίας",
+            "web_session": "Συνεδρία web"
         },
         "show_avatar_changes": "Εμφάνιση αλλαγών εικόνας προφίλ",
         "show_breadcrumbs": "Εμφάνιση συντομεύσεων σε δωμάτια που προβλήθηκαν πρόσφατα πάνω από τη λίστα δωματίων",
@@ -2221,9 +2347,9 @@
             "metaspaces_orphans_description": "Ομαδοποιήστε σε ένα μέρος όλα τα δωμάτιά σας που δεν αποτελούν μέρος ενός χώρου.",
             "metaspaces_people_description": "Ομαδοποιήστε όλα τα άτομα σας σε ένα μέρος.",
             "metaspaces_subsection": "Χώροι για εμφάνιση",
+            "spaces_explainer": "Οι χώροι είναι τρόποι ομαδοποίησης αιθουσών και ανθρώπων. Παράλληλα με τους χώρους στους οποίους βρίσκεστε, μπορείτε να χρησιμοποιήσετε και κάποιους προκατασκευασμένους χώρους.",
             "title": "Πλαϊνή μπάρα"
         },
-        "start_automatically": "Αυτόματη έναρξη μετά τη σύνδεση",
         "use_12_hour_format": "Εμφάνιση χρονικών σημάνσεων σε 12ωρη μορφή ώρας (π.χ. 2:30 μ.μ.)",
         "use_command_enter_send_message": "Χρησιμοποιήστε Command + Enter για να στείλετε ένα μήνυμα",
         "use_command_f_search": "Χρησιμοποιήστε τα πλήκτρα Command + F για αναζήτηση στο χρονολόγιο",
@@ -2251,7 +2377,8 @@
             "voice_processing": "Επεξεργασία φωνής",
             "voice_section": "Ρυθμίσεις φωνής"
         },
-        "warn_quit": "Προειδοποιήστε πριν την παραίτηση"
+        "warn_quit": "Προειδοποιήστε πριν την παραίτηση",
+        "warning": "<w>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</w> <description/>"
     },
     "share": {
         "permalink_message": "Σύνδεσμος στο επιλεγμένο μήνυμα",
@@ -2262,6 +2389,7 @@
     },
     "slash_command": {
         "addwidget": "Προσθέτει ένα προσαρμοσμένο widget μέσω URL στο δωμάτιο",
+        "addwidget_iframe_missing_src": "Το iframe δεν έχει χαρακτηριστικό src",
         "addwidget_invalid_protocol": "Παρακαλώ εισάγετε ένα widget URL με https:// ή http://",
         "addwidget_missing_url": "Παρακαλώ εισάγετε ένα widget URL ή ενσωματώστε κώδικα",
         "addwidget_no_permissions": "Δεν μπορείτε να τροποποιήσετε μικροεφαρμογές σε αυτό το δωμάτιο.",
@@ -2275,10 +2403,12 @@
         "command_error": "Σφάλμα εντολής",
         "converttodm": "Μετατρέπει το δωμάτιο σε προσωπική συνομιλία",
         "converttoroom": "Μετατρέπει την προσωπική συνομιλία σε δωμάτιο",
+        "could_not_find_room": "Δεν ήταν δυνατή η εύρεση αίθουσας",
         "deop": "Deop χρήστη με το συγκεκριμένο αναγνωριστικό",
         "devtools": "Ανοίγει το παράθυρο Εργαλείων για Προγραμματιστές",
         "discardsession": "Επιβάλλει την τρέχουσα εξερχόμενη ομαδική συνεδρία σε κρυπτογραφημένο δωμάτιο για απόρριψη",
         "error_invalid_rendering_type": "Σφάλμα εντολής: Δεν είναι δυνατή η εύρεση του τύπου απόδοσης (%(renderingType)s)",
+        "error_invalid_room": "Η εντολή απέτυχε: Δεν ήταν δυνατή η εύρεση αίθουσας (%(roomId)s)",
         "error_invalid_runfn": "Σφάλμα εντολής: Δεν είναι δυνατή η χρήση της εντολής slash.",
         "help": "Εμφανίζει τη λίστα εντολών με τρόπους χρήσης και περιγραφές",
         "help_dialog_title": "Βοήθεια Εντολών",
@@ -2291,6 +2421,7 @@
         "invite_3pid_needs_is_error": "Χρησιμοποιήστε έναν διακομιστή ταυτοτήτων για να προσκαλέσετε μέσω email. Μπορείτε να κάνετε διαχείριση στις Ρυθμίσεις.",
         "invite_3pid_use_default_is_title": "Χρησιμοποιήστε ένα διακομιστή ταυτοτήτων",
         "invite_3pid_use_default_is_title_description": "Χρησιμοποιήστε έναν διακομιστή ταυτοτήτων για να προσκαλέσετε μέσω email. Πατήστε συνέχεια για να χρησιμοποιήσετε τον προεπιλεγμένο διακομιστή ταυτοτήτων (%(defaultIdentityServerName)s) ή μπείτε στην διαχείριση στις Ρυθμίσεις.",
+        "invite_failed": "Ο χρήστης (%(user)s) δεν προσκλήθηκε στο %(roomId)s, αλλά δεν δόθηκε σφάλμα από το βοηθητικό πρόγραμμα πρόσκλησης.",
         "join": "Σύνδεση στην αίθουσα με την δοθείσα διεύθυνση",
         "jumptodate": "Μεταβείτε στη δεδομένη ημερομηνία στο χρονολόγιο",
         "jumptodate_invalid_input": "Αδυναμία κατανόησης της δοθείσας ημερομηνίας (%(inputDate)s). Προσπαθήστε να χρησιμοποιήσετε την μορφή YYYY-MM-DD.",
@@ -2335,6 +2466,8 @@
         "upgraderoom": "Αναβαθμίζει το δωμάτιο σε μια καινούργια έκδοση",
         "upgraderoom_permission_error": "Δεν διαθέτετε τις απαιτούμενες άδειες για να χρησιμοποιήσετε αυτήν την εντολή.",
         "usage": "Χρήση",
+        "verify": "Επαληθεύστε χειροκίνητα μια από τις δικές σας συσκευές",
+        "view": "Προβάλει την αίθουσα με την δεδομένη διεύθυνση",
         "whois": "Εμφανίζει πληροφορίες για έναν χρήστη"
     },
     "space": {
@@ -2930,6 +3063,8 @@
     "truncated_list_n_more": {
         "other": "Και %(count)s ακόμα..."
     },
+    "unsupported_server_description": "Αυτός ο διακομιστής χρησιμοποιεί μια παλαιότερη έκδοση του Matrix. Αναβαθμίστε σε Matrix %(version)s στο Matrix για να χρησιμοποιήσετε το %(brand)s χωρίς σφάλματα.",
+    "unsupported_server_title": "Ο διακομιστής σας δεν υποστηρίζεται",
     "update": {
         "changelog": "Αλλαγές",
         "check_action": "Έλεγχος για ενημέρωση",
@@ -3042,6 +3177,7 @@
         "call_held": "%(peerName)s έβαλε την κλήση σε αναμονή",
         "call_held_resume": "Έχετε βάλει την κλήση σε αναμονή <a>Επαναφορά</a>",
         "call_held_switch": "Έχετε βάλει την κλήση σε αναμονή <a>Switch</a>",
+        "call_toast_unknown_room": "Άγνωστη αίθουσα",
         "camera_disabled": "Η κάμερά σας είναι απενεργοποιημένη",
         "camera_enabled": "Η κάμερά σας είναι ακόμα ενεργοποιημένη",
         "cannot_call_yourself_description": "Δεν μπορείτε να καλέσετε τον εαυτό σας.",
@@ -3054,19 +3190,29 @@
         "dialpad": "Πληκτρολόγιο κλήσης",
         "disable_camera": "Απενεργοποίηση κάμερας",
         "disable_microphone": "Σίγαση μικροφώνου",
+        "disabled_no_perms_start_video_call": "Δεν έχετε δικαίωμα έναρξης βιντεοκλήσεων",
+        "disabled_no_perms_start_voice_call": "Δεν έχετε δικαίωμα έναρξης φωνητικών κλήσεων",
+        "disabled_ongoing_call": "Κλήση σε εξέλιξη",
         "enable_camera": "Ενεργοποίηση κάμερας",
         "enable_microphone": "Κατάργηση σίγασης μικροφώνου",
         "expand": "Επιστροφή στην κλήση",
         "hangup": "Κλείσιμο",
         "hide_sidebar_button": "Απόκρυψη πλαϊνής μπάρας",
         "input_devices": "Συσκευές εισόδου",
+        "join_button_tooltip_call_full": "Λυπούμαστε — αυτή η κλήση είναι πλήρης αυτήν τη στιγμή",
         "maximise": "Γέμισμα οθόνης",
         "misconfigured_server": "Η κλήση απέτυχε λόγω της λανθασμένης διάρθρωσης του διακομιστή",
         "misconfigured_server_description": "Παρακαλείστε να ρωτήσετε τον διαχειριστή του κεντρικού διακομιστή σας (<code>%(homeserverDomain)s</code>) να ρυθμίσουν έναν διακομιστή πρωτοκόλλου TURN ώστε οι κλήσεις να λειτουργούν απρόσκοπτα.",
+        "misconfigured_server_fallback": "Εναλλακτικά, μπορείτε να δοκιμάσετε να χρησιμοποιήσετε τον δημόσιο διακομιστή στη διεύθυνση <server/> , αλλά αυτό δεν θα είναι τόσο αξιόπιστο και θα κοινοποιήσει τη διεύθυνση IP σας σε αυτόν τον διακομιστή. Μπορείτε επίσης να το διαχειριστείτε αυτό στις Ρυθμίσεις.",
+        "misconfigured_server_fallback_accept": "Δοκιμάστε να χρησιμοποιήσετε το %(server)s",
         "more_button": "Περισσότερα",
         "msisdn_lookup_failed": "Αδυναμία αναζήτησης αριθμού τηλεφώνου",
         "msisdn_lookup_failed_description": "Υπήρξε ένα σφάλμα κατά την αναζήτηση αριθμού τηλεφώνου",
         "msisdn_transfer_failed": "Αδυναμία μεταφοράς κλήσης",
+        "n_people_joined": {
+            "one": "%(count)s άτομο εντάχθηκε",
+            "other": "%(count)s άτομα εντάχθηκαν"
+        },
         "no_audio_input_description": "Δε βρέθηκε μικρόφωνο στη συσκευή σας. Παρακαλώ ελέγξτε τις ρυθμίσεις σας και δοκιμάστε ξανά.",
         "no_audio_input_title": "Δε βρέθηκε μικρόφωνο",
         "no_media_perms_description": "Μπορεί να χρειαστεί να ορίσετε χειροκίνητα την πρόσβαση του %(brand)s στο μικρόφωνο/κάμερα",
@@ -3196,10 +3342,12 @@
         "error_loading": "Σφάλμα φόρτωσης Μικροεφαρμογής",
         "error_mixed_content": "Σφάλμα - Μικτό περιεχόμενο",
         "error_need_invite_permission": "Για να το κάνετε αυτό πρέπει να έχετε τη δυνατότητα να προσκαλέσετε χρήστες.",
+        "error_need_kick_permission": "Πρέπει να έχετε τη δυνατότητα να διώξετε χρήστες για να το κάνετε αυτό.",
         "error_need_to_be_logged_in": "Πρέπει να είστε συνδεδεμένος.",
         "error_unable_start_audio_stream_description": "Δεν είναι δυνατή η έναρξη ροής ήχου.",
         "error_unable_start_audio_stream_title": "Η έναρξη της ζωντανής ροής απέτυχε",
-        "modal_data_warning": "Τα δεδομένα σε αυτήν την οθόνη μοιράζονται με το %(widgetDomain)s",
+        "modal_data_warning": "Τα παρακάτω δεδομένα μοιράζονται με %(widgetDomain)s",
+        "modal_title_default": "Modal Widget",
         "no_name": "Άγνωστη εφαρμογή",
         "open_id_permissions_dialog": {
             "remember_selection": "Να το θυμάσαι αυτό",
@@ -3207,15 +3355,20 @@
             "title": "Επιτρέψτε σε αυτήν τη μικροεφαρμογή να επαληθεύσει την ταυτότητά σας"
         },
         "popout": "Αναδυόμενη μικροεφαρμογή",
-        "set_room_layout": "Ορίστε τη διάταξη του δωματίου μου για όλους",
+        "set_room_layout": "Ορισμός διάταξης για όλους",
+        "shared_data_avatar": "URL της εικόνας προφίλ σας",
+        "shared_data_device_id": "Το αναγνωριστικό της συσκευής σας",
+        "shared_data_lang": "Η γλώσσα σας",
         "shared_data_mxid": "Το αναγνωριστικό (ID) χρήστη σας",
         "shared_data_name": "Το εμφανιζόμενο όνομά σας",
         "shared_data_room_id": "ID Δωματίου",
         "shared_data_theme": "Το θέμα εμφάνισης",
+        "shared_data_url": "%(brand)s URL",
         "shared_data_warning": "Η χρήση αυτής της μικροεφαρμογής ενδέχεται να μοιράζεται δεδομένα <helpIcon /> με %(widgetDomain)s.",
         "shared_data_warning_im": "Η χρήση αυτής της μικροεφαρμογής μπορεί να μοιραστεί δεδομένα <helpIcon /> με το %(widgetDomain)s και τον διαχειριστή πρόσθετων.",
         "shared_data_widget_id": "Ταυτότητα μικροεφαρμογής",
         "unencrypted_warning": "Οι μικροεοεφαρμογές δε χρησιμοποιούν κρυπτογράφηση μηνυμάτων.",
+        "unmaximise": "Απο-μεγιστοποίηση",
         "unpin_to_view_right_panel": "Ξεκαρφιτσώστε αυτήν τη μικροεφαρμογή για να την προβάλετε σε αυτόν τον πίνακα"
     },
     "zxcvbn": {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2a61785608..fc04673dd5 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -98,7 +98,7 @@
         "maximise": "Maximise",
         "mention": "Mention",
         "minimise": "Minimise",
-        "new_message": "New message",
+        "new_conversation": "New conversation",
         "new_room": "New room",
         "new_video_room": "New video room",
         "next": "Next",
@@ -245,8 +245,7 @@
             "setup_key_backup_title": "You'll lose access to your encrypted messages",
             "setup_secure_backup_description_1": "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.",
             "setup_secure_backup_description_2": "When you sign out, these keys will be deleted from this device, which means you won't be able to read encrypted messages unless you have the keys for them on your other devices, or backed them up to the server.",
-            "skip_key_backup": "I don't want my encrypted messages",
-            "use_key_backup": "Start using Key Backup"
+            "skip_key_backup": "I don't want my encrypted messages"
         },
         "misconfigured_body": "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.",
         "misconfigured_title": "Your %(brand)s is misconfigured",
@@ -586,6 +585,7 @@
         "someone": "Someone",
         "space": "Space",
         "spaces": "Spaces",
+        "state_encryption_enabled": "Experimental state encryption enabled",
         "sticker": "Sticker",
         "stickerpack": "Stickerpack",
         "success": "Success",
@@ -606,12 +606,12 @@
         "user": "User",
         "user_avatar": "Profile picture",
         "username": "Username",
-        "verification_cancelled": "Verification cancelled",
         "verified": "Verified",
         "version": "Version",
         "video": "Video",
         "video_room": "Video room",
         "view_message": "View message",
+        "voice": "Voice",
         "warning": "Warning"
     },
     "composer": {
@@ -652,16 +652,17 @@
         "mode_plain": "Hide formatting",
         "mode_rich_text": "Show formatting",
         "no_perms_notice": "You do not have permission to post to this room",
-        "placeholder": "Send a message…",
-        "placeholder_encrypted": "Send an encrypted message…",
-        "placeholder_reply": "Send a reply…",
-        "placeholder_reply_encrypted": "Send an encrypted reply…",
-        "placeholder_thread": "Reply to thread…",
-        "placeholder_thread_encrypted": "Reply to encrypted thread…",
+        "placeholder": "Send an unencrypted message…",
+        "placeholder_encrypted": "Send a message…",
+        "placeholder_reply": "Send an unencrypted reply…",
+        "placeholder_reply_encrypted": "Send a reply…",
+        "placeholder_thread": "Reply to unencrypted thread…",
+        "placeholder_thread_encrypted": "Reply to thread…",
         "poll_button": "Poll",
         "poll_button_no_perms_description": "You do not have permission to start polls in this room.",
         "poll_button_no_perms_title": "Permission Required",
         "replying_title": "Replying",
+        "room_unencrypted": "Messages in this room are not end-to-end encrypted",
         "room_upgraded_link": "The conversation continues here.",
         "room_upgraded_notice": "This room has been replaced and is no longer active.",
         "send_button_title": "Send message",
@@ -692,6 +693,8 @@
         "join_rule_restricted_label": "Everyone in <SpaceName/> will be able to find and join this room.",
         "name_validation_required": "Please enter a name for the room",
         "room_visibility_label": "Room visibility",
+        "state_encrypted_warning": "Enables experimental support for encrypting state events, which hides metadata such as room names and topics from the server. This metadata will also be hidden from people joining rooms later, and people whose clients do not support MSC4362.",
+        "state_encryption_label": "Encrypt state events",
         "title_private_room": "Create a private room",
         "title_public_room": "Create a public room",
         "title_video_room": "Create a video room",
@@ -725,6 +728,7 @@
         "personal_space_description": "A private space to organise your rooms",
         "private_description": "Invite only, best for yourself or teams",
         "private_heading": "Your private space",
+        "private_only_heading": "Your space",
         "private_personal_description": "Make sure the right people have access to %(name)s",
         "private_personal_heading": "Who are you working with?",
         "private_space": "Me and my teammates",
@@ -792,6 +796,7 @@
             "cross_signing_status": "Cross-signing status:",
             "cross_signing_untrusted": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.",
             "crypto_not_available": "Cryptographic module is not available",
+            "device_id": "Device ID",
             "key_backup_active_version": "Active backup version:",
             "key_backup_active_version_none": "None",
             "key_backup_inactive_warning": "Your keys are not being backed up from this session.",
@@ -804,11 +809,24 @@
             "secret_storage_ready": "ready",
             "secret_storage_status": "Secret storage:",
             "self_signing_private_key_cached_status": "Self signing private key:",
+            "session": "Session",
+            "session_fingerprint": "Fingerprint (session key)",
             "title": "End-to-end encryption",
             "user_signing_private_key_cached_status": "User signing private key:"
         },
         "developer_mode": "Developer mode",
         "developer_tools": "Developer Tools",
+        "device_dehydrated_no": "Dehydrated: No",
+        "device_dehydrated_yes": "Dehydrated: Yes",
+        "device_id": "Device ID: %(deviceId)s",
+        "device_keys": "Device keys",
+        "device_verification_status": {
+            "signed_by_owner": "Verification status: <E2EIcon /> Signed by owner",
+            "unknown": "Verification status: Unknown",
+            "unverified": "Verification status: <E2EIcon /> Not signed by owner",
+            "verified": "Verification status: <E2EIcon /> Verified by cross-signing"
+        },
+        "devices": "Cryptographic devices (%(count)s)",
         "edit_setting": "Edit setting",
         "edit_values": "Edit values",
         "empty_string": "<empty string>",
@@ -824,16 +842,20 @@
         "failed_to_save": "Failed to save settings.",
         "failed_to_send": "Failed to send event!",
         "id": "ID: ",
+        "invalid_device_key_id": "Invalid device key ID",
         "invalid_json": "Doesn't look like valid JSON.",
         "level": "Level",
         "low_bandwidth_mode": "Low bandwidth mode",
         "low_bandwidth_mode_description": "Requires compatible homeserver.",
         "main_timeline": "Main timeline",
+        "manual_device_verification": "Manual device verification",
         "no_receipt_found": "No receipt found",
         "notification_state": "Notification state is <strong>%(notificationState)s</strong>",
         "notifications_debug": "Notifications debug",
         "number_of_users": "Number of users",
+        "only_joined_members": "Only joined users",
         "original_event_source": "Original event source",
+        "restore_from_backup": "Restore from backup",
         "room_encrypted": "Room is <strong>encrypted ✅</strong>",
         "room_id": "Room ID: %(roomId)s",
         "room_not_encrypted": "Room is <strong>not encrypted 🚨</strong>",
@@ -866,6 +888,7 @@
             "elementCallUrl": "Element Call URL"
         },
         "settings_explorer": "Settings explorer",
+        "show_empty_content_events": "Show events with empty content",
         "show_hidden_events": "Show hidden events in timeline",
         "spaces": {
             "one": "<space>",
@@ -878,10 +901,23 @@
         "toggle_event": "toggle event",
         "toolbox": "Toolbox",
         "use_at_own_risk": "This UI does NOT check the types of the values. Use at your own risk.",
+        "user_avatar": "Avatar: %(avatar)s",
+        "user_displayname": "Displayname: %(displayname)s",
+        "user_id": "User ID: %(userId)s",
+        "user_no_avatar": "Avatar: <i>None</i>",
+        "user_no_displayname": "Displayname: <i>None</i>",
         "user_read_up_to": "User read up to: ",
         "user_read_up_to_ignore_synthetic": "User read up to (ignoreSynthetic): ",
         "user_read_up_to_private": "User read up to (m.read.private): ",
         "user_read_up_to_private_ignore_synthetic": "User read up to (m.read.private;ignoreSynthetic): ",
+        "user_room_membership": "Membership: %(membership)s",
+        "user_verification_status": {
+            "identity_changed": "Verification status: <E2EIcon /> Unverified, and identity changed",
+            "unverified": "Verification status: <E2EIcon /> Unverified",
+            "verified": "Verification status: <E2EIcon /> Verified",
+            "was_verified": "Verification status: <E2EIcon /> Was verified, but identity changed"
+        },
+        "users": "Users",
         "value": "Value",
         "value_colon": "Value:",
         "value_in_this_room": "Value in this room",
@@ -923,13 +959,13 @@
             },
             "privacy_warning": "Make sure nobody can see this screen!",
             "restoring": "Restoring keys from backup",
-            "security_key_title": "Recovery key"
+            "security_key_label": "Recovery key",
+            "security_key_title": "Enter your recovery key"
         },
         "bootstrap_title": "Setting up keys",
-        "cancel_entering_passphrase_description": "Are you sure you want to cancel entering passphrase?",
-        "cancel_entering_passphrase_title": "Cancel entering passphrase?",
         "confirm_encryption_setup_body": "Click the button below to confirm setting up encryption.",
         "confirm_encryption_setup_title": "Confirm encryption setup",
+        "continue_with_reset": "Continue with reset",
         "cross_signing_room_normal": "This room is end-to-end encrypted",
         "cross_signing_room_verified": "Everyone in this room is verified",
         "cross_signing_room_warning": "Someone is using an unknown session",
@@ -938,12 +974,14 @@
         "cross_signing_user_warning": "This user has not verified all of their sessions.",
         "enter_recovery_key": "Enter recovery key",
         "event_shield_reason_authenticity_not_guaranteed": "The authenticity of this encrypted message can't be guaranteed on this device.",
+        "event_shield_reason_mismatched_sender": "The sender of the event does not match the owner of the device that sent it.",
         "event_shield_reason_mismatched_sender_key": "Encrypted by an unverified session",
         "event_shield_reason_unknown_device": "Encrypted by an unknown or deleted device.",
         "event_shield_reason_unsigned_device": "Encrypted by a device not verified by its owner.",
         "event_shield_reason_unverified_identity": "Encrypted by an unverified user.",
         "export_unsupported": "Your browser does not support the required cryptography extensions",
         "forgot_recovery_key": "Forgot recovery key?",
+        "identity_needs_reset_description": "You have to reset your cryptographic identity in order to ensure access to your message history",
         "import_invalid_keyfile": "Not a valid %(brand)s keyfile",
         "import_invalid_passphrase": "Authentication check failed: incorrect password?",
         "key_storage_out_of_sync": "Your key storage is out of sync.",
@@ -970,11 +1008,8 @@
             "title": "Recovery Method Removed",
             "warning": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings."
         },
-        "reset_all_button": "Forgotten or lost all recovery methods? <a>Reset all</a>",
         "set_up_recovery": "Set up recovery",
-        "set_up_recovery_later": "Not now",
         "set_up_recovery_toast_description": "Generate a recovery key that can be used to restore your encrypted message history in case you lose access to your devices.",
-        "set_up_toast_description": "Safeguard against losing access to encrypted messages & data",
         "set_up_toast_title": "Set up Secure Backup",
         "setup_secure_backup": {
             "explainer": "Back up your keys before signing out to avoid losing them."
@@ -995,16 +1030,17 @@
             "after_new_login": {
                 "device_verified": "Device verified",
                 "skip_verification": "Skip verification for now",
-                "unable_to_verify": "Unable to verify this device",
                 "verify_this_device": "Verify this device"
             },
-            "cancelled": "You cancelled verification.",
-            "cancelled_self": "You cancelled verification on your other device.",
-            "cancelled_user": "%(displayName)s cancelled verification.",
+            "cancelled_verification": "Either the request timed out, the request was denied, or there was a verification mismatch.",
             "cancelling": "Cancelling…",
+            "cant_confirm": "Can't confirm?",
             "complete_action": "Got It",
             "complete_description": "You've successfully verified this user.",
             "complete_title": "Verified!",
+            "confirm_identity_description": "Verify this device to set up secure messaging",
+            "confirm_identity_title": "Confirm your identity",
+            "confirm_the_emojis": "Confirm that the emojis below match those shown on your other device.",
             "error_starting_description": "We were unable to start a chat with the other user.",
             "error_starting_title": "Error starting verification",
             "explainer": "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.",
@@ -1015,58 +1051,72 @@
             "incoming_sas_dialog_waiting": "Waiting for partner to confirm…",
             "incoming_sas_user_dialog_text_1": "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.",
             "incoming_sas_user_dialog_text_2": "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.",
-            "no_key_or_device": "It looks like you don't have a Recovery Key or any other devices you can verify against. This device will not be able to access old encrypted messages. In order to verify your identity on this device, you'll need to reset your verification keys.",
+            "manual": {
+                "already_verified": "This device is already verified",
+                "already_verified_and_wrong_fingerprint": "The supplied fingerprint does not match, but the device is already verified!",
+                "device_id": "Device ID",
+                "failure_description": "Failed to verify '%(deviceId)s': %(error)s",
+                "failure_title": "Verification failed",
+                "fingerprint": "Fingerprint (session key)",
+                "no_crypto": "Unable to verify device - crypto is not enabled",
+                "no_device": "Unable to verify device - device '%(deviceId)s' was not found",
+                "no_userid": "Unable to verify device - cannot find our User ID",
+                "success_description": "The device (%(deviceId)s) is now cross-signed",
+                "success_title": "Verification successful",
+                "text": "Supply the ID and fingerprint of one of your own devices to verify it. NOTE this allows the other device to send and receive messages as you. IF SOMEONE TOLD YOU TO PASTE SOMETHING HERE, IT IS LIKELY YOU ARE BEING SCAMMED!",
+                "wrong_fingerprint": "Unable to verify device '%(deviceId)s' - the supplied fingerprint '%(fingerprint)s' does not match the device fingerprint, '%(fprint)s'"
+            },
             "no_support_qr_emoji": "The device you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.",
+            "now_you_can": "Now you can read or send messages securely, and anyone you chat with can also trust this device.",
+            "once_accepted_can_continue": "Once accepted you'll be able to continue with the verification.",
             "other_party_cancelled": "The other party cancelled the verification.",
             "prompt_encrypted": "Verify all users in a room to ensure it's secure.",
-            "prompt_self": "Start verification again from the notification.",
             "prompt_unencrypted": "In encrypted rooms, verify all users to ensure it's secure.",
-            "prompt_user": "Start verification again from their profile.",
             "qr_or_sas": "%(qrCode)s or %(emojiCompare)s",
-            "qr_or_sas_header": "Verify this device by completing one of the following:",
             "qr_prompt": "Scan this unique code",
-            "qr_reciprocate_same_shield_device": "Almost there! Is your other device showing the same shield?",
+            "qr_reciprocate_check_again_device": "Check again on your other device to finish verification.",
+            "qr_reciprocate_no": "No, I don't see a green shield",
             "qr_reciprocate_same_shield_user": "Almost there! Is %(displayName)s showing the same shield?",
-            "request_toast_accept": "Verify Session",
+            "qr_reciprocate_yes": "Yes, I see a green shield",
             "request_toast_accept_user": "Verify User",
             "request_toast_decline_counter": "Ignore (%(counter)s)",
             "request_toast_detail": "%(deviceId)s from %(ip)s",
-            "reset_proceed_prompt": "Proceed with reset",
+            "request_toast_start_verification": "Start Verification",
             "sas_caption_self": "Verify this device by confirming the following number appears on its screen.",
             "sas_caption_user": "Verify this user by confirming the following number appears on their screen.",
             "sas_description": "Compare a unique set of emoji if you don't have a camera on either device",
-            "sas_emoji_caption_self": "Confirm the emoji below are displayed on both devices, in the same order:",
             "sas_emoji_caption_user": "Verify this user by confirming the following emoji appear on their screen.",
             "sas_match": "They match",
             "sas_no_match": "They don't match",
             "sas_prompt": "Compare unique emoji",
             "scan_qr": "Verify by scanning",
             "scan_qr_explainer": "Ask %(displayName)s to scan your code:",
-            "self_verification_hint": "To proceed, please accept the verification request on your other device.",
             "start_button": "Start Verification",
-            "successful_device": "You've successfully verified %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "You've successfully verified your device!",
             "successful_user": "You've successfully verified %(displayName)s!",
-            "timed_out": "Verification timed out.",
             "unsupported_method": "Unable to find a supported verification method.",
             "unverified_session_toast_accept": "Yes, it was me",
             "unverified_session_toast_title": "New login. Was this you?",
             "unverified_sessions_toast_description": "Review to ensure your account is safe",
             "unverified_sessions_toast_reject": "Later",
             "unverified_sessions_toast_title": "You have unverified sessions",
-            "verification_description": "Verify your identity to access encrypted messages and prove your identity to others. If you also use a mobile device, please open the app there before you proceed.",
+            "use_another_device": "Use another device",
+            "use_recovery_key": "Use recovery key",
+            "verification_dialog_title_choose": "Choose how to verify",
+            "verification_dialog_title_compare_emojis": "Compare emojis",
+            "verification_dialog_title_confirm_green_shield": "Confirm that you see a green shield on your other device",
             "verification_dialog_title_device": "Verify other device",
+            "verification_dialog_title_failed": "Verification failed",
+            "verification_dialog_title_start_on_other_device": "Start verification on the other device",
             "verification_dialog_title_user": "Verification Request",
+            "verification_dialog_title_verified": "Device verified",
             "verification_skip_warning": "Without verifying, you won't have access to all your messages and may appear as untrusted to others.",
             "verification_success_with_backup": "Your new device is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
             "verification_success_without_backup": "Your new device is now verified. Other users will see it as trusted.",
+            "verify_by_completing_one_of": "Verify by completing one of the following:",
             "verify_emoji": "Verify by emoji",
             "verify_emoji_prompt": "Verify by comparing unique emoji.",
             "verify_emoji_prompt_qr": "If you can't scan the code above, verify by comparing unique emoji.",
             "verify_later": "I'll verify later",
-            "verify_using_device": "Verify with another device",
-            "verify_using_key": "Verify with Recovery Key",
-            "verify_using_key_or_phrase": "Verify with Recovery Key or Phrase",
             "waiting_for_user_accept": "Waiting for %(displayName)s to accept…",
             "waiting_other_device": "Waiting for you to verify on your other device…",
             "waiting_other_device_details": "Waiting for you to verify on your other device, %(deviceName)s (%(deviceId)s)…",
@@ -1116,6 +1166,7 @@
         "tls": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
         "unknown": "Unknown error",
         "unknown_error_code": "unknown error code",
+        "update_history_visibility": "Failed to change history visibility",
         "update_power_level": "Failed to change power level"
     },
     "error_app_open_in_another_tab": "Switch to the other tab to connect to %(brand)s. This tab can now be closed.",
@@ -1356,6 +1407,10 @@
         "name_email_mxid_share_space": "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.",
         "name_mxid_share_room": "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.",
         "name_mxid_share_space": "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.",
+        "progress": {
+            "dont_close": "Do not close the app until finished.",
+            "preparing": "Preparing invitations..."
+        },
         "recents_section": "Recent Conversations",
         "room_failed_partial": "We sent the others, but the below people couldn't be invited to <RoomName/>",
         "room_failed_partial_title": "Some invites couldn't be sent",
@@ -1442,6 +1497,7 @@
         "room_list_navigate_down": "Navigate down in the room list",
         "room_list_navigate_up": "Navigate up in the room list",
         "room_list_select_room": "Select room from the room list",
+        "save": "Save",
         "scroll_down_timeline": "Scroll down in the timeline",
         "scroll_up_timeline": "Scroll up in the timeline",
         "search": "Search (must be enabled)",
@@ -1458,7 +1514,6 @@
         "upload_file": "Upload a file"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Allow screen share only mode",
         "ask_to_join": "Enable ask to join",
         "automatic_debug_logs": "Automatically send debug logs on any error",
         "automatic_debug_logs_decryption": "Automatically send debug logs on decryption errors",
@@ -1479,6 +1534,8 @@
         "dynamic_room_predecessors": "Dynamic room predecessors",
         "dynamic_room_predecessors_description": "Enable MSC3946 (to support late-arriving room archives)",
         "element_call_video_rooms": "Element Call video rooms",
+        "encrypted_state_events": "Encrypted state events (MSC4362)",
+        "encrypted_state_events_description": "Enables experimental support for encrypting state events, which hides metadata such as room names and topics from the server. This metadata will also be hidden from people joining rooms later, and people whose clients do not support MSC4362.",
         "exclude_insecure_devices": "Exclude insecure devices when sending/receiving messages",
         "exclude_insecure_devices_description": "When this mode is enabled, encrypted messages will not be shared with unverified devices, and messages from unverified devices will be shown as an error. Note that if you enable this mode, you may be unable to communicate with users who have not verified their devices.",
         "experimental_description": "Feeling experimental? Try out our latest ideas in development. These features are not finalised; they may be unstable, may change, or may be dropped altogether. <a>Learn more</a>.",
@@ -1523,8 +1580,11 @@
         "render_reaction_images_description": "Sometimes referred to as \"custom emojis\".",
         "report_to_moderators": "Report to moderators",
         "report_to_moderators_description": "In rooms that support moderation, the “Report” button will let you report abuse to room moderators.",
+        "share_history_on_invite": "Share encrypted history with new members",
+        "share_history_on_invite_description": "When inviting a user to an encrypted room that has history visibility set to \"shared\", share encrypted history with that user, and accept encrypted history when you are invited to such a room.",
+        "share_history_on_invite_warning": "This feature is EXPERIMENTAL and not all security precautions are implemented. Do not enable on production accounts.",
         "sliding_sync": "Sliding Sync mode",
-        "sliding_sync_description": "Under active development, cannot be disabled.",
+        "sliding_sync_description": "Under active development, cannot be disabled. Currently, not compatible with Element Call.",
         "sliding_sync_disabled_notice": "Log out and back in to disable",
         "sliding_sync_server_no_support": "Your server lacks support",
         "under_active_development": "Under active development.",
@@ -1644,8 +1704,8 @@
         "filter_placeholder": "Search room members",
         "invite_button_no_perms_tooltip": "You do not have permission to invite users",
         "invited_label": "Invited",
-        "no_matches": "No matches",
-        "power_label": "%(userName)s (power %(powerLevelNumber)s)"
+        "list_title": "Member list",
+        "no_matches": "No matches"
     },
     "member_list_back_action_label": "Room members",
     "message_edit_dialog_title": "Message edits",
@@ -1716,6 +1776,7 @@
         "end_message": "The poll has ended. Top answer: %(topAnswer)s",
         "end_message_no_votes": "The poll has ended. No votes were cast.",
         "end_title": "End Poll",
+        "ended_poll_label": "Poll ended",
         "error_ending_description": "Sorry, the poll did not end. Please try again.",
         "error_ending_title": "Failed to end poll",
         "error_voting_description": "Sorry, your vote was not registered. Please try again.",
@@ -1723,10 +1784,20 @@
         "failed_send_poll_description": "Sorry, the poll you tried to create was not posted.",
         "failed_send_poll_title": "Failed to post poll",
         "notes": "Results are only revealed when you end the poll",
+        "option_label": "Option %(number)s, %(answer)s",
+        "option_label_winning_with_total": {
+            "one": "Option %(number)s, %(answer)s, winning option, %(count)s vote",
+            "other": "Option %(number)s, %(answer)s, winning option, %(count)s votes"
+        },
+        "option_label_with_total": {
+            "one": "Option %(number)s, %(answer)s, %(count)s vote",
+            "other": "Option %(number)s, %(answer)s, %(count)s votes"
+        },
         "options_add_button": "Add option",
         "options_heading": "Create options",
         "options_label": "Option %(number)s",
         "options_placeholder": "Write an option",
+        "poll_label": "Poll",
         "topic_heading": "What is your poll question or topic?",
         "topic_label": "Question or topic",
         "topic_placeholder": "Write something…",
@@ -1749,6 +1820,7 @@
     },
     "power_level": {
         "admin": "Admin",
+        "creator": "Owner",
         "custom": "Custom (%(level)s)",
         "custom_level": "Custom level",
         "default": "Default",
@@ -1857,11 +1929,6 @@
                 "other": "You can only pin up to %(count)s widgets"
             },
             "menu": "Open menu",
-            "release_announcement": {
-                "close": "Ok",
-                "description": "Find all pinned messages here. Rollover any message and select “Pin” to add it.",
-                "title": "All new pinned messages"
-            },
             "reply_thread": "Reply to a <link>thread message</link>",
             "unpin_all": {
                 "button": "Unpin all messages",
@@ -1963,6 +2030,7 @@
         },
         "face_pile_tooltip_shortcut": "Including %(commaSeparatedMembers)s",
         "face_pile_tooltip_shortcut_joined": "Including you, %(commaSeparatedMembers)s",
+        "failed_determine_user": "Cannot determine which user to ignore since the member event has changed.",
         "failed_reject_invite": "Failed to reject invite",
         "forget_room": "Forget this room",
         "forget_space": "Forget this space",
@@ -1981,7 +2049,9 @@
         "inaccessible_subtitle_1": "Try again later, or ask a room or space admin to check if you have access.",
         "inaccessible_subtitle_2": "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.",
         "intro": {
+            "display_topic": "Topic: <topic/>",
             "dm_caption": "Only the two of you are in this conversation, unless either of you invites anyone to join.",
+            "edit_topic": "Topic: <topic/> (<a>edit</a>)",
             "enable_encryption_prompt": "Enable encryption in settings.",
             "encrypted_3pid_dm_pending_join": "Once everyone has joined, you’ll be able to chat",
             "no_avatar_label": "Add a photo, so people can easily spot your room.",
@@ -1991,8 +2061,6 @@
             "send_message_start_dm": "Send your first message to invite <displayName/> to chat",
             "start_of_dm_history": "This is the beginning of your direct message history with <displayName/>.",
             "start_of_room": "This is the start of <roomName/>.",
-            "topic": "Topic: %(topic)s ",
-            "topic_edit": "Topic: %(topic)s (<a>edit</a>)",
             "unencrypted_warning": "End-to-end encryption isn't enabled",
             "user_created": "%(displayName)s created this room.",
             "you_created": "You created this room."
@@ -2047,13 +2115,16 @@
         "pinned_message_banner": {
             "button_close_list": "Close list",
             "button_view_all": "View all",
-            "description": "This room has pinned messages. Click to view them.",
-            "go_to_message": "View the pinned message in the timeline.",
+            "description": "Pinned messages",
+            "go_to_newest_message": "View the pinned message in the timeline and the newest pinned message here",
+            "go_to_next_message": "View the pinned message in the timeline and the next oldest pinned message here",
             "title": "<bold>%(index)s of %(length)s</bold> Pinned messages"
         },
         "read_topic": "Click to read topic",
         "rejecting": "Rejecting invite…",
         "rejoin_button": "Re-join",
+        "room_content": "Room content",
+        "room_is_low_priority": "This is a low priority room",
         "search": {
             "all_rooms_button": "Search all rooms",
             "placeholder": "Search messages…",
@@ -2066,6 +2137,7 @@
         "status_bar": {
             "delete_all": "Delete all",
             "exceeded_resource_limit": "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.",
+            "history_visible": "This room has been configured so that new members can read history. <a>Learn More</a>",
             "homeserver_blocked": "Your message wasn't sent because this homeserver has been blocked by its administrator. Please <a>contact your service administrator</a> to continue using the service.",
             "monthly_user_limit_reached": "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.",
             "requires_consent_agreement": "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.",
@@ -2100,16 +2172,17 @@
     "room_list": {
         "add_room_label": "Add room",
         "add_space_label": "Add space",
-        "appearance": "Appearance",
         "breadcrumbs_empty": "No recently visited rooms",
         "breadcrumbs_label": "Recently visited rooms",
+        "collapse_filters": "Collapse filter list",
         "empty": {
             "no_chats": "No chats yet",
             "no_chats_description": "Get started by messaging someone or by creating a room",
             "no_chats_description_no_room_rights": "Get started by messaging someone",
-            "no_favourites": "You don't have favourite chat yet",
+            "no_favourites": "You don't have favourite chats yet",
             "no_favourites_description": "You can add a chat to your favourites in the chat settings",
             "no_invites": "You don't have any unread invites",
+            "no_lowpriority": "You don't have any low priority rooms",
             "no_mentions": "You don't have any unread mentions",
             "no_people": "You don’t have direct chats with anyone yet",
             "no_people_description": "You can deselect filters in order to see your other chats",
@@ -2119,12 +2192,14 @@
             "show_activity": "See all activity",
             "show_chats": "Show all chats"
         },
+        "expand_filters": "Expand filter list",
         "failed_add_tag": "Failed to add tag %(tagName)s to room",
         "failed_remove_tag": "Failed to remove tag %(tagName)s from room",
         "failed_set_dm_tag": "Failed to set direct message tag",
         "filters": {
             "favourite": "Favourites",
             "invites": "Invites",
+            "low_priority": "Low priority",
             "mentions": "Mentions",
             "people": "People",
             "rooms": "Rooms",
@@ -2158,7 +2233,6 @@
         },
         "room_options": "Room Options",
         "show_less": "Show less",
-        "show_message_previews": "Show message previews",
         "show_n_more": {
             "one": "Show %(count)s more",
             "other": "Show %(count)s more"
@@ -2265,6 +2339,8 @@
             "no_aliases_space": "This space has no local addresses",
             "other_section": "Other",
             "publish_toggle": "Publish this room to the public in %(domain)s's room directory?",
+            "publish_warn_invite_only": "You cannot publish a room that is invite-only.",
+            "publish_warn_no_canonical_permission": "You must have permission to set the main address to publish this room.",
             "published_aliases_description": "To publish an address, it needs to be set as a local address first.",
             "published_aliases_explainer_room": "Published addresses can be used by anyone on any server to join your room.",
             "published_aliases_explainer_space": "Published addresses can be used by anyone on any server to join your space.",
@@ -2342,6 +2418,10 @@
             "users_default": "Default role"
         },
         "security": {
+            "cannot_change_to_private_due_to_missing_history_visiblity_permissions": {
+                "description": "You do not have permissions to alter the history visibility of the room. This is dangerous as it could allow unjoined users to read messages.",
+                "title": "Cannot make room private"
+            },
             "enable_encryption_confirm_description": "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>",
             "enable_encryption_confirm_title": "Enable encryption?",
             "enable_encryption_public_room_confirm_description_1": "<b>It's not recommended to add encryption to public rooms.</b> Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.",
@@ -2359,7 +2439,7 @@
             "history_visibility_joined": "Members only (since they joined)",
             "history_visibility_legend": "Who can read history?",
             "history_visibility_shared": "Members only (since the point in time of selecting this option)",
-            "history_visibility_warning": "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.",
+            "history_visibility_warning": "The visibility of existing history will not be changed.",
             "history_visibility_world_readable": "Anyone",
             "join_rule_description": "Decide who can join %(roomName)s.",
             "join_rule_invite": "Private (invite only)",
@@ -2402,6 +2482,7 @@
                 "other": "Updating spaces... (%(progress)s out of %(count)s)"
             },
             "join_rule_upgrade_upgrading_room": "Upgrading room",
+            "join_rule_world_readable_description": "Changing who can join the room will change the visibility of future messages too.",
             "public_without_alias_warning": "To link to this room, please add an address.",
             "publish_room": "Make this room visible in the public room directory.",
             "publish_space": "Make this space visible in the public room directory.",
@@ -2415,11 +2496,12 @@
             "error_failed_save": "Failed to update the visibility of this space",
             "error_update_guest_access": "Failed to update the guest access of this space",
             "error_update_history_visibility": "Failed to update the history visibility of this space",
-            "guest_access_explainer": "Guests can join a space without having an account.",
-            "guest_access_explainer_public_space": "This may be useful for public spaces.",
+            "guest_access_disabled": "You do not have permission to change guest access.",
+            "guest_access_explainer": "Guests can join a space without having an account. This may be useful for public spaces.",
             "guest_access_label": "Enable guest access",
             "history_visibility_anyone_space": "Preview Space",
             "history_visibility_anyone_space_description": "Allow people to preview your space before they join.",
+            "history_visibility_anyone_space_disabled": "You do not have permission to change history visibilty.",
             "history_visibility_anyone_space_recommendation": "Recommended for public spaces.",
             "title": "Visibility"
         },
@@ -2540,6 +2622,7 @@
                 "breadcrumb_second_description": "You will lose any message history that’s stored only on the server",
                 "breadcrumb_third_description": "You will need to verify all your existing devices and contacts again",
                 "breadcrumb_title": "Are you sure you want to reset your identity?",
+                "breadcrumb_title_cant_confirm": "You need to reset your identity",
                 "breadcrumb_title_forgot": "Forgot your recovery key? You’ll need to reset your identity.",
                 "breadcrumb_title_sync_failed": "Failed to sync key storage. You need to reset your identity.",
                 "breadcrumb_warning": "Only do this if you believe your account has been compromised.",
@@ -2547,7 +2630,7 @@
                 "do_not_close_warning": "Do not close this window until the reset is finished",
                 "export_keys": "Export keys",
                 "import_keys": "Import keys",
-                "other_people_device_description": "Warning: users who have not explicitly verified with you (e.g. using emoji) will not receive your encrypted messages. Also, unverified devices of verified users will not receive your encrypted messages.",
+                "other_people_device_description": "Warning: users who have not explicitly verified with you (e.g. using emoji) will not receive your encrypted messages. Also, unverified devices of verified users will not receive your encrypted messages. Changes require an application restart to take effect.",
                 "other_people_device_label": "In encrypted rooms, only send messages to verified users",
                 "other_people_device_title": "Other people’s devices",
                 "reset_identity": "Reset cryptographic identity",
@@ -2616,6 +2699,7 @@
             "allow_spellcheck": "Allow spell check",
             "application_language": "Application language",
             "application_language_reload_hint": "The app will reload after selecting another language",
+            "avatar_open_menu": "Open avatar menu",
             "avatar_remove_progress": "Removing image...",
             "avatar_save_progress": "Uploading image...",
             "avatar_upload_error_text": "The file format is not supported or the image is larger than %(size)s.",
@@ -2693,13 +2777,11 @@
         "inline_url_previews_room": "Enable URL previews by default for participants in this room",
         "inline_url_previews_room_account": "Enable URL previews for this room (only affects you)",
         "insert_trailing_colon_mentions": "Insert a trailing colon after user mentions at the start of a message",
+        "invite_controls": {
+            "default_label": "Allow users to invite you to rooms"
+        },
         "jump_to_bottom_on_send": "Jump to the bottom of the timeline when you send a message",
         "key_backup": {
-            "backup_in_progress": "Your keys are being backed up (the first backup could take a few minutes).",
-            "backup_starting": "Starting backup…",
-            "backup_success": "Success!",
-            "cannot_create_backup": "Unable to create key backup",
-            "create_title": "Create key backup",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Your keys are now being backed up from this device.",
                 "backup_setup_success_title": "Secure Backup successful",
@@ -2759,6 +2841,7 @@
             "show_in_private": "In private rooms",
             "show_media": "Always show"
         },
+        "not_supported": "Your server does not implement this feature.",
         "notifications": {
             "default_setting_description": "This setting will be applied by default to all your rooms.",
             "default_setting_section": "I want to be notified for (Default Setting)",
@@ -2816,6 +2899,7 @@
             "voip": "Audio and Video calls"
         },
         "preferences": {
+            "Electron.enableContentProtection": "Prevent the window contents from being captured by other apps",
             "Electron.enableHardwareAcceleration": "Enable hardware acceleration (restart %(appName)s to take effect)",
             "always_show_menu_bar": "Always show the window menu bar",
             "autocomplete_delay": "Autocomplete delay (ms)",
@@ -2824,6 +2908,7 @@
             "composer_heading": "Composer",
             "default_timezone": "Browser default (%(timezone)s)",
             "dialog_title": "<strong>Settings:</strong> Preferences",
+            "enable_content_protection": "Enable content protection",
             "enable_hardware_acceleration": "Enable hardware acceleration",
             "enable_tray_icon": "Show tray icon and minimise window to it on close",
             "keyboard_heading": "Keyboard shortcuts",
@@ -2837,6 +2922,7 @@
             "room_list_heading": "Room list",
             "show_avatars_pills": "Show avatars in user, room and event mentions",
             "show_polls_button": "Show polls button",
+            "startup_window_behaviour_label": "Start-up and window behaviour",
             "surround_text": "Surround selected text when typing special characters",
             "time_heading": "Displaying time",
             "user_timezone": "Set timezone"
@@ -2858,7 +2944,6 @@
             "ignore_users_empty": "You have no ignored users.",
             "ignore_users_section": "Ignored users",
             "key_backup_algorithm": "Algorithm:",
-            "key_backup_connect": "Connect this session to Key Backup",
             "message_search_disable_warning": "If disabled, messages from encrypted rooms won't appear in search results.",
             "message_search_disabled": "Securely cache encrypted messages locally for them to appear in search results.",
             "message_search_enabled": {
@@ -2871,6 +2956,7 @@
             "message_search_indexing": "Currently indexing: %(currentRoom)s",
             "message_search_indexing_idle": "Not currently indexing messages for any room.",
             "message_search_intro": "%(brand)s is securely caching encrypted messages locally for them to appear in search results:",
+            "message_search_pending_rooms": "Rooms awaiting indexing: %(pendingRooms)s",
             "message_search_room_progress": "%(doneRooms)s out of %(totalRooms)s",
             "message_search_section": "Message search",
             "message_search_sleep_time": "How fast should messages be downloaded.",
@@ -2989,6 +3075,7 @@
         "show_chat_effects": "Show chat effects (animations when receiving e.g. confetti)",
         "show_displayname_changes": "Show display name changes",
         "show_join_leave": "Show join/leave messages (invites/removes/bans unaffected)",
+        "show_message_previews": "Show message previews",
         "show_nsfw_content": "Show NSFW content",
         "show_read_receipts": "Show read receipts sent by other users",
         "show_redaction_placeholder": "Show a placeholder for removed messages",
@@ -3011,7 +3098,12 @@
             "spaces_explainer": "Spaces are ways to group rooms and people. Alongside the spaces you're in, you can use some pre-built ones too.",
             "title": "Sidebar"
         },
-        "start_automatically": "Start automatically after system login",
+        "start_automatically": {
+            "disabled": "No",
+            "enabled": "Yes",
+            "label": "Open %(brand)s when you log in to your computer",
+            "minimised": "Minimised"
+        },
         "tac_only_notifications": "Only show notifications in the thread activity centre",
         "use_12_hour_format": "Show timestamps in 12 hour format (e.g. 2:30pm)",
         "use_command_enter_send_message": "Use Command + Enter to send a message",
@@ -3095,6 +3187,8 @@
         "jumptodate": "Jump to the given date in the timeline",
         "jumptodate_invalid_input": "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.",
         "lenny": "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message",
+        "manual_device_verification_confirm_description": "This will allow another device to send and receive messages as you. IF SOMEONE TOLD YOU TO PASTE SOMETHING HERE, IT IS LIKELY YOU ARE BEING SCAMMED! Are you sure you want to verify this other device?",
+        "manual_device_verification_confirm_title": "Caution: manual device verification",
         "me": "Displays action",
         "msg": "Sends a message to the given user",
         "myavatar": "Changes your profile picture in all rooms",
@@ -3135,6 +3229,7 @@
         "upgraderoom": "Upgrades a room to a new version",
         "upgraderoom_permission_error": "You do not have the required permissions to use this command.",
         "usage": "Usage",
+        "verify": "Manually verify one of your own devices",
         "view": "Views room with given address",
         "whois": "Displays information about a user"
     },
@@ -3376,6 +3471,7 @@
             "unable_to_find": "Tried to load a specific point in this room's timeline, but was unable to find it."
         },
         "m.audio": {
+            "audio_player": "Audio player",
             "error_downloading_audio": "Error downloading audio",
             "error_processing_audio": "Error processing audio message",
             "error_processing_voice_message": "Error processing voice message",
@@ -3437,7 +3533,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Ended a poll",
             "sender_ended": "%(senderName)s has ended a poll"
         },
         "m.poll.start": "%(senderName)s has started a poll - %(pollQuestion)s",
@@ -3475,6 +3570,7 @@
             "enabled_dm": "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their profile picture.",
             "enabled_local": "Messages in this chat will be end-to-end encrypted.",
             "parameters_changed": "Some encryption parameters have been changed.",
+            "state_enabled": "Messages and state events in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their profile picture.",
             "unsupported": "The encryption used by this room isn't supported."
         },
         "m.room.guest_access": {
@@ -3936,12 +4032,12 @@
         "connection_lost": "Connectivity to the server has been lost",
         "connection_lost_description": "You cannot place calls without a connection to the server.",
         "consulting": "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>",
+        "decline_call": "Decline",
         "default_device": "Default Device",
         "dial": "Dial",
         "dialpad": "Dialpad",
         "disable_camera": "Turn off camera",
         "disable_microphone": "Mute microphone",
-        "disabled_no_one_here": "There's no one here to call",
         "disabled_no_perms_start_video_call": "You do not have permission to start video calls",
         "disabled_no_perms_start_voice_call": "You do not have permission to start voice calls",
         "disabled_ongoing_call": "Ongoing call",
@@ -3988,6 +4084,7 @@
         "show_sidebar_button": "Show sidebar",
         "silence": "Silence call",
         "silenced": "Notifications silenced",
+        "skip_lobby_toggle_option": "Join immediately",
         "start_screenshare": "Start sharing your screen",
         "stop_screenshare": "Stop sharing your screen",
         "too_many_calls": "Too Many Calls",
@@ -4008,9 +4105,12 @@
         "user_busy_description": "The user you called is busy.",
         "user_is_presenting": "%(sharerName)s is presenting",
         "video_call": "Video call",
+        "video_call_incoming": "Incoming video call",
         "video_call_started": "Video call started",
         "video_call_using": "Video call using:",
         "voice_call": "Voice call",
+        "voice_call_incoming": "Incoming voice call",
+        "voice_call_using": "Voice call using:",
         "you_are_presenting": "You are presenting"
     },
     "web_default_device_name": "%(appName)s: %(browserName)s on %(osName)s",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index a6f28167ea..3556411638 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -184,8 +184,7 @@
             "megolm_export": "Mane elporti ŝlosilojn",
             "setup_key_backup_title": "Vi perdos aliron al viaj ĉifritaj mesaĝoj",
             "setup_secure_backup_description_1": "Ĉifritaj mesaĝoj estas sekurigitaj per tutvoja ĉifrado. Nur vi kaj la ricevonto(j) havas la ŝlosilojn necesajn por legado.",
-            "skip_key_backup": "Mi ne volas miajn ĉifritajn mesaĝojn",
-            "use_key_backup": "Ekuzi Savkopiadon de ŝlosiloj"
+            "skip_key_backup": "Mi ne volas miajn ĉifritajn mesaĝojn"
         },
         "misconfigured_body": "Petu vian %(brand)s-administranton kontroli <a>vian agordaron</a> je malĝustaj aŭ duoblaj eroj.",
         "misconfigured_title": "Via kliento %(brand)s estas misagordita",
@@ -437,7 +436,6 @@
         "unnamed_space": "Sennoma aro",
         "user_avatar": "Profilbildo",
         "username": "Uzantonomo",
-        "verification_cancelled": "Kontrolo nuliĝis",
         "view_message": "Montri mesaĝon",
         "warning": "Averto"
     },
@@ -604,8 +602,6 @@
             "security_key_title": "Sekureca ŝlosilo"
         },
         "bootstrap_title": "Agordo de klavoj",
-        "cancel_entering_passphrase_description": "Ĉu vi certe volas nuligi enigon de pasfrazo?",
-        "cancel_entering_passphrase_title": "Ĉu nuligi enigon de pasfrazo?",
         "confirm_encryption_setup_body": "Klaku sube la butonon por konfirmi agordon de ĉifrado.",
         "confirm_encryption_setup_title": "Konfirmi agordon de ĉifrado",
         "cross_signing_room_normal": "Ĉi tiu ĉambro uzas tutvojan ĉifradon",
@@ -636,8 +632,6 @@
             "title": "Rehava metodo foriĝis",
             "warning": "Se vi ne forigis la rehavan metodon, eble atakanto provas aliri vian konton. Vi tuj ŝanĝu la pasvorton de via konto, kaj agordu novan rehavan metodon en la agordoj."
         },
-        "reset_all_button": "Ĉu vi forgesis aŭ perdis ĉiujn manierojn de rehavo? <a>Restarigu ĉion</a>",
-        "set_up_toast_description": "Malhelpu perdon de aliro al ĉifritaj mesaĝoj kaj datumoj",
         "set_up_toast_title": "Agordi Sekuran savkopiadon",
         "setup_secure_backup": {
             "explainer": "Savkopiu viajn ŝlosilojn antaŭ adiaŭo, por ilin ne perdi."
@@ -652,8 +646,6 @@
         "unable_to_setup_keys_error": "Ne povas agordi ŝlosilojn",
         "verification": {
             "accepting": "Akceptante…",
-            "cancelled": "Vi nuligis kontrolon.",
-            "cancelled_user": "%(displayName)s nuligis kontrolon.",
             "cancelling": "Nuligante…",
             "complete_action": "Komprenite",
             "complete_description": "Vi sukcese kontrolis ĉi tiun uzanton.",
@@ -667,12 +659,9 @@
             "incoming_sas_user_dialog_text_2": "Kontrolo de tiu ĉi uzanto markos ĝian salutaĵon fidata, kaj ankaŭ markos vian salutaĵon fidata por ĝi.",
             "other_party_cancelled": "La alia kontrolano nuligis la kontrolon.",
             "prompt_encrypted": "Kontrolu ĉiujn uzantojn en ĉambro por certigi, ke ĝi sekuras.",
-            "prompt_self": "Rekomencu kontroladon el la sciigo.",
-            "prompt_user": "Rekomencu kontroladon el ĝia profilo.",
             "qr_prompt": "Skanu ĉi tiun unikan kodon",
             "qr_reciprocate_same_shield_user": "Preskaŭ finite! Ĉu %(displayName)s montras la saman ŝildon?",
             "request_toast_detail": "%(deviceId)s de %(ip)s",
-            "reset_proceed_prompt": "Procedu por restarigi",
             "sas_caption_user": "Kontrolu ĉu tiun uzanton per konfirmo, ke la jena numero aperis sur ĝia ekrano.",
             "sas_description": "Komparu unikan aron de bildsignoj se vi ne havas kameraon sur la alia aparato",
             "sas_emoji_caption_user": "Kontrolu ĉi tiun uzanton per konfirmo, ke la jenaj bildsignoj aperis sur ĝia ekrano.",
@@ -682,17 +671,13 @@
             "scan_qr": "Kontroli per skanado",
             "scan_qr_explainer": "Petu de %(displayName)s skani vian kodon:",
             "start_button": "Komenci kontrolon",
-            "successful_device": "Vi sukcese kontrolis %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "Vi sukcese kontrolis vian aparaton!",
             "successful_user": "Vi sukcese kontrolis uzanton %(displayName)s!",
-            "timed_out": "Kontrolo atingis tempolimon.",
             "unsupported_method": "Ne povas trovi subtenatan metodon de kontrolo.",
             "unverified_session_toast_accept": "Jes, estis mi",
             "unverified_session_toast_title": "Nova saluto. Ĉu tio estis vi?",
             "unverified_sessions_toast_description": "Kontrolu por certigi sekurecon de via konto",
             "unverified_sessions_toast_reject": "Pli poste",
             "unverified_sessions_toast_title": "Vi havas nekontrolitajn salutaĵojn",
-            "verification_description": "Kontrolu vian identecon por aliri ĉifritajn mesaĝojn kaj pruvi vian identecon al aliuloj.",
             "verification_dialog_title_user": "Kontrolpeto",
             "verification_skip_warning": "Sen kontrolado, vi ne havos aliron al ĉiuj viaj mesaĝoj kaj povas aperi kiel nefidinda al aliaj.",
             "verification_success_with_backup": "Via nova aparato nun estas kontrolita. Ĝi havas aliron al viaj ĉifritaj mesaĝoj, kaj aliaj vidos ĝin kiel fidinda.",
@@ -701,9 +686,6 @@
             "verify_emoji_prompt": "Kontrolu per komparo de unikaj bildsignoj.",
             "verify_emoji_prompt_qr": "Se vi ne povas skani la supran kodon, kontrolu per komparo de unikaj bildsignoj.",
             "verify_later": "Kontrolu poste",
-            "verify_using_device": "Kontrolu per alia aparato",
-            "verify_using_key": "Kontrolu per Sekureca ŝlosilo",
-            "verify_using_key_or_phrase": "Kontrolu per Sekureca ŝlosilo aŭ frazo",
             "waiting_for_user_accept": "Atendante akcepton de %(displayName)s…",
             "waiting_other_user": "Atendas kontrolon de %(displayName)s…"
         },
@@ -1092,8 +1074,7 @@
         "share_type_prompt": "Kiel vi volas kunhavigi vian lokon?"
     },
     "member_list": {
-        "filter_placeholder": "Filtri ĉambranojn",
-        "power_label": "%(userName)s (povnivelo je %(powerLevelNumber)s)"
+        "filter_placeholder": "Filtri ĉambranojn"
     },
     "message_edit_dialog_title": "Redaktoj de mesaĝoj",
     "mobile_guide": {
@@ -1285,8 +1266,6 @@
             "room_invite": "Inviti nur al ĉi tiu ĉambro",
             "start_of_dm_history": "Jen la komenco de historio de viaj rektaj mesaĝoj kun <displayName/>.",
             "start_of_room": "Jen la komenco de <roomName/>.",
-            "topic": "Temo: %(topic)s ",
-            "topic_edit": "Temo: %(topic)s (<a>redakti</a>)",
             "unencrypted_warning": "Tutvoja ĉifrado ne estas ŝaltita",
             "user_created": "%(displayName)s kreis ĉi tiun ĉambron.",
             "you_created": "Vi kreis ĉi tiun ĉambron."
@@ -1563,7 +1542,6 @@
             "error_update_guest_access": "Malsukcesis ĝisdatigi aliron de gastoj al ĉi tiu aro",
             "error_update_history_visibility": "Malsukcesis ĝisdatigi videblecon de historio de ĉi tiu aro",
             "guest_access_explainer": "Gastoj povas aliĝi al aro sen konto.",
-            "guest_access_explainer_public_space": "Tio povas esti utila por publikaj aroj.",
             "guest_access_label": "Ŝalti aliron de gastoj",
             "history_visibility_anyone_space": "Antaŭrigardi aron",
             "history_visibility_anyone_space_description": "Povigi personojn antaŭrigardi vian aron antaŭ aliĝo.",
@@ -1698,10 +1676,6 @@
         "inline_url_previews_room_account": "Ŝalti URL-antaŭrigardon en ĉi tiu ĉambro (nur por vi)",
         "jump_to_bottom_on_send": "Salti al subo de historio sendinte mesaĝon",
         "key_backup": {
-            "backup_in_progress": "Viaj ŝlosiloj estas savkopiataj (la unua savkopio povas daŭri kelkajn minutojn).",
-            "backup_success": "Sukceso!",
-            "cannot_create_backup": "Ne povas krei savkopion de ŝlosiloj",
-            "create_title": "Krei savkopion de ŝlosiloj",
             "setup_secure_backup": {
                 "cancel_warning": "Se vi nuligos nun, vi eble perdos ĉifritajn mesaĝojn kaj datumojn se vi perdos aliron al viaj salutoj.",
                 "confirm_security_phrase": "Konfirmu vian Sekurecan frazon",
@@ -1793,7 +1767,6 @@
             "ignore_users_empty": "Vi malatentas neniujn uzantojn.",
             "ignore_users_section": "Malatentaj uzantoj",
             "key_backup_algorithm": "Algoritmo:",
-            "key_backup_connect": "Konekti ĉi tiun salutaĵon al Savkopiado de ŝlosiloj",
             "message_search_disable_warning": "Post malŝalto, mesaĝoj el ĉifritaj ĉambroj ne aperos en serĉorezultoj.",
             "message_search_disabled": "Sekure kaŝmemori ĉifritajn mesaĝojn loke, por aperigi ilin en serĉrezultoj.",
             "message_search_enabled": {
@@ -1861,7 +1834,6 @@
             "metaspaces_home_all_rooms": "Montri ĉiujn ĉambrojn",
             "title": "Flanka kolumno"
         },
-        "start_automatically": "Memfare ruli post operaciuma saluto",
         "use_12_hour_format": "Montri tempindikojn en 12-hora formo (ekz. 2:30 post.)",
         "use_command_enter_send_message": "Sendu mesaĝon per komanda klavo + eniga klavo",
         "use_control_enter_send_message": "Sendu mesaĝon per stirklavo (Ctrl) + eniga klavo",
@@ -1957,6 +1929,7 @@
         "upgraderoom": "Gradaltigas ĉambron al nova versio",
         "upgraderoom_permission_error": "Vi ne havas sufiĉajn permesojn por uzi ĉi tiun komandon.",
         "usage": "Uzo",
+        "verify": "Kontrolas opon de uzanto, salutaĵo, kaj publika ŝlosilo",
         "whois": "Montras informojn pri uzanto"
     },
     "space": {
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 6abbdbe819..c23bc8c5fa 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1,6 +1,8 @@
 {
     "a11y": {
+        "emoji_picker": "Selector de emojis",
         "jump_first_invite": "Salte a la primera invitación.",
+        "message_composer": "Compositor de mensajes",
         "n_unread_messages": {
             "other": "%(count)s mensajes sin leer.",
             "one": "1 mensaje sin leer."
@@ -9,7 +11,12 @@
             "other": "%(count)s mensajes sin leer incluyendo menciones.",
             "one": "1 mención sin leer."
         },
+        "recent_rooms": "Salas recientes",
+        "room_messsage_not_sent": "Abrir sala %(roomName)s con un mensaje no enviado.",
+        "room_n_unread_invite": "Abrir invitación de sala %(roomName)s.",
         "room_name": "Sala %(name)s",
+        "room_status_bar": "Barra de estado de la sala",
+        "seek_bar_label": "Barra de búsqueda de audio",
         "unread_messages": "Mensajes sin leer.",
         "user_menu": "Menú del Usuario"
     },
@@ -40,6 +47,8 @@
         "create_a_room": "Crear una sala",
         "create_account": "Crear cuenta",
         "decline": "Rechazar",
+        "decline_and_block": "Rechazar y bloquear",
+        "decline_invite": "Rechazar invitación",
         "delete": "Borrar",
         "deny": "Denegar",
         "disable": "Desactivar",
@@ -59,6 +68,7 @@
         "go": "Ir",
         "go_back": "Atrás",
         "got_it": "Aceptar",
+        "hide": "Ocultar",
         "hide_advanced": "Ocultar ajustes avanzados",
         "hold": "Poner en espera",
         "ignore": "Ignorar",
@@ -81,6 +91,7 @@
         "no": "No",
         "ok": "Vale",
         "open": "Abrir",
+        "open_menu": "Abrir menú",
         "pause": "Pausar",
         "pin": "Fijar",
         "play": "Reproducir",
@@ -95,6 +106,7 @@
         "reply": "Responder",
         "reply_in_thread": "Responder en hilo",
         "report_content": "Denunciar contenido",
+        "report_room": "Reportar sala",
         "resend": "Reenviar",
         "reset": "Restablecer",
         "resume": "Recuperar",
@@ -104,6 +116,7 @@
         "save": "Guardar",
         "search": "Buscar",
         "send_report": "Enviar denuncia",
+        "set_avatar": "Establece una foto de perfil",
         "share": "Compartir",
         "show": "Mostrar",
         "show_advanced": "Mostrar ajustes avanzados",
@@ -127,6 +140,7 @@
         "update": "Actualizar",
         "upgrade": "Actualizar",
         "upload": "Enviar",
+        "upload_file": "Subir archivo",
         "verify": "Verificar",
         "view": "Ver",
         "view_all": "Ver todas",
@@ -134,6 +148,7 @@
         "view_message": "Ver mensaje",
         "view_source": "Ver fuente",
         "yes": "Sí",
+        "yes_dismiss": "Sí, descartar",
         "zoom_in": "Acercar",
         "zoom_out": "Alejar"
     },
@@ -155,6 +170,7 @@
         "account_clash_previous_account": "Continuar con la cuenta anterior",
         "account_deactivated": "Esta cuenta ha sido desactivada.",
         "autodiscovery_generic_failure": "No se pudo obtener la configuración de autodescubrimiento del servidor",
+        "autodiscovery_hs_incompatible": "Su homeserver es demasiado antiguo y no admite la versión mínima de API requerida. Póngase en contacto con el propietario de su servidor o actualice su servidor.",
         "autodiscovery_invalid": "Respuesta inválida de descubrimiento de servidor base",
         "autodiscovery_invalid_hs": "La URL del servidor base no parece ser un servidor válido de Matrix",
         "autodiscovery_invalid_hs_base_url": "URL-base inválida para m.homeserver",
@@ -162,6 +178,7 @@
         "autodiscovery_invalid_is_base_url": "URL_base no válida para m.identity_server",
         "autodiscovery_invalid_is_response": "Respuesta inválida de descubrimiento de servidor de identidad",
         "autodiscovery_invalid_json": "JSON inválido",
+        "autodiscovery_no_well_known": "No se encontró archivo JSON .well-known",
         "autodiscovery_unexpected_error_hs": "Error inesperado en la configuración del servidor",
         "autodiscovery_unexpected_error_is": "Error inesperado en la configuración del servidor de identidad",
         "captcha_description": "A este servidor le gustaría asegurarse de que no eres un robot.",
@@ -189,6 +206,8 @@
         "email_field_label_required": "Escribe tu dirección de correo electrónico",
         "email_help_text": "Añade un correo para poder restablecer tu contraseña si te olvidas.",
         "email_phone_discovery_text": "Usa tu correo electrónico o teléfono para que, opcionalmente, tus contactos puedan descubrir tu cuenta.",
+        "enter_email_explainer": "<b>%(homeserver)s</b> le enviará un enlace de verificación para permitirle restablecer su contraseña.",
+        "enter_email_heading": "Indica tu correo electrónico para restablecer la contraseña",
         "failed_connect_identity_server": "No se puede conectar con el servidor de identidad",
         "failed_connect_identity_server_other": "Puedes iniciar sesión, pero algunas funcionalidades no estarán disponibles hasta que el servidor de identidad esté disponible. Si continúas viendo este mensaje, comprueba tu configuración o contacta con el administrador del servidor.",
         "failed_connect_identity_server_register": "Te puedes registrar, pero algunas funcionalidades no estarán disponibles hasta que se pueda conectar con el servidor de identidad. Si continúas viendo este aviso, comprueba tu configuración o contacta con el administrador del servidor.",
@@ -212,11 +231,11 @@
             "setup_key_backup_title": "Perderás acceso a tus mensajes cifrados",
             "setup_secure_backup_description_1": "Los mensajes cifrados son seguros con el cifrado punto a punto. Solo tú y el/los destinatario/s tiene/n las claves para leer estos mensajes.",
             "setup_secure_backup_description_2": "Al cerrar sesión, estas claves serán eliminadas del dispositivo. Esto significa que no podrás leer mensajes cifrados salvo que tengas sus claves en otros dispositivos, o hayas hecho una copia de seguridad usando el servidor.",
-            "skip_key_backup": "No quiero mis mensajes cifrados",
-            "use_key_backup": "Comenzar a usar la copia de claves"
+            "skip_key_backup": "No quiero mis mensajes cifrados"
         },
         "misconfigured_body": "Solicita al administrador de %(brand)s que compruebe si hay entradas duplicadas o erróneas en <a>tu configuración</a>.",
         "misconfigured_title": "Tu %(brand)s tiene un error de configuración",
+        "mobile_create_account_title": "Estás a punto de crear una cuenta en %(hsName)s",
         "msisdn_field_description": "Otros usuarios pueden invitarte las salas utilizando tus datos de contacto",
         "msisdn_field_label": "Teléfono",
         "msisdn_field_number_invalid": "Ese número de teléfono no parece ser correcto, compruébalo e inténtalo de nuevo",
@@ -224,6 +243,7 @@
         "no_hs_url_provided": "No se ha indicado la URL del servidor local",
         "oidc": {
             "error_title": "No hemos podido iniciar tu sesión",
+            "generic_auth_error": "Algo salió mal durante la autenticación. Vaya a la página de inicio de sesión e inténtelo de nuevo.",
             "missing_or_invalid_stored_state": "Le hemos preguntado a tu navegador qué servidor base usar para iniciar tu sesión, pero parece que no lo recuerda. Vuelve a la página de inicio de sesión e inténtalo de nuevo."
         },
         "password_field_keep_going_prompt": "Sigue…",
@@ -233,12 +253,40 @@
         "phone_label": "Teléfono",
         "phone_optional_label": "Teléfono (opcional)",
         "qr_code_login": {
+            "check_code_explainer": "Esto verificará que la conexión a su otro dispositivo sea segura.",
+            "check_code_heading": "Ingrese el número mostrado en su otro dispositivo",
+            "check_code_input_label": "Código de 2 dígitos",
+            "check_code_mismatch": "Los números no coinciden",
             "completing_setup": "Terminando de configurar tu nuevo dispositivo",
+            "error_etag_missing": "Ocurrió un error inesperado. Esto puede deberse a una extensión del navegador, servidor proxy o configuración incorrecta del servidor.",
+            "error_expired": "El inicio de sesión ha caducado. Por favor, inténtalo de nuevo.",
+            "error_expired_title": "El inicio de sesión no se completó a tiempo",
+            "error_insecure_channel_detected": "No se pudo establecer una conexión segura con el nuevo dispositivo. Sus dispositivos existentes siguen siendo seguros y no necesita preocuparse por ellos.",
+            "error_insecure_channel_detected_instructions": "¿Ahora qué?",
+            "error_insecure_channel_detected_instructions_1": "Intente iniciar sesión en el otro dispositivo nuevamente con un código QR en caso de que esto fuera un problema de red",
+            "error_insecure_channel_detected_instructions_2": "Si encuentra el mismo problema, pruebe una red wifi diferente o use sus datos móviles en lugar de wifi",
+            "error_insecure_channel_detected_instructions_3": "Si eso no funciona, inicie sesión manualmente",
+            "error_insecure_channel_detected_title": "Conexión no segura",
+            "error_other_device_already_signed_in": "No necesita hacer nada más.",
+            "error_other_device_already_signed_in_title": "Su otro dispositivo ya ha iniciado sesión",
             "error_rate_limited": "Demasiados intentos en poco tiempo. Espera un poco antes de volverlo a intentar.",
-            "error_unexpected": "Ha ocurrido un error inesperado.",
-            "scan_code_instruction": "Escanea el siguiente código QR con tu dispositivo.",
-            "scan_qr_code": "Escanear código QR",
-            "select_qr_code": "Selecciona «%(scanQRCode)s»",
+            "error_unexpected": "Ocurrió un error inesperado. La solicitud para conectar su otro dispositivo ha sido cancelada.",
+            "error_unsupported_protocol": "Este dispositivo no admite iniciar sesión en el otro dispositivo con un código QR.",
+            "error_unsupported_protocol_title": "Otro dispositivo no compatible",
+            "error_user_cancelled": "El inicio de sesión fue cancelado en el otro dispositivo.",
+            "error_user_cancelled_title": "Solicitud de inicio de sesión cancelada",
+            "error_user_declined": "Usted o el proveedor de la cuenta rechazó la solicitud de inicio de sesión.",
+            "error_user_declined_title": "Inicio de sesión rechazado",
+            "follow_remaining_instructions": "Siga las instrucciones restantes",
+            "open_element_other_device": "Abra %(brand)s en su otro dispositivo",
+            "point_the_camera": "Escanee el código QR mostrado aquí",
+            "scan_code_instruction": "Escanee el código QR con otro dispositivo",
+            "scan_qr_code": "Iniciar sesión con código QR",
+            "security_code": "Código de seguridad",
+            "security_code_prompt": "Si se le solicita, ingrese el código de abajo en su otro dispositivo.",
+            "select_qr_code": "Seleccione \"%(scanQRCode)s\"",
+            "unsupported_explainer": "Su proveedor de cuenta no admite iniciar sesión en un nuevo dispositivo con un código QR.",
+            "unsupported_heading": "Código QR no compatible",
             "waiting_for_device": "Esperando a que el dispositivo inicie sesión"
         },
         "register_action": "Crear cuenta",
@@ -254,6 +302,7 @@
         "registration_username_unable_check": "No ha sido posible comprobar si el nombre de usuario está libre. Inténtalo de nuevo más tarde.",
         "registration_username_validation": "Use sólo letras minúsculas, números, guiones y guiones bajos",
         "reset_password": {
+            "confirm_new_password": "Confirmar nueva contraseña",
             "devices_logout_success": "Se ha cerrado sesión en todos tus dispositivos y no recibirás más notificaciones. Para volver a habilitar las notificaciones, inicia sesión de nuevo en cada dispositivo.",
             "other_devices_logout_warning_1": "Cerrar sesión en tus dispositivos causará que las claves de encriptado almacenadas en ellas se eliminen, haciendo que el historial de la conversación encriptada sea imposible de leer.",
             "other_devices_logout_warning_2": "Si deseas mantener acceso a tu historial de conversación en salas encriptadas, configura copia de llaves o exporta tus claves de mensaje desde uno de tus otros dispositivos antes de proceder.",
@@ -265,9 +314,13 @@
             "return_to_login": "Regresar a la pantalla de inicio de sesión",
             "sign_out_other_devices": "Cerrar sesión en todos los dispositivos"
         },
+        "reset_password_action": "Restablecer contraseña",
+        "reset_password_button": "¿Olvidó su contraseña?",
         "reset_password_email_field_description": "Utilice una dirección de correo electrónico para recuperar su cuenta",
         "reset_password_email_field_required_invalid": "Introduce una dirección de correo electrónico (obligatorio en este servidor)",
+        "reset_password_email_not_associated": "Su dirección de correo electrónico no parece estar asociada con un ID de Matrix en este homeserver.",
         "reset_password_email_not_found_title": "No se ha encontrado la dirección de correo electrónico",
+        "reset_password_title": "Restablezca su contraseña",
         "server_picker_custom": "Otro servidor base",
         "server_picker_description": "Puedes usar la opción de servidor personalizado para iniciar sesión a otro servidor de Matrix, escribiendo una dirección URL de servidor base diferente. Esto te permite usar %(brand)s con una cuenta de Matrix que ya exista en otro servidor base.",
         "server_picker_description_matrix.org": "Únete de forma gratuita a millones de personas en el servidor público más grande",
@@ -291,6 +344,7 @@
         },
         "set_email_prompt": "¿Quieres poner una dirección de correo electrónico?",
         "sign_in_description": "Usa tu cuenta para configurar.",
+        "sign_in_instead": "Iniciar sesión en su lugar",
         "sign_in_instead_prompt": "¿Ya tienes una cuenta? <a>Inicia sesión aquí</a>",
         "sign_in_or_register": "Iniciar sesión o Crear una cuenta",
         "sign_in_or_register_description": "Entra con tu cuenta si ya tienes una o crea una nueva para continuar.",
@@ -307,6 +361,8 @@
         "soft_logout_intro_sso": "Inicie sesión y recupere el acceso a su cuenta.",
         "soft_logout_intro_unsupported_auth": "No puedes iniciar sesión en tu cuenta. Ponte en contacto con el administrador de su servidor base para obtener más información.",
         "soft_logout_subheading": "Borrar datos personales",
+        "soft_logout_warning": "Advertencia: sus datos personales (incluidas las claves de cifrado) aún están almacenados en esta sesión. Límpielos si ha terminado de usar esta sesión, o desea iniciar sesión en otra cuenta.",
+        "sso": "Inicio de Sesión Único",
         "sso_complete_in_browser_dialog_title": "Abre tu navegador web para completar el registro",
         "sso_failed_missing_storage": "Le hemos preguntado a tu navegador qué servidor base usar para iniciar tu sesión, pero parece que no lo recuerda. Vuelve a la página de inicio de sesión e inténtalo de nuevo.",
         "sso_or_username_password": "%(ssoButtons)s o %(usernamePassword)s",
@@ -319,11 +375,16 @@
             "email_resend_prompt": "¿No lo has recibido? <a>Volver a mandar</a>",
             "email_resent": "¡Reenviado!",
             "fallback_button": "Iniciar autenticación",
+            "mas_cross_signing_reset_cta": "Continuar a la cuenta",
+            "mas_cross_signing_reset_description": "Está a punto de ir a su cuenta de %(serverName)s para restablecer su identidad. Una vez que haya completado el restablecimiento en su cuenta, regrese aquí y haga clic en Reintentar.",
+            "mas_cross_signing_reset_title": "Vaya a su cuenta para restablecer su identidad",
             "msisdn": "Se envió un mensaje de texto a %(msisdn)s",
             "msisdn_token_incorrect": "Token incorrecto",
             "msisdn_token_prompt": "Por favor, escribe el código que contiene:",
             "password_prompt": "Confirma tu identidad introduciendo la contraseña de tu cuenta.",
             "recaptcha_missing_params": "Falta la clave pública del captcha en la configuración del servidor base. Por favor, informa de esto al administrador de tu servidor base.",
+            "registration_token_label": "Token de registro",
+            "registration_token_prompt": "Ingrese un token de registro proporcionado por el administrador del homeserver.",
             "sso_body": "Confirma la nueva dirección de correo usando SSO para probar tu identidad.",
             "sso_failed": "Ha ocurrido un error al confirmar tu identidad. Cancela e inténtalo de nuevo.",
             "sso_postauth_body": "Haz clic en el botón de abajo para confirmar tu identidad.",
@@ -333,10 +394,13 @@
             "terms": "Por favor, revisa y acepta las políticas de este servidor base:",
             "terms_invalid": "Por favor, revisa y acepta todas las políticas del servidor base"
         },
+        "unsupported_auth": "Este servidor homeserver no ofrece ningún flujo de inicio de sesión compatible con este cliente.",
         "unsupported_auth_email": "Este servidor base no admite iniciar sesión con una dirección de correo electrónico.",
         "unsupported_auth_msisdn": "Este servidor no es compatible con autenticación mediante número telefónico.",
         "username_field_required_invalid": "Introduce nombre de usuario",
-        "username_in_use": "Ya hay alguien con ese nombre de usuario. Prueba con otro, por favor."
+        "username_in_use": "Ya hay alguien con ese nombre de usuario. Prueba con otro, por favor.",
+        "verify_email_explainer": "Necesitamos saber que es usted antes de restablecer su contraseña. Haga clic en el enlace del correo electrónico que acabamos de enviar a <b>%(email)s</b>",
+        "verify_email_heading": "Verifique su correo electrónico para continuar"
     },
     "bug_reporting": {
         "additional_context": "Si hay algún contexto adicional que ayude a analizar el problema, como por ejemplo lo que estaba haciendo en ese momento, nombre (ID) de sala, nombre (ID) de usuario, etc., por favor incluye esas cosas aquí.",
@@ -348,6 +412,15 @@
         "download_logs": "Descargar registros",
         "downloading_logs": "Descargando registros",
         "error_empty": "Por favor, cuéntanos qué ha fallado o, mejor aún, crea una incidencia en GitHub describiendo el problema.",
+        "failed_download_logs": "Error al descargar registros de depuración: ",
+        "failed_send_logs_causes": {
+            "disallowed_app": "Su reporte de error fue rechazado. El servidor rageshake no admite esta aplicación.",
+            "rejected_generic": "Su reporte de error fue rechazado. El servidor rageshake rechazó el contenido del reporte debido a una política.",
+            "rejected_recovery_key": "Su reporte de error fue rechazado por razones de seguridad, ya que contenía una clave de recuperación.",
+            "rejected_version": "Su reporte de error fue rechazado porque la versión que está ejecutando es demasiado antigua.",
+            "server_unknown_error": "El servidor rageshake encontró un error desconocido y no pudo manejar el reporte.",
+            "unknown_error": "Error al enviar registros."
+        },
         "github_issue": "Incidencia de GitHub",
         "introduction": "Si ya has informado de un fallo a través de GitHub, los registros de depuración nos pueden ayudar a investigar mejor el problema. ",
         "log_request": "Para ayudarnos a prevenir esto en el futuro, por favor, <a>envíanos logs</a>.",
@@ -364,6 +437,7 @@
         "uploading_logs": "Subiendo registros",
         "waiting_for_server": "Esperando una respuesta del servidor"
     },
+    "cannot_invite_without_identity_server": "No se puede invitar al usuario por correo electrónico sin un servidor de identidad. Puede conectarse a uno en \"Configuración\".",
     "cannot_reach_homeserver": "No se puede conectar con el servidor",
     "cannot_reach_homeserver_detail": "Asegúrate de tener conexión a internet, o contacta con el administrador del servidor",
     "cant_load_page": "No se ha podido cargar la página",
@@ -386,6 +460,7 @@
         "access_token": "Token de acceso",
         "accessibility": "Accesibilidad",
         "advanced": "Avanzado",
+        "all_chats": "Todos los chats",
         "analytics": "Analítica de datos",
         "and_n_others": {
             "other": "y %(count)s más…",
@@ -400,6 +475,7 @@
         "beta": "Beta",
         "camera": "Cámara",
         "cameras": "Cámaras",
+        "cancel": "Cancelar",
         "capabilities": "Funcionalidades",
         "copied": "¡Copiado!",
         "credits": "Créditos",
@@ -409,6 +485,7 @@
         "device": "Dispositivo",
         "edited": "editado",
         "email_address": "Dirección de correo electrónico",
+        "emoji": "Emoticono",
         "encrypted": "Cifrado",
         "encryption_enabled": "El cifrado está activado",
         "error": "Error",
@@ -417,6 +494,7 @@
         "feedback": "Danos tu opinión",
         "filter_results": "Filtrar resultados",
         "forward_message": "Reenviar mensaje",
+        "general": "General",
         "go_to_settings": "Ir a la configuración",
         "guest": "Invitado",
         "help": "Ayuda",
@@ -428,6 +506,7 @@
         "integration_manager": "Gestor de integración",
         "joined": "Te has unido",
         "labs": "Experimentos",
+        "legal": "Legal",
         "light": "Claro",
         "loading": "Cargando…",
         "location": "Ubicación",
@@ -435,8 +514,10 @@
         "matrix": "Matrix",
         "message": "Mensaje",
         "message_layout": "Diseño del mensaje",
+        "message_timestamp_invalid": "Marca de tiempo inválida",
         "microphone": "Micrófono",
         "model": "Modelo",
+        "moderation_and_safety": "Moderación y seguridad",
         "modern": "Moderno",
         "mute": "Silenciar",
         "n_members": {
@@ -472,10 +553,13 @@
         "qr_code": "Código QR",
         "random": "Al azar",
         "reactions": "Reacciones",
+        "recommended": "Recomendado",
         "report_a_bug": "Avísanos de un fallo",
         "room": "Sala",
         "room_name": "Nombre de la sala",
         "rooms": "Salas",
+        "save": "Guardar",
+        "saved": "Guardado",
         "saving": "Guardando…",
         "secure_backup": "Copia de seguridad segura",
         "select_all": "Seleccionar todo",
@@ -502,9 +586,10 @@
         "unnamed_room": "Sala sin nombre",
         "unnamed_space": "Espacio sin nombre",
         "unverified": "Sin verificar",
+        "updating": "Actualizando...",
+        "user": "Usuario",
         "user_avatar": "Foto de perfil",
         "username": "Nombre de usuario",
-        "verification_cancelled": "Verificación cancelada",
         "verified": "Verificada",
         "version": "Versión",
         "video": "Vídeo",
@@ -748,8 +833,6 @@
             "security_key_title": "Clave de seguridad"
         },
         "bootstrap_title": "Configurando claves",
-        "cancel_entering_passphrase_description": "¿Estas seguro que quieres cancelar el ingresar tu contraseña de recuperación?",
-        "cancel_entering_passphrase_title": "¿Cancelar el ingresar tu contraseña de recuperación?",
         "confirm_encryption_setup_body": "Haz clic en el botón de abajo para confirmar la configuración del cifrado.",
         "confirm_encryption_setup_title": "Confirmar la configuración de cifrado",
         "cross_signing_room_normal": "Esta sala usa cifrado de extremo a extremo",
@@ -783,8 +866,7 @@
             "title": "Método de recuperación eliminado",
             "warning": "Si no eliminó el método de recuperación, es posible que un atacante esté intentando acceder a su cuenta. Cambie la contraseña de su cuenta y configure un nuevo método de recuperación inmediatamente en Configuración."
         },
-        "reset_all_button": "¿Has olvidado o perdido todos los métodos de recuperación? <a>Restablecer todo</a>",
-        "set_up_toast_description": "Evita perder acceso a datos y mensajes cifrados",
+        "set_up_recovery_toast_description": "Genera una clave de recuperación que puede usarse para restaurar el histórico de mensajes encriptados en caso de que pierdas el acceso a tus dispositivos.",
         "set_up_toast_title": "Configurar copia de seguridad segura",
         "setup_secure_backup": {
             "explainer": "Haz copia de seguridad de tus claves antes de cerrar sesión para evitar perderlas."
@@ -803,12 +885,8 @@
             "after_new_login": {
                 "device_verified": "Dispositivo verificado",
                 "skip_verification": "Saltar la verificación por ahora",
-                "unable_to_verify": "No se ha podido verificar el dispositivo",
                 "verify_this_device": "Verificar este dispositivo"
             },
-            "cancelled": "Has cancelado la verificación.",
-            "cancelled_self": "Has cancelado la verificación en tu otro dispositivo.",
-            "cancelled_user": "%(displayName)s canceló la verificación.",
             "cancelling": "Anulando…",
             "complete_action": "Entendido",
             "complete_description": "Has verificado correctamente a este usuario.",
@@ -823,45 +901,32 @@
             "incoming_sas_dialog_waiting": "Esperando a que la otra persona confirme…",
             "incoming_sas_user_dialog_text_1": "Verifica a este usuario para marcarlo como de confianza. Confiar en usuarios aporta tranquilidad en los mensajes cifrados de extremo a extremo.",
             "incoming_sas_user_dialog_text_2": "Verificar este usuario marcará su sesión como de confianza, y también marcará tu sesión como de confianza para él.",
-            "no_key_or_device": "Parece que no tienes una clave de seguridad u otros dispositivos para la verificación.  Este dispositivo no podrá acceder los mensajes cifrados antiguos. Para verificar tu identidad en este dispositivo, tendrás que restablecer tus claves de verificación.",
             "no_support_qr_emoji": "El dispositivo que estás intentando verificar no es compatible con el escaneo de códigos QR o la verificación con emojis, que son las opciones que %(brand)s ofrece. Prueba con otra aplicación distinta.",
             "other_party_cancelled": "El otro lado canceló la verificación.",
             "prompt_encrypted": "Verifica a todos los usuarios de una sala para asegurar que es segura.",
-            "prompt_self": "Inicie la verificación nuevamente a partir de la notificación.",
             "prompt_unencrypted": "En salas cifradas, verifica a todos los usuarios para asegurarte de que es segura.",
-            "prompt_user": "Empieza la verificación de nuevo desde su perfil.",
             "qr_or_sas": "%(qrCode)s o %(emojiCompare)s",
-            "qr_or_sas_header": "Verifica este dispositivo completando una de las siguientes opciones:",
             "qr_prompt": "Escanea este código",
-            "qr_reciprocate_same_shield_device": "¡Ya casi estás! ¿Ves el mismo escudo en el otro dispositivo?",
             "qr_reciprocate_same_shield_user": "¡Ya casi está! ¿Está %(displayName)s mostrando el mismo escudo?",
-            "request_toast_accept": "Verificar sesión",
             "request_toast_decline_counter": "Ignorar (%(counter)s)",
             "request_toast_detail": "%(deviceId)s desde %(ip)s",
-            "reset_proceed_prompt": "Continuar y restablecer",
             "sas_caption_self": "Verifica este dispositivo confirmando que el siguiente número aparece en pantalla.",
             "sas_caption_user": "Verifica a este usuario confirmando que este número aparece en su pantalla.",
             "sas_description": "Compara un conjunto de emojis si no tienes cámara en ninguno de los dispositivos",
-            "sas_emoji_caption_self": "Confirma que los siguientes emojis aparecen en los dos dispositivos y en el mismo orden:",
             "sas_emoji_caption_user": "Verifica este usuario confirmando que los siguientes emojis aparecen en su pantalla.",
             "sas_match": "Coinciden",
             "sas_no_match": "No coinciden",
             "sas_prompt": "Compara los emojis",
             "scan_qr": "Verificar mediante escaneo",
             "scan_qr_explainer": "Pídele a %(displayName)s que escanee tu código:",
-            "self_verification_hint": "Para continuar, acepta la solicitud de verificación en tu otro dispositivo.",
             "start_button": "Iniciar verificación",
-            "successful_device": "Has verificado con éxito %(deviceName)s (%(deviceId)s)",
-            "successful_own_device": "¡Ha verificado correctamente su dispositivo!",
             "successful_user": "¡Has verificado con éxito a %(displayName)s!",
-            "timed_out": "El tiempo máximo para la verificación se ha agotado.",
             "unsupported_method": "No es posible encontrar un método de verificación soportado.",
             "unverified_session_toast_accept": "Sí, fui yo",
             "unverified_session_toast_title": "Nuevo inicio de sesión. ¿Fuiste tú?",
             "unverified_sessions_toast_description": "Revisa que tu cuenta esté segura",
             "unverified_sessions_toast_reject": "Más tarde",
             "unverified_sessions_toast_title": "Tienes sesiones sin verificar",
-            "verification_description": "Verifica tu identidad para leer tus mensajes cifrados y probar a las demás personas que realmente eres tú.",
             "verification_dialog_title_device": "Verificar otro dispositivo",
             "verification_dialog_title_user": "Solicitud de verificación",
             "verification_skip_warning": "Si decides no verificar, no tendrás acceso a todos tus mensajes y puede que le aparezcas a los demás como «no confiado».",
@@ -871,9 +936,6 @@
             "verify_emoji_prompt": "Verifica comparando emoji únicos.",
             "verify_emoji_prompt_qr": "Si no puedes escanear el código de arriba, verifica comparando emoji únicos.",
             "verify_later": "La verificaré en otro momento",
-            "verify_using_device": "Verificar con otro dispositivo",
-            "verify_using_key": "Verificar con una clave de seguridad",
-            "verify_using_key_or_phrase": "Verificar con una clave o frase de seguridad",
             "waiting_for_user_accept": "Esperando a que %(displayName)s acepte…",
             "waiting_other_device": "Esperando a que verifiques en tu otro dispositivo…",
             "waiting_other_device_details": "Esperando a que verifiques en tu otro dispositivo, %(deviceName)s (%(deviceId)s)…",
@@ -1371,8 +1433,7 @@
     },
     "member_list": {
         "filter_placeholder": "Filtrar miembros de la sala",
-        "invite_button_no_perms_tooltip": "No tienes permisos para invitar usuarios",
-        "power_label": "%(userName)s (nivel de permisos %(powerLevelNumber)s)"
+        "invite_button_no_perms_tooltip": "No tienes permisos para invitar usuarios"
     },
     "member_list_back_action_label": "Miembros de la sala",
     "message_edit_dialog_title": "Ediciones del mensaje",
@@ -1465,6 +1526,8 @@
         "unable_edit_title": "Encuesta no editable"
     },
     "power_level": {
+        "admin": "Administrador",
+        "creator": "Propietario",
         "custom": "Personalizado (%(level)s)",
         "custom_level": "Nivel personalizado",
         "default": "Por defecto",
@@ -1644,8 +1707,6 @@
             "send_message_start_dm": "Envía tu primer mensaje para invitar a <displayName/> a la conversación",
             "start_of_dm_history": "Este es el inicio de tu historial de mensajes directos con <displayName/>.",
             "start_of_room": "Aquí empieza <roomName/>.",
-            "topic": "Asunto: %(topic)s ",
-            "topic_edit": "Asunto: %(topic)s (<a>cambiar</a>)",
             "unencrypted_warning": "El cifrado de extremo a extremo no está activado",
             "user_created": "%(displayName)s creó esta sala.",
             "you_created": "Creaste esta sala."
@@ -1976,7 +2037,6 @@
             "error_update_guest_access": "No se ha podido cambiar el acceso a este espacio",
             "error_update_history_visibility": "No se ha podido cambiar la visibilidad del historial de este espacio",
             "guest_access_explainer": "Dejar que las personas sin cuenta se unan al espacio.",
-            "guest_access_explainer_public_space": "Esto puede ser útil para espacios públicos.",
             "guest_access_label": "Permitir acceso a personas sin cuenta",
             "history_visibility_anyone_space": "Previsualizar espacio",
             "history_visibility_anyone_space_description": "Permitir que se pueda ver una vista previa del espacio antes de unirse a él.",
@@ -2069,6 +2129,11 @@
         "emoji_autocomplete": "Sugerir emojis mientras escribes",
         "enable_markdown": "Activar Markdown",
         "enable_markdown_description": "Empieza tu mensaje con <code>/plain</code> para enviarlo sin markdown.",
+        "encryption": {
+            "recovery": {
+                "set_up_recovery_secondary_description": "Después de hacer clic en continuar te generaremos una clave de recuperación."
+            }
+        },
         "general": {
             "account_management_section": "Gestión de la cuenta",
             "account_section": "Cuenta",
@@ -2140,10 +2205,6 @@
         "insert_trailing_colon_mentions": "Inserta automáticamente dos puntos después de las menciones que hagas al principio de los mensajes",
         "jump_to_bottom_on_send": "Saltar abajo del todo al enviar un mensaje",
         "key_backup": {
-            "backup_in_progress": "Se está realizando una copia de seguridad de sus claves (la primera copia de seguridad puede tardar unos minutos).",
-            "backup_success": "¡Éxito!",
-            "cannot_create_backup": "No se puede crear una copia de seguridad de la clave",
-            "create_title": "Crear copia de seguridad de claves",
             "setup_secure_backup": {
                 "cancel_warning": "Si cancela ahora, puede perder mensajes y datos cifrados si pierde el acceso a sus inicios de sesión.",
                 "confirm_security_phrase": "Confirma tu frase de seguridad",
@@ -2245,7 +2306,6 @@
             "ignore_users_empty": "No has ignorado a nadie.",
             "ignore_users_section": "Usuarios ignorados",
             "key_backup_algorithm": "Algoritmo:",
-            "key_backup_connect": "Conecta esta sesión a la copia de respaldo de tu clave",
             "message_search_disable_warning": "Si está desactivado, los mensajes de las salas cifradas no aparecerán en los resultados de búsqueda.",
             "message_search_disabled": "Almacenar localmente, de manera segura, a los mensajes cifrados localmente para que aparezcan en los resultados de búsqueda.",
             "message_search_enabled": {
@@ -2330,7 +2390,7 @@
             "security_recommendations_description": "Mejora la seguridad de tu cuenta siguiendo estas recomendaciones.",
             "session_id": "ID de Sesión",
             "show_details": "Mostrar detalles",
-            "sign_in_with_qr": "Iniciar sesión con código QR",
+            "sign_in_with_qr": "Vincular un dispositivo nuevo",
             "sign_in_with_qr_button": "Ver código QR",
             "sign_in_with_qr_description": "Puedes usar este dispositivo para iniciar sesión en uno nuevo escaneando un código QR. Tendrás que escanearlo con el nuevo dispositivo que quieras usar para iniciar sesión.",
             "sign_out": "Cerrar esta sesión",
@@ -2374,7 +2434,6 @@
             "metaspaces_subsection": "Qué espacios mostrar",
             "title": "Barra lateral"
         },
-        "start_automatically": "Abrir automáticamente después de iniciar sesión en el sistema",
         "use_12_hour_format": "Mostrar las horas con el modelo de 12 horas (ej.: 2:30pm)",
         "use_command_enter_send_message": "Usa Comando + Intro para enviar un mensje",
         "use_command_f_search": "Usa Control + F para buscar",
@@ -2485,6 +2544,7 @@
         "upgraderoom": "Actualiza una sala a una nueva versión",
         "upgraderoom_permission_error": "No tienes los permisos requeridos para usar este comando.",
         "usage": "Uso",
+        "verify": "Verifica a un usuario, sesión y tupla de clave pública",
         "whois": "Muestra información sobre un usuario"
     },
     "space": {
@@ -2698,6 +2758,7 @@
             "unable_to_find": "Se ha intentado cargar cierto punto en la cronología de esta sala, pero no se ha podido encontrarlo."
         },
         "m.audio": {
+            "audio_player": "Reproductor de audio",
             "error_downloading_audio": "Error al descargar el audio",
             "error_processing_audio": "Error al procesar el mensaje de audio",
             "error_processing_voice_message": "Ha ocurrido un error al procesar el mensaje de voz",
@@ -2759,7 +2820,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Cerró una encuesta",
             "sender_ended": "%(senderName)s ha terminado una encuesta"
         },
         "m.poll.start": "%(senderName)s ha empezado una encuesta – %(pollQuestion)s",
@@ -3189,6 +3249,7 @@
         "verify_explainer": "Para mayor seguridad, verifica a este usuario comprobando un código temporal vez dos de tus dispositivos."
     },
     "user_menu": {
+        "link_new_device": "Vincular un dispositivo nuevo",
         "settings": "Ajustes",
         "switch_theme_dark": "Cambiar al tema oscuro",
         "switch_theme_light": "Cambiar al tema claro"
@@ -3221,7 +3282,6 @@
         "dialpad": "Teclado numérico",
         "disable_camera": "Apagar cámara",
         "disable_microphone": "Silenciar micrófono",
-        "disabled_no_one_here": "No hay nadie a quien llamar aquí",
         "disabled_no_perms_start_video_call": "No tienes permiso para empezar videollamadas",
         "disabled_no_perms_start_voice_call": "No tienes permiso para iniciar llamadas de voz",
         "disabled_ongoing_call": "Llamada en curso",
diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 666ed60825..54bc4576e4 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -93,7 +93,7 @@
         "maximise": "Suurenda maksimaalseks",
         "mention": "Maini",
         "minimise": "Väike vaade",
-        "new_message": "Uus sõnum",
+        "new_conversation": "Uus vestlus",
         "new_room": "Uus jututuba",
         "new_video_room": "Uus videotuba",
         "next": "Järgmine",
@@ -240,8 +240,7 @@
             "setup_key_backup_title": "Sa kaotad ligipääsu oma krüptitud sõnumitele",
             "setup_secure_backup_description_1": "Krüptitud sõnumid kasutavad läbivat krüptimist. Ainult sinul ja saaja(te)l on võtmed selliste sõnumite lugemiseks.",
             "setup_secure_backup_description_2": "Kui sa logid välja, siis krüptovõtmed kustutatakse sellest seadmest. Seega, kui sul pole krüptovõtmeid varundatud teistes seadmetes või kasutusel serveripoolset varundust, siis sa krüptitud sõnumeid hiljem lugeda ei saa.",
-            "skip_key_backup": "Ma ei soovi oma krüptitud sõnumeid",
-            "use_key_backup": "Võta kasutusele krüptovõtmete varundamine"
+            "skip_key_backup": "Ma ei soovi oma krüptitud sõnumeid"
         },
         "misconfigured_body": "Palu, et sinu %(brand)s'u haldur kontrolliks <a>sinu seadistusi</a> võimalike vigaste või topeltkirjete osas.",
         "misconfigured_title": "Sinu %(brand)s'i seadistused on paigast ära",
@@ -469,7 +468,7 @@
     "common": {
         "access_token": "Pääsuluba",
         "accessibility": "Ligipääsetavus",
-        "advanced": "Teave arendajatele",
+        "advanced": "Lisavõimalused",
         "all_chats": "Kõik vestlused",
         "analytics": "Analüütika",
         "and_n_others": {
@@ -555,7 +554,7 @@
         "privacy": "Privaatsus",
         "private": "Privaatne",
         "private_room": "Omavaheline jututuba",
-        "private_space": "Privaatne kogukonnakeskus",
+        "private_space": "Privaatne kogukond",
         "profile": "Profiil",
         "public": "Avalik",
         "public_room": "Avalik jututuba",
@@ -600,12 +599,12 @@
         "user": "Kasutaja",
         "user_avatar": "Profiilipilt",
         "username": "Kasutajanimi",
-        "verification_cancelled": "Verifitseerimine tühistatud",
         "verified": "Verifitseeritud",
         "version": "Versioon",
         "video": "Video",
         "video_room": "Videotuba",
         "view_message": "Vaata sõnumit",
+        "voice": "Hääl",
         "warning": "Hoiatus"
     },
     "composer": {
@@ -617,7 +616,7 @@
             "notification_a11y": "Teavituste automaatne lõpetamine",
             "notification_description": "Jututoa teavitus",
             "room_a11y": "Jututubade nimede automaatne lõpetamine",
-            "space_a11y": "Kogukonnakeskuste dünaamiline otsing",
+            "space_a11y": "Kogukondade dünaamiline otsing",
             "user_a11y": "Kasutajanimede automaatne lõpetamine",
             "user_description": "Kasutajad"
         },
@@ -646,16 +645,17 @@
         "mode_plain": "Peida vormindus",
         "mode_rich_text": "Näita vormingut",
         "no_perms_notice": "Sul ei ole õigusi siia jututuppa kirjutamiseks",
-        "placeholder": "Saada sõnum…",
-        "placeholder_encrypted": "Saada krüptitud sõnum…",
-        "placeholder_reply": "Saada vastus…",
-        "placeholder_reply_encrypted": "Saada krüptitud vastus…",
-        "placeholder_thread": "Vasta jutulõngas…",
-        "placeholder_thread_encrypted": "Vasta krüptitud jutulõngas…",
+        "placeholder": "Saada krüptimata sõnum…",
+        "placeholder_encrypted": "Saada sõnum…",
+        "placeholder_reply": "Saada krüptimata vastus…",
+        "placeholder_reply_encrypted": "Saada vastus…",
+        "placeholder_thread": "Vasta krüptimata jutulõngas…",
+        "placeholder_thread_encrypted": "Vasta jutulõngas…",
         "poll_button": "Küsitlus",
         "poll_button_no_perms_description": "Sul ei ole õigusi küsitluste korraldamiseks siin jututoas.",
         "poll_button_no_perms_title": "Vaja on täiendavaid õigusi",
         "replying_title": "Vastan",
+        "room_unencrypted": "Selle jututoa sõnumid pole läbivalt krüptitud",
         "room_upgraded_link": "Vestlus jätkub siin.",
         "room_upgraded_notice": "See jututuba on asendatud teise jututoaga ning ei ole enam kasutusel.",
         "send_button_title": "Saada sõnum",
@@ -706,7 +706,7 @@
         "creating_rooms": "Loon jututube…",
         "done_action": "Palun vaata minu kogukonnakeskust",
         "done_action_first_room": "Mine minu esimese jututoa juurde",
-        "explainer": "Kogukonnakeskused on uus võimalus jututubade ja inimeste liitmiseks. Missugust kogukonnakeskust sa tahaksid luua? Sa saad seda hiljem muuta.",
+        "explainer": "Kogukonnad on uus võimalus jututubade ja inimeste liitmiseks. Missugust kogukonda sa tahaksid luua? Sa saad seda hiljem muuta.",
         "failed_create_initial_rooms": "Algsete jututubade loomine ei õnnestunud",
         "failed_invite_users": "Järgnevate kasutajate kutsumine kogukonnakeskusesse ei õnnestunud: %(csvUsers)s",
         "invite_teammates_by_username": "Kutsu kasutajanime alusel",
@@ -718,7 +718,8 @@
         "personal_space": "Vaid mina",
         "personal_space_description": "Privaatne kogukonnakeskus jututubade koondamiseks",
         "private_description": "Liitumine vaid kutse alusel, sobib sulle ja sinu lähematele kaaslastele",
-        "private_heading": "Sinu privaatne kogukonnakeskus",
+        "private_heading": "Sinu privaatne kogukond",
+        "private_only_heading": "Sinu kogukond",
         "private_personal_description": "Palun kontrolli, et vajalikel inimestel oleks ligipääs siia - %(name)s",
         "private_personal_heading": "Kellega sa koos töötad?",
         "private_space": "Mina ja minu kaasteelised",
@@ -786,6 +787,7 @@
             "cross_signing_status": "Risttunnustamise olek:",
             "cross_signing_untrusted": "Sinu kasutajakonto risttunnustamise identiteet on krüptitud andmehoidlas olemas, aga see sessioon teda veel ei usalda.",
             "crypto_not_available": "Krüptomoodul pole saadaval",
+            "device_id": "Seadme tunnus",
             "key_backup_active_version": "Varukoopia aktiivne versioon:",
             "key_backup_active_version_none": "Puudub",
             "key_backup_inactive_warning": "See sessioon ei varunda sinu krüptovõtmeid.",
@@ -798,11 +800,24 @@
             "secret_storage_ready": "on valmis",
             "secret_storage_status": "Krüptitud andmeruum:",
             "self_signing_private_key_cached_status": "Privaatvõti allkirjastamiseks sinu nimel:",
+            "session": "Sessioon",
+            "session_fingerprint": "Sõrmejälg (sessiooni võti)",
             "title": "Läbiv krüptimine",
             "user_signing_private_key_cached_status": "Kasutaja privaatvõti allkirjastamiseks:"
         },
         "developer_mode": "Arendusrežiim",
         "developer_tools": "Arendusvahendid",
+        "device_dehydrated_no": "Virtuaalne seade serveris (dehüdreeritud): ei",
+        "device_dehydrated_yes": "Virtuaalne seade serveris (dehüdreeritud): jah",
+        "device_id": "Seadme tunnus: %(deviceId)s",
+        "device_keys": "Seadme võtmed",
+        "device_verification_status": {
+            "signed_by_owner": "Verifitseerimise olek: <E2EIcon /> omanik on allkirjastanud",
+            "unknown": "Verifitseerimise olek: teadmata",
+            "unverified": "Verifitseerimise olek: <E2EIcon /> pole omaniku poolt allkirjastatud",
+            "verified": "Verifitseerimise olek: <E2EIcon /> verifitseeritud risttunnustamisega"
+        },
+        "devices": "Krüptoseadmed (%(count)s)",
         "edit_setting": "Muuda seadistust",
         "edit_values": "Muuda väärtusi",
         "empty_string": "<tühi string>",
@@ -818,16 +833,20 @@
         "failed_to_save": "Seadistuste salvestamine ei õnnestunud.",
         "failed_to_send": "Päringu või sündmuse saatmine ei õnnestunud!",
         "id": "ID: ",
+        "invalid_device_key_id": "Vigane seadme võtme tunnus",
         "invalid_json": "See ei tundu olema korrektse json-andmestikuna.",
         "level": "Tase",
         "low_bandwidth_mode": "Vähese ribalaiusega režiim",
         "low_bandwidth_mode_description": "Eeldab, et koduserver toetab sellist funktsionaalsust.",
         "main_timeline": "Peamine ajajoon",
+        "manual_device_verification": "Seadme käsitsi verifitseerimine",
         "no_receipt_found": "Lugemisteatist ei leidu",
         "notification_state": "Teavituste olek: <strong>%(notificationState)s</strong>",
         "notifications_debug": "Teavituste silumine",
         "number_of_users": "Kasutajate arv",
+        "only_joined_members": "Vaid liitunud kasutajad",
         "original_event_source": "Sündmuse töötlemata lähtekood",
+        "restore_from_backup": "Taasta varukoopiast",
         "room_encrypted": "Jututuba on <strong>krüptitud ✅</strong>",
         "room_id": "Jututoa tunnus: %(roomId)s",
         "room_not_encrypted": "Jututuba on <strong>krüptimata 🚨</strong>",
@@ -860,6 +879,7 @@
             "elementCallUrl": "Element Calli võrguaadress"
         },
         "settings_explorer": "Seadistuste haldur",
+        "show_empty_content_events": "Näita tühja sisuga sündmusi",
         "show_hidden_events": "Näita peidetud sündmusi ajajoonel",
         "spaces": {
             "other": "<%(count)s kogukonda>",
@@ -872,10 +892,23 @@
         "toggle_event": "lülita sündmus sisse/välja",
         "toolbox": "Töövahendid",
         "use_at_own_risk": "See kasutajaliides ei oska kontrollida väärtuste tüüpi ja vormingut. Muudatusi teed omal vastutusel.",
+        "user_avatar": "Tunnuspilt: %(avatar)s",
+        "user_displayname": "Kuvatav nimi: %(displayname)s",
+        "user_id": "Kasutaja tunnus: %(userId)s",
+        "user_no_avatar": "Tunnuspilt: <i>puudub</i>",
+        "user_no_displayname": "Kuvatav nimi: <i>puudub</i>",
         "user_read_up_to": "Kasutaja on lugenud kuni: ",
         "user_read_up_to_ignore_synthetic": "Kasutaja luges kuni sõnumini (ignoreSynthetic): ",
         "user_read_up_to_private": "Kasutaja luges kuni sõnumini (m.read.private): ",
         "user_read_up_to_private_ignore_synthetic": "Kasutaja luges kuni sõnumini (m.read.private;ignoreSynthetic): ",
+        "user_room_membership": "Liikmelisus: %(membership)s",
+        "user_verification_status": {
+            "identity_changed": "Verifitseerimise olek: <E2EIcon /> verifitseerimata ja võrguidentiteet on muutunud",
+            "unverified": "Verifitseerimise olek: <E2EIcon /> verifitseerimata",
+            "verified": "Verifitseerimise olek: <E2EIcon /> verifitseeritud",
+            "was_verified": "Verifitseerimise olek: <E2EIcon /> oli verifitseeritud, aga võrguidentiteet muutus"
+        },
+        "users": "Kasutajad",
         "value": "Väärtus",
         "value_colon": "Väärtus:",
         "value_in_this_room": "Väärtus selles jututoas",
@@ -917,13 +950,13 @@
             },
             "privacy_warning": "Palun vaata, et keegi teine ei näeks seda ekraanivaadet!",
             "restoring": "Taastan võtmed varundusest",
-            "security_key_title": "Taastevõti"
+            "security_key_label": "Taastevõti",
+            "security_key_title": "Sisesta oma taastevõti"
         },
         "bootstrap_title": "Võtame krüptovõtmed kasutusele",
-        "cancel_entering_passphrase_description": "Kas oled kindel et sa soovid katkestada paroolifraasi sisestamise?",
-        "cancel_entering_passphrase_title": "Kas katkestame paroolifraasi sisestamise?",
         "confirm_encryption_setup_body": "Kinnitamaks, et soovid krüptimist seadistada, klõpsi järgnevat nuppu.",
         "confirm_encryption_setup_title": "Krüptimise seadistuse kinnitamine",
+        "continue_with_reset": "Jätka lähtestamisega",
         "cross_signing_room_normal": "See jututuba on läbivalt krüptitud",
         "cross_signing_room_verified": "Kõik kasutajad siin jututoas on verifitseeritud",
         "cross_signing_room_warning": "Keegi kasutab tundmatut sessiooni",
@@ -932,12 +965,14 @@
         "cross_signing_user_warning": "See kasutaja ei ole verifitseerinud kõiki oma sessioone.",
         "enter_recovery_key": "Sisesta taastevõti",
         "event_shield_reason_authenticity_not_guaranteed": "Selle krüptitud sõnumi autentsus pole selles seadmes tagatud.",
+        "event_shield_reason_mismatched_sender": "Sündmuse saatja ja seadme omanik pole vastavuses.",
         "event_shield_reason_mismatched_sender_key": "Krüptitud verifitseerimata sessiooni poolt",
         "event_shield_reason_unknown_device": "Krüptitud tundmatu või kustutatud seadme poolt.",
         "event_shield_reason_unsigned_device": "Krüptitud seadme poolt, mida selle omanik ei ole verifitseerinud.",
         "event_shield_reason_unverified_identity": "Krüptitud verifitseerimata kasutaja poolt.",
         "export_unsupported": "Sinu brauser ei toeta vajalikke krüptoteeke",
         "forgot_recovery_key": "Kas unustasid taastevõtme?",
+        "identity_needs_reset_description": "Sõnumite ajaloole juurdepääsu tagamiseks pead oma krüptograafilise võrguidentiteedi lähtestama.",
         "import_invalid_keyfile": "See ei ole sobilik võtmefail %(brand)s'i jaoks",
         "import_invalid_passphrase": "Autentimine ebaõnnestus: kas salasõna pole õige?",
         "key_storage_out_of_sync": "Sinu krüptovõtmete hoidla pole sünkroonis.",
@@ -964,11 +999,8 @@
             "title": "Taastemeetod on eemaldatud",
             "warning": "Kui sa ei ole ise taastamise meetodeid eemaldanud, siis võib olla tegemist ründega sinu konto vastu. Palun vaheta koheselt oma kasutajakonto salasõna ning määra seadistustes uus taastemeetod."
         },
-        "reset_all_button": "Unustasid või oled kaotanud kõik võimalused ligipääsu taastamiseks? <a>Lähtesta kõik ühe korraga</a>",
         "set_up_recovery": "Seadista krüptovõtmete taastamine",
-        "set_up_recovery_later": "Mitte praegu",
         "set_up_recovery_toast_description": "Kui peaksid kaotama ligipääsu oma seadmetele, siis siinloodava taastevõtmega saad taastada ligipääsu oma krüptitud sõnumitele.",
-        "set_up_toast_description": "Hoia ära, et kaotad ligipääsu krüptitud sõnumitele ja andmetele",
         "set_up_toast_title": "Võta kasutusele turvaline varundus",
         "setup_secure_backup": {
             "explainer": "Vältimaks nende kaotamist, varunda krüptovõtmed enne väljalogimist."
@@ -989,16 +1021,17 @@
             "after_new_login": {
                 "device_verified": "Seade on verifitseeritud",
                 "skip_verification": "Jäta verifitseerimine praegu vahele",
-                "unable_to_verify": "Selle seadme verifitseerimine ei õnnestunud",
                 "verify_this_device": "Verifitseeri see seade"
             },
-            "cancelled": "Sina tühistasid verifitseerimise.",
-            "cancelled_self": "Sina tühistasid verifitseerimise oma teises seadmes.",
-            "cancelled_user": "%(displayName)s tühistas verifitseerimise.",
+            "cancelled_verification": "Kas verifitseerimine aegus, teine osapool keeldus vastamast või tekkis vastuste mittevastavus.",
             "cancelling": "Tühistan…",
+            "cant_confirm": "Kas kinnitamine ei õnnestu?",
             "complete_action": "Selge lugu",
             "complete_description": "Sa oled edukalt verifitseerinud selle kasutaja.",
             "complete_title": "Verifitseeritud!",
+            "confirm_identity_description": "Krüptitud sõnumivahetuse tagamiseks verifitseeri see seade",
+            "confirm_identity_title": "Kinnita, et see oled sina",
+            "confirm_the_emojis": "Kinnita, et kõik järgnevalt kuvatud emojid on täpselt samad, mida sa näed oma teises sessioonis.",
             "error_starting_description": "Meil ei õnnestunud alustada vestlust teise kasutajaga.",
             "error_starting_title": "Viga verifitseerimise alustamisel",
             "explainer": "Turvalised sõnumid selle kasutajaga on läbivalt krüptitud ning kolmandad osapooled ei saa neid lugeda.",
@@ -1009,58 +1042,72 @@
             "incoming_sas_dialog_waiting": "Ootan teise osapoole kinnitust…",
             "incoming_sas_user_dialog_text_1": "Selle kasutaja usaldamiseks peaksid ta verifitseerima. Kui sa pruugid läbivalt krüptitud sõnumeid, siis kasutajate verifitseerimine tagab sulle täiendava meelerahu.",
             "incoming_sas_user_dialog_text_2": "Selle kasutaja verifitseerimisel märgitakse tema sessioon usaldusväärseks ning samuti märgitakse sinu sessioon tema jaoks usaldusväärseks.",
-            "no_key_or_device": "Tundub, et sul ei ole ei taastevõtit ega muid seadmeid, mida saaksid verifitseerimiseks kasutada. Siin seadmes ei saa lugeda vanu krüptitud sõnumeid. Enda tuvastamiseks selles seadmes pead oma vanad verifitseerimisvõtmed kustutama.",
+            "manual": {
+                "already_verified": "See seade on juba verifitseeritud",
+                "already_verified_and_wrong_fingerprint": "Viidatud sõrmejälg ei klapi, aga see seade on juba verifitseeritud!",
+                "device_id": "Seadme tunnus",
+                "failure_description": "„%(deviceId)s“ seadme verifitseerimine ei õnnestunud: %(error)s",
+                "failure_title": "Verifitseerimine ei õnnestunud",
+                "fingerprint": "Sõrmejälg (sessiooni võti)",
+                "no_crypto": "Seadme verifitseerimine ei õnnestunud - krüptoteenused pole kasutusel",
+                "no_device": "Seadme verifitseerimine ei õnnestunud - seadet tunnusega „%(deviceId)s“ polnud võimalik leida",
+                "no_userid": "Seadme verifitseerimine ei õnnestunud - meie kasutajatunnust ei õnnestu leida",
+                "success_description": "See seade (%(deviceId)s) on nüüd risttunnustatud",
+                "success_title": "Verifitseerimine õnnestus",
+                "text": "Verifitseerimiseks sisesta ühe oma seadme tunnus ja sõrmejälg. Palun arvesta, et see võimaldab muul seadmel saata ja vastu võtta sõnumeid esinedes sinuna. KUI KEEGI PALUS SUL SIIA MIDAGI KOPEERIDA, SIIS ON SEE KAHTLANE JA ILMSELT PROOVITAKSE SIND PETTA!",
+                "wrong_fingerprint": "„%(deviceId)s“ seadme verifitseerimine ei õnnestunud - lisatud sõrmejälg „%(fingerprint)s“ ja seadme sõrmejälg „%(fprint)s“ pole samad"
+            },
             "no_support_qr_emoji": "See seade, mida sa tahad verifitseerida ei toeta QR-koodi ega emoji-põhist verifitseerimist, aga just neid %(brand)s oskab kasutada. Proovi mõne muu Matrix'i kliendiga.",
+            "now_you_can": "Nüüd saad saata või lugeda sõnumeid turvaliselt ning kõik sinu vestluspartnerid võivad usaldada seda seadet.",
+            "once_accepted_can_continue": "Kui oled nõustunud, siis saad sa verifitseerimist jätkata.",
             "other_party_cancelled": "Teine osapool tühistas verifitseerimise.",
             "prompt_encrypted": "Tagamaks, et jututuba on turvaline, verifitseeri kõik selle kasutajad.",
-            "prompt_self": "Alusta verifitseerimist uuesti teavitusest.",
             "prompt_unencrypted": "Krüptitud jututubades turvalisuse tagamiseks verifitseeri kõik kasutajad.",
-            "prompt_user": "Alusta verifitseerimist uuesti nende profiilist.",
             "qr_or_sas": "%(qrCode)s või %(emojiCompare)s",
-            "qr_or_sas_header": "Verifitseeri see seade täites ühe alljärgnevatest:",
             "qr_prompt": "Skaneeri seda unikaalset koodi",
-            "qr_reciprocate_same_shield_device": "Peaaegu valmis! Kas sinu teine seade kuvab sama kilpi?",
+            "qr_reciprocate_check_again_device": "Verifitseerimise lõpuleviimiseks kontrolli uuesti teavet oma teises seadmes.",
+            "qr_reciprocate_no": "Ei, ma ei näe rohelist kilbi ikooni",
             "qr_reciprocate_same_shield_user": "Peaaegu valmis! Kas %(displayName)s kuvab sama kilpi?",
-            "request_toast_accept": "Verifitseeri sessioon",
+            "qr_reciprocate_yes": "Jah, ma näen rohelist kilbi ikooni",
             "request_toast_accept_user": "Verifitseeri kasutaja",
             "request_toast_decline_counter": "Eira (%(counter)s)",
             "request_toast_detail": "%(deviceId)s ip-aadressil %(ip)s",
-            "reset_proceed_prompt": "Jätka kustutamisega",
+            "request_toast_start_verification": "Alusta verifitseerimist",
             "sas_caption_self": "Verifitseeri see seade tehes kindlaks, et järgnev number kuvatakse tema ekraanil.",
             "sas_caption_user": "Verifitseeri see kasutaja tehes kindlaks, et järgnev number kuvatakse tema ekraanil.",
             "sas_description": "Kui sul mõlemas seadmes pole kaamerat, siis võrdle unikaalset emoji'de komplekti",
-            "sas_emoji_caption_self": "Kontrolli, et allpool näidatud emoji'd on kuvatud mõlemas seadmes samas järjekorras:",
             "sas_emoji_caption_user": "Verifitseeri see kasutaja tehes kindlaks et järgnev emoji kuvatakse tema ekraanil.",
             "sas_match": "Nad klapivad",
             "sas_no_match": "Nad ei klapi",
             "sas_prompt": "Võrdle unikaalseid emoji'sid",
             "scan_qr": "Verifitseeri skaneerides",
             "scan_qr_explainer": "Palu, et %(displayName)s skaneeriks sinu koodi:",
-            "self_verification_hint": "Jätkamaks palun võta vastu verifitseerimispalve oma teises seadmes.",
             "start_button": "Alusta verifitseerimist",
-            "successful_device": "Sa oled edukalt verifitseerinud seadme %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "Sinu seadme verifitseerimine oli edukas!",
             "successful_user": "Sa oled edukalt verifitseerinud kasutaja %(displayName)s!",
-            "timed_out": "Verifitseerimine aegus.",
             "unsupported_method": "Ei suuda leida toetatud verifitseerimismeetodit.",
             "unverified_session_toast_accept": "Jah, see olin mina",
             "unverified_session_toast_title": "Uus sisselogimine. Kas see olid sina?",
             "unverified_sessions_toast_description": "Tagamaks, et su konto on sinu kontrolli all, vaata andmed üle",
             "unverified_sessions_toast_reject": "Hiljem",
             "unverified_sessions_toast_title": "Sul on verifitseerimata sessioone",
-            "verification_description": "Tagamaks ligipääsu oma krüptitud sõnumitele ja tõestamaks oma isikut teistele kasutajatale, verifitseeri end. Kui kasutad mobiilirakendust, siis palun ava see enne jätkamist.",
+            "use_another_device": "Kasuta mõnda muud seadet",
+            "use_recovery_key": "Kasuta taastevõtit",
+            "verification_dialog_title_choose": "Vali verifitseerimise viis",
+            "verification_dialog_title_compare_emojis": "Võrdle emojisid",
+            "verification_dialog_title_confirm_green_shield": "Veendu, et näed oma teises seadmes rohelist kilbi ikooni",
             "verification_dialog_title_device": "Verifitseeri oma teine seade",
+            "verification_dialog_title_failed": "Verifitseerimine ei õnnestunud",
+            "verification_dialog_title_start_on_other_device": "Alusta verifitseerimist teises seadmes",
             "verification_dialog_title_user": "Verifitseerimispäring",
+            "verification_dialog_title_verified": "Seade on verifitseeritud",
             "verification_skip_warning": "Ilma verifitseerimiseta sul puudub ligipääs kõikidele oma sõnumitele ning teised ei näe sinu kasutajakontot usaldusväärsena.",
             "verification_success_with_backup": "Sinu uus seade on nüüd verifitseeritud. Selles seadmes saad lugeda oma krüptitud sõnumeid ja teiste kasutajate jaoks on ta usaldusväärne.",
             "verification_success_without_backup": "Sinu uus seade on nüüd verifitseeritud. Teiste kasutajate jaoks on ta usaldusväärne.",
+            "verify_by_completing_one_of": "Verifitseeri, tehes ühe järgmistest toimingutest:",
             "verify_emoji": "Verifitseeri emoji'de abil",
             "verify_emoji_prompt": "Verifitseeri unikaalsete emoji'de võrdlemise teel.",
             "verify_emoji_prompt_qr": "Kui sa ei saa skaneerida eespool kuvatud koodi, siis verifitseeri unikaalsete emoji'de võrdlemise teel.",
             "verify_later": "Ma verifitseerin hiljem",
-            "verify_using_device": "Verifitseeri teise seadmega",
-            "verify_using_key": "Verifitseeri taastevõtmega",
-            "verify_using_key_or_phrase": "Verifitseeri taastevõtme või -fraasiga",
             "waiting_for_user_accept": "Ootan, et %(displayName)s nõustuks…",
             "waiting_other_device": "Ootan, et sa verifitseeriksid oma teises seadmes…",
             "waiting_other_device_details": "Ootan, et sa verifitseerid oma teises seadmes: %(deviceName)s (%(deviceId)s)…",
@@ -1110,6 +1157,7 @@
         "tls": "Ei sa ühendust koduserveriga. Palun kontrolli, et sinu <a>koduserveri SSL sertifikaat</a> oleks usaldusväärne ning mõni brauseri lisamoodul ei blokeeri päringuid.",
         "unknown": "Teadmata viga",
         "unknown_error_code": "tundmatu veakood",
+        "update_history_visibility": "Ei õnnestunud muuta ajaloo nähtavust",
         "update_power_level": "Õiguste muutmine ei õnnestunud"
     },
     "error_app_open_in_another_tab": "%(brand)s'i kasutamiseks ava teine vahekaart. Selle vahekaardi võid kinni panna.",
@@ -1350,6 +1398,10 @@
         "name_email_mxid_share_space": "Kutsu teist osapoolt tema nime, e-posti aadressi, kasutajanime (nagu <userId/>) alusel või <a>jaga seda kogukonnakeskust</a>.",
         "name_mxid_share_room": "Kutsu kedagi tema nime, kasutajanime (nagu <userId/>) alusel või <a>jaga seda jututuba</a>.",
         "name_mxid_share_space": "Kutsu kedagi tema nime, kasutajanime (nagu <userId/>) alusel või <a>jaga seda kogukonnakeskust</a>.",
+        "progress": {
+            "dont_close": "Palun ära sulge vaadet enne kui tegevus pole lõppenud.",
+            "preparing": "Valmistan kutseid ette..."
+        },
         "recents_section": "Hiljutised vestlused",
         "room_failed_partial": "Teised kasutajad said kutse, kuid allpool toodud kasutajatele ei õnnestunud saata kutset <RoomName/> jututuppa",
         "room_failed_partial_title": "Mõnede kutsete saatmine ei õnnestunud",
@@ -1436,23 +1488,23 @@
         "room_list_navigate_down": "Suundu jututubade loendis alla",
         "room_list_navigate_up": "Suundu jututubade loendis üles",
         "room_list_select_room": "Vali tubade loendist jututuba",
+        "save": "Salvesta",
         "scroll_down_timeline": "Liigu ajajoonel alla",
         "scroll_up_timeline": "Liigu ajajoonel üles",
         "search": "Otsing (peab olema lubatud)",
         "send_sticker": "Saada kleeps",
         "shift": "Shift",
         "space": "Tühikuklahv",
-        "switch_to_space": "Vaata kogukonnakeskust tema numbri alusel",
+        "switch_to_space": "Vaata kogukonda tema numbri alusel",
         "toggle_hidden_events": "Lülita peidetud sündmuste näitamine sisse/välja",
         "toggle_microphone_mute": "Lülita mikrofoni summutamine sisse/välja",
         "toggle_right_panel": "Lülita parem paan sisse/välja",
-        "toggle_space_panel": "Lülita kogukondade riba sisse/välja",
+        "toggle_space_panel": "Lülita kogukondade paan sisse/välja",
         "toggle_top_left_menu": "Lülita ülemine vasak menüü sisse/välja",
         "toggle_webcam_mute": "Lülita veebikaamera sisse/välja",
         "upload_file": "Laadi fail üles"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Luba kasutada vaid ekraanijagamisvaadet",
         "ask_to_join": "Võta kasutusele liitumine kasutaja sooviavalduse alusel",
         "automatic_debug_logs": "Iga vea puhul saada silumislogid automaatselt arendajatele",
         "automatic_debug_logs_decryption": "Dekrüptimisvigade puhul saada silumislogid automaatselt arendajatele",
@@ -1517,6 +1569,9 @@
         "render_reaction_images_description": "Mõnikord nimetatakse neid ka „kohandatud emotikonideks“.",
         "report_to_moderators": "Teata moderaatoritele",
         "report_to_moderators_description": "Kui jututoas on modereerimine kasutusel, siis nupust „Teata sisust“ avaneva vormi abil saad jututoa reegleid rikkuvast sisust teatada moderaatoritele.",
+        "share_history_on_invite": "Jaga uute liikmetega krüptitud ajalugu",
+        "share_history_on_invite_description": "Kutsudes uut kasutajat krüptitud jututuppa, kus ajaloo nähtavus on märgitud jagatuks, siis sa jagad ajalugu selle kasutajaga ning kutsutuna nõustud selle jagamisega.",
+        "share_history_on_invite_warning": "See funktsionaalsus on KATSELINE ja kõik turvameetmed pole veel kasutusel. Palun ära kasuta tarbeserveris.",
         "sliding_sync": "Järkjärgulise sünkroniseerimise režiim",
         "sliding_sync_description": "Aktiivselt arendamisel ega ole võimalik välja lülitada.",
         "sliding_sync_disabled_notice": "Väljalülitamiseks logi Matrix'i võrgust välja ja seejärel tagasi",
@@ -1571,7 +1626,7 @@
     "leave_room_dialog": {
         "last_person_warning": "Sa oled siin viimane osaleja. Kui sa nüüd lahkud, siis mitte keegi, kaasa arvatud sa ise, ei saa hiljem enam liituda.",
         "leave_room_question": "Kas oled kindel, et soovid lahkuda jututoast „%(roomName)s“?",
-        "leave_space_question": "Kas oled kindel, et soovid lahkuda kogukonnakeskusest „%(spaceName)s“?",
+        "leave_space_question": "Kas oled kindel, et soovid lahkuda kogukonnast „%(spaceName)s“?",
         "room_leave_admin_warning": "Sa oled ainus selle jututoa haldaja. Kui sa siit lahkud, ei saa keegi teine jututoa seadistusi muuta ega muid olulisi toiminguid teha.",
         "room_leave_mod_warning": "Sa oled ainus moderaator selles jututoas. Kui sa siis lahkud, ei saa keegi teine jututoa seadistusi muuta ega muid olulisi toiminguid teha.",
         "room_rejoin_warning": "See ei ole avalik jututuba. Ilma kutseta sa ei saa uuesti liituda.",
@@ -1638,8 +1693,8 @@
         "filter_placeholder": "Filtreeri jututoa liikmeid",
         "invite_button_no_perms_tooltip": "Sul pole õigusi kutse saatmiseks teistele kasutajatele",
         "invited_label": "Kutsutud",
-        "no_matches": "Vasteid pole",
-        "power_label": "%(userName)s (õigused %(powerLevelNumber)s)"
+        "list_title": "Liikmete loend",
+        "no_matches": "Vasteid pole"
     },
     "member_list_back_action_label": "Jututoa liikmed",
     "message_edit_dialog_title": "Sõnumite muutmised",
@@ -1710,6 +1765,7 @@
         "end_message": "Küsitlus on läbi. Populaarseim vastus: %(topAnswer)s",
         "end_message_no_votes": "Küsitlus on läbi. Ühtegi osalejate ei ole.",
         "end_title": "Lõpeta küsitlus",
+        "ended_poll_label": "Küsitlus on lõppenud",
         "error_ending_description": "Vabandust, aga küsitlus jäi lõpetamata. Palun proovi uuesti.",
         "error_ending_title": "Küsitluse lõpetamine ei õnnestunud",
         "error_voting_description": "Vabandust, aga sinu valik jäi salvestamata. Palun proovi uuesti.",
@@ -1717,10 +1773,20 @@
         "failed_send_poll_description": "Vabandust, aga sinu loodud küsitlus jäi üleslaadimata.",
         "failed_send_poll_title": "Küsitluse üleslaadimine ei õnnestunud",
         "notes": "Tulemused on näha vaid siis, kui küsitlus in lõppenud",
+        "option_label": "%(number)s. valikvastus: %(answer)s",
+        "option_label_winning_with_total": {
+            "one": "%(number)s. valikvastus: %(answer)s (osutus valituks, %(count)s hääl)",
+            "other": "%(number)s. valikvastus: %(answer)s (osutus valituks, %(count)s häält)"
+        },
+        "option_label_with_total": {
+            "one": "%(number)s. valikvastus: %(answer)s (%(count)s hääl)",
+            "other": "%(number)s. valikvastus: %(answer)s (%(count)s häält)"
+        },
         "options_add_button": "Lisa valik",
         "options_heading": "Koosta valikud",
         "options_label": "Valik %(number)s",
         "options_placeholder": "Sisesta valik",
+        "poll_label": "Küsitlus",
         "topic_heading": "Mis on küsitluse teema?",
         "topic_label": "Küsimus või teema",
         "topic_placeholder": "Kirjuta midagi…",
@@ -1743,6 +1809,7 @@
     },
     "power_level": {
         "admin": "Peakasutaja",
+        "creator": "Omanik",
         "custom": "Kohandatud õigused (%(level)s)",
         "custom_level": "Kohandatud õigused",
         "default": "Tavaline",
@@ -1840,7 +1907,7 @@
         "extensions_empty_title": "Paranda oma tõhusust lisatarvikute, vidinate, võrgusildade ja robotite lisamise abil",
         "files_button": "Failid",
         "pinned_messages": {
-            "empty_description": "Siia lisamiseks vali sõnumi ning vajuta nuppu „%(pinAction)s“",
+            "empty_description": "Siia lisamiseks vali sõnum ning vajuta nuppu „%(pinAction)s“",
             "empty_title": "Et olulisi sõnumeid oleks lihtsam leida, tõsta nad esile",
             "header": {
                 "one": "1 esiletõstetud sõnum",
@@ -1851,11 +1918,6 @@
                 "other": "Sa saad esile tõsta kuni %(count)s vidinat"
             },
             "menu": "Ava menüü",
-            "release_announcement": {
-                "close": "Sobib",
-                "description": "Leiad kõik esiletõstetud sõnumid siit. Uute sõnumite siia lisamiseks liigu vajaliku sõnumi kohale ja vali „Tõsta esile“.",
-                "title": "Kõik uued esiletõstetud sõnumid"
-            },
             "reply_thread": "Vasta <link>jutulõngas</link>",
             "unpin_all": {
                 "button": "Eemalda kõik esiletõstetud sõnumid",
@@ -1957,6 +2019,7 @@
         },
         "face_pile_tooltip_shortcut": "Sealhulgas %(commaSeparatedMembers)s",
         "face_pile_tooltip_shortcut_joined": "Seahulgas Sina, %(commaSeparatedMembers)s",
+        "failed_determine_user": "Kuna liikmelisuse sündmus on muutunud, siis ei saa tuvastada, millist kasutajat peaks eirama.",
         "failed_reject_invite": "Kutse tagasilükkamine ei õnnestunud",
         "forget_room": "Unusta see jututuba",
         "forget_space": "Unusta see kogukond",
@@ -1975,7 +2038,9 @@
         "inaccessible_subtitle_1": "Proovi hiljem uuesti või küsi jututoa või kogukonna haldurilt, kas sul on ligipääs olemas.",
         "inaccessible_subtitle_2": "Astumisel jututuppa või liitumisel kogukonnaga tekkis viga %(errcode)s. Kui sa arvad, et sellise põhjusega viga ei tohiks tekkida, siis palun <issueLink>koosta veateade</issueLink>.",
         "intro": {
+            "display_topic": "Teema: <topic/>",
             "dm_caption": "Kuni kumbki teist kolmandaid osapooli liituma ei kutsu, olete siin vestluses vaid teie kahekesi.",
+            "edit_topic": "Teema: <topic/> (<a>muuda</a>)",
             "enable_encryption_prompt": "Võta seadistustes krüptimine kasutusele.",
             "encrypted_3pid_dm_pending_join": "Te saate vestelda, kui kõik on liitunud",
             "no_avatar_label": "Selleks, et teised märkaks sinu jututuba lihtsamini, palun lisa üks pilt.",
@@ -1985,8 +2050,6 @@
             "send_message_start_dm": "Saada oma esimene sõnum kutsudes <displayName/> vestlusesse",
             "start_of_dm_history": "See on sinu ja kasutaja <displayName/> otsesuhtluse ajaloo algus.",
             "start_of_room": "See on <roomName/> jututoa algus.",
-            "topic": "Teema: %(topic)s ",
-            "topic_edit": "Teema: %(topic)s (<a>muudetud</a>)",
             "unencrypted_warning": "Läbiv krüptimine pole kasutusel",
             "user_created": "%(displayName)s lõi selle jututoa.",
             "you_created": "Sa lõid selle jututoa."
@@ -2041,13 +2104,16 @@
         "pinned_message_banner": {
             "button_close_list": "Sulge loend",
             "button_view_all": "Vaata kõiki",
-            "description": "Selles jututoas on esiletõstetud sõnumeid. Nende vaatamiseks klõpsi.",
-            "go_to_message": "Vaata esiletõstetud sõnumit ajajoonel.",
-            "title": "<bold>%(index)s of %(length)s</bold> Esiletõstetud sõnumid"
+            "description": "Esiletõstetud sõnumid",
+            "go_to_newest_message": "Vaata siin ajajoonel esiletõstetud sõnumit ja viimast esiletõstetud sõnumit",
+            "go_to_next_message": "Vaata siin ajajoonel esiletõstetud sõnumit ja eelviimast esiletõstetud sõnumit",
+            "title": "<bold>%(index)s / %(length)s</bold> esiletõstetud sõnumit"
         },
         "read_topic": "Teema lugemiseks klõpsi",
         "rejecting": "Hülgan kutset…",
         "rejoin_button": "Liitu uuesti",
+        "room_content": "Jututoa sisu",
+        "room_is_low_priority": "See on vähetähtis jututuba",
         "search": {
             "all_rooms_button": "Otsi kõikidest jututubadest",
             "placeholder": "Otsi sõnumeid…",
@@ -2060,6 +2126,7 @@
         "status_bar": {
             "delete_all": "Kustuta kõik",
             "exceeded_resource_limit": "Sinu sõnumit ei saadetud, kuna see koduserver on ületanud on ületanud ressursipiirangu. Teenuse kasutamiseks palun <a>võta ühendust serveri haldajaga</a>.",
+            "history_visible": "See jututuba on seadistatud sel viisil, et uued liikmed saavad lugeda varasemat ajalugu.<a> Lisateave</a>",
             "homeserver_blocked": "Sinu sõnumit ei saadetud, kuna see koduserver blokeeritud serveri haldaja poolt. Teenuse kasutamiseks palun <a>võta ühendust serveri haldajaga</a>.",
             "monthly_user_limit_reached": "Sinu sõnumit ei saadetud, kuna see koduserver on saavutanud igakuise aktiivsete kasutajate piiri. Teenuse kasutamiseks palun <a>võta ühendust serveri haldajaga</a>.",
             "requires_consent_agreement": "Sa ei saa saata ühtego sõnumit enne, kui oled läbi lugenud ja nõustunud <consentLink>meie kasutustingimustega</consentLink>.",
@@ -2093,10 +2160,10 @@
     },
     "room_list": {
         "add_room_label": "Lisa jututuba",
-        "add_space_label": "Lisa kogukonnakeskus",
-        "appearance": "Välimus",
+        "add_space_label": "Lisa kogukond",
         "breadcrumbs_empty": "Hiljuti külastatud jututubasid ei leidu",
         "breadcrumbs_label": "Hiljuti külastatud jututoad",
+        "collapse_filters": "Ahenda filtriloendit",
         "empty": {
             "no_chats": "Vestlusi veel ei leidu",
             "no_chats_description": "Alusta sellest, et leia mõni vestluspartner või loo oma jututuba",
@@ -2104,6 +2171,7 @@
             "no_favourites": "Sa pole veel ühtegi vestlust märkinud lemmikuks",
             "no_favourites_description": "Vestluse saad märkida lemmikuks tema seadistustest",
             "no_invites": "Sul pole lugemata kutseid",
+            "no_lowpriority": "Sul pole ühtegi vähetähtsat jututuba",
             "no_mentions": "Sul pole lugemata mainimisi",
             "no_people": "Sul pole veel ühtegi otsevestlust kellegagi",
             "no_people_description": "Kõikide muude vestluste nägemiseks eemalda otsingufiltrid",
@@ -2113,12 +2181,14 @@
             "show_activity": "Vaata kõiki tegevusi",
             "show_chats": "Näita kõiki vestlusi"
         },
+        "expand_filters": "Laienda filtriloendit",
         "failed_add_tag": "Sildi %(tagName)s lisamine jututoale ebaõnnestus",
         "failed_remove_tag": "Sildi %(tagName)s eemaldamine jututoast ebaõnnestus",
         "failed_set_dm_tag": "Otsevestluse sildi seadmine ei õnnestunud",
         "filters": {
             "favourite": "Lemmikud",
             "invites": "Kutsed",
+            "low_priority": "Vähetähtis",
             "mentions": "Mainimised",
             "people": "Inimesed",
             "rooms": "Jututoad",
@@ -2152,7 +2222,6 @@
         },
         "room_options": "Jututoa valikud",
         "show_less": "Näita vähem",
-        "show_message_previews": "Näita sõnumite eelvaateid",
         "show_n_more": {
             "one": "Näita veel %(count)s vestlust",
             "other": "Näita veel %(count)s vestlust"
@@ -2184,7 +2253,7 @@
             "error_upgrade_description": "Jututoa uuendust ei õnnestunud teha",
             "error_upgrade_title": "Jututoa versiooni uuendamine ei õnnestunud",
             "information_section_room": "Info jututoa kohta",
-            "information_section_space": "Kogukonnakeskuse teave",
+            "information_section_space": "Kogukonna teave",
             "room_id": "Jututoa tehniline tunnus",
             "room_predecessor": "Näita vanemat tüüpi sõnumeid jututoas %(roomName)s.",
             "room_upgrade_button": "Uuenda see jututoa versioon soovitatud versioonini",
@@ -2248,7 +2317,7 @@
             "error_updating_alias_description": "Jututoa lisaaadressi uuendamisel tekkis viga. See kas pole serveris lubatud või tekkis mingi ajutine viga.",
             "error_updating_canonical_alias_description": "Jututoa põhiaadressi uuendamisel tekkis viga. See kas pole serveris lubatud või tekkis mingi ajutine viga.",
             "error_updating_canonical_alias_title": "Viga põhiaadressi uuendamisel",
-            "leave_space": "Lahku kogukonnakeskusest",
+            "leave_space": "Lahku kogukonnast",
             "local_alias_field_label": "Kohalik aadress",
             "local_aliases_explainer_room": "Et muud kasutajad saaks seda jututuba leida sinu koduserveri (%(localDomain)s) kaudu, lisa sellele jututoale aadresse",
             "local_aliases_explainer_space": "Selleks et teised kasutajad saaks seda kogukonda leida oma koduserveri kaudu (%(localDomain)s) seadista talle aadressid",
@@ -2259,6 +2328,8 @@
             "no_aliases_space": "Sellel kogukonnakeskusel puuduvad kohalikud aadressid",
             "other_section": "Muud",
             "publish_toggle": "Kas avaldame selle jututoa %(domain)s jututubade loendis?",
+            "publish_warn_invite_only": "Kuna ligipääs siia jututuppa eeldab kutse olemasolu, siis sa ei saa siin sisu avaldada.",
+            "publish_warn_no_canonical_permission": "Siin jututoas sisu avaldamiseks peab sul olema õigus põhiaadressi muutmiseks.",
             "published_aliases_description": "Aadressi avaldamiseks peab ta esmalt olema määratud kohalikuks aadressiks.",
             "published_aliases_explainer_room": "Avaldatud aadresse saab igaüks igast serverist kasutada liitumiseks sinu jututoaga.",
             "published_aliases_explainer_space": "Avaldatud aadresse saab igaüks igast serverist kasutada liitumiseks sinu kogukonnakeskusega.",
@@ -2336,6 +2407,10 @@
             "users_default": "Vaikimisi roll"
         },
         "security": {
+            "cannot_change_to_private_due_to_missing_history_visiblity_permissions": {
+                "description": "Sul pole õigusi selle jututoa ajaloo nähtavuse muutmiseks. Kuna võib tekkida olukord, kus ka mitteliitunud kasutajad saavad lugeda sõnumeid, siis on selline tegevus ka ohtlik.",
+                "title": "Ei õnnestu muuta jututuba privaatseks"
+            },
             "enable_encryption_confirm_description": "Kui kord juba kasutusele võetud, siis krüptimist enam hiljem ära lõpetada ei saa. Krüptitud sõnumeid ei saa lugeda ei vaheapealses veebiliikluses ega serveris ja vaid jututoa liikmed saavad neid lugeda. Krüptimise kasutusele võtmine võib takistada nii robotite kui sõnumisildade tööd. <a>Lisateave krüptimise kohta.</a>",
             "enable_encryption_confirm_title": "Kas võtame krüptimise kasutusele?",
             "enable_encryption_public_room_confirm_description_1": "<b>Me ei soovita avalikes jututubades krüptimise kasutamist.</b> Kuna kõik huvilised saavad vabalt leida avalikke jututube ning nendega liituda, siis saavad nad niikuinii ka neis leiduvaid sõnumeid lugeda. Olemuselt puuduvad sellises olukorras krüptimise eelised ning sa ei saa hiljem krüptimist välja lülitada. Avalike jututubade sõnumite krüptimine teeb ka sõnumite saatmise ja vastuvõtmise aeglasemaks.",
@@ -2353,7 +2428,7 @@
             "history_visibility_joined": "Ainult liikmetele (alates liitumisest)",
             "history_visibility_legend": "Kes võivad lugeda ajalugu?",
             "history_visibility_shared": "Ainult liikmetele (alates selle seadistuse kasutuselevõtmisest)",
-            "history_visibility_warning": "Kui muudad seda, kes saavad selle jututoa ajalugu lugeda, siis kehtib see vaid tulevaste sõnumite kohta. Senise ajaloo nähtavus sellega ei muutu.",
+            "history_visibility_warning": "Senise ajaloo nähtavus ei muutu.",
             "history_visibility_world_readable": "Kõik kasutajad",
             "join_rule_description": "Vali, kes saavad liituda %(roomName)s jututoaga.",
             "join_rule_invite": "Privaatne jututuba (eeldab kutset)",
@@ -2361,14 +2436,14 @@
             "join_rule_knock": "Küsi võimalust liitumiseks",
             "join_rule_knock_description": "Kasutajade ei saa liituda enne, kui selleks vastav luba on antud.",
             "join_rule_public_description": "Kõik saavad jututuba leida ja sellega liituda.",
-            "join_rule_restricted": "Kogukonnakeskuse liikmed",
+            "join_rule_restricted": "Kogukonna liikmed",
             "join_rule_restricted_description": "Kõik kogukonnakeskuse liikmed saavad jututuba leida ja sellega liituda. <a>Muuda lubatud kogukonnakeskuste loendit.</a>",
             "join_rule_restricted_description_active_space": "Kõik <spaceName/> kogukonnakeskuse liikmed saavad leida ja liituda. Sa võid valida ka muid kogukonnakeskuseid.",
             "join_rule_restricted_description_prompt": "Kõik kogukonnakeskuse liikmed saavad leida ja liituda. Sa võid valida ka mitu kogukonnakeskust.",
             "join_rule_restricted_description_spaces": "Ligipääsuga kogukonnakeskused",
             "join_rule_restricted_dialog_description": "Vali missugustel kogukonnakeskustel on sellele jututoale ligipääs. Kui kogukonnakeskus on valitud, siis selle liikmed saavad <RoomName/> jututuba leida ja temaga liituda.",
             "join_rule_restricted_dialog_empty_warning": "Sa oled eemaldamas kõiki kogukonnakeskuseid. Edaspidine ligipääs eeldab kutse olemasolu",
-            "join_rule_restricted_dialog_filter_placeholder": "Otsi kogukonnakeskusi",
+            "join_rule_restricted_dialog_filter_placeholder": "Otsi kogukondi",
             "join_rule_restricted_dialog_heading_known": "Muud kogukonnad, mida sa tead",
             "join_rule_restricted_dialog_heading_other": "Sellised muud jututoad ja kogukonnakeskused, mida sa ei pruugi teada",
             "join_rule_restricted_dialog_heading_room": "Sulle teadaolevad kogukonnakeskused, millesse kuulub see jututuba",
@@ -2396,6 +2471,7 @@
                 "other": "Uuendan kogukonnakeskuseid... (%(progress)s / %(count)s)"
             },
             "join_rule_upgrade_upgrading_room": "Uuendan jututoa versiooni",
+            "join_rule_world_readable_description": "Kui muudad seda, kes võib jututoaga liituda, siis muutub ka tulevaste sõnumite nähtavus.",
             "public_without_alias_warning": "Sellele jututoale viitamiseks palun lisa talle aadress.",
             "publish_room": "Tee see jututuba nähtavaks avalikus jututubade kataloogis.",
             "publish_space": "Tee see kogukond nähtavaks avalikus jututubade kataloogis.",
@@ -2409,11 +2485,12 @@
             "error_failed_save": "Kogukonnakeskuse nähtavust ei õnnestunud uuendada",
             "error_update_guest_access": "Ei õnnestunud selle kogukonnakekuse külaliste ligipääsureegleid uuendada",
             "error_update_history_visibility": "Ei õnnestunud selle kogukonnakekuse ajaloo loetavust uuendada",
-            "guest_access_explainer": "Külalised võivad liituda kogukonnakeskusega ilma kasutajakontota.",
-            "guest_access_explainer_public_space": "Seda saad kasutada näiteks avalike kogukonnakeskuste puhul.",
+            "guest_access_disabled": "Sul pole õigust muuta külaliskasutajate ligipääsuvõimalusi.",
+            "guest_access_explainer": "Külalised võivad liituda kogukonnaga ilma kasutajakontota. Sellest võimalusest on kasu avalike kogukondade puhul",
             "guest_access_label": "Luba ligipääs külalistele",
-            "history_visibility_anyone_space": "Kogukonnakeskuse eelvaade",
+            "history_visibility_anyone_space": "Kogukonna eelvaade",
             "history_visibility_anyone_space_description": "Luba huvilistel enne liitumist näha kogukonnakeskuse eelvaadet.",
+            "history_visibility_anyone_space_disabled": "Sul pole õigust muuta ajaloo nähtavust.",
             "history_visibility_anyone_space_recommendation": "Soovitame avalike kogukonnakeskuste puhul.",
             "title": "Nähtavus"
         },
@@ -2534,6 +2611,7 @@
                 "breadcrumb_second_description": "Sa kaotad ligipääsu sõnumite ajalooole, mis on salvestatud vaid serveris",
                 "breadcrumb_third_description": "Sa pead kõik oma olemasolevad seadmed ja kontaktid uuesti verifitseerima",
                 "breadcrumb_title": "Kas sa oled kindel, et soovid oma krüptoidentiteeti lähtestada?",
+                "breadcrumb_title_cant_confirm": "Sa pead oma võrguidentiteedi lähtestama",
                 "breadcrumb_title_forgot": "Kas unustasid oma taastevõtme? Pead oma identiteedi lähtestama.",
                 "breadcrumb_title_sync_failed": "Võtmehoidla sünkroniseerimine ei õnnestunud. Sa pead võrguidentiteedi lähtestama.",
                 "breadcrumb_warning": "Tee seda ainult siis, kui arvad, et sinu kasutajakonto võib olla ohustatud kolmandate osapoolet poolt.",
@@ -2541,7 +2619,7 @@
                 "do_not_close_warning": "Ära sulge seda akent enne, kui lähtestamine on lõppenud",
                 "export_keys": "Ekspordi võtmed",
                 "import_keys": "Impordi võtmed",
-                "other_people_device_description": "Hoiatus: kui kasutaja pole sinuga verifitseerimist läbi teinud (näiteks emojide võrdlemise abil), siis ta ei saa sinu krüptitud sõnumeid. Lisaks ei saadeta krüptitud sõnumeid verifitseeritud kasutajate verifitseerimata seadmetesse.",
+                "other_people_device_description": "Hoiatus: kui kasutaja pole sinuga verifitseerimist läbi teinud (näiteks emojide võrdlemise abil), siis ta ei saa sinu krüptitud sõnumeid. Lisaks ei saadeta krüptitud sõnumeid verifitseeritud kasutajate verifitseerimata seadmetesse. Muudatused vajavad jõustamiseks rakenduse uuesti käivitamist.",
                 "other_people_device_label": "Krüptitud jututubades saada sõnumeid vaid verifitseeritud kasutajatele",
                 "other_people_device_title": "Teiste kasutajate seadmed",
                 "reset_identity": "Lähtesta krüptoidentiteet",
@@ -2610,6 +2688,7 @@
             "allow_spellcheck": "Kasuta õigekontrolli",
             "application_language": "Rakenduse keel",
             "application_language_reload_hint": "Teise keele valimisel rakendus käivitub uuesti",
+            "avatar_open_menu": "Ava tunnuspiltide menüü",
             "avatar_remove_progress": "Eemaldame pilti...",
             "avatar_save_progress": "Laadime pilti üles...",
             "avatar_upload_error_text": "Failivormingu tugi puudub või fail on suurem, kui %(size)s.",
@@ -2687,13 +2766,11 @@
         "inline_url_previews_room": "Luba URL'ide vaikimisi eelvaated selles jututoas osalejate jaoks",
         "inline_url_previews_room_account": "Luba URL'ide eelvaated selle jututoa jaoks (mõjutab vaid sind)",
         "insert_trailing_colon_mentions": "Mainimiste järel näita sõnumi alguses koolonit",
+        "invite_controls": {
+            "default_label": "Luba kasutajatel sind kutsida jututubadesse"
+        },
         "jump_to_bottom_on_send": "Sõnumi saatmiseks hüppa ajajoone lõppu",
         "key_backup": {
-            "backup_in_progress": "Sinu krüptovõtmeid varundatakse (esimese varukoopia tegemine võib võtta paar minutit).",
-            "backup_starting": "Alustame varundamist…",
-            "backup_success": "Õnnestus!",
-            "cannot_create_backup": "Ei õnnestu teha võtmetest varukoopiat",
-            "create_title": "Tee võtmetest varukoopia",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Sinu krüptovõtmed on parasjagu sellest seadmest varundamisel.",
                 "backup_setup_success_title": "Krüptovõtmete varundus õnnestus",
@@ -2753,6 +2830,7 @@
             "show_in_private": "Privaatsetes jututubades",
             "show_media": "Alati"
         },
+        "not_supported": "See funktsionaalsus pole sinu serveris kasutusel.",
         "notifications": {
             "default_setting_description": "See seadistus kehtib vaikimisi kõikides sinu jututubades.",
             "default_setting_section": "Soovin teavitusi (vaikimisi seadistused)",
@@ -2810,6 +2888,7 @@
             "voip": "Kõned ja videokõned"
         },
         "preferences": {
+            "Electron.enableContentProtection": "Blokeeri akna sisu salvestamine teiste rakenduste poolt",
             "Electron.enableHardwareAcceleration": "Kasuta riistvaralist kiirendust (jõustamiseks käivita %(appName)s uuesti)",
             "always_show_menu_bar": "Näita aknas alati menüüriba",
             "autocomplete_delay": "Viivitus automaatsel sõnalõpetusel (ms)",
@@ -2818,6 +2897,7 @@
             "composer_heading": "Sõnumite kirjutamine",
             "default_timezone": "Brauseri vaikimisi ajavöönd (%(timezone)s)",
             "dialog_title": "<strong>Seadistused:</strong> Eelistused",
+            "enable_content_protection": "Kasuta sisu kaitset",
             "enable_hardware_acceleration": "Kasuta riistvaralist kiirendust",
             "enable_tray_icon": "Näita süsteemisalve ikooni ja Element'i akna sulgemisel minimeeri ta salve",
             "keyboard_heading": "Kiirklahvid",
@@ -2831,6 +2911,7 @@
             "room_list_heading": "Jututubade loend",
             "show_avatars_pills": "Näita tunnuspilte kasutajate, jututubade ja sündmuste mainimistes",
             "show_polls_button": "Näita küsitluste nuppu",
+            "startup_window_behaviour_label": "Käivitamine ja akna käitumine",
             "surround_text": "Erimärkide sisestamisel märgista valitud tekst",
             "time_heading": "Aegade kuvamine",
             "user_timezone": "Seadista ajavöönd"
@@ -2851,7 +2932,6 @@
             "ignore_users_empty": "Sa ei ole veel kedagi eiranud.",
             "ignore_users_section": "Eiratud kasutajad",
             "key_backup_algorithm": "Algoritm:",
-            "key_backup_connect": "Seo see sessioon krüptovõtmete varundusega",
             "message_search_disable_warning": "Kui see seadistus pole kasutusel, siis krüptitud jututubade sõnumeid otsing ei vaata.",
             "message_search_disabled": "Turvaliselt puhverda krüptitud sõnumid kohalikku arvutisse ja võimalda kasutada neid otsingus.",
             "message_search_enabled": {
@@ -2864,6 +2944,7 @@
             "message_search_indexing": "Parasjagu indekseerin: %(currentRoom)s",
             "message_search_indexing_idle": "Mitte ainsamagi jututoa sõnumeid hetkel ei indekseerita.",
             "message_search_intro": "Otsingus kasutamiseks %(brand)s puhverdab turvaliselt kohalikku arvutisse krüptitud sõnumeid:",
+            "message_search_pending_rooms": "Indekseerimist ootavad jututoad: %(pendingRooms)s",
             "message_search_room_progress": "%(doneRooms)s / %(totalRooms)s",
             "message_search_section": "Otsing sõnumite seast",
             "message_search_sleep_time": "Kui kiiresti peaksime sõnumeid alla laadima.",
@@ -2982,6 +3063,7 @@
         "show_chat_effects": "Näita vestluses edevat graafikat (näiteks kui keegi on saatnud serpentiine)",
         "show_displayname_changes": "Näita kuvatava nime muutusi",
         "show_join_leave": "Näita jututubade liitumise ja lahkumise teateid (ei käi kutsete, müksamiste ja keelamiste kohta)",
+        "show_message_previews": "Näita sõnumite eelvaateid",
         "show_nsfw_content": "Näita töökeskkonnas mittesobilikku sisu",
         "show_read_receipts": "Näita teiste kasutajate lugemisteatiseid",
         "show_redaction_placeholder": "Näita kustutatud sõnumite asemel kohatäidet",
@@ -3004,7 +3086,12 @@
             "spaces_explainer": "Kogukonnad on võimalus jututubade ja inimeste ühendamiseks. Lisaks nendele, mille liige sa juba olev, võid kasutada süsteemi poolt loodud kogukondi.",
             "title": "Külgpaan"
         },
-        "start_automatically": "Käivita Element automaatselt peale arvutisse sisselogimist",
+        "start_automatically": {
+            "disabled": "Ei",
+            "enabled": "Jah",
+            "label": "Oma arvutisse logimisel ava %(brand)s",
+            "minimised": "Minimeeritud"
+        },
         "tac_only_notifications": "Näita teavitusi vaid jutulõngade ülevaates",
         "use_12_hour_format": "Näita ajatempleid 12-tunnises vormingus (näiteks 2:30pl)",
         "use_command_enter_send_message": "Sõnumi saatmiseks vajuta Command + Enter klahve",
@@ -3057,7 +3144,7 @@
         "ban": "Keela ligipääs antud tunnusega kasutajale",
         "category_actions": "Tegevused",
         "category_admin": "Peakasutaja",
-        "category_advanced": "Teave arendajatele",
+        "category_advanced": "Lisavõimalused",
         "category_effects": "Vahvad täiendused",
         "category_messages": "Sõnumid",
         "category_other": "Muud",
@@ -3088,6 +3175,8 @@
         "jumptodate": "Vaata ajajoont alates sellest kuupäevast",
         "jumptodate_invalid_input": "Me ei suutnud sellist kuupäeva mõista (%(inputDate)s). Pigem kasuta aaaa-kk-pp vormingut.",
         "lenny": "Lisa ( ͡° ͜ʖ ͡°) smaili vormindamata sõnumi algusesse",
+        "manual_device_verification_confirm_description": "See võimaldab muul seadmel saata ja vastu võtta sõnumeid esinedes sinuna. KUI KEEGI PALUS SUL SIIA MIDAGI KOPEERIDA, SIIS ON SEE KAHTLANE JA ILMSELT PROOVITAKSE SIND PETTA. Kas sa oled kindel, et soovid seda teist seadet verifitseerida?",
+        "manual_device_verification_confirm_title": "Hoiatus: seadme käsitsi verifitseerimine",
         "me": "Näitab tegevusi",
         "msg": "Saadab sõnumi näidatud kasutajale",
         "myavatar": "Sellega muudad sinu tunnuspilti kõikides jututubades",
@@ -3128,6 +3217,7 @@
         "upgraderoom": "Uuendab jututoa uue versioonini",
         "upgraderoom_permission_error": "Sul ei ole piisavalt õigusi selle käsu käivitamiseks.",
         "usage": "Kasutus",
+        "verify": "Verifitseeri üks oma seadmetest käsitsi",
         "view": "Vaata sellise aadressiga jututuba",
         "whois": "Näitab teavet kasutaja kohta"
     },
@@ -3142,22 +3232,22 @@
                 "one": "Lisan jututuba...",
                 "other": "Lisan jututubasid... (%(progress)s/%(count)s)"
             },
-            "space_dropdown_label": "Kogukonnakeskuse valik",
+            "space_dropdown_label": "Kogukonna valik",
             "space_dropdown_title": "Lisa olemasolevaid jututubasid",
             "subspace_moved_note": "Kogukondade lisamine asub nüüd uues kohas."
         },
         "add_existing_subspace": {
             "create_button": "Loo uus kogukonnakeskus",
             "create_prompt": "Kas sa selle asemel soovid lisada uut kogukonnakeskust?",
-            "filter_placeholder": "Otsi kogukonnakeskusi",
-            "space_dropdown_title": "Lisa olemasolev kogukonnakeskus"
+            "filter_placeholder": "Otsi kogukondi",
+            "space_dropdown_title": "Lisa olemasolev kogukond"
         },
         "context_menu": {
             "devtools_open_timeline": "Vaata jututoa ajajoont (arendusvaade)",
             "explore": "Tutvu jututubadega",
-            "home": "Kogukonnakeskuse avaleht",
+            "home": "Kogukonna avaleht",
             "manage_and_explore": "Halda ja uuri jututubasid",
-            "options": "Kogukonnakeskus eelistused"
+            "options": "Kogukonna eelistused"
         },
         "failed_load_rooms": "Jututubade loendi laadimine ei õnnestunud.",
         "failed_remove_rooms": "Mõnede jututubade eemaldamine ei õnnestunud. Proovi hiljem uuesti",
@@ -3369,6 +3459,7 @@
             "unable_to_find": "Üritasin laadida teatud hetke selle jututoa ajajoonelt, kuid ei suutnud seda leida."
         },
         "m.audio": {
+            "audio_player": "Meediaesitaja",
             "error_downloading_audio": "Helifaili allalaadimine ei õnnestunud",
             "error_processing_audio": "Viga häälsõnumi töötlemisel",
             "error_processing_voice_message": "Viga häälsõnumi töötlemisel",
@@ -3430,7 +3521,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Lõpetas küsitluse",
             "sender_ended": "%(senderName)s lõpetas küsitluse"
         },
         "m.poll.start": "%(senderName)s algatas küsitluse - %(pollQuestion)s",
@@ -3476,7 +3566,7 @@
             "unknown": "%(senderDisplayName)s muutis külaliste ligipääsureeglid alljärgnevaks - %(rule)s"
         },
         "m.room.history_visibility": {
-            "invited": "%(senderName)s määras, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele nende kutsumise hetkest.",
+            "invited": "%(senderName)s määras, et jututoa ajalugu on nähtav kõikidele selle liikmetele nende kutsumise hetkest.",
             "joined": "%(senderName)s määras, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele nende liitumise hetkest.",
             "shared": "%(senderName)s määras, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele.",
             "unknown": "%(senderName)s seadistas, et jututoa tulevase ajaloo nähtavuse olek on (%(visibility)s).",
@@ -3521,12 +3611,12 @@
             "set": "%(senderDisplayName)s muutis jututoa nimeks %(roomName)s."
         },
         "m.room.pinned_events": {
-            "changed": "%(senderName)s muutis selle jututoa klammerdatud sõnumeid.",
-            "changed_link": "%(senderName)s muutis selle jututoa <a>klammerdatud sõnumeid</a>.",
-            "pinned": "%(senderName)s klammerdas siin jututoas ühe sõnumi. Vaata kõiki klammerdatud sõnumeid.",
-            "pinned_link": "%(senderName)s klammerdas siin jututoas <a>ühe sõnumi</a>. Vaata kõiki <b>klammerdatud sõnumeid</b>.",
-            "unpinned": "%(senderName)s eemaldas siin jututoas klammerduse ühelt sõnumilt. Vaata kõiki klammerdatud sõnumeid.",
-            "unpinned_link": "%(senderName)s eemaldas siin jututoas klammerduse <a>ühelt sõnumilt</a>. Vaata kõiki <b>klammerdatud sõnumeid</b>."
+            "changed": "%(senderName)s muutis selle jututoa esiletõstetud sõnumeid.",
+            "changed_link": "%(senderName)s muutis selle jututoa <a>esiletõstetud sõnumeid</a>.",
+            "pinned": "%(senderName)s tõstis siin jututoas ühe sõnumi esile. Vaata kõiki esiletõstetud sõnumeid.",
+            "pinned_link": "%(senderName)s tõstis siin jututoas <a>ühe sõnumi</a> esile. Vaata kõiki <b>esiletõstetud sõnumeid</b>.",
+            "unpinned": "%(senderName)s eemaldas siin jututoas esiletõstmise ühelt sõnumilt. Vaata kõiki esiletõstetud sõnumeid.",
+            "unpinned_link": "%(senderName)s eemaldas siin jututoas esiletõstmise <a>ühelt sõnumilt</a>. Vaata kõiki <b>esiletõstetud sõnumeid</b>."
         },
         "m.room.power_levels": {
             "changed": "%(senderName)s muutis õiguseid: %(powerLevelDiffText)s.",
@@ -3929,12 +4019,12 @@
         "connection_lost": "Ühendus sinu serveriga on katkenud",
         "connection_lost_description": "Kui ühendus sinu serveriga on katkenud, siis sa ei saa helistada.",
         "consulting": "Suhtlen teise osapoolega %(transferTarget)s. <a>Saadan andmeid kasutajale %(transferee)s</a>",
+        "decline_call": "Keeldu",
         "default_device": "Vaikimisi seade",
         "dial": "Helista",
         "dialpad": "Numbriklahvistik",
         "disable_camera": "Lülita kaamera välja",
         "disable_microphone": "Summuta mikrofon",
-        "disabled_no_one_here": "Siin ei leidu kedagi, kellele helistada",
         "disabled_no_perms_start_video_call": "Sul ei ole piisavalt õigusi videokõne alustamiseks",
         "disabled_no_perms_start_voice_call": "Sul ei ole piisavalt õigusi häälkõne alustamiseks",
         "disabled_ongoing_call": "Kõne on pooleli",
@@ -3981,6 +4071,7 @@
         "show_sidebar_button": "Näita külgpaani",
         "silence": "Vaigista kõne",
         "silenced": "Teavitused on summutatud",
+        "skip_lobby_toggle_option": "Liitu kohe",
         "start_screenshare": "Alusta oma seadme ekraani jagamist",
         "stop_screenshare": "Lõpeta oma seadme ekraani jagamine",
         "too_many_calls": "Liiga palju kõnesid",
@@ -4001,9 +4092,12 @@
         "user_busy_description": "Kasutaja, kellele sa helistasid, on hõivatud.",
         "user_is_presenting": "%(sharerName)s esitab",
         "video_call": "Videokõne",
+        "video_call_incoming": "Saabuv videokõne",
         "video_call_started": "Videokõne algas",
         "video_call_using": "Videokõne, kus on kasutusel:",
         "voice_call": "Häälkõne",
+        "voice_call_incoming": "Saaduv häälkõne",
+        "voice_call_using": "Häälkõne, kasutades:",
         "you_are_presenting": "Sina esitad"
     },
     "web_default_device_name": "%(appName)s: %(browserName)s operatsioonisüsteemis %(osName)s",
diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
index 7b375d4db0..3738aa3b40 100644
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -177,8 +177,7 @@
             "setup_key_backup_title": "دسترسی به پیام‌های رمزشده‌ی خود را از دست خواهید داد",
             "setup_secure_backup_description_1": "پیام‌های رمزشده با رمزنگاری سرتاسر ایمن می‌شوند. فقط شما و طرف گیرنده(ها) کلیدهای خواندن این پیام ها را در اختیار دارید.",
             "setup_secure_backup_description_2": "وقتی از سیستم خارج می‌شوید، این کلیدها از این دستگاه حذف می‌شوند، به این معنی که نمی‌توانید پیام‌های رمزگذاری‌شده را بخوانید مگر اینکه کلیدهای آن‌ها را در دستگاه‌های دیگر خود داشته باشید یا از آنها در سرور نسخه پشتیبان تهیه کنید.",
-            "skip_key_backup": "پیام‌های رمزشده‌ی خود را نمی‌خواهم",
-            "use_key_backup": "شروع استفاده از نسخه‌ی پشتیبان کلید"
+            "skip_key_backup": "پیام‌های رمزشده‌ی خود را نمی‌خواهم"
         },
         "misconfigured_body": "از مدیر %(brand)s خود بخواهید تا <a>پیکربندی شما</a> را از جهت ورودی‌های نادرست یا تکراری بررسی کند.",
         "misconfigured_title": "%(brand)s‌ی شما به درستی پیکربندی نشده‌است",
@@ -419,7 +418,6 @@
         "user": "کاربر",
         "user_avatar": "تصویر پروفایل",
         "username": "نام کاربری",
-        "verification_cancelled": "تأیید هویت لغو شد",
         "video": "ویدئو",
         "view_message": "مشاهده پیام",
         "warning": "هشدار"
@@ -564,8 +562,6 @@
             "security_key_title": "کلید امنیتی"
         },
         "bootstrap_title": "تنظیم کلیدها",
-        "cancel_entering_passphrase_description": "آیا مطمئن هستید که می خواهید وارد کردن عبارت امنیتی را لغو کنید؟",
-        "cancel_entering_passphrase_title": "وارد کردن عبارت امنیتی لغو شود؟",
         "confirm_encryption_setup_body": "برای تأیید و فعال‌سازی رمزگذاری ، روی دکمه زیر کلیک کنید.",
         "confirm_encryption_setup_title": "راه‌اندازی رمزگذاری را تأیید کنید",
         "cross_signing_room_normal": "این اتاق به صورت سرتاسر رمزشده است",
@@ -596,8 +592,6 @@
             "title": "روش بازیابی حذف شد",
             "warning": "اگر متد بازیابی را حذف نکرده‌اید، ممکن است حمله‌کننده‌ای سعی در دسترسی به حساب‌کاربری شما داشته باشد. گذرواژه حساب کاربری خود را تغییر داده و فورا یک روش بازیابی را از بخش تنظیمات خود تنظیم کنید."
         },
-        "reset_all_button": "همه روش‌های بازیابی را فراموش کرده یا از دست داده‌اید؟ <a>بازراه‌اندازی (reset) همه</a>",
-        "set_up_toast_description": "محافظ در برابر از دست‌دادن داده‌ها و پیام‌های رمزشده",
         "set_up_toast_title": "پشتیبان‌گیری امن را انجام دهید",
         "setup_secure_backup": {
             "explainer": "پیش از خروج از حساب کاربری، از کلید‌های خود پشتیبان بگیرید تا آن‌ها را از دست ندهید."
@@ -612,8 +606,6 @@
         "unable_to_setup_keys_error": "تنظیم کلیدها امکان پذیر نیست",
         "verification": {
             "accepting": "پذیرش…",
-            "cancelled": "شما تأیید هویت را لغو کردید.",
-            "cancelled_user": "%(displayName)s تایید هویت را لغو کرد.",
             "cancelling": "در حال لغو…",
             "complete_action": "متوجه شدم",
             "complete_description": "شما با موفقیت این کاربر را تائید کردید.",
@@ -627,8 +619,6 @@
             "incoming_sas_user_dialog_text_2": "با تأیید این کاربر ، نشست وی به عنوان مورد اعتماد علامت‌گذاری شده و همچنین نشست شما به عنوان مورد اعتماد برای وی علامت‌گذاری خواهد شد.",
             "other_party_cancelled": "طرف مقابل فرآیند تائید را لغو کرد.",
             "prompt_encrypted": "برای اطمینان از امنیت اتاق، هویت همه‌ی کاربران حاضر در اتاق را تأیید کنید.",
-            "prompt_self": "از اعلان دوباره تأیید را شروع کنید.",
-            "prompt_user": "دوباره تأیید را از نمایه آنها شروع کنید.",
             "qr_prompt": "این QR-code منحصر به فرد را اسکن کنید",
             "qr_reciprocate_same_shield_user": "تقریباً تمام شد! آیا %(displayName)s نیز سپر مشابهی را نشان می‌دهد؟",
             "request_toast_detail": "%(deviceId)s از %(ip)s",
@@ -641,15 +631,11 @@
             "scan_qr": "با اسکن تأیید کنید",
             "scan_qr_explainer": "از %(displayName)s بخواهید که کد شما را اسکن کند:",
             "start_button": "شروع تایید هویت",
-            "successful_device": "شما با موفقیت %(deviceName)s (%(deviceId)s) را تأیید کردید!",
-            "successful_own_device": "شما با موفقیت دستگاه خود را تأیید کردید!",
             "successful_user": "شما%(displayName)s را با موفقیت تأیید کردید!",
-            "timed_out": "مهلت تأیید تمام شد.",
             "unsupported_method": "روش پشتیبانی‌شده‌ای برای تائید پیدا نشد.",
             "unverified_session_toast_title": "ورود جدید. آیا شما بودید؟",
             "unverified_sessions_toast_description": "برای کسب اطمینان از امن‌بودن حساب کاربری خود، لطفا بررسی فرمائید",
             "unverified_sessions_toast_reject": "بعداً",
-            "verification_description": "با تائید هویت خود به پیام‌های رمزشده دسترسی یافته و هویت خود را به دیگران ثابت می‌کنید.",
             "verification_dialog_title_user": "درخواست تأیید",
             "verify_emoji": "تأیید توسط شکلک",
             "verify_emoji_prompt": "با مقایسه شکلک تأیید کنید.",
@@ -1003,8 +989,7 @@
         "toggle_attribution": "تغییر دادن اسناد"
     },
     "member_list": {
-        "filter_placeholder": "فیلتر کردن اعضای اتاق",
-        "power_label": "%(userName)s (سطح قدرت %(powerLevelNumber)s)"
+        "filter_placeholder": "فیلتر کردن اعضای اتاق"
     },
     "member_list_back_action_label": "اعضای اتاق",
     "message_edit_dialog_title": "ویرایش پیام",
@@ -1168,8 +1153,6 @@
             "room_invite": "فقط به این اتاق دعوت کنید",
             "start_of_dm_history": "این ابتدای تاریخچه پیام مستقیم شما با <displayName/> است.",
             "start_of_room": "این شروع <roomName/> است.",
-            "topic": "موضوع: %(topic)s ",
-            "topic_edit": "موضوع: %(topic)s (<a>ویرایش</a>)",
             "user_created": "%(displayName)s این اتاق را ایجاد کرده است.",
             "you_created": "شما این اتاق را ایجاد کردید."
         },
@@ -1496,10 +1479,6 @@
         "inline_url_previews_room_account": "فعال‌سازی پیش‌نمایش URL برای این اتاق (تنها شما را تحت تاثیر قرار می‌دهد)",
         "jump_to_bottom_on_send": "زمانی که پیام ارسال می‌کنید، به صورت خودکار به آخرین پیام پرش کن",
         "key_backup": {
-            "backup_in_progress": "در حال پیشتیبان‌گیری از کلیدهای شما (اولین نسخه پشتیبان ممکن است چند دقیقه طول بکشد).",
-            "backup_success": "موفقیت‌آمیز بود!",
-            "cannot_create_backup": "ایجاد کلید پشتیبان‌گیری امکان‌پذیر نیست",
-            "create_title": "ساختن نسخه‌ی پشتیبان کلید",
             "setup_secure_backup": {
                 "cancel_warning": "اگر الان لغو کنید، ممکن است پیام‌ها و داده‌های رمزشده‌ی خود را در صورت خارج‌شدن از حساب‌های کاربریتان، از دست دهید.",
                 "confirm_security_phrase": "عبارت امنیتی خود را تأیید کنیدعبارت امنیتی خود را تائید نمائید",
@@ -1580,7 +1559,6 @@
             "ignore_users_empty": "شما هیچ کاربری را نادیده نگرفته‌اید.",
             "ignore_users_section": "کاربران نادیده‌گرفته‌شده",
             "key_backup_algorithm": "الگوریتم:",
-            "key_backup_connect": "این نشست را به کلید پشتیبان‌گیر متصل کن",
             "message_search_disable_warning": "اگر غیر فعال شود، پیام‌های اتاق‌های رمزشده در نتایج جستجوها نمایش داده نمی‌شوند.",
             "message_search_disabled": "پیام‌های رمزشده را به صورتی محلی و امن ذخیره کرده تا در نتایج جستجو ظاهر شوند.",
             "message_search_enabled": {
@@ -1619,7 +1597,6 @@
             "metaspaces_home_description": "خانه برای داشتن یک نمای کلی از همه چیز مفید است.",
             "title": "نوارکناری"
         },
-        "start_automatically": "پس از ورود به سیستم به صورت خودکار آغاز کن",
         "use_12_hour_format": "زمان را با فرمت ۱۲ ساعته نشان بده (مثلا ۲:۳۰ بعدازظهر)",
         "use_command_enter_send_message": "استفاده از Command + Enter برای ارسال پیام",
         "use_control_enter_send_message": "استفاده از Ctrl + Enter برای ارسال پیام",
@@ -1716,6 +1693,7 @@
         "upgraderoom": "یک اتاق را به نسخه جدید ارتقا دهید",
         "upgraderoom_permission_error": "شما مجوزهای لازم را برای استفاده از این دستور ندارید.",
         "usage": "استفاده",
+        "verify": "یک کاربر، نشست و عبارت کلید عمومی را تائید می‌کند",
         "whois": "اطلاعات مربوط به کاربر را نمایش می دهد"
     },
     "space": {
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 291b460f2e..32f609f683 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -82,7 +82,6 @@
         "maximise": "Suurenna",
         "mention": "Mainitse",
         "minimise": "Pienennä",
-        "new_message": "Uusi viesti",
         "new_room": "Uusi huone",
         "new_video_room": "Uusi videohuone",
         "next": "Seuraava",
@@ -224,8 +223,7 @@
             "megolm_export": "Vie avaimet käsin",
             "setup_key_backup_title": "Menetät pääsyn salattuihin viesteihisi",
             "setup_secure_backup_description_1": "Salatut viestit turvataan päästä päähän -salauksella. Vain sinä ja viestien vastaanottaja(t) omaavat avaimet näiden viestien lukemiseen.",
-            "skip_key_backup": "En halua salattuja viestejäni",
-            "use_key_backup": "Aloita avainvarmuuskopion käyttö"
+            "skip_key_backup": "En halua salattuja viestejäni"
         },
         "misconfigured_body": "Pyydä %(brand)s-ylläpitäjääsi tarkistamaan, onko <a>asetuksissasi</a>virheellisiä tai toistettuja merkintöjä.",
         "misconfigured_title": "%(brand)sin asetukset ovat pielessä",
@@ -564,7 +562,6 @@
         "user": "Käyttäjä",
         "user_avatar": "Profiilikuva",
         "username": "Käyttäjätunnus",
-        "verification_cancelled": "Varmennus peruutettu",
         "verified": "Vahvistettu",
         "version": "Versio",
         "video": "Video",
@@ -709,7 +706,8 @@
         "twemoji_colr": "<colr>twemoji-colr</colr>-fontti © <author>Mozilla Foundation</author>, käytössä <terms>Apache 2.0</terms>:n ehtojen mukaisesti."
     },
     "decline_invitation_dialog": {
-        "reason_description": "Kerro syy huoneen ilmoittamiseen."
+        "reason_description": "Kerro syy huoneen ilmoittamiseen.",
+        "title": "Kieltäydy kutsusta"
     },
     "desktop_default_device_name": "%(brand)sin työpöytäversio: %(platformName)s",
     "devtools": {
@@ -796,8 +794,6 @@
             "security_key_title": "Palautusavain"
         },
         "bootstrap_title": "Otetaan avaimet käyttöön",
-        "cancel_entering_passphrase_description": "Haluatko varmasti peruuttaa salasanan syöttämisen?",
-        "cancel_entering_passphrase_title": "Peruuta salasanan syöttäminen?",
         "confirm_encryption_setup_body": "Napsauta alla olevaa painiketta vahvistaaksesi salauksen asettamisen.",
         "confirm_encryption_setup_title": "Vahvista salauksen asetukset",
         "cross_signing_room_normal": "Tämä huone käyttää päästä päähän -salausta",
@@ -829,11 +825,8 @@
             "title": "Palautustapa poistettu",
             "warning": "Jos et poistanut palautustapaa, hyökkääjä saattaa yrittää käyttää tiliäsi. Vaihda tilisi salasana ja aseta uusi palautustapa asetuksissa välittömästi."
         },
-        "reset_all_button": "Unohtanut tai kadottanut kaikki palautustavat? <a>Nollaa kaikki</a>",
         "set_up_recovery": "Määritä palautus",
-        "set_up_recovery_later": "Ei nyt",
         "set_up_recovery_toast_description": "Luo palautusavain, jota voit käyttää salatun viestihistorian palauttamiseen, jos menetät pääsyn laitteisiisi.",
-        "set_up_toast_description": "Suojaudu salattuihin viesteihin ja tietoihin pääsyn menettämiseltä",
         "set_up_toast_title": "Määritä turvallinen varmuuskopio",
         "setup_secure_backup": {
             "explainer": "Varmuuskopioi avaimesi ennen kuin kirjaudut ulos välttääksesi avainten menetyksen."
@@ -851,11 +844,8 @@
             "after_new_login": {
                 "device_verified": "Laite vahvistettu",
                 "skip_verification": "Ohita vahvistus toistaiseksi",
-                "unable_to_verify": "Tätä laitetta ei voitu vahvistaa",
                 "verify_this_device": "Vahvista tämä laite"
             },
-            "cancelled": "Peruutit varmennuksen.",
-            "cancelled_user": "%(displayName)s peruutti varmennuksen.",
             "cancelling": "Peruutetaan…",
             "complete_action": "Ymmärretty",
             "complete_description": "Olet varmentanut tämän käyttäjän.",
@@ -869,33 +859,23 @@
             "incoming_sas_user_dialog_text_2": "Tämän käyttäjän varmentaminen merkitsee hänen istuntonsa luotetuksi, ja myös merkkaa sinun istuntosi luotetuksi hänen laitteissaan.",
             "other_party_cancelled": "Toinen osapuoli perui varmennuksen.",
             "prompt_encrypted": "Varmenna kaikki huoneen käyttäjät varmistaaksesi, että se on turvallinen.",
-            "prompt_self": "Aloita varmennus uudelleen ilmoituksesta.",
-            "prompt_user": "Aloita varmennus uudelleen hänen profiilista.",
             "qr_or_sas": "%(qrCode)s tai %(emojiCompare)s",
-            "qr_or_sas_header": "Vahvista tämä laite suorittamalla yksi seuraavista:",
             "qr_prompt": "Skannaa tämä uniikki koodi",
-            "qr_reciprocate_same_shield_device": "Melkein valmista! Näyttääkö toinen laitteesi saman kilven?",
             "qr_reciprocate_same_shield_user": "Melkein valmista! Näyttääkö %(displayName)s saman kilven?",
-            "request_toast_accept": "Vahvista istunto",
             "request_toast_accept_user": "Vahvista käyttäjä",
             "request_toast_decline_counter": "Sivuuta (%(counter)s)",
             "request_toast_detail": "%(deviceId)s osoitteesta %(ip)s",
             "sas_caption_self": "Vahvista tämä laite toteamalla, että seuraava numero näkyy sen näytöllä.",
             "sas_caption_user": "Varmenna tämä käyttäjä varmistamalla, että seuraava luku ilmestyy hänen ruudulleen.",
             "sas_description": "Vertaa kokoelmaa uniikkeja emojeja, jos kummassakaan laitteessa ei ole kameraa",
-            "sas_emoji_caption_self": "Varmista, että alla olevat emojit näkyvät molemmilla laitteilla samassa järjestyksessä:",
             "sas_emoji_caption_user": "Varmenna tämä käyttäjä varmistamalla, että seuraava emoji ilmestyy hänen ruudulleen.",
             "sas_match": "Ne täsmäävät",
             "sas_no_match": "Ne eivät täsmää",
             "sas_prompt": "Vertaa uniikkia emojia",
             "scan_qr": "Varmenna skannaamalla",
             "scan_qr_explainer": "Pyydä käyttäjää %(displayName)s lukemaan koodisi:",
-            "self_verification_hint": "Jatka hyväksymällä vahvistuspyyntö toisella laitteella.",
             "start_button": "Aloita varmennus",
-            "successful_device": "Olet onnistuneesti varmentanut laitteen %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "Olet onnistuneesti varmentanut laitteesi!",
             "successful_user": "Olet varmentanut käyttäjän %(displayName)s!",
-            "timed_out": "Varmennuksessa kesti liikaa.",
             "unsupported_method": "Tuettua varmennustapaa ei löydy.",
             "unverified_session_toast_accept": "Kyllä, se olin minä",
             "unverified_session_toast_title": "Uusi sisäänkirjautuminen. Olitko se sinä?",
@@ -910,9 +890,6 @@
             "verify_emoji_prompt": "Varmenna vertaamalla uniikkia emojia.",
             "verify_emoji_prompt_qr": "Jos et pysty skannaamaan yläpuolella olevaa koodia, varmenna vertaamalla emojia.",
             "verify_later": "Vahvistan myöhemmin",
-            "verify_using_device": "Vahvista toisella laitteella",
-            "verify_using_key": "Vahvista palautusavaimella",
-            "verify_using_key_or_phrase": "Vahvista turva-avaimella tai turvalauseella",
             "waiting_for_user_accept": "Odotetaan, että %(displayName)s hyväksyy…",
             "waiting_other_device": "Odotetaan vahvistustasi toiselta laitteelta…",
             "waiting_other_device_details": "Odotetaan vahvistustasi toiselta laitteelta, %(deviceName)s (%(deviceId)s)…",
@@ -1245,6 +1222,7 @@
         "room_list_navigate_down": "Liiku alas huoneluettelossa",
         "room_list_navigate_up": "Liiku ylös huoneluettelossa",
         "room_list_select_room": "Valitse huone huoneluettelosta",
+        "save": "Tallenna",
         "scroll_down_timeline": "Vieritä alas aikajanalla",
         "scroll_up_timeline": "Vieritä ylös aikajanalla",
         "search": "Haku (pitää olla käytössä)",
@@ -1403,8 +1381,7 @@
         },
         "filter_placeholder": "Suodata huoneen jäseniä",
         "invite_button_no_perms_tooltip": "Sinulla ei ole lupaa kutsua käyttäjiä",
-        "invited_label": "Kutsuttu",
-        "power_label": "%(userName)s (oikeustaso %(powerLevelNumber)s)"
+        "invited_label": "Kutsuttu"
     },
     "member_list_back_action_label": "Huoneen jäsenet",
     "message_edit_dialog_title": "Viestin muokkaukset",
@@ -1587,11 +1564,6 @@
                 "other": "Voit kiinnittää enintään %(count)s sovelmaa"
             },
             "menu": "Avaa valikko",
-            "release_announcement": {
-                "close": "OK",
-                "description": "Kiinnitetyt viestit löytyvät täältä. Mene minkä tahansa viestin päälle ja valitse \"Kiinnitä\" lisätäksesi viestin tänne.",
-                "title": "Kiinnitetyt viestit"
-            },
             "unpin_all": {
                 "button": "Poista kaikkien viestien kiinnitys",
                 "title": "Poistetaanko kaikkien viestien kiinnitys?"
@@ -1702,8 +1674,6 @@
             "send_message_start_dm": "Kutsu <displayName/> keskusteluun kirjoittamalla ensimmäinen viesti",
             "start_of_dm_history": "Tästä alkaa yksityisviestihistoriasi käyttäjän <displayName/> kanssa.",
             "start_of_room": "Tästä alkaa <roomName/>.",
-            "topic": "Aihe: %(topic)s ",
-            "topic_edit": "Aihe: %(topic)s (<a>muokkaa</a>)",
             "unencrypted_warning": "Päästä päähän -salaus ei ole käytössä",
             "user_created": "%(displayName)s loi tämän huoneen.",
             "you_created": "Loit tämän huoneen."
@@ -1754,7 +1724,6 @@
         "pinned_message_banner": {
             "button_view_all": "Näytä kaikki",
             "description": "Tässä huoneessa on kiinnitettyjä viestejä. Napsauta nähdäksesi ne.",
-            "go_to_message": "Näytä kiinnitetty viesti aikajanalla.",
             "title": "<bold>%(index)s/%(length)s</bold> kiinnitettyä viestiä"
         },
         "read_topic": "Lue aihe napsauttamalla",
@@ -1803,7 +1772,6 @@
     "room_list": {
         "add_room_label": "Lisää huone",
         "add_space_label": "Lisää avaruus",
-        "appearance": "Ulkoasu",
         "breadcrumbs_empty": "Ei hiljattain vierailtuja huoneita",
         "breadcrumbs_label": "Hiljattain vieraillut huoneet",
         "empty": {
@@ -1845,7 +1813,6 @@
             "open_room": "Avoin huone %(roomName)s"
         },
         "show_less": "Näytä vähemmän",
-        "show_message_previews": "Näytä viestien esikatselut",
         "show_n_more": {
             "one": "Näytä %(count)s lisää",
             "other": "Näytä %(count)s lisää"
@@ -2087,7 +2054,6 @@
             "error_update_guest_access": "Vieraiden pääsyasetusten muuttaminen epäonnistui",
             "error_update_history_visibility": "Historian näkyvyysasetusten muuttaminen epäonnistui",
             "guest_access_explainer": "Vieraat voivat liittyä avaruuteen ilman tiliä.",
-            "guest_access_explainer_public_space": "Tämä voi olla hyödyllinen julkisille avaruuksille.",
             "guest_access_label": "Ota käyttöön vieraiden pääsy",
             "history_visibility_anyone_space": "Esikatsele avaruutta",
             "history_visibility_anyone_space_description": "Salli ihmisten esikatsella avaruuttasi ennen liittymistä.",
@@ -2308,11 +2274,6 @@
         "insert_trailing_colon_mentions": "Lisää kaksoispiste käyttäjän maininnan perään viestin alussa",
         "jump_to_bottom_on_send": "Siirry aikajanan pohjalle, kun lähetät viestin",
         "key_backup": {
-            "backup_in_progress": "Avaimiasi varmuuskopioidaan (ensimmäinen varmuuskopio voi viedä muutaman minuutin).",
-            "backup_starting": "Aloitetaan varmuuskopiointia…",
-            "backup_success": "Onnistui!",
-            "cannot_create_backup": "Avaimen varmuuskopiota ei voi luoda",
-            "create_title": "Luo avaimen varmuuskopio",
             "setup_secure_backup": {
                 "cancel_warning": "Jos peruutat nyt, voit menettää salattuja viestejä ja tietoja, jos menetät pääsyn kirjautumistietoihisi.",
                 "confirm_security_phrase": "Vahvista turvalause",
@@ -2368,6 +2329,7 @@
         "notifications": {
             "desktop_notification_message_preview": "Näytä viestin esikatselu työpöytäilmoituksessa",
             "dialog_title": "<strong>Asetukset:</strong> Ilmoitukset",
+            "email_section": "Sähköpostin yhteenveto",
             "enable_audible_notifications_session": "Ota käyttöön ääni-ilmoitukset tälle istunnolle",
             "enable_desktop_notifications_session": "Ota käyttöön työpöytäilmoitukset tälle istunnolle",
             "enable_email_notifications": "Sähköposti-ilmoitukset osoitteeseen %(email)s",
@@ -2440,7 +2402,6 @@
             "ignore_users_empty": "Et ole sivuuttanut käyttäjiä.",
             "ignore_users_section": "Sivuutetut käyttäjät",
             "key_backup_algorithm": "Algoritmi:",
-            "key_backup_connect": "Yhdistä tämä istunto avainten varmuuskopiointiin",
             "message_search_disable_warning": "Jos ei ole käytössä, salattujen huoneiden viestejä ei näytetä hakutuloksissa.",
             "message_search_disabled": "Pidä salatut viestit turvallisessa välimuistissa, jotta ne näkyvät hakutuloksissa.",
             "message_search_enabled": {
@@ -2561,6 +2522,7 @@
         "show_chat_effects": "Näytä keskustelutehosteet (animaatiot, kun saat esim. konfettia)",
         "show_displayname_changes": "Näytä näyttönimien muutokset",
         "show_join_leave": "Näytä liittymis- ja poistumisviestit (ei vaikutusta kutsuihin, poistamisiin ja porttikieltoihin)",
+        "show_message_previews": "Näytä viestien esikatselut",
         "show_nsfw_content": "Näytä NSFW-sisältö",
         "show_read_receipts": "Näytä muiden käyttäjien lukukuittaukset",
         "show_redaction_placeholder": "Näytä paikanpitäjä poistetuille viesteille",
@@ -2581,7 +2543,6 @@
             "spaces_explainer": "Avaruudet ovat tapa ryhmitellä huoneita ja ihmisiä. Voit käyttää nykyisten avaruuksiesi lisäksi esivalmisteltuja avaruuksia.",
             "title": "Sivupalkki"
         },
-        "start_automatically": "Käynnistä automaattisesti käyttöjärjestelmään kirjautumisen jälkeen",
         "use_12_hour_format": "Näytä aikaleimat 12 tunnin muodossa (esim. 2:30pm)",
         "use_command_enter_send_message": "Komento + Enter lähettää viestin",
         "use_command_f_search": "Komento + F hakee aikajanalta",
@@ -2699,6 +2660,7 @@
         "upgraderoom": "Päivittää huoneen uuteen versioon",
         "upgraderoom_permission_error": "Sinulla ei ole vaadittavia oikeuksia tämän komennon käyttämiseksi.",
         "usage": "Käyttö",
+        "verify": "Varmentaa käyttäjän, istunnon ja julkiset avaimet",
         "whois": "Näyttää tietoa käyttäjästä"
     },
     "space": {
@@ -3434,7 +3396,6 @@
         "dialpad": "Numeronäppäimistö",
         "disable_camera": "Sammuta kamera",
         "disable_microphone": "Mykistä mikrofoni",
-        "disabled_no_one_here": "Täällä ei ole ketään, jolle voisi soittaa",
         "disabled_no_perms_start_video_call": "Sinulla ei ole oikeutta aloittaa videopuheluita",
         "disabled_no_perms_start_voice_call": "Sinulla ei ole oikeutta aloittaa äänipuheluita",
         "disabled_ongoing_call": "Käynnissä oleva puhelu",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 9992d5e51f..159f4f450a 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -93,7 +93,7 @@
         "maximise": "Maximiser",
         "mention": "Mentionner",
         "minimise": "Minimiser",
-        "new_message": "Nouveau message",
+        "new_conversation": "Nouvelle conversation",
         "new_room": "Nouveau salon",
         "new_video_room": "Nouveau salon visio",
         "next": "Suivant",
@@ -240,8 +240,7 @@
             "setup_key_backup_title": "Vous perdrez l’accès à vos messages chiffrés",
             "setup_secure_backup_description_1": "Les messages chiffrés sont sécurisés avec un chiffrement de bout en bout. Seuls vous et le(s) destinataire(s) ont les clés pour lire ces messages.",
             "setup_secure_backup_description_2": "Quand vous vous déconnectez, ces clés seront supprimées de cet appareil, et vous ne pourrez plus lire les messages chiffrés à moins d’avoir les clés de ces messages sur vos autres appareils, ou de les avoir sauvegardées sur le serveur.",
-            "skip_key_backup": "Je ne veux pas de mes messages chiffrés",
-            "use_key_backup": "Commencer à utiliser la sauvegarde de clés"
+            "skip_key_backup": "Je ne veux pas de mes messages chiffrés"
         },
         "misconfigured_body": "Demandez à votre administrateur %(brand)s de vérifier que <a>votre configuration</a> ne contient pas d’entrées incorrectes ou en double.",
         "misconfigured_title": "Votre %(brand)s est mal configuré",
@@ -569,7 +568,7 @@
         "room_name": "Nom du salon",
         "rooms": "Salons",
         "save": "Enregistrer",
-        "saved": "Sauvegardé",
+        "saved": "Enregistré",
         "saving": "Enregistrement…",
         "secure_backup": "Sauvegarde sécurisée",
         "select_all": "Tout sélectionner",
@@ -600,12 +599,12 @@
         "user": "Utilisateur",
         "user_avatar": "Image de profil",
         "username": "Nom d’utilisateur",
-        "verification_cancelled": "Vérification annulée",
         "verified": "Vérifiée",
         "version": "Version",
         "video": "Vidéo",
         "video_room": "Salon vidéo",
         "view_message": "Afficher le message",
+        "voice": "Voix",
         "warning": "Attention"
     },
     "composer": {
@@ -646,16 +645,17 @@
         "mode_plain": "Masquer le formatage",
         "mode_rich_text": "Afficher le formatage",
         "no_perms_notice": "Vous n’avez pas la permission de poster dans ce salon",
-        "placeholder": "Envoyer un message…",
+        "placeholder": "Envoyer un message non chiffré…",
         "placeholder_encrypted": "Envoyer un message chiffré…",
-        "placeholder_reply": "Envoyer une réponse…",
-        "placeholder_reply_encrypted": "Envoyer une réponse chiffrée…",
-        "placeholder_thread": "Répondre au fil de discussion…",
-        "placeholder_thread_encrypted": "Répondre au fil de discussion chiffré…",
+        "placeholder_reply": "Envoyer une réponse non chiffrée…",
+        "placeholder_reply_encrypted": "Envoyer une réponse...",
+        "placeholder_thread": "Répondre au fil de discussion non chiffré…",
+        "placeholder_thread_encrypted": "Répondre au fil de discussion...",
         "poll_button": "Sondage",
         "poll_button_no_perms_description": "Vous n’avez pas la permission de démarrer un sondage dans ce salon.",
         "poll_button_no_perms_title": "Autorisation requise",
         "replying_title": "Répond",
+        "room_unencrypted": "Les messages dans ce salon ne sont pas chiffrés de bout en bout",
         "room_upgraded_link": "La discussion continue ici.",
         "room_upgraded_notice": "Ce salon a été remplacé et n’est plus actif.",
         "send_button_title": "Envoyer le message",
@@ -719,6 +719,7 @@
         "personal_space_description": "Un espace privé pour organiser vos salons",
         "private_description": "Sur invitation, idéal pour vous-même ou les équipes",
         "private_heading": "Votre espace privé",
+        "private_only_heading": "Votre Espace",
         "private_personal_description": "Assurez-vous que les bonnes personnes aient accès à %(name)s",
         "private_personal_heading": "Avec qui travaillez-vous ?",
         "private_space": "Moi et mon équipe",
@@ -786,6 +787,7 @@
             "cross_signing_status": "État de la signature croisée :",
             "cross_signing_untrusted": "Votre compte a une identité de signature croisée dans le coffre secret, mais cette session ne lui fait pas encore confiance.",
             "crypto_not_available": "Le module cryptographique n'est pas disponible",
+            "device_id": "Identifiant de l'appareil",
             "key_backup_active_version": "Version de sauvegarde active :",
             "key_backup_active_version_none": "Aucun",
             "key_backup_inactive_warning": "Vos clés ne sont pas sauvegardées sur cette session.",
@@ -798,11 +800,24 @@
             "secret_storage_ready": "prêt",
             "secret_storage_status": "Coffre secret :",
             "self_signing_private_key_cached_status": "Clé privée d’auto-signature :",
+            "session": "Session",
+            "session_fingerprint": "Empreinte numérique (clé de la session)",
             "title": "Chiffrement de bout en bout",
             "user_signing_private_key_cached_status": "Clé privée de signature de l’utilisateur :"
         },
         "developer_mode": "Mode développeur",
         "developer_tools": "Outils de développement",
+        "device_dehydrated_no": "Déshydraté : Non",
+        "device_dehydrated_yes": "Déshydraté : Oui",
+        "device_id": "Identifiant de l'appareil : %(deviceId)s",
+        "device_keys": "Clés d'appareil",
+        "device_verification_status": {
+            "signed_by_owner": "Statut de vérification : <E2EIcon /> Signé par le propriétaire",
+            "unknown": "Statut de vérification : Inconnu",
+            "unverified": "Statut de vérification : <E2EIcon /> Non signé par le propriétaire",
+            "verified": "Statut de vérification : <E2EIcon /> Vérifié par signature croisée"
+        },
+        "devices": "Appareils cryptographiques (%(count)s )",
         "edit_setting": "Modifier le paramètre",
         "edit_values": "Modifier les valeurs",
         "empty_string": "<chaîne de caractères vide>",
@@ -818,15 +833,18 @@
         "failed_to_save": "Échec lors de la sauvegarde des paramètres.",
         "failed_to_send": "Échec de l’envoi de l’événement !",
         "id": "ID : ",
+        "invalid_device_key_id": "L'ID de la clé de l'appareil est invalide",
         "invalid_json": "Ne semble pas être du JSON valide.",
         "level": "Rang",
         "low_bandwidth_mode": "Mode faible bande passante",
         "low_bandwidth_mode_description": "Nécessite un serveur d’accueil compatible.",
         "main_timeline": "Historique principal",
+        "manual_device_verification": "Vérification manuelle de l'appareil",
         "no_receipt_found": "Aucun accusé disponible",
         "notification_state": "L’état des notifications est <strong>%(notificationState)s</strong>",
         "notifications_debug": "Débogage des notifications",
         "number_of_users": "Nombre d’utilisateurs",
+        "only_joined_members": "Seuls les utilisateurs membres",
         "original_event_source": "Évènement source original",
         "room_encrypted": "Le salon est <strong>chiffré ✅</strong>",
         "room_id": "Identifiant du salon : %(roomId)s",
@@ -860,6 +878,7 @@
             "elementCallUrl": "Lien d'Element Call"
         },
         "settings_explorer": "Explorateur de paramètres",
+        "show_empty_content_events": "Afficher les événements sans contenu",
         "show_hidden_events": "Afficher les évènements cachés dans le fil de discussion",
         "spaces": {
             "one": "<espace>",
@@ -872,10 +891,23 @@
         "toggle_event": "Afficher/masquer l’évènement",
         "toolbox": "Boîte à outils",
         "use_at_own_risk": "Cette interface ne vérifie pas les types des valeurs. Utilisez la à vos propres risques.",
+        "user_avatar": "Avatar: %(avatar)s",
+        "user_displayname": "Nom d'affichage : %(displayname)s",
+        "user_id": "Identifiant utilisateur : %(userId)s",
+        "user_no_avatar": "Avatar: <i> Aucun</i>",
+        "user_no_displayname": "Nom d'affichage : <i>Aucun</i>",
         "user_read_up_to": "L’utilisateur a lu jusqu’à : ",
         "user_read_up_to_ignore_synthetic": "L’utilisateur a lu jusqu’à (ignoreSynthetic) : ",
         "user_read_up_to_private": "L’utilisateur a lu jusqu’à (m.read.private) : ",
         "user_read_up_to_private_ignore_synthetic": "L’utilisateur a lu jusqu’à (m.read.private;ignoreSynthetic) : ",
+        "user_room_membership": "Adhésion : %(membership)s",
+        "user_verification_status": {
+            "identity_changed": "Statut de la vérification : <E2EIcon /> Non vérifié, et identité modifiée",
+            "unverified": "Statut de la vérification vérification : <E2EIcon /> Non vérifié",
+            "verified": "Statut de la vérification : <E2EIcon /> Vérifié",
+            "was_verified": "Statut de la vérifcation vérification : <E2EIcon /> Etait vérifié, mais l'identité a changé."
+        },
+        "users": "Utilisateurs",
         "value": "Valeur",
         "value_colon": "Valeur :",
         "value_in_this_room": "Valeur pour ce salon",
@@ -911,15 +943,16 @@
     "empty_room_was_name": "Salon vide (précédemment %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
+            "alternatives": "Si vous avez une clé de récupération ou une phrase de sécurité, cela fonctionnera également.",
             "key_validation_text": {
-                "wrong_security_key": "Clé de récupération incorrecte"
+                "wrong_security_key": "La clé de récupération que vous avez saisie est incorrecte."
             },
+            "privacy_warning": "Assurez-vous que personne d'autre ne regarde votre écran !",
             "restoring": "Restauration des clés depuis la sauvegarde",
-            "security_key_title": "Clé de récupération"
+            "security_key_label": "Clé de récupération",
+            "security_key_title": "Saisir votre clé de récupération"
         },
         "bootstrap_title": "Configuration des clés",
-        "cancel_entering_passphrase_description": "Souhaitez-vous vraiment annuler la saisie de la phrase de passe ?",
-        "cancel_entering_passphrase_title": "Annuler la saisie du mot de passe ?",
         "confirm_encryption_setup_body": "Cliquez sur le bouton ci-dessous pour confirmer la configuration du chiffrement.",
         "confirm_encryption_setup_title": "Confirmer la configuration du chiffrement",
         "cross_signing_room_normal": "Ce salon est chiffré de bout en bout",
@@ -930,6 +963,7 @@
         "cross_signing_user_warning": "Cet utilisateur n’a pas vérifié toutes ses sessions.",
         "enter_recovery_key": "Saisir la clé de récupération",
         "event_shield_reason_authenticity_not_guaranteed": "L’authenticité de ce message chiffré ne peut pas être garantie sur cet appareil.",
+        "event_shield_reason_mismatched_sender": "L'expéditeur de ce message ne correspond pas au propriétaire de l'appareil qui l'a envoyé.",
         "event_shield_reason_mismatched_sender_key": "Chiffré par une session non vérifiée",
         "event_shield_reason_unknown_device": "Chiffré par un appareil inconnu ou supprimé.",
         "event_shield_reason_unsigned_device": "Chiffré par un appareil non vérifié par son propriétaire.",
@@ -962,11 +996,8 @@
             "title": "Méthode de récupération supprimée",
             "warning": "Si vous n’avez pas supprimé la méthode de récupération, un attaquant peut être en train d’essayer d’accéder à votre compte. Modifiez le mot de passe de votre compte et configurez une nouvelle méthode de récupération dans les réglages."
         },
-        "reset_all_button": "Vous avez perdu ou oublié tous vos moyens de récupération ? <a>Tout réinitialiser</a>",
         "set_up_recovery": "Configurer la récupération",
-        "set_up_recovery_later": "Pas maintenant",
         "set_up_recovery_toast_description": "Générez une clé de récupération qui peut être utilisée pour restaurer l'historique de vos messages chiffrés au cas où vous perdriez l'accès à vos appareils.",
-        "set_up_toast_description": "Sécurité contre la perte d’accès aux messages et données chiffrées",
         "set_up_toast_title": "Configurer la sauvegarde sécurisée",
         "setup_secure_backup": {
             "explainer": "Sauvegardez vos clés avant de vous déconnecter pour éviter de les perdre."
@@ -987,16 +1018,17 @@
             "after_new_login": {
                 "device_verified": "Appareil vérifié",
                 "skip_verification": "Ignorer la vérification pour l’instant",
-                "unable_to_verify": "Impossible de vérifier cet appareil",
                 "verify_this_device": "Vérifier cet appareil"
             },
-            "cancelled": "Vous avez annulé la vérification.",
-            "cancelled_self": "Vous avez annulé la vérification dans votre autre appareil.",
-            "cancelled_user": "%(displayName)s a annulé la vérification.",
+            "cancelled_verification": "Soit la demande a expiré, soit elle a été refusée, soit la vérification ne correspondait pas.",
             "cancelling": "Annulation…",
+            "cant_confirm": "Confirmation impossible ?",
             "complete_action": "Compris",
             "complete_description": "Vous avez vérifié cet utilisateur avec succès.",
             "complete_title": "Vérifié !",
+            "confirm_identity_description": "Vérifier cet appareil pour configurer votre messagerie sécurisée",
+            "confirm_identity_title": "Confirmez votre identité",
+            "confirm_the_emojis": "Confirmez que les émojis ci-dessous correspondent à ceux affichés sur votre autre appareil.",
             "error_starting_description": "Nous n’avons pas pu démarrer une conversation avec l’autre utilisateur.",
             "error_starting_title": "Erreur en démarrant la vérification",
             "explainer": "Les messages sécurisés avec cet utilisateur sont chiffrés de bout en bout et ne peuvent être lus par d’autres personnes.",
@@ -1007,58 +1039,72 @@
             "incoming_sas_dialog_waiting": "Attente de la confirmation du partenaire…",
             "incoming_sas_user_dialog_text_1": "Vérifier cet utilisateur pour le marquer comme fiable. Faire confiance aux utilisateurs vous permet d’être tranquille lorsque vous utilisez des messages chiffrés de bout en bout.",
             "incoming_sas_user_dialog_text_2": "Vérifier cet utilisateur marquera sa session comme fiable, et marquera aussi votre session comme fiable pour lui.",
-            "no_key_or_device": "Il semblerait que vous ne disposiez pas de clé de récupération ou d’autres appareils pour réalisation la vérification. Cet appareil ne pourra pas accéder aux anciens messages chiffrés. Afin de vérifier votre identité sur cet appareil, vous devrez réinitialiser vos clés de vérifications.",
+            "manual": {
+                "already_verified": "Cet appareil est déjà vérifié",
+                "already_verified_and_wrong_fingerprint": "L'empreinte numérique fournie ne correspond pas, mais l'appareil est déjà vérifié !",
+                "device_id": "Identifiant de l'appareil",
+                "failure_description": "Échec de la vérification de '%(deviceId)s' : %(error)s",
+                "failure_title": "Échec de la vérification",
+                "fingerprint": "Empreinte numérique (clé de la session)",
+                "no_crypto": "Impossible de vérifier l'appareil - le chiffrement n'est pas activé",
+                "no_device": "Impossible de vérifier l'appareil - l'appareil %(deviceId)s n'a pas été trouvé",
+                "no_userid": "Impossible de vérifier l'appareil - identifiant utilisateur introuvable",
+                "success_description": "L’appareil (%(deviceId)s) est maintenant signé de manière croisée",
+                "success_title": "Vérification réussie",
+                "text": "Fournissez l'identifiant et l'empreinte numétrique de l'un de vos appareils pour le vérifier. REMARQUE : cela permet à l'autre appareil d'envoyer et de recevoir des messages comme vous. SI QUELQU'UN VOUS A DIT DE COLLER QUELQUE CHOSE ICI, IL EST PROBABLE QUE VOUS SOYEZ VICTIME D'UNE ARNAQUE !",
+                "wrong_fingerprint": "Impossible de vérifier l'appareil %(deviceId)s - l'empreinte numérique %(fingerprint)s fournie ne correspond pas à celle de l'appareil %(fprint)s"
+            },
             "no_support_qr_emoji": "L’appareil que vous essayez de vérifier ne prend pas en charge les QR codes ou la vérification d’émojis, qui sont les méthodes prises en charge par %(brand)s. Essayez avec un autre client.",
+            "now_you_can": "Vous pouvez désormais lire ou envoyer des messages en toute sécurité, et toute personne avec qui vous discutez peut également faire confiance à cet appareil.",
+            "once_accepted_can_continue": "Une fois acceptée, vous pourrez poursuivre la vérification.",
             "other_party_cancelled": "L’autre personne a annulé la vérification.",
             "prompt_encrypted": "Vérifiez tous les utilisateurs d’un salon pour vous assurer qu’il est sécurisé.",
-            "prompt_self": "Recommencer la vérification depuis la notification.",
             "prompt_unencrypted": "Dans les salons chiffrés, vérifiez tous les utilisateurs pour vous assurer qu’il est sécurisé.",
-            "prompt_user": "Recommencer la vérification depuis son profil.",
             "qr_or_sas": "%(qrCode)s ou %(emojiCompare)s",
-            "qr_or_sas_header": "Vérifiez cet appareil en réalisant une des actions suivantes :",
             "qr_prompt": "Scannez ce code unique",
-            "qr_reciprocate_same_shield_device": "On y est presque ! Votre autre appareil affiche-t-il le même bouclier ?",
+            "qr_reciprocate_check_again_device": "Vérifier à nouveau sur votre autre appareil pour terminer la vérification.",
+            "qr_reciprocate_no": "Non, je ne vois pas de bouclier vert",
             "qr_reciprocate_same_shield_user": "On y est presque ! Est-ce que %(displayName)s affiche le même bouclier ?",
-            "request_toast_accept": "Vérifier la session",
+            "qr_reciprocate_yes": "Oui, je vois un bouclier vert",
             "request_toast_accept_user": "Vérifier l'utilisateur",
             "request_toast_decline_counter": "Ignorer (%(counter)s)",
             "request_toast_detail": "%(deviceId)s depuis %(ip)s",
-            "reset_proceed_prompt": "Faire la réinitialisation",
+            "request_toast_start_verification": "Commencer la vérification",
             "sas_caption_self": "Vérifiez cet appareil en confirmant que le nombre suivant s’affiche sur son écran.",
             "sas_caption_user": "Vérifier cet utilisateur en confirmant que le nombre suivant apparaît sur leur écran.",
             "sas_description": "Comparez une liste unique d’émojis si vous n’avez d’appareil photo sur aucun des deux appareils",
-            "sas_emoji_caption_self": "Confirmez que les émojis ci-dessous s’affichent sur les deux appareils et dans le même ordre :",
             "sas_emoji_caption_user": "Vérifier cet utilisateur en confirmant que les émojis suivant apparaissent sur son écran.",
             "sas_match": "Ils correspondent",
             "sas_no_match": "Ils ne correspondent pas",
             "sas_prompt": "Comparez des émojis uniques",
             "scan_qr": "Vérifier en scannant",
             "scan_qr_explainer": "Demandez à %(displayName)s de scanner votre code :",
-            "self_verification_hint": "Pour continuer, veuillez accepter la demande de vérification sur votre autre appareil.",
             "start_button": "Commencer la vérification",
-            "successful_device": "Vous avez bien vérifié %(deviceName)s (%(deviceId)s) !",
-            "successful_own_device": "Vous avez bien vérifié votre appareil !",
             "successful_user": "Vous avez vérifié %(displayName)s !",
-            "timed_out": "La vérification a expiré.",
             "unsupported_method": "Impossible de trouver une méthode de vérification prise en charge.",
             "unverified_session_toast_accept": "Oui, c’était moi",
             "unverified_session_toast_title": "Nouvelle connexion. Était-ce vous ?",
             "unverified_sessions_toast_description": "Vérifiez pour assurer la sécurité de votre compte",
             "unverified_sessions_toast_reject": "Plus tard",
             "unverified_sessions_toast_title": "Vous avez des sessions non vérifiées",
-            "verification_description": "Vérifiez votre identité pour accéder aux messages chiffrés et prouver votre identité aux autres. Si vous utilisez également un appareil mobile, veuillez ouvrir l’application avant de continuer.",
+            "use_another_device": "Utiliser un autre appareil",
+            "use_recovery_key": "Utiliser la clé de récupération",
+            "verification_dialog_title_choose": "Choisissez comment vérifier",
+            "verification_dialog_title_compare_emojis": "Comparez les émojis",
+            "verification_dialog_title_confirm_green_shield": "Confirmez que vous voyez un bouclier vert sur votre autre appareil",
             "verification_dialog_title_device": "Vérifier un autre appareil",
+            "verification_dialog_title_failed": "Échec de la vérification",
+            "verification_dialog_title_start_on_other_device": "Démarrer la vérification sur l’autre appareil",
             "verification_dialog_title_user": "Demande de vérification",
+            "verification_dialog_title_verified": "Appareil vérifié",
             "verification_skip_warning": "Sans vérification, vous n’aurez pas accès à tous vos messages et vous n’apparaîtrez pas comme de confiance aux autres.",
             "verification_success_with_backup": "Votre nouvel appareil est maintenant vérifié. Il a accès à vos messages chiffrés et les autre utilisateurs le verront comme fiable.",
             "verification_success_without_backup": "Votre nouvel appareil est maintenant vérifié. Les autres utilisateurs le verront comme fiable.",
+            "verify_by_completing_one_of": "Vérifiez en complétant l'une des actions suivantes :",
             "verify_emoji": "Vérifier avec des émojis",
             "verify_emoji_prompt": "Vérifier en comparant des émojis uniques.",
             "verify_emoji_prompt_qr": "Si vous ne pouvez pas scanner le code ci-dessus, vérifiez en comparant des émojis uniques.",
             "verify_later": "Je ferai la vérification plus tard",
-            "verify_using_device": "Vérifier avec un autre appareil",
-            "verify_using_key": "Vérifier avec la clé de récupération",
-            "verify_using_key_or_phrase": "Vérifier avec une clé de récupération ou une phrase",
             "waiting_for_user_accept": "En attente d’acceptation par %(displayName)s…",
             "waiting_other_device": "En attente de votre vérification sur votre autre appareil…",
             "waiting_other_device_details": "En attente de votre vérification sur votre autre appareil, %(deviceName)s (%(deviceId)s)…",
@@ -1108,6 +1154,7 @@
         "tls": "Impossible de se connecter au serveur d’accueil - veuillez vérifier votre connexion, assurez-vous que le <a>certificat SSL de votre serveur d’accueil</a> est un certificat de confiance, et qu’aucune extension du navigateur ne bloque les requêtes.",
         "unknown": "Erreur inconnue",
         "unknown_error_code": "code d’erreur inconnu",
+        "update_history_visibility": "Echec lors de la modification de la visibilité de l'historique",
         "update_power_level": "Échec du changement de rang"
     },
     "error_app_open_in_another_tab": "Vous pouvez fermer cet onglet déconnecté, et aller à l'autre onglet %(brand)s.",
@@ -1348,6 +1395,10 @@
         "name_email_mxid_share_space": "Invitez quelqu’un grâce à son nom, adresse e-mail, nom d’utilisateur (tel que <userId/>) ou <a>partagez cet espace</a>.",
         "name_mxid_share_room": "Invitez quelqu’un à partir de son nom, pseudo (comme <userId/>) ou <a>partagez ce salon</a>.",
         "name_mxid_share_space": "Invitez quelqu’un grâce à son nom, nom d’utilisateur (tel que <userId/>) ou <a>partagez cet espace</a>.",
+        "progress": {
+            "dont_close": "Ne fermez pas l\"application tant que l'opération est en cours",
+            "preparing": "Préparation des invitations..."
+        },
         "recents_section": "Conversations récentes",
         "room_failed_partial": "Nous avons envoyé les invitations, mais les personnes ci-dessous n’ont pas pu être invitées à rejoindre <RoomName/>",
         "room_failed_partial_title": "Certaines invitations n’ont pas pu être envoyées",
@@ -1434,6 +1485,7 @@
         "room_list_navigate_down": "Descendre dans la liste des salons",
         "room_list_navigate_up": "Remonter dans la liste des salons",
         "room_list_select_room": "Sélectionner un salon de la liste des salons",
+        "save": "Enregistrer",
         "scroll_down_timeline": "Faire défiler le fil de discussion vers le bas",
         "scroll_up_timeline": "Faire défiler le fil de discussion vers le haut",
         "search": "Recherche (si activée)",
@@ -1450,7 +1502,6 @@
         "upload_file": "Envoyer un fichier"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Activer le mode partage d’écran uniquement",
         "ask_to_join": "Activer demander à venir",
         "automatic_debug_logs": "Envoyer automatiquement les journaux de débogage en cas d’erreur",
         "automatic_debug_logs_decryption": "Envoyer automatiquement les journaux de débogage en cas d’erreurs de déchiffrement",
@@ -1515,6 +1566,9 @@
         "render_reaction_images_description": "Parfois appelés « émojis personnalisés ».",
         "report_to_moderators": "Signaler aux modérateurs",
         "report_to_moderators_description": "Dans les salons prenant en charge la modération, le bouton « Signaler » vous permet de signaler des abus aux modérateurs du salon.",
+        "share_history_on_invite": "Partagez l'historique chiffré avec les nouveaux membres",
+        "share_history_on_invite_description": "Lorsque vous invitez un utilisateur dans un salon chiffré dont la visibilité de l'historique est définie sur « partagée », partagez l'historique chiffré avec cet utilisateur et acceptez l'historique chiffré lorsque vous êtes invité dans une telle salon.",
+        "share_history_on_invite_warning": "Cette fonctionnalité est EXPÉRIMENTALE et toutes les précautions de sécurité ne sont pas mises en œuvre. Ne l'activez pas sur les comptes en production.",
         "sliding_sync": "Mode synchronisation progressive",
         "sliding_sync_description": "En cours de développement, ne peut être désactivé.",
         "sliding_sync_disabled_notice": "Déconnectez et revenez pour désactiver",
@@ -1636,8 +1690,8 @@
         "filter_placeholder": "Filtrer les membres du salon",
         "invite_button_no_perms_tooltip": "Vous n’avez pas la permission d’inviter des utilisateurs",
         "invited_label": "Invité",
-        "no_matches": "Aucune correspondance",
-        "power_label": "%(userName)s (rang %(powerLevelNumber)s)"
+        "list_title": "Liste des membres",
+        "no_matches": "Aucune correspondance"
     },
     "member_list_back_action_label": "Membres du salon",
     "message_edit_dialog_title": "Modifications du message",
@@ -1708,6 +1762,7 @@
         "end_message": "Le sondage est terminé. Meilleure réponse : %(topAnswer)s",
         "end_message_no_votes": "Le sondage est terminé. Aucun vote n’a été exprimé.",
         "end_title": "Terminer le sondage",
+        "ended_poll_label": "Le sondage est terminé",
         "error_ending_description": "Désolé, le sondage n’a pas pu se terminer. Veuillez réessayer.",
         "error_ending_title": "Impossible de terminer le sondage",
         "error_voting_description": "Désolé, votre vote n’a pas été enregistré. Veuillez réessayer.",
@@ -1715,10 +1770,20 @@
         "failed_send_poll_description": "Désolé, le sondage que vous avez essayé de créer n’a pas été envoyé.",
         "failed_send_poll_title": "Échec lors de la soumission du sondage",
         "notes": "Les résultats ne sont révélés que lorsque vous terminez le sondage",
+        "option_label": "Choix %(number)s ,%(answer)s",
+        "option_label_winning_with_total": {
+            "one": "Choix %(number)s, %(answer)s, choix gagnant, %(count)s vote",
+            "other": "Choix %(number)s, %(answer)s, choix gagnant, %(count)s votes"
+        },
+        "option_label_with_total": {
+            "one": "Choix %(number)s, %(answer)s, %(count)s vote",
+            "other": "Choix %(number)s, %(answer)s, %(count)s votes"
+        },
         "options_add_button": "Ajouter un choix",
         "options_heading": "Créer des choix",
         "options_label": "Choix %(number)s",
         "options_placeholder": "Écrivez un choix",
+        "poll_label": "Sondage",
         "topic_heading": "Quelle est la question ou le sujet de votre sondage ?",
         "topic_label": "Question ou sujet",
         "topic_placeholder": "Écrivez quelque chose…",
@@ -1733,14 +1798,15 @@
         },
         "total_no_votes": "Aucun vote exprimé",
         "total_not_ended": "Les résultats seront visibles lorsque le sondage sera terminé",
-        "type_closed": "Sondage terminé",
+        "type_closed": "Sondage fermé",
         "type_heading": "Type de sondage",
-        "type_open": "Ouvrir le sondage",
+        "type_open": "Sondage ouvert",
         "unable_edit_description": "Désolé, vous ne pouvez pas modifier un sondage après que les votes aient été exprimés.",
         "unable_edit_title": "Impossible de modifier le sondage"
     },
     "power_level": {
         "admin": "Administrateur",
+        "creator": "Propriétaire",
         "custom": "Personnalisé (%(level)s)",
         "custom_level": "Rang personnalisé",
         "default": "Par défaut",
@@ -1848,11 +1914,6 @@
                 "other": "Vous ne pouvez épingler que jusqu’à %(count)s widgets"
             },
             "menu": "Ouvrir le menu",
-            "release_announcement": {
-                "close": "Ok",
-                "description": "Retrouvez tous les messages épinglés ici. Survolez n'importe quel message et sélectionnez « Épingler » pour l'ajouter.",
-                "title": "Tous les nouveaux messages épinglés"
-            },
             "reply_thread": "Répondre à un un <link>message de fil de discussion</link>",
             "unpin_all": {
                 "button": "Désépingler tous les messages",
@@ -1954,6 +2015,7 @@
         },
         "face_pile_tooltip_shortcut": "Dont %(commaSeparatedMembers)s",
         "face_pile_tooltip_shortcut_joined": "Dont vous, %(commaSeparatedMembers)s",
+        "failed_determine_user": "Impossible de déterminer quel utilisateur à ignorer car l'événement des membres a changé.",
         "failed_reject_invite": "Échec du rejet de l’invitation",
         "forget_room": "Oublier ce salon",
         "forget_space": "Oublier cet espace",
@@ -1972,7 +2034,9 @@
         "inaccessible_subtitle_1": "Réessayez plus tard ou demandez à l’administrateur du salon ou de l’espace si vous y avez accès.",
         "inaccessible_subtitle_2": "%(errcode)s a été retourné en essayant d’accéder au salon. Si vous pensez que vous ne devriez pas voir ce message, veuillez <issueLink>soumettre un rapport d’anomalie</issueLink>.",
         "intro": {
+            "display_topic": "Sujet: <topic/>",
             "dm_caption": "Vous n’êtes que tous les deux dans cette conversation, à moins que l’un de vous invite quelqu’un à vous rejoindre.",
+            "edit_topic": "Sujet: <topic/> (<a>modifier</a> )",
             "enable_encryption_prompt": "Activer le chiffrement dans les paramètres.",
             "encrypted_3pid_dm_pending_join": "Quand tout le monde sera présent, vous pourrez discuter",
             "no_avatar_label": "Ajoutez une photo afin que les gens repèrent facilement votre salon.",
@@ -1982,8 +2046,6 @@
             "send_message_start_dm": "Envoyez votre premier message pour inviter <displayName/> à discuter",
             "start_of_dm_history": "C’est le début de l’historique de votre conversation privée avec <displayName/>.",
             "start_of_room": "C’est le début de <roomName/>.",
-            "topic": "Sujet : %(topic)s ",
-            "topic_edit": "Sujet : %(topic)s (<a>modifier</a>)",
             "unencrypted_warning": "Le chiffrement de bout en bout n’est pas activé",
             "user_created": "%(displayName)s a créé ce salon.",
             "you_created": "Vous avez créé ce salon."
@@ -2038,13 +2100,16 @@
         "pinned_message_banner": {
             "button_close_list": "Fermer la liste",
             "button_view_all": "Voir tout",
-            "description": "Ce salon contient des messages épinglés. Cliquez pour les consulter.",
-            "go_to_message": "Afficher le message épinglé dans la discussion.",
+            "description": "Messages épinglés",
+            "go_to_newest_message": "Afficher le message épinglé dans la discussion et le plus récent ici",
+            "go_to_next_message": "Afficher le message épinglé dans la discussion et le plus ancien suivant ici",
             "title": "<bold>%(index)s de %(length)s</bold> messages épinglés"
         },
         "read_topic": "Cliquer pour lire le sujet",
         "rejecting": "Rejet de l’invitation…",
         "rejoin_button": "Revenir",
+        "room_content": "Contenu du salon",
+        "room_is_low_priority": "Ce salon est de priorité basse",
         "search": {
             "all_rooms_button": "Rechercher dans tous les salons",
             "placeholder": "Rechercher des messages…",
@@ -2057,6 +2122,7 @@
         "status_bar": {
             "delete_all": "Tout supprimer",
             "exceeded_resource_limit": "Votre message n’a pas été envoyé car ce serveur d’accueil a dépassé une de ses limites de ressources. Veuillez <a>contacter l’administrateur de votre service</a> pour continuer à l’utiliser.",
+            "history_visible": "Ce salon a été configuré afin que les nouveaux membres puissent lire l'historique.<a> En savori plus</a>",
             "homeserver_blocked": "Votre message n’a pas été envoyé car ce serveur d’accueil a été bloqué par son administrateur. Veuillez <a>contacter l’administrateur de votre service</a> pour continuer à l’utiliser.",
             "monthly_user_limit_reached": "Votre message n’a pas été envoyé car le serveur d’accueil a atteint sa limite mensuelle d’utilisateurs. Veuillez <a>contacter l’administrateur de votre service</a> pour continuer à l’utiliser.",
             "requires_consent_agreement": "Vous ne pouvez voir aucun message tant que vous ne lisez et n’acceptez pas nos <consentLink>conditions générales</consentLink>.",
@@ -2091,9 +2157,9 @@
     "room_list": {
         "add_room_label": "Ajouter un salon",
         "add_space_label": "Ajouter un espace",
-        "appearance": "Apparence",
         "breadcrumbs_empty": "Aucun salon visité récemment",
         "breadcrumbs_label": "Salons visités récemment",
+        "collapse_filters": "Réduire la liste des filtres",
         "empty": {
             "no_chats": "Pas encore de discussions",
             "no_chats_description": "Commencez par envoyer un message à quelqu'un ou en créant un salon",
@@ -2101,6 +2167,7 @@
             "no_favourites": "Vous n'avez pas encore de discussion favorite",
             "no_favourites_description": "Vous pouvez ajouter une discussion à vos favoris dans les paramètres de discussion",
             "no_invites": "Vous n'avez aucune invitation non lue",
+            "no_lowpriority": "Vous n'avez aucun salon avec une priorité basse",
             "no_mentions": "Vous n'avez aucune mention non lue",
             "no_people": "Vous n'avez encore de discussions",
             "no_people_description": "Veuillez désélectionner des filtres pour voir vos discussions",
@@ -2110,12 +2177,14 @@
             "show_activity": "Voir toutes les activités",
             "show_chats": "Afficher toutes les discussions"
         },
+        "expand_filters": "Développer la liste des filtres",
         "failed_add_tag": "Échec de l’ajout de l’étiquette %(tagName)s au salon",
         "failed_remove_tag": "Échec de la suppression de l’étiquette %(tagName)s du salon",
         "failed_set_dm_tag": "Échec de l’ajout de l’étiquette de conversation privée",
         "filters": {
             "favourite": "Favoris",
             "invites": "Invitations",
+            "low_priority": "Priorité basse",
             "mentions": "Mentions",
             "people": "Personnes",
             "rooms": "Salons",
@@ -2149,7 +2218,6 @@
         },
         "room_options": "Options du salon",
         "show_less": "En voir moins",
-        "show_message_previews": "Afficher les aperçus des messages",
         "show_n_more": {
             "other": "En afficher %(count)s de plus",
             "one": "En afficher %(count)s de plus"
@@ -2256,6 +2324,8 @@
             "no_aliases_space": "Cet espace n’a pas d’adresse locale",
             "other_section": "Autre",
             "publish_toggle": "Publier ce salon dans le répertoire de salons public de %(domain)s ?",
+            "publish_warn_invite_only": "Vous ne pouvez pas publier un salon accessible uniquement sur invitation.",
+            "publish_warn_no_canonical_permission": "Vous devez disposer de l'autorisation de définir l'adresse principale pour publier cet salon.",
             "published_aliases_description": "Pour publier une adresse, elle doit d’abord être définie comme adresse locale.",
             "published_aliases_explainer_room": "Les adresses publiées peuvent être utilisées par tout le monde sur tous les serveurs pour rejoindre votre salon.",
             "published_aliases_explainer_space": "Les adresses publiées peuvent être utilisées par tout le monde sur tous les serveurs pour rejoindre votre espace.",
@@ -2333,6 +2403,10 @@
             "users_default": "Rôle par défaut"
         },
         "security": {
+            "cannot_change_to_private_due_to_missing_history_visiblity_permissions": {
+                "description": "Vous n\"avez pas les autorisations nécessaires pour modifier l\"historique du salon. Ceci est dangereux, car cela pourrait permettre aux utilisateurs non présents de lire les messages.",
+                "title": "Impossible de rendre le salon privé"
+            },
             "enable_encryption_confirm_description": "Le chiffrement du salon ne peut pas être désactivé après son activation. Les messages d’un salon chiffré ne peuvent pas être vus par le serveur, seulement par les membres du salon. Activer le chiffrement peut empêcher certains robots et certaines passerelles de fonctionner correctement. <a>En savoir plus sur le chiffrement.</a>",
             "enable_encryption_confirm_title": "Activer le chiffrement ?",
             "enable_encryption_public_room_confirm_description_1": "<b>Il n'est pas recommandé d’ajouter le chiffrement aux salons publics.</b> Tout le monde peut trouver et rejoindre les salons publics, donc tout le monde peut lire les messages qui s’y trouvent. Vous n’aurez aucun des avantages du chiffrement, et vous ne pourrez pas le désactiver plus tard. Chiffrer les messages dans un salon public ralentira la réception et l’envoi de messages.",
@@ -2350,7 +2424,7 @@
             "history_visibility_joined": "Seulement les membres (depuis leur arrivée)",
             "history_visibility_legend": "Qui peut lire l’historique ?",
             "history_visibility_shared": "Seulement les membres (depuis la sélection de cette option)",
-            "history_visibility_warning": "Les modifications concernant l'accès à l’historique ne s'appliqueront qu’aux futurs messages de ce salon. La visibilité de l’historique existant ne sera pas modifiée.",
+            "history_visibility_warning": "La visibilité de l’historique existant ne sera pas modifiée.",
             "history_visibility_world_readable": "N’importe qui",
             "join_rule_description": "Choisir qui peut rejoindre %(roomName)s.",
             "join_rule_invite": "Privé (sur invitation)",
@@ -2393,6 +2467,7 @@
                 "other": "Mise-à-jour des espaces… (%(progress)s sur %(count)s)"
             },
             "join_rule_upgrade_upgrading_room": "Mise-à-jour du salon",
+            "join_rule_world_readable_description": "Changer qui peut rejoindre la salon modifiera également la visibilité des futurs messages.",
             "public_without_alias_warning": "Pour créer un lien vers ce salon, ajoutez une adresse.",
             "publish_room": "Rendez ce salon visible dans l’annuaire des salons publics.",
             "publish_space": "Rendez cet espace visible dans le répertoires des salons publics.",
@@ -2406,11 +2481,12 @@
             "error_failed_save": "Échec de la mise à jour de la visibilité de cet espace",
             "error_update_guest_access": "Échec de la mise à jour de l’accès visiteur de cet espace",
             "error_update_history_visibility": "Échec de la mise à jour de la visibilité de l’historique pour cet espace",
-            "guest_access_explainer": "Les visiteurs peuvent rejoindre un espace sans disposer d’un compte.",
-            "guest_access_explainer_public_space": "Ceci peut être utile pour les espaces publics.",
+            "guest_access_disabled": "Vous n'êtes pas autorisé à modifier les accès invités.",
+            "guest_access_explainer": "Les visiteurs peuvent rejoindre un espace sans disposer d’un compte. Ceci est utile pour les espaces publiques.",
             "guest_access_label": "Activer l’accès visiteur",
             "history_visibility_anyone_space": "Aperçu de l’espace",
             "history_visibility_anyone_space_description": "Permettre aux personnes d’avoir un aperçu de l’espace avant de le rejoindre.",
+            "history_visibility_anyone_space_disabled": "Vous n'êtes pas autorisé à modifier la visibilité de l'historique.",
             "history_visibility_anyone_space_recommendation": "Recommandé pour les espaces publics.",
             "title": "Visibilité"
         },
@@ -2531,6 +2607,7 @@
                 "breadcrumb_second_description": "Vous perdrez l’historique de vos messages",
                 "breadcrumb_third_description": "Vous devrez vérifier à nouveau tous vos appareils et tous vos contacts",
                 "breadcrumb_title": "Êtes-vous sûr de vouloir réinitialiser votre identité ?",
+                "breadcrumb_title_cant_confirm": "Vous devez réinitialiser votre identité",
                 "breadcrumb_title_forgot": "Vous avez oublié votre clé de récupération ? Vous devez réinitialiser votre identité.",
                 "breadcrumb_title_sync_failed": "Impossible de synchroniser le stockage des clés. Vous devez réinitialiser votre identité.",
                 "breadcrumb_warning": "Ne faites cela que si vous pensez que votre compte a été compromis.",
@@ -2538,7 +2615,7 @@
                 "do_not_close_warning": "Ne fermez pas cette fenêtre tant que la réinitialisation n'est pas terminée",
                 "export_keys": "Exporter les clés",
                 "import_keys": "Importer les clés",
-                "other_people_device_description": "Attention : les utilisateurs qui ne se sont pas explicitement vérifiés auprès de vous (par exemple, via des émojis) ne recevront pas vos messages chiffrés. De même, les appareils non vérifiés des utilisateurs vérifiés ne recevront pas vos messages chiffrés.",
+                "other_people_device_description": "Attention : les utilisateurs qui ne se sont pas explicitement vérifiés auprès de vous (par exemple, via des émojis) ne recevront pas vos messages chiffrés. De même, les appareils non vérifiés des utilisateurs vérifiés ne recevront pas vos messages chiffrés. Cette fonctionalitée requiert le redémarrage de l'application pour prendre effet.",
                 "other_people_device_label": "Dans les salons chiffrés, envoyez des messages uniquement aux utilisateurs vérifiés",
                 "other_people_device_title": "Appareils d'autres personnes",
                 "reset_identity": "Réinitialiser l'identité cryptographique",
@@ -2607,6 +2684,7 @@
             "allow_spellcheck": "Autoriser la vérification orthographique",
             "application_language": "Langue de l'application",
             "application_language_reload_hint": "L’application se rechargera après avoir sélectionné une autre langue",
+            "avatar_open_menu": "Ouvrir le menu de l'avatar",
             "avatar_remove_progress": "Suppression de l'image...",
             "avatar_save_progress": "Chargement de l'image...",
             "avatar_upload_error_text": "Le format de fichier n'est pas pris en charge ou l'image est plus grande que%(size)s.",
@@ -2684,13 +2762,11 @@
         "inline_url_previews_room": "Activer l’aperçu des URL par défaut pour les participants de ce salon",
         "inline_url_previews_room_account": "Activer l’aperçu des URL pour ce salon (n’affecte que vous)",
         "insert_trailing_colon_mentions": "Insérer deux-points après les mentions de l'utilisateur au début d'un message",
+        "invite_controls": {
+            "default_label": "Autoriser les utilisateurs à vous inviter dans les salons"
+        },
         "jump_to_bottom_on_send": "Sauter en bas du fil de discussion lorsque vous envoyez un message",
         "key_backup": {
-            "backup_in_progress": "Vous clés sont en cours de sauvegarde (la première sauvegarde peut prendre quelques minutes).",
-            "backup_starting": "Début de la sauvegarde…",
-            "backup_success": "Terminé !",
-            "cannot_create_backup": "Impossible de créer la sauvegarde des clés",
-            "create_title": "Créer une sauvegarde de clé",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Vos clés sont maintenant sauvegardées depuis cet appareil.",
                 "backup_setup_success_title": "Sauvegarde sécurisée réalisée avec succès",
@@ -2711,7 +2787,7 @@
                 "set_phrase_again": "Retournez en arrière pour la redéfinir.",
                 "settings_reminder": "Vous pouvez aussi configurer la sauvegarde sécurisée et gérer vos clés depuis les paramètres.",
                 "title_confirm_phrase": "Confirmer la phrase de sécurité",
-                "title_save_key": "Sauvegarder votre clé de récupération",
+                "title_save_key": "Enregistrer votre clé de récupération",
                 "title_set_phrase": "Définir une phrase de sécurité",
                 "unable_to_setup": "Impossible de configurer le coffre secret",
                 "use_different_passphrase": "Utiliser une phrase secrète différente ?",
@@ -2750,6 +2826,7 @@
             "show_in_private": "Dans les salons privés",
             "show_media": "Toujours afficher"
         },
+        "not_supported": "Votre serveur ne propose pas cette fonctionnalité",
         "notifications": {
             "default_setting_description": "Ce réglage sera appliqué par défaut à tous vos salons.",
             "default_setting_section": "Je veux être notifié pour (réglage par défaut)",
@@ -2807,6 +2884,7 @@
             "voip": "Appels audio et vidéo"
         },
         "preferences": {
+            "Electron.enableContentProtection": "Empêcher le contenu de la fenêtre d'être capturé par d'autres applications",
             "Electron.enableHardwareAcceleration": "Activer l’accélération matérielle (redémarrez %(appName)s pour l'activer)",
             "always_show_menu_bar": "Toujours afficher la barre de menu de la fenêtre",
             "autocomplete_delay": "Délai pour l’autocomplétion (ms)",
@@ -2815,6 +2893,7 @@
             "composer_heading": "Compositeur",
             "default_timezone": "Navigateur par défaut (%(timezone)s)",
             "dialog_title": "<strong>Paramètres : </strong> Préférences",
+            "enable_content_protection": "Activer la protection du contenu",
             "enable_hardware_acceleration": "Activer l’accélération matérielle",
             "enable_tray_icon": "Afficher l’icône dans la barre d’état et minimiser la fenêtre lors de la fermeture",
             "keyboard_heading": "Raccourcis clavier",
@@ -2828,6 +2907,7 @@
             "room_list_heading": "Liste de salons",
             "show_avatars_pills": "Afficher les avatars dans les mentions d'utilisateur, de salon et d’évènements",
             "show_polls_button": "Afficher le bouton des sondages",
+            "startup_window_behaviour_label": "Comportement au démarrage et de la fenêtre",
             "surround_text": "Entourer le texte sélectionné lors de la saisie de certains caractères",
             "time_heading": "Affichage de l’heure",
             "user_timezone": "Définir le fuseau horaire"
@@ -2848,7 +2928,6 @@
             "ignore_users_empty": "Vous n’avez ignoré personne.",
             "ignore_users_section": "Utilisateurs ignorés",
             "key_backup_algorithm": "Algorithme :",
-            "key_backup_connect": "Connecter cette session à la sauvegarde de clés",
             "message_search_disable_warning": "Si l’option est désactivée, les messages des salons chiffrés n’apparaîtront pas dans les résultats de recherche.",
             "message_search_disabled": "Mettre en cache les messages chiffrés localement et de manière sécurisée pour qu’ils apparaissent dans les résultats de recherche.",
             "message_search_enabled": {
@@ -2861,6 +2940,7 @@
             "message_search_indexing": "En train d’indexer : %(currentRoom)s",
             "message_search_indexing_idle": "N’indexe aucun message en ce moment.",
             "message_search_intro": "%(brand)s met en cache les messages chiffrés localement et de manière sécurisée pour qu’ils apparaissent dans les résultats de recherche :",
+            "message_search_pending_rooms": "Salons en attente d'indexation : %(pendingRooms)s",
             "message_search_room_progress": "%(doneRooms)s sur %(totalRooms)s",
             "message_search_section": "Recherche de message",
             "message_search_sleep_time": "À quelle fréquence les messages doivent être téléchargés.",
@@ -2979,6 +3059,7 @@
         "show_chat_effects": "Afficher les animations de conversation (animations lors de la réception par ex. de confettis)",
         "show_displayname_changes": "Afficher les changements de nom d’affichage",
         "show_join_leave": "Afficher les messages d'arrivée et de départ (les invitations/expulsions/bannissements ne sont pas concernés)",
+        "show_message_previews": "Afficher les aperçus des messages",
         "show_nsfw_content": "Afficher le contenu sensible (NSFW)",
         "show_read_receipts": "Afficher les accusés de lecture envoyés par les autres utilisateurs",
         "show_redaction_placeholder": "Afficher les messages supprimés",
@@ -3001,7 +3082,12 @@
             "spaces_explainer": "Les espaces sont un nouveau moyen de regrouper les salons et les gens. En plus des espaces auxquels vous participez, vous pouvez également utiliser ceux qui sont prédéfinis.",
             "title": "Barre latérale"
         },
-        "start_automatically": "Démarrer automatiquement après la phase d'authentification du système",
+        "start_automatically": {
+            "disabled": "Non",
+            "enabled": "Oui",
+            "label": "Ouvrir %(brand)s au démarrage de votre ordinateur",
+            "minimised": "Minimisé"
+        },
         "tac_only_notifications": "Afficher uniquement les notifications dans le centre d'activité des fils de discussions",
         "use_12_hour_format": "Afficher l’heure au format am/pm (par ex. 2:30pm)",
         "use_command_enter_send_message": "Utilisez Ctrl + Entrée pour envoyer un message",
@@ -3085,6 +3171,8 @@
         "jumptodate": "Aller à la date correspondante dans la discussion",
         "jumptodate_invalid_input": "Nous n’avons pas pu comprendre la date saisie (%(inputDate)s). Veuillez essayer en utilisant le format AAAA-MM-JJ.",
         "lenny": "Ajoute ( ͡° ͜ʖ ͡°) en préfixe du message",
+        "manual_device_verification_confirm_description": "Cela permettra à un autre appareil d'envoyer et de recevoir des messages comme vous. SI QUELQU'UN VOUS A DIT DE COLLER QUELQUE CHOSE ICI, IL EST PROBABLE QUE VOUS SOYEZ VICTIME D'UNE ARNAQUE ! Êtes-vous sûr de vouloir vérifier cet autre appareil ?",
+        "manual_device_verification_confirm_title": "Attention : vérification manuelle de l'appareil",
         "me": "Affiche l’action",
         "msg": "Envoie un message à l’utilisateur fourni",
         "myavatar": "Modifier votre image de profil dans tous les salons",
@@ -3125,6 +3213,7 @@
         "upgraderoom": "Met à niveau un salon vers une nouvelle version",
         "upgraderoom_permission_error": "Vous n’avez pas les autorisations nécessaires pour utiliser cette commande.",
         "usage": "Utilisation",
+        "verify": "Vérifiez manuellement l'un de vos appareils",
         "view": "Affiche le salon avec cette adresse",
         "whois": "Affiche des informations à propos de l’utilisateur"
     },
@@ -3366,6 +3455,7 @@
             "unable_to_find": "Un instant donné du fil de discussion n’a pu être chargé car il n’a pas pu être trouvé."
         },
         "m.audio": {
+            "audio_player": "Lecteur audio",
             "error_downloading_audio": "Erreur lors du téléchargement de l’audio",
             "error_processing_audio": "Erreur lors du traitement du message audio",
             "error_processing_voice_message": "Erreur lors du traitement du message vocal",
@@ -3427,7 +3517,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Sondage terminé",
             "sender_ended": "%(senderName)s a terminé un sondage"
         },
         "m.poll.start": "%(senderName)s a démarré un sondage – %(pollQuestion)s",
@@ -3473,7 +3562,7 @@
             "unknown": "%(senderDisplayName)s a changé l’accès des visiteurs en %(rule)s"
         },
         "m.room.history_visibility": {
-            "invited": "%(senderName)s a rendu l’historique visible à tous les membres du salon, depuis le moment où ils ont été invités.",
+            "invited": "%(senderName)s a changé un paramètre : désormais les nouveaux membres pourront voir l'historique de conversation du salon à partir du moment où ils ont été invités.",
             "joined": "%(senderName)s a rendu l’historique visible à tous les membres du salon, à partir de leur arrivée.",
             "shared": "%(senderName)s a rendu l’historique visible à tous les membres du salon.",
             "unknown": "%(senderName)s a rendu l’historique visible à inconnu (%(visibility)s).",
@@ -3926,12 +4015,12 @@
         "connection_lost": "La connexion au serveur a été perdue",
         "connection_lost_description": "Vous ne pouvez pas passer d’appels sans connexion au serveur.",
         "consulting": "Consultation avec %(transferTarget)s. <a>Transfert à %(transferee)s</a>",
+        "decline_call": "Refuser",
         "default_device": "Appareil par défaut",
         "dial": "Composer",
         "dialpad": "Pavé numérique",
         "disable_camera": "Désactiver la caméra",
         "disable_microphone": "Désactiver le microphone",
-        "disabled_no_one_here": "Il n’y a personne à appeler ici",
         "disabled_no_perms_start_video_call": "Vous n’avez pas la permission de démarrer un appel vidéo",
         "disabled_no_perms_start_voice_call": "Vous n’avez pas la permission de démarrer un appel audio",
         "disabled_ongoing_call": "Appel en cours",
@@ -3978,6 +4067,7 @@
         "show_sidebar_button": "Afficher la barre latérale",
         "silence": "Mettre l’appel en sourdine",
         "silenced": "Notifications silencieuses",
+        "skip_lobby_toggle_option": "Rejoignez immédiatement",
         "start_screenshare": "Commencer à partager mon écran",
         "stop_screenshare": "Arrêter de partager mon écran",
         "too_many_calls": "Trop d’appels",
@@ -3998,9 +4088,12 @@
         "user_busy_description": "L’utilisateur que vous avez appelé est indisponible.",
         "user_is_presenting": "%(sharerName)s est à l’écran",
         "video_call": "Appel vidéo",
+        "video_call_incoming": "Appel vidéo entrant",
         "video_call_started": "Appel vidéo commencé",
         "video_call_using": "Appel vidéo utilisant :",
         "voice_call": "Appel audio",
+        "voice_call_incoming": "Appel vocal entrant",
+        "voice_call_using": "Appel vocal utilisant :",
         "you_are_presenting": "Vous êtes à l’écran"
     },
     "web_default_device_name": "%(appName)s : %(browserName)s pour %(osName)s",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index be37d40bc6..ea7522a155 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -197,8 +197,7 @@
             "setup_key_backup_title": "Perderás o acceso as túas mensaxes cifradas",
             "setup_secure_backup_description_1": "As mensaxes cifradas están seguras con cifrado de extremo-a-extremo. Só ti e o correpondente(s) tedes as chaves para ler as mensaxes.",
             "setup_secure_backup_description_2": "Ao saír, estas chaves serán eliminadas deste dispositivo, o que significa que non poderás ler as mensaxes cifradas a menos que teñas as chaves noutro dos teus dispositivos, ou unha copia de apoio no servidor.",
-            "skip_key_backup": "Non quero as miñas mensaxes cifradas",
-            "use_key_backup": "Fai unha Copia de apoio das chaves"
+            "skip_key_backup": "Non quero as miñas mensaxes cifradas"
         },
         "misconfigured_body": "Pídelle a administración do teu %(brand)s que comprobe a <a>configuración</a> para entradas duplicadas ou incorrectas.",
         "misconfigured_title": "O teu %(brand)s está mal configurado",
@@ -463,7 +462,6 @@
         "unverified": "Non verificada",
         "user_avatar": "Imaxe de perfil",
         "username": "Nome de usuaria",
-        "verification_cancelled": "Verificación cancelada",
         "verified": "Verificada",
         "video": "Vídeo",
         "video_room": "Sala de vídeo",
@@ -676,8 +674,6 @@
             "security_key_title": "Chave de Seguridade"
         },
         "bootstrap_title": "Configurando as chaves",
-        "cancel_entering_passphrase_description": "¿Estás seguro de que non queres escribir a frase de paso?",
-        "cancel_entering_passphrase_title": "Cancelar a escrita da frase de paso?",
         "confirm_encryption_setup_body": "Preme no botón inferior para confirmar os axustes do cifrado.",
         "confirm_encryption_setup_title": "Confirma os axustes de cifrado",
         "cross_signing_room_normal": "Esta sala está cifrada extremo-a-extremo",
@@ -711,8 +707,6 @@
             "title": "Método de Recuperación eliminado",
             "warning": "Se non eliminaches o método de recuperación, un atacante podería estar a intentar acceder á túa conta. Cambia inmediatamente o contrasinal da conta e establece un novo método de recuperación nos Axustes."
         },
-        "reset_all_button": "Perdidos ou esquecidos tódolos métodos de recuperación? <a>Restabléceos</a>",
-        "set_up_toast_description": "Protéxete de perder o acceso a mensaxes e datos cifrados",
         "set_up_toast_title": "Configurar Copia de apoio Segura",
         "setup_secure_backup": {
             "explainer": "Fai unha copia de apoio das chaves antes de saír para evitar perdelas."
@@ -731,12 +725,8 @@
             "after_new_login": {
                 "device_verified": "Dispositivo verificado",
                 "skip_verification": "Omitir a verificación por agora",
-                "unable_to_verify": "Non se puido verificar este dispositivo",
                 "verify_this_device": "Verifica este dispositivo"
             },
-            "cancelled": "Cancelaches a verificación.",
-            "cancelled_self": "Cancelaches a verificación no teu outro dispositivo.",
-            "cancelled_user": "%(displayName)s cancelou a verificación.",
             "cancelling": "Cancelando…",
             "complete_action": "Vale",
             "complete_description": "Verificaches esta usuaria.",
@@ -748,41 +738,29 @@
             "incoming_sas_dialog_title": "Solicitude entrante de verificación",
             "incoming_sas_user_dialog_text_1": "Verifica esta usuaria para marcala como confiable. Ao confiar nas usuarias proporcionache tranquilidade extra cando usas cifrado de extremo-a-extremo.",
             "incoming_sas_user_dialog_text_2": "Ao verificar esta usuaria marcarás a súa sesión como confiable, e tamén marcará a túa sesión como confiable para elas.",
-            "no_key_or_device": "Semella que non tes unha Chave de Seguridade ou outros dispositivos cos que verificar. Este dispositivo non poderá acceder a mensaxes antigas cifradas. Para poder verificar a túa identidade neste dispositivo tes que restablecer as chaves de verificación.",
             "no_support_qr_emoji": "Este dispositivo que intentas verificar non ten soporte para código QR nin verificación por emoji, que é o que %(brand)s soporta. Inténtao cun cliente diferente.",
             "other_party_cancelled": "A outra parte cancelou a verificación.",
             "prompt_encrypted": "Verificar todas as usuarias da sala para asegurar que é segura.",
-            "prompt_self": "Inicia o proceso de novo desde a notificación.",
             "prompt_unencrypted": "En salas cifradas, verfica tódalas usuarias para ter certeza de que é segura.",
-            "prompt_user": "Inicia a verificación outra vez desde o seu perfil.",
             "qr_or_sas": "%(qrCode)s ou %(emojiCompare)s",
-            "qr_or_sas_header": "Verifica este dispositivo usando un dos seguintes métodos:",
             "qr_prompt": "Escanea este código único",
-            "qr_reciprocate_same_shield_device": "Xa case está! Mostra o teu outro dispositivo o mesmo escudo?",
             "qr_reciprocate_same_shield_user": "Case feito! ¿está %(displayName)s mostrando as mesmas emoticonas?",
             "request_toast_detail": "%(deviceId)s desde %(ip)s",
-            "reset_proceed_prompt": "Procede co restablecemento",
             "sas_caption_self": "Verifica este dispositivo confirmando que o seguinte número aparece na pantalla.",
             "sas_caption_user": "Verifica esta usuaria confirmando que o seguinte número aparece na súa pantalla.",
             "sas_description": "Compara o conxunto único de emoticonas se non tes cámara no outro dispositivo",
-            "sas_emoji_caption_self": "Confirma que os emoji inferiores se mostran nos dous dispositivos, na mesma orde:",
             "sas_emoji_caption_user": "Verifica a usuaria confirmando que as emoticonas aparecen na súa pantalla.",
             "sas_match": "Concordan",
             "sas_no_match": "Non concordan",
             "sas_prompt": "Compara os emoji",
             "scan_qr": "Verificar escaneando",
             "scan_qr_explainer": "Pídelle a %(displayName)s que escanee o teu código:",
-            "self_verification_hint": "Para seguir, acepta a solicitude de verificación no teu outro dispositivo.",
             "start_button": "Comezar a Verificación",
-            "successful_device": "Verificaches correctamente %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "Verificaches correctamente o teu dispositivo!",
             "successful_user": "Verificaches correctamente a %(displayName)s!",
-            "timed_out": "Verificación caducada.",
             "unsupported_method": "Non se atopa un método de verificación válido.",
             "unverified_session_toast_title": "Nova sesión. Foches ti?",
             "unverified_sessions_toast_description": "Revisa para asegurarte de que a túa conta está protexida",
             "unverified_sessions_toast_reject": "Máis tarde",
-            "verification_description": "Verifica a túa identidade para acceder a mensaxes cifradas e acreditar a túa identidade ante outras.",
             "verification_dialog_title_device": "Verificar outro dispositivo",
             "verification_dialog_title_user": "Solicitude de Verificación",
             "verification_skip_warning": "Sen verificación non poderás acceder a tódalas túas mensaxes e poderían aparecer como non confiables ante outras persoas.",
@@ -792,9 +770,6 @@
             "verify_emoji_prompt": "Verficación por comparación de emoticonas.",
             "verify_emoji_prompt_qr": "Se non podes escanear o código superior, verifica comparando as emoticonas.",
             "verify_later": "Verificarei máis tarde",
-            "verify_using_device": "Verifica usando outro dispositivo",
-            "verify_using_key": "Verificar coa Chave de Seguridade",
-            "verify_using_key_or_phrase": "Verificar coa Chave ou Frase de Seguridade",
             "waiting_for_user_accept": "Agardando a que %(displayName)s acepte…",
             "waiting_other_device": "Agardando a que verifiques no teu outro dispositivo…",
             "waiting_other_device_details": "Agardando a que verifiques o teu outro dispositivo, %(deviceName)s %(deviceId)s …",
@@ -1249,8 +1224,7 @@
         "toggle_attribution": "Cambiar atribución"
     },
     "member_list": {
-        "filter_placeholder": "Filtrar os participantes da conversa",
-        "power_label": "%(userName)s (permiso %(powerLevelNumber)s)"
+        "filter_placeholder": "Filtrar os participantes da conversa"
     },
     "member_list_back_action_label": "Membros da sala",
     "message_edit_dialog_title": "Edicións da mensaxe",
@@ -1497,8 +1471,6 @@
             "send_message_start_dm": "Envía a túa primeira mensaxe para convidar a <displayName/> ao chat",
             "start_of_dm_history": "Este é o comezo do teu historial de conversa con <displayName/>.",
             "start_of_room": "Este é o comezo de <roomName/>.",
-            "topic": "Asunto: %(topic)s ",
-            "topic_edit": "Asunto: %(topic)s (<a>editar</a>)",
             "unencrypted_warning": "Non está activado o cifrado de extremo-a-extremo",
             "user_created": "%(displayName)s creou esta sala.",
             "you_created": "Creaches esta sala."
@@ -1814,7 +1786,6 @@
             "error_update_guest_access": "Fallou a actualización do acceso de convidadas ao espazo",
             "error_update_history_visibility": "Fallou a actualización da visibilidade do historial do espazo",
             "guest_access_explainer": "As convidadas poden unirse ao espazo sen ter unha conta.",
-            "guest_access_explainer_public_space": "Esto podería ser útil para espazos públicos.",
             "guest_access_label": "Activar acceso de convidadas",
             "history_visibility_anyone_space": "Vista previa do Espazo",
             "history_visibility_anyone_space_description": "Permitir que sexa visible o espazo antes de unirte a el.",
@@ -1964,10 +1935,6 @@
         "insert_trailing_colon_mentions": "Inserir dous puntos tras mencionar a outra usuaria no inicio da mensaxe",
         "jump_to_bottom_on_send": "Ir ao final da cronoloxía cando envías unha mensaxe",
         "key_backup": {
-            "backup_in_progress": "As chaves estanse a copiar (a primeira copia podería tardar un anaco).",
-            "backup_success": "Feito!",
-            "cannot_create_backup": "Non se creou a copia da chave",
-            "create_title": "Crear copia da chave",
             "setup_secure_backup": {
                 "cancel_warning": "Se cancelas agora, poderías perder mensaxes e datos cifrados se perdes o acceso ás sesións iniciadas.",
                 "confirm_security_phrase": "Confirma a Frase de Seguridade",
@@ -2064,7 +2031,6 @@
             "ignore_users_empty": "Non tes usuarias ignoradas.",
             "ignore_users_section": "Usuarias ignoradas",
             "key_backup_algorithm": "Algoritmo:",
-            "key_backup_connect": "Conecta esta sesión a Copia de Apoio de chaves",
             "message_search_disable_warning": "Se está desactivado, as mensaxes das salas cifradas non aparecerán nos resultados das buscas.",
             "message_search_disabled": "Gardar de xeito seguro mensaxes cifradas na caché local para que aparezan nos resultados de buscas.",
             "message_search_enabled": {
@@ -2157,7 +2123,6 @@
             "metaspaces_subsection": "Espazos a mostrar",
             "title": "Barra lateral"
         },
-        "start_automatically": "Iniciar automaticamente despois de iniciar sesión",
         "use_12_hour_format": "Mostrar marcas de tempo con formato 12 horas (ex. 2:30pm)",
         "use_command_enter_send_message": "Usar Command + Enter para enviar unha mensaxe",
         "use_command_f_search": "Usar Command + F para buscar na cronoloxía",
@@ -2255,6 +2220,7 @@
         "upgraderoom": "Subir a sala de versión",
         "upgraderoom_permission_error": "Non tes os permisos suficientes para usar este comando.",
         "usage": "Uso",
+        "verify": "Verifica unha usuaria, sesión e chave pública",
         "whois": "Mostra información acerca da usuaria"
     },
     "space": {
diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index 22a1cecc89..0b7f1986de 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -179,8 +179,7 @@
             "megolm_export": "ייצא ידנית מפתחות",
             "setup_key_backup_title": "תאבד את הגישה להודעות המוצפנות שלך",
             "setup_secure_backup_description_1": "הודעות מוצפנות מאובטחות באמצעות הצפנה מקצה לקצה. רק לך ולמקבל / ים יש / ה מקשים לקריאת הודעות אלה.",
-            "skip_key_backup": "אני לא רוצה את ההודעות המוצפנות שלי",
-            "use_key_backup": "התחל להשתמש בגיבוי מקשים"
+            "skip_key_backup": "אני לא רוצה את ההודעות המוצפנות שלי"
         },
         "misconfigured_body": "בקשו מהאדמין של %(brand)s לבדוק <a>קונפיגורציה</a> לרשומות כפולות שגויות.",
         "misconfigured_title": "ה %(brand)s שלך מוגדר באופן שגוי",
@@ -423,7 +422,6 @@
         "unnamed_room": "חדר ללא שם",
         "user_avatar": "תמונת פרופיל",
         "username": "שם משתמש",
-        "verification_cancelled": "אימות בוטל",
         "video": "וידאו",
         "warning": "התראה"
     },
@@ -574,8 +572,6 @@
             "security_key_title": "מפתח אבטחה"
         },
         "bootstrap_title": "מגדיר מפתחות",
-        "cancel_entering_passphrase_description": "האם אתם בטוחים שהינכם רוצים לבטל?",
-        "cancel_entering_passphrase_title": "בטל הקלדת סיסמא?",
         "confirm_encryption_setup_body": "לחץ על הלחצן למטה כדי לאשר את הגדרת ההצפנה.",
         "confirm_encryption_setup_title": "אשר את הגדרת ההצפנה",
         "cross_signing_room_normal": "חדר זה מוצפן מקצה לקצה",
@@ -604,7 +600,6 @@
             "title": "שיטת השחזור הוסרה",
             "warning": "אם לא הסרת את שיטת השחזור, ייתכן שתוקף מנסה לגשת לחשבונך. שנה את סיסמת החשבון שלך והגדר מיד שיטת שחזור חדשה בהגדרות."
         },
-        "set_up_toast_description": "שמור מפני איבוד גישה אל הודעות ומידע מוצפן",
         "set_up_toast_title": "צור גיבוי מאובטח",
         "setup_secure_backup": {
             "explainer": "גבה את המפתחות שלך לפני היציאה כדי להימנע מלאבד אותם."
@@ -621,11 +616,8 @@
             "accepting": "מקבל…",
             "after_new_login": {
                 "device_verified": "המכשיר אומת",
-                "unable_to_verify": "לא ניתן לאמת את מכשיר זה",
                 "verify_this_device": "אמתו את מכשיר זה"
             },
-            "cancelled": "בטלתם את האימות.",
-            "cancelled_user": "הצג אימותים מבוטלים %(displayName)s.",
             "cancelling": "מבטל…",
             "complete_action": "קבלתי",
             "complete_description": "המשתמש הזה אומת בהצלחה.",
@@ -639,14 +631,10 @@
             "incoming_sas_user_dialog_text_2": "אימות משתמש זה יסמן את ההפעלה שלו כאמינה, וגם יסמן את ההפעלה שלכם כאמינה להם.",
             "other_party_cancelled": "הצד השני ביטל את האימות.",
             "prompt_encrypted": "אמת את כל המשתמשים בחדר כדי לוודא שהוא מאובטח.",
-            "prompt_self": "התחל אימות שוב מההודעה.",
-            "prompt_user": "התחל לאמת שוב מהפרופיל שלהם.",
-            "qr_or_sas_header": "אמתו מכשיר זה על ידי מילוי אחת מהפעולות הבאות:",
             "qr_prompt": "סרוק את הקוד הזה",
             "qr_reciprocate_same_shield_user": "כמעט שם! האם %(displayName)s מציג את אותו מגן?",
             "sas_caption_user": "אמת את המשתמש הזה בכך שאותו מספר מופיע אצלו במסך.",
             "sas_description": "השווה קבוצה של סמלים אם אין ברשותכם מצלמה על שום מכשיר",
-            "sas_emoji_caption_self": "ודא ואשר שהסמלים הבאים מופיעים בשני המכשירים ובאותו הסדר:",
             "sas_emoji_caption_user": "אמת את המשתמש הזה בכך שסדרת הסמלים מוצגת זהה אצלו במסך.",
             "sas_match": "הם זהים",
             "sas_no_match": "הם לא זהים",
@@ -654,10 +642,7 @@
             "scan_qr": "אמת על ידי סריקה",
             "scan_qr_explainer": "בקש מ- %(displayName)s לסרוק את הקוד שלכם:",
             "start_button": "התחל אימות",
-            "successful_device": "אימתת בהצלחה את %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "אימתת בהצלחה את המכשיר שלך!",
             "successful_user": "אמתתם בהצלחה את %(displayName)s!",
-            "timed_out": "תם הזמן הקצוב לאימות.",
             "unsupported_method": "לא מצליח למצוא שיטות אימות נתמכות.",
             "unverified_session_toast_title": "כניסה חדשה. האם זה אתם?",
             "unverified_sessions_toast_description": "בידקו כדי לוודא שהחשבון שלך בטוח",
@@ -1039,8 +1024,7 @@
         "toggle_attribution": "דפדפו בין האפשרויות"
     },
     "member_list": {
-        "filter_placeholder": "סינון חברי חדר",
-        "power_label": "%(userName)s (רמת הרשאה %(powerLevelNumber)s)"
+        "filter_placeholder": "סינון חברי חדר"
     },
     "member_list_back_action_label": "חברי החדר",
     "message_edit_dialog_title": "עריכת הודעות",
@@ -1233,8 +1217,6 @@
             "send_message_start_dm": "שילחו את ההודעה הראשונה שלכם להזמין את <displayName/> לצ'אט",
             "start_of_dm_history": "זו ההתחלה של היסטוריית ההודעות הישירות שלך עם <displayName/>.",
             "start_of_room": "זוהי התחלת השיחה בחדר <roomName/>.",
-            "topic": "נושאים: %(topic)s ",
-            "topic_edit": "נושאים: %(topic)s (<a>עריכה</a>)",
             "user_created": "%(displayName)s יצר את החדר הזה.",
             "you_created": "אתם יצרתם את החדר הזה."
         },
@@ -1487,7 +1469,6 @@
             "error_update_guest_access": "עדכון גישת האורח של מרחב העבודה הזה נכשל",
             "error_update_history_visibility": "נכשל עדכון נראות ההיסטוריה של מרחב עבודה זה",
             "guest_access_explainer": "אורחים יכולים להצטרף אל מרחב העבודה ללא חשבון פעיל.",
-            "guest_access_explainer_public_space": "זה יכול להיות שימושי למרחבי עבודה ציבוריים.",
             "guest_access_label": "אפשר גישה לאורחים",
             "history_visibility_anyone_space": "תצוגה מקדימה של מרחב העבודה",
             "history_visibility_anyone_space_description": "אפשרו לאנשים תצוגה מקדימה של מרחב העבודה שלכם לפני שהם מצטרפים.",
@@ -1621,10 +1602,6 @@
         "insert_trailing_colon_mentions": "הוסף נקודתיים לאחר אזכור המשתמש בתחילת ההודעה",
         "jump_to_bottom_on_send": "קפוץ לתחתית השיחה בעת שליחת הודעה",
         "key_backup": {
-            "backup_in_progress": "גיבוי המפתחות שלך (הגיבוי הראשון יכול לקחת מספר דקות).",
-            "backup_success": "הצלחה!",
-            "cannot_create_backup": "לא ניתן ליצור גיבוי מפתח",
-            "create_title": "צור מפתח גיבוי",
             "setup_secure_backup": {
                 "cancel_warning": "אם תבטל עכשיו, אתה עלול לאבד הודעות ונתונים מוצפנים אם תאבד את הגישה לכניסות שלך.",
                 "confirm_security_phrase": "אשר את ביטוי האבטחה שלך",
@@ -1714,7 +1691,6 @@
             "ignore_users_empty": "אין לך משתמשים שהתעלמו מהם.",
             "ignore_users_section": "משתמשים שהתעלמתם מהם",
             "key_backup_algorithm": "אלגוריתם:",
-            "key_backup_connect": "חבר את התחברות הזו לגיבוי מפתח",
             "message_search_disable_warning": "אם מושבת, הודעות מחדרים מוצפנים לא יופיעו בתוצאות החיפוש.",
             "message_search_disabled": "שמור באופן מאובטח הודעות מוצפנות באופן מקומי כדי שיופיעו בתוצאות החיפוש.",
             "message_search_enabled": {
@@ -1769,7 +1745,6 @@
             "metaspaces_subsection": "מרחבי עבודה להצגה",
             "title": "סרגל צד"
         },
-        "start_automatically": "התחל באופן אוטומטי לאחר הכניסה",
         "use_12_hour_format": "הצג חותמות זמן של 12 שעות (כלומר 2:30pm)",
         "use_command_enter_send_message": "השתמש במקלדת Command + Enter על מנת לשלוח הודעה",
         "use_control_enter_send_message": "השתמש ב Ctrl + Enter על מנת לשלוח הודעה",
@@ -1874,6 +1849,7 @@
         "upgraderoom": "משדרג את החדר לגרסא חדשה",
         "upgraderoom_permission_error": "אין לכם הרשאות להשתמש בפקודה זו.",
         "usage": "שימוש",
+        "verify": "מוודא משתמש, התחברות וצמד מפתח ציבורי",
         "whois": "מציג מידע אודות משתמש"
     },
     "space": {
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 76f822fee4..9c10c95a4e 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -93,7 +93,7 @@
         "maximise": "Teljes méret",
         "mention": "Megemlítés",
         "minimise": "Lecsukás",
-        "new_message": "Új üzenet",
+        "new_conversation": "Új beszélgetés",
         "new_room": "Új szoba",
         "new_video_room": "Új videószoba",
         "next": "Következő",
@@ -135,7 +135,7 @@
         "skip": "Kihagyás",
         "start": "Indítás",
         "start_chat": "Csevegés indítása",
-        "start_new_chat": "Új beszélgetés indítása",
+        "start_new_chat": "Új csevegés indítása",
         "stop": "Leállítás",
         "submit": "Elküldés",
         "subscribe": "Feliratkozás",
@@ -240,8 +240,7 @@
             "setup_key_backup_title": "Elveszíti a hozzáférést a titkosított üzeneteihez",
             "setup_secure_backup_description_1": "A titkosított üzenetek végpontok közti titkosítással védettek. Csak Önnek és a címzetteknek lehet meg a kulcsuk az üzenet visszafejtéséhez.",
             "setup_secure_backup_description_2": "A kijelentkezéssel a kulcsok az eszközről törlődnek, ami azt jelenti, hogy ha nincsenek meg máshol a kulcsok, vagy nincsenek mentve a kiszolgálón, akkor a titkosított üzenetek olvashatatlanná válnak.",
-            "skip_key_backup": "Nincs szükségem a titkosított üzeneteimre",
-            "use_key_backup": "Kulcsmentés használatának megkezdése"
+            "skip_key_backup": "Nincs szükségem a titkosított üzeneteimre"
         },
         "misconfigured_body": "Kérje meg a(z) %(brand)s adminisztrátorát, hogy ellenőrizze a <a>beállításait</a>, hibás vagy duplikált bejegyzéseket keresve.",
         "misconfigured_title": "Az %(brand)s hibásan van beállítva",
@@ -598,12 +597,12 @@
         "user": "Felhasználó",
         "user_avatar": "Profilkép",
         "username": "Felhasználói név",
-        "verification_cancelled": "Ellenőrzés megszakítva",
         "verified": "Ellenőrizve",
         "version": "Verzió",
         "video": "Videó",
         "video_room": "Videószoba",
         "view_message": "Üzenet megjelenítése",
+        "voice": "Hang",
         "warning": "Figyelmeztetés"
     },
     "composer": {
@@ -644,16 +643,17 @@
         "mode_plain": "Formázás elrejtése",
         "mode_rich_text": "Formázás megjelenítése",
         "no_perms_notice": "Nincs joga üzenetet küldeni ebbe a szobába",
-        "placeholder": "Üzenet küldése…",
-        "placeholder_encrypted": "Titkosított üzenet küldése…",
-        "placeholder_reply": "Válasz küldése…",
-        "placeholder_reply_encrypted": "Titkosított válasz küldése…",
-        "placeholder_thread": "Válasz az üzenetszálra…",
-        "placeholder_thread_encrypted": "Válasz a titkosított üzenetszálra…",
+        "placeholder": "Titkosítatlan üzenet küldése…",
+        "placeholder_encrypted": "Üzenet küldése…",
+        "placeholder_reply": "Titkosítatlan válasz küldése…",
+        "placeholder_reply_encrypted": "Válasz küldése…",
+        "placeholder_thread": "Válasz titkosítatlan üzenetszálra…",
+        "placeholder_thread_encrypted": "Válasz az üzenetszálra…",
         "poll_button": "Szavazás",
         "poll_button_no_perms_description": "Nincs joga szavazást kezdeményezni ebben a szobában.",
         "poll_button_no_perms_title": "Jogosultság szükséges",
         "replying_title": "Válasz",
+        "room_unencrypted": "A szobában lévő üzenetek nincsenek végponttól végpontig titkosítva",
         "room_upgraded_link": "A beszélgetés itt folytatódik.",
         "room_upgraded_notice": "Ezt a szobát lecseréltük és nem aktív többé.",
         "send_button_title": "Üzenet küldése",
@@ -717,6 +717,7 @@
         "personal_space_description": "Privát tér a szobái csoportosításához",
         "private_description": "Csak meghívóval, saját célra és csoportok számára ideális",
         "private_heading": "Saját privát tér",
+        "private_only_heading": "Saját tér",
         "private_personal_description": "Ellenőrizze, hogy a megfelelő személyeknek hozzáférése van ehhez: %(name)s",
         "private_personal_heading": "Kivel dolgozik együtt?",
         "private_space": "Én és a csoporttársaim",
@@ -784,6 +785,7 @@
             "cross_signing_status": "Eszközök közti hitelesítés állapota:",
             "cross_signing_untrusted": "A fiókjához tartozik egy eszközök közti hitelesítési személyazonosság, de ez a munkamenet még nem jelölte megbízhatónak.",
             "crypto_not_available": "A kriptográfiai modul nem érhető el",
+            "device_id": "Eszközazonosító",
             "key_backup_active_version": "Aktív biztonsági mentés verziója:",
             "key_backup_active_version_none": "Nincs",
             "key_backup_inactive_warning": "A kulcsokról nem készül biztonsági mentés ebből a munkamenetből.",
@@ -796,11 +798,24 @@
             "secret_storage_ready": "kész",
             "secret_storage_status": "Titkos tároló:",
             "self_signing_private_key_cached_status": "Önaláíró titkos kulcs:",
+            "session": "Munkamenet",
+            "session_fingerprint": "Ujjlenyomat (munkamenetkulcs)",
             "title": "Végpontok közti titkosítás",
             "user_signing_private_key_cached_status": "Felhasználó aláírási titkos kulcsa:"
         },
         "developer_mode": "Fejlesztői mód",
         "developer_tools": "Fejlesztői eszközök",
+        "device_dehydrated_no": "Dehidratált: Nem",
+        "device_dehydrated_yes": "Dehidratált: Igen",
+        "device_id": "Eszközazonosító:%(deviceId)s",
+        "device_keys": "Eszközkulcsok",
+        "device_verification_status": {
+            "signed_by_owner": "Ellenőrzés állapota: <E2EIcon /> Tulajdonos által aláírt",
+            "unknown": "Ellenőrzés állapota: Ismeretlen",
+            "unverified": "Ellenőrzés állapota: <E2EIcon /> A tulajdonos nem írta alá",
+            "verified": "Ellenőrzés állapota: <E2EIcon /> Keresztaláírással ellenőrizve"
+        },
+        "devices": "Kriptográfiai eszközök (%(count)s)",
         "edit_setting": "Beállítások szerkesztése",
         "edit_values": "Értékek szerkesztése",
         "empty_string": "<üres karakterek>",
@@ -816,15 +831,18 @@
         "failed_to_save": "A beállítások elmentése sikertelen.",
         "failed_to_send": "Az eseményt nem sikerült elküldeni!",
         "id": "Azonosító: ",
+        "invalid_device_key_id": "Érvénytelen eszközkulcs-azonosító",
         "invalid_json": "Nem tűnik érvényes JSON szövegnek.",
         "level": "Szint",
         "low_bandwidth_mode": "Alacsony sávszélességű mód",
         "low_bandwidth_mode_description": "Kompatibilis Matrix-kiszolgálóra van szükség.",
         "main_timeline": "Fő idővonal",
+        "manual_device_verification": "Kézi eszközellenőrzés",
         "no_receipt_found": "Nincs visszajelzés",
         "notification_state": "Értesítés állapota: <strong>%(notificationState)s</strong>",
         "notifications_debug": "Értesítések hibakeresése",
         "number_of_users": "Felhasználószám",
+        "only_joined_members": "Csak csatlakozott felhasználók",
         "original_event_source": "Eredeti esemény forráskódja",
         "room_encrypted": "A szoba <strong>titkosítva van ✅</strong>",
         "room_id": "Szoba azon.: %(roomId)s",
@@ -857,6 +875,7 @@
             "elementCallUrl": "Element Call webcím"
         },
         "settings_explorer": "Beállításböngésző",
+        "show_empty_content_events": "Üres tartalmú események megjelenítése",
         "show_hidden_events": "Rejtett események megjelenítése az idővonalon",
         "spaces": {
             "<%(count)s szóköz>": "other",
@@ -869,10 +888,23 @@
         "toggle_event": "esemény be/ki",
         "toolbox": "Eszköztár",
         "use_at_own_risk": "Ez a felület nem ellenőrzi az érték típusát. Csak saját felelősségére használja.",
+        "user_avatar": "Profilkép: %(avatar)s",
+        "user_displayname": "Megjelenített név: %(displayname)s",
+        "user_id": "Felhasználói azonosító: %(userId)s",
+        "user_no_avatar": "Profilkép: <i>Nincs</i>",
+        "user_no_displayname": "Megjelenített név: <i>Nincs</i>",
         "user_read_up_to": "A felhasználó eddig olvasta el: ",
         "user_read_up_to_ignore_synthetic": "A felhasználó eddig olvasott felfelé (ignoreSynthetic): ",
         "user_read_up_to_private": "A felhasználó eddig olvasott felfelé (m.read.private): ",
         "user_read_up_to_private_ignore_synthetic": "A felhasználó eddig olvasott felfelé (m.read.private;ignoreSynthetic): ",
+        "user_room_membership": "Tagság: %(membership)s",
+        "user_verification_status": {
+            "identity_changed": "Ellenőrzés állapota: <E2EIcon /> Nincs ellenőrizve, és a személyazonosság megváltozott",
+            "unverified": "Ellenőrzés állapota: <E2EIcon /> Nem ellenőrzött",
+            "verified": "Ellenőrzés állapota: <E2EIcon /> Ellenőrzött",
+            "was_verified": "Ellenőrzési állapot:<E2EIcon /> Ellenőrzés megtörtént, de a személyazonosság megváltozott"
+        },
+        "users": "Felhasználók",
         "value": "Érték",
         "value_colon": "Érték:",
         "value_in_this_room": "Érték ebben a szobában",
@@ -908,15 +940,16 @@
     "empty_room_was_name": "Üres szoba (%(oldName)s volt)",
     "encryption": {
         "access_secret_storage_dialog": {
+            "alternatives": "Ha van biztonsági kulcsa vagy biztonsági jelmondata, akkor ez is fog működni.",
             "key_validation_text": {
-                "wrong_security_key": "Hibás helyreállítási kulcs"
+                "wrong_security_key": "A megadott helyreállítási kulcs helytelen."
             },
+            "privacy_warning": "Győződjön meg arról, hogy senki sem látja ezt a képernyőt!",
             "restoring": "Kulcsok helyreállítása mentésből",
-            "security_key_title": "Helyreállítási kulcs"
+            "security_key_label": "Helyreállítási kulcs",
+            "security_key_title": "Adja meg a helyreállítási kulcsát"
         },
         "bootstrap_title": "Kulcsok beállítása",
-        "cancel_entering_passphrase_description": "Biztos, hogy megszakítja a jelmondat bevitelét?",
-        "cancel_entering_passphrase_title": "Megszakítja a jelmondat bevitelét?",
         "confirm_encryption_setup_body": "Az alábbi gomb megnyomásával erősítsd meg, hogy megadod a titkosítási beállításokat.",
         "confirm_encryption_setup_title": "Erősítse meg a titkosítási beállításokat",
         "cross_signing_room_normal": "Ez a szoba végpontok közti titkosítást használ",
@@ -927,6 +960,7 @@
         "cross_signing_user_warning": "Ez a felhasználó még nem ellenőrizte az összes munkamenetét.",
         "enter_recovery_key": "Adja meg a helyreállítási kulcsot",
         "event_shield_reason_authenticity_not_guaranteed": "A titkosított üzenetek valódiságát ezen az eszközön nem lehet garantálni.",
+        "event_shield_reason_mismatched_sender": "Az esemény feladója nem egyezik meg az eseményt küldő eszköz tulajdonosával.",
         "event_shield_reason_mismatched_sender_key": "Ellenőrizetlen munkamenet által titkosítva",
         "event_shield_reason_unknown_device": "Ismeretlen vagy törölt eszköz által titkosítva.",
         "event_shield_reason_unsigned_device": "A tulajdonos által nem ellenőrzött eszköz által titkosítva.",
@@ -959,11 +993,8 @@
             "title": "Helyreállítási mód eltávolítva",
             "warning": "Ha nem Ön távolított el a helyreállítási módot, akkor lehet, hogy egy támadó hozzá akar férni a fiókjához. Azonnal változtassa meg a jelszavát, és állítson be egy helyreállítási módot a Beállításokban."
         },
-        "reset_all_button": "Elfelejtette vagy elveszett minden helyreállítási lehetőség? <a>Minden alaphelyzetbe állítása</a>",
         "set_up_recovery": "Helyreállítás beállítása",
-        "set_up_recovery_later": "Most nem",
         "set_up_recovery_toast_description": "Létrehozhat egy helyreállítási kulcsot, amellyel helyreállíthatja a titkosított üzenetelőzményeit, ha elveszíti a hozzáférést az eszközeihez.",
-        "set_up_toast_description": "Biztosíték a titkosított üzenetekhez és adatokhoz való hozzáférés elvesztése ellen",
         "set_up_toast_title": "Biztonsági mentés beállítása",
         "setup_secure_backup": {
             "explainer": "Mentse a kulcsait a kiszolgálóra kijelentkezés előtt, hogy ne veszítse el azokat."
@@ -984,78 +1015,93 @@
             "after_new_login": {
                 "device_verified": "Eszköz ellenőrizve",
                 "skip_verification": "Ellenőrzés kihagyása most",
-                "unable_to_verify": "Ennek az eszköznek az ellenőrzése nem lehetséges",
                 "verify_this_device": "Az eszköz ellenőrzése"
             },
-            "cancelled": "Megszakította az ellenőrzést.",
-            "cancelled_self": "Az ellenőrzést megszakította a másik eszközön.",
-            "cancelled_user": "%(displayName)s megszakította az ellenőrzést.",
+            "cancelled_verification": "Vagy időtúllépés történt a kérésnél, vagy elutasították a kérést, vagy ellenőrzési történt hiba.",
             "cancelling": "Megszakítás…",
+            "cant_confirm": "Nem tudja megerősíteni?",
             "complete_action": "Megértettem",
             "complete_description": "Sikeresen ellenőrizte ezt a felhasználót.",
             "complete_title": "Ellenőrizve!",
+            "confirm_identity_description": "A biztonságos üzenetkezelés beállításához ellenőrizze ezt az eszközt.",
+            "confirm_identity_title": "Erősítse meg, hogy Ön az",
+            "confirm_the_emojis": "Erősítse meg, hogy a lenti emodzsik megegyeznek a másik eszközön megjelenítettekkel.",
             "error_starting_description": "A beszélgetést a másik felhasználóval nem lehetett elindítani.",
             "error_starting_title": "Hiba az ellenőrzés indításakor",
             "explainer": "Az ezzel felhasználóval váltott biztonságos üzenetek végpontok közti titkosítással védettek, és azt harmadik fél nem tudja elolvasni.",
             "in_person": "A biztonság érdekében ezt végezze el személyesen, vagy használjon megbízható kommunikációs csatornát.",
             "incoming_sas_device_dialog_text_1": "Eszköz ellenőrzése és beállítás megbízhatóként. Az eszközben való megbízás megnyugtató lehet, ha végpontok közti titkosítást használ.",
-            "incoming_sas_device_dialog_text_2": "Az eszköz ellenőrzése megbízhatónak fogja jelezni az eszközt és azok a felhasználók, akik téged ellenőriztek, megbíznak majd ebben az eszközödben.",
+            "incoming_sas_device_dialog_text_2": "Az eszköz ellenőrzése megbízhatónak fogja jelezni az eszközt és azok a felhasználók, akik ellenőrizték, megbíznak majd ebben az eszközében.",
             "incoming_sas_dialog_title": "Bejövő ellenőrzési kérés",
             "incoming_sas_dialog_waiting": "Várakozás a partner megerősítésére…",
             "incoming_sas_user_dialog_text_1": "Ellenőrizze ezt a felhasználót, hogy megbízhatónak jelölje. A felhasználók megbízhatóságának megerősítése további biztonságot nyújt a végpontok közti titkosítással rendelkező üzenetek használatakor.",
-            "incoming_sas_user_dialog_text_2": "A felhasználó ellenőrzése által az ő munkamenete megbízhatónak lesz jelölve, és a te munkameneted is megbízhatónak lesz jelölve nála.",
-            "no_key_or_device": "Úgy tűnik, hogy nem rendelkezik helyreállítási kulccsal, vagy másik eszközzel, amellyel ellenőrizhetné. Ezzel az eszközzel nem fér majd hozzá a régi titkosított üzenetekhez. Ahhoz, hogy a személyazonosságát ezen az eszközön ellenőrizni lehessen, az ellenőrzési kulcsokat alaphelyzetbe kell állítania.",
+            "incoming_sas_user_dialog_text_2": "A felhasználó ellenőrzése megbízhatónak jelöli az ő munkamenetét, és az Ön munkamenetét is megbízhatónak lesz jelölve nála.",
+            "manual": {
+                "already_verified": "Ez az eszköz már ellenőrzött",
+                "already_verified_and_wrong_fingerprint": "A megadott ujjlenyomat nem egyezik, de az eszköz már ellenőrizve van!",
+                "device_id": "Eszközazonosító",
+                "failure_description": "Nem sikerült ellenőrizni ezt: %(deviceId)s: %(error)s",
+                "failure_title": "Az ellenőrzés sikertelen",
+                "fingerprint": "Ujjlenyomat (munkamenetkulcs)",
+                "no_crypto": "Nem lehet ellenőrizni az eszközt – a titkosítás nincs engedélyezve",
+                "no_device": "Nem sikerült ellenőrizni az eszközt – a(z) „%(deviceId)s” eszköz nem található",
+                "no_userid": "Nem sikerült ellenőrizni az eszközt – nem található a felhasználói azonosító",
+                "success_description": "Az eszköz (%(deviceId)s) mostantól keresztaláírással rendelkezik.",
+                "success_title": "Az ellenőrzés sikeres",
+                "text": "Adja meg valamelyik saját eszköze azonosítóját és ujjlenyomatát annak ellenőrzéséhez. MEGJEGYZÉS: ez lehetővé teszi a másik eszköz számára, hogy az Ön nevében küldjön és fogadjon üzeneteket. HA VALAKI AZT MONDTA, HOGY ILLESSZEN BE IDE VALAMIT, VALÓSZÍNŰLEG ÁTVERIK!",
+                "wrong_fingerprint": "Nem sikerült ellenőrizni a(z) „%(deviceId)s” eszközt – a mellékelt „%(fingerprint)s” ujjlenyomat nem egyezik az eszköz ujjlenyomatával: „%(fprint)s”"
+            },
             "no_support_qr_emoji": "Az ellenőrizni kívánt eszköz nem támogatja sem a QR-kód leolvasását, sem az emodzsis ellenőrzést, amelyeket az %(brand)s támogat. Próbálja meg egy másik klienssel.",
+            "now_you_can": "Mostantól biztonságosan olvashat vagy küldhet üzeneteket, és bárki, akivel cseveg, szintén megbízhat ebben az eszközben.",
+            "once_accepted_can_continue": "Az elfogadást követően folytathatja az ellenőrzést.",
             "other_party_cancelled": "A másik fél megszakította az ellenőrzést.",
             "prompt_encrypted": "Ellenőrizze a szoba összes tagját, hogy meggyőződjön a biztonságáról.",
-            "prompt_self": "Ellenőrzés újrakezdése az értesítésből.",
             "prompt_unencrypted": "A titkosított szobákban ellenőrizze az összes tagot, hogy meggyőződjön a biztonságosságáról.",
-            "prompt_user": "Indítsa újra az ellenőrzést a profiljából.",
             "qr_or_sas": "%(qrCode)s vagy %(emojiCompare)s",
-            "qr_or_sas_header": "Ellenőrizze ezt az eszközt az alábbiak egyikével:",
             "qr_prompt": "Ennek az egyedi kódnak a beolvasása",
-            "qr_reciprocate_same_shield_device": "Majdnem kész! A többi eszköze is ugyanazt a pajzsot mutatja?",
+            "qr_reciprocate_check_again_device": "Az ellenőrzés befejezéséhez nézze meg újra a másik eszközén.",
+            "qr_reciprocate_no": "Nem, nem látok zöld pajzsot",
             "qr_reciprocate_same_shield_user": "Majdnem kész! %(displayName)s is ugyanazt a pajzsot mutatja?",
-            "request_toast_accept": "Munkamenet ellenőrzése",
+            "qr_reciprocate_yes": "Igen, látok egy zöld pajzsot",
             "request_toast_accept_user": "Felhasználó ellenőrzése",
             "request_toast_decline_counter": "Mellőzés (%(counter)s)",
             "request_toast_detail": "%(deviceId)s innen: %(ip)s",
-            "reset_proceed_prompt": "Lecserélés folytatása",
+            "request_toast_start_verification": "Ellenőrzés indítása",
             "sas_caption_self": "Ellenőrizze ezt az eszközt azzal, hogy megerősíti, hogy a következő szám jelenik meg a képernyőjén.",
             "sas_caption_user": "Ellenőrizze ezt a felhasználót azzal, hogy megerősíti, hogy a következő szám jelenik meg a képernyőjén.",
             "sas_description": "Hasonlítsd össze az egyedi emodzsikat ha valamelyik eszközön nincs kamera",
-            "sas_emoji_caption_self": "Erősítse meg, hogy az alábbi emodzsik mindkét eszközön azonos sorrendben jelentek-e meg:",
             "sas_emoji_caption_user": "Ellenőrizze ezt a felhasználót azzal, hogy megerősíti, hogy a következő emodzsi jelenik meg a képernyőjén.",
             "sas_match": "Egyeznek",
             "sas_no_match": "Nem egyeznek",
             "sas_prompt": "Egyedi emodzsik összehasonlítása",
             "scan_qr": "Ellenőrzés kód beolvasással",
             "scan_qr_explainer": "Kérd meg %(displayName)s felhasználót, hogy olvassa be a kódot:",
-            "self_verification_hint": "A folytatáshoz fogadja el az ellenőrzés kérést a másik eszközről.",
             "start_button": "Ellenőrzés elindítása",
-            "successful_device": "Sikeresen ellenőrizted: %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "Sikeresen ellenőrizted az eszközödet!",
             "successful_user": "Sikeresen ellenőrizted a felhasználót: %(displayName)s!",
-            "timed_out": "Az ellenőrzés időtúllépés miatt megszakadt.",
             "unsupported_method": "Nem található támogatott ellenőrzési eljárás.",
             "unverified_session_toast_accept": "Igen, én voltam",
             "unverified_session_toast_title": "Új bejelentkezés. Ön volt az?",
             "unverified_sessions_toast_description": "Tekintse át, hogy meggyőződjön arról, hogy a fiókja biztonságban van",
             "unverified_sessions_toast_reject": "Később",
             "unverified_sessions_toast_title": "Ellenőrizetlen bejelentkezései vannak",
-            "verification_description": "Ellenőrizze a személyazonosságát, hogy hozzáférjen a titkosított üzeneteihez és másoknak is bizonyítani tudja személyazonosságát.",
+            "use_another_device": "Másik eszköz használata",
+            "use_recovery_key": "Helyreállítási kulcs használata",
+            "verification_dialog_title_choose": "Válassza ki az ellenőrzés módját",
+            "verification_dialog_title_compare_emojis": "Emodzsik összehasonlítása",
+            "verification_dialog_title_confirm_green_shield": "Ellenőrizze, hogy a másik eszközén zöld pajzs látható-e.",
             "verification_dialog_title_device": "Másik eszköz ellenőrzése",
+            "verification_dialog_title_failed": "Az ellenőrzés sikertelen",
+            "verification_dialog_title_start_on_other_device": "Ellenőrzés megkezdése a másik eszközön",
             "verification_dialog_title_user": "Ellenőrzési kérés",
+            "verification_dialog_title_verified": "Eszköz ellenőrizve",
             "verification_skip_warning": "Az ellenőrzés nélkül nem fér hozzá az összes üzenetéhez és mások számára megbízhatatlannak fog látszani.",
             "verification_success_with_backup": "Ez az eszköz hitelesítve van. A titkosított üzenetekhez hozzáférése van és más felhasználók megbízhatónak látják.",
             "verification_success_without_backup": "Az új eszköze ellenőrizve van. Mások megbízhatónak fogják látni.",
+            "verify_by_completing_one_of": "Az ellenőrzéshez végezze el az alábbiak egyikét:",
             "verify_emoji": "Ellenőrzés emodzsival",
             "verify_emoji_prompt": "Ellenőrzés egyedi emodzsik összehasonlításával.",
             "verify_emoji_prompt_qr": "Ha nem tudod beolvasni az alábbi kódot, ellenőrizd az egyedi emodzsik összehasonlításával.",
             "verify_later": "Később ellenőrzöm",
-            "verify_using_device": "Ellenőrizze egy másik eszközzel",
-            "verify_using_key": "Ellenőrzés helyreállítási kulccsal",
-            "verify_using_key_or_phrase": "Ellenőrzés helyreállítási kulccsal vagy jelmondattal",
             "waiting_for_user_accept": "%(displayName)s felhasználóra várakozás az elfogadáshoz…",
             "waiting_other_device": "Várakozás a másik eszköztől való ellenőrzésre…",
             "waiting_other_device_details": "Várakozás a másik eszközről való ellenőrzésre: %(deviceName)s (%(deviceId)s)…",
@@ -1105,6 +1151,7 @@
         "tls": "Nem lehet kapcsolódni a Matrix-kiszolgálóhoz – ellenőrizze a kapcsolatot, győződjön meg arról, hogy a <a>Matrix-kiszolgáló tanúsítványa</a> hiteles, és hogy a böngészőkiegészítők nem blokkolják a kéréseket.",
         "unknown": "Ismeretlen hiba",
         "unknown_error_code": "ismeretlen hibakód",
+        "update_history_visibility": "A régi üzenetek láthatóságának módosítása nem sikerült",
         "update_power_level": "A hozzáférési szint megváltoztatása sikertelen"
     },
     "error_app_open_in_another_tab": "Váltson a másik lapra a csatlakozáshoz ide: %(brand)s. Ez a lap most bezárható.",
@@ -1340,6 +1387,10 @@
         "name_email_mxid_share_space": "Hívjon meg valakit a nevét, e-mail-címét vagy felhasználónevét (például <userId/>) megadva, vagy <a>ossza meg ezt a teret</a>.",
         "name_mxid_share_room": "Hívjon meg valakit a nevét vagy felhasználónevét (például <userId/>) megadva, vagy <a>ossza meg ezt a szobát</a>.",
         "name_mxid_share_space": "Hívjon meg valakit a nevét vagy felhasználónevét (például <userId/>) megadva, vagy <a>ossza meg ezt a teret</a>.",
+        "progress": {
+            "dont_close": "Ne zárja be az alkalmazást, amíg be nem fejezte.",
+            "preparing": "Meghívók előkészítése…"
+        },
         "recents_section": "Legújabb beszélgetések",
         "room_failed_partial": "Az alábbi embereket nem sikerül meghívni ide: <RoomName/>, de a többi meghívó elküldve",
         "room_failed_partial_title": "Néhány meghívót nem sikerült elküldeni",
@@ -1426,6 +1477,7 @@
         "room_list_navigate_down": "Navigálás lefelé a szobalistában",
         "room_list_navigate_up": "Navigálás felfelé a szobalistában",
         "room_list_select_room": "Szoba kiválasztása a szobalistából",
+        "save": "Mentés",
         "scroll_down_timeline": "Görgetés lefelé az idővonalon",
         "scroll_up_timeline": "Görgetés felfelé az idővonalon",
         "search": "Keresés (engedélyezni kell)",
@@ -1442,7 +1494,6 @@
         "upload_file": "Fájl feltöltése"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Csak képernyőmegosztási mód engedélyezése",
         "ask_to_join": "A kérést igénylő csatlakozás engedélyezése",
         "automatic_debug_logs": "Hibakeresési naplók automatikus küldése bármilyen hiba esetén",
         "automatic_debug_logs_decryption": "Hibakeresési naplók automatikus küldése titkosítás-visszafejtési hiba esetén",
@@ -1507,6 +1558,9 @@
         "render_reaction_images_description": "Néha „egyéni emodzsiknak” nevezik.",
         "report_to_moderators": "Jelentés a moderátoroknak",
         "report_to_moderators_description": "A moderálást támogató szobákban a problémás tartalmat a „Jelentés” gombbal lehet a moderátorok felé jelezni.",
+        "share_history_on_invite": "Titkosított előzmények megosztása az új tagokkal",
+        "share_history_on_invite_description": "Ha egy felhasználót olyan titkosított szobába hív meg, amelynél az előzmények láthatósága „megosztott” beállításra van állítva, akkor a titkosított előzményeket megosztja azzal a felhasználóval, valamint elfogadja a titkosított előzményeket, ha ilyen szobába hívják meg.",
+        "share_history_on_invite_warning": "Ez a funkció KÍSÉRLETI JELLEGŰ, és nem minden biztonsági óvintézkedés van megvalósítva. Ne engedélyezze éles fiókokban.",
         "sliding_sync": "Csúszóablakos szinkronizálási mód",
         "sliding_sync_description": "Aktív fejlesztés alatt, nem kapcsolható ki.",
         "sliding_sync_disabled_notice": "A kikapcsoláshoz ki-, és bejelentkezés szükséges",
@@ -1580,7 +1634,7 @@
         "MapStyleUrlNotReachable": "Ez a Matrix-kiszolgáló nincs megfelelően beállítva a térképek megjelenítéséhez, vagy a beállított térképkiszolgáló nem érhető el.",
         "WebGLNotEnabled": "A WebGL szükséges a térképek megjelenítéséhez, engedélyezze a böngészőbeállításokban.",
         "click_drop_pin": "Kattintson a hely megjelöléséhez",
-        "click_move_pin": "Kattintson a jelölő mozgatásához",
+        "click_move_pin": "Kattintson a jelölő áthelyezéséhez",
         "close_sidebar": "Oldalsáv bezárása",
         "error_fetch_location": "Nem lehet elérni a földrajzi helyzetét",
         "error_no_perms_description": "Az ebben a szobában történő helymegosztáshoz a megfelelő jogosultságokra van szüksége.",
@@ -1627,8 +1681,8 @@
         "filter_placeholder": "Szoba tagság szűrése",
         "invite_button_no_perms_tooltip": "Nincs jogosultsága felhasználók meghívására",
         "invited_label": "Meghívott",
-        "no_matches": "Nincs egyezés",
-        "power_label": "%(userName)s (szint: %(powerLevelNumber)s)"
+        "list_title": "Tagok listája",
+        "no_matches": "Nincs egyezés"
     },
     "member_list_back_action_label": "Szobatagok",
     "message_edit_dialog_title": "Üzenetszerkesztések",
@@ -1730,6 +1784,7 @@
     },
     "power_level": {
         "admin": "Adminisztrátor",
+        "creator": "Tulajdonos",
         "custom": "Egyéni (%(level)s)",
         "custom_level": "Egyéni szint",
         "default": "Alapértelmezett",
@@ -1827,30 +1882,26 @@
         "extensions_empty_title": "Növelje a hatékonyságát több eszközzel, kisalkalmazásokkal és botokkal",
         "files_button": "Fájlok",
         "pinned_messages": {
-            "empty_description": "Válasszon ki egy üzenetet, majd válassza a „%(pinAction)s ”, hogy ide kerüljön.",
-            "empty_title": "Rögzítse a fontos üzeneteket, hogy könnyen felfedezhetők legyenek",
+            "empty_description": "Válasszon ki egy üzenetet, majd válassza a „%(pinAction)s” lehetőséget, hogy ide kerüljön.",
+            "empty_title": "Tűzze ki a fontos üzeneteket, hogy könnyen felfedezhetők legyenek",
             "header": {
-                "1 rögzített üzenet": "one",
-                "%(count)s rögzített üzenet": "other"
+                "one": "1 kitűzött üzenet",
+                "other": "%(count)s kitűzött üzenet"
             },
             "limits": {
-                "Csak %(count)s kisalkalmazást tud kitűzni": "other"
+                "one": "",
+                "other": "Legfeljebb %(count)s kisalkalmazást tűzhet ki"
             },
             "menu": "Menü megnyitása",
-            "release_announcement": {
-                "close": "OK",
-                "description": "Itt találja az összes kitűzött üzenetet. Húzza az egérmutatót bármely üzenetre, és válassza a „Kitűz” lehetőséget a hozzáadáshoz.",
-                "title": "Minden új kitűzött üzenet"
-            },
             "reply_thread": "Válasz egy <link>üzenetszálra</link>",
             "unpin_all": {
-                "button": "Az összes üzenet rögzítésének feloldása",
-                "content": "Győződjön meg róla, hogy valóban el akarja távolítani az összes üzenet rögzítést. Ezt a műveletet nem lehet visszavonni.",
-                "title": "Feloldja az összes üzenet rögzítését?"
+                "button": "Az összes üzenet kitűzésének feloldása",
+                "content": "Győződjön meg róla, hogy valóban el akarja távolítani az összes üzenet kitűzését. Ezt a műveletet nem lehet visszavonni.",
+                "title": "Feloldja az összes üzenet kitűzését?"
             },
             "view": "Megtekintés az idővonalon"
         },
-        "pinned_messages_button": "Rögzített üzenetek",
+        "pinned_messages_button": "Kitűzött üzenetek",
         "poll": {
             "active_heading": "Aktív szavazások",
             "empty_active": "Nincsenek aktív szavazások ebben a szobában",
@@ -1896,7 +1947,7 @@
         "3pid_invite_error_title_room": "A meghívóddal ebbe a szobába: %(roomName)s valami baj történt",
         "3pid_invite_no_is_subtitle": "Használjon egy azonosítási kiszolgálót a Beállításokban, hogy közvetlenül az %(brand)sben kapja meg a meghívókat.",
         "banned_by": "%(memberName)s felhasználó kitiltotta",
-        "banned_from_room_by": "Téged kitiltott %(memberName)s ebből a szobából: %(roomName)s",
+        "banned_from_room_by": "%(memberName)s kitiltotta ebből a szobából: %(roomName)s",
         "context_menu": {
             "copy_link": "Szoba hivatkozásának másolása",
             "favourite": "Kedvencnek jelölés",
@@ -1941,6 +1992,7 @@
         },
         "face_pile_tooltip_shortcut": "Beleértve: %(commaSeparatedMembers)s",
         "face_pile_tooltip_shortcut_joined": "Önt is beleértve, %(commaSeparatedMembers)s",
+        "failed_determine_user": "Nem lehet meghatározni, hogy melyik felhasználót kell figyelmen kívül hagyni, mivel az esemény megváltozott.",
         "failed_reject_invite": "A meghívót nem sikerült elutasítani",
         "forget_room": "Szoba elfelejtése",
         "forget_space": "Ennek a térnek az elfelejtése",
@@ -1959,7 +2011,9 @@
         "inaccessible_subtitle_1": "Próbálkozzon később vagy kérje meg a szoba vagy tér adminisztrátorát, hogy nézze meg van-e hozzáférése.",
         "inaccessible_subtitle_2": "A szoba vagy tér elérésekor ez a hibaüzenetet érkezett: %(errcode)s. Ha úgy gondolja, hogy az üzenetet egy hiba miatt látja, <issueLink>nyisson egy hibajegyet</issueLink>.",
         "intro": {
+            "display_topic": "Téma: <topic/>",
             "dm_caption": "Csak önök ketten vannak ebben a beszélgetésben, hacsak valamelyikőjük nem hív meg valakit, hogy csatlakozzon.",
+            "edit_topic": "Téma: <topic/> (<a>szerkesztés</a> )",
             "enable_encryption_prompt": "Titkosítás bekapcsolása a beállításokban.",
             "encrypted_3pid_dm_pending_join": "Amint mindenki belépett lekezdheti a beszélgetést",
             "no_avatar_label": "Állítson be egy fényképet, hogy az emberek könnyebben felismerjék a szobáját.",
@@ -1969,11 +2023,9 @@
             "send_message_start_dm": "Küldj egy üzenetet ahhoz, hogy meghívd <displayName/> felhasználót",
             "start_of_dm_history": "Ez a közvetlen beszélgetés kezdete <displayName/> felhasználóval.",
             "start_of_room": "Ez a(z) <roomName/> kezdete.",
-            "topic": "Téma: %(topic)s ",
-            "topic_edit": "Téma: %(topic)s (<a>szerkesztés</a>)",
             "unencrypted_warning": "A végpontok közti titkosítás nincs engedélyezve",
             "user_created": "%(displayName)s készítette ezt a szobát.",
-            "you_created": "Te készítetted ezt a szobát."
+            "you_created": "Ön hozta létre ezt a szobát."
         },
         "invite_email_mismatch_suggestion": "Oszd meg a Beállításokban ezt az e-mail címet, hogy közvetlen meghívókat kaphass %(brand)sba.",
         "invite_sent_to_email": "Ez a meghívó ide lett küldve: %(email)s",
@@ -2023,15 +2075,18 @@
         "peek_join_prompt": "%(roomName)s szoba előnézetét látod. Belépsz?",
         "pinned_message_badge": "Kitűzött üzenet",
         "pinned_message_banner": {
-            "button_close_list": "A lista bezárása",
+            "button_close_list": "Lista bezárása",
             "button_view_all": "Összes megtekintése",
-            "description": "Ez a szoba rögzített üzeneteket tartalmaz. Kattintson ide a megtekintésükhöz.",
-            "go_to_message": "Tekintse meg a rögzített üzenetet az idővonalon.",
-            "title": "<bold>%(index)s. / %(length)s </bold> rögzített üzenet"
+            "description": "Kitűzött üzenetek",
+            "go_to_newest_message": "A kitűzött üzenet megtekintése az idővonalon, a legújabbé pedig itt",
+            "go_to_next_message": "A kitűzött üzenet megtekintése az idővonalon, a következő legrégebbié pedig itt",
+            "title": "<bold>%(index)s. / %(length)s </bold> kitűzött üzenet"
         },
         "read_topic": "Kattintson a téma elolvasásához",
         "rejecting": "Meghívó elutasítása…",
         "rejoin_button": "Újra-csatlakozás",
+        "room_content": "Szoba tartalma",
+        "room_is_low_priority": "Ez egy alacsony prioritású szoba",
         "search": {
             "all_rooms_button": "Keresés az összes szobában",
             "placeholder": "Üzenetek keresése...",
@@ -2076,9 +2131,9 @@
     "room_list": {
         "add_room_label": "Szoba hozzáadása",
         "add_space_label": "Tér hozzáadása",
-        "appearance": "Megjelenés",
         "breadcrumbs_empty": "Nincsenek nemrégiben meglátogatott szobák",
         "breadcrumbs_label": "Nemrég meglátogatott szobák",
+        "collapse_filters": "Szűrőlista összecsukása",
         "empty": {
             "no_chats": "Még nincsenek csevegések",
             "no_chats_description": "Kezdje azzal, hogy üzenetet küld valakinek, vagy létrehoz egy szobát",
@@ -2086,6 +2141,7 @@
             "no_favourites": "Még nincs kedvenc csevegése",
             "no_favourites_description": "A csevegési beállításokban adhat hozzá csevegést a kedvencekhez",
             "no_invites": "Nincs olvasatlan meghívója",
+            "no_lowpriority": "Nincs alacsony prioritású szobája",
             "no_mentions": "Nincs olvasatlan említése",
             "no_people": "Még nincs közvetlen csevegése senkivel",
             "no_people_description": "Kikapcsolhatja a szűrőket a többi csevegés megtekintéséhez",
@@ -2095,12 +2151,14 @@
             "show_activity": "Összes tevékenység megtekintése",
             "show_chats": "Összes csevegés megjelenítése"
         },
+        "expand_filters": "Szűrőlista kibontása",
         "failed_add_tag": "Nem sikerült hozzáadni a szobához ezt: %(tagName)s",
         "failed_remove_tag": "Nem sikerült a szobáról eltávolítani ezt: %(tagName)s",
         "failed_set_dm_tag": "Nem sikerült a közvetlen beszélgetés címkét beállítani",
         "filters": {
             "favourite": "Kedvencek",
             "invites": "Meghívók",
+            "low_priority": "Alacsony prioritás",
             "mentions": "Említések",
             "people": "Emberek",
             "rooms": "Szobák",
@@ -2132,7 +2190,6 @@
         },
         "room_options": "Szobabeállítások",
         "show_less": "Kevesebb megjelenítése",
-        "show_message_previews": "Üzenetelőnézetek megjelenítése",
         "show_n_more": {
             "Még %(count)s megjelenítése": "one"
         },
@@ -2140,10 +2197,10 @@
         "sort": "Rendezés",
         "sort_by": "Rendezés",
         "sort_by_activity": "Aktivitás",
-        "sort_by_alphabet": "A-Z",
+        "sort_by_alphabet": "A–Z",
         "sort_type": {
             "activity": "Tevékenység",
-            "atoz": "A-Z"
+            "atoz": "A–Z"
         },
         "sort_unread_first": "Olvasatlan üzeneteket tartalmazó szobák megjelenítése elöl",
         "space_menu": {
@@ -2315,6 +2372,10 @@
             "users_default": "Alapértelmezett szerep"
         },
         "security": {
+            "cannot_change_to_private_due_to_missing_history_visiblity_permissions": {
+                "description": "Nincs jogosultsága a szoba előzményeinek láthatóságának módosítására. Ez veszélyes, mivel lehetővé teheti a nem csatlakozott felhasználók számára az üzenetek olvasását.",
+                "title": "A szobát nem lehet priváttá tenni"
+            },
             "enable_encryption_confirm_description": "Ha egyszer engedélyezve lett, a szoba titkosítását nem lehet kikapcsolni. A titkosított szobákban küldött üzenetek a kiszolgáló számára nem, csak a szoba tagjai számára láthatók. A titkosítás bekapcsolása megakadályoz sok botot és hidat a megfelelő működésben. <a>Tudjon meg többet a titkosításról.</a>",
             "enable_encryption_confirm_title": "Titkosítás engedélyezése?",
             "enable_encryption_public_room_confirm_description_1": "<b>Nyilvános szobához nem javasolt a titkosítás beállítása.</b>Bárki megtalálhatja és csatlakozhat nyilvános szobákhoz, így bárki elolvashatja az üzeneteket bennük. A titkosítás előnyeit így nem jelentkeznek és később ezt nem lehet kikapcsolni. Nyilvános szobákban a titkosított üzenetek az üzenetküldést és fogadást csak lassítják.",
@@ -2332,7 +2393,7 @@
             "history_visibility_joined": "Csak tagoknak (amióta csatlakoztak)",
             "history_visibility_legend": "Ki olvashatja a régi üzeneteket?",
             "history_visibility_shared": "Csak tagok számára (a beállítás kiválasztásától)",
-            "history_visibility_warning": "A üzenetek olvashatóságának változtatása csak az új üzenetekre lesz érvényes. A régi üzenetek láthatósága nem fog változni.",
+            "history_visibility_warning": "A régi üzenetek láthatósága nem fog változni.",
             "history_visibility_world_readable": "Bárki",
             "join_rule_description": "Döntse el ki léphet be ide: %(roomName)s.",
             "join_rule_invite": "Privát (csak meghívóval)",
@@ -2374,6 +2435,7 @@
                 "Terek frissítése… (%(progress)s / %(count)s)": "other"
             },
             "join_rule_upgrade_upgrading_room": "Szoba fejlesztése",
+            "join_rule_world_readable_description": "A szobába való belépés jogosultságának módosítása a jövőbeli üzenetek láthatóságát is megváltoztatja.",
             "public_without_alias_warning": "Hogy hivatkozhasson erre a szobára, adjon hozzá egy címet.",
             "publish_room": "Szoba láthatóvá tétele a nyilvános szobakatalógusban.",
             "publish_space": "Tér láthatóvá tétele a nyilvános szobakatalógusban.",
@@ -2388,7 +2450,6 @@
             "error_update_guest_access": "A tér vendéghozzáférésének frissítése sikertelen",
             "error_update_history_visibility": "A tér régi üzeneteinek láthatóságának frissítése sikertelen",
             "guest_access_explainer": "A vendégek fiók nélkül is beléphetnek a térbe.",
-            "guest_access_explainer_public_space": "A nyilvános tereknél ez hasznos lehet.",
             "guest_access_label": "Vendéghozzáférés engedélyezése",
             "history_visibility_anyone_space": "Tér előnézete",
             "history_visibility_anyone_space_description": "A tér előnézetének engedélyezése a belépés előtt.",
@@ -2512,6 +2573,7 @@
                 "breadcrumb_second_description": "Elveszít minden olyan üzenetelőzményt, amely csak a kiszolgálón van tárolva.",
                 "breadcrumb_third_description": "Újra ellenőriznie kell az összes meglévő eszközét és névjegyét",
                 "breadcrumb_title": "Biztos, hogy alaphelyzetbe állítja a személyazonosságát?",
+                "breadcrumb_title_cant_confirm": "Alaphelyzetbe kell állítania a személyazonosságát",
                 "breadcrumb_title_forgot": "Elfelejtette a helyreállítási kulcsot? Alaphelyzetbe kell állítania a személyazonosságát.",
                 "breadcrumb_title_sync_failed": "A kulcstároló szinkronizálása sikertelen. Alaphelyzetbe kell állítania személyazonosságát.",
                 "breadcrumb_warning": "Csak akkor tegye ezt, ha úgy gondolja, hogy fiókját feltörték.",
@@ -2588,6 +2650,7 @@
             "allow_spellcheck": "Helyesírás-ellenőrzés engedélyezése",
             "application_language": "Alkalmazás nyelve",
             "application_language_reload_hint": "Az alkalmazás újratöltődik egy másik nyelv kiválasztása után",
+            "avatar_open_menu": "Profilkép menü megnyitása",
             "avatar_remove_progress": "Kép eltávolítása...",
             "avatar_save_progress": "Kép feltöltése...",
             "avatar_upload_error_text": "A fájlformátum nem támogatott, vagy a kép nagyobb, mint %(size)s.",
@@ -2665,13 +2728,11 @@
         "inline_url_previews_room": "Webcím-előnézetek alapértelmezett engedélyezése a szobatagok számára",
         "inline_url_previews_room_account": "Webcím-előnézetek engedélyezése ebben a szobában (csak Önt érinti)",
         "insert_trailing_colon_mentions": "Záró kettőspont beszúrása egy felhasználó üzenet elején való megemlítésekor",
+        "invite_controls": {
+            "default_label": "Felhasználók meghívhatják szobákba"
+        },
         "jump_to_bottom_on_send": "Üzenetküldés után az idővonal aljára ugrás",
         "key_backup": {
-            "backup_in_progress": "A kulcsaid mentése folyamatban van (az első mentés több percig is eltarthat).",
-            "backup_starting": "Mentés indul…",
-            "backup_success": "Sikeres!",
-            "cannot_create_backup": "Kulcsmentés sikertelen",
-            "create_title": "Kulcsmentés készítése",
             "setup_secure_backup": {
                 "backup_setup_success_description": "A kulcsai nem kerülnek elmentésre erről az eszközről.",
                 "backup_setup_success_title": "Biztonsági mentés sikeres",
@@ -2689,11 +2750,11 @@
                 "phrase_strong_enough": "Nagyszerű! Ez a biztonsági jelmondat elég erősnek tűnik.",
                 "secret_storage_query_failure": "A biztonsági tároló állapotát nem lehet lekérdezni",
                 "security_key_safety_reminder": "A helyreállítási kulcsot tárolja biztonságos helyen, például egy jelszókezelőben vagy egy széfben, mivel ez tartja biztonságban a titkosított adatait.",
-                "set_phrase_again": "Lépj vissza és állítsd be újra.",
+                "set_phrase_again": "Lépjen vissza és állítsa be újra.",
                 "settings_reminder": "A biztonsági mentés beállítását és a kulcsok kezelését a Beállításokban is megadhatja.",
                 "title_confirm_phrase": "Biztonsági jelmondat megerősítése",
                 "title_save_key": "Mentse el a helyreállítási kulcsát",
-                "title_set_phrase": "Biztonsági Jelmondat beállítása",
+                "title_set_phrase": "Biztonsági jelmondat beállítása",
                 "unable_to_setup": "A biztonsági tárolót nem sikerült beállítani",
                 "use_different_passphrase": "Másik jelmondat használata?",
                 "use_phrase_only_you_know": "Olyan biztonsági jelmondatot használjon, amelyet csak Ön ismer, és esetleg mentsen el egy helyreállítási kulcsot vésztartalékként."
@@ -2704,11 +2765,11 @@
             "enter_passphrase": "Jelmondat megadása",
             "export_description_1": "Ezzel a folyamattal kimentheted a titkosított szobák üzeneteihez tartozó kulcsokat egy helyi fájlba. Ez után be tudod tölteni ezt a fájlt egy másik Matrix kliensbe, így az a kliens is vissza tudja fejteni az üzeneteket.",
             "export_description_2": "Az exportált fájl lehetővé teszi, hogy bárki, aki el tudja olvasni, visszafejtse a titkosított üzeneteket, amelyeket Ön láthat, ezért ügyeljen a biztonságra. Ennek érdekében az alábbiakban adjon meg egy egyedi jelmondatot, amely csak az exportált adatok titkosítására szolgál. Az adatok importálása csak ugyanezen jelszó használatával lesz lehetséges.",
-            "export_title": "Szoba kulcsok mentése",
+            "export_title": "Szobakulcsok exportálása",
             "file_to_import": "Fájl betöltése",
-            "import_description_1": "Ezzel a folyamattal lehetőséged van betölteni a titkosítási kulcsokat amiket egy másik Matrix kliensből mentettél ki. Ez után minden üzenetet vissza tudsz fejteni amit a másik kliens tudott.",
-            "import_description_2": "A kimentett fájl jelmondattal van védve. A kibontáshoz add meg a jelmondatot.",
-            "import_title": "Szoba kulcsok betöltése",
+            "import_description_1": "Ezzel a folyamattal importálhatja a titkosítási kulcsokat, melyeket egy másik Matrix-kliensből exportált. Ezután minden olyan üzenetet vissza tud fejteni, melyet a másik kliens is tudott.",
+            "import_description_2": "Az exportált fájl jelmondattal van védve. A kibontásához adja meg a jelmondatot.",
+            "import_title": "Szobakulcsok importálása",
             "phrase_cannot_be_empty": "A jelmondat nem lehet üres",
             "phrase_must_match": "A jelmondatoknak meg kell egyezniük",
             "phrase_strong_enough": "Nagyszerű! Ez a jelmondat elég erősnek tűnik."
@@ -2731,6 +2792,7 @@
             "show_in_private": "Privát szobákban",
             "show_media": "Megjelenítés mindig"
         },
+        "not_supported": "A kiszolgálója nem valósítja meg ezt a funkciót.",
         "notifications": {
             "default_setting_description": "Ez a beállítás alapértelmezés szerint az összes szobájára érvényes lesz.",
             "default_setting_section": "Szeretnék értesítést kapni az alábbiakról (Alapértelmezett beállítás)",
@@ -2741,7 +2803,7 @@
             "email_select": "Válassza ki, hogy mely e-mail-címekre szeretne összefoglalókat küldeni. Itt kezelje az e-mail-címeit: <button>Általános</button>.",
             "enable_audible_notifications_session": "Hallható értesítések engedélyezése ehhez a munkamenethez",
             "enable_desktop_notifications_session": "Asztali értesítések engedélyezése ehhez a munkamenethez",
-            "enable_email_notifications": "E-mail értesítések engedélyezése ehhez: %(email)s",
+            "enable_email_notifications": "E-mail-értesítések engedélyezése ehhez: %(email)s",
             "enable_notifications_account": "Értesítések engedélyezése ehhez a fiókhoz",
             "enable_notifications_account_detail": "Kapcsolja ki, hogy letiltsa az értesítéseket az összes eszközökén és munkamenetében",
             "enable_notifications_device": "Értesítések engedélyezése ehhez az eszközhöz",
@@ -2764,7 +2826,7 @@
             "notify_at_room": "Értesítés, ha valaki megemlíti a @room használatával",
             "notify_keyword": "Értesítés, ha valaki egy kulcsszót használ",
             "notify_mention": "Értesítés, ha valaki megemlíti a @megjelenítendő-név vagy %(mxid)s használatával",
-            "other_section": "Egyéb dolgok, amelyekről úgy gondoljuk, hogy érdekelhetik Önt:",
+            "other_section": "Egyéb dolgok, amelyekről úgy gondoljuk, hogy érdekelhetik:",
             "people_mentions_keywords": "Emberek, említések és kulcsszavak",
             "play_sound_for_description": "Alapértelmezés szerint az összes szobára érvényes, az összes eszközön.",
             "play_sound_for_section": "Hang lejátszása a következőkhöz",
@@ -2788,6 +2850,7 @@
             "voip": "Hang- és videóhívások"
         },
         "preferences": {
+            "Electron.enableContentProtection": "Ablak tartalmának más alkalmazások általi rögzítésének megakadályozása",
             "Electron.enableHardwareAcceleration": "Hardveres gyorsítás engedélyezése (a(z) %(appName)s újraindítása szükséges az érvénybe lépéshez)",
             "always_show_menu_bar": "Ablak menüsávjának megjelenítése mindig",
             "autocomplete_delay": "Automatikus kiegészítés késleltetése (ms)",
@@ -2796,6 +2859,7 @@
             "composer_heading": "Szerkesztő",
             "default_timezone": "Böngésző alapértelmezése (%(timezone)s)",
             "dialog_title": "<strong>Beállítások:</strong> Beállítások",
+            "enable_content_protection": "Tartalomvédelem engedélyezése",
             "enable_hardware_acceleration": "Hardveres gyorsítás engedélyezése",
             "enable_tray_icon": "Tálcaikon megjelenítése és az ablak minimalizálása bezáráskor",
             "keyboard_heading": "Gyorsbillentyűk",
@@ -2809,6 +2873,7 @@
             "room_list_heading": "Szobalista",
             "show_avatars_pills": "Profilképek megjelenítése a felhasználók, szobák és események megemlítésénél",
             "show_polls_button": "Szavazások gomb megjelenítése",
+            "startup_window_behaviour_label": "Az indítás és az ablak viselkedése",
             "surround_text": "Kijelölt szöveg körülvétele speciális karakterek beírásakor",
             "time_heading": "Idő megjelenítése",
             "user_timezone": "Időzóna beállítása"
@@ -2829,7 +2894,6 @@
             "ignore_users_empty": "Nincsenek mellőzött felhasználók.",
             "ignore_users_section": "Mellőzött felhasználók",
             "key_backup_algorithm": "Algoritmus:",
-            "key_backup_connect": "Munkamenet csatlakoztatása a kulcsmentéshez",
             "message_search_disable_warning": "Ha nincs engedélyezve akkor a titkosított szobák üzenetei nem jelennek meg a keresések között.",
             "message_search_disabled": "A titkosított üzenetek biztonságos helyi gyorsítótárazása, hogy megjelenhessenek a keresési találatok között.",
             "message_search_enabled": {
@@ -2875,8 +2939,8 @@
             },
             "current_session": "Jelenlegi munkamenet",
             "desktop_session": "Asztali munkamenet",
-            "details_heading": "Munkamenet információk",
-            "device_unverified_description": "A jobb biztonság vagy megbízhatóság érdekében ellenőrizze vagy jelentkezzen ki ebből a munkamenetből.",
+            "details_heading": "Munkamenet-információk",
+            "device_unverified_description": "A jobb biztonság vagy megbízhatóság érdekében ellenőrizze, vagy jelentkezzen ki ebből a munkamenetből.",
             "device_unverified_description_current": "Ellenőrizze az aktuális munkamenetet a biztonságos üzenetküldéshez.",
             "device_verified_description": "Ez a munkamenet beállítva a biztonságos üzenetküldéshez.",
             "device_verified_description_current": "Az aktuális munkamenet készen áll a biztonságos üzenetküldésre.",
@@ -2885,17 +2949,17 @@
             "error_set_name": "Nem sikerült beállítani a munkamenet nevét",
             "filter_all": "Mind",
             "filter_inactive": "Inaktív",
-            "filter_inactive_description": "Inaktív %(inactiveAgeDays)s óta vagy annál hosszabb ideje",
+            "filter_inactive_description": "%(inactiveAgeDays)s napja vagy régebb óta inaktív",
             "filter_label": "Szűrőeszközök",
             "filter_unverified_description": "Nem áll készen a biztonságos üzenetküldésre",
             "filter_verified_description": "Felkészülve a biztonságos üzenetküldésre",
             "hide_details": "Részletek elrejtése",
-            "inactive_days": "Utolsó használat %(inactiveAgeDays)s+ napja",
-            "inactive_sessions": "Nem aktív munkamenetek",
-            "inactive_sessions_explainer_1": "Az inaktív munkamenet olyan munkamenet amit már régóta nem használ de még mindig megkapják a titkosítási kulcsokat.",
+            "inactive_days": "Több mint %(inactiveAgeDays)s napja inaktív",
+            "inactive_sessions": "Inaktív munkamenetek",
+            "inactive_sessions_explainer_1": "Az inaktív munkamenetek olyan régóta nem használt munkamenetek, melyek még mindig megkapják a titkosítási kulcsokat.",
             "inactive_sessions_explainer_2": "Az inaktív munkamenetek törlése növeli a biztonságot és a sebességet, valamint egyszerűbbé teszi a gyanús munkamenetek felismerését.",
             "inactive_sessions_list_description": "Fontolja meg a kijelentkezést a régi munkamenetekből (%(inactiveAgeDays)s napnál régebbi) ha már nem használja azokat.",
-            "ip": "IP cím",
+            "ip": "IP-cím",
             "last_activity": "Utolsó tevékenység",
             "manage": "Munkamenet kezelése",
             "mobile_session": "Mobil munkamenet",
@@ -2933,17 +2997,17 @@
                 "Kijelentkezés %(count)s munkamenetből": "other"
             },
             "title": "Munkamenetek",
-            "unknown_session": "Ismeretlen munkamenet típus",
+            "unknown_session": "Ismeretlen munkamenettípus",
             "unverified_session": "Ellenőrizetlen munkamenet",
             "unverified_session_explainer_1": "Ez a munkamenet nem támogatja a titkosítást, így nem lehet ellenőrizni sem.",
-            "unverified_session_explainer_2": "Ezzel a munkamenettel olyan szobákban ahol a titkosítás be van kapcsolva nem tud részt venni.",
-            "unverified_session_explainer_3": "A biztonság és adatbiztonság érdekében javasolt olyan Matrix klienst használni ami támogatja a titkosítást.",
-            "unverified_sessions": "Meg nem erősített munkamenetek",
-            "unverified_sessions_explainer_1": "Az ellenőrizetlen munkamenetek olyanok amivel a jelszavával bejelentkeztek de nem lett ellenőrizve.",
-            "unverified_sessions_explainer_2": "Egészen bizonyosodjon meg arról, hogy ismeri ezeket a munkameneteket mivel elképzelhető, hogy jogosulatlan fiókhasználatot jeleznek.",
+            "unverified_session_explainer_2": "Ezzel a munkamenettel azokban szobákban nem tud részt venni, ahol a titkosítás be van kapcsolva.",
+            "unverified_session_explainer_3": "A biztonság és adatvédelem érdekében javasolt olyan Matrix klienst használni, amely támogatja a titkosítást.",
+            "unverified_sessions": "Nem ellenőrzött munkamenetek",
+            "unverified_sessions_explainer_1": "A nem ellenőrzött munkamenetek olyanok, amelyek a jelszavával bejelentkeztek, de nem lettek ellenőrizve.",
+            "unverified_sessions_explainer_2": "Egészen bizonyosodjon meg arról, hogy ismeri ezeket a munkameneteket, mivel elképzelhető, hogy jogosulatlan fiókhasználatot jeleznek.",
             "unverified_sessions_list_description": "Erősítse meg a munkameneteit a még biztonságosabb csevegéshez vagy jelentkezzen ki ezekből, ha nem ismeri fel vagy már nem használja őket.",
             "url": "Webcím",
-            "verified_session": "Munkamenet hitelesítve",
+            "verified_session": "Ellenőrzött munkamenet",
             "verified_sessions": "Ellenőrzött munkamenetek",
             "verified_sessions_explainer_1": "Mindenhol ellenőrzött munkamenetek vannak ahol ezt a fiókot használja a jelmondattal vagy azonosította magát egy másik ellenőrzött munkamenetből.",
             "verified_sessions_explainer_2": "Ez azt jelenti, hogy a titkosított üzenetek visszafejtéséhez minden kulccsal rendelkezik valamint a többi felhasználó megbízhat ebben a munkamenetben.",
@@ -2956,6 +3020,7 @@
         "show_chat_effects": "Csevegési effektek (például a konfetti animáció) megjelenítése",
         "show_displayname_changes": "Megjelenítendő nevek változásának megjelenítése",
         "show_join_leave": "Be- és kilépési üzenetek megjelenítése (a meghívók/kirúgások/kitiltások üzeneteit nem érinti)",
+        "show_message_previews": "Üzenetelőnézetek megjelenítése",
         "show_nsfw_content": "Felnőtt tartalmak megjelenítése",
         "show_read_receipts": "Mások által küldött olvasási visszajelzések megjelenítése",
         "show_redaction_placeholder": "Helykitöltő megjelenítése a törölt szövegek helyett",
@@ -2978,7 +3043,12 @@
             "spaces_explainer": "A terek a szobák és az emberek csoportosításának módjai. A terek mellett, amelyekben tartózkodik, használhat néhány előre beépítettet is.",
             "title": "Oldalsáv"
         },
-        "start_automatically": "Automatikus indítás rendszerindítás után",
+        "start_automatically": {
+            "disabled": "Nem",
+            "enabled": "Igen",
+            "label": "Az %(brand)s indítása, amikor bejelentkezik a számítógépére.",
+            "minimised": "Minimalizálva"
+        },
         "tac_only_notifications": "Csak az üzenetszálak központban jelenítsen meg értesítéseket",
         "use_12_hour_format": "Az időbélyegek megjelenítése 12 órás formátumban (például du. 2:30)",
         "use_command_enter_send_message": "Command + Enter használata az üzenet küldéséhez",
@@ -3062,6 +3132,8 @@
         "jumptodate": "Az idővonalon megadott dátumra ugrás",
         "jumptodate_invalid_input": "A megadott dátum (%(inputDate)s) nem értelmezhető. Próbálja meg az ÉÉÉÉ-HH-NN formátum használatát.",
         "lenny": "Az egyszerű szöveges üzenet elé teszi ezt: ( ͡° ͜ʖ ͡°)",
+        "manual_device_verification_confirm_description": "Ez lehetővé teszi egy másik eszköz számára, hogy az Ön nevében üzeneteket küldjön és fogadjon. HA VALAKI AZT MONDTA, HOGY ILLESSZEN BE IDE VALAMIT, VALÓSZÍNŰLEG ÁTVERIK! Biztosan ellenőrizni szeretné ezt a másik eszközt?",
+        "manual_device_verification_confirm_title": "Vigyázat: kézi eszközellenőrzés",
         "me": "Megjeleníti a tevékenységet",
         "msg": "Üzenet küldése a megadott felhasználónak",
         "myavatar": "Az összes szobában módosítja a profilképét",
@@ -3102,6 +3174,7 @@
         "upgraderoom": "Új verzióra fejleszti a szobát",
         "upgraderoom_permission_error": "A parancs használatához nincs meg a megfelelő jogosultsága.",
         "usage": "Használat",
+        "verify": "Az egyik saját eszköz kézi ellenőrzése",
         "view": "Megadott címmel rendelkező szobák megjelenítése",
         "whois": "Információt jelenít meg a felhasználóról"
     },
@@ -3140,7 +3213,7 @@
         "invite_description": "Meghívás e-mail-címmel vagy felhasználónévvel",
         "invite_link": "Meghívási hivatkozás megosztása",
         "joining_space": "Belépés",
-        "landing_welcome": "Üdvözöl a(z) <name/>",
+        "landing_welcome": "Üdvözli a(z) <name/>",
         "leave_dialog_action": "Tér elhagyása",
         "leave_dialog_description": "Éppen el akarja hagyni <spaceName/> teret.",
         "leave_dialog_only_admin_room_warning": "Ön az adminisztrátora néhány szobának vagy térnek amiből ki szeretne lépni. Ha kilép belőlük akkor azok adminisztrátor nélkül maradnak.",
@@ -3190,7 +3263,7 @@
             "network_dropdown_remove_server_adornment": "Távoli kiszolgáló: „%(roomServer)s”",
             "network_dropdown_required_invalid": "Adja meg a kiszolgáló nevét",
             "network_dropdown_selected_label": "Megjelenítés: Matrix szobák",
-            "network_dropdown_selected_label_instance": "Megjelenítés: %(instance)s szobái (%(server)s)",
+            "network_dropdown_selected_label_instance": "Megjelenítés: %(instance)s-szobák (%(server)s)",
             "network_dropdown_your_server_description": "Saját Matrix-kiszolgáló"
         }
     },
@@ -3223,8 +3296,8 @@
         "start_group_chat_button": "Csoportos csevegés indítása"
     },
     "stickers": {
-        "empty": "Nincs engedélyezett matrica csomagod",
-        "empty_add_prompt": "Adj hozzá párat"
+        "empty": "Jelenleg nincsenek engedélyezve matricacsomagok",
+        "empty_add_prompt": "Adjon hozzá néhányat"
     },
     "terms": {
         "column_document": "Dokumentum",
@@ -3341,6 +3414,7 @@
             "unable_to_find": "Megpróbálta betölteni a szoba megadott időpontjának megfelelő adatait, de az nem található."
         },
         "m.audio": {
+            "audio_player": "Hanglejátszó",
             "error_downloading_audio": "Hiba a hang letöltésekor",
             "error_processing_audio": "Hiba a hangüzenet feldolgozásánál",
             "error_processing_voice_message": "Hiba a hangüzenet feldolgozásánál",
@@ -3401,7 +3475,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Lezárta a szavazást",
             "sender_ended": "%(senderName)s lezárta a szavazást"
         },
         "m.poll.start": "%(senderName)s szavazást indított - %(pollQuestion)s",
@@ -3447,7 +3520,7 @@
             "unknown": "%(senderDisplayName)s a vendégek hozzáférését erre állította be: %(rule)s"
         },
         "m.room.history_visibility": {
-            "invited": "%(senderName)s láthatóvá tette a szoba új üzeneteit minden szobatagnak, a meghívásuk idejétől kezdve.",
+            "invited": "%(senderName)s láthatóvá tette a szoba új üzeneteit minden új szobatagnak, a meghívásuk idejétől kezdve.",
             "joined": "%(senderName)s láthatóvá tette a szoba új üzeneteit minden szobatagnak, a csatlakozásuk idejétől kezdve.",
             "shared": "%(senderName)s láthatóvá tette a szoba új üzeneteit minden szobatagnak.",
             "unknown": "%(senderName)s elérhetővé tette a szoba új üzeneteit az ismeretlenek (%(visibility)s) számára is.",
@@ -3684,12 +3757,12 @@
                 "%(severalUsers)s nem változtattak semmit": "one"
             },
             "pinned_events": {
-                "%(oneUser)s módosította a szoba <a>kitűzött üzeneteit</a>": "one",
-                "%(oneUser)s %(count)s alkalommal módosította a szoba <a>kitűzött üzeneteit</a>": "other"
+                "one": "%(oneUser)s megváltoztatta a szoba <a>kitűzött üzeneteit</a>",
+                "other": "%(oneUser)s %(count)s alkalommal megváltoztatta a szoba <a>kitűzött üzeneteit</a>"
             },
             "pinned_events_multiple": {
-                "%(severalUsers)s módosította a szoba <a>kitűzött üzeneteit</a>": "one",
-                "%(severalUsers)s %(count)s alkalommal módosította a szoba <a>kitűzött üzeneteit</a>": "other"
+                "one": "%(severalUsers)s megváltoztatta a szoba <a>kitűzött üzeneteit</a>",
+                "other": "%(severalUsers)s %(count)s alkalommal megváltoztatta a szoba <a>kitűzött üzeneteit</a>"
             },
             "redacted": {
                 "%(oneUser)s üzenetet törölt": "one",
@@ -3735,8 +3808,8 @@
         "thread_info_basic": "Az üzenetszálból",
         "typing_indicator": {
             "more_users": {
-                "%(names)s és még %(count)s felhasználó gépel…": "other",
-                "%(names)s és még valaki gépel…": "one"
+                "one": "%(names)s és még valaki gépel…",
+                "other": "%(names)s és még %(count)s felhasználó gépel…"
             },
             "one_user": "%(displayName)s gépel…",
             "two_users": "%(names)s és %(lastPerson)s gépelnek…"
@@ -3897,12 +3970,12 @@
         "connection_lost": "Megszakadt a kapcsolat a kiszolgálóval",
         "connection_lost_description": "Nem kezdeményezhet hívást a kiszolgálóval való kapcsolat nélkül.",
         "consulting": "Egyeztetés vele: %(transferTarget)s. <a>Átadás ide: %(transferee)s</a>",
+        "decline_call": "Elutasítás",
         "default_device": "Alapértelmezett eszköz",
         "dial": "Tárcsázás",
         "dialpad": "Tárcsázó",
         "disable_camera": "Kamera kikapcsolása",
         "disable_microphone": "Mikrofon némítása",
-        "disabled_no_one_here": "Itt nincs senki, akit fel lehetne hívni",
         "disabled_no_perms_start_video_call": "Nincs jogosultsága videóhívást indítani",
         "disabled_no_perms_start_voice_call": "Nincs jogosultsága hanghívást indítani",
         "disabled_ongoing_call": "Hívás folyamatban",
@@ -3948,6 +4021,7 @@
         "show_sidebar_button": "Oldalsáv megjelenítése",
         "silence": "Hívás némítása",
         "silenced": "Értesítések némítva",
+        "skip_lobby_toggle_option": "Csatlakozás azonnal",
         "start_screenshare": "Képernyőmegosztás bekapcsolása",
         "stop_screenshare": "Képernyőmegosztás kikapcsolása",
         "too_many_calls": "Túl sok hívás",
@@ -3968,9 +4042,11 @@
         "user_busy_description": "A hívott felhasználó foglalt.",
         "user_is_presenting": "%(sharerName)s tartja a bemutatót",
         "video_call": "Videóhívás",
+        "video_call_incoming": "Bejövő videóhívás",
         "video_call_started": "A videóhívás elindult",
         "video_call_using": "Videóhívás:",
         "voice_call": "Hanghívás",
+        "voice_call_incoming": "Bejövő hanghívás",
         "you_are_presenting": "Ön tartja a bemutatót"
     },
     "web_default_device_name": "%(appName)s: (%(browserName)s itt: %(osName)s)",
diff --git a/src/i18n/strings/hy.json b/src/i18n/strings/hy.json
new file mode 100644
index 0000000000..228adbdcf8
--- /dev/null
+++ b/src/i18n/strings/hy.json
@@ -0,0 +1,4168 @@
+{
+    "a11y": {
+        "emoji_picker": "Էմոջիների ընտրիչ",
+        "jump_first_invite": "Անցնել առաջին հրավերին:",
+        "message_composer": "Հաղորդագրություն կազմող",
+        "n_unread_messages": {
+            "one": "1 չկարդացված հաղորդագրություն:",
+            "other": "%(count)s չկարդացված հաղորդագրություններ:"
+        },
+        "n_unread_messages_mentions": {
+            "one": "1 չկարդացված հիշատակում:",
+            "other": "%(count)s չկարդացված հաղորդագրություններ, ներառյալ հիշատակումները։"
+        },
+        "recent_rooms": "Վերջին սենյակները",
+        "room_messsage_not_sent": "Բացել %(roomName)s սենյակը՝ չուղարկված հաղորդագրությամբ",
+        "room_n_unread_invite": "Բացել %(roomName)s սենյակի հրավերը",
+        "room_n_unread_messages": {
+            "one": "Բացել %(roomName)s սենյակը՝ 1 չկարդացած հաղորդագրությամբ",
+            "other": "Բացել %(roomName)s սենյակը՝ %(count)s չկարդացած հաղորդագրություններով"
+        },
+        "room_n_unread_messages_mentions": {
+            "one": "Բացել %(roomName)s սենյակը՝ 1 չկարդացած հիշեցմամբ",
+            "other": "Բացել %(roomName)s սենյակը՝ %(count)s չկարդացած հաղորդագրություններով, ներառյալ հիշեցումները"
+        },
+        "room_name": "Սենյակ %(name)s",
+        "room_status_bar": "Սենյակի կարգավիճակի գոտի/վահանակ",
+        "seek_bar_label": "Աուդիո որոնման գոտի",
+        "unread_messages": "Չկարդացված հաղորդագրություններ։",
+        "user_menu": "Օգտվողի մենյու"
+    },
+    "a11y_jump_first_unread_room": "Անցնել առաջին չկարդացած սենյակ:",
+    "action": {
+        "accept": "Ընդունել",
+        "add": "Ավելացնել",
+        "add_existing_room": "Ավելացնել գոյություն ունեցող սենյակ",
+        "add_people": "Ավելացնել մարդկանց",
+        "apply": "Կիրառել",
+        "approve": "Հաստատել",
+        "ask_to_join": "Խնդրել միանալ",
+        "back": "Վերադառնալ",
+        "call": "Զանգահարել",
+        "cancel": "Չեղարկել",
+        "change": "Փոփոխություն",
+        "clear": "Մաքրել",
+        "click": "Սեղմել",
+        "click_to_copy": "Սեղմեք՝ պատճենելու համար",
+        "close": "Փակել",
+        "collapse": "Կոծկել",
+        "complete": "Վերջացնել",
+        "confirm": "Հաստատել",
+        "continue": "Շարունակել",
+        "copy": "Պատճենել",
+        "copy_link": "Պատճենել հղումը",
+        "create": "Ստեղծել",
+        "create_a_room": "Ստեղծել սենյակ",
+        "create_account": "Ստեղծել հաշիվ",
+        "decline": "Մերժել",
+        "decline_and_block": "Մերժել և արգելափակել",
+        "decline_invite": "Մերժել հրավերը",
+        "delete": "Ջնջել",
+        "deny": "Մերժել",
+        "disable": "Անջատել",
+        "disconnect": "Անջատել",
+        "dismiss": "Հեռացնել",
+        "done": "Կատարված է",
+        "download": "Ներբեռնել",
+        "edit": "Խմբագրել",
+        "enable": "Միացնել",
+        "enter_fullscreen": "Մուտք գործել լիաէկրան ռեժիմ",
+        "exit_fullscreeen": "Ելք լիաէկրան ռեժիմից",
+        "expand": "Ընդլայնել",
+        "explore_public_rooms": "Ուսումնասիրել հասարակական սենյակները",
+        "explore_rooms": "Փնտրել սենյակներ",
+        "export": "Արտահանել",
+        "forward": "Առաջ",
+        "go": "Գնալ",
+        "go_back": "Վերադառնալ",
+        "got_it": "Հասկացա",
+        "hide": "Թաքցնել",
+        "hide_advanced": "Թաքցնել ընդլայնվածները",
+        "hold": "Պահել",
+        "ignore": "Անտեսել",
+        "import": "Ներմուծել",
+        "invite": "Հրավիրել",
+        "invite_to_space": "Հրավիրել տարածք",
+        "invites_list": "Հրավիրում է",
+        "join": "Միանալ",
+        "learn_more": "Իմանալ ավելին",
+        "leave": "Հեռանալ",
+        "leave_room": "Դուրս գալ սենյակից",
+        "logout": "Ելք",
+        "manage": "Կառավարել",
+        "maximise": "Առավելագույնի հասցնել",
+        "mention": "Նշել",
+        "minimise": "Նվազագույնի հասցնել",
+        "new_room": "Նոր սենյակ",
+        "new_video_room": "Նոր վիդեո սենյակ",
+        "next": "Հաջորդ",
+        "no": "Ոչ",
+        "ok": "Լավ",
+        "open": "Բաց(ել)",
+        "open_menu": "Բացել ընտրացանկը",
+        "pause": "Դադար",
+        "pin": "Քորոց",
+        "play": "Միացնել",
+        "proceed": "Շարունակել",
+        "quote": "Մեջբերում",
+        "react": "Արձագանքել",
+        "refresh": "Թարմացնել",
+        "register": "Գրանցվել",
+        "reload": "Վերբեռնել",
+        "remove": "Հեռացնել",
+        "rename": "Վերանվանել",
+        "reply": "Պատասխանել",
+        "reply_in_thread": "Պատասխանել թեմայում",
+        "report_content": "Հաղորդել բովանդակության մասին",
+        "report_room": "Տեղեկացնել/բողոքել սենյակի մասին",
+        "resend": "Վերաուղարկել",
+        "reset": "Վերականգնել",
+        "resume": "Վերսկսել",
+        "retry": "Կրկին փորձեք",
+        "review": "Վերանայել",
+        "revoke": "Չեղարկել",
+        "save": "Պահպանել",
+        "search": "Որոնել",
+        "send_report": "Ուղարկել զեկույցը",
+        "set_avatar": "Սահմանել պրոֆիլի նկար",
+        "share": "Կիսվել",
+        "show": "Ցույց տալ",
+        "show_advanced": "Ցույց տալ ընդլայնվածները",
+        "show_all": "Ցույց տալ բոլորը",
+        "sign_in": "Մուտք գործել",
+        "sign_out": "Դուրս գալ",
+        "skip": "Բաց թողնել",
+        "start": "Սկսել",
+        "start_chat": "Սկսել զրույցը",
+        "start_new_chat": "Սկսել նոր զրույց",
+        "stop": "Դադարեցնել",
+        "submit": "Հաստատել",
+        "subscribe": "Բաժանորդագրվել",
+        "transfer": "Փոխանցում",
+        "trust": "Վստահություն",
+        "try_again": "Կրկին փորձել",
+        "unban": "Ապաալգելափակել",
+        "unignore": "Չեղարկել անտեսումը",
+        "unpin": "Ապաամրացնել",
+        "unsubscribe": "Հրաժարվել բաժանորդագրությունից",
+        "update": "Թարմացնել",
+        "upgrade": "Թարմացնել",
+        "upload": "Վերբեռնել",
+        "upload_file": "Վերբեռնել ֆայլ",
+        "verify": "Ստուգել",
+        "view": "Դիտել",
+        "view_all": "Դիտել բոլորը",
+        "view_list": "Դիտել ցուցակը",
+        "view_message": "Դիտել հաղորդագրությունը",
+        "view_source": "Դիտել աղբյուրը",
+        "yes": "Այո",
+        "yes_dismiss": "Այո, փակել",
+        "zoom_in": "Մեծացնել",
+        "zoom_out": "Փոքրացնել"
+    },
+    "analytics": {
+        "accept_button": "Լավ է",
+        "bullet_1": "Մենք <Bold> չենք </Bold> արձանագրում կամ պրոֆիլավորում հաշվի որևէ տվյալ",
+        "bullet_2": "Մենք <Bold> չենք </Bold> կիսվում տվյալներով երրորդ անձանց հետ",
+        "consent_migration": "Դուք նախկինում համաձայնություն եք տվել մեզ հետ անանուն օգտագործման տվյալներով կիսվելու համար։ Մենք թարմացնում ենք դրա աշխատանքի սկզբունքը։",
+        "disable_prompt": "Դուք կարող եք անջատել սա ցանկացած պահի կարգավորումներում",
+        "enable_prompt": "Օգնեք բարելավել %(analyticsOwner)s",
+        "learn_more": "Կիսվեք անանուն տվյալներով, որոնք կօգնեն մեզ բացահայտել խնդիրները: Ոչ մի անձնական բան։ Ոչ մի երրորդ կողմ։ <LearnMoreLink>Իմանալ ավելին</LearnMoreLink>",
+        "privacy_policy": "Մեր բոլոր պայմանները կարող եք կարդալ <PrivacyPolicyUrl> այստեղ </PrivacyPolicyUrl>",
+        "pseudonymous_usage_data": "Օգնեք մեզ բացահայտել խնդիրները եւ բարելավել %(analyticsOwner)s՝ կիսվելով անանուն օգտագործման տվյալներով: Հասկանալու համար, թե ինչպես են մարդիկ օգտագործում մի քանի սարքեր, մենք կստեղծենք պատահական նույնացուցիչ, որը կիսվում է ձեր սարքերի կողմից:",
+        "shared_data_heading": "Հետևյալ տվյալներից ցանկացած մեկը կարող է տարածվել."
+    },
+    "auth": {
+        "3pid_in_use": "Այդ էլեկտրոնային փոստի հասցեն կամ հեռախոսահամարն արդեն օգտագործվում է։",
+        "account_clash": "Ձեր նոր հաշիվը (%(newAccountId)s ) գրանցված է, բայց դուք արդեն մուտք եք գործել այլ հաշիվ (%(loggedInUserId)s )։",
+        "account_clash_previous_account": "Շարունակել նախորդ հաշվով",
+        "account_deactivated": "Այս հաշիվը ապաակտիվացված է:",
+        "autodiscovery_generic_failure": "Չհաջողվեց սերվերից ստանալ ավտոմատ հայտնաբերման կարգավորումը",
+        "autodiscovery_hs_incompatible": "Ձեր սերվերը չափազանց հին է և չի աջակցում պահանջվող API-ի նվազագույն տարբերակը: Խնդրում ենք կապվել ձեր սերվերի սեփականատիրոջ հետ կամ թարմացնել այն:",
+        "autodiscovery_invalid": "Սերվերի հայտնաբերման անվավեր պատասխան",
+        "autodiscovery_invalid_hs": "Homeserver-ի URL-ը, կարծես թե, վավեր Matrix homeserver չէ։",
+        "autodiscovery_invalid_hs_base_url": "Անվավեր base_url m.homeserver-ի համար",
+        "autodiscovery_invalid_is": "Նույնականացման սերվերի URL-ը, կարծես թե, վավեր նույնականացման սերվեր չէ",
+        "autodiscovery_invalid_is_base_url": "Անվավեր base_url m.identificty_server-ի համար",
+        "autodiscovery_invalid_is_response": "Անվավեր նույնականացման սերվերի հայտնաբերման պատասխան",
+        "autodiscovery_invalid_json": "Չաշխատող JSON",
+        "autodiscovery_no_well_known": ".well-known JSON ֆայլ չի գտնվել",
+        "autodiscovery_unexpected_error_hs": "Անսպասելի սխալ՝ homeserver-ի կարգավորումները ստուգելու ժամանակ",
+        "autodiscovery_unexpected_error_is": "Անսպասելի սխալ՝ ինքնության սերվերի կարգավորումները ստուգելիս",
+        "captcha_description": "Այս սերվերը ցանկանում է համոզվել, որ դուք ռոբոտ չեք։",
+        "change_password_action": "Փոխել գաղտնաբառը",
+        "change_password_confirm_invalid": "Գաղտնաբառերը չեն համընկնում",
+        "change_password_confirm_label": "Հաստատեք գաղտնաբառը",
+        "change_password_current_label": "Ընթացիկ գաղտնաբառը",
+        "change_password_empty": "Գաղտնաբառերը չեն կարող դատարկ լինել",
+        "change_password_error": "Գաղտնաբառը փոխելիս սխալ առաջացավ. %(error)s",
+        "change_password_mismatch": "Նոր գաղտնաբառերը չեն համընկնում",
+        "change_password_new_label": "Նոր գաղտնաբառ",
+        "check_email_explainer": "Հետևեք <b>%(email)s</b> էլ․փոստի հասցեին ուղարկված հրահանգներին",
+        "check_email_resend_prompt": "Չե՞ք ստացել այն։",
+        "check_email_resend_tooltip": "Հաստատման հղման էլ. նամակը վերստին ուղարկվեց։",
+        "check_email_wrong_email_button": "Կրկին մուտքագրեք էլ․ հասցեն",
+        "check_email_wrong_email_prompt": "Սխա՞լ էլ․ հասցե է։",
+        "continue_with_idp": "Շարունակել %(provider)s-ի հետ",
+        "continue_with_sso": "Շարունակել %(ssoButtons)s-ով",
+        "country_dropdown": "Երկրի ցանկ",
+        "create_account_prompt": "Նորեկ եք այստեղ՞։ <a> Ստեղծեք հաշիվ</a>",
+        "create_account_title": "Ստեղծել հաշիվ",
+        "email_discovery_text": "Օգտագործեք էլ․ փոստը՝ առկա կոնտակտների կողմից հայտնաբերելի լինելու համար։",
+        "email_field_label": "Էլ․ փոստ",
+        "email_field_label_invalid": "Չի համապատասխանում վավեր էլեկտրոնային հասցեին",
+        "email_field_label_required": "Մուտքագրեք էլ․ հասցե",
+        "email_help_text": "Ավելացրեք էլ.փոստ, որպեսզի կարողանաք վերականգնել ձեր գաղտնաբառը:",
+        "email_phone_discovery_text": "Օգտագործեք էլ. փոստ կամ հեռախոս՝ առկա կոնտակտների կողմից հայտնաբերելի լինելու համար։",
+        "enter_email_explainer": "<b>%(homeserver)s</b> կուղարկի ձեզ հաստատման հղում՝ գաղտնաբառը վերականգնելու համար։",
+        "enter_email_heading": "Մուտքագրեք ձեր էլ․ հասցեն՝ գաղտնաբառը վերականգնելու համար",
+        "failed_connect_identity_server": "Անհնար է կապ հաստատել նույնականացման սերվերի հետ",
+        "failed_connect_identity_server_other": "Կարող եք մուտք գործել, սակայն որոշ գործառույթներ անհասանելի կլինեն մինչև նույնականացման սերվերը կրկին կմիանա ցանցին։ Եթե շարունակեք տեսնել այս նախազգուշացումը, ստուգեք ձեր կարգավորումները կամ կապվեք սերվերի ադմինիստրատորի հետ։",
+        "failed_connect_identity_server_register": "Կարող եք գրանցվել, սակայն որոշ գործառույթներ անհասանելի կլինեն մինչև նույնականացման սերվերի նորից միացումը առցանց։ Եթե շարունակեք տեսնել այս նախազգուշացումը, ստուգեք ձեր կարգավորումները կամ կապվեք սերվերի ադմինիստրատորի հետ։",
+        "failed_connect_identity_server_reset_password": "Դուք կարող եք վերականգնել ձեր գաղտնաբառը, սակայն որոշ գործառույթներ անհասանելի կլինեն մինչև նույնականացման սերվերը կրկին միանա ցանցին։ Եթե շարունակեք տեսնել այս նախազգուշացումը, ստուգեք ձեր կարգավորումները կամ կապվեք սերվերի ադմինիստրատորի հետ։",
+        "failed_homeserver_discovery": "Սերվերի հայտնաբերումը չհաջողվեց",
+        "failed_query_registration_methods": "Անհնար է հարցում կատարել գրանցման աջակցվող մեթոդների համար:",
+        "failed_soft_logout_auth": "Վերստին նույնականացումը չհաջողվեց",
+        "failed_soft_logout_homeserver": "Վերստին նույնականացումը չհաջողվեց՝ սերվերի խնդրի պատճառով",
+        "forgot_password_email_invalid": "Էլ․ հասցեն, կարծես թե, վավեր չէ։",
+        "forgot_password_email_required": "Անհրաժեշտ է մուտքագրել ձեր հաշվին կցված էլեկտրոնային փոստի հասցեն։",
+        "forgot_password_prompt": "Մոռացե՞լ եք գաղտնաբառը։",
+        "forgot_password_send_email": "Ուղարկել էլ. նամակ",
+        "identifier_label": "Մուտք գործել",
+        "incorrect_credentials": "Սխալ օգտանուն և/կամ գաղտնաբառ։",
+        "incorrect_credentials_detail": "Խնդրում ենք նկատի ունենալ, որ դուք մուտք եք գործում %(hs)s սերվեր, այլ ոչ թե matrix.org։",
+        "incorrect_password": "Սխալ գաղտնաբառ",
+        "log_in_new_account": "<a>Մուտք գործել</a> ձեր նոր հաշիվ։",
+        "logout_dialog": {
+            "description": "Իսկապե՞ս ուզում եք դուրս գալ:",
+            "megolm_export": "Ձեռքով արտահանել բանալիները",
+            "setup_key_backup_title": "Դուք կկորցնեք հասանելիությունը ձեր ծածկագրված հաղորդագրություններին ",
+            "setup_secure_backup_description_1": "Գաղտնագրված հաղորդագրությունները պաշտպանված են ծայրից ծայր գաղտնագրմամբ: Միայն դուք և ստացող(ներ)ն ունեք այս հաղորդագրությունները կարդալու բանալիները:",
+            "setup_secure_backup_description_2": "Երբ դուք դուրս գաք, այս բանալիները կջնջվեն այս սարքից, ինչը նշանակում է, որ դուք չեք կարողանա կարդալ գաղտնագրված հաղորդագրությունները, եթե դրանց բանալիները չունեք ձեր մյուս սարքերի վրա կամ դրանք պահուստավորած չեն սերվերում։",
+            "skip_key_backup": "Ես չեմ ուզում, որ իմ գաղտնագրված հաղորդագրությունները"
+        },
+        "misconfigured_body": "Խնդրեք ձեր %(brand)s ադմինիստրատորին ստուգել <a>ձեր կարգավորումը</a> սխալ կամ կրկնվող գրառումների առկայության համար։",
+        "misconfigured_title": "Ձեր %(brand)s-ը սխալ է կարգավորված",
+        "mobile_create_account_title": "Դուք պատրաստվում եք ստեղծել հաշիվ %(hsName)s-ում։",
+        "msisdn_field_description": "Այլ օգտատերեր կարող են հրավիրել ձեզ սենյակներ՝ օգտագործելով ձեր կոնտակտային տվյալները",
+        "msisdn_field_label": "Հեռախոս",
+        "msisdn_field_number_invalid": "Այդ հեռախոսահամարը այնքան էլ ճիշտ տեսք չունի, խնդրում ենք ստուգել և նորից փորձել",
+        "msisdn_field_required_invalid": "Մուտքագրեք հեռախոսահամար",
+        "no_hs_url_provided": "Ոչ մի homeserver URL չի տրամադրվել",
+        "oidc": {
+            "error_title": "Մենք չկարողացանք մուտքագրել ձեզ",
+            "generic_auth_error": "Նույնականացման ընթացքում ինչոր սխալ է տեղի ունեցել: Անցեք մուտքի էջ և կրկին փորձեք:",
+            "missing_or_invalid_stored_state": "Մենք խնդրեցինք զննարկիչին հիշել, թե որ սերվերն եք օգտագործում մուտք գործելու համար, բայց, ցավոք, ձեր զննարկիչը մոռացել է այն։ Անցեք մուտքի էջ և փորձեք կրկին։"
+        },
+        "password_field_keep_going_prompt": "Շարունակեք…",
+        "password_field_label": "Մուտքագրեք գաղտնաբառը",
+        "password_field_strong_label": "Գեղեցիկ, ուժեղ գաղտնաբառ!",
+        "password_field_weak_label": "Գաղտնաբառը թույլատրված է, բայց անվտանգ չէ",
+        "phone_label": "Հեռախոս",
+        "phone_optional_label": "Հեռախոս (ըստ ցանկության)",
+        "qr_code_login": {
+            "check_code_explainer": "Սա կհաստատի, որ ձեր մյուս սարքի հետ կապն անվտանգ է։",
+            "check_code_heading": "Մուտքագրեք ձեր մյուս սարքի էկրանին ցուցադրված համարը",
+            "check_code_input_label": "2-նիշանոց կոդ",
+            "check_code_mismatch": "Թվերը չեն համընկնում",
+            "completing_setup": "Ձեր նոր սարքի կարգավորումն ավարտվում է",
+            "error_etag_missing": "Անսպասելի սխալ տեղի ունեցավ։ Սա կարող է պայմանավորված լինել զննարկիչի ընդլայնմամբ, պրոքսի սերվերով կամ սերվերի սխալ կարգավորմամբ։",
+            "error_expired": "Մուտք գործելու ժամկետը լրացել է։ Խնդրում ենք կրկին փորձել։",
+            "error_expired_title": "Մուտք գործելը ժամանակին չի ավարտվել",
+            "error_insecure_channel_detected": "Չհաջողվեց ստեղծել անվտանգ կապ նոր սարքի հետ։ Ձեր մնացած սարքերը մնում են ապահով, անհանգստանալու անհրաժեշտություն չկա։",
+            "error_insecure_channel_detected_instructions": "Հիմա ի՞նչ",
+            "error_insecure_channel_detected_instructions_1": "Կրկին փորձեք մուտք գործել մյուս սարքում QR կոդի միջոցով՝ հավանաբար խնդիրը կապված էր ցանցի հետ։",
+            "error_insecure_channel_detected_instructions_2": "Եթե կրկին հանդիպեք նույն խնդրին, միացեք ուրիշ Wi-Fi ցանցի կամ Wi-Fi-ի փոխարեն օգտագործեք բջջային ինտերնետ։",
+            "error_insecure_channel_detected_instructions_3": "Եթե դա չի աշխատում, մուտք գործեք ձեռքով",
+            "error_insecure_channel_detected_title": "Կապը անվտանգ չէ",
+            "error_other_device_already_signed_in": "Այլ բան անելու կարիք չկա։",
+            "error_other_device_already_signed_in_title": "Ձեր մյուս սարքն արդեն մուտք է գործել",
+            "error_rate_limited": "Կարճ ժամանակում չափազանց շատ փորձեր։ Սպասեք որոշ ժամանակ, նախքան կրկին փորձելը։",
+            "error_unexpected": "Տեղի է ունեցել անսպասելի սխալ: Ձեր մյուս սարքը կապակցելու հարցումը չեղարկվել է:",
+            "error_unsupported_protocol": "Այս սարքը չի աջակցում QR կոդով մյուս սարք մուտք գործելը։",
+            "error_unsupported_protocol_title": "Այլ/մյուս սարքը համատեղելի չէ",
+            "error_user_cancelled": "Մուտքը չեղարկվել է մյուս սարքի վրա։",
+            "error_user_cancelled_title": "Մուտք գործելու հարցումը չեղարկվել է",
+            "error_user_declined": "Դուք կամ հաշվի մատակարարը(պրովայդեր) մերժել է մուտք գործելու հարցումը։",
+            "error_user_declined_title": "Մուտքը մերժվեց",
+            "follow_remaining_instructions": "Հետևեք մնացած հրահանգներին",
+            "open_element_other_device": "Բացեք %(brand)s-ը ձեր մյուս սարքի վրա",
+            "point_the_camera": "Սկանավորեք այստեղ ցուցադրված QR կոդը",
+            "scan_code_instruction": "Սկանավորեք QR կոդը մեկ այլ սարքով",
+            "scan_qr_code": "Մուտք գործեք QR կոդով",
+            "security_code": "Անվտանգության կոդ",
+            "security_code_prompt": "Եթե պահանջվի, մուտքագրեք ստորև նշված կոդը ձեր մյուս սարքում։",
+            "select_qr_code": "Ընտրեք “%(scanQRCode)s”",
+            "unsupported_explainer": "Ձեր հաշվի մատակարարը չի աջակցում նոր սարքում QR կոդով մուտք գործելուն։",
+            "unsupported_heading": "QR կոդը չի աջակցվում",
+            "waiting_for_device": "Սպասում է սարքի մուտքին"
+        },
+        "register_action": "Ստեղծել օգտահաշիվ",
+        "registration": {
+            "continue_without_email_description": "Պարզապես զգուշացում, եթե չավելացնեք էլ․ հասցե և մոռանաք ձեր գաղտնաբառը, կարող եք<b> ընդմիշտ կորցնել մուտքը ձեր հաշվին</b> .",
+            "continue_without_email_field_label": "Էլ․ փոստ (ըստ ցանկության)",
+            "continue_without_email_title": "Շարունակել առանց էլեկտրոնային փոստի"
+        },
+        "registration_disabled": "Գրանցումը անջատված է այս սերվերի վրա։",
+        "registration_msisdn_field_required_invalid": "Մուտքագրեք հեռախոսահամարը (պարտադիր է այս սերվերի վրա)",
+        "registration_successful": "Գրանցումը հաջողվեց",
+        "registration_username_in_use": "Այդ օգտանունն արդեն ինչ-որ մեկն օգտագործում է։ Փորձեք մեկ այլ անուն, կամ եթե դա դուք եք, մուտք գործեք ստորև։",
+        "registration_username_unable_check": "Հնարավոր չէ ստուգել, թե արդյոք օգտատիրոջ անունը զբաղված է։ Փորձեք կրկին ավելի ուշ։",
+        "registration_username_validation": "Օգտագործեք միայն փոքրատառեր, թվեր, գծիկներ և ընդգծման նշաններ",
+        "reset_password": {
+            "confirm_new_password": "Հաստատեք նոր գաղտնաբառը",
+            "devices_logout_success": "Դուք դուրս եք եկել բոլոր սարքերից և այլևս չեք ստանա push ծանուցումներ: Ծանուցումները նորից միացնելու համար կրկին մուտք գործեք յուրաքանչյուր սարքից:",
+            "other_devices_logout_warning_1": "Ձեր սարքերից դուրս գալը կջնջի դրանց վրա պահված հաղորդագրությունների գաղտնագրված բանալիները, ինչը գաղտնագրված զրույցի պատմությունը կդարձնի անընթեռնելի։",
+            "other_devices_logout_warning_2": "Եթե ցանկանում եք պահպանել ձեր զրույցի պատմության հասանելիությունը գաղտնագրված սենյակներում, ստեղծեք Key Backup կամ արտահանեք ձեր հաղորդագրության բանալիները ձեր այլ սարքերից մեկից, նախքան շարունակելը:",
+            "password_not_entered": "Պետք է մուտքագրվի նոր գաղտնաբառ։",
+            "passwords_mismatch": "Նոր գաղտնաբառերը պետք է համընկնեն միմյանց հետ։",
+            "rate_limit_error": "Կարճ ժամանակում չափազանց շատ փորձեր։ Սպասեք որոշ ժամանակ, նախքան կրկին փորձելը։",
+            "rate_limit_error_with_time": "Կարճ ժամանակում չափազանց շատ փորձեր։ Կրկին փորձեք %(timeout)s անց։",
+            "reset_successful": "Ձեր գաղտնաբառը վերականգնվել է:",
+            "return_to_login": "Վերադառնալ մուտքի էկրանին",
+            "sign_out_other_devices": "Դուրս գալ բոլոր սարքերից"
+        },
+        "reset_password_action": "Վերականգնել գաղտնաբառը",
+        "reset_password_button": "Մոռացել եք գաղտնաբառը",
+        "reset_password_email_field_description": "Օգտագործեք էլ․ հասցե՝ ձեր հաշիվը վերականգնելու համար",
+        "reset_password_email_field_required_invalid": "Մուտքագրեք էլ.փոստի հասցեն (պարտադիր է այս սերվերի վրա)",
+        "reset_password_email_not_associated": "Ձեր էլ. փոստի հասցեն, կարծես թե, կապված չէ տնային սերվերի Matrix ID-ի հետ։",
+        "reset_password_email_not_found_title": "Այս էլ.փոստի հասցեն չի գտնվել",
+        "reset_password_title": "Վերականգնել Ձեր գաղտնաբառը",
+        "server_picker_custom": "Այլ homeserver",
+        "server_picker_description": "Դուք կարող եք օգտագործել սերվերի հատուկ տարբերակները՝ այլ Matrix սերվերներ մուտք գործելու համար՝ նշելով այլ սերվերի URL-ը: Սա թույլ է տալիս օգտագործել %(brand)s-ը առկա Matrix հաշվի հետ՝ այլ սերվերի վրա։",
+        "server_picker_description_matrix.org": "Միացեք միլիոնավորներին անվճար ամենամեծ հանրային սերվերում",
+        "server_picker_dialog_title": "Որոշեք, թե որտեղ է տեղակայված ձեր հաշիվը",
+        "server_picker_explainer": "Օգտագործեք ձեր նախընտրած Matrix homeserver-ը, եթե ունեք, կամ ստեղծեք/տեղադրեք ձեր սեփականը։",
+        "server_picker_failed_validate_homeserver": "Հնարավոր չէ վավերացնել սերվերը",
+        "server_picker_intro": "Այն վայրերը, որտեղ կարող եք տեղակայել ձեր հաշիվը, մենք անվանում ենք «homeservers»՝ գլխավոր սերվերներ։",
+        "server_picker_invalid_url": "Անվավեր URL",
+        "server_picker_learn_more": "Գլխավոր սերվերների(homeserver) մասին",
+        "server_picker_matrix.org": "Matrix.org-ը աշխարհի ամենամեծ հանրային սերվերն է, ուստի այն լավ վայր է շատերի համար։",
+        "server_picker_required": "Նշե սերվեր",
+        "server_picker_title": "Մուտք գործեք ձեր գլխավոր սերվեր",
+        "server_picker_title_default": "Սերվերի ընտրանքներ",
+        "server_picker_title_registration": "Հյուրընկալող հաշիվը միացված է",
+        "session_logged_out_description": "Անվտանգության նկատառումներից ելնելով՝ այս սեսիայից դուրս եք եկել։ Խնդրում ենք կրկին մուտք գործել։",
+        "session_logged_out_title": "Դուրս է եկել",
+        "set_email": {
+            "description": "Սա թույլ կտա վերականգնել ձեր գաղտնաբառը եւ ստանալ ծանուցումներ:",
+            "verification_pending_description": "Խնդրում ենք ստուգել ձեր էլ. փոստը և սեղմել դրա մեջ պարունակվող հղման վրա: Դրանից հետո սեղմեք «Շարունակել»:",
+            "verification_pending_title": "Հաստատումը սպասվում է"
+        },
+        "set_email_prompt": "Ցանկանո՞ւմ եք սահմանել էլ-փոստի հասցե:",
+        "sign_in_description": "Օգտագործեք ձեր հաշիվը՝ շարունակելու համար։",
+        "sign_in_instead": "Փոխարենը մուտք գործել",
+        "sign_in_instead_prompt": "Արդեն ունե՞ք հաշիվ։<a> Մուտք գործեք այստեղ</a>",
+        "sign_in_or_register": "Մուտք գործել կամ ստեղծել հաշիվ",
+        "sign_in_or_register_description": "Շարունակելու համար օգտագործեք ձեր հաշիվը կամ ստեղծեք նորը։",
+        "sign_in_prompt": "Ունե՞ք հաշիվ: <a>Մուտք գործեք</a>",
+        "sign_in_with_sso": "Մուտք գործեք միասնական մուտքի միջոցով",
+        "signing_in": "Մուտք գործում...",
+        "soft_logout": {
+            "clear_data_button": "Մաքրել բոլոր տվյալները",
+            "clear_data_description": "Այս սեսիայից բոլոր տվյալների մաքրումը մշտական է: Գաղտնագրված հաղորդագրությունները կկորչեն, եթե դրանց բանալիները պահուստավորված չեն:",
+            "clear_data_title": "Մաքրե՞լ այս սեսիայի բոլոր տվյալները։"
+        },
+        "soft_logout_heading": "Դուք դուրս եք եկել հաշվից",
+        "soft_logout_intro_password": "Մուտքագրեք ձեր գաղտնաբառը՝ մուտք գործելու և ձեր հաշվին մուտքը վերականգնելու համար։",
+        "soft_logout_intro_sso": "Մուտք գործեք և վերականգնեք մուտքը ձեր հաշվին:",
+        "soft_logout_intro_unsupported_auth": "Դուք չեք կարող մուտք գործել ձեր հաշիվ։ Լրացուցիչ տեղեկությունների համար կապվեք ձեր սերվերի ադմինիստրատորի հետ։",
+        "soft_logout_subheading": "Մաքրել անձնական տվյալները",
+        "soft_logout_warning": "Զգուշացում. Ձեր անձնական տվյալները (ներառյալ գաղտնագրված բանալիները) դեռևս պահվում են այս սեսիայում: Մաքրեք դրանք, եթե ավարտել եք այս սեսիայի օգտագործումը կամ ցանկանում եք մուտք գործել մեկ այլ հաշիվ:",
+        "sso": "Single Sign On",
+        "sso_complete_in_browser_dialog_title": "Մուտք գործեք ձեր զննարկիչ՝ մուտքն ավարտելու համար",
+        "sso_failed_missing_storage": "Մենք \"խնդրեցինք\" զննարկիչին հիշել, թե որ homeserver-ն եք օգտագործում մուտք գործելու համար, բայց, ցավոք, ձեր զննարկիչը մոռացել է այն։ Անցեք մուտքի էջ և փորձեք կրկին։",
+        "sso_or_username_password": "%(ssoButtons)s կամ %(usernamePassword)s",
+        "sync_footer_subtitle": "Եթե դուք միացել եք շատ սենյակների, դա կարող է որոշ ժամանակ պահանջել",
+        "syncing": "Համաժամեցվում է…",
+        "uia": {
+            "code": "Կոդը",
+            "email": "Ձեր հաշիվը ստեղծելու համար բացեք այն հղումը, որը մենք հենց նոր ուղարկեցինք %(emailAddress)s հասցեին:",
+            "email_auth_header": "Ստուգեք ձեր էլ. փոստը՝ շարունակելու համար",
+            "email_resend_prompt": "Չե՞ք ստացել այն։<a> Վերուղարկել այն</a>",
+            "email_resent": "Վերաուղարկվել է",
+            "fallback_button": "Սկսել նույնականացումը",
+            "mas_cross_signing_reset_cta": "Անցնել հաշվին",
+            "mas_cross_signing_reset_description": "Դուք պատրաստվում եք անցնել ձեր %(serverName)s հաշիվ՝ ձեր ինքնությունը վերականգնելու համար։ Երբ ավարտեք վերականգնումը ձեր հաշվից, վերադարձեք այստեղ և սեղմեք «Կրկին փորձել»։",
+            "mas_cross_signing_reset_title": "Մուտք գործեք ձեր հաշիվ՝ ձեր ինքնությունը վերակայելու համար",
+            "msisdn": "Տեքստային հաղորդագրություն է ուղարկվել հետևյալ հասցեին՝ %(msisdn)s",
+            "msisdn_token_incorrect": "Թոքենը սխալ է",
+            "msisdn_token_prompt": "Խնդրում ենք մուտքագրել դրա մեջ պարունակվող կոդը.",
+            "password_prompt": "Հաստատեք Ձեր ինքնությունը՝ մուտքագրելով Ձեր հաշվի գաղտնաբառը ստորև:",
+            "recaptcha_missing_params": "Գլխավոր սերվերի(homeserver) կարգավորումներում captcha հանրային բանալին բացակայում է: Խնդրում ենք տեղեկացնել դրա մասին ձեր homeserver ադմինիստրատորին:",
+            "registration_token_label": "Գրանցման տոկեն",
+            "registration_token_prompt": "Մուտքագրեք տնային սերվերի ադմինիստրատորի կողմից տրամադրված գրանցման տոկենը։",
+            "sso_body": "Հաստատեք այս էլ․ հասցեի ավելացումը՝ օգտագործելով Single Sign On-ը՝ ձեր ինքնությունը հաստատելու համար։",
+            "sso_failed": "Ինչ-որ բան սխալ է գնացել ձեր ինքնությունը հաստատելու հարցում: Չեղարկեք և փորձեք նորից:",
+            "sso_postauth_body": "Սեղմեք ներքևում գտնվող կոճակը՝ ձեր ինքնությունը հաստատելու համար:",
+            "sso_postauth_title": "Հաստատեք՝ շարունակելու համար",
+            "sso_preauth_body": "Շարունակելու համար օգտագործեք Single Sign On-ը՝ ձեր ինքնությունը հաստատելու համար։",
+            "sso_title": "Շարունակելու համար օգտագործեք Single Sign On-ը(միանգամյա մուտք)",
+            "terms": "Խնդրում ենք վերանայել և ընդունել այս սերվերի քաղաքականությունը.",
+            "terms_invalid": "Խնդրում ենք վերանայել եւ ընդունել բոլոր homeserver-ի քաղաքականությունը"
+        },
+        "unsupported_auth": "Այս սերվերը չի առաջարկում մուտքի որևէ հոսք, որոնք աջակցվում են այս ծրագրի կողմից։",
+        "unsupported_auth_email": "Այս սերվերը չի աջակցում մուտք գործել էլեկտրոնային փոստի հասցեով։",
+        "unsupported_auth_msisdn": "Այս սերվերը չի աջակցում հեռախոսահամարով նույնականացումը։",
+        "username_field_required_invalid": "Մուտքագրեք օգտանուն",
+        "username_in_use": "Այդ օգտանունն արդեն ինչ-որ մեկն օգտագործում է, խնդրում ենք փորձել մեկ ուրիշը։",
+        "verify_email_explainer": "Մենք պետք է իմանանք, որ դա դուք եք, նախքան ձեր գաղտնաբառը վերականգնելը: Սեղմեք <b>%(email)s</b>-ին մեր ուղարկած էլ. նամակում նշված հղմանը:",
+        "verify_email_heading": "Ստուգեք ձեր էլ․ հասցեն՝ շարունակելու համար"
+    },
+    "bug_reporting": {
+        "additional_context": "Եթե լրացուցիչ համատեքստ ​​կա, որը կարող է օգնել խնդրի վերլուծությանը, օրինակ՝ ինչ էիք անում այդ պահին, սենյակների ID-ները, օգտատերերի ID-ները և այլն, խնդրում ենք ներառել այդ տվյալներն այստեղ։",
+        "before_submitting": "Մենք խորհուրդ ենք տալիս <a>ստեղծել GitHub տոմսակ</a>՝ ձեր զեկույցի վերանայումն ապահովելու համար։",
+        "collecting_information": "Հավելվածի տարբերակի տեղեկատվության հավաքում",
+        "collecting_logs": "Գրանցամատյանների(logs) հավաքում",
+        "create_new_issue": "Խնդրում ենք <newIssueLink>ստեղծել նոր տոմսակ</newIssueLink> GitHub-ում, որպեսզի կարողանանք ուսումնասիրել այս սխալը։",
+        "description": "Վրիպազերծման գրանցամատյանները(debug logs) պարունակում են ծրագրի օգտագործման տվյալներ, ներառյալ ձեր օգտատիրոջ անունը, ձեր այցելած սենյակների ID-ները կամ կեղծանունները, վերջին անգամ օգտագործողի ինտերֆեյսի որ տարրերի հետ եք փոխազդել և այլ օգտատերերի օգտատիրոջ անունները: Դրանք չեն պարունակում որևէ հաղորդագրություններ:",
+        "download_logs": "Ներբեռնել գրանցամատյանները",
+        "downloading_logs": "Գրանցամատյանների(logs) ներբեռնում",
+        "error_empty": "Խնդրում ենք պատմել մեզ, թե ինչ սխալ է տեղի ունեցել կամ, ավելի լավ՝ ստեղծել GitHub տոմսակ, որը նկարագրում է խնդիրը։",
+        "failed_download_logs": "Չհաջողվեց ներբեռնել վրիպազերծման մատյանները(debug logs)․ ",
+        "failed_send_logs_causes": {
+            "disallowed_app": "Ձեր սխալի մասին զեկույցը(bug report) մերժվել է։ Rageshake սերվերը չի աջակցում այս հավելվածին։",
+            "rejected_generic": "Ձեր սխալի մասին զեկույցը(bug report) մերժվել է։ Rageshake սերվերը մերժեց զեկույցի պարունակությունը` քաղաքականության պատճառով։",
+            "rejected_recovery_key": "Ձեր սխալի մասին զեկույցը(bug report) մերժվել է անվտանգության նկատառումներից ելնելով, քանի որ այն պարունակում էր վերականգնման բանալի։",
+            "rejected_version": "Ձեր սխալի մասին զեկույցը(bug report) մերժվել է, քանի որ ձեր հավելվածի տարբերակը չափազանց հին է։",
+            "server_unknown_error": "Rageshake սերվերը հանդիպեց անհայտ սխալի և չկարողացավ մշակել հաշվետվությունը։",
+            "unknown_error": "Չհաջողվեց ուղարկել գրանցամատյանները(logs)։"
+        },
+        "github_issue": "GitHub տոմսակ",
+        "introduction": "Եթե ​​դուք GitHub-ի միջոցով սխալ եք հայտնել, վրիպազերծման գրանցամատյանները(debug logs) կարող են մեզ օգնել գտնել խնդիրը: ",
+        "log_request": "Ապագայում սա կանխելու համար խնդրում ենք <a>մեզ ուղարկել գրանցամատյաններ(logs)</a>:",
+        "logs_sent": "Գրանցամատյաններն(logs) ուղարկվեցին",
+        "matrix_security_issue": "Matrix-ի հետ կապված անվտանգության խնդրի մասին հաղորդելու համար, խնդրում ենք կարդալ Matrix.org-ի <a>Անվտանգության բացահայտման քաղաքականությունը</a>:",
+        "preparing_download": "Պատրաստվում է գրանցամատյանների(logs) ներբեռնում",
+        "preparing_logs": "Պատրաստվում է տեղեկամատյաններ(logs) ուղարկելուն",
+        "send_logs": "Ուղարկել տեղեկամատյաններ(logs)",
+        "submit_debug_logs": "Ուղարկել վրիպազերծման գրանցամատյանները",
+        "textarea_label": "Նշումներ",
+        "thank_you": "Շնորհակալություն",
+        "title": "Սխալների մասին հաղորդում",
+        "unsupported_browser": "Հիշեցում․ ձեր զննարկիչը չի աջակցվում, ուստի ձեր փորձը կարող է անկանխատեսելի լինել:",
+        "uploading_logs": "Գրանցամատյանների(logs) վերբեռնում",
+        "waiting_for_server": "Սպասում ենք սերվերի պատասխանին"
+    },
+    "cannot_invite_without_identity_server": "Հնարավոր չէ օգտատիրոջը էլ. փոստով հրավիրել առանց նույնականացման սերվերի։ Դուք կարող եք միանալ դրան «Կարգավորումներ» բաժնում։",
+    "cannot_reach_homeserver": "Հնարավոր չէ կապ հաստատել սերվերի հետ",
+    "cannot_reach_homeserver_detail": "Համոզվեք, որ ունեք կայուն ինտերնետային կապ կամ կապվեք սերվերի ադմինիստրատորի հետ",
+    "cant_load_page": "Չհաջողվեց բեռնել էջը",
+    "chat_card_back_action_label": "Վերադառնալ զրույցին",
+    "chat_effects": {
+        "confetti_description": "Ուղարկում է տրված հաղորդագրությունը կոնֆետտիով",
+        "confetti_message": "ուղարկում է կոնֆետտի",
+        "fireworks_description": "Ուղարկում է տվյալ հաղորդագրությունը հրավառությամբ",
+        "fireworks_message": "ուղարկում է հրավառություն",
+        "hearts_description": "Ուղարկում է տրված հաղորդագրությունը սրտերով",
+        "hearts_message": "ուղարկում է սրտեր",
+        "rainfall_description": "Ուղարկում է տվյալ հաղորդագրությունը անձրևներով",
+        "rainfall_message": "ուղարկում է անձրև",
+        "snowfall_description": "Ուղարկում է տվյալ հաղորդագրությունը ձնաբքի հետ",
+        "snowfall_message": "ուղարկում է ձյուն",
+        "spaceinvaders_description": "Ուղարկում է տվյալ հաղորդագրությունը տիեզերական թեմատիկ էֆեկտով",
+        "spaceinvaders_message": "ուղարկում է space invaders 👾"
+    },
+    "common": {
+        "access_token": "Մուտքի նշան",
+        "accessibility": "Մատչելիություն",
+        "advanced": "Ընդլայնված",
+        "all_chats": "Բոլոր զրույցները",
+        "analytics": "Վերլուծություն",
+        "and_n_others": {
+            "one": "և մեկ այլ...",
+            "other": "և %(count)s ուրիշներ..."
+        },
+        "appearance": "Արտաքին տեսք",
+        "application": "Հավելված",
+        "are_you_sure": "Վստա՞հ եք։",
+        "attachment": "Կցորդ",
+        "authentication": "Վավերացում",
+        "avatar": "Ավատար",
+        "beta": "Բետա",
+        "camera": "Տեսախցիկ",
+        "cameras": "Տեսախցիկներ",
+        "cancel": "Չեղարկել",
+        "capabilities": "Հնարավորություններ",
+        "copied": "Պատճենված։",
+        "credits": "Վարկեր",
+        "dark": "Մութ",
+        "description": "Նկարագրություն",
+        "deselect_all": "Ապընտրել բոլորը",
+        "device": "Սարք",
+        "edited": "խմբագրված",
+        "email_address": "Էլ.փոստի հասցե",
+        "emoji": "Էմոջի",
+        "encrypted": "Ծածկագրված",
+        "encryption_enabled": "Գաղտնագրումը միացված է",
+        "error": "Սխալ",
+        "faq": "Հաճախ տրվող հարցեր",
+        "favourites": "Ընտրյալներ",
+        "feedback": "Հետադարձ կապ",
+        "filter_results": "Ֆիլտրի արդյունքները",
+        "forward_message": "Փոխանցել հաղորդագրությունը",
+        "general": "Ընդհանուր",
+        "go_to_settings": "Գնալ դեպի Կարգավորումներ",
+        "guest": "Հյուր",
+        "help": "Օգնություն",
+        "historical": "Պատմական",
+        "home": "Գլխավոր էջ",
+        "homeserver": "Գլխավոր սպասարկող",
+        "identity_server": "Նույնականացման սերվեր",
+        "image": "Պատկեր",
+        "integration_manager": "Ինտեգրման մենեջեր",
+        "joined": "Միացված է",
+        "labs": "Լաբորատորիաներ",
+        "legal": "Իրավական",
+        "light": "Լուսավոր",
+        "loading": "Բեռնվում է...",
+        "location": "Գտնվելու վայրը",
+        "low_priority": "Ցածր առաջնահերթություն",
+        "matrix": "Matrix",
+        "message": "Հաղորդագրություն",
+        "message_layout": "Հաղորդագրության դասավորություն",
+        "message_timestamp_invalid": "Անվավեր ժամանակային դրոշմանիշ",
+        "microphone": "Խոսափող",
+        "model": "Մոդել",
+        "moderation_and_safety": "Վերահսկողություն և անվտանգություն",
+        "modern": "Ժամանակակից",
+        "mute": "Անջատել ձայնը",
+        "n_members": {
+            "one": "%(count)s անդամ",
+            "other": "%(count)s անդամներ"
+        },
+        "n_rooms": {
+            "one": "%(count)s սենյակ",
+            "other": "%(count)s սենյակներ"
+        },
+        "name": "Անուն",
+        "no_results": "Ոչ մի արդյունք",
+        "no_results_found": "Ոչ մի արդյունք չի գտնվել",
+        "not_trusted": "Անվստահելի",
+        "off": "Անջատված է",
+        "offline": "Անցանց",
+        "on": "Միացված է",
+        "options": "Տարբերակներ",
+        "orphan_rooms": "Այլ սենյակներ",
+        "password": "Գաղտնաբառ",
+        "people": "Մարդիկ",
+        "preferences": "Նախապատվություններ",
+        "presence": "Ներկայություն",
+        "preview_message": "Բարև քեզ։ Դու լավագույնն ես։",
+        "privacy": "Գաղտնիություն",
+        "private": "Մասնավոր",
+        "private_room": "Մասնավոր սենյակ",
+        "private_space": "Մասնավոր տարածք",
+        "profile": "Պրոֆիլ",
+        "public": "Հանրային",
+        "public_room": "Հասարակական սենյակ",
+        "public_space": "Հանրային տարածք",
+        "qr_code": "QR կոդ",
+        "random": "Պատահական",
+        "reactions": "Արձագանքներ",
+        "recommended": "Առաջարկվող",
+        "report_a_bug": "Հաղորդել սխալի մասին",
+        "room": "Սենյակ",
+        "room_name": "Սենյակի անունը",
+        "rooms": "Սենյակներ",
+        "save": "Պահել",
+        "saved": "Պահված է",
+        "saving": "Պահպանվում է…",
+        "secure_backup": "Անվտանգ պահուստավորում",
+        "select_all": "Ընտրել բոլորը",
+        "server": "Սերվեր",
+        "settings": "Կարգավորումներ",
+        "setup_secure_messages": "Կարգավորել Անվտանգ Հաղորդագրությունները",
+        "show_more": "Ցույց տալ ավելին",
+        "someone": "Ինչոր մեկը",
+        "space": "Տարածք",
+        "spaces": "Տարածքներ",
+        "sticker": "Ստիկեր",
+        "stickerpack": "Ստիկերների փաթեթ",
+        "success": "Հաջող",
+        "suggestions": "Առաջարկներ",
+        "support": "Աջակցություն",
+        "system_alerts": "Համակարգի ահազանգեր",
+        "theme": "Թեմա",
+        "thread": "Թեմա",
+        "threads": "Թեմաներ",
+        "timeline": "Ժամանակացույց",
+        "unavailable": "անհասանելի",
+        "unencrypted": "Գաղտնագրված չէ",
+        "unmute": "Միացնել ձայնը",
+        "unnamed_room": "Անանուն սենյակ",
+        "unnamed_space": "Անանուն տարածք",
+        "unverified": "Չստուգված",
+        "updating": "Արդիացում...",
+        "user": "Օգտատեր",
+        "user_avatar": "Պրոֆիլի նկար",
+        "username": "Օգտանուն",
+        "verified": "Ստուգված",
+        "version": "Տարբերակ",
+        "video": "Տեսանյութ",
+        "video_room": "Վիդեո սենյակ",
+        "view_message": "Դիտել հաղորդագրությունը",
+        "warning": "Զգուշացում"
+    },
+    "composer": {
+        "autocomplete": {
+            "@room_description": "Տեղեկացնել ամբողջ սենյակին",
+            "command_a11y": "Հրամանի ավտոմատ լրացում",
+            "command_description": "Հրամաններ",
+            "emoji_a11y": "Էմոջիների ավտոմատ լրացում",
+            "notification_a11y": "Ծանուցման ավտոմատ լրացում",
+            "notification_description": "Սենյակի ծանուցում",
+            "room_a11y": "Սենյակի ավտոմատ լրացում",
+            "space_a11y": "Տարածքի ավտոմատ լրացում",
+            "user_a11y": "Օգտատիրոջ ավտոմատ լրացում",
+            "user_description": "Օգտատերեր"
+        },
+        "close_sticker_picker": "Թաքցնել ստիկերները",
+        "edit_composer_label": "Խմբագրել հաղորդագրությունը",
+        "format_bold": "Թավատառ",
+        "format_code_block": "Կոդի բլոկ",
+        "format_decrease_indent": "Ներդրման նվազեցում",
+        "format_increase_indent": "Ներդրման ավելացում",
+        "format_inline_code": "Կոդ",
+        "format_insert_link": "Զետեղել հղում",
+        "format_italic": "Շեղագիր",
+        "format_italics": "Շեղատառեր",
+        "format_link": "Հղում",
+        "format_ordered_list": "Համարակալված ցանկ",
+        "format_strikethrough": "Վրագծված",
+        "format_underline": "Ընդգծված",
+        "format_unordered_list": "Կետավոր ցուցակ",
+        "formatting_toolbar_label": "Ձևաչափում(ֆորմատավորում)",
+        "link_modal": {
+            "link_field_label": "Հղում",
+            "text_field_label": "Տեքստ",
+            "title_create": "Ստեղծել հղում",
+            "title_edit": "Խմբագրել հղումը"
+        },
+        "mode_plain": "Թաքցնել ձևաչափումը",
+        "mode_rich_text": "Ցուցադրել ձևաչափումը",
+        "no_perms_notice": "Դուք այս սենյակում գրառում անելու թույլտվություն չունեք",
+        "placeholder": "Ուղարկել հաղորդագրություն...",
+        "placeholder_encrypted": "Ուղարկել գաղտնագրված հաղորդագրություն...",
+        "placeholder_reply": "Ուղարկել պատասխան…",
+        "placeholder_reply_encrypted": "Ուղարկել գաղտնագրված պատասխան...",
+        "placeholder_thread": "Պատասխանել թեմային...",
+        "placeholder_thread_encrypted": "Պատասխանել գաղտնագրված թեմային...",
+        "poll_button": "Հարցում",
+        "poll_button_no_perms_description": "Դուք այս սենյակում հարցումներ սկսելու թույլտվություն չունեք։",
+        "poll_button_no_perms_title": "Անհրաժեշտ է թույլտվություն",
+        "replying_title": "Պատասխանում",
+        "room_unencrypted": "Այս սենյակում հաղորդագրությունները ծայրից ծայր գաղտնագրված չեն։",
+        "room_upgraded_link": "Խոսակցությունը շարունակվում է այստեղ։",
+        "room_upgraded_notice": "Այս սենյակը փոխարինվել է և այլևս ակտիվ չէ։",
+        "send_button_title": "Ուղարկել հաղորդագրություն",
+        "send_button_voice_message": "Ուղարկել ձայնային հաղորդագրություն",
+        "send_voice_message": "Ուղարկել ձայնային հաղորդագրություն",
+        "stop_voice_message": "Դադարեցնել ձայնագրումը",
+        "voice_message_button": "Ձայնային հաղորդագրություն"
+    },
+    "console_dev_note": "Եթե գիտեք, թե ինչ եք անում, Element-ի կոդերը բաց են, անպայման այցելեք մեր GitHub-ի էջը (https://github.com/vector-im/element-web/) և ունեցեք ձեր ներդրումը։",
+    "console_scam_warning": "Եթե ինչ-որ մեկը ձեզ ասել է այստեղ ինչ-որ բան պատճենել/տեղադրել, մեծ հավանականություն կա, որ ձեզ խաբում են։",
+    "console_wait": "Սպասե՛ք",
+    "create_room": {
+        "action_create_room": "Ստեղծել սենյակ",
+        "action_create_video_room": "Ստեղծել վիդեո սենյակ",
+        "encrypted_video_room_warning": "Հետագայում չեք կարող անջատել սա: Սենյակը կծածկագրվի, բայց ներմուծված զանգը՝ ոչ։",
+        "encrypted_warning": "Հետագայում չեք կարող անջատել սա: Կամուրջները եւ բոտերի մեծ մասը դեռ չեն աշխատի։",
+        "encryption_forced": "Ձեր սերվերը պահանջում է, որ մասնավոր սենյակներում միացված լինի գաղտնագրումը։",
+        "encryption_label": "Միացնել ծայրից ծայր գաղտնագրումը",
+        "error_title": "Սենյակի ստեղծման ձախողում",
+        "generic_error": "Հնարավոր է՝ սերվերը անհասանելի է, գերծանրաբեռնված է, կամ դուք սխալի եք հանդիպել։",
+        "join_rule_change_notice": "Դուք կարող եք սա փոխել ցանկացած պահիէ սենյակի կարգավորումներից։",
+        "join_rule_invite": "Մասնավոր սենյակ (միայն հրավերով)",
+        "join_rule_invite_label": "Միայն հրավիրված մարդիկ կկարողանան գտնել և միանալ այս սենյակին։",
+        "join_rule_knock_label": "Յուրաքանչյուր ոք կարող է դիմել միանալու համար, բայց ադմինիստրատորները կամ մոդերատորները պետք է թույլ տան դա։ Դուք կարող եք փոխել սա ավելի ուշ:",
+        "join_rule_public_label": "Յուրաքանչյուր ոք կկարողանա գտնել և միանալ այս սենյակին։",
+        "join_rule_public_parent_space_label": "Յուրաքանչյուր ոք կկարողանա գտնել և միանալ այս սենյակին, ոչ միայն <SpaceName/>-ի անդամները։",
+        "join_rule_restricted": "Տեսանելի է տարածքի անդամների համար",
+        "join_rule_restricted_label": "<SpaceName/>-ում բոլորը կկարողանան գտնել և միանալ այս սենյակին:",
+        "name_validation_required": "Խնդրում ենք մուտքագրել սենյակի անունը",
+        "room_visibility_label": "Սենյակի տեսանելիություն",
+        "title_private_room": "Ստեղծել մասնավոր սենյակ",
+        "title_public_room": "Ստեղծել հանրային սենյակ",
+        "title_video_room": "Ստեղծել վիդեո սենյակ",
+        "topic_label": "Թեմա (ըստ ցանկության)",
+        "unfederated": "Արգելափակել %(serverName)s-ի անդամ չհանդիսացող ցանկացած անձի միանալը այս սենյակին։",
+        "unfederated_label_default_off": "Դուք կարող եք միացնել սա, եթե սենյակը օգտագործվելու է միայն ձեր սերվերի ներքին թիմերի հետ համագործակցության համար: Սա հետագայում չի կարող փոխվել:",
+        "unfederated_label_default_on": "Դուք կարող եք անջատել սա, եթե սենյակը օգտագործվելու է արտաքին թիմերի հետ համագործակցության համար, որոնք ունեն իրենց սեփական սերվերը: Սա հետագայում չի կարող փոխվել:",
+        "unsupported_version": "Սերվերը չի աջակցում նշված սենյակի տարբերակը։"
+    },
+    "create_space": {
+        "add_details_prompt": "Ավելացրեք որոշ մանրամասներ, որոնք կօգնեն մարդկանց ճանաչել այն:",
+        "add_details_prompt_2": "Դուք կարող եք փոխել դրանք ցանկացած պահի:",
+        "add_existing_rooms_description": "Ընտրեք սենյակներ կամ զրույցներ՝ ավելացնելու համար։ Սա պարզապես ձեզ համար նախատեսված տարածք է, ոչ ոքի սրա մասին չի տեղեկացվի։ Ավելի ուշ կարող եք ավելացնել ավելին։",
+        "add_existing_rooms_heading": "Ի՞նչ եք ուզում կազմակերպել։",
+        "address_label": "Հասցե",
+        "address_placeholder": "օրինակ՝ my-space (իմ տարածքը)",
+        "creating": "Ստեղծում է…",
+        "creating_rooms": "Սենյակների ստեղծում...",
+        "done_action": "Գնալ իմ տարածք",
+        "done_action_first_room": "Գնալ իմ առաջին սենյակ",
+        "explainer": "Տարածքները սենյակներն ու մարդկանց խմբավորելու նոր միջոց են: Ինչպիսի՞ տարածք եք ուզում ստեղծել: Կարող եք սա փոխել ավելի ուշ:",
+        "failed_create_initial_rooms": "Չհաջողվեց ստեղծել նախնական տարածքի սենյակներ",
+        "failed_invite_users": "Չհաջողվեց հրավիրել հետևյալ օգտատերերին ձեր տարածք․ %(csvUsers)s",
+        "invite_teammates_by_username": "Հրավիրել օգտատիրոջ անունով",
+        "invite_teammates_description": "Համոզվեք, որ ճիշտ մարդիկ ունեն մուտքի իրավունք։ Ավելի ուշ կարող եք հրավիրել ավելի շատերին։",
+        "invite_teammates_heading": "Հրավիրեք ձեր թիմակիցներին",
+        "inviting_users": "Հրավիրում...",
+        "label": "Ստեղծել տարածք",
+        "name_required": "Խնդրում ենք մուտքագրել տարածքի անուն",
+        "personal_space": "Միայն ես",
+        "personal_space_description": "Անհատական ​​տարածք՝ ձեր սենյակները կազմակերպելու համար",
+        "private_description": "Միայն հրավերով, լավագույնը՝ ձեր կամ թիմերի համար",
+        "private_heading": "Ձեր մասնավոր տարածքը",
+        "private_personal_description": "Համոզվեք, որ ճիշտ մարդիկ հասանելիություն ունեն %(name)s-ին",
+        "private_personal_heading": "Ո՞ւմ հետ եք աշխատում:",
+        "private_space": "Ես և իմ թիմակիցները",
+        "private_space_description": "Մասնավոր տարածք ձեզ և ձեր թիմակիցների համար",
+        "public_description": "Բաց տարածք բոլորի համար, լավագույնը՝ համայնքների համար",
+        "public_heading": "Ձեր հանրային տարածքը",
+        "search_public_button": "Որոնել հանրային տարածքներ",
+        "setup_rooms_community_description": "Եկեք նրանցից յուրաքանչյուրի համար սենյակ ստեղծենք։",
+        "setup_rooms_community_heading": "Ի՞նչ թեմաներ եք ուզում քննարկել %(spaceName)s-ում։",
+        "setup_rooms_description": "Հետագայում նույնպես կարող եք ավելացնել ավելին, ներառյալ արդեն գոյություն ունեցողները:",
+        "setup_rooms_private_description": "Մենք նրանցից յուրաքանչյուրի համար սենյակներ կստեղծենք:",
+        "setup_rooms_private_heading": "Ի՞նչ նախագծերի վրա է աշխատում ձեր թիմը:",
+        "share_description": "Այս պահին միայն դու ես, ուրիշների հետ ավելի լավ կլինի։",
+        "share_heading": "Կիսվել %(name)s-ով",
+        "skip_action": "Առայժմ բաց տողնել",
+        "subspace_adding": "Ավելացվում է…",
+        "subspace_beta_notice": "Ավելացրեք տարածք ձեր կառավարվող տարածքին:",
+        "subspace_dropdown_title": "Ստեղծել տարածք",
+        "subspace_existing_space_prompt": "Ցանկան՞ում եք դրա փոխարեն ավելացնել գոյություն ունեցող տարածք:",
+        "subspace_join_rule_invite_description": "Միայն հրավիրված մարդիկ կկարողանան գտնել և միանալ այս տարածքին:",
+        "subspace_join_rule_invite_only": "Մասնավոր տարածք (միայն հրավերով)",
+        "subspace_join_rule_label": "Տարածքի տեսանելիություն",
+        "subspace_join_rule_public_description": "Այս տարածքը կարող է գտնել և միանալ ցանկացած մեկը, ոչ միայն <SpaceName/>-ի անդամները։",
+        "subspace_join_rule_restricted_description": "<SpaceName/>-ում գտնվող ցանկացած մեկը կկարողանա գտնել և միանալ։"
+    },
+    "credits": {
+        "default_cover_photo": "<photo>լռելյայն շապիկի լուսանկարը</photo> © <author>Jesús Roncero</author>, օգտագործվում է <terms>CC-BY-SA 4.0</terms> լիցենզիայի պայմաններով։",
+        "twemoji": "<twemoji>Twemoji</twemoji> էմոջի գրաֆիկան © <author>Twitter, Inc և այլ ներդրողներ</author>, օգտագործվում է <terms>CC-BY 4.0</terms> լիցենզիայի պայմաններով։",
+        "twemoji_colr": "<colr>twemoji-colr</colr> տառատեսակը © <author>Mozilla Foundation</author>, օգտագործվում է <terms>Apache 2.0</terms> լիցենզիայի պայմաններով։"
+    },
+    "decline_invitation_dialog": {
+        "confirm": "Վստա՞հ եք, որ ցանկանում եք մերժել \"%(roomName)s\"-ին միանալու հրավերը",
+        "ignore_user_help": "Դուք չեք տեսնի որևէ հաղորդագրություն կամ սենյակի հրավեր այս օգտատիրոջից",
+        "reason_description": "Նկարագրեք սենյակի մասին զեկուցելու(բողոքելու) պատճառը",
+        "report_room_description": "Զեկուցել այս սենյակի մասին ձեր հաշվի մատակարարին(account provider)",
+        "title": "Մերժել հրավերը"
+    },
+    "desktop_default_device_name": "%(brand)s Համակարգչային աշխատասեղան(desktop)․ %(platformName)s",
+    "devtools": {
+        "active_widgets": "Ակտիվ վիջեթներ",
+        "category_other": "Այլ",
+        "category_room": "Սենյակ",
+        "caution_colon": "Զգուշացում.",
+        "client_versions": "Ծրագրի տարբերակները",
+        "crypto": {
+            "4s_public_key_in_account_data": "հաշվի տվյալներում",
+            "4s_public_key_not_in_account_data": "չի գտնվել",
+            "4s_public_key_status": "Գաղտնի պահեստի հանրային բանալի․",
+            "backup_key_cached": "քեշավորված է տեղային մակարդակում",
+            "backup_key_cached_status": "Պահուստային բանալին պահված է․",
+            "backup_key_not_stored": "չի պահպանվել",
+            "backup_key_stored": "գաղտնի պահեստում",
+            "backup_key_stored_status": "Պահուստային բանալին պահված է․",
+            "backup_key_unexpected_type": "անսպասելի տեսակ",
+            "backup_key_well_formed": "լավ ձևավորված",
+            "cross_signing": "Խաչաձև ստորագրություն",
+            "cross_signing_cached": "քեշավորված է տեղային մակարդակում",
+            "cross_signing_not_ready": "Խաչաձև ստորագրությունը կարգավորված չէ։",
+            "cross_signing_private_keys_in_storage": "գաղտնի պահեստում",
+            "cross_signing_private_keys_in_storage_status": "Խաչաձև ստորագրման մասնավոր բանալիներ․",
+            "cross_signing_private_keys_not_in_storage": "չի գտնվել պահեստում",
+            "cross_signing_public_keys_on_device": "հիշողության մեջ",
+            "cross_signing_public_keys_on_device_status": "Խաչաձև ստորագրման հանրային բանալիներ․",
+            "cross_signing_ready": "Խաչաձև ստորագրությունը պատրաստ է օգտագործման համար։",
+            "cross_signing_status": "Խաչաձև ստորագրման կարգավիճակ․",
+            "cross_signing_untrusted": "Ձեր հաշիվն ունի խաչաձև ստորագրման նույնականացում գաղտնի պահեստում, բայց այն դեռևս վստահելի չէ այս սեսիայի կողմից։",
+            "crypto_not_available": "Կրիպտոգրաֆիկ մոդուլը հասանելի չէ",
+            "device_id": "Սարքի ID",
+            "key_backup_active_version": "Ակտիվ պահուստային տարբերակ․",
+            "key_backup_active_version_none": "Ոչ մեկ",
+            "key_backup_inactive_warning": "Ձեր բանալիները այս սեսիայից չեն պահուստավորվում։",
+            "key_backup_latest_version": "Սերվերի վրա պահուստային պատճենի վերջին տարբերակ․",
+            "key_storage": "Բանալիների պահեստ",
+            "master_private_key_cached_status": "Գլխավոր մասնավոր բանալի․",
+            "not_found": "չի գտնվել",
+            "not_found_locally": "տեղային մակարդակում չի գտնվել",
+            "secret_storage_not_ready": "պատրաստ չէ",
+            "secret_storage_ready": "պատրաստ է",
+            "secret_storage_status": "Գաղտնի պահեստ.",
+            "self_signing_private_key_cached_status": "Ինքնաստորագրման մասնավոր բանալի․",
+            "session": "Սեսիա",
+            "session_fingerprint": "Մատնահետք (սեսիայի բանալի)",
+            "title": "\"Ծայրից ծայր\" գաղտնագրում",
+            "user_signing_private_key_cached_status": "Օգտատիրոջ ստորագրման մասնավոր բանալի․"
+        },
+        "developer_mode": "Ծրագրավորողի ռեժիմ",
+        "developer_tools": "Ծրագրավորողի գործիքներ",
+        "edit_setting": "Խմբագրել կարգավորումը",
+        "edit_values": "Խմբագրել արժեքները",
+        "empty_string": "<empty string>",
+        "event_content": "Իրադարձության բովանդակություն",
+        "event_id": "Իրադարձության ID-ն՝ %(eventId)s",
+        "event_sent": "Իրադարձությունն ուղարկվել է !",
+        "event_type": "Իրադարաձության տեսակ",
+        "explore_account_data": "Ուսումնասիրել հաշվի տվյալները",
+        "explore_room_account_data": "Ուսումնասիրել սենյակի հաշվի տվյալները",
+        "explore_room_state": "Ուսումնասիրել սենյակի վիճակը",
+        "failed_to_find_widget": "Այս վիջեթը գտնելիս սխալ տեղի ունեցավ։",
+        "failed_to_load": "Չհաջողվեց բեռնել:",
+        "failed_to_save": "Չհաջողվեց պահպանել կարգավորումները։",
+        "failed_to_send": "Չհաջողվեց ուղարկել իրադարձությունը։",
+        "id": "ID՝ ",
+        "invalid_json": "Կարծես անվավեր JSON է։",
+        "level": "Մակարդակ",
+        "low_bandwidth_mode": "Ցածր թողունակության ռեժիմ",
+        "low_bandwidth_mode_description": "Պահանջում է համատեղելի սերվեր:",
+        "main_timeline": "Հիմնական ժամանակացույց",
+        "manual_device_verification": "Սարքի ձեռքով ստուգում",
+        "no_receipt_found": "Անդորրագիրը չի գտնվել",
+        "notification_state": "Ծանուցման վիճակը՝ <strong>%(notificationState)s</strong>",
+        "notifications_debug": "Ծանուցումների վրիպազերծում",
+        "number_of_users": "Օգտագործողների քանակը",
+        "original_event_source": "Իրադարձության սկզբնական աղբյուր",
+        "room_encrypted": "Սենյակը <strong>կոդավորված է ✅</strong>",
+        "room_id": "Սենյակի ID: %(roomId)s",
+        "room_not_encrypted": "Սենյակը <strong>կոդավորված չէ ✅</strong>",
+        "room_notifications_dot": "Կետ. ",
+        "room_notifications_highlight": "Ընդգծում. ",
+        "room_notifications_last_event": "Վերջին իրադարձություն.",
+        "room_notifications_sender": "Ուղարկող՝ ",
+        "room_notifications_thread_id": "Թեմայի ID՝ ",
+        "room_notifications_total": "Ընդհանուր՝ ",
+        "room_notifications_type": "Տեսակ՝ ",
+        "room_status": "Սենյակի կարգավիճակ",
+        "room_unread_status_count": {
+            "one": "Սենյակի չկարդացված կարգավիճակը. <strong> %(status)s</strong>, քանակ՝ <strong> %(count)s </strong>",
+            "other": "Սենյակի չկարդացված կարգավիճակը. <strong> %(status)s</strong>, քանակ՝ <strong> %(count)s </strong>"
+        },
+        "save_setting_values": "Պահպանել կարգավորումների արժեքները",
+        "see_history": "Տեսնել պատմությունը",
+        "send_custom_account_data_event": "Ուղարկել հաշվի տվյալների հատուկ իրադարձություն",
+        "send_custom_room_account_data_event": "Ուղարկել սենյակի հաշվի տվյալների հատուկ իրադարձություն",
+        "send_custom_state_event": "Ուղարկել հատուկ վիճակի իրադարձություն",
+        "send_custom_timeline_event": "Ուղարկել հատուկ ժամանակացույցի իրադարձություն",
+        "server_info": "Սերվերի տեղեկություններ",
+        "server_versions": "Սերվերի տարբերակները",
+        "settable_global": "Կարգավորելի է գլոբալ մակարդակում",
+        "settable_room": "Կարգավորելի է սենյակում",
+        "setting_colon": "Կարգավորում․",
+        "setting_definition": "Կարգավորման սահմանում.",
+        "setting_id": "Կարգավորման ID",
+        "settings": {
+            "elementCallUrl": "Element զանգի հղում"
+        },
+        "settings_explorer": "Կարգավորումների հետազոտող",
+        "show_empty_content_events": "Ցուցադրել դատարկ բովանդակությամբ իրադարձությունները",
+        "show_hidden_events": "Ցույց տալ թաքնված իրադարձությունները ժամանակացույցում",
+        "spaces": {
+            "one": "<տարածք>",
+            "other": "<%(count)s տարածքներ>"
+        },
+        "state_key": "Վիճակի բանալի",
+        "thread_root_id": "Թեմայի արմատային ID: %(threadRootId)s",
+        "threads_timeline": "Թեմաների ժամանակագրություն",
+        "title": "Ծրագրավորողի գործիքներ",
+        "toggle_event": "միացնել իրադարձությունը",
+        "toolbox": "Գործիքակազմ",
+        "use_at_own_risk": "Այս UI-ը(օգտագործողի ինտերֆեյսը) չի ստուգում արժեքների տեսակները: Օգտագործել ձեր սեփական ռիսկով:",
+        "user_read_up_to": "Օգտատերը կարդացել է մինչև՝ ",
+        "user_read_up_to_ignore_synthetic": "Օգտվողը կարդացել է մինչեւ (ignoreSynthetic): ",
+        "user_read_up_to_private": "Օգտվողը կարդացել է մինչեւ (m.read.private): ",
+        "user_read_up_to_private_ignore_synthetic": "Օգտվողը կարդացել է մինչեւ (m.read.private; ignoreSynthetic): ",
+        "value": "Արժեք",
+        "value_colon": "Արժեք՝",
+        "value_in_this_room": "Արժեքն այս սենյակում",
+        "value_this_room_colon": "Արժեքը այս սենյակում՝",
+        "values_explicit": "Արժեքներ հստակ մակարդակներում",
+        "values_explicit_colon": "Արժեքները հստակ մակարդակներում՝",
+        "values_explicit_room": "Արժեքները հստակ մակարդակներում այս սենյակում",
+        "values_explicit_this_room_colon": "Այս սենյակում հստակ մակարդակների արժեքները՝",
+        "view_servers_in_room": "Դիտել սենյակում գտնվող սերվերները",
+        "view_source_decrypted_event_source": "Վերծանված իրադարձության աղբյուր",
+        "view_source_decrypted_event_source_unavailable": "Վերծանված աղբյուրն անհասանելի է",
+        "widget_screenshots": "Միացնել վիջեթի screenshot-ը աջակցվող վիջեթների վրա"
+    },
+    "dialog_close_label": "Փակել երկխոսությունը",
+    "download_completed": "Ներբեռնումն ավարտվեց",
+    "emoji": {
+        "categories": "Բաժիններ",
+        "category_activities": "Գործունեություն",
+        "category_animals_nature": "Կենդանիներ և բնություն",
+        "category_flags": "Դրոշներ",
+        "category_food_drink": "Սնունդ և ըմպելիք",
+        "category_frequently_used": "Հաճախակի օգտագործվող",
+        "category_objects": "Առարկաներ",
+        "category_smileys_people": "Սմայլիկներ և մարդիկ",
+        "category_symbols": "Նշաններ",
+        "category_travel_places": "Ճանապարհորդություն և վայրեր",
+        "quick_reactions": "Արագ արձագանքներ"
+    },
+    "emoji_picker": {
+        "cancel_search_label": "Չեղարկել որոնումը"
+    },
+    "empty_room": "Դատարկ սենյակ",
+    "empty_room_was_name": "Դատարկ սենյակ (նախկինում՝ %(oldName)s)",
+    "encryption": {
+        "access_secret_storage_dialog": {
+            "alternatives": "Եթե ​​ունեք անվտանգության բանալի կամ անվտանգության արտահայտություն, սա նույնպես կաշխատի։",
+            "key_validation_text": {
+                "wrong_security_key": "Ձեր մուտքագրած վերականգնման բանալին սխալ է։"
+            },
+            "privacy_warning": "Համոզվեք, որ ոչ ոք չի կարող տեսնել այս էկրանը։",
+            "restoring": "Բանալիների վերականգնում պահուստային պատճենից",
+            "security_key_label": "Վերականգնման բանալի",
+            "security_key_title": "Վերականգնման բանալի(Recovery key)"
+        },
+        "bootstrap_title": "Բանալիների կարգավորում",
+        "confirm_encryption_setup_body": "Սեղմեք ներքեւի կոճակը՝ գաղտնագրումը հաստատելու համար:",
+        "confirm_encryption_setup_title": "Հաստատել գաղտնագրման կարգավորումը",
+        "cross_signing_room_normal": "Այս սենյակը ծայրից ծայր գաղտնագրված է",
+        "cross_signing_room_verified": "Այս սենյակում բոլորը ստուգված են",
+        "cross_signing_room_warning": "Ինչոր մեկն օգտագործում է անհայտ սեսիա",
+        "cross_signing_user_normal": "Դուք չեք ստուգել այս օգտատիրոջը:",
+        "cross_signing_user_verified": "Դուք ստուգել եք այս օգտատիրոջը։ Այս օգտատերը հաստատել է իր բոլոր սեսիաները։",
+        "cross_signing_user_warning": "Այս օգտատերը չի հաստատել իր բոլոր սեսիաները։",
+        "enter_recovery_key": "Մուտքագրեք վերականգնման բանալին",
+        "event_shield_reason_authenticity_not_guaranteed": "Այս գաղտնագրված հաղորդագրության իսկությունը չի կարող երաշխավորվել այս սարքի վրա։",
+        "event_shield_reason_mismatched_sender": "Միջոցառման ուղարկողը չի համընկնում այն սարքի սեփականատիրոջ հետ, որն այն ուղարկել է։",
+        "event_shield_reason_mismatched_sender_key": "Գաղտնագրված է չստուգված սեսիայի կողմից",
+        "event_shield_reason_unknown_device": "Գաղտնագրված է անհայտ կամ ջնջված սարքով:",
+        "event_shield_reason_unsigned_device": "Գաղտնագրված է սարքի կողմից, որը չի ստուգվել իր սեփականատիրոջ կողմից։",
+        "event_shield_reason_unverified_identity": "Գաղտնագրված է չստուգված օգտվողի կողմից:",
+        "export_unsupported": "Ձեր զննարկիչը չի աջակցում գաղտնագրման պահանջվող ընդարձակումները",
+        "forgot_recovery_key": "Մոռացե՞լ եք վերականգնման բանալին",
+        "import_invalid_keyfile": "Անվավեր %(brand)s բանալի ֆայլ",
+        "import_invalid_passphrase": "Նույնականացման ստուգումը ձախողվեց. սխալ գաղտնաբառ՞",
+        "key_storage_out_of_sync": "Ձեր բանալիների պահեստը համաժամեցված չէ։",
+        "key_storage_out_of_sync_description": "Հաստատեք ձեր վերականգնման բանալին՝ բանալիների պահոցի և հաղորդագրությունների պատմության հասանելիությունը պահպանելու համար։",
+        "messages_not_secure": {
+            "cause_1": "Ձեր սերվերը",
+            "cause_2": "Գլխավոր երվերը, որին միացված է ձեր կողմից հաստատվող օգտատերը",
+            "cause_3": "Ձեր կամ մյուս օգտատերերի ինտերնետային կապը",
+            "cause_4": "Ձեր կամ մյուս օգտատերերի սեսիան",
+            "heading": "Հետևյալներից մեկը կարող է վտանգվել.",
+            "title": "Ձեր հաղորդագրություններն անվտանգ չեն"
+        },
+        "new_recovery_method_detected": {
+            "description_1": "Հայտնաբերվել են անվտանգ հաղորդագրությունների նոր անվտանգության արտահայտություն և բանալի։",
+            "description_2": "Այս սեսիան գաղտնագրում է պատմությունը՝ օգտագործելով վերականգնման նոր մեթոդը։",
+            "title": "Նոր վերականգնման մեթոդ",
+            "warning": "Եթե վերականգնման նոր մեթոդը չեք սահմանել, հարձակվողը կարող է փորձել մուտք գործել ձեր հաշիվ: Անմիջապես փոխեք ձեր հաշվի գաղտնաբառը և կարգավորեք նոր վերականգնման մեթոդը Կարգավորումներում:"
+        },
+        "pinned_identity_changed": "%(displayName)s-ի (<b>%(userId)s</b> ) ինքնությունը վերակայվել է։ <a> Իմանալ ավելին</a>",
+        "pinned_identity_changed_no_displayname": "<b>%(userId)s</b>-ի ինքնությունը վերակայվել է։ <a> Իմանալ ավելին</a>",
+        "recovery_method_removed": {
+            "description_1": "Այս սեսիան հայտնաբերել է, որ ձեր անվտանգության արտահայտությունը և անվտանգ հաղորդագրությունների բանալին հեռացված են եղել։",
+            "description_2": "Եթե ​​սա պատահաբար եք արել, կարող եք այս սեսիայի համար կարգավորել անվտանգ հաղորդագրություններ, որոնք կվերագաղտնագրեն այս սեսիայի հաղորդագրությունների պատմությունը նոր վերականգնման մեթոդով։",
+            "title": "Վերականգնման մեթոդը հեռացված է",
+            "warning": "Եթե դուք չեք հեռացրել վերականգնման մեթոդը, հարձակվողը կարող է փորձել մուտք գործել ձեր հաշիվ: Անմիջապես փոխեք ձեր հաշվի գաղտնաբառը եւ կարգավորեք նոր վերականգնման մեթոդ Կարգավորումներում:"
+        },
+        "set_up_recovery": "Կարգավորել վերականգնումը",
+        "set_up_recovery_toast_description": "Ստեղծեք վերականգնման բանալի, որը կարող է օգտագործվել ձեր գաղտնագրված հաղորդագրությունների պատմությունը վերականգնելու համար` ձեր սարքերի կորուստի դեպքում։",
+        "set_up_toast_title": "Կարգավորել անվտանգ պահուստավորում",
+        "setup_secure_backup": {
+            "explainer": "Պահուստավորեք ձեր բանալիները նախքան դուրս գալը, որպեսզի չկորցնեք դրանք:"
+        },
+        "turn_on_key_storage": "Միացնել բանալիների պահեստը",
+        "turn_on_key_storage_description": "Ապահով կերպով պահեք ձեր գաղտնագրական ինքնությունը և հաղորդագրությունների բանալիները սերվերի վրա: Սա թույլ կտա ձեզ դիտել ձեր հաղորդագրությունների պատմությունը ցանկացած նոր սարքի վրա:",
+        "udd": {
+            "interactive_verification_button": "Ինտերակտիվորեն ստուգել էմոջիի միջոցով",
+            "other_ask_verify_text": "Խնդրեք այս օգտատիրոջը ստուգել իր սեսիան կամ ձեռքով ստուգեք այն ստորև։",
+            "other_new_session_text": "%(name)s(%(userId)s )֊ը մուտք է գործել նոր սեսիա՝ առանց այն հաստատելու։",
+            "own_ask_verify_text": "Հաստատեք ձեր մյուս սեսիան՝ օգտագործելով ստորև նշված տարբերակներից մեկը։",
+            "own_new_session_text": "Դուք մուտք եք գործել նոր սեսիա՝ առանց այն ստուգելու։",
+            "title": "Անվստահելի է"
+        },
+        "unable_to_setup_keys_error": "Հնարավոր չէ կարգավորել բանալիները",
+        "verification": {
+            "accepting": "Ընդունվում է…",
+            "after_new_login": {
+                "device_verified": "Սարքը ստուգված է",
+                "skip_verification": "Առայժմ բաց թողնել ստուգումը",
+                "verify_this_device": "Ստուգել այս սարքը"
+            },
+            "cancelling": "Չեղարկվում է…",
+            "complete_action": "Հասկացա",
+            "complete_description": "Դուք հաջողությամբ ստուգել եք այս օգտվողին:",
+            "complete_title": "Ստուգված է!",
+            "error_starting_description": "Մեզ չհաջողվեց սկսել զրույցը մյուս օգտատիրոջ հետ։",
+            "error_starting_title": "Սխալ՝ ստուգումը սկսելիս",
+            "explainer": "Այս օգտատիրոջ հետ անվտանգ հաղորդագրությունները ծայրից ծայր գաղտնագրված են և չեն կարող կարդացվել երրորդ կողմերի կողմից։",
+            "in_person": "Անվտանգ լինելու համար սա արեք անձամբ կամ օգտագործեք հաղորդակցման վստահելի միջոց։",
+            "incoming_sas_device_dialog_text_1": "Ստուգեք այս սարքը՝ այն որպես վստահելի նշելու համար: Այս սարքին վստահելը ձեզ և մյուս օգտատերերին լրացուցիչ մտքի խաղաղություն է տալիս ծայրից ծայր գաղտնագրված հաղորդագրություններ օգտագործելիս։",
+            "incoming_sas_device_dialog_text_2": "Այս սարքը ստուգելը կնշի այն որպես վստահելի, և օգտատերերը, ովքեր ստուգել են ձեզ հետ, կվստահեն այս սարքին:",
+            "incoming_sas_dialog_title": "Մուտքային ստուգման հարցում",
+            "incoming_sas_dialog_waiting": "Սպասում ենք զուգընկերոջ հաստատմանը…",
+            "incoming_sas_user_dialog_text_1": "Ստուգեք այս օգտատիրոջը՝ նրան որպես վստահելի նշելու համար: Օգտատերերին վստահելը ձեզ լրացուցիչ հանգստություն է տալիս ծայրից ծայր գաղտնագրված հաղորդագրություններ օգտագործելիս։",
+            "incoming_sas_user_dialog_text_2": "Այս օգտատիրոջ ստուգումը կնշի նրա սեսիան որպես վստահելի, ինչպես նաև կնշի ձեր սեսիան որպես վստահելի նրանց համար։",
+            "manual": {
+                "already_verified": "Այս սարքն արդեն ստուգված է",
+                "already_verified_and_wrong_fingerprint": "Տրված մատնահետքը չի համապատասխանում, բայց սարքը արդեն հաստատված է։",
+                "device_id": "Սարքի ID",
+                "failure_description": "Չհաջողվեց ստուգել '%(deviceId)s' սարքը․ %(error)s",
+                "failure_title": "Հաստատումը ձախողվեց",
+                "fingerprint": "Մատնահետք (սեսիայի բանալի)",
+                "no_crypto": "Չհաջողվեց ստուգել սարքը․ գաղտնագրումը միացված չէ",
+                "no_device": "Չհաջողվեց ստուգել սարքը․ '%(deviceId)s' սարքը չի գտնվել",
+                "no_userid": "Հնարավոր չէ հաստատել սարքը․ մեր օգտատիրոջ ID-ն չի գտնվել",
+                "success_description": "Սարքը (%(deviceId)s) այժմ խաչաձև ստորագրված է",
+                "success_title": "Հաստատումը հաջողվեց",
+                "text": "Մուտքագրեք ձեր սարքերից մեկի ID-ն և մատնահետքը՝ այն ստուգելու համար։ ՆԿԱՏԻ ՈՒՆԵՑԵՔ, որ սա թույլ է տալիս մյուս սարքին ուղարկել և ստանալ հաղորդագրություններ ձեր անունից։ ԵԹԵ ՈՐԵՎԷ ՄԵԿԸ ՁԵԶ ԱՍԵԼ/ԽՆԴՐԵԼ Է ԱՅՍՏԵՂ ԻՆՉ-ՈՐ ԲԱՆ ՏԵՂԱԴՐԵԼ, ՀԱՎԱՆԱԿԱՆ Է, ՈՐ ՁԵԶ ԽԱԲԵՈՒՄ ԵՆ:",
+                "wrong_fingerprint": "Հնարավոր չէ հաստատել «%(deviceId)s» սարքը․ տրված մատնահետքը (%(fingerprint)s) տարբեր է սարքի մատնահետքից՝ «%(fprint)s»"
+            },
+            "no_support_qr_emoji": "Սարքը, որը դուք փորձում եք ստուգել, չի աջակցում QR կոդի կամ էմոջիի ստուգման սկանավորումը, ինչը %(brand)s-ն աջակցում է: Փորձեք մեկ այլ հաճախորդի/ծրագրի հետ:",
+            "other_party_cancelled": "Մյուս կողմը չեղարկել է ստուգումը:",
+            "prompt_encrypted": "Ստուգել սենյակում գտնվող բոլոր օգտատերերին՝ համոզվելու համար, որ այն անվտանգ է։",
+            "prompt_unencrypted": "Գաղտնագրված սենյակներում ստուգել բոլոր օգտատերերին՝ համոզվելու համար, որ այն անվտանգ է:։",
+            "qr_or_sas": "%(qrCode)s կամ %(emojiCompare)s",
+            "qr_prompt": "Սկանավորեք այս եզակի կոդը",
+            "qr_reciprocate_same_shield_user": "Գրեթե պատրաստ է։%(displayName)s-ը նույն էկրանն է ցուցադրում՞",
+            "request_toast_accept_user": "Հաստատել օգտատիրոջը",
+            "request_toast_decline_counter": "Անտեսել (%(counter)s)",
+            "request_toast_detail": "%(deviceId)s %(ip)s-ից",
+            "sas_caption_self": "Ստուգեք այս սարքը՝ հաստատելով, որ հետևյալ համարը երևում է դրա էկրանին։",
+            "sas_caption_user": "Ստուգեք այս օգտատիրոջը՝ հաստատելով, որ հետևյալ համարը երևում է նրա էկրանին։",
+            "sas_description": "Համեմատեք էմոջիների եզակի հավաքածու, եթե որևէ սարքի վրա տեսախցիկ չունեք",
+            "sas_emoji_caption_user": "Ստուգեք այս օգտատիրոջը՝ հաստատելով, որ հետևյալ էմոջիները հայտնվեն նրա էկրանին։",
+            "sas_match": "Նրանք համապատասխանում են",
+            "sas_no_match": "Նրանք չեն համապատասխանում",
+            "sas_prompt": "Համեմատեք եզակի էմոջիները",
+            "scan_qr": "Ստուգել սկանավորմամբ",
+            "scan_qr_explainer": "Հարցրեք %(displayName)s-ին սկանավորել ձեր կոդը.",
+            "start_button": "Սկսել ստուգումը",
+            "successful_user": "Դուք հաջողությամբ հաստատել եք %(displayName)s !",
+            "unsupported_method": "Հնարավոր չէ գտնել աջակցվող ստուգման մեթոդ։",
+            "unverified_session_toast_accept": "Այո, ես էի",
+            "unverified_session_toast_title": "Նոր մուտք։ Դուք էիք՞",
+            "unverified_sessions_toast_description": "Վերանայեք՝ համոզվելու համար, որ ձեր հաշիվը անվտանգ է",
+            "unverified_sessions_toast_reject": "Ավելի ուշ",
+            "unverified_sessions_toast_title": "Դուք ունեք չհաստատված սեսիաներ",
+            "verification_dialog_title_device": "Ստուգել այլ սարքը",
+            "verification_dialog_title_user": "Ստուգման հարցում",
+            "verification_skip_warning": "Առանց ստուգման, դուք չեք ունենա ձեր բոլոր հաղորդագրություններին հասանելիություն և կարող եք ուրիշներին անվստահելի թվալ։",
+            "verification_success_with_backup": "Ձեր նոր սարքն այժմ ստուգված է։ Այն հասանելիություն ունի ձեր գաղտնագրված հաղորդագրություններին, և մյուս օգտատերերն այն կտեսնեն որպես վստահելի։",
+            "verification_success_without_backup": "Ձեր նոր սարքն այժմ ստուգված է։ Մյուս օգտատերերը այն կտեսնեն որպես վստահելի։",
+            "verify_emoji": "Ստուգել էմոջիի միջոցով",
+            "verify_emoji_prompt": "Ստուգեք՝ համեմատելով եզակի էմոջիները։",
+            "verify_emoji_prompt_qr": "Եթե չեք կարողանում սկանավորել վերևում նշված կոդը, ստուգեք՝ համեմատելով եզակի էմոջիները։",
+            "verify_later": "Ես ավելի ուշ կստուգեմ",
+            "waiting_for_user_accept": "Սպասում ենք %(displayName)s-ին ընդունելու համար...",
+            "waiting_other_device": "Սպասում ենք ձեր մյուս սարքի վրա հաստատմանը…",
+            "waiting_other_device_details": "Սպասում ենք ձեր մյուս սարքի վրա հաստատմանը, %(deviceName)s (%(deviceId)s )…",
+            "waiting_other_user": "Սպասում ենք %(displayName)s-ին ստուգելու համար..."
+        },
+        "verification_requested_toast_title": "Ստուգումը պահանջվել է",
+        "verified_identity_changed": "%(displayName)s-ի (<b>%(userId)s</b>) ինքնությունը վերակայվել է։ <a>Իմանալ ավելին</a>",
+        "verified_identity_changed_no_displayname": "<b>%(userId)s</b>-ի ինքնությունը վերակայվել է։ <a>Իմանալ ավելին</a>",
+        "verify_toast_description": "Մյուս օգտատերերը կարող են չվստահել դրան",
+        "verify_toast_title": "Ստուգել այս սեսիան",
+        "withdraw_verification_action": "Հետ կանչել հաստատումը"
+    },
+    "error": {
+        "admin_contact": "Տվյալ ծառայությունն օգտագործելու համար խնդրում ենք <a> կապվեք ձեր ծառայության ադմինիստրատորի հետ</a>։",
+        "admin_contact_short": "Կապվեք ձեր <a>սերվերի ադմինիստրատորի հետ</a>։",
+        "app_launch_unexpected_error": "Հավելվածի նախապատրաստման ժամանակ անսպասելի սխալ առաջացավ։ Մանրամասների համար դիտեք կոնսոլը։",
+        "cannot_load_config": "Անհնար է բեռնել կարգավորման ֆայլը։ Խնդրում ենք թարմացնել էջը՝ կրկին փորձելու համար։",
+        "connection": "Սերվերի հետ կապ հաստատելու խնդիր առաջացավ, խնդրում ենք կրկին փորձել ավելի ուշ։",
+        "dialog_description_default": "Սխալ է տեղի ունեցել։",
+        "download_media": "Աղբյուրի մեդիան ներբեռնելը չհաջողվեց, աղբյուրի URL-ը չի գտնվել",
+        "edit_history_unsupported": "Ձեր սերվերը, կարծես թե, չի աջակցում այս գործառույթը։",
+        "failed_copy": "Չհաջողվեց պատճենել",
+        "hs_blocked": "Այս սերվերը արգելափակվել է իր ադմինիստրատորի կողմից։",
+        "invalid_configuration_mixed_server": "Անվավեր կարգավորում. default_hs_url-ը չի կարող նշվել default_server_name-ի կամ default_server_config-ի հետ միասին։",
+        "invalid_configuration_no_server": "Անվավեր կարգավորում. լռելյայն սերվեր նշված չէ։",
+        "invalid_json": "Ձեր Element կոնֆիգուրացիան պարունակում է անվավեր JSON ֆայլ։ Խնդրում ենք շտկել խնդիրը և վերաբեռնել էջը։",
+        "invalid_json_detail": "Վերլուծիչի հաղորդագրությունը հետևյալն է.%(message)s",
+        "invalid_json_generic": "Անվավեր JSON",
+        "mau": "Այս սերվերը հասել է իր ամսական ակտիվ օգտատերերի սահմանաչափին։",
+        "misconfigured": "Ձեր Element-ը սխալ է կարգավորված",
+        "mixed_content": "Հնարավոր չէ միանալ գլխավոր սերվերին HTTP-ի միջոցով, երբ ձեր զննարկիչի URL-վահանակում HTTPS-ով URL կա: Կամ օգտագործեք HTTPS, կամ <a>միացրեք անվտանգ չլինող սկրիպտները</a>:",
+        "non_urgent_echo_failure_toast": "Ձեր սերվերը չի արձագանքում որոշ <a>հարցումներներին</a>։",
+        "resource_limits": "Այս սերվերը գերազանցել է իր ռեսուրսների սահմանաչափերից մեկը։",
+        "session_restore": {
+            "clear_storage_button": "Մաքրել պահեստը և դուրս գալ",
+            "clear_storage_description": "Դու՞րս գալ և հեռացնե՞լ գաղտնագրման բանալիները",
+            "description_1": "Ձեր նախորդ սեսիան վերականգնելու փորձի ժամանակ սխալ առաջացավ։",
+            "description_2": "Եթե նախկինում օգտագործել եք %(brand)s-ի ավելի նոր տարբերակ, ձեր սեսիան կարող է անհամատեղելի լինել այս տարբերակի հետ։ Փակեք այս պատուհանը և վերադարձեք ավելի նոր տարբերակին։",
+            "description_3": "Ձեր զննարկիչի պահեստը մաքրելը կարող է լուծել խնդիրը, բայց դա ձեզ ավտոմատ կերպով դուրս կհանի հաշվից, և գաղտնագրված զրույցի պատմությունը կդառնա անընթեռնելի։",
+            "title": "Անհնար է վերականգնել սեսիան"
+        },
+        "something_went_wrong": "Ինչոր բան սխալ գնաց։",
+        "storage_evicted_description_1": "Սեսիայի որոշ տվյալներ, այդ թվում՝ գաղտնագրված հաղորդագրության բանալիները, բացակայում են: Դա շտկելու համար դուրս եկեք և մուտք գործեք հաշիվ՝ բանալիները վերականգնելով պահուստային պատճենից:",
+        "storage_evicted_description_2": "Ձեր զննարկիչը, հավանաբար, հեռացրել է այս տվյալները, երբ հանդիպել է սկավառակի տարածքի սուղության։",
+        "storage_evicted_title": "Սեսիայի տվյալները բացակայում են",
+        "sync": "Հնարավոր չէ միանալ Homeserver-ին։ Կրկին փորձում ենք…",
+        "tls": "Հնարավոր չէ միանալ սերվերին. խնդրում ենք ստուգել ձեր կապը, համոզվել, որ ձեր <a>սերվերի SSL վկայականը</a> վստահելի է, և որ զննարկիչի որևէ ընդլայնում չի արգելափակում հարցումները։",
+        "unknown": "Անհայտ սխալ",
+        "unknown_error_code": "սխալի անհայտ կոդ",
+        "update_power_level": "Չհաջողվեց փոխել հզորության մակարդակը"
+    },
+    "error_app_open_in_another_tab": "%(brand)s-ին միանալու համար անցեք մյուս ներդիրին։ Այս ներդիրը այժմ կարող է փակվել։",
+    "error_app_open_in_another_tab_title": "%(brand)s-ը միացված է մեկ այլ ներդիրում",
+    "error_app_opened_in_another_window": "%(brand)s-ը բաց է մեկ այլ պատուհանում: Սեղմեք «%(label)s»՝ %(brand)s-ը այստեղ օգտագործելու և մյուս պատուհանը անջատելու համար:",
+    "error_database_closed_description": {
+        "for_desktop": "Ձեր սկավառակը կարող է լիքը լինել։ Խնդրում ենք ազատել որոշակի հատված և վերաբեռնել։",
+        "for_web": "IԵթե մաքրել եք դիտարկման տվյալները, ապա այս հաղորդագրությունը սպասելի է։ %(brand)s-ը կարող է բաց լինել նաև մեկ այլ ներդիրում, կամ ձեր սկավառակը լիքն է։ Խնդրում ենք ազատել որոշ տարածք և վերաբեռնել այն։"
+    },
+    "error_database_closed_title": "%(brand)s-ը դադարել է աշխատել",
+    "error_dialog": {
+        "copy_room_link_failed": {
+            "description": "Հնարավոր չէ պատճենել սենյակի հղումը պահեստային հիշողությունում(clipboard):",
+            "title": "Հնարավոր չէ պատճենել սենյակի հղումը"
+        },
+        "error_loading_user_profile": "Հնարավոր չէ բեռնել օգտատիրոջ պրոֆիլը",
+        "forget_room_failed": "Չհաջողվեց մոռանալ %(errCode)s սենյակը"
+    },
+    "error_user_not_logged_in": "Օգտատերը մուտք չի գործել",
+    "event_preview": {
+        "m.call.answer": {
+            "dm": "Զանգն ընթացքի մեջ է",
+            "user": "%(senderName)s-ը միացավ զանգին",
+            "you": "Դուք միացել եք զանգին"
+        },
+        "m.call.hangup": {
+            "user": "%(senderName)s-ն ավարտեց զանգը",
+            "you": "Դուք ավարտեցիք զանգը"
+        },
+        "m.call.invite": {
+            "dm_receive": "%(senderName)s-ը զանգահարում է",
+            "dm_send": "Պատասխանի սպասում",
+            "user": "%(senderName)s-ն սկսել է զանգ",
+            "you": "Դուք զանգ եք սկսել"
+        },
+        "m.emote": "* %(senderName)s %(emote)s",
+        "m.reaction": {
+            "user": "%(sender)s-ն արձագանքել է %(reaction)s-ով %(message)s հաղորդագրությանը",
+            "you": "Դուք արձագանքել եք %(reaction)s-ով %(message)s հաղորդագրությանը"
+        },
+        "m.sticker": "%(senderName)s․ %(stickerName)s",
+        "m.text": "%(senderName)s․ %(message)s",
+        "prefix": {
+            "audio": "Աուդիո",
+            "file": "Ֆայլ",
+            "image": "Պատկեր",
+            "poll": "Հարցում.",
+            "video": "Տեսանյութ"
+        },
+        "preview": "<bold>%(prefix)s:</bold> %(preview)s"
+    },
+    "export_chat": {
+        "cancelled": "Արտահանումը չեղարկվել է",
+        "cancelled_detail": "Արտահանումը հաջողությամբ չեղարկվեց",
+        "confirm_stop": "Համոզվա՞ծ եք, որ ցանկանում եք դադարեցնել ձեր տվյալների արտահանումը: Եթե դա անեք, կարիք կլնի սկսել նորից:",
+        "creating_html": "HTML- ի ստեղծում...",
+        "creating_output": "Արդյունքի ստեղծում...",
+        "creator_summary": "%(creatorName)s-ը ստեղծել է այս սենյակը:",
+        "current_timeline": "Ընթացիկ ժամանակացույց",
+        "enter_number_between_min_max": "Մուտքագրեք թիվ %(min)s-ի և %(max)s-ի միջև",
+        "error_fetching_file": "Սխալ՝ ֆայլը բեռնելիս",
+        "export_info": "Սա <roomName/>-ի արտահանման սկիզբն է։ Արտահանվել է <exporterDetails/>-ի կողմից %(exportDate)s-ին.",
+        "export_successful": "Արտահանումը հաջողվեց։",
+        "exported_n_events_in_time": {
+            "one": "Արտահանվել է %(count)s իրադարձություն %(seconds)s վայրկյանում",
+            "other": "Արտահանվել է %(count)s իրադարձություն %(seconds)s վայրկյանում"
+        },
+        "exporting_your_data": "Ձեր տվյալների արտահանում",
+        "fetched_n_events": {
+            "one": "Մինչ այժմ ստացվել է %(count)s իրադարձություն",
+            "other": "Մինչ այժմ ստացվել են %(count)s իրադարձություններ"
+        },
+        "fetched_n_events_in_time": {
+            "one": "%(count)s իրադարձությունը ստացվել է %(seconds)s վայրկյանում",
+            "other": "%(count)s իրադարձությունները ստացվել են %(seconds)s վայրկյանում"
+        },
+        "fetched_n_events_with_total": {
+            "one": "Բերվել է %(count)s իրադարձություն %(total)s-ից",
+            "other": "Բերվել է %(count)s իրադարձություն %(total)s-ից"
+        },
+        "fetching_events": "Իրադարձությունների բեռնում...",
+        "file_attached": "Ֆայլը կցված է",
+        "format": "Ձևաչափ",
+        "from_the_beginning": "Սկզբից",
+        "generating_zip": "ZIP- ի ստեղծում",
+        "html": "HTML",
+        "html_title": "Արտահանված տվյալներ",
+        "include_attachments": "Ներառել հավելվածներ(կից ֆայլեր)",
+        "json": "JSON",
+        "media_omitted": "Մեդիան բաց է թողնված",
+        "media_omitted_file_size": "Մեդիան բաց է թողնվել․ ֆայլի ծավալի սահմանաչափը գերազանցվել է",
+        "messages": "Հաղորդագրություններ",
+        "next_page": "Հաղորդագրությունների հաջորդ խումբը",
+        "num_messages": "Հաղորդագրությունների քանակը",
+        "num_messages_min_max": "Հաղորդագրությունների քանակը կարող է լինել միայն %(min)s-ի և %(max)s-ի միջև",
+        "number_of_messages": "Նշեք հաղորդագրությունների քանակը",
+        "previous_page": "Հաղորդագրությունների նախորդ խումբը",
+        "processing": "Մշակվում է…",
+        "processing_event_n": "%(total)s-ից %(number)s իրադարձությունների մշակում",
+        "select_option": "Ընտրեք ստորև բերված տարբերակներից ՝ զրույցները ձեր ժամանակացույցից արտահանելու համար",
+        "size_limit": "Չափի սահմանափակում",
+        "size_limit_min_max": "Չափը կարող է լինել միայն %(min)s ՄԲ-ի և %(max)s ՄԲ-ի միջև",
+        "size_limit_postfix": "ՄԲ",
+        "starting_export": "Արտահանումը սկսվում է…",
+        "successful": "Արտահանումը հաջողվեց",
+        "successful_detail": "Ձեր արտահանումը հաջողվեց: Այն կարող եք գտնել ձեր Ներբեռնումների թղթապանակում:",
+        "text": "Պարզ տեքստ",
+        "title": "Արտահանել զրույց",
+        "topic": "Թեմա․ %(topic)s",
+        "unload_confirm": "Իրո՞ք ցանկանում եք դուրս գալ արտահանման ընթացքում:"
+    },
+    "failed_load_async_component": "Անհնար է բեռնել։ Ստուգեք ձեր ցանցային կապը և փորձեք կրկին։",
+    "feedback": {
+        "can_contact_label": "Լրացուցիչ հարցերի դեպքում կարող եք կապվել ինձ հետ",
+        "comment_label": "Մեկնաբանություն",
+        "existing_issue_link": "Խնդրում ենք նախ վերանայել <existingIssuesLink>GitHub-ում առկա սխալները</existingIssuesLink>: Համընկնում չկա՞: <newIssueLink>Սկսեք նորը</newIssueLink>:",
+        "may_contact_label": "Կարող եք կապվել ինձ հետ, եթե ցանկանում եք հետևել նորություններին կամ թույլ տալ ինձ փորձարկել առաջիկա գաղափարները։",
+        "platform_username": "Ձեր հարթակը և օգտատիրոջ անունը կհիշատակվեն, որպեսզի մենք կարողանանք հնարավորինս շատ օգտագործել ձեր կարծիքը։",
+        "pro_type": "ՄԱՍՆԱԳԵՏԻ ՀՈՐԴՈՐ. Եթե սխալ եք հայտնաբերել, խնդրում ենք ներկայացնել <debugLogsLink>վրիպազերծման գրանցամատյաններ(debug logs)</debugLogsLink>, որպեսզի մենք կարողանանք գտնել խնդիրը։",
+        "send_feedback_action": "Ուղարկել արձագանք(կարծիք հայտնել)",
+        "sent": "Կարծիքն ուղարկված է։ Շնորհակալություն, մենք գնահատում ենք այն։"
+    },
+    "file_panel": {
+        "empty_description": "Կցեք ֆայլերը զրույցից կամ պարզապես քաշեք և գցեք դրանք սենյակի ցանկացած վայրում։",
+        "empty_heading": "Այս սենյակում տեսանելի ֆայլեր չկան",
+        "guest_note": "Դուք պետք է <a>գրանցվեք</a>՝ այս գործառույթն/ֆունկցիոնալությունն օգտագործելու համար",
+        "peek_note": "Դուք պետք է միանաք այս սենյակին՝ դրա ֆայլերը դիտելու համար"
+    },
+    "forward": {
+        "filter_placeholder": "Որոնել սենյակներ կամ մարդկանց",
+        "message_preview_heading": "Հաղորդագրության նախադիտում",
+        "no_perms_title": "Դուք դա անելու թույլտվություն չունեք",
+        "open_room": "Բաց սենյակ",
+        "send_label": "Ուղարկել",
+        "sending": "Ուղարկվում է",
+        "sent": "Ուղարկված է"
+    },
+    "identity_server": {
+        "change": "Փոխել նույնականացման սերվերը",
+        "change_prompt": "Անջատվե՞լ <current /> նույնականացման սերվերից և փոխարենը միանալ <new />-ին։",
+        "change_server_prompt": "Եթե ​​չեք ցանկանում օգտագործել <server />-ը՝ ձեր ծանոթ առկա կոնտակտները հայտնաբերելու և նրանց կողմից հայտնաբերելի լինելու համար, ստորև մուտքագրեք մեկ այլ նույնականացման սերվեր։",
+        "changed": "Ձեր նույնականացման սերվերը փոխվել է",
+        "checking": "Սերվերի ստուգում",
+        "description_connected": "Դուք ներկայումս օգտագործում եք <server></server>-ը՝ ձեր ծանոթ առկա կոնտակտները հայտնաբերելու և նրանց կողմից հայտնաբերելի լինելու համար: Կարող եք փոխել ձեր նույնականացման սերվերը ստորև:",
+        "description_disconnected": "Դուք ներկայումս չեք օգտագործում նույնականացման սերվեր։ Ձեր ծանոթ առկա կոնտակտները հայտնաբերելու և նրանց կողմից հայտնաբերելի լինելու համար ավելացրեք մեկը ստորև։",
+        "description_optional": "Նույնականացման սերվերի օգտագործումը պարտադիր չէ: Եթե որոշեք չօգտագործել նույնականացման սերվեր, ձեզ չեն հայտնաբերի այլ օգտատերերը և չեք կարողանա հրավիրել ուրիշներին էլ. փոստով կամ հեռախոսով:",
+        "disconnect": "Անջատել նույնականացման սերվերը",
+        "disconnect_anyway": "Ամեն դեպքում անջատել",
+        "disconnect_offline_warning": "Դուք պետք է <b>հեռացնեք ձեր անձնական տվյալները</b> <idserver /> նույնականացման սերվերից՝ անջատվելուց առաջ։ Ցավոք, <idserver /> նույնականացման սերվերը ներկայումս անջատված է կամ անհասանելի է։",
+        "disconnect_personal_data_warning_1": "Դուք դեռևս <b>կիսվում եք ձեր անձնական տվյալներով</b> <idserver /> նույնականացման սերվերում",
+        "disconnect_personal_data_warning_2": "Խորհուրդ ենք տալիս անջատվելուց առաջ հեռացնել ձեր էլեկտրոնային փոստի հասցեները և հեռախոսահամարները նույնականացման սերվերից։",
+        "disconnect_server": "Անջատվե՞լ <idserver /> նույնականացման սերվերից:",
+        "disconnect_warning": "Ձեր նույնականացման սերվերից անջատվելը նշանակում է, որ դուք տեսանելի չեք լինի այլ օգտատերերի համար, և դուք չեք կարողանա հրավիրել ուրիշներին էլ.փոստով կամ հեռախոսահամարով։",
+        "do_not_use": "Չօգտագործել նույնականացման սերվեր",
+        "error_connection": "Չկարողացավ միանալ նույնականացման սերվերին",
+        "error_invalid": "Անվավեր նույնականացման սերվեր (կարգավիճակի կոդ՝ %(code)s)",
+        "error_invalid_or_terms": "Օգտագործման պայմանները չեն ընդունվել, կամ նույնականացման սերվերը անվավեր է։",
+        "no_terms": "Ձեր ընտրած նույնականացման սերվերը չունի որևէ ծառայության մատուցման պայմաններ։",
+        "suggestions": "Դուք պետք է.",
+        "suggestions_1": "ստուգեք ձեր զննարկիչի հավելվածները՝ նույնականացման սերվերը արգելափակող որևէ բանի համար (օրինակ՝ Privacy Badger-ը):",
+        "suggestions_2": "կապվեք <idserver /> նույնականացման սերվերի ադմինիստրատորների հետ",
+        "suggestions_3": "սպասեք և փորձեք կրկին՝ ավելի ուշ",
+        "url": "Նույնականացման սերվեր (%(server)s)",
+        "url_field_label": "Մուտքագրել նոր նույնականացման սերվեր",
+        "url_not_https": "Նույնականացման սերվերի URL-ը պետք է լինի HTTPS-ով"
+    },
+    "in_space": "%(spaceName)s տարածքում",
+    "in_space1_and_space2": "%(space1Name)s և %(space2Name)s տարածքներում",
+    "in_space_and_n_other_spaces": {
+        "one": "%(spaceName)s-ում և մեկ այլ տարածքում:",
+        "other": "%(spaceName)s-ում և %(count)s այլ տարածքններում:"
+    },
+    "incompatible_browser": {
+        "continue": "Այնուամենայնիվ շարունակել",
+        "description": "%(brand)sօգտագործում է զննարկիչի որոշ գործառույթներ, որոնք հասանելի չեն ձեր ներկայիս զննարկիչում։%(detail)s",
+        "detail_can_continue": "Եթե շարունակեք, որոշ ֆունկցիաներ կարող են դադարեցնել աշխատանքը, և գոյություն ունի տվյալների կորուստի ռիսկ։",
+        "detail_no_continue": "Փորձեք թարմացնել այս զննարկիչը, եթե չեք օգտագործում վերջին տարբերակը, և փորձեք կրկին։",
+        "learn_more": "Իմանալ ավելին",
+        "linux": "Լինուքս",
+        "macos": "Մակ",
+        "supported_browsers": "Լավագույն փորձի համար օգտագործեք <Chrome>Chrome</Chrome>, <Firefox>Firefox</Firefox>, <Edge>Edge</Edge>, կամ <Safari>Safari</Safari>։",
+        "title": "%(brand)s-ն չի աջակցում այս զննարկչին",
+        "use_desktop_heading": "Օգտագործեք %(brand)s Desktop-ը դրա փոխարեն",
+        "use_mobile_heading": "Այլընտրանքորեն օգտագործեք %(brand)s բջջայինում",
+        "use_mobile_heading_after_desktop": "Կամ օգտագործեք մեր բջջային հավելվածը",
+        "windows_64bit": "Windows (64-bit)",
+        "windows_arm_64bit": "Windows (ARM 64-bit)"
+    },
+    "info_tooltip_title": "Տեղեկություն",
+    "integration_manager": {
+        "connecting": "Միացում ինտեգրման կառավարչին...",
+        "error_connecting": "Ինտեգրացիայի մենեջերը անջատված է կամ չի կարող միանալ ձեր գլխավոր սերվերին։",
+        "error_connecting_heading": "Հնարավոր չէ միանալ ինտեգրման կառավարչին",
+        "explainer": "Ինտեգրացիայի կառավարիչները ստանում են կարգավորման տվյալներ և կարող են փոփոխել վիջեթները, ուղարկել սենյակների հրավերներ և ձեր անունից սահմանել հզորության մակարդակները։",
+        "manage_title": "Կառավարել ինտեգրումները",
+        "toggle_label": "Ակտիվացնել ինտեգրացիաների կառավարչի գործառույթը",
+        "use_im": "Օգտագործեք ինտեգրման մենեջեր՝ բոտերը, վիջեթները և ստիկերների փաթեթները կառավարելու համար։",
+        "use_im_default": "Օգտագործեք ինտեգրման կառավարիչ <b>(%(serverName)s)</b>՝ բոտերը, վիջեթները և ստիկերների փաթեթները կառավարելու համար։"
+    },
+    "integrations": {
+        "disabled_dialog_description": "Դա անելու համար կարգավորումներում միացրեք '%(manageIntegrations)s'-ը։",
+        "disabled_dialog_title": "Ինտեգրումներն անջատված են",
+        "impossible_dialog_description": "Ձեր %(brand)s-ը թույլ չի տալիս օգտագործել ինտեգրման մենեջեր սա անելու համար։ Խնդրում ենք կապվել ադմինիստրատորի հետ։",
+        "impossible_dialog_title": "Ինտեգրումները թույլատրված չեն"
+    },
+    "invite": {
+        "ask_anyway_description": "Անհնար է գտնել ստորեւ թվարկված Matrix ID-ների պրոֆիլները: Ցանկանո՞ւմ եք ամեն դեպքում սկսել անձնական հաղորդագրությունը։",
+        "ask_anyway_label": "Ամեն դեպքում սկսել անձնական հաղորդագրությունը",
+        "ask_anyway_never_warn_label": "Ամեն դեպքում սկսել անձնական հաղորդագրություններ ուղարկել և այլևս երբեք մի զգուշացրեք ինձ",
+        "email_caption": "Հրավիրել էլ.փոստով",
+        "email_limit_one": "Էլ.փոստով հրավերները կարող են ուղարկվել միայն մեկ առ մեկ",
+        "email_use_default_is": "Օգտագործեք նույնականացման սերվեր՝ էլ. փոստով հրավիրելու համար։<default> Օգտագործեք լռելյայնը (%(defaultIdentityServerName)s )</default> կամ կառավարել<settings> Կարգավորումներում</settings> .",
+        "email_use_is": "Օգտագործեք նույնականացման սերվեր՝ էլ. փոստով հրավիրելու համար: Կառավարեք<settings> Կարգավորումներում</settings> .",
+        "error_already_invited_room": "Օգտատերը արդեն հրավիրված է սենյակ",
+        "error_already_invited_space": "Օգտատերը արդեն հրավիրված է տարածք",
+        "error_already_joined_room": "Օգտատերը արդեն սենյակում է",
+        "error_already_joined_space": "Օգտատերը արդեն տարածքում է",
+        "error_bad_state": "Օգտատերը պետք է հանվի արգելափակումից, նախքան նրան հրավիրելը:",
+        "error_dm": "Մեզ չհաջողվեց ստեղծել ձեր անձնական հաղորդագրությունը։",
+        "error_find_room": "Օգտատերերին հրավիրելիս ինչ-որ սխալ է տեղի ունեցել։",
+        "error_find_user_description": "Հետևյալ օգտատերերը կարող են գոյություն չունենալ կամ անվավեր լինել, և չեն կարող հրավիրվել։ %(csvNames)s",
+        "error_find_user_title": "Հետևյալ օգտատերերին չհաջողվեց գտնել",
+        "error_invite": "Մենք չկարողացանք հրավիրել այդ օգտատերերին։ Խնդրում ենք նշել այն օգտատերերին, որոնց ցանկանում եք հրավիրել, և կրկին փորձել։",
+        "error_permissions_room": "Դուք չունեք մարդկանց այս սենյակ հրավիրելու թույլտվություն։",
+        "error_permissions_space": "Դուք չունեք մարդկանց այս տարածք հրավիրելու թույլտվություն։",
+        "error_profile_undisclosed": "Օգտվողը կարող է գոյություն ունենալ կամ գոյություն չունենալ",
+        "error_transfer_multiple_target": "Զանգը կարող է փոխանցվել միայն մեկ օգտատիրոջ:",
+        "error_unfederated_room": "Այս սենյակը չի կարող միացվել որևէ այլ սենյակի։ Դուք չեք կարող օգտվողներին հրավիրել արտաքին սերվերներից:",
+        "error_unfederated_space": "Այս տարածքը չի կարող միացվել որևէ այլ տարածքի։ Դուք չեք կարող օգտվողներին հրավիրել արտաքին սերվերներից:",
+        "error_unknown": "Սերվերի անհայտ սխալ",
+        "error_user_not_found": "Օգտատերը գոյություն չունի",
+        "error_version_unsupported_room": "Օգտատիրոջ սերվերը չի աջակցում սենյակի տարբերակը։",
+        "error_version_unsupported_space": "Օգտատիրոջ սերվերը չի աջակցում տարածքի տարբերակը։",
+        "failed_generic": "Գործողությունը ձախողվեց",
+        "failed_title": "Չհաջողվեց հրավիրել",
+        "invalid_address": "Չճանաչված հասցե",
+        "name_email_mxid_share_room": "Հրավիրեք ինչոր մեկին իր անունով, էլ.փոստի հասցեով, օգտատիրոջ օգտանունով (օրինակ՝<userId/> ) կամ<a> կիսվեք այս սենյակով</a> ։",
+        "name_email_mxid_share_space": "Հրավիրեք ինչոր մեկին իր անունով, էլ.փոստի հասցեով, օգտատիրոջ օգտանունով (օրինակ՝<userId/> ) կամ<a> կիսվեք այս տարածքով</a> ։",
+        "name_mxid_share_room": "Հրավիրեք ինչոր մեկին իր անունով, օգտատիրոջ օգտանունով (օրինակ՝<userId/> ) կամ<a> կիսվեք այս սենյակով</a> ։",
+        "name_mxid_share_space": "Հրավիրեք ինչոր մեկին իր անունով, օգտատիրոջ օգտանունով (օրինակ՝<userId/> ) կամ<a> կիսվեք այս տարածքով</a>։",
+        "progress": {
+            "dont_close": "Մի՛ փակեք ծրագիրը մինչեւ ավարտվի:",
+            "preparing": "Հրավերների պատրաստում..."
+        },
+        "recents_section": "Վերջին զրույցները",
+        "room_failed_partial": "Մյուսներին ուղարկեցինք, բայց ստորև բերված մարդկանց չհաջողվեց հրավիրել <RoomName/>",
+        "room_failed_partial_title": "Որոշ հրավերներ չհաջողվեց ուղարկել",
+        "room_failed_title": "Չհաջողվեց հրավիրել օգտատերերին %(roomName)s",
+        "send_link_prompt": "Կամ ուղարկեք հրավերի հղումը",
+        "start_conversation_name_email_mxid_prompt": "Սկսեք զրույց ինչ-որ մեկի հետ, օգտագործելով իր անունը, էլ.փոստի հասցեն կամ օգտատիրոջ անունը (օրինակ՝ <userId/>)։",
+        "start_conversation_name_mxid_prompt": "Սկսեք զրույց ինչ-որ մեկի հետ՝ օգտագործելով նրա անունը կամ օգտատիրոջ անունը (օրինակ՝ <userId/>):",
+        "suggestions_disclaimer": "Որոշ առաջարկներ կարող են թաքցված լինել գաղտնիության համար։",
+        "suggestions_disclaimer_prompt": "Եթե չեք տեսնում, թե ում եք փնտրում, ուղարկեք նրանց ձեր հրավերի հղումը ստորև։",
+        "suggestions_section": "Վերջին ուղիղ հաղորդագրությունները",
+        "to_room": "Հրավիրել %(roomName)s",
+        "to_space": "Հրավիրել %(spaceName)s",
+        "transfer_dial_pad_tab": "Թվային ստեղնաշար",
+        "transfer_user_directory_tab": "Օգտատերերի տեղեկատու",
+        "unable_find_profiles_description_default": "Անհնար է գտնել ստորև թվարկված Matrix ID-ների պրոֆիլները։ Ցանկանո՞ւմ եք այնուամենայնիվ հրավիրել նրանց։",
+        "unable_find_profiles_invite_label_default": "Հրավիրել ամեն դեպքում",
+        "unable_find_profiles_invite_never_warn_label_default": "Ամեն դեպքում հրավիրել և այլևս երբեք չզգուշացնել ինձ",
+        "unable_find_profiles_title": "Հետևյալ օգտատերերը կարող են գոյություն չունենալ",
+        "unban_first_title": "Օգտատիրոջը չի կարելի հրավիրել, քանի դեռ նրա արգելափակումը չի հանվել"
+    },
+    "inviting_user1_and_user2": "%(user1)s և %(user2)s անձանց հրավիրում",
+    "inviting_user_and_n_others": {
+        "one": "Հրավիրում է %(user)s և մեկ այլ",
+        "other": "Հրավիրում է %(user)s և %(count)s ուրիշներին"
+    },
+    "items_and_n_others": {
+        "one": "<Items/> և մեկ այլ",
+        "other": "<Items/> և %(count)s մյուսները"
+    },
+    "keyboard": {
+        "activate_button": "Ակտիվացնել ընտրված կոճակը",
+        "alt": "Alt",
+        "autocomplete_cancel": "Չեղարկել ավտոմատ լրացումը",
+        "autocomplete_force": "Հարկադիր ավարտ",
+        "autocomplete_navigate_next": "Հաջորդ ավտոմատ լրացման առաջարկը",
+        "autocomplete_navigate_prev": "Նախորդ ավտոմատ լրացման առաջարկը",
+        "backspace": "Backspace",
+        "cancel_reply": "Չեղարկել հաղորդագրությանը պատասխանելը",
+        "category_autocomplete": "Ավտոմատ լրացում (ինքնալրացում)",
+        "category_calls": "Զանգեր",
+        "category_navigation": "Տեղորոշում",
+        "category_room_list": "Սենյակների ցուցակ",
+        "close_dialog_menu": "Փակել երկխոսության պատուհանը կամ համատեքստային ցանկը",
+        "composer_jump_end": "Անցնել խմբագրիչի վերջ",
+        "composer_jump_start": "Անցնել խմբագրիչի սկիզբ",
+        "composer_navigate_next_history": "Անցնել հաջորդ հաղորդագրությանը խմբագրիչի պատմության մեջ",
+        "composer_navigate_prev_history": "Անցնել նախորդ հաղորդագրությանը խմբագրիչի պատմության մեջ",
+        "composer_new_line": "Նոր տող",
+        "composer_redo": "Կրկնել խմբագրումը",
+        "composer_toggle_bold": "Միացնել/անջատել թավատառը",
+        "composer_toggle_code_block": "Միացնել/անջատել կոդի բլոկը",
+        "composer_toggle_italics": "Միացնել/անջատել շողատառերը",
+        "composer_toggle_link": "Միացնել/անջատել հղումը",
+        "composer_toggle_quote": "Միացնել/անջատել մեջբերումը",
+        "composer_undo": "Հետարկել խմբագրումը",
+        "control": "Ctrl",
+        "dismiss_read_marker_and_jump_bottom": "Փակել ընթերցման նշիչը և անցնել ներքև",
+        "end": "End",
+        "enter": "Enter",
+        "escape": "Esc",
+        "go_home_view": "Անցնել գլխավոր/հիմնական տեսքին",
+        "home": "Home",
+        "jump_first_message": "Անցնել առաջին հաղորդագրությանը",
+        "jump_last_message": "Անցնել վերջին հաղորդագրությանը",
+        "jump_room_search": "Անցնել սենյակի որոնմանը",
+        "jump_to_read_marker": "Անցեք ամենահին չընթերցված հաղորդագրությանը",
+        "keyboard_shortcuts_tab": "Բացել այս կարգավորումների ներդիրը",
+        "navigate_next_history": "Վերջերս այցելած հաջորդ սենյակը կամ տարածքը",
+        "navigate_next_message_edit": "Խմբագրման համար անցեք հաջորդ հաղորդագրությանը",
+        "navigate_prev_history": "Վերջերս այցելած սենյակ կամ տարածք",
+        "navigate_prev_message_edit": "Խմբագրման համար անցեք նախորդ հաղորդագրությանը",
+        "next_landmark": "Անցնել հաջորդ նշանային կետին",
+        "next_room": "Հաջորդ սենյակը կամ ուղիղ/անձնական հաղորդագրությունը",
+        "next_unread_room": "Հաջորդ չկարդացված սենյակը կամ ուղիղ/անձնական հաղորդագրությունը",
+        "number": "[թիվ]",
+        "open_user_settings": "Բացել օգտատիրոջ կարգավորումները",
+        "page_down": "Page Down",
+        "page_up": "Page Up",
+        "prev_landmark": "Անցնել նախորդ նշանային կետին",
+        "prev_room": "Նախորդ սենյակը կամ ուղիղ/անձնական հաղորդագրությունը",
+        "prev_unread_room": "Նախորդ չկարդացված սենյակը կամ ուղիղ/անձնական հաղորդագրությունը",
+        "room_list_collapse_section": "Ծալել սենյակների ցանկի բաժինը",
+        "room_list_expand_section": "Ընդարձակել սենյակների ցանկի բաժինը",
+        "room_list_navigate_down": "Շարժվել ներքև սենյակների ցանկում",
+        "room_list_navigate_up": "Շարժվել վերև սենյակների ցանկում",
+        "room_list_select_room": "Ընտրել սենյակ՝ սենյակների ցանկից",
+        "save": "Պահել",
+        "scroll_down_timeline": "Ժամանակացույցում ներքև գլորել",
+        "scroll_up_timeline": "Ժամանակացույցում վերև գլորել",
+        "search": "Որոնում (պետք է միացված լինի)",
+        "send_sticker": "Ուղարկել կպչուն պիտակ(ստիկեր)",
+        "shift": "Shift",
+        "space": "Բացատ",
+        "switch_to_space": "Անցնել տարածքին՝ ըստ համարի",
+        "toggle_hidden_events": "Միացնել/անջատել թաքնված միջոցառման տեսանելիությունը",
+        "toggle_microphone_mute": "Միացնել/անջատել խոսափողի լռեցումը",
+        "toggle_right_panel": "Բացել/փակել աջ վահանակը",
+        "toggle_space_panel": "Բացել/փակել տարածքի վահանակը",
+        "toggle_top_left_menu": "Բացել/փակել վերևի ձախ մենյուն",
+        "toggle_webcam_mute": "Միացնել/անջատել վեբ տեսախցիկը",
+        "upload_file": "Ֆայլի վերբեռնում"
+    },
+    "labs": {
+        "ask_to_join": "Միացնել միանալու հարցումը",
+        "automatic_debug_logs": "Ավտոմատ կերպով ուղարկել կարգաբերման տեղեկամատյանները(debug logs) ցանկացած սխալի վերաբերյալ",
+        "automatic_debug_logs_decryption": "Ավտոմատ կերպով ուղարկել կարգաբերման տեղեկամատյանները(debug logs) վերծանման սխալների վերաբերյալ",
+        "automatic_debug_logs_key_backup": "Ավտոմատ կերպով ուղարկել կարգաբերման տեղեկամատյանները(debug logs)՝ բանալիների պահուստավորման չգործելու դեպքում",
+        "beta_description": "Ի՞նչ է սպասվում %(brand)s-ին հաջորդիվ։ Լաբորատորիաները լավագույն միջոցն են ամեն ինչ վաղ փուլում սկսելու, նոր գործառույթները փորձարկելու և դրանք ձևավորելու համար, նախքան դրանց թողարկումը։",
+        "beta_feature": "Սա բետա առանձնահատկություն է",
+        "beta_feedback_leave_button": "Բետա տարբերակից դուրս գալու համար այցելեք ձեր կարգավորումները:",
+        "beta_feedback_title": "%(featureName)s Բետա հետադարձ կապ",
+        "beta_section": "Առաջիկա առանձնահատկություններ",
+        "bridge_state": "Ցույց տալ կամուրջների մասին տեղեկություններ սենյակի կարգավորումներում",
+        "bridge_state_channel": "Ալիք․ <channelLink/>",
+        "bridge_state_creator": "Այս կամուրջն ապահովված էր <user />֊ի կողմից։",
+        "bridge_state_manager": "Այս կամուրջը կառավարվում է <user />֊ի կողմից։",
+        "bridge_state_workspace": "Աշխատանքային տարածք․ <networkLink/>",
+        "click_for_info": "Սեղմեք լրացուցիչ տեղեկությունների համար",
+        "currently_experimental": "Ներկայումս փորձնական։",
+        "custom_themes": "Աջակցեl անհատական ​​​​թեմաների/ոճերի ավելացմանը",
+        "dynamic_room_predecessors": "Դինամիկ սենյակի նախորդներ",
+        "dynamic_room_predecessors_description": "Միացնել MSC3946- ը (ուշ ժամանող սենյակների արխիվներին աջակցելու համար)",
+        "element_call_video_rooms": "Element Call վիդեո սենյակներ",
+        "exclude_insecure_devices": "Բացառել անապահով սարքերը հաղորդագրություններ ուղարկելիս/ստանալիս  ",
+        "exclude_insecure_devices_description": "Երբ այս ռեժիմը միացված է, գաղտնագրված հաղորդագրությունները չեն կիսվի չվավերացված սարքերի հետ, իսկ չվավերացված սարքերից ստացված հաղորդագրությունները կցուցադրվեն որպես սխալ։ Նկատի ունեցեք, որ այս ռեժիմը միացնելիս, հնարավոր է, չկարողանաք շփվել այն օգտատերերի հետ, ովքեր չեն վավերացրել իրենց սարքերը։",
+        "experimental_description": "Փորձարկման կարիք ունե՞ք։ Փորձեք մեր վերջին գաղափարները մշակման փուլում։ Այս գործառույթները դեռևս վերջնականապես մշակված չեն. դրանք կարող են անկայուն լինել, կարող են փոխվել կամ ընդհանրապես հանվել։ <a>Իմացեք ավելին</a>։",
+        "experimental_section": "Վաղ նախադիտումներ",
+        "extended_profiles_msc_support": "Պահանջում է, որ ձեր սերվերը աջակցի MSC4133-ը",
+        "feature_disable_call_per_sender_encryption": "Անջատել յուրաքանչյուր ուղարկողի գաղտնագրումը Element զանգի համար",
+        "feature_wysiwyg_composer_description": "Հաղորդագրության խմբագրիչում օգտագործել \"ձևաչափված տեքստ\" (Rich Text)՝ Markdown-ի փոխարեն",
+        "group_calls": "Խմբային զանգի նոր փորձ",
+        "group_developer": "Ծրագրավորող",
+        "group_encryption": "Գաղտնագրում",
+        "group_experimental": "Փորձարարական",
+        "group_messaging": "Նամակագրություն",
+        "group_moderation": "Մոդերացիա(չափավորում)",
+        "group_profile": "Պրոֆիլ",
+        "group_rooms": "Սենյակներ",
+        "group_spaces": "Տարածքներ",
+        "group_themes": "Ոճեր",
+        "group_threads": "Թեմաներ",
+        "group_ui": "Օգտագործողի միջերես(ինտերֆեյս)",
+        "group_voip": "Ձայն և վիդեո",
+        "group_widgets": "Վիջեթներ",
+        "hidebold": "Թաքցնել ծանուցման կետը (ցուցադրել միայն քանակների նշանները)",
+        "html_topic": "Ցուցադրել սենյակի թեմաների HTML ներկայացումը",
+        "join_beta": "Միանալ բետային",
+        "join_beta_reload": "Բետային միանալը կվերաբեռնի %(brand)s-ը։",
+        "jump_to_date": "Անցնել ամսաթվին (ավելացնում է /jumptodate և անցնում ամսաթվի վերնագրին)",
+        "jump_to_date_msc_support": "Պահանջում է, որ ձեր սերվերը աջակցի MSC3030-ը",
+        "latex_maths": "Հաղորդագրություններում արտապատկերել LaTeX-ով մաթեմատիկական արտահայտությունները",
+        "leave_beta": "Լքել բետան",
+        "leave_beta_reload": "Բետայից դուրս գալը կվերաբեռնի %(brand)s-ը։",
+        "location_share_live": "Իրական ժամանակում գտնվելու վայրի կիսում",
+        "location_share_live_description": "Ժամանակավոր իրականացում: Տեղերը պահպանվում են սենյակների պատմության մեջ:",
+        "mjolnir": "Մարդկանց անտեսելու նոր եղանակներ",
+        "msc3531_hide_messages_pending_moderation": "Թույլատրել մոդերատորներին թաքցնել մոդերացիայի սպասող հաղորդագրությունները։",
+        "new_room_list": "Ակտիվացնել նոր սենյակների ցուցակը",
+        "notification_settings": "Նոր ծանուցումների կարգավորումներ",
+        "notification_settings_beta_caption": "Ներկայացնում ենք ձեր ծանուցումների կարգավորումները փոխելու ավելի պարզ միջոց: Անհատականացրեք ձեր %(brand)s-ն այնպես, ինչպես ցանկանում եք:",
+        "notification_settings_beta_title": "Ծանուցման կարգավորումներ",
+        "notifications": "Միացնել ծանուցումների վահանակը սենյակի վերնագրում",
+        "release_announcement": "Թողարկման հայտարարություն",
+        "render_reaction_images": "Արձանագրել հատուկ պատկերներ ռեակցիաներում",
+        "render_reaction_images_description": "Երբեմն կոչվում է “հատուկ էմոջիներ”:",
+        "report_to_moderators": "Հաղորդել մոդերատորներին",
+        "report_to_moderators_description": "Սենյակներում, որոնք աջակցում են չափավորումը, “Հաշվետվություն” կոճակը թույլ կտա ձեզ հաղորդել չարաշահումների մասին սենյակների մոդերատորներին:",
+        "share_history_on_invite": "Կիսվել գաղտնսգրված պատմությամբ նոր անդամների հետ",
+        "share_history_on_invite_description": "Եթե օգտատիրոջը հրավիրում եք գաղտնագրված սենյակ, որի պատմության հասանելիությունը «կիսված» է, ապա նրա հետ կիսվում է գաղտնագրված պատմությունը, և դուք նույնպես ստանում եք գաղտնագրված պատմություն, երբ հրավիրվում եք նման սենյակ։",
+        "share_history_on_invite_warning": "Այս գործառույթը ՓՈՐՁԱՐԱՐԱԿԱՆ է, և ոչ բոլոր անվտանգության միջոցառումներն են ներդրված։ Մի՛ միացրեք այն իրական(կարևոր) հաշիվներում։",
+        "sliding_sync": "Սահող համաժամեցման(Sliding Sync) ռեժիմ",
+        "sliding_sync_description": "Ակտիվ մշակման փուլում է, չի կարող անջատվել։",
+        "sliding_sync_disabled_notice": "Անջատելու համար դուրս եկեք և նորից մուտք գործեք",
+        "sliding_sync_server_no_support": "Ձեր սերվերը չունի աջակցություն",
+        "under_active_development": "Ակտիվ մշակման փուլում։",
+        "unrealiable_e2e": "Անհուսալի է գաղտնագրված սենյակներում",
+        "video_rooms": "Վիդեո սենյակներ",
+        "video_rooms_a_new_way_to_chat": "Ձայնի և տեսանյութի միջոցով զրուցելու նոր եղանակ %(brand)s-ում:",
+        "video_rooms_always_on_voip_channels": "Տեսասենյակները միշտ միացված VoIP(ձայնային փոխանցում ինտերնետային արձանագրության միջոցով) ալիքներ են, որոնք ներդրված են %(brand)s-ի սենյակում։",
+        "video_rooms_beta": "Վիդեո սենյակները բետա առանձնահատկություն են",
+        "video_rooms_faq1_answer": "Օգտագործեք ձախ վահանակի սենյակի բաժնում գտնվող «+» կոճակը:",
+        "video_rooms_faq1_question": "Ինչպե՞ս կարող եմ ստեղծել վիդեո սենյակ:",
+        "video_rooms_faq2_answer": "Այո, զրույցի ժամանակացույցը ցուցադրվում է վիդեոի հետ մեկտեղ:",
+        "video_rooms_faq2_question": "Կարո՞ղ եմ տեսազանգի հետ մեկտեղ օգտագործել տեքստային զրույց։",
+        "video_rooms_feedbackSubheading": "Շնորհակալություն բետա տարբերակը փորձելու համար, խնդրում ենք մանրամասնել որքան կարող եք, որպեսզի մենք կարողանանք բարելավել այն:",
+        "wysiwyg_composer": "Տեքստի կատարելագործված խմբագրիչ"
+    },
+    "labs_mjolnir": {
+        "advanced_warning": "⚠ Այս կարգավորումները նախատեսված են առաջադեմ օգտատերերի համար։",
+        "ban_reason": "Անտեսված/Արգելափակված",
+        "error_adding_ignore": "Սխալ առաջացավ անտեսված օգտատիրոջ/սերվերի ավելացման ժամանակ",
+        "error_adding_list_description": "Խնդրում ենք ստուգել սենյակի ID-ն կամ հասցեն, և կրկին փորձել:",
+        "error_adding_list_title": "Սխալ՝ ցուցակին բաժանորդագրվելիս",
+        "error_removing_ignore": "Սխալ առաջացավ անտեսված օգտատիրոջը/սերվերին հեռացնելիս",
+        "error_removing_list_description": "Խնդրում ենք կրկին փորձել կամ դիտել ձեր կոնսոլը՝ հուշումներ ստանալու համար։",
+        "error_removing_list_title": "Սխալ՝ ցուցակից հրաժարվելու ժամանակ",
+        "explainer_1": "Այստեղ ավելացրեք այն օգտատերերին և սերվերներին, որոնց ցանկանում եք անտեսել: Օգտագործեք աստղանիշներ, որպեսզի %(brand)s-ը համապատասխանի ցանկացած նիշի: Օրինակ՝ <code>@bot:*</code>-ը կանտեսի բոլոր օգտատերերին, որոնք ունեն 'bot' անունը որևէ սերվերի վրա:",
+        "explainer_2": "Մարդկանց անտեսումը կատարվում է արգելափակման ցուցակների միջոցով, որոնք պարունակում են արգելափակման կանոններ: Արգելափակման ցուցակին բաժանորդագրվելը նշանակում է, որ այդ ցուցակով արգելափակված օգտատերերը/սերվերները կթաքցվեն ձեզանից:",
+        "lists": "Դուք ներկայումս բաժանորդագրված եք՝",
+        "lists_description_1": "Արգելափակված ցուցակին բաժանորդագրվելը ձեզ կհանգեցնի դրան միանալուն։",
+        "lists_description_2": "Եթե ​​սա այն չէ, ինչ դուք ուզում եք, խնդրում ենք օգտագործել այլ գործիք՝ օգտատերերին անտեսելու համար։",
+        "lists_heading": "Բաժանորդագրված ցուցակներ",
+        "lists_new_label": "Սենյակի ID-ն կամ արգելափակված ցուցակի հասցեն",
+        "no_lists": "Դուք բաժանորդագրված չեք որևէ ցուցակի",
+        "personal_description": "Ձեր անձնական արգելափակվածների ցանկը պարունակում է բոլոր այն օգտատերերին/սերվերներին, որոնցից դուք անձամբ չեք ցանկանում տեսնել հաղորդագրություններ։ Առաջին օգտատիրոջը/սերվերին անտեսելուց հետո, ձեր սենյակների ցանկում կհայտնվի նոր սենյակ՝ '%(myBanList)s անունով․ մնացեք այս սենյակում՝ արգելափակումների ցանկը ուժի մեջ պահելու համար։",
+        "personal_empty": "Դուք ոչ ոքի չեք անտեսել:",
+        "personal_heading": "Անձնական արգելքների ցանկ",
+        "personal_new_label": "Անտեսելու համար սպասարկողի կամ օգտատիրոջ ID",
+        "personal_new_placeholder": "օրինակ՝ @bot:* կամ example.org",
+        "personal_section": "Դուք ներկայումս անտեսում եք՝",
+        "room_name": "Իմ արգելափակումների ցանկը",
+        "room_topic": "Սա ձեր կողմից արգելափակված օգտատերերի/սերվերների ցանկն է. սենյակից դուրս մի՛ եկեք։",
+        "rules_empty": "Ոչ ոք",
+        "rules_server": "Սերվերի կանոններ",
+        "rules_title": "Արգելափակումների ցանկի կանոններ․ %(roomName)s",
+        "rules_user": "Օգտագործողի կանոններ",
+        "something_went_wrong": "Ինչոր բան սխալ է գնացել։ Խնդրում ենք կրկին փորձել կամ դիտել ձեր կոնսոլը՝ հուշումներ ստանալու համար։",
+        "title": "Անտեսված օգտատերեր",
+        "view_rules": "Դիտել կանոնները"
+    },
+    "language_dropdown_label": "Լեզվի ցանկ",
+    "leave_room_dialog": {
+        "last_person_warning": "Դուք այստեղ միակ մարդն եք։ Եթե դուրս գաք, ապագայում ոչ ոք չի կարողանա միանալ, այդ թվում՝ դուք։",
+        "leave_room_question": "Վստա՞հ եք, որ ցանկանում եք լքել «%(roomName)s» սենյակը",
+        "leave_space_question": "Վստա՞հ եք, որ ցանկանում եք լքել «%(spaceName)s» տարածքը",
+        "room_leave_admin_warning": "Դուք այս սենյակում միակ ադմինիստրատորն եք։ Եթե դուրս գաք, ոչ ոք չի կարողանա փոխել սենյակի կարգավորումները կամ կատարել այլ կարևոր գործողություններ։",
+        "room_leave_mod_warning": "Դուք այս սենյակի միակ վերահսկողն(մոդերատոր) եք։ Եթե դուրս գաք, ոչ ոք չի կարողանա փոխել սենյակի կարգավորումները կամ կատարել այլ կարևոր գործողություններ։",
+        "room_rejoin_warning": "Այս սենյակը հանրային չէ։ Դուք չեք կարողանա նորից միանալ առանց հրավերի։",
+        "space_rejoin_warning": "Այս տարածքը հանրային չէ։ Դուք չեք կարողանա կրկին միանալ առանց հրավերի։"
+    },
+    "left_panel": {
+        "open_dial_pad": "Բացեք թվերի հավաքման վահանակը"
+    },
+    "lightbox": {
+        "rotate_left": "Պտտել ձախ",
+        "rotate_right": "Պտտել աջ",
+        "title": "Պատկերի տեսք"
+    },
+    "location_sharing": {
+        "MapStyleUrlNotConfigured": "Այս սերվերը կարգավորված չէ քարտեզները ցուցադրելու համար:",
+        "MapStyleUrlNotReachable": "Այս սերվերը ճիշտ չէ կարգավորված քարտեզները ցուցադրելու համար, կամ հնարավոր է կարգավորված քարտեզի սերվերն անհասանելի լինի:",
+        "WebGLNotEnabled": "Քարտեզները ցուցադրելու համար անհրաժեշտ է WebGL(վեբ գրաֆիկայի գրադարան), խնդրում ենք միացնել այն ձեր զննարկիչի կարգավորումներում։",
+        "click_drop_pin": "Սեղմել՝ քորոցը կորցնելու համար",
+        "click_move_pin": "Սեղմել՝ քորոցը տեղափոխելու համար",
+        "close_sidebar": "Փակել կողային վահանակը",
+        "error_fetch_location": "Չհաջողվեց գտնել գտնվելու վայրը",
+        "error_no_perms_description": "Դուք պետք է ունենաք թույլտվություններ, որպեսզի կիսեք վայրերն այս սենյակում:",
+        "error_no_perms_title": "Դուք չունեք գտնվելու վայրեր կիսելու թույլտվություն",
+        "error_send_description": "%(brand)s-ը չկարողացավ ուղարկել ձեր գտնվելու վայրը: Խնդրում ենք կրկին փորձել ավելի ուշ:",
+        "error_send_title": "Մենք չկարողացանք ուղարկել ձեր գտնվելու վայրը",
+        "error_sharing_live_location": "Ձեր կենդանի գտնվելու վայրը կիսելիս սխալ է տեղի ունեցել",
+        "error_stopping_live_location": "Ձեր կենդանի գտնվելու վայրը դադարեցնելիս սխալ է տեղի ունեցել",
+        "expand_map": "Ընդլայնել քարտեզը",
+        "failed_generic": "Չհաջողվեց գտնել ձեր գտնվելու վայրը: Խնդրում ենք կրկին փորձել ավելի ուշ:",
+        "failed_load_map": "Չնհնար է բեռնել քարտեզը",
+        "failed_permission": "%(brand)s-ին մերժվեց ձեր գտնվելու վայրը գտնելու թույլտվությունը: Խնդրում ենք թույլատրել գտնվելու վայրի հասանելիությունը ձեր զննարկիչի կարգավորումներում:",
+        "failed_timeout": "Ձեր գտնվելու վայրի փնտրման ժամանակն ավարտվել է: Խնդրում ենք կրկին փորձել ավելի ուշ:",
+        "failed_unknown": "Գտնվելու վայրի փնտրման անհայտ սխալ: Խնդրում ենք կրկին փորձել ավելի ուշ:",
+        "find_my_location": "Գտնել իմ գտնվելու վայրը",
+        "live_description": "%(displayName)s-ի կենդանի գտնվելու վայրը",
+        "live_enable_description": "Խնդրում ենք նկատի ունենալ, որ սա լաբորատորիաների առանձնահատկություն է, որն օգտագործում է ժամանակավոր իրականացում: Սա նշանակում է, որ դուք չեք կարողանա ջնջել ձեր գտնվելու վայրի պատմությունը, և առաջադեմ օգտատերերը կկարողանան տեսնել ձեր գտնվելու վայրի պատմությունը նույնիսկ այն բանից հետո, երբ դուք դադարում եք կիսել ձեր կենդանի գտնվելու վայրը այս սենյակի հետ:",
+        "live_enable_heading": "Ուղիղ գտնվելու վայրի տարածում/կիսում",
+        "live_location_active": "Դուք կիսում եք ձեր կենդանի գտնվելու վայրը",
+        "live_location_enabled": "Միացված է կենդանի գտնվելու վայրը",
+        "live_location_ended": "Ուղիղ գտնվելու վայրն ավարտվեց",
+        "live_location_error": "Ուղիղ գտնվելու վայրի սխալ",
+        "live_locations_empty": "Կենդանի վայրեր չկան",
+        "live_share_button": "Կիսվել %(duration)s տևողությամբ",
+        "live_toggle_label": "Միացնել կենդանի գտնվելու վայրի տարածումը/կիսումը",
+        "live_until": "Գործում է մինչև %(expiryTime)s",
+        "live_update_time": "Թարմացվել է %(humanizedUpdateTime)s",
+        "loading_live_location": "Ուղիղ գտնվելու վայրը բեռնվում է...",
+        "location_not_available": "Գտնվելու վայրը հասանելի չէ",
+        "map_feedback": "Քարտեզի հետադարձ կապ",
+        "mapbox_logo": "Քարտեզագրման լոգո",
+        "reset_bearing": "Վերականգնել կրիչը դեպի հյուսիս",
+        "share_button": "Տարածել գտնվելու վայրը",
+        "share_type_live": "Իմ կենդանի գտնվելու վայրը",
+        "share_type_own": "Իմ ներկայիս գտնվելու վայրը",
+        "share_type_pin": "Կորցնել քորոցը",
+        "share_type_prompt": "Ո՞ր տեսակի գտնվելու վայրն եք ցանկանում կիսել:",
+        "toggle_attribution": "Միացնել/անջատել վերագրումը"
+    },
+    "member_list": {
+        "count": {
+            "one": "%(count)s անդամ",
+            "other": "%(count)s անդամներ"
+        },
+        "filter_placeholder": "Որոնել սենյակի անդամներին",
+        "invite_button_no_perms_tooltip": "Դուք չունեք օգտատերեր հրավիրելու թույլտվություն",
+        "invited_label": "Հրավիրված",
+        "list_title": "Անդամների ցանկ",
+        "no_matches": "Համընկնումներ չկան"
+    },
+    "member_list_back_action_label": "Սենյակի անդամներ",
+    "message_edit_dialog_title": "Հաղորդագրությունների խմբագրումներ",
+    "migrating_crypto": "Սպասեք մի փոքր։ Մենք թարմացնում ենք %(brand)s-ը՝ գաղտնագրումն ավելի արագ և հուսալի դարձնելու համար։",
+    "mobile_guide": {
+        "toast_accept": "Օգտագործել հավելվածը",
+        "toast_description": "%(brand)s-ը փորձարարական է բջջային վեբ զննարկիչում: Ավելի լավ փորձի և վերջին հնարավորությունների համար օգտագործեք մեր անվճար ծրագիրը:",
+        "toast_title": "Օգտագործեք հավելվածը ավելի լավ փորձի համար"
+    },
+    "name_and_id": "%(name)s (%(userId)s)",
+    "no_more_results": "Այլ արդյունքներ չկան",
+    "notif_panel": {
+        "empty_description": "Դուք տեսանելի ծանուցումներ չունեք։",
+        "empty_heading": "Ամեն ինչ կարդացված է"
+    },
+    "notifications": {
+        "all_messages": "Բոլոր հաղորդագրությունները",
+        "all_messages_description": "Ստանալ ծանուցում յուրաքանչյուր հաղորդագրության համար",
+        "class_global": "Գլոբալ",
+        "class_other": "Այլ",
+        "default": "Լռելյայն",
+        "default_settings": "Համապատասխանեցնել լռելյայն կարգավորումները",
+        "email_pusher_app_display_name": "Ծանուցումներ էլ.փոստով",
+        "enable_prompt_toast_description": "Միացնել աշխատասեղանի ծանուցումները",
+        "enable_prompt_toast_title": "Ծանուցումներ",
+        "enable_prompt_toast_title_from_message_send": "Բաց մի թողեք պատասխանը",
+        "error_change_title": "Փոխել ծանուցման կարգավորումները",
+        "keyword": "Բանալի բառ",
+        "keyword_new": "Նոր բանալի բառ",
+        "level_activity": "Գործունեություն",
+        "level_highlight": "Ընդգծում",
+        "level_muted": "Խլացված",
+        "level_none": "Ոչ մի",
+        "level_notification": "Ծանուցում",
+        "level_unsent": "Չուղարկված",
+        "mark_all_read": "Բոլորը նշել որպես կարդացված",
+        "mentions_and_keywords": "@mentions (հիշատակումներ) և բանալի բառեր",
+        "mentions_and_keywords_description": "Ստանալ ծանուցում միայն հիշատակումներով և բանալի բառերով, ինչպես սահմանված են ձեր <a> կարգաբերումներում</a>",
+        "mentions_keywords": "Նշումներ/հիշատակումներ և բանալի բառեր",
+        "message_didnt_send": "Հաղորդագրությունը չի ուղարկվել: Սեղմեք տեղեկությունների համար:",
+        "mute_description": "Դուք չեք ստանա ոչ մի ծանուցում",
+        "mute_room": "\"Խլացնել\" սենյակի ձայնը"
+    },
+    "notifier": {
+        "m.key.verification.request": "%(name)s-ը պահանջում է ստուգում"
+    },
+    "onboarding": {
+        "create_room": "Ստեղծել խմբային զրույց",
+        "explore_rooms": "Ուսումնասիրել հանրային սենյակները",
+        "has_avatar_label": "Հիանալի է, դա կօգնի մարդկանց իմանալ, որ դա դու ես",
+        "intro_byline": "Սեփականացրեք/կառավարեք ձեր խոսակցությունները:",
+        "intro_welcome": "Բարի գալուստ %(appName)s",
+        "no_avatar_label": "Ավելացրեք լուսանկար, որպեսզի մարդիկ իմանան, որ դա դուք եք:",
+        "send_dm": "Ուղարկել անմիջական հաղորդագրություն",
+        "welcome_detail": "Այժմ, եկեք օգնենք ձեզ սկսել",
+        "welcome_user": "Բարի գալուստ %(name)s"
+    },
+    "pill": {
+        "permalink_other_room": "Հաղորդագրություն %(room)s-ում",
+        "permalink_this_room": "Հաղորդագրություն %(user)s-ից"
+    },
+    "poll": {
+        "create_poll_action": "Ստեղծել Հարցում",
+        "create_poll_title": "Ստեղծել հարցում",
+        "disclosed_notes": "Քվեարկողներն արդյունքները տեսնում են քվեարկելուց անմիջապես հետո",
+        "edit_poll_title": "Խմբագրել հարցումը",
+        "end_description": "Վստա՞հ եք, որ ցանկանում եք ավարտել այս հարցումը։ Սա կցուցադրի հարցման վերջնական արդյունքները և մարդկանց կզրկի քվեարկելու հնարավորությունից։",
+        "end_message": "Հարցումն ավարտված է։ Ամենաշատ պատասխանը՝ %(topAnswer)s",
+        "end_message_no_votes": "Հարցումն ավարտվել է։ Քվեարկություն չի անցկացվել։",
+        "end_title": "Հարցման ավարտ",
+        "error_ending_description": "Կներեք, հարցումը չի ավարտվել։ Խնդրում ենք կրկին փորձել։",
+        "error_ending_title": "Չհաջողվեց ավարտել հարցումը",
+        "error_voting_description": "Կներեք, ձեր քվեն/ձայնը չի գրանցվել։ Խնդրում ենք կրկին փորձել։",
+        "error_voting_title": "Քվեարկությունը չի գրանցվել",
+        "failed_send_poll_description": "Կներեք, ձեր կողմից ստեղծված հարցումը չի հրապարակվել։",
+        "failed_send_poll_title": "Չհաջողվեց հրապարակել հարցումը",
+        "notes": "Արդյունքները կհայտնվեն/կհրապարակվեն միայն հարցման ավարտից հետո",
+        "options_add_button": "Ավելացնել տարբերակ",
+        "options_heading": "Ստեղծել տարբերակներ",
+        "options_label": "Տարբերակ %(number)s",
+        "options_placeholder": "Գրել տարբերակ",
+        "topic_heading": "Ո՞րն է ձեր հարցման հարցը կամ թեման։",
+        "topic_label": "Հարց կամ թեմա",
+        "topic_placeholder": "Գրեք ինչոր բան…",
+        "total_decryption_errors": "Վերծանման սխալների պատճառով որոշ ձայներ կարող են չհաշվվել",
+        "total_n_votes": {
+            "one": "%(count)s ձայն է տվել։ Քվեարկեք՝ արդյունքները տեսնելու համար։",
+            "other": "%(count)s ձայներ են տվել։ Քվեարկեք՝ արդյունքները տեսնելու համար։"
+        },
+        "total_n_votes_voted": {
+            "one": "Հիմնված %(count)s ձայնի վրա",
+            "other": "Հիմնված %(count)s ձայների վրա"
+        },
+        "total_no_votes": "Ձայներ չեն ներկայացվել",
+        "total_not_ended": "Արդյունքները տեսանելի կլինեն, երբ հարցումն ավարտվի",
+        "type_closed": "Փակ հարցում",
+        "type_heading": "Հարցման տեսակը",
+        "type_open": "Բաց հարցում",
+        "unable_edit_description": "Ցավոք, ձայները ներկայացնելուց(քվեարկությունն ավարտվելուց) հետո դուք չեք կարող խմբագրել հարցումը:",
+        "unable_edit_title": "Հարցումը հնարավոր չէ խմբագրել"
+    },
+    "power_level": {
+        "admin": "Ադմին",
+        "creator": "Սեփականատեր",
+        "custom": "Հատուկ (%(level)s)",
+        "custom_level": "Հատուկ մակարդակ",
+        "default": "Լռելյայն",
+        "label": "Էլեկտրաէներգիայի մակարդակը",
+        "moderator": "Մոդերատոր",
+        "restricted": "Սահմանափակված"
+    },
+    "powered_by_matrix": "Մշակված Matrix-ի կողմից",
+    "powered_by_matrix_with_logo": "Ապակենտրոնացված և գաղտնագրված զրույց ու համագործակցություն՝ $matrixLogo-ի աջակցությամբ",
+    "presence": {
+        "away": "Տեղում չէ",
+        "busy": "Զբաղված",
+        "idle": "Անզբաղ",
+        "idle_for": "Անզբաղ %(duration)s ժամանակ",
+        "offline": "Անցանց",
+        "offline_for": "Անցանց %(duration)s ժամանակ",
+        "online": "Առցանց",
+        "online_for": "Առցանց %(duration)s ժամանակ",
+        "unknown": "Անհայտ",
+        "unknown_for": "Անհայտ %(duration)s ժամանակ",
+        "unreachable": "Օգտատիրոջ սերվերը անհասանելի է"
+    },
+    "quick_settings": {
+        "all_settings": "Բոլոր կարգավորումները",
+        "metaspace_section": "Ամրացնել կողային վահանակում",
+        "sidebar_settings": "Լրացուցիչ ընտրանքներ",
+        "title": "Արագ կարգավորումներ"
+    },
+    "quit_warning": {
+        "call_in_progress": "Դուք, կարծես, զանգի մեջ եք, վստա՞հ եք, որ ցանկանում եք դուրս գալ։",
+        "file_upload_in_progress": "Դուք, կարծես թե, ֆայլեր եք վերբեռնում, վստա՞հ եք, որ ցանկանում եք դուրս գալ։"
+    },
+    "redact": {
+        "confirm_button": "Հաստատեք հեռացումը",
+        "confirm_description": "Վստա՞հ եք, որ ցանկանում եք հեռացնել (ջնջել) այս միջոցառումը։",
+        "confirm_description_state": "Նկատի ունեցեք, որ սենյակի նման փոփոխությունները հեռացնելը կարող է չեղարկել փոփոխությունը։",
+        "error": "Դուք չեք կարող ջնջել այս հաղորդագրությունը։ (%(code)s)",
+        "ongoing": "Հեռացվում է…",
+        "reason_label": "Պատճառ (ըստ ցանկության)"
+    },
+    "report_content": {
+        "description": "Այս հաղորդագրության մասին հաղորդելը կուղարկի դրա եզակի «իրադարձության ID-ն» ձեր գլխավոր սերվերի ադմինիստրատորին: Եթե այս սենյակում հաղորդագրությունները գաղտնագրված են, ձեր գլխավոր սերվերի ադմինիստրատորը չի կարողանա կարդալ հաղորդագրության տեքստը կամ դիտել որևէ ֆայլ կամ պատկեր:",
+        "disagree": "Համաձայն չեմ",
+        "error_create_room_moderation_bot": "Հնարավոր չէ ստեղծել սենյակ մոդերատորական բոտի միջոցով",
+        "hide_messages_from_user": "Նշեք, եթե ցանկանում եք թաքցնել այս օգտատիրոջից ստացված բոլոր ներկա և ապագա հաղորդագրությունները։",
+        "ignore_user": "Անտեսել օգտատիրոջը",
+        "illegal_content": "Անօրինական բովանդակություն",
+        "missing_reason": "Խնդրում ենք նշել, թե ինչու եք հայտնում(բողոքում) այդ մասին:",
+        "nature": "Խնդրում ենք ընտրել բնույթ և նկարագրել, թե ինչն է այս հաղորդագրությունը դարձնում վիրավորական։",
+        "nature_disagreement": "Այս օգտատիրոջ գրածը սխալ է։\nՍա կհաղորդվի սենյակի մոդերատորներին։",
+        "nature_illegal": "Այս օգտատերը ցուցաբերում է անօրինական վարքագիծ, օրինակ ՝ վիրավորում է մարդկանց կամ սպառնում է բռնությամբ։\nԱյս մասին կտեղեկացվի սենյակի մոդերատորներին, ովքեր կարող են տեղեկությունը փոխանցել իրավապահ մարմիններին:",
+        "nature_nonstandard_admin": "Այս սենյակը նախատեսված է արգելված կամ թունավոր բովանդակություն տեղադրելու համար, կամ մոդերատորները չեն կարողանում վերահսկել անօրինական կամ թունավոր բովանդակությունը։\nԱյս մասին կտեղեկացվի %(homeserver)s-ի ադմինիստրատորներին:",
+        "nature_nonstandard_admin_encrypted": "Այս սենյակը նախատեսված է արգելված կամ թունավոր բովանդակություն տեղադրելու համար, կամ մոդերատորները չեն կարողանում վերահսկել անօրինական կամ թունավոր բովանդակությունը։\nԱյս մասին կտեղեկացվի %(homeserver)s֊ի ադմինիստրատորներին: Ադմինիստրատորները չեն կարողանա կարդալ այս սենյակի գաղտնագրված բովանդակությունը/հաղորդագրությունները:",
+        "nature_other": "Որևէ այլ պատճառ։ Խնդրում ենք նկարագրել խնդիրը։\nՍա կհաղորդվի սենյակի մոդերատորներին։",
+        "nature_spam": "Այս օգտվողը սենյակում ուղարկում է գովազդներ, հղումներ դեպի գովազդ կամ քարոզչություն:\nԱյս մասին կտեղեկացվի սենյակի մոդերատորներին:",
+        "nature_toxic": "Այս օգտատերը ցուցաբերում է ագրեսիվ(տոքսիկ) վարք, օրինակ՝ վիրավորում է այլ օգտատերերի, ընտանեկան հանգստի սենյակում տեղադրում է միայն մեծահասակների համար նախատեսված նյութեր կամ այլ կերպ խախտում է այդ սենյակի կանոնները:\nԱյս մասին կտեղեկացվի սենյակի մոդերատորներին:",
+        "other_label": "Այլ",
+        "report_content_to_homeserver": "Հաղորդել բովանդակությունը ձեր գլխավոր սերվերի(Homeserver) ադմինիստրատորին",
+        "report_entire_room": "Հաղորդել ամբողջ սենյակի մասին",
+        "spam_or_propaganda": "Սպամ կամ քարոզչություն",
+        "toxic_behaviour": "Թունավոր/տոքսիկ/վիրավորական վարքագիծ"
+    },
+    "report_room": {
+        "description": "Հաղորդե այս սենյակի մասին ձեր հաշվի մատակարարին(account provider)։ Եթե հաղորդագրությունները գաղտնագրված են, ձեր ադմինիստրատորը չի կարողանա կարդալ դրանք։",
+        "reason_label": "Նկարագրել պատճառը"
+    },
+    "restore_key_backup_dialog": {
+        "count_of_decryption_failures": "Չհաջողվեց վերծանել %(failedCount)s սեսիա",
+        "count_of_successfully_restored_keys": "%(sessionCount)s բանալիները հաջողությամբ վերականգնվեցին",
+        "enter_key_description": "Մուտք գործեք ձեր անվտանգ հաղորդագրությունների պատմություն և կարգավորեք անվտանգ հաղորդագրությունները՝ մուտքագրելով ձեր վերականգնման բանալին։",
+        "enter_key_title": "Մուտքագրեք վերականգնման բանալին(Recovery Key)",
+        "enter_phrase_description": "Մուտք գործեք ձեր անվտանգ հաղորդագրությունների պատմություն և կարգավորեք անվտանգ հաղորդագրություններ՝ մուտքագրելով ձեր անվտանգության արտահայտությունը:",
+        "enter_phrase_title": "Մուտքագրեք անվտանգության արտահայտությունը",
+        "incorrect_security_phrase_dialog": "Պահուստային պատճենը հնարավոր չէ վերծանել այս անվտանգության արտահայտությամբ. խնդրում ենք ստուգել, որ մուտքագրել եք ճիշտ անվտանգության արտահայտությունը։",
+        "incorrect_security_phrase_title": "Սխալ անվտանգության արտահայտություն(Security Phrase)",
+        "key_backup_warning": "<b>Զգուշացում</b>. Դուք պետք է բանալիների պահուստավորումը կարգավորեք միայն վստահելի համակարգչից։",
+        "key_fetch_in_progress": "Սերվերից բանալիների ստացում…",
+        "key_forgotten_text": "Եթե մոռացել եք ձեր վերականգնման բանալին, կարող եք <button>կարգավորել վերականգնման նոր տարբերակներ</button>",
+        "key_is_invalid": "Վերականգնման բանալի(Recovery Key) վավեր չէ",
+        "key_is_valid": "Սա կարծես վավեր վերականգնման բանալի է։",
+        "keys_restored_title": "Բանալիները վերականգնված են",
+        "load_error_content": "Անհնար է բեռնել պահուստավորման կարգավիճակը",
+        "load_keys_progress": "%(completed)s-ը %(total)s բանալիներից վերականգնվել է",
+        "no_backup_error": "Պահուստային պատճեն չի գտնվել։",
+        "phrase_forgotten_text": "Եթե մոռացել եք ձեր անվտանգության արտահայտությունը, կարող եք <button1>օգտագործել ձեր վերականգնման բանալին</button1> կամ <button2>կարգավորել վերականգնման նոր տարբերակներ</button2>",
+        "recovery_key_mismatch_description": "Պահուստային պատճենը հնարավոր չէ վերծանել այս վերականգնման բանալիով. խնդրում ենք ստուգել, որ մուտքագրել եք ճիշտ վերականգնման բանալին։",
+        "recovery_key_mismatch_title": "Վերականգնման բանալու(Recovery Key) անհամապատասխանություն",
+        "restore_failed_error": "Անհնար է վերականգնել պահուստային պատճենը"
+    },
+    "right_panel": {
+        "add_integrations": "Ավելացնել ընդլայնումներ",
+        "add_topic": "Ավելացնել թեմա",
+        "extensions_button": "Ընդլայնումներ",
+        "extensions_empty_description": "Ընտրեք «%(addIntegrations)s»՝ սենյակին ընդլայնումներ ավելացնելու և զննելու համար",
+        "extensions_empty_title": "Բարձրացրեք արդյունավետությունը ավելի շատ գործիքների, վիջեթների և բոտերի միջոցով",
+        "files_button": "Ֆայլեր",
+        "pinned_messages": {
+            "empty_description": "Սեղմեք հաղորդագրությանը և ընտրեք «%(pinAction)s», որպեսզի այն ներառվի այստեղ։",
+            "empty_title": "Ամրացրեք(pin) կարևոր հաղորդագրությունները, որպեսզի դրանք հեշտությամբ հայտնաբերվեն",
+            "header": {
+                "one": "1 ամրացված հաղորդագրություն",
+                "other": "%(count)s ամրացված հաղորդագրություններ"
+            },
+            "limits": {
+                "one": "",
+                "other": "Դուք կարող եք ամրացնել միայն մինչև%(count)s վիջեթներ"
+            },
+            "menu": "Բացել մենյուն",
+            "reply_thread": "Պատասխանել <link>թեմատիկ հաղորդագրությանը</link>",
+            "unpin_all": {
+                "button": "Ապաամրացնել բոլոր հաղորդագրությունները",
+                "content": "Համոզվեք, որ իսկապես ուզում եք հեռացնել բոլոր ամրացված հաղորդագրությունները: Այս գործողությունը չի կարող հետարկվել:",
+                "title": "Ապաամրացնե՞լ բոլոր հաղորդագրությունները։"
+            },
+            "view": "Դիտել ժամանակագրության մեջ"
+        },
+        "pinned_messages_button": "Ամրացված հաղորդագրություններ",
+        "poll": {
+            "active_heading": "Ակտիվ հարցումներ",
+            "empty_active": "Այս սենյակում ակտիվ հարցումներ չկան",
+            "empty_active_load_more": "Ակտիվ հարցումներ չկան: Բեռնեք ավելի շատ հարցումներ՝ նախորդ ամիսների հարցումները դիտելու համար:",
+            "empty_active_load_more_n_days": {
+                "one": "Անցած օրվա համար ակտիվ հարցումներ չկան: Բեռնեք ավելի շատ հարցումներ՝ նախորդ ամիսների հարցումները դիտելու համար:",
+                "other": "Վերջին %(count)s օրերի համար ակտիվ հարցումներ չկան։ Բեռնեք ավելի շատ հարցումներ՝ նախորդ ամիսների հարցումները դիտելու համար։"
+            },
+            "empty_past": "Այս սենյակում անցյալ հարցումներ չկան",
+            "empty_past_load_more": "Անցյալ հարցումներ չկան: Բեռնեք ավելի շատ հարցումներ՝ նախորդ ամիսների հարցումները դիտելու համար:",
+            "empty_past_load_more_n_days": {
+                "one": "Անցած օրվա համար անցյալ հարցումներ չկան: Բեռնեք ավելի շատ հարցումներ՝ նախորդ ամիսների հարցումները դիտելու համար:",
+                "other": "Վերջին %(count)s օրերի համար անցյալ հարցումներ չկան։ Բեռնեք ավելի շատ հարցումներ՝ նախորդ ամիսների հարցումները դիտելու համար։"
+            },
+            "final_result": {
+                "one": "Վերջնական արդյունքը՝ հիմնված %(count)s ձայնի վրա",
+                "other": "Վերջնական արդյունքը՝ հիմնված %(count)s ձայների վրա"
+            },
+            "load_more": "Բեռնել ավելի շատ հարցումներ",
+            "loading": "Հարցումների բեռնում",
+            "past_heading": "Անցյալ հարցումներ",
+            "view_in_timeline": "Դիտել հարցումը ժամանակացույցում",
+            "view_poll": "Դիտել հարցումը"
+        },
+        "polls_button": "Հարցումներ",
+        "room_summary_card": {
+            "title": "Սենյակի տեղեկություններ"
+        },
+        "thread_list": {
+            "context_menu_label": "Թեմայի ընտրանքներ"
+        },
+        "video_room_chat": {
+            "title": "Զրուցարան"
+        }
+    },
+    "room": {
+        "3pid_invite_email_not_found_account": "Այս հրավերը ուղարկվել է %(email)s հասցեին, որը կապված չէ ձեր հաշվի հետ",
+        "3pid_invite_email_not_found_account_room": "%(roomName)s սենյակի հրավերը %(email)s հասցեին է ուղարկվել, որը կապված չէ ձեր հաշվի հետ",
+        "3pid_invite_error_description": "Ձեր հրավերը վավերացնելու փորձի ժամանակ վերադարձվել է սխալ (%(errcode)s): Դուք կարող եք փորձել այս տեղեկությունը փոխանցել այն մարդուն, ով հրավիրել է ձեզ։",
+        "3pid_invite_error_invite_action": "Ամեն դեպքում փորձել միանալ",
+        "3pid_invite_error_invite_subtitle": "Դուք կարող եք միանալ միայն գործող հրավերով։",
+        "3pid_invite_error_public_subtitle": "Դուք դեռ կարող եք միանալ այստեղ։",
+        "3pid_invite_error_title": "Ձեր հրավերի հետ կապված ինչոր բան սխալ է եղել։",
+        "3pid_invite_error_title_room": "%(roomName)s սենյակի ձեր հրավերի հետ կապված ինչոր բան սխալ է գնացել",
+        "3pid_invite_no_is_subtitle": "Օգտագործեք նույնականացման սերվերը Կարգավորումներում՝ հրավերներ ստանալու համար անմիջապես %(brand)s-ում:",
+        "banned_by": "Դուք արգելափակվել եք %(memberName)s-ի կողմից",
+        "banned_from_room_by": "Դուք արգելափակվել եք %(roomName)s-ից %(memberName)s-ի կողմից",
+        "context_menu": {
+            "copy_link": "Պատճենել սենյակի հղումը",
+            "favourite": "Սիրված",
+            "forget": "Մոռանալ սենյակը",
+            "low_priority": "Ցածր առաջնահերթություն",
+            "mark_read": "Նշել որպես կարդացված",
+            "mark_unread": "Նշել որպես չկարդացված",
+            "notifications_default": "Համապատասխանում լռելյայն կարգավորումը",
+            "notifications_mute": "Լռեցնել սենյակը",
+            "title": "Սենյակի տարբերակներ",
+            "unfavourite": "Ավելացված է ընտրյալների մեջ"
+        },
+        "creating_room_text": "Մենք ստեղծում ենք սենյակ %(names)s անունով",
+        "dm_invite_action": "Սկսել զրուցել",
+        "dm_invite_subtitle": "<userName/>-ը ցանկանում է զրուցել",
+        "dm_invite_title": "Ցանկանո՞ւմ եք զրուցել %(user)s-ի հետ:",
+        "drop_file_prompt": "Ֆայլը գցեք այստեղ՝ վերբեռնելու համար",
+        "edit_topic": "Խմբագրել թեման",
+        "error_3pid_invite_email_lookup": "Անհնար է գտնել օգտատիրոջը էլ. փոստով",
+        "error_cancel_knock_title": "Չհաջողվեց չեղարկել",
+        "error_join_403": "Այս սենյակ մուտք գործելու համար ձեզ անհրաժեշտ է հրավեր:",
+        "error_join_404_1": "Դուք փորձել եք միանալ սենյակի ID-ով՝ առանց միանալու սերվերների ցանկ տրամադրելու։ Սենյակի ID-ները ներքին նույնականացուցիչներ են և չեն կարող օգտագործվել սենյակին միանալու համար՝ առանց լրացուցիչ տեղեկությունների։",
+        "error_join_404_2": "Եթե գիտեք սենյակի հասցեն, փորձեք միանալ դրանով։",
+        "error_join_404_invite": "Ձեզ հրավիրող անձը արդեն հեռացել է, կամ նրա սերվերը անջատված է։",
+        "error_join_404_invite_same_hs": "Ձեզ հրավիրած անձն արդեն հեռացել է։",
+        "error_join_connection": "Միանալու սխալ տեղի ունեցավ։",
+        "error_join_incompatible_version_1": "Կներեք, ձեր սերվերը չափազանց հին է այստեղ մասնակցելու համար։",
+        "error_join_incompatible_version_2": "Խնդրում ենք կապվել ձեր սերվերի ադմինիստրատորի հետ։",
+        "error_join_title": "Չհաջողվեց միանալ",
+        "error_jump_to_date": "Սերվերը վերադարձրեց %(statusCode)s վիճակի կոդ՝ %(errorCode)s սխալի կոդով",
+        "error_jump_to_date_connection": "Տվյալ ամսաթիվը գտնելու և դրան անցնելու փորձի ժամանակ ցանցային սխալ տեղի ունեցավ: Հնարավոր է՝ ձեր սերվերը անջատված է, կամ ձեր ինտերնետ կապի հետ կապված ժամանակավոր խնդիր է եղել: Խնդրում ենք կրկին փորձել: Եթե սա շարունակվի, խնդրում ենք կապվել ձեր սերվերի ադմինիստրատորի հետ:",
+        "error_jump_to_date_details": "Սխալի մանրամասներ",
+        "error_jump_to_date_not_found": "Մենք չկարողացանք գտնել %(dateString)s-ից առաջ սպասվող իրադարձություն։ Փորձեք ընտրել ավելի վաղ ամսաթիվ։",
+        "error_jump_to_date_send_logs_prompt": "Խնդրում եմ ներկայացնել <debugLogsLink>վրիպազերծման գրանցամատյանները (debug logs)</debugLogsLink>, որպեսզի օգնեք մեզ հետևել խնդրին։",
+        "error_jump_to_date_title": "Անհնար է գտնել այդ ամսաթվի իրադարձությունը",
+        "face_pile_summary": {
+            "one": "%(count)s անձ, ում գիտեք, արդեն միացել է",
+            "other": "%(count)s մարդիկ, ում գիտեք, արդեն միացել են"
+        },
+        "face_pile_tooltip_label": {
+            "one": "Դիտել 1 անդամ",
+            "other": "Դիտել բոլոր %(count)s անդամներին"
+        },
+        "face_pile_tooltip_shortcut": "Ներառյալ %(commaSeparatedMembers)s",
+        "face_pile_tooltip_shortcut_joined": "Ներառյալ ձեզ, %(commaSeparatedMembers)s",
+        "failed_determine_user": "Հնարավոր չէ պարզել, թե որ օգտվողին պետք է անտեսել, քանի որ անդամակցության իրադարձությունը փոխվել է։",
+        "failed_reject_invite": "Հրավերի մերժումը ձախողվեց",
+        "forget_room": "Մոռանալ այս սենյակը",
+        "forget_space": "Մոռանալ այս տարածքը",
+        "header": {
+            "n_people_asking_to_join": {
+                "one": "Խնդրում են միանալ",
+                "other": "%(count)s մարդիկ խնդրում են միանալ"
+            },
+            "room_is_public": "Այս սենյակը հանրային է"
+        },
+        "header_avatar_open_settings_label": "Բացել սենյակի կարգավորումները",
+        "header_face_pile_tooltip": "Մարդիկ",
+        "header_untrusted_label": "Անվստահելի",
+        "inaccessible": "Այս սենյակը կամ տարածքը այս պահին հասանելի չէ։",
+        "inaccessible_name": "%(roomName)s-ն այս պահին հասանելի չէ։",
+        "inaccessible_subtitle_1": "Փորձեք կրկին ավելի ուշ կամ խնդրեք սենյակի կամ տարածքի ադմինիստրատորին ստուգել, թե արդյոք դուք ունեք հասանելիություն:",
+        "inaccessible_subtitle_2": "%(errcode)s-ը վերադարձվել է սենյակ կամ տարածք մուտք գործելու փորձի ժամանակ։ Եթե կարծում եք, որ այս հաղորդագրությունը սխալմամբ եք տեսնում, խնդրում ենք <issueLink> ուղարկել սխալի մասին հաղորդում</issueLink> .",
+        "intro": {
+            "dm_caption": "Այս զրույցին մասնակցում եք միայն դուք երկուսով, քանի դեռ ձեզանից որևէ մեկը չհրավիրի ուրիշ մեկին միանալու։",
+            "enable_encryption_prompt": "Միացրեք կոդավորումը կարգավորումներում։",
+            "encrypted_3pid_dm_pending_join": "Երբ բոլորը միանան, դուք կկարողանաք զրուցել",
+            "no_avatar_label": "Ավելացրեք լուսանկար, որպեսզի մարդիկ հեշտությամբ տեսնեն ձեր սենյակը։",
+            "no_topic": "<a>Ավելացրեք թեմա </a>, որը կօգնի մարդկանց իմանալ, թե ինչի մասին է խոսքը:",
+            "private_unencrypted_warning": "Ձեր մասնավոր հաղորդագրությունները սովորաբար գաղտնագրված են, բայց այս սենյակը՝ ոչ: Սովորաբար դա պայմանավորված է չաջակցվող սարքով կամ մեթոդով, օրինակ՝ էլ.փոստային հրավերներով։",
+            "room_invite": "Հրավիրել միայն այս սենյակ",
+            "send_message_start_dm": "Ուղարկեք Ձեր առաջին հաղորդագրությունը՝ <displayName/>-ին զրույցի հրավիրելու համար",
+            "start_of_dm_history": "Սա ձեր անհատական հաղորդագրությունների պատմության սկիզբն է <displayName/>֊ի հետ.",
+            "start_of_room": "Սա <roomName/>-ի սկիզբն է",
+            "unencrypted_warning": "Ծայրից ծայր գաղտնագրումը միացված չէ",
+            "user_created": "%(displayName)s-ն ստեղծել է այս սենյակը։",
+            "you_created": "Դուք ստեղծեցիք այս սենյակը:"
+        },
+        "invite_email_mismatch_suggestion": "Հրավերներն անմիջապես %(brand)s֊ում ստանալու համար կիսվեք այս էլ․փոստով Կարգավորումներում.",
+        "invite_sent_to_email": "Այս հրավերը ուղարկվել է %(email)s հասցեին",
+        "invite_sent_to_email_room": "%(roomName)s սենյակի այս հրավերը %(email)s հասցեին է ուղարկվել",
+        "invite_subtitle": "Հրավիրված <userName/>֊ի կողմից",
+        "invite_this_room": "Հրավիրել այս սենյակ",
+        "invite_title": "Ցանկանո՞ւմ եք միանալ %(roomName)s֊ին",
+        "inviter_unknown": "Անհայտ",
+        "invites_you_text": "<inviter/>-ը հրավիրում է ձեզ",
+        "join_button_account": "Գրանցվել",
+        "join_failed_needs_invite": "%(roomName)s-ը դիտելու համար անհրաժեշտ է հրավեր",
+        "join_the_discussion": "Միանալ քննարկմանը",
+        "join_title": "Միացեք սենյակին՝ մասնակցելու համար",
+        "join_title_account": "Միանալ զրույցին հաշվի միջոցով",
+        "joining": "Միանում է…",
+        "joining_room": "Միանում է սենյակին…",
+        "joining_space": "Միանում է տարածքին…",
+        "jump_read_marker": "Անցնել առաջին չկարդացված հաղորդագրությանը։",
+        "jump_to_bottom_button": "Անցնել ամենավերջին հաղորդագրություններին",
+        "jump_to_date": "Անցնել ամսաթվին",
+        "jump_to_date_beginning": "Սենյակի սկիզբը",
+        "jump_to_date_prompt": "Ընտրեք ամսաթիվը, որին պետք է անցնել",
+        "kick_reason": "Պատճառը՝ %(reason)s",
+        "kicked_by": "Դուք հեռացվել եք %(memberName)s-ի կողմից",
+        "kicked_from_room_by": "Դուք հեռացվել եք%(roomName)s-ից՝ %(memberName)s-ի կողմից",
+        "knock_cancel_action": "Չեղարկել հարցումը",
+        "knock_denied_subtitle": "Քանի որ ձեզ մերժվել է մուտքը, դուք չեք կարող կրկին միանալ, եթե ձեզ չհրավիրեն խմբի ադմինիստրատորը կամ մոդերատորը։",
+        "knock_denied_title": "Ձեզ թույլ չեն տվել մուտք գործել",
+        "knock_message_field_placeholder": "Հաղորդագրություն (ըստ ցանկության)",
+        "knock_prompt": "Խնդրե՞լ միանալ",
+        "knock_prompt_name": "Խնդրե՞լ միանալ %(roomName)s֊ին",
+        "knock_send_action": "Հայցել հասանելիություն",
+        "knock_sent": "Միանալու հարցումն ուղարկվել է",
+        "knock_sent_subtitle": "Ձեր միանալու հարցումը սպասման մեջ է։",
+        "knock_subtitle": "Զրույցը դիտելու կամ դրան մասնակցելու համար ձեզ անհրաժեշտ է այս սենյակ մուտք գործելու թույլտվություն։ Միանալու հարցում կարող եք ուղարկել ստորև։",
+        "leave_error_title": "Սենյակից դուրս գալու սխալ",
+        "leave_server_notices_description": "Այս սենյակն օգտագործվում է Homeserver-ից կարևոր հաղորդագրությունների համար, ուստի դուք չեք կարող այն լքել։",
+        "leave_server_notices_title": "Հնարավոր չէ լքել սերվերի ծանուցումների սենյակը",
+        "leave_unexpected_error": "Անսպասելի սերվերի սխալ սենյակից դուրս գալու փորձի ժամանակ",
+        "link_email_to_receive_3pid_invite": "Կապեք այս էլ.փոստը Ձեր հաշվի հետ Կարգավորումներում՝ հրավերներ ստանալու համար անմիջապես %(brand)s֊ում:",
+        "loading_preview": "Նախադիտումը բեռնվում է",
+        "no_peek_join_prompt": "%(roomName)s-ը հնարավոր չէ նախադիտել։ Ցանկանո՞ւմ եք միանալ դրան։",
+        "no_peek_no_name_join_prompt": "Նախադիտում չկա, ուզո՞ւմ եք միանալ։",
+        "not_found_subtitle": "Վստա՞հ եք, որ ճիշտ տեղում եք:",
+        "not_found_title": "Այս սենյակը կամ տարածքը գոյություն չունի։",
+        "not_found_title_name": "%(roomName)s-ը գոյություն չունի։",
+        "peek_join_prompt": "Դուք նախադիտում եք %(roomName)s-ը. Ուզու՞մ եք միանալ դրան։",
+        "pinned_message_badge": "Ամրացված հաղորդագրություն",
+        "pinned_message_banner": {
+            "button_close_list": "Փակել ցանկը",
+            "button_view_all": "Դիտել բոլորը",
+            "description": "Այս սենյակում կան ամրացված հաղորդագրություններ։ Սեղմեք՝ դրանք դիտելու համար։",
+            "title": "<bold>%(index)s-ից %(length)s</bold> Ամրացված հաղորդագրություններ"
+        },
+        "read_topic": "Սեղմեք՝ թեման կարդալու համար",
+        "rejecting": "Հրավերի մերժում…",
+        "rejoin_button": "Կրկին միանալ",
+        "room_content": "Սենյակի պարունակությունը",
+        "room_is_low_priority": "Սա ցածր առաջնահերթության սենյակ է",
+        "search": {
+            "all_rooms_button": "Որոնել բոլոր սենյակները",
+            "placeholder": "Փնտրել հաղորդագրություններ…",
+            "summary": {
+                "one": "«<query/>»–ի համար կա 1 արդյունք",
+                "other": "«<query/>»–ի համար կա %(count)s արդյունք"
+            },
+            "this_room_button": "Որոնել այս սենյակը"
+        },
+        "status_bar": {
+            "delete_all": "Ջնջել բոլորը",
+            "exceeded_resource_limit": "Ձեր հաղորդագրությունը չի ուղարկվել, քանի որ այս սերվերը գերազանցել է ռեսուրսների սահմանաչափը։ Խնդրում ենք <a>կապվեք ձեր ծառայության ադմինիստրատորի հետ</a> ծառայությունից օգտվելը շարունակելու համար։",
+            "homeserver_blocked": "Ձեր հաղորդագրությունը չի ուղարկվել, քանի որ այս սերվերն արգելափակվել է ադմինիստրատորի կողմից։ Խնդրում ենք <a>կապվեք ձեր ծառայության ադմինիստրատորի հետ</a> ծառայությունից օգտվելը շարունակելու համար։",
+            "monthly_user_limit_reached": "Ձեր հաղորդագրությունը չի ուղարկվել, քանի որ այս սերվերը հասել է իր ամսական ակտիվ օգտատերերի սահմանաչափին։ Խնդրում ենք <a>կապվեք ձեր ծառայության ադմինիստրատորի հետ</a> ծառայությունից օգտվելը շարունակելու համար։",
+            "requires_consent_agreement": "Դուք չեք կարող ուղարկել որևէ հաղորդագրություն, քանի դեռ չեք վերանայել և համաձայնվել <consentLink>մեր ընդհանուր դրույթներին ու պայմաններին</consentLink>.",
+            "retry_all": "Կրկին փորձել բոլորը",
+            "select_messages_to_retry": "Դուք կարող եք ընտրել բոլորը կամ առանձին հաղորդագրություններ՝ կրկին փորձելու կամ ջնջելու համար",
+            "server_connectivity_lost_description": "Ուղարկված հաղորդագրությունները կպահպանվեն այնքան ժամանակ, քանի դեռ ձեր կապը չի վերադարձել:",
+            "server_connectivity_lost_title": "Սերվերի հետ կապը կորել է։",
+            "some_messages_not_sent": "Ձեր հաղորդագրություններից որոշները չեն ուղարկվել"
+        },
+        "unknown_status_code_for_timeline_jump": "անհայտ կարգավիճակի կոդ",
+        "unread_notifications_predecessor": {
+            "one": "Դուք ունեք %(count)s չընթերցված ծանուցում այս սենյակի նախորդ տարբերակում։",
+            "other": "Դուք ունեք %(count)s չընթերցված ծանուցումներ այս սենյակի նախորդ տարբերակում։"
+        },
+        "upgrade_error_description": "Կրկնակի ստուգեք, որ ձեր սերվերը աջակցում է ընտրված սենյակի տարբերակը և փորձեք կրկին։",
+        "upgrade_error_title": "Սենյակի թարմացման սխալ",
+        "upgrade_warning_bar": "Այս սենյակի արդիականացումը կփակի սենյակի ներկայիս օրինակը և կստեղծի արդիականացված սենյակ նույն անունով։",
+        "upgrade_warning_bar_admins": "Միայն սենյակի ադմինիստրատորները կտեսնեն այս նախազգուշացումը",
+        "upgrade_warning_bar_unstable": "Այս սենյակում աշխատում է <roomVersion /> սենյակի տարբերակը, որը այս սերվերը նշել է որպես <i>անկայուն</i>:",
+        "upgrade_warning_bar_upgraded": "Այս սենյակն արդեն արդիականացվել է։",
+        "upload": {
+            "uploading_multiple_file": {
+                "one": "Բեռնվում է %(filename)s և %(count)s այլ ֆայլ",
+                "other": "Բեռնվում է %(filename)s և %(count)s այլ ֆայլեր"
+            },
+            "uploading_single_file": "Բեռնվում է %(filename)s-ը"
+        },
+        "video_room": "Սենյակը նախատեսված է վիդեո կապի համար",
+        "waiting_for_join_subtitle": "Երբ հրավիրված օգտատերերը միանան %(brand)s-ին, դուք կկարողանաք զրուցել և սենյակը կլինի ծայրից ծայր գաղտնագրված",
+        "waiting_for_join_title": "Սպասում ենք %(brand)s-ին օգտատերերի միանալուն"
+    },
+    "room_list": {
+        "add_room_label": "Ավելացնել սենյակ",
+        "add_space_label": "Ավելացնել տարածք",
+        "breadcrumbs_empty": "Վերջերս այցելած սենյակներ չկան",
+        "breadcrumbs_label": "Վերջերս այցելած սենյակներ",
+        "collapse_filters": "Ծալել ֆիլտրերի ցանկը",
+        "empty": {
+            "no_chats": "Դեռևս զրույցներ չկան",
+            "no_chats_description": "Սկսեք՝ ուղարկելով հաղորդագրություն ինչ-որ մեկին կամ ստեղծելով սենյակ",
+            "no_chats_description_no_room_rights": "Սկսեք՝ հաղորդագրություն ուղարկելով ինչ-որ մեկին։",
+            "no_favourites": "Դուք դեռ չունեք սիրելի զրույց",
+            "no_favourites_description": "Զրույցը նախընտրածների մեջ ավելացնելու համար օգտագործեք զրույցի կարգավորումները։",
+            "no_invites": "Դուք չունեք չկարդացված հրավերներ",
+            "no_lowpriority": "Դուք ցածր առաջնահերթության սենյակներ չունեք",
+            "no_mentions": "Դուք չունեք չկարդացված հիշատակումներ",
+            "no_people": "Դուք դեռ ոչ մեկի հետ անհատական զրույց չունեք",
+            "no_people_description": "Դուք կարող եք անջատել ֆիլտրերը՝ ձեր մյուս զրույցները տեսնելու համար",
+            "no_rooms": "Դուք դեռ որևէ սենյակում չեք գտնվում",
+            "no_rooms_description": "Դուք կարող եք անջատել ֆիլտրերը՝ ձեր մյուս զրույցները տեսնելու համար",
+            "no_unread": "Շնորհավորանքներ։ Դուք չունեք չկարդացված հաղորդագրություններ։",
+            "show_activity": "Տեսնել ամբողջ ակտիվությունը",
+            "show_chats": "Ցուցադրել բոլոր զրույցները"
+        },
+        "expand_filters": "Ընդարձակել ֆիլտրերի ցանկը",
+        "failed_add_tag": "Չհաջողվեց %(tagName)s պիտակը(tag) ավելացնել սենյակին",
+        "failed_remove_tag": "Չհաջողվեց հեռացնել %(tagName)s պիտակը(tag) սենյակից",
+        "failed_set_dm_tag": "Չհաջողվեց սահմանել ուղիղ հաղորդագրության պիտակը(tag)",
+        "filters": {
+            "favourite": "Ընտրյալներ",
+            "invites": "Հրավերներ",
+            "low_priority": "Ցածր առաջնահերթություն",
+            "mentions": "Հիշատակումներ",
+            "people": "Մարդիկ",
+            "rooms": "Սենյակներ",
+            "unread": "Չկարդացվածներ"
+        },
+        "home_menu_label": "Գլխավոր էջի ընտրանքներ",
+        "join_public_room_label": "Միանալ հանրային սենյակին",
+        "joining_rooms_status": {
+            "one": "Ներկայումս միանում է %(count)s սենյակին",
+            "other": "Ներկայումս միանում է %(count)s սենյակներին"
+        },
+        "list_title": "Սենյակների ցանկ",
+        "more_options": {
+            "copy_link": "Պատճենել սենյակի հղումը",
+            "favourited": "Ավելացված է ընտրյալների մեջ",
+            "leave_room": "Լքել սենյակը",
+            "low_priority": "Ցածր առաջնահերթություն",
+            "mark_read": "Նշել որպես կարդացված",
+            "mark_unread": "Նշել որպես չկարդացված"
+        },
+        "notification_options": "Ծանուցման ընտրանքներ",
+        "open_space_menu": "Բացել տարածքների մենյուն",
+        "primary_filters": "Սենյակների ցանկի ֆիլտրեր",
+        "redacting_messages_status": {
+            "one": "Ներկայումս ջնջվում են %(count)s սենյակում",
+            "other": "Ներկայումս ջնջվում են %(count)s սենյակներում"
+        },
+        "room": {
+            "more_options": "Լրացուցիչ ընտրանքներ",
+            "open_room": "Բացել %(roomName)s սենյակը"
+        },
+        "room_options": "Սենյակի պարամետրեր",
+        "show_less": "Ցուցադրել ավելի քիչ",
+        "show_n_more": {
+            "one": "Ցուցադրել ևս %(count)s",
+            "other": "Ցուցադրել ևս %(count)s"
+        },
+        "show_previews": "Ցուցադրել հաղորդագրությունների նախադիտումները",
+        "sort": "Տեսակավորել",
+        "sort_by": "Տեսակավորել ըստ",
+        "sort_by_activity": "Գործունեություն",
+        "sort_by_alphabet": "Ա—Ֆ",
+        "sort_type": {
+            "activity": "Գործունեություն",
+            "atoz": "Ա–Ֆ"
+        },
+        "sort_unread_first": "Սկզբում ցուցադրել չկարդացված հաղորդագրություններով սենյակները",
+        "space_menu": {
+            "home": "Տարածքի գլխավոր էջ",
+            "space_settings": "Տարածքի կարգավորումներ"
+        },
+        "space_menu_label": "%(spaceName)s-ի մենյուն",
+        "sublist_options": "Ցուցակի ընտրանքներ",
+        "suggested_rooms_heading": "Խորհուդ տրվող սենյակներ"
+    },
+    "room_settings": {
+        "access": {
+            "description_space": "Որոշել, թե ով կարող է դիտել և միանալ %(spaceName)s-ին:",
+            "title": "Մուտք/հասանելիություն"
+        },
+        "advanced": {
+            "error_upgrade_description": "Սենյակի թարմացումը/արդիականացումը հնարավոր չէր ավարտել",
+            "error_upgrade_title": "Չհաջողվեց թարմացնել սենյակը",
+            "information_section_room": "Սենյակի մասին տեղեկատվություն",
+            "information_section_space": "Տարածքի մասին տեղեկատվություն",
+            "room_id": "Ներքին սենյակի ID",
+            "room_predecessor": "Դիտել հին հաղորդագրությունները %(roomName)s֊ում։",
+            "room_upgrade_button": "Թարմացրեք այս սենյակը սենյակի առաջարկվող տարբերակով",
+            "room_upgrade_warning": "<b>Զգուշացում</b>․ սենյակի թարմացումը <i>չի հանգեցնի սենյակի անդամների ավտոմատ տեղափոխմանը սենյակի նոր տարբերակին։</i> Մենք նոր սենյակի հղումը կտեղադրենք սենյակի հին տարբերակում. սենյակի անդամները պետք է սեղմեն այս հղման վրա՝ նոր սենյակին միանալու համար։",
+            "room_version": "Սենյակի տարբերակ․",
+            "room_version_section": "Սենյակի տարբերակ",
+            "space_predecessor": "Դիտել %(spaceName)s-ի ավելի հին տարբերակը",
+            "space_upgrade_button": "Թարմացրեք այս տարածքը սենյակի առաջարկվող տարբերակով",
+            "unfederated": "Այս սենյակը հասանելի չէ հեռակա Matrix սերվերների կողմից",
+            "upgrade_button": "Թարմացնել այս սենյակը մինչև %(version)s տարբերակը",
+            "upgrade_dialog_description": "Այս սենյակի թարմացումը/արդիականացումը պահանջում է սենյակի ներկայիս օրինակի փակումը և դրա տեղում նոր սենյակի ստեղծումը։ Սենյակի անդամներին լավագույն հնարավոր փորձառություն տրամադրելու համար մենք կանենք հետևյալը՝",
+            "upgrade_dialog_description_1": "Ստեղծել նոր սենյակ՝ նույն անունով, նկարագրությամբ և ավատարով",
+            "upgrade_dialog_description_2": "Թարմացնել ցանկացած տեղական սենյակի կեղծանուն՝ նոր սենյակին մատնանշելու համար",
+            "upgrade_dialog_description_3": "Կանխել օգտատերերի խոսելը սենյակի հին տարբերակում և տեղադրել հաղորդագրություն՝ խորհուրդ տալով օգտատերերին տեղափոխվել նոր սենյակ։",
+            "upgrade_dialog_description_4": "Նոր սենյակի սկզբում տեղադրեք հղում դեպի հին սենյակ, որպեսզի մարդիկ կարողանան տեսնել հին հաղորդագրությունները",
+            "upgrade_dialog_title": "Թարմացնել սենյակի տարբերակը",
+            "upgrade_dwarning_ialog_title_public": "Թարմացնել/արդիականացնել հանրային սենյակը",
+            "upgrade_warning_dialog_description": "Սենյակի արդիականացումը լրացուցիչ գործողություն է և սովորաբար խորհուրդ է տրվում, երբ սենյակը անկայուն է սխալների, բացակայող գործառույթների կամ անվտանգության խոցելիությունների պատճառով։",
+            "upgrade_warning_dialog_explainer": "<b>Խնդրում ենք նկատի ունենալ, որ արդիականացումը կստեղծի սենյակի նոր տարբերակ</b>։ Բոլոր ընթացիկ հաղորդագրությունները կմնան այս արխիվացված սենյակում։",
+            "upgrade_warning_dialog_footer": "Դուք կարդիականացնեք այս սենյակը <oldVersion />-ից <newVersion />-ի։",
+            "upgrade_warning_dialog_invite_label": "Ավտոմատ կերպով այս սենյակի անդամներին հրավիրել նոր սենյակ",
+            "upgrade_warning_dialog_report_bug_prompt": "Սա սովորաբար ազդում է միայն այն բանի վրա, թե ինչպես է սենյակը մշակվում սերվերի վրա։ Եթե ​​խնդիրներ ունեք ձեր %(brand)s-ի հետ, խնդրում ենք հաղորդել սխալի մասին։",
+            "upgrade_warning_dialog_report_bug_prompt_link": "Սա սովորաբար ազդում է միայն այն բանի վրա, թե ինչպես է սենյակը մշակվում սերվերի վրա։ Եթե ​​խնդիրներ ունեք ձեր %(brand)s-ի հետ, խնդրում ենք <a>հաղորդել սխալի մասին</a>:",
+            "upgrade_warning_dialog_title": "Թարմացնել/արդիականացնել սենյակը",
+            "upgrade_warning_dialog_title_private": "Թարմացնել մասնավոր սենյակը"
+        },
+        "alias_not_specified": "նշված չէ",
+        "bridges": {
+            "description": "Այս սենյակը կամուրջ է հանդիսանում հետևյալ հարթակների հետ հաղորդագրությունների համար։ <a>Իմանալ ավելին։</a>",
+            "empty": "Այս սենյակը որևէ հարթակի հետ հաղորդագրություններ չի կապում։ <a>Իմանալ ավելին։</a>",
+            "title": "Կամուրջներ"
+        },
+        "delete_avatar_label": "Ջնջել ավատարը",
+        "general": {
+            "alias_field_has_domain_invalid": "Դոմենի բաժանարարը բացակայում է, օրինակ. (:domain.org)",
+            "alias_field_has_localpart_invalid": "Սենյակի անունը կամ բաժանիչը բացակայում է, օրինակ. (my-room:domain.org)",
+            "alias_field_matches_invalid": "Այս հասցեն չի մատնանշում այս սենյակին",
+            "alias_field_placeholder_default": "օրինակ՝ իմ-սենյակը",
+            "alias_field_required_invalid": "Խնդրում ենք տրամադրել հասցե",
+            "alias_field_safe_localpart_invalid": "Որոշ նիշեր թույլատրված չեն",
+            "alias_field_taken_invalid": "Այս հասցեն ուներ անվավեր սերվեր կամ արդեն օգտագործվում է",
+            "alias_field_taken_invalid_domain": "Այս հասցեն արդեն օգտագործվում է",
+            "alias_field_taken_valid": "Այս հասցեն հասանելի է օգտագործման համար",
+            "alias_heading": "Սենյակի հասցե",
+            "aliases_items_label": "Այլ հրապարակված հասցեներ.",
+            "aliases_no_items_label": "Այլ հրապարակված հասցեներ դեռ չկան, ավելացրեք մեկը ստորև",
+            "aliases_section": "Սենյակի հասցեներ",
+            "avatar_field_label": "Սենյակի ավատար",
+            "canonical_alias_field_label": "Հիմնական հասցե",
+            "default_url_previews_off": "URL նախադիտումները լռելյայն անջատված են այս սենյակի մասնակիցների համար:",
+            "default_url_previews_on": "URL- ի նախադիտումները միացված են լռելյայն այս սենյակի մասնակիցների համար:",
+            "description_space": "Խմբագրել ձեր տարածքին վերաբերող կարգավորումները:",
+            "error_creating_alias_description": "Այդ հասցեն ստեղծելիս սխալ տեղի ունեցավ։ Հնարավոր է՝ սերվերը թույլ չի տվել դա, կամ ժամանակավոր խափանում է տեղի ունեցել։",
+            "error_creating_alias_title": "Հասցեի ստեղծման սխալ",
+            "error_deleting_alias_description": "Այդ հասցեն հեռացնելիս սխալ տեղի ունեցավ։ Հնարավոր է՝ այն այլևս գոյություն չունի, կամ ժամանակավոր սխալ է տեղի ունեցել։",
+            "error_deleting_alias_description_forbidden": "Դուք չունեք հասցեն ջնջելու թույլտվություն։",
+            "error_deleting_alias_title": "Հասցեն հեռացնելիս սխալ առաջացավ։",
+            "error_publishing": "Հնարավոր չէ հրապարակել սենյակը",
+            "error_publishing_detail": "Այս սենյակը հրապարակելիս սխալ տեղի ունեցավ",
+            "error_save_space_settings": "Չհաջողվեց պահպանել տարածքի կարգավորումները։",
+            "error_updating_alias_description": "Սենյակի այլընտրանքային հասցեները թարմացնելու սխալ է տեղի ունեցել: Հնարավոր է՝ սերվերը թույլ չի տվել դա, կամ ժամանակավոր խափանում է տեղի ունեցել։",
+            "error_updating_canonical_alias_description": "Սենյակի հիմնական հասցեն թարմացնելու սխալ է եղել: Հնարավոր է՝ սերվերը թույլ չի տվել դա, կամ ժամանակավոր խափանում է տեղի ունեցել։",
+            "error_updating_canonical_alias_title": "Հիմնական հասցեի թարմացման սխալ",
+            "leave_space": "Լքել տարածքը",
+            "local_alias_field_label": "Լոկալ հասցե",
+            "local_aliases_explainer_room": "Սահմանեք հասցեներ այս սենյակի համար, որպեսզի օգտատերերը կարողանան գտնել այս սենյակը ձեր homeserver-ի միջոցով (%(localDomain)s)",
+            "local_aliases_explainer_space": "Սահմանեք հասցեներ այս տարածքի համար, որպեսզի օգտատերերը կարողանան գտնել այս տարածքը ձեր homeserver-ի միջոցով (%(localDomain)s)",
+            "local_aliases_section": "Լոկալ հասցեներ",
+            "name_field_label": "Սենյակի անուն",
+            "new_alias_placeholder": "Նոր հրապարակված հասցե (օրինակ ՝ #alias:server)",
+            "no_aliases_room": "Այս սենյակը չունի լոկալ հասցեներ",
+            "no_aliases_space": "Այս տարածքը չունի լոկալ հասցեներ",
+            "other_section": "Այլ",
+            "publish_toggle": "Հրապարակեք այս սենյակը հանրության համար %(domain)s-ի սենյակների տեղեկատուում:",
+            "published_aliases_description": "Հասցե հրապարակելու համար նախ այն պետք է սահմանվի որպես լոկալ հասցե:",
+            "published_aliases_explainer_room": "Հրապարակված հասցեները կարող են օգտագործվել ցանկացած մեկի կողմից ցանկացած սերվերում՝ ձեր սենյակին միանալու համար։",
+            "published_aliases_explainer_space": "Հրապարակված հասցեները կարող են օգտագործվել ցանկացած մեկի կողմից ցանկացած սերվերում` ձեր տարածքին միանալու համար:",
+            "published_aliases_section": "Հրապարակված հասցեներ",
+            "save": "Պահպանել փոփոխությունները",
+            "topic_field_label": "Սենյակի թեմա",
+            "url_preview_encryption_warning": "Գաղտնագրված սենյակներում, ինչպես այս մեկը, URL նախադիտումները անջատվում են լռելյայն `ապահովելու համար, որ ձեր homeserver-ը (որտեղ առաջանում են նախադիտումները) չկարողանա տեղեկություններ հավաքել այս սենյակում տեսած հղումների մասին:",
+            "url_preview_explainer": "Երբ ինչոր մեկը URL է դնում իր հաղորդագրության մեջ, URL- ի նախադիտումը կարող է ցուցադրվել` այդ հղման մասին լրացուցիչ տեղեկություններ տալու համար, ինչպիսիք են վերնագիրը, նկարագրությունը և կայքէջից պատկերը:",
+            "url_previews_section": "URL- ի նախադիտումներ",
+            "user_url_previews_default_off": "Դուք լռելյայն <a>անջատել եք</a> URL- ի նախադիտումները:",
+            "user_url_previews_default_on": "Դուք լռելյայն <a>միացրել եք</a> URL- ի նախադիտումները:"
+        },
+        "notifications": {
+            "browse_button": "Զննել",
+            "custom_sound_prompt": "Սահմանել նոր անհատական ձայն",
+            "notification_sound": "Ծանուցման ձայն",
+            "settings_link": "Ստացեք ծանուցումներ, ինչպես սահմանված է ձեր <a>կարգավորումներում</a>",
+            "sounds_section": "Ձայներ",
+            "upload_sound_label": "Վերբեռնել անհատական ձայն",
+            "uploaded_sound": "Վերբեռնված ձայն"
+        },
+        "people": {
+            "knock_empty": "Ոչ մի խնդրանք",
+            "knock_section": "Միանալու խնդրանք",
+            "see_less": "Տեսնել ավելի քիչ",
+            "see_more": "Տեսնել ավելին"
+        },
+        "permissions": {
+            "add_privileged_user_description": "Այս սենյակում մեկ կամ մի քանի օգտատերերին տալ ավելի շատ արտոնություններ",
+            "add_privileged_user_filter_placeholder": "Որոնել օգտատերերին այս սենյակում...",
+            "add_privileged_user_heading": "Ավելացնել արտոնյալ օգտատերեր",
+            "ban": "Արգելափակել օգտվողներին",
+            "ban_reason": "Պատճառ",
+            "banned_by": "Արգելափակված է %(displayName)s֊ի կողմից",
+            "banned_users_section": "Արգելափակված օգտատերեր",
+            "error_changing_pl_description": "Սխալ է տեղի ունեցել օգտատիրոջ հզորության մակարդակը փոխելիս։ Համոզվեք, որ ունեք բավարար թույլտվություններ և փորձեք կրկին։",
+            "error_changing_pl_reqs_description": "Սենյակի հզորության մակարդակի պահանջները փոխելիս սխալ է տեղի ունեցել։ Համոզվեք, որ ունեք բավարար թույլտվություններ և փորձեք կրկին։",
+            "error_changing_pl_reqs_title": "Սխալ առաջացավ հզորության մակարդակի պահանջը փոխելիս",
+            "error_changing_pl_title": "Սխալ առաջացավ հզորության մակարդակը փոխելիս։",
+            "error_unbanning": "Չհաջողվեց ապաարգելափակել",
+            "events_default": "Ուղարկել հաղորդագրությունները",
+            "invite": "Հրավիրել օգտվողներին",
+            "kick": "Հեռացնել օգտվողներին",
+            "m.call": "Սկսել %(brand)s զանգեր",
+            "m.call.member": "Միանալ %(brand)s զանգերին",
+            "m.reaction": "Ուղարկել արձագանքներ",
+            "m.room.avatar": "Փոխեք սենյակի ավատարը",
+            "m.room.avatar_space": "Փոխեք տարածության ավատարը",
+            "m.room.canonical_alias": "Փոխեք սենյակի հիմնական հասցեն",
+            "m.room.canonical_alias_space": "Փոխեք տարածության հիմնական հասցեն",
+            "m.room.encryption": "Միացնել սենյակի կոդավորումը",
+            "m.room.history_visibility": "Փոխել պատմության տեսանելիությունը",
+            "m.room.name": "Փոխել սենյակի անունը",
+            "m.room.name_space": "Փոխել տարածության անունը",
+            "m.room.pinned_events": "Կառավարել ամրացված իրադարձությունները",
+            "m.room.power_levels": "Փոխել թույլտվությունները",
+            "m.room.redaction": "Ջնջել իմ կողմից ուղարկված հաղորդագրությունները",
+            "m.room.server_acl": "Փոխել սերվերի ACL-ները(մուտքի վերահսկման ցուցակներ)",
+            "m.room.tombstone": "Թարմացնել սենյակը",
+            "m.room.topic": "Փոխել թեման",
+            "m.room.topic_space": "Փոխել նկարագրությունը",
+            "m.space.child": "Կառավարեք սենյակները այս տարածքում",
+            "m.widget": "Փոփոխել վիջեթները",
+            "muted_users_section": "Անջատված օգտատերեր",
+            "no_privileged_users": "Այս սենյակում ոչ մի օգտատեր չունի հատուկ արտոնություններ",
+            "notifications.room": "Տեղեկացնել բոլորին",
+            "permissions_section": "Թույլտվություններ",
+            "permissions_section_description_room": "Ընտրել սենյակի տարբեր մասերը փոխելու համար անհրաժեշտ դերերը",
+            "permissions_section_description_space": "Ընտրել տարածքի տարբեր մասերը փոխելու համար անհրաժեշտ դերերը",
+            "privileged_users_section": "Արտոնյալ օգտատերեր",
+            "redact": "Հեռացրեք ուրիշների կողմից ուղարկված հաղորդագրությունները",
+            "send_event_type": "Ուղարկել %(eventType)s իրադարձություններ",
+            "state_default": "Փոխել կարգավորումները",
+            "title": "Դերեր և թույլտվություններ",
+            "users_default": "Լռելյայն դեր"
+        },
+        "security": {
+            "enable_encryption_confirm_description": "Սենյակի գաղտնագրումը միացնելուց հետո՝ չի կարող անջատվել: Գաղտնագրված սենյակում ուղարկված հաղորդագրությունները չեն կարող տեսանելի լինել սերվերի կողմից, միայն սենյակի մասնակիցների կողմից։ Գաղտնագրումը միացնելը կարող է կանխել բազմաթիվ բոտերի և կամուրջների ճիշտ աշխատանքը: <a>Իմանալ ավելին գաղտնագրման մասին:</a>",
+            "enable_encryption_confirm_title": "Միացնե՞լ գաղտնագրումը",
+            "enable_encryption_public_room_confirm_description_1": "<b>Խորհուրդ չի տրվում ավելացնել գաղտնագրում հանրային սենյակներում: </b> Յուրաքանչյուր ոք կարող է գտնել և միանալ հանրային սենյակներին, այնպես որ ցանկացած մեկը կարող է կարդալ այդտեղի հաղորդագրությունները. Դուք չեք ստանա գաղտնագրման ոչ մի առավելություն, և հետագայում չեք կարողանա այն անջատել: Հաղորդագրությունների գաղտնագրումը հասարակական սենյակում կդարձնի հաղորդագրությունների ստացումն ու ուղարկումն ավելի դանդաղ:",
+            "enable_encryption_public_room_confirm_description_2": "Այս հարցերից խուսափելու համար ստեղծեք <a>նոր գաղտնագրված սենյակ</a>՝ ձեր նախատեսած զրույցների համար։",
+            "enable_encryption_public_room_confirm_title": "Համոզվա՞ծ եք, որ ցանկանում եք ավելացնել գաղտնագրում այս հանրային սենյակում:",
+            "encrypted_room_public_confirm_description_1": "<b>Խորհուրդ չի տրվում գաղտնագրված սենյակները հանրայնացնել:</b> Դա կնշանակի, որ ցանկացած մեկը կարող է գտնել և միանալ սենյակին, այնպես որ ցանկացած մեկը կարող է կարդալ հաղորդագրությունները. Դուք չեք ստանա գաղտնագրման առավելություններից ոչ մեկը: Հասարակական սենյակում հաղորդագրությունների գաղտնագրումը հաղորդագրությունների ստացումը և ուղարկումը կդարձնի ավելի դանդաղ:",
+            "encrypted_room_public_confirm_description_2": "Այս խնդիրներից խուսափելու համար ստեղծեք <a>նոր հանրային սենյակ</a>՝ ձեր նախատեսած զրույցների համար։",
+            "encrypted_room_public_confirm_title": "Համոզվա՞ծ եք, որ ցանկանում եք հանրայնացնել այս գաղտնագրված սենյակը:",
+            "encryption_forced": "Ձեր սերվերը պահանջում է անջատել գաղտնագրումը։",
+            "encryption_permanent": "Միացնելուց հետո՝ գաղտնագրումը չի կարող անջատվել:",
+            "error_join_rule_change_title": "Չհաջողվեց թարմացնել միացման կանոնները",
+            "error_join_rule_change_unknown": "Անհայտ ձախողում",
+            "guest_access_warning": "Աջակցվող ծրագրեր ունեցող մարդիկ կկարողանան միանալ սենյակին՝ առանց գրանցված հաշիվ ունենալու:",
+            "history_visibility_invited": "Միայն անդամներ (քանի որ նրանք հրավիրված էին)",
+            "history_visibility_joined": "Միայն անդամներ (քանի որ նրանք միացել էին)",
+            "history_visibility_legend": "Ո՞վ կարող է կարդալ պատմությունը:",
+            "history_visibility_shared": "Միայն անդամներ (այս տարբերակն ընտրելու պահից ի վեր)",
+            "history_visibility_warning": "Պատմությունը կարդալու իրավունք ունեցողների փոփոխությունները կկիրառվեն միայն այս սենյակի ապագա հաղորդագրություններին։ Գոյություն ունեցող պատմության տեսանելիությունը չի փոխվի։",
+            "history_visibility_world_readable": "Յուրաքանչյուր ոք",
+            "join_rule_description": "Որոշեք, թե ով կարող է միանալ %(roomName)s֊ին։",
+            "join_rule_invite": "Մասնավոր (միայն հրավերով)",
+            "join_rule_invite_description": "Միայն հրավիրված անձինք կարող են միանալ:",
+            "join_rule_knock": "Խնդրել միանալ",
+            "join_rule_knock_description": "Մարդիկ չեն կարող միանալ, եթե մուտք չտրվի:",
+            "join_rule_public_description": "Յուրաքանչյուր ոք կարող է գտնել և միանալ:",
+            "join_rule_restricted": "Տարածքի անդամներ",
+            "join_rule_restricted_description": "Յուրաքանչյուր ոք տարածքում կարող է գտնել և միանալ: <a>Խմբագրել, թե որ տարածքները կարող են մուտք գործել այստեղ:</a>",
+            "join_rule_restricted_description_active_space": "Յուրաքանչյուր ոք <spaceName/>-ում կարող է գտնել և միանալ: Դուք կարող եք ընտրել նաև այլ տարածքներ:",
+            "join_rule_restricted_description_prompt": "Յուրաքանչյուր ոք տարածքում կարող է գտնել և միանալ: Դուք կարող եք ընտրել բազմաթիվ տարածքներ:",
+            "join_rule_restricted_description_spaces": "Մուտք ունեցող տարածքներ",
+            "join_rule_restricted_dialog_description": "Որոշել, թե որ տարածքները կարող են մուտք գործել այս սենյակ: Եթե ընտրված է տարածք, դրա անդամները կարող են գտնել և միանալ <RoomName/>-ին:",
+            "join_rule_restricted_dialog_empty_warning": "Դուք հեռացնում եք բոլոր տարածքները: Մուտքը լռելյայն կլինի միայն հրավերով",
+            "join_rule_restricted_dialog_filter_placeholder": "Որոնել տարածքներ",
+            "join_rule_restricted_dialog_heading_known": "Այլ տարածքներ, որոնք դուք գիտեք",
+            "join_rule_restricted_dialog_heading_other": "Այլ տարածքներ կամ սենյակներ, որոնք դուք կարող եք չիմանալ",
+            "join_rule_restricted_dialog_heading_room": "Ձեր իմացած տարածքները, որոնք պարունակում են այս սենյակը",
+            "join_rule_restricted_dialog_heading_space": "Ձեր իմացած տարածքները, որոնք պարունակում են այս տարածքը",
+            "join_rule_restricted_dialog_heading_unknown": "Սրանք, ամենայն հավանականությամբ, նրանք են, որոնց մասնակցում են նաև սենյակի այլ ադմինիստրատորներ։",
+            "join_rule_restricted_dialog_title": "Ընտրել տարածքներ",
+            "join_rule_restricted_n_more": {
+                "one": "և %(count)s ավելին",
+                "other": "և %(count)s ավելին"
+            },
+            "join_rule_restricted_summary": {
+                "one": "Ներկայումս տարածքը հասանելի է",
+                "other": "Ներկայումս %(count)s տարածքները հասանելի են"
+            },
+            "join_rule_restricted_upgrade_description": "Այս թարմացումը թույլ կտա ընտրված տարածքների անդամներին մուտք ունենալ այս սենյակ առանց հրավերի.",
+            "join_rule_restricted_upgrade_warning": "Այս սենյակը գտնվում է որոշ տարածքներում, որտեղ դուք ադմինիստրատոր չեք: Այդ տարածքներում դեռ կցուցադրվի հին սենյակը, բայց մարդկանց հուշում կտրվի միանալ նորին։",
+            "join_rule_upgrade_awaiting_room": "Բեռնվում է նոր սենյակ",
+            "join_rule_upgrade_required": "Պահանջվում է թարմացում",
+            "join_rule_upgrade_sending_invites": {
+                "one": "Հրավերի ուղարկում...",
+                "other": "Հրավերների ուղարկում... (%(count)s-ից %(progress)s)"
+            },
+            "join_rule_upgrade_updating_spaces": {
+                "one": "Տարածքի թարմացում...",
+                "other": "Տարածքների թարմացում... (%(count)s-ից %(progress)s)"
+            },
+            "join_rule_upgrade_upgrading_room": "Սենյակի թարմացում",
+            "public_without_alias_warning": "Խնդրում ենք ավելացնել հասցե այս սենյակին հղելու համար:",
+            "publish_room": "Դարձնել այս սենյակը տեսանելի հանրային սենյակների գրացուցակում:",
+            "publish_space": "Դարձնել այս տարածքը տեսանելի հանրային սենյակների գրացուցակում:",
+            "strict_encryption": "Ուղարկեք հաղորդագրություններ միայն ստուգված օգտատերերին:",
+            "title": "Անվտանգություն և գաղտնիություն"
+        },
+        "title": "Սենյակի կարգավորումներ՝ %(roomName)s",
+        "upload_avatar_label": "Վերբեռնել ավատար",
+        "visibility": {
+            "alias_section": "Հասցե",
+            "error_failed_save": "Չհաջողվեց թարմացնել այս տարածքի տեսանելիությունը",
+            "error_update_guest_access": "Այս տարածքի հյուրերի հասանելիությունը թարմացնել չհաջողվեց",
+            "error_update_history_visibility": "Չհաջողվեց թարմացնել այս տարածքի պատմության տեսանելիությունը",
+            "guest_access_explainer": "Հյուրերը կարող են միանալ տարածքին առանց հաշիվ ունենալու:",
+            "guest_access_label": "Միացնել հյուրերի մուտքը",
+            "history_visibility_anyone_space": "Տարածքի նախադիտում",
+            "history_visibility_anyone_space_description": "Թույլատրել մարդկանց նախադիտել ձեր տարածքը՝ նախքան նրանք միանալը:",
+            "history_visibility_anyone_space_recommendation": "Խորհուրդ է տրվում հանրային տարածքների համար:",
+            "title": "Տեսանելիություն"
+        },
+        "voip": {
+            "call_type_section": "Զանգի տեսակ",
+            "enable_element_call_caption": "%(brand)s-ը ծայրից ծայր գաղտնագրված է, բայց ներկայումս սահմանափակված է ավելի փոքր թվով օգտատերերով։",
+            "enable_element_call_label": "Միացրեք %(brand)s-ը որպես լրացուցիչ զանգի տարբերակ այս սենյակում",
+            "enable_element_call_no_permissions_tooltip": "Դուք չունեք բավարար թույլտվություններ սա փոխելու համար:"
+        }
+    },
+    "room_summary_card_back_action_label": "Սենյակի մասին",
+    "scalar": {
+        "error_create": "Անհնար է ստեղծել Widget:",
+        "error_membership": "Դուք այս սենյակում չեք։",
+        "error_missing_room_id": "Սենյակի ID- ն բացակայում է:",
+        "error_missing_room_id_request": "Հարցման մեջ բացակայում է room_id-ն",
+        "error_missing_user_id_request": "Հարցման մեջ բացակայում է user_id-ն",
+        "error_permission": "Դուք այս սենյակում դա անելու թույլտվություն չունեք։",
+        "error_power_level_invalid": "Էլեկտրաէներգիայի մակարդակը պետք է լինի դրական ամբողջ թիվ:",
+        "error_room_not_visible": "%(roomId)s սենակը տեսանելի չէ",
+        "error_room_unknown": "Այս սենյակը ճանաչված չէ:",
+        "error_send_request": "Հարցումը չհաջողվեց ուղարկել։",
+        "failed_read_event": "Չհաջողվեց կարդալ իրադարձությունները",
+        "failed_send_event": "Չհաջողվեց ուղարկել իրադարձությունը"
+    },
+    "server_offline": {
+        "description": "Ձեր սերվերը չի արձագանքում ձեր որոշ հարցումներին: Ստորև բերված են ամենահավանական պատճառներից մի քանիսը:",
+        "description_1": "Սերվերը (%(serverName)s) շատ երկար ժամանակ չպատասխանեց:",
+        "description_2": "Ձեր firewall-ը կամ հակավիրուսային ծրագիրը արգելափակում է հարցումը։",
+        "description_3": "Զննարկչի ընդլայնումը կանխում է հարցումը։",
+        "description_4": "Սերվերը անցանց/անջատված է:",
+        "description_5": "Սերվերը մերժել է ձեր հարցումը։",
+        "description_6": "Ձեր տարածքում ինտերնետին միանալու խնդիրներ կան։",
+        "description_7": "Սերվերի հետ կապվելու փորձի ժամանակ կապի սխալ տեղի ունեցավ։",
+        "description_8": "Սերվերը կարգավորված չէ խնդիրը ցույց տալու համար (CORS):",
+        "empty_timeline": "Ամեն ինչ կարդացված է։",
+        "recent_changes_heading": "Վերջին փոփոխությունները, որոնք դեռևս չեն ստացվել",
+        "title": "Սերվերը չի արձագանքում"
+    },
+    "service_worker_error": {
+        "description": "%(brand)s-ը Matrix-ի պահոցներից մեդիա բեռնելու համար օգտագործում է service worker։ Ձեր զննարկիչը դա չի աջակցում, ուստի մեդիան կարող է չբեռնվել։",
+        "title": "Չհաջողվեց բեռնել ծառայության գործընթացը։"
+    },
+    "seshat": {
+        "error_initialising": "Հաղորդագրությունների որոնման նախնականացումը ձախողվեց, ստուգեք <a>ձեր կարգավորումները</a>՝ լրացուցիչ տեղեկությունների համար",
+        "reset_button": "Վերականգնել իրադարձությունների պահեստը",
+        "reset_description": "Դուք, ամենայն հավանականությամբ, չեք ցանկանա վերականգնել իրադարձությունների ինդեքսի պահեստը",
+        "reset_explainer": "Եթե դուք դա անում եք, խնդրում ենք նկատի ունենալ, որ ձեր հաղորդագրություններից ոչ մեկը չի ջնջվի, բայց որոնման որակը կարող է մի քանի վայրկյան վատթարանալ, մինչև ինդեքսը նորից ստեղծվի",
+        "reset_title": "Վերականգնե՞լ իրադարձությունների պահեստը",
+        "warning_kind_files": "%(brand)s-ի այս տարբերակը չի աջակցում որոշ գաղտնագրված ֆայլերի դիտմանը։",
+        "warning_kind_files_app": "Օգտագործեք <a>Համակարգչային հավելվածը</a>՝ բոլոր գաղտնագրված ֆայլերը տեսնելու համար",
+        "warning_kind_search": "%(brand)s-ի այս տարբերակը չի աջակցում գաղտնագրված հաղորդագրությունների որոնումը",
+        "warning_kind_search_app": "Օգտագործեք <a>Համակարգչային հավելվածը</a>՝ գաղտնագրվաժ հաղորդագրությունները որոնելու համար"
+    },
+    "setting": {
+        "help_about": {
+            "access_token_detail": "Ձեր մուտքի տոկենը լիարժեք մուտք է տալիս ձեր հաշվին։ Մի կիսվեք դրանով որևէ մեկի հետ։",
+            "brand_version": "%(brand)s-ի տարբերակը՝",
+            "clear_cache_reload": "Մաքրել քեշը(գաղտնարանը) և վերաբեռնել",
+            "crypto_version": "Գաղտնագրման(կրիպտո) տարբերակ՝",
+            "dialog_title": "<strong>Կարգավորումներ․</strong> Օգնություն և Մեր մասին",
+            "help_link": "%(brand)s-ի օգտագործման հետ կապված օգնության համար սեղմեք <a>այստեղ</a>։",
+            "homeserver": "Գլխավոր սերվերը <code> %(homeserverUrl)s </code>-ն է",
+            "identity_server": "Նույնականացման սերվերը <code>%(identityServerUrl)s</code>-ն է",
+            "title": "Օգնություն և Մեր մասին",
+            "versions": "Տարբերակներ"
+        }
+    },
+    "settings": {
+        "account": {
+            "dialog_title": "<strong>Կարգավորումներ․</strong> Հաշվի տվյալներ",
+            "title": "Հաշիվ"
+        },
+        "all_rooms_home": "Ցույց տալ բոլոր սենյակները Գլխավոր էջում",
+        "all_rooms_home_description": "Բոլոր սենյակները, որոնցում դուք գտնվում եք, կհայտնվեն Գլխավոր էջում:",
+        "always_show_message_timestamps": "Միշտ ցուցադրել հաղորդագրությունների ժամանակային նշագրերը",
+        "appearance": {
+            "bundled_emoji_font": "Օգտագործեք ներկառուցված էմոջիի տառատեսակը",
+            "compact_layout": "Ցուցադրել կրճատ տեսքով տեքստ ու հաղորդագրություններ",
+            "compact_layout_description": "Այս ֆունկցիան հասանելի է միայն դիզայնի ժամանակակից տարբերակի ընտրության դեպքում",
+            "custom_font": "Օգտագործել համակարգային տառատեսակը",
+            "custom_font_description": "Սահմանել ձեր համակարգում տեղադրված տառատեսակի անունը և %(brand)s-ը կփորձի օգտագործել այն։",
+            "custom_font_name": "Համակարգային տառատեսակի անվանում",
+            "custom_font_size": "Օգտագործել հատուկ չափս",
+            "custom_theme_add": "Ավելացնել անհատական գունային ոճ",
+            "custom_theme_downloading": "Անհատական գունային ոճի ներբեռնում…",
+            "custom_theme_error_downloading": "Տեսաձեւի ներբեռնման սխալ",
+            "custom_theme_help": "Մուտքագրեք այն գունային ոճի URL-ը, որը ցանկանում եք կիրառել։",
+            "custom_theme_invalid": "Տեսաձևի անվավեր սխեմա։",
+            "dialog_title": "<strong>Կարգավորումներ․</strong> Արտաքին տեսք",
+            "font_size": "Տառատեսակի չափը",
+            "font_size_default": "%(fontSize)s (լռելյայն)",
+            "high_contrast": "Հակադրության բարձր ռեժիմ",
+            "image_size_default": "Լռելյայն",
+            "image_size_large": "Մեծ",
+            "layout_bubbles": "Հաղորդագրությունների պղպջակներ",
+            "layout_irc": "Ինտերնետային զրույց (փորձարարական)",
+            "match_system_theme": "Համապատասխանեցնել համակարգի թեմաի հետ",
+            "timeline_image_size": "Պատկերի չափը ժամանակացույցում"
+        },
+        "automatic_language_detection_syntax_highlight": "Միացնել լեզվի ավտոմատ հայտնաբերումը շարահյուսության ընդգծման համար",
+        "autoplay_gifs": "GIF-ների ավտոմատ նվագարկում",
+        "autoplay_videos": "Վիդեոների ավտոմատ նվագարկում",
+        "big_emoji": "Միացնել զրուցարանում մեծ էմոջիները",
+        "code_block_expand_default": "Լռելյայնորեն ընդլայնել կոդի բլոկները",
+        "code_block_line_numbers": "Ցուցադրել տողերի համարները կոդի բլոկներում",
+        "disable_historical_profile": "Ցույց տալ ընթացիկ պրոֆիլի նկարը և անունը՝ օգտվողների համար հաղորդագրությունների պատմության մեջ",
+        "discovery": {
+            "title": "Ինչպես գտնել քեզ"
+        },
+        "emoji_autocomplete": "Միացնել էմոջիների առաջարկները տեքստ գրելու ժամանակ",
+        "enable_markdown": "Միացնել Markdown",
+        "enable_markdown_description": "Սկսեք հաղորդագրությունները <code> /հասարակ տեքստ </code> -ով՝ առանց նշման ուղարկելու համար:",
+        "encryption": {
+            "advanced": {
+                "breadcrumb_first_description": "Ձեր հաշվի տվյալները, կոնտակտները, նախընտրությունները և զրույցների ցանկը կպահպանվեն",
+                "breadcrumb_page": "Վերակայել գաղտնագրումը",
+                "breadcrumb_second_description": "Դուք կկորցնեք ցանկացած հաղորդագրության պատմություն, որը պահված է միայն սերվերի վրա",
+                "breadcrumb_third_description": "Դուք պետք է կրկին հաստատեք ձեր բոլոր առկա սարքերը և կոնտակտները",
+                "breadcrumb_title": "Վստա՞հ եք, որ ուզում եք վերակայել(reset) ձեր ինքնությունը։",
+                "breadcrumb_title_forgot": "Մոռացե՞լ եք վերականգնման բանալին։ Դուք պետք է վերակայեք ձեր ինքնությունը։",
+                "breadcrumb_title_sync_failed": "Բանալիների պահոցը համաժամեցումը ձախողվեց։ Դուք պետք է վերակայեք ձեր ինքնությունը։",
+                "breadcrumb_warning": "Սա արեք միայն այն դեպքում, եթե կարծում եք, որ ձեր հաշիվը վտանգված է։",
+                "details_title": "Գաղտնագրման մանրամասներ",
+                "do_not_close_warning": "Մի՛ փակեք այս պատուհանը, մինչև վերակայումը չավարտվի",
+                "export_keys": "Արտահանել բանալիները",
+                "import_keys": "Ներմուծել բանալիները",
+                "other_people_device_description": "Զգուշացում․ օգտատերերը, որոնք բացահայտ չեն հաստատել ձեզ հետ (օր.՝ էմոջիով), չեն ստանա ձեր գաղտնագրված հաղորդագրությունները։ Բացի այդ, հաստատված օգտատերերի չհաստատված սարքերը նույնպես չեն ստանա ձեր գաղտնագրված հաղորդագրությունները։",
+                "other_people_device_label": "Գաղտնագրված սենյակներում ուղարկեք հաղորդագրություններ միայն հաստատված օգտատերերին։",
+                "other_people_device_title": "Այլ մարդկանց սարքերը",
+                "reset_identity": "Վերակայել կրիպտոգրաֆիկ ինքնությունը",
+                "reset_in_progress": "Վերակայումը ընթացքի մեջ է...",
+                "session_id": "Սեսիայի ID․",
+                "session_key": "Սեսիայի բանալի․",
+                "title": "Հավելյալ"
+            },
+            "confirm_key_storage_off": "Վստա՞հ եք, որ ուզում եք բանալիների պահեստը անջատված պահել։",
+            "confirm_key_storage_off_description": "Եթե դուրս գաք բոլոր սարքերից, կկորցնեք ձեր հաղորդագրությունների պատմությունը և ստիպված կլինեք կրկին հաստատել ձեր բոլոր գոյություն ունեցող կոնտակտները։ <a>Իմանալ ավելին</a>",
+            "delete_key_storage": {
+                "breadcrumb_page": "Ջնջել բանալիների պահոցը",
+                "confirm": "Ջնջել բանալիների պահոցը",
+                "description": "Բանալիների պահոցը ջնջելը կհեռացնի ձեր կրիպտոգրաֆիկ ինքնությունը և հաղորդագրությունների բանալիները սերվերից և կանջատի հետևյալ անվտանգության գործառույթները՝",
+                "list_first": "Նոր սարքերի վրա դուք չեք ունենա գաղտնագրված հաղորդագրությունների պատմություն",
+                "list_second": "Եթե դուրս գաք %(brand)s-ից բոլոր տեղերում, դուք կկորցնեք հասանելիությունը ձեր գաղտնագրված հաղորդագրություններին։",
+                "title": "Վստա՞հ եք, որ ուզում եք անջատել բանալիների պահեստը և ջնջել այն։"
+            },
+            "device_not_verified_button": "Հաստատել այս սարքը",
+            "device_not_verified_description": "Դուք պետք է վավերացնեք այս սարքը, որպեսզի դիտեք ձեր գաղտնագրման կարգավորումները։",
+            "device_not_verified_title": "Սարքը հաստատված չէ",
+            "dialog_title": "<strong>Կարգավորումներ․</strong> Գաղտնագրում",
+            "key_storage": {
+                "allow_key_storage": "Թույլատրել բանալիների պահոցը",
+                "description": "Անվտանգ կերպով պահեք ձեր կրիպտոգրաֆիկ ինքնությունը և հաղորդագրությունների բանալիները սերվերի վրա։ Սա թույլ կտա դիտել ձեր հաղորդագրությունների պատմությունը ցանկացած նոր սարքի վրա։ <a>Իմանալ ավելին</a>",
+                "title": "Բանալիների պահեստ"
+            },
+            "recovery": {
+                "change_recovery_confirm_button": "Հաստատեք նոր վերականգնման բանալին",
+                "change_recovery_confirm_description": "Ավարտելու համար ստորև մուտքագրեք ձեր նոր վերականգնման բանալին: Ձեր հինը այլևս չի աշխատի:",
+                "change_recovery_confirm_title": "Մուտքագրեք ձեր նոր վերականգնման բանալին",
+                "change_recovery_key": "Փոխել վերականգնման բանալին",
+                "change_recovery_key_description": "Գրեք այս նոր վերականգնման բանալին որևէ անվտանգ տեղում: Այնուհետև սեղմեք «Շարունակել»՝ փոփոխությունը հաստատելու համար:",
+                "change_recovery_key_title": "Փոխե՞լ վերականգնման բանալին",
+                "description": "Վերականգնեք ձեր գաղտնագրված ինքնությունը և հաղորդագրությունների պատմությունը վերականգնման բանալիով՝ սարքերի հասանելիության բացակայության դեպքում։",
+                "enter_key_error": "Մուտքագրված վերականգնման բանալին սխալ է։",
+                "enter_recovery_key": "Մուտքագրեք վերականգնման բանալին",
+                "forgot_recovery_key": "Մոռացե՞լ եք վերականգնման բանալին",
+                "key_storage_warning": "Ձեր բանալիների պահոցը համաժամեցված չէ։ Սխալը շտկելու համար սեղմեք ստորև ներկայացված որևէ կոճակ։",
+                "save_key_description": "Մի՛ կիսվեք սրանով որևէ մեկի հետ։",
+                "save_key_title": "Վերականգնման բանալի",
+                "set_up_recovery": "Կարգավորեք վերականգնումը",
+                "set_up_recovery_confirm_button": "Ավարտեք կարգավորումը",
+                "set_up_recovery_confirm_description": "Ներմուծեք նախորդ էկրանում ցուցադրված վերականգնման բանալին՝ վերականգնումը ավարտելու համար։",
+                "set_up_recovery_confirm_title": "Մուտքագրեք ձեր վերականգնման բանալին՝ հաստատելու համար։",
+                "set_up_recovery_description": "Ձեր բանալիների պահոցը պաշտպանված է վերականգնման բանալիով։ Եթե կարգավորումից հետո նոր վերականգնման բանալի է անհրաժեշտ, կարող եք այն ստեղծել կրկին՝ ընտրելով «%(changeRecoveryKeyButton)s»։",
+                "set_up_recovery_save_key_description": "Գրեք այս վերականգնման բանալին որևէ անվտանգ տեղում, օրինակ՝ գաղտնաբառերի կառավարիչում, գաղտնագրված նշումներում կամ ֆիզիկական սեյֆում։",
+                "set_up_recovery_save_key_title": "Պահպանեք ձեր վերականգնման բանալին որևէ անվտանգ տեղում",
+                "set_up_recovery_secondary_description": "«Շարունակել» կոճակը սեղմելուց հետո մենք ձեզ համար կստեղծենք վերականգնման բանալի։",
+                "title": "Վերականգնում"
+            },
+            "title": "Գաղտնագրում"
+        },
+        "general": {
+            "account_management_section": "Հաշվի կառավարում",
+            "account_section": "Հաշիվ",
+            "add_email_dialog_title": "Ավելացնել էլ․ հասցե",
+            "add_email_failed_verification": "Էլեկտրոնային հասցեն չհաջողվեց ստուգել. համոզվեք, որ սեղմել եք էլ. նամակում առկա հղման վրա։",
+            "add_email_instructions": "Մենք ձեզ էլ. նամակ ենք ուղարկել՝ ձեր հասցեն հաստատելու համար: Խնդրում ենք հետևել այնտեղ տրված հրահանգներին, ապա սեղմել ստորև նշված կոճակը:",
+            "add_msisdn_confirm_body": "Սեղմեք ստորև նշված կոճակը ՝ այս հեռախոսահամարի ավելացումը հաստատելու համար:",
+            "add_msisdn_confirm_button": "Հաստատեք հեռախոսահամարի ավելացումը",
+            "add_msisdn_confirm_sso_button": "Հաստատեք այս հեռախոսահամարի ավելացումը՝ օգտագործելով Single Sign On ՝ ձեր ինքնությունը ապացուցելու համար:",
+            "add_msisdn_dialog_title": "Ավելացնել հեռախոսահամար",
+            "add_msisdn_instructions": "SMS հաղորդագրություն է ուղարկվել +%(msisdn)s համարին։ Խնդրում ենք մուտքագրել դրանում պարունակվող հաստատման կոդը։",
+            "add_msisdn_misconfigured": "Ավելացնել / կապել գործառույթը(MSISDN-ի հետ) սխալ է կարգավորված",
+            "allow_spellcheck": "Թույլատրել ուղղագրության ստուգումը",
+            "application_language": "Ծրագրի լեզուն",
+            "application_language_reload_hint": "Հավելվածը կվերաբեռնվի մեկ այլ լեզու ընտրելուց հետո",
+            "avatar_remove_progress": "Պատկերը հեռացվում է...",
+            "avatar_save_progress": "Պատկերի վերբեռնում...",
+            "avatar_upload_error_text": "Ֆայլի ձևաչափը չի աջակցվում, կամ պատկերը %(size)s-ից ավելի մեծ է։",
+            "avatar_upload_error_text_generic": "Ֆայլի ձևաչափը կարող է չաջակցվել։",
+            "avatar_upload_error_title": "Ավատարի պատկերը չհաջողվեց վերբեռնել",
+            "confirm_adding_email_body": "Սեղմեք ներքեւի կոճակը՝ այս էլ-փոստի հասցեն ավելացնելու համար։",
+            "confirm_adding_email_title": "Հաստատեք էլ․ հասցեի ավելացումը",
+            "deactivate_confirm_body": "Համոզվա՞ծ եք, որ ցանկանում եք ապաակտիվացնել ձեր հաշիվը: Սա անդարձելի է:",
+            "deactivate_confirm_body_sso": "Հաստատեք ձեր հաշվի ապաակտիվացումը՝ օգտագործելով Single Sign On ՝ ձեր ինքնությունը հաստատելու համար:",
+            "deactivate_confirm_content": "Հաստատեք, որ ցանկանում եք ապաակտիվացնել ձեր հաշիվը: Եթե շարունակեք.",
+            "deactivate_confirm_content_1": "Դուք չեք կարողանա վերաակտիվացնել ձեր հաշիվը",
+            "deactivate_confirm_content_2": "Դուք այլևս չեք կարողանա մուտք գործել",
+            "deactivate_confirm_content_3": "Ոչ ոք չի կարողանա վերաօգտագործել Ձեր օգտվողի անունը (MXID), ներառյալ ձեզ. այս օգտանունն անհասանելի կմնա",
+            "deactivate_confirm_content_4": "Դուք կհեռանաք բոլոր սենյակներից և ուղիղ հաղորդագրություններից, որտեղ գտնվում եք։",
+            "deactivate_confirm_content_5": "Դուք կհեռացվեք նույնականացման սերվերից. ձեր ընկերները այլևս չեն կարողանա գտնել ձեզ ձեր էլ. փոստի հասցեով կամ հեռախոսահամարով։",
+            "deactivate_confirm_content_6": "Ձեր հին հաղորդագրությունները դեռ տեսանելի կլինեն այն մարդկանց համար, ովքեր ստացել են դրանք, ճիշտ այնպես, ինչպես նամակները, որոնք դուք ուղարկել եք անցյալում: Ցանկանում եք թաքցնել ձեզ ուղարկված հաղորդագրությունները այն մարդկանցից, ովքեր ապագայում միանում են սենյակներին:",
+            "deactivate_confirm_continue": "Հաստատել հաշվի ապաակտիվացումը",
+            "deactivate_confirm_erase_label": "Թաքցնել իմ հաղորդագրությունները նոր միացողներից",
+            "deactivate_section": "Ապաակտիվացրեք հաշիվը",
+            "deactivate_warning": "Ձեր հաշիվն ապաակտիվացնելը մշտական գործողություն է. Ուշադիր եղեք:",
+            "discovery_email_empty": "Հայտնաբերման տարբերակները կհայտնվեն էլեկտրոնային նամակ ավելացնելուց հետո:",
+            "discovery_email_verification_instructions": "Հաստատեք հղումը ձեր նամակների մուտքի արկղում",
+            "discovery_msisdn_empty": "Հայտնաբերման տարբերակները կհայտնվեն հեռախոսահամար ավելացնելուց հետո:",
+            "discovery_needs_terms": "Համաձայնեք ինքնության սերվերի (%(serverName)s) Ծառայությունների մատուցման պայմաններին՝ թույլ տալու ինքներդ ձեզ հայտնաբերել էլեկտրոնային փոստի հասցեով կամ հեռախոսահամարով:",
+            "discovery_needs_terms_title": "Թող մարդիկ գտնեն ձեզ",
+            "display_name": "Ցուցադրման անուն",
+            "display_name_error": "Հնարավոր չէ սահմանել ցուցադրման անուն",
+            "email_adding_unsupported_by_hs": "Այս homeserver-ը չի աջակցում ձեր հաշվի հետ էլ.փոստի հասցեներ ավելացնելուն։",
+            "email_address_in_use": "Այս էլ-փոստի հասցեն արդեն օգտագործվում է",
+            "email_address_label": "Էլ.փոստի հասցե",
+            "email_not_verified": "Ձեր էլ-փոստի հասցեն դեռ չի ստուգվել",
+            "email_verification_instructions": "Սեղմեք ստացված էլ. նամակում առկա հղումը՝ հաստատելու համար, ապա կրկին սեղմեք «Շարունակել»։",
+            "emails_heading": "Էլ.փոստի հասցեներ",
+            "error_add_email": "Անհնար է ավելացնել էլ․ հասցեներ",
+            "error_deactivate_communication": "Սերվերի հետ կապ հաստատելու խնդիր առաջացավ։ Խնդրում ենք կրկին փորձել։",
+            "error_deactivate_invalid_auth": "Սերվերը չի վերադարձրել վավեր նույնականացման տեղեկատվություն:",
+            "error_deactivate_no_auth": "Սերվերը որևէ նույնականացում չէր պահանջում",
+            "error_email_verification": "Անհնար է ստուգել էլ-փոստի հասցեն:",
+            "error_invalid_email": "Անվավեր էլ․ հասցե",
+            "error_invalid_email_detail": "Սա կարծես վավեր էլփոստի հասցե չէ",
+            "error_msisdn_verification": "Անհնար է ստուգել հեռախոսահամարը:",
+            "error_password_change_403": "Չհաջողվեց փոխել գաղտնաբառը։ Ձեր գաղտնաբառը ճի՞շտ է։",
+            "error_password_change_http": "%(errorMessage)s (HTTP կարգավիճակ՝ %(httpStatus)s)",
+            "error_password_change_title": "Գաղտնաբառի փոփոխման սխալ",
+            "error_password_change_unknown": "Գաղտնաբառի փոփոխման անհայտ սխալ (%(stringifiedError)s)",
+            "error_remove_3pid": "Անհնար է հեռացնել կոնտակտային տվյալները",
+            "error_revoke_email_discovery": "Անհնար է չեղարկել էլ-փոստի հասցեի համօգտագործումը",
+            "error_revoke_msisdn_discovery": "Անհնար է չեղարկել հեռախոսահամարի համօգտագործումը",
+            "error_share_email_discovery": "Անհնար է համօգտագործել էլ-փոստի հասցեն",
+            "error_share_msisdn_discovery": "Անհնար է համօգտագործել հեռախոսահամարը",
+            "identity_server_no_token": "Ինքնության հասանելիության նշան չի գտնվել",
+            "identity_server_not_set": "Նույնականացման սերվերը կարգավորված չէ",
+            "invalid_phone_number": "Նշված հեռախոսահամարը, կարծես թե, վավեր չէ։",
+            "language_section": "Լեզու",
+            "msisdn_adding_unsupported_by_hs": "Այս homeserver-ը չի աջակցում ձեր հաշվին հեռախոսահամարներ ավելացնելը։",
+            "msisdn_in_use": "Այս հեռախոսահամարն արդեն օգտագործվում է",
+            "msisdn_label": "Հեռախոսահամար",
+            "msisdn_verification_field_label": "Ստուգման կոդ",
+            "msisdn_verification_instructions": "Խնդրում ենք մուտքագրել տեքստով ուղարկված ստուգման կոդը:",
+            "msisdns_heading": "Հեռախոսահամարներ",
+            "oidc_manage_button": "Կառավարել հաշիվը",
+            "password_change_section": "Սահմանեք նոր հաշվի գաղտնաբառ...",
+            "password_change_success": "Ձեր գաղտնաբառը հաջողությամբ փոխվել է:",
+            "personal_info": "Անձնական տեղեկություն",
+            "profile_subtitle": "Ահա թե ինչպես եք դուք երևում մյուսներին հավելվածում։",
+            "profile_subtitle_oidc": "Ձեր հաշիվը առանձին կառավարվում է նույնականացման մատակարարի կողմից, ուստի ձեր անձնական տվյալների մի մասը չի կարող փոխվել այստեղ։",
+            "remove_email_prompt": "Հեռացնել %(email)s-ը ?",
+            "remove_msisdn_prompt": "Հեռացնել %(phone)s-ը ?",
+            "spell_check_locale_placeholder": "Ընտրեք տեղանք",
+            "unable_to_load_emails": "Անհնար է բեռնել էլ․փոստի հասցեները",
+            "unable_to_load_msisdns": "Հեռախոսահամարները չհաջողվեց բեռնել",
+            "username": "Օգտանուն"
+        },
+        "inline_url_previews_default": "Լռելյայն միացնել URL- ի ներդիրային նախադիտումները",
+        "inline_url_previews_room": "Միացնել URL-ների նախադիտումները լռելյայնորեն այս սենյակի մասնակիցների համար",
+        "inline_url_previews_room_account": "Միացնել URL-ների նախադիտումները այս սենյակի համար (ազդում է միայն ձեզ վրա)",
+        "insert_trailing_colon_mentions": "Հաղորդագրության սկզբում գտնվող օգտատիրոջ հիշատակումից հետո ավելացնել երկկետ",
+        "invite_controls": {
+            "default_label": "Թույլատրել օգտատերերին հրավիրել ձեզ սենյակներ"
+        },
+        "jump_to_bottom_on_send": "Հաղորդագրություն ուղարկելիս անցնել ժամանակագրության ներքևի մաս",
+        "key_backup": {
+            "setup_secure_backup": {
+                "backup_setup_success_description": "Ձեր բանալիներն այժմ պահուստավորվում են այս սարքից։",
+                "backup_setup_success_title": "Անվտանգ պահուստավորումը հաջողվեց",
+                "cancel_warning": "Եթե հիմա չեղարկեք, կկորցնեք գաղտնագրված հաղորդագրությունները և տվյալները, եթե կորցնեք ձեր մուտքանուններին հասանելիությունը։",
+                "confirm_security_phrase": "Հաստատեք Ձեր անվտանգության արտահայտությունը",
+                "description": "Պաշտպանեք կոդավորված հաղորդագրությունների և տվյալների հասանելիության կորստի դեմ՝ կրկնօրինակելով ձեր սերվերի գաղտնագրման բանալիները:",
+                "download_or_copy": "%(downloadButton)s կամ %(copyButton)s",
+                "enter_phrase_description": "Մուտքագրեք անվտանգության արտահայտություն, որը միայն դուք գիտեք, քանի որ այն օգտագործվում է ձեր տվյալները պաշտպանելու համար: Անվտանգ լինելու համար չպետք է կրկին օգտագործեք ձեր հաշվի գաղտնաբառը:",
+                "enter_phrase_title": "Մուտքագրել անվտանգության արտահայտությունը",
+                "enter_phrase_to_confirm": "Մուտքագրեք Ձեր անվտանգության արտահայտությունը երկրորդ անգամ՝ այն հաստատելու համար:",
+                "generate_security_key_description": "Մենք կստեղծենք վերականգնման բանալի, որը դուք կարող եք պահել անվտանգ տեղում, օրինակ՝ գաղտնաբառերի կառավարիչում կամ սեյֆում։",
+                "generate_security_key_title": "Ստեղծել Recovery Key(վերականգնման բանալի)",
+                "pass_phrase_match_failed": "Դա չի համընկնում։",
+                "pass_phrase_match_success": "Դա համապատասխանում է!",
+                "phrase_strong_enough": "Հրաշալի! Այս անվտանգության արտահայտությունը բավականաչափ ուժեղ է երևում։",
+                "secret_storage_query_failure": "Հնարավոր չէ հարցնել գաղտնի պահեստի կարգավիճակը",
+                "security_key_safety_reminder": "Պահեք ձեր վերականգնման բանալին ինչոր անվտանգ վայրում, ինչպիսիք են գաղտնաբառերի կառավարիչը կամ սեյֆը, քանի որ այն օգտագործվում է ձեր գաղտնագրված տվյալները պաշտպանելու համար:",
+                "set_phrase_again": "Վերադառնալ այն նորից կարգավորելու համար։",
+                "settings_reminder": "Կարող եք նաև կարգավորել անվտանգ պահուստավորումը և կառավարել ձեր բանալիները Կարգավորումներում։",
+                "title_confirm_phrase": "Հաստատեք անվտանգության արտահայտությունը",
+                "title_save_key": "Պահպանեք ձեր Recovery Key-ն (վերականգնման բանալին)",
+                "title_set_phrase": "Սահմանել անվտանգության արտահայտություն",
+                "unable_to_setup": "Հնարավոր չէ կարգավորել գաղտնի պահեստը",
+                "use_different_passphrase": "Օգտագործե՞լ այլ գաղտնաբառ։",
+                "use_phrase_only_you_know": "Օգտագործեք գաղտնի արտահայտություն, որը միայն դուք գիտեք, և ըստ ցանկության պահպանեք վերականգնման բանալին՝ կրկնօրինակման համար օգտագործելու համար:"
+            }
+        },
+        "key_export_import": {
+            "confirm_passphrase": "Հաստատեք գաղտնաբառը",
+            "enter_passphrase": "Մուտքագրեք գաղտնաբառ",
+            "export_description_1": "Այս գործընթացը թույլ է տալիս արտահանել գաղտնագրված սենյակներում ստացված հաղորդագրությունների բանալիները տեղային ֆայլի մեջ։ Այնուհետև դուք կկարողանաք ապագայում ներմուծել ֆայլը մեկ այլ Matrix հաճախորդի մեջ, որպեսզի այդ հաճախորդը նույնպես կարողանա վերծանել այդ հաղորդագրությունները։",
+            "export_description_2": "Արտահանված ֆայլը թույլ կտա այն կարդացող ցանկացած անձի վերծանել այն գաղտնագրված հաղորդագրությունները, որոնք դուք տեսնում եք, ուստի պետք է զգուշորեն պահեք այն։ Դրան օգնելու համար ներքևում պետք է մուտքագրեք եզակի գաղտնաբառ, որը կօգտագործվի միայն արտահանված տվյալները գաղտնագրելու համար։ Տվյալները հնարավոր կլինի ներմուծել միայն նույն գաղտնաբառը օգտագործելով։",
+            "export_title": "Արտահանել սենյակի բանալիները",
+            "file_to_import": "Ներմուծվող ֆայլ",
+            "import_description_1": "Այս գործընթացը թույլ է տալիս ներմուծել գաղտնագրման բանալիներ, որոնք նախկինում արտահանել էիք Matrix-ի մեկ այլ հաճախորդից։ Այնուհետև դուք կկարողանաք վերծանել ցանկացած հաղորդագրություն, որը կարողացել էր վերծանել մյուս հաճախորդը։",
+            "import_description_2": "Արտահանման ֆայլը պաշտպանված կլինի գաղտնաբառով: Ֆայլը վերծանելու համար դուք պետք է մուտքագրեք գաղտնաբառն այստեղ:",
+            "import_title": "Սենյակի բանալիների ներմուծում",
+            "phrase_cannot_be_empty": "Գաղտնաբառը չպետք է դատարկ լինի",
+            "phrase_must_match": "Գաղտնաբառերը պետք է համընկնեն",
+            "phrase_strong_enough": "Հրաշալի! Այս գաղտնաբառը բավականին ուժեղ է"
+        },
+        "keyboard": {
+            "dialog_title": "<strong>Կարգավորումներ․</strong> Ստեղնաշար",
+            "title": "Ստեղնաշար"
+        },
+        "labs": {
+            "dialog_title": "<strong>Կարգավորումներ․</strong> Լաբորատորիաներ"
+        },
+        "labs_mjolnir": {
+            "dialog_title": "<strong>Կարգավորումներ․</strong> Անտեսված օգտատերեր"
+        },
+        "media_preview": {
+            "hide_avatars": "Թաքցնել սենյակի և հրավեր ուղարկողի պրոֆիլային նկարները",
+            "hide_media": "Միշտ թաքցնել",
+            "media_preview_description": "Թաքնված մեդիան(նկար, տեսանյութ և այլն) միշտ կարող է ցուցադրվել՝ դրա վրա սեղմելով",
+            "media_preview_label": "Ցուցադրել մեդիան ժամանակագրության մեջ",
+            "show_in_private": "Մասնավոր սենյակներում",
+            "show_media": "Միշտ ցուցադրել"
+        },
+        "not_supported": "Ձեր սերվերը չի իրականացնում այս գործառույթը։",
+        "notifications": {
+            "default_setting_description": "Այս կարգավորումը լռելյայնորեն կկիրառվի ձեր բոլոր սենյակների համար։",
+            "default_setting_section": "Ես ուզում եմ ծանուցում ստանալ (Լռելյայն կարգավորում)",
+            "desktop_notification_message_preview": "Ցուցադրել հաղորդագրության նախադիտումը աշխատասեղանի ծանուցման մեջ",
+            "dialog_title": "<strong>Կարգավորումներ․</strong> Ծանուցումներ",
+            "email_description": "Ստացեք բաց թողնված ծանուցումների ամփոփագիր էլ.փոստով",
+            "email_section": "Էլ․փոստի նամակի ամփոփում",
+            "email_select": "Ընտրեք, թե որ էլ.հասցեներին եք ուզում ուղարկել ամփոփագրերը: Կառավարեք ձեր էլ. նամակները <button>Ընդհանուր</button> բաժնում:",
+            "enable_audible_notifications_session": "Միացնել լսելի ծանուցումները այս սեսիայի համար",
+            "enable_desktop_notifications_session": "Միացնել աշխատասեղանի ծանուցումները այս սեսիայի համար",
+            "enable_email_notifications": "Միացնել էլ-փոստային ծանուցումները %(email)s-ի համար",
+            "enable_notifications_account": "Միացնել ծանուցումները այս հաշվի համար",
+            "enable_notifications_account_detail": "Անջատել՝ ձեր բոլոր սարքերի եւ նիստերի ծանուցումները անջատելու համար",
+            "enable_notifications_device": "Միացնել ծանուցումները այս սարքի համար",
+            "error_loading": "Ձեր ծանուցումների կարգավորումները բեռնելիս սխալ տեղի ունեցավ։",
+            "error_permissions_denied": "%(brand)s-ը Ձեզ ծանուցումներ ուղարկելու թույլտվություն չունի. խնդրում ենք ստուգել ձեր զննարկիչի կարգավորումները",
+            "error_permissions_missing": "%(brand)s-ին ծանուցումներ ուղարկելու թույլտվություն չի տրվել. Խնդրում ենք կրկին փորձել",
+            "error_saving": "Սխալ առաջացավ ծանուցումների նախընտրությունները պահպանելիս։",
+            "error_saving_detail": "Ձեր ծանուցման նախապատվությունները պահպանելիս սխալ է տեղի ունեցել:",
+            "error_title": "Անհնար է միացնել ծանուցումները",
+            "error_updating": "Ձեր ծանուցման նախապատվությունները թարմացնելիս սխալ է տեղի ունեցել: Խնդրում ենք փորձեք կրկին միացնել ձեր տարբերակը:",
+            "invites": "Հրավիրվել է սենյակ",
+            "keywords": "Ցուցադրել <badge/> նշանը, երբ սենյակում օգտագործվում են բանալի բառեր։",
+            "keywords_prompt": "Մուտքագրեք բանալի բառեր այստեղ կամ օգտագործեք ուղղագրության տարբերակների կամ մականունների համար",
+            "labs_notice_prompt": "<strong>Թարմացում՝</strong> Մենք պարզեցրել ենք ծանուցումների կարգավորումները՝ տարբերակները ավելի հեշտ գտնելու համար: Անցյալում ընտրված որոշ հատուկ կարգավորումներ այստեղ չեն ցուցադրվում, բայց դրանք դեռևս ակտիվ են: Եթե շարունակեք, ձեր որոշ կարգավորումներ կարող են փոխվել:<a> Իմանալ ավելին</a>",
+            "mentions_keywords": "Հիշատակումներ և բանալի բառեր",
+            "mentions_keywords_only": "Միայն հիշատակումներ և բանալի բառեր",
+            "messages_containing_keywords": "Բանալի բառեր պարունակող հաղորդագրություններ",
+            "noisy": "Աղմկոտ",
+            "notices": "Բոտերի կողմից ուղարկված հաղորդագրություններ",
+            "notify_at_room": "Ծանուցել, երբ ինչ-որ մեկը հիշատակի @room-ի օգտագործումը",
+            "notify_keyword": "Ծանուցել, երբ ինչ-որ մեկը օգտագործում է բանալի բառ",
+            "notify_mention": "Ծանուցել, երբ ինչ-որ մեկը հիշատակում է @displayname կամ %(mxid)s",
+            "other_section": "Այլ բաներ, որոնք, մեր կարծիքով, կարող են ձեզ հետաքրքրել.",
+            "people_mentions_keywords": "Մարդիկ, հիշատակումներ և բանալի բառեր",
+            "play_sound_for_description": "Կիրառվում է լռելյայնորեն բոլոր սարքերի բոլոր սենյակների համար։",
+            "play_sound_for_section": "Նվագարկել ձայն",
+            "push_targets": "Ծանուցման թիրախներ",
+            "quick_actions_mark_all_read": "Նշել բոլոր հաղորդագրությունները որպես կարդացված",
+            "quick_actions_reset": "Վերականգնել լռելյայն կարգավորումները",
+            "quick_actions_section": "Արագ գործողություններ",
+            "room_activity": "Տեղի են ունենում սենյակի նոր ակտիվություններ, թարմացումներ և կարգավիճակի հաղորդագրություններ",
+            "rule_call": "Զանգի հրավեր",
+            "rule_contains_display_name": "Իմ անունը(display name) պարունակող հաղորդագրություններ",
+            "rule_contains_user_name": "Հաղորդագրություններ, որոնք պարունակում են իմ օգտանունը",
+            "rule_encrypted": "Գաղտնագրված հաղորդագրություններ խմբային զրույցներում",
+            "rule_encrypted_room_one_to_one": "Գաղտնագրված հաղորդագրություններն անհատական զրույցներում",
+            "rule_invite_for_me": "Երբ ինձ հրավիրում են սենյակ",
+            "rule_message": "Հաղորդագրություններ խմբային զրույցներում",
+            "rule_room_one_to_one": "Հաղորդագրություններ անհատական զրույցներում",
+            "rule_roomnotif": "@room պարունակող հաղորդագրություններ",
+            "rule_suppress_notices": "Բոտի կողմից ուղարկված հաղորդագրություններ",
+            "rule_tombstone": "Երբ սենյակները թարմացվում են",
+            "show_message_desktop_notification": "Ցույց տալ հաղորդագրությունը աշխատասեղանի ծանուցման մեջ",
+            "voip": "Աուդիո և վիդեո զանգեր"
+        },
+        "preferences": {
+            "Electron.enableContentProtection": "Կանխել պատուհանի պարունակության \"բռնագրումը\" այլ ծրագրերի կողմից",
+            "Electron.enableHardwareAcceleration": "Միացնել ապարատային արագացումը (վերագործարկում՝ %(appName)s֊ը ուժի մեջ մտնելու համար)",
+            "always_show_menu_bar": "Միշտ ցուցադրել պատուհանի ընտրացանկի վահանակը",
+            "autocomplete_delay": "Ավտոմատ լրացման ուշացում (միլիվրկ)",
+            "code_blocks_heading": "Կոդի բլոկներ",
+            "compact_modern": "Օգտագործել ավելի կոմպակտ “Ժամանակակից” դասավորություն",
+            "composer_heading": "Կազմող",
+            "default_timezone": "Զննարկչի նախնական կարգավորում (%(timezone)s)",
+            "dialog_title": "<strong>Կարգավորումներ․</strong> Նախընտրություններ",
+            "enable_content_protection": "Միացնել բովանդակության պաշտպանությունը",
+            "enable_hardware_acceleration": "Միացնել ապարատային արագացումը",
+            "enable_tray_icon": "Ցույցադրել սկուտեղի պատկերակը և փակելիս նվազագույնի հասցնել դրա պատուհանը",
+            "keyboard_heading": "Ստեղնաշարի դյուրանցումներ",
+            "keyboard_view_shortcuts_button": "Բոլոր ստեղնաշարի դյուրանցումները դիտելու համար՝<a> սեղմեք այստեղ</a> .",
+            "media_heading": "Պատկերներ, GIF-եր և տեսանյութեր",
+            "presence_description": "Կիսվել ձեր գործունեությամբ և կարգավիճակով ուրիշների հետ։",
+            "publish_timezone": "Հրապարակել ժամային գոտին հանրային պրոֆիլում",
+            "rm_lifetime": "Կարդացված նշիչի կյանքի տևողությունը (մվ)",
+            "rm_lifetime_offscreen": "Կարդալու նշիչի էկրանից-դուրս կյանքի տևողությունը (մվ)",
+            "room_directory_heading": "Սենյակների գրացուցակ",
+            "room_list_heading": "Սենյակների ցանկ",
+            "show_avatars_pills": "Ցույց տալ ավատարները օգտվողի, սենյակի եւ իրադարձությունների հիշատակումներում",
+            "show_polls_button": "Ցույց տալ հարցումների կոճակը",
+            "surround_text": "Հատուկ նիշերի մուտքագրման ժամանակ շրջապատել ընտրված տեքստը",
+            "time_heading": "Ժամանակի ցուցադրում",
+            "user_timezone": "Սահմանել ժամային գոտի"
+        },
+        "prompt_invite": "Հուշել՝ նախքան պոտենցիալ անվավեր matrix ID-ներին հրավերներ ուղարկելը",
+        "replace_plain_emoji": "Ավտոմատ կերպով փոխարինել պարզ տեքստով էմոջիները",
+        "security": {
+            "analytics_description": "Կիսվել անանուն տվյալներով՝ խնդիրները բացահայտելու համար։ Ոչինչ անձնական։ Ոչ մի երրորդ կողմ։",
+            "bulk_options_accept_all_invites": "Ընդունել բոլոր %(invitedRooms)s հրավերները",
+            "bulk_options_reject_all_invites": "Մերժել բոլոր %(invitedRooms)s հրավերները",
+            "bulk_options_section": "Զանգվածային ընտրանքներ",
+            "dehydrated_device_description": "Օֆլայն սարքի հնարավորությունը թույլ է տալիս ստանալ գաղտնագրված հաղորդագրություններ, նույնիսկ երբ որևէ սարքում մուտք գործած չեք։",
+            "dehydrated_device_enabled": "Օֆլայն սարքը միացված է",
+            "dialog_title": "<strong>Կարգավորումներ․</strong> Անվտանգություն և գաղտնիություն",
+            "e2ee_default_disabled_warning": "Ձեր սերվերի ադմինիստրատորը լռելյայնորեն անջատել է ծայրից ծայր գաղտնագրումը մասնավոր սենյակներիև անհատական հաղորդագրությունների համար։",
+            "enable_message_search": "Թույլատրել հաղորդագրությունների որոնումը գաղտնագրված սենյակներում",
+            "encryption_section": "Գաղտնագրում",
+            "ignore_users_empty": "Դուք համակարգի անտեսված օգտագործողներ չունեք:",
+            "ignore_users_section": "Անտեսված օգտատերեր",
+            "key_backup_algorithm": "Ալգորիթմ՝",
+            "message_search_disable_warning": "Եթե անջատված է, գաղտնագրված սենյակներից հաղորդագրությունները չեն հայտնվի որոնման արդյունքներում:",
+            "message_search_disabled": "Անվտանգ կերպով տեղայնորեն քեշավորեք գաղտնագրված հաղորդագրություններ , որպեսզի դրանք հայտնվեն որոնման արդյունքներում:",
+            "message_search_enabled": {
+                "one": "Գաղտնագրված հաղորդագրությունները տեղայնորեն պահել ապահով քեշում, որպեսզի դրանք հայտնվեն որոնման արդյունքներում, օգտագործելով %(size)s՝ %(rooms)s սենյակի հաղորդագրությունները պահելու համար",
+                "other": "Գաղտնագրված հաղորդագրությունները տեղայնորեն պահել ապահով քեշում, որպեսզի դրանք հայտնվեն որոնման արդյունքներում, օգտագործելով %(size)s՝ %(rooms)s սենյակների հաղորդագրությունները պահելու համար\n"
+            },
+            "message_search_failed": "Հաղորդագրության որոնման սկզբնավորումը ձախողվեց",
+            "message_search_indexed_messages": "Ինդեքսավորված հաղորդագրություններ՝",
+            "message_search_indexed_rooms": "Ինդեքսավորված սենյակներ՝",
+            "message_search_indexing": "Ներկայումս ինդեքսավորվում է՝ %(currentRoom)s",
+            "message_search_indexing_idle": "Ներկայումս չի ինդեքսավորվում որեւէ սենյակի հաղորդագրությունները:",
+            "message_search_intro": "%(brand)s-ն անվտանգ կերպով տեղայնորեն քեշավորում է գաղտնագրված հաղորդագրությունները, որպեսզի դրանք հայտնվեն որոնման արդյունքներում։",
+            "message_search_room_progress": "%(totalRooms)s-ից %(doneRooms)s",
+            "message_search_section": "Հաղորդագրությունների որոնում",
+            "message_search_sleep_time": "Որքան արագ պետք է ներբեռնվեն հաղորդագրությունները:",
+            "message_search_space_used": "Օգտագործված տարածք՝",
+            "message_search_unsupported": "%(brand)s-ում բացակայում են որոշ բաղադրիչներ, որոնք անհրաժեշտ են գաղտնագրված հաղորդագրությունները տեղայնորեն անվտանգ քեշավորելու համար։ Եթե ցանկանում եք փորձարկել այս հնարավորությունը, կառուցեք անհատական %(brand)s Desktop՝ <nativeLink>ավելացված որոնման բաղադրիչներով</nativeLink>։",
+            "message_search_unsupported_web": "Վեբ զննարկչում աշխատելիս %(brand)s-ը չի կարող գաղտնագրված հաղորդագրությունները տեղայնորեն ապահով քեշավորել։ Որպեսզի գաղտնագրված հաղորդագրությունները հայտնվեն որոնման արդյունքներում, օգտագործեք <desktopLink>%(brand)s Desktop</desktopLink>։",
+            "record_session_details": "Նշել հաճախորդի(ծրագրի} անունը, տարբերակը և URL-ը՝ սեսիայի կառավարիչում դրանք ավելի հեշտ ճանաչելու համար",
+            "send_analytics": "Ուղարկել վերլուծական տվյալներ",
+            "strict_encryption": "Ուղարկել հաղորդագրություններ միայն հաստատված օգտատերերին"
+        },
+        "send_read_receipts": "Ուղարկել ընթերցման ստացականներ",
+        "send_read_receipts_unsupported": "Ձեր սերվերը չի աջակցում ընթերցման ստացականների ուղարկման անջատումը։",
+        "send_typing_notifications": "Ուղարկել տեքստ գրելու ծանուցումներ",
+        "sessions": {
+            "best_security_note": "Լավագույն անվտանգության համար ստուգեք ձեր սեսիաները և դուրս եկեք ցանկացած սեսիայից, որը այլևս չեք ճանաչում կամ չեք օգտագործում։",
+            "browser": "Զննարկիչ",
+            "confirm_sign_out": {
+                "one": "Հաստատեք այս սարքից դուրս գալը",
+                "other": "Հաստատեք այս սարքերից դուրս գալը"
+            },
+            "confirm_sign_out_body": {
+                "one": "Սեղմեք ստորև նշված կոճակը ՝ այս սարքից դուրս գալը հաստատելու համար:",
+                "other": "Սեղմեք ստորև նշված կոճակը ՝ այս սարքերից դուրս գալը հաստատելու համար:"
+            },
+            "confirm_sign_out_continue": {
+                "one": "Ելք սարքից",
+                "other": "Ելք սարքերից"
+            },
+            "confirm_sign_out_sso": {
+                "one": "Հաստատեք այս սարքից դուրս գալը՝ օգտագործելով Single Sign On-ը՝ ձեր ինքնությունը հաստատելու համար։",
+                "other": "Հաստատեք այս սարքերից դուրս գալը՝ օգտագործելով Single Sign On-ը՝ ձեր ինքնությունը հաստատելու համար։"
+            },
+            "current_session": "Ընթացիկ սեսիա",
+            "desktop_session": "Համակարգչային սեսիան",
+            "details_heading": "Սեսիայի մանրամասները",
+            "device_unverified_description": "Լավագույն անվտանգության և հուսալիության համար հաստատեք կամ դուրս եկեք այս սեսիայից։",
+            "device_unverified_description_current": "Հաստատեք ձեր ընթացիկ սեսիան՝ հաղորդագրությունների անվտանգությունն ապահովելու համար։",
+            "device_verified_description": "Այս սեսիան պատրաստ է անվտանգ հաղորդագրությունների համար։",
+            "device_verified_description_current": "Ձեր ընթացիկ սեսիան պատրաստ է անվտանգ հաղորդագրությունների համար։",
+            "dialog_title": "<strong>Կարգավորումներ․</strong> Սեսիաներ",
+            "error_pusher_state": "Չհաջողվեց սահմանել pusher-ի վիճակը",
+            "error_set_name": "Չհաջողվեց սահմանել սեսիայի անունը",
+            "filter_all": "Բոլորը",
+            "filter_inactive": "Ոչ ակտիվ",
+            "filter_inactive_description": "Անգործուն է %(inactiveAgeDays)s օրեր կամ ավելի երկար",
+            "filter_label": "Ֆիլտրել սարքեր",
+            "filter_unverified_description": "Պատրաստ չէ անվտանգ հաղորդագրություններ ուղարկելու համար",
+            "filter_verified_description": "Պատրաստ է անվտանգ հաղորդագրությունների ուղարկման համար",
+            "hide_details": "Թաքցնել մանրամասները",
+            "inactive_days": "Անգործուն է %(inactiveAgeDays)s + օրեր",
+            "inactive_sessions": "Անգործուն սեսիաներ",
+            "inactive_sessions_explainer_1": "Անգործուն սեսիաները այն սեսիաներն են, որոնք դուք որոշ ժամանակ չեք օգտագործել, բայց դրանք շարունակում են ստանալ գաղտնագրման բանալիներ։",
+            "inactive_sessions_explainer_2": "Անգործուն սեսիաների հեռացումը բարելավում է անվտանգությունն ու արդյունավետությունը, ինչպես նաև հեշտացնում է նոր սեսիայի կասկածելիության հայտնաբերումը։",
+            "inactive_sessions_list_description": "Դիտարկեք հին սեսիաներից դուրս գալը (%(inactiveAgeDays)s օր կամ ավելի), որոնք այլևս չեք օգտագործում։",
+            "ip": "IP հասցե",
+            "last_activity": "Վերջին ակտիվությունը",
+            "manage": "Կառավարել այս սեսիան",
+            "mobile_session": "Բջջային սեսիա",
+            "n_sessions_selected": {
+                "one": "%(count)s ընտրված սեսիա",
+                "other": "%(count)s ընտրված սեսիաներ"
+            },
+            "no_inactive_sessions": "Անգործուն սեսիաներ չեն գտնվել։",
+            "no_sessions": "Սեսիաներ չեն գտնվել։",
+            "no_unverified_sessions": "Չստուգված սեսիաներ չեն գտնվել:",
+            "no_verified_sessions": "Հաստատված սեսիաներ չեն գտնվել։",
+            "os": "Օպերացիոն համակարգ",
+            "other_sessions_heading": "Այլ սեսիաներ",
+            "push_heading": "Push ծանուցումներ",
+            "push_subheading": "Ստանալ push ծանուցումներ այս սեսիայում։",
+            "push_toggle": "Այս սեսիայի ընթացքում միացնել/անջատել push ծանուցումները։",
+            "rename_form_caption": "Խնդրում ենք հաշվի առնել, որ սեսիաների անունները տեսանելի են նաև այն մարդկանց համար, ում հետ շփվում եք։",
+            "rename_form_heading": "Վերանվանել սեսիան",
+            "rename_form_learn_more": "Սեսիաների վերանվանում",
+            "rename_form_learn_more_description_1": "Ձեր միացած ուղիղ հաղորդագրություններում և սենյակներում գտնվող մյուս օգտատերերը կարող են դիտել ձեր սեսիաների ամբողջական ցանկը։",
+            "rename_form_learn_more_description_2": "Սա նրանց վստահություն է տալիս, որ նրանք իսկապես խոսում են ձեզ հետ, բայց նաև նշանակում է, որ նրանք կարող են տեսնել այստեղ մուտքագրված սեսիայի անվանումը։",
+            "security_recommendations": "Անվտանգության խորհուրդներ",
+            "security_recommendations_description": "Բարելավեք ձեր հաշվի անվտանգությունը՝ հետևելով այս խորհուրդներին։",
+            "session_id": "Սեսիայի ID",
+            "show_details": "Ցուցադրել մանրամասները",
+            "sign_in_with_qr": "Կապել նոր սարք",
+            "sign_in_with_qr_button": "Ցուցադրել QR կոդը",
+            "sign_in_with_qr_description": "Օգտագործեք QR կոդ՝ մեկ այլ սարք մուտք գործելու և անվտանգ հաղորդագրություններ կարգավորելու համար։",
+            "sign_in_with_qr_unsupported": "Չի աջակցվում ձեր հաշվի մատակարարի կողմից",
+            "sign_out": "Դուրս գալ այս սեսիայից",
+            "sign_out_all_other_sessions": "Դուրս գալ մյուս բոլոր սեսիաներից (%(otherSessionsCount)s )",
+            "sign_out_confirm_description": {
+                "one": "Համոզվա՞ծ եք, որ ցանկանում եք դուրս գալ %(count)s սեսիայից:",
+                "other": "Համոզվա՞ծ եք, որ ցանկանում եք դուրս գալ %(count)s սեսիաներից:"
+            },
+            "sign_out_n_sessions": {
+                "one": "Դուրս գալ %(count)s սեսիայից",
+                "other": "Դուրս գալ %(count)s սեսիաներից"
+            },
+            "title": "Սեսիաներ",
+            "unknown_session": "Անհայտ սեսիայի տեսակ",
+            "unverified_session": "Չհաստատված սեսիա",
+            "unverified_session_explainer_1": "Այս սեսիան չի աջակցում գաղտնագրումը և, հետևաբար, չի կարող ստուգվել։",
+            "unverified_session_explainer_2": "Այս սեսիան օգտագործելիս դուք չեք կարողանա մասնակցել այն սենյակներին, որտեղ գաղտնագրումը միացված է։",
+            "unverified_session_explainer_3": "Լավագույն անվտանգության և գաղտնիության համար խորհուրդ է տրվում օգտագործել Matrix հաճախորդներ, որոնք աջակցում են գաղտնագրում:",
+            "unverified_sessions": "Չհաստատված սեսիաներ",
+            "unverified_sessions_explainer_1": "Չհաստատված սեսիաները այն սեսիաներն են, որոնցում մուտք եք գործել ձեր մուտքային տվյալներով, բայց խաչաձև հաստատում չեն անցել։",
+            "unverified_sessions_explainer_2": "Դուք պետք է հատկապես համոզվեք, որ ճանաչում եք այս սեսիաները, քանի որ դրանք կարող են ներկայացնել ձեր հաշվի անթույլատրելի օգտագործումը։",
+            "unverified_sessions_list_description": "Ստուգեք ձեր սեսիաները՝ ավելի անվտանգ հաղորդագրությունների փոխանակման համար, կամ դուրս եկեք այն սեսիաներից, որոնք այլևս չեք ճանաչում կամ չեք օգտագործում։",
+            "url": "URL",
+            "verified_session": "Հաստատված սեսիա",
+            "verified_sessions": "Հաստատված սեսիաներ",
+            "verified_sessions_explainer_1": "Ստուգված սեսիաները գտնվում են ցանկացած վայրում, որտեղ դուք օգտագործում եք այս հաշիվը՝ ձեր անցաբառը մուտքագրելուց կամ ձեր ինքնությունը հաստատելուց հետո։",
+            "verified_sessions_explainer_2": "Սա նշանակում է, որ դուք ունեք բոլոր բանալիները, որոնք անհրաժեշտ են ձեր գաղտնագրված հաղորդագրությունները բացելու և այլ օգտվողներին հաստատելու համար, որ վստահում եք այս սեսիայում:",
+            "verified_sessions_list_description": "Լավագույն անվտանգության համար դուրս եկեք ցանկացած սեսիայից, որը այլևս չեք ճանաչում կամ չեք օգտագործում։",
+            "verify_session": "Հաստատել սեսիան",
+            "web_session": "Վեբ սեսիա"
+        },
+        "show_avatar_changes": "Ցույց տալ պրոֆիլի նկարի փոփոխությունները",
+        "show_breadcrumbs": "Ցուցադրել վերջերս դիտված սենյակների դյուրանցումները սենյակների ցանկի վերևում",
+        "show_chat_effects": "Ցույց տալ զրույցի էֆեկտները (անիմացիաներ, օրինակ ՝ կոնֆետտի ստանալիս)",
+        "show_displayname_changes": "Ցույց տալ ցուցադրման անվան փոփոխությունները",
+        "show_join_leave": "Ցույց տալ միանալ/լքել հաղորդագրությունները (հրավերները/հեռացումները/արգելքները կմնան անփոփոխ)",
+        "show_message_previews": "Ցուցադրել հաղորդագրությունների նախադիտումները",
+        "show_nsfw_content": "Ցույց տալ NSFW բովանդակությունը",
+        "show_read_receipts": "Ցուցադրել այլ օգտատերերի կողմից ուղարկված ընթերցման ստացականները",
+        "show_redaction_placeholder": "Ցուցադրել տեղապահ` հեռացված հաղորդագրությունների համար",
+        "show_stickers_button": "Ցույց տալ ստիկերների կոճակը",
+        "show_typing_notifications": "Ցուցադրել տեքստ գրելու ծանուցումները",
+        "showbold": "Ցուցադրել բոլոր գործողությունները սենյակների ցանկում (կետեր կամ չկարդացված հաղորդագրությունների քանակ)",
+        "sidebar": {
+            "dialog_title": "<strong>Կարգավորումներ․</strong> Կողային վահանակ",
+            "metaspaces_favourites_description": "Խմբավորել ձեր բոլոր սիրելի սենյակներն ու մարդկանց մեկ տեղում։",
+            "metaspaces_home_all_rooms": "Ցուցադրել բոլոր սենյակները",
+            "metaspaces_home_all_rooms_description": "Ցուցադրել ձեր բոլոր սենյակները Գլխավոր էջում, նույնիսկ եթե դրանք գտնվում են որևէ տարածքում։",
+            "metaspaces_home_description": "Գլխավոր էջը օգտակար է ամեն ինչի մասին ընդհանուր պատկերացում կազմելու համար։",
+            "metaspaces_orphans": "Տարածքից դուրս սենյակներ",
+            "metaspaces_orphans_description": "Խմբավորել ձեր բոլոր սենյակները, որոնք տարածքի մաս չեն կազմում, մեկ տեղում։",
+            "metaspaces_people_description": "Խմբավորել ձեր բոլոր մարդկանց մեկ տեղում։",
+            "metaspaces_subsection": "Ցուցադրվող տարածքներ",
+            "metaspaces_video_rooms": "Տեսազանգի սենյակներ և համաժողովներ(կոնֆերանսներ)",
+            "metaspaces_video_rooms_description": "Խմբավորել բոլոր մասնավոր տեսազանգի սենյակներն ու համաժողովները(կոնֆերանսները)։",
+            "metaspaces_video_rooms_description_invite_extension": "Համաժողովներում(կոնֆերանսներում) դուք կարող եք հրավիրել Matrix-ից դուրս գտնվող մարդկանց։",
+            "spaces_explainer": "Տարածքները սենյակներն ու մարդկանց խմբավորելու միջոցներ են: Ձեր գտնվելու վայրերից բացի, կարող եք օգտագործել նաև նախապես կառուցված տարածքներ:",
+            "title": "Կողային վահանակ"
+        },
+        "tac_only_notifications": "Միայն ցուցադրել ծանուցումները թեմայի գործունեության կենտրոնում",
+        "use_12_hour_format": "Ցուցադրել ժամանակային նշանները 12 ժամյա ձևաչափով (օրինակ՝ 2:30pm)",
+        "use_command_enter_send_message": "Հաղորդագրություն ուղարկելու համար օգտագործեք Command + Enter",
+        "use_command_f_search": "Ժամանակացույցը որոնելու համար օգտագործեք Command + F",
+        "use_control_enter_send_message": "Հաղորդագրություն ուղարկելու համար օգտագործեք Ctrl + Enter",
+        "use_control_f_search": "Ժամանակացույցը որոնելու համար օգտագործեք Control + F",
+        "voip": {
+            "allow_p2p": "Թույլատրել Peer-to-Peer կապը 1:1 զանգերի համար",
+            "allow_p2p_description": "Երբ միացված է, մյուս կողմը կարող է տեսնել ձեր IP հասցեն",
+            "audio_input_empty": "Խոսափողեր չեն հայտնաբերվել",
+            "audio_output": "Աուդիո ելք",
+            "audio_output_empty": "Աուդիո ելքեր չեն հայտնաբերվել",
+            "auto_gain_control": "Ավտոմատ ուժեղացման կառավարում",
+            "connection_section": "Միացում",
+            "dialog_title": "<strong>Կարգավորումներ․</strong> Ձայն և վիդեո",
+            "echo_cancellation": "Արձագանքի չեղարկում",
+            "enable_fallback_ice_server": "Թույլատրել հետադարձ զանգի օժանդակ սերվեր () %(server)s",
+            "enable_fallback_ice_server_description": "Գործում է միայն այն դեպքում, եթե ձեր սերվերը չի առաջարկում այն։ Ձեր IP հասցեն կփոխանցվի զանգի ընթացքում։",
+            "mirror_local_feed": "Լոկալ տեսանյութերի հոսքի անդրադարձում",
+            "missing_permissions_prompt": "Մեդիա թույլտվությունները բացակայում են, սեղմեք ներքևի կոճակը՝ հարցման համար:",
+            "noise_suppression": "Աղմուկի ճնշում",
+            "request_permissions": "Մեդիա թույլտվությունների հարցում",
+            "title": "Ձայն եւ վիդեո",
+            "video_input_empty": "Վեբ-տեսախցիկներ չեն հայտնաբերվել",
+            "video_section": "Վիդեո կարգավորումներ",
+            "voice_agc": "Ավտոմատ կերպով կարգավորել խոսափողի ձայնը",
+            "voice_processing": "Ձայնի մշակում",
+            "voice_section": "Ձայնային կարգավորումներ"
+        },
+        "warn_quit": "Զգուշացում՝ հեռանալուց առաջ",
+        "warning": "<w>ԶԳՈՒՇԱՑՈՒՄ: </w> <description/>"
+    },
+    "share": {
+        "link_copied": "Հղումը պատճենվեց",
+        "permalink_message": "Հղում դեպի ընտրված հաղորդագրությունը",
+        "permalink_most_recent": "Հղում դեպի ամենավերջին գրառումը/հաղորդագրությունը",
+        "share_call": "Ժողովի հրավերի հղում",
+        "share_call_subtitle": "Հղում արտաքին օգտատերերի համար՝ matrix հաշվի բացակայության դեպքում զանգին միանալու համար.",
+        "title_link": "Կիսվել հղումով",
+        "title_message": "Կիսվել սենյակի հաղորդագրությամբ",
+        "title_room": "Կիսվել սենյակով",
+        "title_user": "Կիսվել օգտատիրոջ հետ"
+    },
+    "slash_command": {
+        "addwidget": "Սենյակում ավելացնում է հատուկ վիջեթ՝ ըստ URL-ի",
+        "addwidget_iframe_missing_src": "iframe-ը src ատրիբուտ չունի",
+        "addwidget_invalid_protocol": "Խնդրում ենք տրամադրել վիջեթի https:// կամ http:// URL-ը",
+        "addwidget_missing_url": "Խնդրում ենք տրամադրել վիջեթի URL-ը կամ ներդրման կոդը",
+        "addwidget_no_permissions": "Դուք չեք կարող փոփոխել վիջեթները այս սենյակում։",
+        "ban": "Արգելափակում է տրված ID-ով օգտատիրոջը",
+        "category_actions": "Գործողություններ",
+        "category_admin": "Ադմին",
+        "category_advanced": "Ընդլայնված",
+        "category_effects": "Էֆեկտներ",
+        "category_messages": "Հաղորդագրություններ",
+        "category_other": "Այլ",
+        "command_error": "Հրամանի սխալ",
+        "converttodm": "Սենյակը վերածում է DM-ի(անհատական զրույցի)",
+        "converttoroom": "Փոխակերպում է DM-ը (անձնական զրույցը)՝ սենյակի",
+        "could_not_find_room": "Չհաջողվեց գտնել սենյակ",
+        "deop": "Տրված ID-ով օգտատիրոջից հանում է օպերատորի իրավունքները",
+        "devtools": "Բացում է Ծրագրավորողի գործիքների պատուհանը",
+        "discardsession": "Ստիպում է ջնջել գաղտնագրված սենյակում գտնվող ընթացիկ արտագնա խմբային սեսիան։",
+        "error_invalid_rendering_type": "Հրամանի սխալ. Չի կարելի գտնել մատուցման տեսակը (%(renderingType)s)",
+        "error_invalid_room": "Հրամանը ձախողվեց. Հնարավոր չէ գտնել (%(roomId)s ) սենյակը",
+        "error_invalid_runfn": "Հրամանի սխալ. անհնար է մշակել slash հրամանը։",
+        "error_invalid_user_in_room": "Չհաջողվեց գտնել օգտատիրոջը սենյակում",
+        "help": "Ցուցադրում է հրամանների ցանկը՝ օգտագործման և նկարագրությունների հետ միասին",
+        "help_dialog_title": "Հրամանի օգնություն",
+        "holdcall": "Ընթացիկ սենյակում զանգը դնում է սպասման ռեժիմի վրա",
+        "html": "Ուղարկում է հաղորդագրություն որպես html ՝ առանց մեկնաբանելու այն որպես նշագրված",
+        "ignore": "Անտեսում է օգտվողին ՝ թաքցնելով նրա հաղորդագրությունները ձեզանից",
+        "ignore_dialog_description": "Դուք հիմա անտեսում եք %(userId)s-ին",
+        "ignore_dialog_title": "Անտեսված օգտատեր",
+        "invite": "Հրավիրում է տվյալ ID ունեցող օգտատիրոջը ընթացիկ սենյակ",
+        "invite_3pid_needs_is_error": "Օգտագործեք նույնականացման սերվեր՝ էլ. փոստով հրավիրելու համար: Կառավարեք այն կարգավորումներում:",
+        "invite_3pid_use_default_is_title": "Օգտագործեք նույնականացման սերվեր",
+        "invite_3pid_use_default_is_title_description": "Օգտագործեք նույնականացման սերվեր՝ էլ. փոստով հրավիրելու համար: Սեղմեք շարունակել՝ լռելյայն նույնականացման սերվերն (%(defaultIdentityServerName)s ) օգտագործելու համար կամ Կարգավորումներում կառավարելու համար։",
+        "invite_failed": "(%(user)s ) օգտատերը հրավեր չստացավ %(roomId)s սենյակին, բայց հրավիրողի ծրագիրը սխալ չի տվել",
+        "join": "Միանում է տրված հասցեով սենյակին",
+        "jumptodate": "Անցնել ժամանակացույցում տրված ամսաթվին",
+        "jumptodate_invalid_input": "Մենք չկարողացանք հասկանալ տվյալ ամսաթիվը (%(inputDate)s): Փորձեք օգտագործել YYYY-MM-DD ձևաչափը:",
+        "lenny": "Պարզ տեքստային հաղորդագրության սկզբից ավելացնում է ( ͡° ͜ʖ ͡°) նշանները",
+        "manual_device_verification_confirm_description": "Սա թույլ կտա մեկ այլ սարքի ուղարկել և ստանալ հաղորդագրություններ ձեր անունից։ ԵԹԵ ԻՆՉ-ՈՐԸ ՁԵԶ ԱՍԵԼ/ԽՆԴՐԵԼ Է ԱՅՍՏԵՂ ԻՆՉ-ՈՐ ԲԱՆ ՏԵՂԱԴՐԵԼ, ՀԱՎԱՆԱԿԱՆ Է, ՈՐ ՁԵԶ ԽԱԲԵՈՒՄ ԵՆ։ Վստա՞հ եք, որ ուզում եք ստուգել/հաստատել այս մյուս սարքը։",
+        "manual_device_verification_confirm_title": "Զգուշացում. սարքի ձեռքով ստուգում",
+        "me": "Ցուցադրում է գործողություն",
+        "msg": "Ուղարկում է հաղորդագրություն տվյալ օգտվողին",
+        "myavatar": "Փոխում է ձեր պրոֆիլի նկարը բոլոր սենյակներում",
+        "myroomavatar": "Փոխում է ձեր պրոֆիլի նկարը միայն այս ընթացիկ սենյակում",
+        "myroomnick": "Փոխում է ձեր ցուցադրման մականունը միայն ընթացիկ սենյակում",
+        "nick": "Փոխում է ձեր ցուցադրման մականունը",
+        "no_active_call": "Այս սենյակում ակտիվ զանգ չկա",
+        "op": "Սահմանեք օգտատիրոջ հզորության մակարդակը",
+        "part_unknown_alias": "Չճանաչված սենյակի հասցե. %(roomAlias)s",
+        "plain": "Ուղարկում է հաղորդագրություն որպես պարզ տեքստ ՝ առանց մեկնաբանելու այն որպես նշանգրված",
+        "query": "Բացում է տվյալ օգտատիրոջ հետ զրույցը",
+        "query_not_found_phone_number": "Հեռախոսահամարի համար Matrix ID- ն չի գտնվել",
+        "rageshake": "Ուղարկել սխալի մասին հաշվետվություն",
+        "rainbow": "Ուղարկում է տրված հաղորդագրությունը՝ ծիածանի պես գունավորված",
+        "rainbowme": "Ուղարկում է տվյալ զգացմունքի նշանը՝ ծիածանի պես գունավորված",
+        "remove": "Հեռացնում է տվյալ id ունեցող օգտվողին այս սենյակից",
+        "roomavatar": "Փոխում է ընթացիկ սենյակի ավատարը",
+        "roomname": "Սահմանում է սենյակի անունը",
+        "server_error": "Սերվերի սխալ",
+        "server_error_detail": "Սերվերը անհասանելի է, ծանրաբեռնված է կամ ինչոր այլ խնդիր է առաջացել։",
+        "shrug": "Պարզ տեքստային հաղորդագրության սկզբից ավելացնում է ¯\\_(ツ)_/¯ նշանները",
+        "spoiler": "Ուղարկում է տվյալ հաղորդագրությունը որպես սպոյլեր",
+        "tableflip": "Պարզ տեքստային հաղորդագրության սկզբից ավելացնում է (╯°□°）╯︵ ┻━┻ նշանները",
+        "topic": "Ստանում կամ սահմանում է սենյակի թեման",
+        "topic_none": "Այս սենյակը թեմա չունի։",
+        "topic_room_error": "Չհաջողվեց ստանալ սենյակի թեման. Չհաջողվեց գտնել սենյակը ՝ (%(roomId)s",
+        "unban": "Ապաարգելափակում է տրված ID-ով օգտատիրոջը",
+        "unflip": "Պարզ տեքստային հաղորդագրության սկզբից ավելացնում է ┬──┬ ノ( ゜-゜ノ) նշանները",
+        "unholdcall": "Ընթացիկ սենյակում զանգը հանում է սպասման ռեժիմից",
+        "unignore": "Դադարեցնում է օգտատիրոջ անտեսումը՝ ցուցադրելով նրա հաղորդագրությունները հետագայի համար",
+        "unignore_dialog_description": "Դուք այլևս չեք անտեսում %(userId)s-ին",
+        "unignore_dialog_title": "Ապաանտեսված օգտատեր",
+        "unknown_command": "Անհայտ հրաման",
+        "unknown_command_button": "Ուղարկել որպես հաղորդագրություն",
+        "unknown_command_detail": "Չճանաչված հրաման. %(commandText)s",
+        "unknown_command_help": "Դուք կարող եք օգտագործել <code>/օգնություն</code>թխ` հասանելի հրամանների ցուցակը ցույց տալու համար։ Արդյո՞ք դուք ուզում էիք սա ուղարկել որպես հաղորդագրություն։",
+        "unknown_command_hint": "Հուշում. սկսեք ձեր հաղորդագրությունը <code>//</code>-ով՝ թեք գծիկով սկսելու համար։",
+        "upgraderoom": "Սենյակը թարմացնում է նոր տարբերակով",
+        "upgraderoom_permission_error": "Դուք չունեք այս հրամանն օգտագործելու համար անհրաժեշտ թույլտվությունները։",
+        "usage": "Օգտագործում",
+        "verify": "Ձեռքով ստուգել ձեր սեփական սարքերից մեկը",
+        "view": "Դիտել նշված հասցեով սենյակը",
+        "whois": "Ցուցադրում է տեղեկատվություն օգտատիրոջ մասին"
+    },
+    "sliding_sync_legacy_no_longer_supported": "Հնագույն \"սահող համաժամեցումը\"(sliding sync) այլևս չի աջակցվում. խնդրում ենք դուրս գալ և նորից մուտք գործել՝ նոր sliding sync-ի դրոշը միացնելու համար։",
+    "space": {
+        "add_existing_room_space": {
+            "create": "Ցանկան՞ում եք փոխարենն ավելացնել նոր սենյակ:",
+            "create_prompt": "Ստեղծել նոր սենյակ",
+            "dm_heading": "Անհատական(առանձին) հաղորդագրություններ",
+            "error_heading": "Ոչ բոլոր ընտրվածներն են ավելացվել",
+            "progress_text": {
+                "one": "Սենյակի ավելացում...",
+                "other": "Սենյակների ավելացում... (%(progress)s՝ %(count)s-ից)"
+            },
+            "space_dropdown_label": "Տարածքի ընտրություն",
+            "space_dropdown_title": "Ավելացնել գոյություն ունեցող սենյակներ",
+            "subspace_moved_note": "Տարածքների ավելացումը տեղափոխվել է:"
+        },
+        "add_existing_subspace": {
+            "create_button": "Ստեղծել նոր տարածք",
+            "create_prompt": "Ցանկան՞ում եք փոխարենն ավելացնել նոր տարածք:",
+            "filter_placeholder": "Որոնել տարածքներ",
+            "space_dropdown_title": "Ավելացնել գոյություն ունեցող տարածք"
+        },
+        "context_menu": {
+            "devtools_open_timeline": "Տեսնել սենյակի ժամանակացույցը (devtools)",
+            "explore": "Փնտրել սենյակներ",
+            "home": "Տարածքի հիմնական էջ",
+            "manage_and_explore": "Կառավարել և ուսումնասիրել սենյակները",
+            "options": "Տարածքի ընտրանքներ"
+        },
+        "failed_load_rooms": "Չհաջողվեց բեռնել սենյակների ցանկը:",
+        "failed_remove_rooms": "Որոշ սենյակներ չհաջողվեց հեռացնել: Փորձեք նորից ավելի ուշ։",
+        "incompatible_server_hierarchy": "Ձեր սերվերը չի աջակցում տարածքների հիերարխիաների ցուցադրումը:",
+        "invite": "Հրավիրել մարդկանց",
+        "invite_description": "Հրավիրել էլ.փոստով կամ օգտատիրոջ անունով",
+        "invite_link": "Կիսվել հրավիրման հղումով",
+        "joining_space": "Միացում",
+        "landing_welcome": "Բարի գալուստ <name/>",
+        "leave_dialog_action": "Լքել տարածքը",
+        "leave_dialog_description": "Դուք պատրաստվում եք լքել <spaceName/>֊ը։",
+        "leave_dialog_only_admin_room_warning": "Դուք որոշ սենյակների կամ տարածքների միակ ադմինիստրատորն եք, որոնցից ցանկանում եք հեռանալ: Հեռացումը նրանց կթողնի առանց ադմինիստրատորների:",
+        "leave_dialog_only_admin_warning": "Դուք այս տարածքի միակ ադմինիստրատորն եք: Այն լքելը կնշանակի, որ ոչ ոք վերահսկողություն չի ունենա դրա վրա:",
+        "leave_dialog_option_all": "Լքել բոլոր սենյակները",
+        "leave_dialog_option_intro": "Կցանկանայի՞ք լքել այս տարածքի սենյակները:",
+        "leave_dialog_option_none": "Չլքել ոչ մի սենյակ",
+        "leave_dialog_option_specific": "Լքել որոշ սենյակներ",
+        "leave_dialog_public_rejoin_warning": "Դուք չեք կարողանա կրկին միանալ, եթե ձեզ նորից չհրավիրեն:",
+        "leave_dialog_title": "Լքել %(spaceName)s-ը",
+        "mark_suggested": "Նշել որպես առաջարկվող",
+        "no_search_result_hint": "Հնարավոր է, որ ցանկանաք փորձել այլ որոնում, կամ ստուգել տառասխալների առկայությունը:",
+        "preferences": {
+            "sections_section": "Ցուցադրելու բաժիններ",
+            "show_people_in_space": "Սա խմբավորում է ձեր զրույցները այս տարածքի անդամների հետ: Սա անջատելը կթաքցնի այդ զրույցները ձեր %(spaceName)s-ի տեսադաշտից:"
+        },
+        "room_filter_placeholder": "Սենյակների որոնում",
+        "search_children": "Որոնել %(spaceName)s",
+        "search_placeholder": "Որոնել անուններ և նկարագրություններ",
+        "select_room_below": "Նախ ներքևում ընտրեք որևէ սենյակ",
+        "share_public": "Կիսվեք ձեր հանրային տարածքով",
+        "suggested": "Խորհուրդ տրվող",
+        "suggested_tooltip": "Այս սենյակը առաջարկվում է որպես լավ սենյակ միանալու համար",
+        "title_when_query_available": "Արդյունքներ",
+        "title_when_query_unavailable": "Սենյակներ և տարածքներ",
+        "unmark_suggested": "Նշել որպես չառաջարկվող",
+        "user_lacks_permission": "Դուք թույլտվություն չունեք"
+    },
+    "space_settings": {
+        "title": "Կարգավորումներ - %(spaceName)s"
+    },
+    "spaces": {
+        "error_no_permission_add_room": "Դուք չունեք այս տարածքում սենյակներ ավելացնելու թույլտվություններ",
+        "error_no_permission_add_space": "Դուք չունեք այս տարածքում տարածքներ ավելացնելու թույլտվություններ",
+        "error_no_permission_create_room": "Դուք այս տարածքում նոր սենյակներ ստեղծելու թույլտվություն չունեք",
+        "error_no_permission_invite": "Դուք չունեք այս տարածք մարդկանց հրավիրելու թույլտվություններ"
+    },
+    "spotlight": {
+        "public_rooms": {
+            "network_dropdown_add_dialog_description": "Մուտքագրեք այն նոր սերվերի անունը, որը ցանկանում եք ուսումնասիրել։",
+            "network_dropdown_add_dialog_placeholder": "Սերվերի անունը",
+            "network_dropdown_add_dialog_title": "Ավելացնել նոր սերվեր",
+            "network_dropdown_add_server_option": "Ավելացնել նոր սերվեր…",
+            "network_dropdown_available_invalid": "Հնարավոր չէ գտնել այս սերվերը կամ դրա սենյակների ցանկը",
+            "network_dropdown_available_invalid_forbidden": "Դուք չունեք այս սերվերի սենյակների ցանկը դիտելու թույլտվություն",
+            "network_dropdown_available_valid": "Լավ է",
+            "network_dropdown_remove_server_adornment": "Հեռացնել «%(roomServer)s» սերվերը",
+            "network_dropdown_required_invalid": "Մուտքագրեք սերվերի անունը",
+            "network_dropdown_selected_label": "Ցուցադրել՝ Matrix սենյակներ",
+            "network_dropdown_selected_label_instance": "Ցուցադրել՝ %(instance)s սենյակներ (%(server)s )",
+            "network_dropdown_your_server_description": "Ձեր սերվերը"
+        }
+    },
+    "spotlight_dialog": {
+        "cant_find_person_helpful_hint": "Եթե չեք տեսնում նրան, ում փնտրում եք, ուղարկեք նրան ձեր հրավերի հղումը:",
+        "cant_find_room_helpful_hint": "Եթե չեք կարողանում գտնել այն սենյակը, որը փնտրում եք, խնդրեք հրավիրել ձեզ կամ ստեղծել նոր սենյակ:",
+        "copy_link_text": "Պատճենել հրավերի հղումը",
+        "count_of_members": {
+            "one": "%(count)s անդամ",
+            "other": "%(count)s անդամներ"
+        },
+        "create_new_room_button": "Ստեղծել նոր սենյակ",
+        "failed_querying_public_rooms": "Հանրային սենյակների հարցումը չհաջողվեց",
+        "failed_querying_public_spaces": "Հանրային տարածքների հարցումը չհաջողվեց",
+        "group_chat_section_title": "Այլ տարբերակներ/ընտրանքներ",
+        "heading_with_query": "Օգտագործեք «%(query)s»՝ փնտրելու համար",
+        "heading_without_query": "Փնտրել",
+        "join_button_text": "Միանալ %(roomAddress)s-ին",
+        "keyboard_scroll_hint": "Ոլորելու համար օգտագործեք <arrows/>",
+        "messages_label": "Հաղորդագրություններ",
+        "other_rooms_in_space": "Այլ սենյակներ %(spaceName)s-ում",
+        "public_rooms_label": "Հանրային սենյակներ",
+        "public_spaces_label": "Հանրային տարածքներ",
+        "recent_searches_section_title": "Վերջին որոնումները",
+        "recently_viewed_section_title": "Վերջերս դիտված",
+        "remove_filter": "Հեռացնել %(filter)s-ի որոնման ֆիլտրը",
+        "result_may_be_hidden_privacy_warning": "Որոշ արդյունքներ կարող են թաքնված լինել գաղտնիության նպատակներով",
+        "result_may_be_hidden_warning": "Որոշ արդյունքներ կարող են թաքնված լինել",
+        "search_dialog": "Որոնման պատուհան",
+        "spaces_title": "Տարածքներ, որտեղ դուք գտնվում եք",
+        "start_group_chat_button": "Սկսել խմբային զրույց"
+    },
+    "stickers": {
+        "empty": "Դուք ներկայումս չունեք որևէ միացված ստիկերների փաթեթ",
+        "empty_add_prompt": "Ավելացնել մի քանիսը հիմա"
+    },
+    "terms": {
+        "column_document": "Փաստաթուղթ",
+        "column_service": "Ծառայություն",
+        "column_summary": "Ամփոփում",
+        "identity_server_no_terms_description_1": "Այս գործողությունը պահանջում է մուտք գործել ինքնության լռելյայն սերվեր՝ <server /> էլ․փոստի հասցեն կամ հեռախոսահամարը վավերացնելու համար, սակայն սերվերը չունի ծառայությունների մատուցման պայմաններ:",
+        "identity_server_no_terms_description_2": "Շարունակեք միայն այն դեպքում, եթե վստահում եք սերվերի սեփականատիրոջը։",
+        "identity_server_no_terms_title": "Նույնականացման սերվերը ծառայության պայմաններ չունի",
+        "inline_intro_text": "Շարունակելու համար ընդունեք <policyLink />-ը.",
+        "integration_manager": "Օգտագործեք բոտեր, կամուրջներ, վիջեթներ և պիտակների փաթեթներ",
+        "intro": "Շարունակելու համար դուք պետք է ընդունեք այս ծառայության պայմանները:",
+        "summary_identity_server_1": "Գտնել ուրիշներին հեռախոսով կամ էլ.փոստով",
+        "summary_identity_server_2": "Գտնվել հեռախոսով կամ էլ.փոստով",
+        "tac_button": "Վերանայեք ընդհանուր դրույթները և պայմանները",
+        "tac_description": "%(homeserverDomain)s սերվերի օգտագործումը շարունակելու համար դուք պետք է վերանայեք և համաձայնեք մեր դրույթներին և պայմաններին:",
+        "tac_title": "Ընդհանուր դրույթներ և պայմաններ",
+        "tos": "Ծառայությունների մատուցման պայմաններ"
+    },
+    "theme": {
+        "light_high_contrast": "Լույսի բարձր հակադրություն",
+        "match_system": "Համակարգին համապատասխան"
+    },
+    "thread_view_back_action_label": "Վերադառնալ թեմային",
+    "threads": {
+        "all_threads": "Բոլոր թեմաները/հոսքերը",
+        "all_threads_description": "Ցուցադրում է ընթացիկ սենյակի բոլոր թեմաները/հոսքերը",
+        "count_of_reply": {
+            "one": "%(count)s պատասխան",
+            "other": "%(count)s պատասխաններ"
+        },
+        "empty_description": "Օգտագործեք «%(replyInThread)s» երբ կուրսորը պահում եք հաղորդագրության վրա։",
+        "empty_title": "Թեմաները օգնում են պահել ձեր խոսակցությունները թեմային համապատասխան և հեշտ հետևելի։",
+        "error_start_thread_existing_relation": "Հնարավոր չէ գոյություն ունեցող կապով իրադարձությունից ստեղծել «թեմա»/«հոսք»",
+        "mark_all_read": "Բոլորը նշել որպես կարդացված",
+        "my_threads": "Իմ թեմաները",
+        "my_threads_description": "Ցուցադրում է բոլոր թեմաները, որոնց դուք մասնակցել եք",
+        "open_thread": "Բացել թեման",
+        "show_thread_filter": "Ցուցադրել՝"
+    },
+    "threads_activity_centre": {
+        "header": "Թեմաների ակտիվություն",
+        "no_rooms_with_threads_notifs": "Դուք դեռ չունեք սենյակներ թեմատիկ ծանուցումներով։",
+        "no_rooms_with_unread_threads": "Դուք դեռ չունեք սենյակներ, որտեղ կան չկարդացած թեմաներ։"
+    },
+    "time": {
+        "about_day_ago": "մոտ մեկ օր առաջ",
+        "about_hour_ago": "մոտ մեկ ժամ առաջ",
+        "about_minute_ago": "մոտ մեկ րոպե առաջ",
+        "date_at_time": "%(date)s ժամը %(time)s",
+        "few_seconds_ago": "մի քանի վայրկյան առաջ",
+        "hours_minutes_seconds_left": "Մնաց %(hours)sժ %(minutes)sր %(seconds)sվ",
+        "in_about_day": "մոտ մեկ օր անց",
+        "in_about_hour": "մոտ մեկ ժամ անց",
+        "in_about_minute": "մոտ մեկ րոպե անց",
+        "in_few_seconds": "մի քանի վայրկյան անց",
+        "in_n_days": "%(num)s օր անց",
+        "in_n_hours": "%(num)s ժամ անց",
+        "in_n_minutes": "%(num)s րոպեներ անց",
+        "left": "%(timeRemaining)s մնաց",
+        "minutes_seconds_left": "Մնաց %(minutes)sր %(seconds)sվ",
+        "n_days_ago": "%(num)s օր առաջ",
+        "n_hours_ago": "%(num)s ժամ առաջ",
+        "n_minutes_ago": "%(num)s րոպե առաջ",
+        "seconds_left": "Մնաց %(seconds)sվ",
+        "short_days": "%(value)sօր",
+        "short_days_hours_minutes_seconds": "%(days)sօր %(hours)sժ %(minutes)sր %(seconds)sվ",
+        "short_hours": "%(value)sժ",
+        "short_hours_minutes_seconds": "%(hours)sժ %(minutes)sր %(seconds)sվ",
+        "short_minutes": "%(value)sր",
+        "short_minutes_seconds": "%(minutes)sր %(seconds)sվ",
+        "short_seconds": "%(value)sվ"
+    },
+    "timeline": {
+        "context_menu": {
+            "collapse_reply_thread": "Ծալել պատասխանի թեման",
+            "external_url": "Աղբյուրի URL",
+            "open_in_osm": "Բացել OpenStreetMap-ում",
+            "report": "Բողոք",
+            "resent_unsent_reactions": "Կրկին ուղարկել %(unsentCount)s արձագանք(ներ)",
+            "show_url_preview": "Ցուցադրել նախադիտումը",
+            "view_related_event": "Դիտել կապակցված իրադարձությունը",
+            "view_source": "Դիտել աղբյուրը"
+        },
+        "creation_summary_dm": "%(creator)s-ն ստեղծեց այս DM-ը (անձնական հաղորդագրություններ)։",
+        "creation_summary_room": "%(creator)s-ն ստեղծել և կարգավորել է սենյակը։",
+        "decryption_failure": {
+            "blocked": "Ուղարկողը արգելափակել է այս հաղորդագրությունն ստանալու հնարավորությունը, քանի որ ձեր սարքը հաստատված չէ։",
+            "historical_event_no_key_backup": "Պատմական հաղորդագրությունները հասանելի չեն այս սարքի վրա",
+            "historical_event_unverified_device": "Դուք պետք է հաստատեք այս սարքը՝ պատմական հաղորդագրությունների հասանելիության համար",
+            "historical_event_user_not_joined": "Դուք հասանելիություն չունեք այս հաղորդագրություններին",
+            "sender_identity_previously_verified": "Ուղարկողի վավերացված ինքնությունը վերակայվել է։",
+            "sender_unsigned_device": "Ուղարկվել է անապահով սարքից։",
+            "unable_to_decrypt": "Հնարավոր չէ վերծանել հաղորդագրությունը"
+        },
+        "disambiguated_profile": "%(displayName)s(%(matrixId)s)",
+        "download_action_decrypting": "Վերծանում",
+        "download_action_downloading": "Ներբեռնում",
+        "download_failed": "Չհաջողվեց ներբեռնել",
+        "download_failed_description": "Այս ֆայլը ներբեռնելիս սխալ տեղի ունեցավ",
+        "e2e_state": "\"Ծայրից ծայր\" գաղտնագրման կարգավիճակը",
+        "edits": {
+            "tooltip_label": "Խմբագրվել է %(date)s-ին։ Սեղմեք՝ փոփոխությունները դիտելու համար։",
+            "tooltip_sub": "Սեղմեք՝ փոփոխությունները դիտելու համար",
+            "tooltip_title": "Խմբագրվել է %(date)s-ին"
+        },
+        "error_no_renderer": "Անհնար է ցուցադրել այս իրադարձությունը",
+        "error_rendering_message": "Հնարավոր չէ բեռնել այս հաղորդագրությունը",
+        "historical_messages_unavailable": "Դուք չեք կարող տեսնել նախորդ/հին հաղորդագրությունները",
+        "in_room_name": " <strong>%(room)s</strong> սենյակում",
+        "io.element.widgets.layout": "%(senderName)s-ը թարմացրել է սենյակի դասավորությունը",
+        "late_event_separator": "Սկզբնապես ուղարկված %(dateTime)s-ին",
+        "load_error": {
+            "no_permission": "Փորձեցնք բեռնել այս սենյակի ժամանակացույցի որոշակի կետ, բայց դուք թույլտվություն չունեք դիտելու տվյալ հաղորդագրությունը։",
+            "title": "Ժամանակացույցի դիրքը չհաջողվեց բեռնել",
+            "unable_to_find": "Փորձեցինք բեռնել այս սենյակի ժամանակագրության որոշակի կետ, բայց չկարողացանք գտնել այն։"
+        },
+        "m.audio": {
+            "audio_player": "Աուդիո նվագարկիչ",
+            "error_downloading_audio": "Աուդիո ներբեռնման սխալ",
+            "error_processing_audio": "Ձայնային հաղորդագրության մշակման սխալ",
+            "error_processing_voice_message": "Ձայնային հաղորդագրության մշակման սխալ",
+            "unnamed_audio": "Անանուն աուդիո"
+        },
+        "m.beacon_info": {
+            "view_live_location": "Դիտել կենդանի գտնվելու վայրը"
+        },
+        "m.call": {
+            "video_call_ended": "Տեսազանգն ավարտվեց",
+            "video_call_started": "Տեսազանգը սկսվեց %(roomName)s֊ում:",
+            "video_call_started_text": "%(name)s-ը սկսել է տեսազանգ",
+            "video_call_started_unsupported": "Տեսազանգը սկսվեց %(roomName)s֊ում․ (չի աջակցվում այս զննարկչի կողմից)"
+        },
+        "m.call.hangup": {
+            "dm": "Զանգն ավարտվել է"
+        },
+        "m.call.invite": {
+            "answered_elsewhere": "Պատասխանել է այլ տեղ",
+            "call_back_prompt": "Հետզանգահարել",
+            "declined": "Զանգը մերժվեց",
+            "failed_connect_media": "Հնարավոր չէ միացնել մեդիան",
+            "failed_connection": "Կապը ձախողվեց",
+            "failed_opponent_media": "Նրանց սարքը չկարողացավ միացնել տեսախցիկը կամ խոսափողը",
+            "missed_call": "Բաց թողնված զանգ",
+            "no_answer": "Պատասխան չկա",
+            "unknown_error": "Անհայտ սխալ տեղի ունեցավ",
+            "unknown_failure": "Անհայտ ձախողում. %(reason)s",
+            "unknown_state": "Զանգը անհայտ վիճակում է։",
+            "video_call": "%(senderName)s-ը տեղադրել է տեսազանգ:",
+            "video_call_unsupported": "%(senderName)s-ը տեղադրել է տեսազանգ. (չի աջակցվում այս զննարկիչի կողմից)",
+            "voice_call": "%(senderName)s-ը տեղադրել է ձայնային զանգ:",
+            "voice_call_unsupported": "%(senderName)s-ը տեղադրել է ձայնային զանգ․ (չի աջակցվում այս զննարկիչի կողմից)"
+        },
+        "m.file": {
+            "error_decrypting": "Կցորդի վերծանման սխալ",
+            "error_invalid": "Անվավեր ֆայլ"
+        },
+        "m.image": {
+            "error": "Սխալի պատճառով նկարը չի կարող ցուցադրվել",
+            "error_decrypting": "Նկարի վերծանման սխալ",
+            "error_downloading": "Նկարի ներբեռնման սխալ",
+            "sent": "%(senderDisplayName)s-ն նկար է ուղարկել:",
+            "show_image": "Ցուցադրել նկարը"
+        },
+        "m.key.verification.request": {
+            "user_wants_to_verify": "%(name)s-ը ցանկանում է ստուգել",
+            "you_started": "Դուք ուղարկել եք ստուգման հարցում"
+        },
+        "m.location": {
+            "full": "%(senderName)s-ը կիսվել է իր գտնվելու վայրով",
+            "location": "Կիսվել է գտնվելու վայրով՝ ",
+            "self_location": "Կիսվել են իրենց գտնվելու վայրով՝ "
+        },
+        "m.poll": {
+            "count_of_votes": {
+                "one": "%(count)s ձայն",
+                "other": "%(count)s ձայներ"
+            }
+        },
+        "m.poll.end": {
+            "sender_ended": "%(senderName)s-ն ավարտել է հարցումը"
+        },
+        "m.poll.start": "%(senderName)s-ը սկսել է հարցում՝ %(pollQuestion)s",
+        "m.room.avatar": {
+            "changed": "%(senderDisplayName)s-ը փոխել է սենյակի ավատարը:",
+            "changed_img": "%(senderDisplayName)s-ը փոխել է սենյակի ավատարը <img/>-ով",
+            "lightbox_title": "%(senderDisplayName)s-ը փոխել է %(roomName)s֊ի ավատարը",
+            "removed": "%(senderDisplayName)s-ը հեռացրեց սենյակի ավատարը:"
+        },
+        "m.room.canonical_alias": {
+            "alt_added": {
+                "one": "%(senderName)s-ն ավելացրել է %(addresses)s այլընտրանքային հասցեն այս սենյակի համար։",
+                "other": "%(senderName)s-ն ավելացրել է %(addresses)s այլընտրանքային հասցեներն այս սենյակի համար։"
+            },
+            "alt_removed": {
+                "one": "%(senderName)s-ը հեռացրել է %(addresses)s այլընտրանքային հասցեն այս սենյակի համար։",
+                "other": "%(senderName)s-ը հեռացրել է %(addresses)s այլընտրանքային հասցեներն այս սենյակի համար։"
+            },
+            "changed": "%(senderName)s-ը փոխել է այս սենյակի հասցեները:",
+            "changed_alternative": "%(senderName)s-ը փոխել է այս սենյակի այլընտրանքային հասցեները:",
+            "changed_main_and_alternative": "%(senderName)s-ը փոխել է այս սենյակի հիմնական և այլընտրանքային հասցեները:",
+            "removed": "%(senderName)s-ը հեռացրել է այս սենյակի հիմնական հասցեն:",
+            "set": "%(senderName)s-ը սահմանել է այս սենյակի հիմնական հասցեն՝ %(address)s:"
+        },
+        "m.room.create": {
+            "continuation": "Այս սենյակը մեկ այլ զրույցի շարունակությունն է։",
+            "see_older_messages": "Սեղմեք այստեղ՝ ավելի հին հաղորդագրությունները տեսնելու համար։",
+            "unknown_predecessor": "Հնարավոր չէ գտնել այս սենյակի հին տարբերակը (սենյակի ID՝ %(roomId)s ), և մեզ չի տրամադրվել «via_servers»՝ այն փնտրելու համար։",
+            "unknown_predecessor_guess_server": "Հնարավոր չէ գտնել այս սենյակի հին տարբերակը (սենյակի ID՝ %(roomId)s ), և մեզ չի տրամադրվել «via_servers»՝ այն որոնելու համար։ Հնարավոր է, որ սենյակի ID-ից սերվերը գուշակելը կստացվի։ Եթե ուզում եք փորձել, սեղմեք այս հղման վրա։"
+        },
+        "m.room.encryption": {
+            "disable_attempt": "Գաղտնագրումն անջատելու անտեսված փորձ",
+            "disabled": "Գաղտնագրումը միացված չէ",
+            "enabled": "Այս սենյակում հաղորդագրությունները ծայրից ծայր գաղտնագրված են։ Երբ մարդիկ միանում են, դուք կարող եք հաստատել նրանց իրենց էջում՝ պարզապես սեղմելով նրանց էջի նկարի վրա։",
+            "enabled_dm": "Այստեղ հաղորդագրությունները ծայրից ծայր գաղտնագրված են: Ստուգեք %(displayName)s-ին իր պրոֆիլում․ սեղմեք նրա պրոֆիլի նկարին:",
+            "enabled_local": "Այս զրույցի հաղորդագրությունները կլինեն ծայրից ծայր գաղտնագրված։",
+            "parameters_changed": "Որոշ գաղտնագրման պարամետրեր փոխվել են:",
+            "unsupported": "Այս սենյակի կողմից օգտագործվող գաղտնագրումը չի աջակցվում։"
+        },
+        "m.room.guest_access": {
+            "can_join": "%(senderDisplayName)s-ը թույլ է տվել հյուրերին միանալ սենյակին:",
+            "forbidden": "%(senderDisplayName)s-ը կանխել է հյուրերին միանալ սենյակին:",
+            "unknown": "%(senderDisplayName)s-ը փոխել է հյուրի մուտքի թույլտվությունը %(rule)s-ով"
+        },
+        "m.room.history_visibility": {
+            "invited": "%(senderName)s-ը ապագա սենյակի պատմությունը տեսանելի է դարձրել սենյակի բոլոր անդամների համար՝ սկսած նրանց հրավիրելու պահից։",
+            "joined": "%(senderName)s-ը սենյակի ապագա պատմությունը տեսանելի է դարձրել սենյակի բոլոր անդամների համար՝ սկսած նրանց միանալու պահից։",
+            "shared": "%(senderName)s-ը սենյակի ապագա պատմությունը տեսանելի է դարձրել սենյակի բոլոր անդամների համար։",
+            "unknown": "%(senderName)s-ը ապագա սենյակի պատմությունը տեսանելի դարձրեց անհայտ անձանց (%(visibility)s):",
+            "world_readable": "%(senderName)s-ը սենյակի ապագա պատմությունը տեսանելի է դարձրել բոլորի համար։"
+        },
+        "m.room.join_rules": {
+            "invite": "%(senderDisplayName)s-ը սենյակի մուտքը դարձրեց միայն հրավերով։",
+            "knock": "%(senderDisplayName)s-ը փոխել է միանալու կանոնը՝ միանալ խնդրելու եղանակով:",
+            "public": "%(senderDisplayName)s-ը սենյակը հանրայնացրել է այն մարդկանց համար, ովքեր ունեն սենյակի հղումը:",
+            "restricted": "%(senderDisplayName)s-ը փոխել է կարգը, թե ով կարող է միանալ այս սենյակին:",
+            "restricted_settings": "%(senderDisplayName)s-ը փոխել է կարգը, թե ով կարող է միանալ այս սենյակին: <a>Դիտել կարգավորումները</a>։",
+            "unknown": "%(senderDisplayName)s-ը փոխել է միացման կանոնը %(rule)s֊ով։"
+        },
+        "m.room.member": {
+            "accepted_3pid_invite": "%(targetName)s-ն ընդունել է հրավերը․ %(displayName)s",
+            "accepted_invite": "%(targetName)s-ն ընդունել է հրավերը",
+            "ban": "%(senderName)s֊ը արգելափակել է %(targetName)s-ին․",
+            "ban_reason": "%(senderName)s֊ը արգելափակել է %(targetName)s-ին․ %(reason)s",
+            "change_avatar": "%(senderName)s-ը փոխել է իր պրոֆիլի նկարը",
+            "change_name": "%(oldDisplayName)s-ը փոխել է իր ցուցադրման անունը %(displayName)s-նով",
+            "change_name_avatar": "%(oldDisplayName)s-ը փոխել է իր ցուցադրման անունը և պրոֆիլի նկարը",
+            "invite": "%(senderName)s-ը հրավիրվել է %(targetName)s-ին",
+            "join": "%(targetName)s-ը միացել է սենյակին",
+            "kick": "%(senderName)s-ը հեռացրել է %(targetName)s-ին",
+            "kick_reason": "%(senderName)s-ը հեռացրել է %(targetName)s-ին․ %(reason)s",
+            "left": "%(targetName)s-ը լքել է սենյակը",
+            "left_reason": "%(targetName)s-ը լքեց սենյակը. (%(reason)s",
+            "no_change": "%(senderName)s-ը փոփոխություն չի կատարել",
+            "reject_invite": "%(targetName)s-ը մերժել է հրավերը",
+            "reject_invite_reason": "%(targetName)s-ի կողմից հրավերը մերժվել է․ %(reason)s։",
+            "remove_avatar": "%(senderName)s-ը հեռացրել են իր պրոֆիլի նկարը",
+            "remove_name": "%(senderName)s-ը հեռացրել է իր ցուցադրման անունը․ (%(oldDisplayName)s)",
+            "set_avatar": "%(senderName)s-ը սահմանել է պրոֆիլի նկար",
+            "set_name": "%(senderName)s-ը սահմանել է իր ցուցադրման անունը %(displayName)s֊ն",
+            "unban": "%(senderName)s-ն ապաարգելափակել է %(targetName)s-ին",
+            "withdrew_invite": "%(senderName)s-ը հետ վերցրեց %(targetName)s-ի հրավերը",
+            "withdrew_invite_reason": "%(senderName)s-ը հետ վերցրեց %(targetName)s-ի հրավերը. %(reason)s"
+        },
+        "m.room.name": {
+            "change": "%(senderDisplayName)s-ը փոխել է սենյակի անունը՝ %(oldRoomName)s-ից %(newRoomName)s-ն.",
+            "remove": "%(senderDisplayName)s-ը հեռացրել է սենյակի անունը:",
+            "set": "%(senderDisplayName)s-ը փոխել է սենյակի անունը %(roomName)s-ն:"
+        },
+        "m.room.pinned_events": {
+            "changed": "%(senderName)s-ը փոխել է սենյակի համար ամրացված հաղորդագրությունները:",
+            "changed_link": "%(senderName)s-ը փոխել է սենյակի համար <a>ամրացված հաղորդագրությունը</a>։",
+            "pinned": "%(senderName)s-ն ամրացրել է հաղորդագրություն այս սենյակում։ Տեսնել բոլոր ամրացված հաղորդագրությունները։",
+            "pinned_link": "%(senderName)s-ն ամրացրել է <a>հաղորդագրությունը</a> այս սենյակում։ Տեսնել բոլոր <b>ամրացված հաղորդագրությունները</b>․",
+            "unpinned": "%(senderName)s-ն ապաամրացրել է հաղորդագրություն այս սենյակից։ Տեսնել բոլոր ամրացված հաղորդագրությունները։",
+            "unpinned_link": "%(senderName)s-ն ապաամրացրել է <a>հաղորդագրություն</a> այս սենյակից։ Տեսնել բոլոր <b>ամրացված հաղորդագրությունները</b>։"
+        },
+        "m.room.power_levels": {
+            "changed": "%(senderName)s-ը փոխել է %(powerLevelDiffText)s֊ի հզորության մակարդակը։",
+            "user_from_to": "%(userId)s-ը %(fromPowerLevel)s-ից %(toPowerLevel)s"
+        },
+        "m.room.server_acl": {
+            "all_servers_banned": "🎉 Բոլոր սերվերներին արգելված է մասնակցել: Այս սենյակը այլեւս չի կարող օգտագործվել:",
+            "changed": "%(senderDisplayName)s-ը փոխել է սերվերի ACL-ները(մուտքի վերահսկման ցուցակներ) այս սենյակի համար:",
+            "set": "%(senderDisplayName)s-ը սանհմանեց սերվերի ACL-ները(մուտքի վերահսկման ցուցակներ) այս սենյակի համար:"
+        },
+        "m.room.third_party_invite": {
+            "revoked": "%(senderName)s-ը չեղյալ է համարել %(targetDisplayName)s-ի սենյակին միանալու հրավերը:",
+            "sent": "%(senderName)s-ը հրավեր է ուղարկել %(targetDisplayName)s-ին՝ սենյակին միանալու համար։"
+        },
+        "m.room.tombstone": "%(senderDisplayName)s-ը թարմացրել է այս սենյակը:",
+        "m.room.topic": {
+            "changed": "%(senderDisplayName)s-ը թարմացրեց թեման՝ \"%(topic)s\"։",
+            "removed": "%(senderDisplayName)s-ը հեռացրեց թեման։"
+        },
+        "m.sticker": "%(senderDisplayName)s-ը ուղարկել է ստիկեր:",
+        "m.video": {
+            "error_decrypting": "Տեսանյութի վերծանման սխալ",
+            "show_video": "Ցուցադրել տեսանյութը"
+        },
+        "m.widget": {
+            "added": "%(widgetName)s վիջեթն ավելացվել է %(senderName)s-ի կողմից",
+            "jitsi_ended": "Տեսակոնֆերանսն ավարտվել է %(senderName)s-ի կողմից",
+            "jitsi_join_right_prompt": "Միացեք կոնֆերանսին՝ աջ կողմում գտնվող սենյակի տեղեկատվական քարտից",
+            "jitsi_join_top_prompt": "Միացեք կոնֆերանսին այս սենյակի վերևի մասում",
+            "jitsi_started": "Տեսակոնֆերանսը սկսվել է %(senderName)s֊ի կողմից",
+            "jitsi_updated": "Տեսակոնֆերանսը թարմացվել է %(senderName)s-ի կողմից",
+            "modified": "%(widgetName)s վիջեթը փոփոխվել է %(senderName)s-ի կողմից",
+            "removed": "%(widgetName)s վիջեթը հեռացվել է %(senderName)s-ի կողմից"
+        },
+        "mab": {
+            "collapse_reply_chain": "Ծալել մեջբերումները",
+            "copy_link_thread": "Պատճենել հղումը թեմայում",
+            "expand_reply_chain": "Ընդարձակել մեջբերումները",
+            "label": "Հաղորդագրության գործողություններ",
+            "view_in_room": "Դիտել սենյակում"
+        },
+        "message_timestamp_received_at": "Ստացվել է՝ %(dateTime)s-ին",
+        "message_timestamp_sent_at": "Ուղարկվել է՝ %(dateTime)s֊ին",
+        "mjolnir": {
+            "changed_rule_glob": "%(senderName)s թարմացրեց արգելքի կանոնը, որը նախկինում համապատասխանում էր %(oldGlob)s-ին, այժմ՝ %(newGlob)s-ին՝ %(reason)s պատճառով։",
+            "changed_rule_rooms": "%(senderName)s փոխեց կանոնը, որը արգելափակում էր %(oldGlob)s համապատասխանող սենյակները, այժմ այն գործում է %(newGlob)s համապատասխանողների համար՝ %(reason)s պատճառով։",
+            "changed_rule_servers": "%(senderName)s փոխեց կանոնը, որը արգելափակում էր %(oldGlob)s համապատասխանող սերվերները, այժմ այն գործում է %(newGlob)s համապատասխանողների համար՝ %(reason)s պատճառով։",
+            "changed_rule_users": "%(senderName)s փոխեց կանոնը, որը արգելափակում էր %(oldGlob)s համապատասխանող օգտատերերին, այժմ այն գործում է %(newGlob)s համապատասխանողների համար՝ %(reason)s պատճառով։",
+            "created_rule": "%(senderName)s-ը ստեղծեց %(glob)s–ին համապատասխանող արգելքի կանոն՝ %(reason)s պատճառով",
+            "created_rule_rooms": "%(senderName)s-ը ստեղծեց %(glob)s–ին համապատասխանող սենյակները արգելող կանոն՝ %(reason)s պատճառով",
+            "created_rule_servers": "%(senderName)s-ը ստեղծեց %(glob)s–ին համապատասխանող սերվերները արգելող կանոն՝ %(reason)s պատճառով",
+            "created_rule_users": "%(senderName)s-ը ստեղծեց %(glob)s–ին համապատասխանող օգտատերերին արգելող կանոն՝ %(reason)s պատճառով",
+            "message_hidden": "Դուք անտեսել եք այս օգտատիրոջը, ուստի նրա հաղորդագրությունը թաքցված է։<a> Ամեն դեպքում ցույց տալ։</a>",
+            "removed_rule": "%(senderName)s-ը հեռացրել է %(glob)s-ին համապատասխանող արգելքի կանոնը",
+            "removed_rule_rooms": "%(senderName)s-ը հեռացրեց %(glob)s-ին համապատասխանող սենյակներն արգելող կանոնը",
+            "removed_rule_servers": "%(senderName)s-ը հեռացրեց %(glob)s-ին համապատասխանող սերվերներն արգելող կանոնը",
+            "removed_rule_users": "%(senderName)s-ը հեռացրեց %(glob)s-ին համապատասխանող օգտատերերին արգելող կանոնը",
+            "updated_invalid_rule": "%(senderName)s-ը թարմացրել է անվավեր արգելքի կանոնը",
+            "updated_rule": "%(senderName)s-ը թարմացրեց %(glob)s–ին համապատասխանող արգելքի կանոնը՝ %(reason)s պատճառով",
+            "updated_rule_rooms": "%(senderName)s-ը թարմացրեց այն կանոնը, որը արգելում է %(glob)s–ին համապատասխանող սենյակները՝ %(reason)s պատճառով",
+            "updated_rule_servers": "%(senderName)s-ը թարմացրեց այն կանոնը, որը արգելում է %(glob)s–ին համապատասխանող սերվերները՝ %(reason)s պատճառով",
+            "updated_rule_users": "%(senderName)s-ը թարմացրեց այն կանոնը, որը արգելում է %(glob)s–ին համապատասխանող օգտատերերին՝ %(reason)s պատճառով"
+        },
+        "no_permission_messages_before_invite": "Դուք թույլտվություն չունեք դիտելու այն հաղորդագրությունները, որոնք ուղարկված են եղել ձեր հրավերն ստանալուց առաջ։",
+        "no_permission_messages_before_join": "Դուք թույլտվություն չունեք դիտելու այն հաղորդագրությունները, որոնք ուղարկված են եղել ձեր միանալուց առաջ։",
+        "pending_moderation": "Հաղորդագրությունը սպասում է մոդերացիայի",
+        "pending_moderation_reason": "Մոդերացիայի սպասող հաղորդագրություն․ %(reason)s",
+        "reactions": {
+            "add_reaction_prompt": "Ավելացնել արձագանք",
+            "custom_reaction_fallback_label": "Հատուկ արձագանք",
+            "label": "%(reactors)s-ն արձագանքեց %(content)s-ով",
+            "tooltip_caption": "արձագանքեց %(shortName)s-ով"
+        },
+        "read_receipt_title": {
+            "one": "Տեսել է %(count)s մարդ",
+            "other": "Տեսել է %(count)s մարդիկ"
+        },
+        "read_receipts_label": "Կարդալ անդորրագրերը",
+        "redacted": {
+            "tooltip": "Հաղորդագրությունը ջնջվել է %(date)s"
+        },
+        "redaction": "Հաղորդագրությունը ջնջվել է %(name)s-ի կողմից",
+        "reply": {
+            "error_loading": "Անհնար է բեռնել պատասխանված իրադարձությունը, այն կա՛մ գոյություն չունի, կա՛մ դուք չունեք այն դիտելու թույլտվություն:",
+            "in_reply_to": "<a>Ի պատասխան</a><pill>",
+            "in_reply_to_for_export": "Ի պատասխան <a> այս հաղորդագրությանը </a>"
+        },
+        "scalar_starter_link": {
+            "dialog_description": "Դուք շուտով կտեղափոխվեք երրորդ կողմի կայք, որպեսզի կարողանաք վավերացնել ձեր հաշիվը՝ %(integrationsUrl)s-ով օգտագործելու համար: Ցանկանո՞ւմ եք շարունակել:",
+            "dialog_title": "Ավելացնել ինտեգրում"
+        },
+        "self_redaction": "Հաղորդագրությունը ջնջված է",
+        "send_state_encrypting": "Ձեր հաղորդագրության գաղտնագրում...",
+        "send_state_failed": "Չհաջողվեց ուղարկել",
+        "send_state_sending": "Ձեր հաղորդագրությունն ուղարկվում է…",
+        "send_state_sent": "Ձեր հաղորդագրությունն ուղարկվեց",
+        "summary": {
+            "banned": {
+                "one": "արգելվել է",
+                "other": "արգելվել է %(count)s անգամ"
+            },
+            "banned_multiple": {
+                "one": "արգելվել են",
+                "other": "արգելվել են %(count)s անգամ"
+            },
+            "changed_avatar": {
+                "one": "%(oneUser)s փոխելէ իր պրոֆիլի նկարը",
+                "other": "%(oneUser)s փոխել իր պրոֆիլի նկարը %(count)s անգամ"
+            },
+            "changed_avatar_multiple": {
+                "one": "%(severalUsers)s փոխել են իրենց պրոֆիլի նկարը",
+                "other": "%(severalUsers)s փոխել են իրենց պրոֆիլի նկարը %(count)s անգամ"
+            },
+            "changed_name": {
+                "one": "%(oneUser)s փոխել է իր անունը",
+                "other": "%(oneUser)s փոխել է իր անունը %(count)s անգամ"
+            },
+            "changed_name_multiple": {
+                "one": "%(severalUsers)s փոխել են իրենց անունը",
+                "other": "%(severalUsers)s փոխել են իրենց անուն %(count)s անգամ"
+            },
+            "format": "%(nameList)s %(transitionList)s",
+            "hidden_event": {
+                "one": "%(oneUser)s ուղարկել է թաքնված հաղորդագրություն",
+                "other": "%(oneUser)s ուղարկել է %(count)s թաքնված հաղորդագրություններ"
+            },
+            "hidden_event_multiple": {
+                "one": "%(severalUsers)s ուղարկել են թաքնված հաղորդագրություն",
+                "other": "%(severalUsers)s ուղարկել են %(count)s թաքնված հաղորդագրություններ"
+            },
+            "invite_withdrawn": {
+                "one": "%(oneUser)s հրավերը հետ է կանչել",
+                "other": "%(oneUser)s հրավերը հետ է կանչվել %(count)s անգամ"
+            },
+            "invite_withdrawn_multiple": {
+                "one": "%(severalUsers)s հրավերները հետ են կանչվել",
+                "other": "%(severalUsers)s հրավերները հետ են կանչվել %(count)s անգամ"
+            },
+            "invited": {
+                "one": "հրավիրվել էր",
+                "other": "հրավիրվել էր %(count)s անգամ"
+            },
+            "invited_multiple": {
+                "one": "հրավիրվել են",
+                "other": "հրավիրվել են %(count)s անգամ"
+            },
+            "joined": {
+                "one": "%(oneUser)s միացավ",
+                "other": "%(oneUser)s միացավ %(count)s անգամ"
+            },
+            "joined_and_left": {
+                "one": "%(oneUser)s միացավ և լքեց",
+                "other": "%(oneUser)s միացավ և լքեց %(count)s անգամ"
+            },
+            "joined_and_left_multiple": {
+                "one": "%(severalUsers)s միացած և լքած",
+                "other": "%(severalUsers)s միացած և լքած %(count)s անգամ"
+            },
+            "joined_multiple": {
+                "one": "%(severalUsers)s միացած",
+                "other": "%(severalUsers)s միացած %(count)s անգամ"
+            },
+            "kicked": {
+                "one": "հեռացվել է",
+                "other": "հեռացվել է %(count)s անգամ"
+            },
+            "kicked_multiple": {
+                "one": "հեռացվել են",
+                "other": "հեռացվել են %(count)s անգամ"
+            },
+            "left": {
+                "one": "%(oneUser)s լքեց",
+                "other": "%(oneUser)s լքեց %(count)s անգամ"
+            },
+            "left_multiple": {
+                "one": "%(severalUsers)s լքած",
+                "other": "%(severalUsers)s լքած %(count)s անգամ"
+            },
+            "no_change": {
+                "one": "%(oneUser)s փոփոխություններ չի կատարել",
+                "other": "%(oneUser)s փոփոխություններ չի կատարել %(count)s անգամ"
+            },
+            "no_change_multiple": {
+                "one": "%(severalUsers)s փոփոխություններ չեն կատարել",
+                "other": "%(severalUsers)s փոփոխություններ չեն կատարել %(count)s անգամ"
+            },
+            "pinned_events": {
+                "one": "%(oneUser)s փոխել է սենյակի համար <a>ամրացված հաղորդագրությունները</a>",
+                "other": "%(oneUser)s փոխել է սենյակի համար <a>ամրացված հաղորդագրությունները</a> %(count)s անգամ"
+            },
+            "pinned_events_multiple": {
+                "one": "%(severalUsers)s փոխել են սենյակի համար <a>ամրացված հաղորդագրությունները</a>",
+                "other": "%(severalUsers)s փոխել են սենյակի համար <a>ամրացված հաղորդագրությունները</a> %(count)s անգամ"
+            },
+            "redacted": {
+                "one": "%(oneUser)s հեռացրել է հաղորդագրություն",
+                "other": "%(oneUser)s հեռացրել է %(count)s հաղորդագրություններ"
+            },
+            "redacted_multiple": {
+                "one": "%(severalUsers)s հեռացրել են հաղորդագրություն",
+                "other": "%(severalUsers)s հեռացրել են %(count)s հաղորդագրություններ"
+            },
+            "rejected_invite": {
+                "one": "%(oneUser)s մերժել է իր հրավերը",
+                "other": "%(oneUser)s մերժել է իր հրավերը %(count)s անգամ"
+            },
+            "rejected_invite_multiple": {
+                "one": "%(severalUsers)s մերժել են իրենց հրավերները",
+                "other": "%(severalUsers)s մերժել են իրենց հրավերների %(count)s անգամ"
+            },
+            "rejoined": {
+                "one": "%(oneUser)s լքեց և նորից միացավ",
+                "other": "%(oneUser)s լքեց և նորից միացավ %(count)s անգամ"
+            },
+            "rejoined_multiple": {
+                "one": "%(severalUsers)s լքած և նորից միացած",
+                "other": "%(severalUsers)s լքած և նորից միացած %(count)s անգամ"
+            },
+            "server_acls": {
+                "one": "%(oneUser)s-ը փոխել է սերվերի ACL-ները(մուտքի վերահսկման ցուցակներ)",
+                "other": "%(oneUser)s-ը փոխել է սերվերի ACL-ները(մուտքի վերահսկման ցուցակներ) %(count)s անգամ"
+            },
+            "server_acls_multiple": {
+                "one": "%(severalUsers)s-ը փոխել են սերվերի ACL-ները(մուտքի վերահսկման ցուցակներ)",
+                "other": "%(severalUsers)s-ը փոխել են սերվերի ACL-ները(մուտքի վերահսկման ցուցակներ) %(count)s անգամ"
+            },
+            "unbanned": {
+                "one": "ապաարգելվել է",
+                "other": "ապաարգելվել է %(count)s անգամ"
+            },
+            "unbanned_multiple": {
+                "one": "ապաարգելվել են",
+                "other": "ապաարգելվել են %(count)s անգամ"
+            }
+        },
+        "thread_info_basic": "Թեմաից",
+        "typing_indicator": {
+            "more_users": {
+                "one": "%(names)s-ը և մեկ ուրիշը գրում են ...",
+                "other": "%(names)s-ը և %(count)s այլ օգտատերեր գրում են ․․․"
+            },
+            "one_user": "%(displayName)s-ը գրում է ...",
+            "two_users": "%(names)s-ը և %(lastPerson)s-ը գրում են ․․․"
+        },
+        "undecryptable_tooltip": "Անհնար է վերծանել այս հաղորդագրությունը",
+        "url_preview": {
+            "close": "Փակել նախադիտումը",
+            "show_n_more": {
+                "one": "Ցույց տալ %(count)s այլ նախադիտում",
+                "other": "Ցույց տալ %(count)s այլ նախադիտումներ"
+            }
+        }
+    },
+    "truncated_list_n_more": {
+        "one": "",
+        "other": "Եվ ևս %(հաշվարկ)s..."
+    },
+    "unsupported_browser": {
+        "description": "Եթե շարունակեք, որոշ հնարավորություններ կարող են դադարեցնել աշխատանքը, և գոյություն ունի տվյալների կորուստի ռիսկ։ Թարմացրեք ձեր զննարկիչը, որպեսզի շարունակեք օգտագործել %(brand)s-ը։",
+        "title": "Այս զննարկիչը չի աջակցվում %(brand)s-ի կողմից"
+    },
+    "unsupported_server_description": "Այս սերվերը օգտագործում է Matrix-ի ավելի հին տարբերակը: Թարմացրեք Matrix %(version)s տարբերակով՝ %(brand)s-ն առանց սխալների օգտագործելու համար:",
+    "unsupported_server_title": "Ձեր սերվերը չի աջակցվում",
+    "update": {
+        "changelog": "Փոփոխությունների մատյան",
+        "check_action": "Ստուգել նոր տարբերակի առկայությունը",
+        "checking": "Թարմացման ստուգում...",
+        "downloading": "Թարմացումը ներբեռնվում է…",
+        "error_encountered": "Սխալ է առաջացել (%(errorDetail)s):",
+        "error_unable_load_commit": "Անհնար է բեռնել հանձնման մանրամասները. %(msg)s",
+        "new_version_available": "Նոր տարբերակը հասանելի է: <a>Թարմացնել հիմա։</a>",
+        "no_update": "Թարմացում հասանելի չէ:",
+        "release_notes_toast_title": "Ինչ է նոր",
+        "see_changes_button": "Ի՞նչ նոր բան կա:",
+        "toast_description": "%(brand)s-ի նոր տարբերակը հասանելի է",
+        "toast_title": "Թարմացնել %(brand)s-ը",
+        "unavailable": "Անհասանելի"
+    },
+    "update_room_access_modal": {
+        "description": "Կիսման հղում ստեղծելու համար դարձրեք այս սենյակը <b>հանրային</b> կամ ակտիվացրեք այն տարբերակը, որը թույլ է տալիս օգտատերերին <b>խնդրել միանալ</b>։ Սա հնարավորություն է տալիս հյուրերին միանալ առանց հրավերի։",
+        "dont_change_description": "Եթե չեք ցանկանում փոխել այս սենյակի հասանելիությունը, կարող եք ստեղծել նոր սենյակ զանգի հղման համար։",
+        "no_change": "Ես չեմ ցանկանում փոխել հասանելիության աստիճանը։",
+        "revert_access_description": "(Սա կարող է վերադարձվել նախորդ արժեքին սենյակի կարգավորումներում․ <b>Անվտանգություն և գաղտնիություն</b> / <b>Մուտք</b>)",
+        "title": "Թույլատրել հյուր օգտատերերին միանալ այս սենյակին"
+    },
+    "upload_failed_generic": "“%(fileName)s' ֆայլը չի հաջողվել վերբեռնել:",
+    "upload_failed_size": "“%(fileName)s” ֆայլը գերազանցում է այս սերվերում վերբեռնումների համար նախատեսված ծավալը",
+    "upload_failed_title": "Վերբեռնումը ձախողվեց",
+    "upload_file": {
+        "cancel_all_button": "Չեղարկել բոլորը",
+        "error_file_too_large": "Այս ֆայլը <b>չափազանց մեծ է</b> ներբեռնելու համար: Ֆայլի չափի սահմանը %(limit)s է, բայց այս ֆայլը %(sizeOfThisFile)s է:",
+        "error_files_too_large": "Այս ֆայլերը <b>չափազանց մեծ են</b> վերբեռնելու համար։ Ֆայլի չափի սահմանաչափը %(limit)s է։",
+        "error_some_files_too_large": "Որոշ ֆայլեր <b>չափազանց մեծ են</b> վերբեռնման համար։ Ֆայլի չափի սահմանաչափը %(limit)s է։",
+        "error_title": "Վերբեռնման սխալ",
+        "not_image": "Ձեր ընտրած ֆայլը վավեր պատկերի ֆայլ չէ։",
+        "title": "Ֆայլերի վերբեռնում",
+        "title_progress": "Բեռնել ֆայլերը (%(current)s-ը %(total)s-ից)",
+        "upload_all_button": "Բեռնել բոլորը",
+        "upload_n_others_button": {
+            "one": "Բեռնել %(count)s այլ ֆայլ",
+            "other": "Բեռնել %(count)s այլ ֆայլեր"
+        }
+    },
+    "user_info": {
+        "admin_tools_section": "Ադմինիստրատորի գործիքներ",
+        "ban_button_room": "Արգելափակել սենյակից",
+        "ban_button_space": "Արգելափակել տարածքից",
+        "ban_room_confirm_title": "Արգելափակել %(roomName)s֊ից",
+        "ban_space_everything": "Արգելափակել նրանց ամեն ինչից, ինչից կարող եմ",
+        "ban_space_specific": "Արգելափակել նրանց որոշակի բաներից, որոնք ես կարող եմ անել",
+        "deactivate_confirm_action": "Ապաակտիվացնել օգտատիրոջը",
+        "deactivate_confirm_description": "Այս օգտատիրոջ ապաակտիվացումը կհանգեցնի համակարգից նրա դուրս գալուն և թույլ չի տա նրան նորից մուտք գործել։ Բացի այդ, նա կլքի բոլոր սենյակները, որտեղ գտնվում է։ Այս գործողությունը չի կարող հետադարձվել։ Վստա՞հ եք, որ ցանկանում եք ապաակտիվացնել այս օգտատիրոջը։",
+        "deactivate_confirm_title": "Ապաակտիվացնե՞լ օգտատիրոջը",
+        "demote_button": "Նվազեցնել պաշտոնը",
+        "demote_self_confirm_description_space": "Դուք չեք կարողանա չեղարկել այս փոփոխությունը, քանի որ դուք իջեցնում եք ձեր կարգավիճակը։ Եթե դուք տարածքում վերջին արտոնյալ օգտատերն եք, ապա անհնար կլինի վերականգնել արտոնությունները։",
+        "demote_self_confirm_room": "Դուք չեք կարողանա չեղարկել այս փոփոխությունը, քանի որ դուք իջեցնում եք ձեր կարգավիճակը։ Եթե դուք սենյակի վերջին արտոնյալ օգտատերն եք, ապա անհնար կլինի վերականգնել արտոնությունները։",
+        "demote_self_confirm_title": "Ինքներդ ձեզ պաշտոնից ցածրացնե՞լ",
+        "disinvite_button_room": "Հրավերը հանել սենյակից",
+        "disinvite_button_room_name": "Հրավերը հանել %(roomName)s-ից",
+        "disinvite_button_space": "Հրավերը հանել տարածքից",
+        "error_ban_user": "Չհաջողվեց արգելափակել օգտատիրոջը",
+        "error_deactivate": "Չհաջողվեց ապաակտիվացնել օգտատիրոջը",
+        "error_kicking_user": "Չհաջողվեց հեռացնել օգտատիրոջը",
+        "error_mute_user": "Չհաջողվեց լռեցնել օգտատիրոջը",
+        "error_revoke_3pid_invite_description": "Հնարավոր չէ չեղարկել հրավերը: Հնարավոր է՝ սերվերը ժամանակավոր խնդիր ունի, կամ դուք բավարար թույլտվություններ չունեք հրավերը չեղարկելու համար:",
+        "error_revoke_3pid_invite_title": "Չհաջողվեց չեղարկել հրավերը",
+        "ignore_button": "Անտեսել",
+        "ignore_confirm_description": "Այս օգտատիրոջ բոլոր հաղորդագրությունները և հրավերները կթաքցվեն։ Վստա՞հ եք, որ ցանկանում եք անտեսել դրանք։",
+        "ignore_confirm_title": "Անտեսել %(user)s֊ին",
+        "invited_by": "Հրավիրված է %(sender)s֊ի կողմից",
+        "jump_to_rr_button": "Անցնել «բաղադրատոմսերի» ընթերցմանը",
+        "kick_button_room": "Հեռացնել սենյակից",
+        "kick_button_room_name": "Հեռացնել %(roomName)s-ից",
+        "kick_button_space": "Հեռացնել տարածքից",
+        "kick_button_space_everything": "Հեռացնել դրանք ամեն ինչից, ինչից կարող եմ",
+        "kick_space_specific": "Հեռացնել դրանք որոշակի բաներից, որոնք ես կարող եմ",
+        "kick_space_warning": "Նրանք դեռ կկարողանան մուտք գործել/դիմել այն ամենին, որի ադմինիստրատորը դուք չեք։",
+        "promote_warning": "Դուք չեք կարողանա հետարկել այս փոփոխությունը, քանի որ դուք օգտատիրոջը նույն հզորության մակարդակն եք առաջարկում, ինչ ձերը։",
+        "redact": {
+            "confirm_button": {
+                "one": "Հեռացնել 1 հաղորդագրություն",
+                "other": "Հեռացնել %(count)s հաղորդագրություններ"
+            },
+            "confirm_description_1": {
+                "one": "Դուք պատրաստվում եք հեռացնել %(count)s հաղորդագրություն՝ ուղարկված %(user)s-ի կողմից։ Սա ընդմիշտ կհեռացնի դրանք զրույցի բոլոր մասնակիցների համար։ Ցանկանո՞ւմ եք շարունակել։",
+                "other": "Դուք պատրաստվում եք հեռացնել %(count)s հաղորդագրություն՝ ուղարկված %(user)s-ի կողմից։ Սա ընդմիշտ կհեռացնի դրանք զրույցի բոլոր մասնակիցների համար։ Ցանկանո՞ւմ եք շարունակել։"
+            },
+            "confirm_description_2": "Մեծ քանակությամբ հաղորդագրությունների դեպքում սա կարող է որոշ ժամանակ պահանջել: Խնդրում ենք մինչ այդ չթարմացնել ձեր ծրագրի էջը:",
+            "confirm_keep_state_explainer": "Հանեք նշումը, եթե ցանկանում եք նաև հեռացնել այս օգտատիրոջ համակարգային հաղորդագրությունները (օրինակ՝ անդամակցության փոփոխություն, պրոֆիլի փոփոխություն…):",
+            "confirm_keep_state_label": "Պահպանել համակարգի հաղորդագրությունները",
+            "confirm_title": "Հեռացնել %(user)s֊ի կողմից վերջերս ուղարկված հաղորդագրությունները",
+            "no_recent_messages_description": "Փորձեք ոլորել ժամանակացույցը դեպի վեր՝ տեսնելու, թե արդյոք կան ավելի վաղ գրառումներ:",
+            "no_recent_messages_title": "%(user)s-ի կողմից վերջերս ուղարկված հաղորդագրություններ չեն գտնվել"
+        },
+        "redact_button": "Ջնջել հաղորդագրությունները",
+        "revoke_invite": "Հրավերի չեղարկում",
+        "room_encrypted": "Այս սենյակում հաղորդագրությունները ծայրից ծայր գաղտնագրված են։",
+        "room_encrypted_detail": "Ձեր հաղորդագրությունները պաշտպանված են, և միայն դուք և ստացողը ունեք դրանք բացելու եզակի բանալիներ։",
+        "room_unencrypted": "Այս սենյակում հաղորդագրությունները ծայրից ծայր գաղտնագրված չեն։",
+        "room_unencrypted_detail": "Գաղտնագրված սենյակներում ձեր հաղորդագրությունները պաշտպանված են, և միայն դուք և ստացողն ունեք դրանք բացելու եզակի բանալիներ։",
+        "send_message": "Ուղարկել հաղորդագրություն",
+        "share_button": "Կիսվել պրոֆիլով",
+        "unban_button_room": "Ապաարգելափակել սենյակից",
+        "unban_button_space": "Ապաարգելափակել տարածքից",
+        "unban_room_confirm_title": "Ապարագելափակել %(roomName)s֊ից",
+        "unban_space_everything": "Ապաարգելափակել նրանց ամեն ինչից, ինչից կարող եմ",
+        "unban_space_specific": "Ապաարգելափակել նրանց որոշակի բաներից, որոնք ես կարող եմ անել",
+        "unban_space_warning": "Նրանք չեն կարողանա մուտք գործել/դիմել այն ամենին, որի ադմինիստրատորը դուք չեք։",
+        "unignore_button": "Դադարեցնել անտեսումը",
+        "verification_unavailable": "Օգտատիրոջ ստուգումը հասանելի չէ",
+        "verify_button": "Հաստատել օգտատիրոջը",
+        "verify_explainer": "Լրացուցիչ անվտանգության համար հաստատեք այս օգտատիրոջը՝ ստուգելով միանգամյա կոդը ձեր երկու սարքերի վրա։"
+    },
+    "user_menu": {
+        "link_new_device": "Կապել նոր սարք",
+        "settings": "Բոլոր կարգավորումները",
+        "switch_theme_dark": "Անցնել մութ ռեժիմի",
+        "switch_theme_light": "Անցնել լուսավոր ռեժիմի"
+    },
+    "voip": {
+        "already_in_call": "Արդեն զանգի մեջ է",
+        "already_in_call_person": "Դուք արդեն զանգի մեջ եք այս անձի հետ։",
+        "answered_elsewhere": "Պատասխանել է այլ տեղ",
+        "answered_elsewhere_description": "Զանգին պատասխանվել է մեկ այլ սարքից։",
+        "call_failed": "Զանգը ձախողվեց",
+        "call_failed_description": "Զանգը չհաջողվեց հաստատել",
+        "call_failed_media": "Զանգը ձախողվեց, քանի որ անհնար էր դիմել վեբտեսախցիկին կամ խոսափողին: Ստուգեք, որ.",
+        "call_failed_media_applications": "Ոչ մի այլ ծրագիր չի օգտագործում վեբ-տեսախցիկը",
+        "call_failed_media_connected": "Խոսափողը եւ վեբ-տեսախցիկը միացված են և ճիշտ կարգավորված",
+        "call_failed_media_permissions": "Վեբ-տեսախցիկի օգտագործման թույլտվությունը տրված է",
+        "call_failed_microphone": "Զանգը ձախողվեց, քանի որ անհնար էր դիմել խոսափողին: Ստուգեք, որ խոսափողը միացված է և ճիշտ կարգավորված:",
+        "call_held": "%(peerName)s-ը զանգը պահեց",
+        "call_held_resume": "Դուք զանգը պահեցիք <a>Վերսկսել</a>",
+        "call_held_switch": "Դուք զանգը պահեցիք <a>Փոխել</a>",
+        "call_toast_unknown_room": "Անհայտ սենյակ",
+        "camera_disabled": "Ձեր տեսախցիկն անջատված է",
+        "camera_enabled": "Ձեր տեսախցիկը դեռ միացված է",
+        "cannot_call_yourself_description": "Դուք չեք կարող զանգահարել ինքներդ ձեզ։",
+        "close_lobby": "Փակել նախասրահը",
+        "connecting": "Միանում է",
+        "connection_lost": "Սերվերի հետ կապը կորել է",
+        "connection_lost_description": "Դուք չեք կարող զանգեր կատարել առանց սերվերի հետ կապի։",
+        "consulting": "Խորհրդատվություն %(transferTarget)s-ի հետ։ <a>Փոխանցում է %(transferee)s-ին </a>",
+        "default_device": "Լռելյայն սարք",
+        "dial": "Զանգահարել",
+        "dialpad": "Թվաշար",
+        "disable_camera": "Անջատել տեսախցիկը",
+        "disable_microphone": "Խլացնել խոսափողը",
+        "disabled_no_perms_start_video_call": "Դուք չունեք տեսազանգեր սկսելու թույլտվություն",
+        "disabled_no_perms_start_voice_call": "Դուք չունեք ձայնային զանգեր սկսելու թույլտվություն",
+        "disabled_ongoing_call": "Շարունակական զանգ",
+        "element_call": "Element զանգ",
+        "enable_camera": "Միացնել տեսախցիկը",
+        "enable_microphone": "Ապախլացնել խոսափողը",
+        "expand": "Վերադառնալ զանգին",
+        "get_call_link": "Կիսվել զանգի հղումով",
+        "hangup": "Կանգ առնել",
+        "hide_sidebar_button": "Թաքցնել կողային վահանակը",
+        "input_devices": "Մուտքագրման սարքեր",
+        "jitsi_call": "Jitsi կոնֆերանս(ժողով)",
+        "join_button_tooltip_call_full": "Ներեցեք, այս զանգը ներկայումս լրացված է",
+        "legacy_call": "Հնացած զանգ",
+        "maximise": "Լրացնել էկրանը",
+        "maximise_call": "Զանգը առավելագույնի հասցնել",
+        "metaspace_video_rooms": {
+            "conference_room_section": "Համաժողովներ"
+        },
+        "minimise_call": "Զանգը նվազագույնի հասցնել",
+        "misconfigured_server": "Զանգը ձախողվեց սխալ կարգավորված սերվերի պատճառով",
+        "misconfigured_server_description": "Խնդրում ենք խնդրել ձեր սերվերի ադմինիստրատորին (<code>%(homeserverDomain)s</code> )՝ TURN սերվերը կարգավորելու համար, որպեսզի զանգերը հուսալիորեն աշխատեն։",
+        "misconfigured_server_fallback": "Այլապես, դուք կարող եք փորձել օգտագործել հանրային սերվեր՝ <server/>, սակայն սա այնքան էլ հուսալի չի լինի, և այն կկիսվի ձեր IP հասցեով այդ սերվերի հետ։ Դուք կարող եք նաև կառավարել սա Կարգավորումներում։",
+        "misconfigured_server_fallback_accept": "Փորձել օգտագործել %(server)s-ը",
+        "more_button": "Ավելին",
+        "msisdn_lookup_failed": "Հեռախոսահամարը հնարավոր չէ գտնել",
+        "msisdn_lookup_failed_description": "Հեռախոսահամարը որոնելիս սխալ առաջացավ",
+        "msisdn_transfer_failed": "Զանգը հնարավոր չէ փոխանցել",
+        "n_people_joined": {
+            "one": "%(count)s անձ միացել է",
+            "other": "%(count)s մարդիկ միացել են"
+        },
+        "no_audio_input_description": "Ձեր սարքում խոսափող չգտանք: Խնդրում ենք ստուգել ձեր պարամետրերը և կրկին փորձեք:",
+        "no_audio_input_title": "Խոսափող չի գտնվել",
+        "no_media_perms_description": "Հնարավոր է՝ անհրաժեշտ լինի %(brand)s-ին ձեռքով թույլտվություն տալ ձեր խոսափողին/տեսախցիկին դիմելու համար",
+        "no_media_perms_title": "Մեդիա թույլտվություններ չկան",
+        "no_permission_conference": "Պահանջվում է թույլտվություն",
+        "no_permission_conference_description": "Դուք չունեք այս սենյակում կոնֆերանս զանգ սկսելու թույլտվություն",
+        "on_hold": "%(name)s-ը սպասման մեջ է",
+        "output_devices": "Ելքային սարքեր",
+        "screenshare_monitor": "Կիսվել ամբողջ էկրանով",
+        "screenshare_title": "Կիսվել բովանդակությամբ",
+        "screenshare_window": "Ծրագրի պատուհան",
+        "show_sidebar_button": "Ցուցադրել կողային վահանակը",
+        "silence": "Զանգի լռեցում",
+        "silenced": "Ծանուցումները լռեցված են",
+        "start_screenshare": "Սկսել կիսել ձեր էկրանը",
+        "stop_screenshare": "Ընդհատել էկրանի կիսումը",
+        "too_many_calls": "Չափազանց շատ զանգեր",
+        "too_many_calls_description": "Դուք հասել եք միաժամանակյա զանգերի առավելագույն քանակին։",
+        "transfer_consult_first_label": "Նախ խորհրդակցեք",
+        "transfer_failed": "Փոխանցումը ձախողվեց",
+        "transfer_failed_description": "Զանգը չհաջողվեց փոխանցել",
+        "unable_to_access_audio_input_description": "Մենք չկարողացանք դիմել ձեր խոսափողին: Ստուգեք ձեր զննարկիչի կարգավորումները և կրկին փորձեք:",
+        "unable_to_access_audio_input_title": "Անհնար է դիմել ձեր խոսափողին",
+        "unable_to_access_media": "Անհնար է դիմել վեբ-տեսախցիկին / խոսափողին",
+        "unable_to_access_microphone": "Անհնար է դիմել խոսափողին",
+        "unknown_caller": "Անհայտ զանգահարող",
+        "unknown_person": "անհայտ անձ",
+        "unsilence": "Ձայնը միացնել",
+        "unsupported": "Զանգերը չեն աջակցվում",
+        "unsupported_browser": "Դուք չեք կարող զանգեր կատարել այս զննարկիչում:",
+        "user_busy": "Օգտատերը զբաղված է",
+        "user_busy_description": "Ձեր զանգահարած օգտատերը զբաղված է։",
+        "user_is_presenting": "%(sharerName)s-ը ներկայացնում է",
+        "video_call": "Տեսազանգ",
+        "video_call_started": "Տեսազանգը սկսվեց",
+        "video_call_using": "Տեսազանգ՝ օգտագործելով՝",
+        "voice_call": "Ձայնային զանգ",
+        "you_are_presenting": "Դուք ներկայացնում եք"
+    },
+    "web_default_device_name": "%(appName)s: %(browserName)s %(osName)s-ի վրա",
+    "welcome_to_element": "Բարի գալուստ Element",
+    "widget": {
+        "added_by": "Վիջեթը ավելացվել է",
+        "capabilities_dialog": {
+            "content_starting_text": "Այս վիջեթը կցանկանար՝",
+            "decline_all_permission": "Մերժել բոլորը",
+            "remember_Selection": "Հիշեք իմ ընտրությունը այս վիջեթի համար",
+            "title": "Հաստատել վիջեթի թույլտվությունները"
+        },
+        "capability": {
+            "always_on_screen_generic": "Մնալ էկրանին աշխատելու ընթացքում",
+            "always_on_screen_viewing_another_room": "Մնալ էկրանին այլ սենյակ դիտելիս",
+            "any_room": "Վերը նշվածը, բայց ցանկացած սենյակում, որտեղ դուք միացած եք կամ հրավիրված եք, նույնպես",
+            "byline_empty_state_key": "վիճակի դատարկ բանալիով",
+            "byline_state_key": "%(stateKey)s վիճակի բանալիով",
+            "capability": "<b>%(capability)s</b> հնարավորություն",
+            "change_avatar_active_room": "Փոխել ձեր ակտիվ սենյակի ավատարը",
+            "change_avatar_this_room": "Փոխել այս սենյակի ավատարը",
+            "change_name_active_room": "Փոխել ձեր ակտիվ սենյակի անունը",
+            "change_name_this_room": "Փոխել այս սենյակի անունը",
+            "change_topic_active_room": "Փոխեք ձեր ակտիվ սենյակի թեման",
+            "change_topic_this_room": "Փոխեք այս սենյակի թեման",
+            "receive_membership_active_room": "Տեսնել, թե երբ են մարդիկ միանում, դուրս գալիս կամ հրավիրվում ձեր ակտիվ սենյակ",
+            "receive_membership_this_room": "Տեսնել, թե երբ են մարդիկ միանում, դուրս գալիս կամ հրավիրվում այս սենյակ",
+            "remove_ban_invite_leave_active_room": "Հեռացնել, արգելափակել կամ հրավիրել մարդկանց ձեր ակտիվ սենյակ, և ստիպել ձեզ հեռանալ",
+            "remove_ban_invite_leave_this_room": "Հեռացնել, արգելափակել կամ հրավիրել մարդկանց այս սենյակ, և ստիպել ձեզ դուրս գալ",
+            "see_avatar_change_active_room": "Տեսնել, թե երբ է ձեր ակտիվ սենյակում ավատարը փոխվում",
+            "see_avatar_change_this_room": "Տեսնել, թե երբ է այս սենյակում ավատարը փոխվում",
+            "see_event_type_sent_active_room": "Տեսնել <b>%(eventType)s</b> իրադարձությունները՝ տեղադրված ձեր ակտիվ սենյակում",
+            "see_event_type_sent_this_room": "Տեսնել <b>%(eventType)s</b> իրադարձությունները՝ տեղադրված այս սենյակում",
+            "see_images_sent_active_room": "Տեսնել ձեր ակտիվ սենյակում տեղադրված պատկերները",
+            "see_images_sent_this_room": "Տեսնել այս սենյակում տեղադրված պատկերները",
+            "see_messages_sent_active_room": "Դիտել ձեր ակտիվ սենյակում տեղադրված հաղորդագրությունները",
+            "see_messages_sent_this_room": "Տեսնել այս սենյակում ուղարկված հաղորդագրությունները",
+            "see_msgtype_sent_active_room": "Տեսնել <b>%(msgtype)s</b> հաղորդագրությունները՝ տեղադրված ձեր ակտիվ սենյակում",
+            "see_msgtype_sent_this_room": "Տեսնել <b>%(msgtype)s</b> հաղորդագրությունները՝ տեղադրված այս սենյակում",
+            "see_name_change_active_room": "Տեսնել, թե երբ է անունը փոխվում ձեր ակտիվ սենյակում",
+            "see_name_change_this_room": "Տեսնել, թե երբ է այս սենյակի անունը փոխվում",
+            "see_sent_emotes_active_room": "Տեսնել ձեր ակտիվ սենյակում տեղադրված էմոցիաները",
+            "see_sent_emotes_this_room": "Տեսնել այս սենյակում տեղադրված էմոցիաները",
+            "see_sent_files_active_room": "Տեսնել ձեր ակտիվ սենյակում տեղադրված ընդհանուր ֆայլերը",
+            "see_sent_files_this_room": "Տեսնել այս սենյակում տեղադրված ընդհանուր ֆայլերը",
+            "see_sticker_posted_active_room": "Տեսնել, երբ որևէ մեկը կպչուն պիտակ է տեղադրում ձեր ակտիվ սենյակում",
+            "see_sticker_posted_this_room": "Տեսնել, թե երբ է այս սենյակում կպչուն պիտակ փակցվում",
+            "see_text_messages_sent_active_room": "Դիտել ձեր ակտիվ սենյակում ուղարկված տեքստային հաղորդագրությունները",
+            "see_text_messages_sent_this_room": "Դիտել այս սենյակում ուղարկված տեքստային հաղորդագրությունները",
+            "see_topic_change_active_room": "Տեսնել, թե երբ է ձեր ակտիվ սենյակի թեման փոխվում",
+            "see_topic_change_this_room": "Տեսնել, թե երբ է այս սենյակում թեման փոխվում",
+            "see_videos_sent_active_room": "Տեսնել ձեր ակտիվ սենյակում տեղադրված տեսանյութերը",
+            "see_videos_sent_this_room": "Տեսնել այս սենյակում տեղադրված տեսանյութերը",
+            "send_emotes_active_room": "Ուղարկել էմոցիաներ ձեր անունից ձեր ակտիվ սենյակում",
+            "send_emotes_this_room": "Ուղարկել էմոցիաներ ձեր անունից այս սենյակում",
+            "send_event_type_active_room": "Ուղարկել <b>%(eventType)s</b> իրադարձություններ ձեր անունից ձեր ակտիվ սենյակում",
+            "send_event_type_this_room": "Ուղարկել <b>%(eventType)s</b> իրադարձություններ ձեր անունից այս սենյակում",
+            "send_files_active_room": "Ուղարկել ընդհանուր ֆայլեր ձեր անունից ձեր ակտիվ սենյակում",
+            "send_files_this_room": "Ուղարկել ընդհանուր ֆայլեր ձեր անունից այս սենյակում",
+            "send_images_active_room": "Ուղարկել պատկերներ ձեր անունից ձեր ակտիվ սենյակում",
+            "send_images_this_room": "Ուղարկել պատկերներ ձեր անունից այս սենյակում",
+            "send_messages_active_room": "Ուղարկել հաղորդագրություններ ձեր անունից ձեր ակտիվ սենյակում",
+            "send_messages_this_room": "Ուղարկել հաղորդագրություններ ձեր անունից այս սենյակում",
+            "send_msgtype_active_room": "Ուղարկել <b>%(msgtype)s</b> հաղորդագրություններ ձեր անունից ձեր ակտիվ սենյակում",
+            "send_msgtype_this_room": "Ուղարկել <b>%(msgtype)s</b> հաղորդագրություններ ձեր անունից այս սենյակում",
+            "send_stickers_active_room": "Ուղարկեք ստիկերներ ձեր ակտիվ սենյակ",
+            "send_stickers_active_room_as_you": "Ուղարկել ստիկերներ ձեր անունից ձեր ակտիվ սենյակում",
+            "send_stickers_this_room": "Ուղարկեք կպչուն պիտակներ այս սենյակ",
+            "send_stickers_this_room_as_you": "Ուղարկել ստիկերներ ձեր անունից այս սենյակում",
+            "send_text_messages_active_room": "Ուղարկել տեքստային հաղորդագրություններ ձեր անունից ձեր ակտիվ սենյակում",
+            "send_text_messages_this_room": "Ուղարկել տեքստային հաղորդագրություններ ձեր անունից այս սենյակում",
+            "send_videos_active_room": "Ուղարկել տեսանյութեր ձեր անունից ձեր ակտիվ սենյակում",
+            "send_videos_this_room": "Ուղարկել տեսանյութեր ձեր անունից այս սենյակում",
+            "specific_room": "Վերը նշվածը, բայց նաև <Room />-ում",
+            "switch_room": "Փոխեք այն սենյակը, որը դիտում եք",
+            "switch_room_message_user": "Փոխեք, թե որ սենյակը, հաղորդագրությունը կամ օգտատիրոջն եք դիտում"
+        },
+        "close_to_view_right_panel": "Փակել այս վիջեթը՝ այն այս վահանակում դիտելու համար",
+        "context_menu": {
+            "delete": "Ջնջել վիջեթը",
+            "delete_warning": "Վիջեթը ջնջելիս այն կհեռացվի այս սենյակի բոլոր օգտատերերի համար։ Վստա՞հ եք, որ ուզում եք ջնջել այս վիջեթը։",
+            "move_left": "Տեղափոխել ձախ",
+            "move_right": "Տեղափոխել աջ",
+            "remove": "Հեռացնել բոլորի համար",
+            "revoke": "Չեղարկել թույլտվությունները",
+            "screenshot": "Նկարահանել",
+            "start_audio_stream": "Սկսել աուդիո հեռարձակում"
+        },
+        "cookie_warning": "Այս վիջեթը կարող է օգտագործել cookie-ներ։",
+        "error_hangup_description": "Դուք անջատվել եք զանգից։ (Սխալ՝ %(message)s )",
+        "error_hangup_title": "Կապը կորավ",
+        "error_loading": "Վիջեթի բեռնման սխալ",
+        "error_mixed_content": "Սխալ. խառնված բովանդակություն",
+        "error_need_invite_permission": "Դուք պետք է կարողանաք հրավիրել օգտատերերին դա անելու համար։",
+        "error_need_kick_permission": "Դա անելու համար դուք պետք է կարողանաք հեռացնել օգտատերերին",
+        "error_need_to_be_logged_in": "Դուք պետք է մուտք գործեք։",
+        "error_unable_start_audio_stream_description": "Անհնար է սկսել աուդիո հոսքային հեռարձակումը։",
+        "error_unable_start_audio_stream_title": "Չհաջողվեց սկսել ուղիղ հեռարձակումը",
+        "modal_data_warning": "Ստորև բերված տվյալները կիսվում են %(widgetDomain)s-ի հետ",
+        "modal_title_default": "Մոդալային վիջեթ",
+        "no_name": "Անհայտ հավելված",
+        "open_id_permissions_dialog": {
+            "remember_selection": "Հիշել սա",
+            "starting_text": "Վիջեթը կհաստատի ձեր օգտատիրոջ ID-ն, բայց չի կարողանա կատարել գործողություններ ձեզ համար․",
+            "title": "Թույլատրել այս վիջեթին ստուգել ձեր ինքնությունը"
+        },
+        "popout": "Բացվող պատուհանի վիջեթ",
+        "set_room_layout": "Սահմանել դասավորություն բոլորի համար",
+        "shared_data_avatar": "Ձեր պրոֆիլի նկարի URL-ը",
+        "shared_data_device_id": "Ձեր սարքի ID-ն",
+        "shared_data_lang": "Ձեր լեզուն",
+        "shared_data_mxid": "Ձեր օգտատիրոջ ID-ն",
+        "shared_data_name": "Ձեր ցուցադրվող անունը",
+        "shared_data_room_id": "Սենյակի ID",
+        "shared_data_theme": "Ձեր թեման",
+        "shared_data_url": "%(brand)s URL",
+        "shared_data_warning": "Այս վիջեթի օգտագործումը կարող է տվյալներ կիսել <helpIcon /> %(widgetDomain)s-ի հետ։",
+        "shared_data_warning_im": "Այս վիջեթի օգտագործումը կարող է տվյալներ կիսել <helpIcon /> %(widgetDomain)s-ի և ձեր ինտեգրման մենեջերի հետ։",
+        "shared_data_widget_id": "Վիջեթի ID",
+        "unencrypted_warning": "Վիջեթները չեն օգտագործում հաղորդագրությունների գաղտնագրում։",
+        "unmaximise": "Առավելագույնի չհասցնել",
+        "unpin_to_view_right_panel": "Հանել այս վիջեթը՝ այն այս վահանակում դիտելու համար"
+    },
+    "zxcvbn": {
+        "suggestions": {
+            "allUppercase": "Բոլոր մեծատառերը գրեթե նույնքան հեշտ է կռահել, որքան բոլոր փոքրատառերը",
+            "anotherWord": "Ավելացրեք մեկ այլ բառ, կամ երկու: Ավելի լավ է օգտագործել հազվադեպ բառեր:",
+            "associatedYears": "Խուսափեք տարիներից, որոնք կապված են ձեզ հետ",
+            "capitalization": "Մեծատառերով գրելը շատ չի օգնում",
+            "dates": "Խուսափեք ամսաթվերից և տարիներից, որոնք կապված են ձեզ հետ",
+            "l33t": "Կանխատեսելի փոխարինումները, ինչպիսիք են “@” -ը “a” -ի փոխարեն, շատ չեն օգնում",
+            "longerKeyboardPattern": "Օգտագործեք ավելի խճճված երկար ստեղների կաղապար",
+            "noNeed": "Նշանների, թվանշանների կամ մեծատառերի կարիք չկա",
+            "pwned": "Եթե դուք օգտագործում եք այս գաղտնաբառը այլ վայրում, ապա պետք է փոխեք այն:",
+            "recentYears": "Խուսափեք վերջին տարիներից",
+            "repeated": "Խուսափեք կրկնվող բառերից և նիշերից",
+            "reverseWords": "Հակադարձ բառերը շատ դժվար չէ կռահել",
+            "sequences": "Խուսափեք հաջորդականություններից",
+            "useWords": "Օգտագործեք մի քանի բառ, խուսափեք ընդհանուր արտահայտություններից"
+        },
+        "warnings": {
+            "common": "Սա շատ տարածված գաղտնաբառ է",
+            "commonNames": "Ընդհանուր անուններն ու ազգանունները հեշտ է կռահել",
+            "dates": "Ամսաթվերը հաճախ հեշտ կռահելի են:",
+            "extendedRepeat": "“abcabcabc”-ի նման կրկնությունները միայն մի փոքր են դժվար կռահելի, քան “abc”-ն",
+            "keyPattern": "Կարճ ստեղնային օրինաչափությունները հեշտ կռահելի են:",
+            "namesByThemselves": "Անուններն ու ազգանուններն ինքնին հեշտ է կռահել",
+            "pwned": "Ձեր գաղտնաբառը բացահայտվել է ինտերնետում տվյալների խախտման պատճառով:",
+            "recentYears": "Վերջին տարիները հեշտ կռահելի են:",
+            "sequences": "ABC-ի կամ 6543-ի նման հաջորդականությունները հեշտ կռահելի են",
+            "similarToCommon": "Սա նման է սովորաբար օգտագործվող գաղտնաբառերին",
+            "simpleRepeat": "“Աաա” -ի նման կրկնությունները հեշտ կռահելի են",
+            "straightRow": "Ստեղների շարունակական շարքը հեշտ կռահելի է:",
+            "topHundred": "Սա top-100 ամենատարածված գաղտնաբառերն են",
+            "topTen": "Սա top-10 ամենատարածված գաղտնաբառերն են",
+            "userInputs": "Չպետք է լինեն անձնական կամ էջի հետ կապված տվյալներ:",
+            "wordByItself": "Բառն ինքնին հեշտ է կռահել"
+        }
+    }
+}
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 4df0b7707b..66ed598c41 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -91,7 +91,7 @@
         "maximise": "Maksimalkan",
         "mention": "Sebutkan",
         "minimise": "Minimalkan",
-        "new_message": "Pesan baru",
+        "new_conversation": "Percakapan baru",
         "new_room": "Ruangan baru",
         "new_video_room": "Ruangan video baru",
         "next": "Lanjut",
@@ -238,8 +238,7 @@
             "setup_key_backup_title": "Anda akan kehilangan akses ke pesan terenkripsi Anda",
             "setup_secure_backup_description_1": "Pesan terenkripsi diamankan dengan enkripsi ujung ke ujung. Hanya Anda dan penerima punya kuncinya untuk membaca pesan ini.",
             "setup_secure_backup_description_2": "Ketika Anda keluar, kunci-kunci ini akan dihapus dari perangkat ini, yang berarti Anda tidak dapat membaca pesan-pesan terenkripsi kecuali jika Anda mempunyai kuncinya di perangkat Anda yang lain, atau telah mencadangkannya ke server.",
-            "skip_key_backup": "Saya tidak ingin pesan-pesan terenkripsi saya",
-            "use_key_backup": "Mulai menggunakan Cadangan Kunci"
+            "skip_key_backup": "Saya tidak ingin pesan-pesan terenkripsi saya"
         },
         "misconfigured_body": "Tanyakan admin %(brand)s Anda untuk memeriksa <a>konfigurasi Anda</a> untuk entri yang tidak benar atau entri duplikat.",
         "misconfigured_title": "%(brand)s Anda telah diatur dengan salah",
@@ -598,12 +597,12 @@
         "user": "Pengguna",
         "user_avatar": "Gambar profil",
         "username": "Nama Pengguna",
-        "verification_cancelled": "Verifikasi dibatalkan",
         "verified": "Terverifikasi",
         "version": "Versi",
         "video": "Video",
         "video_room": "Ruangan video",
         "view_message": "Tampilkan pesan",
+        "voice": "Suara",
         "warning": "Peringatan"
     },
     "composer": {
@@ -644,16 +643,17 @@
         "mode_plain": "Sembunyikan format",
         "mode_rich_text": "Tampilkan formatting",
         "no_perms_notice": "Anda tidak memiliki izin untuk mengirim ke ruangan ini",
-        "placeholder": "Kirim sebuah pesan…",
-        "placeholder_encrypted": "Kirim sebuah pesan terenkripsi…",
-        "placeholder_reply": "Kirim sebuah balasan…",
-        "placeholder_reply_encrypted": "Kirim sebuah balasan terenkripsi…",
-        "placeholder_thread": "Balas ke utasan…",
-        "placeholder_thread_encrypted": "Balas ke utasan yang terenkripsi…",
+        "placeholder": "Kirim pesan tidak terenkripsi…",
+        "placeholder_encrypted": "Kirim pesan…",
+        "placeholder_reply": "Kirim balasan tidak terenkripsi…",
+        "placeholder_reply_encrypted": "Kirim balasan…",
+        "placeholder_thread": "Balas utas tidak terenkripsi…",
+        "placeholder_thread_encrypted": "Balas utas…",
         "poll_button": "Pemungutan suara",
         "poll_button_no_perms_description": "Anda tidak memiliki izin untuk memulai sebuah poll di ruangan ini.",
         "poll_button_no_perms_title": "Izin Dibutuhkan",
         "replying_title": "Membalas",
+        "room_unencrypted": "Pesan dalam ruangan ini tidak dienkripsi secara ujung ke ujung",
         "room_upgraded_link": "Obrolannya dilanjutkan di sini.",
         "room_upgraded_notice": "Ruangan ini telah diganti dan tidak aktif lagi.",
         "send_button_title": "Kirim pesan",
@@ -717,6 +717,7 @@
         "personal_space_description": "Sebuah space pribadi untuk mengorganisir ruangan Anda",
         "private_description": "Undangan saja, baik untuk Anda sendiri atau tim",
         "private_heading": "Space pribadi Anda",
+        "private_only_heading": "Ruangan Anda",
         "private_personal_description": "Pastikan orang-orang tertentu punya akses ke %(name)s",
         "private_personal_heading": "Dengan siapa Anda bekerja?",
         "private_space": "Saya dan tim saya",
@@ -784,6 +785,7 @@
             "cross_signing_status": "Status penandatanganan silang:",
             "cross_signing_untrusted": "Akun Anda memiliki identitas penandatanganan silang dalam penyimpanan rahasia, tetapi belum dipercaya oleh sesi ini.",
             "crypto_not_available": "Modul kriptografi tidak tersedia",
+            "device_id": "ID Perangkat",
             "key_backup_active_version": "Versi cadangan aktif:",
             "key_backup_active_version_none": "Tidak ada",
             "key_backup_inactive_warning": "Kunci Anda tidak dicadangkan dari sesi ini.",
@@ -796,11 +798,24 @@
             "secret_storage_ready": "siap",
             "secret_storage_status": "Penyimpanan rahasia:",
             "self_signing_private_key_cached_status": "Kunci pribadi penandatanganan sendiri:",
+            "session": "Sesi",
+            "session_fingerprint": "Sidik jari (kunci sesi)",
             "title": "Enkripsi ujung ke ujung",
             "user_signing_private_key_cached_status": "Kunci pribadi penandatanganan pengguna:"
         },
         "developer_mode": "Mode pengembang",
         "developer_tools": "Alat Pengembang",
+        "device_dehydrated_no": "Dehidrasi: Tidak",
+        "device_dehydrated_yes": "Dehidrasi: Ya",
+        "device_id": "ID Perangkat: %(deviceId)s",
+        "device_keys": "Kunci perangkat",
+        "device_verification_status": {
+            "signed_by_owner": "Status verifikasi: <E2EIcon /> Ditandatangani oleh pemilik",
+            "unknown": "Status verifikasi: Tidak diketahui",
+            "unverified": "Status verifikasi: <E2EIcon /> Tidak ditandatangani oleh pemilik",
+            "verified": "Status verifikasi: <E2EIcon /> Diverifikasi dengan penandatanganan silang"
+        },
+        "devices": "Perangkat kriptografi (%(count)s)",
         "edit_setting": "Edit pengaturan",
         "edit_values": "Edit nilai",
         "empty_string": "<string kosong>",
@@ -816,15 +831,18 @@
         "failed_to_save": "Gagal menyimpan pengaturan.",
         "failed_to_send": "Gagal mengirimkan pertistiwa!",
         "id": "ID: ",
+        "invalid_device_key_id": "ID kunci perangkat tidak valid",
         "invalid_json": "Tidak terlihat seperti JSON yang absah.",
         "level": "Tingkat",
         "low_bandwidth_mode": "Mode bandwidth rendah",
         "low_bandwidth_mode_description": "Membutuhkan homeserver yang kompatibel.",
         "main_timeline": "Lini masa utama",
+        "manual_device_verification": "Verifikasi perangkat manual",
         "no_receipt_found": "Tidak ada laporan yang ditemukan",
         "notification_state": "Keadaan notifikasi adalah <strong>%(notificationState)s</strong>",
         "notifications_debug": "Pengawakutuan notifikasi",
         "number_of_users": "Jumlah pengguna",
+        "only_joined_members": "Hanya pengguna yang bergabung",
         "original_event_source": "Sumber peristiwa asli",
         "room_encrypted": "Ruangan <strong>terenkripsi ✅</strong>",
         "room_id": "ID ruangan: %(roomId)s",
@@ -857,6 +875,7 @@
             "elementCallUrl": "URL Element Call"
         },
         "settings_explorer": "Penelusur pengaturan",
+        "show_empty_content_events": "Tampilkan peristiwa dengan isi kosong",
         "show_hidden_events": "Tampilkan peristiwa tersembunyi di lini masa",
         "spaces": {
             "one": "<space>",
@@ -869,10 +888,23 @@
         "toggle_event": "alih peristiwa",
         "toolbox": "Kotak Peralatan",
         "use_at_own_risk": "UI ini TIDAK memeriksa tipe nilai. Gunakan dengan hati-hati.",
+        "user_avatar": "Avatar: %(avatar)s",
+        "user_displayname": "Nama tampilan: %(displayname)s",
+        "user_id": "ID Pengguna: %(userId)s",
+        "user_no_avatar": "Avatar: <i>Tidak ada</i>",
+        "user_no_displayname": "Nama tampilan: <i>Tidak ada</i>",
         "user_read_up_to": "Pembacaan pengguna sampai: ",
         "user_read_up_to_ignore_synthetic": "Pengguna membaca sampai (ignoreSynthetic): ",
         "user_read_up_to_private": "Pengguna membaca sampai (m.read.private): ",
         "user_read_up_to_private_ignore_synthetic": "Pengguna membaca sampai (m.read.private;ignoreSynthetic): ",
+        "user_room_membership": "Keanggotaan: %(membership)s",
+        "user_verification_status": {
+            "identity_changed": "Status verifikasi: <E2EIcon /> Belum diverifikasi, dan identitas berubah",
+            "unverified": "Status verifikasi: <E2EIcon /> Belum diverifikasi",
+            "verified": "Status verifikasi: <E2EIcon /> Terverifikasi",
+            "was_verified": "Status verifikasi: <E2EIcon /> Telah diverifikasi, tetapi identitas berubah"
+        },
+        "users": "Pengguna",
         "value": "Nilai",
         "value_colon": "Nilai:",
         "value_in_this_room": "Nilai di ruangan ini",
@@ -914,11 +946,10 @@
             },
             "privacy_warning": "Pastikan tidak ada yang bisa melihat layar ini!",
             "restoring": "Memulihkan kunci-kunci dari cadangan",
-            "security_key_title": "Kunci pemulihan"
+            "security_key_label": "Kunci pemulihan",
+            "security_key_title": "Konfirmasi kunci pemulihan Anda"
         },
         "bootstrap_title": "Menyiapkan kunci",
-        "cancel_entering_passphrase_description": "Apakah Anda yakin untuk membatalkan pemasukkan frasa sandi?",
-        "cancel_entering_passphrase_title": "Batalkan memasukkan frasa sandi?",
         "confirm_encryption_setup_body": "Klik tombol di bawah untuk mengkonfirmasi menyiapkan enkripsi.",
         "confirm_encryption_setup_title": "Konfirmasi pengaturan enkripsi",
         "cross_signing_room_normal": "Ruangan ini dienkripsi secara ujung ke ujung",
@@ -929,6 +960,7 @@
         "cross_signing_user_warning": "Pengguna ini belum memverifikasi semua sesinya.",
         "enter_recovery_key": "Masukkan kunci pemulihan",
         "event_shield_reason_authenticity_not_guaranteed": "Keaslian pesan terenkripsi ini tidak dapat dijamin pada perangkat ini.",
+        "event_shield_reason_mismatched_sender": "Pengirim peristiwa tidak cocok dengan pemilik perangkat yang mengirimnya.",
         "event_shield_reason_mismatched_sender_key": "Terenkripsi oleh sesi yang belum diverifikasi",
         "event_shield_reason_unknown_device": "Dienkripsi oleh perangkat yang tidak dikenal atau dihapus.",
         "event_shield_reason_unsigned_device": "Dienkripsi oleh perangkat yang tidak diverifikasi oleh pemiliknya.",
@@ -961,11 +993,8 @@
             "title": "Metode Pemulihan Dihapus",
             "warning": "Jika Anda tidak menghapus metode pemulihan, sebuah penyerang mungkin mencoba mengakses akun Anda. Ubah kata sandi akun Anda dan segera tetapkan metode pemulihan baru di Pengaturan."
         },
-        "reset_all_button": "Lupa atau kehilangan semua metode pemulihan? <a>Atur ulang semuanya</a>",
         "set_up_recovery": "Siapkan pemulihan",
-        "set_up_recovery_later": "Tidak sekarang",
         "set_up_recovery_toast_description": "Buat kunci pemulihan yang dapat digunakan untuk memulihkan riwayat pesan terenkripsi jika Anda kehilangan akses ke perangkat Anda.",
-        "set_up_toast_description": "Lindungi dari kehilangan akses ke pesan & data terenkripsi",
         "set_up_toast_title": "Siapkan Cadangan Aman",
         "setup_secure_backup": {
             "explainer": "Cadangkan kunci Anda sebelum keluar untuk menghindari kehilangannya."
@@ -986,16 +1015,17 @@
             "after_new_login": {
                 "device_verified": "Perangkat telah diverifikasi",
                 "skip_verification": "Lewatkan verifikasi untuk sementara",
-                "unable_to_verify": "Tidak dapat memverifikasi perangkat ini",
                 "verify_this_device": "Verifikasi perangkat ini"
             },
-            "cancelled": "Anda membatalkan verifikasi.",
-            "cancelled_self": "Anda membatalkan verifikasi di perangkat Anda yang lain.",
-            "cancelled_user": "%(displayName)s membatalkan verifikasi.",
+            "cancelled_verification": "Permintaan telah kedaluwarsa, permintaan ditolak, atau terdapat ketidaksesuaian verifikasi.",
             "cancelling": "Membatalkan…",
+            "cant_confirm": "Tidak dapat mengonfirmasi?",
             "complete_action": "Mengerti",
             "complete_description": "Anda berhasil memverifikasi pengguna ini.",
             "complete_title": "Terverifikasi!",
+            "confirm_identity_description": "Verifikasi perangkat ini untuk menyiapkan perpesanan aman",
+            "confirm_identity_title": "Konfirmasikan identitas Anda",
+            "confirm_the_emojis": "Pastikan emoji di bawah ini sesuai dengan yang ditampilkan di perangkat lain Anda.",
             "error_starting_description": "Kami tidak dapat memulai sebuah obrolan dengan pengguna lain.",
             "error_starting_title": "Terjadi kesalahan memulai verifikasi",
             "explainer": "Pesan dengan pengguna ini terenkripsi secara ujung ke ujung dan tidak dapat dibaca oleh pihak ketiga.",
@@ -1006,58 +1036,72 @@
             "incoming_sas_dialog_waiting": "Menunggu pengguna untuk konfirmasi…",
             "incoming_sas_user_dialog_text_1": "Verifikasi pengguna ini untuk menandainya sebagai terpercaya. Mempercayai pengguna memberikan Anda ketenangan saat menggunakan pesan terenkripsi secara ujung ke ujung.",
             "incoming_sas_user_dialog_text_2": "Memverifikasi pengguna ini akan menandai sesinya sebagai terpercaya, dan juga menandai sesi Anda sebagai terpercaya kepadanya.",
-            "no_key_or_device": "Sepertinya Anda tidak memiliki Kunci Pemulihan atau perangkat lain yang dapat Anda verifikasi. Perangkat ini tidak akan dapat mengakses pesan terenkripsi lama. Untuk memverifikasi identitas Anda di perangkat ini, Anda harus mengatur ulang kunci verifikasi Anda.",
+            "manual": {
+                "already_verified": "Perangkat ini sudah diverifikasi",
+                "already_verified_and_wrong_fingerprint": "Sidik jari yang disediakan tidak cocok, tetapi perangkat sudah diverifikasi!",
+                "device_id": "ID Perangkat",
+                "failure_description": "Gagal memverifikasi '%(deviceId)s': %(error)s",
+                "failure_title": "Verifikasi gagal",
+                "fingerprint": "Sidik jari (kunci sesi)",
+                "no_crypto": "Tidak dapat memverifikasi perangkat - kripto tidak diaktifkan",
+                "no_device": "Tidak dapat memverifikasi perangkat - perangkat %(deviceId)s '' tidak ditemukan",
+                "no_userid": "Tidak dapat memverifikasi perangkat - tidak dapat menemukan ID Pengguna kami",
+                "success_description": "Perangkat (%(deviceId)s) sekarang ditandatangani silang",
+                "success_title": "Verifikasi berhasil",
+                "text": "Berikan ID dan sidik jari salah satu perangkat Anda untuk memverifikasinya. PERHATIKAN bahwa ini memungkinkan perangkat lain untuk mengirim dan menerima pesan seperti Anda. JIKA SESEORANG MEMINTA ANDA UNTUK MENEMPELKAN SESUATU DI SINI, KEMUNGKINAN ANDA SEDANG DITIPU!",
+                "wrong_fingerprint": "Tidak dapat memverifikasi perangkat '%(deviceId)s' - sidik jari yang disediakan '%(fingerprint)s' tidak cocok dengan sidik jari perangkat, '%(fprint)s'"
+            },
             "no_support_qr_emoji": "Perangkat yang Anda sedang verifikasi tidak mendukung pemindaian kode QR atau verifikasi emoji, yang didukung oleh %(brand)s. Coba menggunakan klien yang lain.",
+            "now_you_can": "Sekarang Anda dapat membaca atau mengirim pesan dengan aman, dan siapa pun yang mengobrol dengan Anda juga dapat mempercayai perangkat ini.",
+            "once_accepted_can_continue": "Setelah diterima, Anda dapat melanjutkan verifikasi.",
             "other_party_cancelled": "Pengguna yang lain membatalkan proses verifikasi ini.",
             "prompt_encrypted": "Verifikasi semua pengguna di sebuah ruangan untuk memastikan keamanannya.",
-            "prompt_self": "Mulai memverifikasi lagi dari notifikasinya.",
             "prompt_unencrypted": "Di ruangan terenkripsi, verifikasi semua pengguna untuk memastikan keamanannya.",
-            "prompt_user": "Mulai memverifikasi lagi dari profilnya.",
             "qr_or_sas": "%(qrCode)s atau %(emojiCompare)s",
-            "qr_or_sas_header": "Verifikasi perangkat ini dengan menyelesaikan salah satu di bawah:",
             "qr_prompt": "Pindai kode unik ini",
-            "qr_reciprocate_same_shield_device": "Hampir selesai! Apakah perangkat lain Anda menampilkan perisai yang sama?",
+            "qr_reciprocate_check_again_device": "Periksa kembali di perangkat lain Anda untuk menyelesaikan verifikasi.",
+            "qr_reciprocate_no": "Tidak, saya tidak melihat perisai hijau",
             "qr_reciprocate_same_shield_user": "Hampir selesai! Apakah %(displayName)s menampilkan perisai yang sama?",
-            "request_toast_accept": "Verifikasi Sesi",
+            "qr_reciprocate_yes": "Ya, saya melihat perisai hijau",
             "request_toast_accept_user": "Verifikasi Pengguna",
             "request_toast_decline_counter": "Abaikan (%(counter)s)",
             "request_toast_detail": "%(deviceId)s dari %(ip)s",
-            "reset_proceed_prompt": "Lanjutkan dengan mengatur ulang",
+            "request_toast_start_verification": "Mulai Verifikasi",
             "sas_caption_self": "Verifikasi perangkat ini dengan mengkonfirmasi nomor berikut ini yang ditampilkan di layarnya.",
             "sas_caption_user": "Verifikasi pengguna ini dengan mengkonfirmasi nomor berikut yang ditampilkan.",
             "sas_description": "Bandingkan emoji jika Anda tidak memiliki sebuah kamera di kedua perangkat",
-            "sas_emoji_caption_self": "Konfirmasi emoji di bawah yang ditampilkan di kedua perangkat, dalam urutan yang sama:",
             "sas_emoji_caption_user": "Verifikasi pengguna ini dengan mengkonfirmasi emoji berikut yang ditampilkan.",
             "sas_match": "Mereka cocok",
             "sas_no_match": "Mereka tidak cocok",
             "sas_prompt": "Bandingkan emoji unik",
             "scan_qr": "Verifikasi dengan memindai",
             "scan_qr_explainer": "Tanyakan %(displayName)s untuk memindai kode Anda:",
-            "self_verification_hint": "Untuk melanjutkan, mohon terima permintaan verifikasi di perangkat Anda yang lain.",
             "start_button": "Mulai Verifikasi",
-            "successful_device": "Anda berhasil memverifikasi %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "Anda berhasil memverifikasi perangkat Anda!",
             "successful_user": "Anda berhasil memverifikasi %(displayName)s!",
-            "timed_out": "Waktu habis untuk memverifikasi.",
             "unsupported_method": "Tidak dapat menemukan metode verifikasi yang didukung.",
             "unverified_session_toast_accept": "Ya, itu saya",
             "unverified_session_toast_title": "Login baru. Apakah itu Anda?",
             "unverified_sessions_toast_description": "Periksa untuk memastikan akun Anda aman",
             "unverified_sessions_toast_reject": "Nanti",
             "unverified_sessions_toast_title": "Anda memiliki sesi yang belum diverifikasi",
-            "verification_description": "Verifikasi identitas Anda untuk mengakses pesan terenkripsi dan membuktikan identitas Anda kepada orang lain. Jika Anda juga menggunakan ponsel, harap buka aplikasi di sana sebelum melanjutkan.",
+            "use_another_device": "Gunakan perangkat lain",
+            "use_recovery_key": "Gunakan kunci pemulihan",
+            "verification_dialog_title_choose": "Pilih cara verifikasi",
+            "verification_dialog_title_compare_emojis": "Bandingkan emoji",
+            "verification_dialog_title_confirm_green_shield": "Konfirmasikan bahwa Anda melihat perisai hijau di perangkat Anda yang lain",
             "verification_dialog_title_device": "Verifikasi perangkat lain",
+            "verification_dialog_title_failed": "Verifikasi gagal",
+            "verification_dialog_title_start_on_other_device": "Mulai verifikasi di perangkat lain",
             "verification_dialog_title_user": "Permintaan Verifikasi",
+            "verification_dialog_title_verified": "Perangkat telah diverifikasi",
             "verification_skip_warning": "Tanpa memverifikasi, Anda tidak akan memiliki akses ke semua pesan Anda dan tampak tidak dipercayai kepada lainnya.",
             "verification_success_with_backup": "Perangkat baru Anda telah diverifikasi. Perangkat baru Anda dapat mengakses pesan-pesan terenkripsi Anda, dan pengguna lain akan melihat perangkat baru Anda sebagai dipercayai.",
             "verification_success_without_backup": "Perangkat baru Anda telah diverifikasi. Pengguna lain akan melihat perangkat baru Anda sebagai dipercayai.",
+            "verify_by_completing_one_of": "Verifikasi dengan menyelesaikan salah satu dari berikut ini:",
             "verify_emoji": "Verifikasi dengan emoji",
             "verify_emoji_prompt": "Verifikasi dengan membandingkan emoji unik.",
             "verify_emoji_prompt_qr": "Jika Anda tidak dapat memindai kode di atas, verifikasi dengan membandingkan emoji yang unik.",
             "verify_later": "Saya verifikasi nanti",
-            "verify_using_device": "Verifikasi dengan perangkat lain",
-            "verify_using_key": "Verifikasi dengan Kunci Keamanan",
-            "verify_using_key_or_phrase": "Verifikasi dengan Kunci atau Frasa Keamanan",
             "waiting_for_user_accept": "Menunggu untuk %(displayName)s untuk menerima…",
             "waiting_other_device": "Menunggu Anda untuk verifikasi di perangkat Anda yang lain…",
             "waiting_other_device_details": "Menunggu Anda untuk memverifikasi perangkat Anda yang lain, %(deviceName)s (%(deviceId)s)…",
@@ -1107,6 +1151,7 @@
         "tls": "Tidak dapat terhubung ke homeserver — harap cek koneksi anda, pastikan <a>sertifikat SSL homeserver</a> Anda terpercaya, dan ekstensi browser tidak memblokir permintaan.",
         "unknown": "Kesalahan tidak diketahui",
         "unknown_error_code": "kode kesalahan tidak diketahui",
+        "update_history_visibility": "Gagal mengubah visibilitas riwayat",
         "update_power_level": "Gagal untuk mengubah tingkat daya"
     },
     "error_app_open_in_another_tab": "%(brand)s telah dibuka di tab lain.",
@@ -1347,6 +1392,10 @@
         "name_email_mxid_share_space": "Undang seseorang menggunakan namanya, alamat email, nama pengguna (seperti <userId/>) atau <a>bagikan space ini</a>.",
         "name_mxid_share_room": "Undang seseorang menggunakan namanya, nama pengguna (seperti <userId/>) atau <a>bagikan ruangan ini</a>.",
         "name_mxid_share_space": "Undang seseorang menggunakan namanya, nama pengguna (seperti <userId/>) atau <a>bagikan space ini</a>.",
+        "progress": {
+            "dont_close": "Jangan tutup aplikasi sampai selesai.",
+            "preparing": "Menyiapkan undangan..."
+        },
         "recents_section": "Obrolan Terkini",
         "room_failed_partial": "Kami telah mengirim yang lainnya, tetapi orang berikut ini tidak dapat diundang ke <RoomName/>",
         "room_failed_partial_title": "Beberapa undangan tidak dapat dikirim",
@@ -1433,6 +1482,7 @@
         "room_list_navigate_down": "Pergi ke bawah di daftar ruangan",
         "room_list_navigate_up": "Pergi ke atas di daftar ruangan",
         "room_list_select_room": "Pilih ruangan dari daftar ruangan",
+        "save": "Simpan",
         "scroll_down_timeline": "Gulir ke bawah di lini masa",
         "scroll_up_timeline": "Gulir ke atas di lini masa",
         "search": "Cari (harus diaktifkan)",
@@ -1449,7 +1499,6 @@
         "upload_file": "Unggah sebuah file"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Perbolehkan mode hanya pembagian layar",
         "ask_to_join": "Aktifkan bertanya untuk bergabung",
         "automatic_debug_logs": "Kirim catatan pengawakutu secara otomatis saat ada kesalahan",
         "automatic_debug_logs_decryption": "Kirim catatan pengawakutu secara otomatis ketika terjadi kesalahan pendekripsian",
@@ -1514,6 +1563,9 @@
         "render_reaction_images_description": "Terkadang disebut sebagai \"emoji khusus\".",
         "report_to_moderators": "Laporkan ke moderator",
         "report_to_moderators_description": "Dalam ruangan yang mendukung moderasi, tombol “Laporkan” memungkinkan Anda untuk melaporkan penyalahgunaan ke moderator ruangan.",
+        "share_history_on_invite": "Bagikan riwayat terenkripsi dengan anggota baru",
+        "share_history_on_invite_description": "Saat mengundang pengguna ke ruangan terenkripsi yang memiliki keterlihatan riwayat yang diatur ke \"terbagi\", bagikan riwayat terenkripsi dengan pengguna tersebut, dan terima riwayat terenkripsi saat Anda diundang ke ruangan tersebut.",
+        "share_history_on_invite_warning": "Fitur ini bersifat EKSPERIMENTAL dan tidak semua tindakan pencegahan keamanan diterapkan. Jangan aktifkan pada akun produksi.",
         "sliding_sync": "Mode Sinkronisasi Geser",
         "sliding_sync_description": "Dalam pengembangan aktif, tidak dapat dinonaktifkan.",
         "sliding_sync_disabled_notice": "Keluar dan masuk kembali ke akun untuk menonaktifkan",
@@ -1634,8 +1686,8 @@
         "filter_placeholder": "Saring anggota ruangan",
         "invite_button_no_perms_tooltip": "Anda tidak memiliki izin untuk mengundang pengguna",
         "invited_label": "Diundang",
-        "no_matches": "Tidak ada kecocokan",
-        "power_label": "%(userName)s (tingkat daya %(powerLevelNumber)s)"
+        "list_title": "Daftar anggota",
+        "no_matches": "Tidak ada kecocokan"
     },
     "member_list_back_action_label": "Anggota ruangan",
     "message_edit_dialog_title": "Editan pesan",
@@ -1739,6 +1791,7 @@
     },
     "power_level": {
         "admin": "Admin",
+        "creator": "Pemilik",
         "custom": "Kustom (%(level)s)",
         "custom_level": "Tingkat kustom",
         "default": "Bawaan",
@@ -1845,11 +1898,6 @@
                 "other": "Anda hanya dapat memasang pin sampai %(count)s widget"
             },
             "menu": "Buka menu",
-            "release_announcement": {
-                "close": "Oke",
-                "description": "Temukan semua pesan yang disematkan di sini. Arahkan pesan apa pun dan pilih “Sematkan” untuk menambahkannya.",
-                "title": "Semua pesan baru yang disematkan"
-            },
             "reply_thread": "Balas ke <link>pesan dalam utas</link>",
             "unpin_all": {
                 "button": "Lepas sematan semua pesan",
@@ -1951,6 +1999,7 @@
         },
         "face_pile_tooltip_shortcut": "Termasuk %(commaSeparatedMembers)s",
         "face_pile_tooltip_shortcut_joined": "Termasuk Anda, %(commaSeparatedMembers)s",
+        "failed_determine_user": "Tidak dapat menentukan pengguna mana yang akan diabaikan karena peristiwa anggota telah berubah.",
         "failed_reject_invite": "Gagal untuk menolak undangan",
         "forget_room": "Lupakan ruangan ini",
         "forget_space": "Lupakan space ini",
@@ -1968,7 +2017,9 @@
         "inaccessible_subtitle_1": "Coba ulang nanti, atau tanya kepada admin ruangan atau space untuk memeriksa jika Anda memiliki akses.",
         "inaccessible_subtitle_2": "%(errcode)s didapatkan saat mencoba mengakses ruangan atau space. Jika Anda pikir Anda melihat pesan ini secara tidak benar, silakan <issueLink>kirim sebuah laporan kutu</issueLink>.",
         "intro": {
+            "display_topic": "Topik: <topic/>",
             "dm_caption": "Hanya Anda berdua yang ada dalam percakapan ini, kecuali jika salah satu dari Anda mengundang siapa saja untuk bergabung.",
+            "edit_topic": "Topik: <topic/> (<a>sunting</a>)",
             "enable_encryption_prompt": "Aktifkan enkripsi di pengaturan.",
             "encrypted_3pid_dm_pending_join": "Setelah semuanya bergabung, Anda akan dapat mengobrol",
             "no_avatar_label": "Tambahkan sebuah foto supaya orang-orang dapat menemukan ruangan Anda.",
@@ -1978,8 +2029,6 @@
             "send_message_start_dm": "Kirim pesan pertama Anda untuk mengundang <displayName/> ke obrolan",
             "start_of_dm_history": "Ini adalah awal dari pesan langsung Anda dengan <displayName/>.",
             "start_of_room": "Ini adalah awal dari <roomName/>.",
-            "topic": "Topik: %(topic)s ",
-            "topic_edit": "Topik %(topic)s (<a>edit</a>)",
             "unencrypted_warning": "Enkripsi ujung ke ujung tidak diaktifkan",
             "user_created": "%(displayName)s membuat ruangan ini.",
             "you_created": "Anda membuat ruangan ini."
@@ -2034,13 +2083,16 @@
         "pinned_message_banner": {
             "button_close_list": "Tutup daftar",
             "button_view_all": "Lihat semua",
-            "description": "Ruangan ini memiliki pesan yang disematkan. Klik untuk melihatnya.",
-            "go_to_message": "Lihat pesan yang disematkan di lini masa.",
+            "description": "Pesan yang disematkan",
+            "go_to_newest_message": "Lihat pesan yang disematkan di lini masa dan pesan terbaru yang disematkan di sini",
+            "go_to_next_message": "Lihat pesan yang disematkan di lini masa dan pesan terlama berikutnya yang disematkan di sini",
             "title": "<bold>%(index)s dari %(length)s</bold> Pesan yang disematkan"
         },
         "read_topic": "Klik untuk membaca topik",
         "rejecting": "Menolak undangan…",
         "rejoin_button": "Bergabung Ulang",
+        "room_content": "Isi ruangan",
+        "room_is_low_priority": "Ini adalah ruangan dengan prioritas rendah",
         "search": {
             "all_rooms_button": "Cari semua ruangan",
             "placeholder": "Cari pesan...",
@@ -2086,9 +2138,9 @@
     "room_list": {
         "add_room_label": "Tambahkan ruangan",
         "add_space_label": "Tambahkan space",
-        "appearance": "Penampilan",
         "breadcrumbs_empty": "Tidak ada ruangan yang baru saja dilihat",
         "breadcrumbs_label": "Ruangan yang baru saja dilihat",
+        "collapse_filters": "Tutup daftar filter",
         "empty": {
             "no_chats": "Belum ada obrolan",
             "no_chats_description": "Mulailah dengan mengirim pesan kepada seseorang atau dengan membuat ruangan",
@@ -2096,6 +2148,7 @@
             "no_favourites": "Anda belum memiliki obrolan favorit",
             "no_favourites_description": "Anda dapat menambahkan obrolan ke favorit Anda di pengaturan obrolan",
             "no_invites": "Anda tidak memiliki undangan yang belum dibaca",
+            "no_lowpriority": "Anda tidak memiliki ruangan dengan prioritas rendah",
             "no_mentions": "Anda tidak memiliki sebutan yang belum dibaca",
             "no_people": "Anda belum memiliki obrolan langsung dengan siapa pun",
             "no_people_description": "Anda dapat membatalkan pilihan saringan untuk melihat percakapan Anda yang lain",
@@ -2105,12 +2158,14 @@
             "show_activity": "Lihat semua aktivitas",
             "show_chats": "Tampilkan semua obrolan"
         },
+        "expand_filters": "Buka daftar filter",
         "failed_add_tag": "Gagal menambahkan tag %(tagName)s ke ruangan",
         "failed_remove_tag": "Gagal menghapus tanda %(tagName)s dari ruangan",
         "failed_set_dm_tag": "Gagal menetapkan tanda pesan langsung",
         "filters": {
             "favourite": "Favorit",
             "invites": "Undangan",
+            "low_priority": "Prioritas rendah",
             "mentions": "Sebutan",
             "people": "Orang",
             "rooms": "Ruangan",
@@ -2144,7 +2199,6 @@
         },
         "room_options": "Opsi Ruangan",
         "show_less": "Tampilkan lebih sedikit",
-        "show_message_previews": "Tampilkan pratinjau pesan",
         "show_n_more": {
             "one": "Tampilkan %(count)s lagi",
             "other": "Tampilkan %(count)s lagi"
@@ -2328,6 +2382,10 @@
             "users_default": "Peran bawaan"
         },
         "security": {
+            "cannot_change_to_private_due_to_missing_history_visiblity_permissions": {
+                "description": "Anda tidak memiliki izin untuk mengubah visibilitas riwayat ruangan. Hal ini berbahaya karena dapat memungkinkan pengguna yang tidak bergabung untuk membaca pesan.",
+                "title": "Tidak dapat menjadikan ruangan privat"
+            },
             "enable_encryption_confirm_description": "Ketika diaktifkan, enkripsi untuk sebuah ruangan tidak dapat dinonaktifkan. Pesan-pesan yang terkirim di sebuah ruangan terenkripsi tidak dapat dilihat oleh server, hanya anggota di ruangan. <a>Pelajari lebih lanjut tentang enkripsi.</a>",
             "enable_encryption_confirm_title": "Aktifkan enkripsi?",
             "enable_encryption_public_room_confirm_description_1": "<b>Menambahkan enkripsi pada ruangan publik tidak disarankan.</b> Siapa pun dapat menemukan dan bergabung dengan ruangan publik, supaya siapa pun dapat membaca pesan di ruangan. Anda tidak akan mendapatkan manfaat dari enkripsi, dan Anda tidak akan dapat menonaktifkan nanti. Mengenkripsi pesan di ruangan publik akan membuat penerimaan dan pengiriman pesan lebih lambat.",
@@ -2345,7 +2403,7 @@
             "history_visibility_joined": "Anggota saja (sejak mereka bergabung)",
             "history_visibility_legend": "Siapa yang dapat membaca riwayat?",
             "history_visibility_shared": "Anggota saja (sejak memilih opsi ini)",
-            "history_visibility_warning": "Perubahan siapa yang dapat membaca riwayat hanya akan berlaku untuk pesan berikutnya di ruangan ini. Visibilitas riwayat yang ada tidak akan berubah.",
+            "history_visibility_warning": "Visibilitas riwayat yang ada tidak akan berubah.",
             "history_visibility_world_readable": "Siapa Saja",
             "join_rule_description": "Putuskan siapa yang dapat bergabung %(roomName)s.",
             "join_rule_invite": "Privat (undangan saja)",
@@ -2388,6 +2446,7 @@
                 "other": "Memperbarui space... (%(progress)s dari %(count)s)"
             },
             "join_rule_upgrade_upgrading_room": "Meningkatkan ruangan",
+            "join_rule_world_readable_description": "Mengubah siapa yang dapat bergabung ke dalam ruangan juga akan mengubah visibilitas pesan di masa mendatang.",
             "public_without_alias_warning": "Untuk menautkan ruangan ini, mohon tambahkan sebuah alamat.",
             "publish_room": "Buat ruangan ini terlihat di direktori ruangan publik.",
             "publish_space": "Buat ruang ini terlihat di direktori ruangan publik.",
@@ -2402,7 +2461,6 @@
             "error_update_guest_access": "Gagal untuk memperbarui akses tamu untuk space ini",
             "error_update_history_visibility": "Gagal untuk memperbarui visibilitas riwayat untuk space ini",
             "guest_access_explainer": "Tamu dapat bergabung sebuah space tanpa harus mempunyai akun.",
-            "guest_access_explainer_public_space": "Ini mungkin berguna untuk space publik.",
             "guest_access_label": "Aktifkan akses tamu",
             "history_visibility_anyone_space": "Tampilkan Space",
             "history_visibility_anyone_space_description": "Memungkinkan orang-orang untuk memperlihatkan space Anda sebelum mereka bergabung.",
@@ -2526,6 +2584,7 @@
                 "breadcrumb_second_description": "Anda akan kehilangan semua riwayat pesan yang hanya disimpan di server",
                 "breadcrumb_third_description": "Anda perlu memverifikasi ulang semua perangkat dan kontak yang ada",
                 "breadcrumb_title": "Apakah Anda yakin ingin mengatur ulang identitas Anda?",
+                "breadcrumb_title_cant_confirm": "Anda perlu mengatur ulang identitas Anda",
                 "breadcrumb_title_forgot": "Lupa kunci pemulihan Anda? Anda harus mengatur ulang identitas Anda.",
                 "breadcrumb_title_sync_failed": "Gagal menyinkronkan penyimpanan kunci. Anda perlu mengatur ulang identitas Anda.",
                 "breadcrumb_warning": "Lakukan ini hanya jika Anda yakin akun Anda telah terkompromi.",
@@ -2533,7 +2592,7 @@
                 "do_not_close_warning": "Jangan tutup jendela ini sampai pengaturan ulang selesai",
                 "export_keys": "Ekspor kunci",
                 "import_keys": "Impor kunci",
-                "other_people_device_description": "Secara bawaan dalam ruangan terenkripsi, jangan kirim pesan terenkripsi kepada siapa pun sampai Anda memverifikasinya",
+                "other_people_device_description": "Peringatan: pengguna yang belum secara eksplisit memverifikasi dengan Anda (misalnya menggunakan emoji) tidak akan menerima pesan terenkripsi Anda. Selain itu, device yang belum diverifikasi dari pengguna yang telah diverifikasi juga tidak akan menerima pesan terenkripsi Anda. Perubahan memerlukan pemulaian ulang aplikasi agar berlaku.",
                 "other_people_device_label": "Jangan pernah mengirim pesan terenkripsi ke perangkat yang tidak terverifikasi",
                 "other_people_device_title": "Perangkat orang lain",
                 "reset_identity": "Atur ulang identitas kriptografi",
@@ -2602,6 +2661,7 @@
             "allow_spellcheck": "Izinkan pemeriksaan ejaan",
             "application_language": "Bahasa aplikasi",
             "application_language_reload_hint": "Aplikasi akan dimuat ulang setelah memilih bahasa lain",
+            "avatar_open_menu": "Buka menu avatar",
             "avatar_remove_progress": "Menghapus gambar...",
             "avatar_save_progress": "Mengunggah gambar...",
             "avatar_upload_error_text": "Format berkas tidak didukung atau gambar lebih besar dari %(size)s.",
@@ -2679,13 +2739,11 @@
         "inline_url_previews_room": "Aktifkan tampilan URL secara bawaan untuk anggota di ruangan ini",
         "inline_url_previews_room_account": "Aktifkan tampilan URL secara bawaan (hanya memengaruhi Anda)",
         "insert_trailing_colon_mentions": "Tambahkan sebuah karakter titik dua sesudah sebutan pengguna dari awal pesan",
+        "invite_controls": {
+            "default_label": "Izinkan pengguna mengundang Anda ke ruangan"
+        },
         "jump_to_bottom_on_send": "Pergi ke bawah lini masa ketika Anda mengirim pesan",
         "key_backup": {
-            "backup_in_progress": "Kunci Anda sedang dicadangkan (cadangan pertama mungkin membutuhkan beberapa menit).",
-            "backup_starting": "Memulai pencadangan…",
-            "backup_success": "Berhasil!",
-            "cannot_create_backup": "Tidak dapat membuat cadangan kunci",
-            "create_title": "Buat cadangan kunci",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Kunci Anda sekarang dicadangkan dari perangkat ini.",
                 "backup_setup_success_title": "Pencadangan Aman berhasil",
@@ -2745,6 +2803,7 @@
             "show_in_private": "Di ruangan privat",
             "show_media": "Selalu tampilkan"
         },
+        "not_supported": "Server Anda tidak menerapkan fitur ini.",
         "notifications": {
             "default_setting_description": "Pengaturan ini akan diterapkan secara bawaan ke semua ruangan Anda.",
             "default_setting_section": "Saya ingin diberi tahu (Pengaturan Bawaan)",
@@ -2802,6 +2861,7 @@
             "voip": "Panggilan Audio dan Video"
         },
         "preferences": {
+            "Electron.enableContentProtection": "Mencegah konten jendela agar tidak ditangkap oleh aplikasi lain",
             "Electron.enableHardwareAcceleration": "Aktifkan akselerasi perangkat keras (mulai ulang %(appName)s untuk menerapkan)",
             "always_show_menu_bar": "Selalu tampilkan bilah menu window",
             "autocomplete_delay": "Delay penyelesaian otomatis (md)",
@@ -2810,6 +2870,7 @@
             "composer_heading": "Komposer",
             "default_timezone": "Bawaan peramban (%(timezone)s)",
             "dialog_title": "<strong>Pengaturan:</strong> Preferensi",
+            "enable_content_protection": "Aktifkan perlindungan konten",
             "enable_hardware_acceleration": "Aktifkan akselerasi perangkat keras",
             "enable_tray_icon": "Tampilkan ikon baki dan minimalkan window ke ikonnya jika ditutup",
             "keyboard_heading": "Pintasan keyboard",
@@ -2823,6 +2884,7 @@
             "room_list_heading": "Daftar ruangan",
             "show_avatars_pills": "Tampilkan avatar di sebutan pengguna, ruangan, dan peristiwa",
             "show_polls_button": "Tampilkan tombol pemungutan suara",
+            "startup_window_behaviour_label": "Perilaku saat memulai dan jendela",
             "surround_text": "Kelilingi teks yang dipilih saat mengetik karakter khusus",
             "time_heading": "Tampilkan waktu",
             "user_timezone": "Atur zona waktu"
@@ -2843,7 +2905,6 @@
             "ignore_users_empty": "Anda tidak memiliki pengguna yang diabaikan.",
             "ignore_users_section": "Pengguna yang diabaikan",
             "key_backup_algorithm": "Algoritma:",
-            "key_backup_connect": "Hubungkan sesi ini ke Pencadangan Kunci",
             "message_search_disable_warning": "Jika dinonaktifkan, pesan dari ruangan terenkripsi tidak akan muncul di hasil pencarian.",
             "message_search_disabled": "Simpan pesan terenkripsi secara lokal dengan aman agar muncul di hasil pencarian.",
             "message_search_enabled": {
@@ -2974,6 +3035,7 @@
         "show_chat_effects": "Tampilkan efek (animasi ketika menerima konfeti, misalnya)",
         "show_displayname_changes": "Tampilkan perubahan nama tampilan",
         "show_join_leave": "Tampilkan pesan-pesan gabung/keluar (undangan/pengeluaran/cekalan tidak terpengaruh)",
+        "show_message_previews": "Tampilkan pratinjau pesan",
         "show_nsfw_content": "Tampilkan konten NSFW",
         "show_read_receipts": "Tampilkan laporan dibaca terkirim oleh pengguna lain",
         "show_redaction_placeholder": "Tampilkan sebuah penampung untuk pesan terhapus",
@@ -2996,7 +3058,12 @@
             "spaces_explainer": "Space adalah cara untuk mengelompokkan ruangan dan orang-orang. Di samping space yang Anda berada, Anda juga dapat menggunakan beberapa yang sudah dibuat sebelumnya.",
             "title": "Bilah Samping"
         },
-        "start_automatically": "Mulai setelah login sistem secara otomatis",
+        "start_automatically": {
+            "disabled": "Tidak",
+            "enabled": "Ya",
+            "label": "Buka %(brand)s saat Anda masuk ke komputer Anda",
+            "minimised": "Diminimalkan"
+        },
         "tac_only_notifications": "Hanya tampilkan notifikasi dalam pusat aktivitas utas",
         "use_12_hour_format": "Tampilkan stempel waktu dalam format 12 jam (mis. 2:30pm)",
         "use_command_enter_send_message": "Gunakan ⌘ + Enter untuk mengirim pesan",
@@ -3080,6 +3147,8 @@
         "jumptodate": "Pergi ke tanggal yang diberikan di lini masa",
         "jumptodate_invalid_input": "Kami tidak dapat mengerti tanggal yang dicantumkan (%(inputDate)s). Coba menggunakan format TTTT-BB-HH.",
         "lenny": "Menambahkan ( ͡° ͜ʖ ͡°) ke pesan teks biasa",
+        "manual_device_verification_confirm_description": "Ini akan memungkinkan perangkat lain untuk mengirim dan menerima pesan seperti Anda. JIKA SESEORANG MENYURUH ANDA MENEMPELKAN SESUATU DI SINI, KEMUNGKINAN ANDA SEDANG DITIPU! Apakah Anda yakin ingin memverifikasi perangkat lain ini?",
+        "manual_device_verification_confirm_title": "Perhatian: verifikasi perangkat manual",
         "me": "Menampilkan aksi",
         "msg": "Mengirim sebuah pesan ke pengguna yang dicantumkan",
         "myavatar": "Ubah foto profil Anda dalam semua ruangan",
@@ -3120,6 +3189,7 @@
         "upgraderoom": "Meningkatkan ruangan ke versi yang baru",
         "upgraderoom_permission_error": "Anda tidak memiliki izin yang dibutuhkan untuk menggunakan perintah ini.",
         "usage": "Penggunaan",
+        "verify": "Verifikasi salah satu perangkat Anda secara manual",
         "view": "Menampilkan ruangan dengan alamat yang ditentukan",
         "whois": "Menampilkan informasi tentang sebuah pengguna"
     },
@@ -3361,6 +3431,7 @@
             "unable_to_find": "Mencoba memuat titik spesifik di lini masa ruangan ini, tetapi tidak dapat menemukannya."
         },
         "m.audio": {
+            "audio_player": "Pemutar audio",
             "error_downloading_audio": "Terjadi kesalahan mengunduh audio",
             "error_processing_audio": "Terjadi kesalahan mengolah pesan suara",
             "error_processing_voice_message": "Terjadi kesalahan mengolah pesan suara",
@@ -3422,7 +3493,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Mengakhiri sebuah pemungutan suara",
             "sender_ended": "%(senderName)s telah mengakhiri sebuah poll"
         },
         "m.poll.start": "%(senderName)s telah memulai sebuah pungutan suara — %(pollQuestion)s",
@@ -3468,7 +3538,7 @@
             "unknown": "%(senderDisplayName)s mengubah akses tamu ke %(rule)s"
         },
         "m.room.history_visibility": {
-            "invited": "%(senderName)s membuat semua riwayat ruangan di masa mendatang dapat dilihat oleh semua anggota ruangan, sejak mereka diundang.",
+            "invited": "%(senderName)s membuat riwayat ruangan masa depan terlihat oleh semua anggota ruangan, sejak mereka diundang.",
             "joined": "%(senderName)s membuat semua riwayat ruangan di masa mendatang dapat dilihat oleh semua anggota ruangan, sejak mereka bergabung.",
             "shared": "%(senderName)s membuat semua riwayat ruangan di masa mendatang dapat dilihat oleh semua anggota ruangan.",
             "unknown": "%(senderName)s membuat semua riwayat ruangan di masa mendatang dapat dilihat oleh orang yang tidak dikenal (%(visibility)s).",
@@ -3921,12 +3991,12 @@
         "connection_lost": "Koneksi ke server telah hilang",
         "connection_lost_description": "Anda tidak dapat membuat panggilan tanpa terhubung ke server.",
         "consulting": "Mengkonsultasi dengan %(transferTarget)s. <a>Transfer ke %(transferee)s</a>",
+        "decline_call": "Tolak",
         "default_device": "Perangkat Bawaan",
         "dial": "Panggil",
         "dialpad": "Tombol Penyetel",
         "disable_camera": "Matikan kamera",
         "disable_microphone": "Bisukan mikrofon",
-        "disabled_no_one_here": "Tidak ada siapa pun di sini untuk dipanggil",
         "disabled_no_perms_start_video_call": "Anda tidak memiliki izin untuk memulai panggilan video",
         "disabled_no_perms_start_voice_call": "Anda tidak memiliki izin untuk memulai panggilan suara",
         "disabled_ongoing_call": "Panggilan sedang berlangsung",
@@ -3973,6 +4043,7 @@
         "show_sidebar_button": "Tampilkan sisi bilah",
         "silence": "Diamkan panggilan",
         "silenced": "Notifikasi dibisukan",
+        "skip_lobby_toggle_option": "Segera bergabung",
         "start_screenshare": "Mulai membagikan layar Anda",
         "stop_screenshare": "Berhenti membagikan layar Anda",
         "too_many_calls": "Terlalu Banyak Panggilan",
@@ -3993,9 +4064,11 @@
         "user_busy_description": "Pengguna yang Anda panggil sedang sibuk.",
         "user_is_presenting": "%(sharerName)s sedang mempresentasi",
         "video_call": "Panggilan video",
+        "video_call_incoming": "Panggilan video masuk",
         "video_call_started": "Panggilan video dimulai",
         "video_call_using": "Panggilan video menggunakan:",
         "voice_call": "Panggilan suara",
+        "voice_call_incoming": "Panggilan suara masuk",
         "you_are_presenting": "Anda sedang mempresentasi"
     },
     "web_default_device_name": "%(appName)s: %(browserName)s di %(osName)s",
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index f57cdf156e..0cd458dfc8 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -197,8 +197,7 @@
             "megolm_export": "Flytja út dulritunarlykla handvirkt",
             "setup_key_backup_title": "Þú munt tapa dulrituðu skilaboðunum þínum",
             "setup_secure_backup_description_1": "Öryggi dulritaðra skilaboða er tryggt með enda-í-enda dulritun. Einungis þú og viðtakendurnir hafa dulritunarlyklana til að lesa slík skilaboð.",
-            "skip_key_backup": "Ég vil ekki dulrituðu skilaboðin mín",
-            "use_key_backup": "Byrja að nota öryggisafrit dulritunarlykla"
+            "skip_key_backup": "Ég vil ekki dulrituðu skilaboðin mín"
         },
         "misconfigured_body": "Biddu kerfisstjórann á %(brand)s að athuga hvort <a>uppsetningin þín</a> innihaldi rangar eða tvíteknar færslur.",
         "misconfigured_title": "%(brand)s-uppsetningin þín er rangt stillt",
@@ -468,7 +467,6 @@
         "unverified": "Óstaðfest",
         "user_avatar": "Notandamynd",
         "username": "Notandanafn",
-        "verification_cancelled": "Hætt við sannprófun",
         "verified": "Staðfest",
         "version": "Útgáfa",
         "video": "Myndskeið",
@@ -679,8 +677,6 @@
             "security_key_title": "Öryggislykill"
         },
         "bootstrap_title": "Set upp dulritunarlykla",
-        "cancel_entering_passphrase_description": "Viltu örugglega hætta við að setja inn lykilfrasa?",
-        "cancel_entering_passphrase_title": "Hætta við að setja inn lykilfrasa?",
         "confirm_encryption_setup_body": "Smelltu á hnappinn hér að neðan til að staðfesta uppsetningu á dulritun.",
         "confirm_encryption_setup_title": "Staðfestu uppsetningu dulritunar",
         "cross_signing_room_normal": "Þessi spjallrás er enda-í-enda dulrituð",
@@ -704,8 +700,6 @@
         "recovery_method_removed": {
             "title": "Endurheimtuaðferð fjarlægð"
         },
-        "reset_all_button": "Gleymdirðu eða týndir öllum aðferðum til endurheimtu? <a>Endurstilla allt</a>",
-        "set_up_toast_description": "Tryggðu þig gegn því að missa aðgang að dulrituðum skilaboðum og gögnum",
         "set_up_toast_title": "Setja upp varið öryggisafrit",
         "setup_secure_backup": {
             "explainer": "Taktu öryggisafrit af dulritunarlyklunum áður en þú skráir þig út svo þeir tapist ekki."
@@ -723,12 +717,8 @@
             "after_new_login": {
                 "device_verified": "Tæki er sannreynt",
                 "skip_verification": "Sleppa sannvottun í bili",
-                "unable_to_verify": "Tókst ekki að sannreyna þetta tæki",
                 "verify_this_device": "Sannreyna þetta tæki"
             },
-            "cancelled": "Þú hættir við sannvottun.",
-            "cancelled_self": "Þú hættir við sannvottun á hinu tækinu þínu.",
-            "cancelled_user": "%(displayName)s hætti við sannvottun.",
             "cancelling": "Hætti við…",
             "complete_action": "Náði því",
             "complete_description": "Þér hefur tekist að sannreyna þennan notanda.",
@@ -738,20 +728,14 @@
             "incoming_sas_dialog_title": "Innkomin beiðni um sannvottun",
             "other_party_cancelled": "Hinn aðilinn hætti við sannvottunina.",
             "prompt_encrypted": "Sannreyndu alla notendur á spjallrás til að tryggja að hún sé örugg.",
-            "prompt_self": "Hefja sannvottun aftur úr tilkynningunni.",
             "prompt_unencrypted": "Í dulrituðum spjallrásum skaltu sannreyna alla notendur til að tryggja að hún sé örugg.",
-            "prompt_user": "Hefja sannvottun aftur úr notandasniði viðkomandi.",
             "qr_or_sas": "%(qrCode)s eða %(emojiCompare)s",
-            "qr_or_sas_header": "Sannreyndu þetta tæki með því að ljúka einu af eftirtöldu:",
             "qr_prompt": "Skanna þennan einstaka kóða",
-            "qr_reciprocate_same_shield_device": "Næstum því búið! Sýnir hitt tækið þitt sama skjöldinn?",
             "qr_reciprocate_same_shield_user": "Næstum því búið! Sýnir %(displayName)s sama skjöldinn?",
             "request_toast_detail": "%(deviceId)s frá %(ip)s",
-            "reset_proceed_prompt": "Halda áfram með endurstillingu",
             "sas_caption_self": "Sannreyndu þetta tæki með því að staðfesta eftirfarandi númer sem birtist á skjá þess.",
             "sas_caption_user": "Sannreyndu þennan notanda með því að staðfesta eftirfarandi númer sem birtist á skjánum hans.",
             "sas_description": "Berðu saman einstakar táknmyndir ef ekki er myndavél á tækjunum",
-            "sas_emoji_caption_self": "Staðfestu að táknmyndirnar hér fyrir neðan séu birtar á báðum tækjunum og í sömu röð:",
             "sas_emoji_caption_user": "Sannreyndu þennan notanda með því að staðfesta eftirfarandi táknmynd sem birtist á skjánum hans.",
             "sas_match": "Þau samsvara",
             "sas_no_match": "Þau samsvara ekki",
@@ -759,10 +743,7 @@
             "scan_qr": "Sannprófa með skönnun",
             "scan_qr_explainer": "Biddu %(displayName)s um að skanna kóðann þinn:",
             "start_button": "Hefja sannvottun",
-            "successful_device": "Þér hefur tekist að sannreyna %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "Þér hefur tekist að sannreyna tækið þitt!",
             "successful_user": "Þér hefur tekist að sannreyna %(displayName)s!",
-            "timed_out": "Sannvottun rann út á tíma.",
             "unsupported_method": "Fann ekki neina studda sannvottunaraðferð.",
             "unverified_session_toast_title": "Ný innskráning. Varst þetta þú?",
             "unverified_sessions_toast_description": "Yfirfarðu þetta til að tryggja að aðgangurinn þinn sé öruggur",
@@ -774,9 +755,6 @@
             "verify_emoji_prompt": "Sannprófaðu með því að bera saman einstakar táknmyndir.",
             "verify_emoji_prompt_qr": "Ef þú getur ekki skannað kóðann hér fyrir ofan, skaltu sannprófa með því að bera saman einstakar táknmyndir.",
             "verify_later": "Ég mun sannreyna síðar",
-            "verify_using_device": "Sannreyna með öðru tæki",
-            "verify_using_key": "Sannreyna með öryggislykli",
-            "verify_using_key_or_phrase": "Sannreyna með öryggisfrasa",
             "waiting_for_user_accept": "Bíð eftir að %(displayName)s samþykki…",
             "waiting_other_device": "Bíð eftir að þú staðfestir á hinu tækinu…",
             "waiting_other_device_details": "Bíð eftir að þú staðfestir á hinu tækinu, %(deviceName)s (%(deviceId)s)…",
@@ -1206,8 +1184,7 @@
         "toggle_attribution": "Víxla tilvísun af/á"
     },
     "member_list": {
-        "filter_placeholder": "Sía meðlimi spjallrásar",
-        "power_label": "%(userName)s (með völd sem %(powerLevelNumber)s)"
+        "filter_placeholder": "Sía meðlimi spjallrásar"
     },
     "member_list_back_action_label": "Meðlimir spjallrásar",
     "message_edit_dialog_title": "Breytingar á skilaboðum",
@@ -1447,8 +1424,6 @@
             "send_message_start_dm": "Sendu fyrstu skilaboðin þín til að bjóða <displayName/> að spjalla",
             "start_of_dm_history": "Þetta er upphaf ferils beinna skilaboða með <displayName/>.",
             "start_of_room": "Þetta er upphafið á <roomName/>.",
-            "topic": "Umfjöllunarefni: %(topic)s ",
-            "topic_edit": "Umfjöllunarefni: %(topic)s (<a>edit</a>)",
             "unencrypted_warning": "Enda-í-enda dulritun er ekki virkjuð",
             "user_created": "%(displayName)s bjó til þessa spjallrás.",
             "you_created": "Þú bjóst til þessa spjallrás."
@@ -1727,7 +1702,6 @@
             "error_update_guest_access": "Mistókst að uppfæra gestaaðgang þessa svæðis",
             "error_update_history_visibility": "Mistókst að uppfæra sýnileika atvikaferils þessa svæðis",
             "guest_access_explainer": "Gestir geta tekið þátt í svæði án þess að vera með notandaaðgang.",
-            "guest_access_explainer_public_space": "Þetta getur hentað fyrir opinber almenningssvæði.",
             "guest_access_label": "Leyfa aðgang gesta",
             "history_visibility_anyone_space": "Forskoða svæði",
             "history_visibility_anyone_space_description": "Bjóddu fólki að forskoða svæðið þitt áður en þau geta tekið þátt.",
@@ -1860,10 +1834,6 @@
         "insert_trailing_colon_mentions": "Setja tvípunkt á eftir þar sem minnst er á notanda í upphafi skilaboða",
         "jump_to_bottom_on_send": "Hoppa neðst á tímalínuna þegar þú sendir skilaboð",
         "key_backup": {
-            "backup_in_progress": "Verið er að öryggisafrita dulritunarlyklana þína (öryggisafritun getur tekið dálítinn tíma í fyrsta skiptið).",
-            "backup_success": "Tókst!",
-            "cannot_create_backup": "Tókst ekki að gera öryggisafrit af dulritunarlykli",
-            "create_title": "Gera öryggisafrit af dulritunarlykli",
             "setup_secure_backup": {
                 "cancel_warning": "Ef þú hættir við núna, geturðu tapað dulrituðum skilaboðum og gögnum ef þú missir aðgang að innskráningum þínum.",
                 "confirm_security_phrase": "Staðfestu öryggisfrasann þinn",
@@ -1960,7 +1930,6 @@
             "ignore_users_empty": "Þú ert ekki með neina hunsaða notendur.",
             "ignore_users_section": "Hunsaðir notendur",
             "key_backup_algorithm": "Reiknirit:",
-            "key_backup_connect": "Tengja þessa setu við öryggisafrit af lykli",
             "message_search_disable_warning": "Ef þetta er óvirkt, munu skilaboð frá dulrituðum spjallrásum ekki birtast í leitarniðurstöðum.",
             "message_search_disabled": "Setja dulrituð skilaboð leynilega í skyndiminni á tækinu svo þau birtist í leitarniðurstöðum.",
             "message_search_enabled": {
@@ -2077,7 +2046,6 @@
             "metaspaces_subsection": "Svæði sem á að birta",
             "title": "Hliðarspjald"
         },
-        "start_automatically": "Ræsa sjálfvirkt við innskráningu í kerfi",
         "use_12_hour_format": "Birta tímamerki á 12 stunda sniði (t.d. 2:30 fh)",
         "use_command_enter_send_message": "Notaðu Command + Enter til að senda skilaboð",
         "use_command_f_search": "Notaðu Command + F til að leita í tímalínu",
@@ -2185,6 +2153,7 @@
         "upgraderoom": "Uppfærir spjallrás í nýja útgáfu",
         "upgraderoom_permission_error": "Þú hefur ekki nauðsynlegar heimildir til að nota þessa skipun.",
         "usage": "Notkun",
+        "verify": "Sannreynir auðkenni notanda, setu og dreifilykils",
         "whois": "Birtir upplýsingar um notanda"
     },
     "space": {
@@ -2869,7 +2838,6 @@
         "dialpad": "Talnaborð",
         "disable_camera": "Slökkva á myndavél",
         "disable_microphone": "Þagga niður í hljóðnema",
-        "disabled_no_one_here": "Hér er enginn sem hægt er að hringja í",
         "disabled_no_perms_start_video_call": "Þú hefur ekki heimildir til að hefja myndsímtöl",
         "disabled_no_perms_start_voice_call": "Þú hefur ekki heimildir til að hefja raddsímtöl",
         "disabled_ongoing_call": "Símtal í gangi",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 66ea31ad9c..affa7e5656 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -221,8 +221,7 @@
             "setup_key_backup_title": "Perderai l'accesso ai tuoi messaggi cifrati",
             "setup_secure_backup_description_1": "I messaggi cifrati sono resi sicuri con una crittografia end-to-end. Solo tu e il/i destinatario/i avete le chiavi per leggere questi messaggi.",
             "setup_secure_backup_description_2": "Quando ti disconnetti queste chiavi verranno eliminate dal dispositivo, quindi non potrai leggere i messaggi cifrati a meno che tu non abbia le chiavi su altri dispositivi, o salvate in backup sul server.",
-            "skip_key_backup": "Non voglio i miei messaggi cifrati",
-            "use_key_backup": "Inizia ad usare il backup chiavi"
+            "skip_key_backup": "Non voglio i miei messaggi cifrati"
         },
         "misconfigured_body": "Chiedi al tuo amministratore di %(brand)s di controllare <a>la tua configurazione</a> per voci non valide o doppie.",
         "misconfigured_title": "Il tuo %(brand)s è configurato male",
@@ -532,7 +531,6 @@
         "user": "Utente",
         "user_avatar": "Immagine del profilo",
         "username": "Nome utente",
-        "verification_cancelled": "Verifica annullata",
         "verified": "Verificato",
         "version": "Versione",
         "video": "Video",
@@ -801,8 +799,6 @@
             "security_key_title": "Chiave di sicurezza"
         },
         "bootstrap_title": "Configurazione chiavi",
-        "cancel_entering_passphrase_description": "Sei sicuro di volere annullare l'inserimento della frase?",
-        "cancel_entering_passphrase_title": "Annullare l'inserimento della password?",
         "confirm_encryption_setup_body": "Clicca il pulsante sotto per confermare l'impostazione della crittografia.",
         "confirm_encryption_setup_title": "Conferma impostazione crittografia",
         "cross_signing_room_normal": "Questa stanza è cifrata end-to-end",
@@ -839,8 +835,6 @@
             "title": "Metodo di ripristino rimosso",
             "warning": "Se non hai rimosso il metodo di ripristino, è possibile che un aggressore stia cercando di accedere al tuo account. Cambia la password del tuo account e imposta immediatamente un nuovo metodo di recupero nelle impostazioni."
         },
-        "reset_all_button": "Hai dimenticato o perso tutti i metodi di recupero? <a>Reimposta tutto</a>",
-        "set_up_toast_description": "Proteggiti dalla perdita dei messaggi e dati crittografati",
         "set_up_toast_title": "Imposta il Backup Sicuro",
         "setup_secure_backup": {
             "explainer": "Fai una copia delle tue chiavi prima di disconnetterti per evitare di perderle."
@@ -859,12 +853,8 @@
             "after_new_login": {
                 "device_verified": "Dispositivo verificato",
                 "skip_verification": "Salta la verifica per adesso",
-                "unable_to_verify": "Impossibile verificare questo dispositivo",
                 "verify_this_device": "Verifica questo dispositivo"
             },
-            "cancelled": "Hai annullato la verifica.",
-            "cancelled_self": "Hai annullato la verifica nell'altro dispositivo.",
-            "cancelled_user": "%(displayName)s ha annullato la verifica.",
             "cancelling": "Annullamento…",
             "complete_action": "Capito",
             "complete_description": "Hai verificato correttamente l'utente.",
@@ -879,45 +869,32 @@
             "incoming_sas_dialog_waiting": "In attesa che il partner confermi…",
             "incoming_sas_user_dialog_text_1": "Verifica questo utente per contrassegnarlo come affidabile. La fiducia degli utenti offre una maggiore tranquillità quando si utilizzano messaggi cifrati end-to-end.",
             "incoming_sas_user_dialog_text_2": "La verifica di questo utente contrassegnerà come fidata la sua sessione a te e viceversa.",
-            "no_key_or_device": "Pare che tu non abbia una chiave di sicurezza o altri dispositivi con cui poterti verificare.  Questo dispositivo non potrà accedere ai vecchi messaggi cifrati. Per potere verificare la tua ideintità su questo dispositivo, dovrai reimpostare le chiavi di verifica.",
             "no_support_qr_emoji": "Il dispositivo che stai cercando di verificare non supporta la scansione di un codice QR o la verifica emoji, che sono supportate da %(brand)s. Prova con un client diverso.",
             "other_party_cancelled": "L'altra parte ha annullato la verifica.",
             "prompt_encrypted": "Verifica tutti gli utenti in una stanza per confermare che sia sicura.",
-            "prompt_self": "Inizia di nuovo la verifica dalla notifica.",
             "prompt_unencrypted": "Nelle stanze cifrate, verifica tutti gli utenti per confermare che siano sicure.",
-            "prompt_user": "Inizia di nuovo la verifica dal suo profilo.",
             "qr_or_sas": "%(qrCode)s o %(emojiCompare)s",
-            "qr_or_sas_header": "Verifica questo dispositivo completando una delle seguenti cose:",
             "qr_prompt": "Scansiona questo codice univoco",
-            "qr_reciprocate_same_shield_device": "Quasi fatto! L'altro dispositivo sta mostrando lo stesso scudo?",
             "qr_reciprocate_same_shield_user": "Quasi fatto! %(displayName)s sta mostrando lo stesso scudo?",
-            "request_toast_accept": "Verifica sessione",
             "request_toast_decline_counter": "Ignora (%(counter)s)",
             "request_toast_detail": "%(deviceId)s da %(ip)s",
-            "reset_proceed_prompt": "Procedi con la reimpostazione",
             "sas_caption_self": "Verifica questo dispositivo confermando che il seguente numero appare sul suo schermo.",
             "sas_caption_user": "Verifica questo utente confermando che il seguente numero appare sul suo schermo.",
             "sas_description": "Confrontate un set di emoji univoci se non avete una fotocamera sui dispositivi",
-            "sas_emoji_caption_self": "Conferma che gli emoji sottostanti sono mostrati in entrambi i dispositivi, nello stesso ordine:",
             "sas_emoji_caption_user": "Verifica questo utente confermando che la seguente emoji appare sul suo schermo.",
             "sas_match": "Corrispondono",
             "sas_no_match": "Non corrispondono",
             "sas_prompt": "Confronta emoji univoci",
             "scan_qr": "Verifica con la scansione",
             "scan_qr_explainer": "Chiedi a %(displayName)s di scansionare il tuo codice:",
-            "self_verification_hint": "Per continuare, accetta la richiesta di verifica nell'altro tuo dispositivo.",
             "start_button": "Inizia la verifica",
-            "successful_device": "Hai verificato %(deviceName)s (%(deviceId)s) correttamente!",
-            "successful_own_device": "Hai verificato correttamente il tuo dispositivo!",
             "successful_user": "Hai verificato correttamente %(displayName)s!",
-            "timed_out": "Verifica scaduta.",
             "unsupported_method": "Impossibile trovare un metodo di verifica supportato.",
             "unverified_session_toast_accept": "Sì, ero io",
             "unverified_session_toast_title": "Nuovo accesso. Eri tu?",
             "unverified_sessions_toast_description": "Controlla per assicurarti che l'account sia sicuro",
             "unverified_sessions_toast_reject": "Più tardi",
             "unverified_sessions_toast_title": "Hai sessioni non verificate",
-            "verification_description": "Verifica la tua identità per accedere ai messaggi cifrati e provare agli altri che sei tu.",
             "verification_dialog_title_device": "Verifica altro dispositivo",
             "verification_dialog_title_user": "Richiesta verifica",
             "verification_skip_warning": "Senza la verifica, non avrai accesso a tutti i tuoi messaggi e potresti apparire agli altri come non fidato.",
@@ -927,9 +904,6 @@
             "verify_emoji_prompt": "Verifica confrontando emoji specifici.",
             "verify_emoji_prompt_qr": "Se non riesci a scansionare il codice sopra, verifica confrontando emoji specifiche.",
             "verify_later": "Verificherò dopo",
-            "verify_using_device": "Verifica con un altro dispositivo",
-            "verify_using_key": "Verifica con chiave di sicurezza",
-            "verify_using_key_or_phrase": "Verifica con chiave di sicurezza o frase",
             "waiting_for_user_accept": "In attesa che %(displayName)s accetti…",
             "waiting_other_device": "In attesa della verifica nel tuo altro dispositivo…",
             "waiting_other_device_details": "In attesa della verifica nel tuo altro dispositivo, %(deviceName)s (%(deviceId)s)…",
@@ -1293,7 +1267,6 @@
         "upload_file": "Invia un file"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Consenti modalità solo condivisione schermo",
         "ask_to_join": "Attiva \"Chiedi di entrare\"",
         "automatic_debug_logs": "Invia automaticamente log di debug per qualsiasi errore",
         "automatic_debug_logs_decryption": "Invia automaticamente log di debug per errori di decifrazione",
@@ -1465,8 +1438,7 @@
     },
     "member_list": {
         "filter_placeholder": "Filtra membri della stanza",
-        "invite_button_no_perms_tooltip": "Non hai l'autorizzazione per invitare utenti",
-        "power_label": "%(userName)s (poteri %(powerLevelNumber)s)"
+        "invite_button_no_perms_tooltip": "Non hai l'autorizzazione per invitare utenti"
     },
     "member_list_back_action_label": "Membri stanza",
     "message_edit_dialog_title": "Modifiche del messaggio",
@@ -1780,8 +1752,6 @@
             "send_message_start_dm": "Invia il primo messaggio per invitare <displayName/> a parlare",
             "start_of_dm_history": "Questo è l'inizio della tua cronologia di messaggi diretti con <displayName/>.",
             "start_of_room": "Questo è l'inizio di <roomName/>.",
-            "topic": "Argomento: %(topic)s ",
-            "topic_edit": "Argomento: %(topic)s (<a>modifica</a>)",
             "unencrypted_warning": "La crittografia end-to-end non è attiva",
             "user_created": "%(displayName)s ha creato questa stanza.",
             "you_created": "Hai creato questa stanza."
@@ -2138,7 +2108,6 @@
             "error_update_guest_access": "Aggiornamento accesso ospiti dello spazio fallito",
             "error_update_history_visibility": "Aggiornamento visibilità cronologia dello spazio fallito",
             "guest_access_explainer": "Gli ospiti possono entrare in uno spazio senza avere un account.",
-            "guest_access_explainer_public_space": "Può tornare utile per gli spazi pubblici.",
             "guest_access_label": "Attiva accesso ospiti",
             "history_visibility_anyone_space": "Anteprima spazio",
             "history_visibility_anyone_space_description": "Permetti a chiunque di vedere l'anteprima dello spazio prima di unirsi.",
@@ -2310,11 +2279,6 @@
         "insert_trailing_colon_mentions": "Inserisci dei due punti dopo le citazioni degli utenti all'inizio di un messaggio",
         "jump_to_bottom_on_send": "Salta in fondo alla linea temporale quando invii un messaggio",
         "key_backup": {
-            "backup_in_progress": "Il backup delle chiavi è in corso (il primo backup potrebbe richiedere qualche minuto).",
-            "backup_starting": "Avvio del backup…",
-            "backup_success": "Completato!",
-            "cannot_create_backup": "Impossibile creare backup della chiave",
-            "create_title": "Crea backup chiavi",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Viene ora fatto il backup delle tue chiavi da questo dispositivo.",
                 "backup_setup_success_title": "Backup Sicuro completato",
@@ -2449,7 +2413,6 @@
             "ignore_users_empty": "Non hai utenti ignorati.",
             "ignore_users_section": "Utenti ignorati",
             "key_backup_algorithm": "Algoritmo:",
-            "key_backup_connect": "Connetti questa sessione al backup chiavi",
             "message_search_disable_warning": "Se disattivato, i messaggi delle stanze cifrate non appariranno nei risultati di ricerca.",
             "message_search_disabled": "Tieni in cache localmente i messaggi cifrati in modo sicuro affinché appaiano nei risultati di ricerca.",
             "message_search_enabled": {
@@ -2594,7 +2557,6 @@
             "spaces_explainer": "Gli spazi sono modi per raggruppare stanze e persone. Oltre agli spazi in cui ti trovi, puoi usarne anche altri già integrati.",
             "title": "Barra laterale"
         },
-        "start_automatically": "Esegui automaticamente all'avvio del sistema",
         "use_12_hour_format": "Mostra gli orari nel formato 12 ore (es. 2:30pm)",
         "use_command_enter_send_message": "Usa Comando + Invio per inviare un messaggio",
         "use_command_f_search": "Usa Comando + F per cercare nella linea temporale",
@@ -2712,6 +2674,7 @@
         "upgraderoom": "Aggiorna una stanza ad una nuova versione",
         "upgraderoom_permission_error": "Non hai l'autorizzazione necessaria per usare questo comando.",
         "usage": "Utilizzo",
+        "verify": "Verifica un utente, una sessione e una tupla pubblica",
         "view": "Visualizza la stanza con l'indirizzo dato",
         "whois": "Mostra le informazioni di un utente"
     },
@@ -2995,7 +2958,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Terminato un sondaggio",
             "sender_ended": "%(senderName)s ha terminato un sondaggio"
         },
         "m.poll.start": "%(senderName)s ha iniziato un sondaggio - %(pollQuestion)s",
@@ -3478,7 +3440,6 @@
         "dialpad": "Tastierino",
         "disable_camera": "Spegni la fotocamera",
         "disable_microphone": "Spegni il microfono",
-        "disabled_no_one_here": "Non c'è nessuno da chiamare qui",
         "disabled_no_perms_start_video_call": "Non hai il permesso di avviare videochiamate",
         "disabled_no_perms_start_voice_call": "Non hai il permesso di avviare chiamate",
         "disabled_ongoing_call": "Chiamata in corso",
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index e4e61e8907..0bdb4d18ff 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -208,8 +208,7 @@
             "setup_key_backup_title": "暗号化されたメッセージにアクセスできなくなります",
             "setup_secure_backup_description_1": "暗号化されたメッセージは、エンドツーエンドの暗号化によって保護されています。これらの暗号化されたメッセージを読むための鍵を持っているのは、あなたと受信者だけです。",
             "setup_secure_backup_description_2": "サインアウトすると、これらの鍵はこの端末から削除されます。使用できる鍵が他の端末にあったり、サーバーにバックアップされたりしているのでない限り、暗号化されたメッセージは読むことができなくなります。",
-            "skip_key_backup": "暗号化されたメッセージは不要です",
-            "use_key_backup": "鍵のバックアップを使用開始"
+            "skip_key_backup": "暗号化されたメッセージは不要です"
         },
         "misconfigured_body": "<a>設定</a>が間違っているか重複しているか確認するよう、%(brand)sの管理者に問い合わせてください。",
         "misconfigured_title": "あなたの%(brand)sは正しく設定されていません",
@@ -510,7 +509,6 @@
         "unverified": "未認証",
         "user_avatar": "プロフィール画像",
         "username": "ユーザー名",
-        "verification_cancelled": "認証のキャンセル",
         "verified": "認証済",
         "version": "バージョン",
         "video": "動画",
@@ -760,8 +758,6 @@
             "security_key_title": "セキュリティーキー"
         },
         "bootstrap_title": "鍵のセットアップ",
-        "cancel_entering_passphrase_description": "パスフレーズの入力をキャンセルしてよろしいですか？",
-        "cancel_entering_passphrase_title": "パスフレーズの入力をキャンセルしますか？",
         "confirm_encryption_setup_body": "以下のボタンをクリックして、暗号化の設定を承認してください。",
         "confirm_encryption_setup_title": "暗号化の設定を承認してください",
         "cross_signing_room_normal": "このルームはエンドツーエンドで暗号化されています",
@@ -795,8 +791,6 @@
             "title": "復元方法を削除しました",
             "warning": "復元方法を削除しなかった場合、攻撃者があなたのアカウントにアクセスしようとしている可能性があります。設定画面でアカウントのパスワードを至急変更し、新しい復元方法を設定してください。"
         },
-        "reset_all_button": "復元方法を全て失ってしまいましたか？<a>リセットできます</a>",
-        "set_up_toast_description": "暗号化されたメッセージとデータへのアクセスが失われるのを防ぎましょう",
         "set_up_toast_title": "セキュアバックアップを設定",
         "setup_secure_backup": {
             "explainer": "鍵を失くさないよう、サインアウトする前にバックアップしてください。"
@@ -815,12 +809,8 @@
             "after_new_login": {
                 "device_verified": "端末が認証されました",
                 "skip_verification": "認証をスキップ",
-                "unable_to_verify": "この端末を認証できません",
                 "verify_this_device": "この端末を認証"
             },
-            "cancelled": "認証をキャンセルしました。",
-            "cancelled_self": "他の端末で認証がキャンセルされました。",
-            "cancelled_user": "%(displayName)sが認証をキャンセルしました。",
             "cancelling": "キャンセルしています…",
             "complete_action": "了解",
             "complete_description": "このユーザーを認証しました。",
@@ -835,42 +825,30 @@
             "incoming_sas_dialog_waiting": "相手の承認を待機しています…",
             "incoming_sas_user_dialog_text_1": "このユーザーを認証すると、信頼済として表示します。ユーザーを信頼すると、より一層安心してエンドツーエンド暗号化を使用することができます。",
             "incoming_sas_user_dialog_text_2": "このユーザーを認証すると、相手のセッションと自分のセッションを信頼済として表示します。",
-            "no_key_or_device": "セキュリティーキーもしくは認証可能な端末が設定されていません。この端末では、以前暗号化されたメッセージにアクセスすることができません。この端末で本人確認を行うには、認証用の鍵を再設定する必要があります。",
             "no_support_qr_emoji": "認証しようとしている端末は、QRコードのスキャンや絵文字による認証をサポートしていませんが、%(brand)sではサポートされています。異なるクライアントで試してください。",
             "other_party_cancelled": "相手が認証をキャンセルしました。",
             "prompt_encrypted": "ルームの全てのユーザーを認証すると、ルームが安全であることを確認できます。",
-            "prompt_self": "通知から再度認証を開始してください。",
             "prompt_unencrypted": "暗号化されたルームでは、安全確認のために全てのユーザーを認証しましょう。",
-            "prompt_user": "プロフィールから再度認証を開始してください。",
             "qr_or_sas": "%(qrCode)sまたは%(emojiCompare)s",
-            "qr_or_sas_header": "以下のいずれかでこの端末を認証してください：",
             "qr_prompt": "ユニークなコードをスキャン",
-            "qr_reciprocate_same_shield_device": "あと少しです！ あなたの他の端末は同じ盾マークを表示していますか？",
             "qr_reciprocate_same_shield_user": "あと少しです！%(displayName)sは同じ盾マークを表示していますか？",
             "request_toast_detail": "%(ip)sの%(deviceId)s",
-            "reset_proceed_prompt": "リセットする",
             "sas_caption_self": "この端末を認証するには、画面に以下の数字が表示されていることを確認してください。",
             "sas_caption_user": "このユーザーを認証するには、相手の画面に以下の数字が表示されていることを確認してください。",
             "sas_description": "両方の端末でQRコードをキャプチャできない場合、絵文字の比較を選んでください",
-            "sas_emoji_caption_self": "以下の絵文字が、両方の端末で、同じ順番で表示されているかどうか確認してください：",
             "sas_emoji_caption_user": "このユーザーを認証するには、相手の画面に以下の絵文字が表示されていることを確認してください。",
             "sas_match": "一致しています",
             "sas_no_match": "一致していません",
             "sas_prompt": "絵文字の並びを比較",
             "scan_qr": "QRコードスキャンで認証",
             "scan_qr_explainer": "%(displayName)sにQRコードをスキャンするよう問い合わせてください：",
-            "self_verification_hint": "続行するには、他の端末で認証リクエストを承認してください。",
             "start_button": "認証を開始",
-            "successful_device": "%(deviceName)s（%(deviceId)s）は正常に認証されました！",
-            "successful_own_device": "この端末は正常に認証されました！",
             "successful_user": "%(displayName)sは正常に認証されました！",
-            "timed_out": "認証がタイムアウトしました。",
             "unsupported_method": "サポートしている認証方法が見つかりません。",
             "unverified_session_toast_title": "新しいログインです。ログインしましたか？",
             "unverified_sessions_toast_description": "アカウントが安全かどうか確認してください",
             "unverified_sessions_toast_reject": "後で",
             "unverified_sessions_toast_title": "未認証のセッションがあります",
-            "verification_description": "暗号化されたメッセージにアクセスするには、本人確認が必要です。",
             "verification_dialog_title_device": "他の端末を認証",
             "verification_dialog_title_user": "認証の要求",
             "verification_skip_warning": "認証を行わないと、あなたの全てのメッセージにアクセスできず、他のユーザーに信頼済として表示されない可能性があります。",
@@ -880,9 +858,6 @@
             "verify_emoji_prompt": "絵文字の並びを比較して認証。",
             "verify_emoji_prompt_qr": "上記のコードをスキャンできない場合は、絵文字による確認を行ってください。",
             "verify_later": "後で認証",
-            "verify_using_device": "別の端末で認証",
-            "verify_using_key": "セキュリティーキーで認証",
-            "verify_using_key_or_phrase": "セキュリティーキーあるいはセキュリティーフレーズで認証",
             "waiting_for_user_accept": "%(displayName)sによる承認を待機しています…",
             "waiting_other_device": "他の端末での認証を待機しています…",
             "waiting_other_device_details": "端末 %(deviceName)s（%(deviceId)s）での認証を待機しています…",
@@ -1364,8 +1339,7 @@
         "toggle_attribution": "属性を切り替える"
     },
     "member_list": {
-        "filter_placeholder": "ルームのメンバーを絞り込む",
-        "power_label": "%(userName)s（権限レベル：%(powerLevelNumber)s）"
+        "filter_placeholder": "ルームのメンバーを絞り込む"
     },
     "member_list_back_action_label": "ルームのメンバー",
     "message_edit_dialog_title": "メッセージの編集履歴",
@@ -1623,8 +1597,6 @@
             "send_message_start_dm": "最初のメッセージを送信すると、<displayName/>を会話に招待",
             "start_of_dm_history": "ここがあなたと<displayName/>のダイレクトメッセージの履歴の先頭です。",
             "start_of_room": "ここが<roomName/>の先頭です。",
-            "topic": "トピック：%(topic)s ",
-            "topic_edit": "トピック：%(topic)s（<a>編集</a>）",
             "unencrypted_warning": "エンドツーエンド暗号化が有効になっていません",
             "user_created": "%(displayName)sがこのルームを作成しました。",
             "you_created": "このルームを作成しました。"
@@ -1946,7 +1918,6 @@
             "error_update_guest_access": "ゲストのアクセスの更新に失敗しました",
             "error_update_history_visibility": "このスペースの履歴の見え方の更新に失敗しました",
             "guest_access_explainer": "ゲストはアカウントを使用せずに参加できます。",
-            "guest_access_explainer_public_space": "公開のスペースに適しているかもしれません。",
             "guest_access_label": "ゲストによるアクセスを有効にする",
             "history_visibility_anyone_space": "スペースのプレビュー",
             "history_visibility_anyone_space_description": "参加する前にスペースのプレビューを閲覧することを許可。",
@@ -2105,11 +2076,6 @@
         "insert_trailing_colon_mentions": "ユーザーをメンションする際にコロンを挿入",
         "jump_to_bottom_on_send": "メッセージを送信する際にタイムラインの最下部に移動",
         "key_backup": {
-            "backup_in_progress": "鍵をバックアップしています（最初のバックアップは数分かかる可能性があります）。",
-            "backup_starting": "バックアップを開始しています…",
-            "backup_success": "成功しました！",
-            "cannot_create_backup": "鍵のバックアップを作成できません",
-            "create_title": "鍵のバックアップを作成",
             "setup_secure_backup": {
                 "backup_setup_success_description": "鍵はこの端末からバックアップされています。",
                 "backup_setup_success_title": "セキュアバックアップに成功しました",
@@ -2213,7 +2179,6 @@
             "ignore_users_empty": "無視しているユーザーはいません。",
             "ignore_users_section": "無視しているユーザー",
             "key_backup_algorithm": "アルゴリズム：",
-            "key_backup_connect": "このセッションを鍵のバックアップに接続",
             "message_search_disable_warning": "無効にすると、暗号化されたルームのメッセージは検索結果に表示されません。",
             "message_search_disabled": "検索結果の表示用に、暗号化されたメッセージをローカルに安全にキャッシュしています。",
             "message_search_enabled": {
@@ -2352,7 +2317,6 @@
             "metaspaces_subsection": "表示するスペース",
             "title": "サイドバー"
         },
-        "start_automatically": "システムログイン後に自動的に起動",
         "use_12_hour_format": "発言時刻を12時間形式で表示（例：2:30午後）",
         "use_command_enter_send_message": "Command+Enterでメッセージを送信",
         "use_command_f_search": "Command+Fでタイムラインを検索",
@@ -2462,6 +2426,7 @@
         "upgraderoom": "ルームを新しいバージョンにアップグレード",
         "upgraderoom_permission_error": "このコマンドを実行するのに必要な権限がありません。",
         "usage": "用法",
+        "verify": "ユーザー、セッション、およびpubkeyタプルを認証",
         "whois": "ユーザーの情報を表示"
     },
     "space": {
@@ -3198,7 +3163,6 @@
         "dialpad": "ダイヤルパッド",
         "disable_camera": "カメラを無効にする",
         "disable_microphone": "マイクをミュート",
-        "disabled_no_one_here": "ここには通話できる人はいません",
         "disabled_no_perms_start_video_call": "ビデオ通話を開始する権限がありません",
         "disabled_no_perms_start_voice_call": "音声通話を開始する権限がありません",
         "disabled_ongoing_call": "通話中",
diff --git a/src/i18n/strings/ka.json b/src/i18n/strings/ka.json
index 514e069bfa..f7413dc821 100644
--- a/src/i18n/strings/ka.json
+++ b/src/i18n/strings/ka.json
@@ -202,8 +202,7 @@
             "setup_key_backup_title": "თქვენ დაკარგავთ წვდომას თქვენს დაშიფრულ შეტყობინებებზე",
             "setup_secure_backup_description_1": "დაშიფრული შეტყობინებები დაცულია ბოლოდან ბოლომდე დაშიფვრით. მხოლოდ თქვენ და მიმღებ(ებ)ს გაქვთ ამ შეტყობინებების წაკითხვის გასაღები.",
             "setup_secure_backup_description_2": "როდესაც გამოხვალთ, ეს გასაღებები წაიშლება ამ მოწყობილობიდან, რაც ნიშნავს, რომ თქვენ ვერ შეძლებთ დაშიფრული შეტყობინებების წაკითხვას, თუ არ გაქვთ მათი გასაღებები თქვენს სხვა მოწყობილობებზე, ან არ შექმნით მათ სარეზერვო ასლს სერვერზე.",
-            "skip_key_backup": "არ მინდა ჩემი დაშიფრული შეტყობინებები",
-            "use_key_backup": "დაიწყეთ Key Backup-ის გამოყენება"
+            "skip_key_backup": "არ მინდა ჩემი დაშიფრული შეტყობინებები"
         },
         "misconfigured_body": "ჰკითხეთ თქვენს%(brand)s ადმინი შესამოწმებლად<a> თქვენი კონფიგურაცია</a> არასწორი ან დუბლიკატი ჩანაწერებისთვის.",
         "misconfigured_title": "შენი%(brand)s არასწორად არის კონფიგურირებული",
@@ -493,7 +492,6 @@
         "user": "მომხმარებელი:",
         "user_avatar": "პროფილის სურათი",
         "username": "მომხმარებლის სახელი",
-        "verification_cancelled": "დადასტურება გაუქმდა",
         "verified": "დამოწმებულია",
         "version": "ვერსია",
         "video": "ვიდეო",
@@ -665,8 +663,6 @@
             "security_key_title": "უსაფრთხოების გასაღები"
         },
         "bootstrap_title": "გასაღებების დაყენება",
-        "cancel_entering_passphrase_description": "დარწმუნებული ხართ, რომ გსურთ გააუქმოთ პაროლის შეყვანა?",
-        "cancel_entering_passphrase_title": "გააუქმოს პაროლის შეყვანა?",
         "confirm_encryption_setup_body": "დააწკაპუნეთ ქვემოთ მოცემულ ღილაკზე დაშიფვრის დაყენების დასადასტურებლად.",
         "confirm_encryption_setup_title": "დაადასტურეთ დაშიფვრის დაყენება",
         "cross_signing_room_normal": "",
@@ -703,8 +699,6 @@
             "title": "აღდგენის მეთოდი ამოღებულია",
             "warning": "თუ თქვენ არ წაშალეთ აღდგენის მეთოდი, შესაძლოა თავდამსხმელი ცდილობდეს თქვენს ანგარიშზე წვდომას. შეცვალეთ თქვენი ანგარიშის პაროლი და დააყენეთ აღდგენის ახალი მეთოდი დაუყოვნებლივ პარამეტრებში."
         },
-        "reset_all_button": "დაგავიწყდათ თუ დაკარგეთ აღდგენის ყველა მეთოდი?<a> გადატვირთეთ ყველა</a>",
-        "set_up_toast_description": "დაიცავით დაშიფრულ შეტყობინებებსა და მონაცემებზე წვდომის დაკარგვისგან",
         "set_up_toast_title": "დააყენეთ უსაფრთხო სარეზერვო ასლი",
         "setup_secure_backup": {
             "explainer": "შექმენით თქვენი გასაღებების სარეზერვო ასლები გასვლამდე, რათა არ დაკარგოთ ისინი."
@@ -723,12 +717,8 @@
             "after_new_login": {
                 "device_verified": "მოწყობილობა დადასტურებულია",
                 "skip_verification": "ამ დროისთვის გამოტოვეთ დადასტურება",
-                "unable_to_verify": "ამ მოწყობილობის დადასტურება შეუძლებელია",
                 "verify_this_device": "დაადასტურეთ ეს მოწყობილობა"
             },
-            "cancelled": "თქვენ გააუქმეთ დადასტურება.",
-            "cancelled_self": "თქვენ გააუქმეთ დადასტურება თქვენს სხვა მოწყობილობაზე.",
-            "cancelled_user": "%(displayName)sგაუქმებული გადამოწმება.",
             "cancelling": "მიმდინარეობს გაუქმება…",
             "complete_action": "Გავიგე",
             "complete_description": "თქვენ წარმატებით დაადასტურეთ ეს მომხმარებელი.",
@@ -743,45 +733,32 @@
             "incoming_sas_dialog_waiting": "ელოდება პარტნიორის დადასტურებას…",
             "incoming_sas_user_dialog_text_1": "დაადასტურეთ ეს მომხმარებელი, რათა მონიშნოთ ისინი სანდოდ. მომხმარებელთა ნდობა გაძლევთ დამატებით სიმშვიდეს, როდესაც იყენებთ ბოლომდე დაშიფრული შეტყობინებების გამოყენებას.",
             "incoming_sas_user_dialog_text_2": "ამ მომხმარებლის დადასტურება მონიშნავს მის სესიას სანდოდ და ასევე მონიშნავს თქვენს სესიას, როგორც მისთვის სანდო.",
-            "no_key_or_device": "როგორც ჩანს, არ გაქვთ უსაფრთხოების გასაღები ან სხვა მოწყობილობები, რომლებზეც შეგიძლიათ დაადასტუროთ. ეს მოწყობილობა ვერ შეძლებს ძველ დაშიფრულ შეტყობინებებზე წვდომას. იმისათვის, რომ დაადასტუროთ თქვენი ვინაობა ამ მოწყობილობაზე, დაგჭირდებათ თქვენი დამადასტურებელი გასაღებების გადატვირთვა.",
             "no_support_qr_emoji": "მოწყობილობა, რომლის გადამოწმებას ცდილობთ, არ უჭერს მხარს QR კოდის ან emoji-ის დადასტურებას, რაც არის%(brand)s მხარს უჭერს. სცადეთ სხვა კლიენტთან.",
             "other_party_cancelled": "მეორე მხარემ გააუქმა გადამოწმება.",
             "prompt_encrypted": "დაადასტურეთ ოთახის ყველა მომხმარებელი, რომ დარწმუნდეთ, რომ ის უსაფრთხოა.",
-            "prompt_self": "ხელახლა დაიწყეთ გადამოწმება შეტყობინებებიდან.",
             "prompt_unencrypted": "დაშიფრულ ოთახებში გადაამოწმეთ ყველა მომხმარებელი, რომ დარწმუნდეთ, რომ ის უსაფრთხოა.",
-            "prompt_user": "ხელახლა დაიწყეთ დადასტურება მათი პროფილიდან.",
             "qr_or_sas": "%(qrCode)sან%(emojiCompare)s",
-            "qr_or_sas_header": "გადაამოწმეთ ეს მოწყობილობა შემდეგიდან ერთ-ერთის შესრულებით:",
             "qr_prompt": "დაასკანირეთ ეს უნიკალური კოდი",
-            "qr_reciprocate_same_shield_device": "თითქმის იქ! თქვენი სხვა მოწყობილობა აჩვენებს იმავე ფარს?",
             "qr_reciprocate_same_shield_user": "თითქმის იქ! არის%(displayName)s იგივე ფარს აჩვენებს?",
-            "request_toast_accept": "სესიის გადამოწმება",
             "request_toast_decline_counter": "იგნორირება (%(counter)s )",
             "request_toast_detail": "%(deviceId)sსაწყისი%(ip)s",
-            "reset_proceed_prompt": "გააგრძელეთ გადატვირთვა",
             "sas_caption_self": "დაადასტურეთ ეს მოწყობილობა და დაადასტურეთ, რომ შემდეგი ნომერი გამოჩნდება მის ეკრანზე.",
             "sas_caption_user": "დაადასტურეთ ეს მომხმარებელი და დაადასტურეთ, რომ შემდეგი ნომერი გამოჩნდება მის ეკრანზე.",
             "sas_description": "შეადარეთ emoji-ების უნიკალური ნაკრები, თუ არცერთ მოწყობილობაზე არ გაქვთ კამერა",
-            "sas_emoji_caption_self": "დაადასტურეთ, რომ ქვემოთ მოცემული emoji ნაჩვენებია ორივე მოწყობილობაზე, იმავე თანმიმდევრობით:",
             "sas_emoji_caption_user": "დაადასტურეთ ეს მომხმარებელი და დაადასტურეთ, რომ შემდეგი emoji გამოჩნდება მის ეკრანზე.",
             "sas_match": "ისინი ემთხვევა",
             "sas_no_match": "ისინი არ ემთხვევა",
             "sas_prompt": "შეადარეთ უნიკალური emoji",
             "scan_qr": "გადაამოწმეთ სკანირებით",
             "scan_qr_explainer": "იკითხე%(displayName)s თქვენი კოდის სკანირებისთვის:",
-            "self_verification_hint": "გასაგრძელებლად გთხოვთ დაეთანხმოთ დადასტურების მოთხოვნას თქვენს სხვა მოწყობილობაზე.",
             "start_button": "დაიწყეთ გადამოწმება",
-            "successful_device": "თქვენ წარმატებით დაადასტურეთ%(deviceName)s (%(deviceId)s )!",
-            "successful_own_device": "თქვენ წარმატებით დაადასტურეთ თქვენი მოწყობილობა!",
             "successful_user": "თქვენ წარმატებით დაადასტურეთ%(displayName)s !",
-            "timed_out": "დადასტურების დრო ამოიწურა.",
             "unsupported_method": "დადასტურების მხარდაჭერილი მეთოდის პოვნა შეუძლებელია.",
             "unverified_session_toast_accept": "დიახ, მე ვიყავი",
             "unverified_session_toast_title": "ახალი შესვლა. ეს შენ იყავი?",
             "unverified_sessions_toast_description": "გადახედეთ, რათა დარწმუნდეთ, რომ თქვენი ანგარიში უსაფრთხოა",
             "unverified_sessions_toast_reject": "მოგვიანებით",
             "unverified_sessions_toast_title": "თქვენ გაქვთ დაუდასტურებელი სესიები",
-            "verification_description": "დაადასტურეთ თქვენი ვინაობა დაშიფრულ შეტყობინებებზე წვდომისთვის და სხვებისთვის თქვენი ვინაობის დასამტკიცებლად. თუ თქვენ ასევე იყენებთ მობილურ მოწყობილობას, გთხოვთ, გახსენით აპი იქ, სანამ გააგრძელებთ.",
             "verification_dialog_title_device": "გადაამოწმეთ სხვა მოწყობილობა",
             "verification_dialog_title_user": "გადამოწმების მოთხოვნა",
             "verification_skip_warning": "დადასტურების გარეშე, თქვენ არ გექნებათ წვდომა თქვენს ყველა შეტყობინებაზე და შეიძლება სხვებისთვის არასანდო გამოჩნდეთ.",
@@ -791,9 +768,6 @@
             "verify_emoji_prompt": "გადაამოწმეთ უნიკალური emoji-ების შედარებით.",
             "verify_emoji_prompt_qr": "თუ ზემოთ მოცემულ კოდს ვერ სკანირებთ, გადაამოწმეთ უნიკალური emoji-ების შედარებით.",
             "verify_later": "მოგვიანებით გადავამოწმებ",
-            "verify_using_device": "გადაამოწმეთ სხვა მოწყობილობით",
-            "verify_using_key": "გადაამოწმეთ უსაფრთხოების გასაღებით",
-            "verify_using_key_or_phrase": "გადაამოწმეთ უსაფრთხოების გასაღებით ან ფრაზით",
             "waiting_for_user_accept": "ელოდება%(displayName)s მიღება…",
             "waiting_other_device": "ელოდება თქვენ გადამოწმებას თქვენს სხვა მოწყობილობაზე…",
             "waiting_other_device_details": "გელოდებათ გადამოწმებას თქვენს სხვა მოწყობილობაზე,%(deviceName)s (%(deviceId)s )…",
@@ -1005,7 +979,6 @@
         "space": "სივრცე"
     },
     "labs": {
-        "allow_screen_share_only_mode": "ეკრანის გაზიარების მხოლოდ რეჟიმში",
         "ask_to_join": "ჩართეთ შეერთების მოთხოვნა",
         "automatic_debug_logs": "ავტომატურად გაგზავნეთ გამართვის ჟურნალი ნებისმიერი შეცდომის შესახებ",
         "automatic_debug_logs_decryption": "გაშიფვრის შეცდომებზე გამართვის ჟურნალების ავტომატურად გაგზავნა",
@@ -1290,8 +1263,6 @@
             "send_message_start_dm": "გაგზავნეთ თქვენი პირველი შეტყობინება მოსაწვევად<displayName/> სასაუბროდ",
             "start_of_dm_history": "ეს არის თქვენი პირდაპირი შეტყობინებების ისტორიის დასაწყისი<displayName/> .",
             "start_of_room": "ეს არის დასაწყისი<roomName/> .",
-            "topic": "თემა: %(topic)s",
-            "topic_edit": "თემა:%(topic)s (<a> რედაქტირება</a> )",
             "unencrypted_warning": "ბოლოდან ბოლომდე დაშიფვრა არ არის ჩართული",
             "user_created": "%(displayName)sშექმნა ეს ოთახი.",
             "you_created": "თქვენ შექმენით ეს ოთახი."
@@ -1615,7 +1586,6 @@
             "error_update_guest_access": "ამ სივრცეში სტუმრის წვდომის განახლება ვერ მოხერხდა",
             "error_update_history_visibility": "ამ სივრცის ისტორიის ხილვადობის განახლება ვერ მოხერხდა",
             "guest_access_explainer": "სტუმრებს შეუძლიათ შეუერთდნენ სივრცეს ანგარიშის გარეშე.",
-            "guest_access_explainer_public_space": "ეს შეიძლება სასარგებლო იყოს საჯარო სივრცეებისთვის.",
             "guest_access_label": "ჩართეთ სტუმრის წვდომა",
             "history_visibility_anyone_space": "გადახედვის სივრცე",
             "history_visibility_anyone_space_description": "ნება მიეცით ხალხს, გადახედონ თქვენს სივრცეს, სანამ შეუერთდებიან.",
@@ -1747,11 +1717,6 @@
         "insert_trailing_colon_mentions": "ჩადეთ ბოლო ორწერტილი მას შემდეგ, რაც მომხმარებელი აღნიშნავს შეტყობინების დასაწყისში",
         "jump_to_bottom_on_send": "შეტყობინების გაგზავნისას გადადით ქრონოლოგიის ბოლოში",
         "key_backup": {
-            "backup_in_progress": "მიმდინარეობს თქვენი გასაღებების სარეზერვო ასლის შექმნა (პირველ სარეზერვო ასლს შეიძლება რამდენიმე წუთი დასჭირდეს).",
-            "backup_starting": "იწყება სარეზერვო ასლის შექმნა…",
-            "backup_success": "წარმატებები!",
-            "cannot_create_backup": "გასაღების სარეზერვო ასლის შექმნა შეუძლებელია",
-            "create_title": "შექმენით გასაღების სარეზერვო საშუალება",
             "setup_secure_backup": {
                 "backup_setup_success_description": "ახლა მიმდინარეობს თქვენი გასაღებების სარეზერვო ასლის შექმნა ამ მოწყობილობიდან.",
                 "backup_setup_success_title": "უსაფრთხო სარეზერვო ასლის შექმნა წარმატებით დასრულდა",
@@ -1886,7 +1851,6 @@
             "ignore_users_empty": "თქვენ არ გყავთ უგულებელყოფილი მომხმარებლები.",
             "ignore_users_section": "იგნორირებული მომხმარებლები",
             "key_backup_algorithm": "ალგორითმი:",
-            "key_backup_connect": "დააკავშირეთ ეს სესია Key Backup-თან",
             "message_search_disable_warning": "თუ გამორთულია, დაშიფრული ოთახებიდან შეტყობინებები არ გამოჩნდება ძიების შედეგებში.",
             "message_search_disabled": "დაშიფრული შეტყობინებების ლოკალურად დაშიფვრა, რათა გამოჩნდეს ძიების შედეგებში.",
             "message_search_enabled": {
@@ -2031,7 +1995,6 @@
             "spaces_explainer": "სივრცეები არის ოთახების და ადამიანების დაჯგუფების გზები. იმ სივრცეებთან ერთად, სადაც იმყოფებით, შეგიძლიათ გამოიყენოთ რამდენიმე წინასწარ აშენებული.",
             "title": "გვერდითი ზოლი"
         },
-        "start_automatically": "ავტომატურად დაიწყება სისტემაში შესვლის შემდეგ",
         "use_12_hour_format": "დროის ანაბეჭდების ჩვენება 12 საათის ფორმატში (მაგ. 14:30)",
         "use_command_enter_send_message": "გამოიყენეთ Command + Enter შეტყობინების გასაგზავნად",
         "use_command_f_search": "გამოიყენეთ Command + F დროის ხაზის მოსაძებნად",
@@ -2351,7 +2314,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "დაასრულა გამოკითხვა",
             "sender_ended": "%(senderName)s დაასრულა გამოკითხვა"
         },
         "m.poll.start": "%(senderName)sდაიწყო გამოკითხვა - %(pollQuestion)s",
@@ -2736,7 +2698,6 @@
         "dialpad": "ციფერბლატი",
         "disable_camera": "გამორთეთ კამერა",
         "disable_microphone": "მიკროფონის დადუმება",
-        "disabled_no_one_here": "აქ არავინ არის დასარეკი",
         "disabled_no_perms_start_video_call": "თქვენ არ გაქვთ ვიდეოზარების დაწყების ნებართვა",
         "disabled_no_perms_start_voice_call": "თქვენ არ გაქვთ ხმოვანი ზარების დაწყების ნებართვა",
         "disabled_ongoing_call": "მიმდინარე ზარი",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
new file mode 100644
index 0000000000..7ff568c560
--- /dev/null
+++ b/src/i18n/strings/ko.json
@@ -0,0 +1,4181 @@
+{
+    "a11y": {
+        "emoji_picker": "이모지 선택",
+        "jump_first_invite": "첫 초대로 건너뜁니다.",
+        "message_composer": "메세지 작성자",
+        "n_unread_messages": {
+            "%(count)s개의 읽지 않은 메시지.": "other",
+            "1개의 읽지 않은 메시지.": "one"
+        },
+        "n_unread_messages_mentions": {
+            "언급을 포함한 %(count)s개의 읽지 않은 메시지.": "other",
+            "1개의 읽지 않은 언급.": "one"
+        },
+        "recent_rooms": "최근 방",
+        "room_messsage_not_sent": "%(roomName)s에 미발송 메시지가 있는 방을 엽니다.",
+        "room_n_unread_invite": "공개 방 %(roomName)s에 초대 되었습니다.",
+        "room_n_unread_messages": {
+            "other": "읽지 않은 메시지 %(count)s개가 있는 채팅방 %(roomName)s 열기"
+        },
+        "room_n_unread_messages_mentions": {
+            "other": "멘션을 포함해 읽지 않은 메시지 %(count)s개가 있는 채팅방 %(roomName)s 열기"
+        },
+        "room_name": "%(name)s 방",
+        "room_status_bar": "방 상태 표시줄",
+        "seek_bar_label": "오디오 탐색 바",
+        "unread_messages": "읽지 않은 메시지",
+        "user_menu": "사용자 메뉴"
+    },
+    "a11y_jump_first_unread_room": "읽지 않은 첫 채팅방으로 건너뜁니다.",
+    "action": {
+        "accept": "수락",
+        "add": "추가",
+        "add_existing_room": "기존 방 목록에서 추가하기",
+        "add_people": "사용자 추가",
+        "apply": "적용",
+        "approve": "승인",
+        "ask_to_join": "참여를 요청하세요.",
+        "back": "돌아가기",
+        "call": "통화",
+        "cancel": "취소",
+        "change": "변경",
+        "clear": "지우기",
+        "click": "클릭",
+        "click_to_copy": "복사하려면 클릭하세요.",
+        "close": "닫기",
+        "collapse": "접기",
+        "complete": "완료",
+        "confirm": "확인",
+        "continue": "계속하기",
+        "copy": "복사하기",
+        "copy_link": "링크 복사",
+        "create": "만들기",
+        "create_a_room": "방 생성",
+        "create_account": "계정 만들기",
+        "decline": "거절",
+        "decline_and_block": "거부 및 차단",
+        "decline_invite": "초대 거절",
+        "delete": "삭제",
+        "deny": "거부",
+        "disable": "비활성화",
+        "disconnect": "연결 끊기",
+        "dismiss": "버리기",
+        "done": "완료",
+        "download": "다운로드",
+        "edit": "편집",
+        "enable": "활성화",
+        "enter_fullscreen": "전체 화면 표시",
+        "exit_fullscreeen": "전체 화면 종료",
+        "expand": "펼치기",
+        "explore_public_rooms": "공개 방 목록 살펴보기",
+        "explore_rooms": "방 검색",
+        "export": "내보내기",
+        "forward": "전달",
+        "go": "이동",
+        "go_back": "돌아가기",
+        "got_it": "확인",
+        "hide": "숨기기",
+        "hide_advanced": "고급 숨기기",
+        "hold": "대기",
+        "ignore": "무시",
+        "import": "가져오기",
+        "invite": "초대",
+        "invite_to_space": "스페이스에 초대하기",
+        "invites_list": "초대",
+        "join": "참가",
+        "learn_more": "자세히 알아보기",
+        "leave": "떠나기",
+        "leave_room": "방 떠나기",
+        "logout": "로그아웃",
+        "manage": "관리",
+        "maximise": "최대화",
+        "mention": "언급",
+        "minimise": "최소화",
+        "new_room": "새로운 방 만들기",
+        "new_video_room": "신규 영상 방",
+        "next": "다음",
+        "no": "아니오",
+        "ok": "네",
+        "open": "열기",
+        "open_menu": "메뉴 열기",
+        "pause": "일시중지",
+        "pin": "핀",
+        "play": "재생",
+        "proceed": "진행",
+        "quote": "인용",
+        "react": "리액션",
+        "refresh": "새로고침",
+        "register": "등록",
+        "reload": "새로고침",
+        "remove": "제거",
+        "rename": "이름 변경",
+        "reply": "답장",
+        "reply_in_thread": "스레드에 답장",
+        "report_content": "내용 신고",
+        "report_room": "방 신고",
+        "resend": "다시 보내기",
+        "reset": "되돌리기",
+        "resume": "계속",
+        "retry": "다시 시도",
+        "review": "평가",
+        "revoke": "취소",
+        "save": "저장",
+        "search": "찾기",
+        "send_report": "신고 보내기",
+        "set_avatar": "프로필 사진 설정",
+        "share": "공유",
+        "show": "표시",
+        "show_advanced": "고급 보이기",
+        "show_all": "전체 보기",
+        "sign_in": "로그인",
+        "sign_out": "로그아웃",
+        "skip": "건너뛰기",
+        "start": "시작하기",
+        "start_chat": "대화 시작",
+        "start_new_chat": "새로운 대화 시작하기",
+        "stop": "중지",
+        "submit": "제출",
+        "subscribe": "구독",
+        "transfer": "전송",
+        "trust": "신뢰함",
+        "try_again": "다시 시도",
+        "unban": "출입 금지 풀기",
+        "unignore": "그만 무시하기",
+        "unpin": "고정 해제",
+        "unsubscribe": "구독 해제",
+        "update": "업데이트",
+        "upgrade": "업그레이드",
+        "upload": "업로드",
+        "upload_file": "파일 업로드",
+        "verify": "확인",
+        "view": "보기",
+        "view_all": "모두 보기",
+        "view_list": "목록 보기",
+        "view_message": "메시지 보기",
+        "view_source": "소스 보기",
+        "yes": "네",
+        "yes_dismiss": "확인",
+        "zoom_in": "확대",
+        "zoom_out": "축소"
+    },
+    "analytics": {
+        "accept_button": "네, 좋아요.",
+        "bullet_1": "저희는<Bold>어떠한 종류의 계정 데이터도</Bold>기록 또는 프로파일링하지 않습니다.",
+        "bullet_2": "저희 <Bold>는</Bold> 정보를 제3자와 공유하지 않습니다.",
+        "consent_migration": "고객님께서는 이전에 익명의 사용 데이터 공유에 동의하셨습니다. 이제 해당 데이터의 처리 방식이 업데이트될 예정입니다.",
+        "disable_prompt": "언제든지 설정에서 이 기능을 끌 수 있습니다.",
+        "enable_prompt": "개선에 도움을 주세요%(analyticsOwner)s",
+        "learn_more": "문제 해결 및 서비스 개선을 위해 익명의 데이터를 공유해주세요. 개인 정보는 포함되지 않으며, 제3자와 절대 공유하지 않습니다.<LearnMoreLink>더 알아보기</LearnMoreLink>",
+        "privacy_policy": "모든 이용 약관은<PrivacyPolicyUrl>에서 확인하실 수 있습니다.</PrivacyPolicyUrl>",
+        "pseudonymous_usage_data": "익명의 사용 데이터를 공유해주시면 %(analyticsOwner)s의 문제를 해결하고 서비스를 개선하는 데 큰 도움이 됩니다. 사용자의 여러 기기 사용 현황을 파악하기 위해, 모든 기기에서 공통으로 사용되는 임의의 식별자가 생성됩니다.",
+        "shared_data_heading": "다음 데이터가 공유됩니다:"
+    },
+    "auth": {
+        "3pid_in_use": "해당 이메일 주소 또는 전화번호는 이미 사용 중입니다.",
+        "account_clash": "당신의 새 계정 (%(newAccountId)s)을 등록했습니다, 하지만 다른 계정 (%(loggedInUserId)s)으로 로그인하고 있습니다.",
+        "account_clash_previous_account": "이 계정으로 계속",
+        "account_deactivated": "이 계정은 비활성화되었습니다.",
+        "autodiscovery_generic_failure": "서버에서 자동 검색 설정 얻기에 실패함",
+        "autodiscovery_hs_incompatible": "귀하의 홈 서버가 너무 오래되어 필요한 최소 API 버전을 지원하지 않습니다. 서버 소유자에게 문의하거나 서버를 업그레이드하십시오.",
+        "autodiscovery_invalid": "잘못된 홈서버 검색 응답",
+        "autodiscovery_invalid_hs": "홈서버 URL이 올바른 Matrix 홈서버가 아님",
+        "autodiscovery_invalid_hs_base_url": "잘못된 m.homeserver 용 base_url",
+        "autodiscovery_invalid_is": "ID 서버 URL이 올바른 ID 서버가 아님",
+        "autodiscovery_invalid_is_base_url": "잘못된 m.identity_server 용 base_url",
+        "autodiscovery_invalid_is_response": "잘못된 ID 서버 검색 응답",
+        "autodiscovery_invalid_json": "유효하지 않은 JSON",
+        "autodiscovery_no_well_known": ".well-known JSON 파일을 찾을 수 없습니다.",
+        "autodiscovery_unexpected_error_hs": "홈서버 설정을 해결하는 중 예기치 않은 오류",
+        "autodiscovery_unexpected_error_is": "ID 서버 설정을 해결하는 중 예기치 않은 오류",
+        "captcha_description": "이 홈서버는 당신이 로봇이 아닌지 확인하고 싶어합니다.",
+        "change_password_action": "비밀번호 바꾸기",
+        "change_password_confirm_invalid": "비밀번호가 맞지 않음",
+        "change_password_confirm_label": "비밀번호 확인",
+        "change_password_current_label": "현재 비밀번호",
+        "change_password_empty": "비밀번호를 입력해주세요",
+        "change_password_error": "비밀번호 변경 중 오류 발생: %(error)s",
+        "change_password_mismatch": "새 비밀번호가 맞지 않음",
+        "change_password_new_label": "새 비밀번호",
+        "check_email_explainer": "전송된 지침을 따르세요<b>%(email)s</b>",
+        "check_email_resend_prompt": "받지 못하셨나요?",
+        "check_email_resend_tooltip": "인증 링크 이메일 재발송!",
+        "check_email_wrong_email_button": "이메일 주소를 다시 입력하세요",
+        "check_email_wrong_email_prompt": "잘못된 메일 주소",
+        "continue_with_idp": "계속하기%(provider)s",
+        "continue_with_sso": "계속하기%(ssoButtons)s",
+        "country_dropdown": "국가 드롭다운",
+        "create_account_prompt": "처음 오셨나요?<a> 계정을 생성하세요</a>",
+        "create_account_title": "계정 만들기",
+        "email_discovery_text": "기존 연락처에서 검색 가능하도록 하려면 이메일을 사용하세요.",
+        "email_field_label": "이메일",
+        "email_field_label_invalid": "올바른 이메일 주소가 아닙니다",
+        "email_field_label_required": "이메일 주소 입력",
+        "email_help_text": "비밀번호를 재설정할 수 있도록 이메일을 추가하세요.",
+        "email_phone_discovery_text": "기존 연락처의 친구가 이메일 또는 전화번호로 나를 찾도록 허용",
+        "enter_email_explainer": "<b>%(homeserver)s</b>에서 비밀번호를 재설정할 수 있는 인증 링크를 회원님께 보냅니다.",
+        "enter_email_heading": "비밀번호 재설정을 위해 이메일을 입력하세요",
+        "failed_connect_identity_server": "ID 서버에 연결할 수 없습니다",
+        "failed_connect_identity_server_other": "로그인할 수 있지만 ID 서버가 다시 온라인 상태가 될 때까지 일부 기능을 사용할 수 없습니다. 이 경고가 계속 표시되면, 설정을 확인하거나 서버 관리자에게 연락하세요.",
+        "failed_connect_identity_server_register": "등록할 수 있지만 ID 서버가 다시 온라인 상태가 될 때까지 일부 기능을 사용할 수 없습니다. 이 경고가 계속 표시되면, 설정을 확인하거나 서버 관리자에게 연락하세요.",
+        "failed_connect_identity_server_reset_password": "비밀번호를 다시 설정할 수 있지만 ID 서버가 다시 온라인 상태가 될 때까지 일부 기능을 사용할 수 없습니다. 이 경고가 계속 표시되면, 설정을 확인하거나 서버 관리자에게 연락하세요.",
+        "failed_homeserver_discovery": "홈서버 검색 수행에 실패함",
+        "failed_query_registration_methods": "지원하는 등록 방식을 쿼리할 수 없습니다.",
+        "failed_soft_logout_auth": "다시 인증에 실패함",
+        "failed_soft_logout_homeserver": "홈서버 문제로 다시 인증에 실패함",
+        "forgot_password_email_invalid": "이메일 주소가 유효하지 않습니다.",
+        "forgot_password_email_required": "계정에 연결한 이메일 주소를 입력해야 합니다.",
+        "forgot_password_prompt": "비밀번호를 잊었습니까?",
+        "forgot_password_send_email": "이메일 보내기",
+        "identifier_label": "이것으로 로그인",
+        "incorrect_credentials": "사용자 이름 혹은 비밀번호가 맞지 않습니다.",
+        "incorrect_credentials_detail": "지금 %(hs)s 서버로 로그인하고 있는데, matrix.org로 로그인해야 합니다.",
+        "incorrect_password": "맞지 않는 비밀번호",
+        "log_in_new_account": "새 계정으로 <a>로그인</a>하기.",
+        "logout_dialog": {
+            "description": "로그아웃하겠습니까?",
+            "megolm_export": "수동으로 키 내보내기",
+            "setup_key_backup_title": "암호화된 메시지에 접근할 수 없게 됩니다",
+            "setup_secure_backup_description_1": "암호화된 메시지는 종단간 암호화로 보호됩니다. 오직 당신과 상대방만 이 메시지를 읽을 수 있는 키를 갖습니다.",
+            "setup_secure_backup_description_2": "로그아웃하면 이 키들은 이 기기에서 삭제됩니다. 즉, 다른 기기에 해당 키가 있거나 서버에 백업해 두지 않는 한 암호화된 메시지를 읽을 수 없게 됩니다.",
+            "skip_key_backup": "저는 제 암호화된 메시지를 원하지 않아요"
+        },
+        "misconfigured_body": "%(brand)s 관리자에게 <a>당신의 설정</a>에 잘못되거나 중복된 항목이 있는지 확인하도록 요청하세요.",
+        "misconfigured_title": "%(brand)s이 잘못 설정됨",
+        "mobile_create_account_title": "계정을 만들려고 합니다.%(hsName)s",
+        "msisdn_field_description": "다른 사용자가 연락처 세부 정보를 사용해서 당신을 방에 초대할 수 있음",
+        "msisdn_field_label": "전화",
+        "msisdn_field_number_invalid": "해당 전화번호가 정확하지 않은 것 같습니다. 확인하고 다시 시도해 주세요.",
+        "msisdn_field_required_invalid": "전화번호를 입력하십시오.",
+        "no_hs_url_provided": "홈서버 URL이 제공되지 않음",
+        "oidc": {
+            "error_title": "로그인에 실패했습니다",
+            "generic_auth_error": "인증 중에 문제가 발생했습니다. 로그인 페이지로 이동하여 다시 시도해 보세요.",
+            "missing_or_invalid_stored_state": "간편한 로그인을 위해 사용하시는 홈서버 정보를 브라우저에 저장하도록 설정했으나, 안타깝게도 브라우저에 해당 정보가 남아있지 않습니다. 로그인 페이지로 이동하여 다시 시도해 주세요."
+        },
+        "password_field_keep_going_prompt": "계속하기",
+        "password_field_label": "비밀번호 입력",
+        "password_field_strong_label": "좋습니다, 강한 비밀번호!",
+        "password_field_weak_label": "비밀번호를 허용할 수는 있지만 안전하지 않음",
+        "phone_label": "전화",
+        "phone_optional_label": "전화 (선택)",
+        "qr_code_login": {
+            "check_code_explainer": "이렇게 하면 다른 기기와의 연결이 안전한지 확인할 수 있습니다.",
+            "check_code_heading": "다른 기기에 표시된 번호를 입력하세요",
+            "check_code_input_label": "2자리 코드",
+            "check_code_mismatch": "숫자가 일치하지 않습니다",
+            "completing_setup": "새 기기 설정 완료",
+            "error_etag_missing": "예기치 않은 오류가 발생했습니다. 이는 브라우저 확장 프로그램, 프록시 서버 또는 서버 설정 오류로 인해 발생했을 수 있습니다.",
+            "error_expired": "로그인이 만료되었습니다. 다시 시도해 주세요.",
+            "error_expired_title": "로그인 시간이 초과되었습니다.",
+            "error_insecure_channel_detected": "새 장치에 안전하게 연결할 수 없습니다. 기존 장치는 여전히 안전하므로 걱정할 필요가 없습니다.",
+            "error_insecure_channel_detected_instructions": "다음 단계",
+            "error_insecure_channel_detected_instructions_1": "네트워크 문제일 수 있으니 다른 기기에서 QR 코드로 다시 로그인해 보세요.",
+            "error_insecure_channel_detected_instructions_2": "동일한 문제를 겪으신 경우 다른 Wi-Fi 네트워크를 사용해 보거나 Wi-Fi 대신 모바일 데이터를 사용해 보세요.",
+            "error_insecure_channel_detected_instructions_3": "그래도 작동하지 않으면 수동으로 로그인하세요.",
+            "error_insecure_channel_detected_title": "연결이 안전하지 않습니다",
+            "error_other_device_already_signed_in": "추가로 진행할 작업은 없습니다.",
+            "error_other_device_already_signed_in_title": "다른 기기에서 이미 로그인되어 있습니다",
+            "error_rate_limited": "단시간에 너무 많은 요청을 보냈습니다. 잠시 후 다시 시도해 주세요.",
+            "error_unexpected": "예상치 못한 오류가 발생했습니다. 다른 기기 연결 요청이 취소되었습니다.",
+            "error_unsupported_protocol": "이 기기는 QR 코드를 사용하여 다른 기기에 로그인하는 기능을 지원하지 않습니다.",
+            "error_unsupported_protocol_title": "다른 기기와 호환되지 않습니다",
+            "error_user_cancelled": "다른 기기에서 로그인이 취소되었습니다.",
+            "error_user_cancelled_title": "로그인 요청이 취소되었습니다",
+            "error_user_declined": "귀하 또는 계정 제공자가 로그인 요청을 거부했습니다.",
+            "error_user_declined_title": "로그인 거부됨",
+            "follow_remaining_instructions": "나머지 지침을 따르세요",
+            "open_element_other_device": "다른 기기에서 %(brand)s 을 열어 보세요.",
+            "point_the_camera": "여기에 표시된 QR 코드를 스캔하세요",
+            "scan_code_instruction": "다른 기기로 QR 코드를 스캔하세요",
+            "scan_qr_code": "QR 코드로 로그인",
+            "security_code": "보안 코드",
+            "security_code_prompt": "요청 시, 다른 기기에서 아래 코드를 입력하세요.",
+            "select_qr_code": "\"%(scanQRCode)s\"를 선택하십시오.",
+            "unsupported_explainer": "귀하의 계정 제공업체는 QR 코드를 사용한 새 기기 로그인을 지원하지 않습니다.",
+            "unsupported_heading": "QR 코드는 지원되지 않습니다",
+            "waiting_for_device": "장치 로그인 대기 중"
+        },
+        "register_action": "계정 만들기",
+        "registration": {
+            "continue_without_email_description": "참고로, 이메일 주소를 추가하지 않고 비밀번호를 잊어버리면 <b>계정에 영구적으로 접근할 수 없게 될 수 있습니다.</b>",
+            "continue_without_email_field_label": "이메일 (선택)",
+            "continue_without_email_title": "이메일 없이 계속하기"
+        },
+        "registration_disabled": "이 홈서버는 등록이 비활성화되어 있습니다.",
+        "registration_msisdn_field_required_invalid": "전화번호 입력 (이 홈서버에 필요함)",
+        "registration_successful": "등록 성공",
+        "registration_username_in_use": "해당 사용자 이름은 이미 사용 중입니다. 다른 이름을 사용해 보거나, 본인이라면 아래에서 로그인하세요.",
+        "registration_username_unable_check": "사용자 이름이 이미 사용 중인지 확인할 수 없습니다. 나중에 다시 시도하세요.",
+        "registration_username_validation": "소문자, 숫자, 가로선, 밑줄선만 사용할 수 있음",
+        "reset_password": {
+            "confirm_new_password": "새로운 비밀번호 확인",
+            "devices_logout_success": "모든 기기에서 로그아웃되었으며 더 이상 푸시 알림을 받지 못합니다. 알림을 다시 활성화하려면 각 기기에서 다시 로그인하세요.",
+            "other_devices_logout_warning_1": "기기에서 로그아웃하면 기기에 저장된 메시지 암호화 키가 삭제되어 암호화된 채팅 기록을 읽을 수 없게 됩니다.",
+            "other_devices_logout_warning_2": "암호화된 방의 채팅 기록에 계속 접근하려면 진행하기 전에 키 백업을 설정하거나 다른 기기에서 메시지 키를 내보내십시오.",
+            "password_not_entered": "새 비밀번호를 입력해주세요.",
+            "passwords_mismatch": "새 비밀번호는 서로 같아야 합니다.",
+            "rate_limit_error": "짧은 시간 내에 너무 많은 시도가 이루어졌습니다. 다시 시도하기 전에 잠시 기다려 주세요.",
+            "rate_limit_error_with_time": "짧은 시간 내에 너무 많은 시도가 있었습니다. %(timeout)s 후에 다시 시도하십시오.",
+            "reset_successful": "비밀번호가 초기화되었습니다.",
+            "return_to_login": "로그인 화면으로 돌아가기",
+            "sign_out_other_devices": "모든 기기에서 로그아웃"
+        },
+        "reset_password_action": "비밀번호 재설정",
+        "reset_password_button": "비밀번호를 잊으셨나요?",
+        "reset_password_email_field_description": "이메일 주소를 사용하여 계정을 복구",
+        "reset_password_email_field_required_invalid": "이메일 주소를 입력 (이 홈서버에 필요함)",
+        "reset_password_email_not_associated": "귀하의 이메일 주소는 이 홈서버에서 Matrix ID와 연결되어 있지 않은 것으로 보입니다.",
+        "reset_password_email_not_found_title": "이 이메일 주소를 찾을 수 없음",
+        "reset_password_title": "비밀번호 초기화",
+        "server_picker_custom": "다른 홈 서버",
+        "server_picker_description": "사용자 지정 서버 옵션을 사용하여 다른 홈 서버 URL을 지정함으로써 다른 Matrix 서버에 로그인할 수 있습니다. 이를 통해 기존 Matrix 계정을 다른 홈 서버에서 %(brand)s 와 함께 사용할 수 있습니다.",
+        "server_picker_description_matrix.org": "가장 넓은 공개 서버에 수 백 만명이 무료로 등록함",
+        "server_picker_dialog_title": "계정이 호스팅되는 위치를 결정하세요",
+        "server_picker_explainer": "사용 중인 매트릭스 홈서버가 있다면 그것을 사용하거나, 직접 호스팅하세요.",
+        "server_picker_failed_validate_homeserver": "홈 서버를 확인할 수 없습니다",
+        "server_picker_intro": "귀하의 계정을 호스팅할 수 있는 장소를 '홈서버'라고 부릅니다.",
+        "server_picker_invalid_url": "유효하지 않은 URL입니다.",
+        "server_picker_learn_more": "홈서버에 대하여",
+        "server_picker_matrix.org": "Matrix.org는 세계 최대의 공개 홈서버이므로 많은 사람들에게 적합한 장소입니다.",
+        "server_picker_required": "홈 서버를 지정하십시오",
+        "server_picker_title": "홈 서버에 로그인하세요",
+        "server_picker_title_default": "서버 옵션",
+        "server_picker_title_registration": "호스트 계정",
+        "session_logged_out_description": "안전을 위해서 이 세션에서 로그아웃했습니다. 다시 로그인해주세요.",
+        "session_logged_out_title": "로그아웃함",
+        "set_email": {
+            "description": "이렇게 하면 비밀번호를 다시 설정하고 알림을 받을 수 있습니다.",
+            "verification_pending_description": "이메일을 확인하고 안의 링크를 클릭합니다. 모두 마치고 나서, 계속하기를 누르세요.",
+            "verification_pending_title": "인증을 기다리는 중"
+        },
+        "set_email_prompt": "이메일 주소를 설정하시겠어요?",
+        "sign_in_description": "계정을 사용하여 계속하세요.",
+        "sign_in_instead": "대신 로그인하세요",
+        "sign_in_instead_prompt": "이미 계정이 있으신가요? <a>여기서 로그인하세요</a>",
+        "sign_in_or_register": "로그인 또는 계정 생성",
+        "sign_in_or_register_description": "계속하려면 기존 계정을 사용하거나 새 계정을 만드세요.",
+        "sign_in_prompt": "계정이 있으신가요?<a> 로그인</a>",
+        "sign_in_with_sso": "통합 인증(SSO)으로 로그인",
+        "signing_in": "로그인 중…",
+        "soft_logout": {
+            "clear_data_button": "모든 데이터 지우기",
+            "clear_data_description": "이 세션의 모든 데이터를 지우면 영구적으로 삭제됩니다. 암호화된 메시지는 해당 키가 백업되지 않은 경우 손실됩니다.",
+            "clear_data_title": "이 세션의 모든 데이터를 삭제하시겠습니까?"
+        },
+        "soft_logout_heading": "로그아웃됬습니다",
+        "soft_logout_intro_password": "로그인하고 계정에 다시 접근하려면 비밀번호를 입력하세요.",
+        "soft_logout_intro_sso": "로그인하고 계정에 다시 접근하기.",
+        "soft_logout_intro_unsupported_auth": "계정에 로그인할 수 없습니다. 자세한 정보는 홈서버 관리자에게 연락하세요.",
+        "soft_logout_subheading": "개인 정보 지우기",
+        "soft_logout_warning": "경고: 귀하의 개인 데이터(암호화 키 포함)가 이 세션에 여전히 저장되어 있습니다. 이 세션 사용을 완료했거나 다른 계정에 로그인하려면 세션을 지우십시오.",
+        "sso": "단일 로그인",
+        "sso_complete_in_browser_dialog_title": "브라우저로 이동하여 로그인을 완료하세요.",
+        "sso_failed_missing_storage": "브라우저에 로그인할 때 사용하는 홈 서버를 기억하도록 요청했으나, 안타깝게도 브라우저가 이를 잊어버렸습니다. 로그인 페이지로 이동하여 다시 시도해 주세요.",
+        "sso_or_username_password": "%(ssoButtons)s또는%(usernamePassword)s",
+        "sync_footer_subtitle": "여러 방에 참여하셨다면 시간이 좀 걸릴 수 있습니다",
+        "syncing": "동기화 중...",
+        "uia": {
+            "code": "코드",
+            "email": "계정을 생성하려면 방금 %(emailAddress)s 으로 발송한 이메일 내 링크를 열어주세요.",
+            "email_auth_header": "계속하려면 이메일을 확인하세요",
+            "email_resend_prompt": "받지 못하셨나요? <a>재발송해 드립니다</a>",
+            "email_resent": "재전송 완료!",
+            "fallback_button": "인증 시작",
+            "mas_cross_signing_reset_cta": "계정으로 계속하기",
+            "mas_cross_signing_reset_description": "이제 신원 재설정을 위해 회원님의 %(serverName)s 계정으로 이동합니다. 계정에서 재설정을 완료하신 뒤, 이 화면으로 다시 돌아와 '재시도' 버튼을 클릭해 주세요.",
+            "mas_cross_signing_reset_title": "계정으로 이동하여 신원을 재설정하세요.",
+            "msisdn": "%(msisdn)s님에게 문자 메시지를 보냈습니다",
+            "msisdn_token_incorrect": "토큰이 맞지 않음",
+            "msisdn_token_prompt": "들어있던 코드를 입력해주세요:",
+            "password_prompt": "아래에 계정 비밀번호를 입력하여 본인임을 확인하세요.",
+            "recaptcha_missing_params": "홈서버 설정에서 캡챠 공개 키가 없습니다. 홈서버 관리자에게 이것을 신고해주세요.",
+            "registration_token_label": "등록 토큰",
+            "registration_token_prompt": "홈서버 관리자가 제공한 등록 토큰을 입력하십시오.",
+            "sso_body": "단일 로그인(SSO)을 사용하여 본인임을 확인하고 이 이메일 주소를 추가했는지 확인하세요.",
+            "sso_failed": "신원 확인 과정에서 문제가 발생했습니다. 취소하고 다시 시도해 주세요.",
+            "sso_postauth_body": "아래 버튼을 클릭하여 본인 확인을 완료하세요.",
+            "sso_postauth_title": "계속하려면 확인하세요",
+            "sso_preauth_body": "계속하려면 싱글 사인온(SSO)을 사용하여 본인임을 확인하십시오.",
+            "sso_title": "SSO로 계속하기",
+            "terms": "이 홈서버의 정책을 검토하고 수락해주세요:",
+            "terms_invalid": "모든 홈서버의 정책을 검토하고 수락해주세요"
+        },
+        "unsupported_auth": "이 홈 서버는 이 클라이언트가 지원하는 로그인 절차를 제공하지 않습니다.",
+        "unsupported_auth_email": "이 홈서버는 이메일 주소로 로그인을 지원하지 않습니다.",
+        "unsupported_auth_msisdn": "이 서버는 전화번호 인증을 지원하지 않습니다.",
+        "username_field_required_invalid": "사용자 이름 입력",
+        "username_in_use": "해당 사용자 이름은 이미 사용 중입니다. 다른 이름을 사용해 주세요.",
+        "verify_email_explainer": "비밀번호를 재설정하기 전에 본인 확인이 필요합니다. 방금 발송한 이메일의 링크를 클릭하세요. <b>%(email)s</b>",
+        "verify_email_heading": "이메일을 확인하여 계속 진행하세요"
+    },
+    "bug_reporting": {
+        "additional_context": "언제, 방 ID, 사용자 ID 등, 문제 분석에 도움이 되는 추가 문맥이 있다면, 그것들도 여기에 포함해주세요.",
+        "before_submitting": "로그를 전송하기 전에, 문제를 설명하는 <a>GitHub 이슈를 만들어야 합니다</a>.",
+        "collecting_information": "앱 버전 정보를 수집하는 중",
+        "collecting_logs": "로그 수집 중",
+        "create_new_issue": "이 버그를 조사할 수 있도록 GitHub에 <newIssueLink>새 이슈를 추가</newIssueLink>해주세요.",
+        "description": "디버그 로그에는 사용자 이름, 방문한 방의 ID 또는 별칭, 마지막으로 상호작용한 UI 요소, 다른 사용자의 사용자 이름 등 애플리케이션 사용 데이터가 포함됩니다. 메시지는 포함되지 않습니다.",
+        "download_logs": "로그 다운로드",
+        "downloading_logs": "로그 다운로드 중",
+        "error_empty": "무엇이 잘못되거나 더 나은 지 알려주세요, 문제를 설명하는 GitHub 이슈를 만들어주세요.",
+        "failed_download_logs": "디버그 로그 다운로드 실패: ",
+        "failed_send_logs_causes": {
+            "disallowed_app": "버그 신고가 거부되었습니다. rageshake 서버는 이 애플리케이션을 지원하지 않습니다.",
+            "rejected_generic": "버그 신고가 거부되었습니다. rageshake 서버에서 정책 위반으로 신고 내용을 거부했습니다.",
+            "rejected_recovery_key": "귀하의 버그 보고서는 복구 키를 포함하고 있어 안전상의 이유로 거부되었습니다.",
+            "rejected_version": "귀하의 버그 보고서는 현재 사용 중인 버전이 너무 오래되어 거부되었습니다.",
+            "server_unknown_error": "rageshake 서버에서 알 수 없는 오류가 발생하여 보고서를 처리할 수 없습니다.",
+            "unknown_error": "로그 전송 실패"
+        },
+        "github_issue": "GitHub 이슈",
+        "introduction": "GitHub을 통해 버그를 제출하셨다면 디버그 로그가 문제 추적에 도움이 될 수 있습니다. ",
+        "log_request": "앞으로 이를 방지할 수 있도록, <a>로그를 보내주세요</a>.",
+        "logs_sent": "로그 보내짐",
+        "matrix_security_issue": "매트릭스 관련 보안 문제를 신고하려면 Matrix.org의 <a>보안 공개 정책(</a>)을 읽어보시기 바랍니다.",
+        "preparing_download": "로그 다운로드 준비 중",
+        "preparing_logs": "로그 보내려고 준비 중",
+        "send_logs": "로그 보내기",
+        "submit_debug_logs": "디버그 로그 전송하기",
+        "textarea_label": "참고",
+        "thank_you": "감사합니다!",
+        "title": "버그 신고하기",
+        "unsupported_browser": "알림: 귀하의 브라우저가 지원되지 않아 정상적인 사용이 어려울 수 있습니다.",
+        "uploading_logs": "로그 업로드 중…",
+        "waiting_for_server": "서버에서 응답을 기다리는 중"
+    },
+    "cannot_invite_without_identity_server": "아이덴티티 서버 없이 이메일로 사용자를 초대할 수 없습니다. \"설정\"에서 서버에 연결할 수 있습니다.",
+    "cannot_reach_homeserver": "홈서버에 연결할 수 없습니다",
+    "cannot_reach_homeserver_detail": "인터넷 연결이 안정적인지 확인하세요, 또는 서버 관리자에게 연락하세요",
+    "cant_load_page": "페이지를 불러올 수 없음",
+    "chat_card_back_action_label": "채팅으로 돌아가기",
+    "chat_effects": {
+        "confetti_description": "입력한 메시지를 콘페티 효과와 함께 보냅니다.",
+        "confetti_message": "콘페티 효과를 보냅니다.",
+        "fireworks_description": "입력한 메시지를 불꽃 효과와 함께 보냅니다.",
+        "fireworks_message": "불꽃효과 보내기",
+        "hearts_description": "지정된 메시지를 하트효과와 함께 전송합니다",
+        "hearts_message": "하트효과 보내기",
+        "rainfall_description": "입력한 메시지를 비가 내리는 효과와 함께 보냅니다.",
+        "rainfall_message": "비내리는 효과 보내기",
+        "snowfall_description": "입력한 메시지를 눈 내리는 효과와 함께 보냅니다.",
+        "snowfall_message": "눈 내리는 효과 보내기",
+        "spaceinvaders_description": "입력한 메시지를 우주테마 효과와 함께 보냅니다.",
+        "spaceinvaders_message": "우주테마 효과 보내기"
+    },
+    "common": {
+        "access_token": "액세스 토큰",
+        "accessibility": "접근성",
+        "advanced": "고급",
+        "all_chats": "모든 채팅",
+        "analytics": "정보 분석",
+        "and_n_others": {
+            "외 한 명...": "one",
+            "외 %(count)s명...": "other"
+        },
+        "appearance": "모습",
+        "application": "애플리케이션",
+        "are_you_sure": "확신합니까?",
+        "attachment": "첨부 파일",
+        "authentication": "인증",
+        "avatar": "아바타",
+        "beta": "베타",
+        "camera": "카메라",
+        "cameras": "카메라",
+        "cancel": "취소",
+        "capabilities": "기능",
+        "copied": "복사했습니다!",
+        "credits": "크레딧",
+        "dark": "다크",
+        "description": "설명",
+        "deselect_all": "전체 선택 해제",
+        "device": "기기",
+        "edited": "편집됨",
+        "email_address": "이메일 주소",
+        "emoji": "이모지",
+        "encrypted": "암호화됨",
+        "encryption_enabled": "암호화 활성화됨",
+        "error": "오류",
+        "faq": "자주 묻는 질문 (FAQ)",
+        "favourites": "즐겨찾기",
+        "feedback": "피드백",
+        "filter_results": "필터 결과",
+        "forward_message": "전달 메세지",
+        "general": "기본",
+        "go_to_settings": "설정으로 가기",
+        "guest": "손님",
+        "help": "도움말",
+        "historical": "기록",
+        "home": "홈",
+        "homeserver": "홈서버",
+        "identity_server": "ID 서버",
+        "image": "이미지",
+        "integration_manager": "통합 관리자",
+        "joined": "참여함",
+        "labs": "실험실",
+        "legal": "법적",
+        "light": "라이트",
+        "loading": "불러오는 중…",
+        "location": "위치",
+        "low_priority": "중요하지 않음",
+        "matrix": "매트릭스",
+        "message": "메시지",
+        "message_layout": "메시지 레이아웃",
+        "message_timestamp_invalid": "유효하지 않은 타임스탬프",
+        "microphone": "마이크",
+        "model": "모델",
+        "moderation_and_safety": "관리 및 안전",
+        "modern": "모던",
+        "mute": "음소거",
+        "n_members": {
+            "other": "%(count)s명의 회원들"
+        },
+        "n_rooms": {
+            "other": "%(count)s개의 채팅방"
+        },
+        "name": "이름",
+        "no_results": "결과 없음",
+        "no_results_found": "검색 결과가 없습니다",
+        "not_trusted": "신뢰하지 않음",
+        "off": "끄기",
+        "offline": "접속 없음",
+        "on": "켜기",
+        "options": "옵션",
+        "orphan_rooms": "다른 방 목록",
+        "password": "비밀번호",
+        "people": "사람들",
+        "preferences": "환경 설정",
+        "presence": "현재 상태",
+        "preview_message": "안녕, 너 최고야!",
+        "privacy": "프라이버시",
+        "private": "비공개",
+        "private_room": "비공개 방",
+        "private_space": "비공개 스페이스",
+        "profile": "프로필",
+        "public": "공개",
+        "public_room": "공개 방",
+        "public_space": "공개 스페이스",
+        "qr_code": "QR 코드",
+        "random": "랜덤",
+        "reactions": "반응",
+        "recommended": "추천",
+        "report_a_bug": "버그 보고",
+        "room": "방",
+        "room_name": "방 이름",
+        "rooms": "방",
+        "save": "저장",
+        "saved": "저장됨",
+        "saving": "저장 중...",
+        "secure_backup": "보안 백업",
+        "select_all": "전체 선택",
+        "server": "서버",
+        "settings": "설정",
+        "setup_secure_messages": "보안 메시지 설정",
+        "show_more": "더 보기",
+        "someone": "다른 사람",
+        "space": "스페이스",
+        "spaces": "스페이스",
+        "state_encryption_enabled": "실험적 상태 암호화 활성화됨",
+        "sticker": "스티커",
+        "stickerpack": "스티커 팩",
+        "success": "성공",
+        "suggestions": "추천 목록",
+        "support": "지원",
+        "system_alerts": "시스템 알림",
+        "theme": "테마",
+        "thread": "스레드",
+        "threads": "스레드",
+        "timeline": "타임라인",
+        "unavailable": "사용 불가",
+        "unencrypted": "암호화되지 않음",
+        "unmute": "음소거 끄기",
+        "unnamed_room": "이름 없는 방",
+        "unnamed_space": "이름 없는 Space",
+        "unverified": "검증 되지 않음",
+        "updating": "업데이트 중…",
+        "user": "사용자",
+        "user_avatar": "프로필 사진",
+        "username": "사용자 이름",
+        "verified": "검증됨",
+        "version": "버전",
+        "video": "비디오",
+        "video_room": "비디오 room",
+        "view_message": "메시지 보기",
+        "voice": "음성",
+        "warning": "경고"
+    },
+    "composer": {
+        "autocomplete": {
+            "@room_description": "방 전체에 알림",
+            "command_a11y": "명령어 자동 완성",
+            "command_description": "명령어",
+            "emoji_a11y": "이모지 자동 완성",
+            "notification_a11y": "알림 자동 완성",
+            "notification_description": "방 알림",
+            "room_a11y": "방 자동 완성",
+            "space_a11y": "스페이스 자동 완성",
+            "user_a11y": "사용자 자동 완성",
+            "user_description": "사용자"
+        },
+        "close_sticker_picker": "스티커 숨기기",
+        "edit_composer_label": "메시지 편집",
+        "format_bold": "굵게",
+        "format_code_block": "코드 블록",
+        "format_decrease_indent": "들여쓰기 감소",
+        "format_increase_indent": "들여쓰기 증가",
+        "format_inline_code": "코드",
+        "format_insert_link": "링크 삽입",
+        "format_italic": "이탤릭체",
+        "format_italics": "기울게",
+        "format_link": "링크",
+        "format_ordered_list": "번호 목록",
+        "format_strikethrough": "취소선",
+        "format_underline": "밑줄",
+        "format_unordered_list": "글머리 기호",
+        "formatting_toolbar_label": "서식 지정",
+        "link_modal": {
+            "link_field_label": "링크",
+            "text_field_label": "글자",
+            "title_create": "링크 생성",
+            "title_edit": "링크 수정"
+        },
+        "mode_plain": "서식 숨기기",
+        "mode_rich_text": "서식 표시",
+        "no_perms_notice": "이 방에 글을 올릴 권한이 없습니다",
+        "placeholder": "암호화되지 않은 메시지를 보내다…",
+        "placeholder_encrypted": "메시지 보내기",
+        "placeholder_reply": "암호화되지 않은 답장을 보내세요…",
+        "placeholder_reply_encrypted": "답변 보내기",
+        "placeholder_thread": "암호화되지 않은 스레드에 답장하기…",
+        "placeholder_thread_encrypted": "스레드에 답글 달기…",
+        "poll_button": "투표",
+        "poll_button_no_perms_description": "이 방에서 투표를 시작할 권한이 없습니다.",
+        "poll_button_no_perms_title": "권한 필요",
+        "replying_title": "답장 중",
+        "room_unencrypted": "이 방의 메시지는 종단간 암호화가 되지 않았습니다.",
+        "room_upgraded_link": "이 대화는 여기서 이어집니다.",
+        "room_upgraded_notice": "이 방은 대체되어서 더 이상 활동하지 않습니다.",
+        "send_button_title": "메시지 보내기",
+        "send_button_voice_message": "음성 메세지 보내기",
+        "send_voice_message": "음성 메세지 보내기",
+        "stop_voice_message": "녹화 중지",
+        "voice_message_button": "음성 메세지"
+    },
+    "console_dev_note": "Element는 오픈소스입니다. 사용법을 알고 계시다면, 저희 GitHub(https://github.com/vector-im/element-web/)를 꼭 확인해 보시고 기여해 주세요!",
+    "console_scam_warning": "누군가 여기서 무언가를 복사/붙여넣으라고 했다면, 사기일 가능성이 매우 높습니다!",
+    "console_wait": "잠시 기다려 주세요.",
+    "create_room": {
+        "action_create_room": "방 만들기",
+        "action_create_video_room": "영상 방 만들기",
+        "encrypted_video_room_warning": "나중에 이 기능을 비활성화할 수 없습니다. 회의실은 암호화되지만 내장된 통화는 암호화되지 않습니다.",
+        "encrypted_warning": "나중에 이 기능을 비활성화할 수 없습니다. 브릿지와 대부분의 봇은 아직 작동하지 않습니다.",
+        "encryption_forced": "서버에서 비공개 방 암호화를 활성화해야 합니다.",
+        "encryption_label": "종단간 암호화 활성화",
+        "error_title": "방 만들기 실패",
+        "generic_error": "서버를 쓸 수 없거나 과부하거나, 오류입니다.",
+        "join_rule_change_notice": "방 설정에서 언제든지 변경할 수 있습니다.",
+        "join_rule_invite": "비공개 방 (초대 필요)",
+        "join_rule_invite_label": "초대받은 사람만 이 방에 참여할 수 있습니다.",
+        "join_rule_knock_label": "누구나 가입을 요청할 수 있지만, 관리자나 운영자가 접근 권한을 부여해야 합니다. 나중에 이 설정을 변경할 수 있습니다.",
+        "join_rule_public_label": "누구나 이 방을 찾아 참여할 수 있습니다.",
+        "join_rule_public_parent_space_label": "<SpaceName/> 회원뿐만 아니라 누구나 이 방을 찾아 참여할 수 있습니다.",
+        "join_rule_restricted": "스페이스 구성원에게 표시됨",
+        "join_rule_restricted_label": "<SpaceName/> 의 모든 사용자는 이 방을 찾아 참여할 수 있습니다.",
+        "name_validation_required": "방 이름을 입력해주세요",
+        "room_visibility_label": "방 표시 여부",
+        "state_encrypted_warning": "상태 이벤트 암호화 실험 기능을 활성화하여 방 이름, 주제 등의 메타데이터를 서버로부터 숨깁니다. 단, 나중에 방에 참여하는 사용자나 MSC4362를 지원하지 않는 클라이언트 사용자에게는 이 정보가 표시되지 않습니다.",
+        "state_encryption_label": "암호화된 상태 이벤트",
+        "title_private_room": "개인 방 만들기",
+        "title_public_room": "공개 방 만들기",
+        "title_video_room": "영상 방 생성",
+        "topic_label": "주제 (선택)",
+        "unfederated": "%(serverName)s 에 속하지 않은 사람은 누구든 이 방에 절대 참여하지 못하도록 차단하십시오.",
+        "unfederated_label_default_off": "홈서버에서 내부 팀과의 협업에만 방을 사용할 경우 이 옵션을 활성화할 수 있습니다. 이 설정은 나중에 변경할 수 없습니다.",
+        "unfederated_label_default_on": "해당 방이 자체 홈서버를 보유한 외부 팀과의 협업에 사용될 경우 이 기능을 비활성화할 수 있습니다. 이 설정은 나중에 변경할 수 없습니다.",
+        "unsupported_version": "서버가 지정된 방 버전을 지원하지 않습니다."
+    },
+    "create_space": {
+        "add_details_prompt": "사람들이 알아볼 수 있도록 세부 사항을 추가하세요.",
+        "add_details_prompt_2": "이 설정은 언제든지 변경할 수 있습니다.",
+        "add_existing_rooms_description": "추가할 방이나 대화를 선택하세요. 이 공간은 오직 당신만을 위한 곳으로, 누구에게도 알리지 않습니다. 나중에 더 추가할 수 있습니다.",
+        "add_existing_rooms_heading": "무엇을 정리하고 싶으신가요?",
+        "address_label": "주소",
+        "address_placeholder": "예: 마이 스페이스",
+        "creating": "생성 중…",
+        "creating_rooms": "방 생성 중…",
+        "done_action": "내 스페이스로 가기",
+        "done_action_first_room": "내 첫 번째 방으로 가세요.",
+        "explainer": "스페이스는 방과 사람을 그룹화하는 새로운 방식입니다. 어떤 종류의 스페이스를 만들고 싶으신가요? 나중에 변경할 수 있습니다.",
+        "failed_create_initial_rooms": "초기 스페이스 방 생성 실패",
+        "failed_invite_users": "다음 사용자를 귀하의 공간에 초대하는 데 실패했습니다: %(csvUsers)s",
+        "invite_teammates_by_username": "사용자 이름으로 초대하기",
+        "invite_teammates_description": "적절한 사람들에게 접근 권한을 부여하세요. 나중에 더 초대할 수 있습니다.",
+        "invite_teammates_heading": "팀원을 초대하세요",
+        "inviting_users": "초대 중...",
+        "label": "스페이스 만들기",
+        "name_required": "스페이스 이름을 입력해 주세요",
+        "personal_space": "나만 보기",
+        "personal_space_description": "나의 대화방을 관리하는 개인 공간",
+        "private_description": "초대 전용, 개인 또는 팀에게 최적",
+        "private_heading": "당신의 비공개 스페이스",
+        "private_only_heading": "당신의 스페이스",
+        "private_personal_description": "적절한 사람들이 접근할 수 있도록 하십시오. %(name)s",
+        "private_personal_heading": "누구와 함께 일하고 있나요?",
+        "private_space": "나와 내 팀원들",
+        "private_space_description": "당신과 팀원들을 위한 전용 공간",
+        "public_description": "누구나 이용할 수 있는 열린 공간, 공동체를 위한 최적의 장소",
+        "public_heading": "당신의 공개 스페이스",
+        "search_public_button": "공개 스페이스 검색",
+        "setup_rooms_community_description": "각각을 위한 방을 만들어 봅시다.",
+        "setup_rooms_community_heading": "%(spaceName)s 에서 어떤 것들을 논의하고 싶으신가요?",
+        "setup_rooms_description": "나중에 추가할 수도 있으며, 기존 항목도 포함됩니다.",
+        "setup_rooms_private_description": "각각을 위한 방을 만들겠습니다.",
+        "setup_rooms_private_heading": "팀에서 어떤 프로젝트를 진행 중인가요?",
+        "share_description": "지금은 당신 혼자지만, 다른 사람들과 함께하면 더 좋을 거예요.",
+        "share_heading": "공유 '%(name)s'",
+        "skip_action": "지금은 건너뛰기",
+        "subspace_adding": "추가 중…",
+        "subspace_beta_notice": "관리하는 스페이스에 스페이스를 추가하세요.",
+        "subspace_dropdown_title": "스페이스 만들기",
+        "subspace_existing_space_prompt": "기존 스페이스를 추가하시겠습니까?",
+        "subspace_join_rule_invite_description": "초대받은 사람만 이 스페이스를 찾아 참여할 수 있습니다.",
+        "subspace_join_rule_invite_only": "비공개 스페이스 (초대 필요)",
+        "subspace_join_rule_label": "스페이스 표시",
+        "subspace_join_rule_public_description": "<SpaceName/> 회원뿐만 아니라 누구나 이 스페이스를 찾아 참여할 수 있습니다.",
+        "subspace_join_rule_restricted_description": "누구든지<SpaceName/> 찾아서 참여할 수 있습니다."
+    },
+    "credits": {
+        "default_cover_photo": "<photo>의 기본 커버 사진</photo> 은 © <author>Jesús Roncero</author> 의 작품으로, <terms>CC-BY-SA 4.0</terms> 라이선스 조건에 따라 사용되었습니다.",
+        "twemoji": "<twemoji>Twemoji</twemoji> 이모지 아트는 © <author>Twitter, Inc 및 기타 기여자</author> <terms> CC-BY 4.0</terms> 의 조건에 따라 사용되었습니다.",
+        "twemoji_colr": "<colr>twemoji-colr</colr> 폰트는 © <author>Mozilla Foundation</author> 에 있으며, <terms>Apache 2.0</terms> 의 조건에 따라 사용됩니다."
+    },
+    "decline_invitation_dialog": {
+        "confirm": "\"%(roomName)s\" 가입 초대를 정말 거절하시겠습니까?",
+        "ignore_user_help": "이 사용자로부터는 어떤 메시지나 방 초대도 받지 못할 것입니다.",
+        "reason_description": "해당 방을 신고한 사유를 설명하십시오.",
+        "report_room_description": "이 방을 계정 제공자에게 신고하십시오.",
+        "title": "초대 거절"
+    },
+    "desktop_default_device_name": "%(brand)s 데스크톱: %(platformName)s",
+    "devtools": {
+        "active_widgets": "활성 위젯",
+        "category_other": "기타",
+        "category_room": "방",
+        "caution_colon": "주의:",
+        "client_versions": "클라이언트 버전",
+        "crypto": {
+            "4s_public_key_in_account_data": "계정 데이터",
+            "4s_public_key_not_in_account_data": "찾을 수 없음",
+            "4s_public_key_status": "비밀 저장소 공개 키:",
+            "backup_key_cached": "로컬에 캐시됨",
+            "backup_key_cached_status": "백업 키 캐시됨:",
+            "backup_key_not_stored": "저장되지 않음",
+            "backup_key_stored": "비밀 저장소에",
+            "backup_key_stored_status": "백업 키 저장됨:",
+            "backup_key_unexpected_type": "예상치 못한 유형",
+            "backup_key_well_formed": "잘 형성됨",
+            "cross_signing": "교차 서명",
+            "cross_signing_cached": "로컬에 캐시됨",
+            "cross_signing_not_ready": "교차서명이 설정되지 않았습니다.",
+            "cross_signing_private_keys_in_storage": "비밀 저장소에",
+            "cross_signing_private_keys_in_storage_status": "개인 키 교차 서명:",
+            "cross_signing_private_keys_not_in_storage": "저장소에서 찾을 수 없음",
+            "cross_signing_public_keys_on_device": "메모리에",
+            "cross_signing_public_keys_on_device_status": "교차 서명 공개 키:",
+            "cross_signing_ready": "교차서명을 사용할 준비가 되었습니다.",
+            "cross_signing_status": "교차 서명 상태:",
+            "cross_signing_untrusted": "귀하의 계정은 비밀 저장소에 교차 서명 ID를 저장하고 있지만, 아직 이 세션에서 신뢰되지 않았습니다.",
+            "crypto_not_available": "암호화 모듈을 사용할 수 없습니다.",
+            "device_id": "기기 ID",
+            "key_backup_active_version": "활성 백업 버전:",
+            "key_backup_active_version_none": "설정없음",
+            "key_backup_inactive_warning": "이 세션에서는 키가 백업되지 않습니다.",
+            "key_backup_latest_version": "서버의 최신 백업 버전:",
+            "key_storage": "키 저장소",
+            "master_private_key_cached_status": "마스터 개인 키:",
+            "not_found": "찾을 수 없음",
+            "not_found_locally": "로컬에서 찾을 수 없음",
+            "secret_storage_not_ready": "준비되지 않음",
+            "secret_storage_ready": "준비",
+            "secret_storage_status": "비밀 저장소:",
+            "self_signing_private_key_cached_status": "자체 서명 개인 키:",
+            "session": "세션",
+            "session_fingerprint": "지문(세션 키)",
+            "title": "종단 간 암호화",
+            "user_signing_private_key_cached_status": "사용자 서명 개인 키:"
+        },
+        "developer_mode": "개발자 모드",
+        "developer_tools": "개발자 도구",
+        "device_dehydrated_no": "Dehydrated: 아니요",
+        "device_dehydrated_yes": "Dehydrated: 예",
+        "device_id": "device ID: %(deviceId)s",
+        "device_keys": "device 키",
+        "device_verification_status": {
+            "signed_by_owner": "검증 상태: <E2EIcon /> 소유자 서명",
+            "unknown": "검증 상태: 알 수 없음",
+            "unverified": "검증 상태: <E2EIcon /> 소유자에 의해 서명되지 않음",
+            "verified": "검증 상태: <E2EIcon /> 교차 서명으로 검증됨"
+        },
+        "devices": "암호화 장치(%(count)s )",
+        "edit_setting": "설정 편집",
+        "edit_values": "값 편집",
+        "empty_string": "<empty string>",
+        "event_content": "이벤트 내용",
+        "event_id": "이벤트 ID:%(eventId)s",
+        "event_sent": "이벤트를 보냈습니다!",
+        "event_type": "이벤트 종류",
+        "explore_account_data": "계정 데이터 탐색",
+        "explore_room_account_data": "방 계정 데이터 탐색",
+        "explore_room_state": "방 상태 탐색",
+        "failed_to_find_widget": "이 위젯을 찾는 과정에서 오류가 발생했습니다.",
+        "failed_to_load": "불러 오지 못했습니다",
+        "failed_to_save": "설정 저장에 실패했습니다.",
+        "failed_to_send": "이벤트 전송하는 데 실패했습니다!",
+        "id": "ID: ",
+        "invalid_device_key_id": "잘못된 장치 키 ID입니다.",
+        "invalid_json": "유효한 JSON이 아닌 것 같습니다.",
+        "level": "레벨",
+        "low_bandwidth_mode": "저대역폭 모드",
+        "low_bandwidth_mode_description": "호환되는 홈 서버가 필요합니다.",
+        "main_timeline": "주 타임라인",
+        "manual_device_verification": "수동 기기 검증",
+        "no_receipt_found": "영수증을 찾을 수 없습니다",
+        "notification_state": "알림 상태는 <strong>%(notificationState)s</strong>",
+        "notifications_debug": "알림 디버그",
+        "number_of_users": "사용자 수",
+        "only_joined_members": "가입한 사용자만",
+        "original_event_source": "원본 이벤트 소스",
+        "restore_from_backup": "백업에서 복원",
+        "room_encrypted": "방은 <strong>암호화됨 ✅</strong>",
+        "room_id": "방 ID: %(roomId)s",
+        "room_not_encrypted": "방은 <strong>암호화되지 않음 🚨</strong>",
+        "room_notifications_dot": "Dot: ",
+        "room_notifications_highlight": "하이라이트",
+        "room_notifications_last_event": "마지막 이벤트:",
+        "room_notifications_sender": "발신자:",
+        "room_notifications_thread_id": "스레드 ID: ",
+        "room_notifications_total": "합계:",
+        "room_notifications_type": "유형:",
+        "room_status": "방 현황",
+        "room_unread_status_count": {
+            "other": "채팅방 읽지 않은 상태: <strong>%(status)s</strong>, 개수: <strong>%(count)s</strong>"
+        },
+        "save_setting_values": "설정값 저장",
+        "see_history": "기록 보기",
+        "send_custom_account_data_event": "사용자 지정 계정 데이터 이벤트 전송",
+        "send_custom_room_account_data_event": "사용자 지정 방 계정 데이터 이벤트 전송",
+        "send_custom_state_event": "사용자 정의 상태 이벤트 전송",
+        "send_custom_timeline_event": "사용자 지정 타임라인 이벤트 보내기",
+        "server_info": "서버 정보",
+        "server_versions": "서버 버전",
+        "settable_global": "전역으로 설정 가능",
+        "settable_room": "채팅방에서 설정 가능",
+        "setting_colon": "설정:",
+        "setting_definition": "설정 정의:",
+        "setting_id": "Setting ID",
+        "settings": {
+            "elementCallUrl": "엘리먼트 통화 URL"
+        },
+        "settings_explorer": "설정 탐색기",
+        "show_empty_content_events": "빈 콘텐츠가 있는 이벤트 표시",
+        "show_hidden_events": "타임라인에서 숨겨진 이벤트 보이기",
+        "spaces": {
+            "other": "<%(count)s 스페이스>"
+        },
+        "state_key": "상태 키",
+        "thread_root_id": "스레드 Root ID: %(threadRootId)s",
+        "threads_timeline": "스레드 타임라인",
+        "title": "개발자 도구",
+        "toggle_event": "이벤트 토글",
+        "toolbox": "도구 상자",
+        "use_at_own_risk": "이 UI는 값의 유형을 확인하지 않습니다. 사용 시 주의하십시오.",
+        "user_avatar": "아바타: %(avatar)s",
+        "user_displayname": "표시 이름: %(displayname)s",
+        "user_id": "사용자 ID:%(userId)s",
+        "user_no_avatar": "아바타: <i>없음</i>",
+        "user_no_displayname": "표시 이름: <i>없음</i>",
+        "user_read_up_to": "사용자가 읽은 위치: ",
+        "user_read_up_to_ignore_synthetic": "사용자가 읽은 위치 (ignoreSynthetic 무시):",
+        "user_read_up_to_private": "사용자가 읽은 위치 (m.read.private):",
+        "user_read_up_to_private_ignore_synthetic": "사용자가 읽은 위치 (m.read.private; ignoreSynthetic):",
+        "user_room_membership": "회원:%(membership)s",
+        "user_verification_status": {
+            "identity_changed": "검증 상태: <E2EIcon /> 미검증, 신원 변경됨",
+            "unverified": "검증 상태: <E2EIcon /> 미검증",
+            "verified": "검증 상태: <E2EIcon /> 검증됨",
+            "was_verified": "검증 상태: <E2EIcon /> 검증되었으나 신원이 변경됨"
+        },
+        "users": "사용자",
+        "value": "Value",
+        "value_colon": "Value:",
+        "value_in_this_room": "이 채팅방의 값",
+        "value_this_room_colon": "이 채팅방의 값:",
+        "values_explicit": "명시적 수준의 값",
+        "values_explicit_colon": "명시적 수준의 값들:",
+        "values_explicit_room": "이 채팅방의 명시적 수준에서의 값들",
+        "values_explicit_this_room_colon": "이 채팅방의 명시적 수준에서의 값들:",
+        "view_servers_in_room": "채팅방 내 서버 보기",
+        "view_source_decrypted_event_source": "복호화된 이벤트 소스",
+        "view_source_decrypted_event_source_unavailable": "복호화된 소스 없음",
+        "widget_screenshots": "지원되는 위젯에 대해 위젯 스크린샷 사용하기"
+    },
+    "dialog_close_label": "대화 상자 닫기",
+    "download_completed": "다운로드 완료",
+    "emoji": {
+        "categories": "카테고리",
+        "category_activities": "활동",
+        "category_animals_nature": "동물 & 자연",
+        "category_flags": "깃발",
+        "category_food_drink": "음식 & 음료",
+        "category_frequently_used": "자주 사용함",
+        "category_objects": "물건",
+        "category_smileys_people": "표정 & 사람",
+        "category_symbols": "기호",
+        "category_travel_places": "여행 & 장소",
+        "quick_reactions": "빠른 리액션"
+    },
+    "emoji_picker": {
+        "cancel_search_label": "검색 취소"
+    },
+    "empty_room": "빈 채팅방",
+    "empty_room_was_name": "빈 채팅방 (이전 이름: %(oldName)s)",
+    "encryption": {
+        "access_secret_storage_dialog": {
+            "alternatives": "보안 키나 보안 문구를 가지고 있다면 이 방법도 작동합니다.",
+            "key_validation_text": {
+                "wrong_security_key": "입력하신 복구 키가 올바르지 않습니다."
+            },
+            "privacy_warning": "아무도 이 화면을 볼 수 없도록 하세요!",
+            "restoring": "백업에서 키 복원",
+            "security_key_label": "복구 키",
+            "security_key_title": "복구 키를 입력하세요"
+        },
+        "bootstrap_title": "키 설정",
+        "confirm_encryption_setup_body": "아래 버튼을 클릭하여 암호화 설정을 확인하십시오.",
+        "confirm_encryption_setup_title": "암호화 설정 확인",
+        "continue_with_reset": "재설정을 계속 진행하세요",
+        "cross_signing_room_normal": "이 방은 종단 간 암호화됩니다",
+        "cross_signing_room_verified": "이 방에 있는 모든 사람은 인증되었습니다",
+        "cross_signing_room_warning": "누군가가 알 수 없는 세션을 사용하고 있습니다.",
+        "cross_signing_user_normal": "이 사용자를 인증하지 않았습니다.",
+        "cross_signing_user_verified": "이 사용자를 인증했습니다. 이 사용자는 모든 세션을 인증했습니다.",
+        "cross_signing_user_warning": "이 사용자는 자신의 모든 세션을 확인하지 않았습니다.",
+        "enter_recovery_key": "복구 키 확인",
+        "event_shield_reason_authenticity_not_guaranteed": "이 장치에서는 이 암호화된 메시지의 진위 여부를 보장할 수 없습니다.",
+        "event_shield_reason_mismatched_sender": "이벤트의 발신자가 이벤트를 보낸 장치의 소유자와 일치하지 않습니다.",
+        "event_shield_reason_mismatched_sender_key": "검증되지 않은 세션으로 암호화됨",
+        "event_shield_reason_unknown_device": "알 수 없거나 삭제된 장치에 의해 암호화됩니다.",
+        "event_shield_reason_unsigned_device": "소유자가 확인하지 않은 장치에 의해 암호화되었습니다.",
+        "event_shield_reason_unverified_identity": "검증되지 않은 사용자에 의해 암호화되었습니다.",
+        "export_unsupported": "필요한 암호화 확장 기능을 브라우저가 지원하지 않습니다",
+        "forgot_recovery_key": "복구 키를 잊으셨나요?",
+        "identity_needs_reset_description": "메시지 기록에 접근하려면 암호화 신원을 재설정해야 합니다.",
+        "import_invalid_keyfile": "올바른 %(brand)s 열쇠 파일이 아닙니다",
+        "import_invalid_passphrase": "인증 확인 실패: 비밀번호를 틀리셨나요?",
+        "key_storage_out_of_sync": "키 저장소가 동기화되지 않았습니다.",
+        "key_storage_out_of_sync_description": "키 저장소 및 메시지 기록에 대한 액세스를 유지하려면 복구 키를 확인하세요.",
+        "messages_not_secure": {
+            "cause_1": "당신의 홈 서버",
+            "cause_2": "사용자가 확인 중인 홈 서버에 연결된 사용자",
+            "cause_3": "귀하의, 또는 다른 사용자들의 인터넷 연결",
+            "cause_4": "귀하의 세션 또는 다른 사용자의 세션",
+            "heading": "다음 중 하나가 손상되었을 수 있습니다:",
+            "title": "귀하의 메시지는 안전하지 않습니다"
+        },
+        "new_recovery_method_detected": {
+            "description_1": "보안 메시지를 위한 새로운 보안 문구와 키가 감지되었습니다.",
+            "description_2": "이 세션은 새로운 복구 방법을 사용하여 기록을 암호화하고 있습니다.",
+            "title": "새 복구 방식",
+            "warning": "새 복구 방식을 설정하지 않으면, 공격자가 계정에 접근을 시도할 지도 모릅니다. 설정에서 계정 비밀번호를 바꾸고 즉시 새 복구 방식을 설정하세요."
+        },
+        "pinned_identity_changed": "%(displayName)s (<b>%(userId)s</b>)의 신원이 재설정되었습니다. <a>자세히 알아보기</a>",
+        "pinned_identity_changed_no_displayname": "<b>%(userId)s</b>'의 신원이 재설정되었습니다. <a>자세히 알아보기</a>",
+        "recovery_method_removed": {
+            "description_1": "이번 세션에서 보안 문구와 보안 메시지용 키가 제거된 것으로 감지되었습니다.",
+            "description_2": "실수로 이 작업을 수행한 경우, 해당 세션에서 보안 메시지를 설정하면 새 복구 방법으로 해당 세션의 메시지 기록을 재암호화할 수 있습니다.",
+            "title": "복구 방식 제거됨",
+            "warning": "이 복구 방식을 제거하지 않으면, 공격자가 계정에 접근을 시도할 지도 모릅니다. 설정에서 계정 비밀번호를 바꾸고 즉시 새 복구 방식을 설정하세요."
+        },
+        "set_up_recovery": "복구 설정",
+        "set_up_recovery_toast_description": "장치에 대한 접근 권한을 잃어버린 경우 암호화된 메시지 기록을 복원하는 데 사용할 수 있는 복구 키를 생성하십시오.",
+        "set_up_toast_title": "보안 백업 설정",
+        "setup_secure_backup": {
+            "explainer": "잃어버리지 않도록 로그아웃하기 전에 키를 백업하세요."
+        },
+        "turn_on_key_storage": "키 저장 기능 켜기",
+        "turn_on_key_storage_description": "암호화 신원 및 메시지 키를 서버에 안전하게 저장하십시오. 이렇게 하면 새 기기에서도 메시지 기록을 확인할 수 있습니다.",
+        "udd": {
+            "interactive_verification_button": "이모지를 통한 상호 인증",
+            "other_ask_verify_text": "이 사용자에게 세션 확인을 요청하거나, 아래에서 수동으로 확인하십시오.",
+            "other_new_session_text": "%(name)s (%(userId)s)가 새 세션에 인증 없이 로그인했습니다:",
+            "own_ask_verify_text": "아래 옵션 중 하나를 사용하여 다른 세션을 확인하세요.",
+            "own_new_session_text": "인증하지 않고 새 세션에 로그인했습니다.",
+            "title": "신뢰할 수 없음"
+        },
+        "unable_to_setup_keys_error": "키 설정이 불가능합니다",
+        "verification": {
+            "accepting": "수락 중…",
+            "after_new_login": {
+                "device_verified": "기기 검증됨",
+                "skip_verification": "지금은 인증을 건너뛰기",
+                "verify_this_device": "이 장치를 확인하십시오"
+            },
+            "cancelled_verification": "요청이 시간 초과되었거나, 요청이 거부되었거나, 인증 불일치가 발생했습니다.",
+            "cancelling": "취소 중…",
+            "cant_confirm": "확인할 수 없나요?",
+            "complete_action": "알겠습니다",
+            "complete_description": "성공적으로 이 사용자를 인증했습니다.",
+            "complete_title": "인증되었습니다!",
+            "confirm_identity_description": "보안 메시징을 설정하려면 이 장치를 확인하세요.",
+            "confirm_identity_title": "본인 인증",
+            "confirm_the_emojis": "아래 이모티콘이 다른 기기에서 표시되는 것과 일치하는지 확인하세요.",
+            "error_starting_description": "다른 사용자와 채팅을 시작할 수 없었습니다.",
+            "error_starting_title": "검증 시작 중 오류 발생",
+            "explainer": "이 사용자 간의 보안 메시지는 종단간 암호화되며 제 3자가 읽을 수 없습니다.",
+            "in_person": "안전을 위해 직접 만나거나 신뢰할 수 있는 방법으로 소통하십시오.",
+            "incoming_sas_device_dialog_text_1": "이 기기를 확인하여 신뢰할 수 있는 기기로 표시하세요. 이 기기를 신뢰하면 귀하와 다른 사용자들이 종단 간 암호화된 메시지를 사용할 때 더욱 안심할 수 있습니다.",
+            "incoming_sas_device_dialog_text_2": "이 기기를 인증하면 신뢰할 수 있는 기기로 표시되며, 귀하와 인증한 사용자들은 이 기기를 신뢰하게 됩니다.",
+            "incoming_sas_dialog_title": "수신 확인 요청",
+            "incoming_sas_dialog_waiting": "파트너가 확인하기를 기다리는 중…",
+            "incoming_sas_user_dialog_text_1": "이 사용자를 신뢰할 수 있도록 인증합니다. 종단간 암호화 메시지를 사용할 때 사용자를 신뢰하면 안심이 듭니다.",
+            "incoming_sas_user_dialog_text_2": "이 사용자를 인증하면 해당 사용자의 세션이 신뢰할 수 있는 세션으로 표시되며, 동시에 귀하의 세션도 해당 사용자에게 신뢰할 수 있는 세션으로 표시됩니다.",
+            "manual": {
+                "already_verified": "이 장치는 이미 검증되었습니다.",
+                "already_verified_and_wrong_fingerprint": "제공된 지문이 일치하지 않지만, 기기는 이미 인증되었습니다!",
+                "device_id": "기기 ID",
+                "failure_description": "'%(deviceId)s' 장치 인증 실패: %(error)s",
+                "failure_title": "인증 실패",
+                "fingerprint": "지문(세션 키)",
+                "no_crypto": "기기 확인 불가 - 암호화 기능이 활성화되지 않았습니다",
+                "no_device": "장치 인증 불가: '%(deviceId)s' 장치를 찾을 수 없음",
+                "no_userid": "장치 확인 불가 - 사용자 ID를 찾을 수 없습니다",
+                "success_description": "해당 장치(%(deviceId)s)는 이제 교차 서명되었습니다.",
+                "success_title": "인증 성공!",
+                "text": "자신의 장치 중 하나의 ID와 지문을 입력하여 장치를 검증하세요. 주의: 이렇게 하면 다른 장치가 사용자를 대신해 메시지를 보내고 받을 수 있습니다. 누군가 이곳에 무엇인가를 붙여넣으라고 했다면, 사기일 가능성이 높습니다!",
+                "wrong_fingerprint": "장치 '%(deviceId)s'를 검증할 수 없습니다 - 제공된 지문 '%(fingerprint)s'이 장치 지문 '%(fprint)s'과 일치하지 않습니다"
+            },
+            "no_support_qr_emoji": "확인하려는 장치는 QR 코드 또는 이모지 인증을 지원하지 않습니다. %(brand)s에서는 이 방식을 사용합니다. 다른 클라이언트로 시도하세요",
+            "now_you_can": "이제 메시지를 안전하게 읽거나 보낼 수 있으며, 채팅 상대도 이 기기를 신뢰할 수 있습니다.",
+            "once_accepted_can_continue": "승인되면 인증 절차를 계속 진행할 수 있습니다.",
+            "other_party_cancelled": "상대방이 확인을 취소했습니다.",
+            "prompt_encrypted": "채팅방의 보안을 보장하려면, 방에 있는 모든 사용자를 인증하세요.",
+            "prompt_unencrypted": "암호화된 채팅방에서는 보안을 보장하기 위해 모든 사용자를 인증해야 합니다.",
+            "qr_or_sas": "%(qrCode)s 또는 %(emojiCompare)s",
+            "qr_prompt": "이 고유 코드를 스캔하세요",
+            "qr_reciprocate_check_again_device": "다른 기기에서 다시 확인하여 인증을 완료하세요.",
+            "qr_reciprocate_no": "아니요, 녹색 방패가 보이지 않습니다.",
+            "qr_reciprocate_same_shield_user": "거의 다 됐습니다! %(displayName)s 기기에도 같은 방패 모양이 보이나요?",
+            "qr_reciprocate_yes": "네, 녹색 방패가 보입니다.",
+            "request_toast_accept_user": "사용자 확인",
+            "request_toast_decline_counter": "무시하다 (%(counter)s )",
+            "request_toast_detail": "%(ip)s에서 접속한 %(deviceId)s",
+            "request_toast_start_verification": "인증 시작",
+            "sas_caption_self": "다음 번호가 화면에 표시되는지 확인하여 이 장치를 인증하십시오.",
+            "sas_caption_user": "다음 숫자가 상대방의 화면에 나타나는 것을 확인하는 것으로 이 사용자를 인증합니다.",
+            "sas_description": "두 기기 모두 카메라가 없는 경우 고유한 이모지 세트를 비교하세요",
+            "sas_emoji_caption_user": "다음 이모지가 상대방의 화면에 나타나는 것을 확인하는 것으로 이 사용자를 인증합니다.",
+            "sas_match": "일치합니다",
+            "sas_no_match": "일치하지 않습니다",
+            "sas_prompt": "고유한 이모지 비교",
+            "scan_qr": "스캔하여 확인",
+            "scan_qr_explainer": "%(displayName)s 에 코드 스캔을 요청하세요:",
+            "start_button": "인증 시작",
+            "successful_user": "%(displayName)s 의 인증을 성공적으로 완료했습니다!",
+            "unsupported_method": "지원하는 인증 방식을 찾을 수 없습니다.",
+            "unverified_session_toast_accept": "네, 저였습니다",
+            "unverified_session_toast_title": "새로 로그인하셨습니다. 본인이신가요?",
+            "unverified_sessions_toast_description": "계정이 안전한지 확인하기 위해 검토하세요",
+            "unverified_sessions_toast_reject": "나중에 하기",
+            "unverified_sessions_toast_title": "확인되지 않은 세션이 있습니다",
+            "use_another_device": "다른 기기 사용",
+            "use_recovery_key": "복구 키 사용",
+            "verification_dialog_title_choose": "인증 방법을 선택하세요",
+            "verification_dialog_title_compare_emojis": "이모지 비교",
+            "verification_dialog_title_confirm_green_shield": "다른 기기에서 녹색 방패 아이콘이 표시되는지 확인하세요",
+            "verification_dialog_title_device": "다른 기기 확인",
+            "verification_dialog_title_failed": "인증 실패",
+            "verification_dialog_title_start_on_other_device": "다른 장치에서 인증 시작",
+            "verification_dialog_title_user": "인증 요청",
+            "verification_dialog_title_verified": "기기 인증됨",
+            "verification_skip_warning": "확인하지 않으면 모든 메시지에 접근할 수 없으며 다른 사람들에게 신뢰할 수 없는 계정으로 표시될 수 있습니다.",
+            "verification_success_with_backup": "새 기기가 이제 인증되었습니다. 암호화된 메시지에 접근할 수 있으며, 다른 사용자에게는 신뢰할 수 있는 기기로 표시됩니다.",
+            "verification_success_without_backup": "새 기기가 이제 인증되었습니다. 다른 사용자에게는 신뢰할 수 있는 기기로 표시됩니다.",
+            "verify_by_completing_one_of": "다음 중 하나를 완료하여 인증하세요.",
+            "verify_emoji": "이모지로 확인",
+            "verify_emoji_prompt": "고유한 이모지를 비교하여 확인하십시오.",
+            "verify_emoji_prompt_qr": "위 코드를 스캔할 수 없는 경우, 고유한 이모지를 비교하여 확인하십시오.",
+            "verify_later": "나중에 확인하겠습니다",
+            "waiting_for_user_accept": "%(displayName)s 의 승인을 기다리는 중…",
+            "waiting_other_device": "다른 기기에서 확인을 기다리는 중입니다...",
+            "waiting_other_device_details": "다른 기기에서 확인을 기다리고 있습니다. %(deviceName)s (%(deviceId)s)…",
+            "waiting_other_user": "%(displayName)s 의 확인을 기다리는 중…"
+        },
+        "verification_requested_toast_title": "검증이 요청되었습니다",
+        "verified_identity_changed": "%(displayName)s (<b>%(userId)s</b>)의 신원이 재설정되었습니다. <a>자세히 알아보기</a>",
+        "verified_identity_changed_no_displayname": "<b>%(userId)s</b>의 신원이 재설정되었습니다.<a> 자세히 알아보기</a>",
+        "verify_toast_description": "다른 사용자들은 그것을 신뢰하지 않을 수 있습니다",
+        "verify_toast_title": "이 세션 검증",
+        "withdraw_verification_action": "인증 취소"
+    },
+    "error": {
+        "admin_contact": "이 서비스를 계속 사용하려면 <a>서비스 관리자에게 연락</a>하세요.",
+        "admin_contact_short": "<a>서버 관리자</a>에게 문의하세요.",
+        "app_launch_unexpected_error": "앱 준비 중 예기치 않은 오류가 발생했습니다. 자세한 내용은 콘솔을 참조하십시오.",
+        "cannot_load_config": "구성 파일을 불러올 수 없습니다: 페이지를 새로고침하여 다시 시도해 주세요.",
+        "connection": "홈 서버와의 통신에 문제가 발생했습니다. 나중에 다시 시도해 주세요.",
+        "dialog_description_default": "오류가 발생했습니다.",
+        "download_media": "소스 미디어 다운로드 실패, 소스 URL을 찾을 수 없음",
+        "edit_history_unsupported": "홈서버가 이 기능을 지원하지 않는 모양입니다.",
+        "failed_copy": "복사 실패함",
+        "hs_blocked": "이 홈 서버는 관리자에 의해 차단되었습니다.",
+        "invalid_configuration_mixed_server": "잘못된 구성: default_hs_url은 default_server_name 또는 default_server_config와 함께 지정할 수 없습니다.",
+        "invalid_configuration_no_server": "잘못된 구성: 기본 서버가 지정되지 않았습니다.",
+        "invalid_json": "요소 구성에 잘못된 JSON이 포함되어 있습니다. 문제를 수정하고 페이지를 다시 로드하십시오.",
+        "invalid_json_detail": "파서에서 보낸 메시지는 다음과 같습니다: %(message)s",
+        "invalid_json_generic": "잘못된 JSON",
+        "mau": "이 홈서버가 월 간 활성 사용자 수 한도를 초과했습니다.",
+        "misconfigured": "요소가 잘못 구성되었습니다",
+        "mixed_content": "주소 창에 HTTPS URL이 있을 때는 HTTP로 홈서버를 연결할 수 없습니다. HTTPS를 쓰거나 <a>안전하지 않은 스크립트를 허용</a>해주세요.",
+        "non_urgent_echo_failure_toast": "서버가 일부 <a>요청</a>에 응답하지 않습니다.",
+        "resource_limits": "이 홈서버가 리소스 한도를 초과했습니다.",
+        "session_restore": {
+            "clear_storage_button": "저장소를 지우고 로그아웃",
+            "clear_storage_description": "로그아웃하고 암호화 키를 제거합니까?",
+            "description_1": "이전 활동을 복구하는 중 에러가 발생했습니다.",
+            "description_2": "이전에 최근 버전의 %(brand)s을 썼다면, 세션이 이 버전과 맞지 않을 것입니다. 창을 닫고 최근 버전으로 돌아가세요.",
+            "description_3": "브라우저의 저장소를 청소한다면 문제가 해결될 수도 있지만, 암호화된 대화 기록을 읽을 수 없게 됩니다.",
+            "title": "세션을 복구할 수 없음"
+        },
+        "something_went_wrong": "문제가 생겼습니다!",
+        "storage_evicted_description_1": "암호화된 메시지 키를 포함한 일부 세션 데이터가 누락되었습니다. 백업에서 키를 복구하면서 로그아웃하고 로그인하면 이를 고칠 수 있습니다.",
+        "storage_evicted_description_2": "디스크 공간이 부족한 경우 브라우저에서 이 데이터를 제거했을 수 있습니다.",
+        "storage_evicted_title": "누락된 세션 데이터",
+        "sync": "홈 서버에 연결할 수 없습니다. 재시도 중…",
+        "tls": "홈서버에 연결할 수 없음 - 연결 상태를 확인하거나, <a>홈서버의 SSL 인증서</a>가 믿을 수 있는지 확인하고, 브라우저 확장 기능이 요청을 막고 있는지 확인해주세요.",
+        "unknown": "알 수 없는 오류",
+        "unknown_error_code": "알 수 없는 오류 코드",
+        "update_history_visibility": "히스토리 공개 설정 변경 실패",
+        "update_power_level": "권한 등급 변경에 실패함"
+    },
+    "error_app_open_in_another_tab": "다른 탭으로 전환하여 %(brand)s 에 접속하세요. 이 탭은 이제 닫을 수 있습니다.",
+    "error_app_open_in_another_tab_title": "%(brand)s가 다른 탭에서 사용 중입니다",
+    "error_app_opened_in_another_window": "%(brand)s가 다른 창에서 열려 있습니다. \"%(label)s\"를 클릭하면 여기에서 %(brand)s를 사용하고 다른 창과 연결을 끊습니다",
+    "error_database_closed_description": {
+        "for_desktop": "디스크 용량이 부족할 수 있습니다. 일부 공간을 확보하고 다시 로드하세요",
+        "for_web": "브라우저 데이터를 삭제했다면 이 메시지가 표시되는 것이 정상입니다. %(brand)s가 다른 탭에서 열려 있거나, 디스크 용량이 부족할 수도 있습니다. 일부 공간을 확보하고 페이지를 다시 로드하세요"
+    },
+    "error_database_closed_title": "%(brand)s 작동이 중단되었습니다",
+    "error_dialog": {
+        "copy_room_link_failed": {
+            "description": "방 링크를 클립보드에 복사할 수 없습니다.",
+            "title": "방 링크를 복사할 수 없습니다"
+        },
+        "error_loading_user_profile": "사용자 프로필을 불러올 수 없음",
+        "forget_room_failed": "%(errCode)s 방 지우기에 실패함"
+    },
+    "error_user_not_logged_in": "사용자가 로그인하지 않았습니다",
+    "event_preview": {
+        "m.call.answer": {
+            "dm": "통화 연결 중",
+            "user": "%(senderName)s님과의 통화에 참여",
+            "you": "통화에 참여하셨습니다"
+        },
+        "m.call.hangup": {
+            "user": "%(senderName)s님과의 통화가 종료됨",
+            "you": "통화를 종료했습니다"
+        },
+        "m.call.invite": {
+            "dm_receive": "%(senderName)s님에게 전화하고 있어요",
+            "dm_send": "통화받기를 기다리는 중",
+            "user": "%(senderName)s님과의  통화를 시작했습니다",
+            "you": "통화를 시작했습니다"
+        },
+        "m.emote": "* %(senderName)s %(emote)s",
+        "m.reaction": {
+            "user": "%(sender)s님이 %(message)s 메시지에 %(reaction)s 반응을 표시했습니다",
+            "you": "%(message)s 메시지에 %(reaction)s 반응을 표시했습니다"
+        },
+        "m.sticker": "%(senderName)s: %(stickerName)s",
+        "m.text": "%(senderName)s: %(message)s",
+        "prefix": {
+            "audio": "오디오",
+            "file": "파일",
+            "image": "이미지",
+            "poll": "투표",
+            "video": "동영상"
+        },
+        "preview": "<bold>%(prefix)s:</bold> %(preview)s"
+    },
+    "export_chat": {
+        "cancelled": "내보내기 취소됨",
+        "cancelled_detail": "내보내기가 성공적으로 취소되었습니다.",
+        "confirm_stop": "데이터 내보내기를 중지하시겠습니까? 중지할 경우 처음부터 다시 시작해야 합니다.",
+        "creating_html": "HTML 만들기…",
+        "creating_output": "출력 생성 중…",
+        "creator_summary": "%(creatorName)s님이 이 채팅방을 생성했습니다",
+        "current_timeline": "현재 타임라인",
+        "enter_number_between_min_max": "%(min)s에서 %(max)s 사이의 숫자를 입력하세요.",
+        "error_fetching_file": "파일 가져오기 중 오류 발생",
+        "export_info": "<roomName/> 채팅방 내보내기를 시작합니다. <exporterDetails/>가 %(exportDate)s에 내보냈습니다",
+        "export_successful": "내보내기 성공",
+        "exported_n_events_in_time": {
+            "other": "%(count)s 개의 이벤트를 %(seconds)s 초 만에 내보냄"
+        },
+        "exporting_your_data": "데이터 내보내기",
+        "fetched_n_events": {
+            "other": "지금까지 %(count)s 개의 이벤트를 가져왔습니다."
+        },
+        "fetched_n_events_in_time": {
+            "other": "%(seconds)s초 동안 %(count)s 개의 이벤트를 가져왔습니다."
+        },
+        "fetched_n_events_with_total": {
+            "other": "%(total)s개의 이벤트 중 %(count)s개를 가져왔습니다"
+        },
+        "fetching_events": "이벤트를 가져오는 중…",
+        "file_attached": "첨부 파일",
+        "format": "포맷",
+        "from_the_beginning": "처음부터",
+        "generating_zip": "ZIP 생성",
+        "html": "HTML",
+        "html_title": "내보낸 데이터",
+        "include_attachments": "첨부 파일 포함",
+        "json": "JSON",
+        "media_omitted": "미디어 생략",
+        "media_omitted_file_size": "미디어 생략 - 파일 크기 제한을 초과했습니다.",
+        "messages": "메시지",
+        "next_page": "다음 메시지 그룹",
+        "num_messages": "메시지 수",
+        "num_messages_min_max": "메시지 수는 %(min)s에서 %(max)s 사이의 숫자여야 합니다.",
+        "number_of_messages": "메시지 수를 지정하십시오",
+        "previous_page": "이전 메시지 그룹",
+        "processing": "처리 중...",
+        "processing_event_n": "%(total)s개의 이벤트 중 %(number)s번째 이벤트 처리 중",
+        "select_option": "아래 옵션 중에서 선택하여 타임라인에서 채팅을 내보내세요",
+        "size_limit": "크기 제한",
+        "size_limit_min_max": "크기는 %(min)sMB에서 %(max)sMB 사이의 숫자여야 합니다.",
+        "size_limit_postfix": "MB",
+        "starting_export": "내보내기를 시작합니다…",
+        "successful": "내보내기 성공",
+        "successful_detail": "내보내기가 성공적으로 완료되었습니다. 다운로드 폴더에서 확인하세요.",
+        "text": "일반 텍스트",
+        "title": "대화 내보내기",
+        "topic": "주제:%(topic)s",
+        "unload_confirm": "이 내보내기 작업을 종료하시겠습니까?"
+    },
+    "failed_load_async_component": "불러올 수 없습니다! 네트워크 연결 상태를 확인한 후 다시 시도하세요.",
+    "feedback": {
+        "can_contact_label": "추가 질문이 있으시면 언제든지 연락 주시기 바랍니다.",
+        "comment_label": "의견",
+        "existing_issue_link": "먼저 <existingIssuesLink>Github의 기존 버그</existingIssuesLink>를 확인해 주세요. 일치하는 항목이 없나요? <newIssueLink>새로 등록</newIssueLink>하세요.",
+        "may_contact_label": "추가 문의 사항이 있거나 향후 아이디어를 테스트해 보길 원하시면 연락 주시기 바랍니다.",
+        "platform_username": "플랫폼과 사용자 이름이 기록되며, 이를 통해 피드백을 최대한 활용할 수 있습니다",
+        "pro_type": "팁: 버그를 보고할 경우, 문제를 추적하는 데 도움이 되도록 <debugLogsLink>디버그 로그</debugLogsLink>를 제출해 주세요",
+        "send_feedback_action": "피드백 보내기",
+        "sent": "피드백을 보냈습니다! 감사합니다!"
+    },
+    "file_panel": {
+        "empty_description": "채팅에서 파일을 첨부하거나 채팅방 안 어디든 파일을 드래그 앤 드롭하세요.",
+        "empty_heading": "이 채팅방에는 파일이 없습니다.",
+        "guest_note": "이 기능을 쓰려면 <a>등록</a>해야 합니다",
+        "peek_note": "파일을 보려면 방에 참가해야 합니다"
+    },
+    "forward": {
+        "filter_placeholder": "방 또는 사람 검색",
+        "message_preview_heading": "메시지 미리보기",
+        "no_perms_title": "이 작업을 수행할 권한이 없습니다.",
+        "open_room": "채팅방 열기",
+        "send_label": "보내기",
+        "sending": "전송 중",
+        "sent": "전송됨"
+    },
+    "identity_server": {
+        "change": "ID 서버 변경",
+        "change_prompt": "현재 ID 서버 <current />와의 연결을 끊고 새 ID 서버 <new />에 연결하겠습니까?",
+        "change_server_prompt": "알고 있는 기존 연락처 사람들을 검색하거나 사람들이 당신을 검색할 수 있는 <server />을(를) 쓰고 싶지 않다면, 아래에 다른 ID 서버를 입력하세요.",
+        "changed": "귀하의 ID 서버가 변경되었습니다.",
+        "checking": "서버 확인 중",
+        "description_connected": "현재 <server></server>을(를) 사용하여 알고 있는 기존 연락처 사람들을 검색하거나 사람들이 당신을 검색할 수 있습니다. 아래에서 ID 서버를 변경할 수 있습니다.",
+        "description_disconnected": "현재 ID 서버를 사용하고 있지 않습니다. 알고 있는 기존 연락처 사람들을 검색하거나 사람들이 당신을 검색하려면, 아래에 하나를 추가하세요.",
+        "description_optional": "ID 서버를 사용하는 것은 선택입니다. ID 서버를 사용하지 않는다면, 다른 사용자에게 검색될 수 없고, 이메일과 전화번호로 다른 사람을 초대할 수 없게 됩니다.",
+        "disconnect": "ID 서버 연결 끊기",
+        "disconnect_anyway": "무시하고 연결 끊기",
+        "disconnect_offline_warning": "계정을 해제하기 전에 ID 서버 <idserver />에서 <b>개인 정보를 삭제</b>해야 합니다. 불행하게도 ID 서버 <idserver />가 현재 오프라인이거나 접근할 수 없는 상태입니다.",
+        "disconnect_personal_data_warning_1": "여전히 ID 서버 <idserver />에 <b>개인 정보를 공유</b>하고 있습니다.",
+        "disconnect_personal_data_warning_2": "연결을 끊기 전에 ID 서버에 이메일 주소와 전화번호를 지우기를 권합니다.",
+        "disconnect_server": "ID 서버 <idserver />(으)로부터 연결을 끊겠습니까?",
+        "disconnect_warning": "ID 서버로부터 연결을 끊으면 다른 사용자에게 검색될 수 없고, 이메일과 전화번호로 다른 사람을 초대할 수 없게 됩니다.",
+        "do_not_use": "ID 서버를 사용하지 않기",
+        "error_connection": "ID 서버에 연결할 수 없음",
+        "error_invalid": "올바르지 않은 ID 서버 (상태 코드 %(code)s)",
+        "error_invalid_or_terms": "서비스 약관에 동의하지 않거나 ID 서버가 올바르지 않습니다.",
+        "no_terms": "고른 ID 서버가 서비스 약관을 갖고 있지 않습니다.",
+        "suggestions": "이렇게 하세요:",
+        "suggestions_1": "브라우저 플러그인을 확인하고 (Privacy Badger같은) ID 서버를 막는 것이 있는지 확인하세요",
+        "suggestions_2": "ID 서버 <idserver />의 관리자와 연락하세요",
+        "suggestions_3": "기다리고 나중에 다시 시도하세요",
+        "url": "ID 서버 (%(server)s)",
+        "url_field_label": "새 ID 서버 입력",
+        "url_not_https": "ID 서버 URL은 HTTPS이어야 함"
+    },
+    "in_space": "%(spaceName)s 스페이스에 속함",
+    "in_space1_and_space2": "소속 스페이스: %(space1Name)s, %(space2Name)s",
+    "in_space_and_n_other_spaces": {
+        "other": "%(spaceName)s 외 %(count)s개의 스페이스에 속함"
+    },
+    "incompatible_browser": {
+        "continue": "그래도 계속하시겠습니까?",
+        "description": "%(brand)s가 현재 브라우저에서 지원되지 않는 일부 기능을 사용합니다. %(detail)s",
+        "detail_can_continue": "계속 진행할 경우 일부 기능이 작동하지 않을 수 있으며, 향후 데이터 손실 위험이 있습니다.",
+        "detail_no_continue": "최신 버전을 사용 중이 아니라면 이 브라우저를 업데이트한 후 다시 시도해 보세요.",
+        "learn_more": "더 알아보기",
+        "linux": "리눅스",
+        "macos": "맥",
+        "supported_browsers": "최상의 경험을 위해 다음 브라우저를 사용하세요. <Chrome>크롬</Chrome>, <Firefox>파이어폭스</Firefox>, <Edge>엣지</Edge>, 또는 <Safari>사파리</Safari>.",
+        "title": "%(brand)s 이 브라우저를 지원하지 않습니다",
+        "use_desktop_heading": "%(brand)s 데스크톱 앱 사용 권장",
+        "use_mobile_heading": "모바일에서는 %(brand)s 을 사용하세요",
+        "use_mobile_heading_after_desktop": "또는 모바일 앱을 사용하세요",
+        "windows_64bit": "Windows (64-bit)",
+        "windows_arm_64bit": "Windows (ARM 64-bit)"
+    },
+    "info_tooltip_title": "정보",
+    "integration_manager": {
+        "connecting": "통합 관리자에 연결 중…",
+        "error_connecting": "통합 관리자가 오프라인이거나 당신의 홈서버에서 접근할 수 없습니다.",
+        "error_connecting_heading": "통합 관리자에 연결할 수 없음",
+        "explainer": "통합 관리자는 구성 데이터를 수신하며, 귀하를 대신하여 위젯을 수정하고, 회의실 초대장을 발송하며, 전력 수준을 설정할 수 있습니다.",
+        "manage_title": "통합 관리",
+        "toggle_label": "통합 관리자 활성화",
+        "use_im": "통합 관리자를 사용하여 봇, 위젯 및 스티커 팩을 관리하세요.",
+        "use_im_default": "봇, 위젯, 스티커 팩을 관리하려면 통합 매니저<b>(%(serverName)s)</b>를 이용하세요."
+    },
+    "integrations": {
+        "disabled_dialog_description": "이 작업을 수행하려면 설정에서 '%(manageIntegrations)s'를 활성화하세요.",
+        "disabled_dialog_title": "통합 기능이 비활성화되었습니다",
+        "impossible_dialog_description": "%(brand)s 에서는 통합 관리자를 사용하여 이 작업을 수행할 수 없습니다. 관리자에게 문의하십시오.",
+        "impossible_dialog_title": "통합이 허용되지 않습니다"
+    },
+    "invite": {
+        "ask_anyway_description": "아래에 나열된 매트릭스 ID에 대한 프로필을 찾을 수 없습니다 - 그래도 DM을 시작하시겠습니까?",
+        "ask_anyway_label": "그래도 DM 시작하기",
+        "ask_anyway_never_warn_label": "어쨌든 DM을 시작하고 다시는 경고하지 마세요",
+        "email_caption": "이메일로 초대",
+        "email_limit_one": "이메일 초대는 한 번에 하나씩만 보낼 수 있습니다",
+        "email_use_default_is": "이메일로 초대하기 위해 ID 서버를 사용합니다. <default>기본 (%(defaultIdentityServerName)s)을(를) 사용하거나</default> <settings>설정</settings>에서 관리하세요.",
+        "email_use_is": "이메일로 초대하기 위해 ID 서버를 사용합니다. <settings>설정</settings>에서 관리하세요.",
+        "error_already_invited_room": "사용자는 이미 채팅방에 초대되었습니다.",
+        "error_already_invited_space": "사용자는 이미 해당 스페이스에 초대되었습니다.",
+        "error_already_joined_room": "사용자는 이미 채팅방에 있습니다",
+        "error_already_joined_space": "사용자는 이미 해당 스페이스에 있습니다.",
+        "error_bad_state": "초대하려면 사용자가 출입 금지되지 않은 상태여야 합니다.",
+        "error_dm": "DM을 생성할 수 없습니다.",
+        "error_find_room": "사용자를 초대하는 과정에서 문제가 발생했습니다.",
+        "error_find_user_description": "다음 사용자는 존재하지 않거나 유효하지 않아 초대할 수 없습니다: %(csvNames)s",
+        "error_find_user_title": "다음 사용자를 찾을 수 없습니다.",
+        "error_invite": "해당 사용자를 초대할 수 없습니다. 초대하려는 사용자를 확인한 후 다시 시도해 주세요.",
+        "error_permissions_room": "이 방에 사람을 초대할 권한이 없습니다.",
+        "error_permissions_space": "이 스페이스에 사람을 초대할 권한이 없습니다.",
+        "error_profile_undisclosed": "사용자가 존재할 수도 있고 존재하지 않을 수도 있습니다.",
+        "error_transfer_multiple_target": "통화는 한 명의 사용자에게만 전송될 수 있습니다.",
+        "error_unfederated_room": "이 채팅방은 연동되지 않았습니다. 외부 서버의 사람들을 초대할 수 없습니다.",
+        "error_unfederated_space": "이 스페이스는 연동되지 않았습니다. 외부 서버의 사용자를 초대할 수 없습니다.",
+        "error_unknown": "알 수 없는 서버 오류",
+        "error_user_not_found": "사용자가 존재하지 않습니다.",
+        "error_version_unsupported_room": "사용자의 홈서버가 방의 버전을 호환하지 않습니다.",
+        "error_version_unsupported_space": "사용자의 홈 서버는 해당 스페이스의 버전을 지원하지 않습니다.",
+        "failed_generic": "작업 실패",
+        "failed_title": "초대 실패",
+        "invalid_address": "인식할 수 없는 주소",
+        "name_email_mxid_share_room": "이름, 이메일 주소, 사용자명(예: <userId/>)을 사용하여 다른 사람을 초대하거나, <a>이 채팅방 공유하기</a>.",
+        "name_email_mxid_share_space": "이름, 이메일 주소, 사용자명(예: <userId/>)을 사용하여 다른 사람을 초대하거나, <a>이 스페이스 공유하기</a>.",
+        "name_mxid_share_room": "이름, 사용자명(예: <userId/>)을 사용하여 다른 사람을 초대하거나, <a>이 채팅방 공유하기</a>.",
+        "name_mxid_share_space": "이름, 이메일 주소, 사용자명(예: <userId/>)을 사용하여 다른 사람을 초대하거나, <a>이 스페이스 공유하기</a>.",
+        "progress": {
+            "dont_close": "작업이 완료될 때까지 앱을 닫지 마십시오.",
+            "preparing": "초대장 준비 중..."
+        },
+        "recents_section": "최근 대화 목록",
+        "room_failed_partial": "사용자들은 초대했지만, 아래의 사용자들은 **<RoomName/>**에 초대할 수 없었습니다.",
+        "room_failed_partial_title": "일부 초대장이 발송되지 못했습니다",
+        "room_failed_title": "%(roomName)s에 사용자를 초대하지 못했습니다",
+        "send_link_prompt": "또는 초대 링크 보내기",
+        "start_conversation_name_email_mxid_prompt": "이름, 이메일, 사용자명(<userId/>) 으로 대화를 시작하세요.",
+        "start_conversation_name_mxid_prompt": "이름이나 사용자명(<userId/> 형식)을 사용하는 사람들과 대화를 시작하세요.",
+        "suggestions_disclaimer": "일부 추천 목록은 개인 정보 보호를 위해 보이지 않을 수 있습니다.",
+        "suggestions_disclaimer_prompt": "찾으려는 사람이 보이지 않으면, 아래의 초대링크를 보내세요.",
+        "suggestions_section": "최근 다이렉트 메세지",
+        "to_room": "%(roomName)s 채팅방에 초대",
+        "to_space": "%(spaceName)s에 초대",
+        "transfer_dial_pad_tab": "다이얼패드",
+        "transfer_user_directory_tab": "사용자 디렉토리",
+        "unable_find_profiles_description_default": "아래에 나열된 Matrix ID에서 프로필을 찾을 수 없습니다 - 무시하고 그들을 초대할까요?",
+        "unable_find_profiles_invite_label_default": "무시하고 초대",
+        "unable_find_profiles_invite_never_warn_label_default": "무시하고 초대, 그리고 다시 경고하지 않기",
+        "unable_find_profiles_title": "다음 사용자는 존재하지 않을 수 있습니다",
+        "unban_first_title": "사용자는 차단이 해제되기 전까지는 초대할 수 없습니다."
+    },
+    "inviting_user1_and_user2": "%(user1)s 및 %(user2)s 초대 중",
+    "inviting_user_and_n_others": {
+        "other": "%(user)s 및 다른 %(count)s명 초대 중"
+    },
+    "items_and_n_others": {
+        "<Items/>님 외 한 명": "one",
+        "<Items/>님 외 %(count)s명": "other"
+    },
+    "keyboard": {
+        "activate_button": "선택한 버튼 활성화",
+        "alt": "Alt",
+        "autocomplete_cancel": "자동완성 취소",
+        "autocomplete_force": "강제 완료",
+        "autocomplete_navigate_next": "다음 자동완성 제안",
+        "autocomplete_navigate_prev": "이전 자동완성 제안",
+        "backspace": "Backspace",
+        "cancel_reply": "메시지 답장 취소",
+        "category_autocomplete": "자동 완성",
+        "category_calls": "통화",
+        "category_navigation": "탐색",
+        "category_room_list": "방 목록",
+        "close_dialog_menu": "대화 상자 또는 컨텍스트 메뉴 닫기",
+        "composer_jump_end": "메시지 입력창 맨 끝으로 이동",
+        "composer_jump_start": "메시지 입력창 맨 앞으로 이동",
+        "composer_navigate_next_history": "다음 작성 메시지로 이동",
+        "composer_navigate_prev_history": "이전 작성 메시지로 이동",
+        "composer_new_line": "새 줄",
+        "composer_redo": "편집 다시하기",
+        "composer_toggle_bold": "굵게 전환",
+        "composer_toggle_code_block": "코드 블록 전환",
+        "composer_toggle_italics": "이탤릭체 전환",
+        "composer_toggle_link": "링크 토글",
+        "composer_toggle_quote": "인용 전환",
+        "composer_undo": "편집 취소",
+        "control": "Ctrl",
+        "dismiss_read_marker_and_jump_bottom": "모두 읽음 처리하고 맨 아래로 이동",
+        "end": "End",
+        "enter": "Enter",
+        "escape": "Esc",
+        "go_home_view": "홈 화면으로 이동",
+        "home": "홈",
+        "jump_first_message": "첫 번째 메시지로 이동",
+        "jump_last_message": "마지막 메시지로 이동",
+        "jump_room_search": "채팅방 검색으로 이동",
+        "jump_to_read_marker": "가장 오래된 읽지 않은 메시지로 이동",
+        "keyboard_shortcuts_tab": "이 설정 탭을 엽니다",
+        "navigate_next_history": "최근에 방문한 채팅방 또는 스페이스",
+        "navigate_next_message_edit": "다음 메시지로 이동하여 편집하세요",
+        "navigate_prev_history": "최근에 방문한 채팅방 또는 스페이스",
+        "navigate_prev_message_edit": "이전 메시지로 이동하여 편집하세요",
+        "next_landmark": "다음 랜드마크로 이동",
+        "next_room": "다음 채팅방 또는 DM",
+        "next_unread_room": "다음 읽지 않은 채팅방 또는 DM",
+        "number": "[number]",
+        "open_user_settings": "사용자 설정 열기",
+        "page_down": "Page Down",
+        "page_up": "Page Up",
+        "prev_landmark": "이전 랜드마크로 이동",
+        "prev_room": "이전 채팅방 또는 DM",
+        "prev_unread_room": "이전 안 읽은 채팅방 또는 DM",
+        "room_list_collapse_section": "채팅방 목록 섹션 접기",
+        "room_list_expand_section": "채팅방 목록 섹션 확장",
+        "room_list_navigate_down": "채팅방 목록에서 아래로 이동",
+        "room_list_navigate_up": "채팅방 목록에서 위로 이동",
+        "room_list_select_room": "채팅방 목록에서 선택 하세요",
+        "save": "저장",
+        "scroll_down_timeline": "타임라인 아래로 스크롤",
+        "scroll_up_timeline": "타임라인 위로 스크롤",
+        "search": "검색 (반드시 활성화해야 함)",
+        "send_sticker": "스티커 보내기",
+        "shift": "Shift",
+        "space": "Space",
+        "switch_to_space": "번호를 입력해 스페이스로 이동",
+        "toggle_hidden_events": "숨겨진 이벤트 표시 여부 전환",
+        "toggle_microphone_mute": "마이크 음소거 전환",
+        "toggle_right_panel": "오른쪽 패널 전환",
+        "toggle_space_panel": "스페이스 패널 토글",
+        "toggle_top_left_menu": "왼쪽 상단 메뉴 전환",
+        "toggle_webcam_mute": "웹캠 켜기/끄기",
+        "upload_file": "파일 업로드"
+    },
+    "labs": {
+        "ask_to_join": "참가 요청 허용",
+        "automatic_debug_logs": "오류 발생 시 자동으로 디버그 로그를 전송합니다",
+        "automatic_debug_logs_decryption": "복호화 오류 시 디버그 로그 자동 전송",
+        "automatic_debug_logs_key_backup": "키 백업이 작동하지 않을 때 디버그 로그를 자동으로 전송합니다",
+        "beta_description": "%(brand)s 의 다음 단계는 무엇일까요? Labs는 새로운 기능을 가장 먼저 접하고 테스트해 볼 수 있는 최고의 방법이며, 정식 출시 전에 기능 개발에 기여할 수 있는 기회입니다.",
+        "beta_feature": "이것은 베타 기능입니다",
+        "beta_feedback_leave_button": "베타를 종료하려면 설정을 방문하세요.",
+        "beta_feedback_title": "%(featureName)s 베타 피드백",
+        "beta_section": "예정된 기능",
+        "bridge_state": "채팅방 설정에서 브리지 정보를 확인하세요",
+        "bridge_state_channel": "채널:<channelLink/>",
+        "bridge_state_creator": "이 브리지는 <user /> 에서 제공되었습니다.",
+        "bridge_state_manager": "이 브리지는 <user /> 에서 관리합니다.",
+        "bridge_state_workspace": "작업 공간:<networkLink/>",
+        "click_for_info": "자세한 내용을 보려면 클릭하세요",
+        "currently_experimental": "현재 실험 중입니다.",
+        "custom_themes": "사용자 정의 테마 추가 지원",
+        "dynamic_room_predecessors": "동적 채팅방 이전 항목",
+        "dynamic_room_predecessors_description": "MSC3946 활성화 (지연 도착 채팅방 아카이브 지원)",
+        "element_call_video_rooms": "Element Call 영상 채팅방",
+        "encrypted_state_events": "암호화된 상태 이벤트(MSC4362)",
+        "encrypted_state_events_description": "상태 이벤트 암호화 실험 기능을 활성화하여 방 이름, 주제 등의 메타데이터를 서버로부터 숨깁니다. 단, 나중에 방에 참여하는 사용자나 MSC4362를 지원하지 않는 클라이언트 사용자에게는 이 정보가 표시되지 않습니다.",
+        "exclude_insecure_devices": "메세지 송수신 시 보안이 취약한 기기 제외",
+        "exclude_insecure_devices_description": "이 모드가 활성화되면 암호화된 메시지는 인증되지 않은 기기와 공유되지 않으며, 인증되지 않은 기기에서 보낸 메시지는 오류로 표시됩니다. 이 모드를 활성화하면 기기를 인증하지 않은 사용자와 통신할 수 없게 될 수 있음을 유의하십시오.",
+        "experimental_description": "실험적인 기분이 드시나요? 개발 중인 최신 아이디어를 시험해 보세요. 이 기능들은 아직 완성되지 않았으며, 불안정할 수 있고 변경되거나 아예 중단될 수도 있습니다. <a>자세히 알아보기</a>.",
+        "experimental_section": "조기 시연",
+        "extended_profiles_msc_support": "서버가 MSC4133을 지원해야 합니다.",
+        "feature_disable_call_per_sender_encryption": "Element 통화에서 발신자별 암호화 비활성화",
+        "feature_wysiwyg_composer_description": "메시지 작성기에서 Markdown 대신 서식 있는 텍스트를 사용하세요",
+        "group_calls": "그룹 통화 새 기능",
+        "group_developer": "개발자",
+        "group_encryption": "암호화",
+        "group_experimental": "실험적 기능",
+        "group_messaging": "메시지",
+        "group_moderation": "관리",
+        "group_profile": "프로필",
+        "group_rooms": "방",
+        "group_spaces": "스페이스",
+        "group_themes": "테마",
+        "group_threads": "스레드",
+        "group_ui": "사용자 인터페이스",
+        "group_voip": "음성 & 영상",
+        "group_widgets": "위젯",
+        "hidebold": "알림 점 숨기기 (카운터 배지만 표시)",
+        "html_topic": "채팅방 주제의 HTML 표현 표시",
+        "join_beta": "베타 참여",
+        "join_beta_reload": "베타에 참여하면 %(brand)s 페이지가 다시 로드됩니다.",
+        "jump_to_date": "날짜로 이동 ( /jumptodate 명령어 및 날짜 이동 헤더 추가 )",
+        "jump_to_date_msc_support": "서버가 MSC3030을 지원해야 합니다.",
+        "latex_maths": "메시지에 LaTeX 수식을 렌더링합니다",
+        "leave_beta": "베타를 종료하세요",
+        "leave_beta_reload": "베타를 종료하면 %(brand)s 가 다시 로드됩니다.",
+        "location_share_live": "실시간 위치 공유",
+        "location_share_live_description": "임시 구현. 위치는 채팅방 기록에 유지됩니다.",
+        "mjolnir": "새로운 차단/무시 기능",
+        "msc3531_hide_messages_pending_moderation": "관리자가 검토 대기 중인 메시지를 숨길 수 있도록 하십시오.",
+        "new_room_list": "새 채팅방 목록 활성화",
+        "notification_settings": "새 알림 설정",
+        "notification_settings_beta_caption": "더욱 간편해진 알림 설정 방법을 만나보세요. 원하는 대로, 당신의 취향에 맞게 %(brand)s을(를) 설정할 수 있습니다.",
+        "notification_settings_beta_title": "알림 설정",
+        "notifications": "방 헤더에서 알림 패널 활성화",
+        "release_announcement": "출시 공지",
+        "render_reaction_images": "반응에 사용자 정의 이미지 렌더링",
+        "render_reaction_images_description": "때로는 \"사용자 정의 이모지\"라고도 불립니다.",
+        "report_to_moderators": "관리자에게 신고하기",
+        "report_to_moderators_description": "운영자가 관리하는 방에서는 '신고' 버튼으로 관리자에게 문제를 신고할 수 있습니다.",
+        "share_history_on_invite": "새 멤버에게 암호화 된 기록을 공유합니다.",
+        "share_history_on_invite_description": "기록 공개 설정이 '공유'로 설정된 암호화된 방으로 사용자를 초대할 때, 해당 사용자와 암호화된 기록을 공유하고, 그러한 방에 초대받았을 때는 암호화된 기록을 수락하세요.",
+        "share_history_on_invite_warning": "이 기능은 실험용 기능으로, 모든 보안 조치가 구현되어 있지는 않습니다. 실제 운영 계정에서는 활성화하지 마십시오.",
+        "sliding_sync": "슬라이딩 동기화 모드",
+        "sliding_sync_description": "개발 진행 중인 기능이며 비활성화는 불가능합니다. 현재 Element Call 기능은 지원하지 않습니다.",
+        "sliding_sync_disabled_notice": "비활성화하려면 로그아웃 후 다시 로그인하세요.",
+        "sliding_sync_server_no_support": "서버에서 지원하지 않는 기능입니다.",
+        "under_active_development": "활발한 개발 중입니다.",
+        "unrealiable_e2e": "암호화된 방에서는 신뢰할 수 없음",
+        "video_rooms": "영상채팅방",
+        "video_rooms_a_new_way_to_chat": "%(brand)s에서 음성 및 영상으로 채팅하는 새로운 방법",
+        "video_rooms_always_on_voip_channels": "영상 채팅방은 %(brand)s의 채팅방 내에 내장된 항상 활성화된 VoIP 채널입니다",
+        "video_rooms_beta": "영상 방은 베타 기능입니다",
+        "video_rooms_faq1_answer": "왼쪽 패널의 채팅방 섹션에 있는 \"+\" 버튼을 사용하세요.",
+        "video_rooms_faq1_question": "동영 채팅방을 어떻게 만들 수 있나요?",
+        "video_rooms_faq2_answer": "네, 채팅 타임라인이 영상과 함께 표시됩니다.",
+        "video_rooms_faq2_question": "영상 통화 중에도 텍스트 채팅을 함께 사용할 수 있나요?",
+        "video_rooms_feedbackSubheading": "베타 버전을 사용해 주셔서 감사합니다. 개선을 위해 가능한 한 상세하게 알려주시기 바랍니다.",
+        "wysiwyg_composer": "서식 있는 텍스트 편집기"
+    },
+    "labs_mjolnir": {
+        "advanced_warning": "⚠ 이 설정은 고급 사용자를 위한 것입니다.",
+        "ban_reason": "무시됨/차단됨",
+        "error_adding_ignore": "무시한 사용자/서버 추가 중 오류",
+        "error_adding_list_description": "방 ID 또는 주소를 확인한 후 다시 시도해 주세요.",
+        "error_adding_list_title": "목록으로 구독하는 중 오류",
+        "error_removing_ignore": "무시한 사용자/서버를 지우는 중 오류",
+        "error_removing_list_description": "다시 시도하거나 콘솔을 통해 원인을 알아봐주세요.",
+        "error_removing_list_title": "목록에서 구독 해제 중 오류",
+        "explainer_1": "무시하고 싶은 사용자와 서버를 여기에 추가하세요. 별표(*)를 사용해서 %(brand)s이 이름과 문자를 맞춰볼 수 있습니다. 예를 들어, <code>@bot:*</code>이라면 모든 서버에서 'bot'이라는 문자를 가진 이름의 모든 사용자를 무시합니다.",
+        "explainer_2": "차단당하는 사람은 규칙에 따라 차단 목록을 통해 무시됩니다. 차단 목록을 구독하면 그 목록에서 차단당한 사용자/서버를 당신으로부터 감추게됩니다.",
+        "lists": "현재 구독 중임:",
+        "lists_description_1": "차단 목록을 구독하면 차단 목록에 참여하게 됩니다!",
+        "lists_description_2": "이것을 원한 것이 아니라면, 사용자를 무시하는 다른 도구를 사용해주세요.",
+        "lists_heading": "구독 목록",
+        "lists_new_label": "방 ID 또는 차단 목록 주소",
+        "no_lists": "어느 목록에도 구독하고 있지 않습니다",
+        "personal_description": "개인 차단 목록은 회원님이 메시지를 받고 싶지 않은 모든 사용자 및 서버의 명단입니다. 첫 사용자 또는 서버를 차단하면, 채팅방 목록에 '%(myBanList)s'이라는 이름의 새로운 방이 나타납니다. 차단 효과를 계속 유지하려면 이 방에 참여 상태로 남아 있어야 합니다.",
+        "personal_empty": "아무도 무시하고 있지 않습니다.",
+        "personal_heading": "개인 차단 목록",
+        "personal_new_label": "무시할 서버 또는 사용자 ID",
+        "personal_new_placeholder": "예: @bot:* 또는 example.org",
+        "personal_section": "현재 무시하고 있음:",
+        "room_name": "차단 목록",
+        "room_topic": "차단한 사용자/서버 목록입니다 - 방을 떠나지 마세요!",
+        "rules_empty": "없음",
+        "rules_server": "서버 규칙",
+        "rules_title": "차단 목록 규칙 - %(roomName)s",
+        "rules_user": "사용자 규칙",
+        "something_went_wrong": "무언가 잘못되었습니다. 다시 시도하거나 콘솔을 통해 원인을 알아봐주세요.",
+        "title": "무시한 사용자",
+        "view_rules": "규칙 보기"
+    },
+    "language_dropdown_label": "언어 드롭다운",
+    "leave_room_dialog": {
+        "last_person_warning": "이 채팅방에는 당신만 있습니다. 나가면 앞으로 아무도 참여할 수 없으며, 당신도 다시 들어올 수 없습니다",
+        "leave_room_question": "%(roomName)s 방을 떠나겠습니까?",
+        "leave_space_question": "'%(spaceName)s' 스페이스를 정말로 떠나시겠습니까?",
+        "room_leave_admin_warning": "이 채팅방의 유일한 관리자입니다. 당신이 나가면 아무도 채팅방 설정을 변경하거나 다른 중요한 작업을 수행할 수 없습니다.",
+        "room_leave_mod_warning": "이 채팅방의 유일한 운영자입니다. 운영자가 방을 떠나면, 아무도 방 설정을 변경하거나 다른 중요한 작업을 수행할 수 없습니다.",
+        "room_rejoin_warning": "이 방은 공개되지 않았습니다. 초대 없이는 다시 들어올 수 없습니다.",
+        "space_rejoin_warning": "이 스페이스는 공개되지 않습니다. 초대 없이는 다시 참여할 수 없습니다."
+    },
+    "left_panel": {
+        "open_dial_pad": "다이얼 패드 열기"
+    },
+    "lightbox": {
+        "rotate_left": "왼쪽으로 회전",
+        "rotate_right": "오른쪽으로 회전",
+        "title": "이미지 보기"
+    },
+    "location_sharing": {
+        "MapStyleUrlNotConfigured": "이 홈 서버는 지도를 표시하도록 설정되어 있지 않습니다.",
+        "MapStyleUrlNotReachable": "이 홈 서버는 지도를 표시하도록 올바르게 구성되지 않았거나, 구성된 지도 서버에 연결할 수 없을 수 있습니다.",
+        "WebGLNotEnabled": "지도를 표시하려면 WebGL이 필요합니다. 브라우저 설정에서 WebGL을 활성화해 주세요.",
+        "click_drop_pin": "핀을 놓으려면 클릭하세요",
+        "click_move_pin": "핀을 이동하려면 클릭하세요",
+        "close_sidebar": "사이드바 닫기",
+        "error_fetch_location": "위치를 가져올 수 없습니다",
+        "error_no_perms_description": "이 방에서 위치를 공유하려면 적절한 권한이 필요합니다.",
+        "error_no_perms_title": "위치 공유 권한이 없습니다.",
+        "error_send_description": "%(brand)s 현재 위치를 전송할 수 없습니다. 나중에 다시 시도해 주세요.",
+        "error_send_title": "귀하의 위치를 전송할 수 없습니다",
+        "error_sharing_live_location": "실시간 위치 공유 중 오류가 발생했습니다",
+        "error_stopping_live_location": "실시간 위치 중지 중 오류가 발생했습니다",
+        "expand_map": "지도 확대",
+        "failed_generic": "위치 정보를 가져오는 데 실패했습니다. 나중에 다시 시도해 주세요.",
+        "failed_load_map": "지도를 불러올 수 없습니다",
+        "failed_permission": "%(brand)s 위치 정보 수집이 거부되었습니다. 브라우저 설정에서 위치 정보 접근을 허용해 주세요.",
+        "failed_timeout": "위치 정보를 가져오는 중 시간 초과가 발생했습니다. 나중에 다시 시도해 주세요.",
+        "failed_unknown": "위치 가져오기 중 알 수 없는 오류가 발생했습니다. 나중에 다시 시도해 주세요.",
+        "find_my_location": "내 위치 찾기",
+        "live_description": "%(displayName)s실시간 위치",
+        "live_enable_description": "참고: 이 기능은 임시 구현을 사용하는 실험 기능입니다. 즉, 위치 기록을 삭제할 수 없으며, 고급 사용자는 실시간 위치 공유를 중지한 후에도 해당 방에서 귀하의 위치 기록을 볼 수 있습니다.",
+        "live_enable_heading": "실시간 위치 공유 중",
+        "live_location_active": "현재 위치 정보를 공유 중입니다",
+        "live_location_enabled": "실시간 위치 정보 활성화됨",
+        "live_location_ended": "실시간 위치 종료됨",
+        "live_location_error": "실시간 위치 오류",
+        "live_locations_empty": "실시간 위치 정보 없음",
+        "live_share_button": "공유하기 %(duration)s",
+        "live_toggle_label": "실시간 위치 공유 활성화",
+        "live_until": "%(expiryTime)s에 공유 만료",
+        "live_update_time": "%(humanizedUpdateTime)s에 업데이트됨",
+        "loading_live_location": "실시간 위치 불러오는 중…",
+        "location_not_available": "위치를 사용할 수 없습니다.",
+        "map_feedback": "지도 피드백",
+        "mapbox_logo": "맵박스 로고",
+        "reset_bearing": "방위를 북쪽으로 재설정",
+        "share_button": "위치 공유",
+        "share_type_live": "내 실시간 위치",
+        "share_type_own": "내 현재 위치",
+        "share_type_pin": "핀 놓기",
+        "share_type_prompt": "어떤 위치 유형을 공유하시겠습니까?",
+        "toggle_attribution": "속성 전환"
+    },
+    "member_list": {
+        "count": {
+            "other": "%(count)s명의 사용자"
+        },
+        "filter_placeholder": "방 구성원 필터",
+        "invite_button_no_perms_tooltip": "사용자를 초대할 권한이 없습니다.",
+        "invited_label": "초대됨",
+        "list_title": "구성원 목록",
+        "no_matches": "일치 항목 없음"
+    },
+    "member_list_back_action_label": "방 구성원",
+    "message_edit_dialog_title": "메시지 편집",
+    "migrating_crypto": "잠시만 기다려 주세요. %(brand)s 의 암호화 속도와 안정성을 개선하기 위해 업데이트 중입니다.",
+    "mobile_guide": {
+        "toast_accept": "앱 사용하기",
+        "toast_description": "모바일 웹 브라우저에서 사용하는 %(brand)s은(는) 아직 실험 단계에 있습니다. 더 나은 사용 환경과 최신 기능을 원하시면 무료 공식 앱을 이용해 보세요.",
+        "toast_title": "앱을 사용하면 더 나은 경험을 할 수 있습니다"
+    },
+    "name_and_id": "%(name)s (%(userId)s)",
+    "no_more_results": "더 이상 결과 없음",
+    "notif_panel": {
+        "empty_description": "표시되는 알림이 없습니다.",
+        "empty_heading": "모두 확인했습니다!"
+    },
+    "notifications": {
+        "all_messages": "모든 메시지",
+        "all_messages_description": "모든 메세지 알림을 받습니다",
+        "class_global": "글로벌",
+        "class_other": "기타",
+        "default": "기본",
+        "default_settings": "기본 설정과 일치",
+        "email_pusher_app_display_name": "이메일 알림",
+        "enable_prompt_toast_description": "데스크톱 알림 활성화",
+        "enable_prompt_toast_title": "알림",
+        "enable_prompt_toast_title_from_message_send": "답변을 놓치지 마세요",
+        "error_change_title": "알림 설정 변경",
+        "keyword": "키워드",
+        "keyword_new": "새로운 키워드",
+        "level_activity": "활동",
+        "level_highlight": "하이라이트",
+        "level_muted": "음소거",
+        "level_none": "설정 안 함",
+        "level_notification": "알림",
+        "level_unsent": "보내지 않음",
+        "mark_all_read": "모두 읽음으로 표시",
+        "mentions_and_keywords": "@멘션(언급) & 키워드",
+        "mentions_and_keywords_description": "<a>설정</a>에서 지정한 멘션과 키워드인 경우에만 알림을 받습니다",
+        "mentions_keywords": "멘션 및 키워드",
+        "message_didnt_send": "메시지가 전송되지 않았습니다. 자세한 내용은 클릭하세요.",
+        "mute_description": "어떤 알람도 받지 않습니다",
+        "mute_room": "채팅방 음소거"
+    },
+    "notifier": {
+        "m.key.verification.request": "%(name)s님이 인증을 요청하고 있습니다"
+    },
+    "onboarding": {
+        "create_room": "그룹 대화 생성하기",
+        "explore_rooms": "공개 방 살펴보기",
+        "has_avatar_label": "좋아요, 그럼 사람들이 그게 당신이라는 걸 알 수 있겠네요",
+        "intro_byline": "대화를 주도하라.",
+        "intro_welcome": "환영합니다 %(appName)s",
+        "no_avatar_label": "사진을 추가해서 사람들이 당신임을 알 수 있게 하세요.",
+        "send_dm": "다이렉트 메세지 보내기",
+        "welcome_detail": "지금 시작할 수 있도록 도와드릴께요",
+        "welcome_user": "환영합니다 %(name)s님"
+    },
+    "pill": {
+        "permalink_other_room": "%(room)s의 메시지",
+        "permalink_this_room": "%(user)s의 메시지"
+    },
+    "poll": {
+        "create_poll_action": "투표 만들기",
+        "create_poll_title": "투표 만들기",
+        "disclosed_notes": "사용자들은 투표를 마치자마자 결과를 확인할 수 있습니다",
+        "edit_poll_title": "투표 수정",
+        "end_description": "이 투표를 종료하시겠습니까? 이렇게 하면 설문의 최종 결과가 표시되고 더 이상 투표할 수 없게 됩니다.",
+        "end_message": "투표가 종료되었습니다. 최다 선택 답변: %(topAnswer)s",
+        "end_message_no_votes": "투표가 종료되었습니다. 투표가 이루어지지 않았습니다.",
+        "end_title": "투표 종료",
+        "error_ending_description": "죄송합니다. 투표가 종료되지 않았습니다. 다시 시도해 주세요.",
+        "error_ending_title": "투표 종료 실패",
+        "error_voting_description": "죄송합니다. 투표가 등록되지 않았습니다. 다시 시도해 주세요.",
+        "error_voting_title": "투표가 등록되지 않았습니다",
+        "failed_send_poll_description": "죄송합니다. 생성하신 투표가 게시되지 않았습니다.",
+        "failed_send_poll_title": "투표 게시 실패",
+        "notes": "투표가 종료될 때만 결과가 공개됩니다",
+        "options_add_button": "옵션 추가",
+        "options_heading": "옵션 만들기",
+        "options_label": "옵션%(number)s",
+        "options_placeholder": "옵션을 작성하세요",
+        "topic_heading": "투표 질문이나 주제는 무엇입니까?",
+        "topic_label": "질문 또는 주제",
+        "topic_placeholder": "글 작성하기",
+        "total_decryption_errors": "복호화 오류로 인해 일부 투표가 집계되지 않을 수 있습니다",
+        "total_n_votes": {
+            "other": "%(count)s 투표 완료. 결과를 보려면 투표하세요."
+        },
+        "total_n_votes_voted": {
+            "other": "%(count)s 표 기준"
+        },
+        "total_no_votes": "투표가 이루어지지 않음",
+        "total_not_ended": "투표가 종료되면 결과가 표시됩니다",
+        "type_closed": "마감된 투표",
+        "type_heading": "투표 유형",
+        "type_open": "진행 중인 투표",
+        "unable_edit_description": "투표가 진행된 후에는 설문을 수정할 수 없습니다.",
+        "unable_edit_title": "투표 편집 불가"
+    },
+    "power_level": {
+        "admin": "관리자",
+        "creator": "소유자",
+        "custom": "맞춤 (%(level)s)",
+        "custom_level": "맞춤 등급",
+        "default": "기본",
+        "label": "권한 등급",
+        "moderator": "조정자",
+        "restricted": "제한됨"
+    },
+    "powered_by_matrix": "Powered by Matrix",
+    "powered_by_matrix_with_logo": "분산형, 암호화된 채팅 및 협업 플랫폼 $matrixLogo",
+    "presence": {
+        "away": "자리 비움",
+        "busy": "다른 용무 중",
+        "idle": "대기 중",
+        "idle_for": "%(duration)s 동안 대기 중",
+        "offline": "접속 없음",
+        "offline_for": "%(duration)s 동안 오프라인",
+        "online": "접속 중",
+        "online_for": "%(duration)s 동안 온라인",
+        "unknown": "알 수 없음",
+        "unknown_for": "%(duration)s 동안 어떤지 모름",
+        "unreachable": "사용자의 서버에 연결할 수 없습니다."
+    },
+    "quick_settings": {
+        "all_settings": "전체 설정",
+        "metaspace_section": "사이드바 고정",
+        "sidebar_settings": "추가 옵션",
+        "title": "빠른 설정"
+    },
+    "quit_warning": {
+        "call_in_progress": "전화 중인데, 끊겠습니까?",
+        "file_upload_in_progress": "파일을 업로드 중인데, 그만두겠습니까?"
+    },
+    "redact": {
+        "confirm_button": "삭제 확인",
+        "confirm_description": "이 이벤트를 정말로 삭제하시겠습니까?",
+        "confirm_description_state": "이와 같은 채팅방 변경 사항을 제거하면 변경 내용이 취소될 수 있습니다",
+        "error": "이 메시지를 삭제할 수 없습니다. (%(code)s)",
+        "ongoing": "제거 중…",
+        "reason_label": "이유(선택 사항)"
+    },
+    "report_content": {
+        "description": "이 메시지를 신고하면 고유 '이벤트 ID'를 홈서버의 관리자에게 보내게 됩니다. 이 방의 메시지가 암호화되어 있다면, 홈서버 관리자는 메시지 문자를 읽거나 파일 혹은 사진을 볼 수 없습니다.",
+        "disagree": "동의 안 함",
+        "error_create_room_moderation_bot": "모더레이션 봇과 함께 채팅방을 생성할 수 없습니다",
+        "hide_messages_from_user": "이 사용자로부터 현재 및 향후 모든 메시지를 숨기려면 선택하십시오.",
+        "ignore_user": "사용자 무시",
+        "illegal_content": "불법 콘텐츠",
+        "missing_reason": "왜 신고하는 지 이유를 적어주세요.",
+        "nature": "부적절한 메시지의 유형을 선택하고, 해당 메시지가 왜 부적절한지 설명해 주세요.",
+        "nature_disagreement": "이 사용자가 작성한 내용은 잘못되었습니다.\n이 내용은 채팅방 관리자에게 신고될 것입니다.",
+        "nature_illegal": "이 사용자는 개인 정보를 유출하거나 폭력을 행사하겠다고 위협하는 등 불법적인 행동을 보이고 있습니다. 이 사실은 채팅방 운영자에게 신고되며, 운영자는 사법 당국에 신고할 수 있습니다.",
+        "nature_nonstandard_admin": "이 방은 불법 또는 유해한 콘텐츠를 게시하거나, 운영진이 불법 또는 유해한 콘텐츠를 적절히 관리하지 못하는 경우에 해당됩니다.\n해당 사항은 %(homeserver)s 관리자에게 신고될 예정입니다.",
+        "nature_nonstandard_admin_encrypted": "이 채팅방은 불법 또는 유해한 콘텐츠를 다루거나, 관리자가 불법/유해 콘텐츠를 적절히 관리하지 못하는 방입니다. 이는 %(homeserver)s 관리자로 신고됩니다. 관리자는 이 채팅방의 암호화된 내용을 열람할 수 없습니다.",
+        "nature_other": "기타 사유. 문제를 설명해 주세요.\n이 내용은 채팅방 관리자에게 보고될 예정입니다.",
+        "nature_spam": "이 사용자는 광고, 광고 링크 또는 선전성 링크로 채팅방을 스팸하고 있습니다. 이는 채팅방 관리자에게 신고될 예정입니다.",
+        "nature_toxic": "이 사용자는 다른 사용자를 모욕하거나 가족 친화적인 채팅방에서 성인 전용 콘텐츠를 공유하는 등 채팅방 규칙을 위반하는 유해한 행동을 하고 있습니다. 이는 채팅방 관리자에게 신고될 예정입니다.",
+        "other_label": "기타",
+        "report_content_to_homeserver": "홈서버 관리자에게 내용 신고하기",
+        "report_entire_room": "채팅방 전체 신고",
+        "spam_or_propaganda": "스팸 또는 광고",
+        "toxic_behaviour": "유해한 행동"
+    },
+    "report_room": {
+        "description": "이 채팅방을 계정 제공자에게 신고하세요. 메시지가 암호화된 경우, 관리자는 내용을 확인할 수 없습니다",
+        "reason_label": "이유를 설명하세요"
+    },
+    "restore_key_backup_dialog": {
+        "count_of_decryption_failures": "%(failedCount)s개의 세션 복호화에 실패했습니다!",
+        "count_of_successfully_restored_keys": "%(sessionCount)s 키를 성공적으로 복원했습니다.",
+        "enter_key_description": "복구 키를 입력하여 보안 메시지 기록에 접근하고 보안 메시징을 설정하세요.",
+        "enter_key_title": "복구 키를 입력하세요",
+        "enter_phrase_description": "보안 문구를 입력하여 보안 메시지 기록에 접근하고 보안 메시징을 설정하세요.",
+        "enter_phrase_title": "보안 문구를 입력하세요",
+        "incorrect_security_phrase_dialog": "이 보안 문구로 백업을 복호화할 수 없습니다: 올바른 보안 문구를 입력했는지 확인하십시오.",
+        "incorrect_security_phrase_title": "잘못된 보안 문구",
+        "key_backup_warning": "<b>경고</b>: 신뢰할 수 있는 컴퓨터에서만 키 백업을 설정해야 합니다.",
+        "key_fetch_in_progress": "서버에서 키 가져오기 중…",
+        "key_forgotten_text": "복구 키를 잊으셨다면, <button>새 복구 옵션을 설정</button>할 수 있습니다",
+        "key_is_invalid": "유효하지 않은 복구 키입니다.",
+        "key_is_valid": "이것은 유효한 복구 키로 보입니다!",
+        "keys_restored_title": "키 복원됨",
+        "load_error_content": "백업 상태 불러올 수 없음",
+        "load_keys_progress": "%(total)s개 키 중 %(completed)s개 복원 완료",
+        "no_backup_error": "백업을 찾을 수 없습니다!",
+        "phrase_forgotten_text": "보안 문구를 잊으셨다면, <button1>복구 키를 사용</button1>하거나 <button2>새 복구 옵션을 설정</button2>할 수 있습니다",
+        "recovery_key_mismatch_description": "이 복구 키로 백업을 해독할 수 없습니다: 올바른 복구 키를 입력했는지 확인하십시오.",
+        "recovery_key_mismatch_title": "복구 키 불일치",
+        "restore_failed_error": "백업을 복구할 수 없음"
+    },
+    "right_panel": {
+        "add_integrations": "확장 기능 추가",
+        "add_topic": "주제 추가",
+        "extensions_button": "확장 기능",
+        "extensions_empty_description": "이 방에 확장 프로그램을 찾아 추가하려면 \"%(addIntegrations)s\"를 선택하세요.",
+        "extensions_empty_title": "더 많은 도구, 위젯 및 봇으로 생산성을 높이세요",
+        "files_button": "파일 목록",
+        "pinned_messages": {
+            "empty_description": "메시지를 선택하고 여기에 포함시키려면 \"%(pinAction)s\"를 선택하세요.",
+            "empty_title": "중요한 메시지를 고정하여 쉽게 찾을 수 있도록 합니다",
+            "header": {
+                "other": "%(count)s개의 고정 메시지"
+            },
+            "limits": {
+                "other": "%(count)s 개의 위젯만 고정할 수 있습니다"
+            },
+            "menu": "메뉴 열기",
+            "reply_thread": "<link>스레드 메시지에 답장</link>",
+            "unpin_all": {
+                "button": "모든 메시지 고정 해제",
+                "content": "모든 고정된 메시지를 정말로 제거하시겠습니까? 이 작업은 되돌릴 수 없습니다.",
+                "title": "모든 메세지를 고정 해제하시겠습니까?"
+            },
+            "view": "타임라인에서 보기"
+        },
+        "pinned_messages_button": "고정된 메세지",
+        "poll": {
+            "active_heading": "실시간 투표",
+            "empty_active": "이 방에는 진행 중인 투표가 없습니다",
+            "empty_active_load_more": "현재 진행 중인 투표가 없습니다. 이전 달의 투표를 보려면 더 많은 투표를 불러오세요.",
+            "empty_active_load_more_n_days": {
+                "other": "지난 %(count)s 일 동안 진행 중인 투표가 없습니다. 이전 달의 투표를 보려면 더 많은 투표를 불러오세요."
+            },
+            "empty_past": "이 방에는 과거의 투표 기록이 없습니다",
+            "empty_past_load_more": "과거 투표는 없습니다. 이전 달의 투표를 보려면 더 많은 투표를 불러오세요.",
+            "empty_past_load_more_n_days": {
+                "other": "지난 %(count)s 일 동안의 과거 투표는 없습니다. 이전 달의 투표를 보려면 더 많은 투표를 불러오세요."
+            },
+            "final_result": {
+                "other": "%(count)s 명의 투표를 바탕으로 한 최종 결과"
+            },
+            "load_more": "더 많은 투표 보기",
+            "loading": "투표 로딩 중",
+            "past_heading": "지난 투표",
+            "view_in_timeline": "타임라인에서 투표 보기",
+            "view_poll": "투표 보기"
+        },
+        "polls_button": "투표",
+        "room_summary_card": {
+            "title": "방 정보"
+        },
+        "thread_list": {
+            "context_menu_label": "스레드 옵션"
+        },
+        "video_room_chat": {
+            "title": "채팅"
+        }
+    },
+    "room": {
+        "3pid_invite_email_not_found_account": "이 초대장은 귀하의 계정과 연결되지 않은 %(email)s 으로 발송되었습니다.",
+        "3pid_invite_email_not_found_account_room": "당신의 계정과 관계없는 %(email)s님으로 %(roomName)s으로의 초대를 보냈습니다",
+        "3pid_invite_error_description": "초대 유효성을 검사하는 중에 오류(%(errcode)s)가 발생했습니다. 이 정보를 회원님을 초대한 사람에게 전달하면 문제 해결에 도움이 될 수 있습니다.",
+        "3pid_invite_error_invite_action": "무시하고 참가 시도",
+        "3pid_invite_error_invite_subtitle": "초대받은 사람만 참가할 수 있습니다.",
+        "3pid_invite_error_public_subtitle": "여기에 아직 가입할 수 있습니다.",
+        "3pid_invite_error_title": "초대에 문제가 발생했습니다.",
+        "3pid_invite_error_title_room": "%(roomName)s 방으로의 초대에 문제가 있음",
+        "3pid_invite_no_is_subtitle": "설정에서 ID 서버를 사용해 %(brand)s에서 직접 초대를 받을 수 있습니다.",
+        "banned_by": "당신은 %(memberName)s에 의해 차단 당했습니다.",
+        "banned_from_room_by": "%(roomName)s 방에서 %(memberName)s님에 의해 출입 금지 당했습니다",
+        "context_menu": {
+            "copy_link": "방 링크 복사",
+            "favourite": "즐겨찾기",
+            "forget": "방 지우기",
+            "low_priority": "중요하지 않음",
+            "mark_read": "읽음으로 표시",
+            "mark_unread": "읽지 않음으로 표시",
+            "notifications_default": "기본 설정과 일치",
+            "notifications_mute": "음소거 방",
+            "title": "방 옵션",
+            "unfavourite": "즐겨찾기 됨"
+        },
+        "creating_room_text": "%(names)s님과의 채팅방을 만드는 중입니다.",
+        "dm_invite_action": "채팅 시작하기",
+        "dm_invite_subtitle": "<userName/>님이 대화를 원해요",
+        "dm_invite_title": "%(user)s님과 대화하겠습니까?",
+        "drop_file_prompt": "업로드할 파일을 여기에 놓으세요",
+        "edit_topic": "주제 편집",
+        "error_3pid_invite_email_lookup": "이메일로 사용자를 찾을 수 없습니다",
+        "error_cancel_knock_title": "취소 실패",
+        "error_join_403": "이 방에 접근하려면 초대장이 필요합니다.",
+        "error_join_404_1": "방 ID만 입력하고 연결할 서버 목록을 제공하지 않은 상태로 방에 참여하려고 시도했습니다. 방 ID는 내부 식별자이므로 추가 정보 없이는 방에 참여할 수 없습니다.",
+        "error_join_404_2": "방 주소를 알고 있다면, 그 주소를 통해 접속해 보세요.",
+        "error_join_404_invite": "초대해 준 사람이 이미 떠났거나, 그들의 서버가 오프라인 상태입니다.",
+        "error_join_404_invite_same_hs": "당신을 초대한 사람은 이미 나갔습니다.",
+        "error_join_connection": "조인 과정에서 오류가 발생했습니다.",
+        "error_join_incompatible_version_1": "죄송합니다. 귀하의 홈서버가 너무 오래되어 여기에 참여할 수 없습니다.",
+        "error_join_incompatible_version_2": "홈서버 관리자에게 연락하세요.",
+        "error_join_title": "참가에 실패했습니다",
+        "error_jump_to_date": "서버가 %(statusCode)s 상태 코드와 %(errorCode)s 오류 코드를 반환했습니다.",
+        "error_jump_to_date_connection": "지정된 날짜를 찾아 이동하는 과정에서 네트워크 오류가 발생했습니다. 홈서버가 다운되었거나 인터넷 연결에 일시적인 문제가 있을 수 있습니다. 다시 시도해 주세요. 문제가 지속될 경우 홈서버 관리자에게 문의하시기 바랍니다.",
+        "error_jump_to_date_details": "오류 세부사항",
+        "error_jump_to_date_not_found": "%(dateString)s 에서 앞으로 예정된 이벤트를 찾을 수 없습니다. 더 이른 날짜를 선택해 보세요.",
+        "error_jump_to_date_send_logs_prompt": "문제의 원인을 파악하는 데 도움이 되도록 **<debugLogsLink>디버그 로그</debugLogsLink>**를 제출해 주세요.",
+        "error_jump_to_date_title": "해당 날짜에 이벤트를 찾을 수 없습니다.",
+        "face_pile_summary": {
+            "other": "회원님이 아는 지인 %(count)s명이 이미 가입했습니다."
+        },
+        "face_pile_tooltip_label": {
+            "other": "총 %(count)s명의 멤버 보기"
+        },
+        "face_pile_tooltip_shortcut": "%(commaSeparatedMembers)s 포함",
+        "face_pile_tooltip_shortcut_joined": "당신을 포함, %(commaSeparatedMembers)s",
+        "failed_determine_user": "멤버 이벤트가 변경되어 무시할 사용자를 확인할 수 없습니다.",
+        "failed_reject_invite": "초대 거부에 실패함",
+        "forget_room": "이 방 지우기",
+        "forget_space": "스페이지 지우기",
+        "header": {
+            "n_people_asking_to_join": {
+                "other": "%(count)s명이 참여 요청 중"
+            },
+            "room_is_public": "이 방은 공개되어 있습니다"
+        },
+        "header_avatar_open_settings_label": "채팅방 설정 열기",
+        "header_face_pile_tooltip": "사람",
+        "header_untrusted_label": "신회할 수 없음",
+        "inaccessible": "이 방 또는 스페이스를 현재 이용하실 수 없습니다.",
+        "inaccessible_name": "현재는 %(roomName)s에 들어갈 수 없습니다.",
+        "inaccessible_subtitle_1": "나중에 다시 시도하거나, 방 또는 스페이스 관리자에게 접근 권한이 있는지 확인해 달라고 요청하세요.",
+        "inaccessible_subtitle_2": "채팅방 또는 스페이스에 접근하는 중에 %(errcode)s 오류가 발생했습니다. 이 메시지가 잘못 표시된 오류라고 생각되시면 **<issueLink>버그를 신고</issueLink>**해주세요.",
+        "intro": {
+            "display_topic": "주제:<topic/>",
+            "dm_caption": "이 대화에는 두 분만 참여하고 있습니다. 두 분 중 한 분이라도 다른 사람을 초대하지 않는 한 말이죠.",
+            "edit_topic": "주제: <topic/> (<a>편집</a>)",
+            "enable_encryption_prompt": "설정에서 암호화를 활성화하세요.",
+            "encrypted_3pid_dm_pending_join": "모두가 참여하면 채팅을 할 수 있습니다",
+            "no_avatar_label": "사진을 추가하면 사람들이 여러분의 방을 쉽게 찾을 수 있습니다.",
+            "no_topic": "<a>주제를 추가</a>하면 다른 멤버들이 이 채팅방의 대화 내용을 쉽게 알 수 있습니다.",
+            "private_unencrypted_warning": "개인 메시지는 일반적으로 암호화되지만, 이 방은 그렇지 않습니다. 보통 이메일 초대와 같이 지원되지 않는 기기나 방법이 사용되었기 때문입니다.",
+            "room_invite": "이 방에만 초대하기",
+            "send_message_start_dm": "첫 메시지를 보내 <displayName/>님을 대화에 초대하세요.",
+            "start_of_dm_history": "<displayName/>님과의 대화가 시작되었습니다",
+            "start_of_room": "<roomName/> 대화가 시작되었습니다.",
+            "unencrypted_warning": "종단 간 암호화가 활성화되지 않았습니다.",
+            "user_created": "%(displayName)s 이 방을 만들었습니다.",
+            "you_created": "당신이 이 방을 만들었습니다."
+        },
+        "invite_email_mismatch_suggestion": "설정에서 이 이메일을 공유해서 %(brand)s에서 직접 초대를 받을 수 있습니다.",
+        "invite_sent_to_email": "이 초대장은 다음 사람에게 전송되었습니다.%(email)s",
+        "invite_sent_to_email_room": "%(roomName)s으로의 초대가 %(email)s(으)로 보내졌습니다",
+        "invite_subtitle": "<userName/>님이 당신을 초대함",
+        "invite_this_room": "이 방에 초대",
+        "invite_title": "%(roomName)s 방에 참가하겠습니까?",
+        "inviter_unknown": "알 수 없음",
+        "invites_you_text": "<inviter/>님이 당신을 초대합니다",
+        "join_button_account": "등록",
+        "join_failed_needs_invite": "%(roomName)s 방을 보려면 , 초대장이 필요해요",
+        "join_the_discussion": "토론에 참가",
+        "join_title": "방에 참여하려면",
+        "join_title_account": "계정으로 대화에 참여",
+        "joining": "참가 중…",
+        "joining_room": "방에 조인 중",
+        "joining_space": "스페이스에 조인 중…",
+        "jump_read_marker": "읽지 않은 첫 메시지로 건너뜁니다.",
+        "jump_to_bottom_button": "가장 최근 메세지로 스크롤",
+        "jump_to_date": "날짜로 이동",
+        "jump_to_date_beginning": "방 시작하기",
+        "jump_to_date_prompt": "날짜를 선택하여 이동하세요",
+        "kick_reason": "이유: %(reason)s",
+        "kicked_by": "당신은 %(memberName)s에 의해 제거되었습니다.",
+        "kicked_from_room_by": "%(memberName)s님이 회원님을 %(roomName)s에서 내보냈습니다.",
+        "knock_cancel_action": "요청 취소",
+        "knock_denied_subtitle": "접근이 거부되었으므로, 그룹 관리자나 운영자의 초대를 받지 않는 한 재가입할 수 없습니다.",
+        "knock_denied_title": "접근이 거부되었습니다",
+        "knock_message_field_placeholder": "메시지 (선택 사항)",
+        "knock_prompt": "참가 요청",
+        "knock_prompt_name": "%(roomName)s 에 가입을 요청하시겠습니까?",
+        "knock_send_action": "액세스 요청",
+        "knock_sent": "가입 요청이 전송되었습니다",
+        "knock_sent_subtitle": "가입 요청이 대기 중입니다.",
+        "knock_subtitle": "이 방의 대화를 보거나 참여하려면 접근 권한이 부여되어야 합니다. 아래에서 참여 요청을 보낼 수 있습니다.",
+        "leave_error_title": "방에서 나갈 때 오류",
+        "leave_server_notices_description": "이 방은 홈서버로부터 중요한 메시지를 받는 데 쓰이므로 떠날 수 없습니다.",
+        "leave_server_notices_title": "서버 알림 방을 떠날 수는 없음",
+        "leave_unexpected_error": "방에서 나가려는 중 예기치 못한 서버 오류가 발생했습니다",
+        "link_email_to_receive_3pid_invite": "설정에서 이 이메일을 계정에 연결하면 %(brand)s에서 직접 초대를 받을 수 있습니다.",
+        "loading_preview": "미리 보기 로딩중…",
+        "no_peek_join_prompt": "%(roomName)s 방을 미리 볼 수 없습니다. 참가하겠습니까?",
+        "no_peek_no_name_join_prompt": "미리보기가 없습니다. 참여하시겠습니까?",
+        "not_found_subtitle": "정말 여기가 맞나요?",
+        "not_found_title": "이 방 또는 스페이스가 존재하지 않습니다.",
+        "not_found_title_name": "%(roomName)s은 없는 방이에요.",
+        "peek_join_prompt": "%(roomName)s 방을 미리 보고 있습니다. 참가하겠습니까?",
+        "pinned_message_badge": "고정된 메시지",
+        "pinned_message_banner": {
+            "button_close_list": "목록닫기",
+            "button_view_all": "모두 보기",
+            "description": "고정된 메세지",
+            "go_to_newest_message": "타임라인에서 고정된 메시지를 확인하고, 여기에 최신 고정 메시지를 확인하세요.",
+            "go_to_next_message": "타임라인에서 고정된 메시지와 그 다음으로 오래된 고정된 메시지를 여기서 확인하세요",
+            "title": "<bold>%(index)s of %(length)s</bold>개의 고정 메시지"
+        },
+        "read_topic": "주제 읽기",
+        "rejecting": "초대 거절 중…",
+        "rejoin_button": "다시 참가",
+        "room_content": "채팅방 내용",
+        "room_is_low_priority": "이것은 낮은 우선순위의 채팅방입니다",
+        "search": {
+            "all_rooms_button": "모든 방 검색",
+            "placeholder": "메시지 검색...",
+            "summary": {
+                "other": "<query/>”에 대해 %(count)s개의 결과가 발견되었습니다"
+            },
+            "this_room_button": "이 방을 검색하세요"
+        },
+        "status_bar": {
+            "delete_all": "전체 삭제",
+            "exceeded_resource_limit": "이 홈서버가 리소스 한도를 초과했기 때문에 메시지를 보낼 수 없었습니다. 서비스를 계속 사용하려면 <a>서비스 관리자에게 연락</a>해주세요.",
+            "homeserver_blocked": "이 홈서버가 관리자에 의해 차단되어 메시지가 전송되지 않았습니다. 서비스를 계속 이용하려면 **<a>서비스 관리자에게 문의</a>**하세요.",
+            "monthly_user_limit_reached": "이 홈서버가 월 간 활성 사용자 한도를 초과했기 때문에 메시지를 보낼 수 없었습니다. 서비스를 계속 사용하려면 <a>서비스 관리자에게 연락</a>해주세요.",
+            "requires_consent_agreement": "<consentLink>이용 약관</consentLink>을 검토하고 동의하기 전까진 메시지를 보낼 수 없습니다.",
+            "retry_all": "전체 재시도",
+            "select_messages_to_retry": "모든 메시지 또는 개별 메시지를 선택하여 재시도하거나 삭제할 수 있습니다.",
+            "server_connectivity_lost_description": "보낸 메시지는 연결이 돌아올 때까지 저장됩니다.",
+            "server_connectivity_lost_title": "서버 연결이 끊어졌습니다.",
+            "some_messages_not_sent": "일부 메시지가 전송되지 않았습니다"
+        },
+        "unknown_status_code_for_timeline_jump": "알 수 없는 상태 코드",
+        "unread_notifications_predecessor": {
+            "이 방의 이전 버전에서 읽지 않은 %(count)s개의 알림이 있습니다.": "one"
+        },
+        "upgrade_error_description": "서버가 선택한 방 버전을 지원하는지 확인한 뒤에 다시 시도해주세요.",
+        "upgrade_error_title": "방 업그레이드 오류",
+        "upgrade_warning_bar": "이 방을 업그레이드하면 현재 방의 인스턴스는 문을 닫고 같은 이름의 업그레이드된 방을 만듭니다.",
+        "upgrade_warning_bar_admins": "방 관리자만이 이 경고를 볼 수 있음",
+        "upgrade_warning_bar_unstable": "이 방은 방 버전 <roomVersion />에서 실행 중이고, 이 홈서버가 <i>불안정</i>으로 표시됩니다.",
+        "upgrade_warning_bar_upgraded": "이 방은 이미 업그레이드됬습니다.",
+        "upload": {
+            "uploading_multiple_file": {
+                "%(filename)s 외 %(count)s개를 올리는 중": "other"
+            },
+            "uploading_single_file": "%(filename)s을(를) 올리는 중"
+        },
+        "video_room": "이 채팅방은 영상채팅방입니다",
+        "waiting_for_join_subtitle": "초대된 사용자가 %(brand)s에 참여하면 대화를 시작할 수 있으며, 이 채팅방은 종단간 암호화됩니다.",
+        "waiting_for_join_title": "다른 사용자가 %(brand)s에 참여하기를 기다리는 중입니다."
+    },
+    "room_list": {
+        "add_room_label": "방 추가",
+        "add_space_label": "스페이스 추가하기",
+        "breadcrumbs_empty": "최근에 방문하지 않은 방 목록",
+        "breadcrumbs_label": "최근 방문한 방 목록",
+        "collapse_filters": "필터 목록 접기",
+        "empty": {
+            "no_chats": "아직 채팅이 없습니다.",
+            "no_chats_description": "누군가에게 메시지를 보내거나 채팅방을 생성하여 시작하세요",
+            "no_chats_description_no_room_rights": "누군가에게 메시지를 보내서 시작하세요",
+            "no_favourites": "아직 즐겨찾는 채팅이 없습니다.",
+            "no_favourites_description": "채팅 설정에서 채팅을 즐겨찾기에 추가할 수 있습니다",
+            "no_invites": "읽지 않은 초대장이 없습니다",
+            "no_lowpriority": "우선순위가 낮은 채팅방이 없습니다.",
+            "no_mentions": "읽지 않은 멘션이 없습니다.",
+            "no_people": "아직 누구와도 직접 채팅을 하지 않았습니다",
+            "no_people_description": "다른 채팅을 보려면 필터 선택을 해제하세요.",
+            "no_rooms": "아직 어떤 채팅방에도 있지 않습니다",
+            "no_rooms_description": "다른 채팅을 보려면 필터 선택을 해제하세요.",
+            "no_unread": "축하합니다! 읽지 않은 메시지가 없습니다.",
+            "show_activity": "모든 활동 보기",
+            "show_chats": "모든 채팅 보기"
+        },
+        "expand_filters": "필터 목록 확장",
+        "failed_add_tag": "방에 %(tagName)s 태그 추가에 실패함",
+        "failed_remove_tag": "방에 %(tagName)s 태그 제거에 실패함",
+        "failed_set_dm_tag": "다이렉트 메시지 태그 설정에 실패했습니다",
+        "filters": {
+            "favourite": "즐겨찾기",
+            "invites": "초대",
+            "low_priority": "낮은 우선순위",
+            "mentions": "멘션",
+            "people": "사람",
+            "rooms": "채팅방",
+            "unread": "읽지 않은 항목"
+        },
+        "home_menu_label": "홈 옵션",
+        "join_public_room_label": "공개 방 참가하기",
+        "joining_rooms_status": {
+            "other": "현재 %(count)s 방에 참여 중입니다"
+        },
+        "list_title": "채팅방 목록",
+        "more_options": {
+            "copy_link": "채팅방 링크 복사",
+            "favourited": "즐겨찾기 됨",
+            "leave_room": "채팅방 떠나기",
+            "low_priority": "낮은 우선순위",
+            "mark_read": "읽음으로 표시",
+            "mark_unread": "읽지 않음으로 표시"
+        },
+        "notification_options": "알림 옵션",
+        "open_space_menu": "스페이스 메뉴 열기",
+        "primary_filters": "채팅방 목록 필터",
+        "redacting_messages_status": {
+            "other": "현재 %(count)s 방에서 메시지를 삭제 중입니다"
+        },
+        "room": {
+            "more_options": "옵션 더보기",
+            "open_room": "채팅방 %(roomName)s 열기"
+        },
+        "room_options": "채팅방 옵션",
+        "show_less": "간단히 표시",
+        "show_n_more": {
+            "%(count)s개 더 보기": "other"
+        },
+        "show_previews": "메시지 미리 보기 표시",
+        "sort": "정렬",
+        "sort_by": "정렬 기준",
+        "sort_by_activity": "활동내역",
+        "sort_by_alphabet": "A-Z",
+        "sort_type": {
+            "activity": "활동",
+            "atoz": "A-Z"
+        },
+        "sort_unread_first": "읽지 않은 메시지가 있는 방을 먼저 표시",
+        "space_menu": {
+            "home": "스페이스 홈",
+            "space_settings": "스페이스 설정"
+        },
+        "space_menu_label": "%(spaceName)s 메뉴",
+        "sublist_options": "목록 옵션",
+        "suggested_rooms_heading": "추천 방"
+    },
+    "room_settings": {
+        "access": {
+            "description_space": "누가 %(spaceName)s를 보거나 참여할 수 있는지 설정합니다.",
+            "title": "접근"
+        },
+        "advanced": {
+            "error_upgrade_description": "방 업그레이드를 완료할 수 없습니다",
+            "error_upgrade_title": "방 업그레이드에 실패함",
+            "information_section_room": "방 정보",
+            "information_section_space": "스페이스 정보",
+            "room_id": "내부 방 ID",
+            "room_predecessor": "%(roomName)s 방에서 오래된 메시지를 봅니다.",
+            "room_upgrade_button": "추천하는 방 버전으로 이 방 업그레이드",
+            "room_upgrade_warning": "<b>경고</b>: 채팅방을 업그레이드해도 <i>멤버들이 새 버전의 채팅방으로 자동 이동되지는 않습니다.</i> 시스템이 이전 버전 채팅방에 새 채팅방으로 이동하는 링크를 게시할 예정이며, 멤버들은 이 링크를 직접 클릭하여 새 채팅방에 참여해야 합니다.",
+            "room_version": "방 버전:",
+            "room_version_section": "방 버전",
+            "space_predecessor": "%(spaceName)s 의 이전 버전 보기.",
+            "space_upgrade_button": "이 스페이스를 권장되는 방 버전으로 업그레이드하세요",
+            "unfederated": "이 방은 원격 Matrix 서버로 접근할 수 없음",
+            "upgrade_button": "이 방을 %(version)s 버전으로 업그레이드",
+            "upgrade_dialog_description": "이 방을 업그레이드하려면 현재 방의 인스턴스를 닫고 그 자리에 새 방을 만들어야 합니다. 방 구성원에게 최상의 경험을 제공하려면 다음 조치를 취해야 합니다:",
+            "upgrade_dialog_description_1": "이름, 설명, 아바타가 같은 새 방 만들기",
+            "upgrade_dialog_description_2": "모든 로컬 방 별칭을 새 방을 향하도록 업데이트",
+            "upgrade_dialog_description_3": "이전 버전의 방에서 대화하는 사용자들을 멈추고, 사용자들에게 새 방으로 이동하라고 알리는 메시지를 게시",
+            "upgrade_dialog_description_4": "새 방을 시작할 때 이전 방을 연결해서 사람들이 이전 메시지를 볼 수 있게 하기",
+            "upgrade_dialog_title": "방 버전 업그레이드",
+            "upgrade_dwarning_ialog_title_public": "공개방 업그레이드",
+            "upgrade_warning_dialog_description": "방 업그레이드는 고급 작업으로, 버그, 누락된 기능 또는 보안 취약점으로 인해 방이 불안정할 때 일반적으로 권장됩니다.",
+            "upgrade_warning_dialog_explainer": "<b>업그레이드하면 방의 새로운 버전이 생성됩니다.</b> . 현재 모든 메세지가 보관된 방에 그대로 유지됩니다.",
+            "upgrade_warning_dialog_footer": "이 방을 <oldVersion /> 에서 <newVersion /> 로 업그레이드할 수 있습니다.",
+            "upgrade_warning_dialog_invite_label": "이 방의 구성원을 새 방에 자동으로 초대합니다",
+            "upgrade_warning_dialog_report_bug_prompt": "이 설정은 일반적으로 서버에서 채팅방이 처리되는 방식에만 영향을 미칩니다. 만약 %(brand)s 사용 중 문제가 발생하면 버그를 신고해 주세요.",
+            "upgrade_warning_dialog_report_bug_prompt_link": "이것은 일반적으로 서버에서 방이 처리되는 방식에만 영향을 미칩니다. %(brand)s 관련 문제가 발생할 경우, <a>에 버그를 신고해 주십시오.</a>",
+            "upgrade_warning_dialog_title": "방 업그레이드",
+            "upgrade_warning_dialog_title_private": "개인 방 업그레이드"
+        },
+        "alias_not_specified": "지정되지 않음",
+        "bridges": {
+            "description": "이 방은 다음 플랫폼으로 메시지를 연결합니다. <a>자세히 알아보기.</a>",
+            "empty": "이 방은 어떤 플랫폼에도 메시지를 연결하지 않습니다. <a>자세히 알아보기.</a>",
+            "title": "중계서버"
+        },
+        "delete_avatar_label": "아바타 삭제",
+        "general": {
+            "alias_field_has_domain_invalid": "도메인 구분 기호가 없습니다. 예: (:domain .org)",
+            "alias_field_has_localpart_invalid": "방 이름 또는 구분자가 누락되었습니다. 예: (my-room:domain.org)",
+            "alias_field_matches_invalid": "이 주소는 이 방을 가리키지 않습니다",
+            "alias_field_placeholder_default": "예: my-room",
+            "alias_field_required_invalid": "주소를 입력해주세요",
+            "alias_field_safe_localpart_invalid": "일부 문자는 허용할 수 없습니다",
+            "alias_field_taken_invalid": "이 주소는 유효하지 않은 서버이거나 이미 사용 중입니다.",
+            "alias_field_taken_invalid_domain": "이 주소는 이미 사용 중입니다.",
+            "alias_field_taken_valid": "이 주소는 사용 가능합니다.",
+            "alias_heading": "방 주소",
+            "aliases_items_label": "기타 게시된 주소:",
+            "aliases_no_items_label": "아직 게시된 주소가 없습니다. 아래에 하나 추가하세요.",
+            "aliases_section": "방 주소",
+            "avatar_field_label": "방 아바타",
+            "canonical_alias_field_label": "기본 주소",
+            "default_url_previews_off": "기본으로 URL 미리 보기가 이 방에 참여한 사람들 모두에게 꺼졌습니다.",
+            "default_url_previews_on": "기본으로 URL 미리 보기가 이 방에 참여한 사람들 모두에게 켜졌습니다.",
+            "description_space": "스페이스와 관련된 설정을 편집하세요.",
+            "error_creating_alias_description": "해당 주소를 생성하는 과정에서 오류가 발생했습니다. 서버에서 허용하지 않거나 일시적인 오류가 발생했을 수 있습니다.",
+            "error_creating_alias_title": "주소 생성 중 오류 발생",
+            "error_deleting_alias_description": "해당 주소를 삭제하는 과정에서 오류가 발생했습니다. 해당 주소가 더 이상 존재하지 않거나 일시적인 오류가 발생한 것 같습니다.",
+            "error_deleting_alias_description_forbidden": "해당 주소를 삭제할 권한이 없습니다.",
+            "error_deleting_alias_title": "주소 제거 중 오류 발생",
+            "error_publishing": "채팅방 게시 불가",
+            "error_publishing_detail": "이 채팅방을 게시하는 과정에서 오류가 발생했습니다.",
+            "error_save_space_settings": "스페이스 설정을 저장하지 못했습니다.",
+            "error_updating_alias_description": "방의 대체 주소 업데이트 중 오류가 발생했습니다. 서버에서 허용하지 않거나 일시적인 오류가 발생했을 수 있습니다.",
+            "error_updating_canonical_alias_description": "방의 기본 주소를 업데이트하는 중 오류가 발생했습니다. 서버가 허용하지 않거나 일시적인 오류 발생일 수 있습니다.",
+            "error_updating_canonical_alias_title": "기본 주소 업데이트 중 오류",
+            "leave_space": "스페이스 나가기",
+            "local_alias_field_label": "로컬 주소",
+            "local_aliases_explainer_room": "이 방의 주소를 설정하여 사용자가 홈 서버(%(localDomain)s)를 통해 이 방을 찾을 수 있도록 하세요.",
+            "local_aliases_explainer_space": "이 공간의 주소를 설정하여 사용자가 홈서버(%(localDomain)s)를 통해 이 공간을 찾을 수 있도록 하십시오.",
+            "local_aliases_section": "로컬 주소",
+            "name_field_label": "방 이름",
+            "new_alias_placeholder": "새로 게시된 주소(예: #alias:server)",
+            "no_aliases_room": "이 방은 로컬 주소가 없음",
+            "no_aliases_space": "이 스페이스에는 로컬 주소가 없습니다",
+            "other_section": "기타",
+            "publish_toggle": "%(domain)s님의 방 목록에서 이 방을 공개로 게시하겠습니까?",
+            "published_aliases_description": "주소를 게시하려면 먼저 로컬 주소로 설정해야 합니다.",
+            "published_aliases_explainer_room": "공개된 주소는 어떤 서버의 누구든지 귀하의 방에 참여하는 데 사용할 수 있습니다.",
+            "published_aliases_explainer_space": "공개된 주소는 어떤 서버의 누구든지 귀하의 공간에 참여하는 데 사용할 수 있습니다.",
+            "published_aliases_section": "공개된 주소",
+            "save": "변경 사항 저장",
+            "topic_field_label": "방 주제",
+            "url_preview_encryption_warning": "지금 이 방처럼, 암호화된 방에서는 홈서버 (미리 보기가 만들어지는 곳)에서 이 방에서 보여지는 링크에 대해 알 수 없도록 기본으로 URL 미리 보기가 꺼집니다.",
+            "url_preview_explainer": "누군가 메시지에 URL을 넣으면, URL 미리 보기로 웹사이트에서 온 제목, 설명, 그리고 이미지 등 그 링크에 대한 정보가 표시됩니다.",
+            "url_previews_section": "URL 미리보기",
+            "user_url_previews_default_off": "기본으로 URL 미리 보기를 <a>껐습니다</a>.",
+            "user_url_previews_default_on": "기본으로 URL 미리 보기를 <a>켰습니다</a>."
+        },
+        "notifications": {
+            "browse_button": "찾기",
+            "custom_sound_prompt": "새 맞춤 소리 설정",
+            "notification_sound": "알림 소리",
+            "settings_link": "<a>설정</a>에서 지정한 알림만 받습니다",
+            "sounds_section": "소리",
+            "upload_sound_label": "사용자 정의 사운드 업로드",
+            "uploaded_sound": "업로드된 소리"
+        },
+        "people": {
+            "knock_empty": "요청 없음",
+            "knock_section": "참여 요청",
+            "see_less": "간략히 보기",
+            "see_more": "더 보기"
+        },
+        "permissions": {
+            "add_privileged_user_description": "이 방의 한 명 또는 여러 명의 사용자에게 더 많은 권한 부여",
+            "add_privileged_user_filter_placeholder": "이 방에서 사용자를 검색하세요…",
+            "add_privileged_user_heading": "권한이 있는 사용자 추가",
+            "ban": "사용자 출입 금지",
+            "ban_reason": "이유",
+            "banned_by": "%(displayName)s님에 의해 출입 금지됨",
+            "banned_users_section": "출입 금지된 사용자",
+            "error_changing_pl_description": "사용자의 권한 등급을 변경하는 중 오류가 발생했습니다. 변경할 수 있는 권한이 있는 지 확인한 후 다시 시도하세요.",
+            "error_changing_pl_reqs_description": "방의 권한 등급 요구 사항을 변경하는 중 오류가 발생했습니다. 변경할 수 있는 권한을 갖고 있는 지 확인한 후 다시 시도하세요.",
+            "error_changing_pl_reqs_title": "권한 등급 요구 사항 변경 중 오류",
+            "error_changing_pl_title": "권한 등급 변경 중 오류",
+            "error_unbanning": "출입 금지 풀기에 실패함",
+            "events_default": "메시지 보내기",
+            "invite": "사용자 초대",
+            "kick": "사용자 제거",
+            "m.call": "%(brand)s 통화 시작",
+            "m.call.member": "%(brand)s의 통화에  참여",
+            "m.reaction": "반응 보내기",
+            "m.room.avatar": "방 아바타 변경",
+            "m.room.avatar_space": "스페이스 아바타 변경",
+            "m.room.canonical_alias": "방에 대한 기본 주소 변경",
+            "m.room.canonical_alias_space": "스페이스 주소를 변경합니다",
+            "m.room.encryption": "방 암호화 켜기",
+            "m.room.history_visibility": "기록 가시성 변경",
+            "m.room.name": "방 이름 변경",
+            "m.room.name_space": "스페이스 이름 변경",
+            "m.room.pinned_events": "고정된 이벤트 관리",
+            "m.room.power_levels": "권한 변경",
+            "m.room.redaction": "내가 보낸 메시지 삭제",
+            "m.room.server_acl": "서버 ACL 변경",
+            "m.room.tombstone": "방 업그레이드",
+            "m.room.topic": "주제 변경",
+            "m.room.topic_space": "설명 변경",
+            "m.space.child": "이 스페이스의 채팅방 관리",
+            "m.widget": "위젯 수정",
+            "muted_users_section": "음소거된 사용자",
+            "no_privileged_users": "모든 사용자가 이 방에 대한 특정 권한이 없음",
+            "notifications.room": "모두에게 알림",
+            "permissions_section": "권한",
+            "permissions_section_description_room": "방의 여러 부분을 변경하는 데 필요한 규칙을 선택",
+            "permissions_section_description_space": "스페이스의 다양한 부분을 변경하는 데 필요한 역할을 선택하십시오",
+            "privileged_users_section": "권한 있는 사용자",
+            "redact": "다른 사람이 보낸 메시지 삭제",
+            "send_event_type": "%(eventType)s 이벤트 보내기",
+            "state_default": "설정 변경",
+            "title": "규칙 & 권한",
+            "users_default": "기본 규칙"
+        },
+        "security": {
+            "cannot_change_to_private_due_to_missing_history_visiblity_permissions": {
+                "description": "이 채팅방의 대화 기록 공개 범위를 변경할 권한이 없습니다. 권한 없이 변경하면 참여하지 않은 사용자가 메시지를 읽을 수 있어 위험합니다",
+                "title": "채팅방을 비공개로 설정할 수 없습니다"
+            },
+            "enable_encryption_confirm_description": "일단 켜면, 방에 대한 암호화는 끌 수 없습니다. 암호화된 방에서 보낸 메시지는 서버에서 볼 수 없고, 오직 방의 참가자만 볼 수 있습니다. 암호화를 켜면 많은 봇과 브릿지가 올바르게 작동하지 않을 수 있습니다. <a>암호화에 대해 더 자세히 알아보기.</a>",
+            "enable_encryption_confirm_title": "암호화를 켜겠습니까?",
+            "enable_encryption_public_room_confirm_description_1": "<b>공개 채팅방에 암호화를 설정하는 것은 권장하지 않습니다.</b> 공개 채팅방은 누구나 검색하여 참여할 수 있으므로, 사실상 모든 메시지를 누구나 읽을 수 있습니다. 따라서 암호화의 이점을 전혀 누릴 수 없으며, 나중에 이 기능을 비활성화할 수도 없습니다. 또한, 공개 채팅방에서 메시지를 암호화하면 메시지를 주고받는 속도가 느려질 수 있습니다.",
+            "enable_encryption_public_room_confirm_description_2": "이러한 문제를 피하려면, 계획 중인 대화를 위해 <a>에서 새 암호화 방(</a> )을 생성하세요.",
+            "enable_encryption_public_room_confirm_title": "이 공개 방에 암호화를 추가하시겠습니까?",
+            "encrypted_room_public_confirm_description_1": "<b>암호화된 방을 공개적으로 설정하는 것은 권장되지 않습니다.</b> 이는 누구나 방을 찾아 참여할 수 있음을 의미하므로, 누구나 메시지를 읽을 수 있습니다. 암호화의 이점을 전혀 누릴 수 없습니다. 공개 방에서 메시지를 암호화하면 메시지 수신 및 전송 속도가 느려집니다.",
+            "encrypted_room_public_confirm_description_2": "이러한 문제를 방지하려면, 나누려는 대화를 위해 **<a>새로운 공개 채팅방</a>**을 만드시는 것을 권장합니다.",
+            "encrypted_room_public_confirm_title": "이 암호화된 방을 공개로 설정하시겠습니까?",
+            "encryption_forced": "서버에서 암호화를 비활성화해야 합니다.",
+            "encryption_permanent": "일단 켜면, 암호화는 끌 수 없습니다.",
+            "error_join_rule_change_title": "조인 규칙을 업데이트하지 못했습니다.",
+            "error_join_rule_change_unknown": "알 수 없는 오류",
+            "guest_access_warning": "지원되는 클라이언트를 사용하는 사용자는 등록된 계정이 없어도 방에 참여할 수 있습니다.",
+            "history_visibility_invited": "구성원만(구성원이 초대받은 시점부터)",
+            "history_visibility_joined": "구성원만(구성원들이 참여한 시점부터)",
+            "history_visibility_legend": "누가 기록을 읽을 수 있나요?",
+            "history_visibility_shared": "구성원만(이 설정을 선택한 시점부터)",
+            "history_visibility_warning": "기존 기록의 공개 설정은 변경되지 않습니다",
+            "history_visibility_world_readable": "누구나",
+            "join_rule_description": "%(roomName)s에 누가 참여할 수 있는지 설정합니다.",
+            "join_rule_invite": "비공개 (초대 필요)",
+            "join_rule_invite_description": "초대한 경우에만 참여할 수 있습니다.",
+            "join_rule_knock": "참가 요청",
+            "join_rule_knock_description": "접근 권한이 부여되지 않으면 사람들은 참여할 수 없습니다.",
+            "join_rule_public_description": "누구나 찾고 참여할 수 있습니다.",
+            "join_rule_restricted": "스페이스 멤버 목록",
+            "join_rule_restricted_description": "누구나 스페이스를 찾고 참여할 수 있습니다. <a>이곳에서 접근 가능한 스페이스를 편집하세요.</a>",
+            "join_rule_restricted_description_active_space": "<spaceName/>에 소속된 누구나 찾고 참여할 수 있습니다. 다른 스페이스도 선택 가능합니다.",
+            "join_rule_restricted_description_prompt": "스페이스의 누구나 찾고 참여할 수 있습니다. 여러 스페이스를 선택할 수 있습니다.",
+            "join_rule_restricted_description_spaces": "접근 가능한 스페이스",
+            "join_rule_restricted_dialog_description": "이 방에 접근할 수 있는 스페이스를 결정하세요. 스페이스가 선택되면, 해당 스페이스의 구성원은 <RoomName/> 를 찾아 참여할 수 있습니다.",
+            "join_rule_restricted_dialog_empty_warning": "모든 스페이스를 제거하고 있습니다. 액세스는 초대 전용으로 기본 설정됩니다.",
+            "join_rule_restricted_dialog_filter_placeholder": "스페이스 검색",
+            "join_rule_restricted_dialog_heading_known": "당신이 아는 다른 스페이스",
+            "join_rule_restricted_dialog_heading_other": "당신이 알지 못하는 다른 스페이스나 방",
+            "join_rule_restricted_dialog_heading_room": "이 방을 포함하는 스페이스",
+            "join_rule_restricted_dialog_heading_space": "내가 참여 중인 상위 스페이스",
+            "join_rule_restricted_dialog_heading_unknown": "이 채팅방의 다른 관리자들도 참여 중인 스페이스일 가능성이 높습니다.",
+            "join_rule_restricted_dialog_title": "스페이스 선택",
+            "join_rule_restricted_n_more": {
+                "other": "외 %(count)s명"
+            },
+            "join_rule_restricted_summary": {
+                "other": "현재 %(count)s개의 스페이스가 접근 권한을 가지고 있습니다."
+            },
+            "join_rule_restricted_upgrade_description": "이번 업그레이드를 통해 선택된 스페이스의 구성원들은 초대 없이도 이 방에 접근할 수 있게 됩니다.",
+            "join_rule_restricted_upgrade_warning": "이 방은 귀하가 관리자가 아닌 일부 스페이스에 존재합니다. 해당 스페이스에서는 기존 방이 계속 표시되지만, 사용자에게 새 방에 참여하라는 안내가 제공됩니다.",
+            "join_rule_upgrade_awaiting_room": "새 방 로딩 중",
+            "join_rule_upgrade_required": "업그레이드가 필요합니다",
+            "join_rule_upgrade_sending_invites": {
+                "other": "초대 발송 중... (총 %(count)s개 중 %(progress)s개)"
+            },
+            "join_rule_upgrade_updating_spaces": {
+                "other": "스페이스 업데이트 중... (총 %(count)s개 중 %(progress)s개)"
+            },
+            "join_rule_upgrade_upgrading_room": "방 업그레이드중",
+            "join_rule_world_readable_description": "채팅방 참여자 설정 변경 시, 이후 메시지의 공개 범위도 함께 변경됩니다",
+            "public_without_alias_warning": "이 방에 연결하려면 주소를 추가해 주세요.",
+            "publish_room": "이 방을 공개 방 디렉토리에 표시하세요.",
+            "publish_space": "이 스페이스를 공용 방 디렉토리에서 표시되도록 설정하세요.",
+            "strict_encryption": "이 채팅방의 현재 세션에서 확인되지 않은 세션으로 암호화된 메시지를 보내지 않음.",
+            "title": "보안 & 개인"
+        },
+        "title": "방 설정 - %(roomName)s",
+        "upload_avatar_label": "아바타 업로드",
+        "visibility": {
+            "alias_section": "주소",
+            "error_failed_save": "이 스페이스의 공개 설정을 변경하는 데 실패했습니다.",
+            "error_update_guest_access": "이 스페이스의 게스트 액세스 업데이트에 실패했습니다",
+            "error_update_history_visibility": "이 스페이스의 히스토리 공개 설정을 변경하는 데 실패했습니다.",
+            "guest_access_explainer": "계정이 없어도 스페이스에 참여할 수 있습니다.",
+            "guest_access_label": "게스트 액세스 활성화",
+            "history_visibility_anyone_space": "스페이스 미리보기",
+            "history_visibility_anyone_space_description": "스페이스에 참여하기 전에 미리볼 수 있도록 허용합니다.",
+            "history_visibility_anyone_space_recommendation": "공개 스페이스에 권장 합니다.",
+            "title": "가시성"
+        },
+        "voip": {
+            "call_type_section": "통화 유형",
+            "enable_element_call_caption": "%(brand)s 종단 간 암호화되지만, 현재는 소수의 사용자로 제한됩니다.",
+            "enable_element_call_label": "이 방에서 추가 발신 옵션으로 %(brand)s 을 활성화하십시오",
+            "enable_element_call_no_permissions_tooltip": "이 항목을 변경할 권한이 충분하지 않습니다."
+        }
+    },
+    "room_summary_card_back_action_label": "방 정보",
+    "scalar": {
+        "error_create": "위젯을 만들지 못합니다.",
+        "error_membership": "이 방의 구성원이 아닙니다.",
+        "error_missing_room_id": "roomid가 없습니다.",
+        "error_missing_room_id_request": "요청에서 room_id가 빠짐",
+        "error_missing_user_id_request": "요청에서 user_id이(가) 빠짐",
+        "error_permission": "이 방에서 그걸 할 수 있는 권한이 없습니다.",
+        "error_power_level_invalid": "권한 등급은 양의 정수이어야 합니다.",
+        "error_room_not_visible": "방 %(roomId)s이(가) 보이지 않음",
+        "error_room_unknown": "이 방은 드러나지 않습니다.",
+        "error_send_request": "요청을 보내지 못했습니다.",
+        "failed_read_event": "이벤트 읽기에 실패했습니다",
+        "failed_send_event": "이벤트 전송 실패"
+    },
+    "server_offline": {
+        "description": "서버가 일부 요청에 응답하지 않는 경우가 있습니다. 가능한 원인은 다음과 같습니다.",
+        "description_1": "서버(%(serverName)s)의 응답 시간이 너무 오래 걸렸습니다.",
+        "description_2": "방화벽이나 바이러스 백신 프로그램이 요청을 차단하고 있습니다.",
+        "description_3": "브라우저 확장 프로그램이 요청을 차단하고 있습니다.",
+        "description_4": "서버가 오프라인 상태입니다.",
+        "description_5": "서버가 귀하의 요청을 거부했습니다.",
+        "description_6": "현재 해당 지역에서 인터넷 연결에 문제가 발생하고 있습니다.",
+        "description_7": "서버에 접속하는 동안 연결 오류가 발생했습니다.",
+        "description_8": "서버는 문제의 원인을 표시하도록 구성되지 않았습니다(CORS).",
+        "empty_timeline": "모두 확인했습니다!",
+        "recent_changes_heading": "아직 수신되지 않은 최근 변경 사항",
+        "title": "서버가 응답하지 않습니다"
+    },
+    "service_worker_error": {
+        "description": "%(brand)s 매트릭스 콘텐츠 저장소에서 인증된 미디어를 로드하려면 서비스 워커가 필요합니다. 현재 사용 중인 브라우저에서는 이 기능이 지원되지 않아 미디어 로드에 실패할 수 있습니다.",
+        "title": "서비스 워커를 로드하지 못했습니다"
+    },
+    "seshat": {
+        "error_initialising": "메시지 검색 초기화 실패, 자세한 내용은 <a>설정</a>를 확인하세요",
+        "reset_button": "이벤트 저장소 재설정",
+        "reset_description": "대부분의 경우 이벤트 인덱스 저장소를 초기화하지 않는 것이 좋습니다",
+        "reset_explainer": "해당 작업을 수행할 경우, 모든 메시지는 삭제되지 않지만 색인 재구축 과정에서 잠시 동안 검색 성능이 저하될 수 있음을 유의하시기 바랍니다.",
+        "reset_title": "이벤트 저장소를 초기화하시겠습니까?",
+        "warning_kind_files": "이 버전의 %(brand)s 은 일부 암호화된 파일의 보기를 지원하지 않습니다.",
+        "warning_kind_files_app": "모든 <encrypted>암호화된</encrypted> 파일을 확인하려면 <a>데스크톱 앱</a>을 사용하세요",
+        "warning_kind_search": "%(brand)s 이 버전에서는 암호화된 메시지 검색을 지원하지 않습니다",
+        "warning_kind_search_app": "암호화된 메시지를 검색하려면 <a>데스크톱 앱</a>을 사용하세요"
+    },
+    "setting": {
+        "help_about": {
+            "access_token_detail": "귀하의 액세스 토큰은 계정에 대한 전체 접근 권한을 부여합니다. 누구와도 공유하지 마십시오.",
+            "brand_version": "%(brand)s 웹 버전:",
+            "clear_cache_reload": "캐시 지우기 및 새로고침",
+            "crypto_version": "암호화 버전:",
+            "dialog_title": "<strong>설정:</strong> 도움말 및 정보",
+            "help_link": "%(brand)s 사용 중 도움이 필요하다면, <a>여기</a>를 클릭하세요.",
+            "homeserver": "홈서버는 <code>%(homeserverUrl)s</code>",
+            "identity_server": "Identity server는 <code>%(identityServerUrl)s</code>",
+            "title": "도움 & 정보",
+            "versions": "버전"
+        }
+    },
+    "settings": {
+        "account": {
+            "dialog_title": "<strong>설정:</strong> 계정",
+            "title": "계정"
+        },
+        "all_rooms_home": "모든 방을 홈에서 보기",
+        "all_rooms_home_description": "현재 있는 모든 채팅방을 홈에 표시됩니다.",
+        "always_show_message_timestamps": "항상 메시지의 시간을 보이기",
+        "appearance": {
+            "bundled_emoji_font": "번들 이모지 글꼴 사용",
+            "compact_layout": "간결한 텍스트 및 메시지 표시",
+            "compact_layout_description": "이 기능을 사용하려면 모던 레이아웃을 선택해야 합니다.",
+            "custom_font": "시스템 폰트 사용",
+            "custom_font_description": "시스템에 설치된 글꼴의 이름을 설정하면 %(brand)s 에서 해당 글꼴을 사용하려고 시도합니다.",
+            "custom_font_name": "시스템 글꼴 이름",
+            "custom_font_size": "사용자 정의 크기 사용",
+            "custom_theme_add": "사용자 지정 테마 추가",
+            "custom_theme_downloading": "사용자 지정 테마 다운로드 중…",
+            "custom_theme_error_downloading": "테마 다운로드 중 오류 발생",
+            "custom_theme_help": "적용하려는 사용자 정의 테마의 URL을 입력하세요.",
+            "custom_theme_invalid": "유효하지 않은 테마 스키마입니다.",
+            "dialog_title": "<strong>설정:</strong> 화면 설정",
+            "font_size": "글자 크기",
+            "font_size_default": "%(fontSize)s (기본값)",
+            "high_contrast": "고대비",
+            "image_size_default": "기본",
+            "image_size_large": "크게",
+            "layout_bubbles": "말풍선 형식",
+            "layout_irc": "IRC(실험적)",
+            "match_system_theme": "시스템 테마 사용",
+            "timeline_image_size": "타임라인 내 이미지 크기"
+        },
+        "automatic_language_detection_syntax_highlight": "구문 강조를 위해 자동 언어 감지 사용하기",
+        "autoplay_gifs": "GIF 자동 재생",
+        "autoplay_videos": "동영상 자동재생",
+        "big_emoji": "대화에서 큰 이모지 켜기",
+        "code_block_expand_default": "기본적으로 코드 블록 확장",
+        "code_block_line_numbers": "코드 블록에 줄 번호 표시",
+        "disable_historical_profile": "메시지 기록에서 사용자의 현재 프로필 사진과 이름을 표시합니다",
+        "discovery": {
+            "title": "어떻게 당신을 찾을 수 있나요"
+        },
+        "emoji_autocomplete": "입력 중 이모지 제안 켜기",
+        "enable_markdown": "마크다운 활성화",
+        "enable_markdown_description": "메시지 앞에 <code>/plain</code>을 입력하면 Markdown 없이 전송됩니다",
+        "encryption": {
+            "advanced": {
+                "breadcrumb_first_description": "귀하의 계정 정보, 연락처, 기본 설정 및 채팅 목록은 보관됩니다",
+                "breadcrumb_page": "암호화 재설정",
+                "breadcrumb_second_description": "서버에만 저장된 모든 메시지 기록이 손실됩니다.",
+                "breadcrumb_third_description": "기존 장치와 연락처를 모두 다시 확인해야 합니다.",
+                "breadcrumb_title": "정말로 신원을 재설정하시겠습니까?",
+                "breadcrumb_title_cant_confirm": "본인 인증 정보를 재설정해야 합니다.",
+                "breadcrumb_title_forgot": "복구 키를 잊으셨나요? 신원을 재설정해야 합니다.",
+                "breadcrumb_title_sync_failed": "키 저장소 동기화에 실패했습니다. 신원을 재설정해야 합니다.",
+                "breadcrumb_warning": "계정이 해킹당했다고 생각될 때만 이 작업을 수행하십시오.",
+                "details_title": "암호화 세부 정보",
+                "do_not_close_warning": "재설정이 완료될 때까지 이 창을 닫지 마십시오",
+                "export_keys": "키 내보내기",
+                "import_keys": "키 가져오기",
+                "other_people_device_description": "경고: 귀하와 명시적으로 인증하지 않은 사용자(예: 이모지 사용)는 귀하의 암호화된 메시지를 수신하지 못합니다. 또한 인증된 사용자의 미인증 기기 역시 귀하의 암호화된 메시지를 수신하지 못합니다.",
+                "other_people_device_label": "암호화된 방에서는 인증된 사용자에게만 메시지를 보내십시오",
+                "other_people_device_title": "다른 사람의 기기",
+                "reset_identity": "암호화 신원 재설정",
+                "reset_in_progress": "재설정 중...",
+                "session_id": "세션 ID:",
+                "session_key": "세션 키:",
+                "title": "고급 설정"
+            },
+            "confirm_key_storage_off": "키 저장 기능을 꺼진 상태로 유지하시겠습니까?",
+            "confirm_key_storage_off_description": "모든 기기에서 로그아웃하면 메시지 기록이 삭제되며 기존 연락처를 다시 모두 인증해야 합니다. <a>자세히 알아보기</a>",
+            "delete_key_storage": {
+                "breadcrumb_page": "키 저장소 삭제",
+                "confirm": "키 저장소 삭제",
+                "description": "키 저장소를 삭제하면 서버에서 암호화 신원 및 메시지 키가 제거되며 다음 보안 기능이 비활성화됩니다:",
+                "list_first": "새 기기에서는 암호화된 메시지 기록을 확인할 수 없습니다.",
+                "list_second": "%(brand)s에서 모든 기기에서 로그아웃하면 암호화된 메시지 접근 권한을 잃게 됩니다",
+                "title": "정말로 키 저장소를 비활성화하고 삭제하시겠습니까?"
+            },
+            "device_not_verified_button": "이 장치를 확인하십시오",
+            "device_not_verified_description": "암호화 설정을 확인하려면 이 기기를 인증해야 합니다.",
+            "device_not_verified_title": "장치가 인증되지 않았습니다",
+            "dialog_title": "<strong>설정:</strong> 암호화",
+            "key_storage": {
+                "allow_key_storage": "키 저장 허용",
+                "description": "암호화 신원 및 메시지 키를 서버에 안전하게 저장하세요. 이렇게 하면 새 기기에서도 메시지 기록을 확인할 수 있습니다. <a>자세히 알아보기</a>",
+                "title": "키 저장소"
+            },
+            "recovery": {
+                "change_recovery_confirm_button": "새 복구 키 확인",
+                "change_recovery_confirm_description": "아래에 새 복구 키를 입력하여 완료하세요. 기존 키는 더 이상 작동하지 않습니다.",
+                "change_recovery_confirm_title": "새 복구 키를 입력하세요",
+                "change_recovery_key": "복구 키 변경",
+                "change_recovery_key_description": "이 새로운 복구 키를 안전한 곳에 기록해 두십시오. 그런 다음 계속을 클릭하여 변경 사항을 확인하십시오.",
+                "change_recovery_key_title": "복구 키 변경하시겠습니까?",
+                "description": "기존의 모든 기기를 분실한 경우, 복구 키를 사용하여 암호화 ID와 메시지 기록을 복구할 수 있습니다.",
+                "enter_key_error": "입력하신 복구 키가 올바르지 않습니다.",
+                "enter_recovery_key": "복구 키 확인",
+                "forgot_recovery_key": "복구 키를 잊으셨나요?",
+                "key_storage_warning": "키 저장소가 동기화되지 않았습니다. 아래 버튼 중 하나를 클릭하여 문제를 해결하세요.",
+                "save_key_description": "이 내용을 누구와도 공유하지 마십시오!",
+                "save_key_title": "복구 키",
+                "set_up_recovery": "복구 설정",
+                "set_up_recovery_confirm_button": "설정 완료",
+                "set_up_recovery_confirm_description": "복구 설정을 완료하려면 이전 화면에 표시된 복구 키를 입력하십시오.",
+                "set_up_recovery_confirm_title": "복구 키를 입력하여 확인하십시오",
+                "set_up_recovery_description": "키 저장소는 복구 키로 보호됩니다. 설정 후 새 복구 키가 필요한 경우 '%(changeRecoveryKeyButton)s'을 선택하여 재작성할 수 있습니다.",
+                "set_up_recovery_save_key_description": "이 복구 키를 암호 관리자, 암호화된 메모 또는 물리적 금고와 같은 안전한 곳에 기록해 두십시오.",
+                "set_up_recovery_save_key_title": "복구 키를 안전한 곳에 보관하세요.",
+                "set_up_recovery_secondary_description": "계속을 클릭하면 복구 키를 생성해 드립니다.",
+                "title": "복구"
+            },
+            "title": "암호화"
+        },
+        "general": {
+            "account_management_section": "계정 관리",
+            "account_section": "계정",
+            "add_email_dialog_title": "이메일 주소 추가",
+            "add_email_failed_verification": "이메일 주소를 인증하지 못했습니다. 메일에 나온 주소를 눌렀는지 확인해 보세요",
+            "add_email_instructions": "주소를 인증하기 위한 이메일을 보냈습니다. 여기있는 설명을 따라간 후 아래 버튼을 클릭하세요.",
+            "add_msisdn_confirm_body": "아래 버튼을 클릭하여 이 전화번호 추가를 확인하세요.",
+            "add_msisdn_confirm_button": "전화번호 추가 확인",
+            "add_msisdn_confirm_sso_button": "본인의 신원을 확인하기 위해 싱글 사인온(SSO)을 사용하여 이 전화번호 추가를 확인하세요.",
+            "add_msisdn_dialog_title": "전화번호 추가",
+            "add_msisdn_instructions": "문자 메시지를 +%(msisdn)s(으)로 보냈습니다. 메시지에 있는 인증 코드를 입력해주세요.",
+            "add_msisdn_misconfigured": "MSISDN을 사용한 추가/바인딩 흐름이 잘못 구성되었습니다.",
+            "allow_spellcheck": "맞춤법 검사 허용",
+            "application_language": "응용 프로그램 언어",
+            "application_language_reload_hint": "다른 언어를 선택하면 앱이 다시 로드됩니다",
+            "avatar_open_menu": "아바타 메뉴 열기",
+            "avatar_remove_progress": "이미지 삭제 중…",
+            "avatar_save_progress": "이미지 업로드 중…",
+            "avatar_upload_error_text": "파일 형식이 지원되지 않거나 이미지가 %(size)s 보다 큽니다.",
+            "avatar_upload_error_text_generic": "파일 형식이 지원되지 않을 수 있습니다.",
+            "avatar_upload_error_title": "아바타 이미지를 업로드할 수 없습니다",
+            "confirm_adding_email_body": "아래 버튼을 클릭하여 이메일 주소 추가를 확인하세요.",
+            "confirm_adding_email_title": "이메일 추가 확인",
+            "deactivate_confirm_body": "계정을 비활성화하시겠습니까? 이 설정은 되돌릴 수 없습니다.",
+            "deactivate_confirm_body_sso": "계정 비활성화를 확인하려면 신원 확인을 위해 싱글 사인온(SSO)을 사용하십시오.",
+            "deactivate_confirm_content": "계정을 비활성화하시겠습니까? 계속 진행하려면:",
+            "deactivate_confirm_content_1": "계정을 다시 활성화할 수 없습니다.",
+            "deactivate_confirm_content_2": "더 이상 로그인할 수 없습니다.",
+            "deactivate_confirm_content_3": "귀하를 포함하여 누구도 귀하의 사용자 이름(MXID)을 재사용할 수 없습니다. 이 사용자 이름은 계속 사용할 수 없습니다.",
+            "deactivate_confirm_content_4": "당신이 참여 중인 모든 방과 DM을 떠나게 됩니다",
+            "deactivate_confirm_content_5": "귀하는 ID 서버에서 제거됩니다: 친구들이 더 이상 이메일이나 전화번호로 귀하를 찾을 수 없게 됩니다",
+            "deactivate_confirm_content_6": "기존에 보낸 메시지는 과거에 보낸 이메일과 마찬가지로 수신자에게 계속 표시됩니다. 향후 방에 참여하는 사람들에게 보낸 메시지를 숨기시겠습니까?",
+            "deactivate_confirm_continue": "계정 비활성화 확인",
+            "deactivate_confirm_erase_label": "새로 가입한 회원에게 내 메시지를 숨기기",
+            "deactivate_section": "계정 비활성화",
+            "deactivate_warning": "계정을 비활성화 하는 것은 취소할 수 없습니다. 조심하세요!",
+            "discovery_email_empty": "이메일을 추가하면 검색 옵션이 표시됩니다.",
+            "discovery_email_verification_instructions": "메일함에 있는 링크로 확인",
+            "discovery_msisdn_empty": "전화번호를 추가하면 검색 옵션이 표시됩니다.",
+            "discovery_needs_terms": "이메일 주소나 전화번호로 자신을 발견할 수 있도록 ID 서버 (%(serverName)s) 서비스 약관에 동의하세요.",
+            "discovery_needs_terms_title": "사람들이 당신을 찾을 수 있도록 하세요",
+            "display_name": "표시 이름",
+            "display_name_error": "표시 이름 설정 불가",
+            "email_adding_unsupported_by_hs": "이 홈 서버는 계정에 이메일 주소를 추가하는 기능을 지원하지 않습니다.",
+            "email_address_in_use": "이 이메일 주소는 이미 사용 중입니다",
+            "email_address_label": "이메일 주소",
+            "email_not_verified": "이메일 주소가 아직 확인되지 않았습니다",
+            "email_verification_instructions": "받은 이메일에 있는 링크를 클릭해서 확인한 후에 계속하기를 클릭하세요.",
+            "emails_heading": "이메일 주소",
+            "error_add_email": "이메일 주소를 추가할 수 없음",
+            "error_deactivate_communication": "서버와 통신하는 데 문제가 발생했습니다. 다시 시도해 주세요.",
+            "error_deactivate_invalid_auth": "서버가 유효한 인증 정보를 반환하지 않았습니다.",
+            "error_deactivate_no_auth": "서버에서 인증이 필요하지 않았습니다",
+            "error_email_verification": "이메일 주소를 인증할 수 없습니다.",
+            "error_invalid_email": "잘못된 이메일 주소",
+            "error_invalid_email_detail": "올바르지 않은 이메일 주소로 보입니다",
+            "error_msisdn_verification": "전화번호를 인증할 수 없습니다.",
+            "error_password_change_403": "비밀번호를 바꾸지 못했습니다. 이 비밀번호가 맞나요?",
+            "error_password_change_http": "%(errorMessage)s (HTTP status %(httpStatus)s)",
+            "error_password_change_title": "비밀번호 변경 중 오류 발생",
+            "error_password_change_unknown": "알 수 없는 비밀번호 변경 오류 (%(stringifiedError)s)",
+            "error_remove_3pid": "연락처 정보를 제거할 수 없음",
+            "error_revoke_email_discovery": "이메일 주소 공유를 취소할 수 없음",
+            "error_revoke_msisdn_discovery": "전화번호 공유를 취소할 수 없음",
+            "error_share_email_discovery": "이메일 주소를 공유할 수 없음",
+            "error_share_msisdn_discovery": "전화번호를 공유할 수 없음",
+            "identity_server_no_token": "ID 액세스 토큰을 찾을 수 없습니다.",
+            "identity_server_not_set": "ID 서버가 설정되지 않았습니다",
+            "invalid_phone_number": "제공된 전화번호가 유효하지 않은 것으로 보입니다.",
+            "language_section": "언어",
+            "msisdn_adding_unsupported_by_hs": "이 홈 서버는 계정에 전화번호를 추가하는 기능을 지원하지 않습니다.",
+            "msisdn_in_use": "이 전화번호는 이미 사용 중입니다",
+            "msisdn_label": "전화번호",
+            "msisdn_verification_field_label": "인증 코드",
+            "msisdn_verification_instructions": "문자로 보낸 인증 코드를 입력해주세요.",
+            "msisdns_heading": "전화번호",
+            "oidc_manage_button": "계정 관리",
+            "password_change_section": "새 계정 비밀번호 설정…",
+            "password_change_success": "비밀번호가 성공적으로 변경되었습니다.",
+            "personal_info": "개인 정보",
+            "profile_subtitle": "앱에서 다른 사람들에게 보이는 모습입니다.",
+            "profile_subtitle_oidc": "귀하의 계정은 신원 제공자(IDP)에 의해 별도로 관리되므로 일부 개인 정보는 여기서 변경할 수 없습니다.",
+            "remove_email_prompt": "%(email)s을(를) 제거하겠습니까?",
+            "remove_msisdn_prompt": "%(phone)s을(를) 제거하겠습니까?",
+            "spell_check_locale_placeholder": "지역을 선택하세요",
+            "unable_to_load_emails": "이메일 주소를 불러올 수 없습니다",
+            "unable_to_load_msisdns": "전화번호를 불러올 수 없습니다",
+            "username": "사용자 이름"
+        },
+        "inline_url_previews_default": "기본으로 인라인 URL 미리 보기 사용하기",
+        "inline_url_previews_room": "이 방에 참여한 모두에게 기본으로 URL 미리보기 사용하기",
+        "inline_url_previews_room_account": "이 방에서 URL 미리보기 사용하기 (오직 나만 영향을 받음)",
+        "insert_trailing_colon_mentions": "메시지 시작 부분에 사용자 언급 뒤에 콜론을 추가합니다",
+        "invite_controls": {
+            "default_label": "사용자가 방에 초대할 수 있도록 허용"
+        },
+        "jump_to_bottom_on_send": "메시지를 보낼 때 타임라인 맨 아래로 이동합니다",
+        "key_backup": {
+            "setup_secure_backup": {
+                "backup_setup_success_description": "현재 이 기기에서 키가 백업 중입니다.",
+                "backup_setup_success_title": "보안 백업 성공",
+                "cancel_warning": "지금 취소하면 로그인 정보에 접근할 수 없게 되어 암호화된 메시지와 데이터를 잃을 수 있습니다.",
+                "confirm_security_phrase": "보안 문구를 확인하세요",
+                "description": "암호화된 메시지와 데이터에 대한 접근 권한을 잃지 않도록 서버에 암호화 키를 백업하여 보호하십시오.",
+                "download_or_copy": "%(downloadButton)s 또는 %(copyButton)s",
+                "enter_phrase_description": "보안을 위해 본인만 알고 있는 보안 문구를 입력하세요. 이 문구는 데이터 보호에 사용됩니다. 보안을 위해 계정 비밀번호를 재사용하지 마십시오.",
+                "enter_phrase_title": "보안 문구를 입력하세요",
+                "enter_phrase_to_confirm": "보안 문구를 다시 한 번 입력하여 확인하십시오.",
+                "generate_security_key_description": "복구 키를 생성해 드리겠습니다. 비밀번호 관리자나 금고 같은 안전한 곳에 보관하시기 바랍니다.",
+                "generate_security_key_title": "복구 키 생성",
+                "pass_phrase_match_failed": "맞지 않습니다.",
+                "pass_phrase_match_success": "맞습니다!",
+                "phrase_strong_enough": "좋아요! 이 보안 문구는 충분히 강력해 보입니다.",
+                "secret_storage_query_failure": "비밀 저장소 상태를 쿼리할 수 없음",
+                "security_key_safety_reminder": "복구 키는 암호화된 데이터를 보호하는 데 사용되므로, 비밀번호 관리 프로그램이나 금고와 같은 안전한 장소에 보관하십시오.",
+                "set_phrase_again": "돌아가서 다시 설정하기.",
+                "settings_reminder": "보안 백업을 설정하고 키를 관리하려면 설정에서 가능합니다.",
+                "title_confirm_phrase": "보안 문구 확인",
+                "title_save_key": "복구 키를 저장하세요",
+                "title_set_phrase": "보안 문구 설정",
+                "unable_to_setup": "비밀 저장소 설정 불가",
+                "use_different_passphrase": "다른 암호를 사용하시겠습니까?",
+                "use_phrase_only_you_know": "자신만 아는 비밀 문구를 사용하고, 선택적으로 백업용 복구 키를 저장하세요."
+            }
+        },
+        "key_export_import": {
+            "confirm_passphrase": "암호 확인",
+            "enter_passphrase": "암호 입력",
+            "export_description_1": "이 과정으로 암호화한 방에서 받은 메시지의 키를 로컬 파일로 내보낼 수 있습니다. 그런 다음 나중에 다른 Matrix 클라이언트에서 파일을 가져와서, 해당 클라이언트에서도 이 메시지를 복호화할 수 있도록 할 수 있습니다.",
+            "export_description_2": "내보낸 파일은 이를 읽을 수 있는 사람이라면 누구나 귀하가 볼 수 있는 암호화된 메시지를 해독할 수 있게 하므로, 반드시 안전하게 보관해야 합니다. 이를 위해 아래에 고유한 암호 문구를 입력해야 하며, 이 문구는 내보낸 데이터 암호화에만 사용됩니다. 동일한 암호 문구를 사용해야만 데이터를 다시 가져올 수 있습니다.",
+            "export_title": "방 키 내보내기",
+            "file_to_import": "가져올 파일",
+            "import_description_1": "이 과정으로 다른 Matrix 클라이언트에서 내보낸 암호화 키를 가져올 수 있습니다. 그런 다음 이전 클라이언트에서 복호화할 수 있는 모든 메시지를 복호화할 수 있습니다.",
+            "import_description_2": "내보낸 파일이 암호로 보호되어 있습니다. 파일을 복호화하려면, 여기에 암호를 입력해야 합니다.",
+            "import_title": "방 키 가져오기",
+            "phrase_cannot_be_empty": "암호를 입력해야 함",
+            "phrase_must_match": "암호가 일치해야 함",
+            "phrase_strong_enough": "좋아요! 이 암호는 충분히 강력해 보입니다."
+        },
+        "keyboard": {
+            "dialog_title": "<strong>설정:</strong> 키보드",
+            "title": "키보드 (단축키)"
+        },
+        "labs": {
+            "dialog_title": "<strong>설정:</strong> 실험실 기능"
+        },
+        "labs_mjolnir": {
+            "dialog_title": "<strong>설정:</strong> 무시된 사용자"
+        },
+        "media_preview": {
+            "hide_avatars": "채팅방 및 초대자의 아바타 숨기기",
+            "hide_media": "항상 숨기기",
+            "media_preview_description": "숨겨진 미디어는 터치로 표시할 수 있습니다.",
+            "media_preview_label": "타임라인에 미디어 표시",
+            "show_in_private": "비공개 방에서",
+            "show_media": "항상 표시"
+        },
+        "not_supported": "귀하의 서버에서는 이 기능이 구현되어 있지 않습니다.",
+        "notifications": {
+            "default_setting_description": "이 설정은 기본적으로 모든 채팅방에 적용됩니다.",
+            "default_setting_section": "알림을 받고 싶습니다 (기본 설정)",
+            "desktop_notification_message_preview": "데스크톱 알림에 메시지 미리 보기 표시",
+            "dialog_title": "<strong>설정:</strong> 알림",
+            "email_description": "놓친 알림에 대한 이메일 요약을 받으세요",
+            "email_section": "이메일 요약",
+            "email_select": "요약 이메일을 받을 이메일을 선택하세요. 이메일 관리는 <button>일반</button>에서 할 수 있습니다",
+            "enable_audible_notifications_session": "이 세션에 대해 소리 알림을 켭니다",
+            "enable_desktop_notifications_session": "이 세션에 대해 데스크톱 알림을 활성화하세요",
+            "enable_email_notifications": "%(email)s에 대한 이메일 알림 활성화",
+            "enable_notifications_account": "이 계정에 대한 알림을 켭니다",
+            "enable_notifications_account_detail": "모든 기기 및 세션에서 알림을 비활성화하려면 끄기",
+            "enable_notifications_device": "이 기기에 대한 알림을 켭니다",
+            "error_loading": "알림 설정을 불러오는 중에 오류가 발생했습니다.",
+            "error_permissions_denied": "%(brand)s은 알림을 보낼 권한을 가지고 있지 않습니다. 브라우저 설정을 확인해주세요",
+            "error_permissions_missing": "%(brand)s이 알림을 보낼 권한을 받지 못했습니다. 다시 해주세요",
+            "error_saving": "알림 환경 설정을 저장하는 중 오류가 발생했습니다.",
+            "error_saving_detail": "알림 환경 설정을 저장하는 동안 오류가 발생했습니다.",
+            "error_title": "알림을 사용할 수 없음",
+            "error_updating": "알림 설정을 업데이트하는 중에 오류가 발생했습니다. 옵션을 다시 설정해 보세요.",
+            "invites": "채팅방에 초대됨",
+            "keywords": "채팅방에서 키워드가 사용될 때 배지 <badge/> 를 표시합니다.",
+            "keywords_prompt": "여기에 키워드를 입력하세요. 철자 변형이나 별명에도 사용할 수 있습니다",
+            "labs_notice_prompt": "<strong>업데이트:</strong> 알림 설정을 간소화하여 옵션을 더 쉽게 찾을 수 있도록 했습니다. 이전에 선택한 일부 맞춤 설정은 여기에서 표시되지 않지만, 여전히 활성 상태입니다. 진행하면 일부 설정이 변경될 수 있습니다. <a>자세히 알아보기</a>",
+            "mentions_keywords": "멘션 및 키워드",
+            "mentions_keywords_only": "멘션 및 키워드만",
+            "messages_containing_keywords": "키워드가 포함된 메시지",
+            "noisy": "소리",
+            "notices": "봇이 보낸 메시지",
+            "notify_at_room": "누군가 @채팅방을 사용해 언급하면 알림",
+            "notify_keyword": "누군가 키워드를 사용할 때 알림",
+            "notify_mention": "누군가 @사용자이름 또는 %(mxid)s로 언급(멘션)하면 알림",
+            "other_section": "귀하가 관심을 가질 만한 다른 사항:",
+            "people_mentions_keywords": "사람, 멘션 및 키워드",
+            "play_sound_for_description": "기본적으로 모든 기기의 모든 채팅방에 적용됩니다.",
+            "play_sound_for_section": "소리를 재생합니다",
+            "push_targets": "알림 대상",
+            "quick_actions_mark_all_read": "모든 메시지를 읽음으로 표시",
+            "quick_actions_reset": "기본 설정으로 재설정",
+            "quick_actions_section": "빠른 작업",
+            "room_activity": "새로운 채팅방 활동, 업그레이드 및 상태 메시지가 발생합니다",
+            "rule_call": "전화 초대",
+            "rule_contains_display_name": "내 표시 이름이 포함된 메시지",
+            "rule_contains_user_name": "내 사용자 이름이 있는 메시지",
+            "rule_encrypted": "그룹 대화 암호화된 메시지",
+            "rule_encrypted_room_one_to_one": "1:1 대화 암호화된 메시지",
+            "rule_invite_for_me": "방에 초대받았을 때",
+            "rule_message": "그룹 대화 메시지",
+            "rule_room_one_to_one": "1:1 대화 메시지",
+            "rule_roomnotif": "@room이(가) 있는 메시지",
+            "rule_suppress_notices": "봇에게 받은 메시지",
+            "rule_tombstone": "방을 업그레이드했을 때",
+            "show_message_desktop_notification": "컴퓨터 알림에서 내용 보이기",
+            "voip": "음성 및 영상 통화"
+        },
+        "preferences": {
+            "Electron.enableContentProtection": "다른 앱이 창 내용을 캡처하지 못하도록 방지합니다",
+            "Electron.enableHardwareAcceleration": "하드웨어 가속 사용 (적용하려면 %(appName)s을(를) 다시 시작하세요)",
+            "always_show_menu_bar": "항상 윈도우 메뉴 막대에 보이기",
+            "autocomplete_delay": "자동 완성 딜레이 (ms)",
+            "code_blocks_heading": "코드 블록",
+            "compact_modern": "더 간결한 '모던' 레이아웃을 사용하세요",
+            "composer_heading": "작성기",
+            "default_timezone": "브라우저 기본값(%(timezone)s )",
+            "dialog_title": "<strong>설정:</strong> 환경설정",
+            "enable_content_protection": "콘텐츠 보호 활성화",
+            "enable_hardware_acceleration": "하드웨어 가속 활성화",
+            "enable_tray_icon": "트레이 아이콘을 표시하고 닫을 때 창을 최소화합니다.",
+            "keyboard_heading": "키보드 단축키",
+            "keyboard_view_shortcuts_button": "모든 키보드 단축키를 보려면 <a>여기를 클릭하세요</a>.",
+            "media_heading": "이미지, GIF 및 동영상",
+            "presence_description": "귀하의 활동과 상태를 다른 사람들과 공유하세요.",
+            "publish_timezone": "공개 프로필에 시간대 게시",
+            "rm_lifetime": "이전 대화 경계선 표시 시간 (ms)",
+            "rm_lifetime_offscreen": "이전 대화 경계선 사라지는 시간 (ms)",
+            "room_directory_heading": "채팅방 목록",
+            "room_list_heading": "방 목록",
+            "show_avatars_pills": "사용자, 방 및 이벤트 멘션에 아바타 표시",
+            "show_polls_button": "투표 버튼 표시",
+            "startup_window_behaviour_label": "시작 및 창 동작",
+            "surround_text": "특수 문자를 입력할 때 선택한 텍스트를 둘러싸기",
+            "time_heading": "시간 표시",
+            "user_timezone": "시간대 설정"
+        },
+        "prompt_invite": "잠재적으로 올바르지 않은 Matrix ID로 초대를 보내기 전에 확인",
+        "replace_plain_emoji": "일반 문자로 된 이모지 자동으로 변환하기",
+        "security": {
+            "analytics_description": "익명 데이터를 공유하여 문제점을 파악하는 데 도움을 주세요. 개인 정보는 포함되지 않습니다. 제3자에게 제공되지 않습니다.",
+            "bulk_options_accept_all_invites": "모든 %(invitedRooms)s개의 초대를 수락",
+            "bulk_options_reject_all_invites": "모든 %(invitedRooms)s개의 초대를 거절",
+            "bulk_options_section": "대량 설정",
+            "dehydrated_device_description": "오프라인 기기 기능을 사용하면 어떤 기기에도 로그인하지 않은 상태에서도 암호화된 메시지를 수신할 수 있습니다.",
+            "dehydrated_device_enabled": "오프라인 장치 활성화됨",
+            "dialog_title": "<strong>설정:</strong> 보안 및 개인 정보 보호",
+            "e2ee_default_disabled_warning": "서버 관리자가 비공개 채팅방과 1:1 메시지의 종단간 암호화를 기본적으로 비활성화했습니다.",
+            "enable_message_search": "암호화된 방에서 메시지 검색을 활성화합니다",
+            "encryption_section": "암호화",
+            "ignore_users_empty": "무시된 사용자가 없습니다.",
+            "ignore_users_section": "무시한 사용자",
+            "key_backup_algorithm": "알고리즘:",
+            "message_search_disable_warning": "비활성화된 경우, 암호화된 방의 메시지는 검색 결과에 표시되지 않습니다.",
+            "message_search_disabled": "암호화된 메시지를 안전하게 로컬에 캐시하여 검색 결과에 표시되도록 합니다.",
+            "message_search_enabled": {
+                "other": "암호화된 메시지를 안전하게 로컬에 캐시하여 검색 결과에 표시되도록 합니다. %(size)s 를 사용하여 %(rooms)s 방의 메시지를 저장합니다."
+            },
+            "message_search_failed": "메시지 검색 초기화 실패",
+            "message_search_indexed_messages": "색인된 메시지:",
+            "message_search_indexed_rooms": "색인된 채팅방:",
+            "message_search_indexing": "현재 색인 중: %(currentRoom)s",
+            "message_search_indexing_idle": "현재 어떤 채팅방의 메시지도 색인화하지 않고 있습니다.",
+            "message_search_intro": "%(brand)s은(는) 검색 결과에 표시하기 위해 암호화된 메시지를 로컬에 안전하게 캐싱합니다:",
+            "message_search_room_progress": "전체 %(totalRooms)s개 중 %(doneRooms)s개 완료",
+            "message_search_section": "메시지 검색",
+            "message_search_sleep_time": "메시지는 얼마나 빨리 다운로드되어야 합니까?",
+            "message_search_space_used": "사용된 공간:",
+            "message_search_unsupported": "%(brand)s에는 암호화된 메시지를 로컬에 안전하게 캐싱하는 데 필요한 일부 구성 요소가 누락되어 있습니다. 이 기능을 실험적으로 사용해 보려면, <nativeLink>검색 구성 요소가 추가된</nativeLink> 사용자 지정 %(brand)s 데스크톱을 직접 빌드하세요.",
+            "message_search_unsupported_web": "웹 브라우저에서 실행 중일 때 %(brand)s는 암호화된 메시지를 로컬에 안전하게 캐시할 수 없습니다. 암호화된 메시지를 검색 결과에 표시하려면 <desktopLink>%(brand)s 데스크톱</desktopLink>을 사용하세요.",
+            "record_session_details": "클라이언트 이름, 버전 및 URL을 기록하여 세션 관리자로 세션을 더 쉽게 식별할 수 있도록 합니다.",
+            "send_analytics": "정보 분석 데이터 보내기",
+            "strict_encryption": "인증된 사용자에게만 메시지를 보내세요"
+        },
+        "send_read_receipts": "읽음 확인 보내기",
+        "send_read_receipts_unsupported": "귀하의 서버는 읽음 확인 전송 비활성화를 지원하지 않습니다.",
+        "send_typing_notifications": "입력 알림 보내기",
+        "sessions": {
+            "best_security_note": "보안을 위해 세션을 확인하고, 인식하지 못하거나 더 이상 사용하지 않는 세션에서는 로그아웃하십시오.",
+            "browser": "브라우저",
+            "confirm_sign_out": {
+                "other": "이 기기들의 로그아웃을 확인하세요"
+            },
+            "confirm_sign_out_body": {
+                "other": "아래 버튼을 클릭하여 해당 기기에서 로그아웃을 확인하세요."
+            },
+            "confirm_sign_out_continue": {
+                "other": "기기 로그아웃"
+            },
+            "confirm_sign_out_sso": {
+                "other": "단일 로그인(SSO)을 사용하여 본인임을 확인하고 해당 기기에서 로그아웃을 확인하십시오."
+            },
+            "current_session": "현재 세션",
+            "desktop_session": "데스크톱 세션",
+            "details_heading": "세션 세부 정보",
+            "device_unverified_description": "최상의 보안 및 안정성을 위해 이 세션을 확인하거나 로그아웃하십시오.",
+            "device_unverified_description_current": "보안 메시징 강화를 위해 현재 세션을 확인하십시오.",
+            "device_verified_description": "이 세션은 보안 메시징을 사용할 준비가 되었습니다.",
+            "device_verified_description_current": "현재 세션에서 보안 메세지를 사용할 수 있습니다.",
+            "dialog_title": "<strong>설정:</strong> 세션",
+            "error_pusher_state": "푸셔 상태를 설정하지 못했습니다.",
+            "error_set_name": "세션 이름을 설정하지 못했습니다.",
+            "filter_all": "전체",
+            "filter_inactive": "비활성",
+            "filter_inactive_description": "%(inactiveAgeDays)s 일 이상 비활성 상태",
+            "filter_label": "기기 필터링",
+            "filter_unverified_description": "보안 메시징 준비가 되지 않음",
+            "filter_verified_description": "보안 메시징 준비 완료",
+            "hide_details": "세부정보 숨기기",
+            "inactive_days": "%(inactiveAgeDays)s일 이상 비활성 상태",
+            "inactive_sessions": "비활성 세션",
+            "inactive_sessions_explainer_1": "비활성 세션은 일정 기간 사용하지 않은 세션이지만, 계속해서 암호화 키를 수신합니다.",
+            "inactive_sessions_explainer_2": "비활성 세션을 제거하면 보안성과 성능이 향상되며, 새로운 세션이 의심스러운지 식별하기가 더 쉬워집니다.",
+            "inactive_sessions_list_description": "더 이상 사용하지 않는 오래된 세션(%(inactiveAgeDays)s 일 이상 경과)에서 로그아웃하는 것을 고려해 보세요.",
+            "ip": "IP 주소",
+            "last_activity": "최근 활동",
+            "manage": "이 세션 관리",
+            "mobile_session": "모바일 세션",
+            "n_sessions_selected": {
+                "other": "%(count)s개 세션 선택됨"
+            },
+            "no_inactive_sessions": "비활성 세션이 발견되지 않았습니다.",
+            "no_sessions": "세션을 찾을 수 없습니다.",
+            "no_unverified_sessions": "확인되지 않은 세션이 없습니다.",
+            "no_verified_sessions": "확인된 세션이 없습니다.",
+            "os": "운영체제",
+            "other_sessions_heading": "다른 세션",
+            "push_heading": "푸시 알림",
+            "push_subheading": "이 세션에 대한 푸시 알림을 받으세요.",
+            "push_toggle": "이 세션에서 푸시 알림을 전환합니다.",
+            "rename_form_caption": "세션 이름은 대화 상대방에게도 표시된다는 점을 유의하시기 바랍니다.",
+            "rename_form_heading": "세션 이름 바꾸기",
+            "rename_form_learn_more": "세션 이름 변경",
+            "rename_form_learn_more_description_1": "개인 메시지와 참여한 채팅방에 있는 다른 사용자는 사용자의 전체 세션 목록을 볼 수 있습니다.",
+            "rename_form_learn_more_description_2": "이렇게 하면 상대방은 당신과 대화하고 있다는 확신을 가질 수 있지만, 동시에 당신이 여기에 입력하는 세션 이름도 볼 수 있습니다.",
+            "security_recommendations": "보안 권고사항",
+            "security_recommendations_description": "다음 권장 사항을 따라 계정 보안을 강화하세요.",
+            "session_id": "세션 ID",
+            "show_details": "세부 정보 표시",
+            "sign_in_with_qr": "새 기기 연결",
+            "sign_in_with_qr_button": "QR 코드 보기",
+            "sign_in_with_qr_description": "QR 코드를 사용하여 다른 기기에 로그인하고 보안 메시징을 설정하세요.",
+            "sign_in_with_qr_unsupported": "귀하의 계정 제공업체에서 지원하지 않습니다.",
+            "sign_out": "이 세션에서 로그아웃합니다",
+            "sign_out_all_other_sessions": "다른 모든 기기에서 로그아웃 (%(otherSessionsCount)s)",
+            "sign_out_confirm_description": {
+                "other": "%(count)s 세션에서 로그아웃하시겠습니까?"
+            },
+            "sign_out_n_sessions": {
+                "other": "%(count)s개 세션에서 로그아웃"
+            },
+            "title": "세션목록",
+            "unknown_session": "알 수 없는 세션 유형",
+            "unverified_session": "검증되지 않은 세션",
+            "unverified_session_explainer_1": "이 세션은 암호화를 지원하지 않으므로 검증할 수 없습니다.",
+            "unverified_session_explainer_2": "이 세션을 사용할 때 암호화가 활성화된 방에는 참여할 수 없습니다.",
+            "unverified_session_explainer_3": "최상의 보안 및 개인정보 보호를 위해 암호화를 지원하는 Matrix 클라이언트를 사용하는 것이 권장됩니다.",
+            "unverified_sessions": "검증되지 않은 세션들",
+            "unverified_sessions_explainer_1": "미확인 세션은 사용자의 자격 증명으로 로그인했으나 교차 검증되지 않은 세션을 의미합니다.",
+            "unverified_sessions_explainer_2": "특히 이러한 세션을 반드시 확인해야 합니다. 이는 귀하의 계정이 무단으로 사용되고 있을 수 있음을 나타낼 수 있기 때문입니다.",
+            "unverified_sessions_list_description": "보안 메시징 기능을 강화하려면 세션을 확인하거나, 더 이상 사용하지 않거나 알 수 없는 세션에서 로그아웃하세요.",
+            "url": "URL",
+            "verified_session": "검증된 세션",
+            "verified_sessions": "검증된 세션들",
+            "verified_sessions_explainer_1": "인증된 세션은 암호를 입력하거나 다른 검증된 세션으로 본인임을 확인한 후 이 계정을 사용하는 모든 곳을 의미합니다.",
+            "verified_sessions_explainer_2": "이는 암호화된 메시지를 해독하는 데 필요한 모든 키를 보유하고 있으며, 다른 사용자에게 본 세션을 신뢰한다는 점을 확인할 수 있음을 의미합니다.",
+            "verified_sessions_list_description": "보안을 위해, 더 이상 사용하지 않거나 본인이 아닌 세션에서는 로그아웃하십시오.",
+            "verify_session": "세션 확인",
+            "web_session": "웹 세션"
+        },
+        "show_avatar_changes": "프로필 사진 변경 사항 표시",
+        "show_breadcrumbs": "채팅방 목록 위에 최근 본 채팅방 바로가기를 표시",
+        "show_chat_effects": "채팅 효과 표시 (메세지 전송시 애니메이션 효과등)",
+        "show_displayname_changes": "표시 이름 변경 사항 보이기",
+        "show_join_leave": "입장/퇴장 메시지 표시 (초대/강제 퇴장/차단에는 영향 없음)",
+        "show_message_previews": "메시지 미리 보기 표시",
+        "show_nsfw_content": "NSFW 콘텐츠 표시",
+        "show_read_receipts": "다른 사용자가 읽은 기록 보이기",
+        "show_redaction_placeholder": "감춘 메시지의 자리 표시하기",
+        "show_stickers_button": "스티커 표시 버튼",
+        "show_typing_notifications": "메세지 타이핑 알림 표시",
+        "showbold": "채팅방 목록에서 모든 활동 표시 (점 또는 읽지 않은 메시지 수)",
+        "sidebar": {
+            "dialog_title": "<strong>설정:</strong> 사이드바",
+            "metaspaces_favourites_description": "좋아하는 채팅방과 사람들을 한곳에 모아보세요.",
+            "metaspaces_home_all_rooms": "모든 방 목록 보기",
+            "metaspaces_home_all_rooms_description": "홈에서 모든 채팅방을 표시합니다. 채팅방이 스페이스에 속해 있어도 표시됩니다.",
+            "metaspaces_home_description": "홈은 모든 것을 한눈에 파악하는 데 유용합니다.",
+            "metaspaces_orphans": "스페이스 밖의 채팅방",
+            "metaspaces_orphans_description": "스페이스에 속하지 않은 모든 채팅방을 한곳에 모으기",
+            "metaspaces_people_description": "모든 사람들을 한곳에 모으세요.",
+            "metaspaces_subsection": "표시할 스페이스",
+            "metaspaces_video_rooms": "영상 회의실 및 회의",
+            "metaspaces_video_rooms_description": "모든 비공개 영상 방 및 회의를 그룹화합니다.",
+            "metaspaces_video_rooms_description_invite_extension": "컨퍼런스에서는 매트릭스 외부 사람들을 초대할 수 있습니다.",
+            "spaces_explainer": "스페이스는 채팅방과 사람들을 그룹화하는 방법입니다. 현재 참여 중인 스페이스와 함께, 미리 만들어진 스페이스도 사용할 수 있습니다.",
+            "title": "사이드바"
+        },
+        "start_automatically": {
+            "disabled": "아니요",
+            "enabled": "예",
+            "label": "컴퓨터에 로그인할 때 %(brand)s 을 열어주세요.",
+            "minimised": "최소화됨"
+        },
+        "tac_only_notifications": "스레드 활동 센터에서만 알림 표시",
+        "use_12_hour_format": "시간을 12시간제로 보이기(예: 오후 2:30)",
+        "use_command_enter_send_message": "Command + Enter 키를 눌러 메시지를 보내세요",
+        "use_command_f_search": "Command + F를 사용하여 타임라인 검색",
+        "use_control_enter_send_message": "메시지를 보내려면 Ctrl + Enter를 누르세요",
+        "use_control_f_search": "Ctrl + F를 사용하여 타임라인 검색",
+        "voip": {
+            "allow_p2p": "1:1 통화에 대해 P2P 허용",
+            "allow_p2p_description": "이 기능이 활성화되면 상대방이 귀하의 IP 주소를 볼 수 있습니다.",
+            "audio_input_empty": "마이크 감지 없음",
+            "audio_output": "오디오 출력",
+            "audio_output_empty": "오디오 출력 감지 없음",
+            "auto_gain_control": "자동 이득 제어",
+            "connection_section": "연결",
+            "dialog_title": "<strong>설정:</strong> 음성 및 영상",
+            "echo_cancellation": "에코 제거",
+            "enable_fallback_ice_server": "대체 통화 지원 서버 허용 (%(server)s)",
+            "enable_fallback_ice_server_description": "홈 서버에서 제공하지 않는 경우에만 적용됩니다. 통화 중 귀하의 IP 주소가 공유될 수 있습니다.",
+            "mirror_local_feed": "보고 있는 비디오 전송 상태 비추기",
+            "missing_permissions_prompt": "미디어 권한이 없습니다, 권한 요청을 보내려면 아래 버튼을 클릭하세요.",
+            "noise_suppression": "잡음 억제",
+            "request_permissions": "미디어 권한 요청",
+            "title": "음성 & 영상",
+            "video_input_empty": "카메라 감지 없음",
+            "video_section": "동영상 설정",
+            "voice_agc": "마이크 볼륨을 자동으로 조절합니다",
+            "voice_processing": "음성 처리",
+            "voice_section": "음성 설정"
+        },
+        "warn_quit": "종료하기 전에 경고",
+        "warning": "<w>경고:</w> <description/>"
+    },
+    "share": {
+        "link_copied": "링크 복사됨",
+        "permalink_message": "선택한 메시지로 연결",
+        "permalink_most_recent": "가장 최근 메시지로 연결",
+        "share_call": "컨퍼런스 초대 링크",
+        "share_call_subtitle": "외부 사용자가 매트릭스 계정 없이 회의에 참여할 수 있는 링크:",
+        "title_link": "링크 공유",
+        "title_message": "방 메시지 공유",
+        "title_room": "방 공유",
+        "title_user": "사용자 공유"
+    },
+    "slash_command": {
+        "addwidget": "URL로 방에 맞춤 위젯 추가하기",
+        "addwidget_iframe_missing_src": "iframe에 src 속성이 없습니다",
+        "addwidget_invalid_protocol": "https:// 또는 http:// 위젯 URL을 제공하세요",
+        "addwidget_missing_url": "위젯 URL 또는 임베드 코드를 제공해 주세요.",
+        "addwidget_no_permissions": "이 방에서 위젯을 수정할 수 없습니다.",
+        "ban": "받은 ID로 사용자 출입 금지하기",
+        "category_actions": "활동",
+        "category_admin": "관리자",
+        "category_advanced": "고급",
+        "category_effects": "효과",
+        "category_messages": "메시지",
+        "category_other": "기타",
+        "command_error": "명령어 오류",
+        "converttodm": "방을 DM으로 변환합니다",
+        "converttoroom": "DM을 방으로 변환",
+        "could_not_find_room": "방이 없습니다",
+        "deop": "받은 ID로 사용자의 등급을 낮추기",
+        "devtools": "개발자 도구 대화 열기",
+        "discardsession": "암호화된 방에서 현재 방 외부의 그룹 세션을 강제로 삭제합니다",
+        "error_invalid_rendering_type": "명령 오류: 렌더링 유형을 찾을 수 없습니다 (%(renderingType)s)",
+        "error_invalid_room": "명령 실패: 방을 찾을 수 없습니다 (%(roomId)s)",
+        "error_invalid_runfn": "명령 오류: 슬래시 명령어를 처리할 수 없습니다.",
+        "error_invalid_user_in_room": "방에서 사용자를 찾을 수 없습니다",
+        "help": "사용법과 설명이 포함된 명령어 목록을 표시합니다",
+        "help_dialog_title": "명령어 도움",
+        "holdcall": "현재 방의 통화를 보류 상태로 전환합니다",
+        "html": "메시지를 마크다운으로서 해석하지 않고 html로서 전송",
+        "ignore": "사용자를 무시하고, 메시지 감추기",
+        "ignore_dialog_description": "%(userId)s님을 이제 무시합니다",
+        "ignore_dialog_title": "무시당한 사용자",
+        "invite": "받은 ID로 사용자를 현재 방에 초대하기",
+        "invite_3pid_needs_is_error": "ID 서버를 사용해 이메일로 초대하세요. 설정에서 관리하세요.",
+        "invite_3pid_use_default_is_title": "ID 서버 사용",
+        "invite_3pid_use_default_is_title_description": "ID 서버를 사용해 이메일로 초대하세요. 기본 ID 서버 (%(defaultIdentityServerName)s)를 사용하려면 계속을 클릭하거나 설정에서 관리하세요.",
+        "invite_failed": "사용자(%(user)s)는 %(roomId)s 에 초대되지 않았으나, 초대자 유틸리티에서 오류가 발생하지 않았습니다.",
+        "join": "지정된 주소로 방에 참여합니다",
+        "jumptodate": "타임라인에서 지정된 날짜로 이동",
+        "jumptodate_invalid_input": "입력한 날짜 (%(inputDate)s)를 이해할 수 없습니다. YYYY-MM-DD 형식을 사용해 보세요",
+        "lenny": "메시지 앞에 ( ͡° ͜ʖ ͡°) 추가",
+        "manual_device_verification_confirm_description": "이 기능은 다른 기기가 귀하를 사칭하여 메시지를 주고받을 수 있게 합니다. 누군가 여기에 무언가를 붙여넣으라고 했다면, 사기일 가능성이 높습니다! 정말 이 다른 기기를 인증하시겠습니까?",
+        "manual_device_verification_confirm_title": "주의: 수동 장치 확인",
+        "me": "활동 표시하기",
+        "msg": "지정된 사용자에게 메시지를 보냅니다",
+        "myavatar": "모든 채팅방에서 프로필 사진을 변경합니다",
+        "myroomavatar": "현재 채팅방에서만 프로필 사진을 변경합니다",
+        "myroomnick": "현재 방에서만 표시 별명 변경하기",
+        "nick": "표시 별명 변경하기",
+        "no_active_call": "이 방에 진행중인 통화 없음",
+        "op": "사용자의 권한 등급 정의하기",
+        "part_unknown_alias": "알 수 없는 방 주소: %(roomAlias)s",
+        "plain": "일반 문자로 메시지를 보냅니다, 마크다운으로 해석하지 않습니다",
+        "query": "지정된 사용자와 채팅을 시작합니다",
+        "query_not_found_phone_number": "전화번호에 대한 매트릭스 ID를 찾을 수 없습니다",
+        "rageshake": "버그 보고서를 로그와 함께 보내주세요",
+        "rainbow": "주어진 메시지를 무지개 색으로 보냅니다",
+        "rainbowme": "주어진 감정 표현을 무지개 색으로 보냅니다",
+        "remove": "지정된 ID를 가진 사용자를 이 방에서 제거합니다",
+        "roomavatar": "현재 방의 아바타 변경하기",
+        "roomname": "방 이름 설정하기",
+        "server_error": "서버 오류",
+        "server_error_detail": "서버를 쓸 수 없거나 과부하거나, 다른 문제가 있습니다.",
+        "shrug": "¯\\_(ツ)_/¯ 앞에 일반 문자 메시지를 놓으세요",
+        "spoiler": "스포일러로서 주어진 메시지를 전송",
+        "tableflip": "평문 텍스트 메시지 앞에 (╯°□°）╯︵ ┻━┻ 를 덧붙임",
+        "topic": "방 주제를 얻거나 설정하기",
+        "topic_none": "이 방은 주제가 없습니다.",
+        "topic_room_error": "채팅방 주제 불러오기 실패: (%(roomId)s) 채팅방을 찾을 수 없음",
+        "unban": "받은 ID로 사용자 출입 금지 풀기",
+        "unflip": "평문 텍스트 메시지 앞에 ┬──┬ ノ( ゜-゜ノ) 를 덧붙임",
+        "unholdcall": "현재 방 통화를 보류 해제합니다",
+        "unignore": "사용자를 그만 무시하고 이제부터 메시지 보기",
+        "unignore_dialog_description": "%(userId)s님을 더 이상 무시하고 있지 않습니다",
+        "unignore_dialog_title": "무시하지 않게 된 사용자",
+        "unknown_command": "알 수 없는 명령",
+        "unknown_command_button": "메시지로 보내기",
+        "unknown_command_detail": "알 수 없는 명령어: %(commandText)s",
+        "unknown_command_help": "사용 가능한 명령어 목록을 보려면 <code>/help</code> 를 사용할 수 있습니다. 이 내용을 메시지로 보내려는 건가요?",
+        "unknown_command_hint": "팁: 메시지를 슬래시(/)로 시작하려면 <code>//</code>를 맨 앞에 입력하세요.",
+        "upgraderoom": "새 버전으로 방을 업그레이드하기",
+        "upgraderoom_permission_error": "이 명령어를 사용하기 위해 필요한 권한이 없습니다.",
+        "usage": "사용",
+        "verify": "자신의 기기 중 하나를 수동으로 확인하십시오",
+        "view": "주어진 주소로 방 보기",
+        "whois": "사용자에 대한 정보를 표시합니다"
+    },
+    "sliding_sync_legacy_no_longer_supported": "레거시 슬라이딩 동기화는 더 이상 지원되지 않습니다: 새 슬라이딩 동기화 플래그를 활성화하려면 로그아웃 후 다시 로그인하십시오",
+    "space": {
+        "add_existing_room_space": {
+            "create": "대신 새 방을 추가하시겠습니까?",
+            "create_prompt": "새 방 만들기",
+            "dm_heading": "다이렉트 메세지",
+            "error_heading": "선택된 모든 항목이 추가된 것은 아닙니다.",
+            "progress_text": {
+                "other": "채팅방 추가 중... (총 %(count)s개 중 %(progress)s개)"
+            },
+            "space_dropdown_label": "스페이스 선택",
+            "space_dropdown_title": "기존 방 추가",
+            "subspace_moved_note": "추가 된 스페이스로 이동"
+        },
+        "add_existing_subspace": {
+            "create_button": "새로운 스페이스 만들기",
+            "create_prompt": "대신 새 스페이스를 추가하시겠습니까?",
+            "filter_placeholder": "스페이스 검색",
+            "space_dropdown_title": "기존 스페이스 추가"
+        },
+        "context_menu": {
+            "devtools_open_timeline": "방 타임라인 보기 (개발자 도구)",
+            "explore": "방 검색",
+            "home": "스페이스 홈",
+            "manage_and_explore": "관리 및 방 목록 보기",
+            "options": "스페이스 옵션"
+        },
+        "failed_load_rooms": "방 목록을 불러오는 데 실패했습니다.",
+        "failed_remove_rooms": "일부 방을 제거하지 못했습니다. 나중에 다시 시도해 주세요.",
+        "incompatible_server_hierarchy": "귀하의 서버는 스페이스 계층 구조 표시를 지원하지 않습니다.",
+        "invite": "사람 초대하기",
+        "invite_description": "이메일 또는 사용자 이름으로 초대하기",
+        "invite_link": "초대 링크 공유하기",
+        "joining_space": "참가 중…",
+        "landing_welcome": "<name/>에 오신것을 환영합니다.",
+        "leave_dialog_action": "스페이스를 남겨두세요",
+        "leave_dialog_description": "<spaceName/>.를 떠나려고 하고 있습니다.",
+        "leave_dialog_only_admin_room_warning": "귀하는 일부 방이나 스페이스의 유일한 관리자입니다. 해당 공간을 떠나면 관리자 없이 남겨지게 됩니다.",
+        "leave_dialog_only_admin_warning": "이 스페이스의 유일한 관리자입니다. 이곳을 떠나면 아무도 관리할 수 없게 됩니다.",
+        "leave_dialog_option_all": "모든 방에서 떠나기",
+        "leave_dialog_option_intro": "이 스페이스의 방들을 떠나시겠습니까?",
+        "leave_dialog_option_none": "어떤 방도 나가지 마세요",
+        "leave_dialog_option_specific": "몇 개의 방을 남겨두세요",
+        "leave_dialog_public_rejoin_warning": "재 초대 받지 않는 한 다시 참여할 수 없습니다.",
+        "leave_dialog_title": "%(spaceName)s를 떠나기",
+        "mark_suggested": "제안된 대로 표시하기",
+        "no_search_result_hint": "다른 검색어를 사용해 보시거나 오타를 확인해 보시기 바랍니다.",
+        "preferences": {
+            "sections_section": "표시할 섹션",
+            "show_people_in_space": "이 설정은 해당 공간 구성원들과의 채팅을 그룹화합니다. 이 기능을 끄면 %(spaceName)s 에서 해당 채팅이 표시되지 않습니다."
+        },
+        "room_filter_placeholder": "방 검색",
+        "search_children": "%(spaceName)s 스페이스 찾기",
+        "search_placeholder": "이름 및 설명 검색",
+        "select_room_below": "아래에서 먼저 방을 선택하세요",
+        "share_public": "당신의 공개 스페이스 공유하기",
+        "suggested": "추천",
+        "suggested_tooltip": "이 방은 참여하기 좋은 방으로 추천됩니다",
+        "title_when_query_available": "결과",
+        "title_when_query_unavailable": "방 및 스페이스 목록",
+        "unmark_suggested": "추천하지 않음으로 표시",
+        "user_lacks_permission": "권한이 없습니다!"
+    },
+    "space_settings": {
+        "title": "설정 -%(spaceName)s"
+    },
+    "spaces": {
+        "error_no_permission_add_room": "이 공간에 방을 추가할 권한이 없습니다.",
+        "error_no_permission_add_space": "이 스페이스에 스페이스를 추가할 권한이 없습니다.",
+        "error_no_permission_create_room": "이 스페이스에서 새 방을 생성할 권한이 없습니다.",
+        "error_no_permission_invite": "이 스페이스에 사람을 초대할 권한이 없습니다."
+    },
+    "spotlight": {
+        "public_rooms": {
+            "network_dropdown_add_dialog_description": "접속할 새 서버 이름을 입력하세요",
+            "network_dropdown_add_dialog_placeholder": "서버 이름",
+            "network_dropdown_add_dialog_title": "새 서버 추가",
+            "network_dropdown_add_server_option": "새로운 서버 추가…",
+            "network_dropdown_available_invalid": "이 서버 또는 해당 서버의 채팅방 목록을 찾을 수 없습니다.",
+            "network_dropdown_available_invalid_forbidden": "이 서버의 채팅방 목록을 볼 수 없습니다.",
+            "network_dropdown_available_valid": "잘 하셨습니다!",
+            "network_dropdown_remove_server_adornment": "“%(roomServer)s” 서버 삭제",
+            "network_dropdown_required_invalid": "서버 이름을 입력하세요",
+            "network_dropdown_selected_label": "보기: 매트릭스 채팅방",
+            "network_dropdown_selected_label_instance": "표시: %(instance)s 스페이스 (%(server)s)",
+            "network_dropdown_your_server_description": "귀하의 서버"
+        }
+    },
+    "spotlight_dialog": {
+        "cant_find_person_helpful_hint": "찾는 사람을 볼 수 없다면 초대 링크를 보내주세요.",
+        "cant_find_room_helpful_hint": "만약 찾고 있는 방이 없다면, 초대를 요청하거나 새로운 방을 만드세요.",
+        "copy_link_text": "초대 링크 복사",
+        "count_of_members": {
+            "other": "%(count)s 회원"
+        },
+        "create_new_room_button": "새 방 만들기",
+        "failed_querying_public_rooms": "공개 채팅방 조회에 실패했습니다",
+        "failed_querying_public_spaces": "공개 스페이스 조회에 실패했습니다",
+        "group_chat_section_title": "기타 옵션",
+        "heading_with_query": "\"%(query)s\"를 사용해 검색",
+        "heading_without_query": "검색 기준",
+        "join_button_text": "%(roomAddress)s 채팅방 참여",
+        "keyboard_scroll_hint": "<arrows/> 를 사용하여 스크롤하세요",
+        "messages_label": "메시지",
+        "other_rooms_in_space": "%(spaceName)s의 다른 채팅방",
+        "public_rooms_label": "공개 채팅방",
+        "public_spaces_label": "공개 스페이스",
+        "recent_searches_section_title": "최근 검색",
+        "recently_viewed_section_title": "최근에 확인한",
+        "remove_filter": "%(filter)s 검색 필터 제거",
+        "result_may_be_hidden_privacy_warning": "개인정보 보호를 위해 일부 결과가 숨겨질 수 있습니다",
+        "result_may_be_hidden_warning": "일부 결과가 숨겨져 있을 수 있습니다.",
+        "search_dialog": "검색 대화상자",
+        "spaces_title": "참여 중인 스페이스",
+        "start_group_chat_button": "그룹 채팅 시작"
+    },
+    "stickers": {
+        "empty": "현재 사용하고 있는 스티커 팩이 없음",
+        "empty_add_prompt": "몇 가지 추가"
+    },
+    "terms": {
+        "column_document": "문서",
+        "column_service": "서비스",
+        "column_summary": "개요",
+        "identity_server_no_terms_description_1": "이 작업에는 이메일 주소 또는 전화번호를 확인하기 위해 기본 ID 서버 <server />에 접근해야 합니다. 하지만 서버가 서비스 약관을 갖고 있지 않습니다.",
+        "identity_server_no_terms_description_2": "서버의 관리자를 신뢰하는 경우에만 계속하세요.",
+        "identity_server_no_terms_title": "ID 서버에 서비스 약관이 없음",
+        "inline_intro_text": "계속하려면 <policyLink />을(를) 수락하세요:",
+        "integration_manager": "봇, 브릿지, 위젯 그리고 스티커 팩을 사용",
+        "intro": "계속하려면 이 서비스 약관에 동의해야 합니다.",
+        "summary_identity_server_1": "전화번호 혹은 이메일로 상대방 찾기",
+        "summary_identity_server_2": "전화번호 혹은 이메일로 찾음",
+        "tac_button": "이용 약관 검토",
+        "tac_description": "홈서버 %(homeserverDomain)s을(를) 계속 사용하기 위해서는 저희 이용 약관을 검토하고 동의해주세요.",
+        "tac_title": "이용 약관",
+        "tos": "서비스 약관"
+    },
+    "theme": {
+        "light_high_contrast": "밝은 고대비",
+        "match_system": "시스템 테마"
+    },
+    "thread_view_back_action_label": "스레드로 돌아가기",
+    "threads": {
+        "all_threads": "모든 스레드",
+        "all_threads_description": "현재 방의 모든 스레드를 표시합니다",
+        "count_of_reply": {
+            "other": "%(count)s개의 답변들"
+        },
+        "empty_description": "메시지 위에 마우스를 올렸을 때 \"%(replyInThread)s\"를 사용하세요.",
+        "empty_title": "스레드는 대화를 주제 중심으로 유지하고 쉽게 추적할 수 있도록 도와줍니다.",
+        "error_start_thread_existing_relation": "기존 관계가 있는 이벤트로부터 스레드를 생성할 수 없습니다",
+        "mark_all_read": "모두 읽음으로 표시",
+        "my_threads": "내 스레드",
+        "my_threads_description": "참여한 모든 스레드를 표시합니다",
+        "open_thread": "스레드 열기",
+        "show_thread_filter": "표시:"
+    },
+    "threads_activity_centre": {
+        "header": "스레드 활동",
+        "no_rooms_with_threads_notifs": "아직 스레드 알림이 있는 방이 없습니다.",
+        "no_rooms_with_unread_threads": "아직 읽지 않은 스레드가 있는 방이 없습니다."
+    },
+    "time": {
+        "about_day_ago": "약 1일 전",
+        "about_hour_ago": "약 1 시간 전",
+        "about_minute_ago": "약 1분 전",
+        "date_at_time": "%(date)s, %(time)s",
+        "few_seconds_ago": "몇 초 전",
+        "hours_minutes_seconds_left": "남은 시간: %(hours)s시간 %(minutes)s분 %(seconds)s초",
+        "in_about_day": "하루 정도 후",
+        "in_about_hour": "지금부터 한 시간 정도 후에",
+        "in_about_minute": "지금부터 약 1분 후",
+        "in_few_seconds": "몇 초 후",
+        "in_n_days": "지금부터 %(num)s 일 후에",
+        "in_n_hours": "지금부터 %(num)s 시간 후",
+        "in_n_minutes": "지금부터 %(num)s분 후",
+        "left": "%(timeRemaining)s 남음",
+        "minutes_seconds_left": "남은 시간: %(minutes)s분 %(seconds)s초",
+        "n_days_ago": "%(num)s일 전",
+        "n_hours_ago": "%(num)s 시간 전",
+        "n_minutes_ago": "%(num)s분 전",
+        "seconds_left": "남은 시간: %(seconds)s초",
+        "short_days": "%(value)s일",
+        "short_days_hours_minutes_seconds": "%(days)s일 %(hours)s시간 %(minutes)s분 %(seconds)s초",
+        "short_hours": "%(value)s시간",
+        "short_hours_minutes_seconds": "%(hours)s시간 %(minutes)s분 %(seconds)s초",
+        "short_minutes": "%(value)s분",
+        "short_minutes_seconds": "%(minutes)s분 %(seconds)s초",
+        "short_seconds": "%(value)s초"
+    },
+    "timeline": {
+        "context_menu": {
+            "collapse_reply_thread": "답글 스레드 접기",
+            "external_url": "출처 URL",
+            "open_in_osm": "OpenStreetMap에서 열기",
+            "report": "보고",
+            "resent_unsent_reactions": "%(unsentCount)s개의 리액션 다시 보내기",
+            "show_url_preview": "미리보기 표시",
+            "view_related_event": "관련 이벤트 보기",
+            "view_source": "소스 보기"
+        },
+        "creation_summary_dm": "%(creator)s 이 DM을 생성했습니다.",
+        "creation_summary_room": "%(creator)s님이 방을 만드고 설정했습니다.",
+        "decryption_failure": {
+            "blocked": "발신자가 귀하의 기기가 인증되지 않았기 때문에 이 메시지를 수신하지 못하도록 차단했습니다.",
+            "historical_event_no_key_backup": "이 기기에서는 과거 메시지를 확인할 수 없습니다.",
+            "historical_event_unverified_device": "이 기기를 인증해야 과거 메시지에 접근할 수 있습니다",
+            "historical_event_user_not_joined": "이 메시지에 액세스할 수 없습니다.",
+            "sender_identity_previously_verified": "발신자의 확인된 신원이 재설정되었습니다.",
+            "sender_unsigned_device": "보안되지 않은 기기에서 전송됨.",
+            "unable_to_decrypt": "메시지를 해독할 수 없습니다."
+        },
+        "disambiguated_profile": "%(displayName)s (%(matrixId)s)",
+        "download_action_decrypting": "복호화 중",
+        "download_action_downloading": "다운로드 중",
+        "download_failed": "다운로드 실패",
+        "download_failed_description": "이 파일을 다운로드하는 동안 오류가 발생했습니다.",
+        "e2e_state": "종단 간 암호화 현황",
+        "edits": {
+            "tooltip_label": "%(date)s에 편집함. 클릭해서 편집 보기.",
+            "tooltip_sub": "편집 내용을 보려면 클릭하세요",
+            "tooltip_title": "편집됨%(date)s"
+        },
+        "error_no_renderer": "이 이벤트를 표시할 수 없음",
+        "error_rendering_message": "이 메시지를 불러올 수 없습니다",
+        "historical_messages_unavailable": "이전 메시지는 볼 수 없습니다.",
+        "in_room_name": "<strong>%(room)s</strong> 안",
+        "io.element.widgets.layout": "%(senderName)s님이 채팅방 레이아웃을 업데이트했습니다",
+        "late_event_separator": "발송 시간: %(dateTime)s",
+        "load_error": {
+            "no_permission": "이 방의 타임라인에서 특정 시점을 불러오려고 했지만, 문제의 메시지를 볼 수 있는 권한이 없습니다.",
+            "title": "타임라인 위치 불러오기에 실패함",
+            "unable_to_find": "이 방의 타임라인에서 특정 시점을 불러오려고 했지만, 찾을 수 없었습니다."
+        },
+        "m.audio": {
+            "audio_player": "오디오 플레이어",
+            "error_downloading_audio": "오디오 다운로드 중 오류 발생",
+            "error_processing_audio": "오디오 메시지 처리 중 오류 발생",
+            "error_processing_voice_message": "음성 메시지 처리 중 오류 발생",
+            "unnamed_audio": "이름 없는 오디오"
+        },
+        "m.beacon_info": {
+            "view_live_location": "실시간 위치 보기"
+        },
+        "m.call": {
+            "video_call_ended": "영상통화가 종료되었습니다",
+            "video_call_started": "%(roomName)s 에서 영상 통화가 시작되었습니다.",
+            "video_call_started_text": "%(name)s 영상 통화를 시작했습니다",
+            "video_call_started_unsupported": "%(roomName)s 에서 영상 통화가 시작되었습니다. (이 브라우저에서는 지원되지 않습니다)"
+        },
+        "m.call.hangup": {
+            "dm": "통화 종료"
+        },
+        "m.call.invite": {
+            "answered_elsewhere": "다른 기기에서 응답함",
+            "call_back_prompt": "전화 걸기",
+            "declined": "통화 거부됨",
+            "failed_connect_media": "미디어를 연결할 수 없습니다",
+            "failed_connection": "연결 실패",
+            "failed_opponent_media": "그들의 기기는 카메라나 마이크를 시작할 수 없었습니다.",
+            "missed_call": "부재중 전화",
+            "no_answer": "응답 없음",
+            "unknown_error": "알 수 없는 오류가 발생했습니다.",
+            "unknown_failure": "알 수 없는 오류: %(reason)s",
+            "unknown_state": "통화 상태를 알 수 없습니다!",
+            "video_call": "%(senderName)s님이 영상 통화를 시작했습니다",
+            "video_call_unsupported": "%(senderName)s님이 영상 통화를 시작했습니다. (이 브라우저에서는 지원되지 않음)",
+            "voice_call": "%(senderName)s님이 음성 통화를 시작했습니다",
+            "voice_call_unsupported": "%(senderName)s님이 음성 통화를 시작했습니다. (이 브라우저에서는 지원되지 않음)"
+        },
+        "m.file": {
+            "error_decrypting": "첨부 파일 복호화 중 오류",
+            "error_invalid": "잘못된 파일입니다."
+        },
+        "m.image": {
+            "error": "오류로 인해 이미지를 표시할 수 없습니다",
+            "error_decrypting": "사진 복호화 중 오류",
+            "error_downloading": "이미지 다운로드 중 오류 발생",
+            "sent": "%(senderDisplayName)s님이 사진을 보냈습니다.",
+            "show_image": "이미지 보이기"
+        },
+        "m.key.verification.request": {
+            "user_wants_to_verify": "%(name)s님이 확인을 요청합니다",
+            "you_started": "확인 요청을 보냈습니다"
+        },
+        "m.location": {
+            "full": "%(senderName)s 자신의 위치를 공유했습니다",
+            "location": "위치를 공유했습니다: ",
+            "self_location": "위치를 공유했습니다: "
+        },
+        "m.poll": {
+            "count_of_votes": {
+                "other": "%(count)s 투표"
+            }
+        },
+        "m.poll.end": {
+            "sender_ended": "%(senderName)s 투표가 종료되었습니다"
+        },
+        "m.poll.start": "%(senderName)s님이 설문을 시작했습니다 - %(pollQuestion)s",
+        "m.room.avatar": {
+            "changed": "%(senderDisplayName)s 방 아바타를 변경했습니다.",
+            "changed_img": "%(senderDisplayName)s님이 방 아바타를 <img/>(으)로 바꿈",
+            "lightbox_title": "%(senderDisplayName)s님이 %(roomName)s 방의 아바타를 바꿈",
+            "removed": "%(senderDisplayName)s님이 방 아바타를 제거했습니다."
+        },
+        "m.room.canonical_alias": {
+            "alt_added": {
+                "other": "%(senderName)s 이 방에 대한 대체 주소 %(addresses)s 을 추가했습니다."
+            },
+            "alt_removed": {
+                "other": "%(senderName)s 해당 방에 대한 대체 주소 %(addresses)s 을 제거했습니다."
+            },
+            "changed": "%(senderName)s님이 이 채팅방의 주소를 변경했습니다.",
+            "changed_alternative": "%(senderName)s님이 이 채팅방의 대체 주소를 변경했습니다.",
+            "changed_main_and_alternative": "%(senderName)s님이 이 채팅방의 메인 및 대체 주소를 변경했습니다.",
+            "removed": "%(senderName)s님이 이 방의 메인 주소를 제거했습니다.",
+            "set": "%(senderName)s님이 이 방의 메인 주소를 %(address)s(으)로 설정했습니다."
+        },
+        "m.room.create": {
+            "continuation": "이 방은 다른 대화방의 연장선입니다.",
+            "see_older_messages": "여길 눌러 오래된 메시지를 보세요.",
+            "unknown_predecessor": "해당 방의 이전 버전(방 ID: %(roomId)s)을 찾을 수 없으며, 이를 검색할 수 있는 'via_servers' 정보도 제공받지 못했습니다.",
+            "unknown_predecessor_guess_server": "해당 방의 이전 버전(방 ID: %(roomId)s)을 찾을 수 없으며, 이를 검색할 'via_servers' 정보도 제공받지 못했습니다. 방 ID로 서버를 추측하는 방법이 통할 수도 있습니다. 시도해 보시려면 이 링크를 클릭하세요:"
+        },
+        "m.room.encryption": {
+            "disable_attempt": "암호화 비활성화 시도가 무시됨",
+            "disabled": "암호화가 활성화되지 않았습니다",
+            "enabled": "이 방의 메시지는 종단 간 암호화됩니다. 사람들이 참여하면 프로필에서 확인할 수 있습니다. 프로필 사진을 탭하기만 하면 됩니다.",
+            "enabled_dm": "여기서 메시지는 종단 간 암호화됩니다. 상대방 프로필에서 %(displayName)s 를 확인하세요 - 프로필 사진을 탭하세요.",
+            "enabled_local": "이 채팅의 메시지는 종단 간 암호화됩니다.",
+            "parameters_changed": "일부 암호화 매개변수가 변경되었습니다.",
+            "state_enabled": "이 방의 메시지와 상태 이벤트는 종단간 암호화됩니다. 참여자의 프로필 사진을 누르면 신원을 검증할 수 있습니다.",
+            "unsupported": "이 방에서 사용하는 암호화 방식은 지원되지 않습니다."
+        },
+        "m.room.guest_access": {
+            "can_join": "%(senderDisplayName)s님이 손님이 방에 들어갈 수 있도록 허용했습니다.",
+            "forbidden": "%(senderDisplayName)s님이 손님이 방에 들어가지 못하도록 했습니다.",
+            "unknown": "%(senderDisplayName)s님이 손님 접근을 %(rule)s(으)로 변경했습니다"
+        },
+        "m.room.history_visibility": {
+            "invited": "%(senderName)s님이 이후 방 구성원 모두, 초대받은 시점부터 방의 기록을 볼 수 있게 했습니다.",
+            "joined": "%(senderName)s님이 이후 방 구성원 모두, 들어온 시점부터 방의 기록을 볼 수 있게 했습니다.",
+            "shared": "%(senderName)s님이 이후 방 구성원 모두 방의 기록을 볼 수 있게 했습니다.",
+            "unknown": "%(senderName)s님이 이후 알 수 없음 (%(visibility)s)이 방의 기록을 볼 수 있게 했습니다.",
+            "world_readable": "%(senderName)s님이 이후 누구나 방의 기록을 볼 수 있게 했습니다."
+        },
+        "m.room.join_rules": {
+            "invite": "%(senderDisplayName)s님이 초대받은 사람만 방에 들어오도록 설정했습니다.",
+            "knock": "%(senderDisplayName)s님이 참여 규칙을 ‘가입 요청’으로 변경했습니다",
+            "public": "%(senderDisplayName)s님이 링크를 아는 사람들에게 방을 공개했습니다.",
+            "restricted": "%(senderDisplayName)s님이 이 채팅방의 참여 권한을 변경했습니다",
+            "restricted_settings": "%(senderDisplayName)s님이 이 채팅방의 참여 권한을 변경했습니다. <a>설정 보기</a>",
+            "unknown": "%(senderDisplayName)s님이 입장 규칙을 %(rule)s(으)로 변경했습니다"
+        },
+        "m.room.member": {
+            "accepted_3pid_invite": "%(targetName)s님이 %(displayName)s님의 초대를 수락했습니다.",
+            "accepted_invite": "%(targetName)s님이 초대를 수락했습니다.",
+            "ban": "%(senderName)s님이 %(targetName)s님을 강퇴함",
+            "ban_reason": "%(senderName)s님이 %(targetName)s님을 강퇴함. 사유: %(reason)s",
+            "change_avatar": "%(senderName)s님이 프로필 사진을 변경했습니다",
+            "change_name": "%(oldDisplayName)s님이 표시이름을 %(displayName)s(으)로 변경했습니다",
+            "change_name_avatar": "%(oldDisplayName)s님이 디스플레이 이름과 프로필 사진을 변경했습니다",
+            "invite": "%(senderName)s님이 %(targetName)s님을 초대했습니다",
+            "join": "%(targetName)s님이 방에 참여했습니다",
+            "kick": "%(senderName)s님이 %(targetName)s님을 퇴장시켰습니다: %(reason)s",
+            "kick_reason": "%(senderName)s님이 %(targetName)s님을 퇴장시켰습니다: %(reason)s",
+            "left": "%(targetName)s님이 방을 떠났습니다",
+            "left_reason": "%(targetName)s님이 채팅방을 나갔습니다: %(reason)s",
+            "no_change": "%(senderName)s님이 변경하지 않았습니다",
+            "reject_invite": "%(targetName)s님이 초대를 거절했습니다.",
+            "reject_invite_reason": "%(targetName)s님이 초대를 거부함: %(reason)s",
+            "remove_avatar": "%(senderName)s님이 프로필 사진을 삭제함",
+            "remove_name": "%(senderName)s님이 표시이름을 제거했습니다 (%(oldDisplayName)s)",
+            "set_avatar": "%(senderName)s님이 프로필 사진을 설정했습니다",
+            "set_name": "%(senderName)s님이 표시 이름을 %(displayName)s(으)로 변경했습니다",
+            "unban": "%(senderName)s님이 %(targetName)s님의 차단을 해제했습니다",
+            "withdrew_invite": "%(senderName)s님이 %(targetName)s님의 초대를 철회했습니다",
+            "withdrew_invite_reason": "%(senderName)s님이 %(targetName)s님의 초대를 철회했습니다: %(reason)s"
+        },
+        "m.room.name": {
+            "change": "%(senderDisplayName)s님이 방 이름을 %(oldRoomName)s에서 %(newRoomName)s(으)로 변경했습니다.",
+            "remove": "%(senderDisplayName)s님이 방 이름을 제거했습니다.",
+            "set": "%(senderDisplayName)s님이 방 이름을 %(roomName)s(으)로 바꿨습니다."
+        },
+        "m.room.pinned_events": {
+            "changed": "%(senderName)s가 방의 고정된 메시지를 바꿨습니다.",
+            "changed_link": "%(senderName)s님이 이 채팅방의 <a>고정된 메시지</a>를 변경했습니다.",
+            "pinned": "%(senderName)s님이 이 채팅방에 메시지를 고정했습니다. 모든 고정된 메시지 보기",
+            "pinned_link": "%(senderName)s님이 이 채팅방에 <a>메시지</a>를 고정했습니다. 모든 <b>고정된 메시지</b> 보기",
+            "unpinned": "%(senderName)s님이 이 채팅방에서 메시지 고정을 해제했습니다. 모든 고정된 메시지 보기",
+            "unpinned_link": "%(senderName)s님이 이 채팅방에서 <a>메시지</a> 고정을 해제했습니다. 모든 <b>고정된 메시지</b> 보기"
+        },
+        "m.room.power_levels": {
+            "changed": "%(senderName)s님이 %(powerLevelDiffText)s의 권한 등급을 바꿨습니다.",
+            "user_from_to": "%(userId)s를 %(fromPowerLevel)s에서 %(toPowerLevel)s로"
+        },
+        "m.room.server_acl": {
+            "all_servers_banned": "🎉 모든 서버의 참여가 금지되었습니다! 이 채팅방은 더 이상 사용할 수 없습니다.",
+            "changed": "%(senderDisplayName)s님이 이 채팅방의 서버 ACL을 변경했습니다",
+            "set": "%(senderDisplayName)s님이 이 채팅방의 서버 ACL을 설정했습니다"
+        },
+        "m.room.third_party_invite": {
+            "revoked": "방에 들어오라고 %(senderName)s님이 %(targetDisplayName)s님에게 보낸 초대를 취소했습니다.",
+            "sent": "방에 들어오라고 %(senderName)s님이 %(targetDisplayName)s님에게 초대를 보냈습니다."
+        },
+        "m.room.tombstone": "%(senderDisplayName)s님이 이 방을 업그레이드했습니다.",
+        "m.room.topic": {
+            "changed": "%(senderDisplayName)s님이 채팅방 주제를 \"%(topic)s\"로 변경했습니다",
+            "removed": "%(senderDisplayName)s님이 주제를 삭제했습니다."
+        },
+        "m.sticker": "%(senderDisplayName)s님이 스티커를 전송했습니다.",
+        "m.video": {
+            "error_decrypting": "영상 복호화 중 오류",
+            "show_video": "동영상 보기"
+        },
+        "m.widget": {
+            "added": "%(senderName)s님이 추가한 %(widgetName)s 위젯",
+            "jitsi_ended": "영상 회의가 종료되었습니다. %(senderName)s",
+            "jitsi_join_right_prompt": "오른쪽의 방 정보 카드에서 회의에 참여하세요",
+            "jitsi_join_top_prompt": "이 방 맨 위에서 열리는 회의에 참여하세요",
+            "jitsi_started": "영상 회의 시작됨 %(senderName)s",
+            "jitsi_updated": "영상 회의 업데이트됨 %(senderName)s",
+            "modified": "%(senderName)s님이 수정한 %(widgetName)s 위젯",
+            "removed": "%(senderName)s님이 제거한 %(widgetName)s 위젯"
+        },
+        "mab": {
+            "collapse_reply_chain": "인용문 접기",
+            "copy_link_thread": "스레드 링크 복사",
+            "expand_reply_chain": "인용문 확장",
+            "label": "메시지 동작",
+            "view_in_room": "방에서 보기"
+        },
+        "message_timestamp_received_at": "수신시간: %(dateTime)s",
+        "message_timestamp_sent_at": "발송 시간: %(dateTime)s",
+        "mjolnir": {
+            "changed_rule_glob": "%(senderName)s님이 차단 규칙의 일치 패턴을 **'%(oldGlob)s'**에서 '%(newGlob)s'(으)로 '%(reason)s' 사유로 변경했습니다.",
+            "changed_rule_rooms": "%(senderName)s님이 채팅방 차단 규칙의 일치 패턴을 **'%(oldGlob)s'**에서 '%(newGlob)s'(으)로 '%(reason)s' 사유로 변경했습니다.",
+            "changed_rule_servers": "%(senderName)s님이 서버 차단 규칙의 일치 패턴을 **'%(oldGlob)s'**에서 '%(newGlob)s'(으)로 변경했습니다. (사유: %(reason)s)",
+            "changed_rule_users": "%(senderName)s님이 사용자 차단 규칙의 일치 패턴을 **'%(oldGlob)s'**에서 '%(newGlob)s'(으)로 '%(reason)s' 사유로 변경했습니다.",
+            "created_rule": "%(senderName)s님이 '%(glob)s' 패턴과 일치하는 차단 규칙을 '%(reason)s' 사유로 생성했습니다.",
+            "created_rule_rooms": "%(senderName)s님이 '%(glob)s' 패턴과 일치하는 채팅방 차단 규칙을 '%(reason)s' 사유로 생성했습니다.",
+            "created_rule_servers": "%(senderName)s님이 '%(glob)s' 패턴과 일치하는 서버 차단 규칙을 '%(reason)s' 사유로 생성했습니다.",
+            "created_rule_users": "%(senderName)s님이 '%(glob)s' 패턴과 일치하는 사용자 차단 규칙을 '%(reason)s' 사유로 생성했습니다.",
+            "message_hidden": "이 사용자를 무시했습니다. 사용자의 메시지는 숨겨집니다. <a>무시하고 보이기.</a>",
+            "removed_rule": "%(senderName)s님이 '%(glob)s' 패턴과 일치하는 차단 규칙을 삭제했습니다.",
+            "removed_rule_rooms": "%(senderName)s님이 '%(glob)s' 패턴과 일치하는 채팅방 차단 규칙을 삭제했습니다.",
+            "removed_rule_servers": "%(senderName)s님이 '%(glob)s' 패턴과 일치하는 서버 차단 규칙을 삭제했습니다.",
+            "removed_rule_users": "%(senderName)s님이 '%(glob)s' 패턴과 일치하는 사용자 차단 규칙을 삭제했습니다.",
+            "updated_invalid_rule": "%(senderName)s 잘못된 금지 규칙을 업데이트했습니다",
+            "updated_rule": "%(senderName)s님이 '%(glob)s' 패턴과 일치하는 차단 규칙을 '%(reason)s' 사유로 수정했습니다.",
+            "updated_rule_rooms": "%(senderName)s님이 '%(glob)s' 패턴과 일치하는 채팅방 차단 규칙을 '%(reason)s' 사유로 수정했습니다.",
+            "updated_rule_servers": "%(senderName)s님이 '%(glob)s' 패턴과 일치하는 서버 차단 규칙을 '%(reason)s' 사유로 수정했습니다.",
+            "updated_rule_users": "%(senderName)s님이 '%(glob)s' 패턴과 일치하는 사용자 차단 규칙을 '%(reason)s' 사유로 수정했습니다."
+        },
+        "no_permission_messages_before_invite": "초대받기 전의 메시지는 볼 수 있는 권한이 없습니다.",
+        "no_permission_messages_before_join": "가입하기 전의 메시지는 볼 수 있는 권한이 없습니다.",
+        "pending_moderation": "검토 대기 중인 메시지",
+        "pending_moderation_reason": "검토 대기 중인 메시지: %(reason)s",
+        "reactions": {
+            "add_reaction_prompt": "반응 추가",
+            "custom_reaction_fallback_label": "사용자 정의 반응",
+            "label": "%(reactors)s님이 %(content)s 반응을 남겼습니다.",
+            "tooltip_caption": "%(shortName)s로 반응함"
+        },
+        "read_receipt_title": {
+            "other": "%(count)s 명이 봤습니다"
+        },
+        "read_receipts_label": "읽음 확인",
+        "redacted": {
+            "tooltip": "메시지가 삭제되었습니다%(date)s"
+        },
+        "redaction": "%(name)s님이 메시지를 삭제했습니다",
+        "reply": {
+            "error_loading": "응답한 이벤트를 불러오지 못했습니다, 존재하지 않거나 볼 수 있는 권한이 없습니다.",
+            "in_reply_to": "<a>관련 대화</a> <pill>",
+            "in_reply_to_for_export": "<a>이 메시지</a>에 대한 답장"
+        },
+        "scalar_starter_link": {
+            "dialog_description": "%(integrationsUrl)s에서 쓸 수 있도록 계정을 인증하려고 다른 사이트로 이동하고 있습니다. 계속하겠습니까?",
+            "dialog_title": "통합 추가"
+        },
+        "self_redaction": "메시지가 삭제됨",
+        "send_state_encrypting": "메시지를 암호화 중…",
+        "send_state_failed": "전송 실패",
+        "send_state_sending": "메시지를 보내는 중…",
+        "send_state_sent": "귀하의 메시지가 전송되었습니다",
+        "summary": {
+            "banned": {
+                "님이 %(count)s번 출입 금지 당했습니다": "other",
+                "님이 출입 금지 당했습니다": "one"
+            },
+            "banned_multiple": {
+                "이 %(count)s번 출입 금지 당했습니다": "other",
+                "이 출입 금지 당했습니다": "one"
+            },
+            "changed_avatar": {
+                "other": "%(oneUser)s님이 프로필 사진을 %(count)s회 변경했습니다"
+            },
+            "changed_avatar_multiple": {
+                "other": "%(severalUsers)s님이 프로필 사진을 %(count)s회 변경했습니다"
+            },
+            "changed_name": {
+                "%(oneUser)s님이 이름을 %(count)s번 바꿨습니다": "other",
+                "%(oneUser)s님이 이름을 바꿨습니다": "one"
+            },
+            "changed_name_multiple": {
+                "%(severalUsers)s이 이름을 %(count)s번 바꿨습니다": "other",
+                "%(severalUsers)s이 이름을 바꿨습니다": "one"
+            },
+            "format": "%(nameList)s %(transitionList)s",
+            "hidden_event": {
+                "other": "%(oneUser)s님이 숨겨진 메시지 %(count)s개를 보냈습니다"
+            },
+            "hidden_event_multiple": {
+                "other": "%(severalUsers)s님이 숨겨진 메시지 %(count)s개를 보냈습니다"
+            },
+            "invite_withdrawn": {
+                "%(oneUser)s님이 초대를 %(count)s번 취소했습니다": "other",
+                "%(oneUser)s님이 초대를 취소했습니다": "one"
+            },
+            "invite_withdrawn_multiple": {
+                "%(severalUsers)s이 초대를 %(count)s번 취소했습니다": "other",
+                "%(severalUsers)s이 초대를 취소했습니다": "one"
+            },
+            "invited": {
+                "님이 초대받았습니다": "one",
+                "님이 %(count)s번 초대받았습니다": "other"
+            },
+            "invited_multiple": {
+                "%(count)s번 초대했습니다": "other",
+                "초대했습니다": "one"
+            },
+            "joined": {
+                "%(oneUser)s님이 %(count)s번 참여했습니다": "other",
+                "%(oneUser)s님이 참여했습니다": "one"
+            },
+            "joined_and_left": {
+                "%(oneUser)s님이 %(count)s번 참여하고 떠났습니다": "other",
+                "%(oneUser)s님이 참여하고 떠났습니다": "one"
+            },
+            "joined_and_left_multiple": {
+                "%(severalUsers)s님이 %(count)s번 참여하고 떠났습니다": "other",
+                "%(severalUsers)s님이 참여하고 떠났습니다": "one"
+            },
+            "joined_multiple": {
+                "%(severalUsers)s님이 참여했습니다": "one",
+                "%(severalUsers)s이 %(count)s번 참여했습니다": "other"
+            },
+            "kicked": {
+                "other": "%(count)s회 제거됨"
+            },
+            "kicked_multiple": {
+                "other": "%(count)s회 제거됨"
+            },
+            "left": {
+                "%(oneUser)s님이 %(count)s번 떠났습니다": "other",
+                "%(oneUser)s님이 떠났습니다": "one"
+            },
+            "left_multiple": {
+                "%(severalUsers)s이 %(count)s번 떠났습니다": "other",
+                "%(severalUsers)s이 떠났습니다": "one"
+            },
+            "no_change": {
+                "%(oneUser)s님이 %(count)s번 변경 사항을 되돌렸습니다": "other",
+                "%(oneUser)s님이 변경 사항을 되돌렸습니다": "one"
+            },
+            "no_change_multiple": {
+                "%(severalUsers)s이 %(count)s번 변경 사항을 되돌렸습니다": "other",
+                "%(severalUsers)s이 변경 사항을 되돌렸습니다": "one"
+            },
+            "pinned_events": {
+                "other": "%(oneUser)s님이 이 채팅방의 <a>고정된 메시지</a>를 %(count)s회 변경했습니다"
+            },
+            "pinned_events_multiple": {
+                "other": "%(severalUsers)s님이 이 채팅방의 <a>고정된 메시지</a>를 %(count)s회 변경했습니다."
+            },
+            "redacted": {
+                "other": "%(oneUser)s님이 메시지 %(count)s개를 삭제했습니다"
+            },
+            "redacted_multiple": {
+                "other": "%(severalUsers)s님이 메시지 %(count)s개를 삭제했습니다"
+            },
+            "rejected_invite": {
+                "%(oneUser)s님이 초대를 %(count)s번 거절했습니다": "other",
+                "%(oneUser)s님이 초대를 거절했습니다": "one"
+            },
+            "rejected_invite_multiple": {
+                "%(severalUsers)s이 초대를 거절했습니다": "one",
+                "%(severalUsers)s이 초대를 %(count)s번 거절했습니다": "other"
+            },
+            "rejoined": {
+                "%(oneUser)s님이 %(count)s번 떠나고 다시 참여했습니다": "other",
+                "%(oneUser)s님이 떠나고 다시 참여했습니다": "one"
+            },
+            "rejoined_multiple": {
+                "%(severalUsers)s님이 떠나고 다시 참여했습니다": "one",
+                "%(severalUsers)s님이 %(count)s번 떠나고 다시 참여했습니다": "other"
+            },
+            "server_acls": {
+                "other": "%(oneUser)s님이 서버 ACL을 %(count)s회 변경했습니다."
+            },
+            "server_acls_multiple": {
+                "other": "%(severalUsers)s님이 서버 ACL을 %(count)s회 변경했습니다"
+            },
+            "unbanned": {
+                "other": "님의 출입 금지가 %(count)s번 해제되었습니다"
+            },
+            "unbanned_multiple": {
+                "other": "의 출입 금지이 %(count)s번 해제되었습니다"
+            }
+        },
+        "thread_info_basic": "한 스레드에서",
+        "typing_indicator": {
+            "more_users": {
+                "%(names)s 외 %(count)s명이 적고 있습니다 …": "other",
+                "%(names)s 외 한 명이 적고 있습니다 …": "one"
+            },
+            "one_user": "%(displayName)s님이 적고 있습니다 …",
+            "two_users": "%(names)s님과 %(lastPerson)s님이 적고 있습니다 …"
+        },
+        "undecryptable_tooltip": "이 메일은 복호화할 수 없습니다.",
+        "url_preview": {
+            "close": "미리보기 닫기",
+            "show_n_more": {
+                "other": "%(count)s 개의 다른 미리보기를 표시"
+            }
+        }
+    },
+    "truncated_list_n_more": {
+        "%(count)s개 더...": "other"
+    },
+    "unsupported_browser": {
+        "description": "계속 진행할 경우 일부 기능이 작동하지 않을 수 있으며, 향후 데이터 손실 위험이 있습니다. %(brand)s 을 계속 사용하려면 브라우저를 업데이트하십시오.",
+        "title": "%(brand)s 이 브라우저를 지원하지 않습니다"
+    },
+    "unsupported_server_description": "이 서버는 구버전의 Matrix를 사용하고 있습니다. %(brand)s 를 오류 없이 사용하려면 Matrix %(version)s 로 업그레이드하십시오.",
+    "unsupported_server_title": "해당 서버는 지원되지 않습니다.",
+    "update": {
+        "changelog": "바뀐 점",
+        "check_action": "업데이트 확인",
+        "checking": "업데이트 확인중.",
+        "downloading": "업데이트 다운로드 중",
+        "error_encountered": "오류가 일어났습니다 (%(errorDetail)s).",
+        "error_unable_load_commit": "커밋 세부 정보를 불러올 수 없음: %(msg)s",
+        "new_version_available": "새로운 버전이 출시되었습니다.<a> 지금 업데이트하세요.</a>",
+        "no_update": "업데이트가 없습니다.",
+        "release_notes_toast_title": "새로운 점",
+        "see_changes_button": "새로운 점은?",
+        "toast_description": "%(brand)s 의 새 버전이 출시되었습니다",
+        "toast_title": "%(brand)s 업데이트하기",
+        "unavailable": "이용할 수 없음"
+    },
+    "update_room_access_modal": {
+        "description": "공유 링크를 생성하려면, 이 채팅방을 <b>공개</b>로 설정하거나 사용자가 <b>참여 요청</b>할 수 있는 옵션을 활성화하세요. 이렇게 하면 초대 없이도 손님이 참여할 수 있습니다",
+        "dont_change_description": "이 채팅방의 접근 권한을 변경하고 싶지 않다면, 통화 링크용 새 채팅방을 생성할 수 있습니다",
+        "no_change": "접근 수준을 변경하고 싶지 않습니다.",
+        "revert_access_description": "(이 설정은 채팅방 설정의 <b>보안 및 개인 정보</b> / <b>접근</b>에서 이전 값으로 되돌릴 수 있습니다)",
+        "title": "이 방에 게스트 사용자의 참여를 허용합니다"
+    },
+    "upload_failed_generic": "'%(fileName)s' 파일 업로드에 실패했습니다.",
+    "upload_failed_size": "'%(fileName)s' 파일이 홈서버의 업로드 크기 제한을 초과합니다",
+    "upload_failed_title": "업로드 실패",
+    "upload_file": {
+        "cancel_all_button": "전부 취소",
+        "error_file_too_large": "이 파일은 업로드하기에 <b>너무 큽니다</b>. 파일 크기 한도는 %(limit)s이지만 이 파일은 %(sizeOfThisFile)s입니다.",
+        "error_files_too_large": "이 파일들은 업로드하기에 <b>너무 큽니다</b>. 파일 크기 한도는 %(limit)s입니다.",
+        "error_some_files_too_large": "일부 파일이 업로드하기에 <b>너무 큽니다</b>. 파일 크기 한도는 %(limit)s입니다.",
+        "error_title": "업로드 오류",
+        "not_image": "선택하신 파일은 유효한 이미지 파일이 아닙니다.",
+        "title": "파일 업로드",
+        "title_progress": "파일 업로드 (총 %(total)s개 중 %(current)s개)",
+        "upload_all_button": "전부 업로드",
+        "upload_n_others_button": {
+            "%(count)s개의 다른 파일 업로드": "one"
+        }
+    },
+    "user_info": {
+        "admin_tools_section": "관리자 도구",
+        "ban_button_room": "방에서 차단",
+        "ban_button_space": "스페이스에서 추방",
+        "ban_room_confirm_title": "금지 %(roomName)s",
+        "ban_space_everything": "내가 할 수 있는 모든 것에서 그들을 금지하라",
+        "ban_space_specific": "내가 할 수 있는 특정 것들로부터 그들을 금지합니다.",
+        "deactivate_confirm_action": "사용자 비활성화",
+        "deactivate_confirm_description": "사용자를 비활성화하면 사용자는 로그아웃되며 다시 로그인할 수 없게 됩니다. 또한 사용자는 모든 방에서 떠나게 됩니다. 이 작업은 돌이킬 수 없습니다. 이 사용자를 비활성화하겠습니까?",
+        "deactivate_confirm_title": "사용자를 비활성화합니까?",
+        "demote_button": "강등",
+        "demote_self_confirm_description_space": "이 변경 사항은 되돌릴 수 없습니다. 본인이 권한을 강등하는 행위이며, 해당 스페이스에서 마지막으로 권한을 가진 사용자라면 권한을 되찾는 것이 불가능해집니다.",
+        "demote_self_confirm_room": "자기 자신을 강등하는 것은 되돌릴 수 없고, 자신이 마지막으로 이 방에서 특권을 가진 사용자라면 다시 특권을 얻는 건 불가능합니다.",
+        "demote_self_confirm_title": "자신을 강등하시겠습니까?",
+        "disinvite_button_room": "방에서 초대 취소",
+        "disinvite_button_room_name": "%(roomName)s방의 초대 취소",
+        "disinvite_button_space": "스페이스에서 초대 취소",
+        "error_ban_user": "사용자 출입 금지에 실패함",
+        "error_deactivate": "사용자 비활성화에 실패함",
+        "error_kicking_user": "사용자 제거에 실패했습니다",
+        "error_mute_user": "사용자 음소거에 실패함",
+        "error_revoke_3pid_invite_description": "초대를 취소할 수 없습니다. 서버에 일시적인 문제가 발생했거나 초대를 취소할 수 있는 권한이 없습니다.",
+        "error_revoke_3pid_invite_title": "초대 취소에 실패함",
+        "ignore_button": "무시",
+        "ignore_confirm_description": "이 사용자로부터의 모든 메시지와 초대장이 숨겨집니다. 정말 무시하시겠습니까?",
+        "ignore_confirm_title": "무시 %(user)s",
+        "invited_by": "%(sender)s님에게 초대받음",
+        "jump_to_rr_button": "읽은 기록으로 건너뛰기",
+        "kick_button_room": "채팅방에서 제거",
+        "kick_button_room_name": "%(roomName)s방에서 제거",
+        "kick_button_space": "스페이스에서 제거",
+        "kick_button_space_everything": "내가 할 수 있는 모든 것에서 그들을 제거하세요",
+        "kick_space_specific": "특정 것들에서 그들을 제거할 수 있습니다",
+        "kick_space_warning": "관리자가 아닌 항목에는 여전히 접근할 수 있습니다.",
+        "promote_warning": "사용자를 자신과 같은 권한 등급으로 올리는 것은 취소할 수 없습니다.",
+        "redact": {
+            "confirm_button": {
+                "%(count)s개의 메시지 삭제": "other",
+                "1개의 메시지 삭제": "one"
+            },
+            "confirm_description_1": {
+                "other": "%(user)s님이 작성한 %(count)s개의 메시지를 삭제하려고 합니다. 이 작업은 되돌릴 수 없으며, 대화에 참여한 모든 사용자에게서 해당 메시지가 영구적으로 삭제됩니다. 계속하시겠습니까?"
+            },
+            "confirm_description_2": "메시지의 양이 많아서 시간이 걸릴 수 있습니다. 처리하는 동안 클라이언트를 새로고침하지 말아주세요.",
+            "confirm_keep_state_explainer": "이 사용자에 대한 시스템 메시지(예: 멤버십 변경, 프로필 변경 등)도 제거하려면 선택을 해제하십시오.",
+            "confirm_keep_state_label": "시스템 메시지 보존",
+            "confirm_title": "%(user)s님의 최근 메시지 삭제",
+            "no_recent_messages_description": "이전 타임라인이 있는지 위로 스크롤하세요.",
+            "no_recent_messages_title": "%(user)s님의 최근 메시지 없음"
+        },
+        "redact_button": "메시지 삭제",
+        "revoke_invite": "초대 취소",
+        "room_encrypted": "이 방의 메시지는 종단간 암호화되었습니다.",
+        "room_encrypted_detail": "귀하의 메시지는 안전하게 보호되며, 오직 귀하와 수신자만이 이를 해독할 수 있는 고유한 키를 보유하고 있습니다.",
+        "room_unencrypted": "이 방의 메시지는 종단간 암호화가 되지 않았습니다.",
+        "room_unencrypted_detail": "암호화된 방에서는 메시지가 안전하게 보호되며, 오직 당신과 수신자만이 이를 해독할 수 있는 고유한 키를 보유합니다.",
+        "send_message": "메시지 보내기",
+        "share_button": "프로필 공유",
+        "unban_button_room": "방에서 차단 해제",
+        "unban_button_space": "스페이스에서 차단 해제",
+        "unban_room_confirm_title": "차단 해제 %(roomName)s",
+        "unban_space_everything": "내가 할 수 있는 모든 것에서 그들의 차단 해제를 요청합니다",
+        "unban_space_specific": "특정 항목에 대한 차단 해제를 할 수 있습니다",
+        "unban_space_warning": "관리자가 아닌 권한이 없는 항목에는 접근할 수 없습니다.",
+        "unignore_button": "무시 해제",
+        "verification_unavailable": "사용자 인증 불가",
+        "verify_button": "사용자 확인",
+        "verify_explainer": "추가 보안을 위해 양쪽 기기에서 일회용 인증 코드를 확인하여 이 사용자를 인증하세요."
+    },
+    "user_menu": {
+        "link_new_device": "새 기기 연결",
+        "settings": "전체 설정",
+        "switch_theme_dark": "다크 모드로 전환",
+        "switch_theme_light": "라이트 모드로 전환"
+    },
+    "voip": {
+        "already_in_call": "이미 전화중",
+        "already_in_call_person": "이미 이 사람과 통화 중입니다.",
+        "answered_elsewhere": "다른 기기에서 응답함",
+        "answered_elsewhere_description": "이 전화는 다른 기기에서 응답했습니다.",
+        "call_failed": "전화 실패",
+        "call_failed_description": "통화가 연결되지 않았습니다",
+        "call_failed_media": "웹캠 또는 마이크에 액세스할 수 없어 통화에 실패했습니다. 다음 사항을 확인하세요.",
+        "call_failed_media_applications": "다른 어떤 애플리케이션도 웹캠을 사용 중이 아닙니다.",
+        "call_failed_media_connected": "마이크와 웹캠이 연결되어 있고 올바르게 설정되어 있습니다.",
+        "call_failed_media_permissions": "웹캠 사용이 허용됩니다.",
+        "call_failed_microphone": "마이크에 접근할 수 없어 통화가 실패했습니다. 마이크가 제대로 연결되고 설정되었는지 확인하세요.",
+        "call_held": "%(peerName)s님이 통화를 보류했습니다",
+        "call_held_resume": "통화를 보류했습니다. <a>다시 시작</a>",
+        "call_held_switch": "통화를 보류했습니다. <a>전환</a>",
+        "call_toast_unknown_room": "알 수 없는 채팅방",
+        "camera_disabled": "카메라가 꺼져 있습니다",
+        "camera_enabled": "카메라가 여전히 활성화되어 있습니다",
+        "cannot_call_yourself_description": "자기 자신에게는 전화를 걸 수 없습니다.",
+        "close_lobby": "로비 닫기",
+        "connecting": "연결 중...",
+        "connection_lost": "서버와의 연결이 끊어졌습니다.",
+        "connection_lost_description": "서버에 연결되지 않으면 전화를 걸 수 없습니다.",
+        "consulting": "%(transferTarget)s와 상담 중입니다. <a>%(transferee)s에게 통화 이전</a>",
+        "decline_call": "거부",
+        "default_device": "기본 기기",
+        "dial": "전화걸기",
+        "dialpad": "다이얼패드",
+        "disable_camera": "카메라 끄기",
+        "disable_microphone": "마이크 음소거",
+        "disabled_no_perms_start_video_call": "영상 통화를 시작할 권한이 없습니다.",
+        "disabled_no_perms_start_voice_call": "음성 통화를 시작할 권한이 없습니다.",
+        "disabled_ongoing_call": "통화 중",
+        "element_call": "엘리먼트 통화",
+        "enable_camera": "카메라 켜기",
+        "enable_microphone": "마이크 음소거 해제",
+        "expand": "통화로 돌아가기",
+        "get_call_link": "통화 링크 공유하기",
+        "hangup": "전화 끊기",
+        "hide_sidebar_button": "사이드바 숨기기",
+        "input_devices": "입력 장치",
+        "jitsi_call": "Jitsi 화상 회의",
+        "join_button_tooltip_call_full": "죄송합니다 — 현재 통화 중입니다",
+        "legacy_call": "레거시 콜",
+        "maximise": "화면 채우기",
+        "maximise_call": "통화 최대화",
+        "metaspace_video_rooms": {
+            "conference_room_section": "컨퍼런스"
+        },
+        "minimise_call": "통화 최소화",
+        "misconfigured_server": "잘못 구성된 서버로 전화에 실패함",
+        "misconfigured_server_description": "전화가 안정적으로 작동하도록 TURN 서버를 설정하려면 당신의 홈서버 (<code>%(homeserverDomain)s</code>) 관리자에게 물어보세요 .",
+        "misconfigured_server_fallback": "또는 <server/> 의 공용 서버를 사용해 볼 수 있지만, 이 방법은 안정성이 떨어지며 해당 서버와 IP 주소를 공유하게 됩니다. 설정에서 이 옵션을 관리할 수도 있습니다.",
+        "misconfigured_server_fallback_accept": "%(server)s 사용해 보기",
+        "more_button": "더 보기",
+        "msisdn_lookup_failed": "전화번호를 찾을 수 없습니다",
+        "msisdn_lookup_failed_description": "전화번호를 찾는 중 오류가 발생했습니다.",
+        "msisdn_transfer_failed": "통화 연결에 실패했습니다",
+        "n_people_joined": {
+            "other": "%(count)s명의 사람들이 참여했습니다"
+        },
+        "no_audio_input_description": "기기에서 마이크를 찾을 수 없습니다. 설정을 확인하고 다시 시도해 주세요.",
+        "no_audio_input_title": "마이크를 찾을 수 없습니다",
+        "no_media_perms_description": "수동으로 %(brand)s에 마이크와 카메라를 허용해야 함",
+        "no_media_perms_title": "미디어 권한 없음",
+        "no_permission_conference": "권한 필요",
+        "no_permission_conference_description": "이 방에서는 회의 전화를 시작할 권한이 없습니다",
+        "on_hold": "%(name)s님 통화 보류 중",
+        "output_devices": "출력 장치",
+        "screenshare_monitor": "전체 화면 공유",
+        "screenshare_title": "콘텐츠 공유",
+        "screenshare_window": "응용 프로그램 창",
+        "show_sidebar_button": "사이드바 표시",
+        "silence": "통화 음소거",
+        "silenced": "알림 음소거됨",
+        "skip_lobby_toggle_option": "즉시 가입하세요",
+        "start_screenshare": "화면 공유를 시작하세요",
+        "stop_screenshare": "화면 공유 중지",
+        "too_many_calls": "전화가 너무 많아요",
+        "too_many_calls_description": "동시 통화 가능 최대 수에 도달했습니다.",
+        "transfer_consult_first_label": "먼저 상담하세요",
+        "transfer_failed": "전송 실패",
+        "transfer_failed_description": "통화 연결에 실패했습니다",
+        "unable_to_access_audio_input_description": "마이크에 접근할 수 없습니다. 브라우저 설정을 확인하고 다시 시도해 주세요.",
+        "unable_to_access_audio_input_title": "마이크에 접근할 수 없습니다",
+        "unable_to_access_media": "웹캠 / 마이크에 접근 불가",
+        "unable_to_access_microphone": "마이크에 접근 불가",
+        "unknown_caller": "알 수 없는 발신자",
+        "unknown_person": "알 수 없는 사람",
+        "unsilence": "소리 켜기",
+        "unsupported": "통화가 지원되지 않습니다",
+        "unsupported_browser": "이 브라우저에서는 전화를 걸 수 없습니다.",
+        "user_busy": "사용자 바쁨",
+        "user_busy_description": "연락하신 상대방이 통화 중입니다.",
+        "user_is_presenting": "%(sharerName)s님이 화면을 공유중입니다.",
+        "video_call": "영상 통화",
+        "video_call_incoming": "수신 영상 통화",
+        "video_call_started": "영상통화가 시작되었습니다",
+        "video_call_using": "사용 중인 영상 통화:",
+        "voice_call": "음성 통화",
+        "voice_call_incoming": "수신 음성 통화",
+        "you_are_presenting": "화면을 공유 중입니다."
+    },
+    "web_default_device_name": "%(appName)s: %(browserName)s on %(osName)s",
+    "welcome_to_element": "Element에 오신 것을 환영합니다",
+    "widget": {
+        "added_by": "위젯을 추가했습니다",
+        "capabilities_dialog": {
+            "content_starting_text": "이 위젯은 다음과 같은 기능을 원합니다:",
+            "decline_all_permission": "모두 거부",
+            "remember_Selection": "이 위젯에 대해 내 선택 기억하기",
+            "title": "위젯 권한 승인"
+        },
+        "capability": {
+            "always_on_screen_generic": "실행 중인 동안 현재 화면에 머무르기",
+            "always_on_screen_viewing_another_room": "다른 채팅방을 보거나 실행 중일 때, 현재 화면에 머무르기",
+            "any_room": "위 내용과 동일하나, 당신이 참여하거나 초대받은 모든 채팅방에서도 마찬가지입니다.",
+            "byline_empty_state_key": "빈 상태 키로",
+            "byline_state_key": "상태 키 '%(stateKey)s'(으)로",
+            "capability": "<b>%(capability)s</b> 기능",
+            "change_avatar_active_room": "현재 사용 중인 채팅방의 아바타 변경",
+            "change_avatar_this_room": "이 채팅방의 아바타를 변경하세요",
+            "change_name_active_room": "현재 사용 중인 채팅방의 이름을 변경하세요",
+            "change_name_this_room": "이 채팅방의 이름을 변경하세요",
+            "change_topic_active_room": "현재 사용 중인 채팅방의 주제를 변경하세요",
+            "change_topic_this_room": "이 채팅방의 주제를 변경하세요",
+            "receive_membership_active_room": "현재 채팅방의 멤버 변동 내역 보기",
+            "receive_membership_this_room": "채팅방 멤버 변동 내역 보기",
+            "remove_ban_invite_leave_active_room": "다른 사용자를 현재 채팅방에서 내보내거나, 차단하거나, 초대할 수 있으며, 회원님 자신도 강제로 퇴장시킬 수 있습니다.",
+            "remove_ban_invite_leave_this_room": "다른 사용자를 이 채팅방에서 내보내거나, 차단하거나, 초대할 수 있으며, 회원님 자신도 강제로 퇴장시킬 수 있습니다.",
+            "see_avatar_change_active_room": "참여중인 채팅방의 프로필 사진 변경 내역 보기",
+            "see_avatar_change_this_room": "채팅방 프로필 사진 변경 내역 보기",
+            "see_event_type_sent_active_room": "현재 채팅방의 <b>%(eventType)s</b> 이벤트 내역 보기",
+            "see_event_type_sent_this_room": "채팅방의 <b>%(eventType)s</b> 이벤트 내역 보기",
+            "see_images_sent_active_room": "현재 채팅방의 이미지 보기",
+            "see_images_sent_this_room": "이 채팅방의 이미지 보기",
+            "see_messages_sent_active_room": "현재 채팅방의 메시지 읽기",
+            "see_messages_sent_this_room": "이 채팅방의 메시지 읽기",
+            "see_msgtype_sent_active_room": "현재 채팅방의 <b>%(msgtype)s</b> 메시지 보기",
+            "see_msgtype_sent_this_room": "이 채팅방의 <b>%(msgtype)s</b> 메시지 보기",
+            "see_name_change_active_room": "현재 채팅방의 이름 변경 내역 보기",
+            "see_name_change_this_room": "채팅방 이름 변경 내역 보기",
+            "see_sent_emotes_active_room": "현재 채팅방의 이모티콘 사용 내역 보기",
+            "see_sent_emotes_this_room": "채팅방 이모티콘 사용 내역 보기",
+            "see_sent_files_active_room": "현재 채팅방의 일반 파일 보기",
+            "see_sent_files_this_room": "이 채팅방의 일반 파일 보기",
+            "see_sticker_posted_active_room": "참여중인 채팅방의 스티커 사용 내역 보기",
+            "see_sticker_posted_this_room": "채팅방 스티커 사용 내역 보기",
+            "see_text_messages_sent_active_room": "참여중인 채팅방의 텍스트 메시지 읽기",
+            "see_text_messages_sent_this_room": "이 채팅방의 텍스트 메시지 읽기",
+            "see_topic_change_active_room": "현재 채팅방의 주제 변경 내역 보기",
+            "see_topic_change_this_room": "이 채팅방에서 주제가 바뀌는 시점을 확인하세요",
+            "see_videos_sent_active_room": "현재 채팅방의 동영상 보기",
+            "see_videos_sent_this_room": "이 채팅방의 동영상 보기",
+            "send_emotes_active_room": "회원님 이름으로 참여중인 채팅방에 이모티콘 보내기",
+            "send_emotes_this_room": "회원님 이름으로 이 채팅방에 이모티콘 보내기",
+            "send_event_type_active_room": "회원님 이름으로 참여중인 채팅방에 <b>%(eventType)s</b> 이벤트를 보냅니다.",
+            "send_event_type_this_room": "회원님 이름으로 이 채팅방에 <b>%(eventType)s</b> 이벤트를 보냅니다.",
+            "send_files_active_room": "회원님 이름으로 현재 채팅방에 일반 파일 보내기",
+            "send_files_this_room": "회원님 이름으로 이 채팅방에 일반 파일 보내기",
+            "send_images_active_room": "회원님 이름으로 현재 채팅방에 이미지 보내기",
+            "send_images_this_room": "회원님 이름으로 이 채팅방에 이미지 보내기",
+            "send_messages_active_room": "회원님 이름으로 현재 채팅방에 메시지 보내기",
+            "send_messages_this_room": "회원님 이름으로 이 채팅방에 메시지 보내기",
+            "send_msgtype_active_room": "회원님 이름으로 현재 채팅방에 <b>%(msgtype)s</b> 메시지 보내기",
+            "send_msgtype_this_room": "회원님 이름으로 이 채팅방에 <b>%(msgtype)s</b> 메시지 보내기",
+            "send_stickers_active_room": "활성 채팅방으로 스티커 보내기",
+            "send_stickers_active_room_as_you": "회원님을 대신하여 현재 채팅방에 스티커 전송",
+            "send_stickers_this_room": "이 채팅방으로 스티커 보내기",
+            "send_stickers_this_room_as_you": "회원님을 대신하여 이 채팅방에 스티커 전송",
+            "send_text_messages_active_room": "회원님 이름으로 참여중인 채팅방에 텍스트 메시지 보내기",
+            "send_text_messages_this_room": "회원님 이름으로 이 채팅방에 텍스트 메시지 보내기",
+            "send_videos_active_room": "회원님 이름으로 현재 채팅방에 동영상 보내기",
+            "send_videos_this_room": "회원님 이름으로 이 채팅방에 동영상 보내기",
+            "specific_room": "위 내용과 동일하지만, <Room /> 에서도 동일하게 적용됩니다.",
+            "switch_room": "채팅방 전환하기",
+            "switch_room_message_user": "다른 채팅방, 메시지 또는 사용자로 이동"
+        },
+        "close_to_view_right_panel": "이 위젯을 닫으면 이 패널에서 볼 수 있습니다",
+        "context_menu": {
+            "delete": "위젯 삭제",
+            "delete_warning": "위젯을 삭제하면 이 방의 모든 사용자에게도 제거됩니다. 위젯을 삭제하겠습니까?",
+            "move_left": "왼쪽으로 이동",
+            "move_right": "오른쪽으로 이동",
+            "remove": "모두를 위해 제거하세요",
+            "revoke": "권한 취소",
+            "screenshot": "사진 찍기",
+            "start_audio_stream": "오디오 스트림 시작"
+        },
+        "cookie_warning": "이 위젯은 쿠키를 사용합니다.",
+        "error_hangup_description": "통화가 끊겼습니다. (오류:%(message)s )",
+        "error_hangup_title": "연결 끊김",
+        "error_loading": "위젯 로딩 중 오류 발생",
+        "error_mixed_content": "오류 - 혼합된 콘텐츠",
+        "error_need_invite_permission": "그러려면 사용자를 초대할 수 있어야 합니다.",
+        "error_need_kick_permission": "그렇게 하려면 사용자를 추방할 수 있어야 합니다.",
+        "error_need_to_be_logged_in": "로그인을 해야 합니다.",
+        "error_unable_start_audio_stream_description": "오디오 스트리밍을 시작할 수 없습니다.",
+        "error_unable_start_audio_stream_title": "라이브 스트리밍을 시작하지 못했습니다",
+        "modal_data_warning": "아래 데이터는 %(widgetDomain)s와(과) 공유됩니다.",
+        "modal_title_default": "Modal Widget",
+        "no_name": "알 수 없는 앱",
+        "open_id_permissions_dialog": {
+            "remember_selection": "이것을 기억하세요",
+            "starting_text": "위젯은 사용자 ID를 확인하지만, 사용자를 대신해 작업을 수행할 수는 없습니다:",
+            "title": "이 위젯이 귀하의 신원을 확인할 수 있도록 허용하세요"
+        },
+        "popout": "위젯 팝업",
+        "set_room_layout": "모든 사람을 위한 레이아웃 설정",
+        "shared_data_avatar": "프로필 사진 URL",
+        "shared_data_device_id": "귀하의 기기 ID",
+        "shared_data_lang": "설정언어",
+        "shared_data_mxid": "당신의 사용자 ID",
+        "shared_data_name": "당신의 표시 이름",
+        "shared_data_room_id": "방 ID",
+        "shared_data_theme": "당신의 테마",
+        "shared_data_url": "%(brand)s URL",
+        "shared_data_warning": "이 위젯을 사용하면 <helpIcon /> %(widgetDomain)s와(과) 데이터를 공유합니다.",
+        "shared_data_warning_im": "이 위젯을 사용하면 <helpcon /> %(widgetDomain)s & 통합 관리자와 데이터를 공유합니다.",
+        "shared_data_widget_id": "위젯 ID",
+        "unencrypted_warning": "위젯은 메시지 암호화를 사용하지 않습니다.",
+        "unmaximise": "최대화 해제",
+        "unpin_to_view_right_panel": "이 패널에서 보려면 이 위젯을 고정 해제하세요."
+    },
+    "zxcvbn": {
+        "suggestions": {
+            "allUppercase": "모두 대문자인 것은 모두 소문자인 것처럼 추측하기 쉬울 겁니다",
+            "anotherWord": "한 두 문자를 추가하세요. 흔하지 않은 문자일수록 좋습니다.",
+            "associatedYears": "당신과 관련된 연도는 피하세요",
+            "capitalization": "대문자는 큰 도움이 되지 않습니다",
+            "dates": "당신과 관련된 날짜와 연도는 피하세요",
+            "l33t": "'a'대신 '@'를 적는 등의 추측할 수 있는 대체제는 큰 도움이 되지 않습니다",
+            "longerKeyboardPattern": "더 긴 키보드 패턴을 사용하되, 많은 변수를 주는 것이 좋습니다",
+            "noNeed": "기호, 숫자 혹은 대문자는 필요하지 않습니다",
+            "pwned": "이 비밀번호를 다른 곳에서도 사용 중이라면 변경해야 합니다.",
+            "recentYears": "최근 연도는 피하세요",
+            "repeated": "반복하는 단어와 문자는 피하세요",
+            "reverseWords": "반대로 쓴 문자는 추측하기 어렵지 않습니다",
+            "sequences": "반복은 피하세요",
+            "useWords": "몇 단어를 사용하되, 흔한 단어는 피하세요"
+        },
+        "warnings": {
+            "common": "이것은 매우 흔한 비밀번호입니다",
+            "commonNames": "흔한 이름과 성은 추측하기 쉽습니다",
+            "dates": "날짜는 종종 추측하기 쉽습니다",
+            "extendedRepeat": "\"abcabcabc\"와 같은 반복은 \"abc\"에서 겨우 조금 더 어렵습니다",
+            "keyPattern": "짧은 키보드 패턴은 추측하기 쉽습니다",
+            "namesByThemselves": "이름과 성 자체는 추측하기 쉽습니다",
+            "pwned": "귀하의 비밀번호가 인터넷상의 데이터 유출 사고로 노출되었습니다.",
+            "recentYears": "최근 연도는 추측하기 쉽습니다",
+            "sequences": "abc나 6543과 같은 반복은 추측하기 쉽습니다",
+            "similarToCommon": "이것은 흔히 사용되는 비밀번호와 유사합니다",
+            "simpleRepeat": "\"aaa\"와 같은 반복은 쉽게 추측합니다",
+            "straightRow": "키의 한 줄은 추측하기 쉽습니다",
+            "topHundred": "이것은 상위 100에 해당하는 흔한 비밀번호입니다",
+            "topTen": "이것은 상위 10에 해당하는 흔한 비밀번호입니다",
+            "userInputs": "개인 정보나 웹페이지 관련 정보는 포함되어서는 안 됩니다.",
+            "wordByItself": "단어 자체는 추측하기 쉽습니다"
+        }
+    }
+}
diff --git a/src/i18n/strings/lo.json b/src/i18n/strings/lo.json
index 782980078d..14ed5f7f1f 100644
--- a/src/i18n/strings/lo.json
+++ b/src/i18n/strings/lo.json
@@ -193,8 +193,7 @@
             "megolm_export": "ສົ່ງກະແຈອອກດ້ວຍຕົນເອງ",
             "setup_key_backup_title": "ທ່ານຈະສູນເສຍການເຂົ້າເຖິງລະຫັດຂໍ້ຄວາມຂອງທ່ານ",
             "setup_secure_backup_description_1": "ຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດໄວ້ແມ່ນປອດໄພດ້ວຍການເຂົ້າລະຫັດແບບຕົ້ນທາງ. ພຽງແຕ່ທ່ານ ແລະ ຜູ້ຮັບເທົ່ານັ້ນທີ່ມີກະແຈເພື່ອອ່ານຂໍ້ຄວາມເຫຼົ່ານີ້.",
-            "skip_key_backup": "ຂ້ອຍບໍ່ຕ້ອງການຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດຂອງຂ້ອຍ",
-            "use_key_backup": "ເລີ່ມຕົ້ນການນໍາໃຊ້ ສຳຮອງກະເເຈ"
+            "skip_key_backup": "ຂ້ອຍບໍ່ຕ້ອງການຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດຂອງຂ້ອຍ"
         },
         "misconfigured_body": "ຂໍໃຫ້ຜູ້ຄຸ້ມຄອງ %(brand)s ຂອງທ່ານກວດເບິ່ງ <a>ການຕັ້ງຄ່າຂອງທ່ານ</a> ສໍາລັບລາຍການທີ່ບໍ່ຖືກຕ້ອງ ຫຼື ຊໍ້າກັນ.",
         "misconfigured_title": "%(brand)s ກຳນົດຄ່າຂອງທ່ານບໍ່ຖືກຕ້ອງ",
@@ -463,7 +462,6 @@
         "unnamed_space": "ພື້ນທີ່ບໍ່ລະບຸຊື່",
         "user_avatar": "ຮູບໂປຣໄຟລ໌",
         "username": "ຊື່ຜູ້ໃຊ້",
-        "verification_cancelled": "ຍົກເລີກການຢັ້ງຢືນແລ້ວ",
         "video": "ວິດີໂອ",
         "video_room": "ຫ້ອງວີດີໂອ",
         "view_message": "ເບິ່ງຂໍ້ຄວາມ",
@@ -668,8 +666,6 @@
             "security_key_title": "ກະແຈຄວາມປອດໄພ"
         },
         "bootstrap_title": "ການຕັ້ງຄ່າກະແຈ",
-        "cancel_entering_passphrase_description": "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການຍົກເລີກການໃສ່ປະໂຫຍກລະຫັດຜ່ານ?",
-        "cancel_entering_passphrase_title": "ຍົກເລີກການໃສ່ປະໂຫຍກລະຫັດຜ່ານບໍ?",
         "confirm_encryption_setup_body": "ກົດທີ່ປຸ່ມຂ້າງລຸ່ມນີ້ເພື່ອຢືນຢັນການຕັ້ງຄ່າການເຂົ້າລະຫັດ.",
         "confirm_encryption_setup_title": "ຢືນຢັນການຕັ້ງຄ່າການເຂົ້າລະຫັດ",
         "cross_signing_room_normal": "ຫ້ອງນີ້ຖືກເຂົ້າລະຫັດແບບຕົ້ນທາງ-ເຖິງປາຍທາງ",
@@ -703,8 +699,6 @@
             "title": "ວິທີລົບຂະບວນການກູ້ຄືນ",
             "warning": "ຖ້າທ່ານບໍ່ໄດ້ລືບຂະບວນການກູ້ຄືນ, ຜູ້ໂຈມຕີອາດຈະພະຍາຍາມເຂົ້າເຖິງບັນຊີຂອງທ່ານ. ປ່ຽນລະຫັດຜ່ານບັນຊີຂອງທ່ານ ແລະ ກຳນົດຂະບວນການກູ້ຄືນໃໝ່ທັນທີໃນການຕັ້ງຄ່າ."
         },
-        "reset_all_button": "ລືມ ຫຼື ສູນເສຍວິທີການກູ້ຄືນທັງຫມົດ? <a>ຕັ້ງຄ່າຄືນໃໝ່ທັງໝົດ</a>",
-        "set_up_toast_description": "ປ້ອງກັນການສູນເສຍການເຂົ້າເຖິງຂໍ້ຄວາມ ແລະຂໍ້ມູນທີ່ເຂົ້າລະຫັດ",
         "set_up_toast_title": "ຕັ້ງຄ່າການສໍາຮອງຂໍ້ມູນທີ່ປອດໄພ",
         "setup_secure_backup": {
             "explainer": "ສຳຮອງຂໍ້ມູນກະແຈຂອງທ່ານກ່ອນທີ່ຈະອອກຈາກລະບົບເພື່ອຫຼີກເວັ້ນການສູນເສຍຂໍ້ມູນ."
@@ -722,12 +716,8 @@
             "after_new_login": {
                 "device_verified": "ຢັ້ງຢືນອຸປະກອນແລ້ວ",
                 "skip_verification": "ຂ້າມການຢັ້ງຢືນດຽວນີ້",
-                "unable_to_verify": "ບໍ່ສາມາດຢັ້ງຢືນອຸປະກອນນີ້ໄດ້",
                 "verify_this_device": "ຢັ້ງຢືນອຸປະກອນນີ້"
             },
-            "cancelled": "ທ່ານໄດ້ຍົກເລີກການຢັ້ງຢືນແລ້ວ.",
-            "cancelled_self": "ທ່ານໄດ້ຍົກເລີກການຢັ້ງຢືນໃນອຸປະກອນອື່ນຂອງທ່ານ.",
-            "cancelled_user": "%(displayName)s ຍົກເລີກການຢັ້ງຢືນ.",
             "cancelling": "ກຳລັງຍົກເລີກ…",
             "complete_action": "ເຂົ້າໃຈແລ້ວ",
             "complete_description": "ທ່ານໄດ້ຢັ້ງຢືນຜູ້ໃຊ້ນີ້ສຳເລັດແລ້ວ.",
@@ -739,40 +729,28 @@
             "incoming_sas_dialog_title": "ການຮ້ອງຂໍການຢັ້ງຢືນຂາເຂົ້າ",
             "incoming_sas_user_dialog_text_1": "ຢັ້ງຢືນຜູ້ໃຊ້ນີ້ເພື່ອສ້າງເຄື່ອງທີ່ເຊື່ອຖືໄດ້. ຜູ້ໃຊ້ທີ່ເຊື່ອຖືໄດ້ ເຮັດໃຫ້ທ່ານອຸ່ນໃຈຂື້ນເມື່ຶຶອເຂົ້າລະຫັດຂໍ້ຄວາມແຕ່ຕົ້ນທາງເຖິງປາຍທາງ.",
             "incoming_sas_user_dialog_text_2": "ການຢືນຢັນຜູ້ໃຊ້ນີ້ຈະເປັນເຄື່ອງໝາຍໃນລະບົບຂອງເຂົາເຈົ້າໜ້າເຊື່ອຖືໄດ້ ແລະ ເປັນເຄື່ອງໝາຍເຖິງລະບົບຂອງທ່ານ ເປັນທີ່ເຊື່ອຖືໄດ້ຕໍ່ກັບເຂົາເຈົ້າ.",
-            "no_key_or_device": "ເບິ່ງຄືວ່າທ່ານບໍ່ມີກະແຈຄວາມປອດໄພ ຫຼື ອຸປະກອນອື່ນໆທີ່ທ່ານສາມາດຢືນຢັນໄດ້. ອຸປະກອນນີ້ຈະບໍ່ສາມາດເຂົ້າເຖິງຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດເກົ່າໄດ້. ເພື່ອຢືນຢັນຕົວຕົນຂອງທ່ານໃນອຸປະກອນນີ້, ທ່ານຈຳເປັນຕ້ອງຕັ້ງລະຫັດຢືນຢັນຂອງທ່ານ.",
             "no_support_qr_emoji": "ອຸປະກອນທີ່ທ່ານພະຍາຍາມກວດສອບບໍ່ຮອງຮັບການສະແກນລະຫັດ QR ຫຼື ການຢັ້ງຢືນ emoji, ຊຶ່ງເປັນສິ່ງທີ່%(brand)sສະຫນັບສະຫນູນ. ລອງໃຊ້ກັບລູກຄ້າອື່ນ.",
             "other_party_cancelled": "ອີກຝ່າຍໄດ້ຍົກເລີກການຢັ້ງຢືນ.",
             "prompt_encrypted": "ຢັ້ງຢືນຜູ້ໃຊ້ທັງໝົດຢູ່ໃນຫ້ອງເພື່ອຮັບປະກັນວ່າມີຄວາມປອດໄພ.",
-            "prompt_self": "ເລີ່ມການຢັ້ງຢືນອີກຄັ້ງຈາກການແຈ້ງເຕືອນ.",
             "prompt_unencrypted": "ໃນຫ້ອງທີ່ເຂົ້າລະຫັດໄວ້, ໃຫ້ກວດສອບຜູ້ໃຊ້ທັງໝົດເພື່ອຮັບປະກັນວ່າປອດໄພ.",
-            "prompt_user": "ເລີ່ມການຢັ້ງຢືນອີກຄັ້ງຈາກໂປຣໄຟລ໌ຂອງເຂົາເຈົ້າ.",
-            "qr_or_sas_header": "ຢັ້ງຢືນອຸປະກອນນີ້ໂດຍການເຮັດສິ່ງໃດໜຶ່ງຕໍ່ໄປນີ້:",
             "qr_prompt": "ສະແກນລະຫັດສະເພາະນີ້",
-            "qr_reciprocate_same_shield_device": "ເກືອບສຳເລັດແລ້ວ! ອຸປະກອນອື່ນຂອງທ່ານສະແດງການປ້ອງກັນຄືກັນບໍ?",
             "qr_reciprocate_same_shield_user": "ໃກ້ສຳເລັດແລ້ວ! %(displayName)s ສະແດງການປ້ອງກັນແບບດຽວກັນບໍ?",
             "request_toast_detail": "%(deviceId)s ຈາກ %(ip)s",
-            "reset_proceed_prompt": "ດຳເນີນການຕັ້ງຄ່າໃໝ່",
             "sas_caption_self": "ຢືນຢັນອຸປະກອນນີ້ໂດຍການຢືນຢັນຕົວເລກຕໍ່ໄປນີ້ໃຫ້ປາກົດຢູ່ໃນຫນ້າຈໍຂອງມັນ.",
             "sas_caption_user": "ຢືນຢັນຜູ້ໃຊ້ນີ້ໂດຍການຢືນຢັນຕົວເລກຕໍ່ໄປນີ້ໃຫ້ປາກົດຢູ່ໃນຫນ້າຈໍຂອງເຂົາເຈົ້າ.",
             "sas_description": "ປຽບທຽບຊຸດ emoji ທີ່ເປັນເອກະລັກຖ້າຫາກທ່ານບໍ່ມີກ້ອງຖ່າຍຮູບຢູ່ໃນອຸປະກອນໃດໜຶ່ງ",
-            "sas_emoji_caption_self": "ຢືນຢັນວ່າ emoji ຂ້າງລຸ່ມນີ້ແມ່ນສະແດງຢູ່ໃນອຸປະກອນທັງສອງ, ໃນລໍາດັບດຽວກັນ:",
             "sas_emoji_caption_user": "ຢືນຢັນຜູ້ໃຊ້ນີ້ໂດຍການຢືນຢັນemoji ຕໍ່ໄປນີ້ປາກົດຢູ່ໃນຫນ້າຈໍຂອງເຂົາເຈົ້າ.",
             "sas_match": "ກົງກັນ",
             "sas_no_match": "ບໍ່ກົງກັນ",
             "sas_prompt": "ປຽບທຽບ emoji ທີ່ເປັນເອກະລັກ",
             "scan_qr": "ຢືນຢັນໂດຍການສະແກນ",
             "scan_qr_explainer": "ໃຫ້ %(displayName)s ສະແກນລະຫັດຂອງທ່ານ:",
-            "self_verification_hint": "ເພື່ອດຳເນີນການຕໍ່, ກະລຸນາຍອມຮັບຄຳຮ້ອງຂໍການຢັ້ງຢືນໃນອຸປະກອນອື່ນຂອງທ່ານ.",
             "start_button": "ເລີ່ມການຢັ້ງຢືນ",
-            "successful_device": "ທ່ານໄດ້ຢືນຢັນສຳເລັດແລ້ວ %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "ທ່ານໄດ້ຢັ້ງຢືນອຸປະກອນຂອງທ່ານສຳເລັດແລ້ວ!",
             "successful_user": "ທ່ານໄດ້ຢືນຢັນສຳເລັດແລ້ວ %(displayName)s!",
-            "timed_out": "ການຢັ້ງຢືນໝົດເວລາ.",
             "unsupported_method": "ບໍ່ສາມາດຊອກຫາວິທີການຢັ້ງຢືນທີ່ຮອງຮັບໄດ້.",
             "unverified_session_toast_title": "ເຂົ້າສູ່ລະບົບໃໝ່. ນີ້ແມ່ນທ່ານບໍ?",
             "unverified_sessions_toast_description": "ກວດສອບໃຫ້ແນ່ໃຈວ່າບັນຊີຂອງທ່ານປອດໄພ",
             "unverified_sessions_toast_reject": "ຕໍ່ມາ",
-            "verification_description": "ຢືນຢັນຕົວຕົນຂອງທ່ານເພື່ອເຂົ້າເຖິງຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດໄວ້ ແລະ ພິສູດຕົວຕົນຂອງທ່ານໃຫ້ກັບຜູ້ອື່ນ.",
             "verification_dialog_title_device": "ຢືນຢັນອຸປະກອນອື່ນ",
             "verification_dialog_title_user": "ການຮ້ອງຂໍການຢັ້ງຢືນ",
             "verification_skip_warning": "ໂດຍບໍ່ມີການຢັ້ງຢືນ, ທ່ານຈະບໍ່ສາມາດເຂົ້າເຖິງຂໍ້ຄວາມທັງຫມົດຂອງທ່ານ ແລະ ອາດຈະປາກົດວ່າບໍ່ຫນ້າເຊື່ອຖື.",
@@ -782,9 +760,6 @@
             "verify_emoji_prompt": "ຢັ້ງຢືນໂດຍການປຽບທຽບ emoji ທີ່ເປັນເອກະລັກ.",
             "verify_emoji_prompt_qr": "ຖ້າທ່ານບໍ່ສາມາດສະແກນລະຫັດຂ້າງເທິງໄດ້, ໃຫ້ກວດສອບໂດຍການປຽບທຽບອີໂມຈິທີ່ເປັນເອກະລັກ.",
             "verify_later": "ຂ້ອຍຈະກວດສອບພາຍຫຼັງ",
-            "verify_using_device": "ຢັ້ງຢືນດ້ວຍອຸປະກອນອື່ນ",
-            "verify_using_key": "ຢືນຢັນດ້ວຍກະແຈຄວາມປອດໄພ",
-            "verify_using_key_or_phrase": "ຢືນຢັນດ້ວຍກະແຈຄວາມປອດໄພ ຫຼືປະໂຫຍກ",
             "waiting_for_user_accept": "ກຳລັງລໍຖ້າ %(displayName)s ຍອມຮັບ…",
             "waiting_other_device": "ກຳລັງລໍຖ້າໃຫ້ທ່ານຢັ້ງຢືນໃນອຸປະກອນອື່ນຂອງທ່ານ…",
             "waiting_other_device_details": "ກຳລັງລໍຖ້າໃຫ້ທ່ານກວດສອບໃນອຸປະກອນອື່ນຂອງທ່ານ, %(deviceName)s (%(deviceId)s)…",
@@ -1464,8 +1439,6 @@
             "room_invite": "ເຊີນເຂົ້າຫ້ອງນີ້ເທົ່ານັ້ນ",
             "start_of_dm_history": "ຈຸດເລີ່ມຕົ້ນຂອງປະຫວັດຂໍ້ຄວາມໂດຍກົງຂອງທ່ານກັບ <displayName/>.",
             "start_of_room": "ນີ້ແມ່ນຈຸດເລີ່ມຕົ້ນຂອງ <roomName/>.",
-            "topic": "ຫົວຂໍ້: %(topic)s ",
-            "topic_edit": "ຫົວຂໍ້: %(topic)s (<a>ແກ້ໄຂ</a>)",
             "unencrypted_warning": "ບໍ່ໄດ້ເປີດໃຊ້ການເຂົ້າລະຫັດແບບຕົ້ນທາງຮອດປາຍທາງ",
             "user_created": "%(displayName)s ສ້າງຫ້ອງນີ້.",
             "you_created": "ທ່ານສ້າງຫ້ອງນີ້."
@@ -1778,7 +1751,6 @@
             "error_update_guest_access": "ການອັບເດດການເຂົ້າເຖິງຂອງແຂກຂອງພື້ນທີ່ນີ້ບໍ່ສຳເລັດ",
             "error_update_history_visibility": "ການອັບເດດປະຫວັດການເບິ່ງເຫັນຂອງພື້ນທີ່ນີ້ບໍ່ສຳເລັດ",
             "guest_access_explainer": "ແຂກສາມາດເຂົ້າຮ່ວມພື້ນທີ່ໄດ້ໂດຍບໍ່ຕ້ອງມີບັນຊີ.",
-            "guest_access_explainer_public_space": "ນີ້ອາດຈະເປັນປະໂຫຍດສໍາລັບສະຖານທີ່ສາທາລະນະ.",
             "guest_access_label": "ເປີດໃຊ້ການເຂົ້າເຖິງແຂກ/ຜູ້ຖືກເຊີນ",
             "history_visibility_anyone_space": "ເບິ່ງຕົວຢ່າງພື້ນທີ່",
             "history_visibility_anyone_space_description": "ອະນຸຍາດໃຫ້ຄົນເບິ່ງຕົວຢ່າງພື້ນທີ່ຂອງທ່ານກ່ອນທີ່ເຂົາເຈົ້າເຂົ້າຮ່ວມ.",
@@ -1925,10 +1897,6 @@
         "insert_trailing_colon_mentions": "ຈໍ້າສອງເມັດພາຍຫຼັງຈາກຜູ້ໃຊ້ກ່າວເຖິງໃນຕອນເລີ່ມຕົ້ນຂອງຂໍ້ຄວາມ",
         "jump_to_bottom_on_send": "ໄປຫາລຸ່ມສຸດຂອງທາມລາຍເມື່ອທ່ານສົ່ງຂໍ້ຄວາມ",
         "key_backup": {
-            "backup_in_progress": "ກະແຈຂອງທ່ານກຳລັງຖືກສຳຮອງຂໍ້ມູນ (ການສຳຮອງຂໍ້ມູນຄັ້ງທຳອິດອາດໃຊ້ເວລາສອງສາມນາທີ).",
-            "backup_success": "ສໍາເລັດ!",
-            "cannot_create_backup": "ບໍ່ສາມາດສ້າງສໍາຮອງຂໍ້ມູນທີ່ສໍາຄັນ",
-            "create_title": "ສ້າງການສໍາຮອງຂໍ້ມູນທີ່ສໍາຄັນ",
             "setup_secure_backup": {
                 "cancel_warning": "ຖ້າທ່ານຍົກເລີກດຽວນີ້, ທ່ານອາດຈະສູນເສຍຂໍ້ຄວາມ & ຂໍ້ມູນທີ່ຖືກເຂົ້າລະຫັດ ແລະ ທ່ານສູນເສຍການເຂົ້າເຖິງການເຂົ້າສູ່ລະບົບຂອງທ່ານ.",
                 "confirm_security_phrase": "ຢືນຢັນປະໂຫຍກຄວາມປອດໄພຂອງທ່ານ",
@@ -2022,7 +1990,6 @@
             "ignore_users_empty": "ທ່ານບໍ່ມີຜູ້ໃຊ້ທີ່ຖືກລະເລີຍ.",
             "ignore_users_section": "ຜູ້ໃຊ້ຖືກຍົກເວັ້ນ",
             "key_backup_algorithm": "ສູດການຄິດໄລ່:",
-            "key_backup_connect": "ເຊື່ອມຕໍ່ລະບົບນີ້ກັບ ກະເເຈສຳຮອງ",
             "message_search_disable_warning": "ຖ້າປິດໃຊ້ງານ, ຂໍ້ຄວາມຈາກຫ້ອງທີ່ເຂົ້າລະຫັດຈະບໍ່ປາກົດຢູ່ໃນຜົນການຄົ້ນຫາ.",
             "message_search_disabled": "ເກັບຮັກສາຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດໄວ້ຢ່າງປອດໄພຢູ່ໃນເຄື່ອງເພື່ອໃຫ້ປາກົດໃນຜົນການຄົ້ນຫາ.",
             "message_search_enabled": {
@@ -2084,7 +2051,6 @@
             "metaspaces_subsection": "ພຶ້ນທີ່ຈະສະແດງ",
             "title": "ແຖບດ້ານຂ້າງ"
         },
-        "start_automatically": "ເລີ່ມອັດຕະໂນມັດຫຼັງຈາກເຂົ້າສູ່ລະບົບ",
         "use_12_hour_format": "ສະແດງເວລາໃນຮູບແບບ 12 ຊົ່ວໂມງ (ເຊັ່ນ: 2:30 ໂມງແລງ)",
         "use_command_enter_send_message": "ໃຊ້ Command + Enter ເພື່ອສົ່ງຂໍ້ຄວາມ",
         "use_command_f_search": "ໃຊ້ຄໍາສັ່ງ + F ເພື່ອຊອກຫາເສັ້ນເວລາ",
@@ -2182,6 +2148,7 @@
         "upgraderoom": "ຍົກລະດັບຫ້ອງເປັນລຸ້ນໃໝ່",
         "upgraderoom_permission_error": "ທ່ານບໍ່ມີສິດໃຊ້ຄໍາສັ່ງນີ້.",
         "usage": "ການນໍາໃຊ້",
+        "verify": "ຢືນຢັນຜູ້ໃຊ້, ລະບົບ, ແລະ pubkey tuple",
         "whois": "ສະແດງຂໍ້ມູນກ່ຽວກັບຜູ້ໃຊ້"
     },
     "space": {
diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 101e8fbc0c..8f3add6d43 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -163,8 +163,7 @@
             "megolm_export": "Eksportuoti raktus rankiniu būdu",
             "setup_key_backup_title": "Jūs prarasite prieigą prie savo užšifruotų žinučių",
             "setup_secure_backup_description_1": "Užšifruotos žinutės yra apsaugotos visapusiu šifravimu. Tik jūs ir gavėjas(-ai) turi raktus šioms žinutėms perskaityti.",
-            "skip_key_backup": "Man nereikalingos užšifruotos žinutės",
-            "use_key_backup": "Pradėti naudoti atsarginę raktų kopiją"
+            "skip_key_backup": "Man nereikalingos užšifruotos žinutės"
         },
         "misconfigured_body": "Paprašykite savo %(brand)s administratoriaus patikrinti ar <a>jūsų konfigūracijoje</a> nėra neteisingų arba pasikartojančių įrašų.",
         "misconfigured_title": "Jūsų %(brand)s yra neteisingai sukonfigūruotas",
@@ -383,7 +382,6 @@
         "unverified": "Nepatvirtinta",
         "user_avatar": "Profilio paveikslėlis",
         "username": "Vartotojo vardas",
-        "verification_cancelled": "Patvirtinimas atšauktas",
         "verified": "Patvirtinta",
         "video": "Vaizdo įrašas",
         "video_room": "Vaizdo kambarys",
@@ -505,8 +503,6 @@
             "security_key_title": "Saugumo Raktas"
         },
         "bootstrap_title": "Raktų nustatymas",
-        "cancel_entering_passphrase_description": "Ar tikrai norite atšaukti slaptafrazės įvedimą?",
-        "cancel_entering_passphrase_title": "Atšaukti slaptafrazės įvedimą?",
         "confirm_encryption_setup_body": "Paspauskite mygtuką žemiau, kad patvirtintumėte šifravimo nustatymą.",
         "confirm_encryption_setup_title": "Patvirtinti šifravimo sąranką",
         "cross_signing_room_normal": "Šis kambarys visapusiškai užšifruotas",
@@ -538,8 +534,6 @@
             "title": "Atgavimo Metodas Pašalintas",
             "warning": "Jei jūs nepašalinote paskyros atgavimo metodo, gali būti, kad užpuolikas bando patekti į jūsų paskyrą. Nedelsiant nustatymuose pakeiskite savo paskyros slaptažodį ir nustatykite naują atgavimo metodą."
         },
-        "reset_all_button": "Pamiršote arba praradote visus atkūrimo metodus? <a>Iš naujo nustatyti viską</a>",
-        "set_up_toast_description": "Apsisaugokite nuo prieigos prie šifruotų žinučių ir duomenų praradimo",
         "set_up_toast_title": "Nustatyti Saugią Atsarginę Kopiją",
         "setup_secure_backup": {
             "explainer": "Prieš atsijungdami sukurkite atsarginę savo raktų kopiją, kad išvengtumėte jų praradimo."
@@ -554,9 +548,6 @@
         "unable_to_setup_keys_error": "Nepavyksta nustatyti raktų",
         "verification": {
             "accepting": "Priimama…",
-            "cancelled": "Jūs atšaukėte patvirtinimą.",
-            "cancelled_self": "Atšaukėte patvirtinimą kitame įrenginyje.",
-            "cancelled_user": "%(displayName)s atšaukė patvirtinimą.",
             "cancelling": "Atšaukiama…",
             "complete_action": "Supratau",
             "complete_description": "Jūs sėkmingai patvirtinote šį vartotoją.",
@@ -571,31 +562,22 @@
             "no_support_qr_emoji": "Įrenginys, kurį bandote patvirtinti, nepalaiko QR kodo nuskaitymo arba jaustukų patikrinimo, kurį palaiko %(brand)s. Pabandykite naudoti kitą klientą.",
             "other_party_cancelled": "Kita šalis atšaukė patvirtinimą.",
             "prompt_encrypted": "Patvirtinkite visus vartotojus kambaryje, kad užtikrintumėte jo saugumą.",
-            "prompt_self": "Pradėkite patvirtinimą iš naujo pranešime.",
             "prompt_unencrypted": "Užšifruotuose kambariuose patvirtinkite visus naudotojus, kad įsitikintumėte, jog jie yra saugūs.",
-            "prompt_user": "Pradėkite patvirtinimą iš naujo jų profilyje.",
             "qr_or_sas": "%(qrCode)s arba %(emojiCompare)s",
-            "qr_or_sas_header": "Patvirtinkite šį įrenginį atlikdami vieną iš toliau nurodytų veiksmų:",
             "qr_prompt": "Nuskaitykite šį unikalų kodą",
-            "qr_reciprocate_same_shield_device": "Jau beveik! Ar kitas jūsų įrenginys rodo tą patį skydą?",
             "qr_reciprocate_same_shield_user": "Beveik atlikta! Ar %(displayName)s rodo tokį patį skydą?",
             "request_toast_detail": "%(deviceId)s iš %(ip)s",
             "sas_caption_self": "Patvirtinkite šį prietaisą patvirtindami, kad jo ekrane rodomas šis numeris.",
             "sas_caption_user": "Patvirtinkite šį vartotoją, įsitikindami, kad jo ekrane rodomas toliau esantis skaičius.",
             "sas_description": "Palyginkite unikalų jaustukų rinkinį, jei neturite fotoaparato nei viename įrenginyje",
-            "sas_emoji_caption_self": "Patvirtinkite, kad toliau pateikti jaustukai rodomi abiejuose prietaisuose ta pačia tvarka:",
             "sas_emoji_caption_user": "Patvirtinkite šį vartotoją, įsitikindami, kad jo ekrane rodomas toliau esantis jaustukas.",
             "sas_match": "Jie sutampa",
             "sas_no_match": "Jie nesutampa",
             "sas_prompt": "Palyginkite unikalius jaustukus",
             "scan_qr": "Patvirtinti nuskaitant",
             "scan_qr_explainer": "Paprašykite %(displayName)s nuskaityti jūsų kodą:",
-            "self_verification_hint": "Jei norite tęsti, priimkite patvirtinimo prašymą kitame savo įrenginyje.",
             "start_button": "Pradėti patvirtinimą",
-            "successful_device": "Jūs sėkmingai patvirtinote %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "Jūs sėkmingai patvirtinote savo įrenginį!",
             "successful_user": "Jūs sėkmingai patvirtinote %(displayName)s!",
-            "timed_out": "Pasibaigė laikas patikrinimui.",
             "unsupported_method": "Nepavyko rasti palaikomo patvirtinimo metodo.",
             "unverified_session_toast_title": "Naujas prisijungimas. Ar tai jūs?",
             "unverified_sessions_toast_description": "Peržiūrėkite, ar jūsų paskyra yra saugi",
@@ -889,8 +871,7 @@
         "rotate_left": "Pasukti Kairėn"
     },
     "member_list": {
-        "filter_placeholder": "Filtruoti kambario dalyvius",
-        "power_label": "%(userName)s (galia %(powerLevelNumber)s)"
+        "filter_placeholder": "Filtruoti kambario dalyvius"
     },
     "member_list_back_action_label": "Kambario nariai",
     "message_edit_dialog_title": "Žinutės redagavimai",
@@ -1056,8 +1037,6 @@
             "send_message_start_dm": "Siųskite pirmąją žinutę kad pakviestumėte <displayName/> į pokalbį",
             "start_of_dm_history": "Tai yra jūsų tiesioginių žinučių su <displayName/> istorijos pradžia.",
             "start_of_room": "Tai yra <roomName/> pradžia.",
-            "topic": "Tema: %(topic)s ",
-            "topic_edit": "Tema: %(topic)s (<a>redaguoti</a>)",
             "unencrypted_warning": "Visapusis šifravimas nėra įjungtas",
             "user_created": "%(displayName)s sukūrė šį kambarį.",
             "you_created": "Jūs sukūrėte šį kambarį."
@@ -1344,7 +1323,6 @@
             "error_update_guest_access": "Nepavyko atnaujinti šios erdvės svečių prieigos",
             "error_update_history_visibility": "Nepavyko atnaujinti šios erdvės istorijos matomumo",
             "guest_access_explainer": "Svečiai gali prisijungti prie erdvės neturėdami paskyros.",
-            "guest_access_explainer_public_space": "Tai gali būti naudinga viešosiose erdvėse.",
             "guest_access_label": "Įjungti svečių prieigą",
             "history_visibility_anyone_space": "Peržiūrėti erdvę",
             "history_visibility_anyone_space_description": "Leisti žmonėms peržiūrėti jūsų erdvę prieš prisijungiant.",
@@ -1481,9 +1459,6 @@
         "insert_trailing_colon_mentions": "Įterpti dvitaškį po naudotojo paminėjimų žinutės pradžioje",
         "jump_to_bottom_on_send": "Peršokti į laiko juostos apačią, kai siunčiate žinutę",
         "key_backup": {
-            "backup_in_progress": "Kuriama jūsų raktų atsarginė kopija (pirmas atsarginės kopijos sukūrimas gali užtrukti kelias minutes).",
-            "cannot_create_backup": "Nepavyko sukurti atsarginės raktų kopijos",
-            "create_title": "Sukurti atsarginę raktų kopiją",
             "setup_secure_backup": {
                 "confirm_security_phrase": "Patvirtinkite savo Saugumo Frazę",
                 "enter_phrase_title": "Įveskite Slaptafrazę",
@@ -1573,7 +1548,6 @@
             "ignore_users_empty": "Nėra ignoruojamų naudotojų.",
             "ignore_users_section": "Ignoruojami vartotojai",
             "key_backup_algorithm": "Algoritmas:",
-            "key_backup_connect": "Prijungti šį seansą prie Atsarginės Raktų Kopijos",
             "message_search_disabled": "Šifruotas žinutes saugiai talpinkite lokaliai, kad jos būtų rodomos paieškos rezultatuose.",
             "message_search_enabled": {
                 "one": "Saugiai talpinkite užšifruotas žinutes vietoje, kad jos būtų rodomos paieškos rezultatuose, naudojant %(size)s žinutėms iš %(rooms)s kambario saugoti.",
@@ -1658,7 +1632,6 @@
             "metaspaces_subsection": "Kurias erdves rodyti",
             "title": "Šoninė juosta"
         },
-        "start_automatically": "Pradėti automatiškai prisijungus prie sistemos",
         "use_12_hour_format": "Rodyti laiko žymes 12 valandų formatu (pvz. 2:30pm)",
         "use_command_enter_send_message": "Naudokite Command + Enter žinutės išsiuntimui",
         "use_command_f_search": "Naudokite Command + F ieškojimui laiko juostoje",
@@ -1739,6 +1712,7 @@
         "upgraderoom": "Atnaujina kambarį į naują versiją",
         "upgraderoom_permission_error": "Jūs neturite reikalingų leidimų naudoti šią komandą.",
         "usage": "Naudojimas",
+        "verify": "Patvirtina vartotojo, seanso ir pubkey daugiadalę duomenų struktūrą",
         "whois": "Parodo informaciją apie vartotoją"
     },
     "space": {
@@ -1940,9 +1914,12 @@
             "unknown": "%(senderDisplayName)s pakeitė prisijungimo taisyklę į %(rule)s"
         },
         "m.room.member": {
+            "accepted_3pid_invite": "%(targetName)s priėmė kvietimą, skirtą %(displayName)s",
+            "accepted_invite": "%(targetName)s priėmė kvietimą",
             "ban": "%(senderName)s užblokavo %(targetName)s",
             "change_avatar": "%(senderName)s pakeitė savo profilio nuotrauką",
             "change_name": "%(oldDisplayName)s pasikeitė savo rodomą vardą į %(displayName)s",
+            "invite": "%(senderName)s pakvietė %(targetName)s",
             "join": "%(targetName)s prisijungė prie kambario",
             "kick": "%(senderName)s pašalino %(targetName)s",
             "kick_reason": "%(senderName)s pašalino %(targetName)s: %(reason)s",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 739e9a81b0..951a5bae1e 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -224,8 +224,7 @@
             "setup_key_backup_title": "Tu zaudēsi piekļuvi savām šifrētajām ziņām",
             "setup_secure_backup_description_1": "Šifrētas ziņas tiek nodrošinātas ar pilnīgu šifrēšanu. Tikai Tev un saņēmējam(iem) ir atslēgas šo ziņojumu lasīšanai.",
             "setup_secure_backup_description_2": "Kad Tu atteiksies, šīs atslēgas tiks izdzēstas no šīs ierīces, kas nozīmē, ka Tu nevarēsi lasīt šifrētas ziņas, līdz Tev būs to atslēgas citās ierīcēs vai serverī izveidosi to rezerves kopiju.",
-            "skip_key_backup": "Es nevēlos savas šifrētās ziņas",
-            "use_key_backup": "Sākt izmantot atslēgu rezerves kopiju veidošanu"
+            "skip_key_backup": "Es nevēlos savas šifrētās ziņas"
         },
         "misconfigured_body": "Jāvaicā savam %(brand)s pārvaldniekam pārbaudīt, vai <a>konfigurācijā</a> ir nepareizu vai atkārtojošos ierakstu",
         "misconfigured_title": "%(brand)s ir nepareizi konfigurēts",
@@ -569,7 +568,6 @@
         "user": "Lietotājs",
         "user_avatar": "Profila attēls",
         "username": "Lietotājvārds",
-        "verification_cancelled": "Apliecināšana atcelta",
         "verified": "Verificēts",
         "version": "Versija",
         "video": "Video",
@@ -840,8 +838,6 @@
             "security_key_title": "Drošības atslēga"
         },
         "bootstrap_title": "Atslēgu iestatīšana",
-        "cancel_entering_passphrase_description": "Vai tiešām atcelt paroles vārdkopas ievadīšanu?",
-        "cancel_entering_passphrase_title": "Atcelt frāzveida paroles ievadi?",
         "confirm_encryption_setup_body": "Noklikšķiniet uz tālāk esošās pogas, lai apstiprinātu šifrēšanas iestatīšanu.",
         "confirm_encryption_setup_title": "Apstiprināt šifrēšanas iestatīšanu",
         "cross_signing_room_normal": "Šajā istabā tiek veikta pilnīga šifrēšana",
@@ -878,8 +874,6 @@
             "title": "Atkopšanas metode noņemta",
             "warning": "Ja nenoņēmi atkopšanas veidu, var būt, ka uzbrucējs mēģina piekļūt Tavam kontam. Nekavējoties jānomaina sava konta parole un jāiestata jauns atkopšanas veids."
         },
-        "reset_all_button": "Aizmirsāt vai pazaudējāt visas atkopšanās iespējas? <a>Atiestatiet visu</a>",
-        "set_up_toast_description": "Pasargājieties pret piekļuves zaudēšanu šifrētām ziņām un datiem",
         "set_up_toast_title": "Iestatīt drošu rezerves dublēšanu",
         "setup_secure_backup": {
             "explainer": "Pirms izrakstīšanās iestatiet atslēgu dublēšanu, lai izvairītos no tās pazaudēšanas."
@@ -898,12 +892,8 @@
             "after_new_login": {
                 "device_verified": "Ierīce ir verificēta",
                 "skip_verification": "Pagaidām izlaist verifikāciju",
-                "unable_to_verify": "Neizdevās verificēt šo ierīci",
                 "verify_this_device": "Verificēt šo ierīci"
             },
-            "cancelled": "Tu atcēli apliecināšanu.",
-            "cancelled_self": "Jūs atcēlāt verifikāciju citā savā ierīcē.",
-            "cancelled_user": "%(displayName)s atcēla apliecināšanu.",
             "cancelling": "Atcelšana...",
             "complete_action": "Sapratu",
             "complete_description": "Tu esi veiksmīgi apliecinājis šo lietotāju.",
@@ -918,46 +908,33 @@
             "incoming_sas_dialog_waiting": "Gaida partnera apstiprinājumu…",
             "incoming_sas_user_dialog_text_1": "Apliecināt šo lietotāju, lai atzīmētu to kā uzticamu. Uzticēšanās lietotājiem sniedz papildu mieru, kad tiek izmantotas pilnīgi šifrētas ziņas.",
             "incoming_sas_user_dialog_text_2": "Šī lietotāja apliecināšana atzīmēs viņa sesiju kā uzticamu, kā arī atzīmēs šo sesiju kā viņam uzticamu.",
-            "no_key_or_device": "Izskatās, ka Tev nav drošības atslēgas vai citu ierīču, kurās varētu veikt apliecināšanu. Šajā ierīcē nebūs iespējams piekļūt vecām šifrētajām ziņām. Lai šajā ierīcē apliecinātu savu identitāti, būs nepieciešams atiestatīt savas apliecināšanas atslēgas.",
             "no_support_qr_emoji": "Ierīce, kuru mēģini apliecināt, nenodrošina kvadrātkoda nolasīšanu vai emocijzīmju apliecināšanu, ko nodrošina %(brand)s. Jāmēģina ar citu klientu.",
             "other_party_cancelled": "Otra puse atcēla apliecināšanu.",
             "prompt_encrypted": "Apliecināt visus istabā esošos lietotājus, lai nodrošinātu tās drošību.",
-            "prompt_self": "Apliecināšana jāuzsāk vēlreiz no paziņojuma.",
             "prompt_unencrypted": "Šifrētās apliecināt visus lietotājus, lai nodrošinātu, ka tās ir drošas.",
-            "prompt_user": "Apliecināšana jāuzsāk vēlreiz no viņu profila.",
             "qr_or_sas": "%(qrCode)s vai %(emojiCompare)s",
-            "qr_or_sas_header": "Verificējiet šo ierīci, veicot vienu no šīm darbībām:",
             "qr_prompt": "Noskenējiet šo unikālo kodu",
-            "qr_reciprocate_same_shield_device": "Gandrīz esam galā! Vai cita jūsu ierīce rāda tādu pašu vairogu?",
             "qr_reciprocate_same_shield_user": "Gandrīz galā! Vai %(displayName)s tiek parādīts tas pats vairogs?",
-            "request_toast_accept": "Apliecināt sesiju",
             "request_toast_accept_user": "Apliecināt lietotāju",
             "request_toast_decline_counter": "Neņemt vērā (%(counter)s)",
             "request_toast_detail": "%(deviceId)s no %(ip)s",
-            "reset_proceed_prompt": "Turpināt atiestatīšanu",
             "sas_caption_self": "Apliecināt šo ierīci, apstiprinot, ka ekrānā parādās šis skaitlis.",
             "sas_caption_user": "Apliecināt šo lietotāju, apstiprinot, ka zemāk esošais numurs pārādās lietotāja ekrānā.",
             "sas_description": "Salīdziniet unikālu emocijzīmju kopu, ja nevienai ierīcei nav kameras",
-            "sas_emoji_caption_self": "Apstiprināt, ka zemāk esošās emocijzīmes air attēlotas abās ierīcēs tādā pašā secībā:",
             "sas_emoji_caption_user": "Apliecināt šo lietotāju, apstiprinot, ka zemāk esošās emocijzīmes pārādās lietotāja ekrānā.",
             "sas_match": "Tās sakrīt",
             "sas_no_match": "Tās nesakrīt",
             "sas_prompt": "Jāsalīdzina vienreizējās emocijzīmes",
             "scan_qr": "Apliecināt ar nolasīšanu",
             "scan_qr_explainer": "Jāvaicā %(displayName)s nolasīt šo kodu:",
-            "self_verification_hint": "Lai turpinātu, lūgums apstiprināt apliecinājuma pieprasījumu otrā ierīcē.",
             "start_button": "Uzsākt apliecināšanu",
-            "successful_device": "Ir veiksmīgi apliecināta %(deviceName)s (%(deviceId)s).",
-            "successful_own_device": "Ierīce ir veiksmīgi apliecināta.",
             "successful_user": "Ir veiksmīgi apliecināts %(displayName)s!",
-            "timed_out": "Verifikācijai iestājās noilgums.",
             "unsupported_method": "Neizdevās atrast atbalstītu verifikācijas metodi.",
             "unverified_session_toast_accept": "Jā, tas biju es",
             "unverified_session_toast_title": "Jauna pieteikšanās. Vai tas biji Tu?",
             "unverified_sessions_toast_description": "Pārskatīt, lai nodrošinātu, ka konts ir drosībā.",
             "unverified_sessions_toast_reject": "Vēlāk",
             "unverified_sessions_toast_title": "Tev ir neapliecinātas sesijas",
-            "verification_description": "Verificējiet savu identitāti, lai piekļūtu šifrētām ziņām un pierādītu savu identitāti citiem.",
             "verification_dialog_title_device": "Apliecināt otru ierīci",
             "verification_dialog_title_user": "Apliecināšanas pieprasījums",
             "verification_skip_warning": "Neveicot verifikāciju, jums nebūs piekļuves visām savām ziņām, kā arī ierīce var tikt parādīta citiem kā neuzticama.",
@@ -967,9 +944,6 @@
             "verify_emoji_prompt": "Apliecināt ar vienreizēju emocijzīmu salīdzināšanu.",
             "verify_emoji_prompt_qr": "Ja nevar nolasīt augstāk esošo kodu, var apliecināt ar vienreizēju emocijzīmju salīdzināšanu.",
             "verify_later": "Es verificēšu vēlāk",
-            "verify_using_device": "Verificēt ar citu ierīci",
-            "verify_using_key": "Verificēt ar drošības atslēgu",
-            "verify_using_key_or_phrase": "Verificēt, izmantojot drošības atslēgu vai frāzi",
             "waiting_for_user_accept": "Gaida, kamēr %(displayName)s apstiprinās…",
             "waiting_other_device": "Gaida, kamēr jūs verificēsiet citā savā ierīcē...",
             "waiting_other_device_details": "Gaida, kamēr jūs verificēsiet citā ierīcē - %(deviceName)s (%(deviceId)s)…",
@@ -1253,7 +1227,6 @@
         "upload_file": "Augšupielādēt datni"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Atļaut tikai ekrāna kopīgošanas režīmu",
         "ask_to_join": "Iespējot aicinājumus pievienoties",
         "automatic_debug_logs": "Automātiski nosūtīt atkļūdošanas žurnālus par jebkuru kļūdu",
         "automatic_debug_logs_decryption": "Automātiski nosūtīt atkļūdošanas žurnālus par atšifrēšanas kļūdām",
@@ -1402,8 +1375,7 @@
     },
     "member_list": {
         "filter_placeholder": "Atfiltrēt istabas dalībniekus",
-        "invite_button_no_perms_tooltip": "Jums nav atļaujas uzaicināt lietotājus",
-        "power_label": "%(userName)s (tiesību līmenis %(powerLevelNumber)s)"
+        "invite_button_no_perms_tooltip": "Jums nav atļaujas uzaicināt lietotājus"
     },
     "member_list_back_action_label": "Istabas dalībnieki",
     "message_edit_dialog_title": "Ziņas labojumi",
@@ -1710,8 +1682,6 @@
             "send_message_start_dm": "Nosūtiet savu pirmo ziņu, lai uzaicinātu <displayName/> uz tērzēšanu",
             "start_of_dm_history": "Šis ir sākums tiešās sarakstes vēsturei ar <displayName/>.",
             "start_of_room": "Šis ir <roomName/> istabas pats sākums.",
-            "topic": "Temats: %(topic)s ",
-            "topic_edit": "Temats: %(topic)s (<a>redigēt</a>)",
             "unencrypted_warning": "Pilnīga šifrēšana nav iespējota",
             "user_created": "%(displayName)s izveidoja šo istabu.",
             "you_created": "Tu izveidoji šo istabu."
@@ -2074,7 +2044,6 @@
             "error_update_guest_access": "Neizdevās atjaunināt viesa piekļuvi šai telpai",
             "error_update_history_visibility": "Neizdevās atjaunināt šīs telpas vēstures redzamību",
             "guest_access_explainer": "Viesi var pievienoties telpai bez konta.",
-            "guest_access_explainer_public_space": "Tas var būt noderīgi publiskās telpās.",
             "guest_access_label": "Iespējot piekļuvi viesiem",
             "history_visibility_anyone_space": "Priekšskatīt telpu",
             "history_visibility_anyone_space_description": "Ļaujiet cilvēkiem priekšskatīt jūsu telpu pirms pievienošanās.",
@@ -2227,11 +2196,6 @@
         "insert_trailing_colon_mentions": "Jāievieto beigu kols pēc lietotāja pieminēšanas ziņas sākumā",
         "jump_to_bottom_on_send": "Nosūtot ziņu, pāriet uz laika skalas beigām",
         "key_backup": {
-            "backup_in_progress": "Jūsu atslēgas tiek dublētas (pirmā dublēšana var ilgt dažas minūtes).",
-            "backup_starting": "Sāk dublējumu...",
-            "backup_success": "Veiksmīgi!",
-            "cannot_create_backup": "Nevar izveidot atslēgu rezerves kopiju",
-            "create_title": "Izveidot atslēgu rezerves kopiju",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Tagad jūsu atslēgas tiek dublētas no šīs ierīces.",
                 "backup_setup_success_title": "Droša dublējuma izveide ir veiksmīga",
@@ -2366,7 +2330,6 @@
             "ignore_users_empty": "Nav vērā neņemtu lietotāju.",
             "ignore_users_section": "Vērā neņemtie lietotāji",
             "key_backup_algorithm": "Algoritms:",
-            "key_backup_connect": "Savienojiet šo sesiju ar atslēgu dublēšanu",
             "message_search_disable_warning": "Ja šī opcija ir atspējota, ziņas no šifrētām istabām neparādīsies meklēšanas rezultātos.",
             "message_search_disabled": "Drošā veidā saglabājiet lokālajā kešatmiņā šifrētās ziņas, lai tās parādītos meklēšanas rezultātos.",
             "message_search_enabled": {
@@ -2522,7 +2485,6 @@
             "spaces_explainer": "Telpas ir veids, kā grupēt istabas un cilvēkus. Papildus telpām, kurās atrodaties, varat izmantot arī dažas sākotnēji veidotās telpas.",
             "title": "Sānjoslas"
         },
-        "start_automatically": "Startēt pie ierīces ielādes",
         "use_12_hour_format": "Rādīt laiku 12 stundu formātā (piemēram 2:30pm)",
         "use_command_enter_send_message": "Lietot Command + Enter ziņas nosūtīšanai",
         "use_command_f_search": "Lietot Command + F meklēšanai laika skalā",
@@ -2643,6 +2605,7 @@
         "upgraderoom": "Atjaunina istabu uz jaunu versiju",
         "upgraderoom_permission_error": "Nav šīs komandas izmantošanai nepieciešamo atļauju.",
         "usage": "Lietojums",
+        "verify": "Verificē lietotāju, sesiju un publiskās atslēgas",
         "view": "Skata istabu ar norādīto adresi",
         "whois": "Parāda lietotāja informāciju"
     },
@@ -2925,7 +2888,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Beidzās aptauja",
             "sender_ended": "%(senderName)s pārtrauca aptauju"
         },
         "m.poll.start": "%(senderName)s uzsāka aptauju- %(pollQuestion)s",
@@ -3421,7 +3383,6 @@
         "dialpad": "Cipartastatūra",
         "disable_camera": "Izslēgt kameru",
         "disable_microphone": "Izslēgt mikrofonu",
-        "disabled_no_one_here": "Šeit nav neviena, kam piezvanīt",
         "disabled_no_perms_start_video_call": "Jums nav atļaujas sākt videozvanus",
         "disabled_no_perms_start_voice_call": "Jums nav atļaujas sākt balss zvanus",
         "disabled_ongoing_call": "Notiek zvans",
diff --git a/src/i18n/strings/mg_MG.json b/src/i18n/strings/mg_MG.json
index 1ec5ed76c5..d68e1454d6 100644
--- a/src/i18n/strings/mg_MG.json
+++ b/src/i18n/strings/mg_MG.json
@@ -219,8 +219,7 @@
             "setup_key_backup_title": "Ho very ny fidirana amin'ny hafatrao voasakana",
             "setup_secure_backup_description_1": "Ny hafatra voarakitra dia arovana aminy fanafenana farany mankany amin'ny farany. Ianao sy ny mpandray (ireo) ihany no manana ny fanalahidy hamakiana ireo hafatra ireo.",
             "setup_secure_backup_description_2": "Rehefa mivoaka ianao dia ho voafafa amin'ity fitaovana ity ireo fanalahidy ireo, izay midika fa tsy ho afaka hamaky hafatra voafono ianao raha tsy manana ny fanalahidin'izy ireo amin'ny fitaovanao hafa, na averinao any aminy mpizara.",
-            "skip_key_backup": "Tsy tiako ny hafatra voarakotra",
-            "use_key_backup": "Manomboka mampiasa fanalahidin'ny fitahirizana"
+            "skip_key_backup": "Tsy tiako ny hafatra voarakotra"
         },
         "misconfigured_body": "Anontanio ny anao%(brand)s admin hanamarina<a> ny config</a> hoany fidirana diso na dika mitovy.",
         "misconfigured_title": "ny%(brand)s dia diso fanitsiana",
@@ -529,7 +528,6 @@
         "user": "Mpampiasa",
         "user_avatar": "Sary mpamantarana ",
         "username": "Anarany mpampiasa",
-        "verification_cancelled": "Manafoana ny fanamarinana",
         "verified": "Fanamariana",
         "version": "Dikan-teny",
         "video": "Ainamanjery",
@@ -797,8 +795,6 @@
             "security_key_title": "Kitendry fiarovana"
         },
         "bootstrap_title": "Fametrahana fanalahidy",
-        "cancel_entering_passphrase_description": "Tena te-hanafoana ny fampidirana fehezanteny ve ianao?",
-        "cancel_entering_passphrase_title": "Hanafoana ny fidirana amin'ny teny miafina ?",
         "confirm_encryption_setup_body": "Kitiho ny bokotra etsy ambany hanamafisana ny fametrahana encryption.",
         "confirm_encryption_setup_title": "Hamafiso ny fanamboarana fanafenana",
         "cross_signing_room_normal": "Ity efitrano ity dia misy encryption avy hatrany",
@@ -835,8 +831,6 @@
             "title": "Nesorina ny fomba fanarenana",
             "warning": "Raha tsy nesorinao ny fomba fanarenana, dia mety hanandrana hiditra aminy kaontinao ny mpanafika. Hanova ny tenimiafiny kaontinao ary mametraha fomba fanarenana vaovao avy hatrany ao amin'ny fanitsiana."
         },
-        "reset_all_button": "Adino na very ny fomba fanarenana rehetra?<a> Avereno daholo</a>",
-        "set_up_toast_description": "Arovy aminy fahaverezany fidirana amin'ny hafatra sy angon-drakitra voatahiry",
         "set_up_toast_title": "Hanitsy angona voaharo",
         "setup_secure_backup": {
             "explainer": "Amboary ny fanalahidinao alohany hivoahana mba tsy ho very."
@@ -855,12 +849,8 @@
             "after_new_login": {
                 "device_verified": "Voamarina ny fitaovana",
                 "skip_verification": "Alefaso ny fanamarinana amin'izao fotoana izao",
-                "unable_to_verify": "Tsy afaka manamarina ity fitaovana ity",
                 "verify_this_device": "Hamarino ity fitaovana ity"
             },
-            "cancelled": "Nofoananao ny fanamarinana.",
-            "cancelled_self": "Nofoananao ny fanamarinana tamin'ny fitaovanao hafa.",
-            "cancelled_user": "%(displayName)snofoanana ny fanamarinana.",
             "cancelling": "Manafoana…",
             "complete_action": "Azoko",
             "complete_description": "Ianao voamariko soa aman-tsara ity mpampiasa ity.",
@@ -875,45 +865,32 @@
             "incoming_sas_dialog_waiting": "Miandry ny mpiara-miasa hanamarina…",
             "incoming_sas_user_dialog_text_1": "Hamarino ity mpampiasa ity mba hanamarihana azy ireo ho azo itokisana. Ny fahatokisana ny mpampiasa dia manome anao fiadanan-tsaina fanampiny rehefa mampiasa hafatra voarakotra amin'ny farany.",
             "incoming_sas_user_dialog_text_2": "Ny fanamarinana ity mpampiasa ity dia hanamarika ny fotoam-pivorian'izy ireo ho atokisana, ary hanamarika ihany koa ny fotoam-pivorianao ho atokisana azy ireo.",
-            "no_key_or_device": "Toa tsy manana fanalahidiny ianao na fitaovana hafa azonao hamarinina. Ity fitaovana ity dia tsy ho afaka miditra aminy hafatra efa misy miafina. Mba hanamarinana ny mombamomba anao amin'ity fitaovana ity dia mila averinao ny fanalahidiny fanamarinanao.",
             "no_support_qr_emoji": "Ny fitaovana ezahinao hohamarinina dia tsy mahazaka ny scan kaody QR na fanamarinana emoji, izany hoe%(brand)s ny manohana. Andramo miaraka aminy mpanjifa hafa.",
             "other_party_cancelled": "Nanafoana ny fanamarinana ny ankilany.",
             "prompt_encrypted": "Hamarino ny mpampiasa rehetra ao amin'ny efitrano iray mba hahazoana antoka fa azo antoka izany.",
-            "prompt_self": "Atombohy indray ny fanamarinana avy amin'ny fampahafantarana.",
             "prompt_unencrypted": "Ao amin'ny efitrano misy miafina, hamarino ny mpampiasa rehetra mba hahazoana antoka fa azo antoka.",
-            "prompt_user": "Atombohy indray ny fanamarinana avy amin'ny mombamomba azy.",
             "qr_or_sas": "%(qrCode)sna%(emojiCompare)s",
-            "qr_or_sas_header": "Hamarino ity fitaovana ity aminy fanatanterahana ny iray amin'ireto manaraka ireto:",
             "qr_prompt": "Tilio ity kaody tokana ity",
-            "qr_reciprocate_same_shield_device": "Saika any! Mampiseho ampinga mitovy ve ny fitaovanao hafa?",
             "qr_reciprocate_same_shield_user": "Saika any! dia%(displayName)s mampiseho ampinga mitovy?",
-            "request_toast_accept": "Hamarino ny fizorana",
             "request_toast_decline_counter": "Tsy miraharaha (%(counter)s )",
             "request_toast_detail": "<x id =\"0\"/> avy amin'ny <x id =\"18\"/>",
-            "reset_proceed_prompt": "Ankany amin'ny famerenana ny rehetra aminy laoniny",
             "sas_caption_self": "Hamarino ity fitaovana ity amin'ny fanamafisana ity isa manaraka ity dia miseho eo aminy efijery.",
             "sas_caption_user": "Hamarino ity mpampiasa ity aminy fanamafisana ity isa manaraka ity dia miseho eo amin'ny efijery.",
             "sas_description": "Ampitahao ny andiana emoji tokana raha tsy manana fakan-tsary amin'ny fitaovana roa ianao",
-            "sas_emoji_caption_self": "Hamafiso fa aseho amin'ny fitaovana roa ny emoji etsy ambany, amin'ny filaharana mitovy:",
             "sas_emoji_caption_user": "Hamarino ity mpampiasa ity amin'ny fanamafisana ity emoji manaraka ity dia miseho eo amin'ny efijery.",
             "sas_match": "Mifanaraka izy ireo",
             "sas_no_match": "Tsy mifanentana izy ireo",
             "sas_prompt": "Ampitahao ny emoji tokana",
             "scan_qr": "Hamarino amin'ny fitiliana",
             "scan_qr_explainer": "Anontanio%(displayName)s hijerena ny kaodinao:",
-            "self_verification_hint": "Mba hanohizana dia ekeo azafady ny fangatahana fanamarinana amin'ny fitaovanao hafa.",
             "start_button": "Atombohy ny fanamarinana",
-            "successful_device": "Vitanao ny nanamarina%(deviceName)s (%(deviceId)s )!",
-            "successful_own_device": "Nahomby ianao nanamarina ny fitaovanao!",
             "successful_user": "Ianao efa voamariko antsakany sy andavany%(displayName)s!",
-            "timed_out": "Tapitra ny fotoana fanamarinana.",
             "unsupported_method": "Tsy nahita fomba fanamarinana tohana.",
             "unverified_session_toast_accept": "Eny, izaho io",
             "unverified_session_toast_title": "Fidirana vaovao. Ianao ve ity?",
             "unverified_sessions_toast_description": "Avereno jerena mba hahazoana antoka fa azo antoka ny kaontinao",
             "unverified_sessions_toast_reject": "Taty aoriana",
             "unverified_sessions_toast_title": "Manana fivoriana tsy voamarina ianao",
-            "verification_description": "Hamarino ny maha-izy anao mba hidirana aminy hafatra miafina ary porofoy amin'ny hafa ny mombamomba anao.",
             "verification_dialog_title_device": "Hamarino ny fitaovana hafa",
             "verification_dialog_title_user": "Fangatahana fanamarinana",
             "verification_skip_warning": "Raha tsy misy fanamarinana dia tsy afaka miditra aminy hafatrao rehetra ianao ary mety hiseho ho tsy atokisana amin'ny hafa.",
@@ -923,9 +900,6 @@
             "verify_emoji_prompt": "Hamarino amin'ny fampitahana emoji tokana.",
             "verify_emoji_prompt_qr": "Raha tsy azonao atao ny mijery ny kaody etsy ambony dia hamarino amin'ny fampitahana emoji tokana.",
             "verify_later": "Hamariniko avy eo",
-            "verify_using_device": "Hamarino amin'ny fitaovana hafa",
-            "verify_using_key": "Hamarino aminy fanalahidiny voaharo",
-            "verify_using_key_or_phrase": "Hamarino amin'ny fanalahidy na rakin-tsoratra voaharo",
             "waiting_for_user_accept": "Miandry%(displayName)s manaiky…",
             "waiting_other_device": "Miandry anao hanamarina amin'ny fitaovanao hafa…",
             "waiting_other_device_details": "Miandry anao hanamarina amin'ny fitaovanao hafa,%(deviceName)s (%(deviceId)s )…",
@@ -1278,7 +1252,6 @@
         "upload_file": "Mampiakara rakitra"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Avelao ny fomba fizarana efijery ihany",
         "ask_to_join": "Alefaso ny fangatahana hiditra",
         "automatic_debug_logs": "Alefaso ho azy ny log debug amin'ny lesoka rehetra",
         "automatic_debug_logs_decryption": "Alefaso ho azy ny diarin'ny debug momba ny lesoka decryption",
@@ -1450,8 +1423,7 @@
     },
     "member_list": {
         "filter_placeholder": "Sivanina ny mpikambana ao amin'ny efitrano",
-        "invite_button_no_perms_tooltip": "Tsy manana alalana hanasana mpampiasa ianao",
-        "power_label": "%(userName)s(hery%(powerLevelNumber)s )"
+        "invite_button_no_perms_tooltip": "Tsy manana alalana hanasana mpampiasa ianao"
     },
     "member_list_back_action_label": "Mpikambana ao amin'ny efitrano",
     "message_edit_dialog_title": "Fanovana hafatra",
@@ -1764,8 +1736,6 @@
             "send_message_start_dm": "Alefaso ny hafatrao voalohany hanasana<displayName/> hifampiresaka",
             "start_of_dm_history": "Ity no fiandohan'ny tantarany hafatra mivantana nataonao<displayName/> .",
             "start_of_room": "Izany no fiandohan'ny<roomName/> .",
-            "topic": "Lohahevitra:%(les sujets",
-            "topic_edit": "Lohahevitra:%(topic)s (<a> Ovay</a> )",
             "unencrypted_warning": "Tsy azo atao ny mandefa ny kaody faran'ny farany",
             "user_created": "%(displayName)snamorona ity efitrano ity.",
             "you_created": "Ianao no namorona ity efitrano ity."
@@ -2122,7 +2092,6 @@
             "error_update_guest_access": "Tsy nahomby ny fanavaozana ny fidirany vahiny amin'ity habaka ity",
             "error_update_history_visibility": "Tsy nahomby ny fanavaozana ny tantaran'ity habaka ity",
             "guest_access_explainer": "Afaka miditra amina toerana iray tsy manana kaonty ny vahiny.",
-            "guest_access_explainer_public_space": "Mety ilaina amin'ny toerana hoany daholobe izany.",
             "guest_access_label": "Alefaso ny fidirana amin'ny vahiny",
             "history_visibility_anyone_space": "Toerana fijerena mialoha",
             "history_visibility_anyone_space_description": "Avelao ny olona hijery ny toerana misy anao alohan'ny hidirany.",
@@ -2294,11 +2263,6 @@
         "insert_trailing_colon_mentions": "Ampidiro tsangambato aoriana aorian'ny fiteny mpampiasa eo am-piandohany hafatra",
         "jump_to_bottom_on_send": "Mankanesa any amin'ny farany fandaharam-potoana rehefa mandefa hafatra ianao",
         "key_backup": {
-            "backup_in_progress": "Averina averina ny fanalahidinao (mety haharitra minitra vitsivitsy ny vakorakitra voalohany).",
-            "backup_starting": "Manomboka vakorakitra…",
-            "backup_success": "Fahombiazana!",
-            "cannot_create_backup": "Tsy afaka mamorona fanalahidin'ny vakorakitra",
-            "create_title": "Mamorona fanalahidin'ny Vakorakitra ",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Averina averina amin'ity fitaovana ity izao ny fanalahidinao.",
                 "backup_setup_success_title": "Nahomby ny fiarovana vakorakitra",
@@ -2433,7 +2397,6 @@
             "ignore_users_empty": "Tsy manana mpampiasa tsy noraharahiana ianao.",
             "ignore_users_section": "Ireo mpampiasa tsy noraharahiana",
             "key_backup_algorithm": "Algorithm:",
-            "key_backup_connect": "Ampifandraiso amin'ny fanalahidin'ny vakorakitra ity fivoriana ity",
             "message_search_disable_warning": "Raha kilemaina, dia tsy hiseho aminy valiny fikarohana ny hafatra avy aminy efitrano misy miafina.",
             "message_search_disabled": "Ampidiro ao an-toerana ny hafatra miafina mba hiseho aminy valiny fikarohana.",
             "message_search_enabled": {
@@ -2578,7 +2541,6 @@
             "spaces_explainer": "Ny habaka dia fomba ivondronana efitrano sy olona. Miaraka amin'ireo habaka misy anao, azonao atao koa ny mampiasa ireo efa vita.",
             "title": "Sidebar"
         },
-        "start_automatically": "Manomboka ho azy aoriany fidirana amin'ny rafitra",
         "use_12_hour_format": "Asehoy ny mari-pamantarana amin'ny endrika adiny 12 (oh 2:30 ariva)",
         "use_command_enter_send_message": "Ampiasao Command + Enter raha handefa hafatra",
         "use_command_f_search": "Ampiasao ny baiko + F hitadiavana ny fandaharam-potoana",
@@ -2979,7 +2941,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Namarana ny",
             "sender_ended": "%(nom de l'expéditeur)s dia namarana ny fitsapan-kevitra"
         },
         "m.poll.start": "%(senderName)snanomboka ny fitsapan-kevitra -%(pollQuestion)s",
@@ -3460,7 +3421,6 @@
         "dialpad": "Fehizoro nomerika",
         "disable_camera": "Vonoy ny fakantsary",
         "disable_microphone": "Tapaina ny mikrô finday",
-        "disabled_no_one_here": "Tsy misy olona azo antsoina eto",
         "disabled_no_perms_start_video_call": "Tsy manana alalana hanombohana antso an-tsary ianao",
         "disabled_no_perms_start_voice_call": "Tsy manana alalana hanombohana antso an-tariby ianao",
         "disabled_ongoing_call": "Antso mitohy",
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index cab5ac8a05..4a8e4d9aee 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -93,7 +93,7 @@
         "maximise": "Maksimer",
         "mention": "Nevn",
         "minimise": "Minimer",
-        "new_message": "Ny melding",
+        "new_conversation": "Ny samtale",
         "new_room": "Nytt rom",
         "new_video_room": "Nytt videorom",
         "next": "Neste",
@@ -240,8 +240,7 @@
             "setup_key_backup_title": "Du mister tilgangen til de krypterte meldingene dine",
             "setup_secure_backup_description_1": "Krypterte meldinger er sikret med punkt-til-punkt-kryptering. Bare du og mottakeren(e) har nøklene til å lese disse meldingene.",
             "setup_secure_backup_description_2": "Når du logger av, slettes disse nøklene fra denne enheten, noe som betyr at du ikke vil kunne lese krypterte meldinger med mindre du har nøklene til dem på dine andre enheter, eller har sikkerhetskopiert dem til serveren.",
-            "skip_key_backup": "Jeg vil ikke ha mine krypterte meldinger",
-            "use_key_backup": "Begynn å bruke Nøkkelsikkerhetskopiering"
+            "skip_key_backup": "Jeg vil ikke ha mine krypterte meldinger"
         },
         "misconfigured_body": "Spør din%(brand)s administrator om å sjekke <a>konfigurasjonen din</a> for feil eller dupliserte oppføringer.",
         "misconfigured_title": "Ditt %(brand)s-oppsett er feiloppsatt",
@@ -549,7 +548,7 @@
         "orphan_rooms": "Andre rom",
         "password": "Passord",
         "people": "Folk",
-        "preferences": "Brukervalg",
+        "preferences": "Innstillinger",
         "presence": "Tilstedeværelse",
         "preview_message": "Hei der. Du er fantastisk!",
         "privacy": "Personvern",
@@ -600,12 +599,12 @@
         "user": "Bruker",
         "user_avatar": "Profilbilde",
         "username": "Brukernavn",
-        "verification_cancelled": "Verifiseringen ble avbrutt",
         "verified": "Verifisert",
         "version": "Versjon",
         "video": "Video",
         "video_room": "Videorom",
         "view_message": "Se melding",
+        "voice": "Tale",
         "warning": "Advarsel"
     },
     "composer": {
@@ -646,16 +645,17 @@
         "mode_plain": "Skjul formatering",
         "mode_rich_text": "Vis formatering",
         "no_perms_notice": "Du har ikke tillatelse til å legge ut innlegg i dette rommet",
-        "placeholder": "Send en melding …",
-        "placeholder_encrypted": "Send en kryptert beskjed …",
-        "placeholder_reply": "Send et svar …",
-        "placeholder_reply_encrypted": "Send et kryptert svar …",
-        "placeholder_thread": "Svar på tråden...",
-        "placeholder_thread_encrypted": "Svar på kryptert tråd...",
+        "placeholder": "Send en ukryptert melding …",
+        "placeholder_encrypted": "Send en melding…",
+        "placeholder_reply": "Send et ukryptert svar …",
+        "placeholder_reply_encrypted": "Send et svar …",
+        "placeholder_thread": "Svar på ukryptert tråd…",
+        "placeholder_thread_encrypted": "Svar på tråd...",
         "poll_button": "Avstemning",
         "poll_button_no_perms_description": "Du har ikke tillatelse til å starte avstemninger i dette rommet.",
         "poll_button_no_perms_title": "Tillatelse kreves",
         "replying_title": "Svarer på",
+        "room_unencrypted": "Meldinger i dette rommet er ikke ende-til-ende krypterte",
         "room_upgraded_link": "Samtalen fortsetter her.",
         "room_upgraded_notice": "Dette rommet har blitt erstattet og er ikke lenger aktivt.",
         "send_button_title": "Send melding",
@@ -719,6 +719,7 @@
         "personal_space_description": "Et privat område for å organisere rommene dine",
         "private_description": "Kun for inviterte, best for deg selv eller team",
         "private_heading": "Ditt private område",
+        "private_only_heading": "Ditt område",
         "private_personal_description": "Sørg for at de riktige personene har tilgang til %(name)s",
         "private_personal_heading": "Hvem jobber du med?",
         "private_space": "Meg og mine teammedlemmer",
@@ -786,6 +787,7 @@
             "cross_signing_status": "Status for krysssignering:",
             "cross_signing_untrusted": "Kontoen din har en krysssigneringsidentitet i hemmelig lagring, men den er ennå ikke klarert av denne sesjonen.",
             "crypto_not_available": "Kryptografisk modul er ikke tilgjengelig",
+            "device_id": "Enhets-ID",
             "key_backup_active_version": "Aktiv sikkerhetskopiversion:",
             "key_backup_active_version_none": "Ingen",
             "key_backup_inactive_warning": "Nøklene dine blir ikke sikkerhetskopiert fra denne sesjonen.",
@@ -798,11 +800,24 @@
             "secret_storage_ready": "klar",
             "secret_storage_status": "Hemmelig lagringsplass:",
             "self_signing_private_key_cached_status": "Selvsignert privat nøkkel:",
+            "session": "Sesjon",
+            "session_fingerprint": "Fingeravtrykk (sesjonsnøkkel)",
             "title": "Ende-til-ende-kryptering",
             "user_signing_private_key_cached_status": "Brukersignert privat nøkkel:"
         },
         "developer_mode": "Utviklermodus",
         "developer_tools": "Utviklerverktøy",
+        "device_dehydrated_no": "Dehydrert: Nei",
+        "device_dehydrated_yes": "Dehydrert: Ja",
+        "device_id": "Enhets-ID: %(deviceId)s",
+        "device_keys": "Enhetsnøkler",
+        "device_verification_status": {
+            "signed_by_owner": "Verifiseringsstatus: <E2EIcon /> Signert av eier",
+            "unknown": "Verifiseringsstatus: Ukjent",
+            "unverified": "Verifiseringsstatus: <E2EIcon /> Ikke signert av eieren",
+            "verified": "Verifiseringsstatus: <E2EIcon /> Verifisert ved krysssignering"
+        },
+        "devices": "Kryptografiske enheter (%(count)s)",
         "edit_setting": "Rediger innstilling",
         "edit_values": "Rediger verdier",
         "empty_string": "<empty string>",
@@ -823,11 +838,14 @@
         "low_bandwidth_mode": "Lav båndbreddemodus",
         "low_bandwidth_mode_description": "Krever kompatibel hjemmeserver.",
         "main_timeline": "Hovedtidslinje",
+        "manual_device_verification": "Manuell enhetsverifisering",
         "no_receipt_found": "Ingen kvittering funnet",
         "notification_state": "Varslingsstatus er <strong>%(notificationState)s</strong>",
         "notifications_debug": "Feilsøking av varsler",
         "number_of_users": "Antall brukere",
+        "only_joined_members": "Kun registrerte brukere",
         "original_event_source": "Opprinnelig hendelseskilde",
+        "restore_from_backup": "Gjenopprett fra sikkerhetskopi",
         "room_encrypted": "Rommet er <strong> kryptert ✅ </strong>",
         "room_id": "Rom-ID: %(roomId)s",
         "room_not_encrypted": "Rommet er <strong>ikke kryptert 🚨</strong>",
@@ -860,6 +878,7 @@
             "elementCallUrl": "Element Call URL"
         },
         "settings_explorer": "Utforsker for innstillinger",
+        "show_empty_content_events": "Vis hendelser med tomt innhold",
         "show_hidden_events": "Vis skjulte hendelser i tidslinjen",
         "spaces": {
             "one": "<space>",
@@ -872,10 +891,23 @@
         "toggle_event": "slå av/på hendelse",
         "toolbox": "Verktøykasse",
         "use_at_own_risk": "Dette brukergrensesnittet kontrollerer IKKE verditypene. Bruk på egen risiko.",
+        "user_avatar": "Avatar: %(avatar)s",
+        "user_displayname": "Visningsnavn: %(displayname)s",
+        "user_id": "Bruker-ID: %(userId)s",
+        "user_no_avatar": "Avatar: <i>Ingen</i>",
+        "user_no_displayname": "Visningsnavn: <i>Ingen</i>",
         "user_read_up_to": "Brukeren har lest opp til: ",
         "user_read_up_to_ignore_synthetic": "Bruker leste opp til (ignoreSynthetic): ",
         "user_read_up_to_private": "Bruker leste opp til (m.read.private): ",
         "user_read_up_to_private_ignore_synthetic": "Bruker leste opp til (m.read.private; ignoreSyntetisk): ",
+        "user_room_membership": "Medlemskap: %(membership)s",
+        "user_verification_status": {
+            "identity_changed": "Verifiseringsstatus: <E2EIcon /> Uverifisert, og identiteten er endret",
+            "unverified": "Verifiseringsstatus: <E2EIcon /> Uverifisert",
+            "verified": "Verifiseringsstatus: <E2EIcon /> Verifisert",
+            "was_verified": "Verifiseringsstatus: <E2EIcon /> Har vært verifisert, men identiteten er endret"
+        },
+        "users": "Brukere",
         "value": "Verdi",
         "value_colon": "Verdi:",
         "value_in_this_room": "Verdi i dette rommet",
@@ -917,11 +949,10 @@
             },
             "privacy_warning": "Sørg for at ingen kan se denne skjermen!",
             "restoring": "Gjenoppretter nøkler fra sikkerhetskopi",
-            "security_key_title": "Gjenopprettingsnøkkel"
+            "security_key_label": "Gjenopprettingsnøkkel",
+            "security_key_title": "Skriv inn din gjenopprettingsnøkkel"
         },
         "bootstrap_title": "Setter opp nøkler",
-        "cancel_entering_passphrase_description": "Er du sikker på at du vil avbryte inntasting av passordfrase?",
-        "cancel_entering_passphrase_title": "Avbryte inntastingen av passordfrase?",
         "confirm_encryption_setup_body": "Klikk på knappen nedenfor for å bekrefte konfigureringen av kryptering.",
         "confirm_encryption_setup_title": "Bekreft krypteringsoppsett",
         "cross_signing_room_normal": "Dette rommet er ende-til-ende-kryptert",
@@ -932,6 +963,7 @@
         "cross_signing_user_warning": "Denne brukeren har ikke bekreftet alle sesjonene sine.",
         "enter_recovery_key": "Skriv inn gjenopprettingsnøkkel",
         "event_shield_reason_authenticity_not_guaranteed": "Autentisiteten av denne krypterte meldingen kan ikke garanteres på denne enheten.",
+        "event_shield_reason_mismatched_sender": "Avsenderen av hendelsen samsvarer ikke med eieren av enheten som sendte den.",
         "event_shield_reason_mismatched_sender_key": "Kryptert av en uverifisert sesjon",
         "event_shield_reason_unknown_device": "Kryptert av en ukjent eller slettet enhet.",
         "event_shield_reason_unsigned_device": "Kryptert med en enhet som ikke er verifisert av eieren.",
@@ -964,11 +996,8 @@
             "title": "Gjenopprettingsmetode fjernet",
             "warning": "Hvis det ikke var deg som fjernet gjenopprettingsmetoden, kan det være en hacker som prøver å få tilgang til kontoen din. Bytt passordet for kontoen din og angi en ny gjenopprettingsmetode øyeblikkelig i Innstillinger."
         },
-        "reset_all_button": "Glemt eller mistet alle gjenopprettingsmetoder?<a> Tilbakestill alt</a>",
         "set_up_recovery": "Sett opp gjenoppretting",
-        "set_up_recovery_later": "Ikke nå",
         "set_up_recovery_toast_description": "Generer en gjenopprettingsnøkkel som kan brukes til å gjenopprette den krypterte meldingshistorikken i tilfelle du mister tilgangen til enhetene dine.",
-        "set_up_toast_description": "Sikre deg mot å miste tilgang til krypterte meldinger og data",
         "set_up_toast_title": "Sett opp sikker sikkerhetskopiering",
         "setup_secure_backup": {
             "explainer": "Ta sikkerhetskopi av nøklene dine før du logger av for å unngå å miste dem."
@@ -989,16 +1018,17 @@
             "after_new_login": {
                 "device_verified": "Enhet verifisert",
                 "skip_verification": "Hopp over verifisering for nå",
-                "unable_to_verify": "Kan ikke verifisere denne enheten",
                 "verify_this_device": "Verifiser denne enheten"
             },
-            "cancelled": "Du avbrøt verifiseringen.",
-            "cancelled_self": "Du avbrøt verifikasjonen på din andre enheten.",
-            "cancelled_user": "%(displayName)s avbrøt verifikasjonen.",
+            "cancelled_verification": "Enten gikk forespørselen ut på tid, ble forespørselen avslått, eller var det en uoverensstemmelse i verifiseringen.",
             "cancelling": "Avbryter …",
+            "cant_confirm": "Kan du ikke bekrefte?",
             "complete_action": "Skjønner",
             "complete_description": "Du har vellykket verifisert denne brukeren.",
             "complete_title": "Verifisert!",
+            "confirm_identity_description": "Verifiser denne enheten for å konfigurere sikker meldingsutveksling",
+            "confirm_identity_title": "Bekreft identiteten din",
+            "confirm_the_emojis": "Bekreft at emojiene nedenfor samsvarer med de som vises på den andre enheten din.",
             "error_starting_description": "Vi kunne ikke starte en chat med den andre brukeren.",
             "error_starting_title": "Feil ved start av bekreftelse",
             "explainer": "Sikre meldinger med denne brukeren er ende-til-ende-kryptert og kan ikke leses av tredjeparter.",
@@ -1009,58 +1039,72 @@
             "incoming_sas_dialog_waiting": "Venter på at partneren skal bekrefte...",
             "incoming_sas_user_dialog_text_1": "Bekreft denne brukeren for å markere dem som klarerte. Tillit til brukere gir deg ekstra trygghet når du bruker ende-til-ende-krypterte meldinger.",
             "incoming_sas_user_dialog_text_2": "Bekreftelse av denne brukeren vil markere økten som klarert, og også merke økten din som klarert for dem.",
-            "no_key_or_device": "Det ser ut til at du ikke har en gjenopprettingsnøkkel eller andre enheter du kan verifisere mot.  Denne enheten vil ikke kunne få tilgang til gamle krypterte meldinger. For å bekrefte identiteten din på denne enheten, må du tilbakestille verifiseringsnøklene dine.",
+            "manual": {
+                "already_verified": "Denne enheten er allerede verifisert",
+                "already_verified_and_wrong_fingerprint": "Det medfølgende fingeravtrykket stemmer ikke overens, men enheten er allerede verifisert!",
+                "device_id": "Enhets-ID",
+                "failure_description": "Kunne ikke verifisere '%(deviceId)s': %(error)s",
+                "failure_title": "Verifisering mislyktes",
+                "fingerprint": "Fingeravtrykk (sesjonsnøkkel)",
+                "no_crypto": "Kan ikke verifisere enheten - krypto er ikke aktivert",
+                "no_device": "Kunne ikke verifisere enheten - enheten '%(deviceId)s' ble ikke funnet",
+                "no_userid": "Kan ikke verifisere enheten - finner ikke bruker-ID",
+                "success_description": "Enheten (%(deviceId)s) er nå krysssignert",
+                "success_title": "Verifiseringen var vellykket",
+                "text": "Oppgi ID-en og fingeravtrykket til en av dine egne enheter for å verifisere det. MERK at dette lar den andre enheten sende og motta meldinger som deg. HVIS NOEN HAR FORTALT DEG BARE Å LIME INN NOE HER, ER DET SANNSYNLIGVIS AT DU BLIR SVINDLET!",
+                "wrong_fingerprint": "Kan ikke verifisere enheten %(deviceId)s &#39;- det medfølgende fingeravtrykket&#39;%(fingerprint)s «samsvarer ikke med enhetens fingeravtrykk»%(fprint)s &#39;"
+            },
             "no_support_qr_emoji": "Enheten du prøver å bekrefte støtter ikke skanning av en QR-kode eller emoji-verifikasjon, som er det som %(brand)s støtter. Prøv med en annen klient.",
+            "now_you_can": "Nå kan du lese eller sende meldinger på en sikker måte, og alle du chatter med kan også stole på denne enheten.",
+            "once_accepted_can_continue": "Når du er godkjent, kan du fortsette med verifiseringen.",
             "other_party_cancelled": "Den andre parten kansellerte verifiseringen.",
             "prompt_encrypted": "Bekreft alle brukere i et rom for å sikre at det er sikkert.",
-            "prompt_self": "Start verfisering igjen fra varselet.",
             "prompt_unencrypted": "Bekreft alle brukere i krypterte rom for å sikre at det er sikkert.",
-            "prompt_user": "Start bekreftelsen igjen fra profilen deres.",
             "qr_or_sas": "%(qrCode)s eller %(emojiCompare)s",
-            "qr_or_sas_header": "Verifiser denne enheten ved å fullføre ett av følgende:",
             "qr_prompt": "Skann denne unike koden",
-            "qr_reciprocate_same_shield_device": "Nesten der! Viser den andre enheten det samme skjoldet?",
+            "qr_reciprocate_check_again_device": "Sjekk igjen på den andre enheten din for å fullføre verifiseringen.",
+            "qr_reciprocate_no": "Nei, jeg ser ikke et grønt skjold.",
             "qr_reciprocate_same_shield_user": "Nesten der! Viser %(displayName)s det samme skjoldet?",
-            "request_toast_accept": "Verifiser sesjonen",
+            "qr_reciprocate_yes": "Ja, jeg ser et grønt skjold.",
             "request_toast_accept_user": "Verifiser bruker",
             "request_toast_decline_counter": "Ignorer (%(counter)s)",
             "request_toast_detail": "%(deviceId)s fra %(ip)s",
-            "reset_proceed_prompt": "Fortsett med tilbakestilling",
+            "request_toast_start_verification": "Start verifisering",
             "sas_caption_self": "Bekreft denne enheten ved å bekrefte at følgende nummer vises på skjermen.",
             "sas_caption_user": "Bekreft denne brukeren ved å bekrefte at følgende nummer vises på skjermen.",
             "sas_description": "Sammenlign et unikt sett med emojier hvis du ikke har et kamera på noen av enhetene",
-            "sas_emoji_caption_self": "Bekreft at emojiene nedenfor vises på begge enhetene, i samme rekkefølge:",
             "sas_emoji_caption_user": "Bekreft denne brukeren ved å bekrefte at følgende emoji vises på skjermen.",
             "sas_match": "De samsvarer",
             "sas_no_match": "De samsvarer ikke",
             "sas_prompt": "Sammenlign unike emojier",
             "scan_qr": "Verifiser med skanning",
             "scan_qr_explainer": "Be %(displayName)s om å skanne koden:",
-            "self_verification_hint": "For å fortsette, godta bekreftelsesforespørselen på den andre enheten din.",
             "start_button": "Begynn verifisering",
-            "successful_device": "Du har vellykket verifisert %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "Du har vellykket verifisert enheten din!",
             "successful_user": "Du har vellykket verifisert %(displayName)s!",
-            "timed_out": "Bekreftelsen ble tidsavbrutt.",
             "unsupported_method": "Kan ikke finne en støttet bekreftelsesmetode.",
             "unverified_session_toast_accept": "Ja, det var meg",
             "unverified_session_toast_title": "En ny pålogging. Var det deg?",
             "unverified_sessions_toast_description": "Se gjennom for å sikre at kontoen din er trygg",
             "unverified_sessions_toast_reject": "Senere",
             "unverified_sessions_toast_title": "Du har ubekreftede økter",
-            "verification_description": "Bekreft identiteten din for å få tilgang til krypterte meldinger og bevise identiteten din for andre.",
+            "use_another_device": "Bruk en annen enhet",
+            "use_recovery_key": "Bruk gjenopprettingsnøkkel",
+            "verification_dialog_title_choose": "Velg hvordan du vil verifisere",
+            "verification_dialog_title_compare_emojis": "Sammenlign emojier",
+            "verification_dialog_title_confirm_green_shield": "Bekreft at du ser et grønt skjold på den andre enheten din.",
             "verification_dialog_title_device": "Bekreft annen enhet",
+            "verification_dialog_title_failed": "Verifiseringen mislyktes",
+            "verification_dialog_title_start_on_other_device": "Start verifiseringen på den andre enheten",
             "verification_dialog_title_user": "Verifiseringsforespørsel",
+            "verification_dialog_title_verified": "Enhet verifisert",
             "verification_skip_warning": "Uten verifisering vil du ikke ha tilgang til alle meldingene dine, og du kan fremstå som upålitelig for andre.",
             "verification_success_with_backup": "Den nye enheten din er nå bekreftet. Den har tilgang til dine krypterte meldinger, og andre brukere vil se det som klarert.",
             "verification_success_without_backup": "Den nye enheten din er nå bekreftet. Andre brukere vil se det som pålitelig.",
+            "verify_by_completing_one_of": "Verifiser ved å fullføre ett av følgende:",
             "verify_emoji": "Verifiser med emoji",
             "verify_emoji_prompt": "Bekreft ved å sammenligne unike emoji.",
             "verify_emoji_prompt_qr": "Hvis du ikke kan skanne koden ovenfor, bekreft ved å sammenligne unike emoji.",
             "verify_later": "Jeg bekrefter senere",
-            "verify_using_device": "Bekreft med en annen enhet",
-            "verify_using_key": "Bekreft med gjenopprettingsnøkkel",
-            "verify_using_key_or_phrase": "Bekreft med gjenopprettingsnøkkel eller -frase",
             "waiting_for_user_accept": "Venter på at %(displayName)s skal akseptere …",
             "waiting_other_device": "Venter på at du skal bekrefte på den andre enheten din...",
             "waiting_other_device_details": "Venter på at du skal bekrefte på den andre enheten din, %(deviceName)s (%(deviceId)s)...",
@@ -1110,6 +1154,7 @@
         "tls": "Kan ikke koble til hjemmeserveren - sjekk tilkoblingen din, sørg for at <a> hjemmeserverens SSL-sertifikat </a> er klarert, og at en nettleserutvidelse ikke blokkerer forespørsler.",
         "unknown": "Ukjent feil",
         "unknown_error_code": "ukjent feilkode",
+        "update_history_visibility": "Kunne ikke endre historikksynligheten",
         "update_power_level": "Kan ikke endre tilgangsnivå"
     },
     "error_app_open_in_another_tab": "Bytt til den andre fanen for å koble til %(brand)s . Denne fanen kan nå lukkes.",
@@ -1350,6 +1395,10 @@
         "name_email_mxid_share_space": "Inviter noen ved å bruke navn, e-postadresse, brukernavn (lik <userId/>) eller <a> del dette området</a>.",
         "name_mxid_share_room": "Inviter noen ved å bruke navnet, brukernavnet (som <userId/>) eller <a>del dette rommet</a>.",
         "name_mxid_share_space": "Inviter noen ved å bruke navnet sitt, brukernavnet (lik <userId/>) eller <a> dele dette området</a>.",
+        "progress": {
+            "dont_close": "Ikke lukk appen før den er ferdig.",
+            "preparing": "Forbereder invitasjoner..."
+        },
         "recents_section": "Nylige samtaler",
         "room_failed_partial": "Vi sendte de andre, men folkene nedenfor kunne ikke inviteres til <RoomName/>",
         "room_failed_partial_title": "Noen invitasjoner kunne ikke sendes",
@@ -1436,6 +1485,7 @@
         "room_list_navigate_down": "Naviger ned i romlisten",
         "room_list_navigate_up": "Naviger opp i romlisten",
         "room_list_select_room": "Velg rom fra romlisten",
+        "save": "Lagre",
         "scroll_down_timeline": "Rull ned i tidslinjen",
         "scroll_up_timeline": "Rull opp i tidslinjen",
         "search": "Søk (må være aktivert)",
@@ -1452,7 +1502,6 @@
         "upload_file": "Last opp en fil"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Tillat modus for bare skjermdeling",
         "ask_to_join": "Aktiver be om å bli med",
         "automatic_debug_logs": "Send automatisk feilsøkingslogger ved eventuelle feil",
         "automatic_debug_logs_decryption": "Send automatisk feilsøkingslogger ved dekrypteringsfeil",
@@ -1517,6 +1566,9 @@
         "render_reaction_images_description": "Noen ganger omtalt som \"egendefinerte emojier\".",
         "report_to_moderators": "Rapporter til moderatorene",
         "report_to_moderators_description": "I rom som støtter moderering, kan du bruke \"Rapporter\"-knappen for å rapportere misbruk til rommoderatorene.",
+        "share_history_on_invite": "Del kryptert historikk med nye medlemmer",
+        "share_history_on_invite_description": "Når du inviterer en bruker til et kryptert rom som har historikkvisibilitet satt til «delt», deler du kryptert historikk med den brukeren, og aksepterer kryptert historikk når du blir invitert til et slikt rom.",
+        "share_history_on_invite_warning": "Denne funksjonen er EKSPERIMENTELL, og ikke alle sikkerhetstiltak er implementert. Ikke aktiver på produksjonskontoer.",
         "sliding_sync": "Sliding Sync modus",
         "sliding_sync_description": "Under aktiv utvikling, kan ikke deaktiveres.",
         "sliding_sync_disabled_notice": "Logg ut og inn igjen for å deaktivere",
@@ -1638,8 +1690,8 @@
         "filter_placeholder": "Filtrer rommets medlemmer",
         "invite_button_no_perms_tooltip": "Du har ikke tillatelse til å invitere brukere",
         "invited_label": "Invitert",
-        "no_matches": "Ingen treff",
-        "power_label": "%(userName)s (styrkenivå %(powerLevelNumber)s)"
+        "list_title": "Medlemsliste",
+        "no_matches": "Ingen treff"
     },
     "member_list_back_action_label": "Medlemmer av rommet",
     "message_edit_dialog_title": "Meldingsredigeringer",
@@ -1710,6 +1762,7 @@
         "end_message": "Avstemningen er avsluttet. Topp svar: %(topAnswer)s",
         "end_message_no_votes": "Avstemningen er avsluttet. Ingen stemmer ble avgitt.",
         "end_title": "Avslutt avstemning",
+        "ended_poll_label": "Avstemningen er avsluttet",
         "error_ending_description": "Beklager, avstemningen ble ikke avsluttet. Prøv igjen.",
         "error_ending_title": "Kunne ikke avslutte avstemningen",
         "error_voting_description": "Beklager, stemmen din ble ikke registrert. Prøv igjen.",
@@ -1717,10 +1770,20 @@
         "failed_send_poll_description": "Beklager, avstemningen du prøvde å opprette ble ikke lagt ut.",
         "failed_send_poll_title": "Kunne ikke legge ut avstemningen",
         "notes": "Resultatene avsløres først når du avslutter avstemningen",
+        "option_label": "Alternativ %(number)s, %(answer)s",
+        "option_label_winning_with_total": {
+            "one": "Alternativ %(number)s, %(answer)s, vinnende alternativ, %(count)s stemme",
+            "other": "Alternativ %(number)s, %(answer)s, vinnende alternativ, %(count)s stemmer"
+        },
+        "option_label_with_total": {
+            "one": "Alternativ %(number)s, %(answer)s, %(count)s stemme",
+            "other": "Alternativ %(number)s, %(answer)s, %(count)s stemmer"
+        },
         "options_add_button": "Legg til alternativ",
         "options_heading": "Opprett alternativer",
         "options_label": "Alternativ %(number)s",
         "options_placeholder": "Skriv et alternativ",
+        "poll_label": "Avstemning",
         "topic_heading": "Hva er avstemningsspørsmålet eller emnet ditt?",
         "topic_label": "Spørsmål eller emne",
         "topic_placeholder": "Skriv noe...",
@@ -1743,6 +1806,7 @@
     },
     "power_level": {
         "admin": "Administrator",
+        "creator": "Eier",
         "custom": "Egendefinert (%(level)s)",
         "custom_level": "Tilpasset nivå",
         "default": "Standard",
@@ -1851,11 +1915,6 @@
                 "other": "Du kan bare feste opptil %(count)s widgets"
             },
             "menu": "Åpne meny",
-            "release_announcement": {
-                "close": "Ok",
-                "description": "Her finner du alle festede meldinger. Hold musepekeren over en melding og velg \"Fest\" for å legge den til.",
-                "title": "Alle nye festede meldinger"
-            },
             "reply_thread": "Svar på en <link> trådmelding </link>",
             "unpin_all": {
                 "button": "Løsne alle meldinger",
@@ -1957,6 +2016,7 @@
         },
         "face_pile_tooltip_shortcut": "Inkludert %(commaSeparatedMembers)s",
         "face_pile_tooltip_shortcut_joined": "Inkludert deg, %(commaSeparatedMembers)s",
+        "failed_determine_user": "Kan ikke avgjøre hvilken bruker som skal ignoreres siden medlemshendelsen har endret seg.",
         "failed_reject_invite": "Kunne ikke avvise invitasjonen",
         "forget_room": "Glem dette rommet",
         "forget_space": "Glem dette området",
@@ -1975,7 +2035,9 @@
         "inaccessible_subtitle_1": "Prøv igjen senere, eller be en områdeadministrator om å sjekke om du har tilgang.",
         "inaccessible_subtitle_2": "%(errcode)s ble returnert mens du prøvde å få tilgang til rommet eller området. Hvis du tror du ser denne meldingen ved en feil, kan du <issueLink>sende inn en feilrapport</issueLink>.",
         "intro": {
+            "display_topic": "Emne: <topic/>",
             "dm_caption": "Bare dere to er i denne samtalen, med mindre noen av dere inviterer noen til å bli med.",
+            "edit_topic": "Emne: <topic/> (<a>rediger</a>)",
             "enable_encryption_prompt": "Aktiver kryptering i innstillinger.",
             "encrypted_3pid_dm_pending_join": "Når alle har blitt med, vil du kunne chatte",
             "no_avatar_label": "Legg til et bilde så folk lettere kan finne rommet ditt.",
@@ -1985,8 +2047,6 @@
             "send_message_start_dm": "Send din første melding for å invitere <displayName/> til chat",
             "start_of_dm_history": "Dette er begynnelsen på direktemeldingshistorikken din med <displayName/>.",
             "start_of_room": "Dette er starten på <roomName/>.",
-            "topic": "Emne: %(topic)s ",
-            "topic_edit": "Emne: %(topic)s (<a>rediger</a>)",
             "unencrypted_warning": "Ende-til-ende-kryptering er ikke aktivert",
             "user_created": "%(displayName)s opprettet dette rommet.",
             "you_created": "Du opprettet dette rommet."
@@ -2041,13 +2101,16 @@
         "pinned_message_banner": {
             "button_close_list": "Lukk liste",
             "button_view_all": "Vis alle",
-            "description": "Dette rommet har festede meldinger. Klikk for å se dem.",
-            "go_to_message": "Vis den festede meldingen i tidslinjen.",
+            "description": "Festede meldinger",
+            "go_to_newest_message": "Se den festede meldingen i tidslinjen og den nyeste festede meldingen her",
+            "go_to_next_message": "Se den festede meldingen i tidslinjen og den nest eldste festede meldingen her",
             "title": "<bold>%(index)s av %(length)s</bold> festede meldinger"
         },
         "read_topic": "Klikk for å lese emnet",
         "rejecting": "Avviser invitasjon...",
         "rejoin_button": "Bli med igjen",
+        "room_content": "Rominnhold",
+        "room_is_low_priority": "Dette er et lavt prioritert rom",
         "search": {
             "all_rooms_button": "Søk i alle rom",
             "placeholder": "Søk i meldinger...",
@@ -2060,6 +2123,7 @@
         "status_bar": {
             "delete_all": "Slett alle",
             "exceeded_resource_limit": "Meldingen din ble ikke sendt fordi denne hjemmeserveren har overskredet en ressursgrense. Ta <a> kontakt med tjenesteadministratoren din </a> for å fortsette å bruke tjenesten.",
+            "history_visible": "Dette rommet er konfigurert slik at nye medlemmer kan lese historikken. <a>Lær mer</a>",
             "homeserver_blocked": "Meldingen din ble ikke sendt fordi denne hjemmeserveren er blokkert av administratoren. Ta <a> kontakt med tjenesteadministratoren din </a> for å fortsette å bruke tjenesten.",
             "monthly_user_limit_reached": "Meldingen din ble ikke sendt fordi denne hjemmeserveren har nådd sin månedlige aktive brukergrense. Ta <a> kontakt med tjenesteadministratoren din </a> for å fortsette å bruke tjenesten.",
             "requires_consent_agreement": "Du kan ikke sende noen meldinger før du har lest gjennom og godtar <consentLink>våre vilkår og betingelser</consentLink>.",
@@ -2094,9 +2158,9 @@
     "room_list": {
         "add_room_label": "Legg til et rom",
         "add_space_label": "Legg til område",
-        "appearance": "Utseende",
         "breadcrumbs_empty": "Ingen nylig besøkte rom",
         "breadcrumbs_label": "Nylig besøkte rom",
+        "collapse_filters": "Skjul filterlisten",
         "empty": {
             "no_chats": "Ingen chatter ennå",
             "no_chats_description": "Kom i gang ved å sende meldinger til noen eller ved å opprette et rom",
@@ -2104,6 +2168,7 @@
             "no_favourites": "Du har ikke favorittchat ennå",
             "no_favourites_description": "Du kan legge til en chat til dine favoritter i chat-innstillingene",
             "no_invites": "Du har ingen uleste invitasjoner",
+            "no_lowpriority": "Du har ingen rom med lav prioritet",
             "no_mentions": "Du har ingen uleste omtaler",
             "no_people": "Du har ikke direkte chatter med noen ennå",
             "no_people_description": "Du kan fjerne merket for filtre for å se de andre chattene dine",
@@ -2113,12 +2178,14 @@
             "show_activity": "Se alle aktiviteter",
             "show_chats": "Vis alle chatter"
         },
+        "expand_filters": "Utvid filterlisten",
         "failed_add_tag": "Kunne ikke legge til tagg %(tagName)s til rom",
         "failed_remove_tag": "Kunne ikke fjerne tagg %(tagName)s fra rommet",
         "failed_set_dm_tag": "Kan ikke sette kode på direktemeldingen",
         "filters": {
             "favourite": "Favoritter",
             "invites": "Invitasjoner",
+            "low_priority": "Lav prioritet",
             "mentions": "Omtaler",
             "people": "Personer",
             "rooms": "Rom",
@@ -2152,7 +2219,6 @@
         },
         "room_options": "Rominnstillinger",
         "show_less": "Vis mindre",
-        "show_message_previews": "Aktiver forhåndsvisning av meldinger",
         "show_n_more": {
             "Vis %(count)s til": "Vis %(count)s mer"
         },
@@ -2258,6 +2324,8 @@
             "no_aliases_space": "Dette området har ingen lokale adresser",
             "other_section": "Andre",
             "publish_toggle": "Vil du publisere dette rommet til offentligheten i %(domain)s sitt rom-arkiv?",
+            "publish_warn_invite_only": "Du kan ikke publisere et rom som kun er tilgjengelig for inviterte.",
+            "publish_warn_no_canonical_permission": "Du må ha tillatelse til å angi hovedadressen for å publisere dette rommet.",
             "published_aliases_description": "For å publisere en adresse, må den angis som en lokal adresse først.",
             "published_aliases_explainer_room": "Publiserte adresser kan brukes av alle, på hvilken som helst server, for å bli med i rommet ditt.",
             "published_aliases_explainer_space": "Publiserte adresser kan brukes av hvem som helst på hvilken som helst server for å bli med i ditt område.",
@@ -2335,6 +2403,10 @@
             "users_default": "Forvalgt rolle"
         },
         "security": {
+            "cannot_change_to_private_due_to_missing_history_visiblity_permissions": {
+                "description": "Du har ikke tillatelse til å endre synligheten av historikken for rommet. Dette er farlig, da det kan gjøre det mulig for brukere som ikke er med i rommet å lese meldinger.",
+                "title": "Kan ikke gjøre rommet privat"
+            },
             "enable_encryption_confirm_description": "Når kryptering for et rom er aktivert, kan den ikke deaktiveres. Meldinger som sendes i et kryptert rom, kan ikke ses av serveren, bare av deltakerne i rommet. Aktivering av kryptering kan hindre mange boter og broer i å fungere korrekt. <a>Finn ut mer om kryptering.</a>",
             "enable_encryption_confirm_title": "Vil du skru på kryptering?",
             "enable_encryption_public_room_confirm_description_1": "<b>Det anbefales ikke å legge til kryptering i offentlige rom. </b>Alle kan finne og bli med i offentlige rom, slik at alle kan lese meldinger i dem. Du får ingen av fordelene med kryptering, og du vil ikke kunne slå den av senere. Kryptering av meldinger i et offentlig rom vil gjøre mottak og sending av meldinger tregere.",
@@ -2395,6 +2467,7 @@
                 "other": "Oppdaterer områder... (%(progress)s out of %(count)s)"
             },
             "join_rule_upgrade_upgrading_room": "Oppgraderer rom",
+            "join_rule_world_readable_description": "Hvis du endrer hvem som kan bli med i rommet, vil det også endre synligheten til fremtidige meldinger.",
             "public_without_alias_warning": "For å lenke til dette rommet, vennligst legg til en adresse.",
             "publish_room": "Gjør dette rommet synlig i katalogen for offentlige rom.",
             "publish_space": "Gjør dette området synlig i katalogen for offentlige rom.",
@@ -2408,11 +2481,12 @@
             "error_failed_save": "Kan ikke oppdatere synligheten til dette området",
             "error_update_guest_access": "Kunne ikke oppdatere gjestetilgangen til dette området",
             "error_update_history_visibility": "Kunne ikke oppdatere historikkens synlighet for dette området",
-            "guest_access_explainer": "Gjester kan bli med i et område uten å ha en konto.",
-            "guest_access_explainer_public_space": "Dette kan være nyttig for offentlige områder.",
+            "guest_access_disabled": "Du har ikke tillatelse til å endre gjestetilgang.",
+            "guest_access_explainer": "Gjester kan delta i et rom uten å ha en konto. Dette kan være nyttig for offentlige rom.",
             "guest_access_label": "Aktiver gjestetilgang",
             "history_visibility_anyone_space": "Forhåndsvisning av områder",
             "history_visibility_anyone_space_description": "La folk få en forhåndsvisning av området ditt før de blir med.",
+            "history_visibility_anyone_space_disabled": "Du har ikke tillatelse til å endre historikkens synlighet.",
             "history_visibility_anyone_space_recommendation": "Anbefales for offentlige områder.",
             "title": "Synlighet"
         },
@@ -2533,6 +2607,7 @@
                 "breadcrumb_second_description": "Du mister all meldingshistorikk som bare er lagret på serveren",
                 "breadcrumb_third_description": "Du må bekrefte alle eksisterende enheter og kontakter på nytt",
                 "breadcrumb_title": "Er du sikker på at du vil tilbakestille identiteten din?",
+                "breadcrumb_title_cant_confirm": "Du må tilbakestille identiteten din",
                 "breadcrumb_title_forgot": "Har du glemt gjenopprettingsnøkkelen din? Du må tilbakestille identiteten din.",
                 "breadcrumb_title_sync_failed": "Kunne ikke synkronisere nøkkellageret. Du må tilbakestille identiteten din.",
                 "breadcrumb_warning": "Gjør dette bare hvis du tror at kontoen din har blitt kompromittert.",
@@ -2540,7 +2615,7 @@
                 "do_not_close_warning": "Ikke lukk dette vinduet før tilbakestillingen er fullført",
                 "export_keys": "Eksporter nøkler",
                 "import_keys": "Importer nøkler",
-                "other_people_device_description": "Advarsel: Brukere som ikke eksplisitt har verifisert med deg (f.eks. ved hjelp av emoji) vil ikke motta dine krypterte meldinger. Ubekreftede enheter av bekreftede brukere vil heller ikke motta krypterte meldinger.",
+                "other_people_device_description": "Advarsel: brukere som ikke har bekreftet deg eksplisitt (f.eks. ved hjelp av emoji), vil ikke motta dine krypterte meldinger. Ubekreftede enheter til bekreftede brukere vil heller ikke motta dine krypterte meldinger. Endringene krever at programmet startes på nytt for at de skal tre i kraft.",
                 "other_people_device_label": "I krypterte rom, send kun meldinger til verifiserte brukere",
                 "other_people_device_title": "Andre personers enheter",
                 "reset_identity": "Tilbakestill kryptografisk identitet",
@@ -2609,6 +2684,7 @@
             "allow_spellcheck": "Tillat stavekontroll",
             "application_language": "Applikasjonsspråk",
             "application_language_reload_hint": "Appen lastes inn på nytt etter å ha valgt et annet språk",
+            "avatar_open_menu": "Åpne avatarmenyen",
             "avatar_remove_progress": "Fjerner bilde...",
             "avatar_save_progress": "Laster opp bilde...",
             "avatar_upload_error_text": "Filformatet støttes ikke, eller bildet er større enn %(size)s.",
@@ -2686,13 +2762,11 @@
         "inline_url_previews_room": "Skru på URL-forhåndsvisninger som standard for deltakerne i dette rommet",
         "inline_url_previews_room_account": "Skru på URL-forhåndsvisninger for dette rommet (Påvirker bare deg)",
         "insert_trailing_colon_mentions": "Sett inn et etterfølgende kolon etter at brukeromtaler i starten av en melding",
+        "invite_controls": {
+            "default_label": "Tillat brukere å invitere deg til rom"
+        },
         "jump_to_bottom_on_send": "Gå til bunnen av tidslinjen når du vil sende en melding",
         "key_backup": {
-            "backup_in_progress": "Nøklene dine blir sikkerhetskopiert (den første sikkerhetskopieringen kan ta noen minutter).",
-            "backup_starting": "Starter sikkerhetskopiering...",
-            "backup_success": "Suksess!",
-            "cannot_create_backup": "Kan ikke opprette sikkerhetskopiering av nøkler",
-            "create_title": "Opprett nøkkelsikkerhetskopi",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Nøklene dine blir nå sikkerhetskopiert fra denne enheten.",
                 "backup_setup_success_title": "Sikker sikkerhetskopiering vellykket",
@@ -2752,6 +2826,7 @@
             "show_in_private": "I private rom",
             "show_media": "Vis alltid"
         },
+        "not_supported": "Serveren din implementerer ikke denne funksjonen.",
         "notifications": {
             "default_setting_description": "Denne innstillingen vil bli brukt som standard for alle rommene dine.",
             "default_setting_section": "Jeg ønsker å bli varslet for (standardinnstilling)",
@@ -2809,6 +2884,7 @@
             "voip": "Lyd- og videosamtaler"
         },
         "preferences": {
+            "Electron.enableContentProtection": "Forhindre at innholdet i vinduet fanges opp av andre apper",
             "Electron.enableHardwareAcceleration": "Aktiver maskinvareakselerasjon (start %(appName)s på nytt for at det skal tre i kraft)",
             "always_show_menu_bar": "Vis alltid vinduets menylinje",
             "autocomplete_delay": "Autofullføringsforsinkelse (ms)",
@@ -2817,6 +2893,7 @@
             "composer_heading": "Komposør",
             "default_timezone": "Nettleserens standard (%(timezone)s)",
             "dialog_title": "<strong>Innstillinger:</strong> Preferanser",
+            "enable_content_protection": "Aktiver innholdsbeskyttelse",
             "enable_hardware_acceleration": "Aktiver maskinvareakselerasjon",
             "enable_tray_icon": "Vis skuffikonet og minimer vinduet til det når det lukkes",
             "keyboard_heading": "Tastatursnarveier",
@@ -2830,6 +2907,7 @@
             "room_list_heading": "Romliste",
             "show_avatars_pills": "Vis avatarer i bruker-, rom- og hendelsesomtaler",
             "show_polls_button": "Vis avstemninger-knapp",
+            "startup_window_behaviour_label": "Oppstart og vindusatferd",
             "surround_text": "Omgi valgt tekst når du skriver spesialtegn",
             "time_heading": "Viser tid",
             "user_timezone": "Angi tidssone"
@@ -2850,7 +2928,6 @@
             "ignore_users_empty": "Du har ingen ignorerte brukere.",
             "ignore_users_section": "Ignorerte brukere",
             "key_backup_algorithm": "Algoritme:",
-            "key_backup_connect": "Koble denne økten til hoved Backup",
             "message_search_disable_warning": "Hvis deaktivert, vises ikke meldinger fra krypterte rom i søkeresultatene.",
             "message_search_disabled": "Bufre krypterte meldinger lokalt på en sikker måte, slik at de vises i søkeresultatene.",
             "message_search_enabled": {
@@ -2863,6 +2940,7 @@
             "message_search_indexing": "Indeksering for øyeblikket: %(currentRoom)s",
             "message_search_indexing_idle": "Indekserer for øyeblikket ikke meldinger for noen rom.",
             "message_search_intro": "%(brand)s bufrer krypterte meldinger lokalt på en sikker måte slik at de vises i søkeresultatene:",
+            "message_search_pending_rooms": "Rom som venter på indeksering: %(pendingRooms)s",
             "message_search_room_progress": "%(doneRooms)s av %(totalRooms)s",
             "message_search_section": "Meldingssøk",
             "message_search_sleep_time": "Hvor raskt skal meldinger lastes ned.",
@@ -2981,6 +3059,7 @@
         "show_chat_effects": "Vis chatteffekter (animasjoner når du mottar f.eks. konfetti)",
         "show_displayname_changes": "Vis visningsnavnendringer",
         "show_join_leave": "Vis bli med/forlat meldinger (invitasjoner/fjernede/utestengte upåvirket)",
+        "show_message_previews": "Vise forhåndsvisninger av meldinger",
         "show_nsfw_content": "Vis NSFW-innhold",
         "show_read_receipts": "Vis lesekvitteringer sendt av andre brukere",
         "show_redaction_placeholder": "Vis en stattholder for fjernede meldinger",
@@ -3003,7 +3082,12 @@
             "spaces_explainer": "Områder er måter å gruppere rom og mennesker på. Ved siden av områdene du er i, kan du også bruke noen forhåndsbygde.",
             "title": "Sidepanel"
         },
-        "start_automatically": "Start automatisk etter systempålogging",
+        "start_automatically": {
+            "disabled": "Nei",
+            "enabled": "Ja",
+            "label": "Åpne %(brand)s når du logger deg på datamaskinen din.",
+            "minimised": "Minimert"
+        },
         "tac_only_notifications": "Vis bare varsler i trådens aktivitetssenter",
         "use_12_hour_format": "Vis tidsstempler i 12-timersformat (f.eks. 2:30pm)",
         "use_command_enter_send_message": "Bruk Kommando + Enter for å sende en melding",
@@ -3087,6 +3171,8 @@
         "jumptodate": "Gå til den gitte datoen i tidslinjen",
         "jumptodate_invalid_input": "Vi klarte ikke å forstå den gitte datoen (%(inputDate)s). Prøv å bruke formatet ÅÅÅÅ-MM-DD.",
         "lenny": "Legger til ( ͡° ͜ʖ ͡°) foran en ren tekstmelding",
+        "manual_device_verification_confirm_description": "Dette vil tillate en annen enhet å sende og motta meldinger som deg. HVIS NOEN BA DEG LIME INN NOE HER, ER DET SANNSYNLIG AT DU BLIR LURT! Er du sikker på at du vil bekrefte denne andre enheten?",
+        "manual_device_verification_confirm_title": "Forsiktig: manuell enhetsverifisering",
         "me": "Viser handling",
         "msg": "Sender en melding til den angitte brukeren",
         "myavatar": "Endrer profilbildet ditt i alle rom",
@@ -3127,6 +3213,7 @@
         "upgraderoom": "Oppgraderer et rom til en ny versjon",
         "upgraderoom_permission_error": "Du har ikke de rette tilgangene til å bruke denne kommandoen.",
         "usage": "Bruk",
+        "verify": "Verifiser en av dine egne enheter manuelt",
         "view": "Viser rom med oppgitt adresse",
         "whois": "Viser informasjon om en bruker"
     },
@@ -3368,6 +3455,7 @@
             "unable_to_find": "Prøvde å laste inn et bestemt punkt i dette rommets tidslinje, men klarte ikke å finne det."
         },
         "m.audio": {
+            "audio_player": "Lydavspiller",
             "error_downloading_audio": "Feil ved nedlasting av lyd",
             "error_processing_audio": "Feil ved prosessering av lydmelding",
             "error_processing_voice_message": "Feil ved prosessering av talemelding",
@@ -3429,7 +3517,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Avsluttet en avstemning",
             "sender_ended": "%(senderName)s har avsluttet en avstemning"
         },
         "m.poll.start": "%(senderName)s har startet en avstemning - %(pollQuestion)s",
@@ -3925,12 +4012,12 @@
         "connection_lost": "Mistet forbindelsen til serveren",
         "connection_lost_description": "Du kan ikke ringe uten tilkobling til serveren.",
         "consulting": "Rådføring med %(transferTarget)s. <a>Overfør til %(transferee)s</a>",
+        "decline_call": "Avslå",
         "default_device": "Standardenhet",
         "dial": "Ring",
         "dialpad": "Nummerpanel",
         "disable_camera": "Stopp kameraet",
         "disable_microphone": "Demp mikrofonen",
-        "disabled_no_one_here": "Det er ingen her å ringe",
         "disabled_no_perms_start_video_call": "Du har ikke tillatelse til å starte videosamtaler",
         "disabled_no_perms_start_voice_call": "Du har ikke tillatelse til å starte taleanrop",
         "disabled_ongoing_call": "Pågående samtale",
@@ -3977,6 +4064,7 @@
         "show_sidebar_button": "Vis sidepanel",
         "silence": "Demp samtale",
         "silenced": "Varslinger er dempet",
+        "skip_lobby_toggle_option": "Bli med umiddelbart",
         "start_screenshare": "Begynn å dele skjermen din",
         "stop_screenshare": "Slutt å dele skjermen din",
         "too_many_calls": "For mange samtaler",
@@ -3997,9 +4085,12 @@
         "user_busy_description": "Brukeren du ringte er opptatt.",
         "user_is_presenting": "%(sharerName)s presenterer",
         "video_call": "Videosamtale",
+        "video_call_incoming": "Innkommende videosamtale",
         "video_call_started": "Videosamtale startet",
         "video_call_using": "Videosamtale ved hjelp av:",
         "voice_call": "Stemmesamtale",
+        "voice_call_incoming": "Innkommende taleanrop",
+        "voice_call_using": "Taleanrop ved hjelp av:",
         "you_are_presenting": "Du presenterer"
     },
     "web_default_device_name": "%(appName)s: %(browserName)s på %(osName)s",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index c8cfd1e8ba..723b8b3a6d 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -209,8 +209,7 @@
             "setup_key_backup_title": "Je zal de toegang tot je versleutelde berichten verliezen",
             "setup_secure_backup_description_1": "Versleutelde berichten zijn beveiligd met eind-tot-eind-versleuteling. Enkel de ontvanger(s) en jij hebben de sleutels om deze berichten te lezen.",
             "setup_secure_backup_description_2": "Wanneer je jezelf afmeldt, worden deze sleutels van dit apparaat verwijderd, wat betekent dat je geen versleutelde berichten kunt lezen, tenzij je de sleutels ervoor op je andere apparaten hebt of er een back-up van hebt gemaakt op de server.",
-            "skip_key_backup": "Ik wil mijn versleutelde berichten niet",
-            "use_key_backup": "Begin sleutelback-up te gebruiken"
+            "skip_key_backup": "Ik wil mijn versleutelde berichten niet"
         },
         "misconfigured_body": "Vraag jouw %(brand)s-beheerder <a>je configuratie</a> na te kijken op onjuiste of dubbele items.",
         "misconfigured_title": "Je %(brand)s is onjuist geconfigureerd",
@@ -491,7 +490,6 @@
         "user": "Gebruiker",
         "user_avatar": "Profielfoto",
         "username": "Inlognaam",
-        "verification_cancelled": "Verificatie geannuleerd",
         "verified": "Geverifieerd",
         "version": "Versie",
         "video": "Video",
@@ -699,8 +697,6 @@
             "security_key_title": "Veiligheidssleutel"
         },
         "bootstrap_title": "Sleutelconfiguratie",
-        "cancel_entering_passphrase_description": "Weet je zeker, dat je het invoeren van je wachtwoord wilt afbreken?",
-        "cancel_entering_passphrase_title": "Wachtwoord annuleren?",
         "confirm_encryption_setup_body": "Klik op de knop hieronder om het instellen van de versleuting te bevestigen.",
         "confirm_encryption_setup_title": "Bevestig versleuting instelling",
         "cross_signing_room_normal": "Deze kamer is eind-tot-eind-versleuteld",
@@ -734,8 +730,6 @@
             "title": "Herstelmethode verwijderd",
             "warning": "Als je de herstelmethode niet hebt verwijderd, is het mogelijk dat er een aanvaller toegang tot jouw account probeert te verkrijgen. Wijzig onmiddellijk je wachtwoord en stel bij instellingen een nieuwe herstelmethode in."
         },
-        "reset_all_button": "Alles vergeten en alle herstelmethoden verloren? <a>Alles opnieuw instellen</a>",
-        "set_up_toast_description": "Beveiliging tegen verlies van toegang tot versleutelde berichten en gegevens",
         "set_up_toast_title": "Beveiligde back-up instellen",
         "setup_secure_backup": {
             "explainer": "Maak een back-up van je sleutels voordat je jezelf afmeldt om ze niet te verliezen."
@@ -754,12 +748,8 @@
             "after_new_login": {
                 "device_verified": "Apparaat geverifieerd",
                 "skip_verification": "Verificatie voorlopig overslaan",
-                "unable_to_verify": "Kan dit apparaat niet verifiëren",
                 "verify_this_device": "Verifieer dit apparaat"
             },
-            "cancelled": "Je hebt de verificatie geannuleerd.",
-            "cancelled_self": "Je hebt de verificatie geannuleerd op het andere apparaat.",
-            "cancelled_user": "%(displayName)s heeft de verificatie geannuleerd.",
             "cancelling": "Bezig met annuleren…",
             "complete_action": "Ik snap het",
             "complete_description": "Je hebt deze persoon geverifieerd.",
@@ -771,40 +761,28 @@
             "incoming_sas_dialog_title": "Inkomend verificatieverzoek",
             "incoming_sas_user_dialog_text_1": "Verifieer deze persoon om als vertrouwd te markeren. Personen vertrouwen geeft je extra zekerheid bij het gebruik van eind-tot-eind-versleutelde berichten.",
             "incoming_sas_user_dialog_text_2": "Deze persoon verifiëren zal de sessie als vertrouwd markeren voor jullie beide.",
-            "no_key_or_device": "Het lijkt erop dat je geen veiligheidssleutel hebt of andere apparaten waarmee je kunt verifiëren.  Dit apparaat heeft geen toegang tot oude versleutelde berichten. Om je identiteit op dit apparaat te verifiëren, moet je jouw verificatiesleutels opnieuw instellen.",
             "no_support_qr_emoji": "Het apparaat dat je probeert te verifiëren ondersteund niet de door %(brand)s ondersteunde methodes: scannen van een QR-code of emoji verificatie. Probeer het met een andere app.",
             "other_party_cancelled": "De tegenpartij heeft de verificatie geannuleerd.",
             "prompt_encrypted": "Controleer alle personen in een kamer om er zeker van te zijn dat het veilig is.",
-            "prompt_self": "Verificatie opnieuw beginnen vanuit de melding.",
             "prompt_unencrypted": "Controleer alle personen in versleutelde kamers om er zeker van te zijn dat het veilig is.",
-            "prompt_user": "Begin verificatie opnieuw vanaf hun profiel.",
             "qr_or_sas": "%(qrCode)s of %(emojiCompare)s",
-            "qr_or_sas_header": "Verifieer dit apparaat door een van onderstaande methodes af te ronden:",
             "qr_prompt": "Scan deze unieke code",
-            "qr_reciprocate_same_shield_device": "Je bent er bijna! Toont het andere apparaat hetzelfde schild?",
             "qr_reciprocate_same_shield_user": "Bijna klaar! Toont %(displayName)s hetzelfde schild?",
             "request_toast_detail": "%(deviceId)s van %(ip)s",
-            "reset_proceed_prompt": "Met reset doorgaan",
             "sas_caption_self": "Verifieer dit apparaat door te bevestigen dat het volgende nummer zichtbaar is op het scherm.",
             "sas_caption_user": "Verifieer deze persoon door te bevestigen dat hun scherm het volgende getal toont.",
             "sas_description": "Vergelijk een unieke lijst met emoji als geen van beide apparaten een camera heeft",
-            "sas_emoji_caption_self": "Bevestig dat de onderstaande emoji zichtbaar zijn op beide apparaten en in dezelfde volgorde:",
             "sas_emoji_caption_user": "Verifieer deze persoon door te bevestigen dat hun scherm de volgende emoji toont.",
             "sas_match": "Ze komen overeen",
             "sas_no_match": "Ze komen niet overeen",
             "sas_prompt": "Vergelijk unieke emoji",
             "scan_qr": "Verifiëren met scan",
             "scan_qr_explainer": "Vraag %(displayName)s om jouw code te scannen:",
-            "self_verification_hint": "Om door te gaan, accepteer het verificatie verzoek op je andere apparaat.",
             "start_button": "Verificatie beginnen",
-            "successful_device": "Je hebt %(deviceName)s (%(deviceId)s) geverifieerd!",
-            "successful_own_device": "Je hebt je apparaat geverifieerd!",
             "successful_user": "Je hebt %(displayName)s geverifieerd!",
-            "timed_out": "Verificatie verlopen.",
             "unsupported_method": "Kan geen ondersteunde verificatiemethode vinden.",
             "unverified_session_toast_title": "Nieuwe login gevonden. Was jij dat?",
             "unverified_sessions_toast_description": "Controleer ze zodat jouw account veilig is",
-            "verification_description": "Verifeer je identiteit om toegang te krijgen tot je versleutelde berichten en om je identiteit te bewijzen voor anderen.",
             "verification_dialog_title_device": "Verifieer ander apparaat",
             "verification_dialog_title_user": "Verificatieverzoek",
             "verification_skip_warning": "Zonder verifiëren heb je geen toegang tot al je berichten en kan je als onvertrouwd aangemerkt staan bij anderen.",
@@ -814,9 +792,6 @@
             "verify_emoji_prompt": "Verifieer door unieke emoji te vergelijken.",
             "verify_emoji_prompt_qr": "Als je bovenstaande code niet kan scannen, verifieer dan door unieke emoji te vergelijken.",
             "verify_later": "Ik verifieer het later",
-            "verify_using_device": "Verifieer met andere apparaat",
-            "verify_using_key": "Verifieer met veiligheidssleutel",
-            "verify_using_key_or_phrase": "Verifieer met veiligheidssleutel of -wachtwoord",
             "waiting_for_user_accept": "Wachten tot %(displayName)s aanvaardt…",
             "waiting_other_device": "Wachten op je verificatie op het andere apparaat…",
             "waiting_other_device_details": "Wachten op je verificatie op het andere apparaat, %(deviceName)s (%(deviceId)s)…",
@@ -1260,8 +1235,7 @@
         "toggle_attribution": "Attributie in-/uitschakelen"
     },
     "member_list": {
-        "filter_placeholder": "Kamerleden filteren",
-        "power_label": "%(userName)s (macht %(powerLevelNumber)s)"
+        "filter_placeholder": "Kamerleden filteren"
     },
     "member_list_back_action_label": "Kamerleden",
     "message_edit_dialog_title": "Berichtbewerkingen",
@@ -1508,8 +1482,6 @@
             "send_message_start_dm": "Stuur je eerste bericht om <displayName/> uit te nodigen om te chatten",
             "start_of_dm_history": "Dit is het begin van je direct gesprek met <displayName/>.",
             "start_of_room": "Dit is het begin van <roomName/>.",
-            "topic": "Onderwerp: %(topic)s ",
-            "topic_edit": "Onderwerp: %(topic)s (<a>bewerken</a>)",
             "unencrypted_warning": "Eind-tot-eind-versleuteling is uitgeschakeld",
             "user_created": "%(displayName)s heeft deze kamer aangemaakt.",
             "you_created": "Jij hebt deze kamer gemaakt."
@@ -1827,7 +1799,6 @@
             "error_update_guest_access": "Het bijwerken van de gastentoegang van deze space is niet gelukt",
             "error_update_history_visibility": "Het bijwerken van de geschiedenis leesbaarheid voor deze space is mislukt",
             "guest_access_explainer": "Gasten kunnen deelnemen aan een space zonder een account.",
-            "guest_access_explainer_public_space": "Dit kan nuttig zijn voor publieke spaces.",
             "guest_access_label": "Gastentoegang inschakelen",
             "history_visibility_anyone_space": "Space voorvertoning",
             "history_visibility_anyone_space_description": "Personen toestaan een voorvertoning van jouw space te zien voor deelname.",
@@ -1981,10 +1952,6 @@
         "insert_trailing_colon_mentions": "Voeg een dubbele punt in nadat de persoon het aan het begin van een bericht heeft vermeld",
         "jump_to_bottom_on_send": "Naar de onderkant van de tijdlijn springen wanneer je een bericht verstuurd",
         "key_backup": {
-            "backup_in_progress": "Er wordt een back-up van je sleutels gemaakt (de eerste back-up kan enkele minuten duren).",
-            "backup_success": "Klaar!",
-            "cannot_create_backup": "Kan sleutelback-up niet aanmaken",
-            "create_title": "Sleutelback-up aanmaken",
             "setup_secure_backup": {
                 "cancel_warning": "Als je nu annuleert, kan je versleutelde berichten en gegevens verliezen als je geen toegang meer hebt tot je login.",
                 "confirm_security_phrase": "Bevestig je veiligheidswachtwoord",
@@ -2084,7 +2051,6 @@
             "ignore_users_empty": "Je hebt geen persoon genegeerd.",
             "ignore_users_section": "Genegeerde personen",
             "key_backup_algorithm": "Algoritme:",
-            "key_backup_connect": "Verbind deze sessie met de sleutelback-up",
             "message_search_disable_warning": "Dit moet aan staan om te kunnen zoeken in versleutelde kamers.",
             "message_search_disabled": "Sla versleutelde berichten veilig lokaal op om ze doorzoekbaar te maken.",
             "message_search_enabled": {
@@ -2203,7 +2169,6 @@
             "metaspaces_subsection": "Spaces om te tonen",
             "title": "Zijbalk"
         },
-        "start_automatically": "Automatisch starten na systeemlogin",
         "use_12_hour_format": "Tijd in 12-uursformaat tonen (bv. 2:30pm)",
         "use_command_enter_send_message": "Gebruik Command (⌘) + Enter om een bericht te sturen",
         "use_command_f_search": "Gebruik Command + F om te zoeken in de tijdlijn",
@@ -2301,6 +2266,7 @@
         "upgraderoom": "Upgrade deze kamer naar een nieuwere versie",
         "upgraderoom_permission_error": "Je beschikt niet over de vereiste machtigingen om deze opdracht uit te voeren.",
         "usage": "Gebruik",
+        "verify": "Verifieert de combinatie van persoon, sessie en publieke sleutel",
         "whois": "Geeft informatie weer over een persoon"
     },
     "space": {
@@ -3021,7 +2987,6 @@
         "dialpad": "Toetsen",
         "disable_camera": "Camera uitschakelen",
         "disable_microphone": "Microfoon dempen",
-        "disabled_no_one_here": "Er is hier niemand om te bellen",
         "disabled_no_perms_start_video_call": "U heeft geen toestemming om videogesprekken te starten",
         "disabled_no_perms_start_voice_call": "U heeft geen toestemming om spraakoproepen te starten",
         "disabled_ongoing_call": "Lopende oproep",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 42eb0de4af..53032886e3 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -12,7 +12,7 @@
             "one": "1 nieprzeczytana wzmianka."
         },
         "recent_rooms": "Ostatnie pokoje",
-        "room_messsage_not_sent": "Otwórz pokój %(roomName)s z niewysłaną wiadomością.",
+        "room_messsage_not_sent": "Otwórz pokój %(roomName)s z niewysłaną wiadomością.room",
         "room_n_unread_invite": "Otwórz zaproszenie pokoju %(roomName)s.",
         "room_n_unread_messages": {
             "one": "Otwórz pokój %(roomName)s z 1 nieprzeczytaną wiadomością.",
@@ -32,7 +32,7 @@
     },
     "a11y_jump_first_unread_room": "Przejdź do pierwszego nieprzeczytanego pokoju.",
     "action": {
-        "accept": "Akceptuj",
+        "accept": "Akceptuję",
         "add": "Dodaj",
         "add_existing_room": "Dodaj istniejący pokój",
         "add_people": "Dodaj osoby",
@@ -95,7 +95,6 @@
         "maximise": "Maksymalizuj",
         "mention": "Wzmianka",
         "minimise": "Minimalizuj",
-        "new_message": "Nowa wiadomość",
         "new_room": "Nowy pokój",
         "new_video_room": "Nowy pokój wideo",
         "next": "Dalej",
@@ -152,13 +151,14 @@
         "upgrade": "Ulepsz",
         "upload": "Prześlij",
         "upload_file": "Prześlij plik",
-        "verify": "Weryfikuj",
+        "verify": "Zweryfikuj",
         "view": "Wyświetl",
         "view_all": "Pokaż wszystkie",
         "view_list": "Wyświetl listę",
         "view_message": "Wyświetl wiadomość",
         "view_source": "Wyświetl źródło",
         "yes": "Tak",
+        "yes_dismiss": "Tak, odrzuć",
         "zoom_in": "Powiększ",
         "zoom_out": "Pomniejsz"
     },
@@ -241,12 +241,11 @@
             "setup_key_backup_title": "Utracisz dostęp do swoich wiadomości szyfrowanych",
             "setup_secure_backup_description_1": "Wiadomości szyfrowane są zabezpieczone szyfrowaniem end-to-end. Tylko Ty i Twój odbiorca mają klucze, aby je wyświetlić.",
             "setup_secure_backup_description_2": "Po wylogowaniu, te klucze zostaną usunięte z urządzenia, co oznacza, że nie będziesz w stanie czytać wiadomości szyfrowanych, chyba że posiadasz je na swoich innych urządzeniach lub zapisałeś je na serwerze.",
-            "skip_key_backup": "Nie chcę moich zaszyfrowanych wiadomości",
-            "use_key_backup": "Rozpocznij z użyciem klucza kopii zapasowej"
+            "skip_key_backup": "Nie chcę moich zaszyfrowanych wiadomości"
         },
         "misconfigured_body": "Poproś swojego administratora %(brand)s by sprawdzić <a>Twoją konfigurację</a> względem niewłaściwych lub zduplikowanych elementów.",
         "misconfigured_title": "Twój %(brand)s jest źle skonfigurowany",
-        "mobile_create_account_title": "Jesteś w trakcie tworzenia konta na %(hsName)s",
+        "mobile_create_account_title": "Zamierzasz utworzyć konto na%(hsName)s",
         "msisdn_field_description": "Inni użytkownicy mogą Cię zaprosić do pokoi za pomocą Twoich danych kontaktowych",
         "msisdn_field_label": "Telefon",
         "msisdn_field_number_invalid": "Ten numer telefonu nie wygląda dobrze, sprawdź go ponownie",
@@ -288,9 +287,9 @@
             "error_user_cancelled_title": "Żądanie logowania anulowane",
             "error_user_declined": "Ty lub Twój dostawca konta odrzucił żądanie logowania.",
             "error_user_declined_title": "Logowanie odrzucone",
-            "follow_remaining_instructions": "Postępuj zgodnie z instrukcjami",
-            "open_element_other_device": "Otwórz %(brand)s na swoim drugim urządzeniu",
-            "point_the_camera": "Skanuj przedstawiony kod QR",
+            "follow_remaining_instructions": "Postępuj zgodnie z pozostałymi instrukcjami, aby zweryfikować Twoje inne urządzenie",
+            "open_element_other_device": "Otwórz %(brand)s na innym urządzeniu",
+            "point_the_camera": "Skieruj kamerę na pokazany tutaj kod QR",
             "scan_code_instruction": "Skanuj kod QR za pomocą innego urządzenia",
             "scan_qr_code": "Zaloguj się kodem QR",
             "security_code": "Kod bezpieczeństwa",
@@ -356,7 +355,7 @@
         "set_email_prompt": "Czy chcesz ustawić adres e-mail?",
         "sign_in_description": "Użyj swojego konta, aby kontynuować.",
         "sign_in_instead": "Zamiast tego zaloguj się",
-        "sign_in_instead_prompt": "Masz już konto? <a>Zaloguj się tutaj</a>",
+        "sign_in_instead_prompt": "Masz już konto? <a>Zaloguj się tutaj </a>",
         "sign_in_or_register": "Zaloguj się lub utwórz konto",
         "sign_in_or_register_description": "Użyj konta lub utwórz nowe, aby kontynuować.",
         "sign_in_prompt": "Posiadasz już konto? <a>Zaloguj się</a>",
@@ -387,7 +386,7 @@
             "email_resent": "Wysłano ponownie!",
             "fallback_button": "Rozpocznij uwierzytelnienie",
             "mas_cross_signing_reset_cta": "Przejdź do swojego konta",
-            "mas_cross_signing_reset_description": "Zresetuj swoją tożsamość poprzez dostawcę swojego konta, wróć i kliknij „Ponów”.",
+            "mas_cross_signing_reset_description": "Zresetuj swoją tożsamość za pośrednictwem dostawcy konta, a następnie wróć i kliknij „Spróbuj ponownie”.",
             "mas_cross_signing_reset_title": "Przejdź do swojego konta, aby zresetować swoją tożsamość",
             "msisdn": "Wysłano wiadomość tekstową do %(msisdn)s",
             "msisdn_token_incorrect": "Niepoprawny token",
@@ -425,12 +424,12 @@
         "error_empty": "Powiedz nam, co poszło nie tak, lub nawet lepiej - utwórz zgłoszenie na platformie GitHub, które opisuje problem.",
         "failed_download_logs": "Nie udało się pobrać dzienników debugowania: ",
         "failed_send_logs_causes": {
-            "disallowed_app": "Twój raport o błędzie został odrzucony. Serwer gniewnego potrząśnięcia nie obsługuje tej aplikacji.",
-            "rejected_generic": "Twój raport o błędzie został odrzucony. Serwer gniewnego potrząśnięcia odrzucił zawartość zgłoszenia ze względu na jej politykę.",
-            "rejected_recovery_key": "Twój raport o błędzie został odrzucony ze względów bezpieczeństwa, ponieważ zawierał on klucz przywracania.",
-            "rejected_version": "Twój raport o błędzie został odrzucony, ponieważ wersja aplikacji jest zbyt stara.",
-            "server_unknown_error": "Serwer gniewnego potrząśnięcia napotkał nieznany błąd i nie mógł obsłużyć raportu.",
-            "unknown_error": "Nie udało się wysłać logów."
+            "disallowed_app": "Twój raport o błędzie został odrzucony. Serwer rageshake nie obsługuje tej aplikacji.",
+            "rejected_generic": "Twój raport o błędzie został odrzucony. Serwer rageshake odrzucił zawartość raportu z powodu polityki.",
+            "rejected_recovery_key": "Twój raport o błędzie został odrzucony ze względów bezpieczeństwa, ponieważ zawierał klucz odzyskiwania.",
+            "rejected_version": "Twój raport o błędzie został odrzucony, ponieważ uruchomiona wersja jest zbyt stara.",
+            "server_unknown_error": "Serwer rageshake napotkał nieznany błąd i nie mógł obsłużyć raportu.",
+            "unknown_error": "Nie udało się wysłać dzienników."
         },
         "github_issue": "Zgłoszenie GitHub",
         "introduction": "Jeśli zgłosiłeś błąd za pomocą serwisu GitHub, dzienniki debugowania mogą pomóc nam w namierzeniu problemu. ",
@@ -498,7 +497,7 @@
         "edited": "edytowane",
         "email_address": "Adres e-mail",
         "emoji": "Emoji",
-        "encrypted": "Szyfrowane",
+        "encrypted": "Szyfrowanie",
         "encryption_enabled": "Włączono szyfrowanie",
         "error": "Błąd",
         "faq": "Najczęściej zadawane pytania",
@@ -603,7 +602,6 @@
         "user": "Użytkownik",
         "user_avatar": "Obraz profilowy",
         "username": "Nazwa użytkownika",
-        "verification_cancelled": "Weryfikacja anulowana",
         "verified": "Zweryfikowane",
         "version": "Wersja",
         "video": "Wideo",
@@ -649,16 +647,17 @@
         "mode_plain": "Ukryj formatowanie",
         "mode_rich_text": "Pokaż formatowanie",
         "no_perms_notice": "Nie masz uprawnień do pisania w tym pokoju",
-        "placeholder": "Wyślij wiadomość…",
-        "placeholder_encrypted": "Wyślij zaszyfrowaną wiadomość…",
-        "placeholder_reply": "Wyślij odpowiedź…",
-        "placeholder_reply_encrypted": "Wyślij zaszyfrowaną odpowiedź…",
-        "placeholder_thread": "Odpowiedz do wątku…",
-        "placeholder_thread_encrypted": "Odpowiedz do wątku szyfrowanego…",
+        "placeholder": "Wyślij niezaszyfrowaną wiadomość…",
+        "placeholder_encrypted": "Wyślij wiadomość…",
+        "placeholder_reply": "Wyślij niezaszyfrowaną odpowiedź…",
+        "placeholder_reply_encrypted": "Wyślij odpowiedź…",
+        "placeholder_thread": "Odpowiedz na niezaszyfrowany wątek...",
+        "placeholder_thread_encrypted": "Odpowiedz na wątku",
         "poll_button": "Ankieta",
         "poll_button_no_perms_description": "Nie masz uprawnień do rozpoczęcia ankiety w tym pokoju",
         "poll_button_no_perms_title": "Wymagane Uprawnienia",
         "replying_title": "Odpowiadanie",
+        "room_unencrypted": "Wiadomości w tym pokoju nie są szyfrowane end-to-end.",
         "room_upgraded_link": "Konwersacja jest kontynuowana tutaj.",
         "room_upgraded_notice": "Ten pokój został zamieniony i nie jest już aktywny.",
         "send_button_title": "Wyślij wiadomość",
@@ -722,6 +721,7 @@
         "personal_space_description": "Prywatna przestrzeń do organizacji Twoich pokoi",
         "private_description": "Tylko na zaproszenie, najlepsza dla siebie lub zespołów",
         "private_heading": "Twoja prywatna przestrzeń",
+        "private_only_heading": "Twoja przestrzeń",
         "private_personal_description": "Upewnij się, że odpowiednie osoby mają dostęp do %(name)s",
         "private_personal_heading": "Z kim pracujesz?",
         "private_space": "Ja i moi koledzy z drużyny",
@@ -789,6 +789,7 @@
             "cross_signing_status": "Status weryfikacji krzyżowej:",
             "cross_signing_untrusted": "Twoje konto ma tożsamość weryfikacji krzyżowej w sekretnym magazynie, ale nie jest jeszcze zaufane przez tę sesję.",
             "crypto_not_available": "Moduł kryptograficzny nie jest dostępny",
+            "device_id": "ID urządzenia",
             "key_backup_active_version": "Aktywna wersja kopii zapasowej:",
             "key_backup_active_version_none": "Brak",
             "key_backup_inactive_warning": "Twoje klucze nie są przywracane na tej sesji.",
@@ -801,6 +802,8 @@
             "secret_storage_ready": "gotowe",
             "secret_storage_status": "Sekretny magazyn:",
             "self_signing_private_key_cached_status": "Samopodpisujący klucz prywatny:",
+            "session": "Sesja",
+            "session_fingerprint": "Odcisk palca (klucz sesji)",
             "title": "Szyfrowanie end-to-end",
             "user_signing_private_key_cached_status": "Podpisany przez użytkownika klucz prywatny:"
         },
@@ -826,6 +829,7 @@
         "low_bandwidth_mode": "Tryb niskiej przepustowości",
         "low_bandwidth_mode_description": "Wymaga kompatybilnego serwera domowego.",
         "main_timeline": "Główna oś czasu",
+        "manual_device_verification": "Ręczna weryfikacja urządzenia",
         "no_receipt_found": "Nie znaleziono potwierdzenia",
         "notification_state": "Status powiadomień <strong>%(notificationState)s</strong>",
         "notifications_debug": "Debug powiadomień",
@@ -864,6 +868,7 @@
             "elementCallUrl": "Adres URL Element Call"
         },
         "settings_explorer": "Eksplorator ustawień",
+        "show_empty_content_events": "Pokaż wydarzenia z pustą zawartością",
         "show_hidden_events": "Pokaż ukryte wydarzenia na linii czasowej",
         "spaces": {
             "one": "<space>",
@@ -916,15 +921,16 @@
     "empty_room_was_name": "Pusty pokój (poprzednio %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
+            "alternatives": "Możesz podać również klucz lub frazę bezpieczeństwa.",
             "key_validation_text": {
-                "wrong_security_key": "Błędny klucz przywracania"
+                "wrong_security_key": "Wprowadzony klucz przywracania nie jest poprawny."
             },
+            "privacy_warning": "Upewnij się, że nikt nie widzi tego ekranu!",
             "restoring": "Przywracanie kluczy z kopii zapasowej",
-            "security_key_title": "Klucz przywracania"
+            "security_key_label": "Klucz przywracania",
+            "security_key_title": "Wprowadź klucz przywracania"
         },
         "bootstrap_title": "Konfigurowanie kluczy",
-        "cancel_entering_passphrase_description": "Czy na pewno chcesz anulować wpisywanie hasła?",
-        "cancel_entering_passphrase_title": "Anulować wpisywanie hasła?",
         "confirm_encryption_setup_body": "Kliknij przycisk poniżej, aby potwierdzić ustawienie szyfrowania.",
         "confirm_encryption_setup_title": "Potwierdź ustawienie szyfrowania",
         "cross_signing_room_normal": "Ten pokój jest szyfrowany end-to-end",
@@ -935,6 +941,7 @@
         "cross_signing_user_warning": "Ten użytkownik nie zweryfikował wszystkich swoich sesji.",
         "enter_recovery_key": "Wprowadź klucz przywracania",
         "event_shield_reason_authenticity_not_guaranteed": "Autentyczność tej wiadomości szyfrowanej nie jest gwarantowana na tym urządzeniu.",
+        "event_shield_reason_mismatched_sender": "Nadawca zdarzenia nie pasuje do właściciela urządzenia, które je wysłał.",
         "event_shield_reason_mismatched_sender_key": "Zaszyfrowano przez sesję niezweryfikowaną",
         "event_shield_reason_unknown_device": "Zaszyfrowano przez nieznane lub usunięte urządzenie.",
         "event_shield_reason_unsigned_device": "Zaszyfrowano przez urządzenie niezweryfikowane przez właściciela.",
@@ -967,15 +974,14 @@
             "title": "Usunięto metodę odzyskiwania",
             "warning": "Jeśli nie usunąłeś metody odzyskiwania, atakujący może próbować dostać się na Twoje konto. Zmień hasło konta i natychmiast ustaw nową metodę odzyskiwania w Ustawieniach."
         },
-        "reset_all_button": "Zapomniałeś lub straciłeś wszystkie opcje odzyskiwania? <a>Resetuj wszystko</a>",
         "set_up_recovery": "Skonfiguruj przywracanie",
-        "set_up_recovery_later": "Nie teraz",
         "set_up_recovery_toast_description": "Wygeneruj klucz przywracania, którego można użyć do przywrócenia zaszyfrowanej historii wiadomości w przypadku utraty dostępu do swoich urządzeń.",
-        "set_up_toast_description": "Zabezpiecz się przed utratą dostępu do szyfrowanych wiadomości i danych",
         "set_up_toast_title": "Skonfiguruj bezpieczną kopię zapasową",
         "setup_secure_backup": {
             "explainer": "Utwórz kopię zapasową kluczy przed wylogowaniem, aby ich nie utracić."
         },
+        "turn_on_key_storage": "Włącz magazyn kluczy",
+        "turn_on_key_storage_description": "Bezpiecznie przechowuj swoją tożsamość kryptograficzną i klucze wiadomości na serwerze. Umożliwi to przeglądanie historii wiadomości na każdym nowym urządzeniu.",
         "udd": {
             "interactive_verification_button": "Zweryfikuj interaktywnie za pomocą emoji",
             "other_ask_verify_text": "Poproś go/ją o zweryfikowanie tej sesji bądź zweryfikuj ją osobiście poniżej.",
@@ -990,16 +996,17 @@
             "after_new_login": {
                 "device_verified": "Urządzenie zweryfikowane",
                 "skip_verification": "Pomiń weryfikację na razie",
-                "unable_to_verify": "Nie można zweryfikować tego urządzenia",
                 "verify_this_device": "Zweryfikuj to urządzenie"
             },
-            "cancelled": "Anulowałeś weryfikację.",
-            "cancelled_self": "Anulowałeś weryfikację na swoim drugim urządzeniu.",
-            "cancelled_user": "%(displayName)s anulował weryfikację.",
+            "cancelled_verification": "Albo upłynął limit czasu oczekiwania, żądanie zostało odrzucone, albo wystąpiła niezgodność w trakcie weryfikacji.",
             "cancelling": "Anulowanie…",
+            "cant_confirm": "Nie możesz potwierdzić?",
             "complete_action": "Zrobione",
             "complete_description": "Pomyślnie zweryfikowałeś tego użytkownika.",
             "complete_title": "Zweryfikowano!",
+            "confirm_identity_description": "Zweryfikuj to urządzenie, aby ustawić bezpieczną komunikację",
+            "confirm_identity_title": "Potwierdź swoją tożsamość",
+            "confirm_the_emojis": "Upewnij się, że emoji poniżej pasują do tych pokazanych na innej sesji.",
             "error_starting_description": "Nie byliśmy w stanie rozpocząć czatu z innym użytkownikiem.",
             "error_starting_title": "Wystąpił błąd w trakcie weryfikacji",
             "explainer": "Bezpieczne wiadomości z tym użytkownikiem są szyfrowane end-to-end i nie mogą zostać odczytane przez osoby trzecie.",
@@ -1010,58 +1017,72 @@
             "incoming_sas_dialog_waiting": "Oczekiwanie na potwierdzenie partnera…",
             "incoming_sas_user_dialog_text_1": "Zweryfikuj tego użytkownika, aby oznaczyć go jako zaufanego. Użytkownicy zaufani dodają większej pewności, gdy korzystasz z wiadomości szyfrowanych end-to-end.",
             "incoming_sas_user_dialog_text_2": "Weryfikacja tego użytkownika oznaczy Twoją i jego sesję jako zaufaną.",
-            "no_key_or_device": "Wygląda na to, że nie masz klucza przywracania ani żadnych innych urządzeń, które mogłyby zweryfikować Twoją tożsamość.  To urządzenie nie będzie mogło odczytać wcześniej zaszyfrowanych wiadomości. Aby zweryfikować swoją tożsamość na tym urządzeniu, musisz zresetować klucze weryfikacyjne.",
+            "manual": {
+                "already_verified": "To urządzenie zostało już zweryfikowane.",
+                "already_verified_and_wrong_fingerprint": "Podany odcinek palca nie pasuje, ale urządzenie zostało już zweryfikowane!",
+                "device_id": "ID urządzenia",
+                "failure_description": "Nie udało się zweryfikować '%(deviceId)s': %(error)s",
+                "failure_title": "Weryfikacja nie powiodła się",
+                "fingerprint": "Odcisk palca (klucz sesji)",
+                "no_crypto": "Nie można zweryfikować urządzenia - krypto nie jest włączone",
+                "no_device": "Nie można zweryfikować urządzenia - urządzenie '%(deviceId)s' nie zostało znalezione",
+                "no_userid": "Nie można zweryfikować urządzenia - nie udało się znaleźć ID użytkownika",
+                "success_description": "Urządzenie (%(deviceId)s) jest teraz podpisane krzyżowo",
+                "success_title": "Zweryfikowano pomyślnie",
+                "text": "Podaj ID i odcisk palca jednego ze swoich urządzeń, aby zweryfikować. UWAGA umożliwi to drugiemu urządzeniu wysyłanie i odbieranie wiadomości w Twoim imieniu. JEŚLI KTOŚ POWIEDZIAŁ CI, ŻEBYŚ COŚ TU WKLEIŁ, PRAWDOPODOBNIE JESTEŚ OSZUKIWANY!",
+                "wrong_fingerprint": "Nie można zweryfikować urządzenia '%(deviceId)s' - podany odcisk palca '%(fingerprint)s' nie pasuje do odcisku palca na urządzeniu, '%(fprint)s'"
+            },
             "no_support_qr_emoji": "Urządzenie, które próbujesz zweryfikować nie wspiera skanowania kodu QR lub weryfikacji emoji, czyli tego co obsługuje %(brand)s. Spróbuj użyć innego klienta.",
+            "now_you_can": "Teraz możesz bezpiecznie czytać i wysyłać wiadomości, a każdy z kim czatujesz również może ufać temu urządzeniu.",
+            "once_accepted_can_continue": "Po zaakceptowaniu będziesz mógł kontynuować weryfikację.",
             "other_party_cancelled": "Druga strona anulowała weryfikację.",
             "prompt_encrypted": "Zweryfikuj wszystkich użytkowników w pokoju, aby upewnić się, że jest bezpieczny.",
-            "prompt_self": "Rozpocznij weryfikację ponownie z powiadomienia.",
             "prompt_unencrypted": "W pokojach szyfrowanych, zweryfikuj wszystkich użytkowników, aby upewnić się, że są bezpieczne.",
-            "prompt_user": "Rozpocznij weryfikację ponownie z ich profilu.",
             "qr_or_sas": "%(qrCode)s lub %(emojiCompare)s",
-            "qr_or_sas_header": "Zweryfikuj to urządzenie wykonując jedno z następujących:",
             "qr_prompt": "Zeskanuj ten unikatowy kod",
-            "qr_reciprocate_same_shield_device": "Prawie gotowe! Czy drugie urządzenie pokazuje tę samą tarczę?",
+            "qr_reciprocate_check_again_device": "Sprawdź ponownie drugie urządzenie, aby zakończyć weryfikację.",
+            "qr_reciprocate_no": "Nie, nie widzę zielonej tarczy",
             "qr_reciprocate_same_shield_user": "Prawie gotowe! Czy %(displayName)s pokazuje tę samą tarczę?",
-            "request_toast_accept": "Zweryfikuj sesję",
-            "request_toast_accept_user": "Weryfikuj użytkownika",
+            "qr_reciprocate_yes": "Tak, widzę zieloną tarczę",
+            "request_toast_accept_user": "Zweryfikuj użytkownika",
             "request_toast_decline_counter": "Ignoruj (%(counter)s)",
             "request_toast_detail": "%(deviceId)s z %(ip)s",
-            "reset_proceed_prompt": "Zresetuj",
+            "request_toast_start_verification": "Rozpocznij weryfikację",
             "sas_caption_self": "Zweryfikuj to urządzenie, upewniając się że poniższy numer wyświetlony jest na jego ekranie.",
             "sas_caption_user": "Sprawdź tego użytkownika potwierdzając, że następujące liczby pojawiają się na ekranie rozmówcy.",
             "sas_description": "Porównaj unikatowy zestaw emoji, jeżeli nie masz aparatu na którymś z urządzeń",
-            "sas_emoji_caption_self": "Potwierdź że poniższe emotikony są wyświetlane na obu urządzeniach, w tej samej kolejności:",
             "sas_emoji_caption_user": "Sprawdź tego użytkownika potwierdzając, że następujące emotikony pojawiają się na ekranie rozmówcy.",
             "sas_match": "Pasują do siebie",
             "sas_no_match": "Nie pasują do siebie",
             "sas_prompt": "Porównaj unikatowe emoji",
             "scan_qr": "Zweryfikuj przez skanowanie",
             "scan_qr_explainer": "Poproś %(displayName)s, aby zeskanował Twój kod:",
-            "self_verification_hint": "Aby kontynuować, akceptuj żądanie weryfikacji na swoim drugim urządzeniu.",
             "start_button": "Rozpocznij weryfikację",
-            "successful_device": "Pomyślnie zweryfikowałeś %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "Pomyślnie zweryfikowano Twoje urządzenie!",
             "successful_user": "Pomyślnie zweryfikowałeś %(displayName)s!",
-            "timed_out": "Upłynął czas oczekiwania weryfikacji.",
             "unsupported_method": "Nie można znaleźć wspieranej metody weryfikacji.",
             "unverified_session_toast_accept": "Tak, to byłem ja",
             "unverified_session_toast_title": "Nowe logowanie. Czy to byłeś Ty?",
             "unverified_sessions_toast_description": "Sprawdź, by upewnić się że Twoje konto jest bezpieczne",
             "unverified_sessions_toast_reject": "Później",
             "unverified_sessions_toast_title": "Masz niezweryfikowane sesje",
-            "verification_description": "Zweryfikuj swoją tożsamość, aby uzyskać dostęp do wiadomości szyfrowanych i potwierdzić swoją tożsamość innym. Jeśli korzystasz z urządzenia mobilnego, otwórz na niej aplikację.",
+            "use_another_device": "Użyj innego urządzenia",
+            "use_recovery_key": "Użyj klucza przywracania",
+            "verification_dialog_title_choose": "Wybierz sposób weryfikacji",
+            "verification_dialog_title_compare_emojis": "Porównaj emoji",
+            "verification_dialog_title_confirm_green_shield": "Sprawdź, czy na drugim urządzeniu widzisz zieloną tarczę",
             "verification_dialog_title_device": "Zweryfikuj drugie urządzenie",
+            "verification_dialog_title_failed": "Weryfikacja nie powiodła się",
+            "verification_dialog_title_start_on_other_device": "Rozpocznij weryfikację na drugim urządzeniu",
             "verification_dialog_title_user": "Żądanie weryfikacji",
+            "verification_dialog_title_verified": "Urządzenie zweryfikowane",
             "verification_skip_warning": "Bez weryfikacji, nie będziesz posiadać dostępu do wszystkich swoich wiadomości, a inni będą Cię widzieć jako niezaufanego.",
             "verification_success_with_backup": "Twoje nowe urządzenie zostało zweryfikowane. Posiada dostęp do Twoich wiadomości szyfrowanych, a inni użytkownicy będą je widzieć jako zaufane.",
             "verification_success_without_backup": "Twoje nowe urządzenie zostało zweryfikowane. Inni użytkownicy będą je widzieć jako zaufane.",
+            "verify_by_completing_one_of": "Zweryfikuj, wykonując jedną z poniższych czynności:",
             "verify_emoji": "Zweryfikuj przez Emoji",
             "verify_emoji_prompt": "Zweryfikuj, porównując unikalne emotikony.",
             "verify_emoji_prompt_qr": "Jeśli nie jesteś w stanie skanować kodu powyżej, zweryfikuj porównując emoji.",
             "verify_later": "Zweryfikuję później",
-            "verify_using_device": "Zweryfikuj innym urządzeniem",
-            "verify_using_key": "Zweryfikuj kluczem przywracania",
-            "verify_using_key_or_phrase": "Zweryfikuj kluczem przywracania lub frazą",
             "waiting_for_user_accept": "Oczekiwanie na akceptację przez %(displayName)s…",
             "waiting_other_device": "Oczekiwanie na zweryfikowanie przez ciebie twojego innego urządzenia…",
             "waiting_other_device_details": "Oczekiwanie na zweryfikowanie przez ciebie twojego innego urządzenia, %(deviceName)s (%(deviceId)s)…",
@@ -1111,6 +1132,7 @@
         "tls": "Nie można nawiązać połączenia z serwerem - proszę sprawdź twoje połączenie, upewnij się, że <a>certyfikat SSL serwera</a> jest zaufany, i że dodatki przeglądarki nie blokują żądania.",
         "unknown": "Nieznany błąd",
         "unknown_error_code": "nieznany kod błędu",
+        "update_history_visibility": "Nie udało się zmienić widoczności historii",
         "update_power_level": "Nie udało się zmienić poziomu mocy"
     },
     "error_app_open_in_another_tab": "Zmień kartę aby połączyć się do %(brand)s. Ta karta może zostać zamknięta.",
@@ -1311,7 +1333,7 @@
         "error_connecting_heading": "Nie udało się połączyć z menedżerem integracji",
         "explainer": "Menedżerowie integracji otrzymują dane konfiguracyjne, przez co mogą modyfikować widżety, wysyłać zaproszenia i ustawiać uprawnienia w Twoim imieniu.",
         "manage_title": "Zarządzaj integracjami",
-        "toggle_label": "Włącz menedżer integracji",
+        "toggle_label": "Włącz menedżera integracji",
         "use_im": "Użyj menedżera integracji, aby zarządzać botami, widżetami i pakietami naklejek.",
         "use_im_default": "Użyj menedżera integracji <b>%(serverName)s</b>, aby zarządzać botami, widżetami i pakietami naklejek."
     },
@@ -1356,6 +1378,10 @@
         "name_email_mxid_share_space": "Zaproś kogoś za pomocą jego imienia, adresu e-mail, nazwy użytkownika (takiej jak <userId/>) lub <a>udostępnij tą przestrzeń</a>.",
         "name_mxid_share_room": "Zaproś kogoś za pomocą jego imienia, nazwy użytkownika (takiej jak <userId/>) lub <a>udostępnij ten pokój</a>.",
         "name_mxid_share_space": "Zaproś kogoś za pomocą jego imienia, nazwy użytkownika (takiej jak <userId/>) lub <a>udostępnij tą przestrzeń</a>.",
+        "progress": {
+            "dont_close": "Nie zamykaj aplikacji przed zakończeniem.",
+            "preparing": "Przygotowywanie zaproszeń..."
+        },
         "recents_section": "Najnowsze rozmowy",
         "room_failed_partial": "Wysłaliśmy pozostałym, ale osoby poniżej nie mogły zostać zaproszone do <RoomName/>",
         "room_failed_partial_title": "Niektóre zaproszenia nie mogły zostać wysłane",
@@ -1444,6 +1470,7 @@
         "room_list_navigate_down": "Przejdź w dół listy pokoi",
         "room_list_navigate_up": "Przejdź w górę listy pokoi",
         "room_list_select_room": "Wybierz pokój z listy pokojów",
+        "save": "Zapisz",
         "scroll_down_timeline": "Przewiń w dół na osi czasu",
         "scroll_up_timeline": "Przewiń w górę na osi czasu",
         "search": "Wyszukiwanie (musi być włączone)",
@@ -1460,7 +1487,6 @@
         "upload_file": "Wyślij plik"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Zezwól na tryb wyłącznego udostępniania ekranu",
         "ask_to_join": "Włącz prośby o dołączenie",
         "automatic_debug_logs": "Automatycznie wysyłaj logi debugowania po wystąpieniu jakiegokolwiek błędu",
         "automatic_debug_logs_decryption": "Automatycznie wysyłaj logi debugowania po wystąpieniu błędów deszyfrowania",
@@ -1485,7 +1511,7 @@
         "exclude_insecure_devices_description": "Gdy ten tryb jest włączony, wiadomości szyfrowane nie zostaną udostępnione niezweryfikowanym urządzeniom, a wiadomości odbierane od tych urządzeń wyświetlą błąd. Należy pamiętać, że jeśli włączysz ten tryb, możesz nie być w stanie komunikować się z użytkownikami, którzy nie zweryfikowali swoich urządzeń.",
         "experimental_description": "Chcesz poeksperymentować? Wypróbuj nasze najnowsze pomysły w trakcie rozwoju. Przedstawione funkcje nie zostały w pełni ukończone; mogą być niestabilne; mogą się zmienić lub zostać kompletnie porzucone. <a>Dowiedz się więcej</a>.",
         "experimental_section": "Wczesny podgląd",
-        "extended_profiles_msc_support": "Serwer musi wspierać MSC4133",
+        "extended_profiles_msc_support": "Wymaga, aby Twój serwer obsługiwał MSC4133",
         "feature_disable_call_per_sender_encryption": "Wyłącz szyfrowanie nadawcy dla Element Call",
         "feature_wysiwyg_composer_description": "Użyj bogatego edytora tekstu zamiast edytora Markdown podczas tworzenia wiadomości.",
         "group_calls": "Nowe wrażenia rozmów grupowych",
@@ -1525,6 +1551,9 @@
         "render_reaction_images_description": "Czasami określane jako \"emoji niestandardowe\".",
         "report_to_moderators": "Zgłoś do moderatorów",
         "report_to_moderators_description": "W pokojach, które wspierają moderacje, przycisk \"Zgłoś\" pozwoli Ci zgłosić nadużycia moderatorom.",
+        "share_history_on_invite": "Udostępnij zaszyfrowaną historię nowym członkom",
+        "share_history_on_invite_description": "Gdy zapraszasz użytkownika do zaszyfrowanego pokoju, w którym widoczność historii jest ustawiona na „udostępniona”, udostępnij historię wiadomości temu użytkownikowi lub zaakceptuj ją, gdy dołączysz do takiego pokoju.",
+        "share_history_on_invite_warning": "Ta funkcja jest EKSPERYMENTALNA i nie wszystkie środki bezpieczeństwa są w niej zaimplementowane. Nie włączaj na kontach produkcyjnych.",
         "sliding_sync": "Tryb synchronizacji przesuwanej",
         "sliding_sync_description": "W trakcie aktywnego rozwoju, nie można wyłączyć.",
         "sliding_sync_disabled_notice": "Zaloguj się ponownie, aby wyłączyć",
@@ -1580,8 +1609,8 @@
         "last_person_warning": "Jesteś jedyną osoba tutaj. Jeśli wyjdziesz, nikt nie będzie w stanie dołączyć w przyszłości, włączając Ciebie.",
         "leave_room_question": "Czy na pewno chcesz opuścić pokój '%(roomName)s'?",
         "leave_space_question": "Czy na pewno chcesz opuścić przestrzeń '%(spaceName)s'?",
-        "room_leave_admin_warning": "Jesteś jedynym administratorem w tym pokoju. Jeśli odejdziesz, nikt nie będzie mógł zmienić ustawień pokoju, ani podjąć innych ważnych działań.",
-        "room_leave_mod_warning": "Jesteś jedynym moderatorem w tym pokoju. Jeśli odejdziesz, nikt nie będzie mógł zmienić ustawień pokoju, ani podjąć innych ważnych działań.",
+        "room_leave_admin_warning": "Jesteś jedynym administratorem w tym pokoju. Jeśli odejdziesz, nikt nie będzie mógł zmienić ustawień pokoju ani podjąć innych ważnych działań.",
+        "room_leave_mod_warning": "Jesteś jedynym moderatorem w tym pokoju. Jeśli odejdziesz, nikt nie będzie mógł zmienić ustawień pokoju ani podjąć innych ważnych działań.",
         "room_rejoin_warning": "Ten pokój nie jest publiczny. Nie będziesz w stanie do niego dołączyć bez zaproszenia.",
         "space_rejoin_warning": "Ta przestrzeń nie jest publiczna. Nie będziesz w stanie dołączyć bez zaproszenia."
     },
@@ -1647,12 +1676,12 @@
         "filter_placeholder": "Filtruj członków pokoju",
         "invite_button_no_perms_tooltip": "Nie posiadasz uprawnień, aby zapraszać użytkowników",
         "invited_label": "Zaproszono",
-        "no_matches": "Brak wyników",
-        "power_label": "%(userName)s (moc uprawnień administratorskich %(powerLevelNumber)s)"
+        "list_title": "Lista członków",
+        "no_matches": "Brak wyników"
     },
     "member_list_back_action_label": "Członkowie pokoju",
     "message_edit_dialog_title": "Edycje wiadomości",
-    "migrating_crypto": "Trzymaj się mocno. Aktualizujemy %(brand)s, aby szyfrowanie było szybsze i bardziej niezawodne.",
+    "migrating_crypto": "Spokojnie. Aktualizujemy %(brand)s, aby szyfrowanie było szybsze i bardziej niezawodne.",
     "mobile_guide": {
         "toast_accept": "Użyj aplikacji",
         "toast_description": "%(brand)s jest eksperymentalne na przeglądarce mobilnej. Dla lepszego doświadczenia i najnowszych funkcji użyj naszej darmowej natywnej aplikacji.",
@@ -1752,6 +1781,7 @@
     },
     "power_level": {
         "admin": "Administrator",
+        "creator": "Właściciel",
         "custom": "Własny (%(level)s)",
         "custom_level": "Własny poziom",
         "default": "Domyślne",
@@ -1860,11 +1890,6 @@
                 "other": "Możesz przypiąć do %(count)s widżetów"
             },
             "menu": "Otwórz menu",
-            "release_announcement": {
-                "close": "Ok",
-                "description": "Wszystkie przypięte wiadomości są tutaj. Najedź na dowolną wiadomość i wybierz „Przypnij”, aby dodać.",
-                "title": "Wszystkie nowe przypięte wiadomości"
-            },
             "reply_thread": "Odpowiedz na <link>wiadomość w wątku</link>",
             "unpin_all": {
                 "button": "Odepnij wszystkie wiadomości",
@@ -1966,6 +1991,7 @@
         },
         "face_pile_tooltip_shortcut": "Włączając %(commaSeparatedMembers)s",
         "face_pile_tooltip_shortcut_joined": "Włączając Ciebie, %(commaSeparatedMembers)s",
+        "failed_determine_user": "Nie można określić, którego użytkownika należy zignorować, ponieważ jego wydarzenie uległo zmianie.",
         "failed_reject_invite": "Nie udało się odrzucić zaproszenia",
         "forget_room": "Zapomnij o tym pokoju",
         "forget_space": "Zapomnij tą przestrzeń",
@@ -1985,7 +2011,9 @@
         "inaccessible_subtitle_1": "Spróbuj ponownie później lub spytaj się administratora przestrzeni, aby sprawdził czy masz dostęp.",
         "inaccessible_subtitle_2": "Wystąpił błąd %(errcode)s podczas próby dostępu do pokoju lub przestrzeni. Jeśli widzisz tą wiadomość w błędzie, <issueLink>zgłoś ten błąd</issueLink>.",
         "intro": {
+            "display_topic": "Temat: <topic/>",
             "dm_caption": "Tylko Wy jesteście w tej konwersacji, dopóki ktoś z Was nie zaprosi tu innej osoby.",
+            "edit_topic": "Temat: <topic/> (<a>edytuj</a>)",
             "enable_encryption_prompt": "Włącz szyfrowanie w ustawieniach.",
             "encrypted_3pid_dm_pending_join": "Kiedy wszyscy dołączą, będziesz mógł rozmawiać",
             "no_avatar_label": "Dodaj zdjęcie, aby inni mogli łatwo zauważyć Twój pokój.",
@@ -1995,8 +2023,6 @@
             "send_message_start_dm": "Wyślij pierwszą wiadomość, aby zaprosić <displayName/> do rozmowy",
             "start_of_dm_history": "Oto początek Twojej historii wiadomości prywatnych z <displayName/>.",
             "start_of_room": "Oto początek <roomName/>.",
-            "topic": "Temat: %(topic)s ",
-            "topic_edit": "Temat: %(topic)s (<a>edytuj</a>)",
             "unencrypted_warning": "Szyfrowanie end-to-end nie jest włączone",
             "user_created": "%(displayName)s utworzył ten pokój.",
             "you_created": "Utworzyłeś ten pokój."
@@ -2051,13 +2077,16 @@
         "pinned_message_banner": {
             "button_close_list": "Zamknij listę",
             "button_view_all": "Pokaż wszystkie",
-            "description": "Ten pokój ma przypięte wiadomości. Kliknij, aby je wyświetlić.",
-            "go_to_message": "Wyświetl przypiętą wiadomość na osi czasu.",
+            "description": "Przypięte wiadomości",
+            "go_to_newest_message": "Zobacz przypiętą wiadomość na osi czasu i najnowszą przypiętą wiadomość tutaj",
+            "go_to_next_message": "Zobacz przypiętą wiadomość na osi czasu i najstarszą przypiętą wiadomość tutaj",
             "title": "<bold>%(index)s z %(length)s</bold> przypiętych wiadomości"
         },
         "read_topic": "Kliknij, aby przeczytać temat",
         "rejecting": "Odrzucanie zaproszenia…",
         "rejoin_button": "Dołącz ponownie",
+        "room_content": "Zawartość pokoju",
+        "room_is_low_priority": "To jest pokój o niskim priorytecie",
         "search": {
             "all_rooms_button": "Wyszukaj wszystkie pokoje",
             "placeholder": "Szukaj wiadomości...",
@@ -2105,27 +2134,35 @@
     "room_list": {
         "add_room_label": "Dodaj pokój",
         "add_space_label": "Dodaj przestrzeń",
-        "appearance": "Wygląd",
         "breadcrumbs_empty": "Brak ostatnio odwiedzonych pokojów",
         "breadcrumbs_label": "Ostatnio odwiedzane pokoje",
+        "collapse_filters": "Zwiń listę filtrów",
         "empty": {
             "no_chats": "Nie ma jeszcze czatów",
             "no_chats_description": "Zacznij od wysłania wiadomości lub utworzenia pokoju",
             "no_chats_description_no_room_rights": "Wyślij komuś wiadomość, aby rozpocząć.",
             "no_favourites": "Nie masz jeszcze ulubionego czatu",
             "no_favourites_description": "Dodaj czat do ulubionych w ustawieniach czatu",
+            "no_invites": "Nie masz żadnych nieprzeczytanych zaproszeń",
+            "no_lowpriority": "Nie masz pokoi o niskim priorytecie",
+            "no_mentions": "Nie masz żadnych nieprzeczytanych wzmianek",
             "no_people": "Nie prowadzisz jeszcze z nikim czatów prywatnych",
             "no_people_description": "Wyczyść filtry, aby zobaczyć pozostałe czaty",
             "no_rooms": "Nie jesteś jeszcze w żadnym pokoju",
             "no_rooms_description": "Wyczyść filtry, aby zobaczyć pozostałe czaty",
             "no_unread": "Brawo! Nie masz żadnych nieprzeczytanych wiadomości",
+            "show_activity": "Wyświetl całą aktywność",
             "show_chats": "Pokaż wszystkie czaty"
         },
+        "expand_filters": "Rozwiń listę filtrów",
         "failed_add_tag": "Nie można dodać tagu %(tagName)s do pokoju",
         "failed_remove_tag": "Nie udało się usunąć tagu %(tagName)s z pokoju",
         "failed_set_dm_tag": "Nie udało się ustawić tagu wiadomości prywatnych",
         "filters": {
             "favourite": "Ulubione",
+            "invites": "Zaproszenia",
+            "low_priority": "Niski priorytet",
+            "mentions": "Wzmianki",
             "people": "Osoby",
             "rooms": "Pokoje",
             "unread": "Nieprzeczytane"
@@ -2136,10 +2173,10 @@
             "one": "Aktualnie dołączanie do %(count)s pokoju",
             "other": "Aktualnie dołączanie do %(count)s pokoi"
         },
-        "list_title": "Lista pokoi",
+        "list_title": "Lista pokojów",
         "more_options": {
-            "copy_link": "Kopiuj link pokoju",
-            "favourited": "Ulubiony",
+            "copy_link": "Kopiuj link do pokoju",
+            "favourited": "Ulubione",
             "leave_room": "Opuść pokój",
             "low_priority": "Niski priorytet",
             "mark_read": "Oznacz jako przeczytane",
@@ -2147,18 +2184,17 @@
         },
         "notification_options": "Opcje powiadomień",
         "open_space_menu": "Otwórz menu przestrzeni",
-        "primary_filters": "Filtry listy pokoi",
+        "primary_filters": "Filtry listy pomieszczeń",
         "redacting_messages_status": {
             "one": "Aktualnie usuwanie wiadomości z %(count)s pokoju",
             "other": "Aktualnie usuwanie wiadomości z %(count)s pokoi"
         },
         "room": {
             "more_options": "Więcej opcji",
-            "open_room": "Pokój otwarty %(roomName)s"
+            "open_room": "Otwórz pokój %(roomName)s"
         },
         "room_options": "Opcje pokoju",
         "show_less": "Pokaż mniej",
-        "show_message_previews": "Pokaż podglądy wiadomości",
         "show_n_more": {
             "one": "Pokaż %(count)s więcej",
             "few": "Pokaż %(count)s więcej",
@@ -2175,8 +2211,8 @@
         },
         "sort_unread_first": "Pokazuj najpierw pokoje z nieprzeczytanymi wiadomościami",
         "space_menu": {
-            "home": "Główna przestrzeni",
-            "space_settings": "Ustawienia przestrzeni"
+            "home": "Główna Space",
+            "space_settings": "Ustawienia Space"
         },
         "space_menu_label": "menu %(spaceName)s",
         "sublist_options": "Ustawienia listy",
@@ -2343,6 +2379,10 @@
             "users_default": "Domyślna rola"
         },
         "security": {
+            "cannot_change_to_private_due_to_missing_history_visiblity_permissions": {
+                "description": "Nie masz uprawnień do zmiany widoczności historii pokoju. Jest to niebezpieczne, ponieważ niezaproszeni użytkownicy mogliby czytać historię wiadomości.",
+                "title": "Nie można ustawić pokoju jako prywatnego"
+            },
             "enable_encryption_confirm_description": "Po włączeniu, szyfrowania pokoju nie będzie się dało wyłączyć. Wiadomości wysłane w pokoju szyfrowanym nie mogą zostać odczytane przez serwer, tylko wyłącznie przez uczestników pokoju. Włączenie szyfrowania może uniemożliwić wielu botom i mostkom działanie. <a>Dowiedz się więcej o szyfrowaniu.</a>",
             "enable_encryption_confirm_title": "Włączyć szyfrowanie?",
             "enable_encryption_public_room_confirm_description_1": "<b>Nie zaleca się dodawania szyfrowania do pokojów publicznych.</b> Każdy może znaleźć Twój pokój, więc jest w stanie czytać wszystkie zawarte w nim wiadomości. Nie uzyskasz żadnych benefitów szyfrowania, a tej zmiany nie będzie można cofnąć. Szyfrowanie wiadomości w pokoju publicznym sprawi, że wysyłanie i odbieranie wiadomości będzie wolniejsze.",
@@ -2360,7 +2400,7 @@
             "history_visibility_joined": "Tylko członkowie (od kiedy dołączyli)",
             "history_visibility_legend": "Kto może czytać historię?",
             "history_visibility_shared": "Tylko członkowie (od momentu włączenia tej opcji)",
-            "history_visibility_warning": "Zmiany tego, kto może przeglądać historię wyszukiwania dotyczą tylko przyszłych wiadomości w pokoju. Widoczność wcześniejszej historii nie zmieni się.",
+            "history_visibility_warning": "Widoczność istniejącej historii nie ulegnie zmianie.",
             "history_visibility_world_readable": "Każdy",
             "join_rule_description": "Decyduj kto może dołączyć do %(roomName)s.",
             "join_rule_invite": "Prywatny (tylko na zaproszenie)",
@@ -2403,6 +2443,7 @@
                 "other": "Aktualizowanie przestrzeni... (%(progress)s z %(count)s)"
             },
             "join_rule_upgrade_upgrading_room": "Aktualizowanie pokoju",
+            "join_rule_world_readable_description": "Zmiana osób, które mogą dołączyć do pokoju, wpłynie również na widoczność przyszłych wiadomości.",
             "public_without_alias_warning": "Aby powiązać ten pokój, dodaj adres.",
             "publish_room": "Uczyń ten pokój widocznym w katalogu pokoi publicznych.",
             "publish_space": "Uczyń tę przestrzeń widoczną w katalogu pomieszczeń publicznych.",
@@ -2417,7 +2458,6 @@
             "error_update_guest_access": "Nie udało się zaktualizować dostępu dla gości do tej przestrzeni",
             "error_update_history_visibility": "Nie udało się zaktualizować widoczności historii dla tej przestrzeni",
             "guest_access_explainer": "Goście mogą dołączyć do przestrzeni bez posiadania konta.",
-            "guest_access_explainer_public_space": "Może to być przydatne dla publicznych przestrzeni.",
             "guest_access_label": "Włącz dostęp dla gości",
             "history_visibility_anyone_space": "Podgląd przestrzeni",
             "history_visibility_anyone_space_description": "Pozwól ludziom na podgląd Twojej przestrzeni zanim dołączą.",
@@ -2512,7 +2552,7 @@
             "custom_theme_invalid": "Nieprawidłowy schemat motywu.",
             "dialog_title": "<strong>Ustawienia:</strong> Wygląd",
             "font_size": "Rozmiar czcionki",
-            "font_size_default": "%(fontSize)s (domyślny)",
+            "font_size_default": "%(fontSize)s(domyślna)",
             "high_contrast": "Wysoki kontrast",
             "image_size_default": "Domyślne",
             "image_size_large": "Duży",
@@ -2541,6 +2581,7 @@
                 "breadcrumb_second_description": "Stracisz całą historię wiadomości przechowywaną na serwerze",
                 "breadcrumb_third_description": "Konieczne będzie ponowne zweryfikowanie wszystkich istniejących urządzeń i kontaktów",
                 "breadcrumb_title": "Czy na pewno chcesz zresetować swoją tożsamość?",
+                "breadcrumb_title_cant_confirm": "Musisz zresetować swoją tożsamość",
                 "breadcrumb_title_forgot": "Nie pamiętasz klucza przywracania? Musisz zresetować swoją tożsamość.",
                 "breadcrumb_title_sync_failed": "Nie udało się zsynchronizować magazynu kluczy. Zresetuj swoją tożsamość.",
                 "breadcrumb_warning": "Zrób to tylko wtedy, gdy uważasz, że Twoje konto zostało naruszone.",
@@ -2557,21 +2598,23 @@
                 "session_key": "Klucz sesji:",
                 "title": "Zaawansowane"
             },
+            "confirm_key_storage_off": "Czy na pewno pozostawić wyłączony magazyn kluczy?",
+            "confirm_key_storage_off_description": "Jeśli wylogujesz się ze wszystkich swoich urządzeń, utracisz historię wiadomości i będziesz musiał ponownie zweryfikować wszystkie istniejące kontakty. <a>Dowiedz się więcej</a>",
             "delete_key_storage": {
-                "breadcrumb_page": "Usuń magazyn kluczy",
+                "breadcrumb_page": "Usuń pamięć klucza",
                 "confirm": "Usuń magazyn kluczy",
-                "description": "Usunięcie magazynu kluczy usunie Twoją tożsamość kryptograficzną, klucze wiadomości z serwera i wyłączy następujące funkcje bezpieczeństwa:",
-                "list_first": "Nowe urządzenia nie będą posiadały Twojej historii wiadomości szyfrowanych",
-                "list_second": "Utracisz dostęp do swoich wiadomości szyfrowanych, jeśli wylogujesz się wszędzie z %(brand)s",
-                "title": "Czy na pewno chcesz wyłączyć magazyn kluczy i go wyłączyć?"
+                "description": "Usunięcie pamięci kluczy spowoduje usunięcie tożsamości kryptograficznej i kluczy wiadomości z serwera i wyłączenie następujących funkcji bezpieczeństwa:",
+                "list_first": "Nie będziesz mieć szyfrowanej historii wiadomości na nowych urządzeniach",
+                "list_second": "Stracisz dostęp do zaszyfrowanych wiadomości, jeśli zostaniesz wylogowany z dowolnego %(brand)s miejsca",
+                "title": "Czy na pewno chcesz wyłączyć przechowywanie kluczy i je usunąć?"
             },
             "device_not_verified_button": "Zweryfikuj to urządzenie",
             "device_not_verified_description": "Aby wyświetlić ustawienia szyfrowania, musisz zweryfikować to urządzenie.",
             "device_not_verified_title": "Urządzenie niezweryfikowane",
             "dialog_title": "<strong>Ustawienia:</strong> Szyfrowanie",
             "key_storage": {
-                "allow_key_storage": "Zezwól na magazynowanie kluczy",
-                "description": "Przechowuj swoją tożsamość kryptograficzną i klucze wiadomości bezpiecznie na serwerze. Umożliwi to na przeglądanie historii wiadomości na wszystkich nowych urządzeniach. <a>Dowiedz się więcej</a>",
+                "allow_key_storage": "Zezwalaj na przechowywanie kluczy",
+                "description": "Bezpiecznie przechowuj swoją tożsamość kryptograficzną i klucze wiadomości na serwerze. Umożliwi to przeglądanie historii wiadomości na dowolnych nowych urządzeniach. <a>Dowiedz się więcej </a>",
                 "title": "Magazyn kluczy"
             },
             "recovery": {
@@ -2615,6 +2658,7 @@
             "allow_spellcheck": "Zezwól na sprawdzanie pisowni",
             "application_language": "Język aplikacji",
             "application_language_reload_hint": "Aplikacja włączy się ponownie po zmianie języka",
+            "avatar_open_menu": "Otwórz menu awatara",
             "avatar_remove_progress": "Usuwanie obrazu...",
             "avatar_save_progress": "Przesyłanie obrazu...",
             "avatar_upload_error_text": "Format pliku nie jest obsługiwany lub obraz jest większy niż %(size)s.",
@@ -2669,7 +2713,7 @@
             "identity_server_not_set": "Serwer tożsamości nie jest ustawiony",
             "invalid_phone_number": "Podany numer telefonu nie wydaje się być poprawny.",
             "language_section": "Język",
-            "msisdn_adding_unsupported_by_hs": "Ten serwer domowy nie obsługuje dodawania numerów telefonu do Twojego konta.",
+            "msisdn_adding_unsupported_by_hs": "Ten serwer domowy nie obsługuje dodawania numerów telefonów do Twojego konta.",
             "msisdn_in_use": "Ten numer telefonu jest już zajęty",
             "msisdn_label": "Numer telefonu",
             "msisdn_verification_field_label": "Kod weryfikacyjny",
@@ -2692,13 +2736,11 @@
         "inline_url_previews_room": "Włącz domyślny podgląd URL dla uczestników w tym pokoju",
         "inline_url_previews_room_account": "Włącz podgląd URL dla tego pokoju (dotyczy tylko Ciebie)",
         "insert_trailing_colon_mentions": "Wstawiaj dwukropek po wzmiance użytkownika na początku wiadomości",
+        "invite_controls": {
+            "default_label": "Zezwól użytkownikom na zapraszanie Cię do pokojów"
+        },
         "jump_to_bottom_on_send": "Przejdź na dół osi czasu po wysłaniu wiadomości",
         "key_backup": {
-            "backup_in_progress": "Tworzy się kopia zapasowa Twoich kluczy (pierwsza kopia może potrwać kilka minut).",
-            "backup_starting": "Rozpoczynanie kopii zapasowej…",
-            "backup_success": "Sukces!",
-            "cannot_create_backup": "Nie można utworzyć kopii zapasowej klucza",
-            "create_title": "Utwórz kopię zapasową klucza",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Twoje klucze są właśnie przywracane z tego urządzenia.",
                 "backup_setup_success_title": "Wykonanie bezpiecznej kopii zapasowej powiodło się",
@@ -2758,6 +2800,7 @@
             "show_in_private": "W pokojach prywatnych",
             "show_media": "Zawsze pokazuj"
         },
+        "not_supported": "Twój serwer nie obsługuje tej funkcji.",
         "notifications": {
             "default_setting_description": "To ustawienie zastosuje się do wszystkich Twoich pokoi.",
             "default_setting_section": "Chce otrzymywać powiadomienia (Domyślne ustawienie)",
@@ -2815,6 +2858,7 @@
             "voip": "Połączenia audio i wideo"
         },
         "preferences": {
+            "Electron.enableContentProtection": "Zapobiegaj przechwytywaniu zawartości okna przez inne aplikacje",
             "Electron.enableHardwareAcceleration": "Włącz akcelerację sprzętową (uruchom ponownie %(appName)s, aby zastosować zmiany).",
             "always_show_menu_bar": "Zawsze pokazuj pasek menu okna",
             "autocomplete_delay": "Opóźnienie autouzupełniania (ms)",
@@ -2823,6 +2867,7 @@
             "composer_heading": "Kompozytor",
             "default_timezone": "Ustawienie przeglądarki (%(timezone)s)",
             "dialog_title": "<strong>Ustawienia:</strong> Preferencje",
+            "enable_content_protection": "Włącz ochronę treści",
             "enable_hardware_acceleration": "Włącz przyspieszenie sprzętowe",
             "enable_tray_icon": "Pokaż ikonę w zasobniku systemowym i zminimalizuj okno do niej zamiast zamknięcia",
             "keyboard_heading": "Skróty klawiszowe",
@@ -2836,6 +2881,7 @@
             "room_list_heading": "Lista pokojów",
             "show_avatars_pills": "Pokaż awatary w wzmiankach użytkownika, pokoju i wydarzenia",
             "show_polls_button": "Pokaż przycisk ankiet",
+            "startup_window_behaviour_label": "Uruchamianie i zachowanie okna",
             "surround_text": "Otocz zaznaczony tekst podczas wpisywania specjalnych znaków",
             "time_heading": "Wyświetlanie czasu",
             "user_timezone": "Ustaw strefę czasową"
@@ -2856,7 +2902,6 @@
             "ignore_users_empty": "Nie posiadasz ignorowanych użytkowników.",
             "ignore_users_section": "Ignorowani użytkownicy",
             "key_backup_algorithm": "Algorytm:",
-            "key_backup_connect": "Połącz tę sesję z kopią zapasową kluczy",
             "message_search_disable_warning": "Jeśli wyłączone, wiadomości z szyfrowanych pokojów nie pojawią się w wynikach wyszukiwania.",
             "message_search_disabled": "Bezpiecznie przechowuj lokalnie wiadomości szyfrowane, aby mogły się wyświetlać w wynikach wyszukiwania.",
             "message_search_enabled": {
@@ -2987,6 +3032,7 @@
         "show_chat_effects": "Pokaż efekty czatu (animacje po odebraniu np. confetti)",
         "show_displayname_changes": "Pokaż zmiany wyświetlanej nazwy",
         "show_join_leave": "Pokaż wiadomości dołączenia/opuszczenia pokoju (nie dotyczy wiadomości zaproszenia/wyrzucenia/banów)",
+        "show_message_previews": "Pokaż podglądy wiadomości",
         "show_nsfw_content": "Pokaż zawartość NSFW",
         "show_read_receipts": "Pokaż potwierdzenia odczytania wysyłane przez innych użytkowników",
         "show_redaction_placeholder": "Pokaż symbol zastępczy dla usuniętych wiadomości",
@@ -3005,11 +3051,16 @@
             "metaspaces_subsection": "Wyświetlanie przestrzeni",
             "metaspaces_video_rooms": "Pokoje wideo i konferencje",
             "metaspaces_video_rooms_description": "Grupuj wszystkie prywatne pokoje wideo i konferencje.",
-            "metaspaces_video_rooms_description_invite_extension": "Na konferencjach możesz zaprosić osoby spoza matrix.",
+            "metaspaces_video_rooms_description_invite_extension": "Na konferencje możesz zapraszać osoby spoza matrixa.",
             "spaces_explainer": "Przestrzenie to sposób grupowania pokoi i osób. Oprócz przestrzeni, w których się znajdujesz, możesz również korzystać z już wstępnie zbudowanych.",
             "title": "Pasek boczny"
         },
-        "start_automatically": "Uruchom automatycznie po zalogowaniu się do systemu",
+        "start_automatically": {
+            "disabled": "Nie",
+            "enabled": "Tak",
+            "label": "Otwórz %(brand)s po zalogowaniu do komputera",
+            "minimised": "Zminimalizowany"
+        },
         "tac_only_notifications": "Pokaż powiadomienia tylko w centrum aktywności wątków",
         "use_12_hour_format": "Pokaż czas w formacie 12-sto godzinnym (np. 2:30pm)",
         "use_command_enter_send_message": "Użyj Command + Enter, aby wysłać wiadomość",
@@ -3046,8 +3097,8 @@
         "link_copied": "Skopiowano link",
         "permalink_message": "Link do zaznaczonej wiadomości",
         "permalink_most_recent": "Link do najnowszej wiadomości",
-        "share_call": "Link zaproszenia do konferencji",
-        "share_call_subtitle": "Link dla użytkowników zewnętrznych, aby dołączyć do połączenia bez konta matrix:",
+        "share_call": "Link do zaproszenia do konferencji",
+        "share_call_subtitle": "Link dla użytkowników zewnętrznych umożliwiający dołączenie do rozmowy bez konta matrix:",
         "title_link": "Udostępnij link",
         "title_message": "Udostępnij wiadomość w pokoju",
         "title_room": "Udostępnij pokój",
@@ -3093,6 +3144,8 @@
         "jumptodate": "Przeskocz do podanej daty w linii czasu",
         "jumptodate_invalid_input": "Nie jesteśmy w stanie rozpoznać podanej daty (%(inputDate)s). Spróbuj użyć formatu RRRR-MM-DD.",
         "lenny": "Dodaje ( ͡° ͜ʖ ͡°) na początku wiadomości tekstowej",
+        "manual_device_verification_confirm_description": "Umożliwi to drugiemu urządzeniu wysyłanie i odbieranie wiadomości w Twoim imieniu. JEŚLI KTOŚ POWIEDZIAŁ CI, ŻEBYŚ COŚ TU WKLEIŁ, PRAWDOPODOBNIE JESTEŚ OSZUKIWANY! Czy na pewno chcesz zweryfikować drugie urządzenie?",
+        "manual_device_verification_confirm_title": "Uwaga: ręczna weryfikacja urządzenia",
         "me": "Wyświetla akcję",
         "msg": "Wysyła wiadomość do wybranego użytkownika",
         "myavatar": "Zdjęcie profilowe zostanie zmienione we wszystkich pokojach",
@@ -3133,6 +3186,7 @@
         "upgraderoom": "Ulepsza pokój do nowej wersji",
         "upgraderoom_permission_error": "Nie posiadasz wymaganych uprawnień do użycia tego polecenia.",
         "usage": "Użycie",
+        "verify": "Zweryfikuj ręcznie jedno ze swoich urządzeń",
         "view": "Przegląda pokój z podanym adresem",
         "whois": "Pokazuje informacje na temat użytkownika"
     },
@@ -3287,8 +3341,8 @@
             "one": "%(count)s odpowiedź",
             "other": "%(count)s odpowiedzi"
         },
-        "empty_description": "Użyj „%(replyInThread)s” po najechaniu kursorem na wiadomość",
-        "empty_title": "Wątki pomagają utrzymać tematykę rozmów i łatwo za nimi podążać.",
+        "empty_description": "Użyj „%(replyInThread)s” podczas najechania kursorem na wiadomość.",
+        "empty_title": "Wątki pomagają utrzymać tematykę rozmów i łatwo je śledzić.",
         "error_start_thread_existing_relation": "Nie można utworzyć wątku z wydarzenia z istniejącą relacją",
         "mark_all_read": "Oznacz wszystkie jako przeczytane",
         "my_threads": "Moje wątki",
@@ -3297,7 +3351,7 @@
         "show_thread_filter": "Pokaż:"
     },
     "threads_activity_centre": {
-        "header": "Aktywność wątków",
+        "header": "Aktywność w wątkach",
         "no_rooms_with_threads_notifs": "Nie masz jeszcze pokoi z powiadomieniami w wątku.",
         "no_rooms_with_unread_threads": "Nie masz jeszcze pokoi z nieprzeczytanymi wątkami."
     },
@@ -3374,6 +3428,7 @@
             "unable_to_find": "Próbowano załadować konkretny punkt na osi czasu w tym pokoju, ale nie można go znaleźć."
         },
         "m.audio": {
+            "audio_player": "Odtwarzacz audio",
             "error_downloading_audio": "Wystąpił błąd w trakcie pobierania audio",
             "error_processing_audio": "Wystąpił błąd procesowania wiadomości audio",
             "error_processing_voice_message": "Wystąpił błąd procesowania wiadomości głosowej",
@@ -3435,7 +3490,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Zakończył ankietę",
             "sender_ended": "%(senderName)s zakończył ankietę"
         },
         "m.poll.start": "%(senderName)s utworzył ankietę - %(pollQuestion)s",
@@ -3817,11 +3871,11 @@
         "unavailable": "Niedostępny"
     },
     "update_room_access_modal": {
-        "description": "Aby utworzyć link udostępniania, ustaw ten pokój jako <b>publiczny</b> lub włącz opcję umożliwiającą użytkownikom <b>poprosić o dołączenie</b>. Dzięki temu goście będą mogli dołączyć bez zaproszenia.",
-        "dont_change_description": "Jeśli nie chcesz zmieniać uprawnień dostępu tego pokoju, możesz utworzyć link połączenia w nowym pokoju.",
-        "no_change": "Nie chce zmieniać poziomu uprawnień.",
-        "revert_access_description": "(Przywróć poprzednią wartość w ustawieniach pokoju: <b>Bezpieczeństwo i prywatność</b> / <b>Dostęp</b>)",
-        "title": "Zezwól gościom na dołączenie do tego pokoju"
+        "description": "Aby utworzyć łącze udostępniania, u <b> publicznij ten pokój </b> lub włącz opcję po <b> proszenia użytkowników o dołączenie</b>. Pozwala to gościom przyłączyć się bez zaproszenia.",
+        "dont_change_description": "Jeśli nie chcesz zmieniać dostępu do tego pokoju, możesz utworzyć nowy pokój dla łącza połączenia.",
+        "no_change": "Nie chcę zmieniać poziomu dostępu.",
+        "revert_access_description": "(Można to przywrócić do poprzedniej wartości w Ustawieniach pokoju: <b> Bezpieczeństwo i prywatność </b> /Dost <b> ęp</b>)",
+        "title": "Zezwalaj gościom na dołączenie do tego pokoju"
     },
     "upload_failed_generic": "Nie udało się przesłać pliku '%(fileName)s'.",
     "upload_failed_size": "Plik '%(fileName)s' przekracza limit rozmiaru dla tego serwera głównego",
@@ -3908,7 +3962,7 @@
         "unban_space_warning": "Nie będą w stanie uzyskać dostępu gdziekolwiek, gdzie nie jesteś administratorem.",
         "unignore_button": "Przestań ignorować",
         "verification_unavailable": "Weryfikacja użytkownika jest niedostępna",
-        "verify_button": "Weryfikuj użytkownika",
+        "verify_button": "Zweryfikuj użytkownika",
         "verify_explainer": "Dla dodatkowego bezpieczeństwa, zweryfikuj tego użytkownika za pomocą jednorazowego kodu na obu waszych urządzeniach."
     },
     "user_menu": {
@@ -3941,12 +3995,12 @@
         "connection_lost": "Połączenie z serwerem zostało przerwane",
         "connection_lost_description": "Nie możesz wykonywać rozmów bez połączenia z serwerem.",
         "consulting": "Konsultowanie z %(transferTarget)s. <a>Transfer do %(transferee)s</a>",
+        "decline_call": "Odrzuć",
         "default_device": "Urządzenie domyślne",
         "dial": "Wybierz numer",
         "dialpad": "Klawiatura telefoniczna",
         "disable_camera": "Wyłącz kamerę",
         "disable_microphone": "Wycisz mikrofon",
-        "disabled_no_one_here": "Nie ma tu nikogo, do kogo można zadzwonić",
         "disabled_no_perms_start_video_call": "Nie masz uprawnień do rozpoczęcia rozmowy wideo",
         "disabled_no_perms_start_voice_call": "Nie masz uprawnień do rozpoczęcia rozmowy głosowej",
         "disabled_ongoing_call": "Rozmowa w toku",
@@ -3960,7 +4014,7 @@
         "input_devices": "Urządzenia wejściowe",
         "jitsi_call": "Konferencja Jitsi",
         "join_button_tooltip_call_full": "Przepraszamy — to połączenie jest już zapełnione",
-        "legacy_call": "Połączenie Legacy",
+        "legacy_call": "Połączenie w starszej technologii.",
         "maximise": "Wypełnij ekran",
         "maximise_call": "Maksymalizuj połączenie",
         "metaspace_video_rooms": {
@@ -3994,6 +4048,7 @@
         "show_sidebar_button": "Pokaż pasek boczny",
         "silence": "Wycisz rozmowę",
         "silenced": "Wyciszono powiadomienia",
+        "skip_lobby_toggle_option": "Dołącz teraz",
         "start_screenshare": "Udostępnij ekran",
         "stop_screenshare": "Przestań udostępniać ekran",
         "too_many_calls": "Zbyt wiele połączeń",
@@ -4015,7 +4070,7 @@
         "user_is_presenting": "%(sharerName)s prezentuje",
         "video_call": "Rozmowa wideo",
         "video_call_started": "Rozpoczęto rozmowę wideo",
-        "video_call_using": "Połączenie wideo za pomocą:",
+        "video_call_using": "Połączenie wideo przy użyciu:",
         "voice_call": "Rozmowa głosowa",
         "you_are_presenting": "Prezentujesz"
     },
@@ -4115,7 +4170,7 @@
         "error_need_to_be_logged_in": "Musisz być zalogowany.",
         "error_unable_start_audio_stream_description": "Nie można rozpocząć przesyłania strumienia audio.",
         "error_unable_start_audio_stream_title": "Nie udało się rozpocząć transmisji na żywo",
-        "modal_data_warning": "Poniższe dane są współdzielone z %(widgetDomain)s",
+        "modal_data_warning": "Poniższe dane są udostępniane z %(widgetDomain)s",
         "modal_title_default": "Widżet modalny",
         "no_name": "Nieznana aplikacja",
         "open_id_permissions_dialog": {
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index db6df857a6..2ed647b43e 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -81,7 +81,6 @@
         "maximise": "Maximizar",
         "mention": "Mencionar",
         "minimise": "Minimizar",
-        "new_message": "Nova mensagem",
         "new_room": "Nova sala",
         "new_video_room": "Nova sala de vídeo",
         "next": "Próximo",
@@ -226,8 +225,7 @@
             "setup_key_backup_title": "Perderás o acesso às tuas mensagens encriptadas",
             "setup_secure_backup_description_1": "As mensagens encriptadas são protegidas com encriptação de ponta a ponta. Só tu e o(s) destinatário(s) têm as chaves para ler estas mensagens.",
             "setup_secure_backup_description_2": "Quando terminares a sessão, estas chaves serão eliminadas deste dispositivo, o que significa que não poderás ler mensagens encriptadas, a menos que tenhas as chaves para elas nos teus outros dispositivos ou tenhas feito uma cópia de segurança das mesmas no servidor.",
-            "skip_key_backup": "Não quero as minhas mensagens encriptadas",
-            "use_key_backup": "Começa a utilizar a Cópia de Segurança das Chaves"
+            "skip_key_backup": "Não quero as minhas mensagens encriptadas"
         },
         "misconfigured_body": "Pede ao teu administrador %(brand)s para verificar <a>a tua configuração</a> para ver se há entradas incorretas ou duplicadas.",
         "misconfigured_title": "O teu %(brand)s está mal configurado",
@@ -584,7 +582,6 @@
         "user": "Utilizador",
         "user_avatar": "Foto do perfil",
         "username": "Nome de utilizador",
-        "verification_cancelled": "Verificação cancelada",
         "verified": "Verificado",
         "version": "Versão",
         "video": "Vídeo",
@@ -892,8 +889,6 @@
             "security_key_title": "Chave de recuperação"
         },
         "bootstrap_title": "A configurar chaves",
-        "cancel_entering_passphrase_description": "Tem a certeza que quer cancelar a introdução da frase-passe?",
-        "cancel_entering_passphrase_title": "Cancelar a introdução da frase-passe?",
         "confirm_encryption_setup_body": "Clica no botão abaixo para confirmar a configuração da encriptação.",
         "confirm_encryption_setup_title": "Confirma a configuração da encriptação",
         "cross_signing_room_normal": "Esta sala é encriptada de ponta a ponta",
@@ -936,11 +931,8 @@
             "title": "Método de recuperação Removido",
             "warning": "Se não tiveres removido o método de recuperação, um atacante pode estar a tentar aceder à tua conta. Altera a palavra-passe da tua conta e define imediatamente um novo método de recuperação nas Definições."
         },
-        "reset_all_button": "Esqueceste-te ou perdeste todos os métodos de recuperação? <a>Repor tudo</a>",
         "set_up_recovery": "Configurar a recuperação",
-        "set_up_recovery_later": "Agora não",
         "set_up_recovery_toast_description": "Gera uma chave de recuperação que pode ser utilizada para restaurar o teu histórico de mensagens encriptadas, caso percas o acesso aos teus dispositivos.",
-        "set_up_toast_description": "Protege-te contra a perda de acesso a mensagens e dados encriptados",
         "set_up_toast_title": "Configura uma cópia de segurança segura",
         "setup_secure_backup": {
             "explainer": "Guarda as tuas chaves antes de saíres para evitar perdê-las."
@@ -959,12 +951,8 @@
             "after_new_login": {
                 "device_verified": "Dispositivo verificado",
                 "skip_verification": "Ignora a verificação por enquanto",
-                "unable_to_verify": "Não é possível verificar este dispositivo",
                 "verify_this_device": "Verifica este dispositivo"
             },
-            "cancelled": "Cancelaste a verificação.",
-            "cancelled_self": "Cancelaste a verificação no teu outro dispositivo.",
-            "cancelled_user": "%(displayName)sverificação cancelada.",
             "cancelling": "A cancelar…",
             "complete_action": "Entendi",
             "complete_description": "Verificaste este utilizador com sucesso.",
@@ -979,46 +967,33 @@
             "incoming_sas_dialog_waiting": "Aguarda a confirmação do parceiro...",
             "incoming_sas_user_dialog_text_1": "Verifica este utilizador para o marcar como fiável. A confiança nos utilizadores dá-te uma tranquilidade extra quando utilizas mensagens encriptadas de ponta a ponta.",
             "incoming_sas_user_dialog_text_2": "A verificação deste utilizador marcará a sua sessão como sendo de confiança e também marcará a tua sessão como sendo de confiança para ele.",
-            "no_key_or_device": "Parece que não tens uma chave de recuperação ou qualquer outro dispositivo com o qual possas fazer a verificação.  Este dispositivo não poderá aceder a mensagens encriptadas antigas. Para verificares a tua identidade neste dispositivo, terás de repor as tuas chaves de verificação.",
             "no_support_qr_emoji": "O dispositivo que estás a tentar verificar não suporta a leitura de um código QR nem a verificação de emoji, os dois métodos suportados pela %(brand)s. Tenta com um cliente diferente.",
             "other_party_cancelled": "A outra parte cancelou a verificação.",
             "prompt_encrypted": "Verifica todos os utilizadores de uma sala para garantir a sua segurança.",
-            "prompt_self": "Inicia novamente a verificação a partir da notificação.",
             "prompt_unencrypted": "Em salas encriptadas, verifica todos os utilizadores para garantir a segurança.",
-            "prompt_user": "Recomeça a verificação a partir do perfil.",
             "qr_or_sas": "%(qrCode)s ou %(emojiCompare)s",
-            "qr_or_sas_header": "Verifica este dispositivo completando uma das seguintes opções:",
             "qr_prompt": "Lê este código único",
-            "qr_reciprocate_same_shield_device": "Estás quase lá! O teu outro dispositivo está a mostrar o mesmo escudo?",
             "qr_reciprocate_same_shield_user": "Estás quase lá! O %(displayName)s tem o mesmo escudo?",
-            "request_toast_accept": "Verifica a sessão",
             "request_toast_accept_user": "Verificar utilizador",
             "request_toast_decline_counter": "Ignora (%(counter)s)",
             "request_toast_detail": "%(deviceId)s de %(ip)s",
-            "reset_proceed_prompt": "Procede à reposição",
             "sas_caption_self": "Verifica este dispositivo, confirmando que o número seguinte aparece no ecrã.",
             "sas_caption_user": "Verifica este utilizador, confirmando que o seguinte número aparece no ecrã deles.",
             "sas_description": "Compara um conjunto único de emojis se não tiveres uma câmara em nenhum dos dispositivos",
-            "sas_emoji_caption_self": "Confirma se os emojis abaixo são apresentados em ambos os dispositivos, pela mesma ordem:",
             "sas_emoji_caption_user": "Verifica este utilizador confirmando que o seguinte emoji aparece no seu ecrã.",
             "sas_match": "Correspondem",
             "sas_no_match": "Não correspondem",
             "sas_prompt": "Compara emojis únicos",
             "scan_qr": "Verifica através da leitura de um código",
             "scan_qr_explainer": "Pede a %(displayName)s para ler o teu código:",
-            "self_verification_hint": "Para continuar, aceita o pedido de verificação no teu outro dispositivo.",
             "start_button": "Iniciar Verificação",
-            "successful_device": "Verificaste com sucesso %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "Verificaste o teu dispositivo com sucesso!",
             "successful_user": "Verificaste com sucesso %(displayName)s!",
-            "timed_out": "A verificação expirou.",
             "unsupported_method": "Não foi possível encontrar um método de verificação compatível.",
             "unverified_session_toast_accept": "Sim, fui eu",
             "unverified_session_toast_title": "Novo login. Foste tu?",
             "unverified_sessions_toast_description": "Revê para garantir que a tua conta está segura",
             "unverified_sessions_toast_reject": "Mais tarde",
             "unverified_sessions_toast_title": "Tens sessões não verificadas",
-            "verification_description": "Verifica a tua identidade para acederes a mensagens encriptadas e provares a tua identidade a outros.",
             "verification_dialog_title_device": "Verifica o outro dispositivo",
             "verification_dialog_title_user": "Pedido de verificação",
             "verification_skip_warning": "Sem a verificação, não terás acesso a todas as tuas mensagens e poderás parecer pouco fiável aos olhos dos outros.",
@@ -1028,9 +1003,6 @@
             "verify_emoji_prompt": "Verifica comparando o emoji único.",
             "verify_emoji_prompt_qr": "Se não conseguires ler o código acima, verifica-o comparando emojis.",
             "verify_later": "Verificarei mais tarde",
-            "verify_using_device": "Verifica com outro dispositivo",
-            "verify_using_key": "Verifica com a chave de recuperação",
-            "verify_using_key_or_phrase": "Verifica com a chave ou frase de recuperação",
             "waiting_for_user_accept": "À espera de %(displayName)s para aceitar...",
             "waiting_other_device": "À espera que verifiques no teu outro dispositivo...",
             "waiting_other_device_details": "À espera que verifiques no teu outro dispositivo, %(deviceName)s (%(deviceId)s)...",
@@ -1422,7 +1394,6 @@
         "upload_file": "Carrega um ficheiro"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Permitir o modo de partilha de ecrã apenas",
         "ask_to_join": "Permitir pedir para participar",
         "automatic_debug_logs": "Envia automaticamente registos de depuração em qualquer erro",
         "automatic_debug_logs_decryption": "Envia automaticamente registos de depuração em caso de erros de desencriptação",
@@ -1608,8 +1579,7 @@
         "filter_placeholder": "Filtrar integrantes da sala",
         "invite_button_no_perms_tooltip": "Não tens permissão para convidar utilizadores",
         "invited_label": "Convidado",
-        "no_matches": "Sem correspondências",
-        "power_label": "%(userName)s (nível de permissão %(powerLevelNumber)s)"
+        "no_matches": "Sem correspondências"
     },
     "member_list_back_action_label": "Membros da sala",
     "message_edit_dialog_title": "Edições de mensagens",
@@ -1815,11 +1785,6 @@
                 "other": "Só podes fixar até %(count)s widgets"
             },
             "menu": "Abrir o menu",
-            "release_announcement": {
-                "close": "Ok",
-                "description": "Encontra todas as mensagens fixadas aqui. Passa o cursor sobre qualquer mensagem e seleciona \"Fixar\" para a adicionar.",
-                "title": "Todas as novas mensagens afixadas"
-            },
             "reply_thread": "Responde a uma <link> mensagem do tópico</link>",
             "unpin_all": {
                 "button": "Desafixa todas as mensagens",
@@ -1949,8 +1914,6 @@
             "send_message_start_dm": "Envia a tua primeira mensagem para convidar <displayName/> para conversar",
             "start_of_dm_history": "Este é o início do teu histórico de mensagens directas com <displayName/>.",
             "start_of_room": "Este é o início de <roomName/>.",
-            "topic": "Tópico: %(topic)s",
-            "topic_edit": "Tópico: %(topic)s (<a>edita</a>)",
             "unencrypted_warning": "A encriptação de ponta a ponta não está ativada",
             "user_created": "%(displayName)s criou esta sala.",
             "you_created": "Tu criaste esta sala."
@@ -2006,7 +1969,6 @@
             "button_close_list": "Fechar lista",
             "button_view_all": "Ver tudo",
             "description": "Esta sala tem mensagens afixadas. Clica para as veres.",
-            "go_to_message": "Visualiza a mensagem fixada na linha do tempo.",
             "title": "<bold>%(index)s de %(length)s</bold> Mensagens fixadas"
         },
         "read_topic": "Clica para ler o tópico",
@@ -2360,7 +2322,6 @@
             "error_update_guest_access": "Falha ao atualizar o acesso de convidado deste espaço",
             "error_update_history_visibility": "Falha ao atualizar a visibilidade do histórico deste espaço",
             "guest_access_explainer": "Os convidados podem juntar-se a um espaço sem terem uma conta.",
-            "guest_access_explainer_public_space": "Isto pode ser útil para espaços públicos.",
             "guest_access_label": "Ativar o acesso de convidados",
             "history_visibility_anyone_space": "Espaço de pré-visualização",
             "history_visibility_anyone_space_description": "Permite que as pessoas visualizem o teu espaço antes de aderirem.",
@@ -2629,11 +2590,6 @@
         "insert_trailing_colon_mentions": "Insere dois pontos após as menções do utilizador no início de uma mensagem",
         "jump_to_bottom_on_send": "Salta para o fundo da linha de tempo quando enviar uma mensagem",
         "key_backup": {
-            "backup_in_progress": "Está a ser feita uma cópia de segurança das tuas chaves (a primeira cópia de segurança pode demorar alguns minutos).",
-            "backup_starting": "Iniciar cópia de segurança...",
-            "backup_success": "Sucesso!",
-            "cannot_create_backup": "Não é possível criar uma cópia de segurança da chave",
-            "create_title": "Cria uma cópia de segurança da chave",
             "setup_secure_backup": {
                 "backup_setup_success_description": "As tuas chaves estão agora a ser copiadas a partir deste dispositivo.",
                 "backup_setup_success_title": "Backup seguro bem-sucedido",
@@ -2783,7 +2739,6 @@
             "ignore_users_empty": "Não tens utilizadores ignorados.",
             "ignore_users_section": "Utilizadores ignorados",
             "key_backup_algorithm": "Algoritmo:",
-            "key_backup_connect": "Liga esta sessão à cópia de segurança das chaves",
             "message_search_disable_warning": "Se estiver desactivada, as mensagens de salas encriptadas não aparecerão nos resultados da pesquisa.",
             "message_search_disabled": "Armazena em cache de forma segura as mensagens encriptadas localmente para que apareçam nos resultados de pesquisa.",
             "message_search_enabled": {
@@ -2936,7 +2891,6 @@
             "spaces_explainer": "Os espaços são formas de agrupar divisões e pessoas. Para além dos espaços em que te encontras, também podes utilizar alguns espaços pré-construídos.",
             "title": "Barra lateral"
         },
-        "start_automatically": "Iniciar automaticamente ao iniciar o sistema",
         "tac_only_notifications": "Mostra apenas as notificações no centro de actividades do tópico",
         "use_12_hour_format": "Mostrar os horários em formato de 12h (p.ex: 2:30pm)",
         "use_command_enter_send_message": "Utiliza Command + Enter para enviar uma mensagem",
@@ -3361,7 +3315,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Terminou uma sondagem",
             "sender_ended": "%(senderName)s encerrou uma sondagem"
         },
         "m.poll.start": "%(senderName)s iniciou uma sondagem - %(pollQuestion)s",
@@ -3864,7 +3817,6 @@
         "dialpad": "Teclado de discagem",
         "disable_camera": "Desliga a câmara",
         "disable_microphone": "Silenciar Microfone",
-        "disabled_no_one_here": "Não há ninguém aqui para ligar",
         "disabled_no_perms_start_video_call": "Não tens autorização para iniciar chamadas de vídeo",
         "disabled_no_perms_start_voice_call": "Não tens autorização para iniciar chamadas de voz",
         "disabled_ongoing_call": "Chamada em curso",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index c0f38b3163..9f2e9f5879 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -93,7 +93,7 @@
         "maximise": "Maximizar",
         "mention": "Mencionar",
         "minimise": "Minimizar",
-        "new_message": "Nova mensagem",
+        "new_conversation": "Nova conversa",
         "new_room": "Nova sala",
         "new_video_room": "Nova sala de vídeo",
         "next": "Próximo",
@@ -240,8 +240,7 @@
             "setup_key_backup_title": "Você perderá acesso às suas mensagens criptografadas",
             "setup_secure_backup_description_1": "As mensagens estão protegidas com a criptografia de ponta a ponta. Somente você e o(s) destinatário(s) têm as chaves para ler essas mensagens.",
             "setup_secure_backup_description_2": "Quando você se desconectar, essas chaves serão excluídas desse dispositivo, o que significa que você não poderá ler mensagens criptografadas, a menos que tenha as chaves delas em seus outros dispositivos ou tenha feito backup delas no servidor.",
-            "skip_key_backup": "Não quero minhas mensagens criptografadas",
-            "use_key_backup": "Comece a usar backup de chave"
+            "skip_key_backup": "Não quero minhas mensagens criptografadas"
         },
         "misconfigured_body": "Entre em contato com o administrador do %(brand)s para verificar se há entradas inválidas ou duplicadas nas <a>suas configurações</a>.",
         "misconfigured_title": "O %(brand)s está mal configurado",
@@ -600,12 +599,12 @@
         "user": "Usuário",
         "user_avatar": "Foto de perfil",
         "username": "Nome de usuário",
-        "verification_cancelled": "Confirmação cancelada",
         "verified": "Verificado",
         "version": "Versão",
         "video": "Vídeo",
         "video_room": "Sala de vídeo",
         "view_message": "Ver mensagem",
+        "voice": "Voz",
         "warning": "Atenção"
     },
     "composer": {
@@ -646,16 +645,17 @@
         "mode_plain": "Ocultar formatação",
         "mode_rich_text": "Mostrar formatação",
         "no_perms_notice": "Você não tem permissão para digitar nesta sala",
-        "placeholder": "Digite uma mensagem…",
-        "placeholder_encrypted": "Digite uma mensagem criptografada…",
-        "placeholder_reply": "Digite sua resposta…",
-        "placeholder_reply_encrypted": "Digite sua resposta criptografada…",
-        "placeholder_thread": "Responder ao tópico…",
-        "placeholder_thread_encrypted": "Responder ao tópico criptografado…",
+        "placeholder": "Enviar uma message não criptografada…",
+        "placeholder_encrypted": "Enviar mensagem...",
+        "placeholder_reply": "Envie uma resposta não criptografada…",
+        "placeholder_reply_encrypted": "Enviar uma resposta…",
+        "placeholder_thread": "Responder a thread não criptografado…",
+        "placeholder_thread_encrypted": "Responder ao tópico...",
         "poll_button": "Enquete",
         "poll_button_no_perms_description": "Você não tem permissão para iniciar enquetes nesta sala.",
         "poll_button_no_perms_title": "Permissão necessária",
         "replying_title": "Em resposta a",
+        "room_unencrypted": "As mensagens nesta sala não estão criptografadas de ponta a ponta.",
         "room_upgraded_link": "A conversa continua aqui.",
         "room_upgraded_notice": "Esta sala foi substituída e não está mais ativa.",
         "send_button_title": "Enviar mensagem",
@@ -719,6 +719,7 @@
         "personal_space_description": "Um espaço privado para organizar suas salas",
         "private_description": "Somente para convidados, melhor para você ou para equipes",
         "private_heading": "O seu espaço privado",
+        "private_only_heading": "Seu espaço",
         "private_personal_description": "Certifique-se de que as pessoas certas tenham acesso a %(name)s",
         "private_personal_heading": "Com quem você está trabalhando?",
         "private_space": "Eu e meus colegas de equipe",
@@ -786,6 +787,7 @@
             "cross_signing_status": "Status de assinatura cruzada:",
             "cross_signing_untrusted": "Sua conta tem uma identidade de assinatura cruzada no armazenamento secreto, mas ela ainda não é confiável para esta sessão.",
             "crypto_not_available": "O módulo criptográfico não está disponível",
+            "device_id": "ID do dispositivo",
             "key_backup_active_version": "Versão de backup ativo:",
             "key_backup_active_version_none": "Nenhuma",
             "key_backup_inactive_warning": "Suas chaves não estão sendo copiadas nesta sessão.",
@@ -798,11 +800,24 @@
             "secret_storage_ready": "pronto",
             "secret_storage_status": "Armazenamento secreto:",
             "self_signing_private_key_cached_status": "Chave privada auto-assinada:",
+            "session": "Sessão",
+            "session_fingerprint": "Impressão digital (chave de sessão)",
             "title": "Criptografia de ponta a ponta",
             "user_signing_private_key_cached_status": "Chave privada de assinatura do usuário:"
         },
         "developer_mode": "Modo desenvolvedor",
         "developer_tools": "Ferramentas do desenvolvedor",
+        "device_dehydrated_no": "Desidratado: Não",
+        "device_dehydrated_yes": "Desidratado: Sim",
+        "device_id": "ID do dispositivo: %(deviceId)s",
+        "device_keys": "Chaves do dispositivo",
+        "device_verification_status": {
+            "signed_by_owner": "Status da verificação: <E2EIcon /> Assinado pelo proprietário",
+            "unknown": "Status da verificação: Desconhecido",
+            "unverified": "Status da verificação: <E2EIcon /> Não assinado pelo proprietário",
+            "verified": "Status da verificação: <E2EIcon /> Verificado por assinatura cruzada"
+        },
+        "devices": "Dispositivos criptográficos (%(count)s)",
         "edit_setting": "Editar configuração",
         "edit_values": "Editar valores",
         "empty_string": "<empty string>",
@@ -818,15 +833,18 @@
         "failed_to_save": "Falha ao salvar as configurações.",
         "failed_to_send": "Falha ao enviar o evento!",
         "id": "ID: ",
+        "invalid_device_key_id": "ID da chave do dispositivo inválida",
         "invalid_json": "Não parece um JSON válido.",
         "level": "Nível",
         "low_bandwidth_mode": "Modo de baixa largura de banda",
         "low_bandwidth_mode_description": "Requer servidor doméstico compatível.",
         "main_timeline": "Linha do tempo principal",
+        "manual_device_verification": "Verificação manual do dispositivo",
         "no_receipt_found": "Nenhum recibo encontrado",
         "notification_state": "O estado da notificação é<strong>%(notificationState)s</strong>",
         "notifications_debug": "Depuração de notificações",
         "number_of_users": "Número de usuários",
+        "only_joined_members": "Somente usuários cadastrados",
         "original_event_source": "Fonte do evento original",
         "room_encrypted": "A sala está <strong> criptografada ✅ </strong>",
         "room_id": "ID da sala: %(roomId)s",
@@ -860,6 +878,7 @@
             "elementCallUrl": "URL de chamada do Element"
         },
         "settings_explorer": "Explorador de configurações",
+        "show_empty_content_events": "Mostrar eventos com conteúdo vazio",
         "show_hidden_events": "Mostrar eventos ocultos nas conversas",
         "spaces": {
             "one": "<space>",
@@ -872,10 +891,23 @@
         "toggle_event": "alternar evento",
         "toolbox": "Ferramentas",
         "use_at_own_risk": "Esta interface de usuário NÃO verifica os tipos de valores. Use por sua conta e risco.",
+        "user_avatar": "Avatar: %(avatar)s",
+        "user_displayname": "Nome de exibição: %(displayname)s",
+        "user_id": "ID do usuário: %(userId)s",
+        "user_no_avatar": "Avatar: <i>Nenhum</i>",
+        "user_no_displayname": "Nome de exibição: <i>Nenhum</i>",
         "user_read_up_to": "O usuário leu até: ",
         "user_read_up_to_ignore_synthetic": "O usuário leu até (ignoreSynthetic): ",
         "user_read_up_to_private": "O usuário leu até (m.read.private): ",
         "user_read_up_to_private_ignore_synthetic": "O usuário leu até (m.read.private; ignoreSynthetic): ",
+        "user_room_membership": "Afiliação: %(membership)s",
+        "user_verification_status": {
+            "identity_changed": "Status da verificação: <E2EIcon /> Não verificado e identidade alterada",
+            "unverified": "Status da verificação: <E2EIcon /> Não verificado",
+            "verified": "Status da verificação: <E2EIcon /> Verificado",
+            "was_verified": "Status da verificação: <E2EIcon /> Foi verificado, mas a identidade mudou."
+        },
+        "users": "Usuários",
         "value": "Valor",
         "value_colon": "Valor:",
         "value_in_this_room": "Valor nessa sala",
@@ -917,11 +949,10 @@
             },
             "privacy_warning": "Certifique-se de que ninguém possa ver essa tela!",
             "restoring": "Restaurando chaves do backup",
-            "security_key_title": "Chave de recuperação"
+            "security_key_label": "Chave de recuperação",
+            "security_key_title": "Insira sua chave de recuperação"
         },
         "bootstrap_title": "Configurar chaves",
-        "cancel_entering_passphrase_description": "Tem certeza que quer cancelar a introdução da frase de senha?",
-        "cancel_entering_passphrase_title": "Cancelar a introdução da frase de senha?",
         "confirm_encryption_setup_body": "Clique no botão abaixo para confirmar a configuração da criptografia.",
         "confirm_encryption_setup_title": "Confirmar a configuração de criptografia",
         "cross_signing_room_normal": "Esta sala é criptografada de ponta a ponta",
@@ -932,6 +963,7 @@
         "cross_signing_user_warning": "Este usuário não confirmou todas as próprias sessões.",
         "enter_recovery_key": "Insira a chave de recuperação",
         "event_shield_reason_authenticity_not_guaranteed": "A autenticidade desta mensagem criptografada não pode ser garantida neste aparelho.",
+        "event_shield_reason_mismatched_sender": "O remetente do evento não corresponde com o proprietário do dispositivo que o enviou.",
         "event_shield_reason_mismatched_sender_key": "Criptografada por uma sessão não confirmada",
         "event_shield_reason_unknown_device": "Criptografado por um dispositivo desconhecido ou excluído.",
         "event_shield_reason_unsigned_device": "Criptografado por um dispositivo não verificado por seu proprietário.",
@@ -964,11 +996,8 @@
             "title": "Opção de recuperação removida",
             "warning": "Se você não excluiu a opção de recuperação, um invasor pode estar tentando acessar sua conta. Altere a senha da sua conta e defina imediatamente uma nova opção de recuperação nas Configurações."
         },
-        "reset_all_button": "Esqueceu ou perdeu todos os métodos de recuperação? <a>Redefinir tudo</a>",
         "set_up_recovery": "Configurar a recuperação",
-        "set_up_recovery_later": "Agora não",
         "set_up_recovery_toast_description": "Gere uma chave de recuperação que possa ser usada para restaurar seu histórico de mensagens criptografadas caso você perca o acesso aos seus dispositivos.",
-        "set_up_toast_description": "Proteja-se contra a perda de acesso a mensagens e dados criptografados",
         "set_up_toast_title": "Configurar o backup online",
         "setup_secure_backup": {
             "explainer": "Faça o backup das suas chaves antes de sair, para evitar perdê-las."
@@ -989,16 +1018,17 @@
             "after_new_login": {
                 "device_verified": "Dispositivo verificado",
                 "skip_verification": "Ignorar a verificação por enquanto",
-                "unable_to_verify": "Não foi possível verificar este dispositivo",
                 "verify_this_device": "Verifique este dispositivo"
             },
-            "cancelled": "Você cancelou a confirmação.",
-            "cancelled_self": "Você cancelou a verificação em seu outro dispositivo.",
-            "cancelled_user": "%(displayName)s cancelou a confirmação.",
+            "cancelled_verification": "A solicitação expirou, foi negada ou houve uma incompatibilidade de verificação.",
             "cancelling": "Cancelando…",
+            "cant_confirm": "Não consegue confirmar?",
             "complete_action": "Ok, entendi",
             "complete_description": "Você confirmou este usuário com sucesso.",
             "complete_title": "Confirmado!",
+            "confirm_identity_description": "Verifique este dispositivo para configurar as mensagens seguras",
+            "confirm_identity_title": "Confirme sua identidade",
+            "confirm_the_emojis": "Confirme se os emojis abaixo correspondem aos exibidos no seu outro dispositivo.",
             "error_starting_description": "Não foi possível iniciar um bate-papo com o outro usuário.",
             "error_starting_title": "Erro ao iniciar a verificação",
             "explainer": "As mensagens com este usuário estão protegidas com a criptografia de ponta a ponta e não podem ser lidas por terceiros.",
@@ -1009,58 +1039,72 @@
             "incoming_sas_dialog_waiting": "Aguardando a confirmação do parceiro…",
             "incoming_sas_user_dialog_text_1": "Confirme este usuário para torná-lo confiável. Confiar nos usuários fornece segurança adicional ao trocar mensagens criptografadas de ponta a ponta.",
             "incoming_sas_user_dialog_text_2": "Se você confirmar esse usuário, a sessão será marcada como confiável para você e para ele.",
-            "no_key_or_device": "Parece que você não tem uma chave de segurança ou qualquer outro dispositivo que possa ser verificado. Este dispositivo não poderá acessar mensagens criptografadas antigas. Para verificar sua identidade neste dispositivo, você precisará redefinir suas chaves de verificação.",
+            "manual": {
+                "already_verified": "Este dispositivo já está verificado",
+                "already_verified_and_wrong_fingerprint": "A impressão digital fornecida não corresponde, mas o dispositivo já foi verificado!",
+                "device_id": "ID do dispositivo",
+                "failure_description": "Falha ao verificar '%(deviceId)s': %(error)s",
+                "failure_title": "A verificação falhou",
+                "fingerprint": "Impressão digital (chave de sessão)",
+                "no_crypto": "Não é possível verificar o dispositivo - a criptografia não está ativada",
+                "no_device": "Não foi possível verificar o dispositivo - o dispositivo '%(deviceId)s' não foi encontrado",
+                "no_userid": "Não foi possível verificar o dispositivo - não foi possível encontrar nossa ID de usuário",
+                "success_description": "O dispositivo (%(deviceId)s) agora tem assinatura cruzada",
+                "success_title": "Verificação bem-sucedida",
+                "text": "Forneça o ID e a impressão digital de um de seus próprios dispositivos para verificá-lo. OBSERVE que isso permite que o outro dispositivo envie e receba mensagens como você. SE ALGUÉM LHE DISSE PARA COLAR ALGO AQUI, É PROVÁVEL QUE VOCÊ ESTEJA SENDO ENGANADO!",
+                "wrong_fingerprint": "Não é possível verificar o dispositivo '%(deviceId)s' - a impressão digital fornecida '%(fingerprint)s' não corresponde à impressão digital do dispositivo, '%(fprint)s'"
+            },
             "no_support_qr_emoji": "O dispositivo que você está tentando verificar não suporta a leitura de um código QR ou verificação de emoji, que é o que %(brand)s suporta. Tente com um cliente diferente.",
+            "now_you_can": "Agora você pode ler ou enviar mensagens com segurança, e qualquer pessoa com quem você converse também poderá confiar neste dispositivo.",
+            "once_accepted_can_continue": "Depois de aceito, você poderá continuar com a verificação.",
             "other_party_cancelled": "Seu contato cancelou a confirmação.",
             "prompt_encrypted": "Verifique todos os usuários em uma sala para se certificar de que ela está segura.",
-            "prompt_self": "Iniciar a confirmação novamente, após a notificação.",
             "prompt_unencrypted": "Em salas criptografadas, verifique todos os usuários para garantir a segurança.",
-            "prompt_user": "Iniciar a confirmação novamente, a partir do perfil deste usuário.",
             "qr_or_sas": "%(qrCode)s ou %(emojiCompare)s",
-            "qr_or_sas_header": "Verifique este dispositivo concluindo um dos seguintes procedimentos:",
             "qr_prompt": "Escaneie este código único",
-            "qr_reciprocate_same_shield_device": "Quase lá! O seu outro dispositivo está mostrando o mesmo escudo?",
+            "qr_reciprocate_check_again_device": "Verifique novamente em seu outro dispositivo para concluir a verificação.",
+            "qr_reciprocate_no": "Não, não vejo nenhum escudo verde.",
             "qr_reciprocate_same_shield_user": "Quase lá! Este escudo também aparece para %(displayName)s?",
-            "request_toast_accept": "Verificar sessão",
+            "qr_reciprocate_yes": "Sim, eu vejo um escudo verde.",
             "request_toast_accept_user": "Verificar usuário",
             "request_toast_decline_counter": "Ignorar (%(counter)s)",
             "request_toast_detail": "%(deviceId)s de %(ip)s",
-            "reset_proceed_prompt": "Prosseguir com a reposição",
+            "request_toast_start_verification": "Iniciar verificação",
             "sas_caption_self": "Verifique este dispositivo confirmando que o seguinte número aparece em sua tela.",
             "sas_caption_user": "Confirme este usuário, comparando os números a seguir que serão exibidos na sua e na tela dele.",
             "sas_description": "Compare um conjunto único de emojis se você não tem uma câmera em nenhum dos dois aparelhos",
-            "sas_emoji_caption_self": "Confirme se os emojis abaixo são exibidos em ambos os dispositivos, na mesma ordem:",
             "sas_emoji_caption_user": "Confirme este usuário confirmando os emojis a seguir exibidos na tela dele.",
             "sas_match": "São coincidentes",
             "sas_no_match": "Elas não são correspondentes",
             "sas_prompt": "Comparar emojis únicos",
             "scan_qr": "Confirmar através de QR Code",
             "scan_qr_explainer": "Peça para %(displayName)s escanear o seu código:",
-            "self_verification_hint": "Para continuar, aceite a solicitação de verificação em seu outro dispositivo.",
             "start_button": "Iniciar confirmação",
-            "successful_device": "Você confirmou %(deviceName)s (%(deviceId)s) com êxito!",
-            "successful_own_device": "Você confirmou o seu aparelho com êxito!",
             "successful_user": "Você confirmou %(displayName)s com sucesso!",
-            "timed_out": "O tempo de confirmação se esgotou.",
             "unsupported_method": "Nenhuma opção de confirmação é suportada.",
             "unverified_session_toast_accept": "Sim, fui eu",
             "unverified_session_toast_title": "Novo login. Foi você?",
             "unverified_sessions_toast_description": "Revise para assegurar que sua conta está segura",
             "unverified_sessions_toast_reject": "Mais tarde",
             "unverified_sessions_toast_title": "Você tem sessões não verificadas",
-            "verification_description": "Verifique sua identidade para acessar mensagens criptografadas e provar sua identidade para outras pessoas.",
+            "use_another_device": "Usar outro dispositivo",
+            "use_recovery_key": "Usar chave de recuperação",
+            "verification_dialog_title_choose": "Escolha como verificar",
+            "verification_dialog_title_compare_emojis": "Comparar emojis",
+            "verification_dialog_title_confirm_green_shield": "Confirme se você vê um escudo verde no seu outro dispositivo.",
             "verification_dialog_title_device": "Verifique outro dispositivo",
+            "verification_dialog_title_failed": "A verificação falhou",
+            "verification_dialog_title_start_on_other_device": "Inicie a verificação no outro dispositivo",
             "verification_dialog_title_user": "Solicitação de confirmação",
+            "verification_dialog_title_verified": "Dispositivo verificado",
             "verification_skip_warning": "Sem verificar, você não terá acesso a todas as suas mensagens e poderá aparecer como não confiável para outras pessoas.",
             "verification_success_with_backup": "O seu novo dispositivo agora está verificado. Ele tem acesso às suas mensagens criptografadas, e outros usuários o verão como confiável.",
             "verification_success_without_backup": "Seu novo dispositivo agora foi verificado. Outros usuários o verão como confiável.",
+            "verify_by_completing_one_of": "Verifique preenchendo um dos seguintes formulários:",
             "verify_emoji": "Confirmar por emojis",
             "verify_emoji_prompt": "Confirmar comparando emojis únicos.",
             "verify_emoji_prompt_qr": "Se você não consegue escanear o código acima, confirme comparando emojis únicos.",
             "verify_later": "Vou verificar mais tarde",
-            "verify_using_device": "Verifique com outro dispositivo",
-            "verify_using_key": "Verifique com a chave de segurança",
-            "verify_using_key_or_phrase": "Verificar com chave de segurança ou frase",
             "waiting_for_user_accept": "Aguardando %(displayName)s aceitar…",
             "waiting_other_device": "Aguardando sua verificação em seu outro dispositivo…",
             "waiting_other_device_details": "Esperando que você verifique em seu outro dispositivo, %(deviceName)s (%(deviceId)s)...",
@@ -1110,6 +1154,7 @@
         "tls": "Não foi possível conectar ao Servidor de Base. Por favor, confira sua conectividade à internet, garanta que o <a>certificado SSL do Servidor de Base</a> é confiável, e que uma extensão do navegador não esteja bloqueando as requisições de rede.",
         "unknown": "Erro desconhecido",
         "unknown_error_code": "código de erro desconhecido",
+        "update_history_visibility": "Falha ao alterar a visibilidade do histórico",
         "update_power_level": "Não foi possível alterar o nível de permissão"
     },
     "error_app_open_in_another_tab": "Mude para a outra guia para se conectar em %(brand)s. Essa guia agora pode ser fechada.",
@@ -1350,6 +1395,10 @@
         "name_email_mxid_share_space": "Convide alguém a partir do nome, endereço de e-mail, nome de usuário (como <userId/>) ou <a>compartilhe este espaço</a>.",
         "name_mxid_share_room": "Convide alguém a partir do nome ou nome de usuário (por exemplo: <userId/>) ou <a>compartilhe esta sala</a>.",
         "name_mxid_share_space": "Convide alguém a partir do nome, nome de usuário (como <userId/>) ou <a>compartilhe este espaço</a>.",
+        "progress": {
+            "dont_close": "Não feche o aplicativo até terminar.",
+            "preparing": "Preparando convites..."
+        },
         "recents_section": "Conversas recentes",
         "room_failed_partial": "Nós enviamos aos outros, mas as pessoas abaixo não puderam ser convidadas para <RoomName/>",
         "room_failed_partial_title": "Alguns convites não puderam ser enviados",
@@ -1436,6 +1485,7 @@
         "room_list_navigate_down": "Navegar para baixo na lista de salas",
         "room_list_navigate_up": "Navegar para cima na lista de salas",
         "room_list_select_room": "Selecionar sala da lista de salas",
+        "save": "Salvar",
         "scroll_down_timeline": "Rola para baixo no histórico",
         "scroll_up_timeline": "Rola para cima no histórico",
         "search": "Pesquisar (deve estar ativado)",
@@ -1452,7 +1502,6 @@
         "upload_file": "Enviar um arquivo"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Permitir somente o modo de compartilhamento de tela",
         "ask_to_join": "Habilitar pedir para participar",
         "automatic_debug_logs": "Enviar automaticamente logs de depuração em qualquer erro",
         "automatic_debug_logs_decryption": "Enviar automaticamente logs sobre erros de descriptografia",
@@ -1517,6 +1566,9 @@
         "render_reaction_images_description": "Às vezes chamados de “emojis personalizados”.",
         "report_to_moderators": "Reportar aos moderadores",
         "report_to_moderators_description": "Em salas que aceitam moderação, o botão \"Denunciar\" permitirá que você denuncie abusos aos moderadores da sala.",
+        "share_history_on_invite": "Compartilhe o histórico criptografado com novos membros",
+        "share_history_on_invite_description": "Quando você convidar alguém para uma sala criptografada com o histórico visível para todos, compartilhe o histórico criptografado com essa pessoa e aceite o histórico criptografado quando for convidado para uma sala assim.",
+        "share_history_on_invite_warning": "Este recurso é EXPERIMENTAL e nem todas as precauções de segurança estão implementadas. Não o habilite em contas de produção.",
         "sliding_sync": "Modo Sliding Sync",
         "sliding_sync_description": "Em desenvolvimento ativo, não pode ser desativado.",
         "sliding_sync_disabled_notice": "Saia e entre novamente para desativar",
@@ -1589,7 +1641,7 @@
         "MapStyleUrlNotConfigured": "Esse​•​servidor​•​doméstico​•​não​•​está​•​configurado​•​para​•​exibir​•​mapas.",
         "MapStyleUrlNotReachable": "Esse​•​servidor​•​doméstico​•​não​•​está​•​configurado​•​corretamente​•​para​•​exibir​•​mapas,​•​ou​•​o​•​servidor​•​de​•​mapas​•​configurado​•​pode​•​estar​•​inacessível.",
         "WebGLNotEnabled": "O​•​WebGL​•​é​•​necessário​•​para​•​exibir​•​mapas,​•​ative-o​•​nas​•​configurações​•​do​•​seu​•​navegador.",
-        "click_drop_pin": "Clique para soltar um alfinete",
+        "click_drop_pin": "Clique ​para​ ​soltar​ um​ ​alfinete",
         "click_move_pin": "Clique​•​para​•​mover​•​o​•​alfinete",
         "close_sidebar": "Fechar​•​barra​•​lateral",
         "error_fetch_location": "Não​•​foi​•​possível​•​obter​•​a​•​localização",
@@ -1638,8 +1690,8 @@
         "filter_placeholder": "Pesquisar participantes da sala",
         "invite_button_no_perms_tooltip": "Você não tem permissão para convidar usuários",
         "invited_label": "Convidado",
-        "no_matches": "Sem correspondências",
-        "power_label": "%(userName)s (nível de permissão %(powerLevelNumber)s)"
+        "list_title": "Lista de membros",
+        "no_matches": "Sem correspondências"
     },
     "member_list_back_action_label": "Membros da sala",
     "message_edit_dialog_title": "Edições na mensagem",
@@ -1743,6 +1795,7 @@
     },
     "power_level": {
         "admin": "Administrador/a",
+        "creator": "Proprietário",
         "custom": "Personalizado (%(level)s)",
         "custom_level": "Nível personalizado",
         "default": "Padrão",
@@ -1850,11 +1903,6 @@
                 "other": "Você pode fixar até %(count)s widgets"
             },
             "menu": "Abrir menu",
-            "release_announcement": {
-                "close": "OK",
-                "description": "Encontre todas as mensagens fixadas aqui. Passe o mouse sobre qualquer mensagem e selecione “Fixar” para adicioná-la.",
-                "title": "Todas as novas mensagens fixadas"
-            },
             "reply_thread": "Responder a uma mensagem de <link>discussão</link>",
             "unpin_all": {
                 "button": "Desfixar todas as mensagens",
@@ -1956,6 +2004,7 @@
         },
         "face_pile_tooltip_shortcut": "Incluindo %(commaSeparatedMembers)s",
         "face_pile_tooltip_shortcut_joined": "Incluindo você, %(commaSeparatedMembers)s",
+        "failed_determine_user": "Não é possível determinar qual usuário ignorar, pois o evento do membro foi alterado.",
         "failed_reject_invite": "Não foi possível recusar o convite",
         "forget_room": "Esquecer esta sala",
         "forget_space": "Esqueça este espaço",
@@ -1974,7 +2023,9 @@
         "inaccessible_subtitle_1": "Tente novamente mais tarde ou peça a um administrador de sala ou espaço para verificar se você tem acesso.",
         "inaccessible_subtitle_2": "%(errcode)s foi retornado ao tentar acessar a sala ou o espaço. Se você acha que está vendo essa mensagem por engano, <issueLink>envie uma comunicação de bug</issueLink>.",
         "intro": {
+            "display_topic": "Tópico <topic/>",
             "dm_caption": "Apenas vocês dois estão nesta conversa, a menos que algum de vocês convide mais alguém.",
+            "edit_topic": "Tópico:<topic/> (<a> editar</a> )",
             "enable_encryption_prompt": "Ative a criptografia nas configurações.",
             "encrypted_3pid_dm_pending_join": "Depois que todos entrarem, você poderá conversar",
             "no_avatar_label": "Adicione uma imagem para que as pessoas possam identificar facilmente sua sala.",
@@ -1984,8 +2035,6 @@
             "send_message_start_dm": "Envie sua primeira mensagem para convidar <displayName/> para conversar",
             "start_of_dm_history": "Este é o início do seu histórico da conversa com <displayName/>.",
             "start_of_room": "Este é o início de <roomName/>.",
-            "topic": "Descrição: %(topic)s ",
-            "topic_edit": "Descrição: %(topic)s (<a>editar</a>)",
             "unencrypted_warning": "Criptografia de ponta-a-ponta não está habilitada",
             "user_created": "%(displayName)s criou esta sala.",
             "you_created": "Você criou esta sala."
@@ -2040,13 +2089,16 @@
         "pinned_message_banner": {
             "button_close_list": "Fechar lista",
             "button_view_all": "Ver tudo",
-            "description": "Esta sala tem mensagens fixadas. Clique para visualizá-las.",
-            "go_to_message": "Veja a mensagem fixada no histórico.",
+            "description": "Mensagens fixadas",
+            "go_to_newest_message": "Veja a mensagem fixada na linha do tempo e a mensagem mais recente fixada aqui.",
+            "go_to_next_message": "Veja a mensagem fixada na linha do tempo e a mensagem mais antiga fixada aqui.",
             "title": "<bold>%(index)s de %(length)s </bold> mensagens fixadas"
         },
         "read_topic": "Clique para ler o tópico",
         "rejecting": "Rejeitando o convite...",
         "rejoin_button": "Entrar novamente",
+        "room_content": "Conteúdo da sala",
+        "room_is_low_priority": "Esta é uma sala de baixa prioridade",
         "search": {
             "all_rooms_button": "Pesquisar todos as salas",
             "placeholder": "Pesquisar mensagens...",
@@ -2093,9 +2145,9 @@
     "room_list": {
         "add_room_label": "Adicionar sala",
         "add_space_label": "Adicionar espaço",
-        "appearance": "Aparência",
         "breadcrumbs_empty": "Nenhuma sala foi visitada recentemente",
         "breadcrumbs_label": "Salas visitadas recentemente",
+        "collapse_filters": "Recolher lista de filtros",
         "empty": {
             "no_chats": "Ainda não há conversas.",
             "no_chats_description": "Comece enviando uma mensagem para alguém ou criando uma sala",
@@ -2103,6 +2155,7 @@
             "no_favourites": "Você ainda não tem o bate-papo favorito",
             "no_favourites_description": "Você pode adicionar um bate-papo aos seus favoritos nas configurações de bate-papo",
             "no_invites": "Você não tem nenhum convite não lido",
+            "no_lowpriority": "Você não tem nenhuma sala de baixa prioridade",
             "no_mentions": "Você não tem nenhuma menção não lida",
             "no_people": "Você ainda não tem conversas diretas com ninguém",
             "no_people_description": "Você pode desmarcar os filtros para ver suas outras conversas",
@@ -2112,12 +2165,14 @@
             "show_activity": "Ver todas as atividades",
             "show_chats": "Mostrar todas as conversas"
         },
+        "expand_filters": "Expandir lista de filtros",
         "failed_add_tag": "Falha ao adicionar a tag %(tagName)s para a sala",
         "failed_remove_tag": "Falha ao remover a tag %(tagName)s da sala",
         "failed_set_dm_tag": "Falha ao definir a marca de mensagem direta",
         "filters": {
             "favourite": "Favoritos",
             "invites": "Convites",
+            "low_priority": "Baixa prioridade",
             "mentions": "Menções",
             "people": "Pessoas",
             "rooms": "Salas",
@@ -2151,7 +2206,6 @@
         },
         "room_options": "Opções da Sala",
         "show_less": "Mostrar menos",
-        "show_message_previews": "Mostrar prévias de mensagens",
         "show_n_more": {
             "other": "Mostrar %(count)s a mais",
             "one": "Mostrar %(count)s a mais"
@@ -2335,6 +2389,10 @@
             "users_default": "Cargo padrão"
         },
         "security": {
+            "cannot_change_to_private_due_to_missing_history_visiblity_permissions": {
+                "description": "Você não tem permissão para alterar a visibilidade do histórico da sala. Isso é perigoso, pois pode permitir que usuários que não participam da sala leiam as mensagens.",
+                "title": "Não dá pra tornar a sala privada"
+            },
             "enable_encryption_confirm_description": "Uma vez ativada, a criptografia da sala não poderá ser desativada. Mensagens enviadas em uma sala criptografada não podem ser lidas pelo servidor, apenas pelos participantes da sala. Ativar a criptografia poderá impedir que vários bots e integrações funcionem corretamente. <a>Saiba mais sobre criptografia.</a>",
             "enable_encryption_confirm_title": "Ativar criptografia?",
             "enable_encryption_public_room_confirm_description_1": "<b>Não é recomendado adicionar criptografia a salas públicas.</b> Qualquer pessoa pode encontrar e ingressar em salas públicas, para que qualquer pessoa possa ler as mensagens nelas contidas. Você não obterá nenhum dos benefícios da criptografia e não poderá desativá-la mais tarde. Criptografar mensagens em uma sala pública tornará o recebimento e o envio de mensagens mais lento.",
@@ -2352,7 +2410,7 @@
             "history_visibility_joined": "Apenas participantes (desde que entraram na sala)",
             "history_visibility_legend": "Quem pode ler o histórico da sala?",
             "history_visibility_shared": "Apenas participantes (a partir do momento em que esta opção for selecionada)",
-            "history_visibility_warning": "Alterações em quem pode ler o histórico de conversas aplica-se apenas para mensagens futuras nesta sala. A visibilidade do histórico existente não será alterada.",
+            "history_visibility_warning": "A visibilidade do histórico existente não será alterada.",
             "history_visibility_world_readable": "Qualquer pessoa",
             "join_rule_description": "Decida quem pode entrar em %(roomName)s.",
             "join_rule_invite": "Privado (convite apenas)",
@@ -2395,6 +2453,7 @@
                 "other": "Atualizando espaços... (%(progress)s de %(count)s)"
             },
             "join_rule_upgrade_upgrading_room": "Atualizando sala",
+            "join_rule_world_readable_description": "Mudar quem pode entrar na sala também vai mudar a visibilidade das mensagens futuras.",
             "public_without_alias_warning": "Para criar um link para esta sala, antes adicione um endereço.",
             "publish_room": "Torne esta sala visível no diretório de salas públicas.",
             "publish_space": "Torne este espaço visível no diretório de salas públicas.",
@@ -2409,7 +2468,6 @@
             "error_update_guest_access": "Falha ao atualizar o acesso de convidados a este espaço",
             "error_update_history_visibility": "Falha ao atualizar a visibilidade do histórico deste espaço",
             "guest_access_explainer": "Convidados podem se juntar a um espaço sem ter uma conta.",
-            "guest_access_explainer_public_space": "Isso pode ser útil para espaços públicos.",
             "guest_access_label": "Habilitar acesso a convidados",
             "history_visibility_anyone_space": "Previsualizar o Espaço",
             "history_visibility_anyone_space_description": "Permite que pessoas vejam seu espaço antes de entrarem.",
@@ -2533,6 +2591,7 @@
                 "breadcrumb_second_description": "Você perderá qualquer histórico de mensagens armazenado somente no servidor",
                 "breadcrumb_third_description": "Você precisará verificar todos os seus dispositivos e contatos existentes novamente.",
                 "breadcrumb_title": "Tem certeza de que deseja redefinir sua identidade?",
+                "breadcrumb_title_cant_confirm": "Você precisa redefinir sua identidade",
                 "breadcrumb_title_forgot": "Esqueceu sua chave de recuperação? Você precisará redefinir sua identidade.",
                 "breadcrumb_title_sync_failed": "Falha ao sincronizar o armazenamento de chaves. Você precisa redefinir sua identidade.",
                 "breadcrumb_warning": "Faça isso somente se você acreditar que sua conta foi comprometida.",
@@ -2540,7 +2599,7 @@
                 "do_not_close_warning": "Não feche essa janela até que a redefinição seja concluída",
                 "export_keys": "Exportar chaves",
                 "import_keys": "Importar chaves",
-                "other_people_device_description": "Por padrão, em salas criptografadas, não envie mensagens criptografadas para ninguém até que você as tenha verificado",
+                "other_people_device_description": "Aviso: usuários que não verificaram explicitamente sua identidade com você (por exemplo, usando emojis) não receberão suas mensagens criptografadas. Além disso, dispositivos não verificados de usuários verificados também não receberão suas mensagens criptografadas. As alterações exigem a reinicialização do aplicativo para entrarem em vigor.",
                 "other_people_device_label": "Nunca envie mensagens criptografadas para dispositivos não verificados",
                 "other_people_device_title": "Dispositivos de outras pessoas",
                 "reset_identity": "Redefinir identidade criptográfica",
@@ -2609,6 +2668,7 @@
             "allow_spellcheck": "Permitir verificação ortográfica",
             "application_language": "Idioma do aplicativo",
             "application_language_reload_hint": "O aplicativo será recarregado após selecionar outro idioma",
+            "avatar_open_menu": "Abrir menu de avatar",
             "avatar_remove_progress": "Removendo a imagem...",
             "avatar_save_progress": "Enviando imagem ...",
             "avatar_upload_error_text": "O formato do arquivo não é suportado ou a imagem é maior que %(size)s.",
@@ -2686,13 +2746,11 @@
         "inline_url_previews_room": "Ativar, para todos os participantes desta sala, a visualização de links",
         "inline_url_previews_room_account": "Ativar, para esta sala, a visualização de links (só afeta você)",
         "insert_trailing_colon_mentions": "Insira dois pontos à direita após o usuário mencionar no início de uma mensagem",
+        "invite_controls": {
+            "default_label": "Permitir que usuários convidem você para salas"
+        },
         "jump_to_bottom_on_send": "Vá para o final da linha do tempo ao enviar uma mensagem",
         "key_backup": {
-            "backup_in_progress": "O backup de suas chaves está sendo feito (o primeiro backup pode demorar alguns minutos).",
-            "backup_starting": "Iniciando o backup...",
-            "backup_success": "Pronto!",
-            "cannot_create_backup": "Não foi possível criar backup da chave",
-            "create_title": "Criar backup de chave",
             "setup_secure_backup": {
                 "backup_setup_success_description": "As suas chaves estão agora a ser copiadas a partir deste dispositivo.",
                 "backup_setup_success_title": "Backup seguro bem-sucedido",
@@ -2752,6 +2810,7 @@
             "show_in_private": "Em salas privadas",
             "show_media": "Mostrar sempre"
         },
+        "not_supported": "Seu servidor não implementa esse recurso.",
         "notifications": {
             "default_setting_description": "Essa configuração será aplicada por padrão a todas as suas salas.",
             "default_setting_section": "Quero ser notificado sobre (configuração padrão)",
@@ -2809,6 +2868,7 @@
             "voip": "Chamadas de áudio e vídeo"
         },
         "preferences": {
+            "Electron.enableContentProtection": "Impedir que o conteúdo da janela seja capturado por outros aplicativos",
             "Electron.enableHardwareAcceleration": "Ativar a aceleração de hardware (reinicie %(appName)s para fazer efeito)",
             "always_show_menu_bar": "Mostrar a barra de menu na janela",
             "autocomplete_delay": "Atraso no preenchimento automático (ms)",
@@ -2817,6 +2877,7 @@
             "composer_heading": "Campo de texto",
             "default_timezone": "Navegador padrão (%(timezone)s)",
             "dialog_title": "<strong>Configurações:</strong> Preferências",
+            "enable_content_protection": "Habilitar a proteção de conteúdo",
             "enable_hardware_acceleration": "Habilitar aceleração de hardware",
             "enable_tray_icon": "Mostrar o ícone da bandeja e minimizar a janela ao fechar",
             "keyboard_heading": "Teclas de atalho do teclado",
@@ -2830,6 +2891,7 @@
             "room_list_heading": "Lista de salas",
             "show_avatars_pills": "Mostrar avatares em menções de usuários, salas e eventos",
             "show_polls_button": "Mostrar botão de enquetes",
+            "startup_window_behaviour_label": "Inicialização e comportamento da janela",
             "surround_text": "Circule o texto selecionado ao digitar caracteres especiais",
             "time_heading": "Exibindo tempo",
             "user_timezone": "Definir fuso horário"
@@ -2850,7 +2912,6 @@
             "ignore_users_empty": "Você não tem usuários ignorados.",
             "ignore_users_section": "Usuários bloqueados",
             "key_backup_algorithm": "Algoritmo:",
-            "key_backup_connect": "Autorize esta sessão a fazer o backup de chaves",
             "message_search_disable_warning": "Se desativado, as mensagens de salas criptografadas não aparecerão em resultados de buscas.",
             "message_search_disabled": "Armazene mensagens criptografadas de forma segura localmente para que possam aparecer nos resultados das buscas.",
             "message_search_enabled": {
@@ -2981,6 +3042,7 @@
         "show_chat_effects": "Mostrar efeitos na conversa (por exemplo: animações ao receber confetes)",
         "show_displayname_changes": "Mostrar alterações de nome e sobrenome",
         "show_join_leave": "Mostrar mensagens de entrada/saída (convites/remoções/bans não são afetados)",
+        "show_message_previews": "Mostrar prévias de mensagens",
         "show_nsfw_content": "Mostrar conteúdo NSFW (\"Não seguro para o trabalho\")",
         "show_read_receipts": "Mostrar confirmações de leitura dos outros usuários",
         "show_redaction_placeholder": "Mostrar um marcador para as mensagens removidas",
@@ -3003,7 +3065,12 @@
             "spaces_explainer": "Os espaços são formas de agrupar salas e pessoas. Além dos espaços em que você está, você também pode usar alguns pré-construídos.",
             "title": "Barra lateral"
         },
-        "start_automatically": "Iniciar automaticamente ao iniciar o sistema",
+        "start_automatically": {
+            "disabled": "Não",
+            "enabled": "Sim",
+            "label": "Abra %(brand)s quando você entrar no seu computador.",
+            "minimised": "Minimizado"
+        },
         "tac_only_notifications": "Mostrar apenas notificações no centro de atividades do tópico",
         "use_12_hour_format": "Mostrar os horários em formato de 12h (p.ex: 2:30pm)",
         "use_command_enter_send_message": "Usar Command + Enter para enviar uma mensagem",
@@ -3087,6 +3154,8 @@
         "jumptodate": "Ir para a data especificada na linha do tempo",
         "jumptodate_invalid_input": "Não foi possível entender a data fornecida (%(inputDate)s). Tente usando o formato AAAA-MM-DD.",
         "lenny": "Adiciona ( ͡° ͜ʖ ͡°) a uma mensagem de texto",
+        "manual_device_verification_confirm_description": "Isso permitirá que outro dispositivo envie e receba mensagens como você. SE ALGUÉM LHE DISSE PARA COLAR ALGO AQUI, É PROVÁVEL QUE VOCÊ ESTEJA SENDO ENGANADO! Tem certeza de que deseja verificar esse outro dispositivo?",
+        "manual_device_verification_confirm_title": "Cuidado: verificação manual do dispositivo",
         "me": "Visualizar atividades",
         "msg": "Envia uma mensagem para determinada pessoa",
         "myavatar": "Altera a foto do seu perfil em todas as salas",
@@ -3127,6 +3196,7 @@
         "upgraderoom": "Atualiza a sala para uma nova versão",
         "upgraderoom_permission_error": "Você não tem as permissões necessárias para usar este comando.",
         "usage": "Uso",
+        "verify": "Verifique manualmente um de seus próprios dispositivos",
         "view": "Visualizações da sala com o endereço fornecido",
         "whois": "Exibe informação sobre um usuário"
     },
@@ -3368,6 +3438,7 @@
             "unable_to_find": "Não foi possível carregar um trecho específico da conversa desta sala."
         },
         "m.audio": {
+            "audio_player": "Reprodutor de Áudio",
             "error_downloading_audio": "Erro ao baixar o áudio",
             "error_processing_audio": "Erro ao processar a mensagem de áudio",
             "error_processing_voice_message": "Erro ao processar a mensagem de voz",
@@ -3429,7 +3500,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Encerrou uma enquete",
             "sender_ended": "%(senderName)s encerrou uma enquete"
         },
         "m.poll.start": "%(senderName)s começou uma enquete - %(pollQuestion)s",
@@ -3721,8 +3791,8 @@
                 "other": "%(severalUsers)salterado o <a>mensagens fixadas</a> para a sala %(count)s vezes"
             },
             "redacted": {
-                "one": "%(oneUser)sremoveu uma mensagem",
-                "other": "%(oneUser)sremoveu %(count)s mensagens"
+                "one": "%(oneUser)s removeu uma mensagem",
+                "other": "%(oneUser)s removeu %(count)s mensagens"
             },
             "redacted_multiple": {
                 "one": "%(severalUsers)s removeu uma mensagem",
@@ -3928,12 +3998,12 @@
         "connection_lost": "A conectividade com o servidor foi perdida",
         "connection_lost_description": "Você não pode fazer chamadas sem uma conexão com o servidor.",
         "consulting": "Consultar com %(transferTarget)s. Tranferir para <a> %(transferee)s</a>",
+        "decline_call": "Recusar",
         "default_device": "Aparelho padrão",
         "dial": "Discar",
         "dialpad": "Teclado de discagem",
         "disable_camera": "Desligar câmera",
         "disable_microphone": "Silenciar microfone",
-        "disabled_no_one_here": "Não há ninguém aqui para ligar",
         "disabled_no_perms_start_video_call": "Você não tem permissão para iniciar chamadas de vídeo",
         "disabled_no_perms_start_voice_call": "Você não tem permissão para iniciar chamadas de voz",
         "disabled_ongoing_call": "Chamada em andamento",
@@ -3980,6 +4050,7 @@
         "show_sidebar_button": "Exibir a barra lateral",
         "silence": "Silenciar chamado",
         "silenced": "Notificações silenciadas",
+        "skip_lobby_toggle_option": "Junte-se imediatamente",
         "start_screenshare": "Começar a compartilhar sua tela",
         "stop_screenshare": "Parar de compartilhar sua tela",
         "too_many_calls": "Muitas chamadas",
@@ -4000,9 +4071,11 @@
         "user_busy_description": "O usuário que você chamou está ocupado.",
         "user_is_presenting": "%(sharerName)s está apresentando",
         "video_call": "Chamada de vídeo",
+        "video_call_incoming": "Chamada de vídeo recebida",
         "video_call_started": "Videochamada iniciada",
         "video_call_using": "Chamada de vídeo usando:",
         "voice_call": "Chamada de voz",
+        "voice_call_incoming": "Chamada de voz recebida",
         "you_are_presenting": "Você está apresentando"
     },
     "web_default_device_name": "%(appName)s: %(browserName)s em %(osName)s",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 108d2e0cd8..a4d54eddeb 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -11,6 +11,19 @@
             "other": "%(count)s непрочитанных сообщения(-й), включая упоминания.",
             "one": "1 непрочитанное упоминание."
         },
+        "recent_rooms": "Недавние комнаты",
+        "room_messsage_not_sent": "Открыть комнату %(roomName)s с неотправленным сообщением.",
+        "room_n_unread_invite": "Открыть приглашение в комнату %(roomName)s.",
+        "room_n_unread_messages": {
+            "one": "Открыть комнату %(roomName)s с 1 непрочитанным сообщением.",
+            "few": "Открыть комнату %(roomName)s с %(count)s непрочитанными сообщениями.",
+            "many": "Открыть комнату %(roomName)s с %(count)s непрочитанными сообщениями."
+        },
+        "room_n_unread_messages_mentions": {
+            "one": "Открыть комнату %(roomName)s с 1 непрочитанным упоминанием.",
+            "few": "Открыть комнату %(roomName)s с %(count)s непрочитанными упоминаниями.",
+            "many": "Открыть комнату %(roomName)s с %(count)s непрочитанными упоминаниями."
+        },
         "room_name": "Комната %(name)s",
         "room_status_bar": "Строка состояния комнаты",
         "seek_bar_label": "Панель поиска аудио",
@@ -44,6 +57,8 @@
         "create_a_room": "Создать комнату",
         "create_account": "Создать учётную запись",
         "decline": "Отклонить",
+        "decline_and_block": "Отклонить и заблокировать",
+        "decline_invite": "Отклонить приглашение",
         "delete": "Удалить",
         "deny": "Запретить",
         "disable": "Отключить",
@@ -80,7 +95,7 @@
         "maximise": "Развернуть",
         "mention": "Упомянуть",
         "minimise": "Свернуть",
-        "new_message": "Новое сообщение",
+        "new_conversation": "Новый диалог",
         "new_room": "Новая комната",
         "new_video_room": "Новая видеокомната",
         "next": "Далее",
@@ -102,6 +117,7 @@
         "reply": "Ответить",
         "reply_in_thread": "Обсудить",
         "report_content": "Пожаловаться на сообщение",
+        "report_room": "Комната отчетов",
         "resend": "Переотправить",
         "reset": "Сброс",
         "resume": "Возобновить",
@@ -143,6 +159,7 @@
         "view_message": "Посмотреть сообщение",
         "view_source": "Исходный код",
         "yes": "Да",
+        "yes_dismiss": "Да, отклонить",
         "zoom_in": "Увеличить",
         "zoom_out": "Уменьшить"
     },
@@ -225,8 +242,7 @@
             "setup_key_backup_title": "Вы потеряете доступ к вашим шифрованным сообщениям",
             "setup_secure_backup_description_1": "Эти сообщения защищены сквозным шифрованием. Только вы и ваш собеседник имеете ключи для их расшифровки и чтения.",
             "setup_secure_backup_description_2": "При выходе эти ключи будут удалены с данного устройства и вы больше не сможете прочитать зашифрованные сообщения, если у вас нет ключей для них на других устройствах или резервной копии на сервере.",
-            "skip_key_backup": "Мне не нужны мои зашифрованные сообщения",
-            "use_key_backup": "Использовать резервную копию ключей шифрования"
+            "skip_key_backup": "Мне не нужны мои зашифрованные сообщения"
         },
         "misconfigured_body": "Попросите администратора %(brand)s проверить <a>конфигурационный файл</a> на наличие неправильных или повторяющихся записей.",
         "misconfigured_title": "Ваш %(brand)s неправильно настроен",
@@ -257,6 +273,7 @@
             "error_expired": "Срок действия входа истек. Пожалуйста, попробуйте еще раз.",
             "error_expired_title": "Вход в систему не был завершён вовремя",
             "error_insecure_channel_detected": "Не удалось установить безопасное соединение с новым устройством. Существующие устройства по-прежнему в безопасности, и вам не нужно беспокоиться о них.",
+            "error_insecure_channel_detected_instructions": "Что дальше?",
             "error_insecure_channel_detected_instructions_1": "Попробуйте снова войти на другое устройство с помощью QR-кода, если возникла проблема с сетью",
             "error_insecure_channel_detected_instructions_2": "Если вы столкнулись с аналогичной проблемой, попробуйте переподключиться к сети Wi-Fi или используйте мобильный интернет",
             "error_insecure_channel_detected_instructions_3": "Если это не помогло, войдите вручную.",
@@ -371,6 +388,7 @@
             "fallback_button": "Начать аутентификацию",
             "mas_cross_signing_reset_cta": "Перейти к учетной записи",
             "mas_cross_signing_reset_description": "Сбросьте свои данные через поставщика учетной записи, а затем вернитесь и нажмите «Повторить».",
+            "mas_cross_signing_reset_title": "Перейдите в свою учетную запись, чтобы сбросить свою личность",
             "msisdn": "Текстовое сообщение отправлено на %(msisdn)s",
             "msisdn_token_incorrect": "Неверный код проверки",
             "msisdn_token_prompt": "Введите полученный код:",
@@ -507,8 +525,10 @@
         "matrix": "Matrix",
         "message": "Отправить личное сообщение",
         "message_layout": "Макет сообщения",
+        "message_timestamp_invalid": "Недопустимая метка времени",
         "microphone": "Микрофон",
         "model": "Модель",
+        "moderation_and_safety": "Модерация и безопасность",
         "modern": "Современный",
         "mute": "Приглушить",
         "n_members": {
@@ -560,7 +580,7 @@
         "setup_secure_messages": "Настроить безопасные сообщения",
         "show_more": "Показать больше",
         "someone": "Кто-то",
-        "space": "Подпространство",
+        "space": "Пространство",
         "spaces": "Пространства",
         "sticker": "Стикер",
         "stickerpack": "Набор стикеров",
@@ -582,12 +602,12 @@
         "user": "Пользователь",
         "user_avatar": "Аватар",
         "username": "Имя пользователя",
-        "verification_cancelled": "Подтверждение отменено",
         "verified": "Заверено",
         "version": "Версия",
         "video": "Видео",
         "video_room": "Видеокомната",
         "view_message": "Посмотреть сообщение",
+        "voice": "Голос",
         "warning": "Внимание"
     },
     "composer": {
@@ -628,16 +648,17 @@
         "mode_plain": "Скрыть форматирование",
         "mode_rich_text": "Показать форматирование",
         "no_perms_notice": "Вы не можете писать в эту комнату",
-        "placeholder": "Отправить сообщение…",
+        "placeholder": "Отправить незашифрованное сообщение...",
         "placeholder_encrypted": "Отправить зашифрованное сообщение…",
-        "placeholder_reply": "Отправить ответ…",
-        "placeholder_reply_encrypted": "Отправить зашифрованный ответ…",
-        "placeholder_thread": "Ответить на обсуждение…",
-        "placeholder_thread_encrypted": "Ответить на зашифрованное обсуждение…",
+        "placeholder_reply": "Отправить незашифрованный ответ…",
+        "placeholder_reply_encrypted": "Отправить ответ…",
+        "placeholder_thread": "Ответить в небезопасном обсуждение…",
+        "placeholder_thread_encrypted": "Ответить в обсуждение…",
         "poll_button": "Опрос",
         "poll_button_no_perms_description": "У вас нет разрешения начинать опросы в этой комнате.",
         "poll_button_no_perms_title": "Требуется разрешение",
         "replying_title": "Отвечает",
+        "room_unencrypted": "Сообщения в этой комнате не защищены сквозным шифрованием.",
         "room_upgraded_link": "Разговор продолжается здесь.",
         "room_upgraded_notice": "Эта комната заменена и более неактивна.",
         "send_button_title": "Отправить сообщение",
@@ -701,6 +722,7 @@
         "personal_space_description": "Приватное пространство для организации ваших комнат",
         "private_description": "Только по приглашениям, лучший вариант для себя или команды",
         "private_heading": "Ваше приватное пространство",
+        "private_only_heading": "Ваше пространство",
         "private_personal_description": "Убедитесь, что правильные люди имеют доступ к %(name)s",
         "private_personal_heading": "С кем вы работаете?",
         "private_space": "Я и мои товарищи по команде",
@@ -731,6 +753,13 @@
         "twemoji": "<twemoji>Изображение смайликов Twemoji</twemoji> © <author> Twitter, Inc и другие авторы </author> используются в соответствии с условиями <terms> CC-BY 4.0</terms>.",
         "twemoji_colr": "<colr>twemoji-colr</colr> шрифт от автора © <author>Mozilla Foundation</author> используется на условиях <terms>Apache 2.0</terms>."
     },
+    "decline_invitation_dialog": {
+        "confirm": "Вы действительно хотите отклонить приглашение присоединиться \"%(roomName)s\"?",
+        "ignore_user_help": "Вы не увидите сообщений или приглашений в комнату от этого пользователя.",
+        "reason_description": "Опишите причину сообщения о проблеме.",
+        "report_room_description": "Сообщите об этой комнате своему поставщику учетной записи.",
+        "title": "Отклонить приглашение"
+    },
     "desktop_default_device_name": "%(brand)s Рабочий стол: %(platformName)s",
     "devtools": {
         "active_widgets": "Активные виджеты",
@@ -741,29 +770,55 @@
         "crypto": {
             "4s_public_key_in_account_data": "в данных учётной записи",
             "4s_public_key_not_in_account_data": "не найдено",
+            "4s_public_key_status": "Публичный ключ секретного хранилища:",
+            "backup_key_cached": "сохранено локально",
             "backup_key_cached_status": "Кэшированный резервный ключ:",
+            "backup_key_not_stored": "не сохранено",
+            "backup_key_stored": "в секретном хранилище",
             "backup_key_stored_status": "Сохраненный резервный ключ:",
+            "backup_key_unexpected_type": "непредвиденный тип",
             "backup_key_well_formed": "корректный",
             "cross_signing": "Кросс-подпись",
             "cross_signing_cached": "сохранено локально",
             "cross_signing_not_ready": "Кросс-подпись не настроена.",
+            "cross_signing_private_keys_in_storage": "в секретном хранилище",
             "cross_signing_private_keys_in_storage_status": "Приватные ключи для кросс-подписи:",
             "cross_signing_private_keys_not_in_storage": "не найдено в хранилище",
+            "cross_signing_public_keys_on_device": "в памяти",
             "cross_signing_public_keys_on_device_status": "Публичные ключи для кросс-подписи:",
             "cross_signing_ready": "Кросс-подпись готова к использованию.",
             "cross_signing_status": "Статус кросс-подписи:",
             "cross_signing_untrusted": "У вашей учётной записи есть кросс-подпись в секретное хранилище, но она пока не является доверенной в этом сеансе.",
             "crypto_not_available": "Криптографический модуль недоступен",
+            "device_id": "Идентификатор устройства",
             "key_backup_active_version": "Активная резервная версия:",
             "key_backup_active_version_none": "Нет",
             "key_backup_inactive_warning": "Резервное копирование ваших ключей из этого сеанса не выполняется.",
+            "key_backup_latest_version": "Последняя версия резервной копии на сервере:",
             "key_storage": "Хранилище ключей",
             "master_private_key_cached_status": "Приватный мастер-ключ:",
+            "not_found": "не найдено",
+            "not_found_locally": "не найдено локально",
+            "secret_storage_not_ready": "не готов",
             "secret_storage_ready": "готово",
-            "title": "Сквозное шифрование"
+            "secret_storage_status": "Секретное хранилище:",
+            "self_signing_private_key_cached_status": "Самоподписанный закрытый ключ:",
+            "session": "Сессия",
+            "session_fingerprint": "Отпечаток пальца (ключ сессии)",
+            "title": "Сквозное шифрование",
+            "user_signing_private_key_cached_status": "Закрытый ключ подписи пользователей:"
         },
         "developer_mode": "Режим разработчика",
         "developer_tools": "Инструменты разработчика",
+        "device_id": "ID устройства: %(deviceId)s",
+        "device_keys": "Ключи устройств",
+        "device_verification_status": {
+            "signed_by_owner": "Статус проверки: <E2EIcon /> Подписано владельцем",
+            "unknown": "Статус проверки: Неизвестно",
+            "unverified": "Статус проверки:<E2EIcon /> Не подписано владельцем",
+            "verified": "Статус проверки:<E2EIcon /> Подтверждено перекрестной подписью"
+        },
+        "devices": "Криптографические устройства (%(count)s )",
         "edit_setting": "Изменить настройки",
         "edit_values": "Редактировать значения",
         "empty_string": "<empty string>",
@@ -779,15 +834,18 @@
         "failed_to_save": "Не удалось сохранить настройки.",
         "failed_to_send": "Не удалось отправить событие!",
         "id": "ID: ",
+        "invalid_device_key_id": "Неверный ключа ID устройства",
         "invalid_json": "Не похоже на действующий JSON.",
         "level": "Уровень",
         "low_bandwidth_mode": "Режим низкой пропускной способности",
         "low_bandwidth_mode_description": "Требуется совместимый сервер.",
         "main_timeline": "Основная хронология",
+        "manual_device_verification": "Ручная проверка устройства",
         "no_receipt_found": "Квитанция не найдена",
         "notification_state": "Состояние уведомления <strong>%(notificationState)s</strong>",
         "notifications_debug": "Отладка уведомлений",
         "number_of_users": "Количество пользователей",
+        "only_joined_members": "Только зарегистрированные пользователи",
         "original_event_source": "Оригинальный исходный код",
         "room_encrypted": "Комната <strong> зашифрована ✅</strong>",
         "room_id": "ID комнаты: %(roomId)s",
@@ -801,9 +859,9 @@
         "room_notifications_type": "Тип: ",
         "room_status": "Статус комнаты",
         "room_unread_status_count": {
-            "one": "Статус непрочитанной комнаты: %(status)s%(status)s</strong>, количество: <strong>%(count)s</strong>",
-            "few": "Статус непрочитанных комнат: %(status)s%(status)s</strong>, количество: <strong>%(count)s</strong>",
-            "many": "Статус непрочитанных комнат: %(status)s%(status)s</strong>, количество: <strong>%(count)s</strong>"
+            "one": "Статус непрочитанной комнаты: <strong>%(status)s</strong>, количество: <strong>%(count)s</strong>",
+            "few": "Статус непрочитанных комнат: <strong>%(status)s</strong>, количество: <strong>%(count)s</strong>",
+            "many": "Статус непрочитанных комнат: <strong>%(status)s</strong>, количество: <strong>%(count)s</strong>"
         },
         "save_setting_values": "Сохранить значения настроек",
         "see_history": "Посмотреть историю",
@@ -818,7 +876,11 @@
         "setting_colon": "Настройки:",
         "setting_definition": "Установка определения:",
         "setting_id": "ID настроек",
+        "settings": {
+            "elementCallUrl": "URL-адрес Element Call"
+        },
         "settings_explorer": "Посмотреть настройки",
+        "show_empty_content_events": "Показывать события с пустым содержимым",
         "show_hidden_events": "Показывать скрытые события в ленте сообщений",
         "spaces": {
             "one": "<space>",
@@ -827,15 +889,28 @@
         },
         "state_key": "Ключ состояния",
         "thread_root_id": "Идентификатор Root ID: %(threadRootId)s",
-        "threads_timeline": "Хронология тем",
+        "threads_timeline": "Хронология обсуждений",
         "title": "Инструменты разработчика",
         "toggle_event": "переключить событие",
         "toolbox": "Панель инструментов",
         "use_at_own_risk": "Этот пользовательский интерфейс НЕ проверяет типы значений. Используйте на свой страх и риск.",
+        "user_avatar": "Аватар: %(avatar)s",
+        "user_displayname": "Отображаемое имя: %(displayname)s",
+        "user_id": "ID пользователя: %(userId)s",
+        "user_no_avatar": "Аватар: <i>Нет</i>",
+        "user_no_displayname": "Отображаемое имя: <i>Отсутствует</i>",
         "user_read_up_to": "Пользователь прочитал до: ",
         "user_read_up_to_ignore_synthetic": "Пользователь прочитал до (IgnoreSynthetic): ",
         "user_read_up_to_private": "Пользователь прочитал до (m.read.private): ",
         "user_read_up_to_private_ignore_synthetic": "Пользователь прочитал до (m.read.private; ignoreSynthetic): ",
+        "user_room_membership": "Членство: %(membership)s",
+        "user_verification_status": {
+            "identity_changed": "Статус проверки:<E2EIcon /> Не проверено, и личность изменена",
+            "unverified": "Статус проверки: <E2EIcon /> Непроверено",
+            "verified": "Статус проверки: <E2EIcon /> Проверено",
+            "was_verified": "Статус проверки: <E2EIcon /> Был проверен, но личность изменилась"
+        },
+        "users": "Пользователи",
         "value": "Значение",
         "value_colon": "Значение:",
         "value_in_this_room": "Значение в этой комнате",
@@ -871,15 +946,16 @@
     "empty_room_was_name": "Пустая комната (без %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
+            "alternatives": "Если у вас есть ключ безопасности или защитная фраза, это тоже подойдет.",
             "key_validation_text": {
-                "wrong_security_key": "Неправильный ключ восстановления"
+                "wrong_security_key": "Введенный ключ восстановления неверен."
             },
+            "privacy_warning": "Убедитесь, что никто не видит этот экран!",
             "restoring": "Восстановление ключей из резервной копии",
-            "security_key_title": "Ключ восстановления"
+            "security_key_label": "Ключ восстановления",
+            "security_key_title": "Введите ключ восстановления"
         },
         "bootstrap_title": "Настройка ключей",
-        "cancel_entering_passphrase_description": "Вы уверены, что хотите отменить ввод кодовой фразы?",
-        "cancel_entering_passphrase_title": "Отменить ввод кодовой фразы?",
         "confirm_encryption_setup_body": "Нажмите кнопку ниже, чтобы подтвердить настройку шифрования.",
         "confirm_encryption_setup_title": "Подтвердите настройку шифрования",
         "cross_signing_room_normal": "Эта комната зашифрована сквозным шифрованием",
@@ -890,6 +966,7 @@
         "cross_signing_user_warning": "Этот пользователь не подтвердил все свои сеансы.",
         "enter_recovery_key": "Введите ключ восстановления",
         "event_shield_reason_authenticity_not_guaranteed": "Подлинность этого зашифрованного сообщения не может быть гарантирована на этом устройстве.",
+        "event_shield_reason_mismatched_sender": "Отправитель события и владелец устройства не совпадают.",
         "event_shield_reason_mismatched_sender_key": "Зашифровано неподтверждённым сеансом",
         "event_shield_reason_unknown_device": "Зашифровано неизвестным или удаленным устройством.",
         "event_shield_reason_unsigned_device": "Зашифровано устройством, не проверенным владельцем.",
@@ -914,20 +991,22 @@
             "title": "Новый метод восстановления",
             "warning": "Если вы не задали новый способ восстановления, злоумышленник может получить доступ к вашей учётной записи. Смените пароль учётной записи и сразу же задайте новый способ восстановления в настройках."
         },
+        "pinned_identity_changed": "Идентичность %(displayName)s (<b>%(userId)s</b>), похоже, изменилась. <a>Узнать больше</a>",
+        "pinned_identity_changed_no_displayname": "Похоже, что личность <b>%(userId)s</b> изменилась. <a>Узнайте больше</a>",
         "recovery_method_removed": {
             "description_1": "Этот сеанс обнаружил, что ваши секретная фраза и ключ безопасности для защищенных сообщений были удалены.",
             "description_2": "Если вы сделали это по ошибке, вы можете настроить защищённые сообщения в этом сеансе, что снова зашифрует историю сообщений в этом сеансе с помощью нового метода восстановления.",
             "title": "Метод восстановления удален",
             "warning": "Если вы не убрали метод восстановления, злоумышленник может получить доступ к вашей учётной записи. Смените пароль учётной записи и сразу задайте новый способ восстановления в настройках."
         },
-        "reset_all_button": "Забыли или потеряли все варианты восстановления? <a>Сбросить всё</a>",
         "set_up_recovery": "Настроить восстановление",
-        "set_up_recovery_later": "Не сейчас",
-        "set_up_toast_description": "Защита от потери доступа к зашифрованным сообщениям и данным",
+        "set_up_recovery_toast_description": "Создайте ключ восстановления, который можно использовать для восстановления зашифрованной истории сообщений в случае потери доступа к своим устройствам.",
         "set_up_toast_title": "Настроить безопасное резервное копирование",
         "setup_secure_backup": {
             "explainer": "Перед выходом сохраните резервную копию ключей шифрования, чтобы не потерять их."
         },
+        "turn_on_key_storage": "Включить хранилище ключей",
+        "turn_on_key_storage_description": "Безопасно храните свои криптографические идентификационные данные и ключи сообщений на сервере. Это позволит вам просматривать историю сообщений на любых новых устройствах.",
         "udd": {
             "interactive_verification_button": "Интерактивная сверка по смайлам",
             "other_ask_verify_text": "Попросите этого пользователя подтвердить сеанс или подтвердите его вручную ниже.",
@@ -942,16 +1021,17 @@
             "after_new_login": {
                 "device_verified": "Сеанс заверен",
                 "skip_verification": "Пока пропустить проверку",
-                "unable_to_verify": "Невозможно заверить этот сеанс",
                 "verify_this_device": "Заверьте этот сеанс"
             },
-            "cancelled": "Вы отменили подтверждение.",
-            "cancelled_self": "Вы отменили проверку на другом устройстве.",
-            "cancelled_user": "%(displayName)s отменил(а) подтверждение.",
+            "cancelled_verification": "Время ожидания подтверждения истекло, запрос был отклонён, или при подтверждении произошло несоответствие.",
             "cancelling": "Отмена…",
+            "cant_confirm": "Не можете подтвердить?",
             "complete_action": "Понятно",
             "complete_description": "Вы успешно подтвердили этого пользователя.",
             "complete_title": "Верифицировано!",
+            "confirm_identity_description": "Подтвердите это устройство, чтобы настроить безопасный обмен сообщениями.",
+            "confirm_identity_title": "Подтвердите свою личность",
+            "confirm_the_emojis": "Убедитесь, что приведенные ниже эмодзи совпадают с эмодзи показанными на другом устройстве.",
             "error_starting_description": "Нам не удалось начать чат с другим пользователем.",
             "error_starting_title": "Ошибка при запуске подтверждения",
             "explainer": "Сообщения с этим пользователем защищены сквозным шифрованием и недоступны третьим лицам.",
@@ -962,66 +1042,83 @@
             "incoming_sas_dialog_waiting": "Ожидаем подтверждения от партнера…",
             "incoming_sas_user_dialog_text_1": "Проверить этого пользователя, чтобы отметить его, как доверенного. Доверенные пользователи дают вам больше уверенности при использовании шифрованных сообщений.",
             "incoming_sas_user_dialog_text_2": "Подтверждение этого пользователя сделает его сеанс доверенным у вас, а также сделает ваш сеанс доверенным у него.",
-            "no_key_or_device": "Похоже, у вас нет бумажного ключа, или других сеансов, с которыми вы могли бы свериться.  В этом сеансе вы не сможете получить доступ к старым зашифрованным сообщениям. Чтобы подтвердить свою личность в этом сеансе, вам нужно будет сбросить свои ключи шифрования.",
+            "manual": {
+                "already_verified": "Это устройство уже проверено",
+                "already_verified_and_wrong_fingerprint": "Предоставленный отпечаток пальца не совпадает, но устройство уже проверено!",
+                "device_id": "Идентификатор устройства",
+                "failure_description": "Не удалось проверить '%(deviceId)s': %(error)s",
+                "failure_title": "Сбой проверки",
+                "fingerprint": "Отпечаток пальца (ключ сессии)",
+                "no_crypto": "Невозможно проверить устройство — шифрование не включено",
+                "no_device": "Не удалось проверить устройство — устройство %(deviceId)s '' не найдено",
+                "no_userid": "Невозможно проверить устройство — не удается найти идентификатор пользователя",
+                "success_description": "Теперь устройство (%(deviceId)s) имеет перекрестную подпись",
+                "success_title": "Проверка прошла успешно",
+                "text": "Предоставьте идентификатор и отпечаток пальца одного из ваших устройств, чтобы подтвердить это. ПРИМЕЧАНИЕ. Это позволяет другому устройству отправлять и получать сообщения так же, как и вы. ЕСЛИ КТО-ТО СКАЗАЛ ВАМ ЧТО-ТО ВСТАВИТЬ СЮДА, СКОРЕЕ ВСЕГО, ВАС ОБМАНУЛИ!",
+                "wrong_fingerprint": "Не удалось проверить устройство \"%(deviceId)s\" - предоставленный ключ проверки \"%(fingerprint)s\" не совпадает с ключом проверки устройства \"%(fprint)s\"."
+            },
             "no_support_qr_emoji": "Устройство, которое вы пытаетесь проверить, не поддерживает сканирование QR-кода или проверку смайликов, которые поддерживает %(brand)s. Попробуйте использовать другой клиент.",
+            "now_you_can": "Теперь вы можете безопасно читать и отправлять сообщения, и все, с кем вы общаетесь в чате, также могут доверять этому устройству.",
+            "once_accepted_can_continue": "После одобрения вы сможете продолжить проверку.",
             "other_party_cancelled": "Другая сторона отменила проверку.",
             "prompt_encrypted": "Подтвердите всех пользователей в комнате, чтобы обеспечить безопасность.",
-            "prompt_self": "Начните подтверждение заново с уведомления.",
             "prompt_unencrypted": "В зашифрованных комнатах, проверьте всех пользователей, чтобы убедиться в их безопасности.",
-            "prompt_user": "Начните подтверждение заново в профиле пользователя.",
             "qr_or_sas": "%(qrCode)s или %(emojiCompare)s",
-            "qr_or_sas_header": "Заверьте этот сеанс, выполнив одно из следующих действий:",
             "qr_prompt": "Отсканируйте этот уникальный код",
-            "qr_reciprocate_same_shield_device": "Почти готово! На другом устройстве отображается такой же щит?",
+            "qr_reciprocate_check_again_device": "Повторите попытку на другом устройстве, чтобы завершить проверку.",
+            "qr_reciprocate_no": "Нет, я не вижу зеленый щит",
             "qr_reciprocate_same_shield_user": "Почти готово! Отображает ли %(displayName)s такой же щит?",
-            "request_toast_accept": "Проверка сеанса",
+            "qr_reciprocate_yes": "Да, я вижу зеленый щит",
             "request_toast_accept_user": "Подтвердить пользователя",
             "request_toast_decline_counter": "Игнорировать (%(counter)s)",
             "request_toast_detail": "%(deviceId)s с %(ip)s",
-            "reset_proceed_prompt": "Выполнить сброс",
+            "request_toast_start_verification": "Начать проверку",
             "sas_caption_self": "Проверьте это устройство, убедившись, что на его экране отображается следующее число.",
             "sas_caption_user": "Подтвердите пользователя, убедившись, что на его экране отображается следующее число.",
             "sas_description": "Сравните уникальный набор смайликов, если у вас нет камеры ни на одном из устройств",
-            "sas_emoji_caption_self": "Убедитесь, что приведённые ниже смайлики отображаются в обоих сеансах в одинаковом порядке:",
             "sas_emoji_caption_user": "Проверьте собеседника, убедившись, что на его экране отображаются следующие символы (смайлы).",
             "sas_match": "Они совпадают",
             "sas_no_match": "Они не совпадают",
             "sas_prompt": "Сравнитe уникальныe смайлики",
             "scan_qr": "Подтверждение сканированием",
             "scan_qr_explainer": "Попросите %(displayName)s отсканировать ваш код:",
-            "self_verification_hint": "Чтобы продолжить, пожалуйста, примите запрос на сверку в другом сеансе.",
             "start_button": "Начать проверку",
-            "successful_device": "Вы успешно подтвердили %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "Вы успешно подтвердили это устройство!",
             "successful_user": "Вы успешно подтвердили %(displayName)s!",
-            "timed_out": "Таймаут подтверждения.",
             "unsupported_method": "Невозможно определить поддерживаемый метод верификации.",
             "unverified_session_toast_accept": "Да, это я",
             "unverified_session_toast_title": "Новый вход в вашу учётную запись. Это были Вы?",
             "unverified_sessions_toast_description": "Проверьте, чтобы убедиться, что ваша учётная запись в безопасности",
             "unverified_sessions_toast_reject": "Позже",
             "unverified_sessions_toast_title": "У вас есть незаверенные сеансы",
-            "verification_description": "Подтвердите свою личность, чтобы получить доступ к зашифрованным сообщениям и доказать свою личность другим.",
+            "use_another_device": "Используйте другое устройство",
+            "use_recovery_key": "Используйте recovery key",
+            "verification_dialog_title_choose": "Выберите способ проверки",
+            "verification_dialog_title_compare_emojis": "Сравните емодзи",
+            "verification_dialog_title_confirm_green_shield": "Убедитесь, что на другом устройстве вы видите зеленый щит.",
             "verification_dialog_title_device": "Проверить другое устройство",
+            "verification_dialog_title_failed": "Сбой проверки",
+            "verification_dialog_title_start_on_other_device": "Начать проверку на другом устройстве",
             "verification_dialog_title_user": "Запрос на сверку",
+            "verification_dialog_title_verified": "Устройство проверено",
             "verification_skip_warning": "Без проверки вы не сможете получить доступ ко всем своим сообщениям и можете показаться другим людям недоверенным.",
             "verification_success_with_backup": "Ваш новый сеанс заверен. Он имеет доступ к вашим зашифрованным сообщениям, и другие пользователи будут видеть его как заверенный.",
             "verification_success_without_backup": "Ваш новый сеанс заверен. Другие пользователи будут видеть его как заверенный.",
+            "verify_by_completing_one_of": "Подтвердите, выполнив одно из следующих действий:",
             "verify_emoji": "Подтверждение с помощью смайлов",
             "verify_emoji_prompt": "Подтверждение сравнением уникальных смайлов.",
             "verify_emoji_prompt_qr": "Если вы не можете отсканировать код выше, попробуйте сравнить уникальные смайлы.",
             "verify_later": "Я заверю позже",
-            "verify_using_device": "Сверить с другим сеансом",
-            "verify_using_key": "Заверить бумажным ключом",
-            "verify_using_key_or_phrase": "Проверка с помощью ключа безопасности или фразы",
             "waiting_for_user_accept": "Ожидание принятия от %(displayName)s…",
             "waiting_other_device": "Ожидает проверки на другом устройстве…",
             "waiting_other_device_details": "Ожидает проверки на другом устройстве, %(deviceName)s (%(deviceId)s)…",
             "waiting_other_user": "Ожидание %(displayName)s для проверки…"
         },
         "verification_requested_toast_title": "Запрошено подтверждение",
+        "verified_identity_changed": "Подтвержденная личность %(displayName)s (<b>%(userId)s</b>) изменилась. <a>Узнайте больше</a>",
+        "verified_identity_changed_no_displayname": "<b>%(userId)s</b> личность была сброшена. <a>Узнать подробности</a>",
         "verify_toast_description": "Другие пользователи могут не доверять этому сеансу",
-        "verify_toast_title": "Заверьте этот сеанс"
+        "verify_toast_title": "Заверьте этот сеанс",
+        "withdraw_verification_action": "Подтверждение верификации"
     },
     "error": {
         "admin_contact": "Пожалуйста, <a>обратитесь к вашему администратору</a>, чтобы продолжить использовать этот сервис.",
@@ -1060,11 +1157,17 @@
         "tls": "Не удается подключиться к домашнему серверу — проверьте подключение, убедитесь, что ваш <a>SSL-сертификат домашнего сервера</a> является доверенным и что расширение браузера не блокирует запросы.",
         "unknown": "Неизвестная ошибка",
         "unknown_error_code": "неизвестный код ошибки",
+        "update_history_visibility": "Не удалось изменить видимость истории.",
         "update_power_level": "Не удалось изменить уровень прав"
     },
-    "error_app_open_in_another_tab": "%(brand)s был открыт в другой вкладке.",
+    "error_app_open_in_another_tab": "Переключитесь на другую вкладку, чтобы подключиться к %(brand)s . Теперь эту вкладку можно закрыть.",
+    "error_app_open_in_another_tab_title": "%(brand)s подключен в другой вкладке",
     "error_app_opened_in_another_window": "%(brand)s открыт в другом окне. Нажмите \"%(label)s\" чтобы использовать %(brand)s в данном окне и отключить другое.",
-    "error_database_closed_title": "База данных неожиданно закрылась",
+    "error_database_closed_description": {
+        "for_desktop": "Возможно, ваш диск переполнен. Освободите место и перезагрузите компьютер.",
+        "for_web": "Если вы очистили данные браузера, то это сообщение ожидаемо. %(brand)s также может быть открыт в другой вкладке, или ваш диск заполнен. Пожалуйста, освободите место и перезагрузите"
+    },
+    "error_database_closed_title": "%(brand)s перестал работать",
     "error_dialog": {
         "copy_room_link_failed": {
             "description": "Не удалось скопировать ссылку на комнату в буфер обмена.",
@@ -1098,8 +1201,13 @@
         "m.sticker": "%(senderName)s: %(stickerName)s",
         "m.text": "%(senderName)s: %(message)s",
         "prefix": {
-            "poll": "Опрос"
-        }
+            "audio": "Аудио",
+            "file": "Файл",
+            "image": "Изображение",
+            "poll": "Опрос",
+            "video": "Видео"
+        },
+        "preview": "<bold>%(prefix)s:</bold> %(preview)s"
     },
     "export_chat": {
         "cancelled": "Экспорт отменён",
@@ -1170,7 +1278,7 @@
         "platform_username": "Ваша платформа и имя пользователя будут отмечены, чтобы мы могли максимально использовать ваш отзыв.",
         "pro_type": "СОВЕТ ДЛЯ ПРОФЕССИОНАЛОВ: если вы запустите ошибку, отправьте <debugLogsLink>журналы отладки</debugLogsLink>, чтобы помочь нам отследить проблему.",
         "send_feedback_action": "Отправить отзыв",
-        "sent": "Отзыв отправлен"
+        "sent": "Отзыв отправлен! Спасибо, мы очень благодарны!"
     },
     "file_panel": {
         "empty_description": "Прикрепите файлы из чата или просто перетащите их в комнату.",
@@ -1191,6 +1299,7 @@
         "change": "Изменить сервер идентификации",
         "change_prompt": "Отключиться от сервера идентификации <current /> и вместо этого подключиться к <new />?",
         "change_server_prompt": "Если вы не хотите использовать <server /> для обнаружения вас и быть обнаруженным вашими существующими контактами, введите другой идентификационный сервер ниже.",
+        "changed": "Ваш сервер идентификации изменен",
         "checking": "Проверка сервера",
         "description_connected": "В настоящее время вы используете <server></server> для поиска вами ваших контактов а также вас вашими оппонентами. Вы можете изменить ваш сервер идентификации ниже.",
         "description_disconnected": "Вы в настоящее время не используете сервер идентификации. Чтобы найти известные вам контакты, и чтобы они могли найти вас, укажите сервер ниже.",
@@ -1222,12 +1331,17 @@
         "other": "В %(spaceName)s и %(count)s других пространствах."
     },
     "incompatible_browser": {
+        "continue": "Продолжить в любом случае",
+        "description": "%(brand)s использует некоторые функции браузера, которые недоступны в вашем текущем браузере. %(detail)s",
+        "detail_can_continue": "Если вы продолжите, некоторые функции могут перестать работать, и существует риск потери данных в будущем.",
         "detail_no_continue": "Попробуйте обновить этот браузер, если вы используете не последнюю версию, и повторите попытку.",
         "learn_more": "Подробнее",
         "linux": "Linux",
         "macos": "Mac",
+        "supported_browsers": "Для наилучшего впечатления используйте <Chrome>Chrome</Chrome>, <Firefox>Firefox</Firefox>, <Edge>Edge</Edge> или <Safari>Safari</Safari>.",
         "title": "Неподдерживаемый браузер",
         "use_desktop_heading": "Вместо этого используйте %(brand)s Desktop",
+        "use_mobile_heading": "Для этого используйте %(brand)s на мобильном телефоне",
         "use_mobile_heading_after_desktop": "Или воспользуйтесь нашим мобильным приложением",
         "windows_64bit": "Windows (64-бит)",
         "windows_arm_64bit": "Windows (ARM 64-бит)"
@@ -1240,8 +1354,8 @@
         "explainer": "Менеджеры по интеграции получают данные конфигурации и могут изменять виджеты, отправлять приглашения в комнаты и устанавливать уровни доступа от вашего имени.",
         "manage_title": "Управление интеграциями",
         "toggle_label": "Включить менеджер интеграции",
-        "use_im": "Используйте менеджер интеграций для управления ботами, виджетами и наклейками.",
-        "use_im_default": "Используйте менеджер интеграций <b>%(serverName)s</b> для управления ботами, виджетами и наклейками."
+        "use_im": "Используйте менеджер интеграций для управления ботами, виджетами и наборами стикеров.",
+        "use_im_default": "Используйте менеджер интеграций <b>%(serverName)s</b> для управления ботами, виджетами и наборами стикеров."
     },
     "integrations": {
         "disabled_dialog_description": "Включите '%(manageIntegrations)s' в Настройках.",
@@ -1283,7 +1397,11 @@
         "name_email_mxid_share_room": "Пригласите кого-нибудь, используя его имя, адрес электронной почты, имя пользователя (например, <userId/>) или <a>поделитесь этой комнатой</a>.",
         "name_email_mxid_share_space": "Пригласите кого-нибудь, используя их имя, адрес электронной почты, имя пользователя (например, <userId/>) или <a>поделитесь этим пространством</a>.",
         "name_mxid_share_room": "Пригласите кого-нибудь, используя его имя, имя пользователя (например, <userId/>) или <a>поделитесь этой комнатой</a>.",
-        "name_mxid_share_space": "Пригласите кого-нибудь, используя их имя, учётную запись (как <userId/>) или <a>поделитесь этим пространством</a>.",
+        "name_mxid_share_space": "Пригласите кого-нибудь, используя их отображаемое имя или имя учётной записи (например, <userId/>) или <a>поделитесь этим пространством</a>.",
+        "progress": {
+            "dont_close": "Не закрывайте приложение, до завершения.",
+            "preparing": "Подготовка приглашений..."
+        },
         "recents_section": "Недавние Диалоги",
         "room_failed_partial": "Мы отправили остальных, но нижеперечисленные люди не могут быть приглашены в <RoomName/>",
         "room_failed_partial_title": "Некоторые приглашения не могут быть отправлены",
@@ -1321,7 +1439,7 @@
         "autocomplete_force": "Принудительно завершить",
         "autocomplete_navigate_next": "Следующее предложение автозаполнения",
         "autocomplete_navigate_prev": "Предыдущее предложение автозаполнения",
-        "backspace": "Очистить",
+        "backspace": "Backspace",
         "cancel_reply": "Отмена ответа на сообщение",
         "category_autocomplete": "Автодополнение",
         "category_calls": "Звонки",
@@ -1356,12 +1474,14 @@
         "navigate_next_message_edit": "Перейдите к следующему сообщению для редактирования",
         "navigate_prev_history": "Предыдущая недавно посещенная комната или пространство",
         "navigate_prev_message_edit": "Перейдите к предыдущему сообщению для редактирования",
+        "next_landmark": "Перейти к следующему ориентиру",
         "next_room": "Следующая команата или ЛС",
         "next_unread_room": "Следующая непрочитанная комната или ЛС",
         "number": "[количество]",
         "open_user_settings": "Открыть пользовательские настройки",
         "page_down": "Page Down",
         "page_up": "Page Up",
+        "prev_landmark": "Перейти к предыдущему ориентиру",
         "prev_room": "Предыдущая комната или ЛС",
         "prev_unread_room": "Предыдущая непрочитанная комната или ЛС",
         "room_list_collapse_section": "Свернуть секцию списка комнат",
@@ -1369,10 +1489,11 @@
         "room_list_navigate_down": "Перейти вниз в списке комнат",
         "room_list_navigate_up": "Перейти вверх в списке комнат",
         "room_list_select_room": "Выбрать комнату из списка комнат",
+        "save": "Сохранить",
         "scroll_down_timeline": "Листать ленту сообщений вниз",
         "scroll_up_timeline": "Листать временную шкалу вверх",
         "search": "Поиск (должен быть включен)",
-        "send_sticker": "Отправить наклейку",
+        "send_sticker": "Отправить стикер",
         "shift": "Shift",
         "space": "Подпространство",
         "switch_to_space": "Перейти к пространству по номеру",
@@ -1385,7 +1506,6 @@
         "upload_file": "Загрузить файл"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Разрешить режим только совместного использования экрана",
         "ask_to_join": "Включить запрос на присоединение",
         "automatic_debug_logs": "Автоматическая отправка журналов отладки при любой ошибке",
         "automatic_debug_logs_decryption": "Автоматическая отправка журналов отладки при ошибках расшифровки",
@@ -1406,8 +1526,12 @@
         "dynamic_room_predecessors": "Родитель динамической комнаты",
         "dynamic_room_predecessors_description": "Включите MSC3946 (для поддержки архивных комнат)",
         "element_call_video_rooms": "Видеокомнаты Element Call",
+        "exclude_insecure_devices": "Исключить небезопасные устройства при отправке/получении сообщений",
+        "exclude_insecure_devices_description": "Когда этот режим включен, зашифрованные сообщения не будут передаваться непроверенным устройствам, а сообщения с непроверенных устройств будут отображаться как ошибка. Обратите внимание, что если вы включите этот режим, возможно, вы не сможете общаться с пользователями, которые не подтвердили свои устройства.",
         "experimental_description": "Время экспериментов? Попробуйте наши последние наработки. Эти функции не заверешены; они могут быть нестабильными, постоянно меняющимися, или вовсе отброшенными. <a>Узнайте больше</a>.",
         "experimental_section": "Предпросмотр",
+        "extended_profiles_msc_support": "Требуется, чтобы ваш сервер поддерживал MSC4133",
+        "feature_disable_call_per_sender_encryption": "Отключить шифрование для каждого отправителя Element Call",
         "feature_wysiwyg_composer_description": "Используйте форматированный текст вместо Markdown в редакторе сообщений.",
         "group_calls": "Новый опыт группового вызова",
         "group_developer": "Разработка",
@@ -1419,6 +1543,7 @@
         "group_rooms": "Комнаты",
         "group_spaces": "Пространства",
         "group_themes": "Темы",
+        "group_threads": "Обсуждения",
         "group_ui": "Пользовательский интерфейс",
         "group_voip": "Голос и видео",
         "group_widgets": "Виджеты",
@@ -1440,14 +1565,18 @@
         "notification_settings_beta_caption": "Представляем вам более простой способ изменения настроек уведомлений. Настройте свои настройки так %(brand)s, как вам удобно.",
         "notification_settings_beta_title": "Настройки уведомлений",
         "notifications": "Включить панель уведомлений в заголовке комнаты",
+        "release_announcement": "Объявление о новой версии",
         "render_reaction_images": "Обработка пользовательских изображений в реакциях",
         "render_reaction_images_description": "Иногда их называют \"пользовательскими эмодзи\".",
         "report_to_moderators": "Пожаловаться модераторам",
         "report_to_moderators_description": "В поддерживающих модерирование комнатах, кнопка \"Пожаловаться\" позволит вам сообщить о нарушении модераторам комнаты.",
+        "share_history_on_invite": "Поделиться зашифрованной историей с новыми участниками",
+        "share_history_on_invite_description": "Приглашая пользователя в зашифрованную комнату, для которой установлена видимость истории как «общая», поделитесь зашифрованной историей с этим пользователем и примите зашифрованную историю, когда вас приглашают в такую комнату.",
+        "share_history_on_invite_warning": "Эта функция ЭКСПЕРИМЕНТАЛЬНАЯ и в ней реализованы не все меры безопасности. Не включайте её в рабочих учётных записях.",
         "sliding_sync": "Режим Sliding Sync",
         "sliding_sync_description": "В активной разработке, нельзя отключить.",
         "sliding_sync_disabled_notice": "Выйдите из системы и снова войдите, чтобы отключить",
-        "sliding_sync_server_no_support": "На вашем сервере отсутствует встроенная поддержка",
+        "sliding_sync_server_no_support": "На вашем сервере отсутствует поддержка",
         "under_active_development": "В активной разработке.",
         "unrealiable_e2e": "Ненадежно в зашифрованных комнатах",
         "video_rooms": "Видеокомнаты",
@@ -1499,6 +1628,8 @@
         "last_person_warning": "Вы здесь единственный человек. Если вы уйдете, никто не сможет присоединиться в будущем, включая вас.",
         "leave_room_question": "Уверены, что хотите покинуть '%(roomName)s'?",
         "leave_space_question": "Уверены, что хотите покинуть пространство \"%(spaceName)s\"?",
+        "room_leave_admin_warning": "Вы единственный администратор в данной комнате. Если вы покинете ее, никто не сможет изменить настройки комнаты или выполнить другие важные действия.",
+        "room_leave_mod_warning": "Вы единственный модератор в этой комнате. Если вы уйдете, никто не сможет изменить настройки комнаты или выполнить другие важные действия.",
         "room_rejoin_warning": "Эта комната не является публичной. Вы не сможете войти без приглашения.",
         "space_rejoin_warning": "Это пространство не публично. Вы не сможете вновь войти без приглашения."
     },
@@ -1563,10 +1694,13 @@
         },
         "filter_placeholder": "Поиск по участникам",
         "invite_button_no_perms_tooltip": "У вас нет разрешения приглашать пользователей",
-        "power_label": "%(userName)s (уровень прав %(powerLevelNumber)s)"
+        "invited_label": "Приглашены",
+        "list_title": "Список участников",
+        "no_matches": "Нет совпадений"
     },
     "member_list_back_action_label": "Участники комнаты",
     "message_edit_dialog_title": "Правки сообщения",
+    "migrating_crypto": "Наберитесь терпения. Мы обновляем %(brand)s, чтобы сделать шифрование быстрые и надежнее.",
     "mobile_guide": {
         "toast_accept": "Использовать приложение",
         "toast_description": "%(brand)s работает в экспериментальном режиме в мобильном браузере. Для лучших впечатлений и новейших функций используйте наше родное бесплатное приложение.",
@@ -1584,6 +1718,7 @@
         "class_global": "Глобально",
         "class_other": "Другие",
         "default": "По умолчанию",
+        "default_settings": "Соответствует настройкам по умолчанию",
         "email_pusher_app_display_name": "Уведомления по электронной почте",
         "enable_prompt_toast_description": "Включить уведомления на рабочем столе",
         "enable_prompt_toast_title": "Уведомления",
@@ -1592,6 +1727,8 @@
         "keyword": "Ключевое слово",
         "keyword_new": "Новое ключевое слово",
         "level_activity": "Активность",
+        "level_highlight": "Выделение",
+        "level_muted": "Звук отключен",
         "level_none": "Пусто",
         "level_notification": "Уведомление",
         "level_unsent": "Не отправлено",
@@ -1600,7 +1737,8 @@
         "mentions_and_keywords_description": "Получать уведомления только по упоминаниям и ключевым словам, установленным в ваших <a>настройках</a>",
         "mentions_keywords": "Упоминания и ключевые слова",
         "message_didnt_send": "Сообщение не отправлено. Нажмите для получения информации.",
-        "mute_description": "Вы не будете получать никаких уведомлений"
+        "mute_description": "Вы не будете получать никаких уведомлений",
+        "mute_room": "Заглушить комнату"
     },
     "notifier": {
         "m.key.verification.request": "%(name)s запрашивает проверку"
@@ -1662,6 +1800,7 @@
     },
     "power_level": {
         "admin": "Администратор",
+        "creator": "Владелец",
         "custom": "Пользовательский (%(level)s)",
         "custom_level": "Специальные права",
         "default": "По умолчанию",
@@ -1724,6 +1863,10 @@
         "spam_or_propaganda": "Спам или пропаганда",
         "toxic_behaviour": "Токсичное поведение"
     },
+    "report_room": {
+        "description": "Сообщите об этой комнате вашему провайдеру аккаунта. Если сообщения зашифрованы, ваш администратор не сможет их прочитать.",
+        "reason_label": "Опишите причину"
+    },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "Не удалось расшифровать сеансы (%(failedCount)s)!",
         "count_of_successfully_restored_keys": "Успешно восстановлены ключи (%(sessionCount)s)",
@@ -1766,11 +1909,7 @@
                 "other": "Вы можете закрепить не более %(count)s виджетов"
             },
             "menu": "Открыть меню",
-            "release_announcement": {
-                "close": "Ок",
-                "description": "Все прикрепленные сообщения можно найти здесь. Наведите курсор на любое сообщение и нажмите «Закрепить», чтобы добавить его.",
-                "title": "Все новые закрепленные сообщения"
-            },
+            "reply_thread": "Ответ на сообщение в <link>обсуждениях</link>",
             "unpin_all": {
                 "button": "Открепить все сообщения",
                 "content": "Убедитесь, что вы действительно хотите удалить все прикреплённые сообщения. Это действие нельзя отменить.",
@@ -1869,10 +2008,12 @@
         },
         "face_pile_tooltip_label": {
             "one": "Посмотреть 1 участника",
-            "other": "Просмотреть всех %(count)s участников"
+            "few": "Посмотреть %(count)s участника",
+            "many": "Посмотреть %(count)s участников"
         },
         "face_pile_tooltip_shortcut": "Включая %(commaSeparatedMembers)s",
         "face_pile_tooltip_shortcut_joined": "Включая вас, %(commaSeparatedMembers)s",
+        "failed_determine_user": "Не удается определить, какого пользователя следует игнорировать, так как событие участника изменилось.",
         "failed_reject_invite": "Не удалось отклонить приглашение",
         "forget_room": "Забыть эту комнату",
         "forget_space": "Забыть это пространство",
@@ -1892,7 +2033,9 @@
         "inaccessible_subtitle_1": "Повторите попытку позже или попросите администратора комнаты или пространства проверить, есть ли у вас доступ.",
         "inaccessible_subtitle_2": "При попытке получить доступ к комнате или пространству была возвращена ошибка %(errcode)s. Если вы думаете, что вы видите это сообщение по ошибке, пожалуйста, <issueLink>отправьте отчет об ошибке</issueLink>.",
         "intro": {
+            "display_topic": "Тема: <topic/>",
             "dm_caption": "В этом разговоре только вы двое, если только кто-нибудь из вас не пригласит кого-нибудь присоединиться.",
+            "edit_topic": "Тема: <topic/> (<a>редактировать</a>)",
             "enable_encryption_prompt": "Включите шифрование в настройках.",
             "encrypted_3pid_dm_pending_join": "Как только все присоединятся, вы сможете общаться в чате",
             "no_avatar_label": "Добавьте фото, чтобы люди могли легко заметить вашу комнату.",
@@ -1902,8 +2045,6 @@
             "send_message_start_dm": "Отправьте свое первое сообщение, чтобы пригласить <displayName/> в чат",
             "start_of_dm_history": "Это начало вашей беседы с <displayName/>.",
             "start_of_room": "Это начало <roomName/>.",
-            "topic": "Тема: %(topic)s ",
-            "topic_edit": "Тема: %(topic)s (<a>изменить</a>)",
             "unencrypted_warning": "Сквозное шифрование не включено",
             "user_created": "%(displayName)s создал(а) эту комнату.",
             "you_created": "Вы создали эту комнату."
@@ -1957,11 +2098,15 @@
         "pinned_message_badge": "Закреплённое сообщение",
         "pinned_message_banner": {
             "button_close_list": "Закрыть список",
-            "button_view_all": "Посмотреть все"
+            "button_view_all": "Посмотреть все",
+            "description": "Закрепленные сообщения",
+            "title": "<bold>%(index)s из %(length)s</bold> Закрепленные сообщения"
         },
         "read_topic": "Нажмите, чтобы увидеть тему",
         "rejecting": "Отклонение приглашения…",
         "rejoin_button": "Пере-присоединение",
+        "room_content": "Содержимое комнаты",
+        "room_is_low_priority": "Это комната с низким приоритетом.",
         "search": {
             "all_rooms_button": "Поиск по всем комнатам",
             "placeholder": "Поиск сообщений...",
@@ -2002,6 +2147,7 @@
             },
             "uploading_single_file": "Отправка %(filename)s"
         },
+        "video_room": "Эта комната представляет собой видеозал",
         "waiting_for_join_subtitle": "Как только приглашенные пользователи присоединятся %(brand)s, вы сможете общаться в чате, а комната будет полностью зашифрована",
         "waiting_for_join_title": "Ожидание присоединения пользователей %(brand)s"
     },
@@ -2010,25 +2156,36 @@
         "add_space_label": "Добавить пространство",
         "breadcrumbs_empty": "Нет недавно посещенных комнат",
         "breadcrumbs_label": "Недавно посещённые комнаты",
+        "collapse_filters": "Свернуть список фильтров",
         "empty": {
             "no_chats": "Пока нет доступных чатов",
             "no_chats_description": "Начните с отправки сообщений или создания комнаты",
             "no_chats_description_no_room_rights": "Начните переписку с отправки сообщения",
             "no_favourites": "У вас пока нет чатов в Избранное",
             "no_favourites_description": "Вы можете добавить в Избранное в настройках чата",
+            "no_invites": "У вас нет непрочитанных приглашений",
+            "no_lowpriority": "У вас нет комнат с низким приоритетом",
+            "no_mentions": "У вас нет непрочитанных упоминаний",
             "no_people": "У вас пока нет личных чатов",
+            "no_people_description": "Вы можете убрать фильтры, чтобы увидеть другие ваши чаты",
             "no_rooms": "Вы еще не находитесь ни в одной комнате",
+            "no_rooms_description": "Вы можете убрать фильтры, чтобы увидеть другие ваши чаты",
             "no_unread": "Поздравляю! У вас нет непрочитанных сообщений",
+            "show_activity": "Посмотреть всю активность",
             "show_chats": "Показать все чаты"
         },
+        "expand_filters": "Развернуть список фильтров",
         "failed_add_tag": "Не удалось добавить тег %(tagName)s в комнату",
         "failed_remove_tag": "Не удалось удалить тег %(tagName)s из комнаты",
         "failed_set_dm_tag": "Не удалось установить метку личного сообщения",
         "filters": {
             "favourite": "Избранное",
+            "invites": "Приглашения",
+            "low_priority": "Низкий приоритет",
+            "mentions": "Упоминания",
             "people": "Люди",
             "rooms": "Комнаты",
-            "unread": "Непрочитанное"
+            "unread": "Непрочитанные"
         },
         "home_menu_label": "Параметры раздела \"Главная\"",
         "join_public_room_label": "Присоединиться к публичной комнате",
@@ -2039,29 +2196,43 @@
         "list_title": "Список комнат",
         "more_options": {
             "copy_link": "Скопировать ссылку на комнату",
+            "favourited": "Избранное",
             "leave_room": "Покинуть комнату",
             "low_priority": "Низкий приоритет",
             "mark_read": "Отметить как прочитанное",
             "mark_unread": "Отметить как непрочитанное"
         },
         "notification_options": "Настройки уведомлений",
+        "open_space_menu": "Открыть меню пространств",
+        "primary_filters": "Фильтры комнат",
         "redacting_messages_status": {
             "one": "Удаляются сообщения в %(count)s комнате",
             "other": "Удаляются сообщения в %(count)s комнатах"
         },
         "room": {
-            "more_options": "Дополнительные параметры"
+            "more_options": "Дополнительные параметры",
+            "open_room": "Открыть комнату %(roomName)s"
         },
+        "room_options": "Настройки комнаты",
         "show_less": "Показать меньше",
         "show_n_more": {
             "other": "Показать ещё %(count)s",
             "one": "Показать ещё %(count)s"
         },
         "show_previews": "Показывать последнее сообщение",
+        "sort": "Сортировать",
         "sort_by": "Сортировать",
         "sort_by_activity": "По активности",
         "sort_by_alphabet": "А-Я",
+        "sort_type": {
+            "activity": "Активность",
+            "atoz": "А-Я"
+        },
         "sort_unread_first": "Комнаты с непрочитанными сообщениями в начале",
+        "space_menu": {
+            "home": "Пространство — Главная",
+            "space_settings": "Настройки Пространства"
+        },
         "space_menu_label": "Меню %(spaceName)s",
         "sublist_options": "Настройки списка",
         "suggested_rooms_heading": "Предлагаемые комнаты"
@@ -2133,6 +2304,8 @@
             "error_deleting_alias_description": "Произошла ошибка при удалении этого адреса. Возможно, он больше не существует или произошла временная ошибка.",
             "error_deleting_alias_description_forbidden": "У вас нет прав для удаления этого адреса.",
             "error_deleting_alias_title": "Ошибка при удалении адреса",
+            "error_publishing": "Невозможно опубликовать комнату",
+            "error_publishing_detail": "Произошла ошибка при публикации этой комнаты",
             "error_save_space_settings": "Не удалось сохранить настройки пространства.",
             "error_updating_alias_description": "Произошла ошибка при обновлении альтернативных адресов комнаты. Это может быть запрещено сервером или произошел временный сбой.",
             "error_updating_canonical_alias_description": "При обновлении основного адреса комнаты произошла ошибка. Возможно, это не разрешено сервером или произошел временный сбой.",
@@ -2225,6 +2398,10 @@
             "users_default": "Роль по умолчанию"
         },
         "security": {
+            "cannot_change_to_private_due_to_missing_history_visiblity_permissions": {
+                "description": "У вас нет прав на изменение настроек видимости истории чата. Это опасно, так как может позволить неприглашенным пользователям читать сообщения.",
+                "title": "Не получается сделать комнату приватной"
+            },
             "enable_encryption_confirm_description": "После включения шифрования в комнате оно не может быть отключено. Сообщения, отправленные в шифрованной комнате, смогут прочитать только участники комнаты, но не сервер. Включенное шифрование может помешать корректной работе многим ботам и мостам. <a>Подробнее о шифровании.</a>",
             "enable_encryption_confirm_title": "Разрешить шифрование?",
             "enable_encryption_public_room_confirm_description_1": "<b>Не рекомендуется добавлять шифрование в публичные комнаты.</b> Кто угодно может найти и присоединиться к ним, тем самым позволяя читать сообщения. Вы не получите преимуществ шифрования и при этом не сможете его отключить. Шифрование сообщений в публичной комнате лишь замедлит их получение и отправку.",
@@ -2242,7 +2419,7 @@
             "history_visibility_joined": "Только участники (с момента их входа)",
             "history_visibility_legend": "Кто может читать историю?",
             "history_visibility_shared": "Только участники (с момента выбора этого параметра)",
-            "history_visibility_warning": "Изменения в том, кто может читать историю, будут применяться только к будущим сообщениям в этой комнате. Существующие истории останутся без изменений.",
+            "history_visibility_warning": "Видимость существующей истории сообщений в этой комнате не изменится.",
             "history_visibility_world_readable": "Все",
             "join_rule_description": "Укажите, кто может присоединиться к %(roomName)s.",
             "join_rule_invite": "Приватное (только по приглашению)",
@@ -2289,10 +2466,11 @@
                 "many": "Обновление пространств... (%(progress)s из %(count)s)"
             },
             "join_rule_upgrade_upgrading_room": "Обновление комнаты",
+            "join_rule_world_readable_description": "Изменение того, кто может присоединиться к комнате, также изменит видимость будущих сообщений.",
             "public_without_alias_warning": "Для связи с этой комнатой, пожалуйста, добавьте адрес.",
             "publish_room": "Сделать эту комнату видимой в каталоге общественных комнат.",
             "publish_space": "Сделайте это пространство видимым в каталоге общественных комнат.",
-            "strict_encryption": "Никогда не отправлять зашифрованные сообщения непроверенным сеансам в этой комнате и через этот сеанс",
+            "strict_encryption": "Отправляйте сообщения только проверенным пользователям.",
             "title": "Безопасность"
         },
         "title": "Настройки комнаты — %(roomName)s",
@@ -2303,7 +2481,6 @@
             "error_update_guest_access": "Не удалось обновить гостевой доступ к этому пространству",
             "error_update_history_visibility": "Не удалось обновить видимость истории этого пространства",
             "guest_access_explainer": "Гости могут присоединиться к пространству, не имея учётной записи.",
-            "guest_access_explainer_public_space": "Это может быть полезно для публичных пространств.",
             "guest_access_label": "Включить гостевой доступ",
             "history_visibility_anyone_space": "Предварительный просмотр пространства",
             "history_visibility_anyone_space_description": "Дайте людям возможность предварительно ознакомиться с вашим пространством, прежде чем они присоединятся к нему.",
@@ -2346,6 +2523,10 @@
         "recent_changes_heading": "Последние изменения, которые еще не были получены",
         "title": "Сервер не отвечает"
     },
+    "service_worker_error": {
+        "description": "%(brand)s Для загрузки аутентифицированных медиафайлов из репозиториев Matrix требуется сервис-воркер. Ваш браузер не поддерживает эту функцию, поэтому медиафайлы могут не загружаться.",
+        "title": "Не удалось загрузить Service Worker"
+    },
     "seshat": {
         "error_initialising": "Инициализация поиска сообщений не удалась, проверьте <a>ваши настройки</a> для получения дополнительной информации",
         "reset_button": "Сброс хранилища событий",
@@ -2373,20 +2554,26 @@
     },
     "settings": {
         "account": {
+            "dialog_title": "<strong>Настройки:</strong> Учетная запись",
             "title": "Учетная запись"
         },
         "all_rooms_home": "Показывать все комнаты на Главной",
         "all_rooms_home_description": "Все комнаты, в которых вы находитесь, будут отображаться на Главной.",
         "always_show_message_timestamps": "Всегда показывать время отправки сообщений",
         "appearance": {
+            "bundled_emoji_font": "Использовать встроенный шрифт эмодзи",
+            "compact_layout": "Показывать компактный текст и сообщения",
+            "compact_layout_description": "Для использования этой функции необходимо выбрать современный макет.",
             "custom_font": "Использовать системный шрифт",
             "custom_font_description": "Установите имя шрифта, установленного в вашей системе, и %(brand)s попытается его использовать.",
             "custom_font_name": "Название системного шрифта",
             "custom_font_size": "Использовать другой размер",
             "custom_theme_add": "Добавить пользовательскую тему",
             "custom_theme_downloading": "Загрузка пользовательской темы…",
-            "custom_theme_error_downloading": "Ошибка при загрузке информации темы.",
+            "custom_theme_error_downloading": "Ошибка при загрузке темы",
+            "custom_theme_help": "Введите URL-адрес пользовательской темы, которую вы хотите применить.",
             "custom_theme_invalid": "Неверная схема темы.",
+            "dialog_title": "<strong>Настройки:</strong> Внешний вид",
             "font_size": "Размер шрифта",
             "font_size_default": "%(fontSize)s (по умолчанию)",
             "high_contrast": "Высокая контрастность",
@@ -2404,6 +2591,9 @@
         "code_block_expand_default": "По умолчанию отображать блоки кода целиком",
         "code_block_line_numbers": "Показывать номера строк в блоках кода",
         "disable_historical_profile": "Показать текущее изображение профиля и имя пользователя в истории сообщений",
+        "discovery": {
+            "title": "Как вас найти"
+        },
         "emoji_autocomplete": "Предлагать смайлики при наборе",
         "enable_markdown": "Использовать Markdown",
         "enable_markdown_description": "Начинайте сообщения с <code>/plain</code>, чтобы отправлять их без markdown.",
@@ -2414,13 +2604,15 @@
                 "breadcrumb_second_description": "Вы потеряете историю сообщений, которая хранится только на сервере",
                 "breadcrumb_third_description": "Вам нужно будет заново подтвердить все существующие устройства и контакты.",
                 "breadcrumb_title": "Вы уверены, что хотите сбросить свою идентификацию?",
+                "breadcrumb_title_cant_confirm": "Вам необходимо сбросить свою личность",
                 "breadcrumb_title_forgot": "Забыли ключ восстановления? Вам нужно будет восстановить свою идентификацию.",
+                "breadcrumb_title_sync_failed": "Не удалось синхронизировать хранилище ключей. Вам необходимо сбросить идентификационные данные.",
                 "breadcrumb_warning": "Делайте это только в том случае, если вы считаете, что ваша учетная запись взломана.",
                 "details_title": "Сведения о шифровании",
                 "do_not_close_warning": "Не закрывайте это окно до тех пор, пока сброс не будет завершен",
                 "export_keys": "Экспортировать ключи",
                 "import_keys": "Импортировать ключи",
-                "other_people_device_description": "Внимание: пользователи, которые явно не подтвердили вашу личность (например, с помощью emoji), не получат ваши зашифрованные сообщения. Кроме того, неверифицированные устройства верифицированных пользователей не будут получать ваши зашифрованные сообщения.",
+                "other_people_device_description": "Внимание: пользователи, которые явно не подтвердили вашу личность (например, с помощью эмодзи), не получат ваши зашифрованные сообщения. Кроме того, неверифицированные устройства верифицированных пользователей не будут получать ваши зашифрованные сообщения.",
                 "other_people_device_label": "В зашифрованных комнатах отправляйте сообщения только проверенным пользователям",
                 "other_people_device_title": "Устройства других людей",
                 "reset_identity": "Сбросить криптографическую идентификацию",
@@ -2429,14 +2621,18 @@
                 "session_key": "Ключ сеанса:",
                 "title": "Дополнительно"
             },
+            "confirm_key_storage_off": "Вы уверены, что хотите оставить хранилище ключей отключенным?",
+            "confirm_key_storage_off_description": "Если вы выйдете из системы на всех своих устройствах, вы потеряете историю сообщений и вам придется заново подтвердить все существующие контакты.<a>Узнать больше</a>",
             "delete_key_storage": {
                 "breadcrumb_page": "Удалить хранилище ключей",
                 "confirm": "Удалить хранилище ключей",
                 "description": "Удаление хранилища ключей приведёт к удалению вашей идентификации и ключей сообщений с сервера, а также отключению следующих функций безопасности:",
                 "list_first": "Нет зашифрованной истории сообщений на новых устройствах",
+                "list_second": "Вы потеряете доступ к своим зашифрованным сообщениям, если вы выйдете из %(brand)s везде",
                 "title": "Вы уверены, что хотите отключить хранение ключей и удалить их?"
             },
             "device_not_verified_button": "Проверить это устройство",
+            "device_not_verified_description": "Для просмотра настроек шифрования необходимо подтвердить это устройство.",
             "device_not_verified_title": "Устройство не проверено",
             "dialog_title": "<strong>Настройки:</strong> Шифрование",
             "key_storage": {
@@ -2446,15 +2642,29 @@
             },
             "recovery": {
                 "change_recovery_confirm_button": "Подтвердите новый ключ восстановления",
+                "change_recovery_confirm_description": "Чтобы завершить, введите новый Ключ Восстановления ниже. Ваш старый ключ больше работать не будет.",
                 "change_recovery_confirm_title": "Введите новый ключ восстановления",
                 "change_recovery_key": "Изменить ключ восстановления",
+                "change_recovery_key_description": "Запишите новый ключ восстановления в безопасном месте. Затем нажмите «Продолжить», чтобы подтвердить изменение.",
                 "change_recovery_key_title": "Изменить ключ восстановления?",
+                "description": "Восстановите свою идентификацию и историю сообщений с помощью ключа восстановления, если вы потеряли все существующие устройства.",
                 "enter_key_error": "Ключ восстановления, который вы ввел, неверный.",
                 "enter_recovery_key": "Введите ключ восстановления",
                 "forgot_recovery_key": "Забыли ключ восстановления?",
+                "key_storage_warning": "Хранилище ключей не синхронизировано. Нажмите кнопку ниже, чтобы устранить проблему.",
                 "save_key_description": "Не сообщайте эту информацию никому!",
-                "save_key_title": "Ключ восстановления"
-            }
+                "save_key_title": "Ключ восстановления",
+                "set_up_recovery": "Настройка восстановления",
+                "set_up_recovery_confirm_button": "Завершить настройку",
+                "set_up_recovery_confirm_description": "Введите ключ восстановления, показанный на предыдущем экране, чтобы завершить настройку восстановления.",
+                "set_up_recovery_confirm_title": "Для подтверждения введите ключ восстановления",
+                "set_up_recovery_description": "Хранилище ключей защищено ключом восстановления. Если после установки вам понадобится новый ключ восстановления, вы можете создать его заново, выбрав '%(changeRecoveryKeyButton)s'.",
+                "set_up_recovery_save_key_description": "Запишите ключ восстановления в безопасном месте, например в диспетчере паролей, зашифрованной заметке или физическом сейфе.",
+                "set_up_recovery_save_key_title": "Сохраните ключ восстановления в безопасном месте",
+                "set_up_recovery_secondary_description": "После нажатия кнопки «Продолжить» мы сгенерируем для вас ключ восстановления.",
+                "title": "Восстановление"
+            },
+            "title": "Шифрование"
         },
         "general": {
             "account_management_section": "Управление учётной записью",
@@ -2468,6 +2678,15 @@
             "add_msisdn_dialog_title": "Добавить номер телефона",
             "add_msisdn_instructions": "Текстовое сообщение было отправлено +%(msisdn)s. Пожалуйста, введите проверочный код, который он содержит.",
             "add_msisdn_misconfigured": "Поток add/bind с MSISDN настроен неправильно",
+            "allow_spellcheck": "Разрешить проверку орфографии",
+            "application_language": "Язык приложения",
+            "application_language_reload_hint": "Приложение перезагрузится после выбора другого языка",
+            "avatar_open_menu": "Открыть меню аватара",
+            "avatar_remove_progress": "Удаление изображения…",
+            "avatar_save_progress": "Загрузка изображения...",
+            "avatar_upload_error_text": "Формат файла не поддерживается или размер изображения превышает %(size)s.",
+            "avatar_upload_error_text_generic": "Формат файла может не поддерживаться.",
+            "avatar_upload_error_title": "Не удалось загрузить изображение профиля",
             "confirm_adding_email_body": "Нажмите кнопку ниже для подтверждения этого почтового адреса.",
             "confirm_adding_email_title": "Подтвердите добавление почтового адреса",
             "deactivate_confirm_body": "Вы уверены, что хотите деактивировать свою учётную запись? Это необратимое действие.",
@@ -2483,10 +2702,14 @@
             "deactivate_confirm_erase_label": "Скрыть мои сообщения от новых участников",
             "deactivate_section": "Деактивировать учётную запись",
             "deactivate_warning": "Деактивация вашей учётной записи является необратимым действием — будьте осторожны!",
-            "discovery_email_empty": "Параметры поиска по электронной почты появятся после добавления её выше.",
+            "discovery_email_empty": "Параметры поиска по электронной почты появятся после её добавления.",
             "discovery_email_verification_instructions": "Проверьте ссылку в вашем почтовом ящике(папка \"Входящие\")",
             "discovery_msisdn_empty": "Параметры поиска по номеру телефона появятся после его добавления.",
             "discovery_needs_terms": "Подтвердите условия предоставления услуг сервера идентификации (%(serverName)s), чтобы вас можно было обнаружить по адресу электронной почты или номеру телефона.",
+            "discovery_needs_terms_title": "Позвольте людям найти вас",
+            "display_name": "Отображаемое имя",
+            "display_name_error": "Невозможно установить отображаемое имя",
+            "email_adding_unsupported_by_hs": "Этот домашний сервер не позволяет добавлять адреса электронной почты в вашу учетную запись.",
             "email_address_in_use": "Этот адрес электронной почты уже используется",
             "email_address_label": "Адрес электронной почты",
             "email_not_verified": "Ваш адрес электронной почты еще не проверен",
@@ -2511,7 +2734,9 @@
             "error_share_msisdn_discovery": "Не удается предоставить общий доступ к номеру телефона",
             "identity_server_no_token": "Не найден токен доступа для идентификации",
             "identity_server_not_set": "Сервер идентификации не установлен",
-            "language_section": "Язык и регион",
+            "invalid_phone_number": "Предоставленный номер телефона, по-видимому, недействителен.",
+            "language_section": "Язык",
+            "msisdn_adding_unsupported_by_hs": "Этот домашний сервер не позволяет добавлять телефонные номера в вашу учетную запись.",
             "msisdn_in_use": "Этот номер телефона уже используется",
             "msisdn_label": "Номер телефона",
             "msisdn_verification_field_label": "Код подтверждения",
@@ -2520,21 +2745,25 @@
             "oidc_manage_button": "Настройки аккаунта",
             "password_change_section": "Установите новый пароль…",
             "password_change_success": "Ваш пароль успешно изменён.",
+            "personal_info": "Личная информация",
+            "profile_subtitle": "Так вас видят другие пользователи приложения.",
+            "profile_subtitle_oidc": "Ваша учетная запись управляется отдельным поставщиком идентификационных данных, поэтому некоторые ваши личные данные изменить нельзя.",
             "remove_email_prompt": "Удалить %(email)s?",
             "remove_msisdn_prompt": "Удалить %(phone)s?",
-            "spell_check_locale_placeholder": "Выберите регион"
+            "spell_check_locale_placeholder": "Выберите регион",
+            "unable_to_load_emails": "Не удалось загрузить адреса электронной почты",
+            "unable_to_load_msisdns": "Не удалось загрузить номера телефонов",
+            "username": "Имя пользователя"
         },
         "inline_url_previews_default": "Предпросмотр ссылок по умолчанию",
         "inline_url_previews_room": "Включить предпросмотр ссылок для участников этой комнаты по умолчанию",
         "inline_url_previews_room_account": "Включить предпросмотр ссылок в этой комнате (влияет только на вас)",
         "insert_trailing_colon_mentions": "Вставлять двоеточие после упоминания пользователя в начале сообщения",
+        "invite_controls": {
+            "default_label": "Разрешить пользователям приглашать вас в комнаты"
+        },
         "jump_to_bottom_on_send": "Перейти к нижней части временной шкалы, когда вы отправляете сообщение",
         "key_backup": {
-            "backup_in_progress": "Выполняется резервная копия ключей (первый раз это может занять несколько минут).",
-            "backup_starting": "Запуск резервного копирования…",
-            "backup_success": "Успешно!",
-            "cannot_create_backup": "Невозможно создать резервную копию ключа",
-            "create_title": "Создать резервную копию ключа",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Выполняется резервное копирование ваших ключей с этого устройства.",
                 "backup_setup_success_title": "Резервное копирование успешно завершено",
@@ -2545,21 +2774,21 @@
                 "enter_phrase_description": "Введите секретную фразу, известную только вам, так как она используется для защиты ваших данных. В целях безопасности не следует повторно использовать пароль своей учетной записи.",
                 "enter_phrase_title": "Введите секретную фразу",
                 "enter_phrase_to_confirm": "Введите секретную фразу второй раз, чтобы подтвердить ее.",
-                "generate_security_key_description": "Мы создадим ключ безопасности для вас, чтобы вы могли хранить его в надежном месте, например, в менеджере паролей или сейфе.",
-                "generate_security_key_title": "Создание ключа безопасности",
+                "generate_security_key_description": "Мы создадим ключ восстановления, который вы сможете хранить в безопасном месте, например в менеджере паролей или сейфе.",
+                "generate_security_key_title": "Создание Ключа Восстановления",
                 "pass_phrase_match_failed": "Они не совпадают.",
                 "pass_phrase_match_success": "Они совпадают!",
                 "phrase_strong_enough": "Отлично! Эта контрольная фраза выглядит достаточно сильной.",
                 "secret_storage_query_failure": "Невозможно запросить состояние секретного хранилища",
-                "security_key_safety_reminder": "Храните ключ безопасности в надежном месте, например в менеджере паролей или сейфе, так как он используется для защиты ваших зашифрованных данных.",
+                "security_key_safety_reminder": "Храните Ключ Восстановления в надежном месте, например в менеджере паролей или сейфе, так как он используется для защиты ваших зашифрованных данных.",
                 "set_phrase_again": "Задать другой пароль.",
                 "settings_reminder": "Вы также можете настроить безопасное резервное копирование и управлять своими ключами в настройках.",
                 "title_confirm_phrase": "Подтвердите секретную фразу",
-                "title_save_key": "Сохраните свой ключ безопасности",
+                "title_save_key": "Сохраните ключ восстановления",
                 "title_set_phrase": "Задайте секретную фразу",
                 "unable_to_setup": "Невозможно настроить секретное хранилище",
                 "use_different_passphrase": "Использовать другую кодовую фразу?",
-                "use_phrase_only_you_know": "Используйте секретную фразу, известную только вам, и при необходимости сохраните ключ безопасности для резервного копирования."
+                "use_phrase_only_you_know": "Используйте секретную фразу, известную только вам, и при необходимости сохраните Ключ Восстановления от резервной копии."
             }
         },
         "key_export_import": {
@@ -2577,12 +2806,29 @@
             "phrase_strong_enough": "Отлично! Эта парольная фраза выглядит достаточно надежной"
         },
         "keyboard": {
+            "dialog_title": "<strong>Настройки:</strong> Клавиатура",
             "title": "Горячие клавиши"
         },
+        "labs": {
+            "dialog_title": "<strong>Настройки:</strong> Лаборатория"
+        },
+        "labs_mjolnir": {
+            "dialog_title": "<strong>Настройки:</strong> Игнорируемые пользователи"
+        },
+        "media_preview": {
+            "hide_avatars": "Скрыть аватары комнаты и приглашающего",
+            "hide_media": "Всегда скрывать",
+            "media_preview_description": "Скрытый медиафайл всегда можно отобразить, нажав на него.",
+            "media_preview_label": "Показать медиафайлы в хронологии",
+            "show_in_private": "В личных комнатах",
+            "show_media": "Всегда показывать"
+        },
+        "not_supported": "На вашем сервере эта функция не реализована.",
         "notifications": {
             "default_setting_description": "Эта настройка будет применена по умолчанию ко всем вашим комнатам.",
             "default_setting_section": "Я хочу получать уведомления о (настройка по умолчанию)",
             "desktop_notification_message_preview": "Показать предварительный просмотр сообщения в уведомлении на рабочем столе",
+            "dialog_title": "<strong>Настройки:</strong> Уведомления",
             "email_description": "Получать по электронной почте сводку пропущенных уведомлений",
             "email_section": "Информация об электронной почте",
             "email_select": "Выберите, на какие электронные письма вы хотите отправлять резюме. Управляйте электронной почтой в <button>Настройках</button>.",
@@ -2627,7 +2873,7 @@
             "rule_encrypted_room_one_to_one": "Зашифрованные сообщения в персональных чатах",
             "rule_invite_for_me": "Приглашения в комнаты",
             "rule_message": "Сообщения в конференциях",
-            "rule_room_one_to_one": "Сообщения в 1:1 чатах",
+            "rule_room_one_to_one": "Сообщения в личных чатах",
             "rule_roomnotif": "Сообщения, содержащие @room",
             "rule_suppress_notices": "Сообщения от ботов",
             "rule_tombstone": "При обновлении комнат",
@@ -2635,26 +2881,33 @@
             "voip": "Аудио и видео звонки"
         },
         "preferences": {
+            "Electron.enableContentProtection": "Предотвратить захват содержимого окна другими приложениями",
             "Electron.enableHardwareAcceleration": "Включите аппаратное ускорение (перезапустите %(appName)s, чтобы настройки вступили в силу)",
             "always_show_menu_bar": "Всегда показывать строку меню",
             "autocomplete_delay": "Задержка автодополнения (мс)",
             "code_blocks_heading": "Блоки кода",
             "compact_modern": "Использовать более компактный \"Современный\" макет",
             "composer_heading": "Редактор",
+            "default_timezone": "Браузер по умолчанию (%(timezone)s)",
+            "dialog_title": "<strong>Настройки:</strong> Параметры",
+            "enable_content_protection": "Включить защиту контента",
             "enable_hardware_acceleration": "Включить аппаратное ускорение",
             "enable_tray_icon": "Показывать значок в трее и сворачивать в него окно при закрытии",
             "keyboard_heading": "Горячие клавиши",
             "keyboard_view_shortcuts_button": "Чтобы просмотреть все сочетания клавиш, <a>нажмите здесь</a>.",
             "media_heading": "Медиа",
             "presence_description": "Поделитесь своей активностью и статусом с другими.",
+            "publish_timezone": "Опубликовать часовой пояс в профиле",
             "rm_lifetime": "Задержка прочтения сообщения (мс)",
             "rm_lifetime_offscreen": "Задержка прочтения сообщения при отсутствии активности (мс)",
             "room_directory_heading": "Каталог комнат",
             "room_list_heading": "Список комнат",
             "show_avatars_pills": "Показывать аватары в упоминаниях пользователей, комнатах и событиях",
             "show_polls_button": "Показывать кнопку опроса",
+            "startup_window_behaviour_label": "Запуск и поведение окна",
             "surround_text": "Обводить выделенный текст при вводе специальных символов",
-            "time_heading": "Отображение времени"
+            "time_heading": "Отображение времени",
+            "user_timezone": "Установить часовой пояс"
         },
         "prompt_invite": "Подтверждать отправку приглашений на потенциально недействительные matrix ID",
         "replace_plain_emoji": "Автоматически заменять текстовые смайлики на графические",
@@ -2663,13 +2916,15 @@
             "bulk_options_accept_all_invites": "Принять все приглашения (%(invitedRooms)s)",
             "bulk_options_reject_all_invites": "Отклонить все %(invitedRooms)s приглашения",
             "bulk_options_section": "Основные опции",
+            "dehydrated_device_description": "Функция автономного устройства позволяет вам получать зашифрованные сообщения, даже если вы не вошли в систему ни на одном устройстве.",
+            "dehydrated_device_enabled": "Устройство в автономном режиме",
+            "dialog_title": "<strong>Настройки:</strong> Безопасность и конфиденциальность",
             "e2ee_default_disabled_warning": "Администратор вашего сервера отключил сквозное шифрование по умолчанию в приватных комнатах и диалогах.",
             "enable_message_search": "Включить поиск сообщений в зашифрованных комнатах",
             "encryption_section": "Шифрование",
             "ignore_users_empty": "У вас нет игнорируемых пользователей.",
             "ignore_users_section": "Игнорируемые пользователи",
             "key_backup_algorithm": "Алгоритм:",
-            "key_backup_connect": "Подключить этот сеанс к резервированию ключей",
             "message_search_disable_warning": "Если этот параметр отключен, сообщения из зашифрованных комнат не будут отображаться в результатах поиска.",
             "message_search_disabled": "Безопасно кэшировать шифрованные сообщения локально, чтобы они появлялись в результатах поиска.",
             "message_search_enabled": {
@@ -2690,7 +2945,7 @@
             "message_search_unsupported_web": "%(brand)s не может безопасно кэшировать зашифрованные сообщения локально во время работы в веб-браузере. Используйте <desktopLink>%(brand)s Desktop</desktopLink>, чтобы зашифрованные сообщения появились в результатах поиска.",
             "record_session_details": "Записывать название клиента, версию и URL-адрес для более лёгкого распознавания сеансов в менеджере сеансов",
             "send_analytics": "Отправить данные аналитики",
-            "strict_encryption": "Никогда не отправлять неподтверждённым сеансам зашифрованные сообщения через этот сеанс"
+            "strict_encryption": "Отправлять сообщения только проверенным пользователям"
         },
         "send_read_receipts": "Уведомлять о прочтении",
         "send_read_receipts_unsupported": "Ваш сервер не поддерживает отключение отправки уведомлений о прочтении.",
@@ -2725,6 +2980,7 @@
             "device_unverified_description_current": "Заверьте текущий сеанс для усиления защиты переписки.",
             "device_verified_description": "Этот сеанс готов к безопасному обмену сообщениями.",
             "device_verified_description_current": "Ваш текущий сеанс готов к защищенной переписке.",
+            "dialog_title": "<strong>Настройки:</strong> Сеансы",
             "error_pusher_state": "Не удалось установить состояние push-службы",
             "error_set_name": "Не удалось установить имя сессии",
             "filter_all": "Все",
@@ -2741,6 +2997,7 @@
             "inactive_sessions_list_description": "Сочтите выйти из старых сеансов (%(inactiveAgeDays)s дней и более), которые вы более не используете.",
             "ip": "IP-адрес",
             "last_activity": "Последняя активность",
+            "manage": "Управление этим сеансом",
             "mobile_session": "Сеанс мобильного устройства",
             "n_sessions_selected": {
                 "one": "%(count)s сеанс выбран",
@@ -2766,8 +3023,9 @@
             "session_id": "ID сеанса",
             "show_details": "Показать подробности",
             "sign_in_with_qr": "Привязать новое устройство",
-            "sign_in_with_qr_button": "Показать QR код",
-            "sign_in_with_qr_description": "Вы можете использовать это устройство для входа на новом устройство с помощью QR-кода. Вам необходимо отсканировать данный QR-код на новом устройстве.",
+            "sign_in_with_qr_button": "Показать QR-код",
+            "sign_in_with_qr_description": "Используйте QR-код для входа на другое устройство и настройки безопасного обмена сообщениями.",
+            "sign_in_with_qr_unsupported": "Не поддерживается вашим поставщиком учетных записей",
             "sign_out": "Выйти из этого сеанса",
             "sign_out_all_other_sessions": "Выйти из всех остальных сеансов (%(otherSessionsCount)s)",
             "sign_out_confirm_description": {
@@ -2804,12 +3062,15 @@
         "show_chat_effects": "Эффекты (анимация при получении, например, конфетти)",
         "show_displayname_changes": "Изменения отображаемого имени",
         "show_join_leave": "Сообщения о присоединении/покидании (приглашения/удаления/блокировки не затрагиваются)",
+        "show_message_previews": "Показать предварительный просмотр сообщений",
         "show_nsfw_content": "Показать NSFW-контент",
         "show_read_receipts": "Уведомления о прочтении другими пользователями",
         "show_redaction_placeholder": "Плашки вместо удалённых сообщений",
         "show_stickers_button": "Показывать кнопку наклеек",
         "show_typing_notifications": "Уведомлять о наборе текста",
+        "showbold": "Показывать всю активность в списке комнат (точки или количество непрочитанных сообщений)",
         "sidebar": {
+            "dialog_title": "<strong>Настройки:</strong> Боковая панель",
             "metaspaces_favourites_description": "Сгруппируйте все свои любимые комнаты и людей в одном месте.",
             "metaspaces_home_all_rooms": "Показать все комнаты",
             "metaspaces_home_all_rooms_description": "Показать все комнаты на Главной, даже если они находятся в пространстве.",
@@ -2818,10 +3079,19 @@
             "metaspaces_orphans_description": "Сгруппируйте все комнаты, которые не являются частью пространства, в одном месте.",
             "metaspaces_people_description": "Сгруппируйте всех своих людей в одном месте.",
             "metaspaces_subsection": "Пространства для показа",
+            "metaspaces_video_rooms": "Видеокомнаты и конференции",
+            "metaspaces_video_rooms_description": "Сгруппировать все частные видеокомнаты и конференции.",
+            "metaspaces_video_rooms_description_invite_extension": "В конференции вы можете приглашать людей за пределами matrix.",
             "spaces_explainer": "Пространства — это способ сгруппировать комнаты и людей. Помимо пространств, в которых вы находитесь, вы также можете использовать готовые помещения.",
             "title": "Боковая панель"
         },
-        "start_automatically": "Автозапуск при входе в систему",
+        "start_automatically": {
+            "disabled": "Нет",
+            "enabled": "Да",
+            "label": "Запустить %(brand)s при входе в систему",
+            "minimised": "Минимизированный"
+        },
+        "tac_only_notifications": "Показывать уведомления только в центре активностей обсуждений",
         "use_12_hour_format": "Отображать время в 12 часовом формате (напр. 2:30pm)",
         "use_command_enter_send_message": "Cmd + Enter, чтобы отправить сообщение",
         "use_command_f_search": "Используйте Command + F для поиска в ленте сообщений",
@@ -2835,6 +3105,7 @@
             "audio_output_empty": "Аудиовыход не обнаружен",
             "auto_gain_control": "Авторегулировка усиления",
             "connection_section": "Соединение",
+            "dialog_title": "<strong>Настройки:</strong> Голос и видео",
             "echo_cancellation": "Эхоподавление",
             "enable_fallback_ice_server": "Разрешить резервный сервер помощи при вызове (%(server)s)",
             "enable_fallback_ice_server_description": "Только применяется, когда у домашнего сервера нет своего TURN-сервера. Ваш IP-адрес будет виден на время звонка.",
@@ -2853,8 +3124,12 @@
         "warning": "<w>ВНИМАНИЕ:</w> <description/>"
     },
     "share": {
+        "link_copied": "Ссылка скопирована",
         "permalink_message": "Ссылка на выбранное сообщение",
         "permalink_most_recent": "Ссылка на последнее сообщение",
+        "share_call": "Ссылка-приглашение на конференцию",
+        "share_call_subtitle": "Ссылка для внешних пользователей, желающих присоединиться к вызову без учетной записи matrix:",
+        "title_link": "Поделиться ссылкой",
         "title_message": "Поделиться сообщением",
         "title_room": "Поделиться комнатой",
         "title_user": "Поделиться пользователем"
@@ -2899,6 +3174,8 @@
         "jumptodate": "Перейти к заданной дате в ленте сообщений",
         "jumptodate_invalid_input": "Мы не смогли распознать заданную дату (%(inputDate)s). Попробуйте использовать формат ГГГГ-ММ-ДД.",
         "lenny": "Добавляет ( ͡° ͜ʖ ͡°) в начало сообщения",
+        "manual_device_verification_confirm_description": "Это позволит другому устройству отправлять и получать сообщения от вашего имени. ЕСЛИ КТО-ТО СКАЗАЛ ВАМ ВСТАВИТЬ ЗДЕСЬ ЧТО-ТО, ВЕРОЯТНО, ВАС ПЫТАЮТСЯ ОБМАНУТЬ! Вы уверены, что хотите подтвердить это другое устройство?",
+        "manual_device_verification_confirm_title": "Внимание: ручная проверка устройства",
         "me": "Отображение действий",
         "msg": "Отправить сообщение данному пользователю",
         "myavatar": "Меняет изображение профиля во всех комнатах",
@@ -2939,6 +3216,7 @@
         "upgraderoom": "Обновляет комнату до новой версии",
         "upgraderoom_permission_error": "У вас нет необходимых разрешений для использования этой команды.",
         "usage": "Использование",
+        "verify": "Проверь вручную одно из своих устройств",
         "view": "Просмотр комнаты с указанным адресом",
         "whois": "Показать информацию о пользователе"
     },
@@ -3048,6 +3326,7 @@
         "heading_without_query": "Поиск",
         "join_button_text": "Присоединиться к %(roomAddress)s",
         "keyboard_scroll_hint": "Используйте <arrows/> для прокрутки",
+        "messages_label": "Сообщения",
         "other_rooms_in_space": "Прочие комнаты в %(spaceName)s",
         "public_rooms_label": "Публичные комнаты",
         "public_spaces_label": "Публичное пространство",
@@ -3088,18 +3367,26 @@
     "thread_view_back_action_label": "Вернуться к обсуждению",
     "threads": {
         "all_threads": "Все обсуждения",
-        "all_threads_description": "Показывает все обсуждения из текущей комнаты",
+        "all_threads_description": "Отобразит все обсуждения из текущей комнаты",
         "count_of_reply": {
             "one": "%(count)s ответ",
             "few": "%(count)s ответа",
             "many": "%(count)s ответов"
         },
+        "empty_description": "Используйте “%(replyInThread)s” при наведении курсора на сообщение.",
+        "empty_title": "Обсуждения помогают поддерживать тему разговоров и их легко отслеживать.",
         "error_start_thread_existing_relation": "Невозможно создать обсуждение из события с существующей связью",
+        "mark_all_read": "Отметить все как прочитанные",
         "my_threads": "Мои обсуждения",
-        "my_threads_description": "Показывает все обсуждения, в которых вы принимали участие",
-        "open_thread": "Открыть ветку",
+        "my_threads_description": "Отобразит все обсуждения, в которых вы принимали участие",
+        "open_thread": "Открыть обсуждение",
         "show_thread_filter": "Показать:"
     },
+    "threads_activity_centre": {
+        "header": "Активность обсуждений",
+        "no_rooms_with_threads_notifs": "У вас пока нет комнат с уведомлениями в обсуждениях.",
+        "no_rooms_with_unread_threads": "У вас пока нет комнат с непрочитанными обсуждениями."
+    },
     "time": {
         "about_day_ago": "около суток назад",
         "about_hour_ago": "около часа назад",
@@ -3141,9 +3428,21 @@
         },
         "creation_summary_dm": "%(creator)s начал(а) этот чат.",
         "creation_summary_room": "%(creator)s создал(а) и настроил(а) комнату.",
+        "decryption_failure": {
+            "blocked": "Отправитель заблокировал получение этого сообщения, поскольку ваше устройство не проверено.",
+            "historical_event_no_key_backup": "История сообщений недоступна на этом устройстве",
+            "historical_event_unverified_device": "Вам необходимо подтвердить это устройство для доступа к истории сообщений.",
+            "historical_event_user_not_joined": "У вас нет доступа к этому сообщению",
+            "sender_identity_previously_verified": "Подтвержденная личность изменилась",
+            "sender_unsigned_device": "Отправлено с незащищенного устройства",
+            "unable_to_decrypt": "Не удалось расшифровать сообщение"
+        },
         "disambiguated_profile": "%(displayName)s (%(matrixId)s)",
         "download_action_decrypting": "Расшифровка",
         "download_action_downloading": "Загрузка",
+        "download_failed": "Загрузка не удалась",
+        "download_failed_description": "Произошла ошибка при загрузке этого файла",
+        "e2e_state": "Состояние сквозного шифрования",
         "edits": {
             "tooltip_label": "Изменено %(date)s. Нажмите для посмотра истории изменений.",
             "tooltip_sub": "Нажмите для просмотра правок",
@@ -3161,6 +3460,7 @@
             "unable_to_find": "Попытка загрузить выбранный интервал истории чата этой комнаты не удалась, так как запрошенный элемент не найден."
         },
         "m.audio": {
+            "audio_player": "Аудиоплеер",
             "error_downloading_audio": "Ошибка загрузки аудио",
             "error_processing_audio": "Ошибка обработки звукового сообщения",
             "error_processing_voice_message": "Ошибка при обработке голосового сообщения",
@@ -3197,7 +3497,7 @@
         },
         "m.file": {
             "error_decrypting": "Ошибка расшифровки вложения",
-            "error_invalid": "Недопустимый файл%(extra)s"
+            "error_invalid": "Недопустимый формат файла"
         },
         "m.image": {
             "error": "Невозможно показать изображение из-за ошибки",
@@ -3222,7 +3522,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Опрос завершен",
             "sender_ended": "%(senderName)s завершил(а) опрос"
         },
         "m.poll.start": "%(senderName)s начал(а) опрос — %(pollQuestion)s",
@@ -3298,6 +3597,7 @@
             "left_reason": "%(targetName)s покинул(а) комнату: %(reason)s",
             "no_change": "%(senderName)s не сделал(а) изменений",
             "reject_invite": "%(targetName)s отклонил(а) приглашение",
+            "reject_invite_reason": "%(targetName)s отклонил приглашение: %(reason)s",
             "remove_avatar": "%(senderName)s удалил(а) аватар",
             "remove_name": "%(senderName)s удалил(а) отображаемое имя (%(oldDisplayName)s)",
             "set_avatar": "%(senderName)s установил(а) аватар",
@@ -3334,11 +3634,13 @@
         },
         "m.room.tombstone": "%(senderDisplayName)s обновил(а) эту комнату.",
         "m.room.topic": {
-            "changed": "%(senderDisplayName)s изменил(а) тему комнаты на \"%(topic)s\"."
+            "changed": "%(senderDisplayName)s изменил(а) тему комнаты на \"%(topic)s\".",
+            "removed": "%(senderDisplayName)s удалил тему."
         },
-        "m.sticker": "%(senderDisplayName)s отправил(а) наклейку.",
+        "m.sticker": "%(senderDisplayName)s отправил(а) стикер.",
         "m.video": {
-            "error_decrypting": "Ошибка расшифровки видео"
+            "error_decrypting": "Ошибка расшифровки видео",
+            "show_video": "Показать видео"
         },
         "m.widget": {
             "added": "Виджет %(widgetName)s был добавлен %(senderName)s",
@@ -3386,7 +3688,8 @@
         "reactions": {
             "add_reaction_prompt": "Отреагировать",
             "custom_reaction_fallback_label": "Пользовательская реакция",
-            "label": "%(reactors)s отреагировали %(content)s"
+            "label": "%(reactors)s отреагировали %(content)s",
+            "tooltip_caption": "отреагировал с %(shortName)s"
         },
         "read_receipt_title": {
             "one": "Просмотрел %(count)s человек",
@@ -3575,6 +3878,10 @@
         "few": "И еще %(count)s...",
         "many": "И еще %(count)s..."
     },
+    "unsupported_browser": {
+        "description": "Если вы продолжите, некоторые функции могут перестать работать, и существует риск потери данных в будущем. Обновите браузер, чтобы продолжить использование %(brand)s.",
+        "title": "%(brand)s не поддерживает этот браузер"
+    },
     "unsupported_server_description": "На этом сервере используется старая версия Matrix. Перейдите на Matrix%(version)s, чтобы использовать %(brand)s ее без ошибок.",
     "unsupported_server_title": "Ваш сервер не поддерживается",
     "update": {
@@ -3592,6 +3899,13 @@
         "toast_title": "Обновление %(brand)s",
         "unavailable": "Недоступен"
     },
+    "update_room_access_modal": {
+        "description": "Чтобы создать ссылку для совместного доступа, сделайте эту комнату <b>общедоступной</b> и разрешите пользователям <b>запрашивать присоединение</b>. Это позволит гостям присоединиться без приглашения.",
+        "dont_change_description": "Кроме того, вы можете провести звонок в отдельной комнате.",
+        "no_change": "Я не хочу менять уровень доступа.",
+        "revert_access_description": "(Это можно вернуть к прежнему значению в настройках комнаты: <b>Безопасность и конфиденциальность</b> / <b>Доступ</b>)",
+        "title": "Изменить уровень доступа в комнату"
+    },
     "upload_failed_generic": "Файл '%(fileName)s' не был загружен.",
     "upload_failed_size": "Размер файла '%(fileName)s' превышает допустимый предел загрузки, установленный на этом сервере",
     "upload_failed_title": "Сбой отправки файла",
@@ -3601,6 +3915,7 @@
         "error_files_too_large": "Эти файлы <b>слишком большие</b> для загрузки. Лимит размера файла составляет %(limit)s.",
         "error_some_files_too_large": "Некоторые файлы имеют <b>слишком большой размер</b>, чтобы их можно было загрузить. Лимит размера файла составляет %(limit)s.",
         "error_title": "Ошибка загрузки",
+        "not_image": "Выбранный вами файл не является изображением.",
         "title": "Загрузка файлов",
         "title_progress": "Загрузка файлов (%(current)s из %(total)s)",
         "upload_all_button": "Загрузить всё",
@@ -3620,7 +3935,7 @@
         "deactivate_confirm_description": "Деактивация этого пользователя приведет к его выходу из системы и запрету повторного входа. Кроме того, они оставит все комнаты, в которых он участник. Это действие безповоротно. Вы уверены, что хотите деактивировать этого пользователя?",
         "deactivate_confirm_title": "Деактивировать пользователя?",
         "demote_button": "Понижение",
-        "demote_self_confirm_description_space": "Вы не сможете отменить это изменение, поскольку вы понижаете свои права, если вы являетесь последним привилегированным пользователем в пространстве, будет невозможно восстановить привилегии вбудущем.",
+        "demote_self_confirm_description_space": "Вы не сможете отменить это изменение, поскольку вы понижаете свои права, если вы являетесь последним привилегированным пользователем в пространстве, будет невозможно восстановить привилегии в будущем.",
         "demote_self_confirm_room": "После понижения своих привилегий вы не сможете это отменить. Если вы являетесь последним привилегированным пользователем в этой комнате, выдать права кому-либо заново будет невозможно.",
         "demote_self_confirm_title": "Понизить самого себя?",
         "disinvite_button_room": "Отозвать приглашение в комнату",
@@ -3632,10 +3947,11 @@
         "error_mute_user": "Не удалось заглушить пользователя",
         "error_revoke_3pid_invite_description": "Не удалось отозвать приглашение. Возможно, на сервере возникла вре́менная проблема или у вас недостаточно прав для отзыва приглашения.",
         "error_revoke_3pid_invite_title": "Не удалось отменить приглашение",
+        "ignore_button": "Игнорировать",
         "ignore_confirm_description": "Все сообщения и приглашения от этого пользователя будут скрыты. Вы действительно хотите их игнорировать?",
         "ignore_confirm_title": "Игнорировать %(user)s",
         "invited_by": "Приглашен %(sender)s",
-        "jump_to_rr_button": "Перейти к последнему прочтённому",
+        "jump_to_rr_button": "Перейти к последнему прочитанному сообщению",
         "kick_button_room": "Удалить из комнаты",
         "kick_button_room_name": "Удалить из %(roomName)s",
         "kick_button_space": "Исключить из пространства",
@@ -3659,19 +3975,22 @@
             "no_recent_messages_description": "Попробуйте пролистать ленту сообщений вверх, чтобы увидеть, есть ли более ранние.",
             "no_recent_messages_title": "Последние сообщения от %(user)s не найдены"
         },
-        "redact_button": "Удалить последние сообщения",
+        "redact_button": "Удалить сообщения",
         "revoke_invite": "Отозвать приглашение",
         "room_encrypted": "Сообщения в этой комнате защищены сквозным шифрованием.",
         "room_encrypted_detail": "Ваши сообщения в безопасности, ключи для расшифровки есть только у вас и получателя.",
         "room_unencrypted": "Сообщения в этой комнате не защищены сквозным шифрованием.",
         "room_unencrypted_detail": "В зашифрованных комнатах ваши сообщения в безопасности: только у вас и у получателя есть ключи для расшифровки.",
-        "share_button": "Поделиться ссылкой на пользователя",
+        "send_message": "Отправить сообщение",
+        "share_button": "Поделиться профилем",
         "unban_button_room": "Разблокировать в комнате",
         "unban_button_space": "Разблокировать в пространстве",
         "unban_room_confirm_title": "Разблокировать в %(roomName)s",
         "unban_space_everything": "Разблокировать их везде, где я могу это сделать",
         "unban_space_specific": "Разблокировать их из определённых мест, где я могу это сделать",
         "unban_space_warning": "Они не смогут получить доступ к тем местам, где вы не являетесь администратором.",
+        "unignore_button": "Не игнорировать",
+        "verification_unavailable": "Проверка пользователя недоступна",
         "verify_button": "Подтвердить пользователя",
         "verify_explainer": "Для дополнительной безопасности подтвердите этого пользователя, сравнив одноразовый код на ваших устройствах."
     },
@@ -3700,27 +4019,37 @@
         "camera_disabled": "Ваша камера выключена",
         "camera_enabled": "Ваша камера всё ещё включена",
         "cannot_call_yourself_description": "Вы не можете позвонить самому себе.",
+        "close_lobby": "Закрыть лобби",
         "connecting": "Подключение",
         "connection_lost": "Соединение с сервером потеряно",
         "connection_lost_description": "Вы не можете совершать вызовы без подключения к серверу.",
         "consulting": "Общение с %(transferTarget)s. <a>Перевод на %(transferee)s</a>",
+        "decline_call": "Отклонить",
         "default_device": "Устройство по умолчанию",
         "dial": "Набор",
         "dialpad": "Панель набора номера",
         "disable_camera": "Отключить камеру",
         "disable_microphone": "Отключить микрофон",
-        "disabled_no_one_here": "Здесь некому звонить",
         "disabled_no_perms_start_video_call": "У вас нет разрешения для запуска видеозвонка",
         "disabled_no_perms_start_voice_call": "У вас нет разрешения для запуска звонка",
         "disabled_ongoing_call": "Текущий звонок",
+        "element_call": "Element Call",
         "enable_camera": "Включить камеру",
         "enable_microphone": "Включить микрофон",
         "expand": "Вернуться к звонку",
+        "get_call_link": "Поделиться ссылкой на звонок",
         "hangup": "Повесить трубку",
         "hide_sidebar_button": "Скрыть боковую панель",
         "input_devices": "Устройства ввода",
+        "jitsi_call": "Конференция Jitsi",
         "join_button_tooltip_call_full": "Извините — этот вызов в настоящее время заполнен",
+        "legacy_call": "Звонок (устаревший)",
         "maximise": "Заполнить экран",
+        "maximise_call": "Развернуть звонок",
+        "metaspace_video_rooms": {
+            "conference_room_section": "Конференции"
+        },
+        "minimise_call": "Свернуть звонок",
         "misconfigured_server": "Вызов не состоялся из-за неправильно настроенного сервера",
         "misconfigured_server_description": "Попросите администратора вашего домашнего сервера (<code>%(homeserverDomain)s</code>) настроить сервер TURN для надежной работы звонков.",
         "misconfigured_server_fallback": "В качестве альтернативы вы можете попробовать использовать общедоступный сервер по адресу <server/>, но он не будет таким надежным, и ваш IP-адрес будет передаваться на сервер. Вы также можете управлять этим в настройках.",
@@ -3747,6 +4076,7 @@
         "show_sidebar_button": "Показать боковую панель",
         "silence": "Тихий вызов",
         "silenced": "Оповещения приглушены",
+        "skip_lobby_toggle_option": "Присоединиться прямо сейчас",
         "start_screenshare": "Начать делиться экраном",
         "stop_screenshare": "Перестать делиться экраном",
         "too_many_calls": "Слишком много звонков",
@@ -3767,8 +4097,11 @@
         "user_busy_description": "Вызываемый пользователь занят.",
         "user_is_presenting": "%(sharerName)s показывает",
         "video_call": "Видеовызов",
+        "video_call_incoming": "Входящий видеозвонок",
         "video_call_started": "Начался видеозвонок",
+        "video_call_using": "Видеозвонок с использованием:",
         "voice_call": "Голосовой вызов",
+        "voice_call_incoming": "Входящий голосовой вызов",
         "you_are_presenting": "Вы представляете"
     },
     "web_default_device_name": "%(appName)s: %(browserName)s на %(osName)s",
@@ -3867,7 +4200,7 @@
         "error_need_to_be_logged_in": "Вы должны войти в систему.",
         "error_unable_start_audio_stream_description": "Невозможно запустить аудио трансляцию.",
         "error_unable_start_audio_stream_title": "Не удалось запустить прямую трансляцию",
-        "modal_data_warning": "Данные на этом экране используются %(widgetDomain)s",
+        "modal_data_warning": "Приведенные ниже данные передаются %(widgetDomain)s",
         "modal_title_default": "Модальный виджет",
         "no_name": "Неизвестное приложение",
         "open_id_permissions_dialog": {
@@ -3876,7 +4209,7 @@
             "title": "Разрешите этому виджету проверить ваш идентификатор"
         },
         "popout": "Всплывающий виджет",
-        "set_room_layout": "Установить мой макет комнаты для всех",
+        "set_room_layout": "Установить макет для всех",
         "shared_data_avatar": "URL-адрес изображения вашего профиля",
         "shared_data_device_id": "Идентификатор вашего устройства",
         "shared_data_lang": "Ваш язык",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 07e7ffeeb1..64a49eed52 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -97,7 +97,7 @@
         "maximise": "Maximalizovať",
         "mention": "Zmieniť sa",
         "minimise": "Minimalizovať",
-        "new_message": "Nová správa",
+        "new_conversation": "Nová konverzácia",
         "new_room": "Nová miestnosť",
         "new_video_room": "Nová video miestnosť",
         "next": "Ďalej",
@@ -244,8 +244,7 @@
             "setup_key_backup_title": "Stratíte prístup ku zašifrovaným správam",
             "setup_secure_backup_description_1": "Šifrované správy sú zabezpečené end-to-end šifrovaním. Kľúče na čítanie týchto správ máte len vy a príjemca (príjemcovia).",
             "setup_secure_backup_description_2": "Po odhlásení sa tieto kľúče z tohto zariadenia vymažú, čo znamená, že nebudete môcť čítať zašifrované správy, pokiaľ k nim nemáte kľúče v iných zariadeniach alebo ich nemáte zálohované na serveri.",
-            "skip_key_backup": "Nezáleží mi na zašifrovaných správach",
-            "use_key_backup": "Začnite používať zálohovanie kľúčov"
+            "skip_key_backup": "Nezáleží mi na zašifrovaných správach"
         },
         "misconfigured_body": "Požiadajte správcu vášho %(brand)su, aby skontroloval <a>vašu konfiguráciu</a>. Pravdepodobne obsahuje chyby alebo duplikáty.",
         "misconfigured_title": "Váš %(brand)s nie je nastavený správne",
@@ -607,12 +606,12 @@
         "user": "Používateľ",
         "user_avatar": "Obrázok v profile",
         "username": "Meno používateľa",
-        "verification_cancelled": "Overovanie zrušené",
         "verified": "Overený",
         "version": "Verzia",
         "video": "Video",
         "video_room": "Video miestnosť",
         "view_message": "Zobraziť správu",
+        "voice": "Hlas",
         "warning": "Upozornenie"
     },
     "composer": {
@@ -653,16 +652,17 @@
         "mode_plain": "Skryť formátovanie",
         "mode_rich_text": "Zobraziť formátovanie",
         "no_perms_notice": "Nemáte povolenie posielať do tejto miestnosti",
-        "placeholder": "Odoslať správu…",
-        "placeholder_encrypted": "Odoslať šifrovanú správu…",
-        "placeholder_reply": "Odoslať odpoveď…",
-        "placeholder_reply_encrypted": "Odoslať šifrovanú odpoveď…",
-        "placeholder_thread": "Odpovedať na vlákno…",
-        "placeholder_thread_encrypted": "Odpovedať na zašifrované vlákno…",
+        "placeholder": "Odoslať nezašifrovanú správu...",
+        "placeholder_encrypted": "Odoslať správu...",
+        "placeholder_reply": "Odoslať nešifrovanú odpoveď…",
+        "placeholder_reply_encrypted": "Odoslať odpoveď…",
+        "placeholder_thread": "Odpovedať na nešifrované vlákno…",
+        "placeholder_thread_encrypted": "Odpovedať na vlákno…",
         "poll_button": "Anketa",
         "poll_button_no_perms_description": "Nemáte povolenie spúšťať ankety v tejto miestnosti.",
         "poll_button_no_perms_title": "Vyžaduje sa povolenie",
         "replying_title": "Odpoveď",
+        "room_unencrypted": "Správy v tejto miestnosti nie sú end-to-end šifrované",
         "room_upgraded_link": "Konverzácia pokračuje tu.",
         "room_upgraded_notice": "Táto miestnosť bola nahradená a nie je viac aktívna.",
         "send_button_title": "Odoslať správu",
@@ -726,6 +726,7 @@
         "personal_space_description": "Súkromný priestor na usporiadanie vašich miestností",
         "private_description": "Len pre pozvaných, najlepšie pre seba alebo tímy",
         "private_heading": "Váš súkromný priestor",
+        "private_only_heading": "Váš priestor",
         "private_personal_description": "Uistite sa, že k %(name)s majú prístup správni ľudia",
         "private_personal_heading": "S kým spolupracujete?",
         "private_space": "Ja a moji kolegovia z tímu",
@@ -793,6 +794,7 @@
             "cross_signing_status": "Stav krížového podpisovania:",
             "cross_signing_untrusted": "Váš účet má identitu s krížovým podpisom v tajnom úložisku, ale táto relácia mu zatiaľ nedôveruje.",
             "crypto_not_available": "Kryptografický modul nie je k dispozícii",
+            "device_id": "ID zariadenia",
             "key_backup_active_version": "Aktívna verzia zálohy:",
             "key_backup_active_version_none": "Žiadna",
             "key_backup_inactive_warning": "Vaše kľúče nie sú zálohované z tejto relácie.",
@@ -805,11 +807,24 @@
             "secret_storage_ready": "pripravený",
             "secret_storage_status": "Tajné úložisko:",
             "self_signing_private_key_cached_status": "Súkromný kľúč s vlastným podpisom:",
+            "session": "Relácia",
+            "session_fingerprint": "Odtlačok prsta (kľúč relácie)",
             "title": "Šifrovanie typu end-to-end",
             "user_signing_private_key_cached_status": "Súkromný kľúč podpisovania používateľa:"
         },
         "developer_mode": "Režim pre vývojárov",
         "developer_tools": "Vývojárske nástroje",
+        "device_dehydrated_no": "Dehydratované: Nie",
+        "device_dehydrated_yes": "Dehydratované: Áno",
+        "device_id": "ID zariadenia: %(deviceId)s",
+        "device_keys": "Kľúče zariadenia",
+        "device_verification_status": {
+            "signed_by_owner": "Stav overenia: <E2EIcon /> Podpísané majiteľom",
+            "unknown": "Stav overenia: Neznámy",
+            "unverified": "Stav overenia: <E2EIcon /> Nepodpísané vlastníkom",
+            "verified": "Stav overenia: <E2EIcon /> Overené krížovým podpisom"
+        },
+        "devices": "Kryptografické zariadenia (%(count)s )",
         "edit_setting": "Upraviť nastavenie",
         "edit_values": "Upraviť hodnoty",
         "empty_string": "<prázdny reťazec>",
@@ -825,15 +840,18 @@
         "failed_to_save": "Nepodarilo sa uložiť nastavenia.",
         "failed_to_send": "Nepodarilo sa odoslať udalosť!",
         "id": "ID: ",
+        "invalid_device_key_id": "Neplatný ID kľúč zariadenia",
         "invalid_json": "Nevyzerá to ako platný JSON.",
         "level": "Úroveň",
         "low_bandwidth_mode": "Režim nízkej šírky pásma",
         "low_bandwidth_mode_description": "Vyžaduje kompatibilný domovský server.",
         "main_timeline": "Hlavná časová os",
+        "manual_device_verification": "Manuálne overenie zariadenia",
         "no_receipt_found": "Nenašlo sa žiadne potvrdenie",
         "notification_state": "Stav oznámenia je <strong>%(notificationState)s</strong>",
         "notifications_debug": "Ladenie oznámení",
         "number_of_users": "Počet používateľov",
+        "only_joined_members": "Iba pripojení používatelia",
         "original_event_source": "Pôvodný zdroj udalosti",
         "room_encrypted": "Miestnosť je <strong>šifrovaná ✅</strong>",
         "room_id": "ID miestnosti: %(roomId)s",
@@ -868,6 +886,7 @@
             "elementCallUrl": "URL adresa Element Call"
         },
         "settings_explorer": "Prieskumník nastavení",
+        "show_empty_content_events": "Zobraziť udalosti s prázdnym obsahom",
         "show_hidden_events": "Zobrazovať skryté udalosti v histórii obsahu miestností",
         "spaces": {
             "one": "<priestor>",
@@ -881,10 +900,23 @@
         "toggle_event": "prepnúť udalosť",
         "toolbox": "Nástroje",
         "use_at_own_risk": "Toto používateľské rozhranie nekontroluje typy hodnôt. Používajte ho na vlastné riziko.",
+        "user_avatar": "Profilový obrázok: %(avatar)s",
+        "user_displayname": "Zobrazované meno: %(displayname)s",
+        "user_id": "ID používateľa: %(userId)s",
+        "user_no_avatar": "Obrázok: <i>Žiadny</i>",
+        "user_no_displayname": "Zobrazované meno: <i>Žiadne</i>",
         "user_read_up_to": "Používateľ sa dočítal až do: ",
         "user_read_up_to_ignore_synthetic": "Používateľ prečíta až do (ignoreSynthetic): ",
         "user_read_up_to_private": "Používateľ prečíta až do (m.read.private): ",
         "user_read_up_to_private_ignore_synthetic": "Používateľ prečíta až do (m.read.private;ignoreSynthetic): ",
+        "user_room_membership": "Členstvo: %(membership)s",
+        "user_verification_status": {
+            "identity_changed": "Stav overenia: <E2EIcon /> Neoverené a identita zmenená",
+            "unverified": "Stav overenia: <E2EIcon /> Neoverené",
+            "verified": "Stav overenia: <E2EIcon /> Overené",
+            "was_verified": "Stav overenia: <E2EIcon /> Bolo overené, ale totožnosť sa zmenila"
+        },
+        "users": "Používatelia",
         "value": "Hodnota",
         "value_colon": "Hodnota:",
         "value_in_this_room": "Hodnota v tejto miestnosti",
@@ -926,11 +958,10 @@
             },
             "privacy_warning": "Uistite sa, že túto obrazovku nikto neuvidí!",
             "restoring": "Obnovenie kľúčov zo zálohy",
-            "security_key_title": "Kľúč na obnovenie"
+            "security_key_label": "Kľúč na obnovenie",
+            "security_key_title": "Zadajte svoj kľúč na obnovenie"
         },
         "bootstrap_title": "Príprava kľúčov",
-        "cancel_entering_passphrase_description": "Naozaj chcete zrušiť zadávanie prístupovej frázy?",
-        "cancel_entering_passphrase_title": "Zrušiť zadanie prístupovej frázy?",
         "confirm_encryption_setup_body": "Kliknutím na tlačidlo nižšie potvrdíte nastavenie šifrovania.",
         "confirm_encryption_setup_title": "Potvrdiť nastavenie šifrovania",
         "cross_signing_room_normal": "Táto miestnosť je end-to-end šifrovaná",
@@ -941,6 +972,7 @@
         "cross_signing_user_warning": "Tento používateľ si neoveril všetky svoje relácie.",
         "enter_recovery_key": "Zadajte kľúč na obnovenie",
         "event_shield_reason_authenticity_not_guaranteed": "Vierohodnosť tejto zašifrovanej správy nie je možné na tomto zariadení zaručiť.",
+        "event_shield_reason_mismatched_sender": "Odosielateľ udalosti sa nezhoduje s vlastníkom zariadenia, ktoré ju odoslalo.",
         "event_shield_reason_mismatched_sender_key": "Šifrované neoverenou reláciou",
         "event_shield_reason_unknown_device": "Šifrované neznámym alebo odstráneným zariadením.",
         "event_shield_reason_unsigned_device": "Šifrované zariadením, ktoré nie je overené jeho majiteľom.",
@@ -973,11 +1005,8 @@
             "title": "Odstránený spôsob obnovenia",
             "warning": "Ak ste neodstránili spôsob obnovenia vy, je možné, že útočník sa pokúša dostať k vášmu účtu. Radšej si ihneď zmeňte vaše heslo a nastavte si nový spôsob obnovenia v Nastaveniach."
         },
-        "reset_all_button": "Zabudli ste alebo ste stratili všetky metódy obnovy? <a>Resetovať všetko</a>",
         "set_up_recovery": "Nastaviť obnovenie",
-        "set_up_recovery_later": "Teraz nie",
         "set_up_recovery_toast_description": "Vytvorte kľúč na obnovenie, ktorý môžete použiť na obnovenie histórie šifrovaných správ v prípade straty prístupu k zariadeniam.",
-        "set_up_toast_description": "Zabezpečte sa proti strate šifrovaných správ a údajov",
         "set_up_toast_title": "Nastaviť bezpečné zálohovanie",
         "setup_secure_backup": {
             "explainer": "Zálohujte si šifrovacie kľúče pred odhlásením, aby ste zabránili ich strate."
@@ -998,16 +1027,17 @@
             "after_new_login": {
                 "device_verified": "Zariadenie overené",
                 "skip_verification": "Vynechať zatiaľ overovanie",
-                "unable_to_verify": "Nie je možné overiť toto zariadenie",
                 "verify_this_device": "Overiť toto zariadenie"
             },
-            "cancelled": "Zrušili ste overenie.",
-            "cancelled_self": "Zrušili ste overovanie na vašom druhom zariadení.",
-            "cancelled_user": "%(displayName)s zrušil/a overenie.",
+            "cancelled_verification": "Buď vypršal časový limit žiadosti, žiadosť bola zamietnutá alebo došlo k nezhode v overení.",
             "cancelling": "Rušenie…",
+            "cant_confirm": "Nemôžete potvrdiť?",
             "complete_action": "Rozumiem",
             "complete_description": "Úspešne ste overili tohoto používateľa.",
             "complete_title": "Overený!",
+            "confirm_identity_description": "Overte toto zariadenie, aby ste mohli nastaviť bezpečné správy",
+            "confirm_identity_title": "Potvrďte svoju totožnosť",
+            "confirm_the_emojis": "Potvrďte, že nižšie uvedené emotikony sa zhodujú s emotikonmi zobrazenými na vašom druhom zariadení.",
             "error_starting_description": "Nepodarilo sa nám spustiť konverzáciu s druhým používateľom.",
             "error_starting_title": "Chyba pri spustení overovania",
             "explainer": "Zabezpečené správy s týmto používateľom sú end-to-end šifrované a tretie strany ich nemôžu čítať.",
@@ -1018,58 +1048,72 @@
             "incoming_sas_dialog_waiting": "Čakanie na potvrdenie od partnera…",
             "incoming_sas_user_dialog_text_1": "Overte tohto používateľa a označte ho ako dôveryhodného. Dôveryhodní používatelia vám poskytujú dodatočný pokoj na duši pri používaní end-to-end šifrovaných správ.",
             "incoming_sas_user_dialog_text_2": "Overenie tohto používateľa označí jeho reláciu ako dôveryhodnú a zároveň označí vašu reláciu ako dôveryhodnú pre neho.",
-            "no_key_or_device": "Vyzerá to, že nemáte kľúč na obnovenie ani žiadne iné zariadenie, pomocou ktorého by ste to mohli overiť.  Toto zariadenie nebude mať prístup k starým zašifrovaným správam. Ak chcete overiť svoju totožnosť na tomto zariadení, budete musieť obnoviť svoje overovacie kľúče.",
+            "manual": {
+                "already_verified": "Toto zariadenie je už overené",
+                "already_verified_and_wrong_fingerprint": "Zadaný odtlačok prsta sa nezhoduje, ale zariadenie je už overené!",
+                "device_id": "ID zariadenia",
+                "failure_description": "Nepodarilo sa overiť '%(deviceId)s': %(error)s",
+                "failure_title": "Overenie zlyhalo",
+                "fingerprint": "Odtlačok prsta (kľúč relácie)",
+                "no_crypto": "Nie je možné overiť zariadenie - kryptografia nie je povolená",
+                "no_device": "Zariadenie sa nepodarilo overiť - zariadenie '%(deviceId)s' nebolo nájdené",
+                "no_userid": "Nie je možné overiť zariadenie - nepodarilo sa nájsť naše ID používateľa",
+                "success_description": "Zariadenie (%(deviceId)s ) je teraz krížovo podpísané",
+                "success_title": "Overenie úspešné",
+                "text": "Na overenie zadajte ID a odtlačok jedného z vašich vlastných zariadení. POZNÁMKA: toto umožňuje druhému zariadeniu odosielať a prijímať správy ako vy. AK VÁM NIEKTO POVEDAL, ABY STE SEM NIEČO VLOŽILI, JE PRAVDEPODOBNÉ, ŽE IDE O PODVOD!",
+                "wrong_fingerprint": "Nie je možné overiť zariadenie '%(deviceId)s' - dodaný odtlačok prsta '%(fingerprint)s' sa nezhoduje s odtlačkom prsta zariadenia, '%(fprint)s'"
+            },
             "no_support_qr_emoji": "Zariadenie, ktoré sa snažíte overiť, nepodporuje overenie skenovaním QR kódu ani overenie pomocou emotikonov, ktoré podporuje aplikácia %(brand)s. Skúste použiť iného klienta.",
+            "now_you_can": "Teraz môžete bezpečne čítať alebo odosielať správy a tomuto zariadeniu môže dôverovať každý, s kým konverzujete.",
+            "once_accepted_can_continue": "Po schválení budete môcť pokračovať v overovaní.",
             "other_party_cancelled": "Proti strana zrušila overovanie.",
             "prompt_encrypted": "Overte všetkých používateľov v miestnosti, aby ste sa uistili, že je zabezpečená.",
-            "prompt_self": "Znova spustiť overovanie z oznámenia.",
             "prompt_unencrypted": "V šifrovaných miestnostiach overte všetkých používateľov, aby ste zaistili ich bezpečnosť.",
-            "prompt_user": "Znova začnite overovanie z ich profilu.",
             "qr_or_sas": "%(qrCode)s alebo %(emojiCompare)s",
-            "qr_or_sas_header": "Overte toto zariadenie dokončením jednej z nasledujúcich možností:",
             "qr_prompt": "Naskenujte tento jedinečný kód",
-            "qr_reciprocate_same_shield_device": "Už je to takmer hotové! Zobrazuje vaše druhé zariadenie rovnaký štít?",
+            "qr_reciprocate_check_again_device": "Znova skontrolujte na druhom zariadení, aby ste dokončili overenie.",
+            "qr_reciprocate_no": "Nie, nevidím zelený štít",
             "qr_reciprocate_same_shield_user": "Už je to takmer hotové! Zobrazuje sa %(displayName)s rovnaký štít?",
-            "request_toast_accept": "Overiť reláciu",
+            "qr_reciprocate_yes": "Áno, vidím zelený štít",
             "request_toast_accept_user": "Overiť používateľa",
             "request_toast_decline_counter": "Ignorovať (%(counter)s)",
             "request_toast_detail": "%(deviceId)s z %(ip)s",
-            "reset_proceed_prompt": "Pokračovať v obnovení",
+            "request_toast_start_verification": "Spustiť overovanie",
             "sas_caption_self": "Overte toto zariadenie potvrdením, že sa na jeho obrazovke zobrazí nasledujúce číslo.",
             "sas_caption_user": "Overte tohoto používateľa tým, že zistíte, či sa na jeho obrazovke objaví nasledujúce číslo.",
             "sas_description": "Pokiaľ nemáte na svojich zariadeniach kameru, porovnajte jedinečnú kombináciu emotikonov",
-            "sas_emoji_caption_self": "Potvrďte, že nasledujúce emotikony sú zobrazené na oboch zariadeniach v rovnakom poradí:",
             "sas_emoji_caption_user": "Overte tohto používateľa potvrdením, že sa na jeho obrazovke zobrazujú nasledujúce emotikony.",
             "sas_match": "Zhodujú sa",
             "sas_no_match": "Nezhodujú sa",
             "sas_prompt": "Porovnajte jedinečnú kombináciu emotikonov",
             "scan_qr": "Overte naskenovaním",
             "scan_qr_explainer": "Požiadajte %(displayName)s, aby naskenoval váš kód:",
-            "self_verification_hint": "Ak chcete pokračovať, prijmite žiadosť o overenie na vašom druhom zariadení.",
             "start_button": "Spustiť overovanie",
-            "successful_device": "Úspešne ste overili %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "Úspešne ste overili svoje zariadenie!",
             "successful_user": "Úspešne ste overili %(displayName)s!",
-            "timed_out": "Čas overovania vypršal.",
             "unsupported_method": "Nie je možné nájsť podporovanú metódu overenia.",
             "unverified_session_toast_accept": "Áno, bol som to ja",
             "unverified_session_toast_title": "Nové prihlásenie. Boli ste to vy?",
             "unverified_sessions_toast_description": "Skontrolujte, či je vaše konto bezpečné",
             "unverified_sessions_toast_reject": "Neskôr",
             "unverified_sessions_toast_title": "Máte neoverené relácie",
-            "verification_description": "Overte svoju totožnosť, aby ste mali prístup k zašifrovaným správam a potvrdili svoju totožnosť ostatným. Ak používate aj mobilné zariadenie, otvorte aplikáciu predtým, ako budete pokračovať.",
+            "use_another_device": "Použiť iné zariadenie",
+            "use_recovery_key": "Použiť kľúč na obnovenie",
+            "verification_dialog_title_choose": "Vyberte spôsob overenia",
+            "verification_dialog_title_compare_emojis": "Porovnať emotikony",
+            "verification_dialog_title_confirm_green_shield": "Potvrďte, že na druhom zariadení vidíte zelený štít",
             "verification_dialog_title_device": "Overenie iného zariadenia",
+            "verification_dialog_title_failed": "Overenie zlyhalo",
+            "verification_dialog_title_start_on_other_device": "Spustite overenie na druhom zariadení",
             "verification_dialog_title_user": "Žiadosť o overenie",
+            "verification_dialog_title_verified": "Zariadenie overené",
             "verification_skip_warning": "Bez overenia nebudete mať prístup ku všetkým svojim správam a pre ostatných sa môžete javiť ako nedôveryhodní.",
             "verification_success_with_backup": "Vaše nové zariadenie je teraz overené. Má prístup k vašim zašifrovaným správam a ostatní používatelia ho budú považovať za dôveryhodné.",
             "verification_success_without_backup": "Vaše nové zariadenie je teraz overené. Ostatní používatelia ho budú vidieť ako dôveryhodné.",
+            "verify_by_completing_one_of": "Overte vyplnením jednej z nasledujúcich možností:",
             "verify_emoji": "Overiť pomocou emotikonov",
             "verify_emoji_prompt": "Overenie porovnaním jedinečnej kombinácie emotikonov.",
             "verify_emoji_prompt_qr": "Ak sa vám nepodarí naskenovať uvedený kód, overte pomocou porovnania jedinečných emotikonov.",
             "verify_later": "Overím to neskôr",
-            "verify_using_device": "Overiť pomocou iného zariadenia",
-            "verify_using_key": "Overiť pomocou kľúča na obnovenie",
-            "verify_using_key_or_phrase": "Overiť pomocou kľúča na obnovenie alebo frázy",
             "waiting_for_user_accept": "Čaká sa, kým to %(displayName)s prijme…",
             "waiting_other_device": "Čaká sa na overenie na vašom druhom zariadení…",
             "waiting_other_device_details": "Čaká sa na overenie na vašom druhom zariadení, %(deviceName)s (%(deviceId)s)…",
@@ -1119,6 +1163,7 @@
         "tls": "Nie je možné pripojiť sa k domovskému serveru - skontrolujte prosím funkčnosť vášho pripojenia na internet. Uistite sa že <a>certifikát domovského servera</a> je dôveryhodný a že žiaden doplnok nainštalovaný v prehliadači nemôže blokovať požiadavky.",
         "unknown": "Neznáma chyba",
         "unknown_error_code": "neznámy kód chyby",
+        "update_history_visibility": "Nepodarilo sa zmeniť viditeľnosť histórie",
         "update_power_level": "Nepodarilo sa zmeniť úroveň oprávnenia"
     },
     "error_app_open_in_another_tab": "Prepnite na druhú kartu aby ste sa spojili s aplikáciou %(brand)s. Túto kartu môžete teraz zatvoriť.",
@@ -1364,6 +1409,10 @@
         "name_email_mxid_share_space": "Pozvite niekoho pomocou jeho mena, e-mailovej adresy, používateľského mena (napríklad <userId/>) alebo <a>zdieľajte tento priestor</a>.",
         "name_mxid_share_room": "Pozvite niekoho pomocou jeho mena, používateľského mena (napríklad <userId/>) alebo <a>zdieľate túto miestnosť</a>.",
         "name_mxid_share_space": "Pozvite niekoho pomocou jeho mena, používateľského mena (napríklad <userId/>) alebo <a>zdieľajte tento priestor</a>.",
+        "progress": {
+            "dont_close": "Nezatvárajte aplikáciu, kým nie je proces dokončený.",
+            "preparing": "Príprava pozvánok..."
+        },
         "recents_section": "Nedávne konverzácie",
         "room_failed_partial": "Ostatným sme pozvánky poslali, ale nižšie uvedené osoby nemohli byť pozvané do <RoomName/>",
         "room_failed_partial_title": "Niektoré pozvánky nebolo možné odoslať",
@@ -1452,6 +1501,7 @@
         "room_list_navigate_down": "Prejsť v zozname miestností smerom nadol",
         "room_list_navigate_up": "Prejsť v zozname miestností smerom hore",
         "room_list_select_room": "Vybrať miestnosť zo zoznamu miestností",
+        "save": "Uložiť",
         "scroll_down_timeline": "Posun dole na časovej osi",
         "scroll_up_timeline": "Posun hore na časovej osi",
         "search": "Vyhľadávanie (musí byť povolené)",
@@ -1468,7 +1518,6 @@
         "upload_file": "Nahrať súbor"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Povoliť režim iba zdieľania obrazovky",
         "ask_to_join": "Umožniť požiadať o pripojenie",
         "automatic_debug_logs": "Automatické odosielanie záznamov ladenia pri akejkoľvek chybe",
         "automatic_debug_logs_decryption": "Automatické odosielanie záznamov ladenia pri chybe dešifrovania",
@@ -1533,6 +1582,9 @@
         "render_reaction_images_description": "Niekedy sa označujú ako „vlastné emotikony“.",
         "report_to_moderators": "Nahlásiť moderátorom",
         "report_to_moderators_description": "V miestnostiach, ktoré podporujú moderovanie, môžete pomocou tlačidla \"Nahlásiť\" nahlásiť porušovanie pravidiel moderátorom miestnosti.",
+        "share_history_on_invite": "Zdieľajte zašifrovanú históriu s novými členmi",
+        "share_history_on_invite_description": "Pri pozývaní používateľa do zašifrovanej miestnosti s históriou nastavenou na „zdieľanú“ zdieľať s týmto používateľom aj zašifrovanú históriu a pri pozvaní do takejto miestnosti prijať zašifrovanú históriu.",
+        "share_history_on_invite_warning": "Táto funkcia je EXPERIMENTÁLNA a nie sú implementované všetky bezpečnostné opatrenia. Nepovoľujte ju v produkčných účtoch.",
         "sliding_sync": "Režim kĺzavej synchronizácie",
         "sliding_sync_description": "V štádiu aktívneho vývoja, nie je možné to vypnúť.",
         "sliding_sync_disabled_notice": "Odhláste sa a znova sa prihláste, aby sa to vyplo",
@@ -1655,8 +1707,8 @@
         "filter_placeholder": "Filtrovať členov v miestnosti",
         "invite_button_no_perms_tooltip": "Nemáte oprávnenie pozývať používateľov",
         "invited_label": "Pozvaní",
-        "no_matches": "Žiadne zhody",
-        "power_label": "%(userName)s (oprávnenie %(powerLevelNumber)s)"
+        "list_title": "Zoznam členov",
+        "no_matches": "Žiadne zhody"
     },
     "member_list_back_action_label": "Členovia miestnosti",
     "message_edit_dialog_title": "Úpravy správy",
@@ -1727,6 +1779,7 @@
         "end_message": "Anketa sa skončila. Najčastejšia odpoveď: %(topAnswer)s",
         "end_message_no_votes": "Anketa sa skončila. Nebol odovzdaný žiadny hlas.",
         "end_title": "Ukončiť anketu",
+        "ended_poll_label": "Anketa ukončená",
         "error_ending_description": "Ospravedlňujeme sa, ale anketa sa neskončila. Skúste to prosím znova.",
         "error_ending_title": "Nepodarilo sa ukončiť anketu",
         "error_voting_description": "Je nám ľúto, váš hlas nebol zaregistrovaný. Skúste to prosím znova.",
@@ -1734,10 +1787,22 @@
         "failed_send_poll_description": "Prepáčte, ale anketa, ktorú ste sa pokúsili vytvoriť, nebola zverejnená.",
         "failed_send_poll_title": "Nepodarilo sa odoslať anketu",
         "notes": "Výsledky sa zobrazia až po ukončení ankety",
+        "option_label": "Možnosť %(number)s,, %(answer)s",
+        "option_label_winning_with_total": {
+            "one": "Možnosť %(number)s ,%(answer)s, víťazná možnosť, %(count)s hlas",
+            "few": "Možnosť %(number)s, %(answer)s, víťazná možnosť, %(count)s hlasy",
+            "other": "Možnosť %(number)s, %(answer)s, víťazná možnosť, %(count)s hlasov"
+        },
+        "option_label_with_total": {
+            "one": "Možnosť %(number)s, %(answer)s, %(count)s hlas",
+            "few": "Možnosť %(number)s, %(answer)s, %(count)s hlasy",
+            "other": "Možnosť %(number)s, %(answer)s, %(count)s hlasov"
+        },
         "options_add_button": "Pridať možnosť",
         "options_heading": "Vytvoriť možnosti",
         "options_label": "Možnosť %(number)s",
         "options_placeholder": "Napíšte možnosť",
+        "poll_label": "Anketa",
         "topic_heading": "Aká je vaša otázka alebo téma ankety?",
         "topic_label": "Otázka alebo téma",
         "topic_placeholder": "Napíšte niečo…",
@@ -1762,6 +1827,7 @@
     },
     "power_level": {
         "admin": "Správca",
+        "creator": "Vlastník",
         "custom": "Vlastný (%(level)s)",
         "custom_level": "Vlastná úroveň",
         "default": "Predvolené",
@@ -1872,11 +1938,6 @@
                 "other": "Môžete pripnúť iba %(count)s widgetov"
             },
             "menu": "Otvoriť ponuku",
-            "release_announcement": {
-                "close": "Ok",
-                "description": "Všetky pripnuté správy nájdete tu. Prejdite na ľubovoľnú správu a výberom možnosti \"Pripnúť\" ju pridajte.",
-                "title": "Všetky nové pripnuté správy"
-            },
             "reply_thread": "Odpoveď na <link>vlákno správy</link>",
             "unpin_all": {
                 "button": "Zrušiť pripnutie všetkých správ",
@@ -1983,6 +2044,7 @@
         },
         "face_pile_tooltip_shortcut": "Vrátane %(commaSeparatedMembers)s",
         "face_pile_tooltip_shortcut_joined": "Vrátane vás, %(commaSeparatedMembers)s",
+        "failed_determine_user": "Nie je možné určiť, ktorého používateľa ignorovať, pretože sa zmenila udalosť člena.",
         "failed_reject_invite": "Nepodarilo sa odmietnuť pozvanie",
         "forget_room": "Zabudnúť túto miestnosť",
         "forget_space": "Zabudnúť tento priestor",
@@ -2002,7 +2064,9 @@
         "inaccessible_subtitle_1": "Skúste to neskôr alebo požiadajte správcu miestnosti alebo priestoru, aby skontroloval, či máte prístup.",
         "inaccessible_subtitle_2": "Pri pokuse o prístup do miestnosti alebo priestoru bolo vrátené %(errcode)s. Ak si myslíte, že sa vám táto správa zobrazuje chybne, <issueLink>odošlite hlásenie o chybe</issueLink>.",
         "intro": {
+            "display_topic": "Téma: <topic/>",
             "dm_caption": "V tejto konverzácii ste len vy dvaja, pokiaľ niektorý z vás nepozve niekoho iného, aby sa pripojil.",
+            "edit_topic": "Téma: <topic/> (<a>upraviť</a> )",
             "enable_encryption_prompt": "Zapnúť šifrovanie v nastaveniach.",
             "encrypted_3pid_dm_pending_join": "Keď sa všetci pridajú, budete môcť konverzovať",
             "no_avatar_label": "Pridajte fotografiu, aby si ľudia mohli ľahko všimnúť vašu miestnosť.",
@@ -2012,8 +2076,6 @@
             "send_message_start_dm": "Odošlite svoju prvú správu a pozvite <displayName/> do konverzácie",
             "start_of_dm_history": "Toto je začiatok histórie vašich priamych správ s používateľom <displayName/>.",
             "start_of_room": "Toto je začiatok miestnosti <roomName/>.",
-            "topic": "Téma: %(topic)s ",
-            "topic_edit": "Téma: %(topic)s (<a>upraviť</a>)",
             "unencrypted_warning": "End-to-end šifrovanie nie je zapnuté",
             "user_created": "%(displayName)s vytvoril túto miestnosť.",
             "you_created": "Túto miestnosť ste vytvorili vy."
@@ -2068,13 +2130,16 @@
         "pinned_message_banner": {
             "button_close_list": "Zatvoriť zoznam",
             "button_view_all": "Zobraziť všetko",
-            "description": "Táto miestnosť má pripnuté správy. Kliknutím ich zobrazíte.",
-            "go_to_message": "Zobraziť pripnuté správy na časovej osi.",
+            "description": "Pripnuté správy",
+            "go_to_newest_message": "Zobraziť pripnutú správu na časovej osi a najnovšiu pripnutú správu tu",
+            "go_to_next_message": "Zobraziť pripnutú správu na časovej osi a ďalšiu najstaršiu pripnutú správu tu",
             "title": "<bold>%(index)s z %(length)s</bold> pripnutých správ"
         },
         "read_topic": "Kliknutím si prečítate tému",
         "rejecting": "Odmietnutie pozvania …",
         "rejoin_button": "Znovu sa pripojiť",
+        "room_content": "Obsah miestnosti",
+        "room_is_low_priority": "Toto je miestnosť s nízkou prioritou",
         "search": {
             "all_rooms_button": "Vyhľadávať vo všetkých miestnostiach",
             "placeholder": "Hľadať správy…",
@@ -2088,6 +2153,7 @@
         "status_bar": {
             "delete_all": "Vymazať všetko",
             "exceeded_resource_limit": "Vaša správa nebola odoslaná, pretože bol prekročený limit prostriedkov tohoto domovského servera. Prosím, <a>kontaktujte správcu služieb</a> aby ste službu mohli naďalej používať.",
+            "history_visible": "Správy, ktoré odošlete, budú zdieľané s novými členmi pozvanými do tejto miestnosti. <a>Zistiť viac</a>",
             "homeserver_blocked": "Vaša správa nebola odoslaná, pretože tento domovský server bol zablokovaný jeho správcom. Prosím, <a>kontaktujte správcu služieb</a>, aby ste službu mohli naďalej používať.",
             "monthly_user_limit_reached": "Vaša správa nebola odoslaná, pretože bol dosiahnutý mesačný limit počtu aktívnych používateľov tohoto domovského servera. Prosím, <a>kontaktujte správcu služieb</a> aby ste službu mohli naďalej používať.",
             "requires_consent_agreement": "Nemôžete posielať žiadne správy, kým si neprečítate a neodsúhlasíte <consentLink>naše zmluvné podmienky</consentLink>.",
@@ -2124,9 +2190,9 @@
     "room_list": {
         "add_room_label": "Pridať miestnosť",
         "add_space_label": "Pridať priestor",
-        "appearance": "Vzhľad",
         "breadcrumbs_empty": "Žiadne nedávno navštívené miestnosti",
         "breadcrumbs_label": "Nedávno navštívené miestnosti",
+        "collapse_filters": "Zbaliť zoznam filtrov",
         "empty": {
             "no_chats": "Zatiaľ žiadne konverzácie",
             "no_chats_description": "Začnite tým, že niekomu napíšete správu alebo vytvoríte miestnosť",
@@ -2134,6 +2200,7 @@
             "no_favourites": "Zatiaľ nemáte obľúbenú konverzáciu",
             "no_favourites_description": "V nastaveniach konverzácií môžete pridať konverzáciu medzi obľúbené",
             "no_invites": "Nemáte žiadne neprečítané pozvánky",
+            "no_lowpriority": "Nemáte žiadne miestnosti s nízkou prioritou",
             "no_mentions": "Nemáte žiadne neprečítané zmienky",
             "no_people": "Zatiaľ s nikým nemáte priame konverzácie",
             "no_people_description": "Môžete zrušiť výber filtrov, aby ste videli svoje ostatné konverzácie",
@@ -2143,12 +2210,14 @@
             "show_activity": "Zobraziť všetku aktivitu",
             "show_chats": "Zobraziť všetky konverzácie"
         },
+        "expand_filters": "Rozbaliť zoznam filtrov",
         "failed_add_tag": "Miestnosti sa nepodarilo pridať značku %(tagName)s",
         "failed_remove_tag": "Z miestnosti sa nepodarilo odstrániť značku %(tagName)s",
         "failed_set_dm_tag": "Nepodarilo sa nastaviť značku priamej správy",
         "filters": {
             "favourite": "Obľúbené",
             "invites": "Pozvánky",
+            "low_priority": "Nízka priorita",
             "mentions": "Zmienky",
             "people": "Ľudia",
             "rooms": "Miestnosti",
@@ -2184,7 +2253,6 @@
         },
         "room_options": "Možnosti miestnosti",
         "show_less": "Zobraziť menej",
-        "show_message_previews": "Zobraziť náhľady správ",
         "show_n_more": {
             "one": "Zobraziť %(count)s ďalšiu",
             "few": "Zobraziť %(count)s ďalšie",
@@ -2292,6 +2360,8 @@
             "no_aliases_space": "Tento priestor nemá žiadne lokálne adresy",
             "other_section": "Ďalšie",
             "publish_toggle": "Uverejniť túto miestnosť v adresári miestností na serveri %(domain)s?",
+            "publish_warn_invite_only": "Nemôžete zverejniť miestnosť, ktorá je prístupná len na pozvánku.",
+            "publish_warn_no_canonical_permission": "Na zverejnenie tejto miestnosti musíte mať povolenie na nastavenie hlavnej adresy.",
             "published_aliases_description": "Ak chcete zverejniť adresu, je potrebné ju najprv nastaviť ako lokálnu adresu.",
             "published_aliases_explainer_room": "Zverejnené adresy môže použiť ktokoľvek na akomkoľvek serveri, aby sa pripojil k vašej miestnosti.",
             "published_aliases_explainer_space": "Zverejnené adresy môže použiť ktokoľvek na akomkoľvek serveri, aby sa pripojil k vášmu priestoru.",
@@ -2369,6 +2439,10 @@
             "users_default": "Predvolená rola"
         },
         "security": {
+            "cannot_change_to_private_due_to_missing_history_visiblity_permissions": {
+                "description": "Nemáte povolenia na zmenu viditeľnosti histórie miestnosti. Toto je nebezpečné, pretože by to mohlo umožniť nepripojeným používateľom čítať správy.",
+                "title": "Miestnosť sa nedá nastaviť ako súkromná"
+            },
             "enable_encryption_confirm_description": "Po povolení šifrovania miestnosti nie je možné šifrovanie zakázať. Správy poslané v šifrovanej miestnosti nie sú viditeľné na serveri, prečítať ich môžu len členovia miestnosti. Mnohí Boti, premostenia do iných sietí a integrácie nemusia po zapnutí šifrovania fungovať správne. <a>Dozvedieť sa viac o šifrovaní.</a>",
             "enable_encryption_confirm_title": "Povoliť šifrovanie?",
             "enable_encryption_public_room_confirm_description_1": "<b>Neodporúča sa pridávať šifrovanie do verejných miestností.</b> Verejné miestnosti môže nájsť a pripojiť sa k nim ktokoľvek, takže si v nich môže ktokoľvek prečítať správy. Nebudete mať žiadne výhody šifrovania a neskôr ho nebudete môcť vypnúť. Šifrovanie správ vo verejnej miestnosti spomalí prijímanie a odosielanie správ.",
@@ -2386,7 +2460,7 @@
             "history_visibility_joined": "Len členovia (odkedy vstúpili)",
             "history_visibility_legend": "Kto môže čítať históriu?",
             "history_visibility_shared": "Len členovia (odkedy je aktívna táto voľba)",
-            "history_visibility_warning": "Zmena viditeľnosti histórie sa prejaví len na budúcich správach v tejto miestnosti. Viditeľnosť existujúcich správ ostane bez zmeny.",
+            "history_visibility_warning": "Viditeľnosť existujúcej histórie sa nezmení.",
             "history_visibility_world_readable": "Ktokoľvek",
             "join_rule_description": "Určite, kto sa môže pripojiť k %(roomName)s.",
             "join_rule_invite": "Súkromné (len pre pozvaných)",
@@ -2432,6 +2506,7 @@
                 "other": "Aktualizácia priestorov... (%(progress)s z %(count)s)"
             },
             "join_rule_upgrade_upgrading_room": "Aktualizácia miestnosti",
+            "join_rule_world_readable_description": "Zmenou možnosti, kto sa môže pripojiť do miestnosti, sa zmení aj viditeľnosť budúcich správ.\n.",
             "public_without_alias_warning": "Ak chcete prepojiť túto miestnosť, pridajte prosím adresu.",
             "publish_room": "Zviditeľniť túto miestnosť v adresári verejných miestností.",
             "publish_space": "Zviditeľniť tento priestor v adresári verejných miestností.",
@@ -2445,11 +2520,12 @@
             "error_failed_save": "Nepodarilo sa aktualizovať viditeľnosť tohto priestoru",
             "error_update_guest_access": "Nepodarilo sa aktualizovať hosťovský prístup do tohto priestoru",
             "error_update_history_visibility": "Nepodarilo sa aktualizovať viditeľnosť histórie tohto priestoru",
-            "guest_access_explainer": "Hostia sa môžu pripojiť k priestoru bez toho, aby mali konto.",
-            "guest_access_explainer_public_space": "To môže byť užitočné pre verejné priestory.",
+            "guest_access_disabled": "Nemáte povolenie na zmenu prístupu hostí.",
+            "guest_access_explainer": "Hostia sa môžu pripojiť k priestoru bez toho, aby mali konto. Toto môže byť užitočné pre verejné priestory.",
             "guest_access_label": "Zapnúť prístup pre hostí",
             "history_visibility_anyone_space": "Prehľad priestoru",
             "history_visibility_anyone_space_description": "Umožnite ľuďom prezrieť si váš priestor predtým, ako sa k vám pripoja.",
+            "history_visibility_anyone_space_disabled": "Nemáte povolenie na zmenu viditeľnosti histórie.",
             "history_visibility_anyone_space_recommendation": "Odporúča sa pre verejné priestory.",
             "title": "Viditeľnosť"
         },
@@ -2570,6 +2646,7 @@
                 "breadcrumb_second_description": "Stratíte históriu správ, ktorá je uložená iba na serveri",
                 "breadcrumb_third_description": "Budete musieť znova overiť všetky vaše existujúce zariadenia a kontakty",
                 "breadcrumb_title": "Naozaj chcete obnoviť svoju identitu?",
+                "breadcrumb_title_cant_confirm": "Musíte obnoviť svoju identitu.",
                 "breadcrumb_title_forgot": "Zabudli ste kľúč na obnovenie? Budete musieť obnoviť svoju identitu.",
                 "breadcrumb_title_sync_failed": "Synchronizácia úložiska kľúčov zlyhala. Musíte obnoviť svoju identitu.",
                 "breadcrumb_warning": "Urobte to iba vtedy, ak sa domnievate, že váš účet bol ohrozený.",
@@ -2577,7 +2654,7 @@
                 "do_not_close_warning": "Nezatvárajte toto okno, kým sa obnovenie nedokončí",
                 "export_keys": "Exportovať kľúče",
                 "import_keys": "Importovať kľúče",
-                "other_people_device_description": "Upozornenie: používatelia, ktorí sa s vami výslovne neoverili (napr. pomocou emotikonov), nedostanú vaše šifrované správy. Neoverené zariadenia overených používateľov tiež nedostanú vaše šifrované správy.",
+                "other_people_device_description": "Upozornenie: používatelia, ktorí sa s vami výslovne neoverili (napr. pomocou emotikonov), nedostanú vaše šifrované správy. Neoverené zariadenia overených používateľov tiež nedostanú vaše šifrované správy. Zmeny nadobudnú platnosť po reštartovaní aplikácie.",
                 "other_people_device_label": "V šifrovaných miestnostiach odosielajte správy iba overeným používateľom",
                 "other_people_device_title": "Zariadenia iných ľudí",
                 "reset_identity": "Obnoviť kryptografickú identitu",
@@ -2646,6 +2723,7 @@
             "allow_spellcheck": "Povoliť kontrolu pravopisu",
             "application_language": "Jazyk aplikácie",
             "application_language_reload_hint": "Po výbere iného jazyka sa aplikácia znova načíta",
+            "avatar_open_menu": "Otvoriť ponuku profilových obrázkov",
             "avatar_remove_progress": "Odstraňuje sa obrázok...",
             "avatar_save_progress": "Nahráva sa obrázok...",
             "avatar_upload_error_text": "Formát súboru nie je podporovaný alebo obrázok je väčší ako %(size)s.",
@@ -2723,13 +2801,11 @@
         "inline_url_previews_room": "Predvolene povoliť náhľady URL adries pre členov tejto miestnosti",
         "inline_url_previews_room_account": "Povoliť náhľady URL adries pre túto miestnosť (ovplyvňuje len vás)",
         "insert_trailing_colon_mentions": "Vložiť na koniec dvojbodku za zmienkou používateľa na začiatku správy",
+        "invite_controls": {
+            "default_label": "Povoliť používateľom pozývať vás do miestností"
+        },
         "jump_to_bottom_on_send": "Skok na koniec časovej osi pri odosielaní správy",
         "key_backup": {
-            "backup_in_progress": "Zálohovanie kľúčov máte aktívne (prvé zálohovanie môže trvať niekoľko minút).",
-            "backup_starting": "Začína sa zálohovanie…",
-            "backup_success": "Úspech!",
-            "cannot_create_backup": "Nie je možné vytvoriť zálohu šifrovacích kľúčov",
-            "create_title": "Vytvoriť zálohu kľúča",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Kľúče sa teraz zálohujú z tohto zariadenia.",
                 "backup_setup_success_title": "Bezpečné zálohovanie bolo úspešné",
@@ -2789,6 +2865,7 @@
             "show_in_private": "V súkromných miestnostiach",
             "show_media": "Vždy zobraziť"
         },
+        "not_supported": "Váš server túto funkciu nepodporuje.",
         "notifications": {
             "default_setting_description": "Toto nastavenie sa predvolene použije pre všetky vaše miestnosti.",
             "default_setting_section": "Chcem byť upozornený na (predvolené nastavenie)",
@@ -2846,6 +2923,7 @@
             "voip": "Zvukové a video hovory"
         },
         "preferences": {
+            "Electron.enableContentProtection": "Zabrániť zachytávaniu obsahu okna inými aplikáciami",
             "Electron.enableHardwareAcceleration": "Povoliť hardvérovú akceleráciu (reštartujte aplikáciu %(appName)s, aby sa prejavila)",
             "always_show_menu_bar": "Vždy zobraziť hornú lištu okna",
             "autocomplete_delay": "Oneskorenie automatického dokončovania (ms)",
@@ -2854,6 +2932,7 @@
             "composer_heading": "Písanie správ",
             "default_timezone": "Predvolená (%(timezone)s) prehliadača",
             "dialog_title": "<strong>Nastavenia:</strong> Predvoľby",
+            "enable_content_protection": "Povoliť ochranu obsahu",
             "enable_hardware_acceleration": "Povoliť hardvérovú akceleráciu",
             "enable_tray_icon": "Zobraziť ikonu na lište a pri zatvorení minimalizovať okno na ňu",
             "keyboard_heading": "Klávesové skratky",
@@ -2867,6 +2946,7 @@
             "room_list_heading": "Zoznam miestností",
             "show_avatars_pills": "Zobraziť obrázky profilov v zmienkach o používateľoch, miestnostiach a udalostiach",
             "show_polls_button": "Zobraziť tlačidlo ankiet",
+            "startup_window_behaviour_label": "Spustenie a správanie okna",
             "surround_text": "Obklopiť vybraný text pri písaní špeciálnych znakov",
             "time_heading": "Zobrazovanie času",
             "user_timezone": "Nastaviť časové pásmo"
@@ -2887,7 +2967,6 @@
             "ignore_users_empty": "Nemáte žiadnych ignorovaných používateľov.",
             "ignore_users_section": "Ignorovaní používatelia",
             "key_backup_algorithm": "Algoritmus:",
-            "key_backup_connect": "Pripojiť túto reláciu k Zálohe kľúčov",
             "message_search_disable_warning": "Ak nie je povolené, správy zo zašifrovaných miestností sa nezobrazia vo výsledkoch vyhľadávania.",
             "message_search_disabled": "Bezpečne lokálne ukladať zašifrované správy do vyrovnávacej pamäte, aby sa zobrazovali vo výsledkoch vyhľadávania.",
             "message_search_enabled": {
@@ -2900,6 +2979,7 @@
             "message_search_indexing": "Aktuálne sa indexuje: %(currentRoom)s",
             "message_search_indexing_idle": "V súčasnosti sa neindexujú správy pre žiadnu miestnosť.",
             "message_search_intro": "%(brand)s bezpečne ukladá zašifrované správy do lokálnej vyrovnávacej pamäte, aby sa mohli zobrazovať vo výsledkoch vyhľadávania:",
+            "message_search_pending_rooms": "Miestnosti čakajúce na indexovanie: %(pendingRooms)s",
             "message_search_room_progress": "%(doneRooms)s z %(totalRooms)s",
             "message_search_section": "Vyhľadávanie v správach",
             "message_search_sleep_time": "Ako rýchlo sa majú správy sťahovať.",
@@ -3021,6 +3101,7 @@
         "show_chat_effects": "Zobraziť efekty konverzácie (animácie pri prijímaní napr. konfety)",
         "show_displayname_changes": "Zobrazovať zmeny zobrazovaného mena",
         "show_join_leave": "Zobraziť správy o pripojení/odchode (pozvania/odstránenia/zákazy nie sú ovplyvnené)",
+        "show_message_previews": "Zobraziť náhľady správ",
         "show_nsfw_content": "Zobraziť obsah NSFW",
         "show_read_receipts": "Zobrazovať potvrdenia o prečítaní od ostatných používateľov",
         "show_redaction_placeholder": "Zobrazovať náhrady za odstránené správy",
@@ -3043,7 +3124,12 @@
             "spaces_explainer": "Priestory sú spôsobom zoskupovania miestností a osôb. Popri priestoroch, v ktorých sa nachádzate, môžete použiť aj niektoré predpripravené.",
             "title": "Bočný panel"
         },
-        "start_automatically": "Spustiť automaticky po prihlásení do systému",
+        "start_automatically": {
+            "disabled": "Nie",
+            "enabled": "Áno",
+            "label": "Po prihlásení do počítača otvoriť aplikáciu %(brand)s",
+            "minimised": "Minimalizované"
+        },
         "tac_only_notifications": "Zobraziť upozornenia iba v centre aktivít vlákna",
         "use_12_hour_format": "Pri zobrazovaní časových značiek používať 12 hodinový formát (napr. 2:30pm)",
         "use_command_enter_send_message": "Použite Command + Enter na odoslanie správy",
@@ -3127,6 +3213,8 @@
         "jumptodate": "Prejsť na zadaný dátum na časovej osi",
         "jumptodate_invalid_input": "Nepodarilo sa nám rozpoznať zadaný dátum (%(inputDate)s). Skúste použiť formát RRRR-MM-DD.",
         "lenny": "Pridá znaky ( ͡° ͜ʖ ͡°) pred správy vo formáte obyčajného textu",
+        "manual_device_verification_confirm_description": "Toto umožní inému zariadeniu odosielať a prijímať správy ako keby ste to boli vy. AK VÁM NIEKTO POVEDAL, ABY STE SEM NIEČO VLOŽILI, JE PRAVDEPODOBNÉ, ŽE IDE PO PODVOD! Ste si istí, že chcete overiť toto iné zariadenie?",
+        "manual_device_verification_confirm_title": "Upozornenie: ručné overenie zariadenia",
         "me": "Zobrazí akciu",
         "msg": "Pošle správu danému používateľovi",
         "myavatar": "Zmení váš profilový obrázok vo všetkých miestnostiach",
@@ -3167,6 +3255,7 @@
         "upgraderoom": "Aktualizuje miestnosť na novšiu verziu",
         "upgraderoom_permission_error": "Na použitie tohoto príkazu nemáte dostatočné povolenia.",
         "usage": "Použitie",
+        "verify": "Manuálne overte jedno z vašich vlastných zariadení",
         "view": "Zobrazí miestnosti s danou adresou",
         "whois": "Zobrazuje informácie o používateľovi"
     },
@@ -3411,6 +3500,7 @@
             "unable_to_find": "Pokus o načítanie konkrétneho bodu na časovej osi tejto miestnosti, ale nepodarilo sa ho nájsť."
         },
         "m.audio": {
+            "audio_player": "Prehrávač zvuku",
             "error_downloading_audio": "Chyba pri sťahovaní zvuku",
             "error_processing_audio": "Chyba pri spracovaní hlasovej správy",
             "error_processing_voice_message": "Chyba pri spracovaní hlasovej správy",
@@ -3473,7 +3563,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Ukončil anketu",
             "sender_ended": "%(senderName)s ukončil anketu"
         },
         "m.poll.start": "%(senderName)s spustil anketu - %(pollQuestion)s",
@@ -3519,7 +3608,7 @@
             "unknown": "%(senderDisplayName)s zmenil prístup hostí na %(rule)s"
         },
         "m.room.history_visibility": {
-            "invited": "%(senderName)s sprístupnil budúcu históriu miestnosti pre všetkých členov, od kedy boli pozvaní.",
+            "invited": "%(senderName)s sprístupnil budúcu históriu miestnosti pre nových členov, od kedy boli pozvaní.",
             "joined": "%(senderName)s sprístupnil budúcu históriu miestnosti pre všetkých členov, od kedy vstúpili.",
             "shared": "%(senderName)s sprístupnil budúcu históriu miestnosti pre všetkých členov.",
             "unknown": "%(senderName)s sprístupnil budúcu históriu miestnosti neznámym (%(visibility)s).",
@@ -4007,12 +4096,12 @@
         "connection_lost": "Spojenie so serverom bolo prerušené",
         "connection_lost_description": "Bez pripojenia k serveru nie je možné uskutočňovať hovory.",
         "consulting": "Konzultovanie s %(transferTarget)s. <a>Presmerovanie na %(transferee)s</a>",
+        "decline_call": "Zamietnuť",
         "default_device": "Predvolené zariadenie",
         "dial": "Vytočiť číslo",
         "dialpad": "Číselník",
         "disable_camera": "Vypnúť kameru",
         "disable_microphone": "Stlmiť mikrofón",
-        "disabled_no_one_here": "Nie je tu nikto, komu by ste mohli zavolať",
         "disabled_no_perms_start_video_call": "Nemáte povolenie na spustenie videohovorov",
         "disabled_no_perms_start_voice_call": "Nemáte povolenie na spustenie hlasových hovorov",
         "disabled_ongoing_call": "Prebiehajúci hovor",
@@ -4060,6 +4149,7 @@
         "show_sidebar_button": "Zobraziť bočný panel",
         "silence": "Stlmiť hovor",
         "silenced": "Oznámenia stlmené",
+        "skip_lobby_toggle_option": "Pripojiť sa okamžite",
         "start_screenshare": "Spustiť zdieľanie vašej obrazovky",
         "stop_screenshare": "Zastaviť zdieľanie vašej obrazovky",
         "too_many_calls": "Príliš veľa hovorov",
@@ -4080,9 +4170,12 @@
         "user_busy_description": "Volaný používateľ má obsadené.",
         "user_is_presenting": "%(sharerName)s prezentuje",
         "video_call": "Video hovor",
+        "video_call_incoming": "Prichádzajúci videohovor",
         "video_call_started": "Videohovor bol spustený",
         "video_call_using": "Videohovor pomocou:",
         "voice_call": "Hlasový hovor",
+        "voice_call_incoming": "Prichádzajúci hlasový hovor",
+        "voice_call_using": "Hlasový hovor pomocou:",
         "you_are_presenting": "Prezentujete"
     },
     "web_default_device_name": "%(appName)s: %(browserName)s na %(osName)s",
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 15ea9a3df8..30200eeae9 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -209,8 +209,7 @@
             "setup_key_backup_title": "Do të humbni hyrje te mesazhet tuaj të fshehtëzuar",
             "setup_secure_backup_description_1": "Mesazhet e fshehtëzuar sigurohen me fshehtëzim skaj-më-skaj. Vetëm ju dhe marrësi(t) kanë kyçet për të lexuar këto mesazhe.",
             "setup_secure_backup_description_2": "Kur dilni nga llogaria, këto kyçe do të fshihen te kjo pajisje, që do të thotë se s’do të jeni në gjendje të lexoni mesazhe të fshehtëzuar, veç në paçi kyçet për ta në pajisjet tuaja të tjera, ose të kopjeruajtur te shërbyesi.",
-            "skip_key_backup": "Nuk i dua mesazhet e mia të fshehtëzuar",
-            "use_key_backup": "Fillo të përdorësh Kopjeruajtje Kyçesh"
+            "skip_key_backup": "Nuk i dua mesazhet e mia të fshehtëzuar"
         },
         "misconfigured_body": "Kërkojini përgjegjësit të %(brand)s-it tuaj të kontrollojë <a>formësimin tuaj</a> për zëra të pasaktë ose të përsëdytur.",
         "misconfigured_title": "%(brand)s-i juaj është i keqformësuar",
@@ -505,7 +504,6 @@
         "user": "Përdorues",
         "user_avatar": "Foto profili",
         "username": "Emër përdoruesi",
-        "verification_cancelled": "Verifikimi u anulua",
         "verified": "I verifikuar",
         "video_room": "Dhomë me video",
         "view_message": "Shihni mesazh",
@@ -762,8 +760,6 @@
             "security_key_title": "Kyç Sigurie"
         },
         "bootstrap_title": "Ujdisje kyçesh",
-        "cancel_entering_passphrase_description": "Jeni i sigurt se doni të anulohet dhënie frazëkalimi?",
-        "cancel_entering_passphrase_title": "Të anulohet dhënue frazëkalimi?",
         "confirm_encryption_setup_body": "Klikoni mbi butonin më poshtë që të ripohoni ujdisjen e fshehtëzimit.",
         "confirm_encryption_setup_title": "Ripohoni ujdisje fshehtëzimi",
         "cross_signing_room_normal": "Kjo dhomë është e fshehtëzuar skaj-më-skaj",
@@ -797,8 +793,6 @@
             "title": "U hoq Metodë Rimarrje",
             "warning": "Nëse metodën e re të rimarrjeve s’e keni hequr ju, dikush mund të jetë duke u rrekur të hyjë në llogarinë tuaj. Ndryshoni menjëherë fjalëkalimin e llogarisë tuaj, te Rregullimet, dhe caktoni një metodë të re rimarrjesh."
         },
-        "reset_all_button": "Harruat, ose humbët krejt metodat e rimarrjes? <a>Riujdisini të gjitha</a>",
-        "set_up_toast_description": "Mbrohuni nga humbja e hyrjes te mesazhe & të dhëna të fshehtëzuara",
         "set_up_toast_title": "Ujdisni Kopjeruajtje të Sigurt",
         "setup_secure_backup": {
             "explainer": "Kopjeruajini kyçet tuaj, përpara se të dilni, që të shmangni humbjen e tyre."
@@ -817,12 +811,8 @@
             "after_new_login": {
                 "device_verified": "Pajisja u verifikua",
                 "skip_verification": "Anashkaloje verifikimin hëpërhë",
-                "unable_to_verify": "S’arrihet të verifikohet kjo pajisje",
                 "verify_this_device": "Verifikoni këtë pajisje"
             },
-            "cancelled": "Anuluat verifikimin.",
-            "cancelled_self": "E anuluat verifikimin në pajisjen tuaj tjetër.",
-            "cancelled_user": "%(displayName)s anuloi verifikimin.",
             "cancelling": "Po anulohet…",
             "complete_action": "E Mora Vesh",
             "complete_description": "E verifikuat me sukses këtë përdorues.",
@@ -837,45 +827,32 @@
             "incoming_sas_dialog_waiting": "Po pritet ripohimi nga partneri…",
             "incoming_sas_user_dialog_text_1": "Verifikojeni këtë përdorues që t’i vihet shenjë si i besuar. Përdoruesit e besuar ju më tepër siguri kur përdorni mesazhe të fshehtëzuar skaj-më-skaj.",
             "incoming_sas_user_dialog_text_2": "Verifikimi i këtij përdoruesi do t’i vërë shenjë sesionit të tij si të besuar dhe sesionit tuaj si të besuar për ta.",
-            "no_key_or_device": "Duket sikur s’keni Kyç Sigurie ose ndonjë pajisje tjetër nga e cila mund të bëni verifikimin. Kjo pajisje s’do të jetë në gjendje të hyjë te mesazhe të dikurshëm të fshehtëzuar. Që të mund të verifikohet identiteti juaj në këtë pajisje, ju duhet të riujdisni kyçet tuaj të verifikimit.",
             "no_support_qr_emoji": "Pajisja që po provoni të verifikoni nuk mbulon skanim të një kodi QR, apo verifikim me emoji, çka janë ato që mbulohen prej %(brand)s. Provoni me një klient tjetër.",
             "other_party_cancelled": "Pala tjetër e anuloi verifikimin.",
             "prompt_encrypted": "Verifiko krejt përdoruesit në dhomë, për të garantuar se është e sigurt.",
-            "prompt_self": "Rifillo verifikimin prej njoftimit.",
             "prompt_unencrypted": "Në dhoma të fshehtëzuara, verifikoni krejt përdoruesit për të garantuar se është e sigurt.",
-            "prompt_user": "Rifillo verifikimin prej profilit të tyre.",
             "qr_or_sas": "%(qrCode)s ose %(emojiCompare)s",
-            "qr_or_sas_header": "Verifikoni këtë pajisje duke plotësuar një nga sa vijon:",
             "qr_prompt": "Skanoni këtë kod unik",
-            "qr_reciprocate_same_shield_device": "Thuajse mbaruam! A po shfaq pajisja juaj të njëjtën mburojë?",
             "qr_reciprocate_same_shield_user": "Thuaje mbërritëm! A shfaq %(displayName)s të njëjtën mburojë?",
-            "request_toast_accept": "Verifiko Sesion",
             "request_toast_decline_counter": "Shpërfill (%(counter)s)",
             "request_toast_detail": "%(deviceId)s prej %(ip)s",
-            "reset_proceed_prompt": "Vazhdo me rikthimin te parazgjedhjet",
             "sas_caption_self": "Verifikoni këtë pajisje duke ripohuar se numri vijues shfaqet në ekranin e saj.",
             "sas_caption_user": "Verifikojeni këtë përdorues duke ripohuar shfaqjen e numrit vijues në skenën e tyre.",
             "sas_description": "Krahasoni një grup unik emoji-sh, nëse s’keni kamera në njërën nga pajisjet",
-            "sas_emoji_caption_self": "Ripohoni se emoji-t më poshtë shfaqen në të dyja pajisjet, sipas të njëjtës radhë:",
             "sas_emoji_caption_user": "Verifikojeni këtë përdorues duke ripohuar shfaqjen e emoji-t vijues në skenën e tyre.",
             "sas_match": "Përputhen",
             "sas_no_match": "S’përputhen",
             "sas_prompt": "Krahasoni emoji unik",
             "scan_qr": "Verifikoje me skanim",
             "scan_qr_explainer": "Kërkojini %(displayName)s të skanojë kodin tuaj:",
-            "self_verification_hint": "Që të vazhdoni më tej, ju lutemi, pranoni në pajisjen tuaj tjetër kërkesën për verifikim.",
             "start_button": "Fillo Verifikimin",
-            "successful_device": "Keni verifikuar me sukses %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "E verifikuat me sukses pajisjen tuaj!",
             "successful_user": "E verifikuat me sukses %(displayName)s!",
-            "timed_out": "Verifikimit i mbaroi koha.",
             "unsupported_method": "S’arrihet të gjendet metodë verifikimi e mbuluar.",
             "unverified_session_toast_accept": "Po, unë qeshë",
             "unverified_session_toast_title": "Hyrje e re. Ju qetë?",
             "unverified_sessions_toast_description": "Shqyrtojeni për t’u siguruar se llogaria është e parrezik",
             "unverified_sessions_toast_reject": "Më vonë",
             "unverified_sessions_toast_title": "Keni sesioni të paverifikuar",
-            "verification_description": "Verifikoni identitetin tuaj që të hyhet në mesazhe të fshehtëzuar dhe t’u provoni të tjerëve identitetin tuaj.",
             "verification_dialog_title_device": "Verifikoni pajisje tjetër",
             "verification_dialog_title_user": "Kërkesë Verifikimi",
             "verification_skip_warning": "Pa e verifikuar, s’do të mund të hyni te krejt mesazhet tuaja dhe mund të dukeni jo i besueshëm për të tjerët.",
@@ -885,9 +862,6 @@
             "verify_emoji_prompt": "Verifikoje duke krahasuar emoji unik.",
             "verify_emoji_prompt_qr": "Nëse s’e skanoni dot kodin më sipër, verifikojeni duke krahasuar emoji unik.",
             "verify_later": "Do ta verifikoj më vonë",
-            "verify_using_device": "Verifikojeni me pajisje tjetër",
-            "verify_using_key": "Verifikoje me Kyç Sigurie",
-            "verify_using_key_or_phrase": "Verifikojeni me Kyç ose Frazë Sigurie",
             "waiting_for_user_accept": "Po pritet për %(displayName)s të pranojë…",
             "waiting_other_device": "Po pritet që ju të verifikoni në pajisjen tuaj tjetër…",
             "waiting_other_device_details": "Po pritet që ju të verifikoni në pajisjen tuaj tjetër, %(deviceName)s (%(deviceId)s)…",
@@ -1376,8 +1350,7 @@
     },
     "member_list": {
         "filter_placeholder": "Filtroni anëtarë dhome",
-        "invite_button_no_perms_tooltip": "S’keni leje të ftoni përdorues",
-        "power_label": "%(userName)s (pushtet %(powerLevelNumber)si)"
+        "invite_button_no_perms_tooltip": "S’keni leje të ftoni përdorues"
     },
     "member_list_back_action_label": "Anëtarë dhome",
     "message_edit_dialog_title": "Përpunime mesazhi",
@@ -1668,8 +1641,6 @@
             "send_message_start_dm": "Dërgoni mesazhin tuaj të parë për të ftuar në fjalosje <displayName/>",
             "start_of_dm_history": "Ky është fillimi i historikut të mesazheve tuaja të drejtpërdrejta me <displayName/>.",
             "start_of_room": "Ky është fillimi i <roomName/>.",
-            "topic": "Temë: %(topic)s ",
-            "topic_edit": "Temë: %(topic)s (<a>përpunojeni</a>)",
             "unencrypted_warning": "Fshehtëzimi skaj-më-skaj s’është i aktivizuar",
             "user_created": "%(displayName)s krijoi këtë dhomë.",
             "you_created": "Krijuat këtë dhomë."
@@ -2002,7 +1973,6 @@
             "error_update_guest_access": "S’arrihet të përditësohet hyrja e mysafirëve të kësaj hapësire",
             "error_update_history_visibility": "S’arrihet të përditësohet dukshmëria e historikut të kësaj hapësire",
             "guest_access_explainer": "Mysafirët mund të hyjnë në një hapësirë pa pasur llogari.",
-            "guest_access_explainer_public_space": "Kjo mund të jetë e dobishme për hapësira publike.",
             "guest_access_label": "Lejo hyrje si vizitor",
             "history_visibility_anyone_space": "Parashiheni Hapësirën",
             "history_visibility_anyone_space_description": "Lejojini personat të parashohin hapësirën tuaj para se të hyjnë në të.",
@@ -2169,11 +2139,6 @@
         "insert_trailing_colon_mentions": "Fut dy pika pas përmendjesh përdoruesi, në fillim të një mesazhi",
         "jump_to_bottom_on_send": "Kalo te fundi i rrjedhës kohore, kur dërgoni një mesazh",
         "key_backup": {
-            "backup_in_progress": "Kyçet tuaj po kopjeruhen (kopjeruajtja e parë mund të hajë disa minuta).",
-            "backup_starting": "Po fillohet kopjeruajtje…",
-            "backup_success": "Sukses!",
-            "cannot_create_backup": "S’arrihet të krijohet kopjeruajtje kyçesh",
-            "create_title": "Krijo kopjeruajtje kyçesh",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Kyçet tuaj tani po kopjeruhen nga kjo pajisje.",
                 "backup_setup_success_title": "Kopjeruajtje e Sigurt e susksesshme",
@@ -2279,7 +2244,6 @@
             "ignore_users_empty": "S’keni përdorues të shpërfillur.",
             "ignore_users_section": "Përdorues të shpërfillur",
             "key_backup_algorithm": "Algoritëm:",
-            "key_backup_connect": "Lidhe këtë sesion me Kopjeruajtje Kyçesh",
             "message_search_disable_warning": "Në u çaktivizoftë, mesazhet prej dhomash të fshehtëzuara s’do të duken në përfundime kërkimi.",
             "message_search_disabled": "Ruaj lokalisht në mënyrë të sigurt në fshehtinë mesazhet që të shfaqen në përfundime kërkimi.",
             "message_search_enabled": {
@@ -2419,7 +2383,6 @@
             "metaspaces_subsection": "Hapësira për shfaqje",
             "title": "Anështyllë"
         },
-        "start_automatically": "Nisu vetvetiu pas hyrjes në sistem",
         "use_12_hour_format": "Vulat kohore shfaqi në formatin 12 orësh (p.sh. 2:30pm)",
         "use_command_enter_send_message": "Që të dërgoni një mesazh, përdorni tastet Command + Enter",
         "use_command_f_search": "Përdorni Command + F që të kërkohet te rrjedha kohore",
@@ -2532,6 +2495,7 @@
         "upgraderoom": "E kalon një dhomë te një version i ri i përmirësuar",
         "upgraderoom_permission_error": "S’keni lejet e domosdoshme për përdorimin e këtij urdhri.",
         "usage": "Përdorim",
+        "verify": "Verifikon një përdorues, sesion dhe një set kyçesh publikë",
         "whois": "Shfaq të dhëna rreth një përdoruesi"
     },
     "space": {
@@ -2799,7 +2763,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Përfundoi një pyetësor",
             "sender_ended": "%(senderName)s e përfundoi anketimin"
         },
         "m.poll.start": "%(senderName)s nisi një anketim - %(pollQuestion)s",
@@ -3263,7 +3226,6 @@
         "dialpad": "Butona numrash",
         "disable_camera": "Çaktivizo kamerën",
         "disable_microphone": "Heshtoje mikrofonin",
-        "disabled_no_one_here": "Këtu s’ka kënd që të thirret",
         "disabled_no_perms_start_video_call": "S’keni leje të nisni thirrje me video",
         "disabled_no_perms_start_voice_call": "S’keni leje të nisni thirrje me zë",
         "disabled_ongoing_call": "Thirrje në kryerje e sipër",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 1715f2276f..3103398033 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -93,7 +93,6 @@
         "maximise": "Maximera",
         "mention": "Nämn",
         "minimise": "Minimera",
-        "new_message": "Nytt meddelande",
         "new_room": "Nytt rum",
         "new_video_room": "Nytt videorum",
         "next": "Nästa",
@@ -114,7 +113,7 @@
         "rename": "Döp om",
         "reply": "Svara",
         "reply_in_thread": "Svara i tråd",
-        "report_content": "Rapportera innehåll",
+        "report_content": "Anmäl innehåll",
         "report_room": "Anmäl rum",
         "resend": "Skicka igen",
         "reset": "Återställ",
@@ -124,7 +123,7 @@
         "revoke": "Återkalla",
         "save": "Spara",
         "search": "Sök",
-        "send_report": "Skicka rapport",
+        "send_report": "Skicka anmälan",
         "set_avatar": "Ställ in profilbild",
         "share": "Dela",
         "show": "Visa",
@@ -157,6 +156,7 @@
         "view_message": "Visa meddelande",
         "view_source": "Visa källa",
         "yes": "Ja",
+        "yes_dismiss": "Ja, avvisa",
         "zoom_in": "Zooma in",
         "zoom_out": "Zooma ut"
     },
@@ -239,8 +239,7 @@
             "setup_key_backup_title": "Du kommer att förlora åtkomst till dina krypterade meddelanden",
             "setup_secure_backup_description_1": "Krypterade meddelanden är säkrade med totalsträckskryptering. Bara du och mottagaren/na har nycklarna för att läsa dessa meddelanden.",
             "setup_secure_backup_description_2": "När du loggar ut kommer nycklarna att raderas från den här enheten, vilket betyder att du inte kommer kunna läsa krypterade meddelanden om du inte har nycklarna för dem på dina andra enheter, eller säkerhetskopierade dem till servern.",
-            "skip_key_backup": "Jag vill inte ha mina krypterade meddelanden",
-            "use_key_backup": "Börja använda nyckelsäkerhetskopiering"
+            "skip_key_backup": "Jag vill inte ha mina krypterade meddelanden"
         },
         "misconfigured_body": "Be din %(brand)s-administratör att kolla <a>din konfiguration</a> efter felaktiga eller duplicerade poster.",
         "misconfigured_title": "Din %(brand)s är felkonfigurerad",
@@ -386,6 +385,7 @@
             "fallback_button": "Starta autentisering",
             "mas_cross_signing_reset_cta": "Gå till ditt konto",
             "mas_cross_signing_reset_description": "Återställ din identitet via din kontoleverantör och kom sedan tillbaka och klicka på ”Försök igen”.",
+            "mas_cross_signing_reset_title": "Gå till ditt konto för att återställa din identitet",
             "msisdn": "Ett SMS har skickats till %(msisdn)s",
             "msisdn_token_incorrect": "Felaktig token",
             "msisdn_token_prompt": "Vänligen ange koden det innehåller:",
@@ -598,7 +598,6 @@
         "user": "Användare",
         "user_avatar": "Profilbild",
         "username": "Användarnamn",
-        "verification_cancelled": "Verifiering avbruten",
         "verified": "Verifierad",
         "version": "Version",
         "video": "Video",
@@ -644,12 +643,12 @@
         "mode_plain": "Dölj formatering",
         "mode_rich_text": "Visa formatering",
         "no_perms_notice": "Du har inte behörighet att posta till detta rum",
-        "placeholder": "Skicka ett meddelande…",
-        "placeholder_encrypted": "Skicka ett krypterat meddelande…",
-        "placeholder_reply": "Skicka ett svar…",
-        "placeholder_reply_encrypted": "Skicka ett krypterat svar…",
-        "placeholder_thread": "Svara på tråd…",
-        "placeholder_thread_encrypted": "Svara på krypterad tråd…",
+        "placeholder": "Skicka ett okrypterat meddelande …",
+        "placeholder_encrypted": "Skicka ett meddelande …",
+        "placeholder_reply": "Skicka ett okrypterat svar …",
+        "placeholder_reply_encrypted": "Skicka ett svar …",
+        "placeholder_thread": "Svara på okrypterad tråd …",
+        "placeholder_thread_encrypted": "Svara på tråd …",
         "poll_button": "Omröstning",
         "poll_button_no_perms_description": "Du får inte starta omröstningar i det här rummet.",
         "poll_button_no_perms_title": "Behörighet krävs",
@@ -784,6 +783,7 @@
             "cross_signing_status": "Korssigneringsstatus:",
             "cross_signing_untrusted": "Ditt konto har en korssigneringsidentitet i hemlig lagring, men den är ännu inte betrodd av den här sessionen.",
             "crypto_not_available": "Kryptografisk modul är inte tillgänglig",
+            "device_id": "Enhets-ID",
             "key_backup_active_version": "Aktiv säkerhetskopiaversion:",
             "key_backup_active_version_none": "Ingen",
             "key_backup_inactive_warning": "Dina nycklar säkerhetskopieras inte från den här sessionen.",
@@ -796,6 +796,8 @@
             "secret_storage_ready": "klar",
             "secret_storage_status": "Hemlig lagring:",
             "self_signing_private_key_cached_status": "Självsignerande privat nyckel:",
+            "session": "Session",
+            "session_fingerprint": "Fingeravtryck (sessionsnyckel)",
             "title": "Totalsträckskryptering",
             "user_signing_private_key_cached_status": "Privat nyckel för användarsignering:"
         },
@@ -821,6 +823,7 @@
         "low_bandwidth_mode": "Lågt bandbreddsläge",
         "low_bandwidth_mode_description": "Kräver kompatibel hemserver.",
         "main_timeline": "Huvudtidslinje",
+        "manual_device_verification": "Manuell enhetsverifiering",
         "no_receipt_found": "Inga kvitton hittade",
         "notification_state": "Aviseringsstatus är <strong>%(notificationState)s</strong>",
         "notifications_debug": "Aviseringsfelsökning",
@@ -858,6 +861,7 @@
             "elementCallUrl": "Element Call-URL"
         },
         "settings_explorer": "Inställningar",
+        "show_empty_content_events": "Visa händelser med tomt innehåll",
         "show_hidden_events": "Visa dolda händelser i tidslinjen",
         "spaces": {
             "one": "<mellanslag>",
@@ -909,15 +913,16 @@
     "empty_room_was_name": "Tomt rum (var %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
+            "alternatives": "Om du har en säkerhetsnyckel eller säkerhetsfras så funkar den också.",
             "key_validation_text": {
-                "wrong_security_key": "Fel säkerhetsnyckel"
+                "wrong_security_key": "Återställningsnyckeln du angav är inte korrekt."
             },
+            "privacy_warning": "Se till att ingen kan se den här skärmen",
             "restoring": "Återställer nycklar från säkerhetskopia",
-            "security_key_title": "Säkerhetsnyckel"
+            "security_key_label": "Återställningsnyckel",
+            "security_key_title": "Ange din återställningsnyckel"
         },
         "bootstrap_title": "Sätter upp nycklar",
-        "cancel_entering_passphrase_description": "Är du säker på att du vill avbryta inmatning av lösenfrasen?",
-        "cancel_entering_passphrase_title": "Avbryta inmatning av lösenfras?",
         "confirm_encryption_setup_body": "Klicka på knappen nedan för att bekräfta inställning av kryptering.",
         "confirm_encryption_setup_title": "Bekräfta krypteringsinställning",
         "cross_signing_room_normal": "Det här rummet är totalsträckskrypterat",
@@ -928,6 +933,7 @@
         "cross_signing_user_warning": "Den här användaren har inte verifierat alla sina sessioner.",
         "enter_recovery_key": "Ange återställningsnyckel",
         "event_shield_reason_authenticity_not_guaranteed": "Det krypterade meddelandets äkthet kan inte garanteras på den här enheten.",
+        "event_shield_reason_mismatched_sender": "Avsändaren av händelsen matchar inte ägaren av den enhet som skickade den.",
         "event_shield_reason_mismatched_sender_key": "Krypterat av en overifierad session",
         "event_shield_reason_unknown_device": "Krypterad av en okänd eller raderad enhet.",
         "event_shield_reason_unsigned_device": "Krypterad av en enhet som inte har verifierats av dess ägare.",
@@ -960,15 +966,14 @@
             "title": "Återställningsmetod borttagen",
             "warning": "Om du inte tog bort återställningsmetoden kan en angripare försöka komma åt ditt konto. Byt ditt kontolösenord och ställ in en ny återställningsmetod omedelbart i inställningarna."
         },
-        "reset_all_button": "Glömt eller förlorat alla återställningsalternativ? <a>Återställ allt</a>",
         "set_up_recovery": "Ställ in återställning",
-        "set_up_recovery_later": "Inte nu",
         "set_up_recovery_toast_description": "Generera en återställningsnyckel som kan användas för att återställa din krypterade meddelandehistorik om du förlorar åtkomst till dina enheter.",
-        "set_up_toast_description": "Skydda mot att förlora åtkomst till krypterade meddelanden och data",
         "set_up_toast_title": "Ställ in säker säkerhetskopiering",
         "setup_secure_backup": {
             "explainer": "Säkerhetskopiera dina nycklar innan du loggar ut för att undvika att du blir av med dem."
         },
+        "turn_on_key_storage": "Slå på nyckellagring",
+        "turn_on_key_storage_description": "Lagra din kryptografiska identitet och dina meddelandenycklar säkert på servern. Detta gör att du kan se din meddelandehistorik på alla nya enheter.",
         "udd": {
             "interactive_verification_button": "Verifiera interaktivt med emoji",
             "other_ask_verify_text": "Be den här användaren att verifiera sin session, eller verifiera den manuellt nedan.",
@@ -983,12 +988,8 @@
             "after_new_login": {
                 "device_verified": "Enhet verifierad",
                 "skip_verification": "Hoppa över verifiering för tillfället",
-                "unable_to_verify": "Kunde inte verifiera den här enheten",
                 "verify_this_device": "Verifiera den här enheten"
             },
-            "cancelled": "Du avbröt verifiering.",
-            "cancelled_self": "Du avbröt verifiering på din andra enhet.",
-            "cancelled_user": "%(displayName)s avbröt verifiering.",
             "cancelling": "Avbryter…",
             "complete_action": "Uppfattat",
             "complete_description": "Du har verifierat den här användaren.",
@@ -1003,46 +1004,48 @@
             "incoming_sas_dialog_waiting": "Väntar på att andra parten ska bekräfta …",
             "incoming_sas_user_dialog_text_1": "Verifiera denna användare för att markera den som betrodd. Att lita på användare ger en extra sinnesfrid när man använder totalsträckskrypterade meddelanden.",
             "incoming_sas_user_dialog_text_2": "Att verifiera den här användaren kommer att markera dess session som betrodd, och markera din session som betrodd för denne.",
-            "no_key_or_device": "Det ser ut som att du inte har någon säkerhetsnyckel eller några andra enheter du kan verifiera mot. Den här enheten kommer inte kunna komma åt gamla krypterad meddelanden. För att verifiera din identitet på den här enheten så behöver du återställa dina verifieringsnycklar.",
+            "manual": {
+                "already_verified": "Den här enheten är redan verifierad",
+                "already_verified_and_wrong_fingerprint": "Det angivna fingeravtrycket matchar inte, men enheten är redan verifierad!",
+                "device_id": "Enhets-ID",
+                "failure_description": "Misslyckades att verifiera '%(deviceId)s': %(error)s",
+                "failure_title": "Verifiering misslyckades",
+                "fingerprint": "Fingeravtryck (sessionsnyckel)",
+                "no_crypto": "Kunde inte verifiera enhet – krypto är inte aktiverat",
+                "no_device": "Kunde inte verifiera enhet – enheten '%(deviceId)s' hittades inte.",
+                "no_userid": "Kunde inte verifiera enhet – kan inte hitta vårt användar-ID",
+                "success_description": "Den här enheten (%(deviceId)s) är nu korssignerad.",
+                "success_title": "Verifiering lyckades",
+                "text": "Ange ID och fingeravtryck för en av dina egna enheter för att verifiera den. OBSERVERA att detta gör att den andra enheten kan skicka och ta emot meddelanden som om den vore du. OM NÅGON HAR BETT DIG ATT KLISTRA IN NÅGOT HÄR ÄR DET TROLIGT ATT DU BLIR LURAD!",
+                "wrong_fingerprint": "Kunde inte verifiera enheten '%(deviceId)s' - det angivna fingeravtrycket '%(fingerprint)s' stämmer inte överens med enhetens fingeravtryck, '%(fprint)s'"
+            },
             "no_support_qr_emoji": "Enheten du försöker verifiera stöder inte att skanna en QR-kod eller verifiera med emoji, vilket är var %(brand)s stöder. Pröva en annan klient.",
             "other_party_cancelled": "Den andra parten avbröt verifieringen.",
             "prompt_encrypted": "Verifiera alla användare i ett rum för att försäkra att det är säkert.",
-            "prompt_self": "Starta verifiering igen från aviseringen.",
             "prompt_unencrypted": "I krypterade rum, verifiera alla användare för att försäkra att det är säkert.",
-            "prompt_user": "Starta verifiering igen från deras profil.",
             "qr_or_sas": "%(qrCode)s eller %(emojiCompare)s",
-            "qr_or_sas_header": "Verifiera den här enheten genom att slutföra ett av följande:",
             "qr_prompt": "Skanna den här unika koden",
-            "qr_reciprocate_same_shield_device": "Nästan klar! Visar din andra enhet samma sköld?",
             "qr_reciprocate_same_shield_user": "Nästan klar! Visar %(displayName)s samma sköld?",
-            "request_toast_accept": "Verifiera session",
             "request_toast_accept_user": "Verifiera användare",
             "request_toast_decline_counter": "Ignorera (%(counter)s)",
             "request_toast_detail": "%(deviceId)s från %(ip)s",
-            "reset_proceed_prompt": "Fortsätt återställning",
             "sas_caption_self": "Verifiera den här enheten genom att bekräfta att det följande numret visas på dess skärm.",
             "sas_caption_user": "Verifiera den här användaren genom att bekräfta att följande nummer visas på deras skärm.",
             "sas_description": "Jämför en unik uppsättning emojier om du inte har en kamera på någon av enheterna",
-            "sas_emoji_caption_self": "Bekräfta att emojierna nedan visas på båda enheterna i samma ordning:",
             "sas_emoji_caption_user": "Verifiera den här användaren genom att bekräfta att följande emojier visas på deras skärm.",
             "sas_match": "De matchar",
             "sas_no_match": "De matchar inte",
             "sas_prompt": "Jämför unika emojier",
             "scan_qr": "Verifiera med skanning",
             "scan_qr_explainer": "Be %(displayName)s att skanna din kod:",
-            "self_verification_hint": "För att fortsätta, acceptera verifieringsförfrågan på din andra enhet.",
             "start_button": "Starta verifiering",
-            "successful_device": "Du har verifierat %(deviceName)s (%(deviceId)s) framgångsrikt!",
-            "successful_own_device": "Du har verifierat din enhet framgångsrikt!",
             "successful_user": "Du har verifierat %(displayName)s framgångsrikt!",
-            "timed_out": "Verifieringen löpte ut.",
             "unsupported_method": "Kunde inte hitta en verifieringsmetod som stöds.",
             "unverified_session_toast_accept": "Ja, det var jag",
             "unverified_session_toast_title": "Ny inloggning. Var det du?",
             "unverified_sessions_toast_description": "Granska för att försäkra dig om att ditt konto är säkert",
             "unverified_sessions_toast_reject": "Senare",
             "unverified_sessions_toast_title": "Du har overifierade sessioner",
-            "verification_description": "Verifiera din identitet för att komma åt krypterade meddelanden och bevisa din identitet för andra.",
             "verification_dialog_title_device": "Verifiera annan enhet",
             "verification_dialog_title_user": "Verifikationsförfrågan",
             "verification_skip_warning": "Om du inte verifierar så kommer du inte komma åt alla dina meddelanden och visas kanske som ej betrodd för andra.",
@@ -1052,9 +1055,6 @@
             "verify_emoji_prompt": "Verifiera genom att jämföra unika emojier.",
             "verify_emoji_prompt_qr": "Om du inte kan skanna koden ovan, verifiera genom att jämföra unika emojier.",
             "verify_later": "Jag verifierar senare",
-            "verify_using_device": "Verifiera med annan enhet",
-            "verify_using_key": "Verifiera med säkerhetsnyckel",
-            "verify_using_key_or_phrase": "Verifiera med säkerhetsnyckel eller -fras",
             "waiting_for_user_accept": "Väntar på att %(displayName)s ska acceptera…",
             "waiting_other_device": "Väntar på att du ska verifiera på din andra enhet…",
             "waiting_other_device_details": "Väntar på att du ska verifiera på din andra enhet, %(deviceName)s (%(deviceId)s)…",
@@ -1344,6 +1344,10 @@
         "name_email_mxid_share_space": "Bjud in någon med deras namn, e-postadress eller användarnamn (som <userId/>), eller <a>dela det här rummet</a>.",
         "name_mxid_share_room": "Bjud in någon med deras namn eller användarnamn (som <userId/>) eller <a>dela det här rummet</a>.",
         "name_mxid_share_space": "Bjud in någon med deras namn eller användarnamn (som <userId/>), eller <a>dela det här utrymmet</a>.",
+        "progress": {
+            "dont_close": "Stäng inte appen förrän det är klart.",
+            "preparing": "Förbereder inbjudningar …"
+        },
         "recents_section": "Senaste konversationerna",
         "room_failed_partial": "Vi skickade de andra, men personerna nedan kunde inte bjudas in till <RoomName/>",
         "room_failed_partial_title": "Vissa inbjudningar kunde inte skickas",
@@ -1430,6 +1434,7 @@
         "room_list_navigate_down": "Navigera ner i rumslistan",
         "room_list_navigate_up": "Navigera upp i rumslistan",
         "room_list_select_room": "Välj rum från rumslistan",
+        "save": "Spara",
         "scroll_down_timeline": "Skrolla ner i tidslinjen",
         "scroll_up_timeline": "Skrolla upp i tidslinjen",
         "search": "Sök (måste vara aktiverat)",
@@ -1446,7 +1451,6 @@
         "upload_file": "Ladda upp en fil"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Tillåt läge med endast skärmdelning",
         "ask_to_join": "Aktivera fråga om att gå med",
         "automatic_debug_logs": "Skicka automatiskt felsökningsloggar vid fel",
         "automatic_debug_logs_decryption": "Skicka automatiskt avbuggningsloggar vid avkrypteringsfel",
@@ -1511,6 +1515,9 @@
         "render_reaction_images_description": "Ibland kallat för ”anpassade emojis”.",
         "report_to_moderators": "Rapportera till moderatorer",
         "report_to_moderators_description": "I rum som stöder moderering så låter \"Rapportera\"-knappen dig rapportera trakasseri till rumsmoderatorer.",
+        "share_history_on_invite": "Dela encrypted historik med nya medlemmar",
+        "share_history_on_invite_description": "När du bjuder in en användare till ett krypterat rum där historiksynlighet är inställd på \"delad\" så delar du krypterad historik med den användaren och du accepterar krypterad historik när du blir inbjuden till ett sådant rum.",
+        "share_history_on_invite_warning": "Den här funktionen är EXPERIMENTELL och alla säkerhetsåtgärder är inte implementerade. Aktivera inte på produktionskonton.",
         "sliding_sync": "Sliding sync-läge",
         "sliding_sync_description": "Under aktiv utveckling, kan inte inaktiveras.",
         "sliding_sync_disabled_notice": "Logga ut och in igen för att inaktivera",
@@ -1632,8 +1639,8 @@
         "filter_placeholder": "Filtrera rumsmedlemmar",
         "invite_button_no_perms_tooltip": "Du är inte behörig att bjuda in användare",
         "invited_label": "Inbjuden",
-        "no_matches": "Inga matchningar",
-        "power_label": "%(userName)s (behörighet %(powerLevelNumber)s)"
+        "list_title": "Medlemslista",
+        "no_matches": "Inga matchningar"
     },
     "member_list_back_action_label": "Rumsmedlemmar",
     "message_edit_dialog_title": "Meddelanderedigeringar",
@@ -1737,6 +1744,7 @@
     },
     "power_level": {
         "admin": "Administratör",
+        "creator": "Ägare",
         "custom": "Anpassad (%(level)s)",
         "custom_level": "Anpassad nivå",
         "default": "Standard",
@@ -1844,11 +1852,6 @@
                 "other": "Du kan bara fästa upp till %(count)s widgets"
             },
             "menu": "Öppna menyn",
-            "release_announcement": {
-                "close": "OK",
-                "description": "Du hittar alla fästa meddelanden här. För muspekaren över ett meddelande och välj \"Fäst\" för att lägga till det.",
-                "title": "Alla nya fästa meddelanden"
-            },
             "reply_thread": "Svara på ett <link> trådmeddelande </link>",
             "unpin_all": {
                 "button": "Lossa alla meddelanden",
@@ -1950,6 +1953,7 @@
         },
         "face_pile_tooltip_shortcut": "Inklusive %(commaSeparatedMembers)s",
         "face_pile_tooltip_shortcut_joined": "Inklusive dig, %(commaSeparatedMembers)s",
+        "failed_determine_user": "Kan inte avgöra vilken användare som ska ignoreras eftersom medlemshändelsen har ändrats.",
         "failed_reject_invite": "Misslyckades att avböja inbjudan",
         "forget_room": "Glöm det här rummet",
         "forget_space": "Glöm det här utrymmet",
@@ -1978,8 +1982,6 @@
             "send_message_start_dm": "Skicka ditt första meddelande för att bjuda in <displayName/> att chatta",
             "start_of_dm_history": "Det här är början på din direktmeddelandehistorik med <displayName/>.",
             "start_of_room": "Det här är början på <roomName/>.",
-            "topic": "Ämne: %(topic)s ",
-            "topic_edit": "Ämne: %(topic)s (<a>redigera</a>)",
             "unencrypted_warning": "Totalsträckskryptering är inte aktiverat",
             "user_created": "%(displayName)s skapade det här rummet.",
             "you_created": "Du skapade det här rummet."
@@ -2035,12 +2037,13 @@
             "button_close_list": "Stäng listan",
             "button_view_all": "Visa alla",
             "description": "Det här rummet har fästa meddelanden. Klicka för att se dem.",
-            "go_to_message": "Visa det fästa meddelandet på tidslinjen.",
             "title": "<bold>%(index)s av %(length)s</bold> fästa meddelanden"
         },
         "read_topic": "Klicka för att läsa ämne",
         "rejecting": "Nekar inbjudan …",
         "rejoin_button": "Gå med igen",
+        "room_content": "Rumsinnehåll",
+        "room_is_low_priority": "Detta är ett lågprioriterat room",
         "search": {
             "all_rooms_button": "Sök i alla rum",
             "placeholder": "Sök meddelanden...",
@@ -2087,27 +2090,35 @@
     "room_list": {
         "add_room_label": "Lägg till rum",
         "add_space_label": "Lägg till utrymme",
-        "appearance": "Utseende",
         "breadcrumbs_empty": "Inga nyligen besökta rum",
         "breadcrumbs_label": "Nyligen besökta rum",
+        "collapse_filters": "Kollapsa filterlista",
         "empty": {
             "no_chats": "Inga chattar än",
             "no_chats_description": "Kom igång genom att skicka meddelanden till någon eller genom att skapa ett rum",
             "no_chats_description_no_room_rights": "Kom igång genom att skicka meddelanden till någon",
             "no_favourites": "Du har ingen favoritchatt än",
             "no_favourites_description": "Du kan lägga till en chatt till dina favoriter i chattinställningarna",
+            "no_invites": "Du har inga olästa inbjudningar",
+            "no_lowpriority": "Du har inga lågprioriterade rum.",
+            "no_mentions": "Du har inga olästa omnämnanden",
             "no_people": "Du har inte direktchattar med någon ännu",
             "no_people_description": "Du kan avmarkera filter för att se dina andra chattar",
             "no_rooms": "Du är inte i något rum än",
             "no_rooms_description": "Du kan avmarkera filter för att se dina andra chattar",
             "no_unread": "Grattis! Du har inga olästa meddelanden",
+            "show_activity": "Visa all aktivitet",
             "show_chats": "Visa alla chattar"
         },
+        "expand_filters": "Expandera filterlista",
         "failed_add_tag": "Misslyckades att lägga till etiketten %(tagName)s till rummet",
         "failed_remove_tag": "Misslyckades att radera etiketten %(tagName)s från rummet",
         "failed_set_dm_tag": "Misslyckades att sätta direktmeddelandetagg",
         "filters": {
             "favourite": "Favoriter",
+            "invites": "Inbjudningar",
+            "low_priority": "Låg prioritet",
+            "mentions": "Omnämnanden",
             "people": "Personer",
             "rooms": "Rum",
             "unread": "Olästa"
@@ -2140,15 +2151,19 @@
         },
         "room_options": "Rumsalternativ",
         "show_less": "Visa mindre",
-        "show_message_previews": "Visa förhandsgranskningar av meddelanden",
         "show_n_more": {
             "other": "Visa %(count)s till",
             "one": "Visa %(count)s till"
         },
         "show_previews": "Visa förhandsgranskningar av meddelanden",
+        "sort": "Sortera",
         "sort_by": "Sortera efter",
         "sort_by_activity": "Aktivitet",
         "sort_by_alphabet": "A-Ö",
+        "sort_type": {
+            "activity": "Aktivitet",
+            "atoz": "A-Ö"
+        },
         "sort_unread_first": "Visa rum med olästa meddelanden först",
         "space_menu": {
             "home": "Utrymmeshem",
@@ -2393,7 +2408,6 @@
             "error_update_guest_access": "Misslyckades att uppdatera gäståtkomst för det här utrymmet",
             "error_update_history_visibility": "Misslyckades att uppdatera historiksynlighet för det här utrymmet",
             "guest_access_explainer": "Gäster kan gå med i ett utrymme utan att ha ett konto.",
-            "guest_access_explainer_public_space": "Det här kan vara användbart för ett offentligt utrymme.",
             "guest_access_label": "Aktivera gäståtkomst",
             "history_visibility_anyone_space": "Förhandsgranska utrymme",
             "history_visibility_anyone_space_description": "Låt personer förhandsgranska ditt utrymme innan de går med.",
@@ -2436,6 +2450,10 @@
         "recent_changes_heading": "Nyliga ändringar har inte mottagits än",
         "title": "Servern svarar inte"
     },
+    "service_worker_error": {
+        "description": "%(brand)s kräver en service worker för att läsa in autentiserade media från Matrix-innehållsförråd. Detta stöds inte av din webbläsare, så du kan uppleva att media misslyckas att laddas.",
+        "title": "Misslyckades att ladda service worker"
+    },
     "seshat": {
         "error_initialising": "Initialisering av meddelandesök misslyckades, kolla <a>dina inställningar</a> för mer information",
         "reset_button": "Återställ händelselagring",
@@ -2529,6 +2547,8 @@
                 "session_key": "Sessionsnyckel:",
                 "title": "Avancerad"
             },
+            "confirm_key_storage_off": "Är du säker på att du vill hålla nyckellagring avstängd?",
+            "confirm_key_storage_off_description": "Om du loggar ut från alla dina enheter kommer du att förlora din meddelandehistorik och måste verifiera alla dina befintliga kontakter igen. <a>Läs mer</a>",
             "delete_key_storage": {
                 "breadcrumb_page": "Radera nyckellagring",
                 "confirm": "Radera nyckellagring",
@@ -2614,6 +2634,7 @@
             "discovery_needs_terms_title": "Låt andra hitta dig",
             "display_name": "Visningsnamn",
             "display_name_error": "Det gick inte att ställa in visningsnamn",
+            "email_adding_unsupported_by_hs": "Den här hemservern stöder inte att lägga till e-postadresser till ditt konto.",
             "email_address_in_use": "Den här e-postadressen används redan",
             "email_address_label": "E-postadress",
             "email_not_verified": "Din e-postadress har inte verifierats än",
@@ -2638,7 +2659,9 @@
             "error_share_msisdn_discovery": "Kunde inte dela telefonnummer",
             "identity_server_no_token": "Ingen identitetsåtkomsttoken hittades",
             "identity_server_not_set": "Identitetsserver inte inställd",
+            "invalid_phone_number": "Det angivna telefonnumret verkar inte vara giltigt.",
             "language_section": "Språk",
+            "msisdn_adding_unsupported_by_hs": "Den här hemservern stöder inte att lägga till telefonnummer till ditt konto.",
             "msisdn_in_use": "Detta telefonnummer används redan",
             "msisdn_label": "Telefonnummer",
             "msisdn_verification_field_label": "Verifieringskod",
@@ -2661,13 +2684,11 @@
         "inline_url_previews_room": "Aktivera URL-förhandsgranskning som standard för deltagare i detta rum",
         "inline_url_previews_room_account": "Aktivera URL-förhandsgranskning för detta rum (påverkar bara dig)",
         "insert_trailing_colon_mentions": "Infoga kolon efter användaromnämnande på början av ett meddelande",
+        "invite_controls": {
+            "default_label": "Tillåt användare att bjuda in dig till rum"
+        },
         "jump_to_bottom_on_send": "Hoppa till botten av tidslinjen när du skickar ett meddelande",
         "key_backup": {
-            "backup_in_progress": "Dina nycklar säkerhetskopieras (den första säkerhetskopieringen kan ta några minuter).",
-            "backup_starting": "Startar säkerhetskopiering …",
-            "backup_success": "Framgång!",
-            "cannot_create_backup": "Kunde inte skapa nyckelsäkerhetskopia",
-            "create_title": "Skapa nyckelsäkerhetskopia",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Dina nycklar säkerhetskopieras nu från denna enhet.",
                 "backup_setup_success_title": "Säkerhetskopiering lyckades",
@@ -2678,8 +2699,8 @@
                 "enter_phrase_description": "Ange en säkerhetsfras som bara du känner till, eftersom den används för att säkra din data. För att vara säker, bör du inte återanvända ditt kontolösenord.",
                 "enter_phrase_title": "Ange en säkerhetsfras",
                 "enter_phrase_to_confirm": "Ange din säkerhetsfras igen för att bekräfta den.",
-                "generate_security_key_description": "Vi kommer att generera en säkerhetsnyckel så du kan lagra någonstans säkert, som en lösenordshanterare eller ett kassaskåp.",
-                "generate_security_key_title": "Generera en säkerhetsnyckel",
+                "generate_security_key_description": "Vi kommer att generera en återställningsnyckel så du kan lagra någonstans säkert, som en lösenordshanterare eller ett kassaskåp.",
+                "generate_security_key_title": "Generera en återställningsnyckel",
                 "pass_phrase_match_failed": "Det matchar inte.",
                 "pass_phrase_match_success": "Det matchar!",
                 "phrase_strong_enough": "Fantastiskt! Den här säkerhetsfrasen ser tillräckligt stark ut.",
@@ -2692,7 +2713,7 @@
                 "title_set_phrase": "Sätt en säkerhetsfras",
                 "unable_to_setup": "Kunde inte sätta upp hemlig lagring",
                 "use_different_passphrase": "Använd en annan lösenfras?",
-                "use_phrase_only_you_know": "Använd en hemlig fras endast du känner till, och spara valfritt en säkerhetsnyckel att använda för säkerhetskopiering."
+                "use_phrase_only_you_know": "Använd en hemlig fras endast du känner till, och spara valfritt en återställningsnyckel att använda för säkerhetskopiering."
             }
         },
         "key_export_import": {
@@ -2727,6 +2748,7 @@
             "show_in_private": "I privata rum",
             "show_media": "Visa alltid"
         },
+        "not_supported": "Din server implementerar inte den här funktionen.",
         "notifications": {
             "default_setting_description": "Denna inställning kommer att tillämpas som standard för alla dina rum.",
             "default_setting_section": "Jag vill bli meddelad för (Standardinställning)",
@@ -2784,6 +2806,7 @@
             "voip": "Ljud- och videosamtal"
         },
         "preferences": {
+            "Electron.enableContentProtection": "Förhindra att fönsterinnehållet spelas in av andra appar",
             "Electron.enableHardwareAcceleration": "Aktivera hårdvaruacceleration (starta om%(appName)s att träda i kraft)",
             "always_show_menu_bar": "Visa alltid fönstermenyn",
             "autocomplete_delay": "Autokompletteringsfördröjning (ms)",
@@ -2792,6 +2815,7 @@
             "composer_heading": "Meddelandefält",
             "default_timezone": "Webbläsarens standard (%(timezone)s)",
             "dialog_title": "<strong>Inställningar:</strong> Alternativ",
+            "enable_content_protection": "Aktivera innehållsskydd",
             "enable_hardware_acceleration": "Aktivera hårdvaruaccelerering",
             "enable_tray_icon": "Visa ikon i systembrickan och minimera programmet till den när fönstret stängs",
             "keyboard_heading": "Tangentbordsgenvägar",
@@ -2825,7 +2849,6 @@
             "ignore_users_empty": "Du har inga ignorerade användare.",
             "ignore_users_section": "Ignorerade användare",
             "key_backup_algorithm": "Algoritm:",
-            "key_backup_connect": "Anslut den här sessionen till nyckelsäkerhetskopiering",
             "message_search_disable_warning": "Om den är inaktiverad visas inte meddelanden från krypterade rum i sökresultaten.",
             "message_search_disabled": "Cachar krypterade meddelanden säkert lokalt för att de ska visas i sökresultat.",
             "message_search_enabled": {
@@ -2846,7 +2869,7 @@
             "message_search_unsupported_web": "%(brand)s kan inte säkert cacha krypterade meddelanden lokalt när den kör i en webbläsare. Använd <desktopLink>%(brand)s Skrivbord</desktopLink> för att krypterade meddelanden ska visas i sökresultaten.",
             "record_session_details": "Spara klientens namn, version och URL för att lättare känna igen sessioner i sessionshanteraren",
             "send_analytics": "Skicka statistik",
-            "strict_encryption": "Skicka aldrig krypterade meddelanden till overifierade sessioner från den här sessionen"
+            "strict_encryption": "Skicka bara meddelanden till verifierade användare"
         },
         "send_read_receipts": "Skicka läskvitton",
         "send_read_receipts_unsupported": "Din server stöder inte inaktivering av läskvitton.",
@@ -2956,6 +2979,7 @@
         "show_chat_effects": "Visa chatteffekter (animeringar när du tar emot t.ex. konfetti)",
         "show_displayname_changes": "Visa visningsnamnsändringar",
         "show_join_leave": "Visa gå med/lämna-meddelanden (inbjudningar/borttagningar/banningar påverkas inte)",
+        "show_message_previews": "Visa förhandsgranskningar av meddelanden",
         "show_nsfw_content": "Visa NSFW-innehåll",
         "show_read_receipts": "Visa läskvitton som skickats av andra användare",
         "show_redaction_placeholder": "Visa en platshållare för borttagna meddelanden",
@@ -2978,7 +3002,6 @@
             "spaces_explainer": "Utrymmen är sätt att gruppera rum och personer. Vid sidan av de utrymmen du befinner dig i kan du också använda några förbyggda.",
             "title": "Sidofält"
         },
-        "start_automatically": "Starta automatiskt vid systeminloggning",
         "tac_only_notifications": "Visa endast notiser i aktivitetscentret för trådar",
         "use_12_hour_format": "Visa tidsstämplar i 12-timmarsformat (t.ex. 2:30em)",
         "use_command_enter_send_message": "Använd Kommando + Enter för att skicka ett meddelande",
@@ -3062,6 +3085,8 @@
         "jumptodate": "Hoppa till det angivna datumet i tidslinjen",
         "jumptodate_invalid_input": "Vi kunde inte förstå det givna datumet (%(inputDate)s). Pröva formatet ÅÅÅÅ-MM-DD.",
         "lenny": "Lägger till ( ͡° ͜ʖ ͡°) i början på ett textmeddelande",
+        "manual_device_verification_confirm_description": "Detta gör det möjligt för en annan enhet att skicka och ta emot meddelanden som du. OM NÅGON HAR BETT DIG ATT KLISTRA IN NÅGOT HÄR ÄR DET TROLIGT ATT DU BLIR LURAD! Är du säker på att du vill verifiera den andra enheten?",
+        "manual_device_verification_confirm_title": "Varning: manuell verifiering av enhet",
         "me": "Visar åtgärd",
         "msg": "Skickar ett meddelande till den valda användaren",
         "myavatar": "Byter din profilbild i alla rum",
@@ -3102,6 +3127,7 @@
         "upgraderoom": "Uppgraderar ett rum till en ny version",
         "upgraderoom_permission_error": "Du har inte de behörigheter som krävs för att använda det här kommandot.",
         "usage": "Användande",
+        "verify": "Verifiera en av dina egna enheter manuellt",
         "view": "Visar rum med den angivna adressen",
         "whois": "Visar information om en användare"
     },
@@ -3210,6 +3236,7 @@
         "heading_without_query": "Sök efter",
         "join_button_text": "Gå med i %(roomAddress)s",
         "keyboard_scroll_hint": "Använd <arrows/> för att skrolla",
+        "messages_label": "Meddelanden",
         "other_rooms_in_space": "Andra rum i %(spaceName)s",
         "public_rooms_label": "Offentliga rum",
         "public_spaces_label": "Offentliga utrymmen",
@@ -3342,6 +3369,7 @@
             "unable_to_find": "Försökte ladda en specifik punkt i det här rummets tidslinje, men kunde inte hitta den."
         },
         "m.audio": {
+            "audio_player": "Ljudspelare",
             "error_downloading_audio": "Fel vid nedladdning av ljud",
             "error_processing_audio": "Fel vid hantering av ljudmeddelande",
             "error_processing_voice_message": "Fel vid hantering av röstmeddelande",
@@ -3403,7 +3431,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Avslutade en omröstning",
             "sender_ended": "%(senderName)s har avslutat en omröstning"
         },
         "m.poll.start": "%(senderName)s har startat en omröstning - %(pollQuestion)s",
@@ -3778,10 +3805,11 @@
         "unavailable": "Otillgänglig"
     },
     "update_room_access_modal": {
-        "description": "För att skapa en delningslänk måste du tillåta gäster att gå med i det här rummet. Detta kan göra rummet mindre säkert. När du är klar med samtalet kan du göra rummet privat igen.",
-        "dont_change_description": "Alternativt kan du hålla samtalet i ett separat rum.",
+        "description": "För att skapa en delningslänk, gör det här rummet <b>offentligt</b> eller aktivera alternativet för användare att <b>be om att få gå med</b>. Detta gör att gäster kan gå med utan att bli inbjudna.",
+        "dont_change_description": "Om du inte vill ändra åtkomst till det här rummet kan du skapa ett nytt rum för samtalslänken.",
         "no_change": "Jag vill inte ändra åtkomstnivån.",
-        "title": "Ändra åtkomstnivå för rummet"
+        "revert_access_description": "(Detta kan återställas till föregående värde i Rumsinställningarna: <b>Säkerhet och sekretess</b> / <b>Åtkomst</b>)",
+        "title": "Tillåt gästanvändare att gå med i det här rummet"
     },
     "upload_failed_generic": "Filen '%(fileName)s' kunde inte laddas upp.",
     "upload_failed_size": "Filen '%(fileName)s' överstiger denna hemserverns storleksgräns för uppladdningar",
@@ -3906,7 +3934,6 @@
         "dialpad": "Knappsats",
         "disable_camera": "Stäng av kamera",
         "disable_microphone": "Slå av mikrofonen",
-        "disabled_no_one_here": "Det finns ingen här att ringa",
         "disabled_no_perms_start_video_call": "Du är inte behörig att starta videosamtal",
         "disabled_no_perms_start_voice_call": "Du är inte behörig att starta röstsamtal",
         "disabled_ongoing_call": "Pågående samtal",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 20cc904f17..ecd80897a2 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -80,7 +80,6 @@
         "maximise": "Maksimize",
         "mention": "Sizden bahsediyor",
         "minimise": "Minimize",
-        "new_message": "Yeni mesaj",
         "new_room": "Yeni oda",
         "new_video_room": "Yeni video odası",
         "next": "İleri",
@@ -132,7 +131,7 @@
         "unignore": "Yoksayma",
         "unpin": "Sabitlemeyi kaldır",
         "unsubscribe": "Abonelikten Çık",
-        "update": "Güncelleştirme",
+        "update": "Güncelleştir",
         "upgrade": "Yükselt",
         "upload": "Yükle",
         "upload_file": "Dosya Yükle",
@@ -225,8 +224,7 @@
             "setup_key_backup_title": "Şifrelenmiş mesajlarınıza erişiminizi kaybedeceksiniz",
             "setup_secure_backup_description_1": "Şifreli mesajlar uçtan uca şifreleme ile korunur. Bu mesajları yalnızca siz ve alıcı(lar) okuyabilir.",
             "setup_secure_backup_description_2": "Oturumu kapattığınızda, bu anahtarlar bu cihazdan silinecek. Bu, diğer cihazlarınızda bu anahtarlara sahip olmadığınız veya anahtarları sunucuya yedeklemediğiniz sürece şifreli mesajları okuyamayacağınız anlamına gelir.",
-            "skip_key_backup": "Şifrelenmiş mesajlarımı istemiyorum",
-            "use_key_backup": "Anahtar Yedekleme kullanmaya başla"
+            "skip_key_backup": "Şifrelenmiş mesajlarımı istemiyorum"
         },
         "misconfigured_body": "%(brand)s yöneticinize <a>yapılandırmanızın</a> hatalı ve mükerrer girdilerini kontrol etmesi için talepte bulunun.",
         "misconfigured_title": "%(brand)s hatalı ayarlanmış",
@@ -582,7 +580,6 @@
         "user": "Kullanıcı",
         "user_avatar": "Profil resmi",
         "username": "Kullanıcı Adı",
-        "verification_cancelled": "Doğrulama iptal edildi",
         "verified": "Doğrulanmış",
         "version": "Versiyon",
         "video": "Video",
@@ -887,11 +884,9 @@
                 "wrong_security_key": "Yanlış Güvenlik Anahtarı"
             },
             "restoring": "Anahtarları yedekten geri yükle",
-            "security_key_title": "Güvenlik anahtarı"
+            "security_key_title": "Kurtarma anahtarı"
         },
         "bootstrap_title": "Anahtarları ayarla",
-        "cancel_entering_passphrase_description": "Parola girmeyi iptal etmek istediğinizden emin misiniz?",
-        "cancel_entering_passphrase_title": "Parola girişini iptal et?",
         "confirm_encryption_setup_body": "Şifreleme kurulumunu onaylamak için aşağıdaki düğmeye tıklayın.",
         "confirm_encryption_setup_title": "Şifreleme kurulumunu onayla",
         "cross_signing_room_normal": "Bu oda uçtan uça şifreli",
@@ -934,11 +929,8 @@
             "title": "Kurtarma Yöntemi Kaldırıldı",
             "warning": "Kurtarma yöntemini kaldırmadıysanız, bir saldırgan hesabınıza erişmeye çalışıyor olabilir. Hesap parolanızı değiştirin ve Ayarlar'da hemen yeni bir kurtarma yöntemi belirleyin."
         },
-        "reset_all_button": "Tüm kurtarma yöntemlerini unuttunuz veya kaybettiniz mi? <a>Tümünü sıfırla</a>",
         "set_up_recovery": "Kurtarmayı ayarlayın",
-        "set_up_recovery_later": "Şimdi değil",
         "set_up_recovery_toast_description": "Cihazlarınıza erişiminizi kaybetmeniz durumunda şifrelenmiş mesaj geçmişinizi geri yüklemek için kullanılabilecek bir kurtarma anahtarı oluşturun.",
-        "set_up_toast_description": "Şifrelenmiş mesajlara ve verilere erişimi kaybetmemek için koruma sağlayın",
         "set_up_toast_title": "Güvenli Yedekleme kur",
         "setup_secure_backup": {
             "explainer": "Anahtarlarını kaybetmemek için, çıkış yapmadan önce önleri yedekle."
@@ -957,12 +949,8 @@
             "after_new_login": {
                 "device_verified": "Cihaz doğrulandı",
                 "skip_verification": "Şimdilik doğrulamayı atla",
-                "unable_to_verify": "Bu cihaz doğrulanamıyor",
                 "verify_this_device": "Bu cihazı doğrulayın"
             },
-            "cancelled": "Doğrulamayı iptal ettiniz.",
-            "cancelled_self": "Diğer cihazınızda doğrulamayı iptal ettiniz.",
-            "cancelled_user": "%(displayName)s doğrulamayı iptal etti.",
             "cancelling": "İptal ediliyor…",
             "complete_action": "Anlaşıldı",
             "complete_description": "Bu kullanıcıyı başarılı şekilde doğruladınız.",
@@ -977,46 +965,33 @@
             "incoming_sas_dialog_waiting": "Ortağın onaylaması bekleniyor…",
             "incoming_sas_user_dialog_text_1": "Güvenilir olarak işaretlemek için bu kullanıcıyı doğrulayın. Kullanıcılara güvenmek, uçtan uca şifrelenmiş mesajları kullanırken içinizin daha rahat olmasını sağlar.",
             "incoming_sas_user_dialog_text_2": "Bu kullanıcıyı doğrulamak, oturumlarını güvenilir olarak işaretleyecek ve ayrıca oturumunuzu onlar için güvenilir olarak işaretleyecektir.",
-            "no_key_or_device": "Görünüşe göre bir Güvenlik Anahtarınız veya doğrulama yapabileceğiniz başka bir cihazınız yok. Bu cihaz eski şifrelenmiş mesajlara erişemeyecek. Bu cihazda kimliğinizi doğrulamak için doğrulama anahtarlarınızı sıfırlamanız gerekir.",
             "no_support_qr_emoji": "Doğrulamaya çalıştığınız cihaz, %(brand)s tarafından desteklenen bir QR kodu taramayı veya emoji doğrulamasını desteklemiyor. Farklı bir istemciyle deneyin.",
             "other_party_cancelled": "Diğer taraf onaylamayı reddetti.",
             "prompt_encrypted": "Güvenli olduğuna emin olmak için odadaki tüm kullanıcıları onaylayın.",
-            "prompt_self": "Doğrulamayı bildirimden tekrar başlatın.",
             "prompt_unencrypted": "Şifrelenmiş odalarda, güvenli olduğundan emin olmak için tüm kullanıcıları doğrulayın.",
-            "prompt_user": "Doğrulamayı profillerinden tekrar başlatın.",
             "qr_or_sas": "%(qrCode)s veya %(emojiCompare)s",
-            "qr_or_sas_header": "Aşağıdakilerden birini tamamlayarak bu cihazı doğrulayın:",
             "qr_prompt": "Bu benzersiz kodu tarayın",
-            "qr_reciprocate_same_shield_device": "Az kaldı! Diğer cihazınız da aynı kalkanı gösteriyor mu?",
             "qr_reciprocate_same_shield_user": "Az kaldı! %(displayName)s aynı kalkanı mı gösteriyor?",
-            "request_toast_accept": "Oturumu Doğrula",
             "request_toast_accept_user": "Kullanıcıyı Doğrula",
             "request_toast_decline_counter": "Yoksay (%(counter)s)",
             "request_toast_detail": "%(ip)s 'den %(deviceId)s",
-            "reset_proceed_prompt": "Sıfırlama işlemine devam et",
             "sas_caption_self": "Ekranda aşağıdaki numaranın göründüğünü onaylayarak bu cihazı doğrulayın.",
             "sas_caption_user": "Aşağıdaki numaranın ekranlarında göründüğünü onaylayarak bu kullanıcıyı doğrulayın.",
             "sas_description": "Her iki cihazda da kamera yoksa benzersiz bir emoji setini karşılaştırın",
-            "sas_emoji_caption_self": "Aşağıdaki emojilerin her iki cihazda da aynı sırada görüntülendiğini onaylayın:",
             "sas_emoji_caption_user": "Aşağıdaki emojinin ekranlarında göründüğünü onaylayarak bu kullanıcıyı doğrulayın.",
             "sas_match": "Eşleşiyorlar",
             "sas_no_match": "Eşleşmiyorlar",
             "sas_prompt": "Benzersiz emoji karşılaştır",
             "scan_qr": "Taramayla doğrula",
             "scan_qr_explainer": "%(displayName)s den kodunuzu taramasını isteyin:",
-            "self_verification_hint": "Devam etmek için lütfen diğer cihazınızda doğrulama isteğini kabul edin.",
             "start_button": "Doğrulamayı Başlat",
-            "successful_device": "%(deviceName)s (%(deviceId)s) başarıyla doğruladınız!",
-            "successful_own_device": "Cihazınızı başarıyla doğruladınız!",
             "successful_user": "%(displayName)s başarıyla doğruladınız!",
-            "timed_out": "Doğrulama zaman aşımına uğradı.",
             "unsupported_method": "Desteklenen doğrulama yöntemi bulunamadı.",
             "unverified_session_toast_accept": "Evet, bendim.",
             "unverified_session_toast_title": "Yeni giriş. Bu siz miydiniz?",
             "unverified_sessions_toast_description": "Hesabınızın güvende olduğundan emin olmak için inceleyin",
             "unverified_sessions_toast_reject": "Sonra",
             "unverified_sessions_toast_title": "Doğrulanmamış oturumlarınız var",
-            "verification_description": "Şifreli mesajlara erişmek ve kimliğinizi başkalarına kanıtlamak için kimliğinizi doğrulayın. Ayrıca bir mobil cihaz kullanıyorsanız, devam etmeden önce lütfen mobilden uygulamayı açın.",
             "verification_dialog_title_device": "Diğer cihazı doğrulayın",
             "verification_dialog_title_user": "Doğrulama Talebi",
             "verification_skip_warning": "Doğrulama yapmazsanız, tüm mesajlarınıza erişemezsiniz ve başkalarına güvenilmez görünebilirsiniz.",
@@ -1026,9 +1001,6 @@
             "verify_emoji_prompt": "Eşsiz emoji eşleştirme ile doğrulama.",
             "verify_emoji_prompt_qr": "Yukarıdaki kodu tarayamıyorsanız benzersiz emojiyi karşılaştırarak doğrulayın.",
             "verify_later": "Daha sonra doğrulayacağım",
-            "verify_using_device": "Başka bir cihazla doğrula",
-            "verify_using_key": "Güvenlik Anahtarı ile Doğrula",
-            "verify_using_key_or_phrase": "Güvenlik Anahtarı veya İfadesiyle Doğrula",
             "waiting_for_user_accept": "%(displayName)s kullanıcısın onaylaması için bekleniliyor…",
             "waiting_other_device": "Diğer cihazınızda doğrulamanız bekleniyor...",
             "waiting_other_device_details": "Diğer cihazınızdan doğrulama beklenior, %(deviceName)s (%(deviceId)s)...",
@@ -1420,7 +1392,6 @@
         "upload_file": "Dosya yükle"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Yalnızca ekran paylaşımına izin ver modu",
         "ask_to_join": "Katılma isteğini etkinleştir",
         "automatic_debug_logs": "Herhangi bir hatada otomatik olarak hata ayıklama günlükleri gönder",
         "automatic_debug_logs_decryption": "Şifre çözme hatalarında otomatik olarak hata ayıklama günlükleri gönder",
@@ -1606,8 +1577,7 @@
         "filter_placeholder": "Oda üyelerini Filtrele",
         "invite_button_no_perms_tooltip": "Kullanıcıları davet etme izniniz yok",
         "invited_label": "Davet Edildi",
-        "no_matches": "Eşleşme yok",
-        "power_label": "%(userName)s (güç %(powerLevelNumber)s)"
+        "no_matches": "Eşleşme yok"
     },
     "member_list_back_action_label": "Oda üyeleri",
     "message_edit_dialog_title": "Mesajları düzenle",
@@ -1813,11 +1783,6 @@
                 "other": "En fazla %(count)s widget'ı sabitleyebilirsiniz"
             },
             "menu": "Menüyü aç",
-            "release_announcement": {
-                "close": "Tamam",
-                "description": "Sabitlenmiş tüm mesajları burada bulabilirsiniz. Herhangi bir mesajın üzerine gelin ve eklemek için \"Sabitle\"yi seçin.",
-                "title": "Tüm yeni sabitlenmiş mesajlar"
-            },
             "reply_thread": "<link>Mesaj dizisinde</link> yanıtla",
             "unpin_all": {
                 "button": "Tüm mesajların sabitlemesini kaldır",
@@ -1947,8 +1912,6 @@
             "send_message_start_dm": "<displayName/> adlı kişiyi sohbete davet etmek için ilk mesajınızı gönderin",
             "start_of_dm_history": "Bu <displayName/> ile olan direkt mesaj geçmişinizin başlangıcıdır.",
             "start_of_room": "Bu <roomName/> odasının başlangıcıdır.",
-            "topic": "Konu: %(topic)s ",
-            "topic_edit": "Konu: %(topic)s (<a>düzenle</a>)",
             "unencrypted_warning": "Uçtan uca şifreleme etkin değil",
             "user_created": "%(displayName)s bu odayı oluşturdu.",
             "you_created": "Bu odayı oluşturdunuz."
@@ -2004,7 +1967,6 @@
             "button_close_list": "Listeyi kapat",
             "button_view_all": "Tümünü görüntüle",
             "description": "Bu odada sabitlenmiş mesajlar var. Görüntülemek için tıklayın.",
-            "go_to_message": "Sabitlenmiş mesajı zaman çizelgesinde görüntüle.",
             "title": "<bold>%(index)s / %(length)s</bold> Sabitlenmiş mesajlar"
         },
         "read_topic": "Başlığı okumak için tıklayın",
@@ -2336,7 +2298,6 @@
             "error_update_guest_access": "Bu alanın misafir erişimi güncellenemedi",
             "error_update_history_visibility": "Bu alanın geçmiş görünürlüğü güncellenemedi",
             "guest_access_explainer": "Misafirler bir hesap oluşturmadan bir alana katılabilirler.",
-            "guest_access_explainer_public_space": "Bu, herkese açık alanlar için yararlı olabilir.",
             "guest_access_label": "Misafir erişimini etkinleştir",
             "history_visibility_anyone_space": "Alanı önizle",
             "history_visibility_anyone_space_description": "İnsanların katılmadan önce alanınızı önizlemesine izin verin.",
@@ -2541,7 +2502,7 @@
             "deactivate_confirm_content_6": "Eski mesajlarınız, geçmişte gönderdiğiniz e-postalar gibi, onları alan kişiler tarafından görülmeye devam eder. Gönderdiğiniz mesajları gelecekte odalara katılacak kişilerden gizlemek ister misiniz?",
             "deactivate_confirm_continue": "Hesap devre dışı bırakmayı onayla",
             "deactivate_confirm_erase_label": "Mesajlarımı yeni katılımcılardan gizle",
-            "deactivate_section": "Hesabı Devre Dışı Bırakma",
+            "deactivate_section": "Hesabı Devre Dışı Bırak",
             "deactivate_warning": "Hesabınızı devre dışı bırakmak kalıcı bir işlemdir - dikkatli olun!",
             "discovery_email_empty": "Bulunulabilirlik seçenekleri, yukarıya bir e-posta adresi ekleyince ortaya çıkacaktır.",
             "discovery_email_verification_instructions": "Gelen kutunuzdaki linki doğrulayın",
@@ -2599,11 +2560,6 @@
         "insert_trailing_colon_mentions": "Mesajın başında kullanıcı etiketlerinden sonra iki nokta üst üste ekle",
         "jump_to_bottom_on_send": "Mesaj gönderdiğinizde zaman çizelgesinin en sonuna atla",
         "key_backup": {
-            "backup_in_progress": "Anahtarlarınız yedekleniyor (ilk yedekleme birkaç dakika sürebilir).",
-            "backup_starting": "Yedekleme başlatılıyor...",
-            "backup_success": "Başarılı!",
-            "cannot_create_backup": "Anahtar yedeklemesi oluşturulamıyor",
-            "create_title": "Anahtar yedeklemesi oluştur",
             "setup_secure_backup": {
                 "backup_setup_success_description": "Anahtarlarınız artık bu cihazdan yedekleniyor.",
                 "backup_setup_success_title": "Güvenli Yedekleme başarılı",
@@ -2717,7 +2673,7 @@
             "autocomplete_delay": "Oto tamamlama gecikmesi (ms)",
             "code_blocks_heading": "Kod blokları",
             "compact_modern": "Daha derli toplu 'Modern' düzeni kullan",
-            "composer_heading": "Yazan",
+            "composer_heading": "Yazma",
             "default_timezone": "Tarayıcı varsayılanı (%(timezone)s)",
             "dialog_title": "<strong>Ayarlar:</strong> Tercihler",
             "enable_hardware_acceleration": "Donanım hızlandırmayı etkinleştir",
@@ -2753,7 +2709,6 @@
             "ignore_users_empty": "Yok saydığınız kullanıcı yok.",
             "ignore_users_section": "Yoksayılan kullanıcılar",
             "key_backup_algorithm": "Algoritma:",
-            "key_backup_connect": "Anahtar Yedekleme için bu oturuma bağlanın",
             "message_search_disable_warning": "Devre dışı bırakılırsa, şifreli odalardaki mesajlar arama sonuçlarında görünmez.",
             "message_search_disabled": "Arama sonuçlarında gozükmeleri için iletileri güvenli bir şekilde yerel olarak önbelleğe al.",
             "message_search_enabled": {
@@ -2884,6 +2839,7 @@
         "show_chat_effects": "Sohbet efektlerini göster (ör. konfeti animasyonları)",
         "show_displayname_changes": "Görüntü adı değişikliklerini göster",
         "show_join_leave": "Katılma/ayrılma mesajlarını göster (davetler/çıkarmalar/engellemeler etkilenmez)",
+        "show_message_previews": "Mesaj önizlemelerini göster",
         "show_nsfw_content": "NSFW içeriği göster",
         "show_read_receipts": "Diğer kullanıcılar tarafından gönderilen okundu bilgisini göster",
         "show_redaction_placeholder": "Silinen mesajlar için bir yer tutucu göster",
@@ -2906,7 +2862,6 @@
             "spaces_explainer": "Alanlar, odaları ve kişileri gruplamanın bir yoludur. İçinde bulunduğunuz alanların yanı sıra, önceden oluşturulmuş bazı alanları da kullanabilirsiniz.",
             "title": "Kenar çubuğu"
         },
-        "start_automatically": "Sisteme giriş yaptıktan sonra otomatik başlat",
         "tac_only_notifications": "Bildirimleri yalnızca mesaj dizisi etkinlik merkezinde göster",
         "use_12_hour_format": "Zaman damgalarını 12 biçiminde göster (örn. 2:30 pm)",
         "use_command_enter_send_message": "Mesaj göndermek için Command + Enter tuşlarını kullanın",
@@ -3030,6 +2985,7 @@
         "upgraderoom": "Bir odayı yeni bir versiyona yükseltir",
         "upgraderoom_permission_error": "Bu komutu kullanmak için gerekli izinlere sahip değilsin.",
         "usage": "Kullanım",
+        "verify": "Bir kullanıcı, oturum ve açık anahtar çiftini doğrular",
         "view": "Verilen adresli odayı görüntüle",
         "whois": "Bir kullanıcı hakkındaki bilgileri görüntüler"
     },
@@ -3172,7 +3128,7 @@
     },
     "theme": {
         "light_high_contrast": "Yüksek ışık kontrastı",
-        "match_system": "Eşleşme sistemi"
+        "match_system": "Sistemle aynı"
     },
     "thread_view_back_action_label": "Konuya geri dön",
     "threads": {
@@ -3330,7 +3286,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Anketi sonlandırdı",
             "sender_ended": "%(senderName)s anketi sonlandırdı"
         },
         "m.poll.start": "%(senderName)s bir anket başlattı - %(pollQuestion)s",
@@ -3828,7 +3783,6 @@
         "dialpad": "Tuş takımı",
         "disable_camera": "Kamerayı kapat",
         "disable_microphone": "Mikrofonu sessize al",
-        "disabled_no_one_here": "Burada arayacak kimse yok.",
         "disabled_no_perms_start_video_call": "Görüntülü arama başlatmak için izniniz yok",
         "disabled_no_perms_start_voice_call": "Sesli arama başlatmak için izniniz yok",
         "disabled_ongoing_call": "Devam eden çağrı",
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 614cfca299..864d8b89b4 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -95,7 +95,7 @@
         "maximise": "Розгорнути",
         "mention": "Згадати",
         "minimise": "Згорнути",
-        "new_message": "Нове повідомлення",
+        "new_conversation": "Нова розмова",
         "new_room": "Нова кімната",
         "new_video_room": "Нова відеокімната",
         "next": "Далі",
@@ -159,6 +159,7 @@
         "view_message": "Переглянути повідомлення",
         "view_source": "Переглянути код",
         "yes": "Так",
+        "yes_dismiss": "Так, відхилити",
         "zoom_in": "Збільшити",
         "zoom_out": "Зменшити"
     },
@@ -241,8 +242,7 @@
             "setup_key_backup_title": "Ви втратите доступ до ваших зашифрованих повідомлень",
             "setup_secure_backup_description_1": "Зашифровані повідомлення захищені наскрізним шифруванням. Лише ви та отримувачі повідомлень мають ключі для їх читання.",
             "setup_secure_backup_description_2": "Коли ви вийдете, ці ключі буде видалено з цього пристрою, і ви не зможете читати зашифровані повідомлення, якщо у вас немає ключів для них на інших пристроях або не створено їх резервну копію на сервері.",
-            "skip_key_backup": "Мені не потрібні мої зашифровані повідомлення",
-            "use_key_backup": "Скористайтеся резервним копіюванням ключів"
+            "skip_key_backup": "Мені не потрібні мої зашифровані повідомлення"
         },
         "misconfigured_body": "Попросіть адміністратора %(brand)s перевірити <a>конфігураційний файл</a> на наявність неправильних або повторюваних записів.",
         "misconfigured_title": "Ваш %(brand)s налаштовано неправильно",
@@ -533,7 +533,8 @@
         "mute": "Стишити",
         "n_members": {
             "one": "%(count)s учасник",
-            "other": "%(count)s учасників"
+            "few": "%(count)s учасники",
+            "many": "%(count)s учасників"
         },
         "n_rooms": {
             "one": "%(count)s кімната",
@@ -601,12 +602,12 @@
         "user": "Користувач",
         "user_avatar": "Зображення профілю",
         "username": "Ім'я користувача",
-        "verification_cancelled": "Звірка скасована",
         "verified": "Звірений",
         "version": "Версія",
         "video": "Відео",
         "video_room": "Відеокімната",
         "view_message": "Переглянути повідомлення",
+        "voice": "Голос",
         "warning": "Попередження"
     },
     "composer": {
@@ -647,16 +648,17 @@
         "mode_plain": "Сховати форматування",
         "mode_rich_text": "Показати форматування",
         "no_perms_notice": "У вас немає дозволу писати в цій кімнаті",
-        "placeholder": "Надіслати повідомлення…",
-        "placeholder_encrypted": "Надіслати зашифроване повідомлення…",
-        "placeholder_reply": "Надіслати відповідь…",
-        "placeholder_reply_encrypted": "Надіслати зашифровану відповідь…",
-        "placeholder_thread": "Відповісти в гілці…",
-        "placeholder_thread_encrypted": "Відповісти в зашифрованій гілці…",
+        "placeholder": "Надіслати незашифроване повідомлення...",
+        "placeholder_encrypted": "Надіслати повідомлення…",
+        "placeholder_reply": "Надіслати незашифровану відповідь…",
+        "placeholder_reply_encrypted": "Надіслати відповідь…",
+        "placeholder_thread": "Відповісти в незашифрованій гілці…",
+        "placeholder_thread_encrypted": "Відповісти в гілці…",
         "poll_button": "Опитування",
         "poll_button_no_perms_description": "Ви не маєте дозволу створювати опитування в цій кімнаті.",
         "poll_button_no_perms_title": "Потрібен дозвіл",
         "replying_title": "Відповідання",
+        "room_unencrypted": "Повідомлення у цій кімнаті не захищено наскрізним шифруванням.",
         "room_upgraded_link": "Розмова триває тут.",
         "room_upgraded_notice": "Ця кімната була замінена і не є активною.",
         "send_button_title": "Надіслати повідомлення",
@@ -720,6 +722,7 @@
         "personal_space_description": "Приватний простір для впорядкування ваших кімнат",
         "private_description": "Лише за запрошенням, найкраще для себе чи для команди",
         "private_heading": "Ваш приватний простір",
+        "private_only_heading": "Ваш простір",
         "private_personal_description": "Переконайтеся, що потрібні люди мають доступ до %(name)s",
         "private_personal_heading": "З ким ви працюєте?",
         "private_space": "Я й учасники моєї команди",
@@ -787,6 +790,7 @@
             "cross_signing_status": "Стан перехресного підписування:",
             "cross_signing_untrusted": "Ваш обліковий запис має ідентичність із перехресним підписом у таємному сховищі, але цей сеанс ще не довіряє їй.",
             "crypto_not_available": "Криптографічний модуль недоступний",
+            "device_id": "ID пристрою",
             "key_backup_active_version": "Активна версія резервної копії:",
             "key_backup_active_version_none": "Немає",
             "key_backup_inactive_warning": "Резервне копіювання ваших ключів із цього сеансу не виконується.",
@@ -799,11 +803,22 @@
             "secret_storage_ready": "готовий",
             "secret_storage_status": "Таємне сховище:",
             "self_signing_private_key_cached_status": "Самопідписаний приватний ключ:",
+            "session": "Сеанс",
+            "session_fingerprint": "Цифровий відбиток (ключ сеансу)",
             "title": "Наскрізне шифрування",
             "user_signing_private_key_cached_status": "Приватний ключ підпису користувача:"
         },
         "developer_mode": "Режим розробника",
         "developer_tools": "Інструменти розробника",
+        "device_id": "ID пристрою: %(deviceId)s",
+        "device_keys": "Ключі пристрою",
+        "device_verification_status": {
+            "signed_by_owner": "Стан верифікації: <E2EIcon /> Підписано власником",
+            "unknown": "Стан верифікації: невідомо",
+            "unverified": "Стан верифікації: <E2EIcon /> Не підписано власником",
+            "verified": "Стан верифікації: <E2EIcon /> Верифіковано перехресним підписом"
+        },
+        "devices": "Криптографічні пристрої (%(count)s)",
         "edit_setting": "Змінити налаштування",
         "edit_values": "Редагувати значення",
         "empty_string": "<порожній рядок>",
@@ -819,15 +834,18 @@
         "failed_to_save": "Не вдалося зберегти налаштування.",
         "failed_to_send": "Не вдалося надіслати подію!",
         "id": "Ідентифікатор: ",
+        "invalid_device_key_id": "Недійсний ID ключа пристрою",
         "invalid_json": "Не схоже на чинний JSON.",
         "level": "Рівень",
         "low_bandwidth_mode": "Режим низької пропускної спроможності",
         "low_bandwidth_mode_description": "Потрібен сумісний домашній сервер.",
         "main_timeline": "Основна стрічка",
+        "manual_device_verification": "Ручна верифікація пристрою",
         "no_receipt_found": "Підтвердження не знайдено",
         "notification_state": "Стан сповіщень <strong>%(notificationState)s</strong>",
         "notifications_debug": "Сповіщення зневадження",
         "number_of_users": "Кількість користувачів",
+        "only_joined_members": "Лише користувачі, які приєдналися",
         "original_event_source": "Оригінальний початковий код",
         "room_encrypted": "Кімната <strong>зашифрована ✅</strong>",
         "room_id": "ID кімнати: %(roomId)s",
@@ -862,6 +880,7 @@
             "elementCallUrl": "URL Element Call"
         },
         "settings_explorer": "Налаштування оглядача",
+        "show_empty_content_events": "Показати події з порожнім вмістом",
         "show_hidden_events": "Показувати приховані події у часоряді",
         "spaces": {
             "one": "<простір>",
@@ -874,10 +893,23 @@
         "toggle_event": "перемкнути подію",
         "toolbox": "Панель інструментів",
         "use_at_own_risk": "Цей інтерфейс НЕ перевіряє типи значень. Користуйтесь на свій ризик.",
+        "user_avatar": "Аватар: %(avatar)s",
+        "user_displayname": "Показуване ім'я: %(displayname)s",
+        "user_id": "ID користувача: %(userId)s",
+        "user_no_avatar": "Аватар: <i>Немає</i>",
+        "user_no_displayname": "Показуване ім'я: <i>Немає</i>",
         "user_read_up_to": "Користувач прочитав до: ",
         "user_read_up_to_ignore_synthetic": "Користувач прочитав до (ignoreSynthetic): ",
         "user_read_up_to_private": "Користувач прочитав до (m.read.private): ",
         "user_read_up_to_private_ignore_synthetic": "Користувач прочитав до (m.read.private;ignoreSynthetic): ",
+        "user_room_membership": "Учасник: %(membership)s",
+        "user_verification_status": {
+            "identity_changed": "Стан верифікації: <E2EIcon /> Не верифіковано, а особу змінено",
+            "unverified": "Стан верифікації: <E2EIcon /> Не верифіковано",
+            "verified": "Стан верифікації: <E2EIcon /> верифіковано",
+            "was_verified": "Стан верифікації: <E2EIcon /> верифіковано, але ідентичність змінено"
+        },
+        "users": "Користувачі",
         "value": "Значення",
         "value_colon": "Значення:",
         "value_in_this_room": "Значення у цій кімнаті",
@@ -913,15 +945,16 @@
     "empty_room_was_name": "Порожня кімната (були %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
+            "alternatives": "Якщо у вас є ключ безпеки або фраза безпеки, це теж спрацює.",
             "key_validation_text": {
-                "wrong_security_key": "Неправильний ключ відновлення"
+                "wrong_security_key": "Ви ввели некоректний ключ відновлення."
             },
+            "privacy_warning": "Переконайтеся, що ніхто не бачить цей екран!",
             "restoring": "Відновлення ключів із резервної копії",
-            "security_key_title": "Ключ відновлення"
+            "security_key_label": "Ключ відновлення",
+            "security_key_title": "Введіть ключ відновлення"
         },
         "bootstrap_title": "Налаштовування ключів",
-        "cancel_entering_passphrase_description": "Ви точно хочете скасувати введення парольної фрази?",
-        "cancel_entering_passphrase_title": "Скасувати введення парольної фрази?",
         "confirm_encryption_setup_body": "Клацніть на кнопку внизу, щоб підтвердити налаштування шифрування.",
         "confirm_encryption_setup_title": "Підтвердити налаштування шифрування",
         "cross_signing_room_normal": "Ця кімната є наскрізно зашифрованою",
@@ -932,6 +965,7 @@
         "cross_signing_user_warning": "Цей користувач звірив не всі свої сеанси.",
         "enter_recovery_key": "Введіть ключ відновлення",
         "event_shield_reason_authenticity_not_guaranteed": "Справжність цього зашифрованого повідомлення не може бути гарантованою на цьому пристрої.",
+        "event_shield_reason_mismatched_sender": "Відправник події не збігається з власником пристрою, який її надіслав.",
         "event_shield_reason_mismatched_sender_key": "Зашифроване незвіреним сеансом",
         "event_shield_reason_unknown_device": "Зашифровано невідомим або видаленим пристроєм.",
         "event_shield_reason_unsigned_device": "Зашифровано пристроєм, не перевіреним його власником.",
@@ -964,15 +998,14 @@
             "title": "Відновлювальний засіб було видалено",
             "warning": "Якщо ви не видаляли способу відновлення, ймовірно хтось намагається зламати ваш обліковий запис. Негайно змініть пароль до свого облікового запису й встановіть новий спосіб відновлення в налаштуваннях."
         },
-        "reset_all_button": "Забули чи втратили всі способи відновлення? <a>Скинути все</a>",
         "set_up_recovery": "Налаштування відновлення",
-        "set_up_recovery_later": "Не зараз",
         "set_up_recovery_toast_description": "Згенеруйте ключ відновлення, який можна використовувати для відновлення історії зашифрованих повідомлень у разі втрати доступу до своїх пристроїв.",
-        "set_up_toast_description": "Захистіться від втрати доступу до зашифрованих повідомлень і даних",
         "set_up_toast_title": "Налаштувати захищене резервне копіювання",
         "setup_secure_backup": {
             "explainer": "Створіть резервну копію ключів перед виходом, щоб не втратити їх."
         },
+        "turn_on_key_storage": "Увімкнути сховище ключів",
+        "turn_on_key_storage_description": "Зберігайте свій криптографічний ідентифікатор і ключі повідомлень на сервері. Це дозволить вам переглядати історію повідомлень на будь-яких нових пристроях. %1$s.",
         "udd": {
             "interactive_verification_button": "Звірити інтерактивно за допомогою емоджі",
             "other_ask_verify_text": "Попросіть цього користувача звірити сеанс, або звірте його власноруч унизу.",
@@ -987,16 +1020,17 @@
             "after_new_login": {
                 "device_verified": "Пристрій звірено",
                 "skip_verification": "На разі пропустити звірку",
-                "unable_to_verify": "Не вдалося звірити цей пристрій",
                 "verify_this_device": "Звірити цей пристрій"
             },
-            "cancelled": "Ви скасували звірку.",
-            "cancelled_self": "Ви скасували звірення на іншому пристрої.",
-            "cancelled_user": "%(displayName)s скасовує звірку.",
+            "cancelled_verification": "Або час очікування запиту минув, або запит було відхилено, або виникла розбіжність у верифікації.",
             "cancelling": "Скасування…",
+            "cant_confirm": "Не можете підтвердити?",
             "complete_action": "Зрозуміло",
             "complete_description": "Ви успішно звірили цього користувача.",
             "complete_title": "Звірено!",
+            "confirm_identity_description": "Верифікуйте цей пристрій, щоб налаштувати безпечний обмін повідомленнями.",
+            "confirm_identity_title": "Підтвердьте свою особистість",
+            "confirm_the_emojis": "Підтвердьте, що емодзі нижче збігаються з тими, які показані на вашому іншому пристрої.",
             "error_starting_description": "Ми не змогли розпочати бесіду з іншим користувачем.",
             "error_starting_title": "Помилка запуску перевірки",
             "explainer": "Захищені повідомлення з цим користувачем є наскрізно зашифрованими та непрочитними для сторонніх осіб.",
@@ -1007,58 +1041,72 @@
             "incoming_sas_dialog_waiting": "Очікування підтвердження партнером…",
             "incoming_sas_user_dialog_text_1": "Звірте цього користувача щоб позначити його довіреним. Довіряння користувачам додає спокою якщо ви користуєтесь наскрізно зашифрованими повідомленнями.",
             "incoming_sas_user_dialog_text_2": "Звірка цього користувача позначить його сеанс довіреним вам, а ваш йому.",
-            "no_key_or_device": "Схоже, у вас немає ключа відновлення або будь-яких інших пристроїв, за допомогою яких ви можете виконати верифікацію. Цей пристрій не зможе отримати доступ до старих зашифрованих повідомлень. Щоб підтвердити свою ідентичність на цьому пристрої, вам потрібно буде скинути ключі верифікації.",
+            "manual": {
+                "already_verified": "Цей пристрій вже верифіковано",
+                "already_verified_and_wrong_fingerprint": "Наданий цифровий відбиток не збігається, але пристрій уже верифіковано!",
+                "device_id": "ID пристрою",
+                "failure_description": "Не вдалося верифікувати '%(deviceId)s': %(error)s",
+                "failure_title": "Не вдалося верифікувати",
+                "fingerprint": "Цифровий відбиток (ключ сеансу)",
+                "no_crypto": "Не вдалося верифікувати пристрій – криптографію не ввімкнено",
+                "no_device": "Не вдалося верифікувати пристрій - пристрій '%(deviceId)s' не знайдено",
+                "no_userid": "Не вдалося верифікувати пристрій – не вдалося знайти наш ID користувача",
+                "success_description": "Пристрій (%(deviceId)s) тепер має перехресний підпис",
+                "success_title": "Успішно верифіковано",
+                "text": "Надайте ID і цифровий відбиток одного з ваших пристроїв, щоб верифікувати його. ЗАУВАЖТЕ, це дозволяє іншому пристрою надсилати та отримувати повідомлення від вашого імені. ЯКЩО ХТОСЬ СКАЗАВ ВАМ ВСТАВИТИ ЩОСЬ СЮДИ, ШВИДШЕ ЗА ВСЕ, ВАС ОБМАНЮЮТЬ!",
+                "wrong_fingerprint": "Не вдалося верифікувати пристрій '%(deviceId)s' - наданий цифровий відбиток '%(fingerprint)s' не збігається з відбитком пристрою, '%(fprint)s'"
+            },
             "no_support_qr_emoji": "Пристрій, який ви намагаєтесь звірити, не підтримує сканування QR-коду або звірення за допомогою емоджі, що є підтримувані %(brand)s. Спробуйте використати інший клієнт.",
+            "now_you_can": "Тепер ви можете безпечно читати та надсилати повідомлення, а всі, з ким ви спілкуєтеся, також можуть довіряти цьому пристрою.",
+            "once_accepted_can_continue": "Після погодження ви зможете продовжити верифікацію.",
             "other_party_cancelled": "Друга сторона скасувала звірення.",
             "prompt_encrypted": "Звірте всіх користувачів у кімнаті, щоб забезпечити її захищеність.",
-            "prompt_self": "Почніть звірку заново зі сповіщення.",
             "prompt_unencrypted": "У зашифрованих кімнатах, звіряйте всіх користувачів, щоб спілкуватися було безпечно.",
-            "prompt_user": "Почніть звірку заново з їхнього профілю.",
             "qr_or_sas": "%(qrCode)s з %(emojiCompare)s",
-            "qr_or_sas_header": "Звірте цей пристрій одним із запропонованих способів:",
             "qr_prompt": "Скануйте цей унікальний код",
-            "qr_reciprocate_same_shield_device": "Майже готово! Чи показує інший пристрій такий самий щит?",
+            "qr_reciprocate_check_again_device": "Перевірте ще раз на іншому пристрої, щоб завершити верифікацію.",
+            "qr_reciprocate_no": "Ні, я не бачу зеленого щита",
             "qr_reciprocate_same_shield_user": "Майже готово! Ваш %(displayName)s показує той самий щит?",
-            "request_toast_accept": "Звірити сеанс",
+            "qr_reciprocate_yes": "Так, я бачу зелений щит",
             "request_toast_accept_user": "Підтвердити користувача",
             "request_toast_decline_counter": "Ігнорувати (%(counter)s)",
             "request_toast_detail": "%(deviceId)s з %(ip)s",
-            "reset_proceed_prompt": "Продовжити скидання",
+            "request_toast_start_verification": "Почати верифікацію",
             "sas_caption_self": "Звірте цей пристрій, підтвердивши, що на екрані з'явилося це число.",
             "sas_caption_user": "Звірте справжність цього користувача, підтвердивши, що на екрані з'явилося таке число.",
             "sas_description": "Порівняйте унікальний набір емодзі якщо жоден ваш пристрій не має камери",
-            "sas_emoji_caption_self": "Переконайтеся, що наведені внизу емоджі показано на обох пристроях в однаковому порядку:",
             "sas_emoji_caption_user": "Звірте цього користувача підтвердженням того, що наступні емодзі з'являються на його екрані.",
             "sas_match": "Вони збігаються",
             "sas_no_match": "Вони не збігаються",
             "sas_prompt": "Порівняйте унікальні емодзі",
             "scan_qr": "Звірити скануванням",
             "scan_qr_explainer": "Попросіть %(displayName)s відсканувати ваш код:",
-            "self_verification_hint": "Щоб продовжити, прийміть запит підтвердження на вашому іншому пристрої.",
             "start_button": "Почати перевірку",
-            "successful_device": "Ви успішно звірили %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "Ви успішно звірили свій пристрій!",
             "successful_user": "Ви успішно звірили %(displayName)s!",
-            "timed_out": "Термін дії звірки завершився.",
             "unsupported_method": "Не вдалося знайти підтримуваний спосіб звірки.",
             "unverified_session_toast_accept": "Так, це я",
             "unverified_session_toast_title": "Новий вхід. Це були ви?",
             "unverified_sessions_toast_description": "Перевірте, щоб переконатися, що ваш обліковий запис у безпеці",
             "unverified_sessions_toast_reject": "Пізніше",
             "unverified_sessions_toast_title": "У вас є неперевірені сеанси",
-            "verification_description": "Верифікуйте свою особистість, щоб отримати доступ до зашифрованих повідомлень і довести свою справжність іншим. Якщо ви також використовуєте мобільний пристрій, відкрийте застосунок на ньому, перш ніж продовжити.",
+            "use_another_device": "Використати інший пристрій",
+            "use_recovery_key": "Використати ключ відновлення",
+            "verification_dialog_title_choose": "Виберіть спосіб верифікації",
+            "verification_dialog_title_compare_emojis": "Порівняти емодзі",
+            "verification_dialog_title_confirm_green_shield": "Підтвердьте, що на іншому пристрої ви бачите зелений щит",
             "verification_dialog_title_device": "Звірити інший пристрій",
+            "verification_dialog_title_failed": "Не вдалося верифікувати",
+            "verification_dialog_title_start_on_other_device": "Розпочати верифікацію на іншому пристрої",
             "verification_dialog_title_user": "Запит підтвердження",
+            "verification_dialog_title_verified": "Пристрій верифіковано",
             "verification_skip_warning": "До звірки ви матимете доступ не до всіх своїх повідомлень, а в інших ви можете позначатися недовіреними.",
             "verification_success_with_backup": "Ваш новий пристрій звірено. Він має доступ до ваших зашифрованих повідомлень, а інші користувачі бачитимуть його довіреним.",
             "verification_success_without_backup": "Ваш новий пристрій звірено. Інші користувачі бачитимуть його довіреним.",
+            "verify_by_completing_one_of": "Верифікуйте, виконавши одну з цих дій:",
             "verify_emoji": "Звірити за допомогою емодзі",
             "verify_emoji_prompt": "Звірити порівнянням унікальних емодзі.",
             "verify_emoji_prompt_qr": "Якщо ви не можете сканувати зазначений код, звірте порівнянням унікальних емодзі.",
             "verify_later": "Звірю пізніше",
-            "verify_using_device": "Звірити за допомогою іншого пристрою",
-            "verify_using_key": "Верифікувати за допомогою ключа відновлення",
-            "verify_using_key_or_phrase": "Верифікувати за допомогою фрази або ключа відновлення",
             "waiting_for_user_accept": "Очікування згоди %(displayName)s…",
             "waiting_other_device": "Очікування вашої звірки на іншому пристрої…",
             "waiting_other_device_details": "Очікування вашої звірки на іншому пристрої, %(deviceName)s (%(deviceId)s)…",
@@ -1108,6 +1156,7 @@
         "tls": "Не вдалося під'єднатися до домашнього сервера — перевірте з'єднання, переконайтесь, що ваш <a>SSL-сертифікат домашнього сервера</a> довірений і що розширення браузера не блокує запити.",
         "unknown": "Невідома помилка",
         "unknown_error_code": "невідомий код помилки",
+        "update_history_visibility": "Не вдалося змінити видимість історії",
         "update_power_level": "Не вдалося змінити рівень повноважень"
     },
     "error_app_open_in_another_tab": "Перейдіть на іншу вкладку, щоб під'єднатися до %(brand)s. Цю вкладку можна закрити.",
@@ -1348,6 +1397,10 @@
         "name_email_mxid_share_space": "Запросіть когось за іменем, е-поштою, користувацьким іменем (вигляду <userId/>) чи <a>поділіться цим простором</a>.",
         "name_mxid_share_room": "Запросіть когось за іменем, користувацьким іменем (вигляду <userId/>) чи <a>поділіться цією кімнатою</a>.",
         "name_mxid_share_space": "Запросіть когось за іменем, користувацьким іменем (вигляду <userId/>) чи <a>поділіться цим простором</a>.",
+        "progress": {
+            "dont_close": "Не закривайте застосунок, доки не завершите.",
+            "preparing": "Приготування запрошень..."
+        },
         "recents_section": "Недавні бесіди",
         "room_failed_partial": "Ми надіслали іншим, але вказаних людей, не вдалося запросити до <RoomName/>",
         "room_failed_partial_title": "Деякі запрошення неможливо надіслати",
@@ -1374,8 +1427,9 @@
         "other": "Запрошення %(user)s і ще %(count)s"
     },
     "items_and_n_others": {
-        "other": "<Items/> та ще %(count)s учасників",
-        "one": "<Items/> і ще хтось"
+        "one": "<Items/> і ще хтось",
+        "few": "<Items/> і ще %(count)s",
+        "many": "<Items/> і ще %(count)s"
     },
     "keyboard": {
         "activate_button": "Натиснути обрану кнопку",
@@ -1434,6 +1488,7 @@
         "room_list_navigate_down": "Перейти вниз списку кімнат",
         "room_list_navigate_up": "Перейти вгору списку кімнат",
         "room_list_select_room": "Вибрати кімнату з переліку",
+        "save": "Зберегти",
         "scroll_down_timeline": "Гортати стрічку вниз",
         "scroll_up_timeline": "Гортати стрічку вгору",
         "search": "Пошук (повинен бути увімкненим)",
@@ -1450,7 +1505,6 @@
         "upload_file": "Вивантажити файл"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Дозволити режим лише спільного доступу до екрана",
         "ask_to_join": "Увімкнути запити на приєднання",
         "automatic_debug_logs": "Автоматично надсилати журнал зневадження про всі помилки",
         "automatic_debug_logs_decryption": "Автоматично надсилати журнали зневадження при збоях розшифрування",
@@ -1515,6 +1569,9 @@
         "render_reaction_images_description": "Іноді їх називають \"користувацькими емодзі\".",
         "report_to_moderators": "Поскаржитись модераторам",
         "report_to_moderators_description": "У кімнатах, які підтримують модерацію, кнопка «Поскаржитися» дає змогу повідомити про зловживання модераторам кімнати.",
+        "share_history_on_invite": "Ділитися зашифрованою історією з новими учасниками",
+        "share_history_on_invite_description": "Коли запрошуєте користувача до зашифрованої кімнати, в якій видимість історії встановлено як «спільна», поділіться зашифрованою історією з цим користувачем і прийміть зашифровану історію, коли вас запросять до такої кімнати.",
+        "share_history_on_invite_warning": "Ця функція ЕКСПЕРИМЕНТАЛЬНА, і впроваджено не всі заходи безпеки. Не вмикайте її на робочих облікових записах.",
         "sliding_sync": "Режим ковзної синхронізації",
         "sliding_sync_description": "На стадії активної розробки, вимкнути не можна.",
         "sliding_sync_disabled_notice": "Вийдіть і знову увійдіть, щоб вимкнути",
@@ -1637,8 +1694,8 @@
         "filter_placeholder": "Відфільтрувати учасників кімнати",
         "invite_button_no_perms_tooltip": "У вас немає дозволу запрошувати користувачів",
         "invited_label": "Запрошено",
-        "no_matches": "Немає збігів",
-        "power_label": "%(userName)s (повноваження %(powerLevelNumber)s)"
+        "list_title": "Список учасників",
+        "no_matches": "Немає збігів"
     },
     "member_list_back_action_label": "Учасники кімнати",
     "message_edit_dialog_title": "Редагування повідомлення",
@@ -1709,6 +1766,7 @@
         "end_message": "Опитування завершене. Перемогла відповідь: %(topAnswer)s",
         "end_message_no_votes": "Опитування завершене. Жодного голосу не було.",
         "end_title": "Завершити опитування",
+        "ended_poll_label": "Опитування завершено",
         "error_ending_description": "Не вдалося завершити опитування. Спробуйте ще.",
         "error_ending_title": "Не вдалося завершити опитування",
         "error_voting_description": "Не вдалося зареєструвати ваш голос. Просимо спробувати ще.",
@@ -1716,10 +1774,17 @@
         "failed_send_poll_description": "Не вдалося надіслати опитування, яке ви намагалися створити.",
         "failed_send_poll_title": "Не вдалося надіслати опитування",
         "notes": "Результати показуються лише після завершення опитування",
+        "option_label": "Варіант %(number)s, %(answer)s",
+        "option_label_with_total": {
+            "one": "Варіант %(number)s, %(answer)s, %(count)s голос",
+            "few": "Варіант %(number)s, %(answer)s, %(count)s голоси",
+            "many": "Варіант %(number)s, %(answer)s, %(count)s голосів"
+        },
         "options_add_button": "Додати варіант",
         "options_heading": "Створіть варіанти",
         "options_label": "Варіант %(number)s",
         "options_placeholder": "Вписати варіант",
+        "poll_label": "Опитування",
         "topic_heading": "Яке питання чи тема вашого опитування?",
         "topic_label": "Питання чи тема",
         "topic_placeholder": "Напишіть щось…",
@@ -1742,6 +1807,7 @@
     },
     "power_level": {
         "admin": "Адміністратор",
+        "creator": "Власник",
         "custom": "Власний (%(level)s)",
         "custom_level": "Власний рівень",
         "default": "Типовий",
@@ -1850,11 +1916,6 @@
                 "other": "Закріпити можна до %(count)s віджетів"
             },
             "menu": "Відкрити меню",
-            "release_announcement": {
-                "close": "Ok",
-                "description": "Усі закріплені повідомлення можна знайти тут. Наведіть курсор на будь-яке повідомлення і виберіть «Закріпити», щоб додати його.",
-                "title": "Усі нові закріплені повідомлення"
-            },
             "reply_thread": "Відповісти в <link>гілці повідомлення</link>",
             "unpin_all": {
                 "button": "Відкріпити всі повідомлення",
@@ -1956,6 +2017,7 @@
         },
         "face_pile_tooltip_shortcut": "Включно з %(commaSeparatedMembers)s",
         "face_pile_tooltip_shortcut_joined": "Включно з вами, %(commaSeparatedMembers)s",
+        "failed_determine_user": "Неможливо визначити, якого користувача ігнорувати, оскільки подія учасника змінилася.",
         "failed_reject_invite": "Не вдалось відхилити запрошення",
         "forget_room": "Забути цю кімнату",
         "forget_space": "Забути цей простір",
@@ -1975,7 +2037,9 @@
         "inaccessible_subtitle_1": "Повторіть спробу пізніше, або запитайте у кімнати або простору перевірку, чи маєте ви доступ.",
         "inaccessible_subtitle_2": "Під час спроби отримати доступ до кімнати або простору було повернено помилку %(errcode)s. Якщо ви думаєте, що ви бачите це повідомлення помилково, будь ласка, <issueLink>надішліть звіт про помилку</issueLink>.",
         "intro": {
+            "display_topic": "Тема: <topic/>",
             "dm_caption": "У цій розмові вас лише двоє, поки хтось із вас не запросить іще когось приєднатися.",
+            "edit_topic": "Тема: <topic/> (<a>змінити</a>)",
             "enable_encryption_prompt": "Ввімкніть шифрування в налаштуваннях.",
             "encrypted_3pid_dm_pending_join": "Коли хтось приєднається, ви зможете спілкуватись",
             "no_avatar_label": "Додайте фото, щоб люди легко вирізняли вашу кімнату.",
@@ -1985,8 +2049,6 @@
             "send_message_start_dm": "Надішліть своє перше повідомлення, щоб запросити <displayName/> до бесіди",
             "start_of_dm_history": "Це початок історії вашого особистого спілкування з <displayName/>.",
             "start_of_room": "Це початок <roomName/>.",
-            "topic": "Тема: %(topic)s ",
-            "topic_edit": "Тема: %(topic)s (<a>змінити</a>)",
             "unencrypted_warning": "Наскрізне шифрування не ввімкнене",
             "user_created": "%(displayName)s створює цю кімнату.",
             "you_created": "Ви створили кімнату."
@@ -2041,13 +2103,16 @@
         "pinned_message_banner": {
             "button_close_list": "Закрити список",
             "button_view_all": "Подивитись все",
-            "description": "У цій кімнаті є закріплені повідомлення. Натисніть, щоб переглянути їх.",
-            "go_to_message": "Переглянути закріплене повідомлення у стрічці часу.",
+            "description": "Закріплені повідомлення",
+            "go_to_newest_message": "Перегляньте закріплене повідомлення у стрічці та найновіше закріплене повідомлення тут",
+            "go_to_next_message": "Перегляньте закріплене повідомлення у стрічці та наступне найдавніше закріплене повідомлення тут",
             "title": "<bold>%(index)s з %(length)s</bold> закріплених повідомлень"
         },
         "read_topic": "Натисніть, щоб побачити тему",
         "rejecting": "Відхилення запрошення…",
         "rejoin_button": "Перепід'єднатись",
+        "room_content": "Вміст кімнати",
+        "room_is_low_priority": "Це кімната з низьким пріоритетом",
         "search": {
             "all_rooms_button": "Вибрати всі кімнати",
             "placeholder": "Пошук повідомлень…",
@@ -2061,6 +2126,7 @@
         "status_bar": {
             "delete_all": "Видалити всі",
             "exceeded_resource_limit": "Не вдалося надіслати повідомлення, бо домашній сервер перевищив ліміт ресурсів. <a>Зв'яжіться з адміністратором сервісу,</a> щоб продовжити використання.",
+            "history_visible": "Цю кімнату налаштовано, щоб нові учасники могли переглядати історію. <a>Докладніше</a>",
             "homeserver_blocked": "Ваше повідомлення не надіслано, оскільки цей домашній сервер заблокований його адміністратором. <a>Зверніться до адміністратора служби</a>, щоб продовжувати користуватися нею.",
             "monthly_user_limit_reached": "Не вдалося надіслати повідомлення, бо домашній сервер перевищив свій ліміт активних користувачів за місяць. <a>Зв'яжіться з адміністратором сервісу,</a> щоб продовжити використання.",
             "requires_consent_agreement": "Ви не можете надсилати жодних повідомлень, поки не переглянете та не погодитесь з <consentLink>нашими умовами та положеннями</consentLink>.",
@@ -2095,27 +2161,35 @@
     "room_list": {
         "add_room_label": "Додати кімнату",
         "add_space_label": "Додати простір",
-        "appearance": "Вигляд",
         "breadcrumbs_empty": "Немає недавно відвіданих кімнат",
         "breadcrumbs_label": "Недавно відвідані кімнати",
+        "collapse_filters": "Згорнути список фільтрів",
         "empty": {
             "no_chats": "Ще немає бесід",
             "no_chats_description": "Почніть користування, надіславши комусь повідомлення або створивши кімнату",
             "no_chats_description_no_room_rights": "Розпочніть користування, написавши комусь повідомлення",
             "no_favourites": "У вас ще немає обраних бесід",
             "no_favourites_description": "Ви можете додати бесіду до обраних у її налаштуваннях",
+            "no_invites": "У вас немає непрочитаних запрошень",
+            "no_lowpriority": "У вас немає неважливих кімнат",
+            "no_mentions": "У вас немає непрочитаних згадок",
             "no_people": "У вас ще немає особистих бесід",
             "no_people_description": "Ви можете очистити фільтри, щоб побачити інші ваші бесіди",
             "no_rooms": "Ви ще не входили до кімнат",
             "no_rooms_description": "Ви можете очистити фільтри, щоб побачити інші ваші бесіди",
             "no_unread": "Вітаємо! У вас немає непрочитаних повідомлень",
+            "show_activity": "Переглянути всю діяльність",
             "show_chats": "Показати всі бесіди"
         },
+        "expand_filters": "Розгорнути список фільтрів",
         "failed_add_tag": "Не вдалось додати до кімнати мітку %(tagName)s",
         "failed_remove_tag": "Не вдалося прибрати з кімнати мітку %(tagName)s",
         "failed_set_dm_tag": "Не вдалося встановити мітку особистого повідомлення",
         "filters": {
             "favourite": "Обрані",
+            "invites": "Запрошення",
+            "low_priority": "Неважливі",
+            "mentions": "Згадування",
             "people": "Люди",
             "rooms": "Кімнати",
             "unread": "Непрочитані"
@@ -2148,7 +2222,6 @@
         },
         "room_options": "Параметри кімнати",
         "show_less": "Згорнути",
-        "show_message_previews": "Показати попередній перегляд повідомлень",
         "show_n_more": {
             "other": "Показати ще %(count)s",
             "one": "Показати ще %(count)s"
@@ -2255,6 +2328,8 @@
             "no_aliases_space": "Простір не має локальних адрес",
             "other_section": "Інше",
             "publish_toggle": "Опублікувати цю кімнату для всіх у каталозі кімнат %(domain)s?",
+            "publish_warn_invite_only": "Ви не можете опублікувати кімнату, доступ до якої дозволено лише за запрошеннями.",
+            "publish_warn_no_canonical_permission": "Щоб опублікувати цю кімнату, вам потрібен дозвіл на встановлення основної адреси.",
             "published_aliases_description": "Щоб зробити адресу загальнодоступною, спершу додайте її в локальні.",
             "published_aliases_explainer_room": "Загальнодоступні адреси можуть бути використані будь-ким на будь-якому сервері для приєднання до вашої кімнати.",
             "published_aliases_explainer_space": "Загальнодоступні адреси можуть бути використані будь-ким на будь-якому сервері для приєднання до вашого простору.",
@@ -2332,6 +2407,10 @@
             "users_default": "Типова роль"
         },
         "security": {
+            "cannot_change_to_private_due_to_missing_history_visiblity_permissions": {
+                "description": "У вас немає дозволів на зміну видимості історії кімнати. Це небезпечно, оскільки може дозволити читати повідомлення користувачам, які не приєдналися.",
+                "title": "Неможливо зробити кімнату приватною"
+            },
             "enable_encryption_confirm_description": "Якщо ви увімкнете шифрування для кімнати, його неможливо буде вимкнути. Надіслані у зашифровану кімнату повідомлення будуть прочитними тільки для учасників кімнати, натомість для сервера вони будуть непрочитними. Увімкнення шифрування може унеможливити роботу ботів та мостів. <a>Дізнатись більше про шифрування.</a>",
             "enable_encryption_confirm_title": "Увімкнути шифрування?",
             "enable_encryption_public_room_confirm_description_1": "<b>Не варто додавати шифрування загальнодоступним кімнатам.</b> Будь-хто може знаходити загальнодоступні кімнати, приєднатись і читати повідомлення в них. Ви не отримаєте переваг від шифрування й не зможете вимкнути його пізніше. Зашифровані повідомлення в загальнодоступній кімнаті отримуватимуться й надсилатимуться повільніше.",
@@ -2349,7 +2428,7 @@
             "history_visibility_joined": "Лише учасники (від часу приєднання)",
             "history_visibility_legend": "Хто може читати історію?",
             "history_visibility_shared": "Лише учасники (від часу вибору цієї опції)",
-            "history_visibility_warning": "Зміни дозволів читання історії вплинуть лише на майбутні повідомлення цієї кімнати. Видимість наявної історії незмінна.",
+            "history_visibility_warning": "Видимість наявної історії не зміниться.",
             "history_visibility_world_readable": "Кожний",
             "join_rule_description": "Вкажіть, хто може приєднуватися до %(roomName)s.",
             "join_rule_invite": "Приватно (лише за запрошенням)",
@@ -2392,6 +2471,7 @@
                 "other": "Оновлення просторів... (%(progress)s із %(count)s)"
             },
             "join_rule_upgrade_upgrading_room": "Поліпшення кімнати",
+            "join_rule_world_readable_description": "Зміна умов приєднання до кімнати також змінить видимість майбутніх повідомлень.",
             "public_without_alias_warning": "Щоб посилатись на цю кімнату, додайте їй адресу.",
             "publish_room": "Зробити цю кімнату видимою в каталозі загальнодоступних кімнат.",
             "publish_space": "Зробити цей простір видимим у каталозі загальнодоступних кімнат.",
@@ -2405,11 +2485,12 @@
             "error_failed_save": "Не вдалось оновити видимість цього простору",
             "error_update_guest_access": "Не вдалося оновити гостьовий доступ до цього простору",
             "error_update_history_visibility": "Не вдалося оновити видимість історії цього простору",
-            "guest_access_explainer": "Гості можуть приєднатися до простору без облікового запису.",
-            "guest_access_explainer_public_space": "Це може бути корисним для загальнодоступних просторів.",
+            "guest_access_disabled": "Ви не маєте дозволу змінювати доступ гостей.",
+            "guest_access_explainer": "Гості можуть приєднатися до простору без облікового запису. Це може бути корисним для загальнодоступних просторів.",
             "guest_access_label": "Увімкнути гостьовий доступ",
             "history_visibility_anyone_space": "Попередній перегляд простору",
             "history_visibility_anyone_space_description": "Дозвольте людям переглядати ваш простір, перш ніж вони приєднаються.",
+            "history_visibility_anyone_space_disabled": "Ви не маєте дозволу змінювати видимість історії.",
             "history_visibility_anyone_space_recommendation": "Рекомендовано для загальнодоступних просторів.",
             "title": "Видимість"
         },
@@ -2449,6 +2530,10 @@
         "recent_changes_heading": "Останні зміни, котрі ще не отримано",
         "title": "Сервер не відповідає"
     },
+    "service_worker_error": {
+        "description": "%(brand)s потребує Service worker для завантаження автентифікованих медіа з репозиторіїв вмісту Matrix. Ваш браузер не підтримує цю функцію, тому медіафайли можуть не завантажуватися.",
+        "title": "Не вдалося завантажити Service Worker"
+    },
     "seshat": {
         "error_initialising": "Не вдалося почати пошук, перевірте <a>налаштування</a>, щоб дізнатися більше",
         "reset_button": "Очистити сховище подій",
@@ -2526,6 +2611,7 @@
                 "breadcrumb_second_description": "Ви втратите історію повідомлень, яка зберігається лише на сервері",
                 "breadcrumb_third_description": "Вам потрібно буде верифікувати всі наявні пристрої та контакти ще раз",
                 "breadcrumb_title": "Ви впевнені, що хочете скинути свою особистість?",
+                "breadcrumb_title_cant_confirm": "Вам потрібно скинути свою ідентичність",
                 "breadcrumb_title_forgot": "Забули ключ відновлення? Вам потрібно скинути свою особистість.",
                 "breadcrumb_title_sync_failed": "Не вдалося синхронізувати сховище ключів. Вам потрібно скинути свою ідентичність.",
                 "breadcrumb_warning": "Робіть це, лише якщо ви впевнені, що ваш обліковий запис скомпрометований.",
@@ -2533,7 +2619,7 @@
                 "do_not_close_warning": "Не закривайте це вікно, поки не завершиться скидання",
                 "export_keys": "Експорт ключів",
                 "import_keys": "Імпорт ключів",
-                "other_people_device_description": "Попередження: користувачі, які не пройшли явну верифікацію з вами (наприклад, за допомогою емодзі), не отримають ваші зашифровані повідомлення. Також неверифіковані пристрої верифікованих користувачів не отримуватимуть ваші зашифровані повідомлення.",
+                "other_people_device_description": "Попередження: користувачі, які не пройшли явну верифікацію з вами (наприклад, за допомогою емодзі), не отримають ваші зашифровані повідомлення. Також неверифіковані пристрої верифікованих користувачів не отримуватимуть ваші зашифровані повідомлення. Зміни набудуть чинності після перезапуску застосунку.",
                 "other_people_device_label": "У кімнатах з увімкненим шифруванням надсилати повідомлення лише верифікованим користувачам",
                 "other_people_device_title": "Пристрої інших людей",
                 "reset_identity": "Скинути криптографічну ідентичність",
@@ -2542,6 +2628,8 @@
                 "session_key": "Ключ сеансу:",
                 "title": "Додатково"
             },
+            "confirm_key_storage_off": "Ви впевнені, що хочете вимкнути сховище ключів?",
+            "confirm_key_storage_off_description": "Якщо ви вийдете з усіх своїх пристроїв, ви втратите історію повідомлень і вам потрібно буде знову підтвердити всі наявні контакти. <a>Докладніше</a>",
             "delete_key_storage": {
                 "breadcrumb_page": "Видалити сховище ключів",
                 "confirm": "Видалити сховище ключів",
@@ -2600,6 +2688,7 @@
             "allow_spellcheck": "Дозволити перевірку правопису",
             "application_language": "Мова застосунку",
             "application_language_reload_hint": "Застосунок перезапуститься після вибору іншої мови",
+            "avatar_open_menu": "Відкрити меню аватара",
             "avatar_remove_progress": "Вилучення зображення...",
             "avatar_save_progress": "Вивантаження зображення...",
             "avatar_upload_error_text": "Формат файлу не підтримується або зображення більше ніж %(size)s.",
@@ -2677,13 +2766,11 @@
         "inline_url_previews_room": "Увімкнути попередній перегляд гіперпосилань за умовчанням для учасників цієї кімнати",
         "inline_url_previews_room_account": "Увімкнути попередній перегляд гіперпосилань в цій кімнаті (стосується тільки вас)",
         "insert_trailing_colon_mentions": "Додавати двокрапку після згадки користувача на початку повідомлення",
+        "invite_controls": {
+            "default_label": "Дозволити користувачам запрошувати вас до кімнат"
+        },
         "jump_to_bottom_on_send": "Переходити вниз стрічки під час надсилання повідомлення",
         "key_backup": {
-            "backup_in_progress": "Створюється резервна копія ваших ключів (перше копіювання може тривати кілька хвилин).",
-            "backup_starting": "Запуск резервного копіювання…",
-            "backup_success": "Успішно!",
-            "cannot_create_backup": "Не вдалося створити резервну копію ключів",
-            "create_title": "Створити резервну копію ключів",
             "setup_secure_backup": {
                 "backup_setup_success_description": "На цьому пристрої створюється резервна копія ваших ключів.",
                 "backup_setup_success_title": "Безпечне резервне копіювання виконано успішно",
@@ -2743,6 +2830,7 @@
             "show_in_private": "У приватних кімнатах",
             "show_media": "Завжди показувати"
         },
+        "not_supported": "Ваш сервер не впровадив цю функцію.",
         "notifications": {
             "default_setting_description": "Цей параметр буде застосовано усталеним до всіх ваших кімнат.",
             "default_setting_section": "Я хочу отримувати сповіщення про (типове налаштування)",
@@ -2800,6 +2888,7 @@
             "voip": "Голосові та відеовиклики"
         },
         "preferences": {
+            "Electron.enableContentProtection": "Запобігати захопленню вмісту вікна іншими застосунками",
             "Electron.enableHardwareAcceleration": "Увімкнути апаратне прискорення (перезапустіть %(appName)s, щоб зміни вступили в силу)",
             "always_show_menu_bar": "Завжди показувати рядок меню",
             "autocomplete_delay": "Затримка автозаповнення (мс)",
@@ -2808,6 +2897,7 @@
             "composer_heading": "Редактор",
             "default_timezone": "Типовий браузера (%(timezone)s)",
             "dialog_title": "<strong>Налаштування:</strong> Параметри",
+            "enable_content_protection": "Увімкнути захист вмісту",
             "enable_hardware_acceleration": "Увімкнути апаратне прискорення",
             "enable_tray_icon": "Згортати вікно до піктограми в лотку при закритті",
             "keyboard_heading": "Комбінації клавіш",
@@ -2821,6 +2911,7 @@
             "room_list_heading": "Перелік кімнат",
             "show_avatars_pills": "Показувати аватари у згадках користувачів, кімнат і подій",
             "show_polls_button": "Показувати кнопку опитування",
+            "startup_window_behaviour_label": "Запуск і поведінка вікна",
             "surround_text": "Обгортати виділений текст при введенні спеціальних символів",
             "time_heading": "Формат часу",
             "user_timezone": "Установити часовий пояс"
@@ -2841,7 +2932,6 @@
             "ignore_users_empty": "Ви не маєте нехтуваних користувачів.",
             "ignore_users_section": "Нехтувані користувачі",
             "key_backup_algorithm": "Алгоритм:",
-            "key_backup_connect": "Налаштувати цьому сеансу резервне копіювання ключів",
             "message_search_disable_warning": "Якщо вимкнути, пошук не показуватиме повідомлень зашифрованих кімнат.",
             "message_search_disabled": "Безпечно локально кешувати зашифровані повідомлення щоб вони з'являлись у результатах пошуку.",
             "message_search_enabled": {
@@ -2854,6 +2944,7 @@
             "message_search_indexing": "Триває індексування: %(currentRoom)s",
             "message_search_indexing_idle": "Зараз жодна кімната не індексується.",
             "message_search_intro": "%(brand)s надійно зберігає зашифровані повідомлення локально, щоб вони з'являлися в результатах пошуку:",
+            "message_search_pending_rooms": "Кімнати, що очікують індексації: %(pendingRooms)s",
             "message_search_room_progress": "%(doneRooms)s із %(totalRooms)s",
             "message_search_section": "Пошук повідомлень",
             "message_search_sleep_time": "Як швидко повідомлення повинні завантажуватися.",
@@ -2972,6 +3063,7 @@
         "show_chat_effects": "Показувати ефекти бесід (анімації отримання, наприклад, конфеті)",
         "show_displayname_changes": "Показувати зміни псевдонімів",
         "show_join_leave": "Показувати повідомлення про приєднання/виходи (не стосується запрошень/вилучень/блокувань]",
+        "show_message_previews": "Показати попередній перегляд повідомлень",
         "show_nsfw_content": "Показати матеріали NSFW",
         "show_read_receipts": "Показувати мітки прочитання, надіслані іншими користувачами",
         "show_redaction_placeholder": "Показувати замісну позначку замість видалених повідомлень",
@@ -2994,7 +3086,12 @@
             "spaces_explainer": "Простір це спосіб групування кімнат та людей. Окрім просторів, які ви створюєте, ви також можете використовувати вже готові.",
             "title": "Бічна панель"
         },
-        "start_automatically": "Автозапуск при вході в систему",
+        "start_automatically": {
+            "disabled": "Ні",
+            "enabled": "Так",
+            "label": "Відкрийте %(brand)s після входу на комп'ютері.",
+            "minimised": "Згорнуто"
+        },
         "tac_only_notifications": "Показувати сповіщення лише в центрі діяльності в гілках",
         "use_12_hour_format": "Показувати час у 12-годинному форматі (напр. 2:30 пп)",
         "use_command_enter_send_message": "Натисніть Command + Enter, щоб надіслати повідомлення",
@@ -3078,6 +3175,8 @@
         "jumptodate": "Перейти до вказаної дати в стрічці",
         "jumptodate_invalid_input": "Не вдалося розпізнати вказану дату (%(inputDate)s). Спробуйте формат рррр-мм-дд.",
         "lenny": "Додає ( ͡° ͜ʖ ͡°) на початку текстового повідомлення",
+        "manual_device_verification_confirm_description": "Це дозволить іншому пристрою надсилати та отримувати повідомлення від вашого імені. ЯКЩО ХТОСЬ СКАЗАВ ВАМ ВСТАВИТИ ЩОСЬ СЮДИ, ЦІЛКОМ ІМОВІРНО, ВАС ОБМАНЮЮТЬ! Ви впевнені, що хочете верифікувати цей інший пристрій?",
+        "manual_device_verification_confirm_title": "Увага: ручна верифікація пристрою",
         "me": "Показ дій",
         "msg": "Надсилає повідомлення вказаному користувачеві",
         "myavatar": "Змінює зображення профілю в усіх кімнатах",
@@ -3118,6 +3217,7 @@
         "upgraderoom": "Поліпшує кімнату до нової версії",
         "upgraderoom_permission_error": "Вам бракує дозволу на використання цієї команди.",
         "usage": "Використання",
+        "verify": "Вручну верифікуйте один із власних пристроїв",
         "view": "Перегляд кімнати з вказаною адресою",
         "whois": "Показує відомості про користувача"
     },
@@ -3359,6 +3459,7 @@
             "unable_to_find": "Не вдалося знайти вказаної позиції в стрічці цієї кімнати."
         },
         "m.audio": {
+            "audio_player": "Звуковий програвач",
             "error_downloading_audio": "Помилка завантаження аудіо",
             "error_processing_audio": "Помилка обробки аудіоповідомлення",
             "error_processing_voice_message": "Помилка обробки голосового повідомлення",
@@ -3420,7 +3521,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "Завершує опитування",
             "sender_ended": "%(senderName)s завершує опитування"
         },
         "m.poll.start": "%(senderName)s починає опитування - %(pollQuestion)s",
@@ -3466,7 +3566,7 @@
             "unknown": "%(senderDisplayName)s змінює гостьовий доступ на \"%(rule)s\""
         },
         "m.room.history_visibility": {
-            "invited": "%(senderName)s робить майбутню історію кімнати видимою для всіх учасників з моменту, коли вони приєдналися.",
+            "invited": "%(senderName)s робить майбутню історію кімнати видимою для всіх учасників від часу їхнього приєднання.",
             "joined": "%(senderName)s робить майбутню історію кімнати видимою для всіх учасників від часу їхнього приєднання.",
             "shared": "%(senderName)s робить майбутню історію видимою для всіх учасників кімнати.",
             "unknown": "%(senderName)s робить майбутню історію видимою для невідомого значення (%(visibility)s).",
@@ -3623,12 +3723,14 @@
                 "one": "заблоковані"
             },
             "changed_avatar": {
-                "other": "%(oneUser)sзмінює своє зображення профілю %(count)s рази",
-                "one": "%(oneUser)sзмінюють зображення профілів"
+                "one": "%(oneUser)s змінює зображення профілю",
+                "few": "%(oneUser)s змінює зображення профілю %(count)s рази",
+                "many": "%(oneUser)s змінює зображення профілю %(count)s разів"
             },
             "changed_avatar_multiple": {
-                "other": "%(severalUsers)sзмінює своє зображення профілю %(count)s рази",
-                "one": "%(severalUsers)sзмінюють зображення профілів"
+                "one": "%(severalUsers)s змінює зображення профілю",
+                "few": "%(severalUsers)s змінюють зображення профілів %(count)s рази",
+                "many": "%(severalUsers)s змінюють зображення профілів %(count)s разів"
             },
             "changed_name": {
                 "one": "%(oneUser)sзмінює своє ім'я",
@@ -3664,20 +3766,24 @@
                 "other": "були запрошені %(count)s разів"
             },
             "joined": {
-                "one": "%(oneUser)sприєднується",
-                "other": "%(oneUser)sприєднується %(count)s разів"
+                "one": "%(oneUser)s приєднується",
+                "few": "%(oneUser)s приєднується %(count)s рази",
+                "many": "%(oneUser)s приєднується %(count)s разів"
             },
             "joined_and_left": {
-                "one": "%(oneUser)sприєднується й виходить",
-                "other": "%(oneUser)sприєднується й виходить %(count)s разів"
+                "one": "%(oneUser)s приєднується й виходить",
+                "few": "%(oneUser)s приєднується й виходить %(count)s рази",
+                "many": "%(oneUser)s приєднується й виходить %(count)s разів"
             },
             "joined_and_left_multiple": {
-                "other": "%(severalUsers)sприєдналися й вийшли %(count)s разів",
-                "one": "%(severalUsers)sприєдналися й вийшли"
+                "one": "%(severalUsers)s приєднуються й виходять",
+                "few": "%(severalUsers)s приєднуються й виходять %(count)s рази",
+                "many": "%(severalUsers)s приєднуються й виходять %(count)s разів"
             },
             "joined_multiple": {
-                "one": "%(severalUsers)sприєдналися",
-                "other": "%(severalUsers)sприєдналися %(count)s разів"
+                "one": "%(severalUsers)s приєднуються",
+                "few": "%(severalUsers)s приєднуються %(count)s рази",
+                "many": "%(severalUsers)s приєднуються %(count)s разів"
             },
             "kicked": {
                 "one": "було вилучено",
@@ -3688,8 +3794,9 @@
                 "other": "було вилучено %(count)s разів"
             },
             "left": {
-                "one": "%(oneUser)sвиходить",
-                "other": "%(oneUser)sвийшли %(count)s разів"
+                "one": "%(oneUser)s виходить",
+                "few": "%(oneUser)s виходить %(count)s рази",
+                "many": "%(oneUser)s виходить %(count)s разів"
             },
             "left_multiple": {
                 "one": "%(severalUsers)sвийшли",
@@ -3728,8 +3835,9 @@
                 "other": "%(severalUsers)s відхилили запрошення %(count)s разів"
             },
             "rejoined": {
-                "one": "%(oneUser)sвиходить і повертається",
-                "other": "%(oneUser)sвиходить і повертається %(count)s разів"
+                "one": "%(oneUser)s виходить і повертається",
+                "few": "%(oneUser)s виходить і повертається %(count)s рази",
+                "many": "%(oneUser)s виходить і повертається %(count)s разів"
             },
             "rejoined_multiple": {
                 "one": "%(severalUsers)sвиходять і повертаються",
@@ -3755,8 +3863,9 @@
         "thread_info_basic": "З гілки",
         "typing_indicator": {
             "more_users": {
-                "other": "%(names)s та ще %(count)s учасників пишуть…",
-                "one": "%(names)s та ще один учасник пишуть…"
+                "one": "%(names)s та ще хтось пишуть…",
+                "few": "%(names)s та ще %(count)s пишуть…",
+                "many": "%(names)s та ще %(count)s пишуть…"
             },
             "one_user": "%(displayName)s пише…",
             "two_users": "%(names)s та %(lastPerson)s пишуть…"
@@ -3771,7 +3880,9 @@
         }
     },
     "truncated_list_n_more": {
-        "other": "І ще %(count)s..."
+        "one": "",
+        "few": "І ще %(count)s…",
+        "many": "І ще %(count)s…"
     },
     "unsupported_browser": {
         "description": "Якщо ви продовжите, деякі функції можуть перестати працювати, і існує ризик втрати даних у майбутньому. Оновіть браузер, щоб продовжити користуватись %(brand)s.",
@@ -3919,12 +4030,12 @@
         "connection_lost": "Втрачено зʼєднання з сервером",
         "connection_lost_description": "Неможливо здійснювати виклики без з'єднання з сервером.",
         "consulting": "Консультація з %(transferTarget)s. <a>Переадресація на %(transferee)s</a>",
+        "decline_call": "Відхилити",
         "default_device": "Уставний пристрій",
         "dial": "Виклик",
         "dialpad": "Номеронабирач",
         "disable_camera": "Вимкнути камеру",
         "disable_microphone": "Вимкнути мікрофон",
-        "disabled_no_one_here": "Тут немає кого викликати",
         "disabled_no_perms_start_video_call": "У вас немає дозволу розпочинати відеовиклики",
         "disabled_no_perms_start_voice_call": "У вас немає дозволу розпочинати голосові виклики",
         "disabled_ongoing_call": "Поточний виклик",
@@ -3954,8 +4065,9 @@
         "msisdn_lookup_failed_description": "Сталася помилка під час пошуку номеру телефону",
         "msisdn_transfer_failed": "Не вдалося переадресувати виклик",
         "n_people_joined": {
-            "one": "%(count)s осіб приєдналися",
-            "other": "%(count)s людей приєдналися"
+            "one": "%(count)s особа приєднується",
+            "few": "%(count)s особи приєднуються",
+            "many": "%(count)s осіб приєднуються"
         },
         "no_audio_input_description": "Мікрофона не знайдено. Перевірте налаштування й повторіть спробу.",
         "no_audio_input_title": "Мікрофона не знайдено",
@@ -3971,6 +4083,7 @@
         "show_sidebar_button": "Показати бічну панель",
         "silence": "Тихий виклик",
         "silenced": "Сповіщення стишено",
+        "skip_lobby_toggle_option": "Приєднатися негайно",
         "start_screenshare": "Почати показ екрана",
         "stop_screenshare": "Вимкнути показ екрана",
         "too_many_calls": "Забагато викликів",
@@ -3991,9 +4104,12 @@
         "user_busy_description": "Користувач, якого ви викликаєте, зайнятий.",
         "user_is_presenting": "%(sharerName)s показує",
         "video_call": "Відеовиклик",
+        "video_call_incoming": "Вхідний відеовиклик",
         "video_call_started": "Відеовиклик розпочато",
         "video_call_using": "Відеодзвінок за допомогою:",
         "voice_call": "Голосовий виклик",
+        "voice_call_incoming": "Вхідний голосовий виклик",
+        "voice_call_using": "Голосовий виклик за допомогою:",
         "you_are_presenting": "Ви показуєте"
     },
     "web_default_device_name": "%(appName)s: %(browserName)s на %(osName)s",
diff --git a/src/i18n/strings/vi.json b/src/i18n/strings/vi.json
index a0c91663ff..2fedb71c84 100644
--- a/src/i18n/strings/vi.json
+++ b/src/i18n/strings/vi.json
@@ -1,6 +1,8 @@
 {
     "a11y": {
+        "emoji_picker": "Trình chọn biểu tượng cảm xúc",
         "jump_first_invite": "Chuyển đến lời mời đầu tiên.",
+        "message_composer": "Trình soạn tin nhắn",
         "n_unread_messages": {
             "one": "1 tin chưa đọc.",
             "other": "%(count)s tin nhắn chưa đọc."
@@ -145,6 +147,7 @@
         "enable_prompt": "Giúp cải thiện %(analyticsOwner)s",
         "learn_more": "Chia sẻ dữ liệu ẩn danh giúp chúng tôi xác định các sự cố. Không có thông tin cá nhân. Không có bên thứ ba. <LearnMoreLink>Tìm hiểu thêm</LearnMoreLink>",
         "privacy_policy": "Bạn có thể đọc tất cả các điều khoản của chúng tôi <PrivacyPolicyUrl>ở đây</PrivacyPolicyUrl>",
+        "pseudonymous_usage_data": "Giúp chúng tôi xác định các vấn đề và cải thiện%(analyticsOwner)s bằng cách chia sẻ dữ liệu sử dụng ẩn danh. Để hiểu cách mọi người sử dụng nhiều thiết bị, chúng tôi sẽ tạo một mã định danh ngẫu nhiên, được chia sẻ bởi các thiết bị của bạn.",
         "shared_data_heading": "Bất kỳ dữ liệu nào sau đây đều có thể được chia sẻ:"
     },
     "auth": {
@@ -210,8 +213,7 @@
             "setup_key_backup_title": "Bạn sẽ mất quyền truy cập vào các tin nhắn được mã hóa của mình",
             "setup_secure_backup_description_1": "Các tin nhắn được mã hóa được bảo mật bằng mã hóa đầu cuối. Chỉ bạn và (những) người nhận mới có chìa khóa để đọc những tin nhắn này.",
             "setup_secure_backup_description_2": "Khi bạn đăng xuất, các khóa sẽ được xóa khỏi thiết bị này, tức là bạn không thể đọc các tin nhắn được mã hóa trừ khi bạn có khóa cho chúng trong thiết bị khác, hoặc sao lưu chúng lên máy chủ.",
-            "skip_key_backup": "Tôi không muốn tin nhắn được mã hóa của mình",
-            "use_key_backup": "Bắt đầu sao lưu các khóa"
+            "skip_key_backup": "Tôi không muốn tin nhắn được mã hóa của mình"
         },
         "misconfigured_body": "Yêu cầu quản trị viên %(brand)s của bạn kiểm tra <a>your config</a> để tìm các mục nhập sai hoặc trùng lặp.",
         "misconfigured_title": "Hệ thống %(brand)s của bạn bị thiết lập sai",
@@ -384,6 +386,7 @@
         "beta": "Thử nghiệm",
         "camera": "Máy ảnh",
         "cameras": "Máy quay",
+        "capabilities": "Khả năng",
         "copied": "Đã sao chép!",
         "credits": "Ghi công",
         "dark": "Tối",
@@ -491,7 +494,6 @@
         "user": "Người dùng",
         "user_avatar": "Ảnh đại diện",
         "username": "Tên đăng nhập",
-        "verification_cancelled": "Đã hủy xác thực",
         "verified": "Đã xác thực",
         "version": "Phiên bản",
         "video": "Truyền hình",
@@ -641,6 +643,7 @@
         "developer_mode": "Chế độ nhà phát triển",
         "developer_tools": "Những công cụ phát triển",
         "edit_setting": "Chỉnh sửa cài đặt",
+        "edit_values": "Chỉnh sửa giá trị",
         "empty_string": "<chuỗi rỗng>",
         "event_content": "Nội dung sự kiện",
         "event_id": "Định danh (ID) sự kiện: %(eventId)s",
@@ -650,19 +653,36 @@
         "explore_room_account_data": "Xem thông tin tài khoản trong phòng",
         "explore_room_state": "Xem trạng thái phòng",
         "failed_to_find_widget": "Đã xảy ra lỗi khi tìm tiện ích widget này.",
+        "failed_to_load": "Không tải được.",
+        "failed_to_save": "Lưu cài đặt thất bại",
         "failed_to_send": "Không thể gửi sự kiện!",
+        "id": "ID: ",
         "invalid_json": "Không giống mã JSON hợp lệ.",
         "level": "Cấp độ",
         "low_bandwidth_mode": "Chế độ băng thông thấp",
         "low_bandwidth_mode_description": "Cần máy chủ nhà tương thích.",
+        "main_timeline": "Dòng thời gian chính",
+        "no_receipt_found": "Không tìm thấy biên lai",
+        "notification_state": "Trạng thái thông báo là <strong> %(notificationState)s </strong>",
         "notifications_debug": "Gỡ lỗi thông báo",
         "number_of_users": "Số người dùng",
         "original_event_source": "Nguồn sự kiện ban đầu",
         "room_encrypted": "Phòng <strong>được mã hóa ✅</strong>",
         "room_id": "Định danh phòng: %(roomId)s",
         "room_not_encrypted": "Phòng <strong>không được mã hóa 🚨</strong>",
+        "room_notifications_dot": "Dấu chấm: ",
+        "room_notifications_highlight": "Nổi bật: ",
+        "room_notifications_last_event": "Sự kiện cuối:",
+        "room_notifications_sender": "Người gửi: ",
+        "room_notifications_thread_id": "ID luồng: ",
+        "room_notifications_total": "Tổng: ",
+        "room_notifications_type": "Loại: ",
         "room_status": "Trạng thái phòng",
+        "room_unread_status_count": {
+            "other": "Trạng thái phòng chưa đọc: <strong>%(status)s</strong>, số lượng: <strong>%(count)s</strong>"
+        },
         "save_setting_values": "Lưu các giá trị cài đặt",
+        "see_history": "Xem lịch sử",
         "send_custom_account_data_event": "Gửi sự kiện tài khoản tùy chỉnh",
         "send_custom_room_account_data_event": "Gửi sự kiện tài khoản tùy chỉnh trong phòng",
         "send_custom_state_event": "Gửi sự kiện trạng thái tùy chỉnh",
@@ -677,10 +697,16 @@
         "settings_explorer": "Xem cài đặt",
         "show_hidden_events": "Hiện các sự kiện ẩn trong dòng thời gian",
         "state_key": "Chìa khóa trạng thái",
+        "thread_root_id": "ID luồng gốc: %(threadRootId)s",
+        "threads_timeline": "Dòng thời gian luồng",
         "title": "Công cụ phát triển",
         "toggle_event": "chuyển đổi sự kiện",
         "toolbox": "Hộp công cụ",
         "use_at_own_risk": "Giao diện người dùng này KHÔNG kiểm tra các loại giá trị. Sử dụng và hãy biết nguy cơ.",
+        "user_read_up_to": "Người dùng đọc lên tới: ",
+        "user_read_up_to_ignore_synthetic": "Người dùng đọc đến (ignoreSynthetic): ",
+        "user_read_up_to_private": "Người dùng đọc lên tới (m.read.private): ",
+        "user_read_up_to_private_ignore_synthetic": "Người dùng đọc lên tới (m.read.private; IgnoreSynthetic): ",
         "value": "Giá trị",
         "value_colon": "Giá trị:",
         "value_in_this_room": "Giá trị trong phòng này",
@@ -723,8 +749,6 @@
             "security_key_title": "Chìa khóa bảo mật"
         },
         "bootstrap_title": "Đang thiết lập khóa bảo mật",
-        "cancel_entering_passphrase_description": "Bạn có chắc chắn muốn hủy nhập cụm mật khẩu không?",
-        "cancel_entering_passphrase_title": "Hủy nhập cụm mật khẩu?",
         "confirm_encryption_setup_body": "Nhấp vào nút bên dưới để xác nhận thiết lập mã hóa.",
         "confirm_encryption_setup_title": "Xác nhận thiết lập mã hóa",
         "cross_signing_room_normal": "Phòng này được mã hóa end-to-end",
@@ -758,8 +782,6 @@
             "title": "Phương thức Khôi phục đã bị xóa",
             "warning": "Nếu bạn không xóa phương pháp khôi phục, kẻ tấn công có thể đang cố truy cập vào tài khoản của bạn. Thay đổi mật khẩu tài khoản của bạn và đặt phương pháp khôi phục mới ngay lập tức trong Cài đặt."
         },
-        "reset_all_button": "Quên hoặc mất tất cả các phương pháp khôi phục? Đặt lại tất cả <a>Reset all</a>",
-        "set_up_toast_description": "Bảo vệ chống mất quyền truy cập vào tin nhắn và dữ liệu được mã hóa",
         "set_up_toast_title": "Thiết lập Sao lưu Bảo mật",
         "setup_secure_backup": {
             "explainer": "Sao lưu chìa khóa của bạn trước khi đăng xuất để tránh mất chúng."
@@ -778,12 +800,8 @@
             "after_new_login": {
                 "device_verified": "Thiết bị được xác thực",
                 "skip_verification": "Bỏ qua xác thực ngay bây giờ",
-                "unable_to_verify": "Không thể xác thực thiết bị này",
                 "verify_this_device": "Xác thực thiết bị này"
             },
-            "cancelled": "Bạn đã hủy xác thực.",
-            "cancelled_self": "Bạn đã hủy xác thực trên thiết bị khác của bạn.",
-            "cancelled_user": "%(displayName)s đã hủy xác thực.",
             "cancelling": "Đang hủy…",
             "complete_action": "Hiểu rồi",
             "complete_description": "Bạn đã xác thực thành công người dùng này.",
@@ -798,45 +816,32 @@
             "incoming_sas_dialog_waiting": "Đang đợi bên kia xác nhận…",
             "incoming_sas_user_dialog_text_1": "Xác thực người dùng này để đánh dấu họ là đáng tin cậy. Người dùng đáng tin cậy giúp bạn yên tâm hơn khi sử dụng các tin nhắn được mã hóa end-to-end.",
             "incoming_sas_user_dialog_text_2": "Việc xác thực người dùng này sẽ đánh dấu phiên của họ là đáng tin cậy và cũng đánh dấu phiên của bạn là đáng tin cậy đối với họ.",
-            "no_key_or_device": "Có vẻ như bạn không có Khóa Bảo mật hoặc bất kỳ thiết bị nào bạn có thể xác thực. Thiết bị này sẽ không thể truy cập vào các tin nhắn mã hóa cũ. Để  xác minh danh tính của bạn trên thiết bị này, bạn sẽ cần đặt lại các khóa xác thực của mình.",
             "no_support_qr_emoji": "Thiết bị bạn đang cố xác thực không hỗ trợ quét mã QR hoặc xác minh biểu tượng cảm xúc, đó là những gì %(brand)s hỗ trợ. Hãy thử với một thiết bị đầu cuối khác.",
             "other_party_cancelled": "Người kia đã hủy xác thực.",
             "prompt_encrypted": "Xác thực tất cả người dùng trong một phòng để đảm bảo phòng đó an toàn.",
-            "prompt_self": "Bắt đầu xác thực lại từ thông báo.",
             "prompt_unencrypted": "Trong các phòng mã hóa, xác thực tất cả người dùng để đảm bảo an toàn.",
-            "prompt_user": "Bắt đầu xác thực lại từ hồ sơ của họ.",
             "qr_or_sas": "%(qrCode)s hay %(emojiCompare)s",
-            "qr_or_sas_header": "Xác thực thiết bị này bằng việc hoàn tất một trong các điều sau:",
             "qr_prompt": "Quét mã duy nhất này",
-            "qr_reciprocate_same_shield_device": "Sắp xong rồi! Có phải thiết bị khác của bạn hiển thị cùng một lá chắn không?",
             "qr_reciprocate_same_shield_user": "Sắp xong rồi! %(displayName)s có hiển thị cùng một lá chắn không?",
-            "request_toast_accept": "Xác thực phiên",
             "request_toast_decline_counter": "Ẩn (%(counter)s)",
             "request_toast_detail": "%(deviceId)s từ %(ip)s",
-            "reset_proceed_prompt": "Tiến hành đặt lại",
             "sas_caption_self": "Xác thực thiết bị này bằng việc xác nhận số sau đây xuất hiện trên màn hình của nó.",
             "sas_caption_user": "Xác thực người dùng này bằng cách xác nhận số xuất hiện trên màn hình của họ.",
             "sas_description": "So sánh một bộ biểu tượng cảm xúc độc đáo nếu bạn không có camera trên một trong hai thiết bị",
-            "sas_emoji_caption_self": "Xác nhận biểu tượng cảm xúc bên dưới được hiển thị trên cả hai thiết bị, theo cùng một thứ tự:",
             "sas_emoji_caption_user": "Xác thực người dùng này bằng cách xác nhận biểu tượng cảm xúc sau xuất hiện trên màn hình của họ.",
             "sas_match": "Chúng phù hợp",
             "sas_no_match": "Chúng không phù hợp",
             "sas_prompt": "So sánh biểu tượng cảm xúc độc đáo",
             "scan_qr": "Xác thực bằng cách quét",
             "scan_qr_explainer": "Yêu cầu %(displayName)s quét mã của bạn:",
-            "self_verification_hint": "Để tiến hành, vui lòng chấp nhận yêu cầu xác thực trên thiết bị khác của bạn.",
             "start_button": "Bắt đầu xác thực",
-            "successful_device": "Bạn đã xác minh thành công %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "Bạn đã xác minh thành công thiết bị của mình!",
             "successful_user": "Bạn đã xác thực thành công %(displayName)s!",
-            "timed_out": "Đã hết thời gian xác thực.",
             "unsupported_method": "Không thấy phương pháp xác thực nào được hỗ trợ.",
             "unverified_session_toast_accept": "Đó là tôi",
             "unverified_session_toast_title": "Đăng nhập mới. Đây có phải là bạn không?",
             "unverified_sessions_toast_description": "Xem lại để đảm bảo tài khoản của bạn an toàn",
             "unverified_sessions_toast_reject": "Để sau",
             "unverified_sessions_toast_title": "Bạn có các phiên chưa được xác thực",
-            "verification_description": "Xác thực danh tính của bạn để truy cập các tin nhắn được mã hóa và chứng minh danh tính của bạn với người khác.",
             "verification_dialog_title_device": "Xác thực thiết bị khác",
             "verification_dialog_title_user": "Yêu cầu xác thực",
             "verification_skip_warning": "Nếu không xác thực, bạn sẽ không thể truy cập vào tất cả tin nhắn của bạn và có thể hiển thị là không đáng tin cậy với những người khác.",
@@ -846,9 +851,6 @@
             "verify_emoji_prompt": "Xác thực bằng cách so sánh biểu tượng cảm xúc độc đáo.",
             "verify_emoji_prompt_qr": "Nếu bạn không thể quét mã ở trên, hãy xác thực bằng cách so sánh biểu tượng cảm xúc duy nhất.",
             "verify_later": "Tôi sẽ xác thực sau",
-            "verify_using_device": "Xác thực bằng thiết bị khác",
-            "verify_using_key": "Xác thực bằng Khóa Bảo mật",
-            "verify_using_key_or_phrase": "Xác thực bằng Khóa hoặc Chuỗi Bảo mật",
             "waiting_for_user_accept": "Đang chờ %(displayName)s chấp nhận…",
             "waiting_other_device": "Đang chờ bạn xác thực trên thiết bị khác của bạn…",
             "waiting_other_device_details": "Đang chờ bạn xác thực trên thiết bị khác của bạn, %(deviceName)s (%(deviceId)s)…",
@@ -923,10 +925,13 @@
             "user": "%(senderName)s đã bắt đầu một cuộc gọi",
             "you": "Bạn bắt đầu một cuộc gọi"
         },
+        "m.emote": "* %(senderName)s %(emote)s",
         "m.reaction": {
             "user": "%(sender)s phản ứng %(reaction)s với %(message)s",
             "you": "Bạn phản ứng %(reaction)s với %(message)s"
-        }
+        },
+        "m.sticker": "%(senderName)s: %(stickerName)s",
+        "m.text": "%(senderName)s: %(message)s"
     },
     "export_chat": {
         "cancelled": "Đã hủy trích xuất",
@@ -962,6 +967,7 @@
         "format": "Định dạng",
         "from_the_beginning": "Ngày từ đầu",
         "generating_zip": "Tạo ZIP",
+        "html": "HTML",
         "html_title": "Dữ liệu được trích xuất",
         "include_attachments": "Bao gồm các đính kèm",
         "json": "JSON",
@@ -1182,7 +1188,6 @@
         "upload_file": "Tải lên một tài liệu"
     },
     "labs": {
-        "allow_screen_share_only_mode": "Cho phép chế độ chỉ-chia sẻ màn hình",
         "ask_to_join": "Bật yêu cầu để tham gia",
         "automatic_debug_logs": "Tự động gửi debug log khi có bất kỳ lỗi nào",
         "automatic_debug_logs_decryption": "Tự động gửi nhật ký gỡ lỗi mỗi lúc gặp lỗi khi giải mã",
@@ -1318,8 +1323,7 @@
     },
     "member_list": {
         "filter_placeholder": "Lọc thành viên phòng",
-        "invite_button_no_perms_tooltip": "Bạn không có quyền mời người khác",
-        "power_label": "%(userName)s (chỉ số %(powerLevelNumber)s)"
+        "invite_button_no_perms_tooltip": "Bạn không có quyền mời người khác"
     },
     "member_list_back_action_label": "Thành viên phòng",
     "message_edit_dialog_title": "Chỉnh sửa tin nhắn",
@@ -1581,8 +1585,6 @@
             "send_message_start_dm": "Gửi tin nhắn đầu tiên để mời <displayName/> vào cuộc trò chuyện",
             "start_of_dm_history": "Đây là phần bắt đầu của lịch sử tin nhắn trực tiếp của bạn với <displayName/>.",
             "start_of_room": "Đây là phần bắt đầu của <roomName/>.",
-            "topic": "Chủ đề: %(topic)s ",
-            "topic_edit": "Chủ đề: %(topic)s (<a>edit</a>)",
             "unencrypted_warning": "Mã hóa đầu-cuối chưa được bật",
             "user_created": "%(displayName)s đã tạo phòng này.",
             "you_created": "Bạn đã tạo phòng này."
@@ -1912,7 +1914,6 @@
             "error_update_guest_access": "Không cập nhật được quyền truy cập của khách vào space này",
             "error_update_history_visibility": "Không cập nhật được chế độ hiển thị lịch sử của space này",
             "guest_access_explainer": "Khách có thể tham gia space mà không cần có tài khoản.",
-            "guest_access_explainer_public_space": "Điều này có thể hữu ích cho space công cộng.",
             "guest_access_label": "Bật quyền truy cập của khách",
             "history_visibility_anyone_space": "Xem trước space",
             "history_visibility_anyone_space_description": "Cho phép mọi người xem trước space của bạn trước khi tham gia.",
@@ -2029,7 +2030,9 @@
             "deactivate_confirm_content_3": "Không ai có thể dùng lại tên người dùng của bạn (MXID), kể cả bạn: tên người dùng này sẽ trở thành không có sẵn",
             "deactivate_confirm_content_4": "Bạn sẽ rời tất cả phòng và tin nhắn trực tiếp mà bạn đã tham gia",
             "deactivate_confirm_content_5": "Bạn sẽ bị xóa khỏi máy chủ định danh: bạn bè của bạn sẽ không tìm thấy bạn bằng địa chỉ thư điện tử hay số điện thoại",
+            "deactivate_confirm_content_6": "Tin nhắn cũ của bạn vẫn sẽ hiển thị với những người đã nhận được chúng, giống như email bạn đã gửi trước đây. Bạn có muốn ẩn tin nhắn đã gửi của mình khỏi những người tham gia phòng trong tương lai không?",
             "deactivate_confirm_continue": "Xác nhận việc hủy kích hoạt tài khoản",
+            "deactivate_confirm_erase_label": "Ẩn tin nhắn của tôi với những người tham gia sau",
             "deactivate_section": "Hủy kích hoạt Tài khoản",
             "deactivate_warning": "Vô hiệu hóa tài khoản của bạn là vĩnh viễn — hãy cẩn trọng!",
             "discovery_email_empty": "Tùy chọn khám phá sẽ xuất hiện khi nào bạn đã thêm địa chỉ thư điện tử.",
@@ -2079,10 +2082,6 @@
         "insert_trailing_colon_mentions": "Chèn dấu hai chấm phía sau các đề cập người dùng ở đầu một tin nhắn",
         "jump_to_bottom_on_send": "Chuyển đến cuối dòng thời gian khi bạn gửi tin nhắn",
         "key_backup": {
-            "backup_in_progress": "Các khóa của bạn đang được sao lưu (bản sao lưu đầu tiên có thể mất vài phút).",
-            "backup_success": "Thành công!",
-            "cannot_create_backup": "Không thể tạo bản sao lưu khóa",
-            "create_title": "Tạo bản sao lưu chính",
             "setup_secure_backup": {
                 "backup_setup_success_title": "Sao lưu bảo mật thành công",
                 "cancel_warning": "Nếu bạn hủy ngay bây giờ, bạn có thể mất tin nhắn và dữ liệu được mã hóa nếu bạn mất quyền truy cập vào thông tin đăng nhập của mình.",
@@ -2124,6 +2123,9 @@
         },
         "notifications": {
             "default_setting_description": "Cài đặt này sẽ được áp dụng theo mặc định cho các tất cả các phòng của bạn.",
+            "email_description": "Nhận email tóm tắt các thông báo bị bỏ lỡ",
+            "email_section": "Tóm tắt email",
+            "email_select": "Chọn email bạn muốn gửi tóm tắt đến. Quản lý email của bạn trong<button> Tổng quan</button> .",
             "enable_audible_notifications_session": "Bật thông báo âm thanh cho phiên này",
             "enable_desktop_notifications_session": "Bật thông báo trên màn hình cho phiên này",
             "enable_email_notifications": "Bật thông báo qua thư điện tử cho %(email)s",
@@ -2193,7 +2195,6 @@
             "ignore_users_empty": "Bạn không có người dùng bị bỏ qua.",
             "ignore_users_section": "Người dùng bị bỏ qua",
             "key_backup_algorithm": "Thuật toán:",
-            "key_backup_connect": "Kết nối phiên này với Khóa Sao lưu",
             "message_search_disable_warning": "Nếu bị tắt, tin nhắn từ các phòng được mã hóa sẽ không xuất hiện trong kết quả tìm kiếm.",
             "message_search_disabled": "Bộ nhớ cache an toàn các tin nhắn được mã hóa cục bộ để chúng xuất hiện trong kết quả tìm kiếm.",
             "message_search_enabled": {
@@ -2334,7 +2335,6 @@
             "metaspaces_subsection": "Space để hiển thị",
             "title": "Thanh bên"
         },
-        "start_automatically": "Tự động khởi động sau khi đăng nhập hệ thống",
         "use_12_hour_format": "Hiển thị thời gian theo mẫu 12 giờ (ví dụ 2:30pm)",
         "use_command_enter_send_message": "Sử dụng Command + Enter để gửi tin nhắn",
         "use_command_f_search": "Sử dụng Command + F để tìm kiếm dòng thời gian",
@@ -2449,6 +2449,7 @@
         "upgraderoom": "Nâng cấp phòng lên phiên bản mới",
         "upgraderoom_permission_error": "Bạn không có quyền để dùng lệnh này.",
         "usage": "Cách sử dụng",
+        "verify": "Xác thực người dùng, thiết bị và tuple pubkey",
         "view": "Phòng truyền hình với địa chỉ đã cho",
         "whois": "Hiển thị thông tin về người dùng"
     },
@@ -2614,9 +2615,13 @@
         "n_hours_ago": "%(num)s giờ trước",
         "n_minutes_ago": "%(num)s phút trước",
         "seconds_left": "Còn %(seconds)s giây",
+        "short_days": "%(value)sngày",
         "short_days_hours_minutes_seconds": "%(days)s ngày %(hours)s giờ %(minutes)s phút %(seconds)s giây",
+        "short_hours": "%(value)sgiờ",
         "short_hours_minutes_seconds": "%(hours)s giờ %(minutes)s phút %(seconds)s giây",
-        "short_minutes_seconds": "%(minutes)s phút %(seconds)s giây"
+        "short_minutes": "%(value)sphút",
+        "short_minutes_seconds": "%(minutes)s phút %(seconds)s giây",
+        "short_seconds": "%(value)sgiây"
     },
     "timeline": {
         "context_menu": {
@@ -2893,6 +2898,9 @@
                 "one": "đã bị cấm",
                 "other": "đã bị cấm %(count)s lần"
             },
+            "changed_avatar": {
+                "other": "%(oneUser)sđã thay đổi ảnh đại diện của họ%(count)s lần"
+            },
             "changed_name": {
                 "one": "%(oneUser)s đã thay đổi tên của họ",
                 "other": "%(oneUser)s đã thay đổi tên của họ %(count)s lần"
@@ -2901,6 +2909,7 @@
                 "one": "%(severalUsers)s đã thay đổi tên của họ",
                 "other": "%(severalUsers)s đã thay đổi tên của họ %(count)s lần"
             },
+            "format": "%(nameList)s%(transitionList)s",
             "hidden_event": {
                 "other": "%(oneUser)sgửi %(count)s tin nhắn ẩn",
                 "one": "%(oneUser)sgửi một tin nhắn ẩn"
@@ -3151,7 +3160,6 @@
         "dialpad": "Bàn phím số",
         "disable_camera": "Tắt máy ghi hình",
         "disable_microphone": "Tắt âm micrô",
-        "disabled_no_one_here": "Không có ai ở đây để gọi",
         "disabled_no_perms_start_video_call": "Bạn không có quyền để bắt đầu cuộc gọi truyền hình",
         "disabled_no_perms_start_voice_call": "Bạn không có quyền để bắt đầu cuộc gọi",
         "disabled_ongoing_call": "Cuộc gọi hiện thời",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 43e1ac008c..489e56ca53 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -216,8 +216,7 @@
             "setup_key_backup_title": "你将失去你的加密消息的访问权",
             "setup_secure_backup_description_1": "加密消息已使用端到端加密保护。只有你和拥有密钥的收件人可以阅读这些消息。",
             "setup_secure_backup_description_2": "当你登出时，这些密钥会从此设备删除。这意味着你将无法查阅已加密消息，除非你在其他设备上有那些消息的密钥，或者已将其备份到服务器。",
-            "skip_key_backup": "我不想要我的加密消息",
-            "use_key_backup": "开始使用密钥备份"
+            "skip_key_backup": "我不想要我的加密消息"
         },
         "misconfigured_body": "跟你的%(brand)s管理员确认<a>你的配置</a>不正确或重复的条目。",
         "misconfigured_title": "你的 %(brand)s 配置有错误",
@@ -507,7 +506,6 @@
         "user": "用户",
         "user_avatar": "头像",
         "username": "用户名",
-        "verification_cancelled": "验证已取消",
         "verified": "已验证",
         "version": "版本",
         "video": "视频",
@@ -733,8 +731,6 @@
             "security_key_title": "安全密钥"
         },
         "bootstrap_title": "设置密钥",
-        "cancel_entering_passphrase_description": "你确定要取消输入口令词组吗？",
-        "cancel_entering_passphrase_title": "取消输入口令词组？",
         "confirm_encryption_setup_body": "点击下方按钮以确认设置加密。",
         "confirm_encryption_setup_title": "确认加密设置",
         "cross_signing_room_normal": "此房间是端到端加密的",
@@ -768,8 +764,6 @@
             "title": "恢复方式已移除",
             "warning": "如果你没有移除此恢复方式，可能有攻击者正试图侵入你的账户。请立即更改你的账户密码并在设置中设定一个新的恢复方式。"
         },
-        "reset_all_button": "忘记或丢失了所有恢复方式？<a>全部重置</a>",
-        "set_up_toast_description": "防止丢失加密消息和数据的访问权",
         "set_up_toast_title": "设置安全备份",
         "setup_secure_backup": {
             "explainer": "在登出之前请备份密钥以免丢失。"
@@ -788,12 +782,8 @@
             "after_new_login": {
                 "device_verified": "设备已验证",
                 "skip_verification": "暂时跳过验证",
-                "unable_to_verify": "无法验证此设备",
                 "verify_this_device": "验证此设备"
             },
-            "cancelled": "你取消了验证。",
-            "cancelled_self": "你在其他设备上取消了验证。",
-            "cancelled_user": "%(displayName)s 取消了验证。",
             "cancelling": "正在取消……",
             "complete_action": "收到",
             "complete_description": "你已成功验证此用户。",
@@ -805,42 +795,30 @@
             "incoming_sas_dialog_title": "收到验证请求",
             "incoming_sas_user_dialog_text_1": "验证此用户并将其标记为已信任。在收发端到端加密消息时，信任用户可让你更加放心。",
             "incoming_sas_user_dialog_text_2": "验证此用户会将其会话标记为已信任，与此同时，你的会话也会被此用户标记为已信任。",
-            "no_key_or_device": "看起来你没有安全密钥或者任何其他可以验证的设备。 此设备将无法访问旧的加密消息。为了在这个设备上验证你的身份，你需要重置你的验证密钥。",
             "no_support_qr_emoji": "你正在尝试验证的设备不支持扫码QR码或表情符号验证，这是%(brand)s所支持的。用不同的客户端试试。",
             "other_party_cancelled": "另一方取消了验证。",
             "prompt_encrypted": "验证房间中所有用户以确保其安全。",
-            "prompt_self": "请从提示重新开始验证。",
             "prompt_unencrypted": "在加密房间中，验证所有用户以确保其安全。",
-            "prompt_user": "请从对方资料重新开始验证。",
             "qr_or_sas": "%(qrCode)s或%(emojiCompare)s",
-            "qr_or_sas_header": "完成以下操作之一来验证此设备：",
             "qr_prompt": "扫描此唯一代码",
-            "qr_reciprocate_same_shield_device": "快完成了！你的其他设备显示相同盾牌吗？",
             "qr_reciprocate_same_shield_user": "快完成了！%(displayName)s 显示了同样的盾牌吗？",
             "request_toast_detail": "来自 %(ip)s 的 %(deviceId)s",
-            "reset_proceed_prompt": "进行重置",
             "sas_caption_self": "确认屏幕上出现以下数字，以验证设备。",
             "sas_caption_user": "通过在其屏幕上显示以下数字来验证此用户。",
             "sas_description": "若你在两个设备上都没有相机，比较唯一一组表情符号",
-            "sas_emoji_caption_self": "确认下面的表情符号在两个设备上以相同顺序显示：",
             "sas_emoji_caption_user": "通过在其屏幕上显示以下表情符号来验证此用户。",
             "sas_match": "它们匹配",
             "sas_no_match": "它们不匹配",
             "sas_prompt": "比较唯一表情符号",
             "scan_qr": "扫码验证",
             "scan_qr_explainer": "请 %(displayName)s 扫描你的代码：",
-            "self_verification_hint": "要继续进行，请接受你另一设备上的验证请求。",
             "start_button": "开始验证",
-            "successful_device": "你成功验证了 %(deviceName)s （%(deviceId)s）！",
-            "successful_own_device": "你成功验证了你的设备！",
             "successful_user": "你成功验证了 %(displayName)s！",
-            "timed_out": "验证超时。",
             "unsupported_method": "无法找到支持的验证方法。",
             "unverified_session_toast_title": "现在登录。请问是你本人吗？",
             "unverified_sessions_toast_description": "检查以确保你的账户是安全的",
             "unverified_sessions_toast_reject": "稍后再说",
             "unverified_sessions_toast_title": "你有未验证的会话",
-            "verification_description": "验证你的身份来获取已加密的消息并向其他人证明你的身份。",
             "verification_dialog_title_device": "验证其他设备",
             "verification_dialog_title_user": "验证请求",
             "verification_skip_warning": "如果不进行验证，您将无法访问您的所有消息，并且在其他人看来可能不受信任。",
@@ -850,9 +828,6 @@
             "verify_emoji_prompt": "通过比较唯一的表情符号来验证。",
             "verify_emoji_prompt_qr": "如果你不能扫描以上代码，请通过比较唯一的表情符号来验证。",
             "verify_later": "我稍后进行验证",
-            "verify_using_device": "使用其他设备进行验证",
-            "verify_using_key": "使用安全密钥进行验证",
-            "verify_using_key_or_phrase": "使用安全密钥或短语进行验证",
             "waiting_for_user_accept": "正在等待%(displayName)s接受……",
             "waiting_other_device": "正等待你在其它设备上验证……",
             "waiting_other_device_details": "正等待你在其它设备上验证，%(deviceName)s（%(deviceId)s）……",
@@ -1185,7 +1160,6 @@
         "upload_file": "上传文件"
     },
     "labs": {
-        "allow_screen_share_only_mode": "允许 “仅限屏幕共享” 模式",
         "ask_to_join": "启用 “需要验证加入请求”",
         "automatic_debug_logs": "遇到任何错误自动发送调试日志",
         "automatic_debug_logs_decryption": "自动发送有关解密错误的debug日志",
@@ -1341,8 +1315,7 @@
         "toggle_attribution": "切换属性"
     },
     "member_list": {
-        "filter_placeholder": "过滤房间成员",
-        "power_label": "%(userName)s（权力 %(powerLevelNumber)s）"
+        "filter_placeholder": "过滤房间成员"
     },
     "member_list_back_action_label": "房间成员",
     "message_edit_dialog_title": "消息编辑历史",
@@ -1598,8 +1571,6 @@
             "send_message_start_dm": "发送你的第一条消息邀请<displayName/>来聊天",
             "start_of_dm_history": "这是你与<displayName/>的私聊历史的开端。",
             "start_of_room": "这里是 <roomName/> 的开始。",
-            "topic": "话题：%(topic)s ",
-            "topic_edit": "话题：%(topic)s（<a>编辑</a>）",
             "unencrypted_warning": "未启用端到端加密",
             "user_created": "%(displayName)s 创建了此房间。",
             "you_created": "你创建了此房间。"
@@ -1924,7 +1895,6 @@
             "error_update_guest_access": "更新此空间的游客访问权限失败",
             "error_update_history_visibility": "更新此空间的历史记录可见性失败",
             "guest_access_explainer": "游客无需账户即可加入空间。",
-            "guest_access_explainer_public_space": "这可能对公开空间有所帮助。",
             "guest_access_label": "启用游客访问权限",
             "history_visibility_anyone_space": "预览空间",
             "history_visibility_anyone_space_description": "允许人们在加入前预览你的空间。",
@@ -2081,10 +2051,6 @@
         "insert_trailing_colon_mentions": "在消息开头的提及用户的地方后面插入尾随冒号",
         "jump_to_bottom_on_send": "发送消息时跳转到时间线底部",
         "key_backup": {
-            "backup_in_progress": "正在备份你的密钥（第一次备份可能会花费几分钟时间）。",
-            "backup_success": "成功！",
-            "cannot_create_backup": "无法创建密钥备份",
-            "create_title": "创建密钥备份",
             "setup_secure_backup": {
                 "cancel_warning": "如果你现在取消，你可能会丢失加密的消息和数据，如果你丢失了登录信息的话。",
                 "confirm_security_phrase": "确认你的安全短语",
@@ -2184,7 +2150,6 @@
             "ignore_users_empty": "你没有设置忽略用户。",
             "ignore_users_section": "已忽略的用户",
             "key_backup_algorithm": "算法：",
-            "key_backup_connect": "将此会话连接到密钥备份",
             "message_search_disable_warning": "如果被禁用，加密房间内的消息不会显示在搜索结果中。",
             "message_search_disabled": "在本地安全地缓存加密消息以使其出现在搜索结果中。",
             "message_search_enabled": {
@@ -2284,7 +2249,6 @@
             "metaspaces_subsection": "要显示的空间",
             "title": "侧边栏"
         },
-        "start_automatically": "开机自启",
         "use_12_hour_format": "使用 12 小时制显示时间戳 （下午 2:30）",
         "use_command_enter_send_message": "使用 Command + Enter 发送消息",
         "use_command_f_search": "使用 Command + F 搜索时间线",
@@ -2400,6 +2364,7 @@
         "upgraderoom": "将房间升级到新版本",
         "upgraderoom_permission_error": "你没有权限使用此命令。",
         "usage": "用法",
+        "verify": "验证用户、会话和公钥元组",
         "whois": "显示关于用户的信息"
     },
     "space": {
@@ -3121,7 +3086,6 @@
         "dialpad": "拨号盘",
         "disable_camera": "关闭相机",
         "disable_microphone": "静音麦克风",
-        "disabled_no_one_here": "这里没有人可以打电话",
         "disabled_no_perms_start_video_call": "你没有权限开始视频通话",
         "disabled_no_perms_start_voice_call": "你没有权限开始语音通话",
         "disabled_ongoing_call": "正在进行的通话",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 18cc169d97..5094d81d18 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1,5 +1,6 @@
 {
     "a11y": {
+        "emoji_picker": "Emoji 選擇器",
         "jump_first_invite": "跳到第一個邀請。",
         "n_unread_messages": {
             "other": "%(count)s 則未讀訊息。",
@@ -40,6 +41,8 @@
         "create_a_room": "建立聊天室",
         "create_account": "建立帳號",
         "decline": "拒絕",
+        "decline_and_block": "拒絕並封鎖",
+        "decline_invite": "拒絕邀請",
         "delete": "刪除",
         "deny": "拒絕",
         "disable": "停用",
@@ -59,6 +62,7 @@
         "go": "前往",
         "go_back": "返回",
         "got_it": "了解",
+        "hide": "隱藏",
         "hide_advanced": "隱藏進階設定",
         "hold": "保留",
         "ignore": "忽略",
@@ -215,8 +219,7 @@
             "setup_key_backup_title": "您將會失去您的加密訊息",
             "setup_secure_backup_description_1": "加密訊息是使用端對端加密。只有您和接收者才有金鑰可以閱讀這些訊息。",
             "setup_secure_backup_description_2": "當您登出時，這些金鑰將會從此裝置被刪除，這代表您將無法再閱讀加密的訊息，除非您在其他裝置上有那些訊息的金鑰，或是將它們備份到伺服器上。",
-            "skip_key_backup": "我不要我的加密訊息了",
-            "use_key_backup": "開始使用金鑰備份"
+            "skip_key_backup": "我不要我的加密訊息了"
         },
         "misconfigured_body": "請要求您的 %(brand)s 管理員檢查<a>您的設定</a>是否有不正確或重覆的項目。",
         "misconfigured_title": "您的 %(brand)s 沒有設定好",
@@ -363,6 +366,9 @@
         "download_logs": "下載紀錄檔",
         "downloading_logs": "正在下載紀錄檔",
         "error_empty": "請告訴我們發生了什麼錯誤，或更好的是，在 GitHub 上建立描述問題的議題。",
+        "failed_send_logs_causes": {
+            "rejected_recovery_key": "您的錯誤報告因安全考量而遭駁回，因為包含復原金鑰。"
+        },
         "github_issue": "GitHub 議題",
         "introduction": "若您透過 GitHub 遞交錯誤，除錯紀錄檔可以協助我們追蹤問題。 ",
         "log_request": "要協助我們讓這個問題不再發生，請<a>將紀錄檔傳送給我們</a>。",
@@ -523,7 +529,6 @@
         "user": "使用者",
         "user_avatar": "大頭照",
         "username": "使用者名稱",
-        "verification_cancelled": "驗證已取消",
         "verified": "已驗證",
         "version": "版本",
         "video": "影片",
@@ -678,6 +683,9 @@
         "category_room": "聊天室",
         "caution_colon": "警告：",
         "client_versions": "客戶端版本",
+        "crypto": {
+            "key_storage": "金鑰儲存"
+        },
         "developer_mode": "開發者模式",
         "developer_tools": "開發者工具",
         "edit_setting": "編輯設定",
@@ -788,11 +796,10 @@
                 "wrong_security_key": "錯誤的安全金鑰"
             },
             "restoring": "從備份還原金鑰",
+            "security_key_label": "復原金鑰",
             "security_key_title": "安全金鑰"
         },
         "bootstrap_title": "正在產生金鑰",
-        "cancel_entering_passphrase_description": "您確定要取消輸入安全密語嗎？",
-        "cancel_entering_passphrase_title": "取消輸入安全密語？",
         "confirm_encryption_setup_body": "點擊下方按鈕以確認設定加密。",
         "confirm_encryption_setup_title": "確認加密設定",
         "cross_signing_room_normal": "此聊天室已端對端加密",
@@ -801,11 +808,14 @@
         "cross_signing_user_normal": "您尚未驗證此使用者。",
         "cross_signing_user_verified": "您已驗證此使用者。此使用者已驗證他們所有的工作階段。",
         "cross_signing_user_warning": "此使用者尚未驗證他們的所有工作階段。",
+        "enter_recovery_key": "輸入復原金鑰",
         "event_shield_reason_authenticity_not_guaranteed": "無法在此裝置上保證加密訊息的真實性。",
         "event_shield_reason_mismatched_sender_key": "已由未驗證的工作階段加密",
         "export_unsupported": "您的瀏覽器不支援需要的加密擴充",
+        "forgot_recovery_key": "忘記復原金鑰？",
         "import_invalid_keyfile": "不是有效的 %(brand)s 金鑰檔案",
         "import_invalid_passphrase": "無法檢查認證：密碼錯誤？",
+        "key_storage_out_of_sync_description": "請確認您的復原金鑰，以維持對金鑰儲存空間及訊息歷史的存取權限。",
         "messages_not_secure": {
             "cause_1": "您的家伺服器",
             "cause_2": "您正在驗證的使用者所連線的家伺服器",
@@ -826,12 +836,13 @@
             "title": "已移除復原方法",
             "warning": "如果您沒有移除復原方法，攻擊者可能會試圖存取您的帳號。請立刻在設定中變更您帳號的密碼並設定新的復原方式。"
         },
-        "reset_all_button": "忘記或遺失了所有復原方法？<a>重設全部</a>",
-        "set_up_toast_description": "避免失去對加密訊息與資料的存取權",
+        "set_up_recovery": "設定復原",
+        "set_up_recovery_toast_description": "產生一把復原金鑰，以便在您無法存取裝置時恢復您的加密訊息歷史記錄。",
         "set_up_toast_title": "設定安全備份",
         "setup_secure_backup": {
             "explainer": "請在登出前備份您的金鑰，以免遺失。"
         },
+        "turn_on_key_storage_description": "在伺服器安全地儲存您的加密身分及訊息金鑰。如此一來，您便能在任何新裝置上檢視訊息歷史紀錄。",
         "udd": {
             "interactive_verification_button": "透過表情符號互動來驗證",
             "other_ask_verify_text": "要求此使用者驗證他們的工作階段，或在下方手動驗證。",
@@ -846,12 +857,8 @@
             "after_new_login": {
                 "device_verified": "裝置已驗證",
                 "skip_verification": "暫時略過驗證",
-                "unable_to_verify": "無法驗證此裝置",
                 "verify_this_device": "驗證此裝置"
             },
-            "cancelled": "您取消了驗證。",
-            "cancelled_self": "您在其他裝置上取消了驗證。",
-            "cancelled_user": "%(displayName)s 取消驗證。",
             "cancelling": "正在取消…",
             "complete_action": "了解",
             "complete_description": "您已經成功驗證此使用者。",
@@ -866,45 +873,33 @@
             "incoming_sas_dialog_waiting": "正在等待夥伴確認…",
             "incoming_sas_user_dialog_text_1": "驗證此工作階段，並標記為可受信任。由您將工作階段標記為可受信任後，可讓聊天夥伴傳送端到端加密訊息時能更加放心。",
             "incoming_sas_user_dialog_text_2": "驗證此使用者將會把他們的工作階段標記為受信任，並同時為他們標記您的工作階段為可信任。",
-            "no_key_or_device": "您似乎沒有安全金鑰或其他可以驗證的裝置。此裝置將無法存取舊的加密訊息。為了在此裝置上驗證您的身分，您必須重設您的驗證金鑰。",
             "no_support_qr_emoji": "您正在嘗試驗證的裝置不支援掃描 QR Code 或表情符號驗證，這是 %(brand)s 所支援的。請嘗試使用其他客戶端。",
             "other_party_cancelled": "另一方取消了驗證。",
             "prompt_encrypted": "請驗證聊天室中的所有使用者來確保安全。",
-            "prompt_self": "從通知再次開始驗證。",
             "prompt_unencrypted": "在加密的聊天適中，驗證所有使用者以確保其安全。",
-            "prompt_user": "從他們的個人簡介再次開始驗證。",
             "qr_or_sas": "%(qrCode)s 或 %(emojiCompare)s",
-            "qr_or_sas_header": "透過完成以下的任何一個操作來驗證此裝置：",
             "qr_prompt": "掃描此獨特的條碼",
-            "qr_reciprocate_same_shield_device": "快好了！您的其他裝置是否顯示了相同的盾牌？",
             "qr_reciprocate_same_shield_user": "差不多了！%(displayName)s 是否顯示相同的盾牌？",
-            "request_toast_accept": "驗證工作階段",
             "request_toast_decline_counter": "忽略（%(counter)s）",
             "request_toast_detail": "從 %(ip)s 來的 %(deviceId)s",
-            "reset_proceed_prompt": "繼續重設",
             "sas_caption_self": "透過確認螢幕上顯示的以下數字來驗證裝置。",
             "sas_caption_user": "透過確認對方畫面上顯示的下列數字來確認使用者。",
             "sas_description": "如果兩個裝置上都沒有相機的話，就比較一組獨特的表情符號",
-            "sas_emoji_caption_self": "確認以下的表情符號以相同的順序顯示在兩台裝置上：",
             "sas_emoji_caption_user": "透過確認對方畫面上顯示的下列表情符號來確認使用者。",
             "sas_match": "它們相符",
             "sas_no_match": "它們不相符",
             "sas_prompt": "比較獨特的表情符號",
             "scan_qr": "透過掃描來驗證",
             "scan_qr_explainer": "要求 %(displayName)s 掃描您的條碼：",
-            "self_verification_hint": "要繼續，請在您的其他裝置上接受驗證請求。",
             "start_button": "開始驗證",
-            "successful_device": "您已成功驗證了 %(deviceName)s (%(deviceId)s)!",
-            "successful_own_device": "您已成功驗證您的裝置！",
             "successful_user": "您已成功驗證 %(displayName)s！",
-            "timed_out": "驗證逾時。",
             "unsupported_method": "找不到支援的驗證方式。",
             "unverified_session_toast_accept": "是的，是我",
             "unverified_session_toast_title": "新登入。這是您嗎？",
             "unverified_sessions_toast_description": "請確認您的帳號安全",
             "unverified_sessions_toast_reject": "稍後",
             "unverified_sessions_toast_title": "您有未驗證的工作階段",
-            "verification_description": "驗證您的身分來存取已加密的訊息並對其他人證明您的身分。",
+            "use_recovery_key": "使用復原金鑰",
             "verification_dialog_title_device": "驗證其他裝置",
             "verification_dialog_title_user": "驗證請求",
             "verification_skip_warning": "如果不進行驗證，您將無法存取您的所有訊息，且可能會被其他人視為不信任。",
@@ -914,9 +909,6 @@
             "verify_emoji_prompt": "透過比對獨特的表情符號來進行驗證。",
             "verify_emoji_prompt_qr": "如果您無法掃描上面的條碼，請透過比較獨特的表情符號驗證。",
             "verify_later": "我稍後驗證",
-            "verify_using_device": "用另一台裝置驗證",
-            "verify_using_key": "使用安全金鑰進行驗證",
-            "verify_using_key_or_phrase": "使用安全金鑰或密語進行驗證",
             "waiting_for_user_accept": "正在等待 %(displayName)s 接受…",
             "waiting_other_device": "正在等待您在其他裝置上驗證…",
             "waiting_other_device_details": "正在等待您在其他裝置上驗證，%(deviceName)s (%(deviceId)s)…",
@@ -1266,7 +1258,6 @@
         "upload_file": "上傳檔案"
     },
     "labs": {
-        "allow_screen_share_only_mode": "允許僅螢幕分享模式",
         "ask_to_join": "啟用要求加入",
         "automatic_debug_logs": "自動在發生錯誤時傳送除錯日誌",
         "automatic_debug_logs_decryption": "自動傳送關於解密錯誤的除錯紀錄檔",
@@ -1317,6 +1308,7 @@
         "mjolnir": "忽略人們的新方式",
         "msc3531_hide_messages_pending_moderation": "讓版主能夠隱藏待審核的訊息。",
         "notification_settings": "新通知設定",
+        "notification_settings_beta_caption": "全新推出更簡便的通知設定調整方式。隨心所欲地自訂您的%(brand)s ，打造專屬體驗。",
         "notification_settings_beta_title": "通知設定",
         "report_to_moderators": "回報給版主",
         "report_to_moderators_description": "在支援審核的聊天室中，「回報」按鈕讓您可以回報濫用行為給聊天室管理員。",
@@ -1431,8 +1423,7 @@
     },
     "member_list": {
         "filter_placeholder": "過濾聊天室成員",
-        "invite_button_no_perms_tooltip": "您沒有權限邀請使用者",
-        "power_label": "%(userName)s（權限等級 %(powerLevelNumber)s）"
+        "invite_button_no_perms_tooltip": "您沒有權限邀請使用者"
     },
     "member_list_back_action_label": "聊天室成員",
     "message_edit_dialog_title": "訊息編輯紀錄",
@@ -1731,8 +1722,6 @@
             "send_message_start_dm": "傳送您的第一則訊息以邀請 <displayName/> 來聊天",
             "start_of_dm_history": "這是您與 <displayName/> 私人訊息紀錄的開頭。",
             "start_of_room": "這是 <roomName/> 的開頭。",
-            "topic": "主題：%(topic)s ",
-            "topic_edit": "主題：%(topic)s（<a>編輯</a>）",
             "unencrypted_warning": "端對端加密未啟用",
             "user_created": "%(displayName)s 建立了此聊天室。",
             "you_created": "您建立了此聊天室。"
@@ -2078,7 +2067,6 @@
             "error_update_guest_access": "無法更新此聊天空間的訪客存取權限",
             "error_update_history_visibility": "無法更新此聊天空間紀錄的能見度",
             "guest_access_explainer": "訪客無需帳號即可加入聊天空間。",
-            "guest_access_explainer_public_space": "這可能對公開聊天空間很有用。",
             "guest_access_label": "允許訪客存取",
             "history_visibility_anyone_space": "預覽聊天空間",
             "history_visibility_anyone_space_description": "允許人們在加入前預覽您的聊天空間。",
@@ -2137,6 +2125,7 @@
             "access_token_detail": "您的存取權杖可提供您帳號完整的存取權限。請勿分享給任何人。",
             "brand_version": "%(brand)s 版本：",
             "clear_cache_reload": "清除快取並重新載入",
+            "dialog_title": "<strong>設定：</strong>說明與關於",
             "help_link": "若需 %(brand)s 的使用說明，請點擊<a>這裡</a>。",
             "homeserver": "家伺服器為 <code>%(homeserverUrl)s</code>",
             "identity_server": "身分伺服器為 <code>%(identityServerUrl)s</code>",
@@ -2145,17 +2134,24 @@
         }
     },
     "settings": {
+        "account": {
+            "dialog_title": "<strong>設定：</strong>帳號"
+        },
         "all_rooms_home": "在首頁顯示所有聊天室",
         "all_rooms_home_description": "您所在的所有聊天室都會出現在首頁。",
         "always_show_message_timestamps": "總是顯示訊息時間戳記",
         "appearance": {
+            "compact_layout": "顯示緊湊的文字及訊息",
+            "compact_layout_description": "訊息布局需使用「現代」才可使用此功能。",
             "custom_font": "使用系統字型",
             "custom_font_description": "設定您系統上安裝的字型名稱，%(brand)s 將會嘗試使用它。",
             "custom_font_name": "系統字型名稱",
             "custom_font_size": "使用自訂大小",
             "custom_theme_error_downloading": "下載佈景主題資訊時發生錯誤。",
             "custom_theme_invalid": "無效的佈景主題架構。",
+            "dialog_title": "<strong>設定：</strong>外觀",
             "font_size": "字型大小",
+            "high_contrast": "高對比",
             "image_size_default": "預設",
             "image_size_large": "大",
             "layout_bubbles": "訊息泡泡",
@@ -2173,6 +2169,36 @@
         "emoji_autocomplete": "啟用在打字時出現表情符號建議",
         "enable_markdown": "啟用 Markdown",
         "enable_markdown_description": "使用 <code>/plain</code> 開頭以不使用 Markdown 傳送訊息。",
+        "encryption": {
+            "advanced": {
+                "breadcrumb_title_forgot": "忘記您的復原金鑰？您需要重置您的身分。"
+            },
+            "dialog_title": "<strong>設定：</strong>加密",
+            "recovery": {
+                "change_recovery_confirm_button": "確認新的復原金鑰",
+                "change_recovery_confirm_description": "在下方輸入新的復原金鑰以完成操作。舊金鑰將不再有效。",
+                "change_recovery_confirm_title": "輸入新的復原金鑰",
+                "change_recovery_key": "變更復原金鑰",
+                "change_recovery_key_description": "請將這組新的復原金鑰記錄在安全的地方，接著點擊「繼續」以確認變更。",
+                "change_recovery_key_title": "變更復原金鑰？",
+                "description": "如果您遺失了所有現有設備，請使用復原金鑰來恢復您的加密身分和訊息歷史記錄。",
+                "enter_key_error": "您輸入的復原密鑰不正確。",
+                "enter_recovery_key": "輸入復原金鑰",
+                "forgot_recovery_key": "忘記復原金鑰？",
+                "key_storage_warning": "您的金鑰儲存不同步，請點擊下方按鈕以解決問題。",
+                "save_key_description": "請勿分享給任何人！",
+                "save_key_title": "復原金鑰",
+                "set_up_recovery": "設定復原",
+                "set_up_recovery_confirm_button": "完成設定",
+                "set_up_recovery_confirm_description": "輸入上個畫面顯示的復原金鑰，以完成復原設定。",
+                "set_up_recovery_confirm_title": "輸入您的復原金鑰以確認",
+                "set_up_recovery_description": "您的金鑰儲存空間受復原金鑰保護。若在設定完成後需要新的復原金鑰，可透過選擇「%(changeRecoveryKeyButton)s」重新建立。",
+                "set_up_recovery_save_key_description": "將此復原金鑰謄寫在安全的地方，例如密碼管理器、加密筆記或實體保險箱。",
+                "set_up_recovery_save_key_title": "將您的復原金鑰保存在安全的地方",
+                "set_up_recovery_secondary_description": "點擊繼續後，我們將產生還原金鑰給您。",
+                "title": "復原"
+            }
+        },
         "general": {
             "account_management_section": "帳號管理",
             "account_section": "帳號",
@@ -2237,6 +2263,8 @@
             "oidc_manage_button": "管理帳號",
             "password_change_section": "設定新帳號密碼…",
             "password_change_success": "您的密碼已成功變更。",
+            "personal_info": "個人資訊",
+            "profile_subtitle": "其他人在 App 上看到的你",
             "remove_email_prompt": "移除 %(email)s？",
             "remove_msisdn_prompt": "移除 %(phone)s？",
             "spell_check_locale_placeholder": "選擇語系"
@@ -2247,11 +2275,6 @@
         "insert_trailing_colon_mentions": "在使用者於訊息開頭提及之後插入跟隨冒號",
         "jump_to_bottom_on_send": "傳送訊息時，跳到時間軸底部",
         "key_backup": {
-            "backup_in_progress": "您的金鑰正在備份（第一次備份會花費數分鐘）。",
-            "backup_starting": "正在開始備份…",
-            "backup_success": "成功！",
-            "cannot_create_backup": "無法建立金鑰備份",
-            "create_title": "建立金鑰備份",
             "setup_secure_backup": {
                 "backup_setup_success_description": "您已備份此裝置的金鑰。",
                 "backup_setup_success_title": "安全備份成功",
@@ -2294,12 +2317,17 @@
             "phrase_strong_enough": "很好！此密碼看起來夠強"
         },
         "keyboard": {
+            "dialog_title": "<strong>設定：</strong>鍵盤",
             "title": "鍵盤"
         },
+        "labs": {
+            "dialog_title": "<strong>設定：</strong>實驗室"
+        },
         "notifications": {
             "default_setting_description": "預設情況下，此設定將會套用於您所有的聊天室。",
             "default_setting_section": "我想收到相關的通知（預設設定）",
             "desktop_notification_message_preview": "在桌面通知顯示訊息預覽",
+            "dialog_title": "<strong>設定：</strong>通知",
             "email_description": "接收錯過通知的電子郵件摘要",
             "email_section": "電子郵件摘要",
             "email_select": "選取您要將摘要傳送到的電子郵件地址。請在<button>一般</button>中管理您的電子郵件地址。",
@@ -2358,6 +2386,7 @@
             "code_blocks_heading": "程式碼區塊",
             "compact_modern": "使用更簡潔的「現代」佈局",
             "composer_heading": "編輯器",
+            "dialog_title": "<strong>設定：</strong>偏好設定",
             "enable_hardware_acceleration": "啟用硬體加速",
             "enable_tray_icon": "顯示系統匣圖示並於關閉時最小化",
             "keyboard_heading": "鍵盤快捷鍵",
@@ -2380,13 +2409,13 @@
             "bulk_options_accept_all_invites": "接受所有 %(invitedRooms)s 邀請",
             "bulk_options_reject_all_invites": "拒絕所有 %(invitedRooms)s 邀請",
             "bulk_options_section": "大量選項",
+            "dialog_title": "<strong>設定：</strong>安全與隱私",
             "e2ee_default_disabled_warning": "您的伺服器管理員已停用在私密聊天室與私人訊息中預設的端對端加密。",
             "enable_message_search": "在已加密的聊天室中啟用訊息搜尋",
             "encryption_section": "加密",
             "ignore_users_empty": "您沒有忽略的使用者。",
             "ignore_users_section": "忽略使用者",
             "key_backup_algorithm": "演算法：",
-            "key_backup_connect": "將此工作階段連結至金鑰備份",
             "message_search_disable_warning": "若停用，從加密聊天室傳來的訊息將不會出現在搜尋結果中。",
             "message_search_disabled": "將加密的訊息安全地在本機快取以出現在顯示結果中。",
             "message_search_enabled": {
@@ -2437,6 +2466,7 @@
             "device_unverified_description_current": "驗證您目前的工作階段以強化安全訊息傳遞。",
             "device_verified_description": "此工作階段已準備好進行安全通訊。",
             "device_verified_description_current": "您目前的工作階段已準備好安全通訊。",
+            "dialog_title": "<strong>設定：</strong>工作階段",
             "error_pusher_state": "無法設定推送程式狀態",
             "filter_all": "全部",
             "filter_inactive": "不活躍",
@@ -2478,6 +2508,7 @@
             "sign_in_with_qr": "使用 QR Code 登入",
             "sign_in_with_qr_button": "顯示 QR Code",
             "sign_in_with_qr_description": "您可以使用此裝置透過 QR Code 登入新裝置。您將需要使用已登出的裝置掃描此裝置上顯示的 QR Code。",
+            "sign_in_with_qr_unsupported": "您的帳號提供者不支援這項功能",
             "sign_out": "登出此工作階段",
             "sign_out_all_other_sessions": "登出所有其他工作階段（%(otherSessionsCount)s）",
             "sign_out_confirm_description": {
@@ -2518,6 +2549,7 @@
         "show_stickers_button": "顯示貼圖案按鈕",
         "show_typing_notifications": "顯示打字通知",
         "sidebar": {
+            "dialog_title": "<strong>設定：</strong>側邊欄",
             "metaspaces_favourites_description": "將所有您最喜愛的聊天室與夥伴集中在同一個地方。",
             "metaspaces_home_all_rooms": "顯示所有聊天室",
             "metaspaces_home_all_rooms_description": "將您所有的聊天室顯示在首頁，即便它們位於同一個聊天空間。",
@@ -2529,7 +2561,6 @@
             "spaces_explainer": "空間是將房間和人群分組的方式。除了您所在的空間之外，您也可以使用一些預先構建的空間。",
             "title": "側邊欄"
         },
-        "start_automatically": "在系統登入後自動開始",
         "use_12_hour_format": "用 12 小時制顯示時間戳記（如：下午 2:30）",
         "use_command_enter_send_message": "使用 Command + Enter 來傳送訊息",
         "use_command_f_search": "使用 Command + F 來搜尋時間軸",
@@ -2543,6 +2574,7 @@
             "audio_output_empty": "未偵測到音訊輸出",
             "auto_gain_control": "自動增益控制",
             "connection_section": "連線",
+            "dialog_title": "<strong>設定：</strong>語音與視訊",
             "echo_cancellation": "迴聲消除",
             "enable_fallback_ice_server": "允許使用備用通話輔助伺服器（%(server)s）",
             "enable_fallback_ice_server_description": "僅當您的家伺服器不提供時才適用。在通話期間，將會把您的 IP 位址分享給此伺服器。",
@@ -2645,6 +2677,7 @@
         "upgraderoom": "升級聊天室到新版本",
         "upgraderoom_permission_error": "您沒有使用此指令的必要權限。",
         "usage": "使用方法",
+        "verify": "驗證使用者、工作階段與公開金鑰組合",
         "view": "檢視指定聊天室的地址",
         "whois": "顯示關於使用者的資訊"
     },
@@ -2921,7 +2954,6 @@
             }
         },
         "m.poll.end": {
-            "ended": "投票已結束",
             "sender_ended": "%(senderName)s 結束了投票"
         },
         "m.poll.start": "%(senderName)s 啟動了投票 - %(pollQuestion)s",
@@ -3399,7 +3431,6 @@
         "dialpad": "撥號鍵盤",
         "disable_camera": "關閉相機",
         "disable_microphone": "麥克風靜音",
-        "disabled_no_one_here": "這裡沒有人可以通話",
         "disabled_no_perms_start_video_call": "您沒有權限開始視訊通話",
         "disabled_no_perms_start_voice_call": "您無權限開始語音通話",
         "disabled_ongoing_call": "正在進行通話",
diff --git a/src/indexing/BaseEventIndexManager.ts b/src/indexing/BaseEventIndexManager.ts
index 7ec65a5f84..8f0e5a1651 100644
--- a/src/indexing/BaseEventIndexManager.ts
+++ b/src/indexing/BaseEventIndexManager.ts
@@ -15,10 +15,23 @@ import {
 
 // The following interfaces take their names and member names from seshat and the spec
 /* eslint-disable camelcase */
+
+/** A record of a place to resume crawling events in a given room. */
 export interface ICrawlerCheckpoint {
+    /** The room to be indexed */
     roomId: string;
-    token: string | null;
+
+    /** The pagination index to resume crawling from. */
+    token: string;
+
+    /**
+     * If `fullCrawl` is false (or absent) and we find that we have already indexed the events we find, then we stop crawling.
+     *
+     * If `fullCrawl` is true, then we keep going until we reach the end of the room history.
+     */
     fullCrawl?: boolean;
+
+    /** Whether we should crawl in the forward or backward direction. */
     direction: Direction;
 }
 
diff --git a/src/indexing/EventIndex.ts b/src/indexing/EventIndex.ts
index 235d68fffd..ff06602687 100644
--- a/src/indexing/EventIndex.ts
+++ b/src/indexing/EventIndex.ts
@@ -26,7 +26,7 @@ import {
     type IMatrixProfile,
     type IResultRoomEvents,
     type SyncStateData,
-    type SyncState,
+    SyncState,
     type TimelineIndex,
     type TimelineWindow,
 } from "matrix-js-sdk/src/matrix";
@@ -46,6 +46,7 @@ import {
     type ISearchArgs,
 } from "./BaseEventIndexManager";
 import { asyncFilter } from "../utils/arrays.ts";
+import { logErrorAndShowErrorDialog } from "../utils/ErrorUtils.tsx";
 
 // The time in ms that the crawler will wait loop iterations if there
 // have not been any checkpoints to consume in the last iteration.
@@ -58,20 +59,49 @@ interface ICrawler {
     cancel(): void;
 }
 
-/*
+/**
  * Event indexing class that wraps the platform specific event indexing.
  */
 export default class EventIndex extends EventEmitter {
-    private crawlerCheckpoints: ICrawlerCheckpoint[] = [];
     private crawler: ICrawler | null = null;
+
+    /**
+     * A list of checkpoints which are awaiting processing by the crawler, once it has done with `currentCheckpoint`.
+     */
+    private crawlerCheckpoints: ICrawlerCheckpoint[] = [];
+
+    /**
+     * The current checkpoint that the crawler is working on.
+     */
     private currentCheckpoint: ICrawlerCheckpoint | null = null;
 
+    /**
+     * True if we need to add the initial checkpoints for encrypted rooms, once we've completed a sync.
+     * This is set if the database is empty when the indexer is first initialized.
+     */
+    private needsInitialCheckpoints = false;
+
+    private readonly logger;
+
+    public constructor() {
+        super();
+
+        this.logger = logger.getChild("EventIndex");
+    }
+
     public async init(): Promise<void> {
         const indexManager = PlatformPeg.get()?.getEventIndexingManager();
         if (!indexManager) return;
 
+        // If the index is empty, set a flag so that we add the initial checkpoints once we sync.
+        // We do this check here rather than in `onSync` because, by the time `onSync` is called, there will
+        // have been a few events added to the index.
+        if (await indexManager.isEventIndexEmpty()) {
+            this.needsInitialCheckpoints = true;
+        }
+
         this.crawlerCheckpoints = await indexManager.loadCheckpoints();
-        logger.log("EventIndex: Loaded checkpoints", this.crawlerCheckpoints);
+        this.logger.debug("Loaded checkpoints", JSON.stringify(this.crawlerCheckpoints));
 
         this.registerListeners();
     }
@@ -102,9 +132,11 @@ export default class EventIndex extends EventEmitter {
     }
 
     /**
-     * Get crawler checkpoints for the encrypted rooms and store them in the index.
+     * Add crawler checkpoints for all of the encrypted rooms the user is in.
      */
     public async addInitialCheckpoints(): Promise<void> {
+        this.needsInitialCheckpoints = false;
+
         const indexManager = PlatformPeg.get()?.getEventIndexingManager();
         if (!indexManager) return;
         const client = MatrixClientPeg.safeGet();
@@ -116,7 +148,7 @@ export default class EventIndex extends EventEmitter {
             Boolean(await client.getCrypto()?.isEncryptionEnabledInRoom(room.roomId)),
         );
 
-        logger.log("EventIndex: Adding initial crawler checkpoints");
+        this.logger.debug("addInitialCheckpoints: starting");
 
         // Gather the prev_batch tokens and create checkpoints for
         // our message crawler.
@@ -125,6 +157,12 @@ export default class EventIndex extends EventEmitter {
                 const timeline = room.getLiveTimeline();
                 const token = timeline.getPaginationToken(Direction.Backward);
 
+                if (!token) {
+                    this.logger.debug(`addInitialCheckpoints: No back-pagination token for room ${room.roomId}"`);
+                    return;
+                }
+                this.logger.debug(`addInitialCheckpoints: Adding initial checkpoints for room ${room.roomId}`);
+
                 const backCheckpoint: ICrawlerCheckpoint = {
                     roomId: room.roomId,
                     token: token,
@@ -139,57 +177,47 @@ export default class EventIndex extends EventEmitter {
                 };
 
                 try {
-                    if (backCheckpoint.token) {
-                        await indexManager.addCrawlerCheckpoint(backCheckpoint);
-                        this.crawlerCheckpoints.push(backCheckpoint);
-                    }
+                    await indexManager.addCrawlerCheckpoint(backCheckpoint);
+                    this.crawlerCheckpoints.push(backCheckpoint);
 
-                    if (forwardCheckpoint.token) {
-                        await indexManager.addCrawlerCheckpoint(forwardCheckpoint);
-                        this.crawlerCheckpoints.push(forwardCheckpoint);
-                    }
+                    await indexManager.addCrawlerCheckpoint(forwardCheckpoint);
+                    this.crawlerCheckpoints.push(forwardCheckpoint);
                 } catch (e) {
-                    logger.log(
-                        "EventIndex: Error adding initial checkpoints for room",
-                        room.roomId,
-                        backCheckpoint,
-                        forwardCheckpoint,
+                    this.logger.warn(
+                        `addInitialCheckpoints: Error adding initial checkpoints for room ${room.roomId}`,
                         e,
                     );
                 }
             }),
         );
+        this.logger.debug("addInitialCheckpoints: done");
     }
 
-    /*
+    /**
      * The sync event listener.
-     *
-     * The listener has two cases:
-     *     - First sync after start up, check if the index is empty, add
-     *         initial checkpoints, if so. Start the crawler background task.
-     *     - Every other sync, tell the event index to commit all the queued up
-     *         live events
      */
-    private onSync = async (state: SyncState, prevState: SyncState | null, data?: SyncStateData): Promise<void> => {
-        const indexManager = PlatformPeg.get()?.getEventIndexingManager();
-        if (!indexManager) return;
+    private onSync = (state: SyncState, prevState: SyncState | null, data?: SyncStateData): void => {
+        if (state != SyncState.Syncing) return;
 
-        if (prevState === "PREPARED" && state === "SYNCING") {
-            // If our indexer is empty we're most likely running Element the
-            // first time with indexing support or running it with an
-            // initial sync. Add checkpoints to crawl our encrypted rooms.
-            const eventIndexWasEmpty = await indexManager.isEventIndexEmpty();
-            if (eventIndexWasEmpty) await this.addInitialCheckpoints();
+        const onSyncInner = async (): Promise<void> => {
+            const indexManager = PlatformPeg.get()?.getEventIndexingManager();
+            if (!indexManager) return;
 
+            // If the index was empty when we first started up, add the initial checkpoints, to back-populate the index.
+            if (this.needsInitialCheckpoints) {
+                await this.addInitialCheckpoints();
+            }
+
+            // Start the crawler if it's not already running.
             this.startCrawler();
-            return;
-        }
 
-        if (prevState === "SYNCING" && state === "SYNCING") {
-            // A sync was done, presumably we queued up some live events,
-            // commit them now.
+            // Commit any queued up live events
             await indexManager.commitLiveEvents();
-        }
+        };
+
+        onSyncInner().catch((e) => {
+            logErrorAndShowErrorDialog("Event indexer threw an unexpected error", e);
+        });
     };
 
     /*
@@ -232,7 +260,7 @@ export default class EventIndex extends EventEmitter {
         if (!MatrixClientPeg.safeGet().isRoomEncrypted(state.roomId)) return;
 
         if (ev.getType() === EventType.RoomEncryption && !(await this.isRoomIndexed(state.roomId))) {
-            logger.log("EventIndex: Adding a checkpoint for a newly encrypted room", state.roomId);
+            this.logger.debug("Adding a checkpoint for a newly encrypted room", state.roomId);
             this.addRoomCheckpoint(state.roomId, true);
         }
     };
@@ -251,7 +279,7 @@ export default class EventIndex extends EventEmitter {
         try {
             await indexManager.deleteEvent(associatedId);
         } catch (e) {
-            logger.log("EventIndex: Error deleting event from index", e);
+            this.logger.warn("Error deleting event from index", e);
         }
     };
 
@@ -265,7 +293,7 @@ export default class EventIndex extends EventEmitter {
         if (!room) return;
         if (!MatrixClientPeg.safeGet().isRoomEncrypted(room.roomId)) return;
 
-        logger.log("EventIndex: Adding a checkpoint because of a limited timeline", room.roomId);
+        this.logger.debug("Adding a checkpoint because of a limited timeline", room.roomId);
 
         this.addRoomCheckpoint(room.roomId, false);
     };
@@ -394,12 +422,12 @@ export default class EventIndex extends EventEmitter {
             direction: Direction.Backward,
         };
 
-        logger.log("EventIndex: Adding checkpoint", checkpoint);
+        this.logger.debug("Adding checkpoint", JSON.stringify(checkpoint));
 
         try {
             await indexManager.addCrawlerCheckpoint(checkpoint);
         } catch (e) {
-            logger.log("EventIndex: Error adding new checkpoint for room", room.roomId, checkpoint, e);
+            this.logger.warn(`Error adding new checkpoint for room ${room.roomId}`, e);
         }
 
         this.crawlerCheckpoints.push(checkpoint);
@@ -460,6 +488,7 @@ export default class EventIndex extends EventEmitter {
                 continue;
             }
 
+            this.logger.debug(`Processing checkpoint ${JSON.stringify(checkpoint)}`);
             this.currentCheckpoint = checkpoint;
             this.emitNewCheckpoint();
 
@@ -481,15 +510,15 @@ export default class EventIndex extends EventEmitter {
                 );
             } catch (e) {
                 if (e instanceof HTTPError && e.httpStatus === 403) {
-                    logger.log(
-                        "EventIndex: Removing checkpoint as we don't have ",
+                    this.logger.debug(
+                        "Removing checkpoint as we don't have ",
                         "permissions to fetch messages from this room.",
-                        checkpoint,
+                        JSON.stringify(checkpoint),
                     );
                     try {
                         await indexManager.removeCrawlerCheckpoint(checkpoint);
                     } catch (e) {
-                        logger.log("EventIndex: Error removing checkpoint", checkpoint, e);
+                        this.logger.warn(`Error removing checkpoint ${JSON.stringify(checkpoint)}:`, e);
                         // We don't push the checkpoint here back, it will
                         // hopefully be removed after a restart. But let us
                         // ignore it for now as we don't want to hammer the
@@ -498,7 +527,7 @@ export default class EventIndex extends EventEmitter {
                     continue;
                 }
 
-                logger.log("EventIndex: Error crawling using checkpoint:", checkpoint, ",", e);
+                this.logger.warn(`Error crawling using checkpoint ${JSON.stringify(checkpoint)}:`, e);
                 this.crawlerCheckpoints.push(checkpoint);
                 continue;
             }
@@ -509,13 +538,13 @@ export default class EventIndex extends EventEmitter {
             }
 
             if (res.chunk.length === 0) {
-                logger.log("EventIndex: Done with the checkpoint", checkpoint);
+                this.logger.debug("Done with the checkpoint", JSON.stringify(checkpoint));
                 // We got to the start/end of our timeline, lets just
                 // delete our checkpoint and go back to sleep.
                 try {
                     await indexManager.removeCrawlerCheckpoint(checkpoint);
                 } catch (e) {
-                    logger.log("EventIndex: Error removing checkpoint", checkpoint, e);
+                    this.logger.warn("Error removing checkpoint", JSON.stringify(checkpoint), e);
                 }
                 continue;
             }
@@ -593,7 +622,7 @@ export default class EventIndex extends EventEmitter {
                     if (eventId) {
                         await indexManager.deleteEvent(eventId);
                     } else {
-                        logger.warn("EventIndex: Redaction event doesn't contain a valid associated event id", ev);
+                        this.logger.warn("Redaction event doesn't contain a valid associated event id", ev);
                     }
                 }
 
@@ -602,10 +631,9 @@ export default class EventIndex extends EventEmitter {
                 // We didn't get a valid new checkpoint from the server, nothing
                 // to do here anymore.
                 if (!newCheckpoint) {
-                    logger.log(
-                        "EventIndex: The server didn't return a valid ",
-                        "new checkpoint, not continuing the crawl.",
-                        checkpoint,
+                    this.logger.debug(
+                        "The server didn't return a valid new checkpoint, not continuing the crawl.",
+                        JSON.stringify(checkpoint),
                     );
                     continue;
                 }
@@ -615,31 +643,29 @@ export default class EventIndex extends EventEmitter {
                 // Let us delete the checkpoint in that case, otherwise push
                 // the new checkpoint to be used by the crawler.
                 if (eventsAlreadyAdded === true && newCheckpoint.fullCrawl !== true) {
-                    logger.log(
-                        "EventIndex: Checkpoint had already all events",
+                    this.logger.debug(
+                        "Checkpoint had already all events",
                         "added, stopping the crawl",
-                        checkpoint,
+                        JSON.stringify(checkpoint),
                     );
                     await indexManager.removeCrawlerCheckpoint(newCheckpoint);
                 } else {
                     if (eventsAlreadyAdded === true) {
-                        logger.log(
-                            "EventIndex: Checkpoint had already all events",
+                        this.logger.debug(
+                            "Checkpoint had already all events",
                             "added, but continuing due to a full crawl",
-                            checkpoint,
+                            JSON.stringify(checkpoint),
                         );
                     }
                     this.crawlerCheckpoints.push(newCheckpoint);
                 }
             } catch (e) {
-                logger.log("EventIndex: Error during a crawl", e);
+                this.logger.warn("Error during a crawl", e);
                 // An error occurred, put the checkpoint back so we
                 // can retry.
                 this.crawlerCheckpoints.push(checkpoint);
             }
         }
-
-        this.crawler = null;
     }
 
     /**
@@ -647,7 +673,14 @@ export default class EventIndex extends EventEmitter {
      */
     public startCrawler(): void {
         if (this.crawler !== null) return;
-        this.crawlerFunc();
+        this.logger.debug("Starting crawler");
+        this.crawlerFunc()
+            .finally(() => {
+                this.crawler = null;
+            })
+            .catch((e) => {
+                this.logger.error("Error in crawler function", e);
+            });
     }
 
     /**
@@ -655,6 +688,7 @@ export default class EventIndex extends EventEmitter {
      */
     public stopCrawler(): void {
         if (this.crawler === null) return;
+        this.logger.debug("Stopping crawler");
         this.crawler.cancel();
     }
 
@@ -732,7 +766,7 @@ export default class EventIndex extends EventEmitter {
         try {
             events = await indexManager.loadFileEvents(loadArgs);
         } catch (e) {
-            logger.log("EventIndex: Error getting file events", e);
+            this.logger.debug("Error getting file events", e);
             return [];
         }
 
@@ -842,11 +876,8 @@ export default class EventIndex extends EventEmitter {
             ret = true;
         }
 
-        logger.log(
-            "EventIndex: Populating file panel with",
-            matrixEvents.length,
-            "events and setting the pagination token to",
-            paginationToken,
+        this.logger.debug(
+            `Populating file panel with ${matrixEvents.length} events and setting the pagination token to ${paginationToken}`,
         );
 
         timeline.setPaginationToken(paginationToken, EventTimeline.BACKWARDS);
@@ -961,7 +992,10 @@ export default class EventIndex extends EventEmitter {
     }
 
     public crawlingRooms(): {
+        /** The rooms that we are currently crawling. */
         crawlingRooms: Set<string>;
+
+        /** All the encrypted rooms known by the MatrixClient. */
         totalRooms: Set<string>;
     } {
         const totalRooms = new Set<string>();
diff --git a/src/integrations/IntegrationManagers.ts b/src/integrations/IntegrationManagers.ts
index 6d8ab69ccc..7c2fc48adc 100644
--- a/src/integrations/IntegrationManagers.ts
+++ b/src/integrations/IntegrationManagers.ts
@@ -13,7 +13,7 @@ import SdkConfig from "../SdkConfig";
 import Modal from "../Modal";
 import { IntegrationManagerInstance, Kind } from "./IntegrationManagerInstance";
 import IntegrationsImpossibleDialog from "../components/views/dialogs/IntegrationsImpossibleDialog";
-import IntegrationsDisabledDialog from "../components/views/dialogs/IntegrationsDisabledDialog";
+import { IntegrationsDisabledDialog } from "../components/views/dialogs/IntegrationsDisabledDialog";
 import WidgetUtils from "../utils/WidgetUtils";
 import { MatrixClientPeg } from "../MatrixClientPeg";
 
diff --git a/src/languageHandler.tsx b/src/languageHandler.tsx
index 175f9c149f..abd26dda01 100644
--- a/src/languageHandler.tsx
+++ b/src/languageHandler.tsx
@@ -1,24 +1,27 @@
 /*
-Copyright 2024 New Vector Ltd.
-Copyright 2019-2022 The Matrix.org Foundation C.I.C.
-Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2017 MTRNord and Cooperative EITA
-Copyright 2017 Vector Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
 
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-import counterpart from "counterpart";
-import React from "react";
 import { logger } from "matrix-js-sdk/src/logger";
-import { type Optional } from "matrix-events-sdk";
 import { MapWithDefault } from "matrix-js-sdk/src/utils";
-import { normalizeLanguageKey, type TranslationKey as _TranslationKey, KEY_SEPARATOR } from "matrix-web-i18n";
 import { type TranslationStringsObject } from "@matrix-org/react-sdk-module-api";
 import _ from "lodash";
+import {
+    _t,
+    normalizeLanguageKey,
+    type TranslationKey,
+    type IVariables,
+    KEY_SEPARATOR,
+    getLangsJson,
+    registerTranslations,
+    setLocale,
+    getLocale,
+    setMissingEntryGenerator as setMissingEntryGeneratorSharedComponents,
+} from "@element-hq/web-shared-components";
 
-import type Translations from "./i18n/strings/en_EN.json";
 import SettingsStore from "./settings/SettingsStore";
 import PlatformPeg from "./PlatformPeg";
 import { SettingLevel } from "./settings/SettingLevel";
@@ -26,24 +29,23 @@ import { retry } from "./utils/promise";
 import SdkConfig from "./SdkConfig";
 import { ModuleRunner } from "./modules/ModuleRunner";
 
-// @ts-ignore - $webapp is a webpack resolve alias pointing to the output directory, see webpack config
-import webpackLangJsonUrl from "$webapp/i18n/languages.json";
-
-export { normalizeLanguageKey, getNormalizedLanguageKeys } from "matrix-web-i18n";
+export {
+    _t,
+    type IVariables,
+    type Tags,
+    type TranslationKey,
+    type TranslatedString,
+    _td,
+    _tDom,
+    lookupString,
+    sanitizeForTranslation,
+    normalizeLanguageKey,
+    getNormalizedLanguageKeys,
+    substitute,
+} from "@element-hq/web-shared-components";
 
 const i18nFolder = "i18n/";
 
-// Control whether to also return original, untranslated strings
-// Useful for debugging and testing
-const ANNOTATE_STRINGS = false;
-
-// We use english strings as keys, some of which contain full stops
-counterpart.setSeparator(KEY_SEPARATOR);
-
-// see `translateWithFallback` for an explanation of fallback handling
-const FALLBACK_LOCALE = "en";
-counterpart.setFallbackLocale(FALLBACK_LOCALE);
-
 export interface ErrorOptions {
     // Because we're mixing the substitution variables and `cause` into the same object
     // below, we want them to always explicitly say whether there is an underlying error
@@ -96,364 +98,13 @@ export function getUserLanguage(): string {
     }
 }
 
-/**
- * A type representing the union of possible keys into the translation file using `|` delimiter to access nested fields.
- * @example `common|error` to access `error` within the `common` sub-object.
- * {
- *     "common": {
- *         "error": "Error"
- *     }
- * }
- */
-export type TranslationKey = _TranslationKey<typeof Translations>;
-
-// Function which only purpose is to mark that a string is translatable
-// Does not actually do anything. It's helpful for automatic extraction of translatable strings
-export function _td(s: TranslationKey): TranslationKey {
-    return s;
-}
-
-function isValidTranslation(translated: string): boolean {
-    return typeof translated === "string" && !translated.startsWith("missing translation:");
-}
-
-/**
- * to improve screen reader experience translations that are not in the main page language
- * eg a translation that fell back to english from another language
- * should be wrapped with an appropriate `lang='en'` attribute
- * counterpart's `translate` doesn't expose a way to determine if the resulting translation
- * is in the target locale or a fallback locale
- * for this reason, force fallbackLocale === locale in the first call to translate
- * and fallback 'manually' so we can mark fallback strings appropriately
- * */
-const translateWithFallback = (text: string, options?: IVariables): { translated: string; isFallback?: boolean } => {
-    const translated = counterpart.translate(text, { ...options, fallbackLocale: counterpart.getLocale() });
-    if (isValidTranslation(translated)) {
-        return { translated };
-    }
-
-    const fallbackTranslated = counterpart.translate(text, { ...options, locale: FALLBACK_LOCALE });
-    if (isValidTranslation(fallbackTranslated)) {
-        return { translated: fallbackTranslated, isFallback: true };
-    }
-
-    // Even the translation via FALLBACK_LOCALE failed; this can happen if
-    //
-    // 1. The string isn't in the translations dictionary, usually because you're in develop
-    // and haven't run yarn i18n
-    // 2. Loading the translation resources over the network failed, which can happen due to
-    // to network or if the client tried to load a translation that's been removed from the
-    // server.
-    //
-    // At this point, its the lesser evil to show the i18n key which will be in English but not human-friendly,
-    // so the user can still make out *something*, rather than an opaque possibly-untranslated "missing translation" error.
-    return { translated: text, isFallback: true };
-};
-
-// Wrapper for counterpart's translation function so that it handles nulls and undefineds properly
-// Takes the same arguments as counterpart.translate()
-function safeCounterpartTranslate(text: string, variables?: IVariables): { translated: string; isFallback?: boolean } {
-    // Don't do substitutions in counterpart. We handle it ourselves so we can replace with React components
-    // However, still pass the variables to counterpart so that it can choose the correct plural if count is given
-    // It is enough to pass the count variable, but in the future counterpart might make use of other information too
-    const options: IVariables & {
-        interpolate: boolean;
-    } = { ...variables, interpolate: false };
-
-    // Horrible hack to avoid https://github.com/vector-im/element-web/issues/4191
-    // The interpolation library that counterpart uses does not support undefined/null
-    // values and instead will throw an error. This is a problem since everywhere else
-    // in JS land passing undefined/null will simply stringify instead, and when converting
-    // valid ES6 template strings to i18n strings it's extremely easy to pass undefined/null
-    // if there are no existing null guards. To avoid this making the app completely inoperable,
-    // we'll check all the values for undefined/null and stringify them here.
-    if (options && typeof options === "object") {
-        Object.keys(options).forEach((k) => {
-            if (options[k] === undefined) {
-                logger.warn("safeCounterpartTranslate called with undefined interpolation name: " + k);
-                options[k] = "undefined";
-            }
-            if (options[k] === null) {
-                logger.warn("safeCounterpartTranslate called with null interpolation name: " + k);
-                options[k] = "null";
-            }
-        });
-    }
-    return translateWithFallback(text, options);
-}
-
-/**
- * The value a variable or tag can take for a translation interpolation.
- */
-type SubstitutionValue = number | string | React.ReactNode | ((sub: string) => React.ReactNode);
-
-export interface IVariables {
-    count?: number;
-    [key: string]: SubstitutionValue;
-}
-
-export type Tags = Record<string, SubstitutionValue>;
-
-export type TranslatedString = string | React.ReactNode;
-
-// For development/testing purposes it is useful to also output the original string
-// Don't do that for release versions
-const annotateStrings = (result: TranslatedString, translationKey: TranslationKey): TranslatedString => {
-    if (!ANNOTATE_STRINGS) {
-        return result;
-    }
-
-    if (typeof result === "string") {
-        return `@@${translationKey}##${result}@@`;
-    } else {
-        return (
-            <span className="translated-string" data-orig-string={translationKey}>
-                {result}
-            </span>
-        );
-    }
-};
-
-/*
- * Translates text and optionally also replaces XML-ish elements in the text with e.g. React components
- * @param {string} text The untranslated text, e.g "click <a>here</a> now to %(foo)s".
- * @param {object} variables Variable substitutions, e.g { foo: 'bar' }
- * @param {object} tags Tag substitutions e.g. { 'a': (sub) => <a>{sub}</a> }
- *
- * In both variables and tags, the values to substitute with can be either simple strings, React components,
- * or functions that return the value to use in the substitution (e.g. return a React component). In case of
- * a tag replacement, the function receives as the argument the text inside the element corresponding to the tag.
- *
- * Use tag substitutions if you need to translate text between tags (e.g. "<a>Click here!</a>"), otherwise
- * you will end up with literal "<a>" in your output, rather than HTML. Note that you can also use variable
- * substitution to insert React components, but you can't use it to translate text between tags.
- *
- * @return a React <span> component if any non-strings were used in substitutions, otherwise a string
- */
-// eslint-next-line @typescript-eslint/naming-convention
-export function _t(text: TranslationKey, variables?: IVariables): string;
-export function _t(text: TranslationKey, variables: IVariables | undefined, tags: Tags): React.ReactNode;
-export function _t(text: TranslationKey, variables?: IVariables, tags?: Tags): TranslatedString {
-    // The translation returns text so there's no XSS vector here (no unsafe HTML, no code execution)
-    const { translated } = safeCounterpartTranslate(text, variables);
-    const substituted = substitute(translated, variables, tags);
-
-    return annotateStrings(substituted, text);
-}
-
-/**
- * Utility function to look up a string by its translation key without resolving variables & tags
- * @param key - the translation key to return the value for
- */
-export function lookupString(key: TranslationKey): string {
-    return safeCounterpartTranslate(key, {}).translated;
-}
-
-/*
- * Wraps normal _t function and adds atttribution for translations that used a fallback locale
- * Wraps translations that fell back from active locale to fallback locale with a `<span lang=<fallback locale>>`
- * @param {string} text The untranslated text, e.g "click <a>here</a> now to %(foo)s".
- * @param {object} variables Variable substitutions, e.g { foo: 'bar' }
- * @param {object} tags Tag substitutions e.g. { 'a': (sub) => <a>{sub}</a> }
- *
- * @return a React <span> component if any non-strings were used in substitutions
- * or translation used a fallback locale, otherwise a string
- */
-// eslint-next-line @typescript-eslint/naming-convention
-export function _tDom(text: TranslationKey, variables?: IVariables): TranslatedString;
-export function _tDom(text: TranslationKey, variables: IVariables, tags: Tags): React.ReactNode;
-export function _tDom(text: TranslationKey, variables?: IVariables, tags?: Tags): TranslatedString {
-    // The translation returns text so there's no XSS vector here (no unsafe HTML, no code execution)
-    const { translated, isFallback } = safeCounterpartTranslate(text, variables);
-    const substituted = substitute(translated, variables, tags);
-
-    // wrap en fallback translation with lang attribute for screen readers
-    const result = isFallback ? <span lang="en">{substituted}</span> : substituted;
-
-    return annotateStrings(result, text);
-}
-
-/**
- * Sanitizes unsafe text for the sanitizer, ensuring references to variables will not be considered
- * replaceable by the translation functions.
- * @param {string} text The text to sanitize.
- * @returns {string} The sanitized text.
- */
-export function sanitizeForTranslation(text: string): string {
-    // Add a non-breaking space so the regex doesn't trigger when translating.
-    return text.replace(/%\(([^)]*)\)/g, "%\xa0($1)");
-}
-
-/*
- * Similar to _t(), except only does substitutions, and no translation
- * @param {string} text The text, e.g "click <a>here</a> now to %(foo)s".
- * @param {object} variables Variable substitutions, e.g { foo: 'bar' }
- * @param {object} tags Tag substitutions e.g. { 'a': (sub) => <a>{sub}</a> }
- *
- * The values to substitute with can be either simple strings, or functions that return the value to use in
- * the substitution (e.g. return a React component). In case of a tag replacement, the function receives as
- * the argument the text inside the element corresponding to the tag.
- *
- * @return a React <span> component if any non-strings were used in substitutions, otherwise a string
- */
-export function substitute(text: string, variables?: IVariables): string;
-export function substitute(text: string, variables: IVariables | undefined, tags: Tags | undefined): string;
-export function substitute(text: string, variables?: IVariables, tags?: Tags): string | React.ReactNode {
-    let result: React.ReactNode | string = text;
-
-    if (variables !== undefined) {
-        const regexpMapping: IVariables = {};
-        for (const variable in variables) {
-            regexpMapping[`%\\(${variable}\\)s`] = variables[variable];
-        }
-        result = replaceByRegexes(result as string, regexpMapping);
-    }
-
-    if (tags !== undefined) {
-        const regexpMapping: Tags = {};
-        for (const tag in tags) {
-            regexpMapping[`(<${tag}>(.*?)<\\/${tag}>|<${tag}>|<${tag}\\s*\\/>)`] = tags[tag];
-        }
-        result = replaceByRegexes(result as string, regexpMapping);
-    }
-
-    return result;
-}
-
-/**
- * Replace parts of a text using regular expressions
- * @param text - The text on which to perform substitutions
- * @param mapping - A mapping from regular expressions in string form to replacement string or a
- * function which will receive as the argument the capture groups defined in the regexp. E.g.
- * { 'Hello (.?) World': (sub) => sub.toUpperCase() }
- *
- * @return a React <span> component if any non-strings were used in substitutions, otherwise a string
- */
-export function replaceByRegexes(text: string, mapping: IVariables): string;
-export function replaceByRegexes(text: string, mapping: Tags): React.ReactNode;
-export function replaceByRegexes(text: string, mapping: IVariables | Tags): string | React.ReactNode {
-    // We initially store our output as an array of strings and objects (e.g. React components).
-    // This will then be converted to a string or a <span> at the end
-    const output: SubstitutionValue[] = [text];
-
-    // If we insert any components we need to wrap the output in a span. React doesn't like just an array of components.
-    let shouldWrapInSpan = false;
-
-    for (const regexpString in mapping) {
-        // TODO: Cache regexps
-        const regexp = new RegExp(regexpString, "g");
-
-        // Loop over what output we have so far and perform replacements
-        // We look for matches: if we find one, we get three parts: everything before the match, the replaced part,
-        // and everything after the match. Insert all three into the output. We need to do this because we can insert objects.
-        // Otherwise there would be no need for the splitting and we could do simple replacement.
-        let matchFoundSomewhere = false; // If we don't find a match anywhere we want to log it
-        for (let outputIndex = 0; outputIndex < output.length; outputIndex++) {
-            const inputText = output[outputIndex];
-            if (typeof inputText !== "string") {
-                // We might have inserted objects earlier, don't try to replace them
-                continue;
-            }
-
-            // process every match in the string
-            // starting with the first
-            let match = regexp.exec(inputText);
-
-            if (!match) continue;
-            matchFoundSomewhere = true;
-
-            // The textual part before the first match
-            const head = inputText.slice(0, match.index);
-
-            const parts: SubstitutionValue[] = [];
-            // keep track of prevMatch
-            let prevMatch;
-            while (match) {
-                // store prevMatch
-                prevMatch = match;
-                const capturedGroups = match.slice(2);
-
-                let replaced: SubstitutionValue;
-                // If substitution is a function, call it
-                if (mapping[regexpString] instanceof Function) {
-                    replaced = ((mapping as Tags)[regexpString] as (...subs: string[]) => string)(...capturedGroups);
-                } else {
-                    replaced = mapping[regexpString];
-                }
-
-                if (typeof replaced === "object") {
-                    shouldWrapInSpan = true;
-                }
-
-                // Here we also need to check that it actually is a string before comparing against one
-                // The head and tail are always strings
-                if (typeof replaced !== "string" || replaced !== "") {
-                    parts.push(replaced);
-                }
-
-                // try the next match
-                match = regexp.exec(inputText);
-
-                // add the text between prevMatch and this one
-                // or the end of the string if prevMatch is the last match
-                let tail;
-                if (match) {
-                    const startIndex = prevMatch.index + prevMatch[0].length;
-                    tail = inputText.slice(startIndex, match.index);
-                } else {
-                    tail = inputText.slice(prevMatch.index + prevMatch[0].length);
-                }
-                if (tail) {
-                    parts.push(tail);
-                }
-            }
-
-            // Insert in reverse order as splice does insert-before and this way we get the final order correct
-            // remove the old element at the same time
-            output.splice(outputIndex, 1, ...parts);
-
-            if (head !== "") {
-                // Don't push empty nodes, they are of no use
-                output.splice(outputIndex, 0, head);
-            }
-        }
-        if (!matchFoundSomewhere) {
-            if (
-                // The current regexp did not match anything in the input. Missing
-                // matches is entirely possible because you might choose to show some
-                // variables only in the case of e.g. plurals. It's still a bit
-                // suspicious, and could be due to an error, so log it. However, not
-                // showing count is so common that it's not worth logging. And other
-                // commonly unused variables here, if there are any.
-                regexpString !== "%\\(count\\)s" &&
-                // Ignore the `locale` option which can be used to override the locale
-                // in counterpart
-                regexpString !== "%\\(locale\\)s"
-            ) {
-                logger.log(`Could not find ${regexp} in ${text}`);
-            }
-        }
-    }
-
-    if (shouldWrapInSpan) {
-        return React.createElement("span", null, ...(output as Array<number | string | React.ReactNode>));
-    } else {
-        // eslint-disable-next-line @typescript-eslint/no-base-to-string
-        return output.join("");
-    }
-}
-
 // Allow overriding the text displayed when no translation exists
 // Currently only used in unit tests to avoid having to load
 // the translations in element-web
 export function setMissingEntryGenerator(f: (value: string) => void): void {
-    counterpart.setMissingEntryGenerator(f);
+    setMissingEntryGeneratorSharedComponents(f);
 }
 
-type Languages = {
-    [lang: string]: string;
-};
-
 export async function setLanguage(...preferredLangs: string[]): Promise<void> {
     PlatformPeg.get()?.setLanguage(preferredLangs);
 
@@ -467,8 +118,8 @@ export async function setLanguage(...preferredLangs: string[]): Promise<void> {
 
     const languageData = await getLanguageRetry(i18nFolder + availableLanguages[chosenLanguage]);
 
-    counterpart.registerTranslations(chosenLanguage, languageData);
-    counterpart.setLocale(chosenLanguage);
+    registerTranslations(chosenLanguage, languageData);
+    setLocale(chosenLanguage);
 
     await SettingsStore.setValue("language", null, SettingLevel.DEVICE, chosenLanguage);
     // Adds a lot of noise to test runs, so disable logging there.
@@ -479,7 +130,7 @@ export async function setLanguage(...preferredLangs: string[]): Promise<void> {
     // Set 'en' as fallback language:
     if (chosenLanguage !== "en") {
         const fallbackLanguageData = await getLanguageRetry(i18nFolder + availableLanguages["en"]);
-        counterpart.registerTranslations("en", fallbackLanguageData);
+        registerTranslations("en", fallbackLanguageData);
     }
 
     await registerCustomTranslations();
@@ -517,7 +168,7 @@ export function getLanguageFromBrowser(): string {
 }
 
 export function getCurrentLanguage(): string {
-    return counterpart.getLocale();
+    return getLocale();
 }
 
 /**
@@ -554,24 +205,6 @@ export function pickBestLanguage(langs: string[]): string {
     return langs[0];
 }
 
-async function getLangsJson(): Promise<Languages> {
-    let url: string;
-    if (typeof webpackLangJsonUrl === "string") {
-        // in Jest this 'url' isn't a URL, so just fall through
-        url = webpackLangJsonUrl;
-    } else {
-        url = i18nFolder + "languages.json";
-    }
-
-    const res = await fetch(url, { method: "GET" });
-
-    if (!res.ok) {
-        throw new Error(`Failed to load ${url}, got ${res.status}`);
-    }
-
-    return res.json();
-}
-
 interface ICounterpartTranslation {
     [key: string]:
         | string
@@ -602,7 +235,7 @@ async function getLanguage(langPath: string): Promise<ICounterpartTranslation> {
     return res.json();
 }
 
-let cachedCustomTranslations: Optional<TranslationStringsObject> = null;
+let cachedCustomTranslations: TranslationStringsObject | undefined;
 let cachedCustomTranslationsExpire = 0; // zero to trigger expiration right away
 
 // This awkward class exists so the test runner can get at the function. It is
@@ -627,7 +260,7 @@ function doRegisterTranslations(customTranslations: TranslationStringsObject): v
 
     // Finally, tell counterpart about our translations
     for (const [lang, translations] of langs) {
-        counterpart.registerTranslations(lang, translations);
+        registerTranslations(lang, translations);
     }
 }
 
@@ -651,7 +284,7 @@ export async function registerCustomTranslations({
     if (!lookupUrl) return; // easy - nothing to do
 
     try {
-        let json: Optional<TranslationStringsObject>;
+        let json: TranslationStringsObject | undefined;
         if (testOnlyIgnoreCustomTranslationsCache || Date.now() >= cachedCustomTranslationsExpire) {
             json = CustomTranslationOptions.lookupFn
                 ? CustomTranslationOptions.lookupFn(lookupUrl)
diff --git a/src/linkify-matrix.ts b/src/linkify-matrix.ts
index 0a96e088e9..b6ed8ee7fc 100644
--- a/src/linkify-matrix.ts
+++ b/src/linkify-matrix.ts
@@ -10,6 +10,7 @@ Please see LICENSE files in the repository root for full details.
 import * as linkifyjs from "linkifyjs";
 import { type EventListeners, type Opts, registerCustomProtocol, registerPlugin } from "linkifyjs";
 import linkifyString from "linkify-string";
+import linkifyHtml from "linkify-html";
 import { getHttpUriForMxc, User } from "matrix-js-sdk/src/matrix";
 
 import {
@@ -121,55 +122,76 @@ export const ELEMENT_URL_PATTERN =
     "(?:app|beta|staging|develop)\\.element\\.io/" +
     ")(#.*)";
 
-export const options: Opts = {
-    events: function (href: string, type: string): EventListeners {
-        switch (type as Type) {
-            case Type.URL: {
-                // intercept local permalinks to users and show them like userids (in userinfo of current room)
-                try {
-                    const permalink = parsePermalink(href);
-                    if (permalink?.userId) {
+// Attach click handlers to links based on their type
+function events(href: string, type: string): EventListeners {
+    switch (type as Type) {
+        case Type.URL: {
+            // intercept local permalinks to users and show them like userids (in userinfo of current room)
+            try {
+                const permalink = parsePermalink(href);
+                if (permalink?.userId) {
+                    return {
+                        click: function (e: MouseEvent) {
+                            onUserClick(e, permalink.userId!);
+                        },
+                    };
+                } else {
+                    // for events, rooms etc. (anything other than users)
+                    const localHref = tryTransformPermalinkToLocalHref(href);
+                    if (localHref !== href) {
+                        // it could be converted to a localHref -> therefore handle locally
                         return {
                             click: function (e: MouseEvent) {
-                                onUserClick(e, permalink.userId!);
+                                e.preventDefault();
+                                window.location.hash = localHref;
                             },
                         };
-                    } else {
-                        // for events, rooms etc. (anything other than users)
-                        const localHref = tryTransformPermalinkToLocalHref(href);
-                        if (localHref !== href) {
-                            // it could be converted to a localHref -> therefore handle locally
-                            return {
-                                click: function (e: MouseEvent) {
-                                    e.preventDefault();
-                                    window.location.hash = localHref;
-                                },
-                            };
-                        }
                     }
-                } catch {
-                    // OK fine, it's not actually a permalink
                 }
-                break;
+            } catch {
+                // OK fine, it's not actually a permalink
             }
-            case Type.UserId:
-                return {
-                    click: function (e: MouseEvent) {
-                        const userId = parsePermalink(href)?.userId ?? href;
-                        if (userId) onUserClick(e, userId);
-                    },
-                };
-            case Type.RoomAlias:
-                return {
-                    click: function (e: MouseEvent) {
-                        const alias = parsePermalink(href)?.roomIdOrAlias ?? href;
-                        if (alias) onAliasClick(e, alias);
-                    },
-                };
+            break;
         }
+        case Type.UserId:
+            return {
+                click: function (e: MouseEvent) {
+                    e.preventDefault();
+                    const userId = parsePermalink(href)?.userId ?? href;
+                    if (userId) onUserClick(e, userId);
+                },
+            };
+        case Type.RoomAlias:
+            return {
+                click: function (e: MouseEvent) {
+                    e.preventDefault();
+                    const alias = parsePermalink(href)?.roomIdOrAlias ?? href;
+                    if (alias) onAliasClick(e, alias);
+                },
+            };
+    }
 
-        return {};
-    },
+    return {};
+}
+
+// linkify-react doesn't respect `events` and needs it mapping to React attributes
+// so we need to manually add the click handler to the attributes
+// https://linkify.js.org/docs/linkify-react.html#events
+function attributes(href: string, type: string): Record<string, unknown> {
+    const attrs: Record<string, unknown> = {
+        rel: "noreferrer noopener",
+    };
+
+    const options = events(href, type);
+    if (options?.click) {
+        attrs.onClick = options.click;
+    }
+
+    return attrs;
+}
+
+export const options: Opts = {
+    events,
 
     formatHref: function (href: string, type: Type | string): string {
         switch (type) {
@@ -194,9 +216,7 @@ export const options: Opts = {
         }
     },
 
-    attributes: {
-        rel: "noreferrer noopener",
-    },
+    attributes,
 
     ignoreTags: ["a", "pre", "code"],
 
@@ -274,3 +294,4 @@ registerCustomProtocol("mxc", false);
 
 export const linkify = linkifyjs;
 export const _linkifyString = linkifyString;
+export const _linkifyHtml = linkifyHtml;
diff --git a/src/models/Call.ts b/src/models/Call.ts
index 70c7e4779f..39e4aa4b9a 100644
--- a/src/models/Call.ts
+++ b/src/models/Call.ts
@@ -10,30 +10,25 @@ import {
     TypedEventEmitter,
     RoomEvent,
     RoomStateEvent,
-    EventType,
     type MatrixClient,
     type IMyDevice,
     type Room,
     type RoomMember,
 } from "matrix-js-sdk/src/matrix";
 import { KnownMembership, type Membership } from "matrix-js-sdk/src/types";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger as rootLogger } from "matrix-js-sdk/src/logger";
 import { secureRandomString } from "matrix-js-sdk/src/randomstring";
 import { CallType } from "matrix-js-sdk/src/webrtc/call";
-import { NamespacedValue } from "matrix-js-sdk/src/NamespacedValue";
 import { type IWidgetApiRequest, type ClientWidgetApi, type IWidgetData } from "matrix-widget-api";
 import {
-    MatrixRTCSession,
+    type MatrixRTCSession,
     MatrixRTCSessionEvent,
-    type CallMembership,
     MatrixRTCSessionManagerEvents,
-    type ICallNotifyContent,
 } from "matrix-js-sdk/src/matrixrtc";
 
 import type EventEmitter from "events";
 import type { IApp } from "../stores/WidgetStore";
 import SettingsStore from "../settings/SettingsStore";
-import MediaDeviceHandler, { MediaDeviceKindEnum } from "../MediaDeviceHandler";
 import { timeout } from "../utils/promise";
 import WidgetUtils from "../utils/WidgetUtils";
 import { WidgetType } from "../widgets/WidgetType";
@@ -43,14 +38,15 @@ import { WidgetMessagingStore, WidgetMessagingStoreEvent } from "../stores/widge
 import ActiveWidgetStore, { ActiveWidgetStoreEvent } from "../stores/ActiveWidgetStore";
 import { getCurrentLanguage } from "../languageHandler";
 import { Anonymity, PosthogAnalytics } from "../PosthogAnalytics";
-import { UPDATE_EVENT } from "../stores/AsyncStore";
-import { getJoinedNonFunctionalMembers } from "../utils/room/getJoinedNonFunctionalMembers";
 import { isVideoRoom } from "../utils/video-rooms";
 import { FontWatcher } from "../settings/watchers/FontWatcher";
 import { type JitsiCallMemberContent, JitsiCallMemberEventType } from "../call-types";
 import SdkConfig from "../SdkConfig.ts";
+import DMRoomMap from "../utils/DMRoomMap.ts";
+import { type WidgetMessaging, WidgetMessagingEvent } from "../stores/widgets/WidgetMessaging.ts";
 
 const TIMEOUT_MS = 16000;
+const logger = rootLogger.getChild("models/Call");
 
 // Waits until an event is emitted satisfying the given predicate
 const waitForEvent = async (
@@ -90,6 +86,7 @@ export enum CallEvent {
     Participants = "participants",
     Close = "close",
     Destroy = "destroy",
+    CallTypeChanged = "call_type_changed",
 }
 
 interface CallEventHandlerMap {
@@ -100,6 +97,7 @@ interface CallEventHandlerMap {
     ) => void;
     [CallEvent.Close]: () => void;
     [CallEvent.Destroy]: () => void;
+    [CallEvent.CallTypeChanged]: (callType: CallType) => void;
 }
 
 /**
@@ -109,20 +107,32 @@ export abstract class Call extends TypedEventEmitter<CallEvent, CallEventHandler
     protected readonly widgetUid: string;
     protected readonly room: Room;
 
+    private _callType: CallType = CallType.Video;
+    public get callType(): CallType {
+        return this._callType;
+    }
+
+    protected set callType(callType: CallType) {
+        if (this._callType !== callType) {
+            this.emit(CallEvent.CallTypeChanged, callType);
+        }
+        this._callType = callType;
+    }
+
     /**
      * The time after which device member state should be considered expired.
      */
     public abstract readonly STUCK_DEVICE_TIMEOUT_MS: number;
 
-    private _messaging: ClientWidgetApi | null = null;
+    private _widgetApi: ClientWidgetApi | null = null;
     /**
-     * The widget's messaging, or null if disconnected.
+     * The widget API interface to the widget, or null if disconnected.
      */
-    protected get messaging(): ClientWidgetApi | null {
-        return this._messaging;
+    protected get widgetApi(): ClientWidgetApi | null {
+        return this._widgetApi;
     }
-    private set messaging(value: ClientWidgetApi | null) {
-        this._messaging = value;
+    private set widgetApi(value: ClientWidgetApi | null) {
+        this._widgetApi = value;
     }
 
     public get roomId(): string {
@@ -195,18 +205,6 @@ export abstract class Call extends TypedEventEmitter<CallEvent, CallEventHandler
      */
     public abstract clean(): Promise<void>;
 
-    /**
-     * Contacts the widget to connect to the call or prompt the user to connect to the call.
-     * @param {MediaDeviceInfo | null} audioInput The audio input to use, or
-     *   null to start muted.
-     * @param {MediaDeviceInfo | null} audioInput The video input to use, or
-     *   null to start muted.
-     */
-    protected abstract performConnection(
-        audioInput: MediaDeviceInfo | null,
-        videoInput: MediaDeviceInfo | null,
-    ): Promise<void>;
-
     /**
      * Contacts the widget to disconnect from the call.
      */
@@ -214,55 +212,77 @@ export abstract class Call extends TypedEventEmitter<CallEvent, CallEventHandler
 
     /**
      * Starts the communication between the widget and the call.
-     * The call then waits for the necessary requirements to actually perform the connection
-     * or connects right away depending on the call type. (Jitsi, Legacy, ElementCall...)
-     * It uses the media devices set in MediaDeviceHandler.
-     * The widget associated with the call must be active
-     * for this to succeed.
+     * The widget associated with the call must be active for this to succeed.
      * Only call this if the call state is: ConnectionState.Disconnected.
+     * @param _params Widget generation parameters are unused in this abstract class.
+     * @returns The ClientWidgetApi for this call.
      */
-    public async start(): Promise<void> {
-        const { [MediaDeviceKindEnum.AudioInput]: audioInputs, [MediaDeviceKindEnum.VideoInput]: videoInputs } =
-            (await MediaDeviceHandler.getDevices())!;
-
-        let audioInput: MediaDeviceInfo | null = null;
-        if (!MediaDeviceHandler.startWithAudioMuted) {
-            const deviceId = MediaDeviceHandler.getAudioInput();
-            audioInput = audioInputs.find((d) => d.deviceId === deviceId) ?? audioInputs[0] ?? null;
-        }
-        let videoInput: MediaDeviceInfo | null = null;
-        if (!MediaDeviceHandler.startWithVideoMuted) {
-            const deviceId = MediaDeviceHandler.getVideoInput();
-            videoInput = videoInputs.find((d) => d.deviceId === deviceId) ?? videoInputs[0] ?? null;
-        }
-
+    public async start(_params?: WidgetGenerationParameters): Promise<ClientWidgetApi> {
         const messagingStore = WidgetMessagingStore.instance;
-        this.messaging = messagingStore.getMessagingForUid(this.widgetUid) ?? null;
-        if (!this.messaging) {
-            // The widget might still be initializing, so wait for it.
+        const startTime = performance.now();
+        let messaging: WidgetMessaging | undefined = messagingStore.getMessagingForUid(this.widgetUid);
+        // The widget might still be initializing, so wait for it in an async
+        // event loop. We need the messaging to be both present and started
+        // (have a connected widget API), so register listeners for both cases.
+        while (!messaging?.widgetApi) {
+            if (messaging) logger.debug(`Messaging present but not yet started for ${this.widgetUid}`);
+            else logger.debug(`No messaging yet for ${this.widgetUid}`);
+            const recheck = Promise.withResolvers<void>();
+            const currentMessaging = messaging;
+
+            // Maybe the messaging is present but not yet started. In this case,
+            // check again for a widget API as soon as it starts.
+            const onStart = (): void => recheck.resolve();
+            currentMessaging?.on(WidgetMessagingEvent.Start, onStart);
+
+            // Maybe the messaging is not present at all. It's also entirely
+            // possible (as shown in React strict mode) that the messaging could
+            // be abandoned and replaced by an entirely new messaging object
+            // while we were waiting for the original one to start. We need to
+            // react to store updates in either case.
+            const onStoreMessaging = (uid: string, m: WidgetMessaging): void => {
+                if (uid === this.widgetUid) {
+                    messagingStore.off(WidgetMessagingStoreEvent.StoreMessaging, onStoreMessaging);
+                    messaging = m; // Check the new messaging object on the next iteration of the loop
+                    recheck.resolve();
+                }
+            };
+            messagingStore.on(WidgetMessagingStoreEvent.StoreMessaging, onStoreMessaging);
+
+            // Race both of the above recheck signals against a timeout.
+            const timeout = setTimeout(
+                () => recheck.reject(new Error(`Widget for call in ${this.roomId} not started; timed out`)),
+                TIMEOUT_MS - (performance.now() - startTime),
+            );
+
             try {
-                await waitForEvent(
-                    messagingStore,
-                    WidgetMessagingStoreEvent.StoreMessaging,
-                    (uid: string, widgetApi: ClientWidgetApi) => {
-                        if (uid === this.widgetUid) {
-                            this.messaging = widgetApi;
-                            return true;
-                        }
-                        return false;
-                    },
-                );
-            } catch (e) {
-                throw new Error(`Failed to bind call widget in room ${this.roomId}: ${e}`);
+                await recheck.promise;
+            } finally {
+                currentMessaging?.off(WidgetMessagingEvent.Start, onStart);
+                messagingStore.off(WidgetMessagingStoreEvent.StoreMessaging, onStoreMessaging);
+                clearTimeout(timeout);
             }
         }
-        await this.performConnection(audioInput, videoInput);
 
+        logger.debug(`Widget ${this.widgetUid} now ready`);
+        return (this.widgetApi = messaging.widgetApi);
+    }
+
+    protected setConnected(): void {
         this.room.on(RoomEvent.MyMembership, this.onMyMembership);
         window.addEventListener("beforeunload", this.beforeUnload);
         this.connectionState = ConnectionState.Connected;
     }
 
+    /**
+     * Manually marks the call as disconnected.
+     */
+    protected setDisconnected(): void {
+        this.room.off(RoomEvent.MyMembership, this.onMyMembership);
+        window.removeEventListener("beforeunload", this.beforeUnload);
+        this.connectionState = ConnectionState.Disconnected;
+    }
+
     /**
      * Disconnects the user from the call.
      */
@@ -275,20 +295,11 @@ export abstract class Call extends TypedEventEmitter<CallEvent, CallEventHandler
         this.close();
     }
 
-    /**
-     * Manually marks the call as disconnected.
-     */
-    public setDisconnected(): void {
-        this.room.off(RoomEvent.MyMembership, this.onMyMembership);
-        window.removeEventListener("beforeunload", this.beforeUnload);
-        this.connectionState = ConnectionState.Disconnected;
-    }
-
     /**
      * Stops further communication with the widget and tells the UI to close.
      */
     protected close(): void {
-        this.messaging = null;
+        this.widgetApi = null;
         this.emit(CallEvent.Close);
     }
 
@@ -310,7 +321,7 @@ export abstract class Call extends TypedEventEmitter<CallEvent, CallEventHandler
 
     private readonly onStopMessaging = (uid: string): void => {
         if (uid === this.widgetUid && this.connected) {
-            logger.log("The widget died; treating this as a user hangup");
+            logger.debug("The widget died; treating this as a user hangup");
             this.setDisconnected();
             this.close();
         }
@@ -469,81 +480,26 @@ export class JitsiCall extends Call {
         });
     }
 
-    protected async performConnection(
-        audioInput: MediaDeviceInfo | null,
-        videoInput: MediaDeviceInfo | null,
-    ): Promise<void> {
-        // Ensure that the messaging doesn't get stopped while we're waiting for responses
-        const dontStopMessaging = new Promise<void>((resolve, reject) => {
-            const messagingStore = WidgetMessagingStore.instance;
-
-            const listener = (uid: string): void => {
-                if (uid === this.widgetUid) {
-                    cleanup();
-                    reject(new Error("Messaging stopped"));
-                }
-            };
-            const done = (): void => {
-                cleanup();
-                resolve();
-            };
-            const cleanup = (): void => {
-                messagingStore.off(WidgetMessagingStoreEvent.StopMessaging, listener);
-                this.off(CallEvent.ConnectionState, done);
-            };
-
-            messagingStore.on(WidgetMessagingStoreEvent.StopMessaging, listener);
-            this.on(CallEvent.ConnectionState, done);
-        });
-
-        // Empirically, it's possible for Jitsi Meet to crash instantly at startup,
-        // sending a hangup event that races with the rest of this method, so we need
-        // to add the hangup listener now rather than later
-        this.messaging!.on(`action:${ElementWidgetActions.HangupCall}`, this.onHangup);
-
-        // Actually perform the join
-        const response = waitForEvent(
-            this.messaging!,
-            `action:${ElementWidgetActions.JoinCall}`,
-            (ev: CustomEvent<IWidgetApiRequest>) => {
-                ev.preventDefault();
-                this.messaging!.transport.reply(ev.detail, {}); // ack
-                return true;
-            },
-        );
-        const request = this.messaging!.transport.send(ElementWidgetActions.JoinCall, {
-            audioInput: audioInput?.label ?? null,
-            videoInput: videoInput?.label ?? null,
-        });
-        try {
-            await Promise.race([Promise.all([request, response]), dontStopMessaging]);
-        } catch (e) {
-            // If it timed out, clean up our advance preparations
-            this.messaging!.off(`action:${ElementWidgetActions.HangupCall}`, this.onHangup);
-
-            if (this.messaging!.transport.ready) {
-                // The messaging still exists, which means Jitsi might still be going in the background
-                this.messaging!.transport.send(ElementWidgetActions.HangupCall, { force: true });
-            }
-
-            throw new Error(`Failed to join call in room ${this.roomId}: ${e}`);
-        }
-
+    public async start(): Promise<ClientWidgetApi> {
+        const widgetApi = await super.start();
+        widgetApi.on(`action:${ElementWidgetActions.JoinCall}`, this.onJoin);
+        widgetApi.on(`action:${ElementWidgetActions.HangupCall}`, this.onHangup);
         ActiveWidgetStore.instance.on(ActiveWidgetStoreEvent.Dock, this.onDock);
         ActiveWidgetStore.instance.on(ActiveWidgetStoreEvent.Undock, this.onUndock);
+        return widgetApi;
     }
 
     protected async performDisconnection(): Promise<void> {
         const response = waitForEvent(
-            this.messaging!,
+            this.widgetApi!,
             `action:${ElementWidgetActions.HangupCall}`,
             (ev: CustomEvent<IWidgetApiRequest>) => {
                 ev.preventDefault();
-                this.messaging!.transport.reply(ev.detail, {}); // ack
+                this.widgetApi!.transport.reply(ev.detail, {}); // ack
                 return true;
             },
         );
-        const request = this.messaging!.transport.send(ElementWidgetActions.HangupCall, {});
+        const request = this.widgetApi!.transport.send(ElementWidgetActions.HangupCall, {});
         try {
             await Promise.all([request, response]);
         } catch (e) {
@@ -551,18 +507,17 @@ export class JitsiCall extends Call {
         }
     }
 
-    public setDisconnected(): void {
-        // During tests this.messaging can be undefined
-        this.messaging?.off(`action:${ElementWidgetActions.HangupCall}`, this.onHangup);
+    public close(): void {
+        this.widgetApi!.off(`action:${ElementWidgetActions.JoinCall}`, this.onJoin);
+        this.widgetApi!.off(`action:${ElementWidgetActions.HangupCall}`, this.onHangup);
         ActiveWidgetStore.instance.off(ActiveWidgetStoreEvent.Dock, this.onDock);
         ActiveWidgetStore.instance.off(ActiveWidgetStoreEvent.Undock, this.onUndock);
-
-        super.setDisconnected();
+        super.close();
     }
 
     public destroy(): void {
         this.room.off(RoomStateEvent.Update, this.onRoomState);
-        this.on(CallEvent.ConnectionState, this.onConnectionState);
+        this.off(CallEvent.ConnectionState, this.onConnectionState);
         if (this.participantsExpirationTimer !== null) {
             clearTimeout(this.participantsExpirationTimer);
             this.participantsExpirationTimer = null;
@@ -586,7 +541,7 @@ export class JitsiCall extends Call {
             // Re-add this device every so often so our video member event doesn't become stale
             this.resendDevicesTimer = window.setInterval(
                 async (): Promise<void> => {
-                    logger.log(`Resending video member event for ${this.roomId}`);
+                    logger.debug(`Resending video member event for ${this.roomId}`);
                     await this.addOurDevice();
                 },
                 (this.STUCK_DEVICE_TIMEOUT_MS * 3) / 4,
@@ -605,13 +560,19 @@ export class JitsiCall extends Call {
 
     private readonly onDock = async (): Promise<void> => {
         // The widget is no longer a PiP, so let's restore the default layout
-        await this.messaging!.transport.send(ElementWidgetActions.TileLayout, {});
+        await this.widgetApi!.transport.send(ElementWidgetActions.TileLayout, {});
     };
 
     private readonly onUndock = async (): Promise<void> => {
         // The widget has become a PiP, so let's switch Jitsi to spotlight mode
         // to only show the active speaker and economize on space
-        await this.messaging!.transport.send(ElementWidgetActions.SpotlightLayout, {});
+        await this.widgetApi!.transport.send(ElementWidgetActions.SpotlightLayout, {});
+    };
+
+    private readonly onJoin = (ev: CustomEvent<IWidgetApiRequest>): void => {
+        ev.preventDefault();
+        this.widgetApi!.transport.reply(ev.detail, {}); // ack
+        this.setConnected();
     };
 
     private readonly onHangup = async (ev: CustomEvent<IWidgetApiRequest>): Promise<void> => {
@@ -620,33 +581,52 @@ export class JitsiCall extends Call {
         if (this.connectionState === ConnectionState.Disconnecting) return;
 
         ev.preventDefault();
-
-        // In case this hangup is caused by Jitsi Meet crashing at startup,
-        // wait for the connection event in order to avoid racing
-        if (this.connectionState === ConnectionState.Disconnected) {
-            await waitForEvent(this, CallEvent.ConnectionState);
-        }
-
-        this.messaging!.transport.reply(ev.detail, {}); // ack
+        this.widgetApi!.transport.reply(ev.detail, {}); // ack
         this.setDisconnected();
-        this.close();
-        // In video rooms we immediately want to restart the call after hangup
-        // The lobby will be shown again and it connects to all signals from Jitsi.
-        if (isVideoRoom(this.room)) {
-            this.start();
-        }
+        if (!isVideoRoom(this.room)) this.close();
     };
 }
 
+export enum ElementCallIntent {
+    StartCall = "start_call",
+    JoinExisting = "join_existing",
+    StartCallDM = "start_call_dm",
+    StartCallDMVoice = "start_call_dm_voice",
+    JoinExistingDM = "join_existing_dm",
+    JoinExistingDMVoice = "join_existing_dm_voice",
+}
+
+/**
+ * Parameters to be passed during widget creation.
+ * These parameters are hints only, and may not be accepted by the implementation.
+ */
+export interface WidgetGenerationParameters {
+    /**
+     * Skip showing the lobby screen of a call.
+     */
+    skipLobby?: boolean;
+    /**
+     * Does the user intent to start a voice call?
+     */
+    voiceOnly?: boolean;
+}
+
+/**
+ * Parameters to be passed during widget creation.
+ * These parameters are hints only, and may not be accepted by the implementation.
+ */
+export interface WidgetGenerationParameters {
+    /**
+     * Skip showing the lobby screen of a call.
+     */
+    skipLobby?: boolean;
+}
+
 /**
  * A group call using MSC3401 and Element Call as a backend.
  * (somewhat cheekily named)
  */
 export class ElementCall extends Call {
-    // TODO this is only there to support backwards compatibility in timeline rendering
-    // this should not be part of this class since it has nothing to do with it.
-    public static readonly CALL_EVENT_TYPE = new NamespacedValue(null, EventType.GroupCallPrefix);
-    public static readonly MEMBER_EVENT_TYPE = new NamespacedValue(null, EventType.GroupCallMemberPrefix);
     public readonly STUCK_DEVICE_TIMEOUT_MS = 1000 * 60 * 60; // 1 hour
 
     private settingsStoreCallEncryptionWatcher?: string;
@@ -660,21 +640,121 @@ export class ElementCall extends Call {
         this.checkDestroy();
     }
 
-    private static generateWidgetUrl(client: MatrixClient, roomId: string): URL {
-        const baseUrl = window.location.href;
-        let url = new URL("./widgets/element-call/index.html#", baseUrl); // this strips hash fragment from baseUrl
+    public widgetGenerationParameters: WidgetGenerationParameters = {};
 
-        const elementCallUrl = SettingsStore.getValue("Developer.elementCallUrl");
-        if (elementCallUrl) url = new URL(elementCallUrl);
+    /**
+     * Calculate the correct intent (and associated parameters) for an Element Call room. Paarameters
+     * will be applied to the `params` instance.
+     *
+     * @param params Existing URL parameters
+     * @param client The current client.
+     * @param roomId The room ID for the call.
+     */
+    private static appendRoomParams(
+        params: URLSearchParams,
+        client: MatrixClient,
+        roomId: string,
+        { voiceOnly }: WidgetGenerationParameters,
+    ): void {
+        const room = client.getRoom(roomId);
+        if (!room) {
+            // If the room isn't known, or the room is a video room then skip setting an intent.
+            return;
+        } else if (isVideoRoom(room)) {
+            // Video rooms already exist, so just treat as if we're joining a group call.
+            params.append("intent", ElementCallIntent.JoinExisting);
+            // Video rooms should always return to lobby.
+            params.append("returnToLobby", "true");
+            // Never skip the lobby, we always want to give the caller a chance to explicitly join.
+            params.append("skipLobby", "false");
+            // Never preload, as per below warning.
+            params.append("preload", "false");
+            return;
+        }
+        const isDM = !!DMRoomMap.shared().getUserIdForRoomId(room.roomId);
+        const oldestCallMember = client.matrixRTC.getRoomSession(room).getOldestMembership();
+        const hasCallStarted = !!oldestCallMember && oldestCallMember.sender !== client.getSafeUserId();
+        // XXX: @element-hq/element-call-embedded <= 0.15.0 sets the wrong parameter for
+        // preload by default so we override here. This can be removed when that package
+        // is released and upgraded.
+        if (isDM) {
+            if (hasCallStarted) {
+                params.append(
+                    "intent",
+                    voiceOnly ? ElementCallIntent.JoinExistingDMVoice : ElementCallIntent.JoinExistingDM,
+                );
+                params.append("preload", "false");
+            } else {
+                params.append("intent", voiceOnly ? ElementCallIntent.StartCallDMVoice : ElementCallIntent.StartCallDM);
+                params.append("preload", "false");
+            }
+        } else {
+            // Group chats do not have a voice option.
+            if (hasCallStarted) {
+                params.append("intent", ElementCallIntent.JoinExisting);
+                params.append("preload", "false");
+            } else {
+                params.append("intent", ElementCallIntent.StartCall);
+                params.append("preload", "false");
+            }
+        }
+    }
+
+    /**
+     * Calculate the correct analytics parameters for an Element Call room. Paarameters
+     * will be applied to the `params` instance.
+     *
+     * @param params Existing URL parameters
+     * @param client The current client.
+     */
+    private static appendAnalyticsParams(params: URLSearchParams, client: MatrixClient): void {
+        const posthogConfig = SdkConfig.get("posthog");
+        if (!posthogConfig || PosthogAnalytics.instance.getAnonymity() === Anonymity.Disabled) {
+            return;
+        }
+
+        const accountAnalyticsData = client.getAccountData(PosthogAnalytics.ANALYTICS_EVENT_TYPE)?.getContent();
+        // The analyticsID is passed directly to element call (EC) since this codepath is only for EC and no other widget.
+        // We really don't want the same analyticID's for the EC and EW posthog instances (Data on posthog should be limited/anonymized as much as possible).
+        // This is prohibited in EC where a hashed version of the analyticsID is used for the actual posthog identification.
+        // We can pass the raw EW analyticsID here since we need to trust EC with not sending sensitive data to posthog (EC has access to more sensible data than the analyticsID e.g. the username)
+        const analyticsID: string = accountAnalyticsData?.pseudonymousAnalyticsOptIn ? accountAnalyticsData?.id : "";
+
+        params.append("analyticsID", analyticsID); // Legacy, deprecated in favour of posthogUserId
+        params.append("posthogUserId", analyticsID);
+        params.append("posthogApiHost", posthogConfig.api_host);
+        params.append("posthogApiKey", posthogConfig.project_api_key);
+
+        // We gate passing sentry behind analytics consent as EC shares data automatically without user-consent,
+        // unlike EW where data is shared upon an intentional user action (rageshake).
+        const sentryConfig = SdkConfig.get("sentry");
+        if (sentryConfig) {
+            params.append("sentryDsn", sentryConfig.dsn);
+            params.append("sentryEnvironment", sentryConfig.environment ?? "");
+        }
+    }
+
+    /**
+     * Generate the correct Element Call widget URL for creating or joining a call in this room.
+     * Unless `Developer.elementCallUrl` is set, the widget will use the embedded Element Call package.
+     *
+     * @param client
+     * @param roomId
+     * @param opts
+     * @returns
+     */
+    private static generateWidgetUrl(client: MatrixClient, roomId: string, opts: WidgetGenerationParameters = {}): URL {
+        const elementCallUrlOverride = SettingsStore.getValue("Developer.elementCallUrl");
+        const url = elementCallUrlOverride
+            ? new URL(elementCallUrlOverride)
+            : // this strips hash fragment from baseUrl
+              new URL("./widgets/element-call/index.html#", window.location.href);
 
         // Splice together the Element Call URL for this call
+        // Parameters can be found in https://github.com/element-hq/element-call/blob/livekit/src/UrlParams.ts.
         const params = new URLSearchParams({
-            embed: "true", // We're embedding EC within another application
             // Template variables are used, so that this can be configured using the widget data.
-            skipLobby: "$skipLobby", // Skip the lobby in case we show a lobby component of our own.
-            returnToLobby: "$returnToLobby", // Returns to the lobby (instead of blank screen) when the call ends. (For video rooms)
             perParticipantE2EE: "$perParticipantE2EE",
-            hideHeader: "true", // Hide the header since our room header is enough
             userId: client.getUserId()!,
             deviceId: client.getDeviceId()!,
             roomId: roomId,
@@ -684,41 +764,28 @@ export class ElementCall extends Call {
             theme: "$org.matrix.msc2873.client_theme",
         });
 
+        if (typeof opts.skipLobby === "boolean") {
+            params.set("skipLobby", opts.skipLobby.toString());
+        }
+
         const rageshakeSubmitUrl = SdkConfig.get("bug_report_endpoint_url");
         if (rageshakeSubmitUrl) {
             params.append("rageshakeSubmitUrl", rageshakeSubmitUrl);
         }
 
-        const posthogConfig = SdkConfig.get("posthog");
-        if (posthogConfig && PosthogAnalytics.instance.getAnonymity() !== Anonymity.Disabled) {
-            const accountAnalyticsData = client.getAccountData(PosthogAnalytics.ANALYTICS_EVENT_TYPE)?.getContent();
-            // The analyticsID is passed directly to element call (EC) since this codepath is only for EC and no other widget.
-            // We really don't want the same analyticID's for the EC and EW posthog instances (Data on posthog should be limited/anonymized as much as possible).
-            // This is prohibited in EC where a hashed version of the analyticsID is used for the actual posthog identification.
-            // We can pass the raw EW analyticsID here since we need to trust EC with not sending sensitive data to posthog (EC has access to more sensible data than the analyticsID e.g. the username)
-            const analyticsID: string = accountAnalyticsData?.pseudonymousAnalyticsOptIn
-                ? accountAnalyticsData?.id
-                : "";
-
-            params.append("analyticsID", analyticsID); // Legacy, deprecated in favour of posthogUserId
-            params.append("posthogUserId", analyticsID);
-            params.append("posthogApiHost", posthogConfig.api_host);
-            params.append("posthogApiKey", posthogConfig.project_api_key);
-
-            // We gate passing sentry behind analytics consent as EC shares data automatically without user-consent,
-            // unlike EW where data is shared upon an intentional user action (rageshake).
-            const sentryConfig = SdkConfig.get("sentry");
-            if (sentryConfig) {
-                params.append("sentryDsn", sentryConfig.dsn);
-                params.append("sentryEnvironment", sentryConfig.environment ?? "");
-            }
-        }
-
         if (SettingsStore.getValue("fallbackICEServerAllowed")) {
             params.append("allowIceFallback", "true");
         }
-        if (SettingsStore.getValue("feature_allow_screen_share_only_mode")) {
-            params.append("allowVoipWithNoMedia", "true");
+
+        const echoCancellation = SettingsStore.getValue("webrtc_audio_echoCancellation");
+        if (!echoCancellation) {
+            // the default is true, so only set if false
+            params.append("echoCancellation", "false");
+        }
+        const noiseSuppression = SettingsStore.getValue("webrtc_audio_noiseSuppression");
+        if (!noiseSuppression) {
+            // the default is true, so only set if false
+            params.append("noiseSuppression", "false");
         }
 
         // Set custom fonts
@@ -733,6 +800,8 @@ export class ElementCall extends Call {
                 })
                 .forEach((font) => params.append("font", font));
         }
+        this.appendAnalyticsParams(params, client);
+        this.appendRoomParams(params, client, roomId, opts);
 
         const replacedUrl = params.toString().replace(/%24/g, "$");
         url.hash = `#?${replacedUrl}`;
@@ -740,34 +809,19 @@ export class ElementCall extends Call {
     }
 
     // Creates a new widget if there isn't any widget of typ Call in this room.
-    // Defaults for creating a new widget are: skipLobby = false
-    // When there is already a widget the current widget configuration will be used or can be overwritten
-    // by passing the according parameters (skipLobby).
-    private static createOrGetCallWidget(
-        roomId: string,
-        client: MatrixClient,
-        skipLobby: boolean | undefined,
-        returnToLobby: boolean | undefined,
-    ): IApp {
+    private static createOrGetCallWidget(roomId: string, client: MatrixClient): IApp {
         const ecWidget = WidgetStore.instance.getApps(roomId).find((app) => WidgetType.CALL.matches(app.type));
         if (ecWidget) {
             // Always update the widget data because even if the widget is already created,
             // we might have settings changes that update the widget.
-            const overwrites: IWidgetData = {};
-            if (skipLobby !== undefined) {
-                overwrites.skipLobby = skipLobby;
-            }
-            if (returnToLobby !== undefined) {
-                overwrites.returnToLobby = returnToLobby;
-            }
-            ecWidget.data = ElementCall.getWidgetData(client, roomId, ecWidget?.data ?? {}, overwrites);
+            ecWidget.data = ElementCall.getWidgetData(client, roomId, ecWidget?.data ?? {}, {});
             return ecWidget;
         }
 
         // To use Element Call without touching room state, we create a virtual
         // widget (one that doesn't have a corresponding state event)
         const url = ElementCall.generateWidgetUrl(client, roomId);
-        const createdWidget = WidgetStore.instance.addVirtualWidget(
+        return WidgetStore.instance.addVirtualWidget(
             {
                 id: secureRandomString(24), // So that it's globally unique
                 creatorUserId: client.getUserId()!,
@@ -775,20 +829,41 @@ export class ElementCall extends Call {
                 type: WidgetType.CALL.preferred,
                 url: url.toString(),
                 waitForIframeLoad: false,
-                data: ElementCall.getWidgetData(
-                    client,
-                    roomId,
-                    {},
-                    {
-                        skipLobby: skipLobby ?? false,
-                        returnToLobby: returnToLobby ?? false,
-                    },
-                ),
+                data: ElementCall.getWidgetData(client, roomId, {}, {}),
             },
             roomId,
         );
-        WidgetStore.instance.emit(UPDATE_EVENT, null);
-        return createdWidget;
+    }
+
+    /**
+     * Get the correct intent for a widget, so that Element Call presents the correct
+     * default config.
+     * @param client The matrix client.
+     * @param roomId
+     * @param voiceOnly Should the call be voice-only, or video (default).
+     */
+    public static getWidgetIntent(client: MatrixClient, roomId: string, voiceOnly?: boolean): ElementCallIntent {
+        const room = client.getRoom(roomId);
+        if (room !== null && !isVideoRoom(room)) {
+            const isDM = !!DMRoomMap.shared().getUserIdForRoomId(room.roomId);
+            const oldestCallMember = client.matrixRTC.getRoomSession(room).getOldestMembership();
+            const hasCallStarted = !!oldestCallMember && oldestCallMember.sender !== client.getSafeUserId();
+            if (isDM) {
+                if (hasCallStarted) {
+                    return voiceOnly ? ElementCallIntent.JoinExistingDMVoice : ElementCallIntent.JoinExistingDM;
+                } else {
+                    return voiceOnly ? ElementCallIntent.StartCallDMVoice : ElementCallIntent.StartCallDM;
+                }
+            } else {
+                if (hasCallStarted) {
+                    return ElementCallIntent.JoinExisting;
+                } else {
+                    return ElementCallIntent.StartCall;
+                }
+            }
+        }
+        // If unknown, default to joining an existing call.
+        return ElementCallIntent.JoinExisting;
     }
 
     private static getWidgetData(
@@ -796,6 +871,7 @@ export class ElementCall extends Call {
         roomId: string,
         currentData: IWidgetData,
         overwriteData: IWidgetData,
+        voiceOnly?: boolean,
     ): IWidgetData {
         let perParticipantE2EE = false;
         if (
@@ -803,9 +879,13 @@ export class ElementCall extends Call {
             !SettingsStore.getValue("feature_disable_call_per_sender_encryption")
         )
             perParticipantE2EE = true;
+
+        const intent = ElementCall.getWidgetIntent(client, roomId, voiceOnly);
+
         return {
             ...currentData,
             ...overwriteData,
+            intent,
             perParticipantE2EE,
         };
     }
@@ -831,7 +911,7 @@ export class ElementCall extends Call {
         this.updateParticipants();
     }
 
-    public static get(room: Room): ElementCall | null {
+    public static get(room: Room, voiceOnly?: boolean): ElementCall | null {
         const apps = WidgetStore.instance.getApps(room.roomId);
         const hasEcWidget = apps.some((app) => WidgetType.CALL.matches(app.type));
         const session = room.client.matrixRTC.getRoomSession(room);
@@ -842,97 +922,58 @@ export class ElementCall extends Call {
         // - or this is a call room. Then we also always want to show a call.
         if (hasEcWidget || session.memberships.length !== 0 || room.isCallRoom()) {
             // create a widget for the case we are joining a running call and don't have on yet.
-            const availableOrCreatedWidget = ElementCall.createOrGetCallWidget(
-                room.roomId,
-                room.client,
-                undefined,
-                isVideoRoom(room),
-            );
+            const availableOrCreatedWidget = ElementCall.createOrGetCallWidget(room.roomId, room.client);
             return new ElementCall(session, availableOrCreatedWidget, room.client);
         }
 
         return null;
     }
 
-    public static create(room: Room, skipLobby = false): void {
-        ElementCall.createOrGetCallWidget(room.roomId, room.client, skipLobby, isVideoRoom(room));
+    public static create(room: Room): void {
+        ElementCall.createOrGetCallWidget(room.roomId, room.client);
     }
 
-    protected async sendCallNotify(): Promise<void> {
-        const room = this.room;
-        const existingOtherRoomCallMembers = MatrixRTCSession.callMembershipsForRoom(room).filter(
-            // filter all memberships where the application is m.call and the call_id is ""
-            (m) => {
-                const isRoomCallMember = m.application === "m.call" && m.callId === "";
-                const isThisDevice = m.deviceId === this.client.deviceId;
-                return isRoomCallMember && !isThisDevice;
-            },
-        );
-
-        const memberCount = getJoinedNonFunctionalMembers(room).length;
-        if (!isVideoRoom(room) && existingOtherRoomCallMembers.length === 0) {
-            // send ringing event
-            const content: ICallNotifyContent = {
-                "application": "m.call",
-                "m.mentions": { user_ids: [], room: true },
-                "notify_type": memberCount == 2 ? "ring" : "notify",
-                "call_id": "",
-            };
-
-            await room.client.sendEvent(room.roomId, EventType.CallNotify, content);
-        }
-    }
-
-    protected async performConnection(
-        audioInput: MediaDeviceInfo | null,
-        videoInput: MediaDeviceInfo | null,
-    ): Promise<void> {
-        this.messaging!.on(`action:${ElementWidgetActions.HangupCall}`, this.onHangup);
-        this.messaging!.once(`action:${ElementWidgetActions.Close}`, this.onClose);
-        this.messaging!.on(`action:${ElementWidgetActions.DeviceMute}`, this.onDeviceMute);
-
-        // TODO: if the widget informs us when the join button is clicked (widget action), so we can
-        // - set state to connecting
-        // - send call notify
-        const session = this.client.matrixRTC.getActiveRoomSession(this.room);
-        if (session) {
-            await waitForEvent(
-                session,
-                MatrixRTCSessionEvent.MembershipsChanged,
-                (_, newMemberships: CallMembership[]) =>
-                    newMemberships.some((m) => m.sender === this.client.getUserId()),
-                false, // allow user to wait as long as they want (no timeout)
-            );
-        } else {
-            await waitForEvent(
-                this.client.matrixRTC,
-                MatrixRTCSessionManagerEvents.SessionStarted,
-                (roomId: string, session: MatrixRTCSession) =>
-                    this.session.callId === session.callId && roomId === this.roomId,
-                false, // allow user to wait as long as they want (no timeout)
-            );
-        }
-        this.sendCallNotify();
+    public async start(widgetGenerationParameters: WidgetGenerationParameters): Promise<ClientWidgetApi> {
+        // Some parameters may only be set once the user has chosen to interact with the call, regenerate the URL
+        // at this point in case any of the parameters have changed.
+        this.widgetGenerationParameters = { ...this.widgetGenerationParameters, ...widgetGenerationParameters };
+        this.widget.url = ElementCall.generateWidgetUrl(
+            this.client,
+            this.roomId,
+            this.widgetGenerationParameters,
+        ).toString();
+        const widgetApi = await super.start();
+        widgetApi.on(`action:${ElementWidgetActions.JoinCall}`, this.onJoin);
+        widgetApi.on(`action:${ElementWidgetActions.HangupCall}`, this.onHangup);
+        widgetApi.on(`action:${ElementWidgetActions.Close}`, this.onClose);
+        widgetApi.on(`action:${ElementWidgetActions.DeviceMute}`, this.onDeviceMute);
+        return widgetApi;
     }
 
     protected async performDisconnection(): Promise<void> {
+        const response = waitForEvent(
+            this.widgetApi!,
+            `action:${ElementWidgetActions.HangupCall}`,
+            (ev: CustomEvent<IWidgetApiRequest>) => {
+                ev.preventDefault();
+                this.widgetApi!.transport.reply(ev.detail, {}); // ack
+                return true;
+            },
+        );
+        const request = this.widgetApi!.transport.send(ElementWidgetActions.HangupCall, {});
         try {
-            await this.messaging!.transport.send(ElementWidgetActions.HangupCall, {});
-            await waitForEvent(
-                this.session,
-                MatrixRTCSessionEvent.MembershipsChanged,
-                (_, newMemberships: CallMembership[]) =>
-                    !newMemberships.some((m) => m.sender === this.client.getUserId()),
-            );
+            await Promise.all([request, response]);
         } catch (e) {
             throw new Error(`Failed to hangup call in room ${this.roomId}: ${e}`);
         }
     }
 
-    public setDisconnected(): void {
-        this.messaging!.off(`action:${ElementWidgetActions.HangupCall}`, this.onHangup);
-        this.messaging!.off(`action:${ElementWidgetActions.DeviceMute}`, this.onDeviceMute);
-        super.setDisconnected();
+    public close(): void {
+        this.widgetApi!.off(`action:${ElementWidgetActions.JoinCall}`, this.onJoin);
+        this.widgetApi!.off(`action:${ElementWidgetActions.HangupCall}`, this.onHangup);
+        this.widgetApi!.off(`action:${ElementWidgetActions.Close}`, this.onClose);
+        this.widgetApi!.off(`action:${ElementWidgetActions.DeviceMute}`, this.onDeviceMute);
+        super.close();
     }
 
     public destroy(): void {
@@ -954,7 +995,10 @@ export class ElementCall extends Call {
         if (this.session.memberships.length === 0 && !this.presented && !this.room.isCallRoom()) this.destroy();
     };
 
-    private readonly onMembershipChanged = (): void => this.updateParticipants();
+    private readonly onMembershipChanged = (): void => {
+        this.updateParticipants();
+        this.callType = this.session.getConsensusCallIntent() === "audio" ? CallType.Voice : CallType.Video;
+    };
 
     private updateParticipants(): void {
         const participants = new Map<RoomMember, Set<string>>();
@@ -976,25 +1020,30 @@ export class ElementCall extends Call {
 
     private readonly onDeviceMute = (ev: CustomEvent<IWidgetApiRequest>): void => {
         ev.preventDefault();
-        this.messaging!.transport.reply(ev.detail, {}); // ack
+        this.widgetApi!.transport.reply(ev.detail, {}); // ack
+    };
+
+    private readonly onJoin = (ev: CustomEvent<IWidgetApiRequest>): void => {
+        ev.preventDefault();
+        this.widgetApi!.transport.reply(ev.detail, {}); // ack
+        this.setConnected();
     };
 
     private readonly onHangup = async (ev: CustomEvent<IWidgetApiRequest>): Promise<void> => {
+        // If we're already in the middle of a client-initiated disconnection,
+        // ignore the event
+        if (this.connectionState === ConnectionState.Disconnecting) return;
+
         ev.preventDefault();
-        this.messaging!.transport.reply(ev.detail, {}); // ack
+        this.widgetApi!.transport.reply(ev.detail, {}); // ack
         this.setDisconnected();
-        // In video rooms we immediately want to reconnect after hangup
-        // This starts the lobby again and connects to all signals from EC.
-        if (isVideoRoom(this.room)) {
-            this.start();
-        }
     };
 
     private readonly onClose = async (ev: CustomEvent<IWidgetApiRequest>): Promise<void> => {
         ev.preventDefault();
-        this.messaging!.transport.reply(ev.detail, {}); // ack
-        // User is done with the call; tell the UI to close it
-        this.close();
+        this.widgetApi!.transport.reply(ev.detail, {}); // ack
+        this.setDisconnected(); // Just in case the widget forgot to emit a hangup action (maybe it's in an error state)
+        this.close(); // User is done with the call; tell the UI to close it
     };
 
     public clean(): Promise<void> {
diff --git a/src/models/LocalRoom.ts b/src/models/LocalRoom.ts
index a8e2c255b2..960c7f634c 100644
--- a/src/models/LocalRoom.ts
+++ b/src/models/LocalRoom.ts
@@ -6,7 +6,14 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { type MatrixClient, Room, PendingEventOrdering } from "matrix-js-sdk/src/matrix";
+import {
+    type MatrixClient,
+    Room,
+    PendingEventOrdering,
+    MatrixEvent,
+    Direction,
+    EventType,
+} from "matrix-js-sdk/src/matrix";
 
 import { type Member } from "../utils/direct-messages";
 
@@ -50,4 +57,20 @@ export class LocalRoom extends Room {
     public get isError(): boolean {
         return this.state === LocalRoomState.ERROR;
     }
+
+    /**
+     * Check if encryption is enabled in this room.
+     * True if the room has any encryption state event
+     */
+    public isEncryptionEnabled(): boolean {
+        const roomState = this.getLiveTimeline().getState(Direction.Forward);
+        if (!roomState) return false;
+
+        const stateEvents = roomState.getStateEvents(EventType.RoomEncryption);
+        if (stateEvents.length === 0) return false;
+
+        // if there is an encryption state event, it is encrypted.
+        // Regardless of the content/algorithm, we assume it is encrypted.
+        return stateEvents[0] instanceof MatrixEvent;
+    }
 }
diff --git a/src/modules/AccountDataApi.ts b/src/modules/AccountDataApi.ts
new file mode 100644
index 0000000000..cf1dba513d
--- /dev/null
+++ b/src/modules/AccountDataApi.ts
@@ -0,0 +1,54 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { Watchable, type AccountDataApi as IAccountDataApi } from "@element-hq/element-web-module-api";
+import { ClientEvent, type MatrixEvent, type MatrixClient } from "matrix-js-sdk/src/matrix";
+
+import { MatrixClientPeg } from "../MatrixClientPeg";
+
+export class AccountDataApi implements IAccountDataApi {
+    public get(eventType: string): Watchable<unknown> {
+        const cli = MatrixClientPeg.safeGet();
+        return new AccountDataWatchable(cli, eventType);
+    }
+
+    public async set(eventType: string, content: any): Promise<void> {
+        const cli = MatrixClientPeg.safeGet();
+        //@ts-expect-error: JS-SDK accepts known event-types, intentionally allow arbitrary types.
+        await cli.setAccountData(eventType, content);
+    }
+
+    public async delete(eventType: string): Promise<void> {
+        const cli = MatrixClientPeg.safeGet();
+        //@ts-expect-error: JS-SDK accepts known event-types, intentionally allow arbitrary types.
+        await cli.deleteAccountData(eventType);
+    }
+}
+
+class AccountDataWatchable extends Watchable<unknown> {
+    public constructor(
+        private cli: MatrixClient,
+        private eventType: string,
+    ) {
+        //@ts-expect-error: JS-SDK accepts known event-types, intentionally allow arbitrary types.
+        super(cli.getAccountData(eventType)?.getContent());
+    }
+
+    private onAccountData = (event: MatrixEvent): void => {
+        if (event.getType() === this.eventType) {
+            this.value = event.getContent();
+        }
+    };
+
+    protected onFirstWatch(): void {
+        this.cli.on(ClientEvent.AccountData, this.onAccountData);
+    }
+
+    protected onLastWatch(): void {
+        this.cli.off(ClientEvent.AccountData, this.onAccountData);
+    }
+}
diff --git a/src/modules/Api.ts b/src/modules/Api.ts
index 23abadf529..057cbf71b0 100644
--- a/src/modules/Api.ts
+++ b/src/modules/Api.ts
@@ -6,8 +6,9 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { createRoot, type Root } from "react-dom/client";
+import { type Api, type RuntimeModuleConstructor } from "@element-hq/element-web-module-api";
+import { I18nApi } from "@element-hq/web-shared-components";
 
-import type { Api, RuntimeModuleConstructor } from "@element-hq/element-web-module-api";
 import { ModuleRunner } from "./ModuleRunner.ts";
 import AliasCustomisations from "../customisations/Alias.ts";
 import { RoomListCustomisations } from "../customisations/RoomList.ts";
@@ -20,7 +21,15 @@ import UserIdentifierCustomisations from "../customisations/UserIdentifier.ts";
 import { WidgetPermissionCustomisations } from "../customisations/WidgetPermissions.ts";
 import { WidgetVariableCustomisations } from "../customisations/WidgetVariables.ts";
 import { ConfigApi } from "./ConfigApi.ts";
-import { I18nApi } from "./I18nApi.ts";
+import { CustomComponentsApi } from "./customComponentApi";
+import { WatchableProfile } from "./Profile.ts";
+import { NavigationApi } from "./Navigation.ts";
+import { openDialog } from "./Dialog.tsx";
+import { overwriteAccountAuth } from "./Auth.ts";
+import { ElementWebExtrasApi } from "./ExtrasApi.ts";
+import { ElementWebBuiltinsApi } from "./BuiltinsApi.tsx";
+import { ClientApi } from "./ClientApi.ts";
+import { StoresApi } from "./StoresApi.ts";
 
 const legacyCustomisationsFactory = <T extends object>(baseCustomisations: T) => {
     let used = false;
@@ -34,7 +43,17 @@ const legacyCustomisationsFactory = <T extends object>(baseCustomisations: T) =>
 /**
  * Implementation of the @element-hq/element-web-module-api runtime module API.
  */
-class ModuleApi implements Api {
+export class ModuleApi implements Api {
+    private static _instance: ModuleApi;
+
+    public static get instance(): ModuleApi {
+        if (!ModuleApi._instance) {
+            ModuleApi._instance = new ModuleApi();
+            window.mxModuleApi = ModuleApi._instance;
+        }
+        return ModuleApi._instance;
+    }
+
     /* eslint-disable @typescript-eslint/naming-convention */
     public async _registerLegacyModule(LegacyModule: RuntimeModuleConstructor): Promise<void> {
         ModuleRunner.instance.registerModule((api) => new LegacyModule(api));
@@ -56,9 +75,19 @@ class ModuleApi implements Api {
         legacyCustomisationsFactory(WidgetVariableCustomisations);
     /* eslint-enable @typescript-eslint/naming-convention */
 
+    public readonly navigation = new NavigationApi();
+    public readonly openDialog = openDialog;
+    public readonly overwriteAccountAuth = overwriteAccountAuth;
+    public readonly profile = new WatchableProfile();
+
     public readonly config = new ConfigApi();
     public readonly i18n = new I18nApi();
+    public readonly customComponents = new CustomComponentsApi();
+    public readonly extras = new ElementWebExtrasApi();
+    public readonly builtins = new ElementWebBuiltinsApi();
     public readonly rootNode = document.getElementById("matrixchat")!;
+    public readonly client = new ClientApi();
+    public readonly stores = new StoresApi();
 
     public createRoot(element: Element): Root {
         return createRoot(element);
@@ -66,8 +95,3 @@ class ModuleApi implements Api {
 }
 
 export type ModuleApiType = ModuleApi;
-
-if (!window.mxModuleApi) {
-    window.mxModuleApi = new ModuleApi();
-}
-export default window.mxModuleApi;
diff --git a/src/modules/Auth.ts b/src/modules/Auth.ts
new file mode 100644
index 0000000000..c48a6de9cb
--- /dev/null
+++ b/src/modules/Auth.ts
@@ -0,0 +1,43 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type AccountAuthInfo } from "@element-hq/element-web-module-api";
+import { sleep } from "matrix-js-sdk/src/utils";
+
+import type { OverwriteLoginPayload } from "../dispatcher/payloads/OverwriteLoginPayload.ts";
+import { Action } from "../dispatcher/actions.ts";
+import defaultDispatcher from "../dispatcher/dispatcher.ts";
+import type { ActionPayload } from "../dispatcher/payloads.ts";
+
+export async function overwriteAccountAuth(accountInfo: AccountAuthInfo): Promise<void> {
+    const { promise, resolve } = Promise.withResolvers<void>();
+
+    const onAction = (payload: ActionPayload): void => {
+        if (payload.action === Action.OnLoggedIn) {
+            // We want to wait for the new login to complete before returning.
+            // See `Action.OnLoggedIn` in dispatcher.
+            resolve();
+        }
+    };
+    const dispatcherRef = defaultDispatcher.register(onAction);
+
+    defaultDispatcher.dispatch<OverwriteLoginPayload>(
+        {
+            action: Action.OverwriteLogin,
+            credentials: {
+                ...accountInfo,
+                guest: false,
+            },
+        },
+        true,
+    ); // require to be sync to match inherited interface behaviour
+
+    // wait for login to complete
+    await promise;
+    defaultDispatcher.unregister(dispatcherRef);
+    await sleep(0); // wait for the next tick to ensure the login is fully processed
+}
diff --git a/src/modules/BuiltinsApi.tsx b/src/modules/BuiltinsApi.tsx
new file mode 100644
index 0000000000..83d4c2acc4
--- /dev/null
+++ b/src/modules/BuiltinsApi.tsx
@@ -0,0 +1,96 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { type RoomViewProps, type BuiltinsApi } from "@element-hq/element-web-module-api";
+
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import type { Room } from "matrix-js-sdk/src/matrix";
+import type { ModuleNotificationDecorationProps } from "./components/ModuleNotificationDecoration";
+
+interface RoomViewPropsWithRoomId extends RoomViewProps {
+    /**
+     * The ID of the room to display
+     */
+    roomId?: string;
+}
+
+interface RoomAvatarProps {
+    room: Room;
+    size?: string;
+}
+
+interface Components {
+    roomView: React.ComponentType<RoomViewPropsWithRoomId>;
+    roomAvatar: React.ComponentType<RoomAvatarProps>;
+    notificationDecoration: React.ComponentType<ModuleNotificationDecorationProps>;
+}
+
+export class ElementWebBuiltinsApi implements BuiltinsApi {
+    private _roomView?: Components["roomView"];
+    private _roomAvatar?: Components["roomAvatar"];
+    private _notificationDecoration?: Components["notificationDecoration"];
+
+    /**
+     * Sets the components used by the API.
+     *
+     * This only really exists here because referencing these components directly causes a nightmare of
+     * circular dependencies that break the whole app, so instead we avoid referencing it here
+     * and pass it in from somewhere it's already referenced (see related comment in app.tsx).
+     *
+     * @param component The components used by the api, see {@link Components}
+     */
+    public setComponents(components: Components): void {
+        this._roomView = components.roomView;
+        this._roomAvatar = components.roomAvatar;
+        this._notificationDecoration = components.notificationDecoration;
+    }
+
+    public getRoomViewComponent(): React.ComponentType<RoomViewPropsWithRoomId> {
+        if (!this._roomView) {
+            throw new Error("No RoomView component has been set");
+        }
+        return this._roomView;
+    }
+
+    public getRoomAvatarComponent(): React.ComponentType<RoomAvatarProps> {
+        if (!this._roomAvatar) {
+            throw new Error("No RoomAvatar component has been set");
+        }
+        return this._roomAvatar;
+    }
+
+    public getNotificationDecorationComponent(): React.ComponentType<ModuleNotificationDecorationProps> {
+        if (!this._notificationDecoration) {
+            throw new Error("No NotificationDecoration component has been set");
+        }
+        return this._notificationDecoration;
+    }
+
+    public renderRoomView(roomId: string, props?: RoomViewProps): React.ReactNode {
+        const Component = this.getRoomViewComponent();
+        return <Component roomId={roomId} {...props} />;
+    }
+
+    public renderRoomAvatar(roomId: string, size?: string): React.ReactNode {
+        const room = MatrixClientPeg.safeGet().getRoom(roomId);
+        if (!room) {
+            throw new Error(`No room such room: ${roomId}`);
+        }
+        const Component = this.getRoomAvatarComponent();
+        return <Component room={room} size={size} />;
+    }
+
+    public renderNotificationDecoration(roomId: string): React.ReactNode {
+        const room = MatrixClientPeg.safeGet().getRoom(roomId);
+        if (!room) {
+            throw new Error(`No room such room: ${roomId}`);
+        }
+        const Component = this.getNotificationDecorationComponent();
+        return <Component room={room} />;
+    }
+}
diff --git a/src/modules/ClientApi.ts b/src/modules/ClientApi.ts
new file mode 100644
index 0000000000..7b5ccd2828
--- /dev/null
+++ b/src/modules/ClientApi.ts
@@ -0,0 +1,20 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+import type { ClientApi as IClientApi, Room } from "@element-hq/element-web-module-api";
+import { Room as ModuleRoom } from "./models/Room";
+import { AccountDataApi } from "./AccountDataApi";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+
+export class ClientApi implements IClientApi {
+    public readonly accountData = new AccountDataApi();
+
+    public getRoom(roomId: string): Room | null {
+        const sdkRoom = MatrixClientPeg.safeGet().getRoom(roomId);
+        if (sdkRoom) return new ModuleRoom(sdkRoom);
+        return null;
+    }
+}
diff --git a/src/modules/Dialog.tsx b/src/modules/Dialog.tsx
new file mode 100644
index 0000000000..97d2839f0f
--- /dev/null
+++ b/src/modules/Dialog.tsx
@@ -0,0 +1,52 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React, { type ComponentType, type JSX, useCallback } from "react";
+import { type DialogProps, type DialogOptions, type DialogHandle } from "@element-hq/element-web-module-api";
+
+import Modal from "../Modal";
+import BaseDialog from "../components/views/dialogs/BaseDialog.tsx";
+
+const OuterDialog = <M, P extends object>({
+    title,
+    Dialog,
+    props,
+    onFinished,
+}: {
+    title: string;
+    Dialog: ComponentType<DialogProps<M> & P>;
+    props: P;
+    onFinished(ok: boolean, model: M | null): void;
+}): JSX.Element => {
+    const close = useCallback(() => onFinished(false, null), [onFinished]);
+    const submit = useCallback((model: M) => onFinished(true, model), [onFinished]);
+    return (
+        <BaseDialog onFinished={close} title={title}>
+            <Dialog {...props} onSubmit={submit} onCancel={close} />
+        </BaseDialog>
+    );
+};
+
+export function openDialog<M, P extends object>(
+    initialOptions: DialogOptions,
+    Dialog: ComponentType<P & DialogProps<M>>,
+    props: P,
+): DialogHandle<M> {
+    const { close, finished } = Modal.createDialog(OuterDialog<M, P>, {
+        title: initialOptions.title,
+        Dialog,
+        props,
+    });
+
+    return {
+        finished: finished.then(([ok, model]) => ({
+            ok: ok ?? false,
+            model: model ?? null,
+        })),
+        close: () => close(false, null),
+    };
+}
diff --git a/src/modules/ExtrasApi.ts b/src/modules/ExtrasApi.ts
new file mode 100644
index 0000000000..420b17130a
--- /dev/null
+++ b/src/modules/ExtrasApi.ts
@@ -0,0 +1,55 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { useState } from "react";
+import { type SpacePanelItemProps, type ExtrasApi } from "@element-hq/element-web-module-api";
+import { TypedEventEmitter } from "matrix-js-sdk/src/matrix";
+
+import { useTypedEventEmitter } from "../hooks/useEventEmitter";
+
+export interface ModuleSpacePanelItem extends SpacePanelItemProps {
+    spaceKey: string;
+}
+
+enum ExtrasApiEvent {
+    SpacePanelItemsChanged = "SpacePanelItemsChanged",
+}
+
+interface EmittedEvents {
+    [ExtrasApiEvent.SpacePanelItemsChanged]: () => void;
+}
+
+export class ElementWebExtrasApi extends TypedEventEmitter<keyof EmittedEvents, EmittedEvents> implements ExtrasApi {
+    public spacePanelItems = new Map<string, SpacePanelItemProps>();
+    public visibleRoomBySpaceKey = new Map<string, () => string[]>();
+
+    public setSpacePanelItem(spacekey: string, item: SpacePanelItemProps): void {
+        this.spacePanelItems.set(spacekey, item);
+        this.emit(ExtrasApiEvent.SpacePanelItemsChanged);
+    }
+
+    public getVisibleRoomBySpaceKey(spaceKey: string, cb: () => string[]): void {
+        this.visibleRoomBySpaceKey.set(spaceKey, cb);
+    }
+}
+
+export function useModuleSpacePanelItems(api: ElementWebExtrasApi): ModuleSpacePanelItem[] {
+    const getItems = (): ModuleSpacePanelItem[] => {
+        return Array.from(api.spacePanelItems.entries()).map(([spaceKey, item]) => ({
+            spaceKey,
+            ...item,
+        }));
+    };
+
+    const [items, setItems] = useState<ModuleSpacePanelItem[]>(getItems);
+
+    useTypedEventEmitter(api, ExtrasApiEvent.SpacePanelItemsChanged, () => {
+        setItems(getItems());
+    });
+
+    return items;
+}
diff --git a/src/modules/Navigation.ts b/src/modules/Navigation.ts
new file mode 100644
index 0000000000..fff87156b6
--- /dev/null
+++ b/src/modules/Navigation.ts
@@ -0,0 +1,48 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import type {
+    LocationRenderFunction,
+    NavigationApi as INavigationApi,
+    OpenRoomOptions,
+} from "@element-hq/element-web-module-api";
+import { navigateToPermalink } from "../utils/permalinks/navigator.ts";
+import { parsePermalink } from "../utils/permalinks/Permalinks.ts";
+import dispatcher from "../dispatcher/dispatcher.ts";
+import { Action } from "../dispatcher/actions.ts";
+import type { ViewRoomPayload } from "../dispatcher/payloads/ViewRoomPayload.ts";
+
+export class NavigationApi implements INavigationApi {
+    public locationRenderers = new Map<string, LocationRenderFunction>();
+
+    public async toMatrixToLink(link: string, join = false): Promise<void> {
+        navigateToPermalink(link);
+
+        const parts = parsePermalink(link);
+        if (parts?.roomIdOrAlias) {
+            this.openRoom(parts.roomIdOrAlias, {
+                viaServers: parts.viaServers ?? undefined,
+                autoJoin: join,
+            });
+        }
+    }
+
+    public registerLocationRenderer(path: string, renderer: LocationRenderFunction): void {
+        this.locationRenderers.set(path, renderer);
+    }
+
+    public openRoom(roomIdOrAlias: string, opts: OpenRoomOptions = {}): void {
+        const key = roomIdOrAlias.startsWith("#") ? "room_alias" : "room_id";
+        dispatcher.dispatch<ViewRoomPayload>({
+            action: Action.ViewRoom,
+            [key]: roomIdOrAlias,
+            via_servers: opts.viaServers,
+            auto_join: opts.autoJoin,
+            metricsTrigger: undefined,
+        });
+    }
+}
diff --git a/src/modules/Profile.ts b/src/modules/Profile.ts
new file mode 100644
index 0000000000..4df3eb7a04
--- /dev/null
+++ b/src/modules/Profile.ts
@@ -0,0 +1,32 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type Profile, Watchable } from "@element-hq/element-web-module-api";
+
+import { OwnProfileStore } from "../stores/OwnProfileStore.ts";
+import { UPDATE_EVENT } from "../stores/AsyncStore.ts";
+
+export class WatchableProfile extends Watchable<Profile> {
+    public constructor() {
+        super({});
+        this.value = this.profile;
+
+        OwnProfileStore.instance.on(UPDATE_EVENT, this.onProfileChange);
+    }
+
+    private get profile(): Profile {
+        return {
+            isGuest: OwnProfileStore.instance.matrixClient?.isGuest() ?? false,
+            userId: OwnProfileStore.instance.matrixClient?.getUserId() ?? undefined,
+            displayName: OwnProfileStore.instance.displayName ?? undefined,
+        };
+    }
+
+    private readonly onProfileChange = (): void => {
+        this.value = this.profile;
+    };
+}
diff --git a/src/modules/ProxiedModuleApi.ts b/src/modules/ProxiedModuleApi.ts
index b14b2c0c0c..f36b81dec2 100644
--- a/src/modules/ProxiedModuleApi.ts
+++ b/src/modules/ProxiedModuleApi.ts
@@ -11,7 +11,6 @@ import {
     type TranslationStringsObject,
     type PlainSubstitution,
 } from "@matrix-org/react-sdk-module-api/lib/types/translations";
-import { type Optional } from "matrix-events-sdk";
 import { type DialogContent, type DialogProps } from "@matrix-org/react-sdk-module-api/lib/components/DialogContent";
 import { type AccountAuthInfo } from "@matrix-org/react-sdk-module-api/lib/types/AccountAuthInfo";
 import * as Matrix from "matrix-js-sdk/src/matrix";
@@ -28,20 +27,19 @@ import dispatcher from "../dispatcher/dispatcher";
 import { navigateToPermalink } from "../utils/permalinks/navigator";
 import { parsePermalink } from "../utils/permalinks/Permalinks";
 import { MatrixClientPeg } from "../MatrixClientPeg";
-import { getCachedRoomIDForAlias } from "../RoomAliasCache";
 import { Action } from "../dispatcher/actions";
 import { type OverwriteLoginPayload } from "../dispatcher/payloads/OverwriteLoginPayload";
 import { type ActionPayload } from "../dispatcher/payloads";
-import SettingsStore from "../settings/SettingsStore";
 import WidgetStore, { type IApp } from "../stores/WidgetStore";
 import { type Container, WidgetLayoutStore } from "../stores/widgets/WidgetLayoutStore";
+import type { ViewRoomPayload } from "../dispatcher/payloads/ViewRoomPayload.ts";
 
 /**
  * Glue between the `ModuleApi` interface and the react-sdk. Anticipates one instance
  * to be assigned to a single module.
  */
 export class ProxiedModuleApi implements ModuleApi {
-    private cachedTranslations: Optional<TranslationStringsObject>;
+    private cachedTranslations?: TranslationStringsObject;
 
     private overrideLoginResolve?: () => void;
 
@@ -58,7 +56,7 @@ export class ProxiedModuleApi implements ModuleApi {
     /**
      * All custom translations used by the associated module.
      */
-    public get translations(): Optional<TranslationStringsObject> {
+    public get translations(): TranslationStringsObject | undefined {
         return this.cachedTranslations;
     }
 
@@ -183,28 +181,22 @@ export class ProxiedModuleApi implements ModuleApi {
         navigateToPermalink(uri);
 
         const parts = parsePermalink(uri);
-        if (parts?.roomIdOrAlias && andJoin) {
-            let roomId: string | undefined = parts.roomIdOrAlias;
-            let servers = parts.viaServers;
-            if (roomId.startsWith("#")) {
-                roomId = getCachedRoomIDForAlias(parts.roomIdOrAlias);
-                if (!roomId) {
-                    // alias resolution failed
-                    const result = await MatrixClientPeg.safeGet().getRoomIdForAlias(parts.roomIdOrAlias);
-                    roomId = result.room_id;
-                    if (!servers) servers = result.servers; // use provided servers first, if available
-                }
-            }
-            dispatcher.dispatch({
-                action: Action.ViewRoom,
-                room_id: roomId,
-                via_servers: servers,
-            });
-
-            if (andJoin) {
-                dispatcher.dispatch({
-                    action: Action.JoinRoom,
-                    canAskToJoin: SettingsStore.getValue("feature_ask_to_join"),
+        if (parts?.roomIdOrAlias) {
+            if (parts.roomIdOrAlias.startsWith("#")) {
+                dispatcher.dispatch<ViewRoomPayload>({
+                    action: Action.ViewRoom,
+                    room_alias: parts.roomIdOrAlias,
+                    via_servers: parts.viaServers ?? undefined,
+                    auto_join: andJoin ?? false,
+                    metricsTrigger: undefined,
+                });
+            } else {
+                dispatcher.dispatch<ViewRoomPayload>({
+                    action: Action.ViewRoom,
+                    room_id: parts.roomIdOrAlias,
+                    via_servers: parts.viaServers ?? undefined,
+                    auto_join: andJoin ?? false,
+                    metricsTrigger: undefined,
                 });
             }
         }
diff --git a/src/modules/StoresApi.ts b/src/modules/StoresApi.ts
new file mode 100644
index 0000000000..f1d6add95e
--- /dev/null
+++ b/src/modules/StoresApi.ts
@@ -0,0 +1,106 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+import {
+    type StoresApi as IStoresApi,
+    type RoomListStoreApi as IRoomListStore,
+    type Room,
+    Watchable,
+} from "@element-hq/element-web-module-api";
+
+import type { RoomListStoreV3Class, RoomListStoreV3Event } from "../stores/room-list-v3/RoomListStoreV3";
+import { Room as ModuleRoom } from "./models/Room";
+
+interface RlsEvents {
+    LISTS_LOADED_EVENT: RoomListStoreV3Event.ListsLoaded;
+    LISTS_UPDATE_EVENT: RoomListStoreV3Event.ListsUpdate;
+}
+
+export class RoomListStoreApi implements IRoomListStore {
+    private rls?: RoomListStoreV3Class;
+    private LISTS_LOADED_EVENT?: RoomListStoreV3Event.ListsLoaded;
+    private LISTS_UPDATE_EVENT?: RoomListStoreV3Event.ListsUpdate;
+    public readonly moduleLoadPromise: Promise<void>;
+
+    public constructor() {
+        this.moduleLoadPromise = this.init();
+    }
+
+    /**
+     * Load the RLS through a dynamic import. This is necessary to prevent
+     * circular dependency issues.
+     */
+    private async init(): Promise<void> {
+        const module = await import("../stores/room-list-v3/RoomListStoreV3");
+        this.rls = module.default.instance;
+        this.LISTS_LOADED_EVENT = module.LISTS_LOADED_EVENT;
+        this.LISTS_UPDATE_EVENT = module.LISTS_UPDATE_EVENT;
+    }
+
+    public getRooms(): RoomsWatchable {
+        return new RoomsWatchable(this.roomListStore, this.events);
+    }
+
+    private get events(): RlsEvents {
+        if (!this.LISTS_LOADED_EVENT || !this.LISTS_UPDATE_EVENT) {
+            throw new Error("Event type was not loaded correctly, did you forget to await waitForReady()?");
+        }
+        return { LISTS_LOADED_EVENT: this.LISTS_LOADED_EVENT, LISTS_UPDATE_EVENT: this.LISTS_UPDATE_EVENT };
+    }
+
+    private get roomListStore(): RoomListStoreV3Class {
+        if (!this.rls) {
+            throw new Error("rls is undefined, did you forget to await waitForReady()?");
+        }
+        return this.rls;
+    }
+
+    public async waitForReady(): Promise<void> {
+        // Wait for the module to load first
+        await this.moduleLoadPromise;
+
+        // Check if RLS is already loaded
+        if (!this.roomListStore.isLoadingRooms) return;
+
+        // Await a promise that resolves when RLS has loaded
+        const { promise, resolve } = Promise.withResolvers<void>();
+        const { LISTS_LOADED_EVENT } = this.events;
+        this.roomListStore.once(LISTS_LOADED_EVENT, resolve);
+        await promise;
+    }
+}
+
+class RoomsWatchable extends Watchable<Room[]> {
+    public constructor(
+        private readonly rls: RoomListStoreV3Class,
+        private readonly events: RlsEvents,
+    ) {
+        super(rls.getSortedRooms().map((sdkRoom) => new ModuleRoom(sdkRoom)));
+    }
+
+    private onRlsUpdate = (): void => {
+        this.value = this.rls.getSortedRooms().map((sdkRoom) => new ModuleRoom(sdkRoom));
+    };
+
+    protected onFirstWatch(): void {
+        this.rls.on(this.events.LISTS_UPDATE_EVENT, this.onRlsUpdate);
+    }
+
+    protected onLastWatch(): void {
+        this.rls.off(this.events.LISTS_UPDATE_EVENT, this.onRlsUpdate);
+    }
+}
+
+export class StoresApi implements IStoresApi {
+    private roomListStoreApi?: IRoomListStore;
+
+    public get roomListStore(): IRoomListStore {
+        if (!this.roomListStoreApi) {
+            this.roomListStoreApi = new RoomListStoreApi();
+        }
+        return this.roomListStoreApi;
+    }
+}
diff --git a/src/modules/components/ModuleNotificationDecoration.tsx b/src/modules/components/ModuleNotificationDecoration.tsx
new file mode 100644
index 0000000000..12852d0910
--- /dev/null
+++ b/src/modules/components/ModuleNotificationDecoration.tsx
@@ -0,0 +1,29 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+import React, { useMemo } from "react";
+
+import type { Room } from "matrix-js-sdk/src/matrix";
+import { RoomNotificationStateStore } from "../../stores/notifications/RoomNotificationStateStore";
+import { useCall } from "../../hooks/useCall";
+import { NotificationDecoration } from "../../components/views/rooms/NotificationDecoration";
+
+export interface ModuleNotificationDecorationProps {
+    /**
+     * The room for which the decoration is rendered.
+     */
+    room: Room;
+}
+
+/**
+ * React component that takes a room as prop and renders {@link NotificationDecoration} with it.
+ * Used by the module API to render notification decoration without having to expose a bunch of stores.
+ */
+export const ModuleNotificationDecoration: React.FC<ModuleNotificationDecorationProps> = ({ room }) => {
+    const notificationState = useMemo(() => RoomNotificationStateStore.instance.getRoomState(room), [room]);
+    const call = useCall(room.roomId);
+    return <NotificationDecoration notificationState={notificationState} callType={call?.callType} />;
+};
diff --git a/src/modules/customComponentApi.ts b/src/modules/customComponentApi.ts
new file mode 100644
index 0000000000..5121acc7ea
--- /dev/null
+++ b/src/modules/customComponentApi.ts
@@ -0,0 +1,156 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { logger } from "matrix-js-sdk/src/logger";
+
+import type {
+    CustomComponentsApi as ICustomComponentsApi,
+    CustomMessageRenderFunction,
+    CustomMessageComponentProps as ModuleCustomMessageComponentProps,
+    OriginalMessageComponentProps,
+    CustomMessageRenderHints as ModuleCustomCustomMessageRenderHints,
+    MatrixEvent as ModuleMatrixEvent,
+    CustomRoomPreviewBarRenderFunction,
+} from "@element-hq/element-web-module-api";
+import type React from "react";
+
+type EventTypeOrFilter = Parameters<ICustomComponentsApi["registerMessageRenderer"]>[0];
+
+type EventRenderer = {
+    eventTypeOrFilter: EventTypeOrFilter;
+    renderer: CustomMessageRenderFunction;
+    hints: ModuleCustomCustomMessageRenderHints;
+};
+
+interface CustomMessageComponentProps extends Omit<ModuleCustomMessageComponentProps, "mxEvent"> {
+    mxEvent: MatrixEvent;
+}
+
+interface CustomMessageRenderHints extends Omit<ModuleCustomCustomMessageRenderHints, "allowDownloadingMedia"> {
+    // Note. This just makes it easier to use this API on Element Web as we already have the moduleized event stored.
+    allowDownloadingMedia?: () => Promise<boolean>;
+}
+
+export class CustomComponentsApi implements ICustomComponentsApi {
+    /**
+     * Convert a matrix-js-sdk event into a ModuleMatrixEvent.
+     * @param mxEvent
+     * @returns An event object, or `null` if the event was not a message event.
+     */
+    private static getModuleMatrixEvent(mxEvent: MatrixEvent): ModuleMatrixEvent | null {
+        const eventId = mxEvent.getId();
+        const roomId = mxEvent.getRoomId();
+        const sender = mxEvent.sender;
+        // Typically we wouldn't expect messages without these keys to be rendered
+        // by the timeline, but for the sake of type safety.
+        if (!eventId || !roomId || !sender) {
+            // Not a message event.
+            return null;
+        }
+        return {
+            content: mxEvent.getContent(),
+            eventId,
+            originServerTs: mxEvent.getTs(),
+            roomId,
+            sender: sender.userId,
+            stateKey: mxEvent.getStateKey(),
+            type: mxEvent.getType(),
+            unsigned: mxEvent.getUnsigned(),
+        };
+    }
+
+    private readonly registeredMessageRenderers: EventRenderer[] = [];
+
+    public registerMessageRenderer(
+        eventTypeOrFilter: EventTypeOrFilter,
+        renderer: CustomMessageRenderFunction,
+        hints: ModuleCustomCustomMessageRenderHints = {},
+    ): void {
+        this.registeredMessageRenderers.push({ eventTypeOrFilter: eventTypeOrFilter, renderer, hints });
+    }
+
+    /**
+     * Select the correct renderer based on the event information.
+     * @param mxEvent The message event being rendered.
+     * @returns The registered renderer.
+     */
+    private selectRenderer(mxEvent: ModuleMatrixEvent): EventRenderer | undefined {
+        return this.registeredMessageRenderers.find((renderer) => {
+            if (typeof renderer.eventTypeOrFilter === "string") {
+                return renderer.eventTypeOrFilter === mxEvent.type;
+            } else {
+                try {
+                    return renderer.eventTypeOrFilter(mxEvent);
+                } catch (ex) {
+                    logger.warn("Message renderer failed to process filter", ex);
+                    return false; // Skip erroring renderers.
+                }
+            }
+        });
+    }
+
+    /**
+     * Render the component for a message event.
+     * @param props Props to be passed to the custom renderer.
+     * @param originalComponent Function that will be rendered if no custom renderers are present, or as a child of a custom component.
+     * @returns A component if a custom renderer exists, or originalComponent returns a value. Otherwise null.
+     */
+    public renderMessage(
+        props: CustomMessageComponentProps,
+        originalComponent?: (props?: OriginalMessageComponentProps) => React.JSX.Element,
+    ): React.JSX.Element | null {
+        const moduleEv = CustomComponentsApi.getModuleMatrixEvent(props.mxEvent);
+        const renderer = moduleEv && this.selectRenderer(moduleEv);
+        if (renderer) {
+            try {
+                return renderer.renderer({ ...props, mxEvent: moduleEv }, originalComponent);
+            } catch (ex) {
+                logger.warn("Message renderer failed to render", ex);
+                // Fall through to original component. If the module encounters an error we still want to display messages to the user!
+            }
+        }
+        return originalComponent?.() ?? null;
+    }
+
+    /**
+     * Get hints about an message before rendering it.
+     * @param mxEvent The message event being rendered.
+     * @returns A component if a custom renderer exists, or originalComponent returns a value. Otherwise null.
+     */
+    public getHintsForMessage(mxEvent: MatrixEvent): CustomMessageRenderHints | null {
+        const moduleEv = CustomComponentsApi.getModuleMatrixEvent(mxEvent);
+        const renderer = moduleEv && this.selectRenderer(moduleEv);
+        if (renderer) {
+            return {
+                ...renderer.hints,
+                // Convert from js-sdk style events to module events automatically.
+                allowDownloadingMedia: renderer.hints.allowDownloadingMedia
+                    ? () => renderer.hints.allowDownloadingMedia!(moduleEv)
+                    : undefined,
+            };
+        }
+        return null;
+    }
+
+    private _roomPreviewBarRenderer?: CustomRoomPreviewBarRenderFunction;
+
+    /**
+     * Get the custom room preview bar renderer, if any has been registered.
+     */
+    public get roomPreviewBarRenderer(): CustomRoomPreviewBarRenderFunction | undefined {
+        return this._roomPreviewBarRenderer;
+    }
+
+    /**
+     * Register a custom room preview bar renderer.
+     * @param renderer - the function that will render the custom room preview bar.
+     */
+    public registerRoomPreviewBar(renderer: CustomRoomPreviewBarRenderFunction): void {
+        this._roomPreviewBarRenderer = renderer;
+    }
+}
diff --git a/src/modules/models/Room.ts b/src/modules/models/Room.ts
new file mode 100644
index 0000000000..e317c0dc03
--- /dev/null
+++ b/src/modules/models/Room.ts
@@ -0,0 +1,45 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type Room as IRoom, Watchable } from "@element-hq/element-web-module-api";
+import { RoomEvent, type Room as SdkRoom } from "matrix-js-sdk/src/matrix";
+
+export class Room implements IRoom {
+    public name: Watchable<string>;
+
+    public constructor(private sdkRoom: SdkRoom) {
+        this.name = new WatchableName(sdkRoom);
+    }
+
+    public getLastActiveTimestamp(): number {
+        return this.sdkRoom.getLastActiveTimestamp();
+    }
+
+    public get id(): string {
+        return this.sdkRoom.roomId;
+    }
+}
+
+/**
+ * A custom watchable for room name.
+ */
+class WatchableName extends Watchable<string> {
+    public constructor(private sdkRoom: SdkRoom) {
+        super(sdkRoom.name);
+    }
+
+    private onNameUpdate = (): void => {
+        super.value = this.sdkRoom.name;
+    };
+    protected onFirstWatch(): void {
+        this.sdkRoom.on(RoomEvent.Name, this.onNameUpdate);
+    }
+
+    protected onLastWatch(): void {
+        this.sdkRoom.off(RoomEvent.Name, this.onNameUpdate);
+    }
+}
diff --git a/src/rageshake/submit-rageshake.ts b/src/rageshake/submit-rageshake.ts
index 2e04d7d9dc..0717ccd56a 100644
--- a/src/rageshake/submit-rageshake.ts
+++ b/src/rageshake/submit-rageshake.ts
@@ -171,7 +171,7 @@ async function collectSynapseSpecific(client: MatrixClient, body: FormData): Pro
         } catch {
             try {
                 // If that fails we'll hit any endpoint and look at the server response header
-                const res = await window.fetch(client.http.getUrl("/login"), {
+                const res = await fetch(client.http.getUrl("/login"), {
                     method: "GET",
                     mode: "cors",
                 });
@@ -257,7 +257,7 @@ export function collectSettings(body: FormData): void {
         body.append("lowBandwidth", "enabled");
     }
 
-    body.append("mx_local_settings", localStorage.getItem("mx_local_settings")!);
+    body.append("mx_local_settings", SettingsStore.exportForRageshake());
 }
 
 /**
diff --git a/src/renderer/index.ts b/src/renderer/index.ts
index eaed7b71c3..3de73c8bbe 100644
--- a/src/renderer/index.ts
+++ b/src/renderer/index.ts
@@ -9,10 +9,4 @@ export { ambiguousLinkTooltipRenderer } from "./link-tooltip";
 export { keywordPillRenderer, mentionPillRenderer } from "./pill";
 export { spoilerRenderer } from "./spoiler";
 export { codeBlockRenderer } from "./code-block";
-export {
-    applyReplacerOnString,
-    replacerToRenderFunction,
-    combineRenderers,
-    type RendererMap,
-    type Replacer,
-} from "./utils";
+export { applyReplacerOnString, combineRenderers, type RendererMap, type Replacer } from "./utils";
diff --git a/src/renderer/spoiler.tsx b/src/renderer/spoiler.tsx
index ee7f45f48e..7b71295c08 100644
--- a/src/renderer/spoiler.tsx
+++ b/src/renderer/spoiler.tsx
@@ -15,10 +15,12 @@ import Spoiler from "../components/views/elements/Spoiler.tsx";
  * Replaces spans with `data-mx-spoiler` with a Spoiler component.
  */
 export const spoilerRenderer: RendererMap = {
-    span: (span) => {
+    span: (span, params) => {
         const reason = span.attribs["data-mx-spoiler"];
         if (typeof reason === "string") {
-            return <Spoiler reason={reason}>{domToReact(span.children as DOMNode[])}</Spoiler>;
+            return (
+                <Spoiler reason={reason}>{domToReact(span.children as DOMNode[], { replace: params.replace })}</Spoiler>
+            );
         }
     },
 };
diff --git a/src/renderer/utils.tsx b/src/renderer/utils.tsx
index 0cf37b9a8c..3109e9b447 100644
--- a/src/renderer/utils.tsx
+++ b/src/renderer/utils.tsx
@@ -8,7 +8,6 @@ Please see LICENSE files in the repository root for full details.
 import React, { type JSX } from "react";
 import { type DOMNode, Element, type HTMLReactParserOptions, Text } from "html-react-parser";
 import { type MatrixEvent, type Room } from "matrix-js-sdk/src/matrix";
-import { type Opts } from "linkifyjs";
 
 /**
  * The type of a parent node of an element, normally exported by domhandler but that is not a direct dependency of ours
@@ -65,29 +64,9 @@ export function applyReplacerOnString(
     });
 }
 
-/**
- * Converts a Replacer function to a render function for linkify-react
- * So that we can use the same replacer functions for both
- * @param replacer The replacer function to convert
- */
-export function replacerToRenderFunction(replacer: Replacer): Opts["render"] {
-    if (!replacer) return;
-    return ({ tagName, attributes, content }) => {
-        const domNode = new Element(tagName, attributes, [new Text(content)], "tag" as Element["type"]);
-        const result = replacer(domNode, 0);
-        if (result) return result;
-
-        // This is cribbed from the default render function in linkify-react
-        if (attributes.class) {
-            attributes.className = attributes.class;
-            delete attributes.class;
-        }
-        return React.createElement(tagName, attributes, content);
-    };
-}
-
 interface Parameters {
     isHtml: boolean;
+    replace: Replacer;
     // Required for keywordPillRenderer
     keywordRegexpPattern?: RegExp;
     // Required for mentionPillRenderer
@@ -114,7 +93,7 @@ export type RendererMap = Partial<
     }
 >;
 
-type PreparedRenderer = (parameters: Parameters) => Replacer;
+type PreparedRenderer = (parameters: Omit<Parameters, "replace">) => Replacer;
 
 /**
  * Combines multiple renderers into a single Replacer function
@@ -122,19 +101,22 @@ type PreparedRenderer = (parameters: Parameters) => Replacer;
  */
 export const combineRenderers =
     (...renderers: RendererMap[]): PreparedRenderer =>
-    (parameters) =>
-    (node, index) => {
-        if (node.type === "text") {
-            for (const replacer of renderers) {
-                const result = replacer[Node.TEXT_NODE]?.(node, parameters, index);
-                if (result) return result;
+    (parameters) => {
+        const replace: Replacer = (node, index) => {
+            if (node.type === "text") {
+                for (const replacer of renderers) {
+                    const result = replacer[Node.TEXT_NODE]?.(node, parametersWithReplace, index);
+                    if (result) return result;
+                }
             }
-        }
-        if (node instanceof Element) {
-            const tagName = node.tagName.toLowerCase() as keyof HTMLElementTagNameMap;
-            for (const replacer of renderers) {
-                const result = replacer[tagName]?.(node, parameters, index);
-                if (result) return result;
+            if (node instanceof Element) {
+                const tagName = node.tagName.toLowerCase() as keyof HTMLElementTagNameMap;
+                for (const replacer of renderers) {
+                    const result = replacer[tagName]?.(node, parametersWithReplace, index);
+                    if (result) return result;
+                }
             }
-        }
+        };
+        const parametersWithReplace: Parameters = { ...parameters, replace };
+        return replace;
     };
diff --git a/src/sentry.ts b/src/sentry.ts
index 92e8403963..214f4f09e3 100644
--- a/src/sentry.ts
+++ b/src/sentry.ts
@@ -141,7 +141,7 @@ async function getCryptoContext(client: MatrixClient): Promise<CryptoContext> {
 function getDeviceContext(client: MatrixClient): DeviceContext {
     const result: DeviceContext = {
         device_id: client?.deviceId ?? undefined,
-        mx_local_settings: localStorage.getItem("mx_local_settings"),
+        mx_local_settings: SettingsStore.exportForRageshake(),
     };
 
     if (window.Modernizr) {
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 1c649054ad..812acc1fe8 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -8,10 +8,11 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type ReactNode } from "react";
-import { UNSTABLE_MSC4133_EXTENDED_PROFILES } from "matrix-js-sdk/src/matrix";
+import { STABLE_MSC4133_EXTENDED_PROFILES, UNSTABLE_MSC4133_EXTENDED_PROFILES } from "matrix-js-sdk/src/matrix";
+// Import these directly from shared-components to avoid circular deps
+import { _t, _td, type TranslationKey } from "@element-hq/web-shared-components";
 
 import { type MediaPreviewConfig } from "../@types/media_preview.ts";
-import { _t, _td, type TranslationKey } from "../languageHandler";
 import DeviceIsolationModeController from "./controllers/DeviceIsolationModeController.ts";
 import {
     NotificationBodyEnabledController,
@@ -47,6 +48,9 @@ import { type RecentEmojiData } from "../emojipicker/recent.ts";
 import { type Assignable } from "../@types/common.ts";
 import { SortingAlgorithm } from "../stores/room-list-v3/skip-list/sorters/index.ts";
 import MediaPreviewConfigController from "./controllers/MediaPreviewConfigController.ts";
+import InviteRulesConfigController from "./controllers/InviteRulesConfigController.ts";
+import { type ComputedInviteConfig } from "../@types/invite-rules.ts";
+import BlockInvitesConfigController from "./controllers/BlockInvitesConfigController.ts";
 
 export const defaultWatchManager = new WatchManager();
 
@@ -171,6 +175,19 @@ export interface IBaseSetting<T extends SettingValueType = SettingValueType> {
 
     // Whether the setting should have a warning sign in the microcopy
     shouldWarn?: boolean;
+
+    /**
+     * Whether the setting should be exported in a rageshake report.
+     */
+    shouldExportToRageshake?: boolean;
+
+    /**
+     * Options array for a setting controlled by a dropdown.
+     */
+    options?: {
+        value: T;
+        label: TranslationKey;
+    }[];
 }
 
 export interface IFeature extends Omit<IBaseSetting<boolean>, "isFeature"> {
@@ -197,6 +214,7 @@ export interface Settings {
     "feature_mjolnir": IFeature;
     "feature_custom_themes": IFeature;
     "feature_exclude_insecure_devices": IFeature;
+    "feature_share_history_on_invite": IFeature;
     "feature_html_topic": IFeature;
     "feature_bridge_state": IFeature;
     "feature_jump_to_date": IFeature;
@@ -205,13 +223,13 @@ export interface Settings {
     "feature_element_call_video_rooms": IFeature;
     "feature_group_calls": IFeature;
     "feature_disable_call_per_sender_encryption": IFeature;
-    "feature_allow_screen_share_only_mode": IFeature;
     "feature_location_share_live": IFeature;
     "feature_dynamic_room_predecessors": IFeature;
     "feature_render_reaction_images": IFeature;
     "feature_new_room_list": IFeature;
     "feature_ask_to_join": IFeature;
     "feature_notifications": IFeature;
+    "feature_msc4362_encrypted_state_events": IFeature;
     // These are in the feature namespace but aren't actually features
     "feature_hidebold": IBaseSetting<boolean>;
 
@@ -345,13 +363,17 @@ export interface Settings {
     "videoInputMuted": IBaseSetting<boolean>;
     "activeCallRoomIds": IBaseSetting<string[]>;
     "releaseAnnouncementData": IBaseSetting<ReleaseAnnouncementData>;
-    "Electron.autoLaunch": IBaseSetting<boolean>;
+    "Electron.autoLaunch": IBaseSetting<"enabled" | "minimised" | "disabled">;
     "Electron.warnBeforeExit": IBaseSetting<boolean>;
     "Electron.alwaysShowMenuBar": IBaseSetting<boolean>;
     "Electron.showTrayIcon": IBaseSetting<boolean>;
     "Electron.enableHardwareAcceleration": IBaseSetting<boolean>;
+    "Electron.enableContentProtection": IBaseSetting<boolean>;
     "mediaPreviewConfig": IBaseSetting<MediaPreviewConfig>;
+    "inviteRules": IBaseSetting<ComputedInviteConfig>;
+    "blockInvites": IBaseSetting<boolean>;
     "Developer.elementCallUrl": IBaseSetting<string>;
+    "acknowledgedHistoryVisibility": IBaseSetting<boolean>;
 }
 
 export type SettingKey = keyof Settings;
@@ -434,6 +456,18 @@ export const SETTINGS: Settings = {
         supportedLevels: LEVELS_ROOM_SETTINGS,
         default: MediaPreviewConfigController.default,
     },
+    "inviteRules": {
+        controller: new InviteRulesConfigController(),
+        supportedLevels: [SettingLevel.ACCOUNT],
+        default: InviteRulesConfigController.default,
+        // Contains server names
+        shouldExportToRageshake: false,
+    },
+    "blockInvites": {
+        controller: new BlockInvitesConfigController("blockInvites"),
+        supportedLevels: [SettingLevel.ACCOUNT],
+        default: false,
+    },
     "feature_report_to_moderators": {
         isFeature: true,
         labsGroup: LabGroup.Moderation,
@@ -487,6 +521,29 @@ export const SETTINGS: Settings = {
         supportedLevelsAreOrdered: true,
         default: false,
     },
+    "feature_share_history_on_invite": {
+        isFeature: true,
+        labsGroup: LabGroup.Encryption,
+        displayName: _td("labs|share_history_on_invite"),
+        description: () => (
+            <>
+                {_t("labs|share_history_on_invite_description")}
+                <div className="mx_SettingsFlag_microcopy">
+                    {_t(
+                        "settings|warning",
+                        {},
+                        {
+                            w: (sub) => <span className="mx_SettingsTab_microcopy_warning">{sub}</span>,
+                            description: _t("labs|share_history_on_invite_warning"),
+                        },
+                    )}
+                </div>
+            </>
+        ),
+        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
+        supportedLevelsAreOrdered: true,
+        default: false,
+    },
     "useOnlyCurrentProfiles": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td("settings|disable_historical_profile"),
@@ -495,10 +552,14 @@ export const SETTINGS: Settings = {
     "mjolnirRooms": {
         supportedLevels: [SettingLevel.ACCOUNT],
         default: [],
+        // Contains room IDs
+        shouldExportToRageshake: false,
     },
     "mjolnirPersonalRoom": {
         supportedLevels: [SettingLevel.ACCOUNT],
         default: null,
+        // Contains room ID
+        shouldExportToRageshake: false,
     },
     "feature_html_topic": {
         isFeature: true,
@@ -592,16 +653,6 @@ export const SETTINGS: Settings = {
         displayName: _td("labs|feature_disable_call_per_sender_encryption"),
         default: false,
     },
-    "feature_allow_screen_share_only_mode": {
-        isFeature: true,
-        labsGroup: LabGroup.VoiceAndVideo,
-        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
-        supportedLevelsAreOrdered: true,
-        description: _td("labs|under_active_development"),
-        displayName: _td("labs|allow_screen_share_only_mode"),
-        controller: new ReloadOnChangeController(),
-        default: false,
-    },
     "feature_location_share_live": {
         isFeature: true,
         labsGroup: LabGroup.Messaging,
@@ -646,7 +697,7 @@ export const SETTINGS: Settings = {
         displayName: _td("labs|new_room_list"),
         description: _td("labs|under_active_development"),
         isFeature: true,
-        default: false,
+        default: true,
         controller: new ReloadOnChangeController(),
     },
     /**
@@ -744,6 +795,16 @@ export const SETTINGS: Settings = {
         supportedLevelsAreOrdered: true,
         default: false,
     },
+    "feature_msc4362_encrypted_state_events": {
+        isFeature: true,
+        labsGroup: LabGroup.Encryption,
+        displayName: _td("labs|encrypted_state_events"),
+        description: _td("labs|encrypted_state_events_description"),
+        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
+        supportedLevelsAreOrdered: true,
+        shouldWarn: true,
+        default: false,
+    },
     "useCompactLayout": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         displayName: _td("settings|preferences|compact_modern"),
@@ -794,6 +855,8 @@ export const SETTINGS: Settings = {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         displayName: _td("settings|preferences|user_timezone"),
         default: "",
+        // Location leak
+        shouldExportToRageshake: false,
     },
     "userTimezonePublish": {
         // This is per-device so you can avoid having devices overwrite each other.
@@ -803,7 +866,7 @@ export const SETTINGS: Settings = {
         controller: new ServerSupportUnstableFeatureController(
             "userTimezonePublish",
             defaultWatchManager,
-            [[UNSTABLE_MSC4133_EXTENDED_PROFILES]],
+            [[UNSTABLE_MSC4133_EXTENDED_PROFILES], [STABLE_MSC4133_EXTENDED_PROFILES]],
             undefined,
             _td("labs|extended_profiles_msc_support"),
         ),
@@ -900,7 +963,7 @@ export const SETTINGS: Settings = {
     "VideoView.flipVideoHorizontally": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td("settings|voip|mirror_local_feed"),
-        default: false,
+        default: true,
     },
     "theme": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
@@ -910,6 +973,8 @@ export const SETTINGS: Settings = {
     "custom_themes": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         default: [],
+        // Potential privacy leak via theme origin
+        shouldExportToRageshake: false,
     },
     "use_system_theme": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
@@ -927,6 +992,10 @@ export const SETTINGS: Settings = {
         default: false,
         displayName: _td("settings|appearance|custom_font"),
         controller: new SystemFontController(),
+        description: () =>
+            _t("settings|appearance|custom_font_description", {
+                brand: SdkConfig.get().brand,
+            }),
     },
     "systemFont": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
@@ -971,26 +1040,36 @@ export const SETTINGS: Settings = {
     "language": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
         default: "en",
+        // For privacy
+        shouldExportToRageshake: false,
     },
     "breadcrumb_rooms": {
         // not really a setting
         supportedLevels: [SettingLevel.ACCOUNT],
         default: [],
+        // Contains joined rooms
+        shouldExportToRageshake: false,
     },
     "recent_emoji": {
         // not really a setting
         supportedLevels: [SettingLevel.ACCOUNT],
         default: [],
+        // For privacy
+        shouldExportToRageshake: false,
     },
     "SpotlightSearch.recentSearches": {
         // not really a setting
         supportedLevels: [SettingLevel.ACCOUNT],
         default: [], // list of room IDs, most recent first
+        // For privacy
+        shouldExportToRageshake: false,
     },
     "showMediaEventIds": {
         // not really a setting
         supportedLevels: [SettingLevel.DEVICE],
         default: {}, // List of events => is visible
+        // Exports event IDs
+        shouldExportToRageshake: false,
     },
     "SpotlightSearch.showNsfwPublicRooms": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
@@ -1000,6 +1079,8 @@ export const SETTINGS: Settings = {
     "room_directory_servers": {
         supportedLevels: [SettingLevel.ACCOUNT],
         default: [],
+        // Contains connected servers for user
+        shouldExportToRageshake: false,
     },
     "integrationProvisioning": {
         supportedLevels: [SettingLevel.ACCOUNT],
@@ -1009,6 +1090,7 @@ export const SETTINGS: Settings = {
         supportedLevels: [SettingLevel.ROOM_ACCOUNT, SettingLevel.ROOM_DEVICE],
         supportedLevelsAreOrdered: true,
         default: {}, // none allowed
+        shouldExportToRageshake: false,
     },
     // Legacy, kept around for transitionary purposes
     "analyticsOptIn": {
@@ -1075,23 +1157,29 @@ export const SETTINGS: Settings = {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         default: false,
         controller: new NotificationsEnabledController(),
+        displayName: _td("settings|notifications|enable_desktop_notifications_session"),
     },
     "deviceNotificationsEnabled": {
         supportedLevels: [SettingLevel.DEVICE],
         default: true,
+        displayName: _td("settings|notifications|enable_notifications_device"),
     },
     "notificationSound": {
         supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
         default: false,
+        // Contains personal information in file name
+        shouldExportToRageshake: false,
     },
     "notificationBodyEnabled": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         default: true,
         controller: new NotificationBodyEnabledController(),
+        displayName: _td("settings|notifications|show_message_desktop_notification"),
     },
     "audioNotificationsEnabled": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         default: true,
+        displayName: _td("settings|notifications|enable_audible_notifications_session"),
     },
     "enableWidgetScreenshots": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
@@ -1109,6 +1197,8 @@ export const SETTINGS: Settings = {
             allow: [],
             deny: [],
         },
+        // Expses widget information
+        shouldExportToRageshake: false,
     },
     "breadcrumbs": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
@@ -1140,8 +1230,9 @@ export const SETTINGS: Settings = {
         default: SortingAlgorithm.Recency,
     },
     "RoomList.showMessagePreview": {
-        supportedLevels: [SettingLevel.DEVICE],
+        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
         default: false,
+        displayName: _td("settings|show_message_previews"),
     },
     "RightPanel.phasesGlobal": {
         supportedLevels: [SettingLevel.DEVICE],
@@ -1197,6 +1288,8 @@ export const SETTINGS: Settings = {
         // deprecated
         supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
         default: {},
+        // Sensitive information in widget ID
+        shouldExportToRageshake: false,
     },
     "Widgets.layout": {
         supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
@@ -1271,6 +1364,8 @@ export const SETTINGS: Settings = {
     "activeCallRoomIds": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         default: [],
+        // Contains room IDs
+        shouldExportToRageshake: false,
     },
     /**
      * Enable or disable the release announcement feature
@@ -1360,13 +1455,26 @@ export const SETTINGS: Settings = {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
     },
+    [UIFeature.AllowCreatingPublicSpaces]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
+    [UIFeature.AllowCreatingPublicRooms]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
 
     // Electron-specific settings, they are stored by Electron and set/read over an IPC.
     // We store them over there are they are necessary to know before the renderer process launches.
     "Electron.autoLaunch": {
         supportedLevels: [SettingLevel.PLATFORM],
-        displayName: _td("settings|start_automatically"),
-        default: false,
+        displayName: _td("settings|start_automatically|label"),
+        options: [
+            { value: "enabled", label: _td("settings|start_automatically|enabled") },
+            { value: "disabled", label: _td("settings|start_automatically|disabled") },
+            { value: "minimised", label: _td("settings|start_automatically|minimised") },
+        ],
+        default: "disabled",
     },
     "Electron.warnBeforeExit": {
         supportedLevels: [SettingLevel.PLATFORM],
@@ -1388,9 +1496,18 @@ export const SETTINGS: Settings = {
         displayName: _td("settings|preferences|enable_hardware_acceleration"),
         default: true,
     },
+    "Electron.enableContentProtection": {
+        supportedLevels: [SettingLevel.PLATFORM],
+        displayName: _td("settings|preferences|enable_content_protection"),
+        default: false,
+    },
     "Developer.elementCallUrl": {
         supportedLevels: [SettingLevel.DEVICE],
         displayName: _td("devtools|settings|elementCallUrl"),
         default: "",
     },
+    "acknowledgedHistoryVisibility": {
+        supportedLevels: [SettingLevel.ROOM_ACCOUNT],
+        default: false,
+    },
 };
diff --git a/src/settings/SettingsStore.ts b/src/settings/SettingsStore.ts
index aaa836b6fc..c6a739f1c8 100644
--- a/src/settings/SettingsStore.ts
+++ b/src/settings/SettingsStore.ts
@@ -340,7 +340,7 @@ export default class SettingsStore {
     }
 
     /**
-     * Retrieves the reason a setting is disabled if one is assigned.
+     * Retrieves the internationalised reason a setting is disabled if one is assigned.
      * If a setting is not disabled, or no reason is given by the `SettingController`,
      * this will return undefined.
      * @param {string} settingName The setting to look up.
@@ -883,6 +883,21 @@ export default class SettingsStore {
         logger.log(`--- END DEBUG`);
     }
 
+    /**
+     * Export all settings as a JSON object, except for settings
+     * blocked from being exported by `shouldExportToRageshake`.
+     * @returns Settings as a JSON object string.
+     */
+    public static exportForRageshake(): string {
+        const settingMap: Record<string, unknown> = {};
+        for (const settingKey of (Object.keys(SETTINGS) as SettingKey[]).filter(
+            (s) => SETTINGS[s].shouldExportToRageshake !== false,
+        )) {
+            settingMap[settingKey] = SettingsStore.getValue(settingKey);
+        }
+        return JSON.stringify(settingMap);
+    }
+
     private static getHandler(settingName: SettingKey, level: SettingLevel): SettingsHandler | null {
         const handlers = SettingsStore.getHandlers(settingName);
         if (!handlers[level]) return null;
diff --git a/src/settings/UIFeature.ts b/src/settings/UIFeature.ts
index 4aef725d4a..12b0c7c089 100644
--- a/src/settings/UIFeature.ts
+++ b/src/settings/UIFeature.ts
@@ -25,6 +25,8 @@ export const enum UIFeature {
     RoomHistorySettings = "UIFeature.roomHistorySettings",
     TimelineEnableRelativeDates = "UIFeature.timelineEnableRelativeDates",
     BulkUnverifiedSessionsReminder = "UIFeature.BulkUnverifiedSessionsReminder",
+    AllowCreatingPublicRooms = "UIFeature.allowCreatingPublicRooms",
+    AllowCreatingPublicSpaces = "UIFeature.allowCreatingPublicSpaces",
 }
 
 export enum UIComponent {
diff --git a/src/settings/controllers/BlockInvitesConfigController.ts b/src/settings/controllers/BlockInvitesConfigController.ts
new file mode 100644
index 0000000000..dffcb0852b
--- /dev/null
+++ b/src/settings/controllers/BlockInvitesConfigController.ts
@@ -0,0 +1,36 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type SettingLevel } from "../SettingLevel.ts";
+import { MSC4380_INVITE_RULES_ACCOUNT_DATA_TYPE } from "../../@types/invite-rules.ts";
+import { _td } from "../../languageHandler.tsx";
+import ServerSupportUnstableFeatureController from "./ServerSupportUnstableFeatureController.ts";
+import { defaultWatchManager, type SettingKey } from "../Settings.tsx";
+
+/**
+ * Handles invite filtering rules provided by MSC4380.
+ * This handler does not make use of the roomId parameter.
+ */
+export default class BlockInvitesConfigController extends ServerSupportUnstableFeatureController {
+    public constructor(settingName: SettingKey) {
+        super(settingName, defaultWatchManager, [["org.matrix.msc4380"]], undefined, _td("settings|not_supported"));
+    }
+
+    public getValueOverride(_level: SettingLevel): boolean {
+        const accountData = this.client?.getAccountData(MSC4380_INVITE_RULES_ACCOUNT_DATA_TYPE)?.getContent();
+        return accountData?.default_action == "block";
+    }
+
+    public async beforeChange(_level: SettingLevel, _roomId: string | null, newValue: boolean): Promise<boolean> {
+        if (!this.client) {
+            return false;
+        }
+        const newDefault = newValue ? "block" : "allow";
+        await this.client.setAccountData(MSC4380_INVITE_RULES_ACCOUNT_DATA_TYPE, { default_action: newDefault });
+        return true;
+    }
+}
diff --git a/src/settings/controllers/InviteRulesConfigController.ts b/src/settings/controllers/InviteRulesConfigController.ts
new file mode 100644
index 0000000000..61c7323009
--- /dev/null
+++ b/src/settings/controllers/InviteRulesConfigController.ts
@@ -0,0 +1,88 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type MatrixClient, type IContent } from "matrix-js-sdk/src/matrix";
+
+import { type SettingLevel } from "../SettingLevel.ts";
+import MatrixClientBackedController from "./MatrixClientBackedController.ts";
+import {
+    type ComputedInviteConfig as ComputedInviteRules,
+    INVITE_RULES_ACCOUNT_DATA_TYPE,
+    type InviteConfigAccountData,
+} from "../../@types/invite-rules.ts";
+import { _t } from "../../languageHandler.tsx";
+
+/**
+ * Handles invite filtering rules provided by MSC4155.
+ * This handler does not make use of the roomId parameter.
+ */
+export default class InviteRulesConfigController extends MatrixClientBackedController {
+    public static readonly default: ComputedInviteRules = {
+        allBlocked: false,
+    };
+
+    private static getValidSettingData(content: IContent): ComputedInviteRules {
+        const expectedConfig = content as InviteConfigAccountData;
+        return {
+            allBlocked: !!expectedConfig.blocked_users?.includes("*"),
+        };
+    }
+
+    public initMatrixClient(newClient: MatrixClient): void {
+        newClient.doesServerSupportUnstableFeature("org.matrix.msc4155").then((result) => {
+            this.featureSupported = result;
+        });
+    }
+
+    public featureSupported?: boolean;
+
+    public constructor() {
+        super();
+        this.featureSupported = false;
+    }
+
+    private getValue = (): ComputedInviteRules => {
+        const accountData =
+            this.client?.getAccountData(INVITE_RULES_ACCOUNT_DATA_TYPE)?.getContent<InviteConfigAccountData>() ?? {};
+        return InviteRulesConfigController.getValidSettingData(accountData);
+    };
+
+    public getValueOverride(_level: SettingLevel): ComputedInviteRules {
+        return this.getValue();
+    }
+
+    public get settingDisabled(): true | string {
+        return this.featureSupported ? true : _t("settings|not_supported");
+    }
+
+    public async beforeChange(
+        _level: SettingLevel,
+        _roomId: string | null,
+        newValue: ComputedInviteRules,
+    ): Promise<boolean> {
+        if (!this.client) {
+            return false;
+        }
+        const existingContent = this.client
+            .getAccountData(INVITE_RULES_ACCOUNT_DATA_TYPE)
+            ?.getContent<InviteConfigAccountData>();
+        const newContent: InviteConfigAccountData = {
+            ...existingContent,
+            blocked_users: [...(existingContent?.blocked_users ?? [])],
+        };
+        if (newValue.allBlocked && !newContent.blocked_users!.includes("*")) {
+            newContent.blocked_users!.push("*");
+        } else if (!newValue.allBlocked && newContent.blocked_users?.includes("*")) {
+            newContent.blocked_users = newContent.blocked_users.filter((u) => u !== "*");
+        } else {
+            // No changes required.
+            return false;
+        }
+        await this.client.setAccountData(INVITE_RULES_ACCOUNT_DATA_TYPE, newContent);
+        return true;
+    }
+}
diff --git a/src/settings/controllers/ServerSupportUnstableFeatureController.ts b/src/settings/controllers/ServerSupportUnstableFeatureController.ts
index 1b6bf9cfff..058fdaae08 100644
--- a/src/settings/controllers/ServerSupportUnstableFeatureController.ts
+++ b/src/settings/controllers/ServerSupportUnstableFeatureController.ts
@@ -11,6 +11,7 @@ import MatrixClientBackedController from "./MatrixClientBackedController";
 import { type WatchManager } from "../WatchManager";
 import SettingsStore from "../SettingsStore";
 import { type SettingKey } from "../Settings.tsx";
+import { _t, type TranslationKey } from "../../languageHandler.tsx";
 
 /**
  * Disables a given setting if the server unstable feature it requires is not supported
@@ -33,7 +34,7 @@ export default class ServerSupportUnstableFeatureController extends MatrixClient
         private readonly watchers: WatchManager,
         private readonly unstableFeatureGroups: string[][],
         private readonly stableVersion?: string,
-        private readonly disabledMessage?: string,
+        private readonly disabledMessage?: TranslationKey,
         private readonly forcedValue: any = false,
     ) {
         super();
@@ -96,7 +97,7 @@ export default class ServerSupportUnstableFeatureController extends MatrixClient
 
     public get settingDisabled(): boolean | string {
         if (this.disabled) {
-            return this.disabledMessage ?? true;
+            return this.disabledMessage ? _t(this.disabledMessage) : true;
         }
         return false;
     }
diff --git a/src/settings/controllers/ThemeController.ts b/src/settings/controllers/ThemeController.ts
index 32a13ff8b7..567cc59735 100644
--- a/src/settings/controllers/ThemeController.ts
+++ b/src/settings/controllers/ThemeController.ts
@@ -12,8 +12,6 @@ import { DEFAULT_THEME, enumerateThemes } from "../../theme";
 import { type SettingLevel } from "../SettingLevel";
 
 export default class ThemeController extends SettingController {
-    public static isLogin = false;
-
     public getValueOverride(
         level: SettingLevel,
         roomId: string,
@@ -22,8 +20,6 @@ export default class ThemeController extends SettingController {
     ): any {
         if (!calculatedValue) return null; // Don't override null themes
 
-        if (ThemeController.isLogin) return "light";
-
         const themes = enumerateThemes();
         // Override in case some no longer supported theme is stored here
         if (!themes[calculatedValue]) {
diff --git a/src/settings/handlers/AccountSettingsHandler.ts b/src/settings/handlers/AccountSettingsHandler.ts
index 3ea9db158e..29117778d6 100644
--- a/src/settings/handlers/AccountSettingsHandler.ts
+++ b/src/settings/handlers/AccountSettingsHandler.ts
@@ -204,6 +204,9 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
             case "mediaPreviewConfig":
                 // Handled in MediaPreviewConfigController.
                 return;
+            case "inviteRules":
+                // Handled in InviteRulesConfigController.
+                return;
             default:
                 return this.setAccountData(DEFAULT_SETTINGS_EVENT_TYPE, settingName, newValue);
         }
diff --git a/src/settings/handlers/PlatformSettingsHandler.ts b/src/settings/handlers/PlatformSettingsHandler.ts
index 48420650b1..4741f35530 100644
--- a/src/settings/handlers/PlatformSettingsHandler.ts
+++ b/src/settings/handlers/PlatformSettingsHandler.ts
@@ -10,9 +10,6 @@ import SettingsHandler from "./SettingsHandler";
 import PlatformPeg from "../../PlatformPeg";
 import { SETTINGS } from "../Settings";
 import { SettingLevel } from "../SettingLevel";
-import defaultDispatcher from "../../dispatcher/dispatcher";
-import { type ActionPayload } from "../../dispatcher/payloads";
-import { Action } from "../../dispatcher/actions";
 
 /**
  * Gets and sets settings at the "platform" level for the current device.
@@ -24,22 +21,22 @@ export default class PlatformSettingsHandler extends SettingsHandler {
     public constructor() {
         super();
 
-        defaultDispatcher.register(this.onAction);
+        void this.setup();
     }
 
-    private onAction = (payload: ActionPayload): void => {
-        if (payload.action === Action.PlatformSet) {
-            this.store = {};
-            // Load setting values as they are async and `getValue` must be synchronous
-            Object.entries(SETTINGS).forEach(([key, setting]) => {
-                if (setting.supportedLevels?.includes(SettingLevel.PLATFORM) && payload.platform.supportsSetting(key)) {
-                    payload.platform.getSettingValue(key).then((value: any) => {
-                        this.store[key] = value;
-                    });
-                }
-            });
-        }
-    };
+    private async setup(): Promise<void> {
+        const platform = await PlatformPeg.platformPromise;
+        await platform.initialised;
+
+        // Load setting values as they are async and `getValue` must be synchronous
+        Object.entries(SETTINGS).forEach(([key, setting]) => {
+            if (setting.supportedLevels?.includes(SettingLevel.PLATFORM) && platform.supportsSetting(key)) {
+                platform.getSettingValue(key).then((value: any) => {
+                    this.store[key] = value;
+                });
+            }
+        });
+    }
 
     public canSetValue(settingName: string, roomId: string): boolean {
         return PlatformPeg.get()?.supportsSetting(settingName) ?? false;
diff --git a/src/settings/handlers/RoomAccountSettingsHandler.ts b/src/settings/handlers/RoomAccountSettingsHandler.ts
index 8fdf412adf..6ed09a9801 100644
--- a/src/settings/handlers/RoomAccountSettingsHandler.ts
+++ b/src/settings/handlers/RoomAccountSettingsHandler.ts
@@ -122,6 +122,9 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
             case "mediaPreviewConfig":
                 // Handled in MediaPreviewConfigController.
                 return;
+            case "inviteRules":
+                // Handled in InviteRulesConfigController.
+                return;
             default:
                 return this.setRoomAccountData(roomId, DEFAULT_SETTINGS_EVENT_TYPE, settingName, newValue);
         }
diff --git a/src/settings/watchers/ThemeWatcher.ts b/src/settings/watchers/ThemeWatcher.ts
index 5ee5810884..d56ee559c2 100644
--- a/src/settings/watchers/ThemeWatcher.ts
+++ b/src/settings/watchers/ThemeWatcher.ts
@@ -13,7 +13,6 @@ import { TypedEventEmitter } from "matrix-js-sdk/src/matrix";
 import SettingsStore from "../SettingsStore";
 import dis from "../../dispatcher/dispatcher";
 import { Action } from "../../dispatcher/actions";
-import ThemeController from "../controllers/ThemeController";
 import { findHighContrastTheme } from "../../theme";
 import { type ActionPayload } from "../../dispatcher/payloads";
 import { SettingLevel } from "../SettingLevel";
@@ -88,15 +87,6 @@ export default class ThemeWatcher extends TypedEventEmitter<ThemeWatcherEvent, T
     public getEffectiveTheme(): string {
         // Dev note: Much of this logic is replicated in the AppearanceUserSettingsTab
 
-        // XXX: checking the isLight flag here makes checking it in the ThemeController
-        // itself completely redundant since we just override the result here and we're
-        // now effectively just using the ThemeController as a place to store the static
-        // variable. The system theme setting probably ought to have an equivalent
-        // controller that honours the same flag, although probably better would be to
-        // have the theme logic in one place rather than split between however many
-        // different places.
-        if (ThemeController.isLogin) return "light";
-
         // If the user has specifically enabled the system matching option (excluding default),
         // then use that over anything else. We pick the lowest possible level for the setting
         // to ensure the ordering otherwise works.
@@ -132,7 +122,6 @@ export default class ThemeWatcher extends TypedEventEmitter<ThemeWatcherEvent, T
                 return theme;
             }
         }
-        logger.log("returning theme value");
         return SettingsStore.getValue("theme");
     }
 
diff --git a/src/shouldHideEvent.ts b/src/shouldHideEvent.ts
index f8bc2fc517..64a0e1f0f9 100644
--- a/src/shouldHideEvent.ts
+++ b/src/shouldHideEvent.ts
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
  */
 
-import { type MatrixEvent, EventType, RelationType } from "matrix-js-sdk/src/matrix";
+import { type MatrixEvent, EventType, RelationType, M_POLL_END } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import SettingsStore from "./settings/SettingsStore";
@@ -50,6 +50,9 @@ function memberEventDiff(ev: MatrixEvent): IDiff {
  *     hitting the settings store
  */
 export default function shouldHideEvent(ev: MatrixEvent, ctx?: IRoomState): boolean {
+    // Hide all poll end events
+    if (M_POLL_END.matches(ev.getType())) return true;
+
     // Accessing the settings store directly can be expensive if done frequently,
     // so we should prefer using cached values if a RoomContext is available
     const isEnabled = ctx
diff --git a/src/slash-commands/command.ts b/src/slash-commands/command.ts
index 029d42db45..9619c514dd 100644
--- a/src/slash-commands/command.ts
+++ b/src/slash-commands/command.ts
@@ -18,6 +18,14 @@ import { _t, type TranslationKey, UserFriendlyError } from "../languageHandler";
 import { PosthogAnalytics } from "../PosthogAnalytics";
 import { CommandCategories, type RunResult } from "./interface";
 
+/**
+ * The function signature for the run function of a {@link Command}
+ * @param matrixClient - The Matrix client
+ * @param roomId - The room ID where the command is run
+ * @param threadId - The thread ID where the command is run, or null for room timeline
+ * @param args - The arguments passed to the command
+ * @returns The result of running the command
+ */
 type RunFn = (
     this: Command,
     matrixClient: MatrixClient,
@@ -26,6 +34,19 @@ type RunFn = (
     args?: string,
 ) => RunResult;
 
+/**
+ * Options for {@link Command}
+ * @param command - The command name, e.g. "me" for the /me command
+ * @param aliases - Alternative names for the command
+ * @param args - The arguments for the command, e.g. "<message>" for the /me command
+ * @param description - A translation key describing the command
+ * @param analyticsName - The name to use for analytics tracking
+ * @param runFn - The function to execute when the command is run
+ * @param category - The category of the command, e.g. CommandCategories.emoji
+ * @param hideCompletionAfterSpace - Whether to hide autocomplete after a space is typed
+ * @param isEnabled - A function to determine if the command is enabled in a given context
+ * @param renderingTypes - The rendering types (room/thread) where this command is valid
+ */
 interface ICommandOpts {
     command: string;
     aliases?: string[];
@@ -35,7 +56,7 @@ interface ICommandOpts {
     runFn?: RunFn;
     category: string;
     hideCompletionAfterSpace?: boolean;
-    isEnabled?(matrixClient: MatrixClient | null): boolean;
+    isEnabled?(matrixClient: MatrixClient | null, roomId: string | null): boolean;
     renderingTypes?: TimelineRenderingType[];
 }
 
@@ -49,7 +70,7 @@ export class Command {
     public readonly hideCompletionAfterSpace: boolean;
     public readonly renderingTypes?: TimelineRenderingType[];
     public readonly analyticsName?: SlashCommandEvent["command"];
-    private readonly _isEnabled?: (matrixClient: MatrixClient | null) => boolean;
+    private readonly _isEnabled?: (matrixClient: MatrixClient | null, roomId: string | null) => boolean;
 
     public constructor(opts: ICommandOpts) {
         this.command = opts.command;
@@ -102,7 +123,7 @@ export class Command {
         return _t("slash_command|usage") + ": " + this.getCommandWithArgs();
     }
 
-    public isEnabled(cli: MatrixClient | null): boolean {
-        return this._isEnabled?.(cli) ?? true;
+    public isEnabled(cli: MatrixClient | null, roomId: string | null): boolean {
+        return this._isEnabled?.(cli, roomId) ?? true;
     }
 }
diff --git a/src/slash-commands/utils.ts b/src/slash-commands/utils.ts
index d9cf15d16a..a96a324d5d 100644
--- a/src/slash-commands/utils.ts
+++ b/src/slash-commands/utils.ts
@@ -29,8 +29,13 @@ export function successSync(value: any): RunResult {
     return success(Promise.resolve(value));
 }
 
-export const canAffectPowerlevels = (cli: MatrixClient | null): boolean => {
-    const roomId = SdkContextClass.instance.roomViewStore.getRoomId();
+/**
+ * Check whether the user can affect power levels in the given room
+ * @param cli - The Matrix client
+ * @param roomId - The room ID
+ * @returns True if the user can affect power levels, false otherwise
+ */
+export const canAffectPowerlevels = (cli: MatrixClient | null, roomId: string | null): boolean => {
     if (!cli || !roomId) return false;
     const room = cli?.getRoom(roomId);
     return !!room?.currentState.maySendStateEvent(EventType.RoomPowerLevels, cli.getSafeUserId()) && !isLocalRoom(room);
diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts
index e3b01cae0b..041430340e 100644
--- a/src/stores/BreadcrumbsStore.ts
+++ b/src/stores/BreadcrumbsStore.ts
@@ -143,7 +143,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
 
         // If the room is upgraded, use that room instead. We'll also splice out
         // any children of the room.
-        const history = this.matrixClient?.getRoomUpgradeHistory(room.roomId, false, msc3946ProcessDynamicPredecessor);
+        const history = this.matrixClient?.getRoomUpgradeHistory(room.roomId, true, msc3946ProcessDynamicPredecessor);
         if (history && history.length > 1) {
             room = history[history.length - 1]; // Last room is most recent in history
 
diff --git a/src/stores/CallStore.ts b/src/stores/CallStore.ts
index 6347cc898e..6dc41dfce1 100644
--- a/src/stores/CallStore.ts
+++ b/src/stores/CallStore.ts
@@ -7,10 +7,9 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { logger } from "matrix-js-sdk/src/logger";
-import { GroupCallEventHandlerEvent } from "matrix-js-sdk/src/webrtc/groupCallEventHandler";
 import { type MatrixRTCSession, MatrixRTCSessionManagerEvents } from "matrix-js-sdk/src/matrixrtc";
 
-import type { EmptyObject, GroupCall, Room } from "matrix-js-sdk/src/matrix";
+import type { EmptyObject, Room } from "matrix-js-sdk/src/matrix";
 import defaultDispatcher from "../dispatcher/dispatcher";
 import { UPDATE_EVENT } from "./AsyncStore";
 import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
@@ -53,8 +52,6 @@ export class CallStore extends AsyncStoreWithClient<EmptyObject> {
         for (const room of this.matrixClient.getRooms()) {
             this.updateRoom(room);
         }
-        this.matrixClient.on(GroupCallEventHandlerEvent.Incoming, this.onGroupCall);
-        this.matrixClient.on(GroupCallEventHandlerEvent.Outgoing, this.onGroupCall);
         this.matrixClient.matrixRTC.on(MatrixRTCSessionManagerEvents.SessionStarted, this.onRTCSessionStart);
         WidgetStore.instance.on(UPDATE_EVENT, this.onWidgets);
 
@@ -85,12 +82,7 @@ export class CallStore extends AsyncStoreWithClient<EmptyObject> {
         this.calls.clear();
         this._connectedCalls.clear();
 
-        if (this.matrixClient) {
-            this.matrixClient.off(GroupCallEventHandlerEvent.Incoming, this.onGroupCall);
-            this.matrixClient.off(GroupCallEventHandlerEvent.Outgoing, this.onGroupCall);
-            this.matrixClient.off(GroupCallEventHandlerEvent.Ended, this.onGroupCall);
-            this.matrixClient.matrixRTC.off(MatrixRTCSessionManagerEvents.SessionStarted, this.onRTCSessionStart);
-        }
+        this.matrixClient?.matrixRTC.off(MatrixRTCSessionManagerEvents.SessionStarted, this.onRTCSessionStart);
         WidgetStore.instance.off(UPDATE_EVENT, this.onWidgets);
     }
 
@@ -117,8 +109,16 @@ export class CallStore extends AsyncStoreWithClient<EmptyObject> {
     private calls = new Map<string, Call>(); // Key is room ID
     private callListeners = new Map<Call, Map<CallEvent, (...args: unknown[]) => unknown>>();
 
+    private inUpdateRoom = false;
     private updateRoom(room: Room): void {
-        if (!this.calls.has(room.roomId)) {
+        // XXX: This method is guarded with the flag this.inUpdateRoom because
+        // we need to block this method from calling itself recursively. That
+        // could happen, for instance, if Call.get adds a new virtual widget to
+        // the WidgetStore, firing a WidgetStore update that we don't actually
+        // care about. Without the guard we could get duplicate Call objects
+        // fighting for control over the same widget.
+        if (!this.inUpdateRoom && !this.calls.has(room.roomId)) {
+            this.inUpdateRoom = true;
             const call = Call.get(room);
 
             if (call) {
@@ -149,6 +149,7 @@ export class CallStore extends AsyncStoreWithClient<EmptyObject> {
             }
 
             this.emit(CallStoreEvent.Call, call, room.roomId);
+            this.inUpdateRoom = false;
         }
     }
 
@@ -186,7 +187,6 @@ export class CallStore extends AsyncStoreWithClient<EmptyObject> {
         }
     };
 
-    private onGroupCall = (groupCall: GroupCall): void => this.updateRoom(groupCall.room);
     private onRTCSessionStart = (roomId: string, session: MatrixRTCSession): void => {
         this.updateRoom(session.room);
     };
diff --git a/src/stores/LifecycleStore.ts b/src/stores/LifecycleStore.ts
index 6efeffa013..1afc105f19 100644
--- a/src/stores/LifecycleStore.ts
+++ b/src/stores/LifecycleStore.ts
@@ -69,7 +69,7 @@ class LifecycleStore extends AsyncStore<IState> {
                 dis.dispatch(deferredAction);
                 break;
             }
-            case "on_client_not_viable":
+            case Action.ClientNotViable:
             case Action.OnLoggedOut:
                 this.reset();
                 break;
diff --git a/src/stores/ModalWidgetStore.ts b/src/stores/ModalWidgetStore.ts
index 2a2fbdd8da..76db49e5dc 100644
--- a/src/stores/ModalWidgetStore.ts
+++ b/src/stores/ModalWidgetStore.ts
@@ -88,11 +88,11 @@ export class ModalWidgetStore extends AsyncStoreWithClient<IState> {
             this.modalInstance = null;
 
             const sourceMessaging = WidgetMessagingStore.instance.getMessaging(sourceWidget, widgetRoomId);
-            if (!sourceMessaging) {
-                logger.error("No source widget messaging for modal widget");
+            if (!sourceMessaging?.widgetApi) {
+                logger.error("No source widget API for modal widget");
                 return;
             }
-            sourceMessaging.notifyModalWidgetClose(data);
+            sourceMessaging.widgetApi.notifyModalWidgetClose(data);
         }
     };
 }
diff --git a/src/stores/MultiRoomViewStore.ts b/src/stores/MultiRoomViewStore.ts
new file mode 100644
index 0000000000..bc2f090e6f
--- /dev/null
+++ b/src/stores/MultiRoomViewStore.ts
@@ -0,0 +1,67 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { logger } from "matrix-js-sdk/src/logger";
+
+import { RoomViewStore } from "./RoomViewStore";
+import { type MatrixDispatcher } from "../dispatcher/dispatcher";
+import { type SdkContextClass } from "../contexts/SDKContext";
+import { Action } from "../dispatcher/actions";
+
+/**
+ * Acts as a cache of many RoomViewStore instances, creating them as necessary
+ * given a room ID.
+ */
+export class MultiRoomViewStore {
+    /**
+     * Map from room-id to RVS instance.
+     */
+    private stores: Map<string, RoomViewStore> = new Map();
+
+    public constructor(
+        private dispatcher: MatrixDispatcher,
+        private sdkContextClass: SdkContextClass,
+    ) {}
+
+    /**
+     * Get a RVS instance for the room identified by the given roomId.
+     */
+    public getRoomViewStoreForRoom(roomId: string): RoomViewStore {
+        // Get existing store / create new store
+        const store = this.stores.has(roomId)
+            ? this.stores.get(roomId)!
+            : new RoomViewStore(this.dispatcher, this.sdkContextClass, roomId);
+
+        // RoomView component does not render the room unless you call viewRoom
+        store.viewRoom({
+            action: Action.ViewRoom,
+            room_id: roomId,
+            metricsTrigger: undefined,
+        });
+
+        // Cache the store, okay to do even if the store is already in the map
+        this.stores.set(roomId, store);
+
+        return store;
+    }
+
+    /**
+     * Remove a RVS instance that was created by {@link getRoomViewStoreForRoom}.
+     */
+    public removeRoomViewStore(roomId: string): void {
+        const didRemove = this.stores.delete(roomId);
+        if (!didRemove) {
+            logger.warn(`removeRoomViewStore called with ${roomId} but no store exists for this room.`);
+        }
+    }
+
+    public dispose(): void {
+        for (const id of this.stores.keys()) {
+            this.removeRoomViewStore(id);
+        }
+    }
+}
diff --git a/src/stores/ReadyWatchingStore.ts b/src/stores/ReadyWatchingStore.ts
index 91d7144c71..1c7b92ade7 100644
--- a/src/stores/ReadyWatchingStore.ts
+++ b/src/stores/ReadyWatchingStore.ts
@@ -77,7 +77,7 @@ export abstract class ReadyWatchingStore extends EventEmitter implements IDestro
                 this.matrixClient = payload.matrixClient;
                 await this.onReady();
             }
-        } else if (payload.action === "on_client_not_viable" || payload.action === Action.OnLoggedOut) {
+        } else if (payload.action === Action.ClientNotViable || payload.action === Action.OnLoggedOut) {
             if (this.matrixClient) {
                 await this.onNotReady();
                 this.matrixClient = undefined;
diff --git a/src/stores/ReleaseAnnouncementStore.ts b/src/stores/ReleaseAnnouncementStore.ts
index 0b287d44b9..f005fd4b30 100644
--- a/src/stores/ReleaseAnnouncementStore.ts
+++ b/src/stores/ReleaseAnnouncementStore.ts
@@ -13,11 +13,14 @@ import { cloneDeep } from "lodash";
 import SettingsStore from "../settings/SettingsStore";
 import { SettingLevel } from "../settings/SettingLevel";
 import { Features } from "../settings/Settings";
+import ToastStore from "./ToastStore";
 
 /**
  * The features are shown in the array order.
+ * We include a `_test_dummy` value to enable tests to function even where there are no running release announcements.
+ * This value must be at the end of the list.
  */
-const FEATURES = ["pinningMessageList"] as const;
+const FEATURES = ["_test_dummy1", "_test_dummy2"] as const;
 /**
  * All the features that can be shown in the release announcements.
  */
@@ -76,6 +79,9 @@ export class ReleaseAnnouncementStore extends TypedEventEmitter<ReleaseAnnouncem
         SettingsStore.watchSetting("releaseAnnouncementData", null, () => {
             this.emit("releaseAnnouncementChanged", this.getReleaseAnnouncement());
         });
+        ToastStore.sharedInstance().on("update", () => {
+            this.emit("releaseAnnouncementChanged", this.getReleaseAnnouncement());
+        });
     }
 
     /**
@@ -104,6 +110,9 @@ export class ReleaseAnnouncementStore extends TypedEventEmitter<ReleaseAnnouncem
         const isReleaseAnnouncementEnabled = this.isReleaseAnnouncementEnabled();
         if (!isReleaseAnnouncementEnabled) return null;
 
+        // also don't show release announcements if any toasts are on screen
+        if (ToastStore.sharedInstance().getToasts().length > 0) return null;
+
         const viewedReleaseAnnouncements = this.getViewedReleaseAnnouncements();
 
         // Find the first feature that has not been viewed
diff --git a/src/stores/RoomViewStore.tsx b/src/stores/RoomViewStore.tsx
index 633d55f3f6..743f6c4f74 100644
--- a/src/stores/RoomViewStore.tsx
+++ b/src/stores/RoomViewStore.tsx
@@ -10,12 +10,11 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type ReactNode } from "react";
 import * as utils from "matrix-js-sdk/src/utils";
-import { MatrixError, JoinRule, type Room, type MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { MatrixError, JoinRule, type Room, type MatrixEvent, type IJoinRoomOpts } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 import { type ViewRoom as ViewRoomEvent } from "@matrix-org/analytics-events/types/typescript/ViewRoom";
 import { type JoinedRoom as JoinedRoomEvent } from "@matrix-org/analytics-events/types/typescript/JoinedRoom";
-import { type Optional } from "matrix-events-sdk";
 import EventEmitter from "events";
 import {
     RoomViewLifecycle,
@@ -26,7 +25,7 @@ import { type MatrixDispatcher } from "../dispatcher/dispatcher";
 import { MatrixClientPeg } from "../MatrixClientPeg";
 import Modal from "../Modal";
 import { _t } from "../languageHandler";
-import { getCachedRoomIDForAlias, storeRoomAliasInCache } from "../RoomAliasCache";
+import { getCachedRoomIdForAlias, storeRoomAliasInCache } from "../RoomAliasCache";
 import { Action } from "../dispatcher/actions";
 import { retry } from "../utils/promise";
 import { TimelineRenderingType } from "../contexts/RoomContext";
@@ -52,6 +51,7 @@ import { ModuleRunner } from "../modules/ModuleRunner";
 import { setMarkedUnreadState } from "../utils/notifications";
 import { ConnectionState, ElementCall } from "../models/Call";
 import { isVideoRoom } from "../utils/video-rooms";
+import { ModuleApi } from "../modules/Api";
 
 const NUM_JOIN_RETRY = 5;
 
@@ -109,10 +109,6 @@ interface State {
      * Whether we're viewing a call or call lobby in this room
      */
     viewingCall: boolean;
-    /**
-     * If we want the call to skip the lobby and immediately join
-     */
-    skipLobby?: boolean;
 
     promptAskToJoin: boolean;
 
@@ -157,6 +153,7 @@ export class RoomViewStore extends EventEmitter {
     public constructor(
         dis: MatrixDispatcher,
         private readonly stores: SdkContextClass,
+        private readonly lockedToRoomId?: string,
     ) {
         super();
         this.resetDispatcher(dis);
@@ -191,7 +188,7 @@ export class RoomViewStore extends EventEmitter {
 
         const lastRoomId = this.state.roomId;
         this.state = Object.assign(this.state, newState);
-        if (lastRoomId !== this.state.roomId) {
+        if (!this.lockedToRoomId && lastRoomId !== this.state.roomId) {
             if (lastRoomId) this.emitForRoom(lastRoomId, false);
             if (this.state.roomId) this.emitForRoom(this.state.roomId, true);
 
@@ -208,6 +205,9 @@ export class RoomViewStore extends EventEmitter {
     }
 
     private onDispatch(payload: ActionPayload): void {
+        if (this.lockedToRoomId && payload.room_id && this.lockedToRoomId !== payload.room_id) {
+            return;
+        }
         // eslint-disable-line @typescript-eslint/naming-convention
         switch (payload.action) {
             // view_room:
@@ -285,17 +285,22 @@ export class RoomViewStore extends EventEmitter {
 
                 break;
             }
-            case "on_client_not_viable":
+            case Action.ClientNotViable:
             case Action.OnLoggedOut:
                 this.reset();
                 break;
             case "reply_to_event":
                 // Thread timeline view handles its own reply-to-state
                 if (TimelineRenderingType.Thread !== payload.context) {
+                    const roomId: string | undefined = payload.event?.getRoomId();
+
                     // If currently viewed room does not match the room in which we wish to reply then change rooms this
                     // can happen when performing a search across all rooms. Persist the data from this event for both
                     // room and search timeline rendering types, search will get auto-closed by RoomView at this time.
-                    if (payload.event && payload.event.getRoomId() !== this.state.roomId) {
+                    if (payload.event && roomId !== this.state.roomId) {
+                        // if the room is displayed in a module, we don't want to change the room view
+                        if (roomId && this.isRoomDisplayedInModule(roomId)) return;
+
                         this.dis?.dispatch<ViewRoomPayload>({
                             action: Action.ViewRoom,
                             room_id: payload.event.getRoomId(),
@@ -328,7 +333,7 @@ export class RoomViewStore extends EventEmitter {
         }
     }
 
-    private async viewRoom(payload: ViewRoomPayload): Promise<void> {
+    public async viewRoom(payload: ViewRoomPayload): Promise<void> {
         if (payload.room_id) {
             const room = MatrixClientPeg.safeGet().getRoom(payload.room_id);
 
@@ -355,17 +360,29 @@ export class RoomViewStore extends EventEmitter {
                 });
             }
 
-            if (room && (payload.view_call || isVideoRoom(room))) {
+            let viewingCall = payload.view_call;
+            if (viewingCall === undefined) {
+                // Default behavior: keep the same call state as before if viewing the same room
+                if (payload.room_id === this.state.roomId) viewingCall = this.state.viewingCall;
+                // Always view the call in video rooms
+                else if (room && isVideoRoom(room)) viewingCall = true;
+                // Otherwise, only view if actively connected
+                else viewingCall = CallStore.instance.getActiveCall(payload.room_id) !== null;
+            }
+
+            if (room && viewingCall) {
                 let call = CallStore.instance.getCall(payload.room_id);
                 // Start a call if not already there
                 if (call === null) {
-                    ElementCall.create(room, false);
+                    ElementCall.create(room);
                     call = CallStore.instance.getCall(payload.room_id)!;
                 }
                 call.presented = true;
                 // Immediately start the call. This will connect to all required widget events
                 // and allow the widget to show the lobby.
-                if (call.connectionState === ConnectionState.Disconnected) call.start();
+                if (call.connectionState === ConnectionState.Disconnected) {
+                    call.start({ skipLobby: payload.skipLobby, voiceOnly: payload.voiceOnly });
+                }
             }
             // If we switch to a different room from the call, we are no longer presenting it
             const prevRoomCall = this.state.roomId ? CallStore.instance.getCall(this.state.roomId) : null;
@@ -413,12 +430,7 @@ export class RoomViewStore extends EventEmitter {
                 replyingToEvent: null,
                 viaServers: payload.via_servers ?? [],
                 wasContextSwitch: payload.context_switch ?? false,
-                skipLobby: payload.skipLobby,
-                viewingCall:
-                    payload.view_call ??
-                    (payload.room_id === this.state.roomId
-                        ? this.state.viewingCall
-                        : CallStore.instance.getActiveCall(payload.room_id) !== null),
+                viewingCall,
             };
 
             // Allow being given an event to be replied to when switching rooms but sanity check its for this room
@@ -433,22 +445,37 @@ export class RoomViewStore extends EventEmitter {
             this.setState(newState);
 
             if (payload.auto_join) {
-                this.dis?.dispatch<JoinRoomPayload>({
+                const joinPayload: JoinRoomPayload = {
                     ...payload,
                     action: Action.JoinRoom,
                     roomId: payload.room_id,
                     metricsTrigger: payload.metricsTrigger as JoinRoomPayload["metricsTrigger"],
-                });
+                    canAskToJoin: SettingsStore.getValue("feature_ask_to_join"),
+                };
+                // Explicitly pass viaServers in case state doesn't contain the same due to
+                // some race issues.
+                if (payload.via_servers) {
+                    joinPayload.opts = {
+                        viaServers: payload.via_servers,
+                    };
+                }
+                this.dis?.dispatch<JoinRoomPayload>(joinPayload);
             }
 
             if (room) {
                 await setMarkedUnreadState(room, MatrixClientPeg.safeGet(), false);
             }
         } else if (payload.room_alias) {
+            let roomId: string;
+            let viaServers: string[] | undefined;
+
             // Try the room alias to room ID navigation cache first to avoid
             // blocking room navigation on the homeserver.
-            let roomId = getCachedRoomIDForAlias(payload.room_alias);
-            if (!roomId) {
+            const cachedResult = getCachedRoomIdForAlias(payload.room_alias);
+            if (cachedResult) {
+                roomId = cachedResult.roomId;
+                viaServers = cachedResult.viaServers;
+            } else {
                 // Room alias cache miss, so let's ask the homeserver. Resolve the alias
                 // and then do a second dispatch with the room ID acquired.
                 this.setState({
@@ -463,12 +490,12 @@ export class RoomViewStore extends EventEmitter {
                     viaServers: payload.via_servers,
                     wasContextSwitch: payload.context_switch,
                     viewingCall: payload.view_call ?? false,
-                    skipLobby: payload.skipLobby,
                 });
                 try {
                     const result = await MatrixClientPeg.safeGet().getRoomIdForAlias(payload.room_alias);
-                    storeRoomAliasInCache(payload.room_alias, result.room_id);
+                    storeRoomAliasInCache(payload.room_alias, result.room_id, result.servers);
                     roomId = result.room_id;
+                    viaServers = result.servers;
                 } catch (err) {
                     logger.error("RVS failed to get room id for alias: ", err);
                     this.dis?.dispatch<ViewRoomErrorPayload>({
@@ -485,6 +512,7 @@ export class RoomViewStore extends EventEmitter {
             this.dis?.dispatch({
                 ...payload,
                 room_id: roomId,
+                via_servers: viaServers,
             });
         }
     }
@@ -509,18 +537,22 @@ export class RoomViewStore extends EventEmitter {
             joining: true,
         });
 
-        // take a copy of roomAlias & roomId as they may change by the time the join is complete
-        const { roomAlias, roomId = payload.roomId } = this.state;
+        // take a copy of roomAlias, roomId & viaServers as they may change by the time the join is complete
+        const { roomAlias, roomId = payload.roomId, viaServers = [] } = this.state;
+        // prefer the room alias if we have one as it allows joining over federation even with no viaServers
         const address = roomAlias || roomId!;
-        const viaServers = this.state.viaServers || [];
+
+        const joinOpts: IJoinRoomOpts = {
+            viaServers,
+            ...(payload.opts ?? {}),
+        };
+        if (SettingsStore.getValue("feature_share_history_on_invite")) {
+            joinOpts.acceptSharedHistory = true;
+        }
         try {
             const cli = MatrixClientPeg.safeGet();
             await retry<Room, MatrixError>(
-                () =>
-                    cli.joinRoom(address, {
-                        viaServers,
-                        ...(payload.opts || {}),
-                    }),
+                () => cli.joinRoom(address, joinOpts),
                 NUM_JOIN_RETRY,
                 (err) => {
                     // if we received a Gateway timeout or Cloudflare timeout then retry
@@ -544,7 +576,7 @@ export class RoomViewStore extends EventEmitter {
                 canAskToJoin: payload.canAskToJoin,
             });
 
-            if (payload.canAskToJoin) {
+            if (payload.canAskToJoin && err instanceof MatrixError && err.httpStatus === 403) {
                 this.dis?.dispatch({ action: Action.PromptAskToJoin });
             }
         }
@@ -639,16 +671,16 @@ export class RoomViewStore extends EventEmitter {
     }
 
     // The room ID of the room currently being viewed
-    public getRoomId(): Optional<string> {
+    public getRoomId(): string | null {
         return this.state.roomId;
     }
 
-    public getThreadId(): Optional<string> {
+    public getThreadId(): string | null {
         return this.state.threadId;
     }
 
     // The event to scroll to when the room is first viewed
-    public getInitialEventId(): Optional<string> {
+    public getInitialEventId(): string | null {
         return this.state.initialEventId;
     }
 
@@ -663,7 +695,7 @@ export class RoomViewStore extends EventEmitter {
     }
 
     // The room alias of the room (or null if not originally specified in view_room)
-    public getRoomAlias(): Optional<string> {
+    public getRoomAlias(): string | null {
         return this.state.roomAlias;
     }
 
@@ -673,7 +705,7 @@ export class RoomViewStore extends EventEmitter {
     }
 
     // Any error that has occurred during loading
-    public getRoomLoadError(): Optional<MatrixError> {
+    public getRoomLoadError(): MatrixError | null {
         return this.state.roomLoadError;
     }
 
@@ -705,7 +737,7 @@ export class RoomViewStore extends EventEmitter {
     }
 
     // Any error that has occurred during joining
-    public getJoinError(): Optional<Error> {
+    public getJoinError(): Error | null {
         return this.state.joinError;
     }
 
@@ -726,10 +758,6 @@ export class RoomViewStore extends EventEmitter {
         return this.state.viewingCall;
     }
 
-    public skipCallLobby(): boolean | undefined {
-        return this.state.skipLobby;
-    }
-
     /**
      * Gets the current state of the 'promptForAskToJoin' property.
      *
@@ -793,4 +821,16 @@ export class RoomViewStore extends EventEmitter {
         ModuleRunner.instance.invoke(RoomViewLifecycle.ViewRoom, viewRoomOpts, this.getRoomId());
         this.setState({ viewRoomOpts });
     }
+
+    /**
+     * Checks if a room is already displayed in the current active space module.
+     * @param roomId
+     */
+    public isRoomDisplayedInModule(roomId: string): boolean {
+        const currentSpace = this.stores.spaceStore.activeSpace;
+        const cb = ModuleApi.instance.extras.visibleRoomBySpaceKey.get(currentSpace);
+        if (!cb) return false;
+
+        return cb().includes(roomId);
+    }
 }
diff --git a/src/stores/ToastStore.ts b/src/stores/ToastStore.ts
index 7cb9d60925..41a78ed460 100644
--- a/src/stores/ToastStore.ts
+++ b/src/stores/ToastStore.ts
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import EventEmitter from "events";
 import { logger } from "matrix-js-sdk/src/logger";
+import { type JSX } from "react";
 
 import type React from "react";
 import { type ComponentClass } from "../@types/common";
@@ -17,7 +18,7 @@ export interface IToast<C extends ComponentClass> {
     // higher priority number will be shown on top of lower priority
     priority: number;
     title?: string;
-    icon?: string;
+    icon?: JSX.Element;
     component: C;
     className?: string;
     bodyClassName?: string;
diff --git a/src/stores/VoiceRecordingStore.ts b/src/stores/VoiceRecordingStore.ts
index 0715394996..20ad092484 100644
--- a/src/stores/VoiceRecordingStore.ts
+++ b/src/stores/VoiceRecordingStore.ts
@@ -6,7 +6,6 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { type Optional } from "matrix-events-sdk";
 import { type Room, type IEventRelation, RelationType } from "matrix-js-sdk/src/matrix";
 
 import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
@@ -17,7 +16,7 @@ import { createVoiceMessageRecording, type VoiceMessageRecording } from "../audi
 const SEPARATOR = "|";
 
 interface IState {
-    [voiceRecordingId: string]: Optional<VoiceMessageRecording>;
+    [voiceRecordingId: string]: VoiceMessageRecording;
 }
 
 export class VoiceRecordingStore extends AsyncStoreWithClient<IState> {
@@ -51,9 +50,9 @@ export class VoiceRecordingStore extends AsyncStoreWithClient<IState> {
     /**
      * Gets the active recording instance, if any.
      * @param {string} voiceRecordingId The room ID (with optionally the thread ID if in one) to get the recording in.
-     * @returns {Optional<VoiceRecording>} The recording, if any.
+     * @returns {VoiceRecording?} The recording, if any.
      */
-    public getActiveRecording(voiceRecordingId: string): Optional<VoiceMessageRecording> {
+    public getActiveRecording(voiceRecordingId: string): VoiceMessageRecording | undefined {
         return this.state[voiceRecordingId];
     }
 
diff --git a/src/stores/WidgetStore.ts b/src/stores/WidgetStore.ts
index 5a76df7103..fbae950dbc 100644
--- a/src/stores/WidgetStore.ts
+++ b/src/stores/WidgetStore.ts
@@ -189,6 +189,7 @@ export default class WidgetStore extends AsyncStoreWithClient<EmptyObject> {
         const app = WidgetUtils.makeAppConfig(widget.id, widget, widget.creatorUserId, roomId, undefined);
         this.widgetMap.set(WidgetUtils.getWidgetUid(app), app);
         this.roomMap.get(roomId)!.widgets.push(app);
+        this.emit(UPDATE_EVENT, roomId);
         return app;
     }
 
@@ -198,6 +199,7 @@ export default class WidgetStore extends AsyncStoreWithClient<EmptyObject> {
         if (roomApps) {
             roomApps.widgets = roomApps.widgets.filter((app) => !(app.id === widgetId && app.roomId === roomId));
         }
+        this.emit(UPDATE_EVENT, roomId);
     }
 }
 
diff --git a/src/stores/notifications/SpaceNotificationState.ts b/src/stores/notifications/SpaceNotificationState.ts
index 4ea24b7e10..0faf8bc3e6 100644
--- a/src/stores/notifications/SpaceNotificationState.ts
+++ b/src/stores/notifications/SpaceNotificationState.ts
@@ -12,15 +12,15 @@ import { NotificationLevel } from "./NotificationLevel";
 import { arrayDiff } from "../../utils/arrays";
 import { type RoomNotificationState } from "./RoomNotificationState";
 import { NotificationState, NotificationStateEvents } from "./NotificationState";
-import { type FetchRoomFn } from "./ListNotificationState";
 import { DefaultTagID } from "../room-list/models";
 import RoomListStore from "../room-list/RoomListStore";
+import { RoomNotificationStateStore } from "./RoomNotificationStateStore";
 
 export class SpaceNotificationState extends NotificationState {
     public rooms: Room[] = []; // exposed only for tests
     private states: { [spaceId: string]: RoomNotificationState } = {};
 
-    public constructor(private getRoomFn: FetchRoomFn) {
+    public constructor() {
         super();
     }
 
@@ -39,7 +39,7 @@ export class SpaceNotificationState extends NotificationState {
             state.off(NotificationStateEvents.Update, this.onRoomNotificationStateUpdate);
         }
         for (const newRoom of diff.added) {
-            const state = this.getRoomFn(newRoom);
+            const state = RoomNotificationStateStore.instance.getRoomState(newRoom);
             state.on(NotificationStateEvents.Update, this.onRoomNotificationStateUpdate);
             this.states[newRoom.roomId] = state;
         }
diff --git a/src/stores/right-panel/RightPanelStore.ts b/src/stores/right-panel/RightPanelStore.ts
index b3f8d93460..f58559a66e 100644
--- a/src/stores/right-panel/RightPanelStore.ts
+++ b/src/stores/right-panel/RightPanelStore.ts
@@ -8,7 +8,6 @@ Please see LICENSE files in the repository root for full details.
 
 import { logger } from "matrix-js-sdk/src/logger";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto-api";
-import { type Optional } from "matrix-events-sdk";
 
 import defaultDispatcher from "../../dispatcher/dispatcher";
 import { pendingVerificationRequestForUser } from "../../verification";
@@ -58,7 +57,7 @@ export default class RightPanelStore extends ReadyWatchingStore {
 
     private global?: IRightPanelForRoom;
     private byRoom: { [roomId: string]: IRightPanelForRoom } = {};
-    private viewedRoomId: Optional<string>;
+    private viewedRoomId: string | null = null;
 
     private constructor() {
         super(defaultDispatcher);
@@ -419,7 +418,7 @@ export default class RightPanelStore extends ReadyWatchingStore {
         }
     };
 
-    private handleViewedRoomChange(oldRoomId: Optional<string>, newRoomId: Optional<string>): void {
+    private handleViewedRoomChange(oldRoomId: string | null, newRoomId: string | null): void {
         if (!this.mxClient) return; // not ready, onReady will handle the first room
         this.viewedRoomId = newRoomId;
         // load values from byRoomCache with the viewedRoomId.
diff --git a/src/stores/room-list-v3/RoomListStoreV3.ts b/src/stores/room-list-v3/RoomListStoreV3.ts
index 92de63285e..6133fcfd19 100644
--- a/src/stores/room-list-v3/RoomListStoreV3.ts
+++ b/src/stores/room-list-v3/RoomListStoreV3.ts
@@ -6,9 +6,9 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { logger } from "matrix-js-sdk/src/logger";
-import { EventType, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { EventType } from "matrix-js-sdk/src/matrix";
 
-import type { EmptyObject, Room, RoomState } from "matrix-js-sdk/src/matrix";
+import type { EmptyObject, Room } from "matrix-js-sdk/src/matrix";
 import type { MatrixDispatcher } from "../../dispatcher/dispatcher";
 import type { ActionPayload } from "../../dispatcher/payloads";
 import type { FilterKey } from "./skip-list/filters";
@@ -22,7 +22,7 @@ import { AlphabeticSorter } from "./skip-list/sorters/AlphabeticSorter";
 import { readReceiptChangeIsFor } from "../../utils/read-receipts";
 import { EffectiveMembership, getEffectiveMembership, getEffectiveMembershipTag } from "../../utils/membership";
 import SpaceStore from "../spaces/SpaceStore";
-import { UPDATE_HOME_BEHAVIOUR, UPDATE_SELECTED_SPACE } from "../spaces";
+import { type SpaceKey, UPDATE_HOME_BEHAVIOUR, UPDATE_SELECTED_SPACE } from "../spaces";
 import { FavouriteFilter } from "./skip-list/filters/FavouriteFilter";
 import { UnreadFilter } from "./skip-list/filters/UnreadFilter";
 import { PeopleFilter } from "./skip-list/filters/PeopleFilter";
@@ -56,6 +56,16 @@ export enum RoomListStoreV3Event {
     ListsLoaded = "lists_loaded",
 }
 
+// The result object for returning rooms from the store
+export type RoomsResult = {
+    // The ID of the active space queried
+    spaceId: SpaceKey;
+    // The filter queried
+    filterKeys?: FilterKey[];
+    // The resulting list of rooms
+    rooms: Room[];
+};
+
 export const LISTS_UPDATE_EVENT = RoomListStoreV3Event.ListsUpdate;
 export const LISTS_LOADED_EVENT = RoomListStoreV3Event.ListsLoaded;
 /**
@@ -107,9 +117,15 @@ export class RoomListStoreV3Class extends AsyncStoreWithClient<EmptyObject> {
 
      * @param filterKeys Optional array of filters that the rooms must match against.
      */
-    public getSortedRoomsInActiveSpace(filterKeys?: FilterKey[]): Room[] {
-        if (this.roomSkipList?.initialized) return Array.from(this.roomSkipList.getRoomsInActiveSpace(filterKeys));
-        else return [];
+    public getSortedRoomsInActiveSpace(filterKeys?: FilterKey[]): RoomsResult {
+        const spaceId = SpaceStore.instance.activeSpace;
+        if (this.roomSkipList?.initialized)
+            return {
+                spaceId: spaceId,
+                filterKeys,
+                rooms: Array.from(this.roomSkipList.getRoomsInActiveSpace(filterKeys)),
+            };
+        else return { spaceId: spaceId, filterKeys, rooms: [] };
     }
 
     /**
@@ -219,12 +235,10 @@ export class RoomListStoreV3Class extends AsyncStoreWithClient<EmptyObject> {
                     this.addRoomAndEmit(payload.room);
                     return;
                 }
-
                 // If the user has left this room, remove it from the skiplist.
                 if (
-                    (payload.oldMembership === KnownMembership.Invite ||
-                        payload.oldMembership === KnownMembership.Join) &&
-                    payload.membership === KnownMembership.Leave
+                    (oldMembership === EffectiveMembership.Invite || oldMembership === EffectiveMembership.Join) &&
+                    newMembership === EffectiveMembership.Leave
                 ) {
                     this.roomSkipList.removeRoom(payload.room);
                     this.emit(LISTS_UPDATE_EVENT);
@@ -234,16 +248,19 @@ export class RoomListStoreV3Class extends AsyncStoreWithClient<EmptyObject> {
                 // If we're joining an upgraded room, we'll want to make sure we don't proliferate
                 // the dead room in the list.
                 if (oldMembership !== EffectiveMembership.Join && newMembership === EffectiveMembership.Join) {
-                    const roomState: RoomState = payload.room.currentState;
-                    const predecessor = roomState.findPredecessor(this.msc3946ProcessDynamicPredecessor);
-                    if (predecessor) {
-                        const prevRoom = this.matrixClient?.getRoom(predecessor.roomId);
-                        if (prevRoom) this.roomSkipList.removeRoom(prevRoom);
-                        else logger.warn(`Unable to find predecessor room with id ${predecessor.roomId}`);
+                    const room: Room = payload.room;
+                    const roomUpgradeHistory = room.client.getRoomUpgradeHistory(
+                        room.roomId,
+                        true,
+                        this.msc3946ProcessDynamicPredecessor,
+                    );
+                    const predecessors = roomUpgradeHistory.slice(0, roomUpgradeHistory.indexOf(room));
+                    for (const predecessor of predecessors) {
+                        this.roomSkipList.removeRoom(predecessor);
                     }
                 }
 
-                this.addRoomAndEmit(payload.room, true);
+                this.addRoomAndEmit(payload.room, oldMembership === EffectiveMembership.Leave);
                 break;
             }
 
@@ -356,4 +373,4 @@ export default class RoomListStoreV3 {
     }
 }
 
-window.mxRoomListStoreV3 = RoomListStoreV3.instance;
+window.getRoomListStoreV3 = () => RoomListStoreV3.instance;
diff --git a/src/stores/room-list-v3/skip-list/sorters/RecencySorter.ts b/src/stores/room-list-v3/skip-list/sorters/RecencySorter.ts
index 07c902e3ee..53e8ae4331 100644
--- a/src/stores/room-list-v3/skip-list/sorters/RecencySorter.ts
+++ b/src/stores/room-list-v3/skip-list/sorters/RecencySorter.ts
@@ -9,6 +9,7 @@ import type { Room } from "matrix-js-sdk/src/matrix";
 import { type Sorter, SortingAlgorithm } from ".";
 import { getLastTs } from "../../../room-list/algorithms/tag-sorting/RecentAlgorithm";
 import { RoomNotificationStateStore } from "../../../notifications/RoomNotificationStateStore";
+import { DefaultTagID } from "../../../room-list/models";
 
 export class RecencySorter implements Sorter {
     public constructor(private myUserId: string) {}
@@ -19,11 +20,9 @@ export class RecencySorter implements Sorter {
     }
 
     public comparator(roomA: Room, roomB: Room, cache?: any): number {
-        // Check mute status first; muted rooms should be at the bottom
-        const isRoomAMuted = RoomNotificationStateStore.instance.getRoomState(roomA).muted;
-        const isRoomBMuted = RoomNotificationStateStore.instance.getRoomState(roomB).muted;
-        if (isRoomAMuted && !isRoomBMuted) return 1;
-        if (isRoomBMuted && !isRoomAMuted) return -1;
+        // First check if the rooms are low priority or muted
+        const exceptionalOrdering = this.getScore(roomA) - this.getScore(roomB);
+        if (exceptionalOrdering !== 0) return exceptionalOrdering;
 
         // Then check recency; recent rooms should be at the top
         const roomALastTs = this.getTs(roomA, cache);
@@ -35,6 +34,28 @@ export class RecencySorter implements Sorter {
         return SortingAlgorithm.Recency;
     }
 
+    /**
+     * This sorter mostly sorts rooms by recency but there are two exceptions:
+     * 1. Muted rooms are sorted to the bottom of the list.
+     * 2. Low priority rooms are sorted to the bottom of the list but before muted rooms.
+     *
+     * The following method provides a numerical value that takes care of this
+     * exceptional ordering. For two rooms A and B, it works as follows:
+     * - If getScore(A) - getScore(B) > 0, A should come after B
+     * - If getScore(A) - getScore(B) < 0, A should come before B
+     * - If getScore(A) - getScore(B) = 0, no special ordering needed, just use recency
+     */
+    private getScore(room: Room): number {
+        const isLowPriority = !!room.tags[DefaultTagID.LowPriority];
+        const isMuted = RoomNotificationStateStore.instance.getRoomState(room).muted;
+        // These constants are chosen so that the following order is maintained:
+        // Low priority rooms -> Low priority and muted rooms -> Muted rooms
+        if (isMuted && isLowPriority) return 5;
+        else if (isMuted) return 10;
+        else if (isLowPriority) return 2;
+        else return 0;
+    }
+
     private getTs(room: Room, cache?: { [roomId: string]: number }): number {
         const ts = cache?.[room.roomId] ?? getLastTs(room, this.myUserId);
         if (cache) {
diff --git a/src/stores/room-list/MessagePreviewStore.ts b/src/stores/room-list/MessagePreviewStore.ts
index 51e413940d..e626bca50c 100644
--- a/src/stores/room-list/MessagePreviewStore.ts
+++ b/src/stores/room-list/MessagePreviewStore.ts
@@ -31,6 +31,7 @@ import { ReactionEventPreview } from "./previews/ReactionEventPreview";
 import { UPDATE_EVENT } from "../AsyncStore";
 import { type IPreview } from "./previews/IPreview";
 import shouldHideEvent from "../../shouldHideEvent";
+import SettingsStore from "../../settings/SettingsStore";
 
 // Emitted event for when a room's preview has changed. First argument will the room for which
 // the change happened.
@@ -178,11 +179,14 @@ export class MessagePreviewStore extends AsyncStoreWithClient<EmptyObject> {
     private async generatePreview(room: Room, tagId?: TagID): Promise<void> {
         const events = [...room.getLiveTimeline().getEvents(), ...room.getPendingEvents()];
 
-        // add last reply from each thread
-        room.getThreads().forEach((thread: Thread): void => {
-            const lastReply = thread.lastReply();
-            if (lastReply) events.push(lastReply);
-        });
+        const isNewRoomListEnabled = SettingsStore.getValue("feature_new_room_list");
+        if (!isNewRoomListEnabled) {
+            // add last reply from each thread
+            room.getThreads().forEach((thread: Thread): void => {
+                const lastReply = thread.lastReply();
+                if (lastReply) events.push(lastReply);
+            });
+        }
 
         // sort events from oldest to newest
         events.sort((a: MatrixEvent, b: MatrixEvent) => {
diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
index 2fc396b8b3..c6675d7aa5 100644
--- a/src/stores/room-list/RoomListStore.ts
+++ b/src/stores/room-list/RoomListStore.ts
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { type MatrixClient, type Room, type RoomState, EventType, type EmptyObject } from "matrix-js-sdk/src/matrix";
+import { type MatrixClient, type Room, EventType, type EmptyObject } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import SettingsStore from "../../settings/SettingsStore";
@@ -308,24 +308,22 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
         const oldMembership = getEffectiveMembership(membershipPayload.oldMembership);
         const newMembership = getEffectiveMembershipTag(membershipPayload.room, membershipPayload.membership);
         if (oldMembership !== EffectiveMembership.Join && newMembership === EffectiveMembership.Join) {
-            // If we're joining an upgraded room, we'll want to make sure we don't proliferate
-            // the dead room in the list.
-            const roomState: RoomState = membershipPayload.room.currentState;
-            const predecessor = roomState.findPredecessor(this.msc3946ProcessDynamicPredecessor);
-            if (predecessor) {
-                const prevRoom = this.matrixClient?.getRoom(predecessor.roomId);
-                if (prevRoom) {
-                    const isSticky = this.algorithm.stickyRoom === prevRoom;
-                    if (isSticky) {
-                        this.algorithm.setStickyRoom(null);
-                    }
-
-                    // Note: we hit the algorithm instead of our handleRoomUpdate() function to
-                    // avoid redundant updates.
-                    this.algorithm.handleRoomUpdate(prevRoom, RoomUpdateCause.RoomRemoved);
-                } else {
-                    logger.warn(`Unable to find predecessor room with id ${predecessor.roomId}`);
+            // If we're joining an upgraded room, we'll want to make sure we don't proliferate the dead room in the list.
+            const room: Room = membershipPayload.room;
+            const roomUpgradeHistory = room.client.getRoomUpgradeHistory(
+                room.roomId,
+                true,
+                this.msc3946ProcessDynamicPredecessor,
+            );
+            const predecessors = roomUpgradeHistory.slice(0, roomUpgradeHistory.indexOf(room));
+            for (const predecessor of predecessors) {
+                const isSticky = this.algorithm.stickyRoom === predecessor;
+                if (isSticky) {
+                    this.algorithm.setStickyRoom(null);
                 }
+                // Note: we hit the algorithm instead of our handleRoomUpdate() function to
+                // avoid redundant updates.
+                this.algorithm.handleRoomUpdate(predecessor, RoomUpdateCause.RoomRemoved);
             }
 
             await this.handleRoomUpdate(membershipPayload.room, RoomUpdateCause.NewRoom);
diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
index 015c9fa0fd..c0b9a92159 100644
--- a/src/stores/spaces/SpaceStore.ts
+++ b/src/stores/spaces/SpaceStore.ts
@@ -27,7 +27,6 @@ import defaultDispatcher from "../../dispatcher/dispatcher";
 import RoomListStore from "../room-list/RoomListStore";
 import SettingsStore from "../../settings/SettingsStore";
 import DMRoomMap from "../../utils/DMRoomMap";
-import { type FetchRoomFn } from "../notifications/ListNotificationState";
 import { SpaceNotificationState } from "../notifications/SpaceNotificationState";
 import { RoomNotificationStateStore } from "../notifications/RoomNotificationStateStore";
 import { DefaultTagID } from "../room-list/models";
@@ -49,7 +48,7 @@ import {
     UPDATE_SUGGESTED_ROOMS,
     UPDATE_TOP_LEVEL_SPACES,
 } from ".";
-import { getCachedRoomIDForAlias } from "../../RoomAliasCache";
+import { getCachedRoomIdForAlias } from "../../RoomAliasCache";
 import { EffectiveMembership, getEffectiveMembership } from "../../utils/membership";
 import {
     flattenSpaceHierarchyWithCache,
@@ -63,6 +62,7 @@ import { type ViewHomePagePayload } from "../../dispatcher/payloads/ViewHomePage
 import { type SwitchSpacePayload } from "../../dispatcher/payloads/SwitchSpacePayload";
 import { type AfterLeaveRoomPayload } from "../../dispatcher/payloads/AfterLeaveRoomPayload";
 import { SdkContextClass } from "../../contexts/SDKContext";
+import { ModuleApi } from "../../modules/Api.ts";
 
 const ACTIVE_SPACE_LS_KEY = "mx_active_space";
 
@@ -111,10 +111,6 @@ export const getChildOrder = (
     return [validOrder(order) ?? NaN, ts, roomId]; // NaN has lodash sort it at the end in asc
 };
 
-const getRoomFn: FetchRoomFn = (room: Room) => {
-    return RoomNotificationStateStore.instance.getRoomState(room);
-};
-
 type SpaceStoreActions =
     | SettingUpdatedPayload
     | ViewRoomPayload
@@ -258,7 +254,9 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
         if (!space || !this.matrixClient || space === this.activeSpace) return;
 
         let cliSpace: Room | null = null;
-        if (!isMetaSpace(space)) {
+        if (ModuleApi.instance.extras.spacePanelItems.has(space)) {
+            // it's a "space" provided by a module: that's good enough
+        } else if (!isMetaSpace(space)) {
             cliSpace = this.matrixClient.getRoom(space);
             if (!cliSpace?.isSpaceRoom()) return;
         } else if (!this.enabledMetaSpaces.includes(space)) {
@@ -293,6 +291,8 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
                     context_switch: true,
                     metricsTrigger: "WebSpaceContextSwitch",
                 });
+            } else if (ModuleApi.instance.extras.spacePanelItems.has(space)) {
+                // module will handle this
             } else {
                 defaultDispatcher.dispatch<ViewHomePagePayload>({
                     action: Action.ViewHomePage,
@@ -1214,7 +1214,8 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
         const lastSpaceId = window.localStorage.getItem(ACTIVE_SPACE_LS_KEY) as MetaSpace;
         const valid =
             lastSpaceId &&
-            (!isMetaSpace(lastSpaceId) ? this.matrixClient.getRoom(lastSpaceId) : enabledMetaSpaces[lastSpaceId]);
+            (ModuleApi.instance.extras.spacePanelItems.has(lastSpaceId) ||
+                (!isMetaSpace(lastSpaceId) ? this.matrixClient.getRoom(lastSpaceId) : enabledMetaSpaces[lastSpaceId]));
         if (valid) {
             // don't context switch here as it may break permalinks
             this.setActiveSpace(lastSpaceId, false);
@@ -1249,7 +1250,8 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
                 let roomId = payload.room_id;
 
                 if (payload.room_alias && !roomId) {
-                    roomId = getCachedRoomIDForAlias(payload.room_alias);
+                    const result = getCachedRoomIdForAlias(payload.room_alias);
+                    if (result) roomId = result.roomId;
                 }
 
                 if (!roomId) return; // we'll get re-fired with the room ID shortly
@@ -1302,11 +1304,11 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
                         const newValue = SettingsStore.getValue("Spaces.allRoomsInHome");
                         if (this.allRoomsInHome !== newValue) {
                             this._allRoomsInHome = newValue;
-                            this.emit(UPDATE_HOME_BEHAVIOUR, this.allRoomsInHome);
                             if (this.enabledMetaSpaces.includes(MetaSpace.Home)) {
                                 this.rebuildHomeSpace();
                             }
                             this.sendUserProperties();
+                            this.emit(UPDATE_HOME_BEHAVIOUR, this.allRoomsInHome);
                         }
                         break;
                     }
@@ -1368,7 +1370,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
             return this.notificationStateMap.get(key)!;
         }
 
-        const state = new SpaceNotificationState(getRoomFn);
+        const state = new SpaceNotificationState();
         this.notificationStateMap.set(key, state);
         return state;
     }
diff --git a/src/stores/spaces/index.ts b/src/stores/spaces/index.ts
index 5a775692c9..fb642b638d 100644
--- a/src/stores/spaces/index.ts
+++ b/src/stores/spaces/index.ts
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { type Room, type HierarchyRoom } from "matrix-js-sdk/src/matrix";
+import { type HierarchyRoom } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../languageHandler";
 
@@ -42,7 +42,15 @@ export const getMetaSpaceName = (spaceKey: MetaSpace, allRoomsInHome = false): s
     }
 };
 
-export type SpaceKey = MetaSpace | Room["roomId"];
+/**
+ * This can be:
+ *  - a MetaSpace
+ *  - space ID (ie. a room ID)
+ *  - A 'custom' space from a module
+ * Unfortunately we can't type the last set as we don't know what modules will define,
+ * so we can't do better than string here.
+ */
+export type SpaceKey = string;
 
 export interface ISuggestedRoom extends HierarchyRoom {
     viaServers: string[];
diff --git a/src/stores/widgets/StopGapWidgetDriver.ts b/src/stores/widgets/ElementWidgetDriver.ts
similarity index 80%
rename from src/stores/widgets/StopGapWidgetDriver.ts
rename to src/stores/widgets/ElementWidgetDriver.ts
index d4c0f8930c..82da6c3d59 100644
--- a/src/stores/widgets/StopGapWidgetDriver.ts
+++ b/src/stores/widgets/ElementWidgetDriver.ts
@@ -26,7 +26,6 @@ import {
     type IWidgetApiErrorResponseDataDetails,
     type ISearchUserDirectoryResult,
     type IGetMediaConfigResult,
-    type UpdateDelayedEventAction,
 } from "matrix-widget-api";
 import {
     ClientEvent,
@@ -34,12 +33,14 @@ import {
     EventType,
     type IContent,
     MatrixError,
-    type MatrixEvent,
     Direction,
     THREAD_RELATION_TYPE,
     type SendDelayedEventResponse,
     type StateEvents,
     type TimelineEvents,
+    type Room,
+    type SendDelayedEventRequestOpts,
+    type MatrixClient,
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import {
@@ -66,8 +67,6 @@ import { ModuleRunner } from "../../modules/ModuleRunner";
 import SettingsStore from "../../settings/SettingsStore";
 import { mediaFromMxc } from "../../customisations/Media";
 
-// TODO: Purge this from the universe
-
 function getRememberedCapabilitiesForWidget(widget: Widget): Capability[] {
     return JSON.parse(localStorage.getItem(`widget_${widget.id}_approved_caps`) || "[]");
 }
@@ -82,12 +81,19 @@ const normalizeTurnServer = ({ urls, username, credential }: IClientTurnServer):
     password: credential,
 });
 
-export class StopGapWidgetDriver extends WidgetDriver {
+/**
+ * Element Web's implementation of a widget driver (the object that
+ * matrix-widget-api uses to retrieve information from the client and carry out
+ * authorized actions on the widget's behalf). Essentially this is a glorified
+ * set of callbacks.
+ */
+// TODO: Consider alternative designs for matrix-widget-api?
+// Replace with matrix-rust-sdk?
+export class ElementWidgetDriver extends WidgetDriver {
     private allowedCapabilities: Set<Capability>;
 
     // TODO: Refactor widgetKind into the Widget class
     public constructor(
-        allowedCapabilities: Capability[],
         private forWidget: Widget,
         private forWidgetKind: WidgetKind,
         virtual: boolean,
@@ -98,11 +104,7 @@ export class StopGapWidgetDriver extends WidgetDriver {
         // Always allow screenshots to be taken because it's a client-induced flow. The widget can't
         // spew screenshots at us and can't request screenshots of us, so it's up to us to provide the
         // button if the widget says it supports screenshots.
-        this.allowedCapabilities = new Set([
-            ...allowedCapabilities,
-            MatrixCapabilities.Screenshots,
-            ElementWidgetCapabilities.RequiresClient,
-        ]);
+        this.allowedCapabilities = new Set([MatrixCapabilities.Screenshots, ElementWidgetCapabilities.RequiresClient]);
 
         // Grant the permissions that are specific to given widget types
         if (WidgetType.JITSI.matches(this.forWidget.type) && forWidgetKind === WidgetKind.Room) {
@@ -122,7 +124,11 @@ export class StopGapWidgetDriver extends WidgetDriver {
             this.allowedCapabilities.add(`org.matrix.msc2762.timeline:${inRoomId}`);
             this.allowedCapabilities.add(MatrixCapabilities.MSC4157SendDelayedEvent);
             this.allowedCapabilities.add(MatrixCapabilities.MSC4157UpdateDelayedEvent);
+            this.allowedCapabilities.add(MatrixCapabilities.MSC4354SendStickyEvent);
 
+            this.allowedCapabilities.add(
+                WidgetEventCapability.forStateEvent(EventDirection.Receive, EventType.RoomName).raw,
+            );
             this.allowedCapabilities.add(
                 WidgetEventCapability.forStateEvent(EventDirection.Receive, EventType.RoomMember).raw,
             );
@@ -141,6 +147,7 @@ export class StopGapWidgetDriver extends WidgetDriver {
             const clientDeviceId = MatrixClientPeg.safeGet().getDeviceId();
             if (clientDeviceId !== null) {
                 // For the session membership type compliant with MSC4143
+                // Note MSC4143 still uses the org.matrix.msc3401 unstable prefix
                 this.allowedCapabilities.add(
                     WidgetEventCapability.forStateEvent(
                         EventDirection.Send,
@@ -148,6 +155,13 @@ export class StopGapWidgetDriver extends WidgetDriver {
                         `_${clientUserId}_${clientDeviceId}`,
                     ).raw,
                 );
+                this.allowedCapabilities.add(
+                    WidgetEventCapability.forStateEvent(
+                        EventDirection.Send,
+                        "org.matrix.msc3401.call.member",
+                        `_${clientUserId}_${clientDeviceId}_m.call`,
+                    ).raw,
+                );
                 // Version with no leading underscore, for room versions whose auth rules allow it
                 this.allowedCapabilities.add(
                     WidgetEventCapability.forStateEvent(
@@ -156,6 +170,13 @@ export class StopGapWidgetDriver extends WidgetDriver {
                         `${clientUserId}_${clientDeviceId}`,
                     ).raw,
                 );
+                this.allowedCapabilities.add(
+                    WidgetEventCapability.forStateEvent(
+                        EventDirection.Send,
+                        "org.matrix.msc3401.call.member",
+                        `${clientUserId}_${clientDeviceId}_m.call`,
+                    ).raw,
+                );
             }
             this.allowedCapabilities.add(
                 WidgetEventCapability.forStateEvent(EventDirection.Receive, "org.matrix.msc3401.call.member").raw,
@@ -165,17 +186,24 @@ export class StopGapWidgetDriver extends WidgetDriver {
                 WidgetEventCapability.forStateEvent(EventDirection.Receive, EventType.RoomCreate).raw,
             );
 
+            const sendRoomEvents = [EventType.CallNotify, EventType.RTCNotification];
             const sendRecvRoomEvents = [
                 "io.element.call.encryption_keys",
                 "org.matrix.rageshake_request",
                 EventType.Reaction,
                 EventType.RoomRedaction,
                 "io.element.call.reaction",
+                //  MSC4310: Add dev and final event to ease future transition,
+                EventType.RTCDecline,
+                "m.rtc.decline",
+                // MSC4310 The main membership event is sent via a room sticky event.
+                EventType.RTCMembership,
+                "m.rtc.member",
             ];
-            for (const eventType of sendRecvRoomEvents) {
+            for (const eventType of [...sendRoomEvents, ...sendRecvRoomEvents])
                 this.allowedCapabilities.add(WidgetEventCapability.forRoomEvent(EventDirection.Send, eventType).raw);
+            for (const eventType of sendRecvRoomEvents)
                 this.allowedCapabilities.add(WidgetEventCapability.forRoomEvent(EventDirection.Receive, eventType).raw);
-            }
 
             const sendRecvToDevice = [
                 EventType.CallInvite,
@@ -263,6 +291,13 @@ export class StopGapWidgetDriver extends WidgetDriver {
         return allAllowed;
     }
 
+    private getSendEventTarget(roomId: string | null = null): { client: MatrixClient; roomId: string } {
+        const client = MatrixClientPeg.safeGet();
+        roomId = roomId || SdkContextClass.instance.roomViewStore.getRoomId() || null;
+        if (!roomId) throw new Error("No room specified and no room in RoomViewStore focus.");
+        return { client, roomId };
+    }
+
     public async sendEvent<K extends keyof StateEvents>(
         eventType: K,
         content: StateEvents[K],
@@ -281,10 +316,7 @@ export class StopGapWidgetDriver extends WidgetDriver {
         stateKey: string | null = null,
         targetRoomId: string | null = null,
     ): Promise<ISendEventDetails> {
-        const client = MatrixClientPeg.get();
-        const roomId = targetRoomId || SdkContextClass.instance.roomViewStore.getRoomId();
-
-        if (!client || !roomId) throw new Error("Not in a room or not attached to a client");
+        const { client, roomId } = this.getSendEventTarget(targetRoomId);
 
         let r: { event_id: string } | null;
         if (stateKey !== null) {
@@ -323,6 +355,42 @@ export class StopGapWidgetDriver extends WidgetDriver {
         return { roomId, eventId: r.event_id };
     }
 
+    /**
+     * @experimental Part of MSC4354
+     * @see {@link WidgetDriver#sendStickyEvent}
+     */
+    public async sendStickyEvent(
+        stickyDurationMs: number,
+        eventType: string,
+        content: unknown,
+        targetRoomId?: string | null,
+    ): Promise<ISendEventDetails> {
+        const { client, roomId } = this.getSendEventTarget(targetRoomId);
+
+        const r = await client._unstable_sendStickyEvent(
+            roomId,
+            stickyDurationMs,
+            null,
+            eventType as keyof TimelineEvents,
+            content as TimelineEvents[keyof TimelineEvents] & { msc4354_sticky_key: string },
+        );
+        return { roomId, eventId: r.event_id };
+    }
+
+    private getSendDelayedEventOpts(delay: number | null, parentDelayId: string | null): SendDelayedEventRequestOpts {
+        if (delay !== null) {
+            return {
+                delay,
+                ...(parentDelayId !== null && { parent_delay_id: parentDelayId }),
+            };
+        } else if (parentDelayId !== null) {
+            return {
+                parent_delay_id: parentDelayId,
+            };
+        }
+        throw new Error("Must provide at least one of delay or parentDelayId");
+    }
+
     /**
      * @experimental Part of MSC4140 & MSC4157
      * @see {@link WidgetDriver#sendDelayedEvent}
@@ -354,24 +422,8 @@ export class StopGapWidgetDriver extends WidgetDriver {
         stateKey: string | null = null,
         targetRoomId: string | null = null,
     ): Promise<ISendDelayedEventDetails> {
-        const client = MatrixClientPeg.get();
-        const roomId = targetRoomId || SdkContextClass.instance.roomViewStore.getRoomId();
-
-        if (!client || !roomId) throw new Error("Not in a room or not attached to a client");
-
-        let delayOpts;
-        if (delay !== null) {
-            delayOpts = {
-                delay,
-                ...(parentDelayId !== null && { parent_delay_id: parentDelayId }),
-            };
-        } else if (parentDelayId !== null) {
-            delayOpts = {
-                parent_delay_id: parentDelayId,
-            };
-        } else {
-            throw new Error("Must provide at least one of delay or parentDelayId");
-        }
+        const { client, roomId } = this.getSendEventTarget(targetRoomId);
+        const delayOpts = this.getSendDelayedEventOpts(delay, parentDelayId);
 
         let r: SendDelayedEventResponse | null;
         if (stateKey !== null) {
@@ -400,15 +452,63 @@ export class StopGapWidgetDriver extends WidgetDriver {
         };
     }
 
+    /**
+     * @experimental Part of MSC4354
+     * @see {@link WidgetDriver#sendStickyEvent}
+     */
+    public async sendDelayedStickyEvent(
+        delay: number | null,
+        parentDelayId: string | null,
+        stickyDurationMs: number,
+        eventType: string,
+        content: unknown,
+        targetRoomId?: string | null,
+    ): Promise<ISendDelayedEventDetails> {
+        const { client, roomId } = this.getSendEventTarget(targetRoomId);
+        const delayOpts = this.getSendDelayedEventOpts(delay, parentDelayId);
+
+        const r = await client._unstable_sendStickyDelayedEvent(
+            roomId,
+            stickyDurationMs,
+            delayOpts,
+            null,
+            eventType as keyof TimelineEvents,
+            content as TimelineEvents[keyof TimelineEvents] & { msc4354_sticky_key: string },
+        );
+        return { roomId, delayId: r.delay_id };
+    }
+
     /**
      * @experimental Part of MSC4140 & MSC4157
      */
-    public async updateDelayedEvent(delayId: string, action: UpdateDelayedEventAction): Promise<void> {
+    public async cancelScheduledDelayedEvent(delayId: string): Promise<void> {
         const client = MatrixClientPeg.get();
 
-        if (!client) throw new Error("Not in a room or not attached to a client");
+        if (!client) throw new Error("Not attached to a client");
 
-        await client._unstable_updateDelayedEvent(delayId, action);
+        await client._unstable_cancelScheduledDelayedEvent(delayId);
+    }
+
+    /**
+     * @experimental Part of MSC4140 & MSC4157
+     */
+    public async restartScheduledDelayedEvent(delayId: string): Promise<void> {
+        const client = MatrixClientPeg.get();
+
+        if (!client) throw new Error("Not attached to a client");
+
+        await client._unstable_restartScheduledDelayedEvent(delayId);
+    }
+
+    /**
+     * @experimental Part of MSC4140 & MSC4157
+     */
+    public async sendScheduledDelayedEvent(delayId: string): Promise<void> {
+        const client = MatrixClientPeg.get();
+
+        if (!client) throw new Error("Not attached to a client");
+
+        await client._unstable_sendScheduledDelayedEvent(delayId);
     }
 
     /**
@@ -463,6 +563,38 @@ export class StopGapWidgetDriver extends WidgetDriver {
         }
     }
 
+    /**
+     * Generator function that retrieves events for readRoomTimeline
+     * @param room The room to check the timeline of.
+     * @param eventType The event type to be read.
+     * @param msgtype The msgtype of the events to be read, if applicable/defined.
+     * @param stateKey The state key of the events to be read, if applicable/defined.
+     * @param limit The maximum number of events to retrieve. Will be zero to denote "as many as
+     * possible".
+     * @param since When null, retrieves the number of events specified by the "limit" parameter.
+     * Otherwise, the event ID at which only subsequent events will be returned, as many as specified
+     * in "limit".
+     * @returns A generator that emits events.
+     */
+    private *readRoomTimelineIterator(
+        room: Room,
+        eventType: string,
+        msgtype: string | undefined,
+        stateKey: string | undefined,
+        limit: number,
+        since: string | undefined,
+    ): Generator<IRoomEvent, void, void> {
+        let resultCount: number = 0;
+        const events = [...room.getLiveTimeline().getEvents()]; // timelines are most recent last
+        for (let ev = events.pop(); ev && resultCount < limit && ev.getId() !== since; ev = events.pop()) {
+            if (ev.getType() !== eventType) continue;
+            if (eventType === EventType.RoomMessage && msgtype && msgtype !== ev.getContent()["msgtype"]) continue;
+            if (stateKey !== undefined && ev.getStateKey() !== stateKey) continue;
+            yield ev.getEffectiveEvent() as IRoomEvent;
+            resultCount++;
+        }
+    }
+
     /**
      * Reads all events of the given type, and optionally `msgtype` (if applicable/defined),
      * the user has access to. The widget API will have already verified that the widget is
@@ -488,23 +620,9 @@ export class StopGapWidgetDriver extends WidgetDriver {
         since: string | undefined,
     ): Promise<IRoomEvent[]> {
         limit = limit > 0 ? Math.min(limit, Number.MAX_SAFE_INTEGER) : Number.MAX_SAFE_INTEGER; // relatively arbitrary
-
         const room = MatrixClientPeg.safeGet().getRoom(roomId);
         if (room === null) return [];
-        const results: MatrixEvent[] = [];
-        const events = room.getLiveTimeline().getEvents(); // timelines are most recent last
-        for (let i = events.length - 1; i >= 0; i--) {
-            const ev = events[i];
-            if (results.length >= limit) break;
-            if (since !== undefined && ev.getId() === since) break;
-
-            if (ev.getType() !== eventType) continue;
-            if (eventType === EventType.RoomMessage && msgtype && msgtype !== ev.getContent()["msgtype"]) continue;
-            if (stateKey !== undefined && ev.getStateKey() !== stateKey) continue;
-            results.push(ev);
-        }
-
-        return results.map((e) => e.getEffectiveEvent() as IRoomEvent);
+        return [...this.readRoomTimelineIterator(room, eventType, msgtype, stateKey, limit, since)];
     }
 
     /**
diff --git a/src/stores/widgets/WidgetLayoutStore.ts b/src/stores/widgets/WidgetLayoutStore.ts
index eaea0957b0..345db83cfc 100644
--- a/src/stores/widgets/WidgetLayoutStore.ts
+++ b/src/stores/widgets/WidgetLayoutStore.ts
@@ -7,14 +7,13 @@
  */
 
 import { type Room, RoomStateEvent, type MatrixEvent } from "matrix-js-sdk/src/matrix";
-import { type Optional } from "matrix-events-sdk";
 import { MapWithDefault, recursiveMapToObject } from "matrix-js-sdk/src/utils";
 import { type IWidget } from "matrix-widget-api";
+import { clamp, defaultNumber, sum } from "@element-hq/web-shared-components";
 
 import SettingsStore from "../../settings/SettingsStore";
 import WidgetStore, { type IApp } from "../WidgetStore";
 import { WidgetType } from "../../widgets/WidgetType";
-import { clamp, defaultNumber, sum } from "../../utils/numbers";
 import defaultDispatcher from "../../dispatcher/dispatcher";
 import { ReadyWatchingStore } from "../ReadyWatchingStore";
 import { SettingLevel } from "../../settings/SettingLevel";
@@ -316,7 +315,7 @@ export class WidgetLayoutStore extends ReadyWatchingStore {
         }
     }
 
-    public getContainerWidgets(room: Optional<Room>, container: Container): IWidget[] {
+    public getContainerWidgets(room: Room | null, container: Container): IWidget[] {
         return (room && this.byRoom.get(room.roomId)?.get(container)?.ordered) || [];
     }
 
diff --git a/src/stores/widgets/StopGapWidget.ts b/src/stores/widgets/WidgetMessaging.ts
similarity index 76%
rename from src/stores/widgets/StopGapWidget.ts
rename to src/stores/widgets/WidgetMessaging.ts
index 672c1b27b4..6731f1d1d9 100644
--- a/src/stores/widgets/StopGapWidget.ts
+++ b/src/stores/widgets/WidgetMessaging.ts
@@ -13,6 +13,8 @@ import {
     type MatrixClient,
     ClientEvent,
     RoomStateEvent,
+    type ReceivedToDeviceMessage,
+    TypedEventEmitter,
 } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import {
@@ -33,11 +35,10 @@ import {
     WidgetApiFromWidgetAction,
     WidgetKind,
 } from "matrix-widget-api";
-import { EventEmitter } from "events";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t, getUserLanguage } from "../../languageHandler";
-import { StopGapWidgetDriver } from "./StopGapWidgetDriver";
+import { ElementWidgetDriver } from "./ElementWidgetDriver";
 import { WidgetMessagingStore } from "./WidgetMessagingStore";
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 import { OwnProfileStore } from "../OwnProfileStore";
@@ -45,12 +46,11 @@ import WidgetUtils from "../../utils/WidgetUtils";
 import { IntegrationManagers } from "../../integrations/IntegrationManagers";
 import { WidgetType } from "../../widgets/WidgetType";
 import ActiveWidgetStore from "../ActiveWidgetStore";
-import { objectShallowClone } from "../../utils/objects";
 import defaultDispatcher from "../../dispatcher/dispatcher";
 import { Action } from "../../dispatcher/actions";
 import { ElementWidgetActions, type IHangupCallApiRequest, type IViewRoomApiRequest } from "./ElementWidgetActions";
 import { ModalWidgetStore } from "../ModalWidgetStore";
-import { type IApp, isAppWidget } from "../WidgetStore";
+import { isAppWidget } from "../WidgetStore";
 import ThemeWatcher, { ThemeWatcherEvent } from "../../settings/watchers/ThemeWatcher";
 import { getCustomTheme } from "../../theme";
 import { ElementWidgetCapabilities } from "./ElementWidgetCapabilities";
@@ -63,21 +63,10 @@ import ErrorDialog from "../../components/views/dialogs/ErrorDialog";
 import { SdkContextClass } from "../../contexts/SDKContext";
 import { UPDATE_EVENT } from "../AsyncStore";
 
-// TODO: Destroy all of this code
+// TODO: Purge this code of its overgrown hacks and compatibility shims.
 
-interface IAppTileProps {
-    // Note: these are only the props we care about
-    app: IApp | IWidget;
-    room?: Room; // without a room it is a user widget
-    userId: string;
-    creatorUserId: string;
-    waitForIframeLoad: boolean;
-    whitelistCapabilities?: string[];
-    userWidget: boolean;
-    stickyPromise?: () => Promise<void>;
-}
-
-// TODO: Don't use this because it's wrong
+// TODO: Don't use this. We should avoid overriding/mocking matrix-widget-api
+// behavior and instead strive to use widgets in more transparent ways.
 export class ElementWidget extends Widget {
     public constructor(private rawDefinition: IWidget) {
         super(rawDefinition);
@@ -151,10 +140,49 @@ export class ElementWidget extends Widget {
     }
 }
 
-export class StopGapWidget extends EventEmitter {
+export enum WidgetMessagingEvent {
+    Start = "start",
+    Stop = "stop",
+}
+
+interface WidgetMessagingEventMap {
+    [WidgetMessagingEvent.Start]: (widgetApi: ClientWidgetApi) => void;
+    [WidgetMessagingEvent.Stop]: (widgetApi: ClientWidgetApi) => void;
+}
+
+interface WidgetMessagingOptions {
+    app: IWidget;
+    room?: Room; // without a room it is a user widget
+    userId: string;
+    creatorUserId: string;
+    waitForIframeLoad: boolean;
+    userWidget: boolean;
+    /**
+     * If defined this async method will be called when the widget requests to become sticky.
+     * It will only become sticky once the returned promise resolves.
+     * This is useful because: Widget B is sticky. Making widget A sticky will kill widget B immediately.
+     * This promise allows to do Widget B related cleanup before Widget A becomes sticky. (e.g. hangup a Voip call)
+     */
+    stickyPromise?: () => Promise<void>;
+}
+
+/**
+ * A running instance of a widget, associated with an iframe and an active communication
+ * channel. Instances must be tracked by WidgetMessagingStore, as only one WidgetMessaging
+ * instance should exist for a given widget.
+ *
+ * This class is responsible for:
+ * - Computing the templated widget URL
+ * - Starting a {@link ClientWidgetApi} communication channel with the widget
+ * - Eagerly pushing events from the Matrix client to the widget
+ *
+ * @see {@link ElementWidgetDriver} for the class used to *pull* data lazily from the
+ *   Matrix client to the widget on the widget's behalf.
+ * @see {@link WidgetMessagingStore} for the store that holds these instances.
+ */
+export class WidgetMessaging extends TypedEventEmitter<WidgetMessagingEvent, WidgetMessagingEventMap> {
     private client: MatrixClient;
-    private messaging: ClientWidgetApi | null = null;
-    private mockWidget: ElementWidget;
+    private iframe: HTMLIFrameElement | null = null;
     private scalarToken?: string;
     private roomId?: string;
     // The room that we're currently allowing the widget to interact with. Only
@@ -169,26 +197,28 @@ export class StopGapWidget extends EventEmitter {
     // Holds events that should be fed to the widget once they finish decrypting
     private readonly eventsToFeed = new WeakSet<MatrixEvent>();
 
-    public constructor(private appTileProps: IAppTileProps) {
+    public constructor(
+        private readonly widget: ElementWidget,
+        options: WidgetMessagingOptions,
+    ) {
         super();
         this.client = MatrixClientPeg.safeGet();
-
-        let app = appTileProps.app;
-        // Backwards compatibility: not all old widgets have a creatorUserId
-        if (!app.creatorUserId) {
-            app = objectShallowClone(app); // clone to prevent accidental mutation
-            app.creatorUserId = this.client.getUserId()!;
-        }
-
-        this.mockWidget = new ElementWidget(app);
-        this.roomId = appTileProps.room?.roomId;
-        this.kind = appTileProps.userWidget ? WidgetKind.Account : WidgetKind.Room; // probably
-        this.virtual = isAppWidget(app) && app.eventId === undefined;
-        this.stickyPromise = appTileProps.stickyPromise;
+        this.roomId = options.room?.roomId;
+        this.kind = options.userWidget ? WidgetKind.Account : WidgetKind.Room; // probably
+        this.virtual = isAppWidget(options.app) && options.app.eventId === undefined;
+        this.stickyPromise = options.stickyPromise;
     }
 
+    private _widgetApi: ClientWidgetApi | null = null;
+    private set widgetApi(value: ClientWidgetApi | null) {
+        this._widgetApi = value;
+    }
+
+    /**
+     * The widget API interface to the widget, or null if disconnected.
+     */
     public get widgetApi(): ClientWidgetApi | null {
-        return this.messaging;
+        return this._widgetApi;
     }
 
     /**
@@ -218,7 +248,7 @@ export class StopGapWidget extends EventEmitter {
             deviceId: this.client.getDeviceId() ?? undefined,
             baseUrl: this.client.baseUrl,
         };
-        const templated = this.mockWidget.getCompleteUrl(Object.assign(defaults, fromCustomisation), opts?.asPopout);
+        const templated = this.widget.getCompleteUrl(Object.assign(defaults, fromCustomisation), opts?.asPopout);
 
         const parsed = new URL(templated);
 
@@ -226,7 +256,7 @@ export class StopGapWidget extends EventEmitter {
         // TODO: Replace these with proper widget params
         // See https://github.com/matrix-org/matrix-doc/pull/1958/files#r405714833
         if (!opts?.asPopout) {
-            parsed.searchParams.set("widgetId", this.mockWidget.id);
+            parsed.searchParams.set("widgetId", this.widget.id);
             parsed.searchParams.set("parentUrl", window.location.href.split("#", 2)[0]);
 
             // Give the widget a scalar token if we're supposed to (more legacy)
@@ -241,21 +271,17 @@ export class StopGapWidget extends EventEmitter {
         return parsed.toString().replace(/%24/g, "$");
     }
 
-    public get started(): boolean {
-        return !!this.messaging;
-    }
-
     private onThemeChange = (theme: string): void => {
-        this.messaging?.updateTheme({ name: theme });
+        this.widgetApi?.updateTheme({ name: theme });
     };
 
     private onOpenModal = async (ev: CustomEvent<IModalWidgetOpenRequest>): Promise<void> => {
         ev.preventDefault();
         if (ModalWidgetStore.instance.canOpenModalWidget()) {
-            ModalWidgetStore.instance.openModalWidget(ev.detail.data, this.mockWidget, this.roomId);
-            this.messaging?.transport.reply(ev.detail, {}); // ack
+            ModalWidgetStore.instance.openModalWidget(ev.detail.data, this.widget, this.roomId);
+            this.widgetApi?.transport.reply(ev.detail, {}); // ack
         } else {
-            this.messaging?.transport.reply(ev.detail, {
+            this.widgetApi?.transport.reply(ev.detail, {
                 error: {
                     message: "Unable to open modal at this time",
                 },
@@ -268,7 +294,7 @@ export class StopGapWidget extends EventEmitter {
     private onRoomViewStoreUpdate = (): void => {
         const roomId = SdkContextClass.instance.roomViewStore.getRoomId() ?? null;
         if (roomId !== this.viewedRoomId) {
-            this.messaging!.setViewedRoomId(roomId);
+            this.widgetApi!.setViewedRoomId(roomId);
             this.viewedRoomId = roomId;
         }
     };
@@ -277,59 +303,47 @@ export class StopGapWidget extends EventEmitter {
      * This starts the messaging for the widget if it is not in the state `started` yet.
      * @param iframe the iframe the widget should use
      */
-    public startMessaging(iframe: HTMLIFrameElement): any {
-        if (this.started) return;
+    public start(iframe: HTMLIFrameElement): void {
+        if (this.widgetApi !== null) return;
 
-        const allowedCapabilities = this.appTileProps.whitelistCapabilities || [];
-        const driver = new StopGapWidgetDriver(
-            allowedCapabilities,
-            this.mockWidget,
-            this.kind,
-            this.virtual,
-            this.roomId,
-        );
-
-        this.messaging = new ClientWidgetApi(this.mockWidget, iframe, driver);
-        this.messaging.on("preparing", () => this.emit("preparing"));
-        this.messaging.on("error:preparing", (err: unknown) => this.emit("error:preparing", err));
-        this.messaging.once("ready", () => {
-            WidgetMessagingStore.instance.storeMessaging(this.mockWidget, this.roomId, this.messaging!);
-            this.emit("ready");
+        this.iframe = iframe;
+        const driver = new ElementWidgetDriver(this.widget, this.kind, this.virtual, this.roomId);
 
+        this.widgetApi = new ClientWidgetApi(this.widget, iframe, driver);
+        this.widgetApi.once("ready", () => {
             this.themeWatcher.start();
             this.themeWatcher.on(ThemeWatcherEvent.Change, this.onThemeChange);
             // Theme may have changed while messaging was starting
             this.onThemeChange(this.themeWatcher.getEffectiveTheme());
         });
-        this.messaging.on("capabilitiesNotified", () => this.emit("capabilitiesNotified"));
-        this.messaging.on(`action:${WidgetApiFromWidgetAction.OpenModalWidget}`, this.onOpenModal);
+        this.widgetApi.on(`action:${WidgetApiFromWidgetAction.OpenModalWidget}`, this.onOpenModal);
 
         // When widgets are listening to events, we need to make sure they're only
         // receiving events for the right room
         if (this.roomId === undefined) {
             // Account widgets listen to the currently active room
-            this.messaging.setViewedRoomId(SdkContextClass.instance.roomViewStore.getRoomId() ?? null);
+            this.widgetApi.setViewedRoomId(SdkContextClass.instance.roomViewStore.getRoomId() ?? null);
             SdkContextClass.instance.roomViewStore.on(UPDATE_EVENT, this.onRoomViewStoreUpdate);
         } else {
             // Room widgets get locked to the room they were added in
-            this.messaging.setViewedRoomId(this.roomId);
+            this.widgetApi.setViewedRoomId(this.roomId);
         }
 
         // Always attach a handler for ViewRoom, but permission check it internally
-        this.messaging.on(`action:${ElementWidgetActions.ViewRoom}`, (ev: CustomEvent<IViewRoomApiRequest>) => {
+        this.widgetApi.on(`action:${ElementWidgetActions.ViewRoom}`, (ev: CustomEvent<IViewRoomApiRequest>) => {
             ev.preventDefault(); // stop the widget API from auto-rejecting this
 
             // Check up front if this is even a valid request
             const targetRoomId = (ev.detail.data || {}).room_id;
             if (!targetRoomId) {
-                return this.messaging?.transport.reply(ev.detail, <IWidgetApiErrorResponseData>{
+                return this.widgetApi?.transport.reply(ev.detail, <IWidgetApiErrorResponseData>{
                     error: { message: "Room ID not supplied." },
                 });
             }
 
             // Check the widget's permission
-            if (!this.messaging?.hasCapability(ElementWidgetCapabilities.CanChangeViewedRoom)) {
-                return this.messaging?.transport.reply(ev.detail, <IWidgetApiErrorResponseData>{
+            if (!this.widgetApi?.hasCapability(ElementWidgetCapabilities.CanChangeViewedRoom)) {
+                return this.widgetApi?.transport.reply(ev.detail, <IWidgetApiErrorResponseData>{
                     error: { message: "This widget does not have permission for this action (denied)." },
                 });
             }
@@ -342,7 +356,7 @@ export class StopGapWidget extends EventEmitter {
             });
 
             // acknowledge so the widget doesn't freak out
-            this.messaging.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
+            this.widgetApi.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
         });
 
         // Populate the map of "read up to" events for this widget with the current event in every room.
@@ -360,12 +374,12 @@ export class StopGapWidget extends EventEmitter {
         this.client.on(ClientEvent.Event, this.onEvent);
         this.client.on(MatrixEventEvent.Decrypted, this.onEventDecrypted);
         this.client.on(RoomStateEvent.Events, this.onStateUpdate);
-        this.client.on(ClientEvent.ToDeviceEvent, this.onToDeviceEvent);
+        this.client.on(ClientEvent.ReceivedToDeviceMessage, this.onToDeviceMessage);
 
-        this.messaging.on(
+        this.widgetApi.on(
             `action:${WidgetApiFromWidgetAction.UpdateAlwaysOnScreen}`,
             async (ev: CustomEvent<IStickyActionRequest>) => {
-                if (this.messaging?.hasCapability(MatrixCapabilities.AlwaysOnScreen)) {
+                if (this.widgetApi?.hasCapability(MatrixCapabilities.AlwaysOnScreen)) {
                     ev.preventDefault();
                     if (ev.detail.data.value) {
                         // If the widget wants to become sticky we wait for the stickyPromise to resolve
@@ -373,43 +387,43 @@ export class StopGapWidget extends EventEmitter {
                     }
                     // Stop being persistent can be done instantly
                     ActiveWidgetStore.instance.setWidgetPersistence(
-                        this.mockWidget.id,
+                        this.widget.id,
                         this.roomId ?? null,
                         ev.detail.data.value,
                     );
                     // Send the ack after the widget actually has become sticky.
-                    this.messaging.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
+                    this.widgetApi.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
                 }
             },
         );
 
         // TODO: Replace this event listener with appropriate driver functionality once the API
         // establishes a sane way to send events back and forth.
-        this.messaging.on(
+        this.widgetApi.on(
             `action:${WidgetApiFromWidgetAction.SendSticker}`,
             (ev: CustomEvent<IStickerActionRequest>) => {
-                if (this.messaging?.hasCapability(MatrixCapabilities.StickerSending)) {
+                if (this.widgetApi?.hasCapability(MatrixCapabilities.StickerSending)) {
                     // Acknowledge first
                     ev.preventDefault();
-                    this.messaging.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
+                    this.widgetApi.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
 
                     // Send the sticker
                     defaultDispatcher.dispatch({
                         action: "m.sticker",
                         data: ev.detail.data,
-                        widgetId: this.mockWidget.id,
+                        widgetId: this.widget.id,
                     });
                 }
             },
         );
 
-        if (WidgetType.STICKERPICKER.matches(this.mockWidget.type)) {
-            this.messaging.on(
+        if (WidgetType.STICKERPICKER.matches(this.widget.type)) {
+            this.widgetApi.on(
                 `action:${ElementWidgetActions.OpenIntegrationManager}`,
                 (ev: CustomEvent<IWidgetApiRequest>) => {
                     // Acknowledge first
                     ev.preventDefault();
-                    this.messaging?.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
+                    this.widgetApi?.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
 
                     // First close the stickerpicker
                     defaultDispatcher.dispatch({ action: "stickerpicker_close" });
@@ -430,8 +444,8 @@ export class StopGapWidget extends EventEmitter {
             );
         }
 
-        if (WidgetType.JITSI.matches(this.mockWidget.type)) {
-            this.messaging.on(`action:${ElementWidgetActions.HangupCall}`, (ev: CustomEvent<IHangupCallApiRequest>) => {
+        if (WidgetType.JITSI.matches(this.widget.type)) {
+            this.widgetApi.on(`action:${ElementWidgetActions.HangupCall}`, (ev: CustomEvent<IHangupCallApiRequest>) => {
                 ev.preventDefault();
                 if (ev.detail.data?.errorMessage) {
                     Modal.createDialog(ErrorDialog, {
@@ -441,9 +455,11 @@ export class StopGapWidget extends EventEmitter {
                         }),
                     });
                 }
-                this.messaging?.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
+                this.widgetApi?.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
             });
         }
+
+        this.emit(WidgetMessagingEvent.Start, this.widgetApi);
     }
 
     public async prepare(): Promise<void> {
@@ -451,10 +467,8 @@ export class StopGapWidget extends EventEmitter {
         await (WidgetVariableCustomisations?.isReady?.() ?? Promise.resolve());
 
         if (this.scalarToken) return;
-        const existingMessaging = WidgetMessagingStore.instance.getMessaging(this.mockWidget, this.roomId);
-        if (existingMessaging) this.messaging = existingMessaging;
         try {
-            if (WidgetUtils.isScalarUrl(this.mockWidget.templateUrl)) {
+            if (WidgetUtils.isScalarUrl(this.widget.templateUrl)) {
                 const managers = IntegrationManagers.sharedInstance();
                 if (managers.hasManager()) {
                     // TODO: Pick the right manager for the widget
@@ -476,24 +490,37 @@ export class StopGapWidget extends EventEmitter {
      * widget.
      * @param opts
      */
-    public stopMessaging(opts = { forceDestroy: false }): void {
-        if (
-            !opts?.forceDestroy &&
-            ActiveWidgetStore.instance.getWidgetPersistence(this.mockWidget.id, this.roomId ?? null)
-        ) {
+    public stop(opts = { forceDestroy: false }): void {
+        if (this.widgetApi === null || this.iframe === null) return;
+        if (opts.forceDestroy) {
+            // HACK: This is a really dirty way to ensure that Jitsi cleans up
+            // its hold on the webcam. Without this, the widget holds a media
+            // stream open, even after death. See https://github.com/vector-im/element-web/issues/7351
+            // In practice we could just do `+= ''` to trick the browser into
+            // thinking the URL changed, however I can foresee this being
+            // optimized out by a browser. Instead, we'll just point the iframe
+            // at a page that is reasonably safe to use in the event the iframe
+            // doesn't wink away.
+            this.iframe!.src = "about:blank";
+        } else if (ActiveWidgetStore.instance.getWidgetPersistence(this.widget.id, this.roomId ?? null)) {
             logger.log("Skipping destroy - persistent widget");
             return;
         }
-        if (!this.started) return;
-        WidgetMessagingStore.instance.stopMessaging(this.mockWidget, this.roomId);
-        this.messaging = null;
+
+        this.emit(WidgetMessagingEvent.Stop, this.widgetApi);
+        this.widgetApi?.stop();
+        // XXX is the removeAllListeners necessary here?
+        this.widgetApi?.removeAllListeners(); // Insurance against resource leaks
+        this.widgetApi = null;
+        this.iframe = null;
+        WidgetMessagingStore.instance.stopMessaging(this.widget, this.roomId);
 
         SdkContextClass.instance.roomViewStore.off(UPDATE_EVENT, this.onRoomViewStoreUpdate);
 
         this.client.off(ClientEvent.Event, this.onEvent);
         this.client.off(MatrixEventEvent.Decrypted, this.onEventDecrypted);
         this.client.off(RoomStateEvent.Events, this.onStateUpdate);
-        this.client.off(ClientEvent.ToDeviceEvent, this.onToDeviceEvent);
+        this.client.off(ClientEvent.ReceivedToDeviceMessage, this.onToDeviceMessage);
     }
 
     private onEvent = (ev: MatrixEvent): void => {
@@ -506,17 +533,15 @@ export class StopGapWidget extends EventEmitter {
     };
 
     private onStateUpdate = (ev: MatrixEvent): void => {
-        if (this.messaging === null) return;
+        if (this.widgetApi === null) return;
         const raw = ev.getEffectiveEvent();
-        this.messaging.feedStateUpdate(raw as IRoomEvent).catch((e) => {
+        this.widgetApi.feedStateUpdate(raw as IRoomEvent).catch((e) => {
             logger.error("Error sending state update to widget: ", e);
         });
     };
 
-    private onToDeviceEvent = async (ev: MatrixEvent): Promise<void> => {
-        await this.client.decryptEventIfNeeded(ev);
-        if (ev.isDecryptionFailure()) return;
-        await this.messaging?.feedToDevice(ev.getEffectiveEvent() as IRoomEvent, ev.isEncrypted());
+    private onToDeviceMessage = async ({ message, encryptionInfo }: ReceivedToDeviceMessage): Promise<void> => {
+        await this.widgetApi?.feedToDevice(message, encryptionInfo != null);
     };
 
     /**
@@ -583,7 +608,7 @@ export class StopGapWidget extends EventEmitter {
     }
 
     private feedEvent(ev: MatrixEvent): void {
-        if (this.messaging === null) return;
+        if (this.widgetApi === null) return;
         if (
             // If we had decided earlier to feed this event to the widget, but
             // it just wasn't ready, give it another try
@@ -612,7 +637,7 @@ export class StopGapWidget extends EventEmitter {
                 this.eventsToFeed.add(ev);
             } else {
                 const raw = ev.getEffectiveEvent();
-                this.messaging.feedEvent(raw as IRoomEvent).catch((e) => {
+                this.widgetApi.feedEvent(raw as IRoomEvent).catch((e) => {
                     logger.error("Error sending event to widget: ", e);
                 });
             }
diff --git a/src/stores/widgets/WidgetMessagingStore.ts b/src/stores/widgets/WidgetMessagingStore.ts
index 2dcf8c4fdc..a9ec3d765f 100644
--- a/src/stores/widgets/WidgetMessagingStore.ts
+++ b/src/stores/widgets/WidgetMessagingStore.ts
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import { type ClientWidgetApi, type Widget } from "matrix-widget-api";
+import { type Widget } from "matrix-widget-api";
 import { type EmptyObject } from "matrix-js-sdk/src/matrix";
 
 import { AsyncStoreWithClient } from "../AsyncStoreWithClient";
@@ -14,6 +14,7 @@ import defaultDispatcher from "../../dispatcher/dispatcher";
 import { type ActionPayload } from "../../dispatcher/payloads";
 import { EnhancedMap } from "../../utils/maps";
 import WidgetUtils from "../../utils/WidgetUtils";
+import { type WidgetMessaging } from "./WidgetMessaging";
 
 export enum WidgetMessagingStoreEvent {
     StoreMessaging = "store_messaging",
@@ -32,7 +33,7 @@ export class WidgetMessagingStore extends AsyncStoreWithClient<EmptyObject> {
         return instance;
     })();
 
-    private widgetMap = new EnhancedMap<string, ClientWidgetApi>(); // <widget UID, ClientWidgetAPi>
+    private widgetMap = new EnhancedMap<string, WidgetMessaging>(); // <widget UID, messaging>
 
     public constructor() {
         super(defaultDispatcher);
@@ -51,19 +52,19 @@ export class WidgetMessagingStore extends AsyncStoreWithClient<EmptyObject> {
         this.widgetMap.clear();
     }
 
-    public storeMessaging(widget: Widget, roomId: string | undefined, widgetApi: ClientWidgetApi): void {
+    public storeMessaging(widget: Widget, roomId: string | undefined, messaging: WidgetMessaging): void {
         this.stopMessaging(widget, roomId);
         const uid = WidgetUtils.calcWidgetUid(widget.id, roomId);
-        this.widgetMap.set(uid, widgetApi);
+        this.widgetMap.set(uid, messaging);
 
-        this.emit(WidgetMessagingStoreEvent.StoreMessaging, uid, widgetApi);
+        this.emit(WidgetMessagingStoreEvent.StoreMessaging, uid, messaging);
     }
 
     public stopMessaging(widget: Widget, roomId: string | undefined): void {
         this.stopMessagingByUid(WidgetUtils.calcWidgetUid(widget.id, roomId));
     }
 
-    public getMessaging(widget: Widget, roomId: string | undefined): ClientWidgetApi | undefined {
+    public getMessaging(widget: Widget, roomId: string | undefined): WidgetMessaging | undefined {
         return this.widgetMap.get(WidgetUtils.calcWidgetUid(widget.id, roomId));
     }
 
@@ -84,7 +85,7 @@ export class WidgetMessagingStore extends AsyncStoreWithClient<EmptyObject> {
      * @param {string} widgetUid The widget UID.
      * @returns {ClientWidgetApi} The widget API, or a falsy value if not found.
      */
-    public getMessagingForUid(widgetUid: string): ClientWidgetApi | undefined {
+    public getMessagingForUid(widgetUid: string): WidgetMessaging | undefined {
         return this.widgetMap.get(widgetUid);
     }
 }
diff --git a/src/theme.ts b/src/theme.ts
index bfc471544c..4cd07f32ab 100644
--- a/src/theme.ts
+++ b/src/theme.ts
@@ -16,10 +16,10 @@ import "@fontsource/inter/600-italic.css";
 import "@fontsource/inter/700.css";
 import "@fontsource/inter/700-italic.css";
 
-import "@fontsource/inconsolata/latin-ext-400.css";
-import "@fontsource/inconsolata/latin-400.css";
-import "@fontsource/inconsolata/latin-ext-700.css";
-import "@fontsource/inconsolata/latin-700.css";
+import "@fontsource/fira-code/latin-ext-400.css";
+import "@fontsource/fira-code/latin-400.css";
+import "@fontsource/fira-code/latin-ext-700.css";
+import "@fontsource/fira-code/latin-700.css";
 
 import { logger } from "matrix-js-sdk/src/logger";
 
diff --git a/src/toasts/BulkUnverifiedSessionsToast.ts b/src/toasts/BulkUnverifiedSessionsToast.tsx
similarity index 90%
rename from src/toasts/BulkUnverifiedSessionsToast.ts
rename to src/toasts/BulkUnverifiedSessionsToast.tsx
index 9df70cfb9d..7f658dc3ab 100644
--- a/src/toasts/BulkUnverifiedSessionsToast.ts
+++ b/src/toasts/BulkUnverifiedSessionsToast.tsx
@@ -6,6 +6,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
+import React from "react";
+import { ErrorSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
+
 import { _t } from "../languageHandler";
 import dis from "../dispatcher/dispatcher";
 import DeviceListener from "../DeviceListener";
@@ -33,7 +36,7 @@ export const showToast = (deviceIds: Set<string>): void => {
     ToastStore.sharedInstance().addOrReplaceToast({
         key: TOAST_KEY,
         title: _t("encryption|verification|unverified_sessions_toast_title"),
-        icon: "verification_warning",
+        icon: <ErrorSolidIcon color="var(--cpd-color-icon-critical-primary)" />,
         props: {
             description: _t("encryption|verification|unverified_sessions_toast_description"),
             primaryLabel: _t("action|review"),
diff --git a/src/toasts/IncomingCallToast.tsx b/src/toasts/IncomingCallToast.tsx
index 9f393beb06..ec0dd8f3ec 100644
--- a/src/toasts/IncomingCallToast.tsx
+++ b/src/toasts/IncomingCallToast.tsx
@@ -6,10 +6,14 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { type JSX, useCallback, useEffect, useState } from "react";
-import { type MatrixEvent, type RoomMember } from "matrix-js-sdk/src/matrix";
-import { Button, Tooltip, TooltipProvider } from "@vector-im/compound-web";
+import React, { type JSX, useCallback, useEffect, useRef, useState } from "react";
+import { type Room, type MatrixEvent, type RoomMember, RoomEvent, EventType } from "matrix-js-sdk/src/matrix";
+import { Button, ToggleInput, Tooltip, TooltipProvider } from "@vector-im/compound-web";
 import VideoCallIcon from "@vector-im/compound-design-tokens/assets/web/icons/video-call-solid";
+import { logger } from "matrix-js-sdk/src/logger";
+import { type IRTCNotificationContent } from "matrix-js-sdk/src/matrixrtc";
+import { CheckIcon, VoiceCallIcon, CloseIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
+import { AvatarWithDetails } from "@element-hq/web-shared-components";
 
 import { _t } from "../languageHandler";
 import RoomAvatar from "../components/views/avatars/RoomAvatar";
@@ -18,12 +22,8 @@ import defaultDispatcher from "../dispatcher/dispatcher";
 import { type ViewRoomPayload } from "../dispatcher/payloads/ViewRoomPayload";
 import { Action } from "../dispatcher/actions";
 import ToastStore from "../stores/ToastStore";
-import {
-    LiveContentSummary,
-    LiveContentSummaryWithCall,
-    LiveContentType,
-} from "../components/views/rooms/LiveContentSummary";
-import { useCall, useJoinCallButtonDisabledTooltip } from "../hooks/useCall";
+import { LiveContentSummary, LiveContentType } from "../components/views/rooms/LiveContentSummary";
+import { useCall, useJoinCallButtonDisabledTooltip, useParticipantCount } from "../hooks/useCall";
 import AccessibleButton, { type ButtonEvent } from "../components/views/elements/AccessibleButton";
 import { useDispatcher } from "../hooks/useDispatcher";
 import { type ActionPayload } from "../dispatcher/payloads";
@@ -31,17 +31,51 @@ import { type Call, CallEvent } from "../models/Call";
 import LegacyCallHandler, { AudioID } from "../LegacyCallHandler";
 import { useEventEmitter } from "../hooks/useEventEmitter";
 import { CallStore, CallStoreEvent } from "../stores/CallStore";
+import DMRoomMap from "../utils/DMRoomMap";
 
-export const getIncomingCallToastKey = (callId: string, roomId: string): string => `call_${callId}_${roomId}`;
+/**
+ * Get the key for the incoming call toast. A combination of the event ID and room ID.
+ * @param notificationEventId The ID of the notification event.
+ * @param roomId The ID of the room.
+ * @returns The key for the incoming call toast.
+ */
+export const getIncomingCallToastKey = (notificationEventId: string, roomId: string): string =>
+    `call_${notificationEventId}_${roomId}`;
+
+/**
+ * Get the ts when the notification event was sent.
+ * This can be either the origin_server_ts or a ts the sender of this event claims as
+ * the time they sent it (sender_ts).
+ * The origin_server_ts is the fallback if sender_ts seems wrong.
+ * @param event The RTCNotification event.
+ * @returns The timestamp to use as the expect start time to apply the `lifetime` to.
+ */
+export const getNotificationEventSendTs = (event: MatrixEvent): number => {
+    const content = event.getContent() as Partial<IRTCNotificationContent>;
+    const sendTs = content.sender_ts;
+    if (sendTs && Math.abs(sendTs - event.getTs()) >= 15000) {
+        logger.warn(
+            "Received RTCNotification event. With large sender_ts origin_server_ts offset -> using origin_server_ts",
+        );
+        return event.getTs();
+    }
+    return sendTs ?? event.getTs();
+};
 const MAX_RING_TIME_MS = 90 * 1000;
 
 interface JoinCallButtonWithCallProps {
     onClick: (e: ButtonEvent) => void;
     call: Call | null;
     disabledTooltip: string | undefined;
+    isRinging: boolean;
 }
 
-function JoinCallButtonWithCall({ onClick, call, disabledTooltip }: JoinCallButtonWithCallProps): JSX.Element {
+function JoinCallButtonWithCall({
+    onClick,
+    call,
+    disabledTooltip,
+    isRinging,
+}: JoinCallButtonWithCallProps): JSX.Element {
     let disTooltip = disabledTooltip;
     const disabledBecauseFullTooltip = useJoinCallButtonDisabledTooltip(call);
     disTooltip = disabledTooltip ?? disabledBecauseFullTooltip ?? undefined;
@@ -49,25 +83,65 @@ function JoinCallButtonWithCall({ onClick, call, disabledTooltip }: JoinCallButt
     return (
         <Tooltip description={disTooltip ?? _t("voip|video_call")}>
             <Button
-                className="mx_IncomingCallToast_joinButton"
+                className="mx_IncomingCallToast_actionButton"
                 onClick={onClick}
                 disabled={disTooltip != undefined}
                 kind="primary"
-                Icon={VideoCallIcon}
+                Icon={CheckIcon}
                 size="sm"
             >
-                {_t("action|join")}
+                {isRinging ? _t("action|accept") : _t("action|join")}
+            </Button>
+        </Tooltip>
+    );
+}
+
+interface DeclineCallButtonWithNotificationEventProps {
+    onDeclined: (e: ButtonEvent) => void;
+    notificationEvent: MatrixEvent;
+    room?: Room;
+}
+
+function DeclineCallButtonWithNotificationEvent({
+    notificationEvent,
+    room,
+    onDeclined,
+}: DeclineCallButtonWithNotificationEventProps): JSX.Element {
+    const [declining, setDeclining] = useState(false);
+    const onClick = useCallback(
+        async (e: ButtonEvent) => {
+            e.stopPropagation();
+            setDeclining(true);
+            await room?.client.sendRtcDecline(room.roomId, notificationEvent.getId() ?? "");
+            onDeclined(e);
+        },
+        [notificationEvent, onDeclined, room?.client, room?.roomId],
+    );
+    return (
+        <Tooltip description={_t("voip|decline_call")}>
+            <Button
+                className="mx_IncomingCallToast_actionButton"
+                onClick={onClick}
+                kind="primary"
+                destructive
+                disabled={declining}
+                Icon={CloseIcon}
+                size="sm"
+            >
+                {_t("action|decline")}
             </Button>
         </Tooltip>
     );
 }
 
 interface Props {
-    notifyEvent: MatrixEvent;
+    notificationEvent: MatrixEvent;
 }
 
-export function IncomingCallToast({ notifyEvent }: Props): JSX.Element {
-    const roomId = notifyEvent.getRoomId()!;
+export function IncomingCallToast({ notificationEvent }: Props): JSX.Element {
+    const roomId = notificationEvent.getRoomId()!;
+    // Use a partial type so ts still helps us to not miss any type checks.
+    const notificationContent = notificationEvent.getContent() as Partial<IRTCNotificationContent>;
     const room = MatrixClientPeg.safeGet().getRoom(roomId) ?? undefined;
     const call = useCall(roomId);
     const [connectedCalls, setConnectedCalls] = useState<Call[]>(Array.from(CallStore.instance.connectedCalls));
@@ -75,35 +149,59 @@ export function IncomingCallToast({ notifyEvent }: Props): JSX.Element {
         setConnectedCalls(Array.from(CallStore.instance.connectedCalls));
     });
     const otherCallIsOngoing = connectedCalls.find((call) => call.roomId !== roomId);
-    // Start ringing if not already.
+    const soundHasStarted = useRef<boolean>(false);
     useEffect(() => {
-        const isRingToast = (notifyEvent.getContent() as unknown as { notify_type: string })["notify_type"] == "ring";
-        if (isRingToast && !LegacyCallHandler.instance.isPlaying(AudioID.Ring)) {
-            LegacyCallHandler.instance.play(AudioID.Ring);
+        // This section can race, so we use a ref to keep track of whether we have started trying to play.
+        // This is because `LegacyCallHandler.play` tries to load the sound and then play it asynchonously
+        // and `LegacyCallHandler.isPlaying` will not be `true` until the sound starts playing.
+        const isRingToast = notificationContent.notification_type === "ring";
+        if (isRingToast && !soundHasStarted.current && !LegacyCallHandler.instance.isPlaying(AudioID.Ring)) {
+            // Start ringing if not already.
+            soundHasStarted.current = true;
+            void LegacyCallHandler.instance.play(AudioID.Ring);
         }
-    }, [notifyEvent]);
+    }, [notificationContent.notification_type, soundHasStarted]);
 
     // Stop ringing on dismiss.
     const dismissToast = useCallback((): void => {
-        ToastStore.sharedInstance().dismissToast(
-            getIncomingCallToastKey(notifyEvent.getContent().call_id ?? "", roomId),
-        );
+        const notificationId = notificationEvent.getId();
+        if (!notificationId) {
+            logger.warn("Could not get eventId for RTCNotification event");
+            return;
+        }
+        ToastStore.sharedInstance().dismissToast(getIncomingCallToastKey(notificationId, roomId));
         LegacyCallHandler.instance.pause(AudioID.Ring);
-    }, [notifyEvent, roomId]);
+    }, [notificationEvent, roomId]);
 
     // Dismiss if session got ended remotely.
     const onCall = useCallback(
         (call: Call, callRoomId: string): void => {
-            const roomId = notifyEvent.getRoomId();
+            const roomId = notificationEvent.getRoomId();
             if (!roomId && roomId !== callRoomId) return;
             if (call === null || call.participants.size === 0) {
                 dismissToast();
             }
         },
-        [dismissToast, notifyEvent],
+        [dismissToast, notificationEvent],
     );
 
-    // Dismiss if antother device from this user joins.
+    // Dismiss if session got declined remotely.
+    const onTimelineChange = useCallback(
+        (ev: MatrixEvent) => {
+            const userId = room?.client.getUserId();
+            if (
+                ev.getType() === EventType.RTCDecline &&
+                userId !== undefined &&
+                ev.getSender() === userId && // It is our decline not someone elses
+                ev.relationEventId === notificationEvent.getId() // The event declines this ringing toast.
+            ) {
+                dismissToast();
+            }
+        },
+        [dismissToast, notificationEvent, room?.client],
+    );
+
+    // Dismiss if another device from this user joins.
     const onParticipantChange = useCallback(
         (participants: Map<RoomMember, Set<string>>, prevParticipants: Map<RoomMember, Set<string>>) => {
             if (Array.from(participants.keys()).some((p) => p.userId == room?.client.getUserId())) {
@@ -115,7 +213,8 @@ export function IncomingCallToast({ notifyEvent }: Props): JSX.Element {
 
     // Dismiss on timeout.
     useEffect(() => {
-        const timeout = setTimeout(dismissToast, MAX_RING_TIME_MS);
+        const lifetime = notificationContent.lifetime ?? MAX_RING_TIME_MS;
+        const timeout = setTimeout(dismissToast, getNotificationEventSendTs(notificationEvent) + lifetime - Date.now());
         return () => clearTimeout(timeout);
     });
 
@@ -132,7 +231,10 @@ export function IncomingCallToast({ notifyEvent }: Props): JSX.Element {
         ),
     );
 
+    const [skipLobbyToggle, setSkipLobbyToggle] = useState(true);
+
     // Dismiss on clicking join.
+    // If the skip lobby option is undefined, it will use to the shift key state to decide if the lobby is skipped.
     const onJoinClick = useCallback(
         (e: ButtonEvent): void => {
             e.stopPropagation();
@@ -142,11 +244,12 @@ export function IncomingCallToast({ notifyEvent }: Props): JSX.Element {
                 action: Action.ViewRoom,
                 room_id: room?.roomId,
                 view_call: true,
-                skipLobby: "shiftKey" in e ? e.shiftKey : false,
+                skipLobby: ("shiftKey" in e && e.shiftKey) || skipLobbyToggle,
+                voiceOnly: notificationContent["m.call.intent"] === "audio",
                 metricsTrigger: undefined,
             });
         },
-        [room],
+        [room, skipLobbyToggle, notificationContent],
     );
 
     // Dismiss on closing toast.
@@ -161,41 +264,75 @@ export function IncomingCallToast({ notifyEvent }: Props): JSX.Element {
 
     useEventEmitter(CallStore.instance, CallStoreEvent.Call, onCall);
     useEventEmitter(call ?? undefined, CallEvent.Participants, onParticipantChange);
+    useEventEmitter(room, RoomEvent.Timeline, onTimelineChange);
+    const isVoice = notificationContent["m.call.intent"] === "audio";
+    const otherUserId = DMRoomMap.shared().getUserIdForRoomId(roomId);
+    const participantCount = useParticipantCount(call);
+    const detailsInformation =
+        notificationContent.notification_type === "ring" ? (
+            <span>{otherUserId}</span>
+        ) : (
+            <LiveContentSummary
+                type={isVoice ? LiveContentType.Voice : LiveContentType.Video}
+                text={isVoice ? _t("common|voice") : _t("common|video")}
+                active={false}
+                participantCount={participantCount}
+            />
+        );
 
     return (
         <TooltipProvider>
             <>
-                <div>
-                    <RoomAvatar room={room ?? undefined} size="24px" />
-                </div>
                 <div className="mx_IncomingCallToast_content">
-                    <div className="mx_IncomingCallToast_info">
-                        <span className="mx_IncomingCallToast_room">
-                            {room ? room.name : _t("voip|call_toast_unknown_room")}
-                        </span>
-                        <div className="mx_IncomingCallToast_message">{_t("voip|video_call_started")}</div>
-                        {call ? (
-                            <LiveContentSummaryWithCall call={call} />
-                        ) : (
-                            <LiveContentSummary
-                                type={LiveContentType.Video}
-                                text={_t("common|video")}
-                                active={false}
-                                participantCount={0}
-                            />
-                        )}
-                    </div>
-                    <JoinCallButtonWithCall
-                        onClick={onJoinClick}
-                        call={call}
-                        disabledTooltip={otherCallIsOngoing ? "Ongoing call" : undefined}
+                    {isVoice ? (
+                        <div className="mx_IncomingCallToast_message">
+                            <VoiceCallIcon width="20px" height="20px" style={{ position: "relative", top: "4px" }} />{" "}
+                            {_t("voip|voice_call_incoming")}
+                        </div>
+                    ) : (
+                        <div className="mx_IncomingCallToast_message">
+                            <VideoCallIcon width="20px" height="20px" style={{ position: "relative", top: "4px" }} />{" "}
+                            {notificationContent.notification_type === "ring"
+                                ? _t("voip|video_call_incoming")
+                                : _t("voip|video_call_started")}
+                        </div>
+                    )}
+                    <AvatarWithDetails
+                        avatar={<RoomAvatar room={room ?? undefined} size="32px" />}
+                        details={detailsInformation}
+                        title={room ? room.name : _t("voip|call_toast_unknown_room")}
+                        className="mx_IncomingCallToast_AvatarWithDetails"
                     />
+                    {!isVoice && (
+                        <div className="mx_IncomingCallToast_toggleWithLabel">
+                            <span>{_t("voip|skip_lobby_toggle_option")}</span>
+                            <ToggleInput
+                                onChange={(e) => setSkipLobbyToggle(e.target.checked)}
+                                checked={skipLobbyToggle}
+                            />
+                        </div>
+                    )}
+                    <div className="mx_IncomingCallToast_buttons">
+                        <DeclineCallButtonWithNotificationEvent
+                            notificationEvent={notificationEvent}
+                            room={room}
+                            onDeclined={onCloseClick}
+                        />
+                        <JoinCallButtonWithCall
+                            onClick={onJoinClick}
+                            call={call}
+                            isRinging={notificationContent.notification_type === "ring"}
+                            disabledTooltip={otherCallIsOngoing ? "Ongoing call" : undefined}
+                        />
+                    </div>
                 </div>
                 <AccessibleButton
                     className="mx_IncomingCallToast_closeButton"
                     onClick={onCloseClick}
                     title={_t("action|close")}
-                />
+                >
+                    <CloseIcon />
+                </AccessibleButton>
             </>
         </TooltipProvider>
     );
diff --git a/src/toasts/SetupEncryptionToast.ts b/src/toasts/SetupEncryptionToast.ts
deleted file mode 100644
index 802da5b895..0000000000
--- a/src/toasts/SetupEncryptionToast.ts
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-import KeyIcon from "@vector-im/compound-design-tokens/assets/web/icons/key";
-import { type ComponentType } from "react";
-
-import type React from "react";
-import Modal from "../Modal";
-import { _t } from "../languageHandler";
-import DeviceListener from "../DeviceListener";
-import SetupEncryptionDialog from "../components/views/dialogs/security/SetupEncryptionDialog";
-import { AccessCancelledError, accessSecretStorage } from "../SecurityManager";
-import ToastStore from "../stores/ToastStore";
-import GenericToast from "../components/views/toasts/GenericToast";
-import { ModuleRunner } from "../modules/ModuleRunner";
-import { SetupEncryptionStore } from "../stores/SetupEncryptionStore";
-import Spinner from "../components/views/elements/Spinner";
-import { type OpenToTabPayload } from "../dispatcher/payloads/OpenToTabPayload";
-import { Action } from "../dispatcher/actions";
-import { UserTab } from "../components/views/dialogs/UserTab";
-import defaultDispatcher from "../dispatcher/dispatcher";
-import ConfirmKeyStorageOffDialog from "../components/views/dialogs/ConfirmKeyStorageOffDialog";
-
-const TOAST_KEY = "setupencryption";
-
-const getTitle = (kind: Kind): string => {
-    switch (kind) {
-        case Kind.SET_UP_ENCRYPTION:
-            return _t("encryption|set_up_toast_title");
-        case Kind.SET_UP_RECOVERY:
-            return _t("encryption|set_up_recovery");
-        case Kind.VERIFY_THIS_SESSION:
-            return _t("encryption|verify_toast_title");
-        case Kind.KEY_STORAGE_OUT_OF_SYNC:
-            return _t("encryption|key_storage_out_of_sync");
-        case Kind.TURN_ON_KEY_STORAGE:
-            return _t("encryption|turn_on_key_storage");
-    }
-};
-
-const getIcon = (kind: Kind): string | undefined => {
-    switch (kind) {
-        case Kind.SET_UP_ENCRYPTION:
-            return "secure_backup";
-        case Kind.SET_UP_RECOVERY:
-            return undefined;
-        case Kind.VERIFY_THIS_SESSION:
-        case Kind.KEY_STORAGE_OUT_OF_SYNC:
-            return "verification_warning";
-        case Kind.TURN_ON_KEY_STORAGE:
-            return "key_storage";
-    }
-};
-
-const getSetupCaption = (kind: Kind): string => {
-    switch (kind) {
-        case Kind.SET_UP_ENCRYPTION:
-            return _t("action|continue");
-        case Kind.SET_UP_RECOVERY:
-            return _t("action|continue");
-        case Kind.VERIFY_THIS_SESSION:
-            return _t("action|verify");
-        case Kind.KEY_STORAGE_OUT_OF_SYNC:
-            return _t("encryption|enter_recovery_key");
-        case Kind.TURN_ON_KEY_STORAGE:
-            return _t("action|continue");
-    }
-};
-
-/**
- * Get the icon to show on the primary button.
- * @param kind
- */
-const getPrimaryButtonIcon = (kind: Kind): ComponentType<React.SVGAttributes<SVGElement>> | undefined => {
-    switch (kind) {
-        case Kind.KEY_STORAGE_OUT_OF_SYNC:
-            return KeyIcon;
-        default:
-            return;
-    }
-};
-
-const getSecondaryButtonLabel = (kind: Kind): string => {
-    switch (kind) {
-        case Kind.SET_UP_RECOVERY:
-            return _t("encryption|set_up_recovery_later");
-        case Kind.SET_UP_ENCRYPTION:
-        case Kind.VERIFY_THIS_SESSION:
-            return _t("encryption|verification|unverified_sessions_toast_reject");
-        case Kind.KEY_STORAGE_OUT_OF_SYNC:
-            return _t("encryption|forgot_recovery_key");
-        case Kind.TURN_ON_KEY_STORAGE:
-            return _t("action|dismiss");
-    }
-};
-
-const getDescription = (kind: Kind): string => {
-    switch (kind) {
-        case Kind.SET_UP_ENCRYPTION:
-            return _t("encryption|set_up_toast_description");
-        case Kind.SET_UP_RECOVERY:
-            return _t("encryption|set_up_recovery_toast_description");
-        case Kind.VERIFY_THIS_SESSION:
-            return _t("encryption|verify_toast_description");
-        case Kind.KEY_STORAGE_OUT_OF_SYNC:
-            return _t("encryption|key_storage_out_of_sync_description");
-        case Kind.TURN_ON_KEY_STORAGE:
-            return _t("encryption|turn_on_key_storage_description");
-    }
-};
-
-/**
- * The kind of toast to show.
- */
-export enum Kind {
-    /**
-     *  Prompt the user to set up encryption
-     */
-    SET_UP_ENCRYPTION = "set_up_encryption",
-    /**
-     * Prompt the user to set up a recovery key
-     */
-    SET_UP_RECOVERY = "set_up_recovery",
-    /**
-     * Prompt the user to verify this session
-     */
-    VERIFY_THIS_SESSION = "verify_this_session",
-    /**
-     * Prompt the user to enter their recovery key
-     */
-    KEY_STORAGE_OUT_OF_SYNC = "key_storage_out_of_sync",
-    /**
-     * Prompt the user to turn on key storage
-     */
-    TURN_ON_KEY_STORAGE = "turn_on_key_storage",
-}
-
-/**
- * Show a toast prompting the user for some action related to setting up their encryption.
- *
- * @param kind The kind of toast to show
- */
-export const showToast = (kind: Kind): void => {
-    if (
-        ModuleRunner.instance.extensions.cryptoSetup.setupEncryptionNeeded({
-            kind: kind as any,
-            storeProvider: { getInstance: () => SetupEncryptionStore.sharedInstance() },
-        })
-    ) {
-        return;
-    }
-
-    const onPrimaryClick = async (): Promise<void> => {
-        if (kind === Kind.VERIFY_THIS_SESSION) {
-            Modal.createDialog(SetupEncryptionDialog, {}, undefined, /* priority = */ false, /* static = */ true);
-        } else if (kind == Kind.TURN_ON_KEY_STORAGE) {
-            // Open the user settings dialog to the encryption tab
-            const payload: OpenToTabPayload = {
-                action: Action.ViewUserSettings,
-                initialTabId: UserTab.Encryption,
-            };
-            defaultDispatcher.dispatch(payload);
-        } else {
-            const modal = Modal.createDialog(
-                Spinner,
-                undefined,
-                "mx_Dialog_spinner",
-                /* priority */ false,
-                /* static */ true,
-            );
-            try {
-                await accessSecretStorage();
-            } catch (error) {
-                onAccessSecretStorageFailed(error as Error);
-            } finally {
-                modal.close();
-            }
-        }
-    };
-
-    const onSecondaryClick = async (): Promise<void> => {
-        if (kind === Kind.KEY_STORAGE_OUT_OF_SYNC) {
-            // Open the user settings dialog to the encryption tab and start the flow to reset encryption
-            const payload: OpenToTabPayload = {
-                action: Action.ViewUserSettings,
-                initialTabId: UserTab.Encryption,
-                props: { initialEncryptionState: "reset_identity_forgot" },
-            };
-            defaultDispatcher.dispatch(payload);
-        } else if (kind === Kind.TURN_ON_KEY_STORAGE) {
-            // The user clicked "Dismiss": offer them "Are you sure?"
-            const modal = Modal.createDialog(ConfirmKeyStorageOffDialog, undefined, "mx_ConfirmKeyStorageOffDialog");
-            const [dismissed] = await modal.finished;
-            if (dismissed) {
-                const deviceListener = DeviceListener.sharedInstance();
-                await deviceListener.recordKeyBackupDisabled();
-                deviceListener.dismissEncryptionSetup();
-            }
-        } else {
-            DeviceListener.sharedInstance().dismissEncryptionSetup();
-        }
-    };
-
-    /**
-     * We tried to accessSecretStorage, which triggered us to ask for the
-     * recovery key, but this failed. If the user just gave up, that is fine,
-     * but if not, that means downloading encryption info from 4S did not fix
-     * the problem we identified. Presumably, something is wrong with what
-     * they have in 4S: we tell them to reset their identity.
-     */
-    const onAccessSecretStorageFailed = (error: Error): void => {
-        if (error instanceof AccessCancelledError) {
-            // The user cancelled the dialog - just allow it to close
-        } else {
-            // A real error happened - jump to the reset identity tab
-            const payload: OpenToTabPayload = {
-                action: Action.ViewUserSettings,
-                initialTabId: UserTab.Encryption,
-                props: { initialEncryptionState: "reset_identity_sync_failed" },
-            };
-            defaultDispatcher.dispatch(payload);
-        }
-    };
-
-    ToastStore.sharedInstance().addOrReplaceToast({
-        key: TOAST_KEY,
-        title: getTitle(kind),
-        icon: getIcon(kind),
-        props: {
-            description: getDescription(kind),
-            primaryLabel: getSetupCaption(kind),
-            PrimaryIcon: getPrimaryButtonIcon(kind),
-            onPrimaryClick,
-            secondaryLabel: getSecondaryButtonLabel(kind),
-            onSecondaryClick,
-            overrideWidth: kind === Kind.KEY_STORAGE_OUT_OF_SYNC ? "366px" : undefined,
-        },
-        component: GenericToast,
-        priority: kind === Kind.VERIFY_THIS_SESSION ? 95 : 40,
-    });
-};
-
-/**
- * Hide the encryption setup toast if it is currently being shown.
- */
-export const hideToast = (): void => {
-    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
-};
diff --git a/src/toasts/SetupEncryptionToast.tsx b/src/toasts/SetupEncryptionToast.tsx
new file mode 100644
index 0000000000..1b5f8a4a49
--- /dev/null
+++ b/src/toasts/SetupEncryptionToast.tsx
@@ -0,0 +1,325 @@
+/*
+Copyright 2025 Element Creations Ltd.
+Copyright 2024 New Vector Ltd.
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { KeyIcon, ErrorSolidIcon, SettingsSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
+import { type ComponentType } from "react";
+import { type Interaction as InteractionEvent } from "@matrix-org/analytics-events/types/typescript/Interaction";
+
+import Modal from "../Modal";
+import { _t } from "../languageHandler";
+import DeviceListener, { type DeviceState } from "../DeviceListener";
+import SetupEncryptionDialog from "../components/views/dialogs/security/SetupEncryptionDialog";
+import { AccessCancelledError, accessSecretStorage } from "../SecurityManager";
+import ToastStore, { type IToast } from "../stores/ToastStore";
+import GenericToast from "../components/views/toasts/GenericToast";
+import { ModuleRunner } from "../modules/ModuleRunner";
+import { SetupEncryptionStore } from "../stores/SetupEncryptionStore";
+import Spinner from "../components/views/elements/Spinner";
+import { type OpenToTabPayload } from "../dispatcher/payloads/OpenToTabPayload";
+import { Action } from "../dispatcher/actions";
+import { UserTab } from "../components/views/dialogs/UserTab";
+import defaultDispatcher from "../dispatcher/dispatcher";
+import ConfirmKeyStorageOffDialog from "../components/views/dialogs/ConfirmKeyStorageOffDialog";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import { resetKeyBackupAndWait } from "../utils/crypto/resetKeyBackup";
+import { PosthogAnalytics } from "../PosthogAnalytics";
+
+const TOAST_KEY = "setupencryption";
+
+/**
+ * The device states that we show a toast for (everything except for "ok").
+ */
+type DeviceStateForToast = Exclude<DeviceState, "ok">;
+
+const getTitle = (state: DeviceStateForToast): string => {
+    switch (state) {
+        case "set_up_recovery":
+            return _t("encryption|set_up_recovery");
+        case "verify_this_session":
+            return _t("encryption|verify_toast_title");
+        case "key_storage_out_of_sync":
+        case "identity_needs_reset":
+            return _t("encryption|key_storage_out_of_sync");
+        case "turn_on_key_storage":
+            return _t("encryption|turn_on_key_storage");
+    }
+};
+
+const getIcon = (state: DeviceStateForToast): IToast<any>["icon"] => {
+    switch (state) {
+        case "set_up_recovery":
+            return undefined;
+        case "verify_this_session":
+        case "key_storage_out_of_sync":
+        case "identity_needs_reset":
+            return <ErrorSolidIcon color="var(--cpd-color-icon-critical-primary)" />;
+        case "turn_on_key_storage":
+            return <SettingsSolidIcon color="var(--cpd-color-text-primary)" />;
+    }
+};
+
+const getSetupCaption = (state: DeviceStateForToast): string => {
+    switch (state) {
+        case "set_up_recovery":
+            return _t("action|continue");
+        case "verify_this_session":
+            return _t("action|verify");
+        case "key_storage_out_of_sync":
+            return _t("encryption|enter_recovery_key");
+        case "turn_on_key_storage":
+            return _t("action|continue");
+        case "identity_needs_reset":
+            return _t("encryption|continue_with_reset");
+    }
+};
+
+/**
+ * Get the icon to show on the primary button.
+ * @param state
+ */
+const getPrimaryButtonIcon = (
+    state: DeviceStateForToast,
+): ComponentType<React.SVGAttributes<SVGElement>> | undefined => {
+    switch (state) {
+        case "key_storage_out_of_sync":
+            return KeyIcon;
+        default:
+            return;
+    }
+};
+
+const getSecondaryButtonLabel = (state: DeviceStateForToast): string => {
+    switch (state) {
+        case "set_up_recovery":
+            return _t("action|dismiss");
+        case "verify_this_session":
+            return _t("encryption|verification|unverified_sessions_toast_reject");
+        case "key_storage_out_of_sync":
+            return _t("encryption|forgot_recovery_key");
+        case "turn_on_key_storage":
+            return _t("action|dismiss");
+        case "identity_needs_reset":
+            return "";
+    }
+};
+
+const getDescription = (state: DeviceStateForToast): string => {
+    switch (state) {
+        case "set_up_recovery":
+            return _t("encryption|set_up_recovery_toast_description");
+        case "verify_this_session":
+            return _t("encryption|verify_toast_description");
+        case "key_storage_out_of_sync":
+            return _t("encryption|key_storage_out_of_sync_description");
+        case "turn_on_key_storage":
+            return _t("encryption|turn_on_key_storage_description");
+        case "identity_needs_reset":
+            return _t("encryption|identity_needs_reset_description");
+    }
+};
+
+/**
+ * Show a toast prompting the user for some action related to setting up their encryption.
+ *
+ * @param state The state of the device
+ */
+export const showToast = (state: DeviceStateForToast): void => {
+    if (
+        ModuleRunner.instance.extensions.cryptoSetup.setupEncryptionNeeded({
+            kind: state as any,
+            storeProvider: { getInstance: () => SetupEncryptionStore.sharedInstance() },
+        })
+    ) {
+        return;
+    }
+
+    const onPrimaryClick = async (): Promise<void> => {
+        switch (state) {
+            case "set_up_recovery":
+            case "turn_on_key_storage": {
+                PosthogAnalytics.instance.trackEvent<InteractionEvent>({
+                    eventName: "Interaction",
+                    interactionType: "Pointer",
+                    name: state === "set_up_recovery" ? "ToastSetUpRecoveryClick" : "ToastTurnOnKeyStorageClick",
+                });
+                // Open the user settings dialog to the encryption tab
+                const payload: OpenToTabPayload = {
+                    action: Action.ViewUserSettings,
+                    initialTabId: UserTab.Encryption,
+                };
+                defaultDispatcher.dispatch(payload);
+                break;
+            }
+            case "verify_this_session":
+                Modal.createDialog(SetupEncryptionDialog, {}, undefined, /* priority = */ false, /* static = */ true);
+                break;
+            case "key_storage_out_of_sync": {
+                const modal = Modal.createDialog(
+                    Spinner,
+                    undefined,
+                    "mx_Dialog_spinner",
+                    /* priority */ false,
+                    /* static */ true,
+                );
+
+                const matrixClient = MatrixClientPeg.safeGet();
+                const crypto = matrixClient.getCrypto()!;
+
+                try {
+                    const deviceListener = DeviceListener.sharedInstance();
+
+                    // we need to call keyStorageOutOfSyncNeedsBackupReset here because
+                    // deviceListener.whilePaused() sets its client to undefined, so
+                    // keyStorageOutOfSyncNeedsBackupReset won't be able to check
+                    // the backup state.
+                    const needsBackupReset = await deviceListener.keyStorageOutOfSyncNeedsBackupReset(false);
+
+                    // pause the device listener because we could be making lots
+                    // of changes, and don't want toasts to pop up and disappear
+                    // while we're doing it
+                    await deviceListener.whilePaused(async () => {
+                        await accessSecretStorage(async () => {
+                            // Reset backup if needed.
+                            if (needsBackupReset) {
+                                await resetKeyBackupAndWait(crypto);
+                            } else if (await matrixClient.isKeyBackupKeyStored()) {
+                                await crypto.loadSessionBackupPrivateKeyFromSecretStorage();
+                            }
+                        });
+                    });
+                } catch (error) {
+                    await onAccessSecretStorageFailed(error as Error);
+                } finally {
+                    modal.close();
+                }
+                break;
+            }
+            case "identity_needs_reset": {
+                // Open the user settings dialog to reset identity
+                const payload: OpenToTabPayload = {
+                    action: Action.ViewUserSettings,
+                    initialTabId: UserTab.Encryption,
+                    props: {
+                        initialEncryptionState: "reset_identity_cant_recover",
+                    },
+                };
+                defaultDispatcher.dispatch(payload);
+                break;
+            }
+        }
+    };
+
+    const onSecondaryClick = async (): Promise<void> => {
+        switch (state) {
+            case "set_up_recovery": {
+                PosthogAnalytics.instance.trackEvent<InteractionEvent>({
+                    eventName: "Interaction",
+                    interactionType: "Pointer",
+                    name: "ToastSetUpRecoveryDismiss",
+                });
+                // Record that the user doesn't want to set up recovery
+                const deviceListener = DeviceListener.sharedInstance();
+                await deviceListener.recordRecoveryDisabled();
+                deviceListener.dismissEncryptionSetup();
+                break;
+            }
+            case "key_storage_out_of_sync": {
+                // Open the user settings dialog to the encryption tab and start the flow to reset encryption or change the recovery key
+                const deviceListener = DeviceListener.sharedInstance();
+                const needsCrossSigningReset = await deviceListener.keyStorageOutOfSyncNeedsCrossSigningReset(true);
+                const payload: OpenToTabPayload = {
+                    action: Action.ViewUserSettings,
+                    initialTabId: UserTab.Encryption,
+                    props: {
+                        initialEncryptionState: needsCrossSigningReset
+                            ? "reset_identity_forgot"
+                            : "change_recovery_key",
+                    },
+                };
+                defaultDispatcher.dispatch(payload);
+                break;
+            }
+            case "turn_on_key_storage": {
+                PosthogAnalytics.instance.trackEvent<InteractionEvent>({
+                    eventName: "Interaction",
+                    interactionType: "Pointer",
+                    name: "ToastTurnOnKeyStorageDismiss",
+                });
+                // The user clicked "Dismiss": offer them "Are you sure?"
+                const modal = Modal.createDialog(
+                    ConfirmKeyStorageOffDialog,
+                    undefined,
+                    "mx_ConfirmKeyStorageOffDialog",
+                );
+                const [dismissed] = await modal.finished;
+                if (dismissed) {
+                    const deviceListener = DeviceListener.sharedInstance();
+                    await deviceListener.recordKeyBackupDisabled();
+                    deviceListener.dismissEncryptionSetup();
+                }
+                break;
+            }
+            default:
+                DeviceListener.sharedInstance().dismissEncryptionSetup();
+        }
+    };
+
+    /**
+     * We tried to accessSecretStorage, which triggered us to ask for the
+     * recovery key, but this failed. If the user just gave up, that is fine,
+     * but if not, that means downloading encryption info from 4S did not fix
+     * the problem we identified. Presumably, something is wrong with what they
+     * have in 4S.
+     */
+    const onAccessSecretStorageFailed = async (error: Error): Promise<void> => {
+        if (error instanceof AccessCancelledError) {
+            // The user cancelled the dialog - just allow it to close
+        } else {
+            // A real error happened - jump to the reset identity or change
+            // recovery tab
+            const needsCrossSigningReset =
+                await DeviceListener.sharedInstance().keyStorageOutOfSyncNeedsCrossSigningReset(true);
+            const payload: OpenToTabPayload = {
+                action: Action.ViewUserSettings,
+                initialTabId: UserTab.Encryption,
+                props: {
+                    initialEncryptionState: needsCrossSigningReset
+                        ? "reset_identity_sync_failed"
+                        : "change_recovery_key",
+                },
+            };
+            defaultDispatcher.dispatch(payload);
+        }
+    };
+
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: TOAST_KEY,
+        title: getTitle(state),
+        icon: getIcon(state),
+        props: {
+            description: getDescription(state),
+            primaryLabel: getSetupCaption(state),
+            PrimaryIcon: getPrimaryButtonIcon(state),
+            onPrimaryClick,
+            secondaryLabel: getSecondaryButtonLabel(state),
+            onSecondaryClick,
+            overrideWidth: state === "key_storage_out_of_sync" ? "366px" : undefined,
+        },
+        component: GenericToast,
+        priority: state === "verify_this_session" ? 95 : 40,
+    });
+};
+
+/**
+ * Hide the encryption setup toast if it is currently being shown.
+ */
+export const hideToast = (): void => {
+    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};
diff --git a/src/toasts/UnverifiedSessionToast.tsx b/src/toasts/UnverifiedSessionToast.tsx
index 76d961233c..4a7f7d2be4 100644
--- a/src/toasts/UnverifiedSessionToast.tsx
+++ b/src/toasts/UnverifiedSessionToast.tsx
@@ -7,6 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
+import { ErrorSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { _t } from "../languageHandler";
 import dis from "../dispatcher/dispatcher";
@@ -47,7 +48,7 @@ export const showToast = async (deviceId: string): Promise<void> => {
     ToastStore.sharedInstance().addOrReplaceToast({
         key: toastKey(deviceId),
         title: _t("encryption|verification|unverified_session_toast_title"),
-        icon: "verification_warning",
+        icon: <ErrorSolidIcon color="var(--cpd-color-icon-critical-primary)" />,
         props: {
             description: device.display_name,
             detail: <DeviceMetaData device={extendedDevice} />,
diff --git a/src/utils/DMRoomMap.ts b/src/utils/DMRoomMap.ts
index df1cc2d364..989eea09d0 100644
--- a/src/utils/DMRoomMap.ts
+++ b/src/utils/DMRoomMap.ts
@@ -10,7 +10,6 @@ import { uniq } from "lodash";
 import { type Room, type MatrixEvent, EventType, ClientEvent, type MatrixClient } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
-import { type Optional } from "matrix-events-sdk";
 
 import { filterValidMDirect } from "./dm/filterValidMDirect";
 
@@ -170,7 +169,7 @@ export default class DMRoomMap {
         return joinedRooms[0];
     }
 
-    public getUserIdForRoomId(roomId: string): Optional<string> {
+    public getUserIdForRoomId(roomId: string): string | undefined {
         if (this.roomToUser == null) {
             // we lazily populate roomToUser so you can use
             // this class just to call getDMRoomsForUserId
diff --git a/src/utils/DecryptFile.ts b/src/utils/DecryptFile.ts
index baf2acafc1..b159b526d0 100644
--- a/src/utils/DecryptFile.ts
+++ b/src/utils/DecryptFile.ts
@@ -64,8 +64,7 @@ export async function decryptFile(file?: EncryptedFile, info?: MediaEventInfo):
         // they introduce XSS attacks if the Blob URI is viewed directly in the
         // browser (e.g. by copying the URI into a new tab or window.)
         // See warning at top of file.
-        let mimetype = info?.mimetype ? info.mimetype.split(";")[0].trim() : "";
-        mimetype = getBlobSafeMimeType(mimetype);
+        const mimetype = getBlobSafeMimeType(info?.mimetype?.split(";")[0].trim() ?? "");
 
         return new Blob([dataArray], { type: mimetype });
     } catch (e) {
diff --git a/src/utils/EventRenderingUtils.ts b/src/utils/EventRenderingUtils.ts
index 5ac6629b8b..b99e01a07b 100644
--- a/src/utils/EventRenderingUtils.ts
+++ b/src/utils/EventRenderingUtils.ts
@@ -20,7 +20,7 @@ import {
 import SettingsStore from "../settings/SettingsStore";
 import { haveRendererForEvent, JitsiEventFactory, JSONEventFactory, pickFactory } from "../events/EventTileFactory";
 import { getMessageModerationState, isLocationEvent, MessageModerationState } from "./EventUtils";
-import { ElementCall } from "../models/Call";
+import { ElementCallEventType } from "../call-types";
 
 const calcIsInfoMessage = (
     eventType: EventType | string,
@@ -82,7 +82,7 @@ export function getEventDisplayInfo(
         eventType === EventType.RoomEncryption ||
         factory === JitsiEventFactory;
     const isLeftAlignedBubbleMessage =
-        !isBubbleMessage && (eventType === EventType.CallInvite || ElementCall.CALL_EVENT_TYPE.matches(eventType));
+        !isBubbleMessage && (eventType === EventType.CallInvite || ElementCallEventType.matches(eventType));
     let isInfoMessage = calcIsInfoMessage(eventType, content, isBubbleMessage, isLeftAlignedBubbleMessage);
     // Some non-info messages want to be rendered in the appropriate bubble column but without the bubble background
     const noBubbleEvent =
diff --git a/src/utils/EventUtils.ts b/src/utils/EventUtils.ts
index 9c387b16b0..2c6d149342 100644
--- a/src/utils/EventUtils.ts
+++ b/src/utils/EventUtils.ts
@@ -30,6 +30,7 @@ import { type TimelineRenderingType } from "../contexts/RoomContext";
 import { launchPollEditor } from "../components/views/messages/MPollBody";
 import { Action } from "../dispatcher/actions";
 import { type ViewRoomPayload } from "../dispatcher/payloads/ViewRoomPayload";
+import { ModuleApi } from "../modules/Api";
 
 /**
  * Returns whether an event should allow actions like reply, reactions, edit, etc.
@@ -69,7 +70,9 @@ export function canEditContent(matrixClient: MatrixClient, mxEvent: MatrixEvent)
 
     if (
         !isCancellable ||
-        mxEvent.status === EventStatus.CANCELLED ||
+        // Editing local echos is not supported(results in send a message that references the local ID).
+        // We need to ensure the event is not local, and therefore has no send status.
+        mxEvent.status !== null ||
         mxEvent.isRedacted() ||
         mxEvent.isRelation(RelationType.Replace) ||
         mxEvent.getSender() !== matrixClient.getUserId()
@@ -77,6 +80,10 @@ export function canEditContent(matrixClient: MatrixClient, mxEvent: MatrixEvent)
         return false;
     }
 
+    if (ModuleApi.instance.customComponents.getHintsForMessage(mxEvent)?.allowEditingEvent === false) {
+        return false;
+    }
+
     const { msgtype, body } = mxEvent.getOriginalContent();
     return (
         M_POLL_START.matches(mxEvent.getType()) ||
diff --git a/src/utils/FileUtils.ts b/src/utils/FileUtils.ts
index 1240dc61db..7958489057 100644
--- a/src/utils/FileUtils.ts
+++ b/src/utils/FileUtils.ts
@@ -7,16 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import {
-    filesize,
-    type FileSizeOptionsArray,
-    type FileSizeOptionsBase,
-    type FileSizeOptionsExponent,
-    type FileSizeOptionsObject,
-    type FileSizeOptionsString,
-    type FileSizeReturnArray,
-    type FileSizeReturnObject,
-} from "filesize";
+import { filesize, type FilesizeOptions, type FilesizeReturn } from "filesize";
 import { type MediaEventContent } from "matrix-js-sdk/src/types";
 
 import { _t } from "../languageHandler";
@@ -27,7 +18,7 @@ export function downloadLabelForFile(content: MediaEventContent, withSize = true
     if (content.info?.size && withSize) {
         // If we know the size of the file then add it as human-readable string to the end of the link text
         // so that the user knows how big a file they are downloading.
-        text += " (" + <string>fileSize(content.info.size, { base: 2, standard: "jedec" }) + ")";
+        text += " (" + fileSize(content.info.size, { base: 2, standard: "jedec" }) + ")";
     }
     return text;
 }
@@ -83,18 +74,11 @@ export function presentableTextForFile(
         // it since it is "ugly", users generally aren't aware what it
         // means and the type of the attachment can usually be inferred
         // from the file extension.
-        text += " (" + <string>fileSize(content.info.size, { base: 2, standard: "jedec" }) + ")";
+        text += " (" + fileSize(content.info.size, { base: 2, standard: "jedec" }) + ")";
     }
     return text;
 }
 
-type FileSizeOptions =
-    | FileSizeOptionsString
-    | FileSizeOptionsBase
-    | FileSizeOptionsArray
-    | FileSizeOptionsExponent
-    | FileSizeOptionsObject;
-
 /**
  * wrapper function to set default values for filesize function
  *
@@ -106,15 +90,7 @@ type FileSizeOptions =
  *  exponent: number;
  *  unit: string;}} formatted file size with unit e.g. 12kB, 12KB
  */
-export function fileSize(byteCount: number, options: FileSizeOptionsString | FileSizeOptionsBase): string;
-export function fileSize(byteCount: number, options: FileSizeOptionsArray): FileSizeReturnArray;
-export function fileSize(byteCount: number, options: FileSizeOptionsExponent): number;
-export function fileSize(byteCount: number, options: FileSizeOptionsObject): FileSizeReturnObject;
-export function fileSize(byteCount: number): string;
-export function fileSize(
-    byteCount: number,
-    options?: FileSizeOptions,
-): string | number | FileSizeReturnArray | FileSizeReturnObject {
-    const defaultOption: FileSizeOptions = { base: 2, standard: "jedec", ...options };
-    return filesize(byteCount, defaultOption);
+export function fileSize<O extends FilesizeOptions>(byteCount: number, options?: O): FilesizeReturn<O> {
+    const defaultOption = { base: 2, standard: "jedec", ...options } as O;
+    return filesize<O>(byteCount, defaultOption);
 }
diff --git a/src/utils/FormattingUtils.ts b/src/utils/FormattingUtils.ts
index 051ef7a371..b952c96170 100644
--- a/src/utils/FormattingUtils.ts
+++ b/src/utils/FormattingUtils.ts
@@ -12,6 +12,9 @@ import { useIdColorHash } from "@vector-im/compound-web";
 
 import { _t, getCurrentLanguage, getUserLanguage } from "../languageHandler";
 import { jsxJoin } from "./ReactUtils";
+
+export { formatBytes } from "@element-hq/web-shared-components";
+
 const locale = getCurrentLanguage();
 
 // It's quite costly to instanciate `Intl.NumberFormat`, hence why we do not do
@@ -40,22 +43,6 @@ export function formatCountLong(count: number): string {
     return formatter.format(count);
 }
 
-/**
- * format a size in bytes into a human readable form
- * e.g: 1024 -> 1.00 KB
- */
-export function formatBytes(bytes: number, decimals = 2): string {
-    if (bytes === 0) return "0 Bytes";
-
-    const k = 1024;
-    const dm = decimals < 0 ? 0 : decimals;
-    const sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
-
-    const i = Math.floor(Math.log(bytes) / Math.log(k));
-
-    return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + " " + sizes[i];
-}
-
 export function getUserNameColorClass(userId: string): string {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     const number = useIdColorHash(userId);
diff --git a/src/utils/Image.ts b/src/utils/Image.ts
index ab7c67d477..99352e26a0 100644
--- a/src/utils/Image.ts
+++ b/src/utils/Image.ts
@@ -9,7 +9,6 @@
 import { arrayHasDiff } from "./arrays";
 
 export function mayBeAnimated(mimeType?: string): boolean {
-    // AVIF animation support at the time of writing is only available in Chrome hence not having `blobIsAnimated` check
     return ["image/gif", "image/webp", "image/png", "image/apng", "image/avif"].includes(mimeType!);
 }
 
@@ -26,8 +25,28 @@ function arrayBufferReadStr(arr: ArrayBuffer, start: number, len: number): strin
     return String.fromCharCode.apply(null, Array.from(arrayBufferRead(arr, start, len)));
 }
 
-export async function blobIsAnimated(mimeType: string | undefined, blob: Blob): Promise<boolean> {
-    switch (mimeType) {
+/**
+ * Check if a Blob contains an animated image.
+ * @param blob The Blob to check.
+ * @returns True if the image is animated, false if not, or undefined if it could not be determined.
+ */
+export async function blobIsAnimated(blob: Blob): Promise<boolean | undefined> {
+    try {
+        // Try parse the image using ImageDecoder as this is the most coherent way of asserting whether a piece of media
+        // is or is not animated. Limited availability at time of writing, notably Safari lacks support.
+        // https://developer.mozilla.org/en-US/docs/Web/API/ImageDecoder
+        const data = await blob.arrayBuffer();
+        const decoder = new ImageDecoder({ data, type: blob.type });
+        await decoder.tracks.ready;
+        if ([...decoder.tracks].some((track) => track.animated)) {
+            return true;
+        }
+    } catch (e) {
+        console.warn("ImageDecoder not supported or failed to decode image", e);
+        // Not supported by this browser, fall through to manual checks
+    }
+
+    switch (blob.type) {
         case "image/webp": {
             // Only extended file format WEBP images support animation, so grab the expected data range and verify header.
             // Based on https://developers.google.com/speed/webp/docs/riff_container#extended_file_format
@@ -42,7 +61,7 @@ export async function blobIsAnimated(mimeType: string | undefined, blob: Blob):
                 const animationFlagMask = 1 << 1;
                 return (flags & animationFlagMask) != 0;
             }
-            break;
+            return false;
         }
 
         case "image/gif": {
@@ -100,9 +119,7 @@ export async function blobIsAnimated(mimeType: string | undefined, blob: Blob):
                 }
                 i += length + 4;
             }
-            break;
+            return false;
         }
     }
-
-    return false;
 }
diff --git a/src/utils/MediaEventHelper.ts b/src/utils/MediaEventHelper.ts
index 98cbe4da58..837f049398 100644
--- a/src/utils/MediaEventHelper.ts
+++ b/src/utils/MediaEventHelper.ts
@@ -14,6 +14,7 @@ import { LazyValue } from "./LazyValue";
 import { type Media, mediaFromContent } from "../customisations/Media";
 import { decryptFile } from "./DecryptFile";
 import { type IDestroyable } from "./IDestroyable";
+import { getBlobSafeMimeType } from "./blobs.ts";
 
 // TODO: We should consider caching the blobs. https://github.com/vector-im/element-web/issues/17192
 
@@ -72,18 +73,25 @@ export class MediaEventHelper implements IDestroyable {
     };
 
     private fetchSource = (): Promise<Blob> => {
+        const content = this.event.getContent<MediaEventContent>();
         if (this.media.isEncrypted) {
-            const content = this.event.getContent<MediaEventContent>();
             return decryptFile(content.file!, content.info);
         }
-        return this.media.downloadSource().then((r) => r.blob());
+
+        return (
+            this.media
+                .downloadSource()
+                .then((r) => r.blob())
+                // Set the mime type from the event info on the blob
+                .then((blob) => blob.slice(0, blob.size, getBlobSafeMimeType(content.info?.mimetype ?? blob.type)))
+        );
     };
 
     private fetchThumbnail = (): Promise<Blob | null> => {
         if (!this.media.hasThumbnail) return Promise.resolve(null);
 
+        const content = this.event.getContent<ImageContent>();
         if (this.media.isEncrypted) {
-            const content = this.event.getContent<ImageContent>();
             if (content.info?.thumbnail_file) {
                 return decryptFile(content.info.thumbnail_file, content.info.thumbnail_info);
             } else {
@@ -96,7 +104,14 @@ export class MediaEventHelper implements IDestroyable {
         const thumbnailHttp = this.media.thumbnailHttp;
         if (!thumbnailHttp) return Promise.resolve(null);
 
-        return fetch(thumbnailHttp).then((r) => r.blob());
+        return (
+            fetch(thumbnailHttp)
+                .then((r) => r.blob())
+                // Set the mime type from the event info on the blob
+                .then((blob) =>
+                    blob.slice(0, blob.size, getBlobSafeMimeType(content.info?.thumbnail_info?.mimetype ?? blob.type)),
+                )
+        );
     };
 
     public static isEligible(event: MatrixEvent): boolean {
@@ -117,7 +132,7 @@ export class MediaEventHelper implements IDestroyable {
     /**
      * Determine if the media event in question supports being hidden in the timeline.
      * @param event Any matrix event.
-     * @returns `true` if the media can be hidden, otherwise false.
+     * @returns `true` if the media can be hidden, otherwise `false`.
      */
     public static canHide(event: MatrixEvent): boolean {
         if (!event) return false;
diff --git a/src/utils/MessageDiffUtils.tsx b/src/utils/MessageDiffUtils.tsx
index addb8265be..53d12b2513 100644
--- a/src/utils/MessageDiffUtils.tsx
+++ b/src/utils/MessageDiffUtils.tsx
@@ -27,7 +27,7 @@ function getSanitizedHtmlBody(content: IContent): string {
         stripReplyFallback: true,
     };
     if (content.format === "org.matrix.custom.html") {
-        return bodyToHtml(content, null, opts);
+        return bodyToHtml(content, undefined, opts);
     } else {
         // convert the string to something that can be safely
         // embedded in an html document, e.g. use html entities where needed
@@ -37,7 +37,7 @@ function getSanitizedHtmlBody(content: IContent): string {
         // as opposed to bodyToHtml, here we also render
         // text messages with dangerouslySetInnerHTML, to unify
         // the code paths and because we need html to show differences
-        return textToHtml(bodyToHtml(content, null, opts));
+        return textToHtml(bodyToHtml(content, undefined, opts));
     }
 }
 
diff --git a/src/utils/MultiInviter.ts b/src/utils/MultiInviter.ts
index f8310de8bd..46fd84cc26 100644
--- a/src/utils/MultiInviter.ts
+++ b/src/utils/MultiInviter.ts
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { MatrixError, type MatrixClient, EventType, type EmptyObject } from "matrix-js-sdk/src/matrix";
+import { MatrixError, type MatrixClient, EventType, type EmptyObject, type InviteOpts } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 
@@ -16,6 +16,7 @@ import Modal from "../Modal";
 import SettingsStore from "../settings/SettingsStore";
 import AskInviteAnywayDialog from "../components/views/dialogs/AskInviteAnywayDialog";
 import ConfirmUserActionDialog from "../components/views/dialogs/ConfirmUserActionDialog";
+import { openInviteProgressDialog } from "../components/views/dialogs/InviteProgressDialog.tsx";
 
 export enum InviteState {
     Invited = "invited",
@@ -40,28 +41,37 @@ const USER_ALREADY_JOINED = "IO.ELEMENT.ALREADY_JOINED";
 const USER_ALREADY_INVITED = "IO.ELEMENT.ALREADY_INVITED";
 const USER_BANNED = "IO.ELEMENT.BANNED";
 
+/** Options interface for {@link MultiInviter} */
+export interface MultiInviterOptions {
+    /** Optional callback, fired after each invite */
+    progressCallback?: () => void;
+
+    /**
+     * By default, we will pop up a "Preparing invitations..." dialog while the invites are being sent. Set this to
+     * `true` to inhibit it (in which case, you probably want to implement another bit of feedback UI).
+     */
+    inhibitProgressDialog?: boolean;
+}
+
 /**
  * Invites multiple addresses to a room, handling rate limiting from the server
  */
 export default class MultiInviter {
-    private canceled = false;
     private addresses: string[] = [];
-    private busy = false;
     private _fatal = false;
     private completionStates: CompletionStates = {}; // State of each address (invited or error)
     private errors: Record<string, IError> = {}; // { address: {errorText, errcode} }
-    private deferred: PromiseWithResolvers<CompletionStates> | null = null;
     private reason: string | undefined;
 
     /**
      * @param matrixClient the client of the logged in user
      * @param {string} roomId The ID of the room to invite to
-     * @param {function} progressCallback optional callback, fired after each invite.
+     * @param options Options object
      */
     public constructor(
         private readonly matrixClient: MatrixClient,
         private roomId: string,
-        private readonly progressCallback?: () => void,
+        private readonly options: MultiInviterOptions = {},
     ) {}
 
     public get fatal(): boolean {
@@ -72,40 +82,75 @@ export default class MultiInviter {
      * Invite users to this room. This may only be called once per
      * instance of the class.
      *
+     * Any failures are returned via the {@link CompletionStates} in the result.
+     *
      * @param {array} addresses Array of addresses to invite
      * @param {string} reason Reason for inviting (optional)
-     * @returns {Promise} Resolved when all invitations in the queue are complete
+     * @returns {Promise} Resolved when all invitations in the queue are complete.
      */
-    public invite(addresses: string[], reason?: string): Promise<CompletionStates> {
+    public async invite(addresses: string[], reason?: string): Promise<CompletionStates> {
         if (this.addresses.length > 0) {
             throw new Error("Already inviting/invited");
         }
         this.addresses.push(...addresses);
         this.reason = reason;
 
-        for (const addr of this.addresses) {
-            if (getAddressType(addr) === null) {
-                this.completionStates[addr] = InviteState.Error;
-                this.errors[addr] = {
-                    errcode: "M_INVALID",
-                    errorText: _t("invite|invalid_address"),
-                };
-            }
+        let closeDialog: (() => void) | undefined;
+        if (!this.options.inhibitProgressDialog) {
+            closeDialog = openInviteProgressDialog();
         }
-        this.deferred = Promise.withResolvers<CompletionStates>();
-        this.inviteMore(0);
 
-        return this.deferred.promise;
-    }
+        try {
+            for (const addr of this.addresses) {
+                if (getAddressType(addr) === null) {
+                    this.completionStates[addr] = InviteState.Error;
+                    this.errors[addr] = {
+                        errcode: "M_INVALID",
+                        errorText: _t("invite|invalid_address"),
+                    };
+                }
+            }
 
-    /**
-     * Stops inviting. Causes promises returned by invite() to be rejected.
-     */
-    public cancel(): void {
-        if (!this.busy) return;
+            for (const addr of this.addresses) {
+                // don't try to invite it if it's an invalid address
+                // (it will already be marked as an error though,
+                // so no need to do so again)
+                if (getAddressType(addr) === null) {
+                    continue;
+                }
 
-        this.canceled = true;
-        this.deferred?.reject(new Error("canceled"));
+                // don't re-invite (there's no way in the UI to do this, but
+                // for sanity's sake)
+                if (this.completionStates[addr] === InviteState.Invited) {
+                    continue;
+                }
+
+                await this.doInvite(addr, false);
+
+                if (this._fatal) {
+                    // `doInvite` suffered a fatal error. The error should have been recorded in `errors`; it's up
+                    // to the caller to report back to the user.
+                    return this.completionStates;
+                }
+            }
+
+            if (Object.keys(this.errors).length > 0) {
+                // There were problems inviting some people - see if we can invite them
+                // without caring if they exist or not.
+                const unknownProfileUsers = Object.keys(this.errors).filter((a) =>
+                    UNKNOWN_PROFILE_ERRORS.includes(this.errors[a].errcode),
+                );
+
+                if (unknownProfileUsers.length > 0) {
+                    await this.handleUnknownProfileUsers(unknownProfileUsers);
+                }
+            }
+        } finally {
+            // Remember to close the progress dialog, if we opened one.
+            closeDialog?.();
+        }
+
+        return this.completionStates;
     }
 
     public getCompletionState(addr: string): InviteState {
@@ -183,34 +228,36 @@ export default class MultiInviter {
                 }
             }
 
-            return this.matrixClient.invite(roomId, addr, this.reason);
+            const opts: InviteOpts = {};
+            if (this.reason !== undefined) opts.reason = this.reason;
+            if (SettingsStore.getValue("feature_share_history_on_invite")) opts.shareEncryptedHistory = true;
+
+            return this.matrixClient.invite(roomId, addr, opts);
         } else {
             throw new Error("Unsupported address");
         }
     }
 
-    private doInvite(address: string, ignoreProfile = false): Promise<void> {
+    /**
+     * Attempt to invite a user.
+     *
+     * Does not normally throw exceptions. If there was an error, this is reflected in {@link errors}.
+     * If the error was fatal and should prevent further invites from being done, {@link _fatal} is set.
+     */
+    private doInvite(address: string, ignoreProfile: boolean): Promise<void> {
         return new Promise<void>((resolve, reject) => {
             logger.log(`Inviting ${address}`);
 
             const doInvite = this.inviteToRoom(this.roomId, address, ignoreProfile);
             doInvite
                 .then(() => {
-                    if (this.canceled) {
-                        return;
-                    }
-
                     this.completionStates[address] = InviteState.Invited;
                     delete this.errors[address];
 
                     resolve();
-                    this.progressCallback?.();
+                    this.options.progressCallback?.();
                 })
                 .catch((err) => {
-                    if (this.canceled) {
-                        return;
-                    }
-
                     logger.error(err);
 
                     const room = this.roomId ? this.matrixClient.getRoom(this.roomId) : null;
@@ -220,7 +267,6 @@ export default class MultiInviter {
                     ];
 
                     let errorText: string | undefined;
-                    let fatal = false;
                     switch (err.errcode) {
                         case "M_FORBIDDEN":
                             if (isSpace) {
@@ -234,7 +280,8 @@ export default class MultiInviter {
                                         ? _t("invite|error_unfederated_room")
                                         : _t("invite|error_permissions_room");
                             }
-                            fatal = true;
+                            // No point doing further invites.
+                            this._fatal = true;
                             break;
                         case USER_ALREADY_INVITED:
                             if (isSpace) {
@@ -295,86 +342,43 @@ export default class MultiInviter {
                     this.completionStates[address] = InviteState.Error;
                     this.errors[address] = { errorText, errcode: err.errcode };
 
-                    this.busy = !fatal;
-                    this._fatal = fatal;
-
-                    if (fatal) {
-                        reject(err);
-                    } else {
-                        resolve();
-                    }
+                    resolve();
                 });
         });
     }
 
-    private inviteMore(nextIndex: number, ignoreProfile = false): void {
-        if (this.canceled) {
-            return;
-        }
+    /** Handle users which failed with an error code which indicated that their profile was unknown.
+     *
+     * Depending on the `promptBeforeInviteUnknownUsers` setting, we either prompt the user for how to proceed, or
+     * send the invites anyway.
+     */
+    private handleUnknownProfileUsers(unknownProfileUsers: string[]): Promise<void> {
+        return new Promise<void>((resolve) => {
+            const inviteUnknowns = (): void => {
+                const promises = unknownProfileUsers.map((u) => this.doInvite(u, true));
+                Promise.all(promises).then(() => resolve());
+            };
 
-        if (nextIndex === this.addresses.length) {
-            this.busy = false;
-            if (Object.keys(this.errors).length > 0) {
-                // There were problems inviting some people - see if we can invite them
-                // without caring if they exist or not.
-                const unknownProfileUsers = Object.keys(this.errors).filter((a) =>
-                    UNKNOWN_PROFILE_ERRORS.includes(this.errors[a].errcode),
-                );
-
-                if (unknownProfileUsers.length > 0) {
-                    const inviteUnknowns = (): void => {
-                        const promises = unknownProfileUsers.map((u) => this.doInvite(u, true));
-                        Promise.all(promises).then(() => this.deferred?.resolve(this.completionStates));
-                    };
-
-                    if (!SettingsStore.getValue("promptBeforeInviteUnknownUsers", this.roomId)) {
-                        inviteUnknowns();
-                        return;
-                    }
-
-                    logger.log("Showing failed to invite dialog...");
-                    Modal.createDialog(AskInviteAnywayDialog, {
-                        unknownProfileUsers: unknownProfileUsers.map((u) => ({
-                            userId: u,
-                            errorText: this.errors[u].errorText,
-                        })),
-                        onInviteAnyways: () => inviteUnknowns(),
-                        onGiveUp: () => {
-                            // Fake all the completion states because we already warned the user
-                            for (const addr of unknownProfileUsers) {
-                                this.completionStates[addr] = InviteState.Invited;
-                            }
-                            this.deferred?.resolve(this.completionStates);
-                        },
-                    });
-                    return;
-                }
+            if (!SettingsStore.getValue("promptBeforeInviteUnknownUsers", this.roomId)) {
+                inviteUnknowns();
+                return;
             }
-            this.deferred?.resolve(this.completionStates);
-            return;
-        }
 
-        const addr = this.addresses[nextIndex];
-
-        // don't try to invite it if it's an invalid address
-        // (it will already be marked as an error though,
-        // so no need to do so again)
-        if (getAddressType(addr) === null) {
-            this.inviteMore(nextIndex + 1);
-            return;
-        }
-
-        // don't re-invite (there's no way in the UI to do this, but
-        // for sanity's sake)
-        if (this.completionStates[addr] === InviteState.Invited) {
-            this.inviteMore(nextIndex + 1);
-            return;
-        }
-
-        this.doInvite(addr, ignoreProfile)
-            .then(() => {
-                this.inviteMore(nextIndex + 1, ignoreProfile);
-            })
-            .catch(() => this.deferred?.resolve(this.completionStates));
+            logger.log("Showing failed to invite dialog...");
+            Modal.createDialog(AskInviteAnywayDialog, {
+                unknownProfileUsers: unknownProfileUsers.map((u) => ({
+                    userId: u,
+                    errorText: this.errors[u].errorText,
+                })),
+                onInviteAnyways: () => inviteUnknowns(),
+                onGiveUp: () => {
+                    // Fake all the completion states because we already warned the user
+                    for (const addr of unknownProfileUsers) {
+                        this.completionStates[addr] = InviteState.Invited;
+                    }
+                    resolve();
+                },
+            });
+        });
     }
 }
diff --git a/src/utils/PinningUtils.ts b/src/utils/PinningUtils.ts
index 9575e3b767..19a1a9a726 100644
--- a/src/utils/PinningUtils.ts
+++ b/src/utils/PinningUtils.ts
@@ -81,6 +81,9 @@ export default class PinningUtils {
         const room = matrixClient.getRoom(mxEvent.getRoomId());
         if (!room) return false;
 
+        // Should have a non-local event id
+        if (mxEvent.status !== null) return false;
+
         return PinningUtils.userHasPinOrUnpinPermission(matrixClient, room) && PinningUtils.isPinnable(mxEvent);
     }
 
@@ -94,6 +97,9 @@ export default class PinningUtils {
         const room = matrixClient.getRoom(mxEvent.getRoomId());
         if (!room) return false;
 
+        // Should have a non-local event id
+        if (mxEvent.status !== null) return false;
+
         return PinningUtils.userHasPinOrUnpinPermission(matrixClient, room) && PinningUtils.isUnpinnable(mxEvent);
     }
 
@@ -123,6 +129,9 @@ export default class PinningUtils {
         const eventId = mxEvent.getId();
         if (!eventId) return;
 
+        // Should have a non-local event id
+        if (mxEvent.status !== null) return;
+
         // Get the current pinned events of the room
         const pinnedIds: Array<string> =
             room
diff --git a/src/utils/RoomUpgrade.ts b/src/utils/RoomUpgrade.ts
index aa106f1a1a..0c476a2ddd 100644
--- a/src/utils/RoomUpgrade.ts
+++ b/src/utils/RoomUpgrade.ts
@@ -6,18 +6,19 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { type Room, EventType, ClientEvent, type MatrixClient } from "matrix-js-sdk/src/matrix";
+import { ClientEvent, EventType, type MatrixClient, type Room } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 
-import { inviteUsersToRoom } from "../RoomInvite";
+import { inviteMultipleToRoom, showAnyInviteErrors } from "../RoomInvite";
 import Modal, { type IHandle } from "../Modal";
 import { _t } from "../languageHandler";
 import ErrorDialog from "../components/views/dialogs/ErrorDialog";
 import SpaceStore from "../stores/spaces/SpaceStore";
 import Spinner from "../components/views/elements/Spinner";
+import type { MultiInviterOptions } from "./MultiInviter";
 
-interface IProgress {
+export interface RoomUpgradeProgress {
     roomUpgraded: boolean;
     roomSynced?: boolean;
     inviteUsersProgress?: number;
@@ -50,7 +51,8 @@ export async function upgradeRoom(
     handleError = true,
     updateSpaces = true,
     awaitRoom = false,
-    progressCallback?: (progress: IProgress) => void,
+    progressCallback?: (progress: RoomUpgradeProgress) => void,
+    inhibitInviteProgressDialog = false,
 ): Promise<string> {
     const cli = room.client;
     let spinnerModal: IHandle<any> | undefined;
@@ -77,7 +79,7 @@ export async function upgradeRoom(
             ) as Room[];
     }
 
-    const progress: IProgress = {
+    const progress: RoomUpgradeProgress = {
         roomUpgraded: false,
         roomSynced: awaitRoom || inviteUsers ? false : undefined,
         inviteUsersProgress: inviteUsers ? 0 : undefined,
@@ -112,9 +114,12 @@ export async function upgradeRoom(
 
     if (toInvite.length > 0) {
         // Errors are handled internally to this function
-        await inviteUsersToRoom(cli, newRoomId, toInvite, () => {
-            progress.inviteUsersProgress!++;
-            progressCallback?.(progress);
+        await inviteUsersToRoom(cli, newRoomId, toInvite, {
+            progressCallback: () => {
+                progress.inviteUsersProgress!++;
+                progressCallback?.(progress);
+            },
+            inhibitProgressDialog: inhibitInviteProgressDialog,
         });
     }
 
@@ -145,3 +150,14 @@ export async function upgradeRoom(
     spinnerModal?.close();
     return newRoomId;
 }
+
+async function inviteUsersToRoom(
+    client: MatrixClient,
+    roomId: string,
+    userIds: string[],
+    inviteOptions: MultiInviterOptions,
+): Promise<void> {
+    const result = await inviteMultipleToRoom(client, roomId, userIds, inviteOptions);
+    const room = client.getRoom(roomId)!;
+    showAnyInviteErrors(result.states, room, result.inviter);
+}
diff --git a/src/utils/WellKnownUtils.ts b/src/utils/WellKnownUtils.ts
index 33d27166e2..410523b9e1 100644
--- a/src/utils/WellKnownUtils.ts
+++ b/src/utils/WellKnownUtils.ts
@@ -32,8 +32,6 @@ export interface IE2EEWellKnown {
      * Disables the option to enable encryption in room settings for all new and existing rooms
      */
     force_disable?: boolean;
-    secure_backup_required?: boolean;
-    secure_backup_setup_methods?: SecureBackupSetupMethod[];
 }
 
 export interface ITileServerWellKnown {
diff --git a/src/utils/arrays.ts b/src/utils/arrays.ts
index b54e0949f2..392436eee8 100644
--- a/src/utils/arrays.ts
+++ b/src/utils/arrays.ts
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { percentageOf, percentageWithin } from "./numbers";
+import { percentageOf, percentageWithin } from "@element-hq/web-shared-components";
 
 /**
  * Quickly resample an array to have less/more data points. If an input which is larger
diff --git a/src/utils/blobs.ts b/src/utils/blobs.ts
index 70ba54a030..b9ee316a1f 100644
--- a/src/utils/blobs.ts
+++ b/src/utils/blobs.ts
@@ -66,8 +66,20 @@ const ALLOWED_BLOB_MIMETYPES = [
     "audio/x-flac",
 ];
 
+/**
+ * Checks whether the given mime type is in the allowed mimetype list
+ * @param mimetype - the mimetype to check
+ */
+export function isMimeTypeAllowed(mimetype: string): boolean {
+    return ALLOWED_BLOB_MIMETYPES.includes(mimetype);
+}
+
+/**
+ * Returns the input mimetype if it is allowed, `application/octet-stream` otherwise
+ * @param mimetype - the mimetype to check
+ */
 export function getBlobSafeMimeType(mimetype: string): string {
-    if (!ALLOWED_BLOB_MIMETYPES.includes(mimetype)) {
+    if (!isMimeTypeAllowed(mimetype)) {
         return "application/octet-stream";
     }
     return mimetype;
diff --git a/src/utils/crypto/resetKeyBackup.ts b/src/utils/crypto/resetKeyBackup.ts
new file mode 100644
index 0000000000..024f8804bf
--- /dev/null
+++ b/src/utils/crypto/resetKeyBackup.ts
@@ -0,0 +1,20 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type CryptoApi } from "matrix-js-sdk/src/crypto-api";
+
+/**
+ * Creates a new key backup version, and wait until it is enabled.
+ *
+ * This is typically used within a {@link DeviceListener.pause()} call, to
+ * ensure that the device listener doesn't check the backup status until after the
+ * key backup is active.
+ */
+export async function resetKeyBackupAndWait(crypto: CryptoApi): Promise<void> {
+    await crypto.resetKeyBackup();
+    await crypto.checkKeyBackupAndEnable();
+}
diff --git a/src/utils/dm/startDm.ts b/src/utils/dm/startDm.ts
index c88ad15c77..4b9ef082e3 100644
--- a/src/utils/dm/startDm.ts
+++ b/src/utils/dm/startDm.ts
@@ -7,7 +7,6 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { type IInvite3PID, type MatrixClient, type Room } from "matrix-js-sdk/src/matrix";
-import { type Optional } from "matrix-events-sdk";
 
 import { Action } from "../../dispatcher/actions";
 import { type ViewRoomPayload } from "../../dispatcher/payloads/ViewRoomPayload";
@@ -28,7 +27,7 @@ export async function startDm(client: MatrixClient, targets: Member[], showSpinn
     const targetIds = targets.map((t) => t.userId);
 
     // Check if there is already a DM with these people and reuse it if possible.
-    let existingRoom: Optional<Room>;
+    let existingRoom: Room | undefined;
     if (targetIds.length === 1) {
         existingRoom = findDMForUser(client, targetIds[0]);
     } else {
diff --git a/src/utils/exportUtils/Exporter.ts b/src/utils/exportUtils/Exporter.ts
index 5409186941..4085126491 100644
--- a/src/utils/exportUtils/Exporter.ts
+++ b/src/utils/exportUtils/Exporter.ts
@@ -25,8 +25,17 @@ type BlobFile = {
     blob: Blob;
 };
 
+type FileDetails = {
+    directory: string;
+    name: string;
+    date: string;
+    extension: string;
+    count?: number;
+};
+
 export default abstract class Exporter {
     protected files: BlobFile[] = [];
+    protected fileNames: Map<string, number> = new Map();
     protected cancelled = false;
 
     protected constructor(
@@ -241,6 +250,19 @@ export default abstract class Exporter {
         return [fileName, "." + ext];
     }
 
+    protected makeUniqueFilePath(details: FileDetails): string {
+        const makePath = ({ directory, name, date, extension, count = 0 }: FileDetails): string =>
+            `${directory}/${name}-${date}${count > 0 ? ` (${count})` : ""}${extension}`;
+        const defaultPath = makePath(details);
+        const count = this.fileNames.get(defaultPath) || 0;
+        this.fileNames.set(defaultPath, count + 1);
+        if (count > 0) {
+            return makePath({ ...details, count });
+        }
+
+        return defaultPath;
+    }
+
     public getFilePath(event: MatrixEvent): string {
         const mediaType = event.getContent().msgtype;
         let fileDirectory: string;
@@ -263,7 +285,12 @@ export default abstract class Exporter {
         if (event.getType() === "m.sticker") fileExt = ".png";
         if (isVoiceMessage(event)) fileExt = ".ogg";
 
-        return fileDirectory + "/" + fileName + "-" + fileDate + fileExt;
+        return this.makeUniqueFilePath({
+            directory: fileDirectory,
+            name: fileName,
+            date: fileDate,
+            extension: fileExt,
+        });
     }
 
     protected isReply(event: MatrixEvent): boolean {
diff --git a/src/utils/exportUtils/HtmlExport.tsx b/src/utils/exportUtils/HtmlExport.tsx
index c20ea8762f..20b7b681ac 100644
--- a/src/utils/exportUtils/HtmlExport.tsx
+++ b/src/utils/exportUtils/HtmlExport.tsx
@@ -30,6 +30,7 @@ import MatrixClientContext from "../../contexts/MatrixClientContext";
 import getExportCSS from "./exportCSS";
 import { textForEvent } from "../../TextForEvent";
 import { haveRendererForEvent } from "../../events/EventTileFactory";
+import { SDKContext, SdkContextClass } from "../../contexts/SDKContext.ts";
 
 import exportJS from "!!raw-loader!./exportJS";
 
@@ -161,7 +162,7 @@ export default class HTMLExporter extends Exporter {
                     <div class="mx_MatrixChat_wrapper" aria-hidden="false">
                         <div class="mx_MatrixChat">
                         <main class="mx_RoomView">
-                            <div class="mx_Flex mx_RoomHeader light-panel">
+                            <div class="mx_RoomHeader light-panel">
                                 ${roomAvatar}
                                 <div class="mx_RoomHeader_infoWrapper">
                                     <div
@@ -267,29 +268,31 @@ export default class HTMLExporter extends Exporter {
         return (
             <div className="mx_Export_EventWrapper" id={mxEv.getId()}>
                 <MatrixClientContext.Provider value={this.room.client}>
-                    <TooltipProvider>
-                        <EventTile
-                            mxEvent={mxEv}
-                            continuation={continuation}
-                            isRedacted={mxEv.isRedacted()}
-                            replacingEventId={mxEv.replacingEventId()}
-                            forExport={true}
-                            alwaysShowTimestamps={true}
-                            showUrlPreview={false}
-                            checkUnmounting={() => false}
-                            isTwelveHour={false}
-                            last={false}
-                            lastInSection={false}
-                            permalinkCreator={this.permalinkCreator}
-                            lastSuccessful={false}
-                            isSelectedEvent={false}
-                            showReactions={true}
-                            layout={Layout.Group}
-                            showReadReceipts={false}
-                            getRelationsForEvent={this.getRelationsForEvent}
-                            ref={ref}
-                        />
-                    </TooltipProvider>
+                    <SDKContext.Provider value={SdkContextClass.instance}>
+                        <TooltipProvider>
+                            <EventTile
+                                mxEvent={mxEv}
+                                continuation={continuation}
+                                isRedacted={mxEv.isRedacted()}
+                                replacingEventId={mxEv.replacingEventId()}
+                                forExport={true}
+                                alwaysShowTimestamps={true}
+                                showUrlPreview={false}
+                                checkUnmounting={() => false}
+                                isTwelveHour={false}
+                                last={false}
+                                lastInSection={false}
+                                permalinkCreator={this.permalinkCreator}
+                                lastSuccessful={false}
+                                isSelectedEvent={false}
+                                showReactions={true}
+                                layout={Layout.Group}
+                                showReadReceipts={false}
+                                getRelationsForEvent={this.getRelationsForEvent}
+                                ref={ref}
+                            />
+                        </TooltipProvider>
+                    </SDKContext.Provider>
                 </MatrixClientContext.Provider>
             </div>
         );
diff --git a/src/utils/exportUtils/exportCSS.ts b/src/utils/exportUtils/exportCSS.ts
index ade56edb3e..8c470aaa0d 100644
--- a/src/utils/exportUtils/exportCSS.ts
+++ b/src/utils/exportUtils/exportCSS.ts
@@ -13,14 +13,14 @@ import customCSS from "!!raw-loader!./exportCustomCSS.css";
 const cssSelectorTextClassesRegex = /\.[\w-]+/g;
 
 function mutateCssText(css: string): string {
-    // replace used fonts so that we don't have to bundle Inter & Inconsalata
+    // replace used fonts so that we don't have to bundle Inter & Fira Code
     const sansFont = `-apple-system, BlinkMacSystemFont, avenir next,
             avenir, segoe ui, helvetica neue, helvetica, Ubuntu, roboto, noto, arial, sans-serif`;
     return css
         .replace(/font-family: ?(Inter|'Inter'|"Inter")/g, `font-family: ${sansFont}`)
         .replace(/--cpd-font-family-sans: ?(Inter|'Inter'|"Inter")/g, `--cpd-font-family-sans: ${sansFont}`)
         .replace(
-            /font-family: ?Inconsolata/g,
+            /font-family: ?Fira Code/g,
             "font-family: Menlo, Consolas, Monaco, Liberation Mono, Lucida Console, monospace",
         );
 }
diff --git a/src/utils/exportUtils/exportCustomCSS.css b/src/utils/exportUtils/exportCustomCSS.css
index fc94fef90b..117eff6b23 100644
--- a/src/utils/exportUtils/exportCustomCSS.css
+++ b/src/utils/exportUtils/exportCustomCSS.css
@@ -131,11 +131,11 @@ a.mx_reply_anchor:hover {
 }
 
 .mx_RoomHeader {
-    --mx-flex-display: flex;
-    --mx-flex-direction: row;
-    --mx-flex-align: center;
-    --mx-flex-justify: start;
-    --mx-flex-gap: var(--cpd-space-3x);
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: start;
+    gap: var(--cpd-space-3x);
 }
 
 .mx_ReplyChain_Export {
diff --git a/src/utils/leave-behaviour.ts b/src/utils/leave-behaviour.ts
index 2ad6e7d4fe..8b7ee02f36 100644
--- a/src/utils/leave-behaviour.ts
+++ b/src/utils/leave-behaviour.ts
@@ -40,7 +40,7 @@ export async function leaveRoomBehaviour(
     let leavingAllVersions = true;
     const history = matrixClient.getRoomUpgradeHistory(
         roomId,
-        false,
+        true,
         SettingsStore.getValue("feature_dynamic_room_predecessors"),
     );
     if (history && history.length > 0) {
diff --git a/src/utils/membership.ts b/src/utils/membership.ts
index ba67d5a6c3..9880043e3d 100644
--- a/src/utils/membership.ts
+++ b/src/utils/membership.ts
@@ -131,3 +131,23 @@ export async function waitForMember(
         client.removeListener(RoomStateEvent.NewMember, handler);
     });
 }
+
+/**
+ * Check if the user is the only joined admin in the room
+ * This function will *not* cause lazy loading of room members, so if these should be included then
+ * the caller needs to make sure members have been loaded.
+ * @param room The room to check if the user is the only admin.
+ * @returns True if the user is the only user with the highest power level, false otherwise
+ */
+export function isOnlyAdmin(room: Room): boolean {
+    const currentUserLevel = room.getMember(room.client.getSafeUserId())?.powerLevel;
+
+    const userLevelValues = room.getJoinedMembers().map((m) => m.powerLevel);
+
+    const maxUserLevel = Math.max(...userLevelValues.filter((x) => typeof x === "number"));
+    // If the user is the only user with highest power level
+    return (
+        maxUserLevel === currentUserLevel &&
+        userLevelValues.lastIndexOf(maxUserLevel) == userLevelValues.indexOf(maxUserLevel)
+    );
+}
diff --git a/src/utils/messages.ts b/src/utils/messages.ts
new file mode 100644
index 0000000000..b6040b536b
--- /dev/null
+++ b/src/utils/messages.ts
@@ -0,0 +1,109 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type MatrixEvent, type IContent, type IMentions, type IEventRelation } from "matrix-js-sdk/src/matrix";
+
+import type EditorModel from "../editor/model";
+import { Type } from "../editor/parts";
+
+/**
+ * Build the mentions information based on the editor model (and any related events):
+ *
+ * 1. Search the model parts for room or user pills and fill in the mentions object.
+ * 2. If this is a reply to another event, include any user mentions from that
+ *    (but do not include a room mention).
+ *
+ * @param sender - The Matrix ID of the user sending the event.
+ * @param content - The event content.
+ * @param model - The editor model to search for mentions, null if there is no editor.
+ * @param replyToEvent - The event being replied to or undefined if it is not a reply.
+ * @param editedContent - The content of the parent event being edited.
+ */
+export function attachMentions(
+    sender: string,
+    content: IContent,
+    model: EditorModel | null,
+    replyToEvent: MatrixEvent | undefined,
+    editedContent: IContent | null = null,
+): void {
+    // We always attach the mentions even if the home server doesn't yet support
+    // intentional mentions. This is safe because m.mentions is an additive change
+    // that should simply be ignored by incapable home servers.
+
+    // The mentions property *always* gets included to disable legacy push rules.
+    const mentions: IMentions = (content["m.mentions"] = {});
+
+    const userMentions = new Set<string>();
+    let roomMention = false;
+
+    // If there's a reply, initialize the mentioned users as the sender of that event.
+    if (replyToEvent) {
+        userMentions.add(replyToEvent.sender!.userId);
+    }
+
+    // If user provided content is available, check to see if any users are mentioned.
+    if (model) {
+        // Add any mentioned users in the current content.
+        for (const part of model.parts) {
+            if (part.type === Type.UserPill) {
+                userMentions.add(part.resourceId);
+            } else if (part.type === Type.AtRoomPill) {
+                roomMention = true;
+            }
+        }
+    }
+
+    // Ensure the *current* user isn't listed in the mentioned users.
+    userMentions.delete(sender);
+
+    // Finally, if this event is editing a previous event, only include users who
+    // were not previously mentioned and a room mention if the previous event was
+    // not a room mention.
+    if (editedContent) {
+        // First, the new event content gets the *full* set of users.
+        const newContent = content["m.new_content"];
+        const newMentions: IMentions = (newContent["m.mentions"] = {});
+
+        // Only include the users/room if there is any content.
+        if (userMentions.size) {
+            newMentions.user_ids = [...userMentions];
+        }
+        if (roomMention) {
+            newMentions.room = true;
+        }
+
+        // Fetch the mentions from the original event and remove any previously
+        // mentioned users.
+        const prevMentions = editedContent["m.mentions"];
+        if (Array.isArray(prevMentions?.user_ids)) {
+            prevMentions!.user_ids.forEach((userId) => userMentions.delete(userId));
+        }
+
+        // If the original event mentioned the room, nothing to do here.
+        if (prevMentions?.room) {
+            roomMention = false;
+        }
+    }
+
+    // Only include the users/room if there is any content.
+    if (userMentions.size) {
+        mentions.user_ids = [...userMentions];
+    }
+    if (roomMention) {
+        mentions.room = true;
+    }
+}
+
+// Merges favouring the given relation
+export function attachRelation(content: IContent, relation?: IEventRelation): void {
+    if (relation) {
+        content["m.relates_to"] = {
+            ...(content["m.relates_to"] || {}),
+            ...relation,
+        };
+    }
+}
diff --git a/src/utils/oidc/TokenRefresher.ts b/src/utils/oidc/TokenRefresher.ts
index a525f9fd1d..3ee354c998 100644
--- a/src/utils/oidc/TokenRefresher.ts
+++ b/src/utils/oidc/TokenRefresher.ts
@@ -17,8 +17,6 @@ import { persistAccessTokenInStorage, persistRefreshTokenInStorage } from "../to
  * Stores tokens in the same way as login flow in Lifecycle.
  */
 export class TokenRefresher extends OidcTokenRefresher {
-    private readonly deviceId!: string;
-
     public constructor(
         issuer: string,
         clientId: string,
@@ -27,8 +25,7 @@ export class TokenRefresher extends OidcTokenRefresher {
         idTokenClaims: IdTokenClaims,
         private readonly userId: string,
     ) {
-        super(issuer, clientId, deviceId, redirectUri, idTokenClaims);
-        this.deviceId = deviceId;
+        super(issuer, clientId, redirectUri, deviceId, idTokenClaims);
     }
 
     public async persistTokens({ accessToken, refreshToken }: AccessTokens): Promise<void> {
diff --git a/src/utils/permalinks/Permalinks.ts b/src/utils/permalinks/Permalinks.ts
index 0df4b4beb1..8b8c850fc4 100644
--- a/src/utils/permalinks/Permalinks.ts
+++ b/src/utils/permalinks/Permalinks.ts
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import isIp from "is-ip";
+import { isIP } from "is-ip";
 import * as utils from "matrix-js-sdk/src/utils";
 import { type Room, type MatrixClient, RoomStateEvent, EventType } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
@@ -217,7 +217,7 @@ export class RoomPermalinkCreator {
 
                 const allowed = aclEvent.getContent<{ allow: string[] }>().allow;
                 allowedHostsRegexps = []; // we don't want to use the default rule here
-                if (Array.isArray(denied)) {
+                if (Array.isArray(allowed)) {
                     allowed.forEach((h) => allowedHostsRegexps.push(getRegex(h)));
                 }
             }
@@ -492,7 +492,7 @@ function isHostnameIpAddress(hostname: string): boolean {
         hostname = hostname.substring(1, hostname.length - 1);
     }
 
-    return isIp(hostname);
+    return isIP(hostname);
 }
 
 export const calculateRoomVia = (room: Room): string[] => {
diff --git a/src/utils/room/placeCall.ts b/src/utils/room/placeCall.ts
index 1f0d67c1e6..6c046116ce 100644
--- a/src/utils/room/placeCall.ts
+++ b/src/utils/room/placeCall.ts
@@ -21,12 +21,14 @@ import PosthogTrackers from "../../PosthogTrackers";
  * @param room the room to place the call in
  * @param callType the type of call
  * @param platformCallType the platform to pass the call on
+ * @param skipLobby Has the user indicated they would like to skip the lobby. Otherwise, defer to platform defaults.
  */
 export const placeCall = async (
     room: Room,
     callType: CallType,
     platformCallType: PlatformCallType,
-    skipLobby: boolean,
+    skipLobby: boolean | undefined,
+    voiceOnly: boolean,
 ): Promise<void> => {
     const { analyticsName } = getPlatformCallTypeProps(platformCallType);
     PosthogTrackers.trackInteraction(analyticsName);
@@ -38,6 +40,7 @@ export const placeCall = async (
             action: Action.ViewRoom,
             room_id: room.roomId,
             view_call: true,
+            voiceOnly,
             skipLobby,
             metricsTrigger: undefined,
         });
diff --git a/src/vector/app.tsx b/src/vector/app.tsx
index d0c689a2b4..84f9b18ec1 100644
--- a/src/vector/app.tsx
+++ b/src/vector/app.tsx
@@ -30,6 +30,10 @@ import { ModuleRunner } from "../modules/ModuleRunner";
 import { parseQs } from "./url_utils";
 import { getInitialScreenAfterLogin, getScreenFromLocation, init as initRouting, onNewScreen } from "./routing";
 import { UserFriendlyError } from "../languageHandler";
+import { ModuleApi } from "../modules/Api";
+import { RoomView } from "../components/structures/RoomView";
+import RoomAvatar from "../components/views/avatars/RoomAvatar";
+import { ModuleNotificationDecoration } from "../modules/components/ModuleNotificationDecoration";
 
 logger.log(`Application is running in ${process.env.NODE_ENV} mode`);
 
@@ -43,6 +47,7 @@ function onTokenLoginCompleted(): void {
     // a little nasty but let's redirect to clear them.
     const url = new URL(window.location.href);
 
+    url.searchParams.delete("no_universal_links");
     url.searchParams.delete("loginToken");
     url.searchParams.delete("state");
     url.searchParams.delete("code");
@@ -52,6 +57,14 @@ function onTokenLoginCompleted(): void {
 }
 
 export async function loadApp(fragParams: QueryDict, matrixChatRef: React.Ref<MatrixChat>): Promise<ReactElement> {
+    // XXX: This lives here because certain components import so many things that importing it in a sensible place (eg.
+    // the builtins module or init.tsx) causes a circular dependency.
+    ModuleApi.instance.builtins.setComponents({
+        roomView: RoomView,
+        roomAvatar: RoomAvatar,
+        notificationDecoration: ModuleNotificationDecoration,
+    });
+
     initRouting();
     const platform = PlatformPeg.get();
 
diff --git a/src/vector/index.html b/src/vector/index.html
index 0c21a0791b..84f334554d 100644
--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -3,24 +3,18 @@
   <head>
     <meta charset="utf-8">
     <title>Element</title>
-    <link rel="apple-touch-icon" sizes="57x57" href="<%= require('../../res/vector-icons/apple-touch-icon-57.png') %>">
-    <link rel="apple-touch-icon" sizes="60x60" href="<%= require('../../res/vector-icons/apple-touch-icon-60.png') %>">
-    <link rel="apple-touch-icon" sizes="72x72" href="<%= require('../../res/vector-icons/apple-touch-icon-72.png') %>">
-    <link rel="apple-touch-icon" sizes="76x76" href="<%= require('../../res/vector-icons/apple-touch-icon-76.png') %>">
-    <link rel="apple-touch-icon" sizes="114x114" href="<%= require('../../res/vector-icons/apple-touch-icon-114.png') %>">
-    <link rel="apple-touch-icon" sizes="120x120" href="<%= require('../../res/vector-icons/apple-touch-icon-120.png') %>">
-    <link rel="apple-touch-icon" sizes="144x144" href="<%= require('../../res/vector-icons/apple-touch-icon-144.png') %>">
-    <link rel="apple-touch-icon" sizes="152x152" href="<%= require('../../res/vector-icons/apple-touch-icon-152.png') %>">
-    <link rel="apple-touch-icon" sizes="180x180" href="<%= require('../../res/vector-icons/apple-touch-icon-180.png') %>">
+    <link rel="apple-touch-icon" sizes="120x120" href="<%= require('../../res/vector-icons/120.png') %>">
+    <link rel="apple-touch-icon" sizes="144x144" href="<%= require('../../res/vector-icons/144.png') %>">
+    <link rel="apple-touch-icon" sizes="152x152" href="<%= require('../../res/vector-icons/152.png') %>">
+    <link rel="apple-touch-icon" sizes="180x180" href="<%= require('../../res/vector-icons/180.png') %>">
     <link rel="manifest" href="manifest.json">
     <meta name="referrer" content="no-referrer">
-    <link rel="shortcut icon" href="<%= require('../../res/vector-icons/favicon.ico') %>">
+    <link rel="icon" type="image/png" sizes="24x24" href="<%= require('../../res/vector-icons/24.png') %>">
+    <link rel="icon" type="image/png" sizes="144x144" href="<%= require('../../res/vector-icons/144.png') %>">
+    <link rel="icon" type="image/png" sizes="512x512" href="<%= require('../../res/vector-icons/512.png') %>">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="apple-mobile-web-app-title" content="Element">
     <meta name="application-name" content="Element">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="<%= require('../../res/vector-icons/mstile-150.png') %>">
-    <meta name="msapplication-config" content="<%= require('../../res/vector-icons/browserconfig.xml') %>">
     <meta name="theme-color" content="#ffffff">
     <meta property="og:image" content="<%= og_image_url %>" />
     <meta http-equiv="Content-Security-Policy" content="
@@ -73,7 +67,6 @@
 
     <!-- Legacy supporting Prefetch images -->
     <img src="<%= require('../../res/img/warning.svg').default %>" aria-hidden alt="" width="24" height="23" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
-    <img src="<%= require('../../res/img/e2e/warning.svg').default %>" aria-hidden alt="" width="24" height="23" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
     <img src="<%= require('@vector-im/compound-design-tokens/icons/warning.svg').default %>" aria-hidden alt="" width="24" height="23" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
     <img src="<%= require('@vector-im/compound-design-tokens/icons/bold.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
     <img src="<%= require('@vector-im/compound-design-tokens/icons/inline-code.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
diff --git a/src/vector/index.ts b/src/vector/index.ts
index 943ed49c6a..e705014add 100644
--- a/src/vector/index.ts
+++ b/src/vector/index.ts
@@ -17,6 +17,9 @@ import { shouldPolyfill as shouldPolyFillIntlSegmenter } from "@formatjs/intl-se
 import { parseQsFromFragment } from "./url_utils";
 import "./modernizr";
 
+// Import shared components CSS
+import "@element-hq/web-shared-components/dist/element-web-shared-components.css";
+
 // Require common CSS here; this will make webpack process it into bundle.css.
 // Our own CSS (which is themed) is imported via separate webpack entry points
 // in webpack.config.js
diff --git a/src/vector/init.tsx b/src/vector/init.tsx
index e481e34b97..6706b75672 100644
--- a/src/vector/init.tsx
+++ b/src/vector/init.tsx
@@ -25,7 +25,7 @@ import ElectronPlatform from "./platform/ElectronPlatform";
 import PWAPlatform from "./platform/PWAPlatform";
 import WebPlatform from "./platform/WebPlatform";
 import { initRageshake, initRageshakeStore } from "./rageshakesetup";
-import ModuleApi from "../modules/Api.ts";
+import { ModuleApi } from "../modules/Api.ts";
 
 export const rageshakePromise = initRageshake();
 
@@ -145,7 +145,7 @@ export async function loadPlugins(): Promise<void> {
 
     const modules = SdkConfig.get("modules");
     if (!modules?.length) return;
-    const moduleLoader = new ModuleLoader(ModuleApi);
+    const moduleLoader = new ModuleLoader(ModuleApi.instance);
     window.mxModuleLoader = moduleLoader;
     for (const src of modules) {
         // We need to instruct webpack to not mangle this import as it is not available at compile time
diff --git a/src/vector/jitsi/index.pcss b/src/vector/jitsi/index.pcss
index 09299f1b7f..9dfbd1796f 100644
--- a/src/vector/jitsi/index.pcss
+++ b/src/vector/jitsi/index.pcss
@@ -7,6 +7,7 @@ Please see LICENSE files in the repository root for full details.
 
 /* TODO: Match the user's theme: https://github.com/element-hq/element-web/issues/12794 */
 
+@import url("@vector-im/compound-design-tokens/assets/web/css/compound-design-tokens.css");
 /* Path to `res` dir in the source tree */
 $res: ../../../res;
 
@@ -70,16 +71,22 @@ html {
 }
 
 #joinButton {
-    /* A mix of AccessibleButton styles */
-    cursor: pointer;
-    padding: 7px 18px;
+    /* Copy of Compound Button styles */
+    border: 1px solid var(--cpd-color-bg-action-primary-rest);
+    color: var(--cpd-color-text-on-solid-primary);
+    background-color: var(--cpd-color-bg-action-primary-rest);
+    padding-block: var(--cpd-space-2x);
+    padding-inline: var(--cpd-space-8x);
+    min-block-size: var(--cpd-space-12x);
     text-align: center;
-    border-radius: 4px;
-    display: inline-block;
-    font-size: 14px;
-    color: #ffffff;
-    background-color: #03b381;
-    border: 0;
+    border-radius: 24px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    font: var(--cpd-font-body-lg-semibold);
+    border: none;
+    word-break: keep-all;
+    cursor: pointer;
 }
 
 .icon {
@@ -92,7 +99,7 @@ html {
         background-color: $dark-fg;
         mask-repeat: no-repeat;
         mask-position: center;
-        mask-image: url("$(res)/img/element-icons/call/video-call.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/video-call-solid.svg");
         mask-size: $icon-size;
         display: block;
         width: $icon-size;
diff --git a/src/vector/mobile_guide/assets/app-store-badge.svg b/src/vector/mobile_guide/assets/app-store-badge.svg
new file mode 100755
index 0000000000..072b425a1a
--- /dev/null
+++ b/src/vector/mobile_guide/assets/app-store-badge.svg
@@ -0,0 +1,46 @@
+<svg id="livetype" xmlns="http://www.w3.org/2000/svg" width="119.66407" height="40" viewBox="0 0 119.66407 40">
+  <title>Download_on_the_App_Store_Badge_US-UK_RGB_blk_4SVG_092917</title>
+  <g>
+    <g>
+      <g>
+        <path d="M110.13477,0H9.53468c-.3667,0-.729,0-1.09473.002-.30615.002-.60986.00781-.91895.0127A13.21476,13.21476,0,0,0,5.5171.19141a6.66509,6.66509,0,0,0-1.90088.627A6.43779,6.43779,0,0,0,1.99757,1.99707,6.25844,6.25844,0,0,0,.81935,3.61816a6.60119,6.60119,0,0,0-.625,1.90332,12.993,12.993,0,0,0-.1792,2.002C.00587,7.83008.00489,8.1377,0,8.44434V31.5586c.00489.3105.00587.6113.01515.9219a12.99232,12.99232,0,0,0,.1792,2.0019,6.58756,6.58756,0,0,0,.625,1.9043A6.20778,6.20778,0,0,0,1.99757,38.001a6.27445,6.27445,0,0,0,1.61865,1.1787,6.70082,6.70082,0,0,0,1.90088.6308,13.45514,13.45514,0,0,0,2.0039.1768c.30909.0068.6128.0107.91895.0107C8.80567,40,9.168,40,9.53468,40H110.13477c.3594,0,.7246,0,1.084-.002.3047,0,.6172-.0039.9219-.0107a13.279,13.279,0,0,0,2-.1768,6.80432,6.80432,0,0,0,1.9082-.6308,6.27742,6.27742,0,0,0,1.6172-1.1787,6.39482,6.39482,0,0,0,1.1816-1.6143,6.60413,6.60413,0,0,0,.6191-1.9043,13.50643,13.50643,0,0,0,.1856-2.0019c.0039-.3106.0039-.6114.0039-.9219.0078-.3633.0078-.7246.0078-1.0938V9.53613c0-.36621,0-.72949-.0078-1.09179,0-.30664,0-.61426-.0039-.9209a13.5071,13.5071,0,0,0-.1856-2.002,6.6177,6.6177,0,0,0-.6191-1.90332,6.46619,6.46619,0,0,0-2.7988-2.7998,6.76754,6.76754,0,0,0-1.9082-.627,13.04394,13.04394,0,0,0-2-.17676c-.3047-.00488-.6172-.01074-.9219-.01269-.3594-.002-.7246-.002-1.084-.002Z" style="fill: #a6a6a6"/>
+        <path d="M8.44483,39.125c-.30468,0-.602-.0039-.90429-.0107a12.68714,12.68714,0,0,1-1.86914-.1631,5.88381,5.88381,0,0,1-1.65674-.5479,5.40573,5.40573,0,0,1-1.397-1.0166,5.32082,5.32082,0,0,1-1.02051-1.3965,5.72186,5.72186,0,0,1-.543-1.6572,12.41351,12.41351,0,0,1-.1665-1.875c-.00634-.2109-.01464-.9131-.01464-.9131V8.44434S.88185,7.75293.8877,7.5498a12.37039,12.37039,0,0,1,.16553-1.87207,5.7555,5.7555,0,0,1,.54346-1.6621A5.37349,5.37349,0,0,1,2.61183,2.61768,5.56543,5.56543,0,0,1,4.01417,1.59521a5.82309,5.82309,0,0,1,1.65332-.54394A12.58589,12.58589,0,0,1,7.543.88721L8.44532.875H111.21387l.9131.0127a12.38493,12.38493,0,0,1,1.8584.16259,5.93833,5.93833,0,0,1,1.6709.54785,5.59374,5.59374,0,0,1,2.415,2.41993,5.76267,5.76267,0,0,1,.5352,1.64892,12.995,12.995,0,0,1,.1738,1.88721c.0029.2832.0029.5874.0029.89014.0079.375.0079.73193.0079,1.09179V30.4648c0,.3633,0,.7178-.0079,1.0752,0,.3252,0,.6231-.0039.9297a12.73126,12.73126,0,0,1-.1709,1.8535,5.739,5.739,0,0,1-.54,1.67,5.48029,5.48029,0,0,1-1.0156,1.3857,5.4129,5.4129,0,0,1-1.3994,1.0225,5.86168,5.86168,0,0,1-1.668.5498,12.54218,12.54218,0,0,1-1.8692.1631c-.2929.0068-.5996.0107-.8974.0107l-1.084.002Z"/>
+      </g>
+      <g id="_Group_" data-name="&lt;Group&gt;">
+        <g id="_Group_2" data-name="&lt;Group&gt;">
+          <g id="_Group_3" data-name="&lt;Group&gt;">
+            <path id="_Path_" data-name="&lt;Path&gt;" d="M24.76888,20.30068a4.94881,4.94881,0,0,1,2.35656-4.15206,5.06566,5.06566,0,0,0-3.99116-2.15768c-1.67924-.17626-3.30719,1.00483-4.1629,1.00483-.87227,0-2.18977-.98733-3.6085-.95814a5.31529,5.31529,0,0,0-4.47292,2.72787c-1.934,3.34842-.49141,8.26947,1.3612,10.97608.9269,1.32535,2.01018,2.8058,3.42763,2.7533,1.38706-.05753,1.9051-.88448,3.5794-.88448,1.65876,0,2.14479.88448,3.591.8511,1.48838-.02416,2.42613-1.33124,3.32051-2.66914a10.962,10.962,0,0,0,1.51842-3.09251A4.78205,4.78205,0,0,1,24.76888,20.30068Z" style="fill: #fff"/>
+            <path id="_Path_2" data-name="&lt;Path&gt;" d="M22.03725,12.21089a4.87248,4.87248,0,0,0,1.11452-3.49062,4.95746,4.95746,0,0,0-3.20758,1.65961,4.63634,4.63634,0,0,0-1.14371,3.36139A4.09905,4.09905,0,0,0,22.03725,12.21089Z" style="fill: #fff"/>
+          </g>
+        </g>
+        <g>
+          <path d="M42.30227,27.13965h-4.7334l-1.13672,3.35645H34.42727l4.4834-12.418h2.083l4.4834,12.418H43.438ZM38.0591,25.59082h3.752l-1.84961-5.44727h-.05176Z" style="fill: #fff"/>
+          <path d="M55.15969,25.96973c0,2.81348-1.50586,4.62109-3.77832,4.62109a3.0693,3.0693,0,0,1-2.84863-1.584h-.043v4.48438h-1.8584V21.44238H48.4302v1.50586h.03418a3.21162,3.21162,0,0,1,2.88281-1.60059C53.645,21.34766,55.15969,23.16406,55.15969,25.96973Zm-1.91016,0c0-1.833-.94727-3.03809-2.39258-3.03809-1.41992,0-2.375,1.23047-2.375,3.03809,0,1.82422.95508,3.0459,2.375,3.0459C52.30227,29.01563,53.24953,27.81934,53.24953,25.96973Z" style="fill: #fff"/>
+          <path d="M65.12453,25.96973c0,2.81348-1.50586,4.62109-3.77832,4.62109a3.0693,3.0693,0,0,1-2.84863-1.584h-.043v4.48438h-1.8584V21.44238H58.395v1.50586h.03418A3.21162,3.21162,0,0,1,61.312,21.34766C63.60988,21.34766,65.12453,23.16406,65.12453,25.96973Zm-1.91016,0c0-1.833-.94727-3.03809-2.39258-3.03809-1.41992,0-2.375,1.23047-2.375,3.03809,0,1.82422.95508,3.0459,2.375,3.0459C62.26711,29.01563,63.21438,27.81934,63.21438,25.96973Z" style="fill: #fff"/>
+          <path d="M71.71047,27.03613c.1377,1.23145,1.334,2.04,2.96875,2.04,1.56641,0,2.69336-.80859,2.69336-1.91895,0-.96387-.67969-1.541-2.28906-1.93652l-1.60937-.3877c-2.28027-.55078-3.33887-1.61719-3.33887-3.34766,0-2.14258,1.86719-3.61426,4.51855-3.61426,2.624,0,4.42285,1.47168,4.4834,3.61426h-1.876c-.1123-1.23926-1.13672-1.9873-2.63379-1.9873s-2.52148.75684-2.52148,1.8584c0,.87793.6543,1.39453,2.25488,1.79l1.36816.33594c2.54785.60254,3.60645,1.626,3.60645,3.44238,0,2.32324-1.85059,3.77832-4.79395,3.77832-2.75391,0-4.61328-1.4209-4.7334-3.667Z" style="fill: #fff"/>
+          <path d="M83.34621,19.2998v2.14258h1.72168v1.47168H83.34621v4.99121c0,.77539.34473,1.13672,1.10156,1.13672a5.80752,5.80752,0,0,0,.61133-.043v1.46289a5.10351,5.10351,0,0,1-1.03223.08594c-1.833,0-2.54785-.68848-2.54785-2.44434V22.91406H80.16262V21.44238H81.479V19.2998Z" style="fill: #fff"/>
+          <path d="M86.065,25.96973c0-2.84863,1.67773-4.63867,4.29395-4.63867,2.625,0,4.29492,1.79,4.29492,4.63867,0,2.85645-1.66113,4.63867-4.29492,4.63867C87.72609,30.6084,86.065,28.82617,86.065,25.96973Zm6.69531,0c0-1.9541-.89551-3.10742-2.40137-3.10742s-2.40039,1.16211-2.40039,3.10742c0,1.96191.89453,3.10645,2.40039,3.10645S92.76027,27.93164,92.76027,25.96973Z" style="fill: #fff"/>
+          <path d="M96.18606,21.44238h1.77246v1.541h.043a2.1594,2.1594,0,0,1,2.17773-1.63574,2.86616,2.86616,0,0,1,.63672.06934v1.73828a2.59794,2.59794,0,0,0-.835-.1123,1.87264,1.87264,0,0,0-1.93652,2.083v5.37012h-1.8584Z" style="fill: #fff"/>
+          <path d="M109.3843,27.83691c-.25,1.64355-1.85059,2.77148-3.89844,2.77148-2.63379,0-4.26855-1.76465-4.26855-4.5957,0-2.83984,1.64355-4.68164,4.19043-4.68164,2.50488,0,4.08008,1.7207,4.08008,4.46582v.63672h-6.39453v.1123a2.358,2.358,0,0,0,2.43555,2.56445,2.04834,2.04834,0,0,0,2.09082-1.27344Zm-6.28223-2.70215h4.52637a2.1773,2.1773,0,0,0-2.2207-2.29785A2.292,2.292,0,0,0,103.10207,25.13477Z" style="fill: #fff"/>
+        </g>
+      </g>
+    </g>
+    <g id="_Group_4" data-name="&lt;Group&gt;">
+      <g>
+        <path d="M37.82619,8.731a2.63964,2.63964,0,0,1,2.80762,2.96484c0,1.90625-1.03027,3.002-2.80762,3.002H35.67092V8.731Zm-1.22852,5.123h1.125a1.87588,1.87588,0,0,0,1.96777-2.146,1.881,1.881,0,0,0-1.96777-2.13379h-1.125Z" style="fill: #fff"/>
+        <path d="M41.68068,12.44434a2.13323,2.13323,0,1,1,4.24707,0,2.13358,2.13358,0,1,1-4.24707,0Zm3.333,0c0-.97607-.43848-1.54687-1.208-1.54687-.77246,0-1.207.5708-1.207,1.54688,0,.98389.43457,1.55029,1.207,1.55029C44.57522,13.99463,45.01369,13.42432,45.01369,12.44434Z" style="fill: #fff"/>
+        <path d="M51.57326,14.69775h-.92187l-.93066-3.31641h-.07031l-.92676,3.31641h-.91309l-1.24121-4.50293h.90137l.80664,3.436h.06641l.92578-3.436h.85254l.92578,3.436h.07031l.80273-3.436h.88867Z" style="fill: #fff"/>
+        <path d="M53.85354,10.19482H54.709v.71533h.06641a1.348,1.348,0,0,1,1.34375-.80225,1.46456,1.46456,0,0,1,1.55859,1.6748v2.915h-.88867V12.00586c0-.72363-.31445-1.0835-.97168-1.0835a1.03294,1.03294,0,0,0-1.0752,1.14111v2.63428h-.88867Z" style="fill: #fff"/>
+        <path d="M59.09377,8.437h.88867v6.26074h-.88867Z" style="fill: #fff"/>
+        <path d="M61.21779,12.44434a2.13346,2.13346,0,1,1,4.24756,0,2.1338,2.1338,0,1,1-4.24756,0Zm3.333,0c0-.97607-.43848-1.54687-1.208-1.54687-.77246,0-1.207.5708-1.207,1.54688,0,.98389.43457,1.55029,1.207,1.55029C64.11232,13.99463,64.5508,13.42432,64.5508,12.44434Z" style="fill: #fff"/>
+        <path d="M66.4009,13.42432c0-.81055.60352-1.27783,1.6748-1.34424l1.21973-.07031v-.38867c0-.47559-.31445-.74414-.92187-.74414-.49609,0-.83984.18213-.93848.50049h-.86035c.09082-.77344.81836-1.26953,1.83984-1.26953,1.12891,0,1.76563.562,1.76563,1.51318v3.07666h-.85547v-.63281h-.07031a1.515,1.515,0,0,1-1.35254.707A1.36026,1.36026,0,0,1,66.4009,13.42432Zm2.89453-.38477v-.37646l-1.09961.07031c-.62012.0415-.90137.25244-.90137.64941,0,.40527.35156.64111.835.64111A1.0615,1.0615,0,0,0,69.29543,13.03955Z" style="fill: #fff"/>
+        <path d="M71.34816,12.44434c0-1.42285.73145-2.32422,1.86914-2.32422a1.484,1.484,0,0,1,1.38086.79h.06641V8.437h.88867v6.26074h-.85156v-.71143h-.07031a1.56284,1.56284,0,0,1-1.41406.78564C72.0718,14.772,71.34816,13.87061,71.34816,12.44434Zm.918,0c0,.95508.4502,1.52979,1.20313,1.52979.749,0,1.21191-.583,1.21191-1.52588,0-.93848-.46777-1.52979-1.21191-1.52979C72.72121,10.91846,72.26613,11.49707,72.26613,12.44434Z" style="fill: #fff"/>
+        <path d="M79.23,12.44434a2.13323,2.13323,0,1,1,4.24707,0,2.13358,2.13358,0,1,1-4.24707,0Zm3.333,0c0-.97607-.43848-1.54687-1.208-1.54687-.77246,0-1.207.5708-1.207,1.54688,0,.98389.43457,1.55029,1.207,1.55029C82.12453,13.99463,82.563,13.42432,82.563,12.44434Z" style="fill: #fff"/>
+        <path d="M84.66945,10.19482h.85547v.71533h.06641a1.348,1.348,0,0,1,1.34375-.80225,1.46456,1.46456,0,0,1,1.55859,1.6748v2.915H87.605V12.00586c0-.72363-.31445-1.0835-.97168-1.0835a1.03294,1.03294,0,0,0-1.0752,1.14111v2.63428h-.88867Z" style="fill: #fff"/>
+        <path d="M93.51516,9.07373v1.1416h.97559v.74854h-.97559V13.2793c0,.47168.19434.67822.63672.67822a2.96657,2.96657,0,0,0,.33887-.02051v.74023a2.9155,2.9155,0,0,1-.4834.04541c-.98828,0-1.38184-.34766-1.38184-1.21582v-2.543h-.71484v-.74854h.71484V9.07373Z" style="fill: #fff"/>
+        <path d="M95.70461,8.437h.88086v2.48145h.07031a1.3856,1.3856,0,0,1,1.373-.80664,1.48339,1.48339,0,0,1,1.55078,1.67871v2.90723H98.69v-2.688c0-.71924-.335-1.0835-.96289-1.0835a1.05194,1.05194,0,0,0-1.13379,1.1416v2.62988h-.88867Z" style="fill: #fff"/>
+        <path d="M104.76125,13.48193a1.828,1.828,0,0,1-1.95117,1.30273A2.04531,2.04531,0,0,1,100.73,12.46045a2.07685,2.07685,0,0,1,2.07617-2.35254c1.25293,0,2.00879.856,2.00879,2.27V12.688h-3.17969v.0498a1.1902,1.1902,0,0,0,1.19922,1.29,1.07934,1.07934,0,0,0,1.07129-.5459Zm-3.126-1.45117h2.27441a1.08647,1.08647,0,0,0-1.1084-1.1665A1.15162,1.15162,0,0,0,101.63527,12.03076Z" style="fill: #fff"/>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/src/vector/mobile_guide/assets/bottom-gradient.svg b/src/vector/mobile_guide/assets/bottom-gradient.svg
new file mode 100644
index 0000000000..0740440946
--- /dev/null
+++ b/src/vector/mobile_guide/assets/bottom-gradient.svg
@@ -0,0 +1,53 @@
+<svg width="375" height="178" viewBox="0 0 375 178" fill="none" preserveAspectRatio="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_382_1634)">
+<rect width="375" height="178" fill="white"/>
+<g filter="url(#filter0_f_382_1634)">
+<ellipse cx="187.5" cy="645.488" rx="403.5" ry="612.805" fill="url(#paint0_linear_382_1634)"/>
+</g>
+<g filter="url(#filter1_f_382_1634)">
+<ellipse cx="187.5" cy="650.529" rx="385.3" ry="585.164" fill="#101317"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_f_382_1634" x="-248.683" y="-6.48499e-05" width="872.367" height="1290.98" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="16.3415" result="effect1_foregroundBlur_382_1634"/>
+</filter>
+<filter id="filter1_f_382_1634" x="-230.483" y="32.6826" width="835.966" height="1235.69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="16.3415" result="effect1_foregroundBlur_382_1634"/>
+</filter>
+<linearGradient id="paint0_linear_382_1634" x1="141.636" y1="133.796" x2="141.636" y2="32.6829" gradientUnits="userSpaceOnUse">
+<stop stop-color="#062993"/>
+<stop offset="0.040404" stop-color="#02389D"/>
+<stop offset="0.0808081" stop-color="#0045A6"/>
+<stop offset="0.121212" stop-color="#0051AD"/>
+<stop offset="0.161616" stop-color="#005DB4"/>
+<stop offset="0.20202" stop-color="#0069BA"/>
+<stop offset="0.242424" stop-color="#0075BB"/>
+<stop offset="0.282828" stop-color="#0081BB"/>
+<stop offset="0.323232" stop-color="#008CB9"/>
+<stop offset="0.363636" stop-color="#0098B7"/>
+<stop offset="0.40404" stop-color="#00A3B3"/>
+<stop offset="0.444444" stop-color="#00AEAD"/>
+<stop offset="0.484848" stop-color="#00B8A4"/>
+<stop offset="0.525253" stop-color="#00C2A0"/>
+<stop offset="0.565657" stop-color="#00CC99"/>
+<stop offset="0.606061" stop-color="#3AD396"/>
+<stop offset="0.646465" stop-color="#5DD898"/>
+<stop offset="0.686869" stop-color="#79DD99"/>
+<stop offset="0.727273" stop-color="#92E29B"/>
+<stop offset="0.767677" stop-color="#A8E69F"/>
+<stop offset="0.808081" stop-color="#BBEAA5"/>
+<stop offset="0.848485" stop-color="#CDEEAE"/>
+<stop offset="0.888889" stop-color="#DCF2B9"/>
+<stop offset="0.929293" stop-color="#EAF6C7"/>
+<stop offset="0.969697" stop-color="#F5FBD5"/>
+</linearGradient>
+<clipPath id="clip0_382_1634">
+<rect width="375" height="178" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/vector/mobile_guide/assets/element-logo.svg b/src/vector/mobile_guide/assets/element-logo.svg
new file mode 100644
index 0000000000..d2cb52e498
--- /dev/null
+++ b/src/vector/mobile_guide/assets/element-logo.svg
@@ -0,0 +1,8 @@
+<svg width="149" height="32" viewBox="0 0 149 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.3571 32C25.1936 32 32.3571 24.8366 32.3571 16C32.3571 7.16344 25.1936 0 16.3571 0C7.5205 0 0.357056 7.16344 0.357056 16C0.357056 24.8366 7.5205 32 16.3571 32Z" fill="#0DBD8B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.4318 7.45512C13.4318 6.80928 13.9565 6.28573 14.6037 6.28573C18.9901 6.28573 22.546 9.83425 22.546 14.2116C22.546 14.8574 22.0214 15.381 21.3742 15.381C20.727 15.381 20.2023 14.8574 20.2023 14.2116C20.2023 11.1259 17.6957 8.62452 14.6037 8.62452C13.9565 8.62452 13.4318 8.10096 13.4318 7.45512Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.8996 13.0422C25.5467 13.0422 26.0714 13.5658 26.0714 14.2116C26.0714 18.589 22.5155 22.1375 18.129 22.1375C17.4819 22.1375 16.9572 21.6139 16.9572 20.9681C16.9572 20.3223 17.4819 19.7987 18.129 19.7987C21.2211 19.7987 23.7277 17.2973 23.7277 14.2116C23.7277 13.5658 24.2524 13.0422 24.8996 13.0422Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.3008 24.5448C19.3008 25.1906 18.7762 25.7142 18.129 25.7142C13.7426 25.7142 10.1867 22.1656 10.1867 17.7883C10.1867 17.1425 10.7113 16.6189 11.3585 16.6189C12.0057 16.6189 12.5303 17.1425 12.5303 17.7883C12.5303 20.8739 15.0369 23.3754 18.129 23.3754C18.7762 23.3754 19.3008 23.8989 19.3008 24.5448Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.81455 18.9578C7.16737 18.9578 6.64272 18.4342 6.64272 17.7884C6.64272 13.411 10.1986 9.86251 14.5851 9.86251C15.2323 9.86251 15.7569 10.3861 15.7569 11.0319C15.7569 11.6777 15.2323 12.2013 14.5851 12.2013C11.493 12.2013 8.98638 14.7027 8.98638 17.7884C8.98638 18.4342 8.46173 18.9578 7.81455 18.9578Z" fill="white"/>
+<path d="M56.3571 17.2858H45.0714C45.2048 18.4667 45.6333 19.4096 46.3571 20.1144C47.0809 20.8001 48.0333 21.1429 49.2143 21.1429C49.9952 21.1429 50.7 20.9525 51.3286 20.5715C51.9571 20.1905 52.4048 19.6763 52.6714 19.0286H56.1C55.6429 20.5334 54.7857 21.7525 53.5286 22.6858C52.2905 23.6001 50.8238 24.0572 49.1286 24.0572C46.919 24.0572 45.1286 23.3239 43.7571 21.8572C42.4048 20.3905 41.7286 18.5334 41.7286 16.2858C41.7286 14.0953 42.4143 12.2572 43.7857 10.7715C45.1571 9.28578 46.9286 8.54293 49.1 8.54293C51.2714 8.54293 53.0238 9.27626 54.3571 10.7429C55.7095 12.1905 56.3857 14.0191 56.3857 16.2286L56.3571 17.2858ZM49.1 11.3144C48.0333 11.3144 47.1476 11.6286 46.4429 12.2572C45.7381 12.8858 45.3 13.7239 45.1286 14.7715H53.0143C52.8619 13.7239 52.4429 12.8858 51.7571 12.2572C51.0714 11.6286 50.1857 11.3144 49.1 11.3144ZM58.7254 19.2858V2.28578H62.1254V19.3429C62.1254 20.1048 62.5445 20.4858 63.3826 20.4858L63.9826 20.4572V23.6858C63.6588 23.7429 63.3159 23.7715 62.954 23.7715C61.4873 23.7715 60.4112 23.4001 59.7254 22.6572C59.0588 21.9144 58.7254 20.7905 58.7254 19.2858ZM79.817 17.2858H68.5312C68.6646 18.4667 69.0932 19.4096 69.817 20.1144C70.5408 20.8001 71.4932 21.1429 72.6741 21.1429C73.4551 21.1429 74.1598 20.9525 74.7884 20.5715C75.417 20.1905 75.8646 19.6763 76.1312 19.0286H79.5598C79.1027 20.5334 78.2455 21.7525 76.9884 22.6858C75.7503 23.6001 74.2836 24.0572 72.5884 24.0572C70.3789 24.0572 68.5884 23.3239 67.217 21.8572C65.8646 20.3905 65.1884 18.5334 65.1884 16.2858C65.1884 14.0953 65.8741 12.2572 67.2455 10.7715C68.617 9.28578 70.3884 8.54293 72.5598 8.54293C74.7312 8.54293 76.4836 9.27626 77.817 10.7429C79.1693 12.1905 79.8455 14.0191 79.8455 16.2286L79.817 17.2858ZM72.5598 11.3144C71.4932 11.3144 70.6074 11.6286 69.9027 12.2572C69.1979 12.8858 68.7598 13.7239 68.5884 14.7715H76.4741C76.3217 13.7239 75.9027 12.8858 75.217 12.2572C74.5312 11.6286 73.6455 11.3144 72.5598 11.3144ZM95.1567 15.2001V23.7144H91.7567V14.8286C91.7567 12.581 90.8234 11.4572 88.9567 11.4572C87.9472 11.4572 87.1376 11.781 86.5281 12.4286C85.9376 13.0763 85.6424 13.962 85.6424 15.0858V23.7144H82.2424V8.88578H85.3853V10.8572C85.7472 10.1905 86.2996 9.63816 87.0424 9.20007C87.7853 8.76197 88.7091 8.54293 89.8138 8.54293C91.871 8.54293 93.3567 9.32388 94.271 10.8858C95.5281 9.32388 97.2043 8.54293 99.2996 8.54293C101.033 8.54293 102.366 9.08578 103.3 10.1715C104.233 11.2382 104.7 12.6477 104.7 14.4001V23.7144H101.3V14.8286C101.3 12.581 100.366 11.4572 98.4996 11.4572C97.471 11.4572 96.6519 11.7905 96.0424 12.4572C95.4519 13.1048 95.1567 14.0191 95.1567 15.2001ZM121.608 17.2858H110.323C110.456 18.4667 110.884 19.4096 111.608 20.1144C112.332 20.8001 113.284 21.1429 114.465 21.1429C115.246 21.1429 115.951 20.9525 116.58 20.5715C117.208 20.1905 117.656 19.6763 117.923 19.0286H121.351C120.894 20.5334 120.037 21.7525 118.78 22.6858C117.542 23.6001 116.075 24.0572 114.38 24.0572C112.17 24.0572 110.38 23.3239 109.008 21.8572C107.656 20.3905 106.98 18.5334 106.98 16.2858C106.98 14.0953 107.665 12.2572 109.037 10.7715C110.408 9.28578 112.18 8.54293 114.351 8.54293C116.523 8.54293 118.275 9.27626 119.608 10.7429C120.961 12.1905 121.637 14.0191 121.637 16.2286L121.608 17.2858ZM114.351 11.3144C113.284 11.3144 112.399 11.6286 111.694 12.2572C110.989 12.8858 110.551 13.7239 110.38 14.7715H118.265C118.113 13.7239 117.694 12.8858 117.008 12.2572C116.323 11.6286 115.437 11.3144 114.351 11.3144ZM127.177 8.88578V10.8572C127.519 10.2096 128.081 9.66674 128.862 9.22864C129.662 8.7715 130.624 8.54293 131.748 8.54293C133.5 8.54293 134.853 9.07626 135.805 10.1429C136.777 11.2096 137.262 12.6286 137.262 14.4001V23.7144H133.862V14.8286C133.862 13.781 133.615 12.962 133.119 12.3715C132.643 11.762 131.91 11.4572 130.919 11.4572C129.834 11.4572 128.977 11.781 128.348 12.4286C127.738 13.0763 127.434 13.9715 127.434 15.1144V23.7144H124.034V8.88578H127.177ZM147.192 20.6858V23.6286C146.773 23.7429 146.182 23.8001 145.421 23.8001C142.525 23.8001 141.078 22.3429 141.078 19.4286V11.6001H138.821V8.88578H141.078V5.02864H144.478V8.88578H147.249V11.6001H144.478V19.0858C144.478 20.2477 145.03 20.8286 146.135 20.8286L147.192 20.6858Z" fill="black"/>
+</svg>
diff --git a/src/vector/mobile_guide/assets/google-play-badge.svg b/src/vector/mobile_guide/assets/google-play-badge.svg
new file mode 100644
index 0000000000..fac62d70ed
--- /dev/null
+++ b/src/vector/mobile_guide/assets/google-play-badge.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 135 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-miterlimit:2;">
+    <g transform="matrix(1,0,0,1,0,-1)">
+        <g>
+            <path d="M130,41L4.999,41C2.249,41 0,38.75 0,36L0,6C0,3.25 2.249,1 4.999,1L130,1C132.75,1 135,3.25 135,6L135,36C135,38.75 132.75,41 130,41Z" style="fill:rgb(3,4,4);fill-rule:nonzero;"/>
+            <path d="M130,1L4.999,1C2.249,1 0,3.25 0,6L0,36C0,38.75 2.249,41 4.999,41L130,41C132.75,41 135,38.75 135,36L135,6C135,3.25 132.75,1 130,1ZM130,1.8C132.316,1.8 134.2,3.685 134.2,6L134.2,36C134.2,38.316 132.316,40.201 130,40.201L4.999,40.201C2.684,40.201 0.8,38.316 0.8,36L0.8,6C0.8,3.685 2.684,1.8 4.999,1.8L130,1.8Z" style="fill:rgb(167,165,166);fill-rule:nonzero;"/>
+            <path d="M47.376,10.791L44.468,10.791L44.468,11.512L46.647,11.512C46.588,12.098 46.353,12.559 45.96,12.894C45.566,13.229 45.063,13.397 44.468,13.397C43.814,13.397 43.261,13.171 42.809,12.718C42.365,12.257 42.138,11.688 42.138,11C42.138,10.313 42.365,9.743 42.809,9.282C43.261,8.83 43.814,8.604 44.468,8.604C44.803,8.604 45.122,8.662 45.415,8.788C45.708,8.914 45.943,9.09 46.127,9.316L46.68,8.763C46.429,8.478 46.11,8.26 45.717,8.101C45.323,7.942 44.912,7.866 44.468,7.866C43.596,7.866 42.859,8.168 42.256,8.771C41.652,9.375 41.351,10.12 41.351,11C41.351,11.88 41.652,12.626 42.256,13.229C42.859,13.833 43.596,14.134 44.468,14.134C45.381,14.134 46.11,13.841 46.672,13.246C47.166,12.752 47.418,12.081 47.418,11.243C47.418,11.101 47.401,10.95 47.376,10.791Z" style="fill:white;fill-rule:nonzero;"/>
+            <path d="M48.524,8L48.524,14L52.027,14L52.027,13.263L49.295,13.263L49.295,11.361L51.758,11.361L51.758,10.64L49.295,10.64L49.295,8.738L52.027,8.738L52.027,8L48.524,8Z" style="fill:white;fill-rule:nonzero;"/>
+            <path d="M56.953,8.738L56.953,8L52.83,8L52.83,8.738L54.506,8.738L54.506,14L55.277,14L55.277,8.738L56.953,8.738Z" style="fill:white;fill-rule:nonzero;"/>
+            <rect x="59.937" y="8" width="0.771" height="6" style="fill:white;fill-rule:nonzero;"/>
+            <path d="M65.803,8.738L65.803,8L61.68,8L61.68,8.738L63.356,8.738L63.356,14L64.127,14L64.127,8.738L65.803,8.738Z" style="fill:white;fill-rule:nonzero;"/>
+            <path d="M73.605,8.78C73.01,8.168 72.281,7.866 71.409,7.866C70.538,7.866 69.808,8.168 69.213,8.771C68.618,9.366 68.325,10.112 68.325,11C68.325,11.889 68.618,12.634 69.213,13.229C69.808,13.833 70.538,14.134 71.409,14.134C72.272,14.134 73.01,13.833 73.605,13.229C74.2,12.634 74.493,11.889 74.493,11C74.493,10.12 74.2,9.375 73.605,8.78ZM69.767,9.282C70.211,8.83 70.755,8.604 71.409,8.604C72.063,8.604 72.607,8.83 73.043,9.282C73.487,9.727 73.705,10.305 73.705,11C73.705,11.696 73.487,12.274 73.043,12.718C72.607,13.171 72.063,13.397 71.409,13.397C70.755,13.397 70.211,13.171 69.767,12.718C69.331,12.266 69.113,11.696 69.113,11C69.113,10.305 69.331,9.735 69.767,9.282Z" style="fill:white;fill-rule:nonzero;"/>
+            <path d="M76.345,10.263L76.312,9.106L76.345,9.106L79.396,14L80.2,14L80.2,8L79.429,8L79.429,11.512L79.463,12.668L79.429,12.668L76.513,8L75.575,8L75.575,14L76.345,14L76.345,10.263Z" style="fill:white;fill-rule:nonzero;"/>
+            <path d="M47.376,10.791L44.468,10.791L44.468,11.512L46.647,11.512C46.588,12.098 46.353,12.559 45.96,12.894C45.566,13.229 45.063,13.397 44.468,13.397C43.814,13.397 43.261,13.171 42.809,12.718C42.365,12.257 42.138,11.688 42.138,11C42.138,10.313 42.365,9.743 42.809,9.282C43.261,8.83 43.814,8.604 44.468,8.604C44.803,8.604 45.122,8.662 45.415,8.788C45.708,8.914 45.943,9.09 46.127,9.316L46.68,8.763C46.429,8.478 46.11,8.26 45.717,8.101C45.323,7.942 44.912,7.866 44.468,7.866C43.596,7.866 42.859,8.168 42.256,8.771C41.652,9.375 41.351,10.12 41.351,11C41.351,11.88 41.652,12.626 42.256,13.229C42.859,13.833 43.596,14.134 44.468,14.134C45.381,14.134 46.11,13.841 46.672,13.246C47.166,12.752 47.418,12.081 47.418,11.243C47.418,11.101 47.401,10.95 47.376,10.791ZM48.524,8L48.524,14L52.027,14L52.027,13.263L49.295,13.263L49.295,11.361L51.758,11.361L51.758,10.64L49.295,10.64L49.295,8.738L52.027,8.738L52.027,8L48.524,8ZM56.953,8.738L56.953,8L52.831,8L52.831,8.738L54.507,8.738L54.507,14L55.277,14L55.277,8.738L56.953,8.738ZM60.708,8L59.937,8L59.937,14L60.708,14L60.708,8ZM65.803,8.738L65.803,8L61.68,8L61.68,8.738L63.356,8.738L63.356,14L64.127,14L64.127,8.738L65.803,8.738ZM73.605,8.78C73.01,8.168 72.281,7.866 71.409,7.866C70.537,7.866 69.808,8.168 69.213,8.771C68.618,9.366 68.325,10.112 68.325,11C68.325,11.889 68.618,12.634 69.213,13.229C69.808,13.833 70.537,14.134 71.409,14.134C72.272,14.134 73.01,13.833 73.605,13.229C74.2,12.634 74.493,11.889 74.493,11C74.493,10.12 74.2,9.375 73.605,8.78ZM69.767,9.282C70.211,8.83 70.755,8.604 71.409,8.604C72.063,8.604 72.607,8.83 73.043,9.282C73.487,9.727 73.705,10.305 73.705,11C73.705,11.696 73.487,12.274 73.043,12.718C72.607,13.171 72.063,13.397 71.409,13.397C70.755,13.397 70.211,13.171 69.767,12.718C69.331,12.266 69.113,11.696 69.113,11C69.113,10.305 69.331,9.735 69.767,9.282ZM76.346,10.263L76.312,9.106L76.346,9.106L79.396,14L80.2,14L80.2,8L79.429,8L79.429,11.512L79.463,12.668L79.429,12.668L76.513,8L75.575,8L75.575,14L76.346,14L76.346,10.263Z" style="fill:none;stroke:white;stroke-width:0.2px;"/>
+            <path d="M106.936,31.001L108.802,31.001L108.802,18.499L106.936,18.499L106.936,31.001ZM123.743,23.002L121.604,28.422L121.54,28.422L119.32,23.002L117.31,23.002L120.64,30.578L118.741,34.791L120.687,34.791L125.818,23.002L123.743,23.002ZM113.16,29.581C112.55,29.581 111.697,29.275 111.697,28.519C111.697,27.554 112.759,27.184 113.675,27.184C114.495,27.184 114.882,27.361 115.38,27.602C115.235,28.76 114.238,29.581 113.16,29.581ZM113.386,22.729C112.035,22.729 110.636,23.324 110.057,24.643L111.713,25.334C112.067,24.643 112.726,24.418 113.418,24.418C114.383,24.418 115.364,24.997 115.38,26.026L115.38,26.155C115.042,25.962 114.318,25.672 113.434,25.672C111.648,25.672 109.831,26.653 109.831,28.487C109.831,30.16 111.295,31.237 112.935,31.237C114.189,31.237 114.882,30.674 115.315,30.015L115.38,30.015L115.38,30.98L117.182,30.98L117.182,26.187C117.182,23.967 115.524,22.729 113.386,22.729ZM101.854,24.524L99.2,24.524L99.2,20.239L101.854,20.239C103.249,20.239 104.041,21.394 104.041,22.382C104.041,23.351 103.249,24.524 101.854,24.524ZM101.806,18.499L97.334,18.499L97.334,31.001L99.2,31.001L99.2,26.264L101.806,26.264C103.874,26.264 105.907,24.767 105.907,22.382C105.907,19.997 103.874,18.499 101.806,18.499ZM77.424,29.583C76.135,29.583 75.056,28.503 75.056,27.022C75.056,25.523 76.135,24.428 77.424,24.428C78.697,24.428 79.696,25.523 79.696,27.022C79.696,28.503 78.697,29.583 77.424,29.583ZM79.567,23.703L79.502,23.703C79.083,23.203 78.278,22.752 77.263,22.752C75.136,22.752 73.187,24.621 73.187,27.022C73.187,29.406 75.136,31.258 77.263,31.258C78.278,31.258 79.083,30.807 79.502,30.292L79.567,30.292L79.567,30.904C79.567,32.531 78.697,33.401 77.295,33.401C76.152,33.401 75.443,32.58 75.153,31.887L73.526,32.563C73.993,33.691 75.233,35.077 77.295,35.077C79.487,35.077 81.339,33.788 81.339,30.646L81.339,23.01L79.567,23.01L79.567,23.703ZM82.628,31.001L84.497,31.001L84.497,18.499L82.628,18.499L82.628,31.001ZM87.251,26.876C87.204,25.233 88.525,24.396 89.475,24.396C90.216,24.396 90.844,24.766 91.054,25.297L87.251,26.876ZM93.051,25.459C92.697,24.508 91.618,22.752 89.411,22.752C87.219,22.752 85.399,24.476 85.399,27.005C85.399,29.39 87.204,31.258 89.62,31.258C91.569,31.258 92.697,30.066 93.165,29.374L91.714,28.407C91.231,29.116 90.571,29.583 89.62,29.583C88.669,29.583 87.993,29.148 87.558,28.294L93.245,25.942L93.051,25.459ZM47.743,24.057L47.743,25.861L52.061,25.861C51.932,26.876 51.594,27.617 51.078,28.133C50.45,28.761 49.467,29.454 47.743,29.454C45.085,29.454 43.007,27.312 43.007,24.653C43.007,21.995 45.085,19.852 47.743,19.852C49.177,19.852 50.224,20.416 50.998,21.141L52.27,19.868C51.191,18.837 49.757,18.048 47.743,18.048C44.102,18.048 41.041,21.012 41.041,24.653C41.041,28.294 44.102,31.258 47.743,31.258C49.708,31.258 51.191,30.614 52.351,29.406C53.543,28.213 53.914,26.538 53.914,25.185C53.914,24.766 53.881,24.379 53.817,24.057L47.743,24.057ZM58.822,29.583C57.533,29.583 56.421,28.52 56.421,27.005C56.421,25.475 57.533,24.428 58.822,24.428C60.111,24.428 61.223,25.475 61.223,27.005C61.223,28.52 60.111,29.583 58.822,29.583ZM58.822,22.752C56.47,22.752 54.553,24.541 54.553,27.005C54.553,29.454 56.47,31.258 58.822,31.258C61.174,31.258 63.091,29.454 63.091,27.005C63.091,24.541 61.174,22.752 58.822,22.752ZM68.135,29.583C66.847,29.583 65.735,28.52 65.735,27.005C65.735,25.475 66.847,24.428 68.135,24.428C69.424,24.428 70.536,25.475 70.536,27.005C70.536,28.52 69.424,29.583 68.135,29.583ZM68.135,22.752C65.783,22.752 63.866,24.541 63.866,27.005C63.866,29.454 65.783,31.258 68.135,31.258C70.488,31.258 72.405,29.454 72.405,27.005C72.405,24.541 70.488,22.752 68.135,22.752Z" style="fill:white;fill-rule:nonzero;"/>
+            <path d="M20.717,20.425L10.07,31.725C10.071,31.727 10.071,31.729 10.072,31.731C10.398,32.959 11.519,33.862 12.849,33.862C13.381,33.862 13.88,33.718 14.308,33.466L14.342,33.446L26.326,26.531L20.717,20.425Z" style="fill:rgb(235,67,53);fill-rule:nonzero;"/>
+            <path d="M31.488,18.501L31.478,18.494L26.304,15.494L20.475,20.681L26.324,26.529L31.471,23.56C32.373,23.073 32.985,22.122 32.985,21.025C32.985,19.936 32.381,18.989 31.488,18.501Z" style="fill:rgb(250,188,19);fill-rule:nonzero;"/>
+            <path d="M10.07,10.278C10.006,10.514 9.972,10.761 9.972,11.018L9.972,30.985C9.972,31.242 10.005,31.49 10.07,31.725L21.083,20.714L10.07,10.278Z" style="fill:rgb(84,125,191);fill-rule:nonzero;"/>
+            <path d="M20.795,21.001L26.306,15.492L14.335,8.552C13.9,8.291 13.393,8.141 12.849,8.141C11.519,8.141 10.397,9.046 10.07,10.275L10.07,10.278L20.795,21.001Z" style="fill:rgb(48,168,81);fill-rule:nonzero;"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/vector/mobile_guide/index.css b/src/vector/mobile_guide/index.css
new file mode 100644
index 0000000000..cb51c3fb24
--- /dev/null
+++ b/src/vector/mobile_guide/index.css
@@ -0,0 +1,183 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+@import url("@vector-im/compound-design-tokens/assets/web/css/compound-design-tokens.css");
+
+html {
+    min-height: 100%;
+    position: relative;
+}
+
+body {
+    background: var(--cpd-color-bg-canvas-default);
+    max-width: 680px;
+    margin: var(--cpd-space-0x) auto;
+    padding-bottom: 178px; /* Match the height of mx_BottomGradient */
+    font-family: var(--cpd-font-family-sans);
+    font-size: var(--cpd-font-size-body-lg); /* Design says 16px, this is 17px */
+    color: var(--cpd-color-text-primary);
+}
+
+hr {
+    border: none;
+    height: var(--cpd-border-width-1);
+    background-color: var(
+        --cpd-color-bg-subtle-primary /* Design uses Border token from "Compound Marketing" set, but this matches. */
+    );
+    color: var(
+        --cpd-color-bg-subtle-primary /* Design uses Border token from "Compound Marketing" set, but this matches. */
+    );
+    margin: 0;
+}
+
+p {
+    margin: var(--cpd-space-1x) var(--cpd-space-0x);
+    padding: var(--cpd-space-0x);
+}
+
+.mx_Button {
+    border: 0;
+    border-radius: 100px;
+    min-width: 80px;
+    background-color: var(--cpd-color-bg-action-primary-rest);
+    color: var(--cpd-color-text-on-solid-primary);
+    cursor: pointer;
+    padding: 12px 22px;
+    word-break: break-word;
+    text-decoration: none;
+}
+
+#deep_link_button {
+    margin-top: 12px;
+    display: inline-block;
+    width: auto;
+    box-sizing: border-box;
+}
+
+.mx_StoreLinks {
+    margin: 15px 0 12px 0;
+}
+
+.mx_StoreBadge {
+    text-decoration: none !important;
+    margin: 16px 16px 16px 0px;
+}
+
+#f_droid_link {
+    color: var(--cpd-color-text-action-accent);
+    font-weight: bold;
+    text-decoration: none;
+}
+
+#f_droid_link:visited {
+    color: var(--cpd-color-text-action-accent);
+}
+
+.mx_HomePage_header {
+    color: var(--cpd-color-text-secondary);
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    padding-top: 48px;
+    padding-bottom: 48px;
+}
+
+.mx_HomePage_header #header_title {
+    margin-top: 8px;
+    margin-bottom: 0px;
+}
+
+.mx_HomePage h3 {
+    margin-top: 30px;
+}
+
+.mx_HomePage_col {
+    display: flex;
+    flex-direction: row;
+}
+
+.mx_HomePage_row {
+    flex: 1 1 0;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-items: flex-start;
+}
+
+.mx_HomePage_container {
+    margin: 10px 20px;
+}
+
+.mx_HomePage_errorContainer {
+    display: none; /* shown in JS if needed */
+    margin: 20px;
+    border: var(--cpd-border-width-1) solid var(--cpd-color-border-critical-primary);
+    background-color: var(--cpd-color-bg-critical-subtle);
+    padding: 5px;
+}
+
+.mx_HomePage_container h1,
+.mx_HomePage_container h2,
+.mx_HomePage_container h3,
+.mx_HomePage_container h4 {
+    font-weight: var(--cpd-font-weight-semibold);
+    font-size: var(--cpd-font-size-body-lg); /* Design says 16px, this is 17px */
+    margin-bottom: 8px;
+    margin-top: 4px;
+}
+
+.mx_Spacer {
+    margin-top: 48px;
+}
+
+.mx_DesktopLink {
+    color: var(--cpd-color-text-action-accent);
+    font-weight: var(--cpd-font-weight-semibold);
+    text-decoration: none;
+}
+
+/*
+ * The bottom gradient is a full-width background image that stretches horizontally across the page.
+ * It is positioned pinned to the bottom of the viewport unless the content is taller than the viewport,
+ * in which case it will be pinned to the bottom of the content.
+ */
+.mx_BottomGradient {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    width: 100vw;
+    height: 178px; /* Match the height of assets/bottom-gradient.svg so the gradient only stretches horizontally */
+    background-image: url("./assets/bottom-gradient.svg");
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    z-index: -1;
+    margin-left: calc(50% - 50vw); /* Center the gradient regardless of body width */
+}
+
+.mx_HomePage_step_number {
+    display: flex;
+    align-items: flex-start;
+    margin-right: 8px;
+}
+
+.mx_HomePage_step_number span {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: var(--cpd-space-6x);
+    height: var(--cpd-space-6x);
+    border-radius: 50%;
+    border: var(--cpd-border-width-1) solid var(--cpd-color-bg-subtle-primary); /* Not a border token, but matches the Design (Border token from the "Compound Marketing" set). */
+    background-color: transparent;
+    color: var(--cpd-color-text-secondary);
+    font-size: var(--cpd-font-size-body-md); /* Design says 14px, this is 15px */
+}
+
+#step2_description {
+    color: var(--cpd-color-text-secondary);
+}
diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html
index d58842d6a6..3bd8a8e20d 100644
--- a/src/vector/mobile_guide/index.html
+++ b/src/vector/mobile_guide/index.html
@@ -1,141 +1,13 @@
 <!doctype html>
+<!--
+    Please note: This page is similar to the one at mobile.element.io so any changes made here can potentially
+    be applied to that site as well. They still share the mobile-apps.ts file for updating the app metadata.
+-->
 <html lang="en">
     <head>
         <title>Element Mobile Guide</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="apple-itunes-app" content="app-id=id1083446067" />
-
-        <style type="text/css">
-            /* By default, hide the custom IS stuff - enabled in JS */
-            #custom_is,
-            #is_url {
-                display: none;
-            }
-
-            body {
-                background: #f9fafb;
-                max-width: 680px;
-                margin: auto;
-                font-family:
-                    -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif,
-                    "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-            }
-
-            .mx_Button {
-                border: 0;
-                border-radius: 4px;
-                font-size: 18px;
-                margin-left: 4px;
-                margin-right: 4px;
-                min-width: 80px;
-                background-color: #03b381;
-                color: #fff;
-                cursor: pointer;
-                padding: 12px 22px;
-                word-break: break-word;
-                text-decoration: none;
-            }
-
-            .mx_Center {
-                justify-content: center;
-            }
-
-            .mx_ClearDecoration {
-                text-decoration: none !important;
-            }
-
-            .mx_HomePage_header {
-                color: #2e2f32;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-            }
-
-            .mx_HomePage h3 {
-                margin-top: 30px;
-            }
-
-            .mx_HomePage_col {
-                display: flex;
-                flex-direction: row;
-            }
-
-            .mx_HomePage_row {
-                flex: 1 1 0;
-                display: flex;
-                flex-direction: row;
-                flex-wrap: wrap;
-            }
-
-            .mx_HomePage_logo {
-                margin-right: 20px;
-            }
-
-            .mx_HomePage_container {
-                display: block !important;
-                margin: 10px 20px;
-            }
-
-            .mx_HomePage_errorContainer {
-                display: none; /* shown in JS if needed */
-                margin: 20px;
-                border: 1px solid red;
-                background-color: #ffb9b9;
-                padding: 5px;
-            }
-
-            .mx_HomePage_container h1,
-            .mx_HomePage_container h2,
-            .mx_HomePage_container h3,
-            .mx_HomePage_container h4 {
-                font-weight: 600;
-                margin-bottom: 32px;
-            }
-
-            .mx_Spacer {
-                margin-top: 24px;
-            }
-
-            .mx_FooterLink {
-                color: #0dbd8b;
-                text-decoration: none;
-            }
-
-            .mx_Subtext {
-                font-size: 14px;
-            }
-
-            .mx_SubtextTop {
-                margin-top: 32px;
-            }
-
-            @media screen and (max-width: 1120px) {
-                body {
-                    font-size: 20px;
-                }
-
-                h1 {
-                    font-size: 20px;
-                }
-
-                h4 {
-                    font-size: 16px;
-                }
-
-                .mx_Button {
-                    font-size: 18px;
-                    padding: 14px 28px;
-                }
-
-                .mx_HomePage_header {
-                    justify-content: left;
-                }
-
-                .mx_Spacer {
-                    margin-top: 24px;
-                }
-            }
-        </style>
+        <meta name="apple-itunes-app" content="app-id=id1631335820" />
     </head>
 
     <body>
@@ -144,648 +16,90 @@
         </div>
 
         <div class="mx_HomePage_container">
-            <div class="mx_HomePage_header">
-                <span class="mx_HomePage_logo">
-                    <svg width="34" height="42" viewBox="0 0 34 42" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <path
-                            fill-rule="evenodd"
-                            clip-rule="evenodd"
-                            d="M13.08 8.68C13.08 7.75216 13.8321 7 14.76 7C20.9456 7 25.96 12.0144 25.96 18.2C25.96 19.1278 25.2078 19.88 24.28 19.88C23.3521 19.88 22.6 19.1278 22.6 18.2C22.6 13.8701 19.0899 10.36 14.76 10.36C13.8321 10.36 13.08 9.60784 13.08 8.68Z"
-                            fill="#0DBD8B"
-                        />
-                        <path
-                            fill-rule="evenodd"
-                            clip-rule="evenodd"
-                            d="M20.92 33.32C20.92 34.2478 20.1679 35 19.24 35C13.0544 35 8.04001 29.9856 8.04001 23.8C8.04001 22.8722 8.79217 22.12 9.72001 22.12C10.6478 22.12 11.4 22.8722 11.4 23.8C11.4 28.1299 14.9101 31.64 19.24 31.64C20.1679 31.64 20.92 32.3922 20.92 33.32Z"
-                            fill="#0DBD8B"
-                        />
-                        <path
-                            fill-rule="evenodd"
-                            clip-rule="evenodd"
-                            d="M4.68 24.9199C3.75216 24.9199 3 24.1678 3 23.2399C3 17.0543 8.01441 12.0399 14.2 12.0399C15.1278 12.0399 15.88 12.7921 15.88 13.7199C15.88 14.6478 15.1278 15.3999 14.2 15.3999C9.87009 15.3999 6.36 18.91 6.36 23.2399C6.36 24.1678 5.60784 24.9199 4.68 24.9199Z"
-                            fill="#0DBD8B"
-                        />
-                        <path
-                            fill-rule="evenodd"
-                            clip-rule="evenodd"
-                            d="M29.32 17.0801C30.2478 17.0801 31 17.8322 31 18.7601C31 24.9457 25.9856 29.9601 19.8 29.9601C18.8722 29.9601 18.12 29.2079 18.12 28.2801C18.12 27.3522 18.8722 26.6001 19.8 26.6001C24.1299 26.6001 27.64 23.09 27.64 18.7601C27.64 17.8322 28.3922 17.0801 29.32 17.0801Z"
-                            fill="#0DBD8B"
-                        />
-                    </svg>
-                </span>
-                <p>Set up Element on iOS or Android</p>
-            </div>
-            <div class="mx_HomePage_col">
-                <div class="mx_HomePage_row">
+            <header>
+                <div class="mx_HomePage_header">
                     <div>
-                        <h2 id="step1_heading">Install the app</h2>
-                        <p><strong>iOS</strong> (iPhone or iPad)</p>
-                        <a
-                            href="https://apps.apple.com/app/vector/id1083446067"
-                            target="_blank"
-                            class="mx_ClearDecoration"
-                        >
-                            <svg
-                                width="144px"
-                                height="48px"
-                                viewBox="0 0 120 40"
-                                version="1.1"
-                                xmlns="http://www.w3.org/2000/svg"
-                                xmlns:xlink="http://www.w3.org/1999/xlink"
-                            >
-                                <desc>Download on the App Store.</desc>
-                                <defs></defs>
-                                <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-                                    <g id="App-Store-badge" fill-rule="nonzero">
-                                        <g id="Group">
-                                            <g id="Shape">
-                                                <path
-                                                    d="M110.13477,0 L9.53468,0 C9.16798,0 8.80568,0 8.43995,0.002 C8.1338,0.004 7.83009,0.00981 7.521,0.0147 C6.84951368,0.0226018036 6.17960647,0.0816762599 5.5171,0.19141 C4.85552408,0.303532628 4.21467252,0.51491574 3.61622,0.81841 C3.01849941,1.12447171 2.47234502,1.52216753 1.99757,1.99707 C1.5203025,2.47063699 1.12246318,3.01801638 0.81935,3.61816 C0.515400242,4.21710912 0.304640498,4.8589383 0.19435,5.52148 C0.0830109412,6.18318491 0.0230983806,6.85252054 0.01515,7.52348 C0.00587,7.83008 0.00489,8.1377 0,8.44434 L0,31.5586 C0.00489,31.8691 0.00587,32.1699 0.01515,32.4805 C0.023100818,33.1514262 0.0830133796,33.8207284 0.19435,34.4824 C0.304335953,35.145329 0.515108158,35.7875266 0.81935,36.3867 C1.12232555,36.9849029 1.52022081,37.5300662 1.99757,38.001 C2.47054482,38.478014 3.01705224,38.8759804 3.61622,39.1797 C4.21466797,39.4840065 4.85545044,39.6966478 5.5171,39.8105 C6.1797191,39.9193547 6.84955741,39.9784532 7.521,39.9873 C7.83009,39.9941 8.1338,39.998 8.43995,39.998 C8.80567,40 9.168,40 9.53468,40 L110.13477,40 C110.49417,40 110.85937,40 111.21877,39.998 C111.52347,39.998 111.83597,39.9941 112.14067,39.9873 C112.810843,39.9789237 113.47942,39.9198215 114.14067,39.8105 C114.804454,39.6958464 115.447534,39.4832614 116.04887,39.1797 C116.647497,38.8758046 117.1935,38.4778491 117.66607,38.001 C118.142188,37.5282218 118.540932,36.9834573 118.84767,36.3867 C119.149629,35.7870908 119.358395,35.1449445 119.46677,34.4824 C119.578285,33.8206376 119.640323,33.1514843 119.65237,32.4805 C119.65627,32.1699 119.65627,31.8691 119.65627,31.5586 C119.66407,31.1953 119.66407,30.834 119.66407,30.4648 L119.66407,9.53613 C119.66407,9.16992 119.66407,8.80664 119.65627,8.44434 C119.65627,8.1377 119.65627,7.83008 119.65237,7.52344 C119.640326,6.85242244 119.578287,6.18323567 119.46677,5.52144 C119.358093,4.8592816 119.149339,4.21750328 118.84767,3.61812 C118.230394,2.41519608 117.251573,1.4360254 116.04887,0.81832 C115.447532,0.51556738 114.804383,0.30424041 114.14067,0.19132 C113.479535,0.0811027831 112.810888,0.0220077649 112.14067,0.01456 C111.83597,0.00968 111.52347,0.00382 111.21877,0.00187 C110.85937,-0.00013 110.49417,-0.00013 110.13477,-0.00013 L110.13477,0 Z"
-                                                    fill="#A6A6A6"
-                                                ></path>
-                                                <path
-                                                    d="M8.44483,39.125 C8.14015,39.125 7.84283,39.1211 7.54054,39.1143 C6.91432177,39.1061407 6.28956717,39.051625 5.6714,38.9512 C5.0949903,38.8519282 4.53660424,38.6672645 4.01466,38.4033 C3.4975017,38.1415227 3.02581177,37.7982729 2.61766,37.3867 C2.20360033,36.9799753 1.85887673,36.508244 1.59715,35.9902 C1.33253926,35.4687891 1.14941288,34.9098996 1.05415,34.333 C0.951274358,33.7131149 0.895614374,33.0863132 0.88765,32.458 C0.88131,32.2471 0.87301,31.5449 0.87301,31.5449 L0.87301,8.44434 C0.87301,8.44434 0.88185,7.75293 0.8877,7.5498 C0.895325827,6.92248205 0.950662148,6.2966531 1.05323,5.67773 C1.14866872,5.09925008 1.33193687,4.53874887 1.59669,4.01563 C1.85745482,3.49794385 2.20026458,3.02586029 2.61183,2.61768 C3.02293283,2.20562142 3.49613161,1.86060412 4.01417,1.59521 C4.53491467,1.3320936 5.09224545,1.14873255 5.66749,1.05127 C6.28768733,0.949836139 6.91461084,0.894996084 7.543,0.88721 L8.44532,0.875 L111.21387,0.875 L112.12697,0.8877 C112.749643,0.895099198 113.370872,0.949450006 113.98537,1.05029 C114.566438,1.14897507 115.129577,1.33361553 115.65627,1.59814 C116.694088,2.13298605 117.538542,2.97916295 118.07127,4.01807 C118.331797,4.53757756 118.512239,5.09350676 118.60647,5.66699 C118.710259,6.29099138 118.768347,6.92173834 118.78027,7.5542 C118.78317,7.8374 118.78317,8.1416 118.78317,8.44434 C118.79107,8.81934 118.79107,9.17627 118.79107,9.53613 L118.79107,30.4648 C118.79107,30.8281 118.79107,31.1826 118.78317,31.54 C118.78317,31.8652 118.78317,32.1631 118.77927,32.4697 C118.767605,33.0908757 118.710486,33.7103642 118.60837,34.3232 C118.51506,34.9042612 118.33293,35.4675131 118.06837,35.9932 C117.804793,36.5056211 117.462049,36.9732662 117.05277,37.3789 C116.644251,37.7926846 116.171729,38.1379427 115.65337,38.4014 C115.128136,38.6673937 114.565826,38.8527403 113.98537,38.9512 C113.36725,39.052161 112.742435,39.1066802 112.11617,39.1143 C111.82327,39.1211 111.51657,39.125 111.21877,39.125 L110.13477,39.127 L8.44483,39.125 Z"
-                                                    fill="#000000"
-                                                ></path>
-                                            </g>
-                                            <g id="_Group_" transform="translate(9.000000, 8.000000)" fill="#FFFFFF">
-                                                <g id="_Group_2">
-                                                    <g id="_Group_3">
-                                                        <path
-                                                            d="M15.76888,12.30068 C15.790737,10.6042091 16.6801229,9.03718611 18.12544,8.14862 C17.2095126,6.84051277 15.730392,6.04087835 14.13428,5.99094 C12.45504,5.81468 10.82709,6.99577 9.97138,6.99577 C9.09911,6.99577 7.78161,6.00844 6.36288,6.03763 C4.49620126,6.09793842 2.79813717,7.13352548 1.88996,8.7655 C-0.04404,12.11392 1.39855,17.03497 3.25116,19.74158 C4.17806,21.06693 5.26134,22.54738 6.67879,22.49488 C8.06585,22.43735 8.58389,21.6104 10.25819,21.6104 C11.91695,21.6104 12.40298,22.49488 13.84919,22.4615 C15.33757,22.43734 16.27532,21.13026 17.1697,19.79236 C17.8356761,18.8479997 18.3481437,17.8042759 18.68812,16.69985 C16.9203766,15.9521813 15.7709432,14.2200343 15.76888,12.30068 Z"
-                                                            id="_Path_"
-                                                        ></path>
-                                                        <path
-                                                            d="M13.03725,4.21089 C13.8487766,3.23668191 14.248585,1.98450245 14.15177,0.72027 C12.9119378,0.850490487 11.7666802,1.44304968 10.94419,2.37988 C10.1320187,3.30418903 9.72057463,4.51343268 9.80048,5.74127 C11.0569368,5.75420677 12.2499161,5.19015322 13.03725,4.21089 Z"
-                                                            id="_Path_2"
-                                                        ></path>
-                                                    </g>
-                                                </g>
-                                                <g id="Group" transform="translate(25.000000, 9.000000)">
-                                                    <path
-                                                        d="M8.30227,10.13965 L3.56887,10.13965 L2.43215,13.4961 L0.42727,13.4961 L4.91067,1.0781 L6.99367,1.0781 L11.47707,13.4961 L9.438,13.4961 L8.30227,10.13965 Z M4.0591,8.59082 L7.8111,8.59082 L5.96149,3.14355 L5.90973,3.14355 L4.0591,8.59082 Z"
-                                                        id="Shape"
-                                                    ></path>
-                                                    <path
-                                                        d="M21.15969,8.96973 C21.15969,11.78321 19.65383,13.59082 17.38137,13.59082 C16.2067553,13.6522646 15.1003324,13.0370307 14.53274,12.00682 L14.48974,12.00682 L14.48974,16.4912 L12.63134,16.4912 L12.63134,4.44238 L14.4302,4.44238 L14.4302,5.94824 L14.46438,5.94824 C15.0571883,4.92448792 16.1648043,4.30951884 17.34719,4.34765 C19.645,4.34766 21.15969,6.16406 21.15969,8.96973 Z M19.24953,8.96973 C19.24953,7.13673 18.30226,5.93164 16.85695,5.93164 C15.43703,5.93164 14.48195,7.16211 14.48195,8.96973 C14.48195,10.79395 15.43703,12.01563 16.85695,12.01563 C18.30227,12.01563 19.24953,10.81934 19.24953,8.96973 Z"
-                                                        id="Shape"
-                                                    ></path>
-                                                    <path
-                                                        d="M31.12453,8.96973 C31.12453,11.78321 29.61867,13.59082 27.34621,13.59082 C26.1715953,13.6522646 25.0651724,13.0370307 24.49758,12.00682 L24.45458,12.00682 L24.45458,16.4912 L22.59618,16.4912 L22.59618,4.44238 L24.395,4.44238 L24.395,5.94824 L24.42918,5.94824 C25.0219926,4.92448854 26.1296128,4.30952307 27.312,4.34766 C29.60988,4.34766 31.12453,6.16406 31.12453,8.96973 Z M29.21437,8.96973 C29.21437,7.13673 28.2671,5.93164 26.82179,5.93164 C25.40187,5.93164 24.44679,7.16211 24.44679,8.96973 C24.44679,10.79395 25.40187,12.01563 26.82179,12.01563 C28.26711,12.01563 29.21438,10.81934 29.21438,8.96973 L29.21437,8.96973 Z"
-                                                        id="Shape"
-                                                    ></path>
-                                                    <path
-                                                        d="M37.71047,10.03613 C37.84817,11.26758 39.04447,12.07613 40.67922,12.07613 C42.24563,12.07613 43.37258,11.26754 43.37258,10.15718 C43.37258,9.19331 42.69289,8.61618 41.08352,8.22066 L39.47415,7.83296 C37.19388,7.28218 36.13528,6.21577 36.13528,4.4853 C36.13528,2.34272 38.00247,0.87104 40.65383,0.87104 C43.27783,0.87104 45.07668,2.34272 45.13723,4.4853 L43.26123,4.4853 C43.14893,3.24604 42.12451,2.498 40.62744,2.498 C39.13037,2.498 38.10596,3.25484 38.10596,4.3564 C38.10596,5.23433 38.76026,5.75093 40.36084,6.1464 L41.729,6.48234 C44.27685,7.08488 45.33545,8.10834 45.33545,9.92472 C45.33545,12.24796 43.48486,13.70304 40.5415,13.70304 C37.78759,13.70304 35.92822,12.28214 35.8081,10.03604 L37.71047,10.03613 Z"
-                                                        id="Shape"
-                                                    ></path>
-                                                    <path
-                                                        d="M49.34621,2.2998 L49.34621,4.44238 L51.06789,4.44238 L51.06789,5.91406 L49.34621,5.91406 L49.34621,10.90527 C49.34621,11.68066 49.69094,12.04199 50.44777,12.04199 C50.6521614,12.0384259 50.8562221,12.0240726 51.0591,11.99899 L51.0591,13.46188 C50.7188283,13.5254596 50.3729708,13.5542545 50.02687,13.54782 C48.19387,13.54782 47.47902,12.85934 47.47902,11.10348 L47.47902,5.91406 L46.16262,5.91406 L46.16262,4.44238 L47.479,4.44238 L47.479,2.2998 L49.34621,2.2998 Z"
-                                                        id="Shape"
-                                                    ></path>
-                                                    <path
-                                                        d="M52.065,8.96973 C52.065,6.1211 53.74273,4.33106 56.35895,4.33106 C58.98395,4.33106 60.65387,6.12106 60.65387,8.96973 C60.65387,11.82618 58.99274,13.6084 56.35895,13.6084 C53.72609,13.6084 52.065,11.82617 52.065,8.96973 Z M58.76031,8.96973 C58.76031,7.01563 57.8648,5.86231 56.35894,5.86231 C54.85308,5.86231 53.95855,7.02442 53.95855,8.96973 C53.95855,10.93164 54.85308,12.07618 56.35894,12.07618 C57.8648,12.07618 58.76027,10.93164 58.76027,8.96973 L58.76031,8.96973 Z"
-                                                        id="Shape"
-                                                    ></path>
-                                                    <path
-                                                        d="M62.18606,4.44238 L63.95852,4.44238 L63.95852,5.98338 L64.00152,5.98338 C64.248696,4.99136841 65.1576526,4.30863156 66.17925,4.34764 C66.393414,4.34689223 66.6069872,4.37015075 66.81597,4.41698 L66.81597,6.15526 C66.545601,6.07264332 66.2635596,6.03471129 65.98097,6.04296 C65.4346182,6.02079544 64.9058709,6.23853473 64.5335615,6.63900597 C64.161252,7.03947722 63.9825766,7.58267074 64.04445,8.12596 L64.04445,13.49608 L62.18605,13.49608 L62.18606,4.44238 Z"
-                                                        id="Shape"
-                                                    ></path>
-                                                    <path
-                                                        d="M75.3843,10.83691 C75.1343,12.48046 73.53371,13.60839 71.48586,13.60839 C68.85207,13.60839 67.21731,11.84374 67.21731,9.01269 C67.21731,6.17285 68.86086,4.33105 71.40774,4.33105 C73.91262,4.33105 75.48782,6.05175 75.48782,8.79687 L75.48782,9.43359 L69.09329,9.43359 L69.09329,9.54589 C69.0335874,10.2199216 69.2663316,10.8871194 69.7323199,11.3777699 C70.1983083,11.8684204 70.8526275,12.1352333 71.52884,12.11034 C72.4306823,12.1948396 73.2809431,11.6769777 73.61966,10.8369 L75.3843,10.83691 Z M69.1020624,8.13477 L73.62844,8.13476 C73.6621655,7.52909749 73.4416965,6.93682308 73.0201501,6.50063155 C72.5986036,6.06444001 72.0142008,5.82388041 71.40774,5.83691 C70.7964818,5.83326223 70.2090907,6.07393463 69.7761255,6.50543324 C69.3431603,6.93693186 69.1004963,7.52350292 69.1020624,8.13477 Z"
-                                                        id="Shape"
-                                                    ></path>
-                                                </g>
-                                            </g>
-                                        </g>
-                                        <g id="_Group_4" transform="translate(35.000000, 8.000000)" fill="#FFFFFF">
-                                            <g id="Group">
-                                                <path
-                                                    d="M2.82619,0.731 C3.61513656,0.674384181 4.38789226,0.974547428 4.93176129,1.54887182 C5.47563032,2.12319621 5.73328587,2.91114479 5.63381,3.69584 C5.63381,5.60209 4.60354,6.69784 2.82619,6.69784 L0.67092,6.69784 L0.67092,0.731 L2.82619,0.731 Z M1.59767,5.854 L2.72267,5.854 C3.28649194,5.88770201 3.83548652,5.66555901 4.21721851,5.24925179 C4.5989505,4.83294457 4.77277961,4.26679442 4.69044,3.708 C4.76678901,3.15152453 4.59045658,2.59004622 4.20967108,2.17713398 C3.82888557,1.76422175 3.28349567,1.5430863 2.72267,1.57421 L1.59767,1.57421 L1.59767,5.854 Z"
-                                                    id="Shape"
-                                                ></path>
-                                                <path
-                                                    d="M6.68068,4.44434 C6.60346713,3.63722505 6.99048366,2.85611193 7.67941593,2.42859737 C8.36834819,2.0010828 9.24008181,2.0010828 9.92901407,2.42859737 C10.6179463,2.85611193 11.0049629,3.63722505 10.92775,4.44434 C11.0064319,5.25232226 10.6197687,6.03495038 9.93022554,6.4633853 C9.24068243,6.89182022 8.36774757,6.89182022 7.67820446,6.4633853 C6.98866134,6.03495038 6.60199806,5.25232226 6.68068,4.44434 Z M10.01368,4.44434 C10.01368,3.46827 9.5752,2.89747 8.80568,2.89747 C8.03322,2.89747 7.59868,3.46827 7.59868,4.44435 C7.59868,5.42824 8.03325,5.99464 8.80568,5.99464 C9.57522,5.99463 10.01369,5.42432 10.01369,4.44434 L10.01368,4.44434 Z"
-                                                    id="Shape"
-                                                ></path>
-                                                <polygon
-                                                    id="Shape"
-                                                    points="16.57326 6.69775 15.65139 6.69775 14.72073 3.38134 14.65042 3.38134 13.72366 6.69775 12.81057 6.69775 11.56936 2.19482 12.47073 2.19482 13.27737 5.63082 13.34378 5.63082 14.26956 2.19482 15.1221 2.19482 16.04788 5.63082 16.11819 5.63082 16.92092 2.19482 17.80959 2.19482"
-                                                ></polygon>
-                                                <path
-                                                    d="M18.85354,2.19482 L19.709,2.19482 L19.709,2.91015 L19.77541,2.91015 C20.0063449,2.38347794 20.5459729,2.06130747 21.11916,2.1079 C21.5629768,2.07453177 21.9978859,2.2447899 22.3010908,2.57060207 C22.6042957,2.89641424 22.7428931,3.34242376 22.67775,3.7827 L22.67775,6.6977 L21.78908,6.6977 L21.78908,4.00586 C21.78908,3.28223 21.47463,2.92236 20.8174,2.92236 C20.5163658,2.90833912 20.2242202,3.02648257 20.0175546,3.24581678 C19.810889,3.465151 19.710315,3.76380101 19.7422,4.06347 L19.7422,6.69775 L18.85353,6.69775 L18.85354,2.19482 Z"
-                                                    id="Shape"
-                                                ></path>
-                                                <polygon
-                                                    id="Shape"
-                                                    points="24.09377 0.437 24.98244 0.437 24.98244 6.69774 24.09377 6.69774"
-                                                ></polygon>
-                                                <path
-                                                    d="M26.21779,4.44434 C26.1406364,3.63717225 26.527714,2.85603936 27.2166974,2.4285182 C27.9056808,2.00099704 28.7774592,2.00099704 29.4664426,2.4285182 C30.155426,2.85603936 30.5425036,3.63717225 30.46535,4.44434 C30.543932,5.25235119 30.1571979,6.03495719 29.4676205,6.46337324 C28.7780432,6.89178929 27.9050968,6.89178929 27.2155195,6.46337324 C26.5259421,6.03495719 26.139208,5.25235119 26.21779,4.44434 Z M29.55079,4.44434 C29.55079,3.46827 29.11231,2.89747 28.34279,2.89747 C27.57033,2.89747 27.13579,3.46827 27.13579,4.44435 C27.13579,5.42824 27.57036,5.99464 28.34279,5.99464 C29.11232,5.99463 29.5508,5.42432 29.5508,4.44434 L29.55079,4.44434 Z"
-                                                    id="Shape"
-                                                ></path>
-                                                <path
-                                                    d="M31.4009,5.42432 C31.4009,4.61377 32.00442,4.14649 33.0757,4.08008 L34.29543,4.00977 L34.29543,3.6211 C34.29543,3.14551 33.98098,2.87696 33.37356,2.87696 C32.87747,2.87696 32.53372,3.05909 32.43508,3.37745 L31.57473,3.37745 C31.66555,2.60401 32.39309,2.10792 33.41457,2.10792 C34.54348,2.10792 35.1802,2.66992 35.1802,3.6211 L35.1802,6.69776 L34.32473,6.69776 L34.32473,6.06495 L34.25442,6.06495 C33.9638686,6.52707633 33.4471736,6.79716323 32.90188,6.77195 C32.5196161,6.81171181 32.1383711,6.68791066 31.8523958,6.43115244 C31.5664205,6.17439423 31.4024061,5.80864331 31.4009,5.42432 Z M34.29543,5.03955 L34.29543,4.66309 L33.19582,4.7334 C32.5757,4.7749 32.29445,4.98584 32.29445,5.38281 C32.29445,5.78808 32.64601,6.02392 33.12945,6.02392 C33.4156361,6.05288986 33.7013264,5.96447505 33.9211204,5.77891559 C34.1409144,5.59335613 34.2759916,5.32654106 34.29543,5.03955 Z"
-                                                    id="Shape"
-                                                ></path>
-                                                <path
-                                                    d="M36.34816,4.44434 C36.34816,3.02149 37.07961,2.12012 38.2173,2.12012 C38.7917768,2.09365013 39.3298275,2.40147287 39.59816,2.91012 L39.66457,2.91012 L39.66457,0.437 L40.55324,0.437 L40.55324,6.69774 L39.70168,6.69774 L39.70168,5.98631 L39.63137,5.98631 C39.3427542,6.49073698 38.7980745,6.79335648 38.21731,6.77195 C37.0718,6.772 36.34816,5.87061 36.34816,4.44434 Z M37.26616,4.44434 C37.26616,5.39942 37.71636,5.97413 38.46929,5.97413 C39.21829,5.97413 39.6812,5.39113 39.6812,4.44825 C39.6812,3.50977 39.21343,2.91846 38.46929,2.91846 C37.72121,2.91846 37.26613,3.49707 37.26613,4.44434 L37.26616,4.44434 Z"
-                                                    id="Shape"
-                                                ></path>
-                                                <path
-                                                    d="M44.23,4.44434 C44.1527871,3.63722505 44.5398037,2.85611193 45.2287359,2.42859737 C45.9176682,2.0010828 46.7894018,2.0010828 47.4783341,2.42859737 C48.1672663,2.85611193 48.5542829,3.63722505 48.47707,4.44434 C48.5557519,5.25232226 48.1690887,6.03495038 47.4795455,6.4633853 C46.7900024,6.89182022 45.9170676,6.89182022 45.2275245,6.4633853 C44.5379813,6.03495038 44.1513181,5.25232226 44.23,4.44434 Z M47.563,4.44434 C47.563,3.46827 47.12452,2.89747 46.355,2.89747 C45.58254,2.89747 45.148,3.46827 45.148,4.44435 C45.148,5.42824 45.58257,5.99464 46.355,5.99464 C47.12453,5.99463 47.563,5.42432 47.563,4.44434 Z"
-                                                    id="Shape"
-                                                ></path>
-                                                <path
-                                                    d="M49.66945,2.19482 L50.52492,2.19482 L50.52492,2.91015 L50.59133,2.91015 C50.8222649,2.38347794 51.3618929,2.06130747 51.93508,2.1079 C52.3788968,2.07453177 52.8138059,2.2447899 53.1170108,2.57060207 C53.4202157,2.89641424 53.5588131,3.34242376 53.49367,3.7827 L53.49367,6.6977 L52.605,6.6977 L52.605,4.00586 C52.605,3.28223 52.29055,2.92236 51.63332,2.92236 C51.3322858,2.90833912 51.0401402,3.02648257 50.8334746,3.24581678 C50.626809,3.465151 50.526235,3.76380101 50.55812,4.06347 L50.55812,6.69775 L49.66945,6.69775 L49.66945,2.19482 Z"
-                                                    id="Shape"
-                                                ></path>
-                                                <path
-                                                    d="M58.51516,1.07373 L58.51516,2.21533 L59.49075,2.21533 L59.49075,2.96387 L58.51516,2.96387 L58.51516,5.2793 C58.51516,5.75098 58.7095,5.95752 59.15188,5.95752 C59.2651356,5.95715754 59.3782775,5.95030966 59.49075,5.93701 L59.49075,6.67724 C59.3311595,6.70579072 59.1694656,6.72098004 59.00735,6.72265 C58.01907,6.72265 57.62551,6.37499 57.62551,5.50683 L57.62551,2.96383 L56.91067,2.96383 L56.91067,2.21529 L57.62551,2.21529 L57.62551,1.07373 L58.51516,1.07373 Z"
-                                                    id="Shape"
-                                                ></path>
-                                                <path
-                                                    d="M60.70461,0.437 L61.58547,0.437 L61.58547,2.91845 L61.65578,2.91845 C61.8978078,2.38716856 62.4468801,2.06458754 63.02878,2.11181 C63.4700766,2.08779728 63.8990983,2.26180371 64.1989893,2.58643385 C64.4988802,2.91106399 64.6384049,3.35250564 64.57956,3.79052 L64.57956,6.69775 L63.69,6.69775 L63.69,4.00975 C63.69,3.29051 63.355,2.92625 62.72711,2.92625 C62.417939,2.90089367 62.1133391,3.01329096 61.8947423,3.2333935 C61.6761456,3.45349605 61.5658419,3.75886031 61.59332,4.06785 L61.59332,6.69773 L60.70465,6.69773 L60.70461,0.437 Z"
-                                                    id="Shape"
-                                                ></path>
-                                                <path
-                                                    d="M69.76125,5.48193 C69.512057,6.33130948 68.6900989,6.88010304 67.81008,6.78466 C67.2096439,6.8005102 66.6325914,6.5516307 66.2320282,6.10405516 C65.8314651,5.65647963 65.6478864,5.05545594 65.73,4.46045 C65.6500674,3.86379048 65.8329582,3.26180373 66.2312908,2.81044696 C66.6296234,2.35909018 67.204202,2.10277675 67.80617,2.10791 C69.0591,2.10791 69.81496,2.96391 69.81496,4.37791 L69.81496,4.688 L66.63527,4.688 L66.63527,4.7378 C66.607132,5.07194014 66.7212507,5.40244775 66.9495608,5.6480407 C67.1778709,5.89363365 67.4991879,6.03152392 67.83449,6.0278 C68.2692619,6.07999468 68.6924825,5.86433304 68.90578,5.4819 L69.76125,5.48193 Z M66.63525,4.03076 L68.90966,4.03076 C68.9323129,3.72516044 68.8248585,3.42420507 68.6137769,3.20205909 C68.4026954,2.97991311 68.1076175,2.85723623 67.80126,2.86426 C67.490752,2.86035891 67.191828,2.98202124 66.9722963,3.20164888 C66.7527647,3.42127653 66.6312331,3.72025374 66.63527,4.03076 L66.63525,4.03076 Z"
-                                                    id="Shape"
-                                                ></path>
-                                            </g>
-                                        </g>
-                                    </g>
-                                </g>
-                            </svg>
-                        </a>
-                        <p class="mx_Spacer"><strong>Android</strong></p>
-                        <a
-                            href="https://play.google.com/store/apps/details?id=im.vector.app"
-                            target="_blank"
-                            class="mx_ClearDecoration"
-                        >
-                            <svg
-                                width="162px"
-                                height="48px"
-                                viewBox="0 0 162 48"
-                                version="1.1"
-                                xmlns="http://www.w3.org/2000/svg"
-                                xmlns:xlink="http://www.w3.org/1999/xlink"
-                            >
-                                <!-- Generator: Sketch 51.2 (57519) - http://www.bohemiancoding.com/sketch -->
-                                <desc>Created with Sketch.</desc>
-                                <defs>
-                                    <linearGradient
-                                        x1="91.488428%"
-                                        y1="4.9481245%"
-                                        x2="-38.3517333%"
-                                        y2="71.9074222%"
-                                        id="linearGradient-1"
-                                    >
-                                        <stop stop-color="#00A0FF" offset="0%"></stop>
-                                        <stop stop-color="#00A1FF" offset="1%"></stop>
-                                        <stop stop-color="#00BEFF" offset="26%"></stop>
-                                        <stop stop-color="#00D2FF" offset="51%"></stop>
-                                        <stop stop-color="#00DFFF" offset="76%"></stop>
-                                        <stop stop-color="#00E3FF" offset="100%"></stop>
-                                    </linearGradient>
-                                    <linearGradient
-                                        x1="107.684729%"
-                                        y1="50%"
-                                        x2="-130.640394%"
-                                        y2="50%"
-                                        id="linearGradient-2"
-                                    >
-                                        <stop stop-color="#FFE000" offset="0%"></stop>
-                                        <stop stop-color="#FFBD00" offset="41%"></stop>
-                                        <stop stop-color="#FFA500" offset="78%"></stop>
-                                        <stop stop-color="#FF9C00" offset="100%"></stop>
-                                    </linearGradient>
-                                    <linearGradient
-                                        x1="86.219293%"
-                                        y1="17.8768889%"
-                                        x2="-50.1497903%"
-                                        y2="194.702638%"
-                                        id="linearGradient-3"
-                                    >
-                                        <stop stop-color="#FF3A44" offset="0%"></stop>
-                                        <stop stop-color="#C31162" offset="100%"></stop>
-                                    </linearGradient>
-                                    <linearGradient
-                                        x1="-18.7537448%"
-                                        y1="-54.0521474%"
-                                        x2="42.1210306%"
-                                        y2="24.9170664%"
-                                        id="linearGradient-4"
-                                    >
-                                        <stop stop-color="#32A071" offset="0%"></stop>
-                                        <stop stop-color="#2DA771" offset="7%"></stop>
-                                        <stop stop-color="#15CF74" offset="48%"></stop>
-                                        <stop stop-color="#06E775" offset="80%"></stop>
-                                        <stop stop-color="#00F076" offset="100%"></stop>
-                                    </linearGradient>
-                                </defs>
-                                <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-                                    <g id="Google-Play-badge" fill-rule="nonzero">
-                                        <rect
-                                            id="Rectangle-path"
-                                            fill="#000000"
-                                            x="0"
-                                            y="0"
-                                            width="162"
-                                            height="48"
-                                            rx="6"
-                                        ></rect>
-                                        <path
-                                            d="M156,0.96 C158.783515,0.96 161.04,3.21648486 161.04,6 L161.04,42 C161.04,44.7835151 158.783515,47.04 156,47.04 L6,47.04 C3.21648486,47.04 0.96,44.7835151 0.96,42 L0.96,6 C0.96,3.21648486 3.21648486,0.96 6,0.96 L156,0.96 Z M156,0 L6,0 C2.6862915,2.13162821e-15 0,2.6862915 0,6 L0,42 C0,45.3137085 2.6862915,48 6,48 L156,48 C159.313708,48 162,45.3137085 162,42 L162,6 C162,2.6862915 159.313708,2.13162821e-15 156,0 Z"
-                                            id="Shape"
-                                            fill="#A6A6A6"
-                                        ></path>
-                                        <path
-                                            d="M56.904,12.288 C56.9452243,13.1774773 56.6199211,14.0449523 56.004,14.688 C55.3157397,15.4029639 54.3557806,15.791311 53.364,15.756 C51.8428083,15.7440945 50.4769778,14.8214594 49.8980302,13.4146952 C49.3190825,12.007931 49.6398426,10.3911869 50.712,9.312 C51.4086396,8.60079116 52.3686947,8.20981851 53.364,8.232 C53.8713092,8.23030972 54.3736031,8.33240198 54.84,8.532 C55.2742254,8.70714427 55.6607809,8.98266787 55.968,9.336 L55.332,9.972 C54.8464162,9.39441174 54.1174618,9.07882784 53.364,9.12 C52.6066192,9.11628465 51.8804152,9.42130519 51.3528432,9.96472697 C50.8252713,10.5081487 50.541874,11.2430609 50.568,12 C50.5519223,13.1438276 51.2255718,14.1850074 52.2755199,14.63911 C53.325468,15.0932125 54.5455111,14.8710548 55.368,14.076 C55.7372514,13.6758439 55.9502196,13.1562016 55.968,12.612 L53.364,12.612 L53.364,11.748 L56.856,11.748 C56.8880078,11.9262169 56.9040713,12.1069316 56.904,12.288 Z M62.4,9.288 L59.16,9.288 L59.16,11.568 L62.112,11.568 L62.112,12.432 L59.16,12.432 L59.16,14.712 L62.4,14.712 L62.4,15.6 L58.2,15.6 L58.2,8.4 L62.4,8.4 L62.4,9.288 Z M66.336,15.6 L65.412,15.6 L65.412,9.288 L63.396,9.288 L63.396,8.4 L68.4,8.4 L68.4,9.288 L66.336,9.288 L66.336,15.6 Z M71.928,15.6 L71.928,8.4 L72.852,8.4 L72.852,15.6 L71.928,15.6 Z M76.956,15.6 L76.032,15.6 L76.032,9.288 L74.016,9.288 L74.016,8.4 L78.96,8.4 L78.96,9.288 L76.956,9.288 L76.956,15.6 Z M88.332,14.664 C86.8715878,16.1162735 84.5124122,16.1162735 83.052,14.664 C81.6363227,13.1654806 81.6363227,10.8225194 83.052,9.324 C83.7503981,8.62049603 84.7006989,8.22483956 85.692,8.22483956 C86.6833011,8.22483956 87.6336019,8.62049603 88.332,9.324 C89.7537186,10.8201118 89.7537186,13.1678882 88.332,14.664 Z M83.736,14.064 C84.8175887,15.1410781 86.5664113,15.1410781 87.648,14.064 C88.710238,12.8930054 88.710238,11.1069946 87.648,9.936 C86.5664113,8.85892192 84.8175887,8.85892192 83.736,9.936 C82.673762,11.1069946 82.673762,12.8930054 83.736,14.064 Z M90.696,15.6 L90.696,8.4 L91.824,8.4 L95.328,14.004 L95.328,8.4 L96.252,8.4 L96.252,15.6 L95.292,15.6 L91.632,9.732 L91.632,15.6 L90.696,15.6 Z"
-                                            id="Shape"
-                                            stroke="#FFFFFF"
-                                            stroke-width="0.5"
-                                            fill="#FFFFFF"
-                                        ></path>
-                                        <path
-                                            d="M81.768,26.1 C78.95451,26.1132401 76.6832087,28.4024174 76.692025,31.2159247 C76.7008414,34.0294321 78.9864446,36.3043299 81.7999624,36.2999373 C84.6134801,36.2955447 86.8919688,34.0135212 86.892,31.2 C86.9117676,29.8372485 86.3774779,28.5248517 85.4115062,27.5634044 C84.4455344,26.6019571 83.1306436,26.0738348 81.768,26.1 Z M81.768,34.296 C80.4998728,34.3846863 79.3064075,33.6891762 78.7584256,32.5421245 C78.2104436,31.3950728 78.419323,30.0296194 79.285159,29.0988456 C80.1509951,28.1680719 81.4978054,27.8611589 82.6814254,28.3248997 C83.8650454,28.7886405 84.6449026,29.9287792 84.648,31.2 C84.6870513,31.9952063 84.4032392,32.7724713 83.8609684,33.3554125 C83.3186976,33.9383536 82.5639505,34.2775396 81.768,34.296 Z M70.596,26.1 C67.7809194,26.1066237 65.503593,28.3928962 65.5080063,31.2079812 C65.5124195,34.0230661 67.796903,36.302187 70.6119906,36.2999843 C73.4270781,36.2977816 75.7079922,34.0150884 75.708,31.2 C75.7277676,29.8372485 75.1934779,28.5248517 74.2275062,27.5634044 C73.2615344,26.6019571 71.9466436,26.0738348 70.584,26.1 L70.596,26.1 Z M70.596,34.296 C69.3272109,34.3896877 68.1302658,33.6976456 67.5784221,32.5513159 C67.0265783,31.4049863 67.2321873,30.0377538 68.096776,29.1044321 C68.9613648,28.1711103 70.3089091,27.8617171 71.4940246,28.3244312 C72.6791401,28.7871453 73.4605457,29.9277613 73.464,31.2 C73.5030513,31.9952063 73.2192392,32.7724713 72.6769684,33.3554125 C72.1346976,33.9383536 71.3799505,34.2775396 70.584,34.296 L70.596,34.296 Z M57.288,27.672 L57.288,29.832 L62.472,29.832 C62.3907161,30.8493646 61.9678136,31.8093534 61.272,32.556 C60.2232275,33.6242696 58.7718519,34.1995896 57.276,34.14 C54.0948398,34.14 51.516,31.5611602 51.516,28.38 C51.516,25.1988398 54.0948398,22.62 57.276,22.62 C58.7373549,22.5961666 60.1485143,23.1528625 61.2,24.168 L62.724,22.644 C61.2899035,21.1918298 59.3288621,20.3823049 57.288,20.4 C54.3827529,20.2869348 51.6484723,21.7724061 50.1622249,24.2712685 C48.6759775,26.7701308 48.6759775,29.8818692 50.1622249,32.3807315 C51.6484723,34.8795939 54.3827529,36.3650652 57.288,36.252 C59.366118,36.3459052 61.3832889,35.5364115 62.82,34.032 C64.0772109,32.6507059 64.7484517,30.8349134 64.692,28.968 C64.6958722,28.5131858 64.6556846,28.0590658 64.572,27.612 L57.288,27.672 Z M111.66,29.352 C111.019296,27.4670521 109.281513,26.1732637 107.292,26.1 C105.965236,26.097406 104.696574,26.6440891 103.787255,27.6102403 C102.877937,28.5763915 102.409075,29.8758277 102.492,31.2 C102.462529,32.5551554 102.985397,33.864034 103.940463,34.8258889 C104.895528,35.7877438 106.20067,36.3198705 107.556,36.3 C109.26103,36.3091908 110.856772,35.4617346 111.804,34.044 L110.064,32.844 C109.535695,33.7247306 108.583028,34.2626004 107.556,34.26 C106.49231,34.3005421 105.51197,33.6866398 105.084,32.712 L111.912,29.892 L111.66,29.352 Z M104.7,31.056 C104.650862,30.3061971 104.905591,29.568174 105.40676,29.0083093 C105.907929,28.4484447 106.613352,28.113866 107.364,28.08 C108.155244,28.0278619 108.90128,28.4528191 109.26,29.16 L104.7,31.056 Z M99.156,36 L101.4,36 L101.4,21 L99.156,21 L99.156,36 Z M95.484,27.24 L95.4,27.24 C94.7159545,26.4752121 93.7380686,26.0386559 92.712,26.04 C89.9881763,26.172086 87.8476045,28.4189755 87.8476045,31.146 C87.8476045,33.8730245 89.9881763,36.119914 92.712,36.252 C93.7413947,36.2693085 94.7256191,35.8299226 95.4,35.052 L95.472,35.052 L95.472,35.784 C95.472,37.74 94.428,38.784 92.748,38.784 C91.6035636,38.7572129 90.5888737,38.0412401 90.18,36.972 L88.224,37.788 C88.977218,39.6201732 90.767077,40.81183 92.748,40.8 C95.376,40.8 97.548,39.252 97.548,35.484 L97.548,26.4 L95.484,26.4 L95.484,27.24 Z M92.916,34.296 C91.3114651,34.1545918 90.0808516,32.810754 90.0808516,31.2 C90.0808516,29.589246 91.3114651,28.2454082 92.916,28.104 C93.6913435,28.143789 94.4177831,28.4949242 94.9306198,29.0777958 C95.4434564,29.6606674 95.6992476,30.4259002 95.64,31.2 C95.7061618,31.9776593 95.451189,32.7485174 94.9343644,33.3333452 C94.4175397,33.9181731 93.6838925,34.2660166 92.904,34.296 L92.916,34.296 Z M122.172,21 L116.808,21 L116.808,36 L119.052,36 L119.052,30.312 L122.184,30.312 C123.927221,30.4372366 125.594369,29.5782107 126.504156,28.0859676 C127.413943,26.5937244 127.413943,24.7182756 126.504156,23.2260324 C125.594369,21.7337893 123.927221,20.8747634 122.184,21 L122.172,21 Z M122.172,28.2 L119.04,28.2 L119.04,23.088 L122.22,23.088 C123.641581,23.088 124.794,24.2404191 124.794,25.662 C124.794,27.0835809 123.641581,28.236 122.22,28.236 L122.172,28.2 Z M136.008,26.04 C134.338455,25.9402067 132.768824,26.8405056 132.012,28.332 L134.004,29.16 C134.405287,28.4204018 135.20535,27.9874267 136.044,28.056 C136.619434,27.9887935 137.197744,28.1555641 137.649034,28.5188522 C138.100324,28.8821403 138.386758,29.4114899 138.444,29.988 L138.444,30.144 C137.723271,29.7623989 136.919511,29.5645502 136.104,29.568 C133.956,29.568 131.784,30.768 131.784,32.94 C131.826825,33.8756506 132.246288,34.7541954 132.946958,35.3757568 C133.647627,35.9973182 134.569918,36.3090392 135.504,36.24 C136.655075,36.3226597 137.759483,35.7704558 138.384,34.8 L138.456,34.8 L138.456,36 L140.616,36 L140.616,30.228 C140.616,27.6 138.624,26.076 136.068,26.076 L136.008,26.04 Z M135.732,34.26 C135,34.26 133.98,33.888 133.98,32.988 C133.98,31.788 135.252,31.392 136.38,31.392 C137.09285,31.3744103 137.797357,31.5484649 138.42,31.896 C138.264835,33.239298 137.143828,34.2630486 135.792,34.296 L135.732,34.26 Z M148.488,26.4 L145.92,32.904 L145.848,32.904 L143.184,26.4 L140.784,26.4 L144.78,35.496 L142.5,40.548 L144.84,40.548 L150.984,26.4 L148.488,26.4 Z M128.316,36 L130.56,36 L130.56,21 L128.316,21 L128.316,36 Z"
-                                            id="Shape"
-                                            fill="#FFFFFF"
-                                        ></path>
-                                        <path
-                                            d="M12.528,9.048 C12.1368779,9.51733 11.9394644,10.1181539 11.976,10.728 L11.976,37.272 C11.9394644,37.8818461 12.1368779,38.48267 12.528,38.952 L12.612,39.036 L27.48,24.18 L27.48,23.832 L12.612,8.964 L12.528,9.048 Z"
-                                            id="Shape"
-                                            fill="url(#linearGradient-1)"
-                                        ></path>
-                                        <path
-                                            d="M32.4,29.136 L27.48,24.18 L27.48,23.832 L32.4,18.864 L32.508,18.924 L38.4,22.272 C40.08,23.22 40.08,24.78 38.4,25.74 L32.532,29.076 L32.4,29.136 Z"
-                                            id="Shape"
-                                            fill="url(#linearGradient-2)"
-                                        ></path>
-                                        <path
-                                            d="M32.544,29.064 L27.48,24 L12.528,38.952 C13.2344613,39.5730269 14.2829148,39.6032707 15.024,39.024 L32.556,29.064"
-                                            id="Shape"
-                                            fill="url(#linearGradient-3)"
-                                        ></path>
-                                        <path
-                                            d="M32.544,18.936 L15.012,8.976 C14.2709148,8.39672927 13.2224613,8.42697312 12.516,9.048 L27.48,24 L32.544,18.936 Z"
-                                            id="Shape"
-                                            fill="url(#linearGradient-4)"
-                                        ></path>
-                                        <path
-                                            d="M32.4,28.956 L15.012,38.856 C14.3004462,39.3880037 13.3235538,39.3880037 12.612,38.856 L12.528,38.94 L12.612,39.024 C13.3222149,39.5600151 14.3017851,39.5600151 15.012,39.024 L32.544,29.064 L32.4,28.956 Z"
-                                            id="Shape"
-                                            fill="#000000"
-                                            opacity="0.2"
-                                        ></path>
-                                        <path
-                                            d="M12.528,38.784 C12.1368779,38.31467 11.9394644,37.7138461 11.976,37.104 L11.976,37.284 C11.9394644,37.8938461 12.1368779,38.49467 12.528,38.964 L12.612,38.88 L12.528,38.784 Z M38.4,25.56 L32.4,28.956 L32.508,29.064 L38.4,25.728 C39.0804841,25.4083358 39.5381621,24.7492796 39.6,24 C39.4632354,24.6778055 39.0200471,25.2539503 38.4,25.56 Z"
-                                            id="Shape"
-                                            fill="#000000"
-                                            opacity="0.12"
-                                        ></path>
-                                        <path
-                                            d="M15.012,9.144 L38.4,22.44 C39.0200471,22.7460497 39.4632354,23.3221945 39.6,24 C39.5381621,23.2507204 39.0804841,22.5916642 38.4,22.272 L15.012,8.976 C13.332,8.028 11.964,8.82 11.964,10.74 L11.964,10.92 C12,8.988 13.344,8.196 15.012,9.144 Z"
-                                            id="Shape"
-                                            fill="#FFFFFF"
-                                            opacity="0.25"
-                                        ></path>
-                                    </g>
-                                </g>
-                            </svg>
-                        </a>
-                        <a
-                            href="https://f-droid.org/repository/browse/?fdid=im.vector.app"
-                            target="_blank"
-                            class="mx_ClearDecoration"
-                        >
-                            <svg
-                                width="164px"
-                                height="48px"
-                                viewBox="0 0 157 46"
-                                version="1.1"
-                                xmlns="http://www.w3.org/2000/svg"
-                                xmlns:xlink="http://www.w3.org/1999/xlink"
-                            >
-                                <desc>Get it on F-Droid.</desc>
-                                <defs>
-                                    <radialGradient
-                                        cx="0.55528181%"
-                                        cy="0.456156968%"
-                                        fx="0.55528181%"
-                                        fy="0.456156968%"
-                                        r="99.5501799%"
-                                        gradientTransform="translate(0.005553,0.004562),scale(0.985441,1.000000),rotate(90.000001),translate(-0.005553,-0.004562)"
-                                        id="radialGradient-1"
-                                    >
-                                        <stop stop-color="#FFFFFF" stop-opacity="0.098039" offset="0%"></stop>
-                                        <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
-                                    </radialGradient>
-                                </defs>
-                                <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-                                    <g id="F-Droid-badge">
-                                        <rect
-                                            id="Rectangle-path"
-                                            fill="#000000"
-                                            fill-rule="nonzero"
-                                            x="0"
-                                            y="0"
-                                            width="157"
-                                            height="46"
-                                            rx="5.6097561"
-                                        ></rect>
-                                        <g
-                                            id="Group"
-                                            transform="translate(49.623214, 5.890244)"
-                                            fill="#FFFFFF"
-                                            fill-rule="nonzero"
-                                        >
-                                            <path
-                                                d="M5.68003571,6.29863415 L5.68003571,4.42449878 L4.13843589,4.42449878 L4.13843589,3.64866951 L6.61432589,3.64866951 L6.61432589,6.64455976 C6.24995506,6.90316951 5.84820327,7.09946423 5.40907054,7.2334439 C4.96995649,7.36430642 4.50125542,7.42973768 4.00296732,7.42973768 C2.91295744,7.42973768 2.0596344,7.1119263 1.44299821,6.47630354 C0.829483333,5.83757671 0.522725893,4.94958037 0.522725893,3.81231451 C0.522725893,2.67194459 0.829483333,1.78394825 1.44299821,1.14832549 C2.0596344,0.509598659 2.91295744,0.190235244 4.00296732,0.190235244 C4.45765054,0.190235244 4.88898,0.24631878 5.29695571,0.358485854 C5.70805274,0.470652927 6.08644143,0.635785447 6.43212179,0.853883415 L6.43212179,1.85873098 C6.08332012,1.56274154 5.71271601,1.33995943 5.32030946,1.19038463 C4.92790292,1.04082854 4.51525458,0.966050488 4.08236446,0.966050488 C3.22903208,0.966050488 2.58748149,1.20440902 2.15771268,1.6811261 C1.73104649,2.15784317 1.51771339,2.86824398 1.51771339,3.81232854 C1.51771339,4.75329033 1.73104649,5.46212976 2.15771268,5.93884683 C2.58748149,6.4155639 3.22903208,6.65392244 4.08236446,6.65392244 C4.41559696,6.65392244 4.71301851,6.6258802 4.97462911,6.56979573 C5.2362397,6.51059598 5.47136589,6.4202387 5.68000768,6.2987239 L5.68003571,6.29863415 Z"
-                                                id="Shape"
-                                            ></path>
-                                            <polygon
-                                                id="Shape"
-                                                points="8.34342857 0.316390244 12.7531661 0.316390244 12.7531661 1.1109 9.28683036 1.1109 9.28683036 3.17666463 12.6082214 3.17666463 12.6082214 3.97117439 9.28683036 3.97117439 9.28683036 6.49963171 12.8372732 6.49963171 12.8372732 7.29414146 8.34342857 7.29414146 8.34342857 0.316446341"
-                                            ></polygon>
-                                            <polygon
-                                                id="Shape"
-                                                points="13.4319107 0.316390244 19.3320268 0.316390244 19.3320268 1.1109 16.8561368 1.1109 16.8561368 7.29425366 15.9078287 7.29425366 15.9078287 1.1109 13.4319387 1.1109 13.4319387 0.316390244"
-                                            ></polygon>
-                                            <polygon
-                                                id="Shape"
-                                                points="23.2920714 0.316390244 24.2356975 0.316390244 24.2356975 7.29408537 23.2920714 7.29408537"
-                                            ></polygon>
-                                            <polygon
-                                                id="Shape"
-                                                points="25.1480357 0.316390244 31.0481518 0.316390244 31.0481518 1.1109 28.5722618 1.1109 28.5722618 7.29425366 27.6239537 7.29425366 27.6239537 1.1109 25.1480637 1.1109 25.1480637 0.316390244"
-                                            ></polygon>
-                                            <path
-                                                d="M37.8398036,0.956463415 C37.1546481,0.956463415 36.6096432,1.21195976 36.2047887,1.72295244 C35.803037,2.23394512 35.6021611,2.93032154 35.6021611,3.81208171 C35.6021611,4.69071911 35.803037,5.38553415 36.2047887,5.89652683 C36.6096432,6.40751951 37.1546481,6.66301585 37.8398036,6.66301585 C38.524959,6.66301585 39.066852,6.40751951 39.4654825,5.89652683 C39.8672343,5.38553415 40.0681102,4.69071911 40.0681102,3.81208171 C40.0681102,2.93032154 39.8672343,2.23394512 39.4654825,1.72295244 C39.0673754,1.21209065 38.5253515,0.956659756 37.8394111,0.956659756 L37.8398036,0.956463415 Z M37.8398036,0.18997439 C38.817708,0.18997439 39.5993998,0.518687398 40.1848789,1.17611341 C40.7703768,1.83043537 41.0631257,2.70908211 41.0631257,3.81205366 C41.0631257,4.91192114 40.7703768,5.79056789 40.1848789,6.4479939 C39.5993811,7.10231585 38.8176893,7.42947683 37.8398036,7.42947683 C36.8587965,7.42947683 36.0739835,7.10231585 35.4853643,6.4479939 C34.8998664,5.79369065 34.6071175,4.9150439 34.6071175,3.81205366 C34.6071175,2.70906341 34.8998664,1.83041667 35.4853643,1.17611341 C36.0739648,0.518687398 36.8587779,0.18997439 37.8398036,0.18997439 Z"
-                                                id="Shape"
-                                            ></path>
-                                            <polygon
-                                                id="Shape"
-                                                points="42.5385893 0.316390244 43.8092239 0.316390244 46.9018436 6.15390244 46.9018436 0.316390244 47.817462 0.316390244 47.817462 7.29408537 46.5468273 7.29408537 43.4542077 1.45657317 43.4542077 7.29408537 42.5385893 7.29408537"
-                                            ></polygon>
-                                            <path
-                                                d="M14.4888571,14.6357134 L14.4888571,19.7020244 L13.8851641,19.7020244 C13.7044646,18.9049341 13.5319795,18.3009504 13.3677089,17.8900732 C13.2034365,17.4791959 12.981674,17.1176285 12.7024214,16.8053707 C11.9303365,15.9260976 10.3984651,15.486461 8.10680714,15.486461 C7.46615369,15.486461 7.03493637,15.5686346 6.81315518,15.7329817 C6.5995978,15.8891143 6.49281911,16.201372 6.49281911,16.6697549 L6.49281911,22.5369988 C7.74949196,22.5369988 8.64887768,22.269937 9.19097625,21.7358134 C9.73307482,21.2016898 10.1191173,20.2114744 10.3491036,18.7651671 L10.97744,18.7651671 L10.97744,27.3071427 L10.3491036,27.3071427 C10.1684059,25.8444362 9.80290431,24.8336516 9.25259875,24.274789 C8.70229506,23.7077923 7.78236851,23.4119618 6.49281911,23.3872976 L6.49281911,29.2668829 C6.49281911,29.9653724 6.66530417,30.4296545 7.01027429,30.6597293 C7.3552444,30.8815951 8.10678845,31.0171829 9.26490643,31.0664927 L9.26490643,31.695122 L0.184699286,31.695122 L0.184699286,31.0664927 C1.12105476,30.9678844 1.72475714,30.8076417 1.99580643,30.5857646 C2.26685571,30.3638988 2.40238036,29.9242622 2.40238036,29.2668549 L2.40238036,17.051611 C2.40238036,16.4024313 2.25042679,15.9545858 1.94651964,15.7080744 C1.6426125,15.4615443 1.05533905,15.3136337 0.184699286,15.2643427 L0.184699286,14.6357134 L14.4888571,14.6357134 Z"
-                                                id="Shape"
-                                            ></path>
-                                            <polygon
-                                                id="Shape"
-                                                points="21.6099286 24.4473171 21.6099286 27.380939 15.4743125 27.380939 15.4743125 24.4473171"
-                                            ></polygon>
-                                            <path
-                                                d="M25.1956964,29.4035366 L25.1956964,16.9540854 C25.1956964,16.378861 25.0478548,15.9720976 24.7521714,15.7337951 C24.4564881,15.4954927 23.9061751,15.3393638 23.1012323,15.2654085 L23.1012323,14.6367793 L30.7891859,14.6367793 C33.7050871,14.6367793 35.9926145,15.3804553 37.651768,16.8678073 C39.3191267,18.3469504 40.1528061,20.3848813 40.1528061,22.9816 C40.1528061,25.5948114 39.3191267,27.7025837 37.651768,29.3049171 C35.9844093,30.8990976 33.7913623,31.6961878 31.072627,31.6961878 L23.1012323,31.6961878 L23.1012323,31.0675585 C23.8322355,31.0429074 24.3620171,30.8991013 24.690577,30.6361402 C25.027342,30.3731923 25.1957245,29.9623244 25.1957245,29.4035366 L25.1956964,29.4035366 Z M29.2737714,16.374878 L29.2737714,29.3541707 C29.2737714,29.9211675 29.3764382,30.3073898 29.5817718,30.5128378 C29.7871054,30.7100581 30.1731478,30.8086683 30.7398991,30.8086683 C32.3497659,30.8086683 33.585954,30.2293394 34.4484634,29.0706817 C34.8591492,28.503685 35.179476,27.7107085 35.4094436,26.6917524 C35.647635,25.6727963 35.7667307,24.5634671 35.7667307,23.3637646 C35.7667307,21.194285 35.4217606,19.4275858 34.7318204,18.0636671 C33.8776095,16.3462215 32.5552583,15.4874988 30.7647668,15.4874988 C29.7709194,15.4874988 29.2739957,15.7833293 29.2739957,16.3749902 L29.2737714,16.374878 Z"
-                                                id="Shape"
-                                            ></path>
-                                            <path
-                                                d="M46.4748036,20.0576829 L46.4748036,22.1284683 C47.0661889,21.2820683 47.6247164,20.6739801 48.1503861,20.3042037 C48.6842608,19.9344272 49.2633198,19.749539 49.887563,19.749539 C50.4789484,19.749539 50.9676576,19.9385411 51.3536907,20.3165451 C51.7397238,20.6863215 51.9327404,21.1547175 51.9327404,21.7217329 C51.9327404,22.2147744 51.7848987,22.6215378 51.4892154,22.9420232 C51.193532,23.2542809 50.8116015,23.4104098 50.3434237,23.4104098 C50.0148826,23.4104098 49.7397307,23.3446709 49.5179682,23.2131932 C49.2962057,23.0817136 49.0662287,22.8475156 48.8280373,22.5105993 C48.556988,22.1161586 48.3228992,21.9189383 48.1257707,21.9189383 C47.7068798,21.9189383 47.3454807,22.1572407 47.0415736,22.6338456 C46.7376664,23.1022415 46.5857129,23.6651338 46.5857129,24.3225224 L46.5857129,29.0927785 C46.5857129,29.8734322 46.6965941,30.3911285 46.9183566,30.6458676 C47.1483429,30.8923976 47.6493692,31.0403082 48.4214354,31.0895993 L48.4214354,31.6935737 L41.706879,31.6935737 L41.7068818,31.0895993 C42.2654093,30.990991 42.6309109,30.8430804 42.8033866,30.6458676 C42.9840843,30.4486472 43.0744331,30.0911936 43.0744331,29.5735066 L43.0744331,22.1532017 C43.0744331,21.6437237 42.9799808,21.28627 42.7910761,21.0808407 C42.6103766,20.8754115 42.2489776,20.7357192 41.706879,20.6617639 L41.706879,20.0577895 L46.4749129,20.0577895 L46.4748036,20.0576829 Z"
-                                                id="Shape"
-                                            ></path>
-                                            <path
-                                                d="M58.2021429,19.7519512 C59.8284386,19.7519512 61.1795731,20.3394984 62.2555464,21.5145927 C63.3397436,22.6814593 63.8818421,24.1482236 63.8818421,25.9148854 C63.8818421,27.673413 63.3397436,29.1361569 62.2555464,30.3031171 C61.1795731,31.4699837 59.8284386,32.0534171 58.2021429,32.0534171 C56.5512131,32.0534171 55.1877429,31.4699837 54.1117321,30.3031171 C53.0357588,29.1362504 52.4977721,27.6489171 52.4977721,25.8411171 C52.4977721,24.1236715 53.0480852,22.6814967 54.1487113,21.5145927 C55.2493373,20.3394984 56.6004718,19.7519512 58.2021148,19.7519512 L58.2021429,19.7519512 Z M58.2267862,20.5408232 C57.6929115,20.5408232 57.282235,20.7174931 56.9947568,21.0708329 C56.7155024,21.4159638 56.5142714,21.9952927 56.3910637,22.8088195 C56.2678599,23.6223463 56.2062579,24.7851553 56.2062579,26.2972463 C56.2062579,28.1461659 56.349997,29.4363163 56.6374752,30.1676976 C56.9331586,30.8990415 57.4547257,31.2647134 58.2021765,31.2647134 C58.9331797,31.2647134 59.4424204,30.8826049 59.7298986,30.1183878 C60.025582,29.3541707 60.1734236,28.0024065 60.1734236,26.0630951 C60.1734236,23.9923472 60.0296845,22.5542862 59.7422063,21.7489122 C59.4629519,20.943613 58.9578138,20.5409634 58.2267919,20.5409634 L58.2267862,20.5408232 Z"
-                                                id="Shape"
-                                            ></path>
-                                            <path
-                                                d="M69.7332321,20.0576829 L69.7332321,29.6472805 C69.7332321,30.1238854 69.8194747,30.4690163 69.9919597,30.6826732 C70.1644448,30.8881024 70.4724545,31.0236902 70.9159888,31.0894366 L70.9159888,31.693411 L64.891383,31.693411 L64.8913942,31.0894366 C65.4663506,30.9497406 65.8318522,30.7936117 65.987899,30.62105 C66.1439589,30.4402663 66.2219888,30.0910215 66.2219888,29.5733159 L66.2219888,22.153011 C66.2219888,21.6353053 66.1398526,21.2860606 65.9755801,21.1052768 C65.8113077,20.9244931 65.4499086,20.7765825 64.891383,20.6615451 L64.891383,20.0575707 L69.7334312,20.0575707 L69.7332321,20.0576829 Z M66.5792143,14.8313537 C66.9652474,14.4451407 67.4293132,14.2520341 67.9714118,14.2520341 C68.5135104,14.2520341 68.9693617,14.4451407 69.3389659,14.8313537 C69.7167939,15.2175667 69.9057079,15.6818488 69.9057079,16.2242 C69.9057079,16.7747602 69.7167939,17.2349378 69.3389659,17.6047329 C68.9693617,17.9745093 68.5052959,18.1593976 67.9467684,18.1593976 C67.3882409,18.1593976 66.9241751,17.9745093 66.5545709,17.6047329 C66.1849667,17.2349565 66.0001646,16.7665606 66.0001646,16.1995451 C66.0001646,15.6654215 66.1931812,15.2093577 66.5792143,14.8313537 Z"
-                                                id="Shape"
-                                            ></path>
-                                            <path
-                                                d="M80.0335536,32.0289024 L80.0335536,30.3895354 C79.4421682,31.0140508 78.9041815,31.4495736 78.4195936,31.6961037 C77.9349869,31.9344061 77.3559279,32.0535573 76.6824166,32.0535573 C75.360028,32.0535573 74.2676632,31.4947695 73.405322,30.3771939 C72.542906,29.2514093 72.111698,27.8298037 72.111698,26.1123768 C72.111698,24.2881028 72.5716613,22.7719728 73.4915879,21.5639866 C74.4115144,20.3560191 75.5655579,19.7520354 76.9537182,19.7520354 C77.5286746,19.7520354 78.0379154,19.8670821 78.4814404,20.0971756 C78.9249654,20.3272691 79.4177771,20.7340325 79.9598757,21.3174659 L79.9598757,16.6953073 C79.9598757,16.1200829 79.8489945,15.7502972 79.627232,15.58595 C79.4136746,15.421601 78.883893,15.3065542 78.0378873,15.2408098 L78.0378873,14.6368354 L83.4712087,14.6368354 L83.4712087,29.1447866 C83.4712087,29.6789102 83.5738755,30.0486959 83.7792091,30.2541439 C83.9927665,30.4595732 84.3870234,30.5787244 84.9619798,30.6115976 L84.9619798,31.1909171 L83.3972786,31.3881337 C82.1734636,31.5196133 81.0523154,31.7332702 80.0338339,32.0291044 L80.0335536,32.0289024 Z M79.9596318,28.8734146 L79.9596318,22.734939 C79.7789323,22.2583341 79.507883,21.8803301 79.1464839,21.6009268 C78.7933087,21.3133146 78.4072663,21.1695085 77.9883566,21.1695085 C77.2573534,21.1695085 76.7152548,21.5557309 76.3620609,22.3281756 C76.0170908,23.0923927 75.8446057,24.2880187 75.8446057,25.9150537 C75.8446057,27.5174431 76.0047738,28.7048415 76.3251098,29.4772488 C76.6454459,30.2496935 77.1423696,30.6359159 77.8158809,30.6359159 C78.3744084,30.6359159 78.90419,30.3483037 79.4052256,29.7730793 C79.553071,29.6087302 79.6803811,29.4361648 79.7871561,29.2553829 C79.9021474,29.0746011 79.959643,28.9472315 79.959643,28.8732744 L79.9596318,28.8734146 Z"
-                                                id="Shape"
-                                            ></path>
-                                        </g>
-                                        <path
-                                            d="M40.46675,6.67476829 L37.3323571,10.7342683"
-                                            id="Shape"
-                                            stroke="#769616"
-                                            stroke-width="1.84532927"
-                                            fill="#8AB000"
-                                            fill-rule="nonzero"
-                                            stroke-linecap="round"
-                                        ></path>
-                                        <path
-                                            d="M40.4527321,5.75 C40.7872823,5.75886341 41.014708,5.88950341 41.1763059,6.08111585 C39.6808809,7.85918415 39.428952,8.14166341 37.3875595,10.6732622 C36.6353612,11.6468354 35.8517911,11.1436683 36.6039893,10.1700951 L39.7395036,6.11031463 C39.9084496,5.88474354 40.1711695,5.75748902 40.4527882,5.7498878 L40.4527321,5.75 Z"
-                                            id="Shape"
-                                            fill-opacity="0.29804"
-                                            fill="#FFFFFF"
-                                            fill-rule="nonzero"
-                                        ></path>
-                                        <path
-                                            d="M41.1816607,6.09023171 C41.2730684,6.19940037 41.5956921,6.68413659 41.1982579,7.23888537 L38.0627436,11.2986659 C37.3105454,12.272239 37.2143829,10.8467159 37.2143829,10.8467159 C37.2143829,10.8467159 39.9695927,7.51788659 41.1817168,6.09020366 L41.1816607,6.09023171 Z"
-                                            id="Shape"
-                                            fill-opacity="0.2"
-                                            fill="#263238"
-                                            fill-rule="nonzero"
-                                        ></path>
-                                        <path
-                                            d="M40.6545893,5.92334146 C40.9778691,5.92334146 41.3627714,6.02785963 41.2626839,6.51281463 C41.1862782,6.88305854 37.8241036,10.9964122 37.8241036,10.9964122 C37.0719054,11.9699854 35.9844561,11.4955963 36.7366543,10.5221634 L39.8606739,6.48257805 C40.0526737,6.26852098 40.3096379,5.93371951 40.6546454,5.92322927 L40.6545893,5.92334146 Z"
-                                            id="Shape"
-                                            fill="#8AB000"
-                                            fill-rule="nonzero"
-                                        ></path>
-                                        <path
-                                            d="M8.87470536,6.67476829 L12.0105,10.7342683"
-                                            id="Shape"
-                                            stroke="#769616"
-                                            stroke-width="1.84532927"
-                                            fill="#8AB000"
-                                            fill-rule="nonzero"
-                                            stroke-linecap="round"
-                                        ></path>
-                                        <path
-                                            d="M8.89124643,5.75 C8.55669625,5.75886341 8.32927054,5.88950341 8.16767268,6.08111585 C9.66309768,7.85918415 9.91502661,8.14166341 11.9564191,10.6732622 C12.7086173,11.6468354 13.4921875,11.1436683 12.7399893,10.1700951 L9.604475,6.11087561 C9.43552898,5.88530451 9.17280911,5.75805 8.89119036,5.75044878 L8.89124643,5.75 Z"
-                                            id="Shape"
-                                            fill-opacity="0.29804"
-                                            fill="#FFFFFF"
-                                            fill-rule="nonzero"
-                                        ></path>
-                                        <path
-                                            d="M8.16147679,6.09023171 C8.07006914,6.19940037 7.74744536,6.68413659 8.14487964,7.23888537 L11.2803939,11.2986659 C12.0325921,12.272239 12.1287546,10.8467159 12.1287546,10.8467159 C12.1287546,10.8467159 9.37354482,7.51788659 8.16142071,6.09020366 L8.16147679,6.09023171 Z"
-                                            id="Shape"
-                                            fill-opacity="0.2"
-                                            fill="#263238"
-                                            fill-rule="nonzero"
-                                        ></path>
-                                        <path
-                                            d="M8.68966964,5.92334146 C8.36638982,5.92334146 7.9814875,6.02785963 8.081575,6.51281463 C8.15798073,6.88305854 11.5201554,10.9964122 11.5201554,10.9964122 C12.2723536,11.9699854 13.3598029,11.4955963 12.6076046,10.5221634 L9.483585,6.48257805 C9.29154036,6.26856585 9.03445286,5.93366341 8.68961357,5.92328537 L8.68966964,5.92334146 Z"
-                                            id="Shape"
-                                            fill="#8AB000"
-                                            fill-rule="nonzero"
-                                        ></path>
-                                        <rect
-                                            id="Rectangle-path"
-                                            fill="#AEEA00"
-                                            fill-rule="nonzero"
-                                            x="10.6535714"
-                                            y="9.25609756"
-                                            width="28.0357143"
-                                            height="9.53658537"
-                                            rx="2.21439512"
-                                        ></rect>
-                                        <rect
-                                            id="Rectangle-path"
-                                            fill-opacity="0.2"
-                                            fill="#263238"
-                                            fill-rule="nonzero"
-                                            x="10.6535714"
-                                            y="11.4113659"
-                                            width="28.0357143"
-                                            height="7.38131707"
-                                            rx="2.21439512"
-                                        ></rect>
-                                        <rect
-                                            id="Rectangle-path"
-                                            fill-opacity="0.29804"
-                                            fill="#FFFFFF"
-                                            fill-rule="nonzero"
-                                            x="10.6535714"
-                                            y="9.25806098"
-                                            width="28.0357143"
-                                            height="7.38131707"
-                                            rx="2.21439512"
-                                        ></rect>
-                                        <rect
-                                            id="Rectangle-path"
-                                            fill="#AEEA00"
-                                            fill-rule="nonzero"
-                                            x="10.6535714"
-                                            y="10.098122"
-                                            width="28.0357143"
-                                            height="7.85421951"
-                                            rx="2.21439512"
-                                        ></rect>
-                                        <rect
-                                            id="Rectangle-path"
-                                            fill="#1976D2"
-                                            fill-rule="nonzero"
-                                            x="10.6535714"
-                                            y="19.6341463"
-                                            width="28.0357143"
-                                            height="19.0731707"
-                                            rx="2.21439512"
-                                        ></rect>
-                                        <rect
-                                            id="Rectangle-path"
-                                            fill-opacity="0.2"
-                                            fill="#263238"
-                                            fill-rule="nonzero"
-                                            x="10.6535714"
-                                            y="29.1118293"
-                                            width="28.0357143"
-                                            height="9.5954878"
-                                            rx="2.21439512"
-                                        ></rect>
-                                        <rect
-                                            id="Rectangle-path"
-                                            fill-opacity="0.2"
-                                            fill="#FFFFFF"
-                                            fill-rule="nonzero"
-                                            x="10.6535714"
-                                            y="19.5752439"
-                                            width="28.0357143"
-                                            height="9.5954878"
-                                            rx="2.21439512"
-                                        ></rect>
-                                        <rect
-                                            id="Rectangle-path"
-                                            fill="#1976D2"
-                                            fill-rule="nonzero"
-                                            x="10.6535714"
-                                            y="20.4756098"
-                                            width="28.0357143"
-                                            height="17.3902439"
-                                            rx="2.21439512"
-                                        ></rect>
-                                        <path
-                                            d="M24.6714286,24.5735366 C22.5461252,24.5735366 20.7467089,26.0384683 20.2201982,28.0061463 L22.5906179,28.0061463 C22.9995748,27.2788415 23.767473,26.7879598 24.6714005,26.7879598 C26.0087882,26.7879598 27.0692111,27.8488768 27.0692111,29.1868598 C27.0692111,30.5248427 26.0087882,31.5857598 24.6714005,31.5857598 C23.7068318,31.5857598 22.8924223,31.0301695 22.5099311,30.2205134 L20.1827425,30.2205134 C20.6565741,32.2619878 22.49339,33.8000988 24.6715407,33.8000988 C27.2051002,33.8000988 29.2825746,31.7215439 29.2825746,29.1869159 C29.2825746,26.6521756 27.204988,24.5737329 24.6715407,24.5737329 L24.6714286,24.5735366 Z"
-                                            id="Shape"
-                                            fill="#0D47A1"
-                                            fill-rule="nonzero"
-                                        ></path>
-                                        <ellipse
-                                            id="Oval"
-                                            stroke="#0D47A1"
-                                            stroke-width="1.40243902"
-                                            stroke-linecap="round"
-                                            cx="24.6714286"
-                                            cy="29.187561"
-                                            rx="7.04593571"
-                                            ry="7.04921951"
-                                        ></ellipse>
-                                        <ellipse
-                                            id="Oval"
-                                            fill-opacity="0.2"
-                                            fill="#263238"
-                                            fill-rule="nonzero"
-                                            cx="17.5699821"
-                                            cy="14.1480854"
-                                            rx="2.49002"
-                                            ry="2.86013415"
-                                        ></ellipse>
-                                        <ellipse
-                                            id="Oval"
-                                            fill="#FFFFFF"
-                                            fill-rule="nonzero"
-                                            cx="17.5699821"
-                                            cy="14.5172073"
-                                            rx="2.49002"
-                                            ry="2.49118049"
-                                        ></ellipse>
-                                        <ellipse
-                                            id="Oval"
-                                            fill-opacity="0.2"
-                                            fill="#263238"
-                                            fill-rule="nonzero"
-                                            cx="31.9579107"
-                                            cy="14.1480854"
-                                            rx="2.49002"
-                                            ry="2.86013415"
-                                        ></ellipse>
-                                        <ellipse
-                                            id="Oval"
-                                            fill="#FFFFFF"
-                                            fill-rule="nonzero"
-                                            cx="31.9579107"
-                                            cy="14.5172073"
-                                            rx="2.49002"
-                                            ry="2.49118049"
-                                        ></ellipse>
-                                        <path
-                                            d="M8.89152679,5.74242683 C8.53321466,5.73295225 8.20186636,5.93202601 8.04184972,6.25291205 C7.88183308,6.57379808 7.92213189,6.95837436 8.14518804,7.23908171 L10.8014598,10.6784232 C10.7075486,10.9245568 10.6536163,11.19065 10.6536163,11.4705768 L10.6536163,16.5785402 C10.6536163,17.8053098 11.6406977,18.7928512 12.8668957,18.7928512 L36.4760511,18.7928512 C37.7022491,18.7928512 38.6893306,17.8052817 38.6893306,16.5785402 L38.6893306,11.4705768 C38.6893306,11.1904873 38.6360487,10.9241305 38.5420337,10.6778622 L41.1977728,7.23908171 C41.4136365,6.96742572 41.4588967,6.59756916 41.3149131,6.28183678 C41.1709296,5.96610439 40.8620538,5.75789519 40.5154957,5.74295976 C40.2117646,5.72988939 39.9211038,5.86740249 39.7384859,6.11056707 L37.2114307,9.3827378 C36.9843414,9.30055488 36.7376271,9.25483537 36.4796986,9.25483537 L12.8705432,9.25483537 C12.6122305,9.25483537 12.3657882,9.30072317 12.1356991,9.38138305 L9.60687766,6.10921232 C9.43781797,5.88409848 9.17527379,5.74853032 8.89392945,5.74107207 L8.89152679,5.74242683 Z M12.8669911,19.6341463 C11.640793,19.6341463 10.6537116,20.6216878 10.6537116,21.8484573 L10.6537116,36.4930061 C10.6537116,37.7197756 11.640793,38.7073171 12.8669911,38.7073171 L36.4761464,38.7073171 C37.7023445,38.7073171 38.6894259,37.7197756 38.6894259,36.4930061 L38.6894259,21.8484573 C38.6922295,20.6232866 37.7053723,19.635689 36.4802116,19.635689 L12.8710562,19.635689 L12.8669911,19.6341463 Z"
-                                            id="Shape"
-                                            fill="url(#radialGradient-1)"
-                                            fill-rule="nonzero"
-                                        ></path>
-                                    </g>
-                                </g>
-                            </svg>
-                        </a>
+                        <img src="./assets/element-logo.svg" alt="Element Logo" width="148px" height="32px" />
+                    </div>
+                    <div>
+                        <p id="header_title">Join Element.</p>
                     </div>
                 </div>
-            </div>
-            <div id="step2_container" class="mx_HomePage_col mx_Spacer" style="display: none">
-                <div class="mx_HomePage_row">
-                    <div>
-                        <h2>2: Configure your app</h2>
-                        <a class="mx_Button" id="configure_element_button" href="#">Configure</a>
-                        <p class="mx_Subtext mx_SubtextTop">
-                            Tap the button above, or manually enable <em>Use custom server</em> and enter:
-                        </p>
-                        <p class="mx_Subtext">Homeserver: <em id="hs_url"></em></p>
-                        <p class="mx_Subtext" id="custom_is">Identity server: <em id="is_url"></em></p>
+                <hr />
+            </header>
+
+            <main>
+                <div class="mx_HomePage_col mx_Spacer">
+                    <p>
+                        The <a id="back_to_element_button" href="#" class="mx_DesktopLink">desktop site</a> does
+                        <b>not</b> work on mobile, please download the app.
+                    </p>
+                </div>
+                <div class="mx_HomePage_col mx_Spacer">
+                    <div class="mx_HomePage_row">
+                        <div class="mx_HomePage_step_number">
+                            <span>1</span>
+                        </div>
+                        <div>
+                            <h1 id="step1_heading">Download Element</h1>
+                            <div class="mx_StoreLinks">
+                                <a
+                                    href="https://apps.apple.com/app/element-x-secure-chat-call/id1631335820"
+                                    target="_blank"
+                                    class="mx_StoreBadge"
+                                    id="app_store_link"
+                                >
+                                    <img
+                                        src="./assets/app-store-badge.svg"
+                                        alt="Download on the App Store."
+                                        width="120px"
+                                        height="40px"
+                                    />
+                                </a>
+                                <a
+                                    href="https://play.google.com/store/apps/details?id=io.element.android.x"
+                                    target="_blank"
+                                    class="mx_StoreBadge"
+                                    id="play_store_link"
+                                >
+                                    <img
+                                        src="./assets/google-play-badge.svg"
+                                        alt="Get it on Google Play."
+                                        width="135px"
+                                        height="40px"
+                                    />
+                                </a>
+                            </div>
+                            <p id="f_droid_section">
+                                Also available on
+                                <a
+                                    href="https://f-droid.org/packages/io.element.android.x"
+                                    target="_blank"
+                                    class="mx_ClearDecoration"
+                                    id="f_droid_link"
+                                    >F-Droid</a
+                                >
+                            </p>
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="mx_HomePage_row mx_Center mx_Spacer">
-                <p class="mx_Spacer">
-                    <a id="back_to_element_button" href="#" class="mx_FooterLink"> Go to Desktop Site </a>
-                    <br />
-                    Please note the Desktop site does <b>not</b> work on mobile.
-                </p>
-            </div>
+                <div id="step2_container" class="mx_HomePage_col mx_Spacer" style="display: none">
+                    <div class="mx_HomePage_row">
+                        <div class="mx_HomePage_step_number">
+                            <span>2</span>
+                        </div>
+                        <div>
+                            <h1>Come back here to sign in</h1>
+                            <p id="step2_description">This will set up your app</p>
+                            <a class="mx_Button" id="deep_link_button" href="#">Sign in</a>
+                        </div>
+                    </div>
+                </div>
+            </main>
         </div>
+
+        <footer>
+            <div class="mx_BottomGradient"></div>
+        </footer>
     </body>
 </html>
diff --git a/src/vector/mobile_guide/index.ts b/src/vector/mobile_guide/index.ts
index ae769039a8..e9732b4035 100644
--- a/src/vector/mobile_guide/index.ts
+++ b/src/vector/mobile_guide/index.ts
@@ -5,9 +5,14 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
+import "./index.css";
+import "@fontsource/inter/400.css";
+import "@fontsource/inter/600.css";
+
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { getVectorConfig } from "../getconfig";
+import { MobileAppVariant, mobileApps, updateMobilePage } from "./mobile-apps.ts";
 
 function onBackToElementClick(): void {
     // Cookie should expire in 4 hours
@@ -38,18 +43,19 @@ function renderConfigError(message: string): void {
 }
 
 async function initPage(): Promise<void> {
-    document.getElementById("back_to_element_button")!.onclick = onBackToElementClick;
-
     const config = await getVectorConfig("..");
 
     // We manually parse the config similar to how validateServerConfig works because
     // calling that function pulls in roughly 4mb of JS we don't use.
 
     const wkConfig = config?.["default_server_config"]; // overwritten later under some conditions
-    const serverName = config?.["default_server_name"];
+    let serverName = config?.["default_server_name"];
     const defaultHsUrl = config?.["default_hs_url"];
     const defaultIsUrl = config?.["default_is_url"];
 
+    const appVariant = (config?.["mobile_guide_app_variant"] as MobileAppVariant) ?? MobileAppVariant.X;
+    const metadata = mobileApps[appVariant] ?? mobileApps[MobileAppVariant.X]; // Additional fallback in case mobile_guide_app_variant has an unexpected value.
+
     const incompatibleOptions = [wkConfig, serverName, defaultHsUrl].filter((i) => !!i);
     if (defaultHsUrl && (wkConfig || serverName)) {
         return renderConfigError(
@@ -66,6 +72,7 @@ async function initPage(): Promise<void> {
 
     if (!serverName && typeof wkConfig?.["m.homeserver"]?.["base_url"] === "string") {
         hsUrl = wkConfig["m.homeserver"]["base_url"];
+        serverName = wkConfig["m.homeserver"]["server_name"];
 
         if (typeof wkConfig["m.identity_server"]?.["base_url"] === "string") {
             isUrl = wkConfig["m.identity_server"]["base_url"];
@@ -110,21 +117,21 @@ async function initPage(): Promise<void> {
     if (hsUrl && !hsUrl.endsWith("/")) hsUrl += "/";
     if (isUrl && !isUrl.endsWith("/")) isUrl += "/";
 
-    if (hsUrl !== "https://matrix.org/") {
-        let url = "https://mobile.element.io?hs_url=" + encodeURIComponent(hsUrl);
+    let deepLinkUrl = `https://mobile.element.io${metadata.deepLinkPath}`;
 
+    if (metadata.usesLegacyDeepLink) {
+        deepLinkUrl += `?hs_url=${encodeURIComponent(hsUrl)}`;
         if (isUrl) {
-            document.getElementById("custom_is")!.style.display = "block";
-            document.getElementById("is_url")!.style.display = "block";
-            document.getElementById("is_url")!.innerText = isUrl;
-            url += "&is_url=" + encodeURIComponent(isUrl ?? "");
+            deepLinkUrl += `&is_url=${encodeURIComponent(isUrl)}`;
         }
-
-        (document.getElementById("configure_element_button") as HTMLAnchorElement).href = url;
-        document.getElementById("step1_heading")!.innerHTML = "1: Install the app";
-        document.getElementById("step2_container")!.style.display = "block";
-        document.getElementById("hs_url")!.innerText = hsUrl;
+    } else if (serverName) {
+        deepLinkUrl += `?account_provider=${serverName}`;
     }
+
+    // Not part of updateMobilePage as the link is only shown on mobile_guide and not on mobile.element.io
+    document.getElementById("back_to_element_button")!.onclick = onBackToElementClick;
+
+    updateMobilePage(metadata, deepLinkUrl, serverName ?? hsUrl);
 }
 
 void initPage();
diff --git a/src/vector/mobile_guide/mobile-apps.ts b/src/vector/mobile_guide/mobile-apps.ts
new file mode 100644
index 0000000000..ff3430d6b7
--- /dev/null
+++ b/src/vector/mobile_guide/mobile-apps.ts
@@ -0,0 +1,88 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+/*
+ * Shared code that is used by the mobile guide and the mobile.element.io site.
+ */
+
+export enum MobileAppVariant {
+    Classic = "element-classic",
+    X = "element",
+    Pro = "element-pro",
+}
+
+export interface MobileAppMetadata {
+    name: string;
+    appleAppId: string;
+    appStoreUrl: string;
+    playStoreUrl: string;
+    fDroidUrl?: string;
+    deepLinkPath: string;
+    usesLegacyDeepLink: boolean;
+    isProApp: boolean;
+}
+
+export const mobileApps: Record<MobileAppVariant, MobileAppMetadata> = {
+    [MobileAppVariant.Classic]: {
+        name: "Element",
+        appleAppId: "id1083446067",
+        appStoreUrl: "https://apps.apple.com/app/element-messenger/id1083446067",
+        playStoreUrl: "https://play.google.com/store/apps/details?id=im.vector.app",
+        fDroidUrl: "https://f-droid.org/packages/im.vector.app",
+        deepLinkPath: "",
+        usesLegacyDeepLink: true,
+        isProApp: false,
+    },
+    [MobileAppVariant.X]: {
+        name: "Element X",
+        appleAppId: "id1631335820",
+        appStoreUrl: "https://apps.apple.com/app/element-x-secure-chat-call/id1631335820",
+        playStoreUrl: "https://play.google.com/store/apps/details?id=io.element.android.x",
+        fDroidUrl: "https://f-droid.org/packages/io.element.android.x",
+        deepLinkPath: "/element",
+        usesLegacyDeepLink: false,
+        isProApp: false,
+    },
+    [MobileAppVariant.Pro]: {
+        name: "Element Pro",
+        appleAppId: "id6502951615",
+        appStoreUrl: "https://apps.apple.com/app/element-pro-for-work/id6502951615",
+        playStoreUrl: "https://play.google.com/store/apps/details?id=io.element.enterprise",
+        deepLinkPath: "/element-pro",
+        usesLegacyDeepLink: false,
+        isProApp: true,
+    },
+};
+
+export function updateMobilePage(metadata: MobileAppMetadata, deepLinkUrl: string, server: string | undefined): void {
+    const appleMeta = document.querySelector('meta[name="apple-itunes-app"]') as Element;
+    appleMeta.setAttribute("content", `app-id=${metadata.appleAppId}`);
+
+    if (server) {
+        (document.getElementById("header_title") as HTMLHeadingElement).innerText = `Join ${server} on Element`;
+    }
+    (document.getElementById("app_store_link") as HTMLAnchorElement).href = metadata.appStoreUrl;
+    (document.getElementById("play_store_link") as HTMLAnchorElement).href = metadata.playStoreUrl;
+
+    if (metadata.fDroidUrl) {
+        (document.getElementById("f_droid_link") as HTMLAnchorElement).href = metadata.fDroidUrl;
+    } else {
+        document.getElementById("f_droid_section")!.style.display = "none";
+    }
+
+    const step1Heading = document.getElementById("step1_heading")!;
+    step1Heading.innerHTML = step1Heading!.innerHTML.replace("Element", metadata.name);
+
+    // Step 2 is only shown on the mobile guide, not on mobile.element.io
+    if (document.getElementById("step2_container")) {
+        document.getElementById("step2_container")!.style.display = "block";
+        if (metadata.isProApp) {
+            document.getElementById("step2_description")!.innerHTML = "Use your work email to join";
+        }
+        (document.getElementById("deep_link_button") as HTMLAnchorElement).href = deepLinkUrl;
+    }
+}
diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx
index c8b544daf1..941963602e 100644
--- a/src/vector/platform/ElectronPlatform.tsx
+++ b/src/vector/platform/ElectronPlatform.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 New Vector Ltd.
+Copyright 2024-2025 New Vector Ltd.
 Copyright 2022 Šimon Brandner <simon.bra.ag@gmail.com>
 Copyright 2018-2021 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
@@ -18,6 +18,7 @@ import {
 } from "matrix-js-sdk/src/matrix";
 import React from "react";
 import { logger } from "matrix-js-sdk/src/logger";
+import { uniqueId } from "lodash";
 
 import BasePlatform, { UpdateCheckStatus, type UpdateStatus } from "../../BasePlatform";
 import type BaseEventIndexManager from "../../indexing/BaseEventIndexManager";
@@ -42,6 +43,8 @@ import { MatrixClientPeg } from "../../MatrixClientPeg";
 import { SeshatIndexManager } from "./SeshatIndexManager";
 import { IPCManager } from "./IPCManager";
 import { _t } from "../../languageHandler";
+import { BadgeOverlayRenderer } from "../../favicon";
+import GenericToast from "../../components/views/toasts/GenericToast.tsx";
 
 interface SquirrelUpdate {
     releaseNotes: string;
@@ -52,8 +55,6 @@ interface SquirrelUpdate {
 
 const SSO_ID_KEY = "element-desktop-ssoid";
 
-const isMac = navigator.platform.toUpperCase().includes("MAC");
-
 function platformFriendlyName(): string {
     // used to use window.process but the same info is available here
     if (navigator.userAgent.includes("Macintosh")) {
@@ -73,13 +74,6 @@ function platformFriendlyName(): string {
     }
 }
 
-function onAction(payload: ActionPayload): void {
-    // Whitelist payload actions, no point sending most across
-    if (["call_state"].includes(payload.action)) {
-        window.electron!.send("app_onAction", payload);
-    }
-}
-
 function getUpdateCheckStatus(status: boolean | string): UpdateStatus {
     if (status === true) {
         return { status: UpdateCheckStatus.Downloading };
@@ -96,10 +90,14 @@ function getUpdateCheckStatus(status: boolean | string): UpdateStatus {
 export default class ElectronPlatform extends BasePlatform {
     private readonly ipc = new IPCManager("ipcCall", "ipcReply");
     private readonly eventIndexManager: BaseEventIndexManager = new SeshatIndexManager();
-    private readonly initialised: Promise<void>;
+    public readonly initialised: Promise<void>;
+    private readonly electron: Electron;
     private protocol!: string;
     private sessionId!: string;
+    private badgeOverlayRenderer?: BadgeOverlayRenderer;
     private config!: IConfigOptions;
+    private supportedSettings?: Record<string, boolean>;
+    private clientStartedPromiseWithResolvers = Promise.withResolvers<void>();
 
     public constructor() {
         super();
@@ -107,15 +105,15 @@ export default class ElectronPlatform extends BasePlatform {
         if (!window.electron) {
             throw new Error("Cannot instantiate ElectronPlatform, window.electron is not set");
         }
+        this.electron = window.electron;
 
-        dis.register(onAction);
         /*
             IPC Call `check_updates` returns:
             true if there is an update available
             false if there is not
             or the error if one is encountered
          */
-        window.electron.on("check_updates", (event, status) => {
+        this.electron.on("check_updates", (event, status) => {
             dis.dispatch<CheckUpdatesPayload>({
                 action: Action.CheckUpdates,
                 ...getUpdateCheckStatus(status),
@@ -124,44 +122,44 @@ export default class ElectronPlatform extends BasePlatform {
 
         // `userAccessToken` (IPC) is requested by the main process when appending authentication
         // to media downloads. A reply is sent over the same channel.
-        window.electron.on("userAccessToken", () => {
-            window.electron!.send("userAccessToken", MatrixClientPeg.get()?.getAccessToken());
+        this.electron.on("userAccessToken", () => {
+            this.electron.send("userAccessToken", MatrixClientPeg.get()?.getAccessToken());
         });
 
         // `homeserverUrl` (IPC) is requested by the main process. A reply is sent over the same channel.
-        window.electron.on("homeserverUrl", () => {
-            window.electron!.send("homeserverUrl", MatrixClientPeg.get()?.getHomeserverUrl());
+        this.electron.on("homeserverUrl", () => {
+            this.electron.send("homeserverUrl", MatrixClientPeg.get()?.getHomeserverUrl());
         });
 
         // `serverSupportedVersions` is requested by the main process when it needs to know if the
         // server supports a particular version. This is primarily used to detect authenticated media
         // support. A reply is sent over the same channel.
-        window.electron.on("serverSupportedVersions", async () => {
-            window.electron!.send("serverSupportedVersions", await MatrixClientPeg.get()?.getVersions());
+        this.electron.on("serverSupportedVersions", async () => {
+            this.electron.send("serverSupportedVersions", await MatrixClientPeg.get()?.getVersions());
         });
 
         // try to flush the rageshake logs to indexeddb before quit.
-        window.electron.on("before-quit", function () {
+        this.electron.on("before-quit", function () {
             logger.log("element-desktop closing");
             rageshake.flush();
         });
 
-        window.electron.on("update-downloaded", this.onUpdateDownloaded);
+        this.electron.on("update-downloaded", this.onUpdateDownloaded);
 
-        window.electron.on("preferences", () => {
+        this.electron.on("preferences", () => {
             dis.fire(Action.ViewUserSettings);
         });
 
-        window.electron.on("userDownloadCompleted", (ev, { id, name }) => {
+        this.electron.on("userDownloadCompleted", (ev, { id, name }) => {
             const key = `DOWNLOAD_TOAST_${id}`;
 
             const onAccept = (): void => {
-                window.electron!.send("userDownloadAction", { id, open: true });
+                this.electron.send("userDownloadAction", { id, open: true });
                 ToastStore.sharedInstance().dismissToast(key);
             };
 
             const onDismiss = (): void => {
-                window.electron!.send("userDownloadAction", { id });
+                this.electron.send("userDownloadAction", { id });
             };
 
             ToastStore.sharedInstance().addOrReplaceToast({
@@ -180,23 +178,61 @@ export default class ElectronPlatform extends BasePlatform {
             });
         });
 
-        window.electron.on("openDesktopCapturerSourcePicker", async () => {
+        this.electron.on("openDesktopCapturerSourcePicker", async () => {
             const { finished } = Modal.createDialog(DesktopCapturerSourcePicker);
             const [source] = await finished;
             // getDisplayMedia promise does not return if no dummy is passed here as source
             await this.ipc.call("callDisplayMediaCallback", source ?? { id: "", name: "", thumbnailURL: "" });
         });
 
+        this.electron.on("showToast", async (ev, { title, description, priority = 40 }) => {
+            await this.clientStartedPromiseWithResolvers.promise;
+
+            const key = uniqueId("electron_showToast_");
+            const onPrimaryClick = (): void => {
+                ToastStore.sharedInstance().dismissToast(key);
+            };
+
+            ToastStore.sharedInstance().addOrReplaceToast({
+                key,
+                title,
+                props: {
+                    description,
+                    primaryLabel: _t("action|dismiss"),
+                    onPrimaryClick,
+                },
+                component: GenericToast,
+                priority,
+            });
+        });
+
         BreadcrumbsStore.instance.on(UPDATE_EVENT, this.onBreadcrumbsUpdate);
 
         this.initialised = this.initialise();
     }
 
+    protected onAction(payload: ActionPayload): void {
+        super.onAction(payload);
+        // Whitelist payload actions, no point sending most across
+        if (["call_state"].includes(payload.action)) {
+            this.electron.send("app_onAction", payload);
+        }
+
+        if (payload.action === Action.ClientStarted) {
+            this.clientStartedPromiseWithResolvers.resolve();
+        }
+    }
+
     private async initialise(): Promise<void> {
-        const { protocol, sessionId, config } = await window.electron!.initialise();
+        const { protocol, sessionId, config, supportedSettings, supportsBadgeOverlay } =
+            await this.electron.initialise();
         this.protocol = protocol;
         this.sessionId = sessionId;
         this.config = config;
+        this.supportedSettings = supportedSettings;
+        if (supportsBadgeOverlay) {
+            this.badgeOverlayRenderer = new BadgeOverlayRenderer();
+        }
     }
 
     public async getConfig(): Promise<IConfigOptions | undefined> {
@@ -247,8 +283,42 @@ export default class ElectronPlatform extends BasePlatform {
     public setNotificationCount(count: number): void {
         if (this.notificationCount === count) return;
         super.setNotificationCount(count);
+        if (this.badgeOverlayRenderer) {
+            this.badgeOverlayRenderer
+                .render(count)
+                .then((buffer) => {
+                    this.electron.send("setBadgeCount", count, buffer);
+                })
+                .catch((ex) => {
+                    logger.warn("Unable to generate badge overlay", ex);
+                });
+        } else {
+            this.electron.send("setBadgeCount", count);
+        }
+    }
 
-        window.electron!.send("setBadgeCount", count);
+    public setErrorStatus(errorDidOccur: boolean): void {
+        if (!this.badgeOverlayRenderer) {
+            super.setErrorStatus(errorDidOccur);
+            return;
+        }
+        // Check before calling super so we don't override the previous state.
+        if (this.errorDidOccur !== errorDidOccur) {
+            super.setErrorStatus(errorDidOccur);
+            let promise: Promise<ArrayBuffer | null>;
+            if (errorDidOccur) {
+                promise = this.badgeOverlayRenderer.render(this.notificationCount || "×", "#f00");
+            } else {
+                promise = this.badgeOverlayRenderer.render(this.notificationCount);
+            }
+            promise
+                .then((buffer) => {
+                    this.electron.send("setBadgeCount", this.notificationCount, buffer, errorDidOccur);
+                })
+                .catch((ex) => {
+                    logger.warn("Unable to generate badge overlay", ex);
+                });
+        }
     }
 
     public supportsNotifications(): boolean {
@@ -288,7 +358,7 @@ export default class ElectronPlatform extends BasePlatform {
     }
 
     public loudNotification(ev: MatrixEvent, room: Room): void {
-        window.electron!.send("loudNotification");
+        this.electron.send("loudNotification");
     }
 
     public needsUrlTooltips(): boolean {
@@ -300,21 +370,18 @@ export default class ElectronPlatform extends BasePlatform {
     }
 
     public supportsSetting(settingName?: string): boolean {
-        switch (settingName) {
-            case "Electron.showTrayIcon": // Things other than Mac support tray icons
-            case "Electron.alwaysShowMenuBar": // This isn't relevant on Mac as Menu bars don't live in the app window
-                return !isMac;
-            default:
-                return true;
-        }
+        if (settingName === undefined) return true;
+        return this.supportedSettings?.[settingName] === true;
     }
 
-    public getSettingValue(settingName: string): Promise<any> {
-        return this.ipc.call("getSettingValue", settingName);
+    public async getSettingValue(settingName: string): Promise<any> {
+        await this.initialised;
+        return this.electron.getSettingValue(settingName);
     }
 
-    public setSettingValue(settingName: string, value: any): Promise<void> {
-        return this.ipc.call("setSettingValue", settingName, value);
+    public async setSettingValue(settingName: string, value: any): Promise<void> {
+        await this.initialised;
+        return this.electron.setSettingValue(settingName, value);
     }
 
     public async canSelfUpdate(): Promise<boolean> {
@@ -324,14 +391,14 @@ export default class ElectronPlatform extends BasePlatform {
 
     public startUpdateCheck(): void {
         super.startUpdateCheck();
-        window.electron!.send("check_updates");
+        this.electron.send("check_updates");
     }
 
     public installUpdate(): void {
         // IPC to the main process to install the update, since quitAndInstall
         // doesn't fire the before-quit event so the main process needs to know
         // it should exit.
-        window.electron!.send("install_update");
+        this.electron.send("install_update");
     }
 
     public getDefaultDeviceDisplayName(): string {
@@ -493,4 +560,12 @@ export default class ElectronPlatform extends BasePlatform {
         }
         return url;
     }
+
+    public checkSessionLockFree(): boolean {
+        return true;
+    }
+
+    public async getSessionLock(_onNewInstance: () => Promise<void>): Promise<boolean> {
+        return true;
+    }
 }
diff --git a/src/vector/platform/IPCManager.ts b/src/vector/platform/IPCManager.ts
index dc183f0cfb..5a5bb9b0fb 100644
--- a/src/vector/platform/IPCManager.ts
+++ b/src/vector/platform/IPCManager.ts
@@ -11,7 +11,7 @@ import { type ElectronChannel } from "../../@types/global";
 
 interface IPCPayload {
     id?: number;
-    error?: string;
+    error?: string | { message: string };
     reply?: any;
 }
 
@@ -53,7 +53,12 @@ export class IPCManager {
         const callbacks = this.pendingIpcCalls[payload.id];
         delete this.pendingIpcCalls[payload.id];
         if (payload.error) {
-            callbacks.reject(payload.error);
+            // `seshat.ts` sends a JavaScript object with a `message` property. Turn it into a proper Error.
+            let error = payload.error;
+            if (typeof error === "object" && error.message) {
+                error = new Error(error.message);
+            }
+            callbacks.reject(error);
         } else {
             callbacks.resolve(payload.reply);
         }
diff --git a/src/vector/platform/WebPlatform.ts b/src/vector/platform/WebPlatform.ts
index 46b6a61f83..a794e160a4 100644
--- a/src/vector/platform/WebPlatform.ts
+++ b/src/vector/platform/WebPlatform.ts
@@ -22,6 +22,7 @@ import ToastStore from "../../stores/ToastStore.ts";
 import GenericToast from "../../components/views/toasts/GenericToast.tsx";
 import SdkConfig from "../../SdkConfig.ts";
 import type { ActionPayload } from "../../dispatcher/payloads.ts";
+import * as SessionLock from "../../utils/SessionLock.ts";
 
 const POKE_RATE_MS = 10 * 60 * 1000; // 10 min
 
@@ -52,7 +53,7 @@ export default class WebPlatform extends BasePlatform {
         super.onAction(payload);
 
         switch (payload.action) {
-            case "client_started":
+            case Action.ClientStarted:
                 // Defer drawing the toast until the client is started as the lifecycle methods reset the ToastStore right before
                 this.registerServiceWorkerPromise.catch(this.handleServiceWorkerRegistrationError);
                 break;
@@ -268,4 +269,12 @@ export default class WebPlatform extends BasePlatform {
     public reload(): void {
         window.location.reload();
     }
+
+    public checkSessionLockFree(): boolean {
+        return SessionLock.checkSessionLockFree();
+    }
+
+    public async getSessionLock(onNewInstance: () => Promise<void>): Promise<boolean> {
+        return SessionLock.getSessionLock(onNewInstance);
+    }
 }
diff --git a/src/verification.ts b/src/verification.ts
index 5dc3ea2979..e3e6fb2293 100644
--- a/src/verification.ts
+++ b/src/verification.ts
@@ -7,35 +7,24 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { type User, type MatrixClient, type RoomMember } from "matrix-js-sdk/src/matrix";
-import { CrossSigningKey, type VerificationRequest } from "matrix-js-sdk/src/crypto-api";
+import { type VerificationRequest } from "matrix-js-sdk/src/crypto-api";
 
 import dis from "./dispatcher/dispatcher";
 import { RightPanelPhases } from "./stores/right-panel/RightPanelStorePhases";
-import { accessSecretStorage } from "./SecurityManager";
 import RightPanelStore from "./stores/right-panel/RightPanelStore";
 import { type IRightPanelCardState } from "./stores/right-panel/RightPanelStoreIPanelState";
 import { findDMForUser } from "./utils/dm/findDMForUser";
 
-async function enable4SIfNeeded(matrixClient: MatrixClient): Promise<boolean> {
-    const crypto = matrixClient.getCrypto();
-    if (!crypto) return false;
-    const usk = await crypto.getCrossSigningKeyId(CrossSigningKey.UserSigning);
-    if (!usk) {
-        await accessSecretStorage();
-        return false;
-    }
-
-    return true;
-}
-
+/**
+ * Verify another user.
+ *
+ * Note: cross-signing must be set up before calling this function.
+ */
 export async function verifyUser(matrixClient: MatrixClient, user: User): Promise<void> {
     if (matrixClient.isGuest()) {
         dis.dispatch({ action: "require_registration" });
         return;
     }
-    if (!(await enable4SIfNeeded(matrixClient))) {
-        return;
-    }
     const existingRequest = pendingVerificationRequestForUser(matrixClient, user);
     setRightPanel({ member: user, verificationRequest: existingRequest });
 }
diff --git a/src/viewmodels/audio/AudioPlayerViewModel.ts b/src/viewmodels/audio/AudioPlayerViewModel.ts
new file mode 100644
index 0000000000..37588c5afd
--- /dev/null
+++ b/src/viewmodels/audio/AudioPlayerViewModel.ts
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { type ChangeEvent, type KeyboardEvent } from "react";
+import { logger } from "matrix-js-sdk/src/logger";
+import {
+    percentageOf,
+    BaseViewModel,
+    type AudioPlayerViewSnapshot,
+    type AudioPlayerViewModel as AudioPlayerViewModelInterface,
+} from "@element-hq/web-shared-components";
+
+import { type Playback } from "../../audio/Playback";
+import { UPDATE_EVENT } from "../../stores/AsyncStore";
+import { getKeyBindingsManager } from "../../KeyBindingsManager";
+import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
+
+/**
+ * The number of seconds to skip when the user presses the left or right arrow keys.
+ */
+const ARROW_SKIP_SECONDS = 5;
+
+interface Props {
+    /**
+     * The playback instance that manages the audio playback.
+     */
+    playback: Playback;
+    /**
+     * Optional name of the media being played.
+     */
+    mediaName?: string;
+}
+
+/**
+ * ViewModel for the audio player, providing the current state of the audio playback.
+ * It listens to updates from the Playback instance and computes a snapshot.
+ */
+export class AudioPlayerViewModel
+    extends BaseViewModel<AudioPlayerViewSnapshot, Props>
+    implements AudioPlayerViewModelInterface
+{
+    /**
+     * Indicates if there was an error processing the audio file.
+     * @private
+     */
+    private error = false;
+
+    /**
+     * Computes the snapshot of the audio player based on the current playback state.
+     * This includes the media name, size in bytes, playback state, duration, percentage complete,
+     * played seconds, and whether there was an error.
+     * @param playback - The playback instance managing the audio playback.
+     * @param mediaName - Optional name of the media being played.
+     * @param error - Indicates if there was an error processing the audio file.
+     */
+    private static readonly computeSnapshot = (
+        playback: Playback,
+        mediaName?: string,
+        error = false,
+    ): AudioPlayerViewSnapshot => {
+        const percentComplete = percentageOf(playback.timeSeconds, 0, playback.durationSeconds) * 100;
+
+        return {
+            mediaName,
+            sizeBytes: playback.sizeBytes,
+            playbackState: playback.currentState,
+            durationSeconds: playback.durationSeconds,
+            percentComplete,
+            playedSeconds: playback.timeSeconds,
+            error,
+        };
+    };
+
+    public constructor(props: Props) {
+        super(props, AudioPlayerViewModel.computeSnapshot(props.playback, props.mediaName));
+        this.disposables.trackListener(props.playback, UPDATE_EVENT, this.setSnapshot);
+        // There is no unsubscribe method in SimpleObservable
+        this.props.playback.clockInfo.liveData.onUpdate(this.setSnapshot);
+
+        // Don't wait for the promise to complete - it will emit a progress update when it
+        // is done, and it's not meant to take long anyhow.
+        this.preparePlayback();
+    }
+
+    /**
+     * Prepares the playback by calling the prepare method on the playback instance.
+     * @private
+     */
+    private async preparePlayback(): Promise<void> {
+        try {
+            await this.props.playback.prepare();
+        } catch (e) {
+            logger.error("Error processing audio file:", e, this.props.playback.currentState);
+            this.error = true;
+            this.setSnapshot();
+        }
+    }
+
+    /**
+     * Sets the snapshot and emits an update to subscribers.
+     */
+    private readonly setSnapshot = (): void => {
+        this.snapshot.set(AudioPlayerViewModel.computeSnapshot(this.props.playback, this.props.mediaName, this.error));
+    };
+
+    public onKeyDown = (ev: KeyboardEvent<HTMLDivElement>): void => {
+        let handled = true;
+        const action = getKeyBindingsManager().getAccessibilityAction(ev);
+
+        switch (action) {
+            case KeyBindingAction.Space:
+                this.togglePlay();
+                break;
+            case KeyBindingAction.ArrowLeft:
+                this.props.playback.skipTo(this.props.playback.timeSeconds - ARROW_SKIP_SECONDS);
+                break;
+            case KeyBindingAction.ArrowRight:
+                this.props.playback.skipTo(this.props.playback.timeSeconds + ARROW_SKIP_SECONDS);
+                break;
+            default:
+                handled = false;
+                break;
+        }
+
+        // stopPropagation() prevents the FocusComposer catch-all from triggering,
+        // but we need to do it on key down instead of press (even though the user
+        // interaction is typically on press).
+        if (handled) {
+            ev.stopPropagation();
+        }
+    };
+
+    public togglePlay = async (): Promise<void> => {
+        await this.props.playback.toggle();
+    };
+
+    public onSeekbarChange = async (ev: ChangeEvent<HTMLInputElement>): Promise<void> => {
+        await this.props.playback.skipTo((Number(ev.target.value) / 100) * this.props.playback.durationSeconds);
+    };
+
+    /**
+     * Updates the properties of the view model and recomputes the snapshot.
+     * @param newProps
+     */
+    public setProps(newProps: Partial<Props>): void {
+        this.props = { ...this.props, ...newProps };
+        this.setSnapshot();
+    }
+}
diff --git a/src/viewmodels/composer/HistoryVisibleBannerViewModel.tsx b/src/viewmodels/composer/HistoryVisibleBannerViewModel.tsx
new file mode 100644
index 0000000000..7d1ce9ec81
--- /dev/null
+++ b/src/viewmodels/composer/HistoryVisibleBannerViewModel.tsx
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import {
+    BaseViewModel,
+    type HistoryVisibleBannerViewModel as HistoryVisibleBannerViewModelInterface,
+    type HistoryVisibleBannerViewSnapshot,
+} from "@element-hq/web-shared-components";
+import { HistoryVisibility, RoomStateEvent, type Room } from "matrix-js-sdk/src/matrix";
+
+import SettingsStore from "../../settings/SettingsStore";
+import { SettingLevel } from "../../settings/SettingLevel";
+
+/**
+ * A collection of {@link HistoryVisibility} levels that trigger the display of the history visible banner.
+ */
+const BANNER_VISIBLE_LEVELS = [HistoryVisibility.Shared, HistoryVisibility.WorldReadable];
+
+interface Props {
+    /**
+     * The room instance associated with this banner view model.
+     */
+    room: Room;
+
+    /**
+     * Whether or not the current user is able to send messages in this room.
+     */
+    canSendMessages: boolean;
+
+    /**
+     * If not null, indicates the ID of the thread currently being viewed in the thread
+     * timeline side view, where the banner view is displayed as a child of the message
+     * composer.
+     */
+    threadId: string | null;
+}
+
+/**
+ * View model for the history visible banner, which prompts users that the current room
+ * history may be shared with new invitees, if they have not already acknowledged the
+ * banner.
+ *
+ * The view model operates using a simple 2-case algorithm:
+ *
+ * 1. When a user opens an encrypted room where `history_visibility` is not set to `joined`,
+ *    and the user hasn't previously dismissed it for this particular room, display a banner.
+ *    If the user dismisses the banner, update the client's local store to record that the
+ *    banner has been dismissed.
+ * 2. When the user opens an encrypted room where `history_visibility` is set to `joined`, clear
+ *    the dismissal flag if it was previously set. This ensures that if the room's history
+ *    visibility changes from public to private and back to public, the banner will reappear
+ *    when appropriate.
+ *
+ * This banner is only shown in the regular timeline view, not the thread timeline view, which is
+ * done by conditioning on the presence of `threadId` in the viewmodel's {@link Props}.
+ *
+ * See https://github.com/element-hq/element-meta/issues/2875 for more information.
+ */
+export class HistoryVisibleBannerViewModel
+    extends BaseViewModel<HistoryVisibleBannerViewSnapshot, Props>
+    implements HistoryVisibleBannerViewModelInterface
+{
+    /**
+     * Watcher ID for the "feature_share_history_on_invite" setting.
+     */
+    private readonly featureWatcher: string;
+
+    /**
+     * Watcher ID for the "acknowledgedHistoryVisibility" setting specific to the room.
+     */
+    private readonly acknowledgedWatcher: string;
+
+    /**
+     * Computes the latest banner snapshot given the VM's props.
+     * @param props - See {@link Props}.
+     * @returns The latest snapshot. See {@link HistoryVisibleBannerViewSnapshot}.
+     */
+    private static readonly computeSnapshot = ({
+        room,
+        canSendMessages,
+        threadId,
+    }: Props): HistoryVisibleBannerViewSnapshot => {
+        const featureEnabled = SettingsStore.getValue("feature_share_history_on_invite");
+        const acknowledged = SettingsStore.getValue("acknowledgedHistoryVisibility", room.roomId);
+        const isHistoryVisible = BANNER_VISIBLE_LEVELS.includes(room.getHistoryVisibility());
+
+        // This implements point 1. of the algorithm described above. In the order below, all
+        // of the following must be true for the banner to display:
+        // - The room history sharing feature must be enabled.
+        // - The room must be encrypted.
+        // - The user must be able to send messages.
+        // - The history must be visible.
+        // - The view should not be part of a thread timeline.
+        // - The user must not have acknowledged the banner.
+        return {
+            visible:
+                featureEnabled &&
+                room.hasEncryptionStateEvent() &&
+                canSendMessages &&
+                isHistoryVisible &&
+                !threadId &&
+                !acknowledged,
+        };
+    };
+
+    /**
+     * Creates a new view model instance.
+     * @param props - Properties for this view model. See {@link Props}.
+     */
+    public constructor(props: Props) {
+        super(props, HistoryVisibleBannerViewModel.computeSnapshot(props));
+
+        this.disposables.trackListener(props.room, RoomStateEvent.Update, () => this.setSnapshot());
+
+        // `SettingsStore` is not an `EventListener`, so we must manage these manually.
+        this.featureWatcher = SettingsStore.watchSetting(
+            "feature_share_history_on_invite",
+            null,
+            (_key, _roomId, _level, value: boolean) => this.setSnapshot(),
+        );
+        this.acknowledgedWatcher = SettingsStore.watchSetting(
+            "acknowledgedHistoryVisibility",
+            props.room.roomId,
+            (_key, _roomId, _level, value: boolean) => this.setSnapshot(),
+        );
+    }
+
+    /**
+     * Recompute and update this VM instance's snapshot. This will update the `acknowledgedHistoryVisibility`
+     * store entry if necessary.
+     */
+    private setSnapshot(): void {
+        const acknowledged = SettingsStore.getValue("acknowledgedHistoryVisibility", this.props.room.roomId);
+
+        // Reset the acknowleded flag when the history visibility is set back to joined.
+        if (this.props.room.getHistoryVisibility() === HistoryVisibility.Joined && acknowledged) {
+            SettingsStore.setValue(
+                "acknowledgedHistoryVisibility",
+                this.props.room.roomId,
+                SettingLevel.ROOM_ACCOUNT,
+                false,
+            );
+        }
+
+        this.snapshot.set(HistoryVisibleBannerViewModel.computeSnapshot(this.props));
+    }
+
+    /**
+     * Revoke the banner's acknoledgement status.
+     */
+    public async revoke(): Promise<void> {
+        await SettingsStore.setValue(
+            "acknowledgedHistoryVisibility",
+            this.props.room.roomId,
+            SettingLevel.ROOM_ACCOUNT,
+            false,
+        );
+    }
+
+    /**
+     * Called when the user dismisses the banner.
+     */
+    public async onClose(): Promise<void> {
+        await SettingsStore.setValue(
+            "acknowledgedHistoryVisibility",
+            this.props.room.roomId,
+            SettingLevel.ROOM_ACCOUNT,
+            true,
+        );
+    }
+
+    /**
+     * Dispose of the viewmodel and its settings listeners.
+     */
+    public dispose(): void {
+        super.dispose();
+        SettingsStore.unwatchSetting(this.featureWatcher);
+        SettingsStore.unwatchSetting(this.acknowledgedWatcher);
+    }
+}
diff --git a/src/viewmodels/event-tiles/TextualEventViewModel.ts b/src/viewmodels/event-tiles/TextualEventViewModel.ts
new file mode 100644
index 0000000000..46322c4590
--- /dev/null
+++ b/src/viewmodels/event-tiles/TextualEventViewModel.ts
@@ -0,0 +1,26 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { MatrixEventEvent } from "matrix-js-sdk/src/matrix";
+import { type TextualEventViewSnapshot, BaseViewModel } from "@element-hq/web-shared-components";
+
+import { type EventTileTypeProps } from "../../events/EventTileFactory";
+import { MatrixClientPeg } from "../../MatrixClientPeg";
+import { textForEvent } from "../../TextForEvent";
+
+export class TextualEventViewModel extends BaseViewModel<TextualEventViewSnapshot, EventTileTypeProps> {
+    public constructor(props: EventTileTypeProps) {
+        super(props, { content: "" });
+        this.setTextFromEvent();
+        this.disposables.trackListener(this.props.mxEvent, MatrixEventEvent.SentinelUpdated, this.setTextFromEvent);
+    }
+
+    private setTextFromEvent = (): void => {
+        const content = textForEvent(this.props.mxEvent, MatrixClientPeg.safeGet(), true, this.props.showHiddenEvents);
+        this.snapshot.set({ content });
+    };
+}
diff --git a/src/viewmodels/room-list/RoomListSearchViewModel.ts b/src/viewmodels/room-list/RoomListSearchViewModel.ts
new file mode 100644
index 0000000000..d1a15f99ea
--- /dev/null
+++ b/src/viewmodels/room-list/RoomListSearchViewModel.ts
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { type MouseEvent } from "react";
+import {
+    BaseViewModel,
+    type RoomListSearchViewSnapshot,
+    type RoomListSearchViewModel as RoomListSearchViewModelInterface,
+} from "@element-hq/web-shared-components";
+
+import { IS_MAC, Key } from "../../Keyboard";
+import { _t } from "../../languageHandler";
+import { ALTERNATE_KEY_NAME } from "../../accessibility/KeyboardShortcuts";
+import { shouldShowComponent } from "../../customisations/helpers/UIComponents";
+import { UIComponent } from "../../settings/UIFeature";
+import { MetaSpace } from "../../stores/spaces";
+import { Action } from "../../dispatcher/actions";
+import PosthogTrackers from "../../PosthogTrackers";
+import defaultDispatcher from "../../dispatcher/dispatcher";
+import LegacyCallHandler, { LegacyCallHandlerEvent } from "../../LegacyCallHandler";
+
+export interface Props {
+    /**
+     * Current active space
+     * The explore button is only displayed in the Home meta space
+     */
+    activeSpace: string;
+}
+
+/**
+ * ViewModel for the room list search component.
+ * Manages the state and actions for the search bar, dial pad, and explore buttons.
+ */
+export class RoomListSearchViewModel
+    extends BaseViewModel<RoomListSearchViewSnapshot, Props>
+    implements RoomListSearchViewModelInterface
+{
+    private displayDialButton = false;
+
+    /**
+     * Computes the snapshot based on the current props and PSTN support state.
+     */
+    private static readonly computeSnapshot = (
+        activeSpace: string,
+        supportsPstn: boolean,
+    ): RoomListSearchViewSnapshot => {
+        const displayExploreButton = activeSpace === MetaSpace.Home && shouldShowComponent(UIComponent.ExploreRooms);
+        const searchShortcut = IS_MAC ? "⌘ K" : _t(ALTERNATE_KEY_NAME[Key.CONTROL]) + " K";
+        return {
+            displayExploreButton,
+            displayDialButton: supportsPstn,
+            searchShortcut,
+        };
+    };
+
+    public constructor(props: Props) {
+        const supportsPstn = LegacyCallHandler.instance.getSupportsPstnProtocol();
+        super(props, RoomListSearchViewModel.computeSnapshot(props.activeSpace, supportsPstn));
+        this.displayDialButton = supportsPstn;
+
+        // Listen for changes in PSTN protocol support
+        this.disposables.trackListener(
+            LegacyCallHandler.instance,
+            LegacyCallHandlerEvent.ProtocolSupport,
+            this.onProtocolSupportChange,
+        );
+    }
+
+    /**
+     * Handles changes in protocol support (PSTN).
+     */
+    private readonly onProtocolSupportChange = (): void => {
+        const supportsPstn = LegacyCallHandler.instance.getSupportsPstnProtocol();
+        this.displayDialButton = supportsPstn;
+        this.snapshot.set(RoomListSearchViewModel.computeSnapshot(this.props.activeSpace, supportsPstn));
+    };
+
+    /**
+     * Handles the search button click event.
+     * Opens the spotlight search dialog.
+     */
+    public onSearchClick = (): void => {
+        defaultDispatcher.fire(Action.OpenSpotlight);
+    };
+
+    /**
+     * Handles the dial pad button click event.
+     * Opens the dial pad dialog.
+     */
+    public onDialPadClick = (): void => {
+        defaultDispatcher.fire(Action.OpenDialPad);
+    };
+
+    /**
+     * Handles the explore button click event.
+     * Opens the room directory and tracks the interaction.
+     */
+    public onExploreClick = (ev: MouseEvent<HTMLButtonElement>): void => {
+        defaultDispatcher.fire(Action.ViewRoomDirectory);
+        PosthogTrackers.trackInteraction("WebLeftPanelExploreRoomsButton", ev);
+    };
+
+    /**
+     * Sets the active space and updates the snapshot accordingly.
+     * @param activeSpace - The new active space ID.
+     */
+    public setActiveSpace(activeSpace: string): void {
+        if (activeSpace === this.props.activeSpace) return;
+
+        this.props.activeSpace = activeSpace;
+        this.snapshot.set(RoomListSearchViewModel.computeSnapshot(activeSpace, this.displayDialButton));
+    }
+}
diff --git a/test/CreateCrossSigning-test.ts b/test/CreateCrossSigning-test.ts
index cd2bf904cd..09bb3b5a63 100644
--- a/test/CreateCrossSigning-test.ts
+++ b/test/CreateCrossSigning-test.ts
@@ -45,7 +45,7 @@ describe("CreateCrossSigning", () => {
 
         const makeRequest = jest.fn();
         await authUploadDeviceSigningKeys!(makeRequest);
-        expect(makeRequest).toHaveBeenCalledWith({});
+        expect(makeRequest).toHaveBeenCalledWith(null);
     });
 
     it("should prompt user if upload failed with UIA", async () => {
diff --git a/test/setup/setupLanguage.ts b/test/setup/setupLanguage.ts
index 347f38edfc..124ff7cbbd 100644
--- a/test/setup/setupLanguage.ts
+++ b/test/setup/setupLanguage.ts
@@ -7,10 +7,12 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import fetchMock from "fetch-mock-jest";
+import { ModuleLoader } from "@element-hq/element-web-module-api";
 
 import * as languageHandler from "../../src/languageHandler";
 import en from "../../src/i18n/strings/en_EN.json";
 import de from "../../src/i18n/strings/de_DE.json";
+import { ModuleApi } from "../../src/modules/Api";
 
 const lv = {
     Save: "Saglabāt",
@@ -43,3 +45,7 @@ setupLanguageMock();
 
 languageHandler.setLanguage("en");
 languageHandler.setMissingEntryGenerator((key) => key.split("|", 2)[1]);
+
+// Set up the mdule API (so the i18n API exists)
+const moduleLoader = new ModuleLoader(ModuleApi.instance);
+window.mxModuleLoader = moduleLoader;
diff --git a/test/setupTests.ts b/test/setupTests.ts
index 144f27e15a..7e68edf19d 100644
--- a/test/setupTests.ts
+++ b/test/setupTests.ts
@@ -6,12 +6,14 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
+import { env } from "process";
 import "@testing-library/jest-dom";
 import "blob-polyfill";
 import { secureRandomString } from "matrix-js-sdk/src/randomstring";
 import { mocked } from "jest-mock";
 
-import { PredictableRandom } from "./test-utils/predictableRandom"; // https://github.com/jsdom/jsdom/issues/2555
+import { PredictableRandom } from "./test-utils/predictableRandom";
+import * as rageshake from "../src/rageshake/rageshake";
 
 declare global {
     // eslint-disable-next-line no-var
@@ -37,6 +39,23 @@ beforeEach(() => {
     });
 });
 
+// Somewhat hacky workaround for https://github.com/jestjs/jest/issues/15747: if the GHA reporter is enabled,
+// capture logs using the rageshake infrastructure, then dump them out after the test.
+if (env["GITHUB_ACTIONS"] !== undefined) {
+    beforeEach(async () => {
+        await rageshake.init(/* setUpPersistence = */ false);
+    });
+
+    afterEach(async () => {
+        const logs = global.mx_rage_logger.flush(/* keeplogs = */ false);
+        if (logs) {
+            process.stderr.write(`::group::Console logs from test '${expect.getState().currentTestName}'\n\n`);
+            process.stderr.write(logs);
+            process.stderr.write("::endgroup::\n");
+        }
+    });
+}
+
 // Very carefully enable the mocks for everything else in
 // a specific order. We use this order to ensure we properly
 // establish an application state that actually works.
diff --git a/test/test-utils/call.ts b/test/test-utils/call.ts
index a0a1c84536..90ef5d1ea2 100644
--- a/test/test-utils/call.ts
+++ b/test/test-utils/call.ts
@@ -7,11 +7,29 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { MatrixWidgetType } from "matrix-widget-api";
+import {
+    type GroupCall,
+    Room,
+    type RoomMember,
+    type MatrixEvent,
+    type MatrixClient,
+    PendingEventOrdering,
+    KnownMembership,
+    RoomStateEvent,
+    type IContent,
+} from "matrix-js-sdk/src/matrix";
+import { mocked, type Mocked } from "jest-mock";
+import { type MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
 
-import type { GroupCall, Room, RoomMember, MatrixEvent } from "matrix-js-sdk/src/matrix";
-import { mkEvent } from "./test-utils";
+import { mkEvent, mkRoomMember, setupAsyncStoreWithClient, stubClient } from "./test-utils";
 import { Call, type ConnectionState, ElementCall, JitsiCall } from "../../src/models/Call";
 import { CallStore } from "../../src/stores/CallStore";
+import { MatrixClientPeg } from "../../src/MatrixClientPeg";
+import DMRoomMap from "../../src/utils/DMRoomMap";
+import { MockEventEmitter } from "./client";
+import WidgetStore from "../../src/stores/WidgetStore";
+import { WidgetMessagingStore } from "../../src/stores/widgets/WidgetMessagingStore";
+import SettingsStore from "../../src/settings/SettingsStore";
 
 export class MockedCall extends Call {
     public static readonly EVENT_TYPE = "org.example.mocked_call";
@@ -79,7 +97,6 @@ export class MockedCall extends Call {
     // No action needed for any of the following methods since this is just a mock
     public async clean(): Promise<void> {}
     // Public to allow spying
-    public async performConnection(): Promise<void> {}
     public async performDisconnection(): Promise<void> {}
 
     public destroy() {
@@ -106,8 +123,93 @@ export class MockedCall extends Call {
 /**
  * Sets up the call store to use mocked calls.
  */
-export const useMockedCalls = () => {
+export function useMockedCalls() {
     Call.get = (room) => MockedCall.get(room);
     JitsiCall.create = async (room) => MockedCall.create(room, "1");
     ElementCall.create = (room) => MockedCall.create(room, "1");
-};
+}
+
+/**
+ * Enables the feature flags required for call tests.
+ */
+export function enableCalls(): { enabledSettings: Set<string> } {
+    const enabledSettings = new Set(["feature_group_calls", "feature_video_rooms", "feature_element_call_video_rooms"]);
+    jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName): any => {
+        if (settingName.startsWith("feature_")) return enabledSettings.has(settingName);
+        if (settingName === "activeCallRoomIds") return [];
+        return undefined;
+    });
+    return { enabledSettings };
+}
+
+export function setUpClientRoomAndStores(): {
+    client: Mocked<MatrixClient>;
+    room: Room;
+    alice: RoomMember;
+    bob: RoomMember;
+    carol: RoomMember;
+    roomSession: Mocked<MatrixRTCSession>;
+} {
+    stubClient();
+    const client = mocked<MatrixClient>(MatrixClientPeg.safeGet());
+    DMRoomMap.makeShared(client);
+
+    const room = new Room("!1:example.org", client, "@alice:example.org", {
+        pendingEventOrdering: PendingEventOrdering.Detached,
+    });
+
+    const alice = mkRoomMember(room.roomId, "@alice:example.org");
+    const bob = mkRoomMember(room.roomId, "@bob:example.org");
+    const carol = mkRoomMember(room.roomId, "@carol:example.org");
+    jest.spyOn(room, "getMember").mockImplementation((userId) => {
+        switch (userId) {
+            case alice.userId:
+                return alice;
+            case bob.userId:
+                return bob;
+            case carol.userId:
+                return carol;
+            default:
+                return null;
+        }
+    });
+
+    jest.spyOn(room, "getMyMembership").mockReturnValue(KnownMembership.Join);
+
+    client.getRoom.mockImplementation((roomId) => (roomId === room.roomId ? room : null));
+
+    const roomSession = new MockEventEmitter({
+        memberships: [],
+        getOldestMembership: jest.fn().mockReturnValue(undefined),
+        getConsensusCallIntent: jest.fn().mockReturnValue(undefined),
+        room,
+    }) as Mocked<MatrixRTCSession>;
+
+    client.matrixRTC.getRoomSession.mockReturnValue(roomSession);
+    client.getRooms.mockReturnValue([room]);
+    client.getUserId.mockReturnValue(alice.userId);
+    client.getDeviceId.mockReturnValue("alices_device");
+    client.reEmitter.reEmit(room, [RoomStateEvent.Events]);
+    client.sendStateEvent.mockImplementation(async (roomId, eventType, content, stateKey = "") => {
+        if (roomId !== room.roomId) throw new Error("Unknown room");
+        const event = mkEvent({
+            event: true,
+            type: eventType,
+            room: roomId,
+            user: alice.userId,
+            skey: stateKey,
+            content: content as IContent,
+        });
+        room.addLiveEvents([event], { addToState: true });
+        return { event_id: event.getId()! };
+    });
+
+    setupAsyncStoreWithClient(WidgetStore.instance, client);
+    setupAsyncStoreWithClient(WidgetMessagingStore.instance, client);
+
+    return { client, room, alice, bob, carol, roomSession };
+}
+
+export function cleanUpClientRoomAndStores(client: MatrixClient, room: Room) {
+    client.reEmitter.stopReEmitting(room, [RoomStateEvent.Events]);
+}
diff --git a/test/test-utils/client.ts b/test/test-utils/client.ts
index cdda7b7dea..f4d35220c2 100644
--- a/test/test-utils/client.ts
+++ b/test/test-utils/client.ts
@@ -9,7 +9,7 @@ Please see LICENSE files in the repository root for full details.
 import EventEmitter from "events";
 import { type MethodLikeKeys, mocked, type MockedObject, type PropertyLikeKeys } from "jest-mock";
 import { Feature, ServerSupport } from "matrix-js-sdk/src/feature";
-import { type MatrixClient, type Room, MatrixError, User } from "matrix-js-sdk/src/matrix";
+import { type MatrixClient, type Room, User } from "matrix-js-sdk/src/matrix";
 
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
 
@@ -138,7 +138,6 @@ export const mockClientMethodsServer = (): Partial<Record<MethodLikeKeys<MatrixC
     isVersionSupported: jest.fn().mockResolvedValue(false),
     getVersions: jest.fn().mockResolvedValue({}),
     isFallbackICEServerAllowed: jest.fn(),
-    getAuthIssuer: jest.fn().mockRejectedValue(new MatrixError({ errcode: "M_UNKNOWN" }, 404)),
 });
 
 export const mockClientMethodsDevice = (
@@ -153,7 +152,11 @@ export const mockClientMethodsCrypto = (): Partial<
 > => ({
     isKeyBackupKeyStored: jest.fn(),
     getCrossSigningCacheCallbacks: jest.fn().mockReturnValue({ getCrossSigningKeyCache: jest.fn() }),
-    secretStorage: { hasKey: jest.fn(), isStored: jest.fn().mockResolvedValue(null) },
+    secretStorage: {
+        hasKey: jest.fn(),
+        isStored: jest.fn().mockResolvedValue(null),
+        getDefaultKeyId: jest.fn().mockResolvedValue(null),
+    },
     getCrypto: jest.fn().mockReturnValue({
         getUserDeviceInfo: jest.fn(),
         getCrossSigningStatus: jest.fn().mockResolvedValue({
diff --git a/test/test-utils/composer.ts b/test/test-utils/composer.ts
index 6439e70fc2..956648a472 100644
--- a/test/test-utils/composer.ts
+++ b/test/test-utils/composer.ts
@@ -25,7 +25,7 @@ export const addTextToComposer = (container: HTMLElement, text: string) =>
 
 export const addTextToComposerRTL = async (renderResult: RenderResult, text: string): Promise<void> => {
     await act(async () => {
-        await userEvent.click(renderResult.getByLabelText("Send a message…"));
+        await userEvent.click(renderResult.getByLabelText("Send an unencrypted message…"));
         await userEvent.keyboard(text);
     });
 };
diff --git a/test/test-utils/jest-matrix-react.tsx b/test/test-utils/jest-matrix-react.tsx
index ed5ff0075e..76150df478 100644
--- a/test/test-utils/jest-matrix-react.tsx
+++ b/test/test-utils/jest-matrix-react.tsx
@@ -10,17 +10,33 @@ import React, { type ReactElement } from "react";
 // eslint-disable-next-line no-restricted-imports
 import { render, type RenderOptions } from "@testing-library/react";
 import { TooltipProvider } from "@vector-im/compound-web";
+import { I18nContext } from "@element-hq/web-shared-components";
 
-const wrapWithTooltipProvider = (Wrapper: RenderOptions["wrapper"]) => {
+/**
+ * Wraps the provided components in:
+ *  * A TooltipProvider
+ *  * An I18nContext.Provider
+ *
+ * ...plus any wrapper provided in the options.
+ * @param Wrapper Additional wrapper to include
+ * @returns The wrapped component
+ */
+const wrapWithStandardContexts = (Wrapper: RenderOptions["wrapper"]) => {
     return ({ children }: { children: React.ReactNode }) => {
         if (Wrapper) {
             return (
                 <Wrapper>
-                    <TooltipProvider>{children}</TooltipProvider>
+                    <I18nContext.Provider value={window.mxModuleApi.i18n}>
+                        <TooltipProvider>{children}</TooltipProvider>
+                    </I18nContext.Provider>
                 </Wrapper>
             );
         } else {
-            return <TooltipProvider>{children}</TooltipProvider>;
+            return (
+                <TooltipProvider>
+                    <I18nContext.Provider value={window.mxModuleApi.i18n}>{children}</I18nContext.Provider>
+                </TooltipProvider>
+            );
         }
     };
 };
@@ -28,7 +44,7 @@ const wrapWithTooltipProvider = (Wrapper: RenderOptions["wrapper"]) => {
 const customRender = (ui: ReactElement, options: RenderOptions = {}) => {
     return render(ui, {
         ...options,
-        wrapper: wrapWithTooltipProvider(options?.wrapper) as RenderOptions["wrapper"],
+        wrapper: wrapWithStandardContexts(options?.wrapper) as RenderOptions["wrapper"],
     }) as ReturnType<typeof render>;
 };
 
diff --git a/test/test-utils/platform.ts b/test/test-utils/platform.ts
index 3769826576..ec742a407e 100644
--- a/test/test-utils/platform.ts
+++ b/test/test-utils/platform.ts
@@ -10,6 +10,7 @@ import { type MethodLikeKeys, mocked, type MockedObject } from "jest-mock";
 
 import BasePlatform from "../../src/BasePlatform";
 import PlatformPeg from "../../src/PlatformPeg";
+import * as SessionLock from "../../src/utils/SessionLock";
 
 // doesn't implement abstract
 // @ts-ignore
@@ -18,6 +19,14 @@ class MockPlatform extends BasePlatform {
         super();
         Object.assign(this, platformMocks);
     }
+
+    public checkSessionLockFree(): boolean {
+        return SessionLock.checkSessionLockFree();
+    }
+
+    public async getSessionLock(onNewInstance: () => Promise<void>): Promise<boolean> {
+        return SessionLock.getSessionLock(onNewInstance);
+    }
 }
 /**
  * Mock Platform Peg
diff --git a/test/test-utils/room.ts b/test/test-utils/room.ts
index d4c6466ef2..ecce6818b0 100644
--- a/test/test-utils/room.ts
+++ b/test/test-utils/room.ts
@@ -10,10 +10,11 @@ import { type MockedObject } from "jest-mock";
 import { type EventTimeline, EventType, type MatrixClient, type MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 
-import { type IRoomState, MainSplitContentType } from "../../src/components/structures/RoomView";
-import { TimelineRenderingType } from "../../src/contexts/RoomContext";
+import { MainSplitContentType } from "../../src/components/structures/RoomView";
+import { type RoomContextType, TimelineRenderingType } from "../../src/contexts/RoomContext";
 import { Layout } from "../../src/settings/enums/Layout";
 import { mkEvent } from "./test-utils";
+import { SdkContextClass } from "../../src/contexts/SDKContext";
 
 export const makeMembershipEvent = (roomId: string, userId: string, membership = KnownMembership.Join) =>
     mkEvent({
@@ -42,8 +43,9 @@ export const makeRoomWithStateEvents = (
     return room1;
 };
 
-export function getRoomContext(room: Room, override: Partial<IRoomState>): IRoomState {
+export function getRoomContext(room: Room, override: Partial<RoomContextType>): RoomContextType {
     return {
+        roomViewStore: SdkContextClass.instance.roomViewStore,
         room,
         roomLoading: true,
         peekLoading: false,
diff --git a/test/test-utils/test-utils.ts b/test/test-utils/test-utils.ts
index 8243fe5083..d3d6e0bec1 100644
--- a/test/test-utils/test-utils.ts
+++ b/test/test-utils/test-utils.ts
@@ -9,6 +9,7 @@ Please see LICENSE files in the repository root for full details.
 import EventEmitter from "events";
 import { mocked, type MockedObject } from "jest-mock";
 import {
+    type EventTimeline,
     MatrixEvent,
     type Room,
     type User,
@@ -16,8 +17,7 @@ import {
     type IEvent,
     type RoomMember,
     type MatrixClient,
-    type EventTimeline,
-    type RoomState,
+    RoomState,
     EventType,
     type IEventRelation,
     type IUnsigned,
@@ -30,6 +30,8 @@ import {
     JoinRule,
     type OidcClientConfig,
     type GroupCall,
+    HistoryVisibility,
+    type ICreateRoomOpts,
 } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { normalize } from "matrix-js-sdk/src/utils";
@@ -84,6 +86,7 @@ export function createTestClient(): MatrixClient {
     const eventEmitter = new EventEmitter();
 
     let txnId = 1;
+    let createdRoom: Room | undefined;
 
     const client = {
         getHomeserverUrl: jest.fn(),
@@ -99,6 +102,7 @@ export function createTestClient(): MatrixClient {
         getDevices: jest.fn().mockResolvedValue({ devices: [{ device_id: "ABCDEFGHI" }] }),
         getSessionId: jest.fn().mockReturnValue("iaszphgvfku"),
         credentials: { userId: "@userId:matrix.org" },
+        getAccessToken: jest.fn(),
 
         secretStorage: {
             get: jest.fn(),
@@ -122,6 +126,7 @@ export function createTestClient(): MatrixClient {
             getDeviceVerificationStatus: jest.fn(),
             resetKeyBackup: jest.fn(),
             isEncryptionEnabledInRoom: jest.fn().mockResolvedValue(false),
+            isStateEncryptionEnabledInRoom: jest.fn().mockResolvedValue(false),
             getVerificationRequestsToDeviceInProgress: jest.fn().mockReturnValue([]),
             setDeviceIsolationMode: jest.fn(),
             prepareToEncrypt: jest.fn(),
@@ -156,10 +161,18 @@ export function createTestClient(): MatrixClient {
             getSessionBackupPrivateKey: jest.fn().mockResolvedValue(null),
             isSecretStorageReady: jest.fn().mockResolvedValue(false),
             deleteKeyBackupVersion: jest.fn(),
+            crossSignDevice: jest.fn(),
         }),
 
         getPushActionsForEvent: jest.fn(),
-        getRoom: jest.fn().mockImplementation((roomId) => mkStubRoom(roomId, "My room", client)),
+        getRoom: jest.fn().mockImplementation((roomId) => {
+            // If the test called `createRoom`, return the mocked room it created.
+            if (createdRoom) {
+                return createdRoom;
+            } else {
+                return mkStubRoom(roomId, "My room", client);
+            }
+        }),
         getRooms: jest.fn().mockReturnValue([]),
         getVisibleRooms: jest.fn().mockReturnValue([]),
         loginFlows: jest.fn(),
@@ -193,22 +206,41 @@ export function createTestClient(): MatrixClient {
                 content: {},
             });
         }),
+        getAccountDataFromServer: jest.fn(),
         mxcUrlToHttp: jest.fn().mockImplementation((mxc: string) => `http://this.is.a.url/${mxc.substring(6)}`),
         setAccountData: jest.fn(),
         deleteAccountData: jest.fn(),
         setRoomAccountData: jest.fn(),
+        setRoomName: jest.fn(),
         setRoomTopic: jest.fn(),
         setRoomReadMarkers: jest.fn().mockResolvedValue({}),
         sendTyping: jest.fn().mockResolvedValue({}),
         sendMessage: jest.fn().mockResolvedValue({}),
         sendStateEvent: jest.fn().mockResolvedValue(undefined),
+        sendRtcDecline: jest.fn().mockResolvedValue(undefined),
         getSyncState: jest.fn().mockReturnValue("SYNCING"),
         generateClientSecret: () => "t35tcl1Ent5ECr3T",
         isGuest: jest.fn().mockReturnValue(false),
         getRoomHierarchy: jest.fn().mockReturnValue({
             rooms: [],
         }),
-        createRoom: jest.fn().mockResolvedValue({ room_id: "!1:example.org" }),
+        createRoom: jest.fn(async (createOpts?: ICreateRoomOpts) => {
+            const initialState = createOpts?.initial_state?.map((event, i) =>
+                mkEvent({
+                    ...event,
+                    room: "!1:example.org",
+                    user: "@user:example.com",
+                    event: true,
+                }),
+            );
+            createdRoom = mkStubRoom(
+                "!1:example.org",
+                "My room",
+                client,
+                initialState && mkRoomState("!1:example.org", initialState),
+            );
+            return { room_id: "!1:example.org" };
+        }),
         setPowerLevel: jest.fn().mockResolvedValue(undefined),
         pushRules: {},
         decryptEventIfNeeded: () => Promise.resolve(),
@@ -273,7 +305,11 @@ export function createTestClient(): MatrixClient {
 
         _unstable_sendDelayedEvent: jest.fn(),
         _unstable_sendDelayedStateEvent: jest.fn(),
-        _unstable_updateDelayedEvent: jest.fn(),
+        _unstable_cancelScheduledDelayedEvent: jest.fn(),
+        _unstable_restartScheduledDelayedEvent: jest.fn(),
+        _unstable_sendScheduledDelayedEvent: jest.fn(),
+        _unstable_sendStickyEvent: jest.fn(),
+        _unstable_sendStickyDelayedEvent: jest.fn(),
 
         searchUserDirectory: jest.fn().mockResolvedValue({ limited: false, results: [] }),
         setDeviceVerified: jest.fn(),
@@ -609,10 +645,11 @@ export function mkStubRoom(
     roomId: string | null | undefined = null,
     name: string | undefined,
     client: MatrixClient | undefined,
+    state?: RoomState | undefined,
 ): Room {
     const stubTimeline = {
         getEvents: (): MatrixEvent[] => [],
-        getState: (): RoomState | undefined => undefined,
+        getState: (): RoomState | undefined => state,
     } as unknown as EventTimeline;
     return {
         canInvite: jest.fn().mockReturnValue(false),
@@ -621,6 +658,7 @@ export function mkStubRoom(
         createThreadsTimelineSets: jest.fn().mockReturnValue(new Promise(() => {})),
         currentState: {
             getStateEvents: jest.fn((_type, key) => (key === undefined ? [] : null)),
+            getHistoryVisibility: jest.fn().mockReturnValue(HistoryVisibility.Joined),
             getMember: jest.fn(),
             mayClientSendStateEvent: jest.fn().mockReturnValue(true),
             maySendStateEvent: jest.fn().mockReturnValue(true),
@@ -641,12 +679,14 @@ export function mkStubRoom(
         getCanonicalAlias: jest.fn(),
         getDMInviter: jest.fn(),
         getEventReadUpTo: jest.fn(() => null),
+        getHistoryVisibility: jest.fn().mockReturnValue(HistoryVisibility.Joined),
         getInvitedAndJoinedMemberCount: jest.fn().mockReturnValue(1),
         getJoinRule: jest.fn().mockReturnValue("invite"),
         getJoinedMemberCount: jest.fn().mockReturnValue(1),
         getJoinedMembers: jest.fn().mockReturnValue([]),
         getLiveTimeline: jest.fn().mockReturnValue(stubTimeline),
         getLastLiveEvent: jest.fn().mockReturnValue(undefined),
+        getLastActiveTimestamp: jest.fn().mockReturnValue(1183140000),
         getMember: jest.fn().mockReturnValue({
             userId: "@member:domain.bla",
             name: "Member",
@@ -692,6 +732,22 @@ export function mkStubRoom(
     } as unknown as Room;
 }
 
+export function mkRoomState(
+    roomId: string = "!1:example.org",
+    stateEvents: MatrixEvent[] = [],
+    members: RoomMember[] = [],
+): RoomState {
+    const roomState = new RoomState(roomId);
+
+    roomState.setStateEvents(stateEvents);
+
+    for (const member of members) {
+        roomState.members[member.userId] = member;
+    }
+
+    return roomState;
+}
+
 export function mkServerConfig(
     hsUrl: string,
     isUrl: string,
diff --git a/test/test-utils/utilities.ts b/test/test-utils/utilities.ts
index dd3e5e6a62..fef20bddad 100644
--- a/test/test-utils/utilities.ts
+++ b/test/test-utils/utilities.ts
@@ -188,35 +188,11 @@ export const waitEnoughCyclesForModal = async ({
 };
 
 /**
- * A horrible hack necessary to make sure modals don't leak and pollute tests.
- * `jest-matrix-react` automatic cleanup function does not pick up the async modal
- * rendering and the modals don't unmount when the component unmounts. We should strive
- * to fix this.
+ * Clears all modals that are currently open.
  */
 export const clearAllModals = async (): Promise<void> => {
     // Prevent modals from leaking and polluting other tests
-    let keepClosingModals = true;
-    while (keepClosingModals) {
-        keepClosingModals = await act(() => Modal.closeCurrentModal());
-
-        // Then wait for the screen to update (probably React rerender and async/await).
-        // Important for tests using Jest fake timers to not get into an infinite loop
-        // of removing the same modal because the promises don't flush otherwise.
-        //
-        // XXX: Maybe in the future with Jest 29.5.0+, we could use `runAllTimersAsync` instead.
-
-        // this is called in some places where timers are not faked
-        // which causes a lot of noise in the console
-        // to make a hack even hackier check if timers are faked using a weird trick from github
-        // then call the appropriate promise flusher
-        // https://github.com/facebook/jest/issues/10555#issuecomment-1136466942
-        const jestTimersFaked = setTimeout.name === "setTimeout";
-        if (jestTimersFaked) {
-            await flushPromisesWithFakeTimers();
-        } else {
-            await flushPromises();
-        }
-    }
+    act(() => Modal.forceCloseAllModals());
 };
 
 /** Install a stub object at `navigator.mediaDevices` */
diff --git a/test/test-utils/wrappers.tsx b/test/test-utils/wrappers.tsx
index 7c4fd4b968..99ceae7f94 100644
--- a/test/test-utils/wrappers.tsx
+++ b/test/test-utils/wrappers.tsx
@@ -62,3 +62,13 @@ export function withClientContextRenderOptions(client: MatrixClient): RenderOpti
         ),
     };
 }
+
+export function clientAndSDKContextRenderOptions(client: MatrixClient, sdkContext: SdkContextClass): RenderOptions {
+    return {
+        wrapper: ({ children }) => (
+            <SDKContext.Provider value={sdkContext}>
+                <MatrixClientContext.Provider value={client}>{children}</MatrixClientContext.Provider>
+            </SDKContext.Provider>
+        ),
+    };
+}
diff --git a/test/unit-tests/Avatar-test.ts b/test/unit-tests/Avatar-test.ts
index ced974a059..72e313db28 100644
--- a/test/unit-tests/Avatar-test.ts
+++ b/test/unit-tests/Avatar-test.ts
@@ -68,7 +68,7 @@ describe("avatarUrlForRoom", () => {
     });
 
     it("should return null if the room is not a DM", () => {
-        mocked(dmRoomMap).getUserIdForRoomId.mockReturnValue(null);
+        mocked(dmRoomMap).getUserIdForRoomId.mockReturnValue(undefined);
         expect(avatarUrlForRoom(room, 128, 128)).toBeNull();
         expect(dmRoomMap.getUserIdForRoomId).toHaveBeenCalledWith(roomId);
     });
diff --git a/test/unit-tests/ContentMessages-test.ts b/test/unit-tests/ContentMessages-test.ts
index 80b400568e..51bb73fbfd 100644
--- a/test/unit-tests/ContentMessages-test.ts
+++ b/test/unit-tests/ContentMessages-test.ts
@@ -10,6 +10,7 @@ import { mocked } from "jest-mock";
 import {
     type ISendEventResponse,
     type MatrixClient,
+    MatrixError,
     RelationType,
     type UploadResponse,
 } from "matrix-js-sdk/src/matrix";
@@ -20,6 +21,9 @@ import ContentMessages, { UploadCanceledError, uploadFile } from "../../src/Cont
 import { doMaybeLocalRoomAction } from "../../src/utils/local-room";
 import { createTestClient, flushPromises, mkEvent } from "../test-utils";
 import { BlurhashEncoder } from "../../src/BlurhashEncoder";
+import Modal from "../../src/Modal";
+import ErrorDialog from "../../src/components/views/dialogs/ErrorDialog";
+import { _t } from "../../src/languageHandler";
 
 jest.mock("matrix-encrypt-attachment", () => ({ encryptAttachment: jest.fn().mockResolvedValue({}) }));
 
@@ -291,6 +295,28 @@ describe("ContentMessages", () => {
                 }),
             );
         });
+
+        it("handles 413 error", async () => {
+            mocked(client.uploadContent).mockRejectedValue(
+                new MatrixError(
+                    {
+                        errcode: "M_TOO_LARGE",
+                        error: "File size limit exceeded",
+                    },
+                    413,
+                ),
+            );
+            const file = new File([], "fileName", { type: "image/jpeg" });
+            const dialogSpy = jest.spyOn(Modal, "createDialog");
+            await contentMessages.sendContentToRoom(file, roomId, undefined, client, undefined);
+            expect(dialogSpy).toHaveBeenCalledWith(
+                ErrorDialog,
+                expect.objectContaining({
+                    description: _t("upload_failed_size", { fileName: "fileName" }),
+                }),
+            );
+            dialogSpy.mockRestore();
+        });
     });
 
     describe("getCurrentUploads", () => {
diff --git a/test/unit-tests/DecryptionFailureTracker-test.ts b/test/unit-tests/DecryptionFailureTracker-test.ts
index 754a621a4f..bad06a59c0 100644
--- a/test/unit-tests/DecryptionFailureTracker-test.ts
+++ b/test/unit-tests/DecryptionFailureTracker-test.ts
@@ -125,8 +125,8 @@ describe("DecryptionFailureTracker", function () {
 
         // use three different errors so that we can distinguish the reports
         const error1 = DecryptionFailureCode.MEGOLM_UNKNOWN_INBOUND_SESSION_ID;
-        const error2 = DecryptionFailureCode.MEGOLM_BAD_ROOM;
-        const error3 = DecryptionFailureCode.MEGOLM_MISSING_FIELDS;
+        const error2 = DecryptionFailureCode.MEGOLM_KEY_WITHHELD_FOR_UNVERIFIED_DEVICE;
+        const error3 = DecryptionFailureCode.MEGOLM_KEY_WITHHELD;
 
         // event that will be marked as visible before it's marked as undecryptable
         const markedVisibleFirst = await createFailedDecryptionEvent({ code: error1 });
@@ -536,8 +536,8 @@ describe("DecryptionFailureTracker", function () {
 
         // use three different errors so that we can distinguish the reports
         const error1 = DecryptionFailureCode.MEGOLM_UNKNOWN_INBOUND_SESSION_ID;
-        const error2 = DecryptionFailureCode.MEGOLM_BAD_ROOM;
-        const error3 = DecryptionFailureCode.MEGOLM_MISSING_FIELDS;
+        const error2 = DecryptionFailureCode.MEGOLM_KEY_WITHHELD_FOR_UNVERIFIED_DEVICE;
+        const error3 = DecryptionFailureCode.MEGOLM_KEY_WITHHELD;
 
         // event that will be slow to decrypt
         const lateDecryption = await createFailedDecryptionEvent({ code: error1 });
@@ -638,8 +638,8 @@ describe("DecryptionFailureTracker", function () {
 
         // use three different errors so that we can distinguish the reports
         const error1 = DecryptionFailureCode.MEGOLM_UNKNOWN_INBOUND_SESSION_ID;
-        const error2 = DecryptionFailureCode.MEGOLM_BAD_ROOM;
-        const error3 = DecryptionFailureCode.MEGOLM_MISSING_FIELDS;
+        const error2 = DecryptionFailureCode.MEGOLM_KEY_WITHHELD_FOR_UNVERIFIED_DEVICE;
+        const error3 = DecryptionFailureCode.MEGOLM_KEY_WITHHELD;
 
         // event from a federated user (@alice:example.com)
         const federatedDecryption = await createFailedDecryptionEvent({
diff --git a/test/unit-tests/DeviceListener-test.ts b/test/unit-tests/DeviceListener-test.ts
index 62221d0665..153739dea6 100644
--- a/test/unit-tests/DeviceListener-test.ts
+++ b/test/unit-tests/DeviceListener-test.ts
@@ -21,6 +21,7 @@ import {
     type CryptoApi,
     DeviceVerificationStatus,
     type KeyBackupInfo,
+    type SecretStorageStatus,
 } from "matrix-js-sdk/src/crypto-api";
 import { type CryptoSessionStateChange } from "@matrix-org/analytics-events/types/typescript/CryptoSessionStateChange";
 
@@ -59,6 +60,18 @@ const deviceId = "my-device-id";
 const mockDispatcher = mocked(dis);
 const flushPromises = async () => await new Promise(process.nextTick);
 
+const readySecretStorageStatus: SecretStorageStatus = {
+    ready: true,
+    defaultKeyId: "00",
+    secretStorageKeyValidityMap: {},
+};
+
+const unreadySecretStorageStatus: SecretStorageStatus = {
+    ready: false,
+    defaultKeyId: null,
+    secretStorageKeyValidityMap: {},
+};
+
 describe("DeviceListener", () => {
     let mockClient: Mocked<MatrixClient>;
     let mockCrypto: Mocked<CryptoApi>;
@@ -90,7 +103,7 @@ describe("DeviceListener", () => {
             }),
             getUserDeviceInfo: jest.fn().mockResolvedValue(new Map()),
             isCrossSigningReady: jest.fn().mockResolvedValue(true),
-            isSecretStorageReady: jest.fn().mockResolvedValue(true),
+            getSecretStorageStatus: jest.fn().mockResolvedValue(readySecretStorageStatus),
             userHasCrossSigningKeys: jest.fn(),
             getActiveSessionBackupVersion: jest.fn(),
             getCrossSigningStatus: jest.fn().mockReturnValue({
@@ -113,6 +126,7 @@ describe("DeviceListener", () => {
             getRooms: jest.fn().mockReturnValue([]),
             isVersionSupported: jest.fn().mockResolvedValue(true),
             isInitialSyncComplete: jest.fn().mockReturnValue(true),
+            isKeyBackupKeyStored: jest.fn(),
             waitForClientWellKnown: jest.fn(),
             getClientWellKnown: jest.fn(),
             getDeviceId: jest.fn().mockReturnValue(deviceId),
@@ -123,7 +137,6 @@ describe("DeviceListener", () => {
             getCrypto: jest.fn().mockReturnValue(mockCrypto),
             secretStorage: {
                 isStored: jest.fn().mockReturnValue(null),
-                getDefaultKeyId: jest.fn().mockReturnValue("00"),
             },
         });
         jest.spyOn(MatrixClientPeg, "get").mockReturnValue(mockClient);
@@ -263,13 +276,6 @@ describe("DeviceListener", () => {
     });
 
     describe("recheck", () => {
-        it("does nothing when cross signing feature is not supported", async () => {
-            mockClient!.isVersionSupported.mockResolvedValue(false);
-            await createAndStart();
-
-            expect(mockClient!.isVersionSupported).toHaveBeenCalledWith("v1.1");
-            expect(mockCrypto!.isCrossSigningReady).not.toHaveBeenCalled();
-        });
         it("does nothing when crypto is not enabled", async () => {
             mockClient!.getCrypto.mockReturnValue(undefined);
             await createAndStart();
@@ -302,22 +308,15 @@ describe("DeviceListener", () => {
 
             beforeEach(() => {
                 mockCrypto!.isCrossSigningReady.mockResolvedValue(false);
-                mockCrypto!.isSecretStorageReady.mockResolvedValue(false);
+                mockCrypto!.getSecretStorageStatus.mockResolvedValue(unreadySecretStorageStatus);
                 mockClient!.getRooms.mockReturnValue(rooms);
                 jest.spyOn(mockClient.getCrypto()!, "isEncryptionEnabledInRoom").mockResolvedValue(true);
             });
 
-            it("hides setup encryption toast when cross signing and secret storage are ready", async () => {
-                mockCrypto!.isCrossSigningReady.mockResolvedValue(true);
-                mockCrypto!.isSecretStorageReady.mockResolvedValue(true);
-                mockCrypto!.getActiveSessionBackupVersion.mockResolvedValue("1");
-
-                await createAndStart();
-                expect(SetupEncryptionToast.hideToast).toHaveBeenCalled();
-            });
-
             it("hides setup encryption toast when it is dismissed", async () => {
                 const instance = await createAndStart();
+                expect(SetupEncryptionToast.showToast).toHaveBeenCalled();
+
                 instance.dismissEncryptionSetup();
                 await flushPromises();
                 expect(SetupEncryptionToast.hideToast).toHaveBeenCalled();
@@ -342,9 +341,7 @@ describe("DeviceListener", () => {
                 await createAndStart();
 
                 expect(mockCrypto!.getUserDeviceInfo).toHaveBeenCalled();
-                expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith(
-                    SetupEncryptionToast.Kind.VERIFY_THIS_SESSION,
-                );
+                expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith("verify_this_session");
             });
 
             describe("when current device is verified", () => {
@@ -360,7 +357,15 @@ describe("DeviceListener", () => {
                     );
                 });
 
-                it("shows an out-of-sync toast when one of the secrets is missing", async () => {
+                it("hides setup encryption toast when cross signing and secret storage are ready", async () => {
+                    mockCrypto!.getSecretStorageStatus.mockResolvedValue(readySecretStorageStatus);
+                    mockCrypto!.getActiveSessionBackupVersion.mockResolvedValue("1");
+
+                    await createAndStart();
+                    expect(SetupEncryptionToast.hideToast).toHaveBeenCalled();
+                });
+
+                it("shows an out-of-sync toast when one of the cross-signing secrets is missing locally", async () => {
                     mockCrypto!.getCrossSigningStatus.mockResolvedValue({
                         publicKeysOnDevice: true,
                         privateKeysInSecretStorage: true,
@@ -373,13 +378,49 @@ describe("DeviceListener", () => {
 
                     await createAndStart();
 
-                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith(
-                        SetupEncryptionToast.Kind.KEY_STORAGE_OUT_OF_SYNC,
-                    );
+                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith("key_storage_out_of_sync");
                 });
 
-                it("hides the out-of-sync toast when one of the secrets is missing", async () => {
-                    mockCrypto!.isSecretStorageReady.mockResolvedValue(true);
+                it("shows an identity reset toast when one of the cross-signing secrets is missing locally and in 4S", async () => {
+                    mockCrypto!.getCrossSigningStatus.mockResolvedValue({
+                        publicKeysOnDevice: true,
+                        privateKeysInSecretStorage: false,
+                        privateKeysCachedLocally: {
+                            masterKey: false,
+                            selfSigningKey: true,
+                            userSigningKey: true,
+                        },
+                    });
+
+                    await createAndStart();
+
+                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith("identity_needs_reset");
+                });
+
+                it("shows an out-of-sync toast when the backup key is missing locally", async () => {
+                    mockCrypto!.getSecretStorageStatus.mockResolvedValue(readySecretStorageStatus);
+                    mockCrypto!.getActiveSessionBackupVersion.mockResolvedValue("1");
+                    mockCrypto!.getSessionBackupPrivateKey.mockResolvedValue(null);
+
+                    await createAndStart();
+
+                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith("key_storage_out_of_sync");
+                });
+
+                it("does not show an out-of-sync toast when the backup key is missing locally but backup is purposely disabled", async () => {
+                    mockCrypto!.getSecretStorageStatus.mockResolvedValue(readySecretStorageStatus);
+                    mockCrypto!.getSessionBackupPrivateKey.mockResolvedValue(null);
+                    mockClient.getAccountDataFromServer.mockImplementation((eventType) =>
+                        eventType === BACKUP_DISABLED_ACCOUNT_DATA_KEY ? ({ disabled: true } as any) : null,
+                    );
+
+                    await createAndStart();
+
+                    expect(SetupEncryptionToast.hideToast).toHaveBeenCalled();
+                });
+
+                it("hides the out-of-sync toast after we receive the missing secrets", async () => {
+                    mockCrypto!.getSecretStorageStatus.mockResolvedValue(readySecretStorageStatus);
                     mockCrypto!.getActiveSessionBackupVersion.mockResolvedValue("1");
 
                     // First show the toast
@@ -395,9 +436,7 @@ describe("DeviceListener", () => {
 
                     await createAndStart();
 
-                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith(
-                        SetupEncryptionToast.Kind.KEY_STORAGE_OUT_OF_SYNC,
-                    );
+                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith("key_storage_out_of_sync");
 
                     // Then, when we receive the secret, it should be hidden.
                     mockCrypto!.getCrossSigningStatus.mockResolvedValue({
@@ -419,13 +458,25 @@ describe("DeviceListener", () => {
                     // non falsy response
                     mockCrypto.getKeyBackupInfo.mockResolvedValue({} as unknown as KeyBackupInfo);
                     mockCrypto.getActiveSessionBackupVersion.mockResolvedValue("1");
-                    mockClient.secretStorage.getDefaultKeyId.mockResolvedValue(null);
+                    mockCrypto.getSecretStorageStatus.mockResolvedValue(unreadySecretStorageStatus);
 
                     await createAndStart();
 
-                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith(
-                        SetupEncryptionToast.Kind.SET_UP_RECOVERY,
-                    );
+                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith("set_up_recovery");
+                });
+
+                it("shows an out-of-sync toast when one of the secrets is missing from 4S", async () => {
+                    mockCrypto.getKeyBackupInfo.mockResolvedValue({} as unknown as KeyBackupInfo);
+                    mockCrypto.getActiveSessionBackupVersion.mockResolvedValue("1");
+                    mockCrypto!.getSecretStorageStatus.mockResolvedValue({
+                        ready: false,
+                        defaultKeyId: "foo",
+                        secretStorageKeyValidityMap: {},
+                    });
+
+                    await createAndStart();
+
+                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith("key_storage_out_of_sync");
                 });
             });
         });
@@ -448,6 +499,16 @@ describe("DeviceListener", () => {
             });
 
             it("dispatches keybackup event when key backup is not enabled", async () => {
+                mockCrypto!.isCrossSigningReady.mockResolvedValue(true);
+
+                // current device is verified
+                mockCrypto!.getDeviceVerificationStatus.mockResolvedValue(
+                    new DeviceVerificationStatus({
+                        trustCrossSignedDevices: true,
+                        crossSigningVerified: true,
+                    }),
+                );
+
                 mockCrypto.getActiveSessionBackupVersion.mockResolvedValue(null);
                 mockClient.getAccountDataFromServer.mockImplementation((eventType) =>
                     eventType === BACKUP_DISABLED_ACCOUNT_DATA_KEY ? ({ disabled: true } as any) : null,
@@ -480,6 +541,15 @@ describe("DeviceListener", () => {
             });
         });
 
+        it("sets the recovery account data when we call recordRecoveryDisabled", async () => {
+            const instance = await createAndStart();
+            await instance.recordRecoveryDisabled();
+
+            expect(mockClient.setAccountData).toHaveBeenCalledWith("io.element.recovery", {
+                enabled: false,
+            });
+        });
+
         describe("when crypto is in use and set up", () => {
             beforeEach(() => {
                 // Encryption is in use
@@ -507,9 +577,7 @@ describe("DeviceListener", () => {
                     await createAndStart();
 
                     // Then the toast is displayed
-                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith(
-                        SetupEncryptionToast.Kind.TURN_ON_KEY_STORAGE,
-                    );
+                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith("turn_on_key_storage");
                 });
 
                 it("shows the 'Turn on key storage' toast if we turned on key storage", async () => {
@@ -525,9 +593,7 @@ describe("DeviceListener", () => {
                     await createAndStart();
 
                     // Then the toast is displayed
-                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith(
-                        SetupEncryptionToast.Kind.TURN_ON_KEY_STORAGE,
-                    );
+                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith("turn_on_key_storage");
                 });
 
                 it("does not show the 'Turn on key storage' toast if we turned off key storage", async () => {
@@ -540,9 +606,7 @@ describe("DeviceListener", () => {
                     await createAndStart();
 
                     // Then the toast is not displayed
-                    expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith(
-                        SetupEncryptionToast.Kind.TURN_ON_KEY_STORAGE,
-                    );
+                    expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith("turn_on_key_storage");
                 });
             });
 
@@ -560,9 +624,7 @@ describe("DeviceListener", () => {
                     await createAndStart();
 
                     // Then the toast is not displayed
-                    expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith(
-                        SetupEncryptionToast.Kind.TURN_ON_KEY_STORAGE,
-                    );
+                    expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith("turn_on_key_storage");
                 });
 
                 it("does not show the 'Turn on key storage' toast if we turned on key storage", async () => {
@@ -577,9 +639,7 @@ describe("DeviceListener", () => {
                     await createAndStart();
 
                     // Then the toast is not displayed
-                    expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith(
-                        SetupEncryptionToast.Kind.TURN_ON_KEY_STORAGE,
-                    );
+                    expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith("turn_on_key_storage");
                 });
 
                 it("does not show the 'Turn on key storage' toast if we turned off key storage", async () => {
@@ -595,9 +655,7 @@ describe("DeviceListener", () => {
                     await createAndStart();
 
                     // Then the toast is not displayed
-                    expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith(
-                        SetupEncryptionToast.Kind.TURN_ON_KEY_STORAGE,
-                    );
+                    expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith("turn_on_key_storage");
                 });
             });
         });
@@ -809,8 +867,7 @@ describe("DeviceListener", () => {
                 ];
 
                 beforeEach(() => {
-                    mockClient.secretStorage.getDefaultKeyId.mockResolvedValue(null);
-                    mockCrypto.isSecretStorageReady.mockResolvedValue(false);
+                    mockCrypto!.getSecretStorageStatus.mockResolvedValue(unreadySecretStorageStatus);
                 });
 
                 it.each(testCases)("Does report session verification state when %s", async (_, status, expected) => {
@@ -880,7 +937,7 @@ describe("DeviceListener", () => {
 
                     it("Should report recovery state as Enabled", async () => {
                         // 4S is enabled
-                        mockClient.secretStorage.getDefaultKeyId.mockResolvedValue("00");
+                        mockCrypto!.getSecretStorageStatus.mockResolvedValue(readySecretStorageStatus);
 
                         // Session trusted and cross signing secrets in 4S and stored locally
                         mockCrypto!.getCrossSigningStatus.mockResolvedValue({
@@ -910,7 +967,7 @@ describe("DeviceListener", () => {
 
                     it("Should report recovery state as Incomplete if secrets not cached locally", async () => {
                         // 4S is enabled
-                        mockClient.secretStorage.getDefaultKeyId.mockResolvedValue("00");
+                        mockCrypto!.getSecretStorageStatus.mockResolvedValue(readySecretStorageStatus);
 
                         // Session trusted and cross signing secrets in 4S and stored locally
                         mockCrypto!.getCrossSigningStatus.mockResolvedValue({
@@ -1018,7 +1075,7 @@ describe("DeviceListener", () => {
                     it.each(partialTestCases)(
                         "Should report recovery state as Incomplete when %s",
                         async (_, status) => {
-                            mockClient.secretStorage.getDefaultKeyId.mockResolvedValue("00");
+                            mockCrypto!.getSecretStorageStatus.mockResolvedValue(readySecretStorageStatus);
 
                             // Session trusted and cross signing secrets in 4S and stored locally
                             mockCrypto!.getCrossSigningStatus.mockResolvedValue(status);
@@ -1040,10 +1097,12 @@ describe("DeviceListener", () => {
                     );
 
                     it("Should report recovery state as Incomplete when some secrets are not in 4S", async () => {
-                        mockClient.secretStorage.getDefaultKeyId.mockResolvedValue("00");
-
                         // Some missing secret in 4S
-                        mockCrypto.isSecretStorageReady.mockResolvedValue(false);
+                        mockCrypto!.getSecretStorageStatus.mockResolvedValue({
+                            ready: false,
+                            defaultKeyId: "00",
+                            secretStorageKeyValidityMap: {},
+                        });
 
                         // Session trusted and secrets known locally.
                         mockCrypto!.getCrossSigningStatus.mockResolvedValue({
@@ -1083,7 +1142,7 @@ describe("DeviceListener", () => {
                     ];
                     it.each(testCases)("Should report recovery state as %s", async (_, isCached) => {
                         // 4S is enabled
-                        mockClient.secretStorage.getDefaultKeyId.mockResolvedValue("00");
+                        mockCrypto!.getSecretStorageStatus.mockResolvedValue(readySecretStorageStatus);
 
                         // Session trusted and cross signing secrets in 4S and stored locally
                         mockCrypto!.getCrossSigningStatus.mockResolvedValue({
@@ -1129,8 +1188,7 @@ describe("DeviceListener", () => {
                     }),
                 );
                 mockCrypto!.isCrossSigningReady.mockResolvedValue(true);
-                mockCrypto!.isSecretStorageReady.mockResolvedValue(false);
-                mockClient.secretStorage.getDefaultKeyId.mockResolvedValue(null);
+                mockCrypto!.getSecretStorageStatus.mockResolvedValue(unreadySecretStorageStatus);
                 mockClient!.getRooms.mockReturnValue(rooms);
                 jest.spyOn(mockClient.getCrypto()!, "isEncryptionEnabledInRoom").mockResolvedValue(true);
             });
@@ -1140,26 +1198,21 @@ describe("DeviceListener", () => {
 
                 await createAndStart();
 
-                expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith(SetupEncryptionToast.Kind.SET_UP_RECOVERY);
+                expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith("set_up_recovery");
             });
 
             it("does not show the 'set up recovery' toast if secret storage is set up", async () => {
-                mockCrypto!.isSecretStorageReady.mockResolvedValue(true);
-                mockClient.secretStorage.getDefaultKeyId.mockResolvedValue("thiskey");
+                mockCrypto!.getSecretStorageStatus.mockResolvedValue(readySecretStorageStatus);
                 await createAndStart();
 
-                expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith(
-                    SetupEncryptionToast.Kind.SET_UP_RECOVERY,
-                );
+                expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith("set_up_recovery");
             });
 
             it("does not show the 'set up recovery' toast if user has no encrypted rooms", async () => {
                 jest.spyOn(mockClient.getCrypto()!, "isEncryptionEnabledInRoom").mockResolvedValue(false);
                 await createAndStart();
 
-                expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith(
-                    SetupEncryptionToast.Kind.SET_UP_RECOVERY,
-                );
+                expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith("set_up_recovery");
             });
 
             it("does not show the 'set up recovery' toast if the user has chosen to disable key storage", async () => {
@@ -1171,9 +1224,137 @@ describe("DeviceListener", () => {
                 });
                 await createAndStart();
 
-                expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith(
-                    SetupEncryptionToast.Kind.SET_UP_RECOVERY,
-                );
+                expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith("set_up_recovery");
+            });
+        });
+    });
+
+    describe("key storage out of sync", () => {
+        describe("needs backup reset", () => {
+            it("should not need resetting if backup disabled", async () => {
+                const deviceListener = await createAndStart();
+                mockClient.getAccountDataFromServer.mockResolvedValue({
+                    disabled: true,
+                });
+                expect(await deviceListener.keyStorageOutOfSyncNeedsBackupReset(false)).toBe(false);
+                expect(await deviceListener.keyStorageOutOfSyncNeedsBackupReset(true)).toBe(false);
+            });
+
+            it("should not need resetting if backup key is present locally or in 4S, and user has 4S key", async () => {
+                const deviceListener = await createAndStart();
+                mockClient.getAccountDataFromServer.mockResolvedValue({
+                    disabled: false,
+                });
+
+                mockCrypto.getSessionBackupPrivateKey.mockResolvedValue(null);
+                mockClient.isKeyBackupKeyStored.mockResolvedValue({});
+                expect(await deviceListener.keyStorageOutOfSyncNeedsBackupReset(false)).toBe(false);
+
+                mockCrypto.getSessionBackupPrivateKey.mockResolvedValue(new Uint8Array());
+                mockClient.isKeyBackupKeyStored.mockResolvedValue(null);
+                expect(await deviceListener.keyStorageOutOfSyncNeedsBackupReset(false)).toBe(false);
+            });
+
+            it("should not need resetting if backup key is present locally and user forgot 4S key", async () => {
+                const deviceListener = await createAndStart();
+                mockClient.getAccountDataFromServer.mockResolvedValue({
+                    disabled: false,
+                });
+
+                mockCrypto.getSessionBackupPrivateKey.mockResolvedValue(new Uint8Array());
+                mockClient.isKeyBackupKeyStored.mockResolvedValue(null);
+                expect(await deviceListener.keyStorageOutOfSyncNeedsBackupReset(true)).toBe(false);
+            });
+
+            it("should need resetting if backup key is missing locally and user forgot 4S key", async () => {
+                const deviceListener = await createAndStart();
+                mockClient.getAccountDataFromServer.mockResolvedValue({
+                    disabled: false,
+                });
+
+                mockCrypto.getSessionBackupPrivateKey.mockResolvedValue(null);
+                mockClient.isKeyBackupKeyStored.mockResolvedValue({});
+                expect(await deviceListener.keyStorageOutOfSyncNeedsBackupReset(true)).toBe(true);
+            });
+
+            it("should need resetting if backup key is missing locally and in 4s", async () => {
+                const deviceListener = await createAndStart();
+                mockClient.getAccountDataFromServer.mockResolvedValue({
+                    disabled: false,
+                });
+
+                mockCrypto.getSessionBackupPrivateKey.mockResolvedValue(null);
+                mockClient.isKeyBackupKeyStored.mockResolvedValue(null);
+                expect(await deviceListener.keyStorageOutOfSyncNeedsBackupReset(false)).toBe(true);
+            });
+        });
+
+        describe("needs cross-signing reset", () => {
+            it("should not need resetting if cross-signing keys are present locally or in 4S, and user has 4S key", async () => {
+                const deviceListener = await createAndStart();
+                mockCrypto.getCrossSigningStatus.mockResolvedValue({
+                    publicKeysOnDevice: true,
+                    privateKeysInSecretStorage: false,
+                    privateKeysCachedLocally: {
+                        masterKey: true,
+                        selfSigningKey: true,
+                        userSigningKey: true,
+                    },
+                });
+                expect(await deviceListener.keyStorageOutOfSyncNeedsCrossSigningReset(false)).toBe(false);
+
+                mockCrypto.getCrossSigningStatus.mockResolvedValue({
+                    publicKeysOnDevice: true,
+                    privateKeysInSecretStorage: true,
+                    privateKeysCachedLocally: {
+                        masterKey: false,
+                        selfSigningKey: false,
+                        userSigningKey: false,
+                    },
+                });
+                expect(await deviceListener.keyStorageOutOfSyncNeedsCrossSigningReset(false)).toBe(false);
+            });
+
+            it("should not need resetting if cross-signing keys are present locally and user forgot 4S key", async () => {
+                const deviceListener = await createAndStart();
+                mockCrypto.getCrossSigningStatus.mockResolvedValue({
+                    publicKeysOnDevice: true,
+                    privateKeysInSecretStorage: false,
+                    privateKeysCachedLocally: {
+                        masterKey: true,
+                        selfSigningKey: true,
+                        userSigningKey: true,
+                    },
+                });
+                expect(await deviceListener.keyStorageOutOfSyncNeedsCrossSigningReset(true)).toBe(false);
+            });
+
+            it("should need resetting if cross-signing keys are missing locally and user forgot 4S key", async () => {
+                const deviceListener = await createAndStart();
+                mockCrypto.getCrossSigningStatus.mockResolvedValue({
+                    publicKeysOnDevice: true,
+                    privateKeysInSecretStorage: true,
+                    privateKeysCachedLocally: {
+                        masterKey: false,
+                        selfSigningKey: false,
+                        userSigningKey: false,
+                    },
+                });
+                expect(await deviceListener.keyStorageOutOfSyncNeedsCrossSigningReset(true)).toBe(true);
+            });
+
+            it("should need resetting if cross-signing keys are missing locally and in 4S key", async () => {
+                const deviceListener = await createAndStart();
+                mockCrypto.getCrossSigningStatus.mockResolvedValue({
+                    publicKeysOnDevice: true,
+                    privateKeysInSecretStorage: false,
+                    privateKeysCachedLocally: {
+                        masterKey: false,
+                        selfSigningKey: false,
+                        userSigningKey: false,
+                    },
+                });
+                expect(await deviceListener.keyStorageOutOfSyncNeedsCrossSigningReset(false)).toBe(true);
             });
         });
     });
diff --git a/test/unit-tests/HtmlUtils-test.tsx b/test/unit-tests/HtmlUtils-test.tsx
index 97c8da6013..690f2a713a 100644
--- a/test/unit-tests/HtmlUtils-test.tsx
+++ b/test/unit-tests/HtmlUtils-test.tsx
@@ -86,6 +86,44 @@ describe("bodyToHtml", () => {
         expect(html).toMatchInlineSnapshot(`"<span class="mx_EventTile_searchHighlight">test</span> foo &lt;b&gt;bar"`);
     });
 
+    it("should linkify and hightlight parts of links in plaintext message highlighting", () => {
+        getMockClientWithEventEmitter({});
+
+        const html = bodyToHtml(
+            {
+                body: "foo http://link.example/test/path bar",
+                msgtype: "m.text",
+            },
+            ["test"],
+            {
+                linkify: true,
+            },
+        );
+
+        expect(html).toMatchInlineSnapshot(
+            `"foo <a href="http://link.example/test/path" class="linkified" target="_blank" rel="noreferrer noopener">http://link.example/<span class="mx_EventTile_searchHighlight">test</span>/path</a> bar"`,
+        );
+    });
+
+    it("should hightlight parts of links in HTML message highlighting", () => {
+        const html = bodyToHtml(
+            {
+                body: "foo http://link.example/test/path bar",
+                msgtype: "m.text",
+                formatted_body: 'foo <a href="http://link.example/test/path">http://link.example/test/path</a> bar',
+                format: "org.matrix.custom.html",
+            },
+            ["test"],
+            {
+                linkify: true,
+            },
+        );
+
+        expect(html).toMatchInlineSnapshot(
+            `"foo <a href="http://link.example/test/path" target="_blank" rel="noreferrer noopener">http://link.example/<span class="mx_EventTile_searchHighlight">test</span>/path</a> bar"`,
+        );
+    });
+
     it("does not mistake characters in text presentation mode for emoji", () => {
         const { asFragment } = render(
             <span className="mx_EventTile_body translate" dir="auto">
diff --git a/test/unit-tests/Image-test.ts b/test/unit-tests/Image-test.ts
index 966236bc8a..1104788e6f 100644
--- a/test/unit-tests/Image-test.ts
+++ b/test/unit-tests/Image-test.ts
@@ -32,42 +32,55 @@ describe("Image", () => {
 
     describe("blobIsAnimated", () => {
         it("Animated GIF", async () => {
-            const img = new Blob([fs.readFileSync(path.resolve(__dirname, "images", "animated-logo.gif"))]);
-            expect(await blobIsAnimated("image/gif", img)).toBeTruthy();
+            const img = new Blob([fs.readFileSync(path.resolve(__dirname, "images", "animated-logo.gif"))], {
+                type: "image/gif",
+            });
+            expect(await blobIsAnimated(img)).toBeTruthy();
         });
 
         it("Static GIF", async () => {
-            const img = new Blob([fs.readFileSync(path.resolve(__dirname, "images", "static-logo.gif"))]);
-            expect(await blobIsAnimated("image/gif", img)).toBeFalsy();
+            const img = new Blob([fs.readFileSync(path.resolve(__dirname, "images", "static-logo.gif"))], {
+                type: "image/gif",
+            });
+            expect(await blobIsAnimated(img)).toBeFalsy();
         });
 
         it("Animated WEBP", async () => {
-            const img = new Blob([fs.readFileSync(path.resolve(__dirname, "images", "animated-logo.webp"))]);
-            expect(await blobIsAnimated("image/webp", img)).toBeTruthy();
+            const img = new Blob([fs.readFileSync(path.resolve(__dirname, "images", "animated-logo.webp"))], {
+                type: "image/webp",
+            });
+            expect(await blobIsAnimated(img)).toBeTruthy();
         });
 
         it("Static WEBP", async () => {
-            const img = new Blob([fs.readFileSync(path.resolve(__dirname, "images", "static-logo.webp"))]);
-            expect(await blobIsAnimated("image/webp", img)).toBeFalsy();
+            const img = new Blob([fs.readFileSync(path.resolve(__dirname, "images", "static-logo.webp"))], {
+                type: "image/webp",
+            });
+            expect(await blobIsAnimated(img)).toBeFalsy();
         });
 
         it("Static WEBP in extended file format", async () => {
-            const img = new Blob([
-                fs.readFileSync(path.resolve(__dirname, "images", "static-logo-extended-file-format.webp")),
-            ]);
-            expect(await blobIsAnimated("image/webp", img)).toBeFalsy();
+            const img = new Blob(
+                [fs.readFileSync(path.resolve(__dirname, "images", "static-logo-extended-file-format.webp"))],
+                { type: "image/webp" },
+            );
+            expect(await blobIsAnimated(img)).toBeFalsy();
         });
 
         it("Animated PNG", async () => {
             const img = new Blob([fs.readFileSync(path.resolve(__dirname, "images", "animated-logo.apng"))]);
-            expect(await blobIsAnimated("image/png", img)).toBeTruthy();
-            expect(await blobIsAnimated("image/apng", img)).toBeTruthy();
+            const pngBlob = img.slice(0, img.size, "image/png");
+            const apngBlob = img.slice(0, img.size, "image/apng");
+            expect(await blobIsAnimated(pngBlob)).toBeTruthy();
+            expect(await blobIsAnimated(apngBlob)).toBeTruthy();
         });
 
         it("Static PNG", async () => {
             const img = new Blob([fs.readFileSync(path.resolve(__dirname, "images", "static-logo.png"))]);
-            expect(await blobIsAnimated("image/png", img)).toBeFalsy();
-            expect(await blobIsAnimated("image/apng", img)).toBeFalsy();
+            const pngBlob = img.slice(0, img.size, "image/png");
+            const apngBlob = img.slice(0, img.size, "image/apng");
+            expect(await blobIsAnimated(pngBlob)).toBeFalsy();
+            expect(await blobIsAnimated(apngBlob)).toBeFalsy();
         });
     });
 });
diff --git a/test/unit-tests/LegacyCallHandler-test.ts b/test/unit-tests/LegacyCallHandler-test.ts
index 972f17b7e0..b21aa76a17 100644
--- a/test/unit-tests/LegacyCallHandler-test.ts
+++ b/test/unit-tests/LegacyCallHandler-test.ts
@@ -585,4 +585,42 @@ describe("LegacyCallHandler without third party protocols", () => {
             expect(mockAudioBufferSourceNode.start).not.toHaveBeenCalled();
         });
     });
+
+    describe("sidebar state", () => {
+        const roomId = "test-room-id";
+
+        it("should default to showing sidebar", () => {
+            const call = new MatrixCall({
+                client: MatrixClientPeg.safeGet(),
+                roomId,
+            });
+            const cli = MatrixClientPeg.safeGet();
+            cli.emit(CallEventHandlerEvent.Incoming, call);
+
+            expect(callHandler.isCallSidebarShown(call.callId)).toEqual(true);
+        });
+
+        it("should remember sidebar state per call", () => {
+            const call = new MatrixCall({
+                client: MatrixClientPeg.safeGet(),
+                roomId,
+            });
+            const cli = MatrixClientPeg.safeGet();
+            cli.emit(CallEventHandlerEvent.Incoming, call);
+
+            expect(callHandler.isCallSidebarShown(call.callId)).toEqual(true);
+            callHandler.setCallSidebarShown(call.callId, false);
+            expect(callHandler.isCallSidebarShown(call.callId)).toEqual(false);
+
+            call.emit(CallEvent.Hangup, call);
+
+            const call2 = new MatrixCall({
+                client: MatrixClientPeg.safeGet(),
+                roomId,
+            });
+            cli.emit(CallEventHandlerEvent.Incoming, call2);
+
+            expect(callHandler.isCallSidebarShown(call2.callId)).toEqual(true);
+        });
+    });
 });
diff --git a/test/unit-tests/Lifecycle-test.ts b/test/unit-tests/Lifecycle-test.ts
index 97ab3c6109..e2d4425ca6 100644
--- a/test/unit-tests/Lifecycle-test.ts
+++ b/test/unit-tests/Lifecycle-test.ts
@@ -167,6 +167,8 @@ describe("Lifecycle", () => {
         mx_is_url: identityServerUrl,
         mx_user_id: userId,
         mx_device_id: deviceId,
+        mx_oidc_token_issuer: "test-issuer.dummy",
+        mx_oidc_client_id: "test-client-id",
     };
     const idbStorageSession = {
         account: {
@@ -374,7 +376,7 @@ describe("Lifecycle", () => {
                                 guest: false,
                                 pickleKey: undefined,
                             },
-                            undefined,
+                            expect.any(Function),
                         );
                     });
                 });
@@ -492,7 +494,7 @@ describe("Lifecycle", () => {
                                 guest: false,
                                 pickleKey: pickleKey,
                             },
-                            undefined,
+                            expect.any(Function),
                         );
                     });
                 });
@@ -657,6 +659,11 @@ describe("Lifecycle", () => {
             });
 
             it("should persist a refreshToken when present", async () => {
+                initLocalStorageMock({
+                    mx_oidc_token_issuer: "test-issuer.dummy",
+                    mx_oidc_client_id: "test-client-id",
+                });
+
                 await setLoggedIn({
                     ...credentials,
                     refreshToken,
@@ -838,12 +845,19 @@ describe("Lifecycle", () => {
             });
 
             it("should not try to create a token refresher without a deviceId", async () => {
-                await setLoggedIn({
-                    ...credentials,
-                    refreshToken,
-                    deviceId: undefined,
+                initLocalStorageMock({
+                    mx_oidc_token_issuer: "test-issuer.dummy",
+                    mx_oidc_client_id: "test-client-id",
                 });
 
+                await expect(
+                    setLoggedIn({
+                        ...credentials,
+                        refreshToken,
+                        deviceId: undefined,
+                    }),
+                ).rejects.toThrow("Expected deviceId in user credentials.");
+
                 // didn't try to initialise token refresher
                 expect(fetchMock).not.toHaveFetched(`${delegatedAuthConfig.issuer}.well-known/openid-configuration`);
             });
@@ -855,10 +869,12 @@ describe("Lifecycle", () => {
                     undefined,
                     idToken,
                 );
-                await setLoggedIn({
-                    ...credentials,
-                    refreshToken,
-                });
+                await expect(
+                    setLoggedIn({
+                        ...credentials,
+                        refreshToken,
+                    }),
+                ).rejects.toThrow("Cannot create an OIDC token refresher as no stored OIDC token issuer was found.");
 
                 // didn't try to initialise token refresher
                 expect(fetchMock).not.toHaveFetched(`${delegatedAuthConfig.issuer}.well-known/openid-configuration`);
diff --git a/test/unit-tests/Notifier-test.ts b/test/unit-tests/Notifier-test.ts
index 92df3bc385..5ff4b0bf77 100644
--- a/test/unit-tests/Notifier-test.ts
+++ b/test/unit-tests/Notifier-test.ts
@@ -371,6 +371,7 @@ describe("Notifier", () => {
         beforeEach(() => {
             jest.spyOn(SettingsStore, "getValue").mockReturnValue(true);
             jest.spyOn(ToastStore.sharedInstance(), "addOrReplaceToast");
+            jest.spyOn(ToastStore.sharedInstance(), "dismissToast");
 
             mockClient.getPushActionsForEvent.mockReturnValue({
                 notify: true,
@@ -384,33 +385,49 @@ describe("Notifier", () => {
             jest.resetAllMocks();
         });
 
-        const emitCallNotifyEvent = (type?: string, roomMention = true) => {
-            const callEvent = mkEvent({
-                type: type ?? EventType.CallNotify,
+        const emitCallNotificationEvent = (
+            params: {
+                type?: string;
+                roomMention?: boolean;
+                lifetime?: number;
+                ts?: number;
+            } = {},
+        ) => {
+            const { type, roomMention, lifetime, ts } = {
+                type: EventType.RTCNotification,
+                roomMention: true,
+                lifetime: 30000,
+                ts: Date.now(),
+                ...params,
+            };
+            const notificationEvent = mkEvent({
+                type: type,
                 user: "@alice:foo",
                 room: roomId,
+                ts,
                 content: {
-                    "application": "m.call",
+                    "notification_type": "ring",
+                    "m.relation": { rel_type: "m.reference", event_id: "$memberEventId" },
                     "m.mentions": { user_ids: [], room: roomMention },
-                    "notify_type": "ring",
-                    "call_id": "abc123",
+                    lifetime,
+                    "sender_ts": ts,
                 },
                 event: true,
             });
-            emitLiveEvent(callEvent);
-            return callEvent;
+            emitLiveEvent(notificationEvent);
+            return notificationEvent;
         };
 
         it("shows group call toast", () => {
-            const notifyEvent = emitCallNotifyEvent();
+            const notificationEvent = emitCallNotificationEvent();
 
             expect(ToastStore.sharedInstance().addOrReplaceToast).toHaveBeenCalledWith(
                 expect.objectContaining({
-                    key: getIncomingCallToastKey(notifyEvent.getContent().call_id ?? "", roomId),
+                    key: getIncomingCallToastKey(notificationEvent.getId() ?? "", roomId),
                     priority: 100,
                     component: IncomingCallToast,
                     bodyClassName: "mx_IncomingCallToast",
-                    props: { notifyEvent },
+                    props: { notificationEvent },
                 }),
             );
         });
@@ -438,13 +455,19 @@ describe("Notifier", () => {
             const roomSession = MatrixRTCSession.roomSessionForRoom(mockClient, testRoom);
 
             mockClient.matrixRTC.getRoomSession.mockReturnValue(roomSession);
-            emitCallNotifyEvent();
+            emitCallNotificationEvent();
             expect(ToastStore.sharedInstance().addOrReplaceToast).not.toHaveBeenCalled();
             spyCallMemberships.mockRestore();
         });
 
-        it("should not show toast when calling with non-group call event", () => {
-            emitCallNotifyEvent("event_type");
+        it("should not show toast when calling with a different event type to org.matrix.msc4075.rtc.notification", () => {
+            emitCallNotificationEvent({ type: "event_type" });
+
+            expect(ToastStore.sharedInstance().addOrReplaceToast).not.toHaveBeenCalled();
+        });
+
+        it("should not show notification event is expired", () => {
+            emitCallNotificationEvent({ ts: Date.now() - 40000 });
 
             expect(ToastStore.sharedInstance().addOrReplaceToast).not.toHaveBeenCalled();
         });
diff --git a/test/unit-tests/RoomInvite-test.ts b/test/unit-tests/RoomInvite-test.ts
new file mode 100644
index 0000000000..32ef8dc73f
--- /dev/null
+++ b/test/unit-tests/RoomInvite-test.ts
@@ -0,0 +1,33 @@
+/*
+Copyright 2025 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { getMockClientWithEventEmitter } from "../test-utils";
+import { inviteMultipleToRoom } from "../../src/RoomInvite.tsx";
+
+afterEach(() => {
+    jest.restoreAllMocks();
+});
+
+describe("inviteMultipleToRoom", () => {
+    it("can be called wth no `options`", async () => {
+        const client = getMockClientWithEventEmitter({});
+        const { states, inviter } = await inviteMultipleToRoom(client, "!room:id", []);
+        expect(states).toEqual({});
+
+        // @ts-ignore reference to private property
+        expect(inviter.options).toEqual({});
+    });
+});
diff --git a/test/unit-tests/SecurityManager-test.ts b/test/unit-tests/SecurityManager-test.ts
index 8c1671b52e..20d93b2c24 100644
--- a/test/unit-tests/SecurityManager-test.ts
+++ b/test/unit-tests/SecurityManager-test.ts
@@ -67,6 +67,17 @@ describe("SecurityManager", () => {
                     await accessSecretStorage(jest.fn());
                 }).rejects.toThrow("End-to-end encryption is disabled - unable to access secret storage");
             });
+
+            it("throws if there is no 4S", async () => {
+                // Given a client with no default 4S key ID
+                stubClient();
+
+                // When I run accessSecretStorage
+                // Then we throw an error
+                await expect(async () => {
+                    await accessSecretStorage(jest.fn());
+                }).rejects.toThrow("Secret storage has not been created yet");
+            });
         });
 
         it("should show CreateSecretStorageDialog if forceReset=true", async () => {
diff --git a/test/unit-tests/SlashCommands-test.tsx b/test/unit-tests/SlashCommands-test.tsx
index b30bc69176..1f583138c4 100644
--- a/test/unit-tests/SlashCommands-test.tsx
+++ b/test/unit-tests/SlashCommands-test.tsx
@@ -9,18 +9,19 @@ Please see LICENSE files in the repository root for full details.
 import { type MatrixClient, Room, RoomMember } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { mocked } from "jest-mock";
+import { act, waitFor } from "jest-matrix-react";
 
 import { type Command, Commands, getCommand } from "../../src/SlashCommands";
 import { createTestClient } from "../test-utils";
 import { LocalRoom, LOCAL_ROOM_ID_PREFIX } from "../../src/models/LocalRoom";
-import SettingsStore from "../../src/settings/SettingsStore";
 import { SdkContextClass } from "../../src/contexts/SDKContext";
-import Modal from "../../src/Modal";
+import Modal, { type ComponentType, type IHandle } from "../../src/Modal";
 import WidgetUtils from "../../src/utils/WidgetUtils";
 import { WidgetType } from "../../src/widgets/WidgetType";
 import { warnSelfDemote } from "../../src/components/views/right_panel/UserInfo";
 import dispatcher from "../../src/dispatcher/dispatcher";
-import { SettingLevel } from "../../src/settings/SettingLevel";
+import QuestionDialog from "../../src/components/views/dialogs/QuestionDialog";
+import ErrorDialog from "../../src/components/views/dialogs/ErrorDialog";
 
 jest.mock("../../src/components/views/right_panel/UserInfo");
 
@@ -65,7 +66,7 @@ describe("SlashCommands", () => {
 
     describe("/topic", () => {
         it("sets topic", async () => {
-            const command = getCommand("/topic pizza");
+            const command = getCommand(roomId, "/topic pizza");
             expect(command.cmd).toBeDefined();
             expect(command.args).toBeDefined();
             await command.cmd!.run(client, "room-id", null, command.args);
@@ -74,7 +75,7 @@ describe("SlashCommands", () => {
 
         it("should show topic modal if no args passed", async () => {
             const spy = jest.spyOn(Modal, "createDialog");
-            const command = getCommand("/topic")!;
+            const command = getCommand(roomId, "/topic")!;
             await command.cmd!.run(client, roomId, null);
             expect(spy).toHaveBeenCalled();
         });
@@ -108,12 +109,12 @@ describe("SlashCommands", () => {
         describe("isEnabled", () => {
             it("should return true for Room", () => {
                 setCurrentRoom();
-                expect(command.isEnabled(client)).toBe(true);
+                expect(command.isEnabled(client, roomId)).toBe(true);
             });
 
             it("should return false for LocalRoom", () => {
                 setCurrentLocalRoom();
-                expect(command.isEnabled(client)).toBe(false);
+                expect(command.isEnabled(client, roomId)).toBe(false);
             });
         });
     });
@@ -124,13 +125,8 @@ describe("SlashCommands", () => {
             setCurrentRoom();
         });
 
-        it("should be disabled by default", () => {
-            expect(command.isEnabled(client)).toBe(false);
-        });
-
-        it("should be enabled for developerMode", () => {
-            SettingsStore.setValue("developerMode", null, SettingLevel.DEVICE, true);
-            expect(command.isEnabled(client)).toBe(true);
+        it("should be enabled by default", () => {
+            expect(command.isEnabled(client, roomId)).toBe(true);
         });
     });
 
@@ -203,11 +199,11 @@ describe("SlashCommands", () => {
             room2.getCanonicalAlias = jest.fn().mockReturnValue("#baz:bar");
             mocked(client.getRooms).mockReturnValue([room1, room2]);
 
-            const command = getCommand("/part #foo:bar");
+            const command = getCommand(room1.roomId, "/part #foo:bar");
             expect(command.cmd).toBeDefined();
             expect(command.args).toBeDefined();
-            await command.cmd!.run(client, "room-id", null, command.args);
-            expect(client.leaveRoomChain).toHaveBeenCalledWith("room-id", expect.anything());
+            await command.cmd!.run(client, room1.roomId, null, command.args);
+            expect(client.leaveRoomChain).toHaveBeenCalledWith(room1.roomId, expect.anything());
         });
 
         it("should part room matching alt alias if found", async () => {
@@ -217,11 +213,11 @@ describe("SlashCommands", () => {
             room2.getAltAliases = jest.fn().mockReturnValue(["#baz:bar"]);
             mocked(client.getRooms).mockReturnValue([room1, room2]);
 
-            const command = getCommand("/part #foo:bar");
+            const command = getCommand(room1.roomId, "/part #foo:bar");
             expect(command.cmd).toBeDefined();
             expect(command.args).toBeDefined();
-            await command.cmd!.run(client, "room-id", null, command.args!);
-            expect(client.leaveRoomChain).toHaveBeenCalledWith("room-id", expect.anything());
+            await command.cmd!.run(client, room1.roomId, null, command.args!);
+            expect(client.leaveRoomChain).toHaveBeenCalledWith(room1.roomId, expect.anything());
         });
     });
 
@@ -253,6 +249,56 @@ describe("SlashCommands", () => {
         });
     });
 
+    describe("/verify", () => {
+        it("should return usage if no args", () => {
+            const command = findCommand("verify")!;
+            expect(command.run(client, roomId, null, undefined).error).toBe(command.getUsage());
+        });
+
+        it("should attempt manual verification after confirmation", async () => {
+            // Given we say yes to prompt
+            const spy = jest.spyOn(Modal, "createDialog");
+            spy.mockReturnValue({ finished: Promise.resolve([true]) } as unknown as IHandle<ComponentType>);
+
+            // When we run the command
+            const command = findCommand("verify")!;
+            await act(() => command.run(client, roomId, null, "mydeviceid myfingerprint"));
+
+            // Then the prompt is displayed
+            expect(spy).toHaveBeenCalledWith(
+                QuestionDialog,
+                expect.objectContaining({ title: "Caution: manual device verification" }),
+            );
+
+            // And then we attempt the verification
+            await waitFor(() =>
+                expect(spy).toHaveBeenCalledWith(
+                    ErrorDialog,
+                    expect.objectContaining({ title: "Verification failed" }),
+                ),
+            );
+        });
+
+        it("should not do manual verification if cancelled", async () => {
+            // Given we say no to prompt
+            const spy = jest.spyOn(Modal, "createDialog");
+            spy.mockReturnValue({ finished: Promise.resolve([false]) } as unknown as IHandle<ComponentType>);
+
+            // When we run the command
+            const command = findCommand("verify")!;
+            command.run(client, roomId, null, "mydeviceid myfingerprint");
+
+            // Then the prompt is displayed
+            expect(spy).toHaveBeenCalledWith(
+                QuestionDialog,
+                expect.objectContaining({ title: "Caution: manual device verification" }),
+            );
+
+            // But nothing else happens
+            expect(spy).not.toHaveBeenCalledWith(ErrorDialog, expect.anything());
+        });
+    });
+
     describe("/addwidget", () => {
         it("should parse html iframe snippets", async () => {
             jest.spyOn(WidgetUtils, "canUserModifyWidgets").mockReturnValue(true);
diff --git a/test/unit-tests/SupportedBrowser-test.ts b/test/unit-tests/SupportedBrowser-test.ts
index 0eb2b42ed6..3607b35a08 100644
--- a/test/unit-tests/SupportedBrowser-test.ts
+++ b/test/unit-tests/SupportedBrowser-test.ts
@@ -63,20 +63,20 @@ describe("SupportedBrowser", () => {
 
     // Grabbed from https://www.whatismybrowser.com/guides/the-latest-user-agent/
     it.each([
-        // Safari 18.0 on macOS Sonoma
-        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Safari/605.1.15",
+        // Safari 26.0 on macOS
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 15_7_2) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Safari/605.1.15",
         // Latest Firefox on macOS Sonoma
-        "Mozilla/5.0 (Macintosh; Intel Mac OS X 14.7; rv:139.0) Gecko/20100101 Firefox/139.0",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 15.7; rv:145.0) Gecko/20100101 Firefox/145.0",
         // Latest Edge on Windows
-        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36 Edg/136.0.3240.92",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36 Edg/142.0.3595.76",
         // Latest Edge on macOS
-        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36 Edg/136.0.3240.92",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36 Edg/142.0.3595.76",
         // Latest Firefox on Windows
-        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:139.0) Gecko/20100101 Firefox/139.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:145.0) Gecko/20100101 Firefox/145.0",
         // Latest Firefox on Linux
-        "Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:139.0) Gecko/20100101 Firefox/139.0",
+        "Mozilla/5.0 (X11; Linux i686; rv:145.0) Gecko/20100101 Firefox/145.0",
         // Latest Chrome on Windows
-        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36",
     ])("should not warn for supported browsers", testUserAgentFactory());
 
     it.each([
diff --git a/test/unit-tests/TextForEvent-test.ts b/test/unit-tests/TextForEvent-test.ts
index a505d6510f..076972e646 100644
--- a/test/unit-tests/TextForEvent-test.ts
+++ b/test/unit-tests/TextForEvent-test.ts
@@ -21,13 +21,13 @@ import { render } from "jest-matrix-react";
 import { type ReactElement } from "react";
 import { type Mocked, mocked } from "jest-mock";
 
-import { textForEvent } from "../../src/TextForEvent";
+import { hasText, textForEvent } from "../../src/TextForEvent";
 import SettingsStore from "../../src/settings/SettingsStore";
 import { createTestClient, stubClient } from "../test-utils";
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
 import UserIdentifierCustomisations from "../../src/customisations/UserIdentifier";
-import { ElementCall } from "../../src/models/Call";
 import { getSenderName } from "../../src/utils/event/getSenderName";
+import { ElementCallEventType } from "../../src/call-types";
 
 jest.mock("../../src/settings/SettingsStore");
 jest.mock("../../src/customisations/UserIdentifier", () => ({
@@ -471,7 +471,7 @@ describe("TextForEvent", () => {
             } as unknown as MatrixEvent;
         });
 
-        describe.each(ElementCall.CALL_EVENT_TYPE.names)("eventType=%s", (eventType: string) => {
+        describe.each(ElementCallEventType.names)("eventType=%s", (eventType: string) => {
             beforeEach(() => {
                 mocked(callEvent).getType.mockReturnValue(eventType);
             });
@@ -664,24 +664,24 @@ describe("TextForEvent", () => {
             ["the legacy key", { topic: "My topic" }, { result: '@a changed the topic to "My topic".' }],
             [
                 "the legacy key with an empty m.topic key",
-                { "topic": "My topic", "m.topic": [] },
+                { "topic": "My topic", "m.topic": { "m.text": [] } },
                 { result: '@a changed the topic to "My topic".' },
             ],
             [
                 "the m.topic key",
-                { "topic": "Ignore this", "m.topic": [{ mimetype: "text/plain", body: "My topic" }] },
+                { "topic": "Ignore this", "m.topic": { "m.text": [{ mimetype: "text/plain", body: "My topic" }] } },
                 { result: '@a changed the topic to "My topic".' },
             ],
             [
                 "the m.topic key and the legacy key undefined",
-                { "topic": undefined, "m.topic": [{ mimetype: "text/plain", body: "My topic" }] },
+                { "topic": undefined, "m.topic": { "m.text": [{ mimetype: "text/plain", body: "My topic" }] } },
                 { result: '@a changed the topic to "My topic".' },
             ],
             ["the legacy key undefined", { topic: undefined }, { result: "@a removed the topic." }],
             ["the legacy key empty string", { topic: "" }, { result: "@a removed the topic." }],
             [
                 "both the legacy and new keys removed",
-                { "topic": undefined, "m.topic": [] },
+                { "topic": undefined, "m.topic": { "m.text": [] } },
                 { result: "@a removed the topic." },
             ],
         ];
@@ -700,4 +700,20 @@ describe("TextForEvent", () => {
             ).toEqual(result);
         });
     });
+
+    describe("hasText", () => {
+        it("should return true for a known handler given an invalid event", async () => {
+            const cli = stubClient();
+            const ev = new MatrixEvent({
+                type: "m.room.name",
+                content: {
+                    name: { foo: "bar" },
+                },
+                state_key: "",
+                room_id: "!roomId",
+                sender: cli.getUserId()!,
+            });
+            expect(hasText(ev, cli, false)).toBe(true);
+        });
+    });
 });
diff --git a/test/unit-tests/__snapshots__/HtmlUtils-test.tsx.snap b/test/unit-tests/__snapshots__/HtmlUtils-test.tsx.snap
index 018a6721c1..0ea4b96864 100644
--- a/test/unit-tests/__snapshots__/HtmlUtils-test.tsx.snap
+++ b/test/unit-tests/__snapshots__/HtmlUtils-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`bodyToHtml does not mistake characters in text presentation mode for emoji 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/__snapshots__/SlashCommands-test.tsx.snap b/test/unit-tests/__snapshots__/SlashCommands-test.tsx.snap
index fdffb74ac3..472feb6dcf 100644
--- a/test/unit-tests/__snapshots__/SlashCommands-test.tsx.snap
+++ b/test/unit-tests/__snapshots__/SlashCommands-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`SlashCommands /lenny should match snapshot with args 1`] = `
 {
diff --git a/test/unit-tests/__snapshots__/Terms-test.tsx.snap b/test/unit-tests/__snapshots__/Terms-test.tsx.snap
index a35963cd51..7c1bbaa5c0 100644
--- a/test/unit-tests/__snapshots__/Terms-test.tsx.snap
+++ b/test/unit-tests/__snapshots__/Terms-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`dialogTermsInteractionCallback should render a dialog with the expected terms 1`] = `
 <div
@@ -7,6 +7,7 @@ exports[`dialogTermsInteractionCallback should render a dialog with the expected
   class=""
   data-focus-lock-disabled="false"
   role="dialog"
+  tabindex="-1"
 >
   <div
     class="mx_Dialog_header"
@@ -73,9 +74,21 @@ exports[`dialogTermsInteractionCallback should render a dialog with the expected
               target="_blank"
             >
               Terms
-              <i
+              <svg
                 class="mx_ExternalLink_icon"
-              />
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+                />
+                <path
+                  d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+                />
+              </svg>
             </a>
           </td>
           <td>
diff --git a/test/unit-tests/__snapshots__/TextForEvent-test.ts.snap b/test/unit-tests/__snapshots__/TextForEvent-test.ts.snap
index 6713c3d449..ac063c3432 100644
--- a/test/unit-tests/__snapshots__/TextForEvent-test.ts.snap
+++ b/test/unit-tests/__snapshots__/TextForEvent-test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`TextForEvent textForJoinRulesEvent() returns correct JSX message when room join rule changed to restricted 1`] = `
 <span>
diff --git a/test/unit-tests/__snapshots__/favicon-test.ts.snap b/test/unit-tests/__snapshots__/favicon-test.ts.snap
index 10ec81ed1a..f4c22fe3e9 100644
--- a/test/unit-tests/__snapshots__/favicon-test.ts.snap
+++ b/test/unit-tests/__snapshots__/favicon-test.ts.snap
@@ -1,11 +1,11 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`Favicon should clear a badge if called with a zero value 1`] = `
 [
   {
     "props": {
-      "height": 32,
-      "width": 32,
+      "height": 144,
+      "width": 144,
       "x": 0,
       "y": 0,
     },
@@ -21,16 +21,16 @@ exports[`Favicon should clear a badge if called with a zero value 1`] = `
   },
   {
     "props": {
-      "dHeight": 32,
-      "dWidth": 32,
+      "dHeight": 144,
+      "dWidth": 144,
       "dx": 0,
       "dy": 0,
       "img": <img
-        height="32"
-        width="32"
+        height="144"
+        width="144"
       />,
-      "sHeight": 32,
-      "sWidth": 32,
+      "sHeight": 144,
+      "sWidth": 144,
       "sx": 0,
       "sy": 0,
     },
@@ -62,8 +62,8 @@ exports[`Favicon should clear a badge if called with a zero value 1`] = `
         },
         {
           "props": {
-            "x": 16.159999999999997,
-            "y": 12.8,
+            "x": 72.72,
+            "y": 57.6,
           },
           "transform": [
             1,
@@ -77,8 +77,8 @@ exports[`Favicon should clear a badge if called with a zero value 1`] = `
         },
         {
           "props": {
-            "x": 22.4,
-            "y": 12.8,
+            "x": 100.79999999999998,
+            "y": 57.6,
           },
           "transform": [
             1,
@@ -92,8 +92,8 @@ exports[`Favicon should clear a badge if called with a zero value 1`] = `
         },
         {
           "props": {
-            "x": 31.999999999999996,
-            "y": 22.4,
+            "x": 143.99999999999997,
+            "y": 100.80000000000001,
           },
           "transform": [
             1,
@@ -107,8 +107,8 @@ exports[`Favicon should clear a badge if called with a zero value 1`] = `
         },
         {
           "props": {
-            "x": 9.92,
-            "y": 32,
+            "x": 44.64,
+            "y": 144,
           },
           "transform": [
             1,
@@ -122,8 +122,8 @@ exports[`Favicon should clear a badge if called with a zero value 1`] = `
         },
         {
           "props": {
-            "x": 0.3200000000000003,
-            "y": 22.4,
+            "x": 1.4400000000000048,
+            "y": 100.8,
           },
           "transform": [
             1,
@@ -178,8 +178,8 @@ exports[`Favicon should clear a badge if called with a zero value 1`] = `
     "props": {
       "maxWidth": null,
       "text": "123",
-      "x": 16,
-      "y": 29,
+      "x": 72,
+      "y": 131,
     },
     "transform": [
       1,
@@ -193,8 +193,8 @@ exports[`Favicon should clear a badge if called with a zero value 1`] = `
   },
   {
     "props": {
-      "height": 32,
-      "width": 32,
+      "height": 144,
+      "width": 144,
       "x": 0,
       "y": 0,
     },
@@ -210,16 +210,16 @@ exports[`Favicon should clear a badge if called with a zero value 1`] = `
   },
   {
     "props": {
-      "dHeight": 32,
-      "dWidth": 32,
+      "dHeight": 144,
+      "dWidth": 144,
       "dx": 0,
       "dy": 0,
       "img": <img
-        height="32"
-        width="32"
+        height="144"
+        width="144"
       />,
-      "sHeight": 32,
-      "sWidth": 32,
+      "sHeight": 144,
+      "sWidth": 144,
       "sx": 0,
       "sy": 0,
     },
@@ -240,8 +240,8 @@ exports[`Favicon should draw a badge if called with a non-zero value 1`] = `
 [
   {
     "props": {
-      "height": 32,
-      "width": 32,
+      "height": 144,
+      "width": 144,
       "x": 0,
       "y": 0,
     },
@@ -257,16 +257,16 @@ exports[`Favicon should draw a badge if called with a non-zero value 1`] = `
   },
   {
     "props": {
-      "dHeight": 32,
-      "dWidth": 32,
+      "dHeight": 144,
+      "dWidth": 144,
       "dx": 0,
       "dy": 0,
       "img": <img
-        height="32"
-        width="32"
+        height="144"
+        width="144"
       />,
-      "sHeight": 32,
-      "sWidth": 32,
+      "sHeight": 144,
+      "sWidth": 144,
       "sx": 0,
       "sy": 0,
     },
@@ -298,8 +298,8 @@ exports[`Favicon should draw a badge if called with a non-zero value 1`] = `
         },
         {
           "props": {
-            "x": 16.159999999999997,
-            "y": 12.8,
+            "x": 72.72,
+            "y": 57.6,
           },
           "transform": [
             1,
@@ -313,8 +313,8 @@ exports[`Favicon should draw a badge if called with a non-zero value 1`] = `
         },
         {
           "props": {
-            "x": 22.4,
-            "y": 12.8,
+            "x": 100.79999999999998,
+            "y": 57.6,
           },
           "transform": [
             1,
@@ -328,8 +328,8 @@ exports[`Favicon should draw a badge if called with a non-zero value 1`] = `
         },
         {
           "props": {
-            "x": 31.999999999999996,
-            "y": 22.4,
+            "x": 143.99999999999997,
+            "y": 100.80000000000001,
           },
           "transform": [
             1,
@@ -343,8 +343,8 @@ exports[`Favicon should draw a badge if called with a non-zero value 1`] = `
         },
         {
           "props": {
-            "x": 9.92,
-            "y": 32,
+            "x": 44.64,
+            "y": 144,
           },
           "transform": [
             1,
@@ -358,8 +358,8 @@ exports[`Favicon should draw a badge if called with a non-zero value 1`] = `
         },
         {
           "props": {
-            "x": 0.3200000000000003,
-            "y": 22.4,
+            "x": 1.4400000000000048,
+            "y": 100.8,
           },
           "transform": [
             1,
@@ -414,8 +414,8 @@ exports[`Favicon should draw a badge if called with a non-zero value 1`] = `
     "props": {
       "maxWidth": null,
       "text": "123",
-      "x": 16,
-      "y": 29,
+      "x": 72,
+      "y": 131,
     },
     "transform": [
       1,
diff --git a/test/unit-tests/__snapshots__/theme-test.ts.snap b/test/unit-tests/__snapshots__/theme-test.ts.snap
index 754786eb70..af61bc7151 100644
--- a/test/unit-tests/__snapshots__/theme-test.ts.snap
+++ b/test/unit-tests/__snapshots__/theme-test.ts.snap
@@ -1,3 +1,3 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`theme setTheme applies a custom Compound theme 1`] = `"@layer compound.custom { :root, [class*="cpd-theme-"] { --cpd-color-icon-accent-tertiary: var(--cpd-color-blue-800); --cpd-color-text-action-accent: var(--cpd-color-blue-900); } }"`;
diff --git a/test/unit-tests/accessibility/LandmarkNavigation-test.tsx b/test/unit-tests/accessibility/LandmarkNavigation-test.tsx
index ad160e8866..878981f708 100644
--- a/test/unit-tests/accessibility/LandmarkNavigation-test.tsx
+++ b/test/unit-tests/accessibility/LandmarkNavigation-test.tsx
@@ -19,10 +19,10 @@ describe("KeyboardLandmarkUtils", () => {
                 <div tabIndex={0} className="mx_SpaceButton_active" data-testid="mx_SpaceButton_active">
                     SPACE_BUTTON
                 </div>
-                <div tabIndex={0} className="mx_RoomSearch" data-testid="mx_RoomSearch">
+                <div tabIndex={0} id="room-list-search-button" data-testid="mx_RoomListSearch_search">
                     ROOM_SEARCH
                 </div>
-                <div tabIndex={0} className="mx_RoomTile" data-testid="mx_RoomTile">
+                <div tabIndex={0} className="mx_RoomListItemView" data-testid="mx_RoomListItemView">
                     ROOM_TILE
                 </div>
                 <div tabIndex={0} className="mx_HomePage" data-testid="mx_HomePage">
@@ -33,11 +33,11 @@ describe("KeyboardLandmarkUtils", () => {
         // ACTIVE_SPACE_BUTTON <-> ROOM_SEARCH <-> ROOM_LIST <-> HOME <-> ACTIVE_SPACE_BUTTON
         // ACTIVE_SPACE_BUTTON -> ROOM_SEARCH
         LandmarkNavigation.findAndFocusNextLandmark(Landmark.ACTIVE_SPACE_BUTTON);
-        expect(screen.getByTestId("mx_RoomSearch")).toHaveFocus();
+        expect(screen.getByTestId("mx_RoomListSearch_search")).toHaveFocus();
 
         // ROOM_SEARCH -> ROOM_LIST
         LandmarkNavigation.findAndFocusNextLandmark(Landmark.ROOM_SEARCH);
-        expect(screen.getByTestId("mx_RoomTile")).toHaveFocus();
+        expect(screen.getByTestId("mx_RoomListItemView")).toHaveFocus();
 
         // ROOM_LIST -> HOME_PAGE
         LandmarkNavigation.findAndFocusNextLandmark(Landmark.ROOM_LIST);
@@ -53,11 +53,11 @@ describe("KeyboardLandmarkUtils", () => {
 
         // ROOM_LIST <- HOME_PAGE
         LandmarkNavigation.findAndFocusNextLandmark(Landmark.MESSAGE_COMPOSER_OR_HOME, true);
-        expect(screen.getByTestId("mx_RoomTile")).toHaveFocus();
+        expect(screen.getByTestId("mx_RoomListItemView")).toHaveFocus();
 
         // ROOM_SEARCH <- ROOM_LIST
         LandmarkNavigation.findAndFocusNextLandmark(Landmark.ROOM_LIST, true);
-        expect(screen.getByTestId("mx_RoomSearch")).toHaveFocus();
+        expect(screen.getByTestId("mx_RoomListSearch_search")).toHaveFocus();
 
         // ACTIVE_SPACE_BUTTON <- ROOM_SEARCH
         LandmarkNavigation.findAndFocusNextLandmark(Landmark.ROOM_SEARCH, true);
@@ -72,10 +72,10 @@ describe("KeyboardLandmarkUtils", () => {
                 <div tabIndex={0} className="mx_SpaceButton_active" data-testid="mx_SpaceButton_active">
                     SPACE_BUTTON
                 </div>
-                <div tabIndex={0} className="mx_RoomSearch" data-testid="mx_RoomSearch">
+                <div tabIndex={0} id="room-list-search-button" data-testid="mx_RoomListSearch_search">
                     ROOM_SEARCH
                 </div>
-                <div tabIndex={0} className="mx_RoomTile_selected" data-testid="mx_RoomTile_selected">
+                <div tabIndex={0} className="mx_RoomListItemView_selected" data-testid="mx_RoomListItemView_selected">
                     ROOM_TILE
                 </div>
                 <div tabIndex={0} className="mx_Room" data-testid="mx_Room">
@@ -89,11 +89,11 @@ describe("KeyboardLandmarkUtils", () => {
         // ACTIVE_SPACE_BUTTON <-> ROOM_SEARCH <-> ROOM_LIST <-> MESSAGE_COMPOSER <-> ACTIVE_SPACE_BUTTON
         // ACTIVE_SPACE_BUTTON -> ROOM_SEARCH
         LandmarkNavigation.findAndFocusNextLandmark(Landmark.ACTIVE_SPACE_BUTTON);
-        expect(screen.getByTestId("mx_RoomSearch")).toHaveFocus();
+        expect(screen.getByTestId("mx_RoomListSearch_search")).toHaveFocus();
 
         // ROOM_SEARCH -> ROOM_LIST
         LandmarkNavigation.findAndFocusNextLandmark(Landmark.ROOM_SEARCH);
-        expect(screen.getByTestId("mx_RoomTile_selected")).toHaveFocus();
+        expect(screen.getByTestId("mx_RoomListItemView_selected")).toHaveFocus();
 
         // ROOM_LIST -> MESSAGE_COMPOSER
         LandmarkNavigation.findAndFocusNextLandmark(Landmark.ROOM_LIST);
@@ -109,11 +109,11 @@ describe("KeyboardLandmarkUtils", () => {
 
         // ROOM_LIST <- MESSAGE_COMPOSER
         LandmarkNavigation.findAndFocusNextLandmark(Landmark.MESSAGE_COMPOSER_OR_HOME, true);
-        expect(screen.getByTestId("mx_RoomTile_selected")).toHaveFocus();
+        expect(screen.getByTestId("mx_RoomListItemView_selected")).toHaveFocus();
 
         // ROOM_SEARCH <- ROOM_LIST
         LandmarkNavigation.findAndFocusNextLandmark(Landmark.ROOM_LIST, true);
-        expect(screen.getByTestId("mx_RoomSearch")).toHaveFocus();
+        expect(screen.getByTestId("mx_RoomListSearch_search")).toHaveFocus();
 
         // ACTIVE_SPACE_BUTTON <- ROOM_SEARCH
         LandmarkNavigation.findAndFocusNextLandmark(Landmark.ROOM_SEARCH, true);
diff --git a/test/unit-tests/async-components/dialogs/security/RecoveryMethodRemovedDialog-test.tsx b/test/unit-tests/async-components/dialogs/security/RecoveryMethodRemovedDialog-test.tsx
index ec5e714286..8779748b8e 100644
--- a/test/unit-tests/async-components/dialogs/security/RecoveryMethodRemovedDialog-test.tsx
+++ b/test/unit-tests/async-components/dialogs/security/RecoveryMethodRemovedDialog-test.tsx
@@ -9,7 +9,9 @@ import React from "react";
 import { render, screen, fireEvent, waitFor } from "jest-matrix-react";
 
 import RecoveryMethodRemovedDialog from "../../../../../src/async-components/views/dialogs/security/RecoveryMethodRemovedDialog";
-import Modal from "../../../../../src/Modal.tsx";
+import dispatch from "../../../../../src/dispatcher/dispatcher";
+import { Action } from "../../../../../src/dispatcher/actions";
+import { UserTab } from "../../../../../src/components/views/dialogs/UserTab";
 
 describe("<RecoveryMethodRemovedDialog />", () => {
     afterEach(() => {
@@ -18,16 +20,15 @@ describe("<RecoveryMethodRemovedDialog />", () => {
 
     it("should open CreateKeyBackupDialog on primary action click", async () => {
         const onFinished = jest.fn();
-        const spy = jest.spyOn(Modal, "createDialog");
-        jest.mock("../../../../../src/async-components/views/dialogs/security/CreateKeyBackupDialog", () => ({
-            __test: true,
-            __esModule: true,
-            default: () => <span>mocked dialog</span>,
-        }));
+        jest.spyOn(dispatch, "dispatch");
 
         render(<RecoveryMethodRemovedDialog onFinished={onFinished} />);
         fireEvent.click(screen.getByRole("button", { name: "Set up Secure Messages" }));
-        await waitFor(() => expect(spy).toHaveBeenCalledTimes(1));
-        expect((spy.mock.lastCall![0] as any)._payload._result).toEqual(expect.objectContaining({ __test: true }));
+        await waitFor(() =>
+            expect(dispatch.dispatch).toHaveBeenCalledWith({
+                action: Action.ViewUserSettings,
+                initialTabId: UserTab.Encryption,
+            }),
+        );
     });
 });
diff --git a/test/unit-tests/async-components/dialogs/security/__snapshots__/NewRecoveryMethodDialog-test.tsx.snap b/test/unit-tests/async-components/dialogs/security/__snapshots__/NewRecoveryMethodDialog-test.tsx.snap
index 08b5ee18d3..2221bd135c 100644
--- a/test/unit-tests/async-components/dialogs/security/__snapshots__/NewRecoveryMethodDialog-test.tsx.snap
+++ b/test/unit-tests/async-components/dialogs/security/__snapshots__/NewRecoveryMethodDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<NewRecoveryMethodDialog /> when key backup is disabled 1`] = `
 <DocumentFragment>
@@ -12,6 +12,7 @@ exports[`<NewRecoveryMethodDialog /> when key backup is disabled 1`] = `
     class="mx_KeyBackupFailedDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -23,6 +24,17 @@ exports[`<NewRecoveryMethodDialog /> when key backup is disabled 1`] = `
         <span
           class="mx_KeyBackupFailedDialog_title"
         >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22m0-2q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4 6.325 6.325 4 12t2.325 5.675T12 20"
+            />
+          </svg>
           New Recovery Method
         </span>
       </h1>
@@ -83,6 +95,7 @@ exports[`<NewRecoveryMethodDialog /> when key backup is enabled 1`] = `
     class="mx_KeyBackupFailedDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -94,6 +107,17 @@ exports[`<NewRecoveryMethodDialog /> when key backup is enabled 1`] = `
         <span
           class="mx_KeyBackupFailedDialog_title"
         >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22m0-2q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4 6.325 6.325 4 12t2.325 5.675T12 20"
+            />
+          </svg>
           New Recovery Method
         </span>
       </h1>
diff --git a/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap b/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap
index 3cc2f1630f..d22d61a0bd 100644
--- a/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap
+++ b/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<ErrorView /> should match snapshot 1`] = `
 <DocumentFragment>
@@ -98,11 +98,11 @@ exports[`<UnsupportedBrowserView /> should match snapshot 1`] = `
         </span>
       </p>
       <div
-        class="mx_Flex mx_ErrorView_buttons"
+        class="_flex_4dswl_9 mx_ErrorView_flexContainer mx_ErrorView_buttons"
         style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-4x); --mx-flex-wrap: nowrap;"
       >
         <button
-          class="_button_vczzf_8 _has-icon_vczzf_57"
+          class="_button_187yx_8 _has-icon_187yx_57"
           data-kind="secondary"
           data-size="sm"
           role="button"
@@ -128,7 +128,7 @@ exports[`<UnsupportedBrowserView /> should match snapshot 1`] = `
       </div>
     </div>
     <div
-      class="_separator_7ckbw_8"
+      class="_separator_cqpyv_8"
       data-kind="primary"
       data-orientation="horizontal"
       role="separator"
@@ -139,67 +139,116 @@ exports[`<UnsupportedBrowserView /> should match snapshot 1`] = `
       Use Element Desktop instead
     </h2>
     <div
-      class="mx_Flex"
+      class="_flex_4dswl_9 mx_ErrorView_flexContainer"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-4x); --mx-flex-wrap: nowrap;"
     >
       <a
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="secondary"
         data-size="lg"
         href="https://packages.element.io/desktop/install/macos/Element.dmg"
         role="link"
         tabindex="0"
       >
-        <div
+        <svg
           aria-hidden="true"
+          fill="currentColor"
           height="20"
+          viewBox="0 0 24 24"
           width="20"
-        />
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            clip-rule="evenodd"
+            d="M16.099 2.4a4.1 4.1 0 0 1-1.057 3.074c-.747.862-1.878 1.358-3.07 1.347-.075-1.081.315-2.146 1.085-2.96.78-.825 1.866-1.346 3.042-1.461m3.767 6.54c-1.37.783-2.213 2.163-2.234 3.657.002 1.69 1.092 3.215 2.768 3.873a9.4 9.4 0 0 1-1.44 2.723c-.848 1.178-1.737 2.329-3.149 2.35-.67.015-1.124-.165-1.596-.351-.493-.195-1.006-.398-1.809-.398-.851 0-1.388.21-1.905.412-.447.174-.88.343-1.49.367-1.343.046-2.37-1.258-3.25-2.425-1.756-2.383-3.124-6.716-1.29-9.664.861-1.437 2.471-2.349 4.241-2.402.763-.015 1.494.258 2.136.497.49.183.928.347 1.286.347.315 0 .74-.157 1.237-.34.78-.288 1.737-.64 2.71-.545 1.514.044 2.917.748 3.785 1.9"
+            fill-rule="evenodd"
+          />
+        </svg>
         Mac
       </a>
       <a
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="secondary"
         data-size="lg"
         href="https://packages.element.io/desktop/install/win32/x64/Element%20Setup.exe"
         role="link"
         tabindex="0"
       >
-        <div
+        <svg
           aria-hidden="true"
+          fill="currentColor"
           height="20"
+          viewBox="0 0 24 24"
           width="20"
-        />
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12.589 2.4H21.6v9.011h-9.011zM2.4 12.588h9.011v9.011H2.4zM2.4 2.4h9.011v9.011H2.4zm10.189 10.188H21.6v9.011h-9.011z"
+          />
+        </svg>
         Windows (64-bit)
       </a>
       <a
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="secondary"
         data-size="lg"
         href="https://packages.element.io/desktop/install/win32/arm64/Element%20Setup.exe"
         role="link"
         tabindex="0"
       >
-        <div
+        <svg
           aria-hidden="true"
+          fill="currentColor"
           height="20"
+          viewBox="0 0 24 24"
           width="20"
-        />
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12.589 2.4H21.6v9.011h-9.011zM2.4 12.588h9.011v9.011H2.4zM2.4 2.4h9.011v9.011H2.4zm10.189 10.188H21.6v9.011h-9.011z"
+          />
+        </svg>
         Windows (ARM 64-bit)
       </a>
       <a
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="secondary"
         data-size="lg"
         href="https://element.io/download#linux"
         role="link"
         tabindex="0"
       >
-        <div
+        <svg
           aria-hidden="true"
+          fill="currentColor"
           height="20"
+          viewBox="0 0 24 24"
           width="20"
-        />
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <g
+            clip-path="url(#a)"
+          >
+            <path
+              d="M13.206 20.644a2.7 2.7 0 0 1-1.097.248 2.8 2.8 0 0 1-1.567-.495c-.153.38-.392.723-.7 1a2.8 2.8 0 0 1-1.078.604h6.141a2.8 2.8 0 0 1-.99-.51 2.8 2.8 0 0 1-.709-.847M6.71 16.673a.2.2 0 0 0 .067-.03q.056-.49.13-.94c-.01-.169.017-.338.08-.495.348-1.904.834-3.24 1.504-4.052a.13.13 0 0 1 .18-.018.123.123 0 0 1 .018.174 4 4 0 0 0-.203.272q-.764 1.113-1.199 3.389h.03a.6.6 0 0 1 .166 0c.198.042.508.203.985.67.061-2.72 1.661-4.913 3.642-4.913 1.748 0 3.208 1.715 3.556 3.997a1.7 1.7 0 0 1 .762-.742.8.8 0 0 1 .254-.047 7.5 7.5 0 0 0-.948-2.342 4 4 0 0 0-.2-.272.12.12 0 0 1-.03-.09.12.12 0 0 1 .048-.083.13.13 0 0 1 .092-.028.13.13 0 0 1 .085.045c.508.624.93 1.557 1.245 2.822.678.247.696 1.361.71 2.267 0 .43 0 .877.105.99.104.114.325.09.635-.04.036-.393.053-.742.063-1.036v-1.082c0-2.475-3.266-6.755-3.266-6.755l-.378-3.218c0-2.953-2.733-2.926-2.733-2.926s-2.743-.027-2.743 2.914l-.365 3.23s-3.267 4.277-3.267 6.755v.31s-.012.299 0 .767v.227c.414.154.839.315.976.28m5.388-10.41c.761.068 1.975.247 2.031.613.04.282-.429.822-.523.926-.195.215-.876.92-1.49.92-.615 0-1.296-.705-1.49-.92-.093-.104-.563-.644-.525-.926.046-.374 1.273-.545 1.996-.614"
+            />
+            <path
+              d="M12.111 8.475c.333 0 .843-.33 1.298-.837.348-.384.475-.666.465-.73-.064-.127-.894-.317-1.778-.401-.856.084-1.687.274-1.75.406.091.275.252.523.467.722.457.51.965.84 1.298.84m.684 10.664c-.292-2.607-.023-3.146.206-3.324a.42.42 0 0 1 .4-.057c.23.11.431.271.587.47.287.304.488.495.674.391.131-.077.32-.495.507-.879.097-.205.196-.425.305-.636-.254-2.33-1.65-4.126-3.355-4.126-1.872 0-3.393 2.166-3.393 4.827v.096c.31.317.68.743 1.133 1.3q.266.328.487.685a2.7 2.7 0 0 1 .29 2.258c.426.312.943.485 1.476.495.341-.002.679-.073.99-.21a2.6 2.6 0 0 1-.16-.46 7 7 0 0 1-.147-.83"
+            />
+            <path
+              d="M9.651 17.35c-.355-.44-.657-.789-.916-1.071l-.13-.139-.132-.138c-.587-.594-.897-.758-1.06-.785a.2.2 0 0 0-.068 0 .15.15 0 0 0-.114.082v.017a.9.9 0 0 0-.058.406v.327c.034.25-.019.505-.15.723a.4.4 0 0 1-.087.071l-.053.032a.6.6 0 0 1-.107.043H6.75c-.211.037-.554-.084-.988-.248l-.127-.05c-.544-.21-1.179-.452-1.644-.452a.63.63 0 0 0-.553.232c-.34.495.421 1.273 1.036 1.901.378.389.675.693.708.921.059.42-.393.582-.792.725a1.5 1.5 0 0 0-.564.278c-.06.069-.058.116-.045.15.055.191.507.61 2.897 1.285q.398.112.806.178c.49.073.992.01 1.448-.182a2.64 2.64 0 0 0 1.13-.902q.165-.245.271-.522l.05-.121c0-.042.024-.09.037-.131a2.48 2.48 0 0 0-.293-1.98 7 7 0 0 0-.475-.65m9.618-.17c-.212.02-.418.084-.604.186l-.277.117c-.305.113-.61.168-.807-.095a.6.6 0 0 1-.094-.227 3.6 3.6 0 0 1-.056-.592v-.322c0-.72-.026-1.586-.373-1.925a.5.5 0 0 0-.255-.14h-.038a.5.5 0 0 0-.254.035c-.3.12-.56.496-.79.936l-.109.215-.117.248-.104.225c-.223.495-.398.874-.601.99-.376.216-.704-.13-.991-.438a1.5 1.5 0 0 0-.48-.4.2.2 0 0 0-.076-.016q-.048 0-.084.03c-.158.124-.384.69-.112 3.104q.044.4.137.792.052.207.137.404.027.056.056.111c.02.037.033.074.054.111.208.377.51.696.879.928a2.66 2.66 0 0 0 2.504.171c.398-.18.743-.454 1.003-.8a7 7 0 0 0 .45-.675c1.218-2.116 1.241-2.722 1.147-2.896a.15.15 0 0 0-.144-.077"
+            />
+          </g>
+          <defs>
+            <clippath
+              id="a"
+            >
+              <path
+                d="M3.167 2.19H20.5V22H3.165z"
+              />
+            </clippath>
+          </defs>
+        </svg>
         Linux
       </a>
     </div>
@@ -209,7 +258,7 @@ exports[`<UnsupportedBrowserView /> should match snapshot 1`] = `
       Or use our mobile app
     </h2>
     <div
-      class="mx_Flex"
+      class="_flex_4dswl_9 mx_ErrorView_flexContainer"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-6x); --mx-flex-wrap: nowrap;"
     >
       <a
diff --git a/test/unit-tests/audio/MockedPlayback.ts b/test/unit-tests/audio/MockedPlayback.ts
new file mode 100644
index 0000000000..da7839748e
--- /dev/null
+++ b/test/unit-tests/audio/MockedPlayback.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import EventEmitter from "events";
+import { SimpleObservable } from "matrix-widget-api";
+
+import { PlaybackState } from "../../../src/audio/Playback";
+
+/**
+ * A mocked playback implementation for testing purposes.
+ * It simulates a playback with a fixed size and allows state changes.
+ */
+export class MockedPlayback extends EventEmitter {
+    public sizeBytes = 8000;
+    private waveformObservable = new SimpleObservable<number[]>();
+    public liveData = new SimpleObservable<number[]>();
+
+    public constructor(
+        public currentState: PlaybackState,
+        public durationSeconds: number,
+        public timeSeconds: number,
+    ) {
+        super();
+    }
+
+    public setState(state: PlaybackState): void {
+        this.currentState = state;
+        this.emit("update", state);
+    }
+
+    public get isPlaying(): boolean {
+        return this.currentState === PlaybackState.Playing;
+    }
+
+    public get clockInfo() {
+        return {
+            liveData: this.liveData,
+            populatePlaceholdersFrom: () => undefined,
+        };
+    }
+
+    public get waveform(): number[] {
+        return [];
+    }
+
+    public get waveformData(): SimpleObservable<number[]> {
+        return this.waveformObservable;
+    }
+
+    public prepare = jest.fn().mockResolvedValue(undefined);
+    public skipTo = jest.fn();
+    public toggle = jest.fn();
+    public destroy = jest.fn().mockResolvedValue(undefined);
+}
diff --git a/test/unit-tests/audio/Playback-test.ts b/test/unit-tests/audio/Playback-test.ts
index 7f14685f45..9732132d6d 100644
--- a/test/unit-tests/audio/Playback-test.ts
+++ b/test/unit-tests/audio/Playback-test.ts
@@ -46,6 +46,7 @@ describe("Playback", () => {
 
     beforeEach(() => {
         jest.spyOn(logger, "error").mockRestore();
+        mockAudioBufferSourceNode.addEventListener.mockClear();
         mockAudioBuffer.getChannelData.mockClear().mockReturnValue(mockChannelData);
         mockAudioContext.decodeAudioData.mockReset().mockResolvedValue(mockAudioBuffer);
         mockAudioContext.resume.mockClear().mockResolvedValue(undefined);
@@ -105,6 +106,26 @@ describe("Playback", () => {
         expect(playback.currentState).toEqual(PlaybackState.Stopped);
     });
 
+    it("stop when audio source ended", async () => {
+        const buffer = new ArrayBuffer(8);
+        const playback = new Playback(buffer);
+        await playback.prepare();
+        await playback.play();
+
+        // Simulate the audio source ending by calling the 'ended' event listener
+        const endedListener = mockAudioBufferSourceNode.addEventListener.mock.calls.find(
+            (call) => call[0] === "ended",
+        )[1];
+        await endedListener();
+
+        // AudioContext should be suspended
+        expect(mockAudioContext.suspend).toHaveBeenCalled();
+        // Playback state should be Stopped
+        expect(playback.currentState).toEqual(PlaybackState.Stopped);
+        // Clock should be reset to 0
+        expect(playback.timeSeconds).toEqual(0);
+    });
+
     describe("prepare()", () => {
         it("decodes audio data when not greater than 5mb", async () => {
             const buffer = new ArrayBuffer(8);
diff --git a/test/unit-tests/audio/PlaybackQueue-test.ts b/test/unit-tests/audio/PlaybackQueue-test.ts
new file mode 100644
index 0000000000..15bad79345
--- /dev/null
+++ b/test/unit-tests/audio/PlaybackQueue-test.ts
@@ -0,0 +1,88 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type Mocked } from "jest-mock";
+import { type MatrixEvent, type Room } from "matrix-js-sdk/src/matrix";
+
+import { PlaybackQueue } from "../../../src/audio/PlaybackQueue";
+import { type Playback, PlaybackState } from "../../../src/audio/Playback";
+import { UPDATE_EVENT } from "../../../src/stores/AsyncStore";
+import { MockedPlayback } from "./MockedPlayback";
+import { SdkContextClass } from "../../../src/contexts/SDKContext";
+
+describe("PlaybackQueue", () => {
+    let playbackQueue: PlaybackQueue;
+    let mockRoom: Mocked<Room>;
+
+    beforeEach(() => {
+        mockRoom = {
+            getMember: jest.fn(),
+        } as unknown as Mocked<Room>;
+        playbackQueue = new PlaybackQueue(mockRoom, SdkContextClass.instance.roomViewStore);
+    });
+
+    it.each([
+        [PlaybackState.Playing, true],
+        [PlaybackState.Paused, true],
+        [PlaybackState.Preparing, false],
+        [PlaybackState.Decoding, false],
+        [PlaybackState.Stopped, false],
+    ])("should save (or not) the clock PlayBackState=%s expected=%s", (playbackState, expected) => {
+        const mockEvent = {
+            getId: jest.fn().mockReturnValue("$foo:bar"),
+        } as unknown as Mocked<MatrixEvent>;
+        const mockPlayback = new MockedPlayback(playbackState, 0, 0) as unknown as Mocked<Playback>;
+
+        // Enqueue
+        playbackQueue.unsortedEnqueue(mockEvent, mockPlayback);
+
+        // Emit our clockInfo of 0, which will playbackQueue to save the state.
+        mockPlayback.clockInfo.liveData.update([1]);
+
+        // @ts-ignore
+        expect(playbackQueue.clockStates.has(mockEvent.getId()!)).toBe(expected);
+    });
+
+    it("does call skipTo on playback if clock advances to 1s", () => {
+        const mockEvent = {
+            getId: jest.fn().mockReturnValue("$foo:bar"),
+        } as unknown as Mocked<MatrixEvent>;
+        const mockPlayback = new MockedPlayback(PlaybackState.Playing, 0, 0) as unknown as Mocked<Playback>;
+
+        // Enqueue
+        playbackQueue.unsortedEnqueue(mockEvent, mockPlayback);
+
+        // Emit our clockInfo of 0, which will playbackQueue to save the state.
+        mockPlayback.clockInfo.liveData.update([1]);
+
+        // Fire an update event to say that we have stopped.
+        // Note that Playback really emits an UPDATE_EVENT whenever state changes, the types are lies.
+        mockPlayback.emit(UPDATE_EVENT as any, PlaybackState.Stopped);
+
+        expect(mockPlayback.skipTo).toHaveBeenCalledWith(1);
+    });
+
+    it("should ignore the nullish clock state when loading", () => {
+        const clockStates = new Map([
+            ["a", 1],
+            ["b", null],
+            ["c", 3],
+        ]);
+        localStorage.setItem(
+            `mx_voice_message_clocks_${mockRoom.roomId}`,
+            JSON.stringify(Array.from(clockStates.entries())),
+        );
+        playbackQueue = new PlaybackQueue(mockRoom, SdkContextClass.instance.roomViewStore);
+
+        // @ts-ignore
+        expect(playbackQueue.clockStates.has("a")).toBe(true);
+        // @ts-ignore
+        expect(playbackQueue.clockStates.has("b")).toBe(false);
+        // @ts-ignore
+        expect(playbackQueue.clockStates.has("c")).toBe(true);
+    });
+});
diff --git a/test/unit-tests/autocomplete/CommandProvider-test.ts b/test/unit-tests/autocomplete/CommandProvider-test.ts
new file mode 100644
index 0000000000..f282063901
--- /dev/null
+++ b/test/unit-tests/autocomplete/CommandProvider-test.ts
@@ -0,0 +1,87 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type Room } from "matrix-js-sdk/src/matrix";
+
+import CommandProvider from "../../../src/autocomplete/CommandProvider";
+import { stubClient } from "../../test-utils";
+import { Command } from "../../../src/slash-commands/command";
+import { CommandCategories } from "../../../src/slash-commands/interface";
+import { _td } from "../../../src/languageHandler";
+import * as SlashCommands from "../../../src/SlashCommands";
+
+describe("CommandProvider", () => {
+    let room: Room;
+
+    beforeEach(() => {
+        stubClient();
+        room = {
+            roomId: "!room:server",
+        } as Room;
+    });
+
+    it("should filter out disabled commands when arguments are provided", async () => {
+        // Create a disabled command
+        const disabledCommand = new Command({
+            command: "disabled",
+            args: "<arg>",
+            description: _td("slash_command|spoiler"),
+            runFn: jest.fn(),
+            category: CommandCategories.messages,
+            isEnabled: () => false,
+        });
+
+        // Create an enabled command
+        const enabledCommand = new Command({
+            command: "enabled",
+            args: "<arg>",
+            description: _td("slash_command|shrug"),
+            runFn: jest.fn(),
+            category: CommandCategories.messages,
+            isEnabled: () => true,
+        });
+
+        // Mock the Commands array and CommandMap
+        Object.defineProperty(SlashCommands, "Commands", {
+            value: [disabledCommand, enabledCommand],
+            configurable: true,
+        });
+
+        const mockCommandMap = new Map<string, Command>();
+        mockCommandMap.set("disabled", disabledCommand);
+        mockCommandMap.set("enabled", enabledCommand);
+
+        Object.defineProperty(SlashCommands, "CommandMap", {
+            value: mockCommandMap,
+            configurable: true,
+        });
+
+        const provider = new CommandProvider(room);
+
+        // When we search for a disabled command with arguments
+        const completions = await provider.getCompletions("/disabled test", {
+            beginning: true,
+            start: 0,
+            end: 14,
+        });
+
+        // Then we should get no completions because the command is disabled
+        expect(completions).toEqual([]);
+
+        // When we search for an enabled command with arguments
+        const enabledCompletions = await provider.getCompletions("/enabled test", {
+            beginning: true,
+            start: 0,
+            end: 13,
+        });
+
+        // Then we should get the completion because the command is enabled
+        // The completion preserves the arguments when the command matches
+        expect(enabledCompletions.length).toBe(1);
+        expect(enabledCompletions[0].completion).toBe("/enabled test");
+    });
+});
diff --git a/test/unit-tests/components/structures/FileDropTarget-test.tsx b/test/unit-tests/components/structures/FileDropTarget-test.tsx
new file mode 100644
index 0000000000..20b02f9fa5
--- /dev/null
+++ b/test/unit-tests/components/structures/FileDropTarget-test.tsx
@@ -0,0 +1,59 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { mocked } from "jest-mock";
+import { render, fireEvent } from "jest-matrix-react";
+import { Room } from "matrix-js-sdk/src/matrix";
+
+import FileDropTarget from "../../../../src/components/structures/FileDropTarget.tsx";
+import { stubClient } from "../../../test-utils";
+
+describe("FileDropTarget", () => {
+    let room: Room;
+    beforeEach(() => {
+        const client = stubClient();
+        room = new Room("!roomId:example.com", client, client.getUserId()!);
+        room.currentState.maySendMessage = jest.fn().mockReturnValue(true);
+    });
+
+    it("should render nothing when idle", () => {
+        const element = document.createElement("div");
+        const onFileDrop = jest.fn();
+
+        const { asFragment } = render(<FileDropTarget room={room} onFileDrop={onFileDrop} parent={element} />);
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should render drop file prompt on mouse over with file if permissions allow", () => {
+        const element = document.createElement("div");
+        const onFileDrop = jest.fn();
+        mocked(room.currentState.maySendMessage).mockReturnValue(true);
+
+        const { asFragment } = render(<FileDropTarget room={room} onFileDrop={onFileDrop} parent={element} />);
+        fireEvent.dragEnter(element, {
+            dataTransfer: {
+                types: ["Files"],
+            },
+        });
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should not render drop file prompt on mouse over with file if permissions do not allow", () => {
+        const element = document.createElement("div");
+        const onFileDrop = jest.fn();
+        mocked(room.currentState.maySendMessage).mockReturnValue(false);
+
+        const { asFragment } = render(<FileDropTarget room={room} onFileDrop={onFileDrop} parent={element} />);
+        fireEvent.dragEnter(element, {
+            dataTransfer: {
+                types: ["Files"],
+            },
+        });
+        expect(asFragment()).toMatchSnapshot();
+    });
+});
diff --git a/test/unit-tests/components/structures/FilePanel-test.tsx b/test/unit-tests/components/structures/FilePanel-test.tsx
index 0b9b18c38e..eab6725293 100644
--- a/test/unit-tests/components/structures/FilePanel-test.tsx
+++ b/test/unit-tests/components/structures/FilePanel-test.tsx
@@ -12,7 +12,6 @@ import { screen, render, waitFor } from "jest-matrix-react";
 import { mocked } from "jest-mock";
 
 import FilePanel from "../../../../src/components/structures/FilePanel";
-import ResizeNotifier from "../../../../src/utils/ResizeNotifier";
 import { mkEvent, stubClient } from "../../../test-utils";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 
@@ -39,9 +38,7 @@ describe("FilePanel", () => {
         room.getOrCreateFilteredTimelineSet = jest.fn().mockReturnValue(timelineSet);
         mocked(cli.getRoom).mockReturnValue(room);
 
-        const { asFragment } = render(
-            <FilePanel roomId={room.roomId} onClose={jest.fn()} resizeNotifier={new ResizeNotifier()} />,
-        );
+        const { asFragment } = render(<FilePanel roomId={room.roomId} onClose={jest.fn()} />);
         await waitFor(() => {
             expect(screen.getByText("No files visible in this room")).toBeInTheDocument();
         });
@@ -64,7 +61,6 @@ describe("FilePanel", () => {
                 <FilePanel
                     roomId={room.roomId}
                     onClose={jest.fn()}
-                    resizeNotifier={new ResizeNotifier()}
                     ref={(ref) => {
                         filePanel = ref;
                     }}
diff --git a/test/unit-tests/components/structures/GenericDropdownMenu-test.tsx b/test/unit-tests/components/structures/GenericDropdownMenu-test.tsx
new file mode 100644
index 0000000000..e2ea1c5a75
--- /dev/null
+++ b/test/unit-tests/components/structures/GenericDropdownMenu-test.tsx
@@ -0,0 +1,48 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { render, screen, fireEvent } from "jest-matrix-react";
+
+import {
+    GenericDropdownMenu,
+    type GenericDropdownMenuItem,
+} from "../../../../src/components/structures/GenericDropdownMenu.tsx";
+
+describe("GenericDropdownMenu", () => {
+    it("should render check icon for checked option", async () => {
+        const options: GenericDropdownMenuItem<string>[] = [
+            {
+                key: "selected",
+                label: "Selected",
+                description: "This item is selected",
+            },
+            {
+                key: "not-selected",
+                label: "Not selected",
+            },
+        ];
+
+        render(
+            <GenericDropdownMenu
+                value="selected"
+                options={options}
+                onChange={jest.fn()}
+                selectedLabel={() => "Selected"}
+            />,
+        );
+
+        const trigger = screen.getByRole("button");
+        fireEvent.click(trigger);
+
+        const dropdown = await screen.findByRole("menu");
+        expect(
+            dropdown.querySelector('[aria-checked="true"]')?.querySelector(".mx_GenericDropdownMenu_Option--checkIcon"),
+        ).toBeTruthy();
+        expect(dropdown).toMatchSnapshot();
+    });
+});
diff --git a/test/unit-tests/components/structures/LoggedInView-test.tsx b/test/unit-tests/components/structures/LoggedInView-test.tsx
index 6d24cbe416..de4d0a2d58 100644
--- a/test/unit-tests/components/structures/LoggedInView-test.tsx
+++ b/test/unit-tests/components/structures/LoggedInView-test.tsx
@@ -15,6 +15,10 @@ import {
     MatrixEvent,
     ClientEvent,
     PushRuleKind,
+    ProfileKeyTimezone,
+    ProfileKeyMSC4175Timezone,
+    SyncState,
+    MatrixError,
 } from "matrix-js-sdk/src/matrix";
 import { MediaHandler } from "matrix-js-sdk/src/webrtc/mediaHandler";
 import { logger } from "matrix-js-sdk/src/logger";
@@ -33,6 +37,28 @@ import { SettingLevel } from "../../../../src/settings/SettingLevel";
 import { Action } from "../../../../src/dispatcher/actions";
 import Modal from "../../../../src/Modal";
 import { SETTINGS } from "../../../../src/settings/Settings";
+import ToastStore from "../../../../src/stores/ToastStore";
+
+// Create a mock resizer instance that can be shared across tests
+const mockResizerInstance = {
+    attach: jest.fn(),
+    detach: jest.fn(),
+    forHandleWithId: jest.fn().mockReturnValue({ resize: jest.fn() }),
+    setClassNames: jest.fn(),
+};
+
+// Mock the Resizer module
+jest.mock("../../../../src/resizer", () => {
+    const originalModule = jest.requireActual("../../../../src/resizer");
+    return {
+        ...originalModule,
+        Resizer: jest.fn().mockImplementation((container, distributorBuilder, collapseConfig) => {
+            // Store the callbacks globally for test access
+            (global as any).__resizeCallbacks = collapseConfig;
+            return mockResizerInstance;
+        }),
+    };
+});
 
 describe("<LoggedInView />", () => {
     const userId = "@alice:domain.org";
@@ -449,30 +475,169 @@ describe("<LoggedInView />", () => {
         it("does not update the timezone when userTimezonePublish is off", async () => {
             getComponent();
             await SettingsStore.setValue("userTimezonePublish", null, SettingLevel.DEVICE, false);
-            expect(mockClient.deleteExtendedProfileProperty).toHaveBeenCalledWith("us.cloke.msc4175.tz");
+            expect(mockClient.deleteExtendedProfileProperty).toHaveBeenCalledWith(ProfileKeyTimezone);
+            expect(mockClient.deleteExtendedProfileProperty).toHaveBeenCalledWith(ProfileKeyMSC4175Timezone);
             expect(mockClient.setExtendedProfileProperty).not.toHaveBeenCalled();
         });
         it("should set the user timezone when userTimezonePublish is enabled", async () => {
             getComponent();
             await SettingsStore.setValue("userTimezonePublish", null, SettingLevel.DEVICE, true);
-            expect(mockClient.setExtendedProfileProperty).toHaveBeenCalledWith("us.cloke.msc4175.tz", userTimezone);
+            expect(mockClient.setExtendedProfileProperty).toHaveBeenCalledWith(ProfileKeyTimezone, userTimezone);
+            expect(mockClient.setExtendedProfileProperty).toHaveBeenCalledWith(ProfileKeyMSC4175Timezone, userTimezone);
         });
 
         it("should set the user timezone when the timezone is changed", async () => {
             const newTimezone = "Europe/Paris";
             getComponent();
             await SettingsStore.setValue("userTimezonePublish", null, SettingLevel.DEVICE, true);
-            expect(mockClient.setExtendedProfileProperty).toHaveBeenCalledWith("us.cloke.msc4175.tz", userTimezone);
+            expect(mockClient.setExtendedProfileProperty).toHaveBeenCalledWith(ProfileKeyTimezone, userTimezone);
+            expect(mockClient.setExtendedProfileProperty).toHaveBeenCalledWith(ProfileKeyMSC4175Timezone, userTimezone);
             await SettingsStore.setValue("userTimezone", null, SettingLevel.DEVICE, newTimezone);
-            expect(mockClient.setExtendedProfileProperty).toHaveBeenCalledWith("us.cloke.msc4175.tz", newTimezone);
+            expect(mockClient.setExtendedProfileProperty).toHaveBeenCalledWith(ProfileKeyTimezone, newTimezone);
+            expect(mockClient.setExtendedProfileProperty).toHaveBeenCalledWith(ProfileKeyMSC4175Timezone, newTimezone);
         });
 
         it("should clear the timezone when the publish feature is turned off", async () => {
             getComponent();
             await SettingsStore.setValue("userTimezonePublish", null, SettingLevel.DEVICE, true);
-            expect(mockClient.setExtendedProfileProperty).toHaveBeenCalledWith("us.cloke.msc4175.tz", userTimezone);
+            expect(mockClient.setExtendedProfileProperty).toHaveBeenCalledWith(ProfileKeyTimezone, userTimezone);
+            expect(mockClient.setExtendedProfileProperty).toHaveBeenCalledWith(ProfileKeyMSC4175Timezone, userTimezone);
             await SettingsStore.setValue("userTimezonePublish", null, SettingLevel.DEVICE, false);
-            expect(mockClient.deleteExtendedProfileProperty).toHaveBeenCalledWith("us.cloke.msc4175.tz");
+            expect(mockClient.deleteExtendedProfileProperty).toHaveBeenCalledWith(ProfileKeyTimezone);
+            expect(mockClient.deleteExtendedProfileProperty).toHaveBeenCalledWith(ProfileKeyMSC4175Timezone);
+        });
+    });
+
+    describe("resource limit exceeded errors", () => {
+        it("pops a toast when M_RESOURCE_LIMIT_EXCEEDED is seen down sync", async () => {
+            const addOrReplaceToast = jest.spyOn(ToastStore.sharedInstance(), "addOrReplaceToast");
+            const dismissToast = jest.spyOn(ToastStore.sharedInstance(), "dismissToast");
+            getComponent();
+            mockClient.emit(ClientEvent.Sync, SyncState.Error, null, {
+                error: new MatrixError({
+                    errcode: "M_RESOURCE_LIMIT_EXCEEDED",
+                    limit_type: "hs_disabled",
+                    admin_contact: "admin@example.org",
+                }),
+            });
+            expect(addOrReplaceToast).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    key: "serverlimit",
+                    title: "Warning",
+                }),
+            );
+            mockClient.emit(ClientEvent.Sync, SyncState.Prepared, null, undefined);
+            expect(dismissToast).toHaveBeenCalledWith("serverlimit");
+        });
+    });
+
+    describe("resizer preferences", () => {
+        let mockResize: jest.Mock;
+        let mockForHandleWithId: jest.Mock;
+        beforeEach(() => {
+            // Clear localStorage before each test
+            window.localStorage.clear();
+
+            mockResize = jest.fn();
+            mockForHandleWithId = jest.fn().mockReturnValue({ resize: mockResize });
+
+            // Update the shared mock instance for this test
+            mockResizerInstance.forHandleWithId = mockForHandleWithId;
+
+            // Clear any global callback state
+            delete (global as any).__resizeCallbacks;
+        });
+
+        it("should call resize with default size when localStorage contains NaN value", () => {
+            // Set invalid value in localStorage that will result in NaN
+            window.localStorage.setItem("mx_lhs_size", "not-a-number");
+
+            getComponent();
+
+            // Verify that when lhsSize is NaN, it defaults to 350 and calls resize
+            expect(mockForHandleWithId).toHaveBeenCalledWith("lp-resizer");
+            expect(mockResize).toHaveBeenCalledWith(350);
+        });
+
+        it("should use existing size when localStorage contains valid value", () => {
+            // Set valid value in localStorage
+            window.localStorage.setItem("mx_lhs_size", "400");
+
+            getComponent();
+
+            // Verify the resize method was called with the stored size (400)
+            expect(mockResize).toHaveBeenCalledWith(400);
+        });
+
+        it("should enforce minimum width for new room list when stored size is zero", async () => {
+            // Enable new room list feature
+            await SettingsStore.setValue("feature_new_room_list", null, SettingLevel.DEVICE, true);
+
+            // 0 represents the collapsed state for the old room list, which could have been set before the new room list was enabled
+            window.localStorage.setItem("mx_lhs_size", "0");
+
+            getComponent();
+
+            // Verify the resize method was called with the default size (350) when stored size is below minimum
+            expect(mockResize).toHaveBeenCalledWith(350);
+        });
+
+        it("should not set localStorage to 0 when resizing lp-resizer to minimum width for new room list", async () => {
+            // Enable new room list feature and mock SettingsStore
+            await SettingsStore.setValue("feature_new_room_list", null, SettingLevel.DEVICE, true);
+
+            const minimumWidth = 224; // NEW_ROOM_LIST_MIN_WIDTH
+
+            // Render the component
+            getComponent();
+
+            // Get the callbacks that were captured during resizer creation
+            const callbacks = (global as any).__resizeCallbacks;
+
+            // Create a mock DOM node for isItemCollapsed to check
+            const domNode = {
+                classList: {
+                    contains: jest.fn().mockReturnValue(true), // Simulate the error where mx_LeftPanel_minimized is present
+                },
+            } as any;
+
+            callbacks.onResized(minimumWidth);
+            const isCollapsed = callbacks.isItemCollapsed(domNode);
+            callbacks.onCollapsed(isCollapsed); // Not collapsed for new room list
+            callbacks.onResizeStop();
+
+            // Verify localStorage was set to the minimum width (224), not 0
+            expect(window.localStorage.getItem("mx_lhs_size")).toBe("224");
+        });
+    });
+
+    describe("create a new resizer when page_type changes", () => {
+        afterEach(() => {
+            jest.clearAllMocks();
+        });
+
+        it("should call loadResizer when page_type changes", () => {
+            const component = getComponent({ page_type: "room" });
+
+            // Re-render with different page_type
+            component.rerender(<LoggedInView {...defaultProps} page_type="home" />);
+
+            // Verify that detach was called (from loadResizer)
+            expect(mockResizerInstance.detach).toHaveBeenCalledTimes(1);
+            // Verify that attach was called (from loadResizer)
+            // 1 (when page_type = "room") + 1 (when page_type = "home")
+            expect(mockResizerInstance.attach).toHaveBeenCalledTimes(2);
+        });
+
+        it("should not call loadResizer when page_type remains the same", () => {
+            const component = getComponent({ page_type: "room" });
+
+            // Re-render with same page_type but different other props
+            component.rerender(<LoggedInView {...defaultProps} page_type="room" currentRoomId="!different:room.id" />);
+
+            // Verify that resizer methods were not called
+            expect(mockResizerInstance.detach).not.toHaveBeenCalled();
+            expect(mockResizerInstance.attach).toHaveBeenCalledTimes(1);
         });
     });
 });
diff --git a/test/unit-tests/components/structures/MainSplit-test.tsx b/test/unit-tests/components/structures/MainSplit-test.tsx
index 2feb9b22f6..da3c29cd36 100644
--- a/test/unit-tests/components/structures/MainSplit-test.tsx
+++ b/test/unit-tests/components/structures/MainSplit-test.tsx
@@ -10,30 +10,26 @@ import React from "react";
 import { render, fireEvent } from "jest-matrix-react";
 
 import MainSplit from "../../../../src/components/structures/MainSplit";
-import ResizeNotifier from "../../../../src/utils/ResizeNotifier";
 import { PosthogAnalytics } from "../../../../src/PosthogAnalytics.ts";
+import { SDKContext, SdkContextClass } from "../../../../src/contexts/SDKContext.ts";
 
 describe("<MainSplit/>", () => {
-    const resizeNotifier = new ResizeNotifier();
     const children = (
         <div>
             Child<span>Foo</span>Bar
         </div>
     );
     const panel = <div>Right panel</div>;
+    let sdkContext: SdkContextClass;
 
     beforeEach(() => {
         localStorage.clear();
+        sdkContext = new SdkContextClass();
     });
 
     it("renders", () => {
         const { asFragment, container } = render(
-            <MainSplit
-                resizeNotifier={resizeNotifier}
-                children={children}
-                panel={panel}
-                analyticsRoomType="other_room"
-            />,
+            <MainSplit children={children} panel={panel} analyticsRoomType="other_room" />,
         );
         expect(asFragment()).toMatchSnapshot();
         // Assert it matches the default width of 320
@@ -42,13 +38,7 @@ describe("<MainSplit/>", () => {
 
     it("respects defaultSize prop", () => {
         const { asFragment, container } = render(
-            <MainSplit
-                resizeNotifier={resizeNotifier}
-                children={children}
-                panel={panel}
-                defaultSize={500}
-                analyticsRoomType="other_room"
-            />,
+            <MainSplit children={children} panel={panel} defaultSize={500} analyticsRoomType="other_room" />,
         );
         expect(asFragment()).toMatchSnapshot();
         // Assert it matches the default width of 350
@@ -59,7 +49,6 @@ describe("<MainSplit/>", () => {
         localStorage.setItem("mx_rhs_size_thread", "333");
         const { container } = render(
             <MainSplit
-                resizeNotifier={resizeNotifier}
                 children={children}
                 panel={panel}
                 sizeKey="thread"
@@ -73,18 +62,19 @@ describe("<MainSplit/>", () => {
     it("should report to analytics on resize stop", () => {
         const { container } = render(
             <MainSplit
-                resizeNotifier={resizeNotifier}
                 children={children}
                 panel={panel}
                 sizeKey="thread"
                 defaultSize={400}
                 analyticsRoomType="other_room"
             />,
+            { wrapper: ({ children }) => <SDKContext.Provider value={sdkContext}>{children}</SDKContext.Provider> },
         );
 
         const spy = jest.spyOn(PosthogAnalytics.instance, "trackEvent");
 
         const handle = container.querySelector(".mx_ResizeHandle--horizontal")!;
+        expect(handle).toBeInTheDocument();
         fireEvent.mouseDown(handle);
         fireEvent.resize(handle, { clientX: 0 });
         fireEvent.mouseUp(handle);
diff --git a/test/unit-tests/components/structures/MatrixChat-test.tsx b/test/unit-tests/components/structures/MatrixChat-test.tsx
index 62fcf40f4d..f950b5a44f 100644
--- a/test/unit-tests/components/structures/MatrixChat-test.tsx
+++ b/test/unit-tests/components/structures/MatrixChat-test.tsx
@@ -71,6 +71,8 @@ import { SetupEncryptionStore } from "../../../../src/stores/SetupEncryptionStor
 import { ShareFormat } from "../../../../src/dispatcher/payloads/SharePayload.ts";
 import { clearStorage } from "../../../../src/Lifecycle";
 import RoomListStore from "../../../../src/stores/room-list/RoomListStore.ts";
+import UserSettingsDialog from "../../../../src/components/views/dialogs/UserSettingsDialog.tsx";
+import { SdkContextClass } from "../../../../src/contexts/SDKContext.ts";
 
 jest.mock("matrix-js-sdk/src/oidc/authorize", () => ({
     completeAuthorizationCodeGrant: jest.fn(),
@@ -94,7 +96,17 @@ describe("<MatrixChat />", () => {
         ...mockClientMethodsUser(userId),
         ...mockClientMethodsServer(),
         getVersions: jest.fn().mockResolvedValue({ versions: SERVER_SUPPORTED_MATRIX_VERSIONS }),
-        startClient: function () {
+        startClient: async function () {
+            // This `sleep` is a horrible hack, for which I am sorry.
+            //
+            // MatrixChat uses its `view` state as the tracker for the current state of its state machine. However,
+            // React state does not update immediately, with the result that if the client starts too quickly after the
+            // "OnLoggedIn" action, the state machine will be confused and the view will not be correctly updated.
+            //
+            // In practice it takes a little time for the client to start up (it has to read a load of stuff from
+            // indexedDB, so in some ways this is just a more realistic simulation of the real world 😇
+            await sleep(1);
+
             // @ts-ignore
             this.emit(ClientEvent.Sync, SyncState.Prepared, null);
         },
@@ -127,7 +139,7 @@ describe("<MatrixChat />", () => {
         setGuest: jest.fn(),
         setNotifTimelineSet: jest.fn(),
         getAccountData: jest.fn(),
-        doesServerSupportUnstableFeature: jest.fn(),
+        doesServerSupportUnstableFeature: jest.fn().mockResolvedValue(false),
         getDevices: jest.fn().mockResolvedValue({ devices: [] }),
         getProfileInfo: jest.fn().mockResolvedValue({
             displayname: "Ernie",
@@ -193,33 +205,6 @@ describe("<MatrixChat />", () => {
         localStorage.setItem("mx_device_id", deviceId);
     }
 
-    /**
-     * Wait for a bunch of stuff to happen
-     * between deciding we are logged in and removing the spinner
-     * including waiting for initial sync
-     */
-    const waitForSyncAndLoad = async (client: MatrixClient, withoutSecuritySetup?: boolean): Promise<void> => {
-        // need to wait for different elements depending on which flow
-        // without security setup we go to a loading page
-        if (withoutSecuritySetup) {
-            // wait for logged in view to load
-            await screen.findByLabelText("User menu");
-
-            // otherwise we stay on login and load from there for longer
-        } else {
-            // we are logged in, but are still waiting for the /sync to complete
-            await screen.findByText("Syncing…");
-            // initial sync
-            await act(() => client.emit(ClientEvent.Sync, SyncState.Prepared, null));
-        }
-
-        // let things settle
-        await flushPromises();
-        // and some more for good measure
-        // this proved to be a little flaky
-        await flushPromises();
-    };
-
     beforeEach(async () => {
         await clearStorage();
         Lifecycle.setSessionLockNotStolen();
@@ -269,6 +254,16 @@ describe("<MatrixChat />", () => {
         act(() => defaultDispatcher.dispatch({ action: Action.OnLoggedOut }, true));
 
         localStorage.clear();
+
+        // This is a massive hack, but ...
+        //
+        // A lot of these tests end up completing while the login flow is still proceeding. So then, we start the next
+        // test while stuff is still ongoing from the previous test, which messes up the current test (by changing
+        // localStorage or opening modals, or whatever).
+        //
+        // There is no obvious event we could wait for which indicates that everything has completed, since each test
+        // does something different. Instead...
+        await act(() => sleep(200));
     });
 
     resetJsDomAfterEach();
@@ -295,6 +290,30 @@ describe("<MatrixChat />", () => {
         });
     });
 
+    it("should notify resizenotifier when left panel hidden", async () => {
+        getComponent();
+
+        jest.spyOn(SdkContextClass.instance.resizeNotifier, "notifyLeftHandleResized");
+
+        defaultDispatcher.dispatch({ action: "hide_left_panel" });
+
+        await waitFor(() =>
+            expect(mocked(SdkContextClass.instance.resizeNotifier.notifyLeftHandleResized)).toHaveBeenCalled(),
+        );
+    });
+
+    it("should notify resizenotifier when left panel shown", async () => {
+        getComponent();
+
+        jest.spyOn(SdkContextClass.instance.resizeNotifier, "notifyLeftHandleResized");
+
+        defaultDispatcher.dispatch({ action: "show_left_panel" });
+
+        await waitFor(() =>
+            expect(mocked(SdkContextClass.instance.resizeNotifier.notifyLeftHandleResized)).toHaveBeenCalled(),
+        );
+    });
+
     describe("when query params have a OIDC params", () => {
         const issuer = "https://auth.com/";
         const homeserverUrl = "https://matrix.org";
@@ -511,15 +530,15 @@ describe("<MatrixChat />", () => {
                 getComponent({ realQueryParams });
 
                 defaultDispatcher.dispatch({
-                    action: "will_start_client",
+                    action: Action.WillStartClient,
                 });
                 // client successfully started
                 await waitFor(() =>
-                    expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({ action: "client_started" }),
+                    expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({ action: Action.ClientStarted }),
                 );
 
-                // check we get to logged in view
-                await waitForSyncAndLoad(loginClient, true);
+                // set up keys screen is rendered
+                expect(screen.getByText("Setting up keys")).toBeInTheDocument();
             });
 
             it("should persist device language when available", async () => {
@@ -640,22 +659,29 @@ describe("<MatrixChat />", () => {
         });
 
         describe("onAction()", () => {
-            beforeEach(() => {
-                jest.spyOn(defaultDispatcher, "dispatch").mockClear();
-                jest.spyOn(defaultDispatcher, "fire").mockClear();
+            afterEach(() => {
+                jest.restoreAllMocks();
             });
-            it("should open user device settings", async () => {
+
+            it("ViewUserDeviceSettings should open user device settings", async () => {
                 await getComponentAndWaitForReady();
 
-                defaultDispatcher.dispatch({
-                    action: Action.ViewUserDeviceSettings,
-                });
+                const createDialog = jest.spyOn(Modal, "createDialog").mockReturnValue({} as any);
 
-                await flushPromises();
+                await act(async () => {
+                    defaultDispatcher.dispatch({
+                        action: Action.ViewUserDeviceSettings,
+                    });
 
-                expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({
-                    action: Action.ViewUserSettings,
-                    initialTabId: UserTab.SessionManager,
+                    await waitFor(() =>
+                        expect(createDialog).toHaveBeenCalledWith(
+                            UserSettingsDialog,
+                            { initialTabId: UserTab.SessionManager, sdkContext: expect.any(SdkContextClass) },
+                            /*className=*/ undefined,
+                            /*isPriority=*/ false,
+                            /*isStatic=*/ true,
+                        ),
+                    );
                 });
             });
 
@@ -672,10 +698,8 @@ describe("<MatrixChat />", () => {
                     jest.spyOn(spaceRoom, "isSpaceRoom").mockReturnValue(true);
 
                     jest.spyOn(ReleaseAnnouncementStore.instance, "getReleaseAnnouncement").mockReturnValue(null);
-                });
-
-                afterEach(() => {
-                    jest.restoreAllMocks();
+                    (room as any).client = mockClient;
+                    (spaceRoom as any).client = mockClient;
                 });
 
                 describe("forget_room", () => {
@@ -760,6 +784,22 @@ describe("<MatrixChat />", () => {
                                 ),
                             ).toBeInTheDocument();
                         });
+                        it("should warn when user is the last admin", async () => {
+                            jest.spyOn(room, "getJoinedMembers").mockReturnValue([
+                                { powerLevel: 100 } as unknown as MatrixJs.RoomMember,
+                                { powerLevel: 0 } as unknown as MatrixJs.RoomMember,
+                            ]);
+                            jest.spyOn(room, "getMember").mockReturnValue({
+                                powerLevel: 100,
+                            } as unknown as MatrixJs.RoomMember);
+                            dispatchAction();
+                            await screen.findByRole("dialog");
+                            expect(
+                                screen.getByText(
+                                    "You're the only administrator in this room. If you leave, nobody will be able to change room settings or take other important actions.",
+                                ),
+                            ).toBeInTheDocument();
+                        });
                         it("should do nothing on cancel", async () => {
                             dispatchAction();
                             const dialog = await screen.findByRole("dialog");
@@ -1040,7 +1080,7 @@ describe("<MatrixChat />", () => {
                 localStorage.removeItem("must_verify_device");
             });
 
-            it("should show the complete security screen if unskippable verification is enabled", async () => {
+            it("should show the Complete Security screen if unskippable verification is enabled", async () => {
                 // Given we have force verification on, and an existing logged-in session
                 // that is not verified (see beforeEach())
 
@@ -1048,12 +1088,11 @@ describe("<MatrixChat />", () => {
                 getComponent();
 
                 // Then we are asked to verify our device
-                await screen.findByRole("heading", { name: "Verify this device", level: 1 });
+                await screen.findByRole("heading", { name: "Confirm your identity", level: 2 });
 
                 // Sanity: we are not racing with another screen update, so this heading stays visible
-                await screen.findByRole("heading", { name: "Verify this device", level: 1 });
+                await screen.findByRole("heading", { name: "Confirm your identity", level: 2 });
             });
-
             it("should not open app after cancelling device verify if unskippable verification is on", async () => {
                 // See https://github.com/element-hq/element-web/issues/29230
                 // We used to allow bypassing force verification by choosing "Verify with
@@ -1068,17 +1107,63 @@ describe("<MatrixChat />", () => {
                 // And MatrixChat is rendered
                 getComponent();
 
-                // When we click "Verify with another device"
-                await screen.findByRole("heading", { name: "Verify this device", level: 1 });
-                const verify = screen.getByRole("button", { name: "Verify with another device" });
+                // When we click "Use another device"
+                await screen.findByRole("heading", { name: "Confirm your identity", level: 2 });
+                const verify = screen.getByRole("button", { name: "Use another device" });
                 act(() => verify.click());
 
                 // And close the device verification dialog
-                const closeButton = await screen.findByRole("button", { name: "Close dialog" });
+                const closeButton = screen.getByRole("button", { name: "Close dialog" });
                 act(() => closeButton.click());
 
                 // Then we are not allowed in - we are still being asked to verify
-                await screen.findByRole("heading", { name: "Verify this device", level: 1 });
+                await screen.findByRole("heading", { name: "Confirm your identity", level: 2 });
+            });
+
+            describe("when query params have a loginToken", () => {
+                const loginToken = "test-login-token";
+                const realQueryParams = {
+                    loginToken,
+                };
+
+                let loginClient!: ReturnType<typeof getMockClientWithEventEmitter>;
+                const deviceId = "test-device-id";
+                const accessToken = "test-access-token";
+                const clientLoginResponse = {
+                    user_id: userId,
+                    device_id: deviceId,
+                    access_token: accessToken,
+                };
+
+                beforeEach(() => {
+                    localStorage.setItem("mx_sso_hs_url", serverConfig.hsUrl);
+                    localStorage.setItem("mx_sso_is_url", serverConfig.isUrl);
+                    loginClient = getMockClientWithEventEmitter(getMockClientMethods());
+                    // this is used to create a temporary client during login
+                    jest.spyOn(MatrixJs, "createClient").mockReturnValue(loginClient);
+
+                    loginClient.login.mockClear().mockResolvedValue(clientLoginResponse);
+                });
+
+                it("should show the Complete Security screen after OIDC login if unskippable ver. is on", async () => {
+                    // Given force_verification is on (outer describe)
+                    // And we just logged in via OIDC (inner describe)
+
+                    mocked(loginClient.getCrypto()!.userHasCrossSigningKeys).mockResolvedValue(true);
+
+                    // When we load the page
+                    getComponent({ realQueryParams });
+
+                    defaultDispatcher.dispatch({
+                        action: Action.WillStartClient,
+                    });
+                    await waitFor(() =>
+                        expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({ action: Action.ClientStarted }),
+                    );
+
+                    // Then we are not allowed in - we are being asked to verify
+                    await screen.findByRole("heading", { name: "Confirm your identity", level: 2 });
+                });
             });
 
             function createMockCrypto(): CryptoApi {
@@ -1103,7 +1188,7 @@ describe("<MatrixChat />", () => {
                         .fn()
                         .mockResolvedValue({ signedByOwner: true } as DeviceVerificationStatus),
                     isCrossSigningReady: jest.fn().mockReturnValue(false),
-                    requestOwnUserVerification: jest.fn().mockResolvedValue({ cancel: jest.fn() }),
+                    requestOwnUserVerification: jest.fn().mockResolvedValue({ cancel: jest.fn(), on: jest.fn() }),
                 } as any;
             }
         });
@@ -1179,7 +1264,7 @@ describe("<MatrixChat />", () => {
             return renderResult;
         };
 
-        const getComponentAndLogin = async (withoutSecuritySetup?: boolean): Promise<void> => {
+        const getComponentAndLogin = async (): Promise<void> => {
             await getComponentAndWaitForReady();
 
             fireEvent.change(screen.getByLabelText("Username"), { target: { value: userName } });
@@ -1187,8 +1272,6 @@ describe("<MatrixChat />", () => {
 
             // sign in button is an input
             fireEvent.click(screen.getByDisplayValue("Sign in"));
-
-            await waitForSyncAndLoad(loginClient, withoutSecuritySetup);
         };
 
         beforeEach(() => {
@@ -1235,27 +1318,16 @@ describe("<MatrixChat />", () => {
             it("should go straight to logged in view when crypto is not enabled", async () => {
                 loginClient.getCrypto.mockReturnValue(undefined);
 
-                await getComponentAndLogin(true);
+                await getComponentAndLogin();
+
+                // wait for logged in view to load
+                await screen.findByLabelText("User menu");
 
                 expect(screen.getByRole("heading", { name: "Welcome Ernie" })).toBeInTheDocument();
             });
 
-            it("should go straight to logged in view when user does not have cross signing keys and server does not support cross signing", async () => {
-                loginClient.doesServerSupportUnstableFeature.mockResolvedValue(false);
-
-                await getComponentAndLogin(false);
-
-                expect(loginClient.doesServerSupportUnstableFeature).toHaveBeenCalledWith(
-                    "org.matrix.e2e_cross_signing",
-                );
-
-                // logged in
-                await screen.findByLabelText("User menu");
-            });
-
-            describe("when server supports cross signing and user does not have cross signing setup", () => {
+            describe("when user does not have cross signing set up", () => {
                 beforeEach(() => {
-                    loginClient.doesServerSupportUnstableFeature.mockResolvedValue(true);
                     jest.spyOn(loginClient.getCrypto()!, "userHasCrossSigningKeys").mockResolvedValue(false);
                 });
 
@@ -1282,57 +1354,48 @@ describe("<MatrixChat />", () => {
 
                     it("should go straight to logged in view when user is not in any encrypted rooms", async () => {
                         loginClient.getRooms.mockReturnValue([unencryptedRoom]);
-                        await getComponentAndLogin(false);
+                        await getComponentAndLogin();
 
-                        await flushPromises();
-
-                        // logged in, did not setup keys
+                        // logged in, did not set up keys
                         await screen.findByLabelText("User menu");
                     });
 
-                    it("should go to setup e2e screen when user is in encrypted rooms", async () => {
+                    it("should go to set up e2e screen when user is in encrypted rooms", async () => {
                         loginClient.getRooms.mockReturnValue([unencryptedRoom, encryptedRoom]);
                         await getComponentAndLogin();
-                        await flushPromises();
                         // set up keys screen is rendered
-                        expect(screen.getByText("Setting up keys")).toBeInTheDocument();
+                        await screen.findByText("Setting up keys");
                     });
                 });
 
-                it("should go to setup e2e screen", async () => {
-                    loginClient.doesServerSupportUnstableFeature.mockResolvedValue(true);
-
+                it("should go to set up e2e screen", async () => {
                     await getComponentAndLogin();
 
-                    expect(loginClient.getCrypto()!.userHasCrossSigningKeys).toHaveBeenCalled();
-
                     // set up keys screen is rendered
-                    await expect(await screen.findByText("Setting up keys")).toBeInTheDocument();
+                    await screen.findByText("Setting up keys");
+
+                    expect(loginClient.getCrypto()!.userHasCrossSigningKeys).toHaveBeenCalled();
                 });
             });
 
-            it("should show complete security screen when user has cross signing setup", async () => {
+            it("should show complete security screen when user has cross signing set up", async () => {
                 jest.spyOn(loginClient.getCrypto()!, "userHasCrossSigningKeys").mockResolvedValue(true);
 
                 await getComponentAndLogin();
 
-                expect(loginClient.getCrypto()!.userHasCrossSigningKeys).toHaveBeenCalled();
-
-                await flushPromises();
-
                 // Complete security begin screen is rendered
-                expect(screen.getByText("Unable to verify this device")).toBeInTheDocument();
+                await screen.findByText("Confirm your identity");
+
+                expect(loginClient.getCrypto()!.userHasCrossSigningKeys).toHaveBeenCalled();
             });
 
-            it("should setup e2e when server supports cross signing", async () => {
-                loginClient.doesServerSupportUnstableFeature.mockResolvedValue(true);
-
+            it("should set up e2e", async () => {
                 await getComponentAndLogin();
 
-                expect(loginClient.getCrypto()!.userHasCrossSigningKeys).toHaveBeenCalled();
-
                 // set up keys screen is rendered
-                expect(screen.getByText("Setting up keys")).toBeInTheDocument();
+                await screen.findByText("Setting up keys");
+
+                expect(loginClient.getCrypto()!.userHasCrossSigningKeys).toHaveBeenCalled();
             });
         });
     });
@@ -1484,11 +1547,11 @@ describe("<MatrixChat />", () => {
             it("should continue to post login setup when no session is found in local storage", async () => {
                 getComponent({ realQueryParams });
                 defaultDispatcher.dispatch({
-                    action: "will_start_client",
+                    action: Action.WillStartClient,
                 });
 
-                // logged in but waiting for sync screen
-                await screen.findByText("Logout");
+                // set up keys screen is rendered
+                expect(await screen.findByText("Setting up keys")).toBeInTheDocument();
             });
         });
     });
@@ -1556,10 +1619,15 @@ describe("<MatrixChat />", () => {
     });
 
     describe("Multi-tab lockout", () => {
+        beforeEach(() => {
+            mockPlatformPeg();
+        });
+
         afterEach(() => {
             Lifecycle.setSessionLockNotStolen();
         });
 
+        // Flaky test, see https://github.com/element-hq/element-web/issues/30337
         it("waits for other tab to stop during startup", async () => {
             fetchMock.get("/welcome.html", { body: "<h1>Hello</h1>" });
             jest.spyOn(Lifecycle, "attemptDelegatedAuthLogin");
@@ -1600,6 +1668,8 @@ describe("<MatrixChat />", () => {
             beforeEach(() => {
                 // make sure we start from a clean DOM for each of these tests
                 document.body.replaceChildren();
+                // use the MockPlatform
+                mockPlatformPeg();
             });
 
             function simulateSessionLockClaim() {
@@ -1616,8 +1686,7 @@ describe("<MatrixChat />", () => {
                 jest.spyOn(MatrixJs, "createClient").mockReturnValue(client);
 
                 const rendered = getComponent({});
-                await waitForSyncAndLoad(client, true);
-                rendered.getByText("Welcome Ernie");
+                await rendered.findByText("Welcome Ernie");
 
                 // we're now at the welcome page. Another session wants the lock...
                 simulateSessionLockClaim();
@@ -1737,7 +1806,7 @@ describe("<MatrixChat />", () => {
 
             getComponent({});
             defaultDispatcher.dispatch({
-                action: "will_start_client",
+                action: Action.WillStartClient,
             });
             await flushPromises();
             mockClient.emit(CryptoEvent.KeyBackupFailed, "error code");
@@ -1760,7 +1829,7 @@ describe("<MatrixChat />", () => {
 
             getComponent({});
             defaultDispatcher.dispatch({
-                action: "will_start_client",
+                action: Action.WillStartClient,
             });
             await flushPromises();
             mockClient.emit(CryptoEvent.KeyBackupFailed, "error code");
diff --git a/test/unit-tests/components/structures/MessagePanel-test.tsx b/test/unit-tests/components/structures/MessagePanel-test.tsx
index ae12768c2f..71234bea3b 100644
--- a/test/unit-tests/components/structures/MessagePanel-test.tsx
+++ b/test/unit-tests/components/structures/MessagePanel-test.tsx
@@ -15,11 +15,11 @@ import { render } from "jest-matrix-react";
 
 import MessagePanel, { shouldFormContinuation } from "../../../../src/components/structures/MessagePanel";
 import SettingsStore from "../../../../src/settings/SettingsStore";
-import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
-import RoomContext, { TimelineRenderingType } from "../../../../src/contexts/RoomContext";
+import RoomContext, { type RoomContextType, TimelineRenderingType } from "../../../../src/contexts/RoomContext";
 import DMRoomMap from "../../../../src/utils/DMRoomMap";
 import * as TestUtilsMatrix from "../../../test-utils";
 import {
+    clientAndSDKContextRenderOptions,
     createTestClient,
     getMockClientWithEventEmitter,
     makeBeaconInfoEvent,
@@ -29,9 +29,9 @@ import {
     mockClientPushProcessor,
 } from "../../../test-utils";
 import type ResizeNotifier from "../../../../src/utils/ResizeNotifier";
-import { type IRoomState } from "../../../../src/components/structures/RoomView";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import { ScopedRoomContextProvider } from "../../../../src/contexts/ScopedRoomContext.tsx";
+import { SdkContextClass } from "../../../../src/contexts/SDKContext.ts";
 
 jest.mock("../../../../src/utils/beacon", () => ({
     useBeacon: jest.fn(),
@@ -54,6 +54,7 @@ describe("MessagePanel", function () {
         getClientWellKnown: jest.fn().mockReturnValue({}),
         supportsThreads: jest.fn().mockReturnValue(true),
     });
+    let sdkContext: SdkContextClass;
     jest.spyOn(MatrixClientPeg, "get").mockReturnValue(client);
 
     const room = new Room(roomId, client, userId);
@@ -90,14 +91,12 @@ describe("MessagePanel", function () {
         showAvatarChanges: false,
         showDisplaynameChanges: true,
         showHiddenEvents: false,
-    } as unknown as IRoomState;
+    } as unknown as RoomContextType;
 
-    const getComponent = (props = {}, roomContext: Partial<IRoomState> = {}) => (
-        <MatrixClientContext.Provider value={client}>
-            <ScopedRoomContextProvider {...defaultRoomContext} {...roomContext}>
-                <MessagePanel {...defaultProps} {...props} />
-            </ScopedRoomContextProvider>
-        </MatrixClientContext.Provider>
+    const getComponent = (props = {}, roomContext: Partial<RoomContextType> = {}) => (
+        <ScopedRoomContextProvider {...defaultRoomContext} {...roomContext}>
+            <MessagePanel {...defaultProps} {...props} />
+        </ScopedRoomContextProvider>
     );
 
     beforeEach(function () {
@@ -107,6 +106,8 @@ describe("MessagePanel", function () {
             return arg === "showDisplaynameChanges";
         });
 
+        sdkContext = new SdkContextClass();
+
         DMRoomMap.makeShared(client);
     });
 
@@ -314,7 +315,7 @@ describe("MessagePanel", function () {
     }
 
     it("should show the events", function () {
-        const { container } = render(getComponent({ events }));
+        const { container } = render(getComponent({ events }), clientAndSDKContextRenderOptions(client, sdkContext));
 
         // just check we have the right number of tiles for now
         const tiles = container.getElementsByClassName("mx_EventTile");
@@ -322,7 +323,10 @@ describe("MessagePanel", function () {
     });
 
     it("should collapse adjacent member events", function () {
-        const { container } = render(getComponent({ events: mkMelsEvents() }));
+        const { container } = render(
+            getComponent({ events: mkMelsEvents() }),
+            clientAndSDKContextRenderOptions(client, sdkContext),
+        );
 
         // just check we have the right number of tiles for now
         const tiles = container.getElementsByClassName("mx_EventTile");
@@ -339,6 +343,7 @@ describe("MessagePanel", function () {
                 readMarkerEventId: events[4].getId(),
                 readMarkerVisible: true,
             }),
+            clientAndSDKContextRenderOptions(client, sdkContext),
         );
 
         const tiles = container.getElementsByClassName("mx_EventTile");
@@ -359,6 +364,7 @@ describe("MessagePanel", function () {
                 readMarkerEventId: melsEvents[4].getId(),
                 readMarkerVisible: true,
             }),
+            clientAndSDKContextRenderOptions(client, sdkContext),
         );
 
         const [summary] = container.getElementsByClassName("mx_GenericEventListSummary");
@@ -381,6 +387,7 @@ describe("MessagePanel", function () {
                 readMarkerEventId: melsEvents[9].getId(),
                 readMarkerVisible: true,
             }),
+            clientAndSDKContextRenderOptions(client, sdkContext),
         );
 
         const [summary] = container.getElementsByClassName("mx_GenericEventListSummary");
@@ -406,6 +413,7 @@ describe("MessagePanel", function () {
                     readMarkerVisible: true,
                 })}
             </div>,
+            clientAndSDKContextRenderOptions(client, sdkContext),
         );
 
         const tiles = container.getElementsByClassName("mx_EventTile");
@@ -448,7 +456,7 @@ describe("MessagePanel", function () {
         client.getRoom.mockImplementation((id) => (id === createEvent!.getRoomId() ? room : null));
         TestUtilsMatrix.upsertRoomStateEvents(room, events);
 
-        const { container } = render(getComponent({ events }));
+        const { container } = render(getComponent({ events }), clientAndSDKContextRenderOptions(client, sdkContext));
 
         // we expect that
         // - the room creation event, the room encryption event, and Alice inviting Bob,
@@ -476,7 +484,10 @@ describe("MessagePanel", function () {
         });
         const combinedEvents = [...events, beaconInfoEvent];
         TestUtilsMatrix.upsertRoomStateEvents(room, combinedEvents);
-        const { container } = render(getComponent({ events: combinedEvents }));
+        const { container } = render(
+            getComponent({ events: combinedEvents }),
+            clientAndSDKContextRenderOptions(client, sdkContext),
+        );
 
         const [summaryTile] = container.getElementsByClassName("mx_GenericEventListSummary");
 
@@ -498,6 +509,7 @@ describe("MessagePanel", function () {
                 readMarkerEventId: events[5].getId(),
                 readMarkerVisible: true,
             }),
+            clientAndSDKContextRenderOptions(client, sdkContext),
         );
 
         // find the <li> which wraps the read marker
@@ -514,7 +526,10 @@ describe("MessagePanel", function () {
 
     it("should render Date separators for the events", function () {
         const events = mkOneDayEvents();
-        const { queryAllByRole } = render(getComponent({ events }));
+        const { queryAllByRole } = render(
+            getComponent({ events }),
+            clientAndSDKContextRenderOptions(client, sdkContext),
+        );
         const dates = queryAllByRole("separator");
 
         expect(dates.length).toEqual(1);
@@ -523,7 +538,10 @@ describe("MessagePanel", function () {
     it("appends events into summaries during forward pagination without changing key", () => {
         const events = mkMelsEvents().slice(1, 11);
 
-        const { container, rerender } = render(getComponent({ events }));
+        const { container, rerender } = render(
+            getComponent({ events }),
+            clientAndSDKContextRenderOptions(client, sdkContext),
+        );
         let els = container.getElementsByClassName("mx_GenericEventListSummary");
         expect(els.length).toEqual(1);
         expect(els[0].getAttribute("data-testid")).toEqual("eventlistsummary-" + events[0].getId());
@@ -553,7 +571,10 @@ describe("MessagePanel", function () {
     it("prepends events into summaries during backward pagination without changing key", () => {
         const events = mkMelsEvents().slice(1, 11);
 
-        const { container, rerender } = render(getComponent({ events }));
+        const { container, rerender } = render(
+            getComponent({ events }),
+            clientAndSDKContextRenderOptions(client, sdkContext),
+        );
         let els = container.getElementsByClassName("mx_GenericEventListSummary");
         expect(els.length).toEqual(1);
         expect(els[0].getAttribute("data-testid")).toEqual("eventlistsummary-" + events[0].getId());
@@ -583,7 +604,10 @@ describe("MessagePanel", function () {
     it("assigns different keys to summaries that get split up", () => {
         const events = mkMelsEvents().slice(1, 11);
 
-        const { container, rerender } = render(getComponent({ events }));
+        const { container, rerender } = render(
+            getComponent({ events }),
+            clientAndSDKContextRenderOptions(client, sdkContext),
+        );
         let els = container.getElementsByClassName("mx_GenericEventListSummary");
         expect(els.length).toEqual(1);
         expect(els[0].getAttribute("data-testid")).toEqual(`eventlistsummary-${events[0].getId()}`);
@@ -616,7 +640,7 @@ describe("MessagePanel", function () {
     it("doesn't lookup showHiddenEventsInTimeline while rendering", () => {
         // We're only interested in the setting lookups that happen on every render,
         // rather than those happening on first mount, so let's get those out of the way
-        const { rerender } = render(getComponent({ events: [] }));
+        const { rerender } = render(getComponent({ events: [] }), clientAndSDKContextRenderOptions(client, sdkContext));
 
         // Set up our spy and re-render with new events
         const settingsSpy = jest.spyOn(SettingsStore, "getValue").mockClear();
@@ -654,7 +678,10 @@ describe("MessagePanel", function () {
                 ts: 3,
             }),
         ];
-        const { container } = render(getComponent({ events }, { showHiddenEvents: true }));
+        const { container } = render(
+            getComponent({ events }, { showHiddenEvents: true }),
+            clientAndSDKContextRenderOptions(client, sdkContext),
+        );
 
         const els = container.getElementsByClassName("mx_GenericEventListSummary");
         expect(els.length).toEqual(1);
@@ -678,7 +705,10 @@ describe("MessagePanel", function () {
                 }),
             );
         }
-        const { asFragment } = render(getComponent({ events }, { showHiddenEvents: false }));
+        const { asFragment } = render(
+            getComponent({ events }, { showHiddenEvents: false }),
+            clientAndSDKContextRenderOptions(client, sdkContext),
+        );
         expect(asFragment()).toMatchSnapshot();
     });
 
@@ -699,7 +729,10 @@ describe("MessagePanel", function () {
                 }),
             );
         }
-        const { asFragment } = render(getComponent({ events }, { showHiddenEvents: false }));
+        const { asFragment } = render(
+            getComponent({ events }, { showHiddenEvents: false }),
+            clientAndSDKContextRenderOptions(client, sdkContext),
+        );
         expect(asFragment()).toMatchSnapshot();
     });
 
@@ -720,7 +753,10 @@ describe("MessagePanel", function () {
                 }),
             );
         }
-        const { asFragment } = render(getComponent({ events }, { showHiddenEvents: true }));
+        const { asFragment } = render(
+            getComponent({ events }, { showHiddenEvents: true }),
+            clientAndSDKContextRenderOptions(client, sdkContext),
+        );
         const cpt = asFragment();
 
         // Ignore properties that change every time
@@ -751,7 +787,10 @@ describe("MessagePanel", function () {
                 content: { topic: "TOPIC" },
             }),
         ];
-        const { container } = render(getComponent({ events, showReadReceipts: true }));
+        const { container } = render(
+            getComponent({ events, showReadReceipts: true }),
+            clientAndSDKContextRenderOptions(client, sdkContext),
+        );
 
         const tiles = container.getElementsByClassName("mx_EventTile");
         expect(tiles.length).toEqual(2);
@@ -784,7 +823,10 @@ describe("MessagePanel", function () {
             },
             true,
         );
-        const { container } = render(getComponent({ events, showReadReceipts: true }));
+        const { container } = render(
+            getComponent({ events, showReadReceipts: true }),
+            clientAndSDKContextRenderOptions(client, sdkContext),
+        );
 
         const tiles = container.getElementsByClassName("mx_EventTile");
         expect(tiles.length).toEqual(2);
diff --git a/test/unit-tests/components/structures/PipContainer-test.tsx b/test/unit-tests/components/structures/PipContainer-test.tsx
index c401853c2f..2d3bcd821b 100644
--- a/test/unit-tests/components/structures/PipContainer-test.tsx
+++ b/test/unit-tests/components/structures/PipContainer-test.tsx
@@ -49,10 +49,12 @@ import WidgetStore from "../../../../src/stores/WidgetStore";
 import { WidgetType } from "../../../../src/widgets/WidgetType";
 import { SdkContextClass } from "../../../../src/contexts/SDKContext";
 import { ElementWidgetActions } from "../../../../src/stores/widgets/ElementWidgetActions";
+import { type WidgetMessaging } from "../../../../src/stores/widgets/WidgetMessaging";
 
 jest.mock("../../../../src/stores/OwnProfileStore", () => ({
     OwnProfileStore: {
         instance: {
+            on: jest.fn(),
             isProfileInfoFetched: true,
             removeListener: jest.fn(),
             getHttpAvatarUrl: jest.fn().mockReturnValue("http://avatar_url"),
@@ -132,6 +134,7 @@ describe("PipContainer", () => {
             {
                 action: Action.ViewRoom,
                 room_id: roomId,
+                view_call: false, // We're testing PiP functionality, so view the timeline
                 metricsTrigger: undefined,
             },
             true,
@@ -147,30 +150,40 @@ describe("PipContainer", () => {
         await act(async () => {
             WidgetStore.instance.addVirtualWidget(call.widget, room.roomId);
             WidgetMessagingStore.instance.storeMessaging(widget, room.roomId, {
+                on: () => {},
+                off: () => {},
+                prepare: async () => {},
                 stop: () => {},
-                hasCapability: jest.fn(),
-                feedStateUpdate: jest.fn().mockResolvedValue(undefined),
-            } as unknown as ClientWidgetApi);
+                widgetApi: {
+                    hasCapability: jest.fn(),
+                    feedStateUpdate: jest.fn().mockResolvedValue(undefined),
+                },
+            } as unknown as WidgetMessaging);
 
             await call.start();
             ActiveWidgetStore.instance.setWidgetPersistence(widget.id, room.roomId, true);
         });
 
-        await fn(call);
-
-        cleanup();
-        act(() => {
-            call.destroy();
-            ActiveWidgetStore.instance.destroyPersistentWidget(widget.id, room.roomId);
-            WidgetStore.instance.removeVirtualWidget(widget.id, room.roomId);
-        });
+        try {
+            await fn(call);
+        } finally {
+            cleanup();
+            act(() => {
+                call.destroy();
+                ActiveWidgetStore.instance.destroyPersistentWidget(widget.id, room.roomId);
+                WidgetStore.instance.removeVirtualWidget(widget.id, room.roomId);
+            });
+        }
     };
 
     const withWidget = async (fn: () => Promise<void>): Promise<void> => {
         act(() => ActiveWidgetStore.instance.setWidgetPersistence("1", room.roomId, true));
-        await fn();
-        cleanup();
-        ActiveWidgetStore.instance.destroyPersistentWidget("1", room.roomId);
+        try {
+            await fn();
+        } finally {
+            cleanup();
+            ActiveWidgetStore.instance.destroyPersistentWidget("1", room.roomId);
+        }
     };
 
     const setUpRoomViewStore = () => {
@@ -274,9 +287,13 @@ describe("PipContainer", () => {
                 >()
                 .mockResolvedValue({});
             const mockMessaging = {
-                transport: { send: sendSpy },
+                on: () => {},
+                off: () => {},
                 stop: () => {},
-            } as unknown as ClientWidgetApi;
+                widgetApi: {
+                    transport: { send: sendSpy },
+                },
+            } as unknown as WidgetMessaging;
             WidgetMessagingStore.instance.storeMessaging(new Widget(widget), room.roomId, mockMessaging);
             await user.click(screen.getByRole("button", { name: "Leave" }));
             expect(sendSpy).toHaveBeenCalledWith(ElementWidgetActions.HangupCall, {});
diff --git a/test/unit-tests/components/structures/ReleaseAnnouncement-test.tsx b/test/unit-tests/components/structures/ReleaseAnnouncement-test.tsx
index e53bf06d48..bb0274e9af 100644
--- a/test/unit-tests/components/structures/ReleaseAnnouncement-test.tsx
+++ b/test/unit-tests/components/structures/ReleaseAnnouncement-test.tsx
@@ -22,12 +22,7 @@ describe("ReleaseAnnouncement", () => {
 
     function renderReleaseAnnouncement() {
         return render(
-            <ReleaseAnnouncement
-                feature="pinningMessageList"
-                header="header"
-                description="description"
-                closeLabel="close"
-            >
+            <ReleaseAnnouncement feature="_test_dummy1" header="header" description="description" closeLabel="close">
                 <div>content</div>
             </ReleaseAnnouncement>,
         );
diff --git a/test/unit-tests/components/structures/RoomSearchView-test.tsx b/test/unit-tests/components/structures/RoomSearchView-test.tsx
index ab52e8012b..36c204ec13 100644
--- a/test/unit-tests/components/structures/RoomSearchView-test.tsx
+++ b/test/unit-tests/components/structures/RoomSearchView-test.tsx
@@ -20,11 +20,13 @@ import {
 } from "matrix-js-sdk/src/matrix";
 
 import { RoomSearchView } from "../../../../src/components/structures/RoomSearchView";
-import ResizeNotifier from "../../../../src/utils/ResizeNotifier";
-import { stubClient } from "../../../test-utils";
+import { clientAndSDKContextRenderOptions, stubClient } from "../../../test-utils";
 import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import { searchPagination, SearchScope } from "../../../../src/Searching";
+import { SdkContextClass } from "../../../../src/contexts/SDKContext";
+import SettingsStore from "../../../../src/settings/SettingsStore.ts";
+import { SettingLevel } from "../../../../src/settings/SettingLevel.ts";
 
 jest.mock("../../../../src/Searching", () => ({
     searchPagination: jest.fn(),
@@ -33,13 +35,14 @@ jest.mock("../../../../src/Searching", () => ({
 
 describe("<RoomSearchView/>", () => {
     const eventMapper = (obj: Partial<IEvent>) => new MatrixEvent(obj);
-    const resizeNotifier = new ResizeNotifier();
     let client: MatrixClient;
+    let sdkContext: SdkContextClass;
     let room: Room;
 
     beforeEach(async () => {
         stubClient();
         client = MatrixClientPeg.safeGet();
+        sdkContext = new SdkContextClass();
         client.supportsThreads = jest.fn().mockReturnValue(true);
         room = new Room("!room:server", client, client.getSafeUserId());
         mocked(client.getRoom).mockReturnValue(room);
@@ -60,7 +63,6 @@ describe("<RoomSearchView/>", () => {
                 term="search term"
                 scope={SearchScope.All}
                 promise={deferred.promise}
-                resizeNotifier={resizeNotifier}
                 className="someClass"
                 onUpdate={jest.fn()}
             />,
@@ -71,59 +73,57 @@ describe("<RoomSearchView/>", () => {
 
     it("should render results when the promise resolves", async () => {
         render(
-            <MatrixClientContext.Provider value={client}>
-                <RoomSearchView
-                    inProgress={false}
-                    term="search term"
-                    scope={SearchScope.All}
-                    promise={Promise.resolve<ISearchResults>({
-                        results: [
-                            SearchResult.fromJson(
-                                {
-                                    rank: 1,
-                                    result: {
-                                        room_id: room.roomId,
-                                        event_id: "$2",
-                                        sender: client.getSafeUserId(),
-                                        origin_server_ts: 1,
-                                        content: { body: "Foo Test Bar", msgtype: "m.text" },
-                                        type: EventType.RoomMessage,
-                                    },
-                                    context: {
-                                        profile_info: {},
-                                        events_before: [
-                                            {
-                                                room_id: room.roomId,
-                                                event_id: "$1",
-                                                sender: client.getSafeUserId(),
-                                                origin_server_ts: 1,
-                                                content: { body: "Before", msgtype: "m.text" },
-                                                type: EventType.RoomMessage,
-                                            },
-                                        ],
-                                        events_after: [
-                                            {
-                                                room_id: room.roomId,
-                                                event_id: "$3",
-                                                sender: client.getSafeUserId(),
-                                                origin_server_ts: 1,
-                                                content: { body: "After", msgtype: "m.text" },
-                                                type: EventType.RoomMessage,
-                                            },
-                                        ],
-                                    },
+            <RoomSearchView
+                inProgress={false}
+                term="search term"
+                scope={SearchScope.All}
+                promise={Promise.resolve<ISearchResults>({
+                    results: [
+                        SearchResult.fromJson(
+                            {
+                                rank: 1,
+                                result: {
+                                    room_id: room.roomId,
+                                    event_id: "$2",
+                                    sender: client.getSafeUserId(),
+                                    origin_server_ts: 1,
+                                    content: { body: "Foo Test Bar", msgtype: "m.text" },
+                                    type: EventType.RoomMessage,
                                 },
-                                eventMapper,
-                            ),
-                        ],
-                        highlights: [],
-                        count: 1,
-                    })}
-                    resizeNotifier={resizeNotifier}
-                    className="someClass"
-                    onUpdate={jest.fn()}
-                />
-            </MatrixClientContext.Provider>,
+                                context: {
+                                    profile_info: {},
+                                    events_before: [
+                                        {
+                                            room_id: room.roomId,
+                                            event_id: "$1",
+                                            sender: client.getSafeUserId(),
+                                            origin_server_ts: 1,
+                                            content: { body: "Before", msgtype: "m.text" },
+                                            type: EventType.RoomMessage,
+                                        },
+                                    ],
+                                    events_after: [
+                                        {
+                                            room_id: room.roomId,
+                                            event_id: "$3",
+                                            sender: client.getSafeUserId(),
+                                            origin_server_ts: 1,
+                                            content: { body: "After", msgtype: "m.text" },
+                                            type: EventType.RoomMessage,
+                                        },
+                                    ],
+                                },
+                            },
+                            eventMapper,
+                        ),
+                    ],
+                    highlights: [],
+                    count: 1,
+                })}
+                className="someClass"
+                onUpdate={jest.fn()}
+            />,
+            clientAndSDKContextRenderOptions(client, sdkContext),
         );
 
         await screen.findByText("Before");
@@ -133,41 +133,39 @@ describe("<RoomSearchView/>", () => {
 
     it("should highlight words correctly", async () => {
         render(
-            <MatrixClientContext.Provider value={client}>
-                <RoomSearchView
-                    inProgress={false}
-                    term="search term"
-                    scope={SearchScope.Room}
-                    promise={Promise.resolve<ISearchResults>({
-                        results: [
-                            SearchResult.fromJson(
-                                {
-                                    rank: 1,
-                                    result: {
-                                        room_id: room.roomId,
-                                        event_id: "$2",
-                                        sender: client.getSafeUserId(),
-                                        origin_server_ts: 1,
-                                        content: { body: "Foo Test Bar", msgtype: "m.text" },
-                                        type: EventType.RoomMessage,
-                                    },
-                                    context: {
-                                        profile_info: {},
-                                        events_before: [],
-                                        events_after: [],
-                                    },
+            <RoomSearchView
+                inProgress={false}
+                term="search term"
+                scope={SearchScope.Room}
+                promise={Promise.resolve<ISearchResults>({
+                    results: [
+                        SearchResult.fromJson(
+                            {
+                                rank: 1,
+                                result: {
+                                    room_id: room.roomId,
+                                    event_id: "$2",
+                                    sender: client.getSafeUserId(),
+                                    origin_server_ts: 1,
+                                    content: { body: "Foo Test Bar", msgtype: "m.text" },
+                                    type: EventType.RoomMessage,
                                 },
-                                eventMapper,
-                            ),
-                        ],
-                        highlights: ["test"],
-                        count: 1,
-                    })}
-                    resizeNotifier={resizeNotifier}
-                    className="someClass"
-                    onUpdate={jest.fn()}
-                />
-            </MatrixClientContext.Provider>,
+                                context: {
+                                    profile_info: {},
+                                    events_before: [],
+                                    events_after: [],
+                                },
+                            },
+                            eventMapper,
+                        ),
+                    ],
+                    highlights: ["test"],
+                    count: 1,
+                })}
+                className="someClass"
+                onUpdate={jest.fn()}
+            />,
+            clientAndSDKContextRenderOptions(client, sdkContext),
         );
 
         const text = await screen.findByText("Test");
@@ -231,17 +229,15 @@ describe("<RoomSearchView/>", () => {
         const onUpdate = jest.fn();
 
         const { rerender } = render(
-            <MatrixClientContext.Provider value={client}>
-                <RoomSearchView
-                    inProgress={true}
-                    term="search term"
-                    scope={SearchScope.All}
-                    promise={Promise.resolve(searchResults)}
-                    resizeNotifier={resizeNotifier}
-                    className="someClass"
-                    onUpdate={onUpdate}
-                />
-            </MatrixClientContext.Provider>,
+            <RoomSearchView
+                inProgress={true}
+                term="search term"
+                scope={SearchScope.All}
+                promise={Promise.resolve(searchResults)}
+                className="someClass"
+                onUpdate={onUpdate}
+            />,
+            clientAndSDKContextRenderOptions(client, sdkContext),
         );
 
         await screen.findByRole("progressbar");
@@ -249,17 +245,14 @@ describe("<RoomSearchView/>", () => {
         expect(onUpdate).toHaveBeenCalledWith(false, expect.objectContaining({}), null);
 
         rerender(
-            <MatrixClientContext.Provider value={client}>
-                <RoomSearchView
-                    inProgress={false}
-                    term="search term"
-                    scope={SearchScope.All}
-                    promise={Promise.resolve(searchResults)}
-                    resizeNotifier={resizeNotifier}
-                    className="someClass"
-                    onUpdate={jest.fn()}
-                />
-            </MatrixClientContext.Provider>,
+            <RoomSearchView
+                inProgress={false}
+                term="search term"
+                scope={SearchScope.All}
+                promise={Promise.resolve(searchResults)}
+                className="someClass"
+                onUpdate={jest.fn()}
+            />,
         );
 
         expect(screen.queryByRole("progressbar")).toBeFalsy();
@@ -275,7 +268,6 @@ describe("<RoomSearchView/>", () => {
                     term="search term"
                     scope={SearchScope.All}
                     promise={deferred.promise}
-                    resizeNotifier={resizeNotifier}
                     className="someClass"
                     onUpdate={jest.fn()}
                 />
@@ -299,7 +291,6 @@ describe("<RoomSearchView/>", () => {
                     term="search term"
                     scope={SearchScope.All}
                     promise={deferred.promise}
-                    resizeNotifier={resizeNotifier}
                     className="someClass"
                     onUpdate={jest.fn()}
                 />
@@ -324,7 +315,6 @@ describe("<RoomSearchView/>", () => {
                     term="search term"
                     scope={SearchScope.All}
                     promise={deferred.promise}
-                    resizeNotifier={resizeNotifier}
                     className="someClass"
                     onUpdate={onUpdate}
                 />
@@ -424,17 +414,15 @@ describe("<RoomSearchView/>", () => {
         };
 
         render(
-            <MatrixClientContext.Provider value={client}>
-                <RoomSearchView
-                    inProgress={false}
-                    term="search term"
-                    scope={SearchScope.All}
-                    promise={Promise.resolve(searchResults)}
-                    resizeNotifier={resizeNotifier}
-                    className="someClass"
-                    onUpdate={jest.fn()}
-                />
-            </MatrixClientContext.Provider>,
+            <RoomSearchView
+                inProgress={false}
+                term="search term"
+                scope={SearchScope.All}
+                promise={Promise.resolve(searchResults)}
+                className="someClass"
+                onUpdate={jest.fn()}
+            />,
+            clientAndSDKContextRenderOptions(client, sdkContext),
         );
 
         const beforeNode = await screen.findByText("Before");
@@ -452,6 +440,7 @@ describe("<RoomSearchView/>", () => {
     });
 
     it("should pass appropriate permalink creator for all rooms search", async () => {
+        await SettingsStore.setValue("alwaysShowTimestamps", null, SettingLevel.DEVICE, true);
         const room2 = new Room("!room2:server", client, client.getSafeUserId());
         const room3 = new Room("!room3:server", client, client.getSafeUserId());
         mocked(client.getRoom).mockImplementation(
@@ -459,98 +448,96 @@ describe("<RoomSearchView/>", () => {
         );
 
         render(
-            <MatrixClientContext.Provider value={client}>
-                <RoomSearchView
-                    inProgress={false}
-                    term="search term"
-                    scope={SearchScope.All}
-                    promise={Promise.resolve<ISearchResults>({
-                        results: [
-                            SearchResult.fromJson(
-                                {
-                                    rank: 1,
-                                    result: {
-                                        room_id: room.roomId,
-                                        event_id: "$2",
-                                        sender: client.getSafeUserId(),
-                                        origin_server_ts: 1,
-                                        content: { body: "Room 1", msgtype: "m.text" },
-                                        type: EventType.RoomMessage,
-                                    },
-                                    context: {
-                                        profile_info: {},
-                                        events_before: [],
-                                        events_after: [],
-                                    },
+            <RoomSearchView
+                inProgress={false}
+                term="search term"
+                scope={SearchScope.All}
+                promise={Promise.resolve<ISearchResults>({
+                    results: [
+                        SearchResult.fromJson(
+                            {
+                                rank: 1,
+                                result: {
+                                    room_id: room.roomId,
+                                    event_id: "$2",
+                                    sender: client.getSafeUserId(),
+                                    origin_server_ts: 1,
+                                    content: { body: "Room 1", msgtype: "m.text" },
+                                    type: EventType.RoomMessage,
                                 },
-                                eventMapper,
-                            ),
-                            SearchResult.fromJson(
-                                {
-                                    rank: 2,
-                                    result: {
-                                        room_id: room2.roomId,
-                                        event_id: "$22",
-                                        sender: client.getSafeUserId(),
-                                        origin_server_ts: 1,
-                                        content: { body: "Room 2", msgtype: "m.text" },
-                                        type: EventType.RoomMessage,
-                                    },
-                                    context: {
-                                        profile_info: {},
-                                        events_before: [],
-                                        events_after: [],
-                                    },
+                                context: {
+                                    profile_info: {},
+                                    events_before: [],
+                                    events_after: [],
                                 },
-                                eventMapper,
-                            ),
-                            SearchResult.fromJson(
-                                {
-                                    rank: 2,
-                                    result: {
-                                        room_id: room2.roomId,
-                                        event_id: "$23",
-                                        sender: client.getSafeUserId(),
-                                        origin_server_ts: 2,
-                                        content: { body: "Room 2 message 2", msgtype: "m.text" },
-                                        type: EventType.RoomMessage,
-                                    },
-                                    context: {
-                                        profile_info: {},
-                                        events_before: [],
-                                        events_after: [],
-                                    },
+                            },
+                            eventMapper,
+                        ),
+                        SearchResult.fromJson(
+                            {
+                                rank: 2,
+                                result: {
+                                    room_id: room2.roomId,
+                                    event_id: "$22",
+                                    sender: client.getSafeUserId(),
+                                    origin_server_ts: 1,
+                                    content: { body: "Room 2", msgtype: "m.text" },
+                                    type: EventType.RoomMessage,
                                 },
-                                eventMapper,
-                            ),
-                            SearchResult.fromJson(
-                                {
-                                    rank: 3,
-                                    result: {
-                                        room_id: room3.roomId,
-                                        event_id: "$32",
-                                        sender: client.getSafeUserId(),
-                                        origin_server_ts: 1,
-                                        content: { body: "Room 3", msgtype: "m.text" },
-                                        type: EventType.RoomMessage,
-                                    },
-                                    context: {
-                                        profile_info: {},
-                                        events_before: [],
-                                        events_after: [],
-                                    },
+                                context: {
+                                    profile_info: {},
+                                    events_before: [],
+                                    events_after: [],
                                 },
-                                eventMapper,
-                            ),
-                        ],
-                        highlights: [],
-                        count: 1,
-                    })}
-                    resizeNotifier={resizeNotifier}
-                    className="someClass"
-                    onUpdate={jest.fn()}
-                />
-            </MatrixClientContext.Provider>,
+                            },
+                            eventMapper,
+                        ),
+                        SearchResult.fromJson(
+                            {
+                                rank: 2,
+                                result: {
+                                    room_id: room2.roomId,
+                                    event_id: "$23",
+                                    sender: client.getSafeUserId(),
+                                    origin_server_ts: 2,
+                                    content: { body: "Room 2 message 2", msgtype: "m.text" },
+                                    type: EventType.RoomMessage,
+                                },
+                                context: {
+                                    profile_info: {},
+                                    events_before: [],
+                                    events_after: [],
+                                },
+                            },
+                            eventMapper,
+                        ),
+                        SearchResult.fromJson(
+                            {
+                                rank: 3,
+                                result: {
+                                    room_id: room3.roomId,
+                                    event_id: "$32",
+                                    sender: client.getSafeUserId(),
+                                    origin_server_ts: 1,
+                                    content: { body: "Room 3", msgtype: "m.text" },
+                                    type: EventType.RoomMessage,
+                                },
+                                context: {
+                                    profile_info: {},
+                                    events_before: [],
+                                    events_after: [],
+                                },
+                            },
+                            eventMapper,
+                        ),
+                    ],
+                    highlights: [],
+                    count: 1,
+                })}
+                className="someClass"
+                onUpdate={jest.fn()}
+            />,
+            clientAndSDKContextRenderOptions(client, sdkContext),
         );
 
         const event1 = await screen.findByText("Room 1");
diff --git a/test/unit-tests/components/structures/RoomView-test.tsx b/test/unit-tests/components/structures/RoomView-test.tsx
index 2d0d7f0d36..58a26ab73e 100644
--- a/test/unit-tests/components/structures/RoomView-test.tsx
+++ b/test/unit-tests/components/structures/RoomView-test.tsx
@@ -55,7 +55,6 @@ import { Action } from "../../../../src/dispatcher/actions";
 import defaultDispatcher from "../../../../src/dispatcher/dispatcher";
 import { type ViewRoomPayload } from "../../../../src/dispatcher/payloads/ViewRoomPayload";
 import { RoomView } from "../../../../src/components/structures/RoomView";
-import ResizeNotifier from "../../../../src/utils/ResizeNotifier";
 import SettingsStore from "../../../../src/settings/SettingsStore";
 import { SettingLevel } from "../../../../src/settings/SettingLevel";
 import DMRoomMap from "../../../../src/utils/DMRoomMap";
@@ -76,7 +75,11 @@ import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
 import { type ViewUserPayload } from "../../../../src/dispatcher/payloads/ViewUserPayload.ts";
 import { CallStore } from "../../../../src/stores/CallStore.ts";
 import MediaDeviceHandler, { MediaDeviceKindEnum } from "../../../../src/MediaDeviceHandler.ts";
-import Modal from "../../../../src/Modal.tsx";
+import Modal, { type ComponentProps } from "../../../../src/Modal.tsx";
+import ErrorDialog from "../../../../src/components/views/dialogs/ErrorDialog.tsx";
+import * as pinnedEventHooks from "../../../../src/hooks/usePinnedEvents";
+import { TimelineRenderingType } from "../../../../src/contexts/RoomContext";
+import { ModuleApi } from "../../../../src/modules/Api";
 
 // Used by group calls
 jest.spyOn(MediaDeviceHandler, "getDevices").mockResolvedValue({
@@ -89,7 +92,6 @@ describe("RoomView", () => {
     let cli: MockedObject<MatrixClient>;
     let room: Room;
     let rooms: Map<string, Room>;
-    let roomCount = 0;
     let stores: SdkContextClass;
     let crypto: CryptoApi;
 
@@ -100,7 +102,9 @@ describe("RoomView", () => {
         mockPlatformPeg({ reload: () => {} });
         cli = mocked(stubClient());
 
-        room = new Room(`!${roomCount++}:example.org`, cli, "@alice:example.org");
+        const roomName = (expect.getState().currentTestName ?? "").replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
+
+        room = new Room(`!${roomName}:example.org`, cli, "@alice:example.org");
         jest.spyOn(room, "findPredecessor");
         room.getPendingEvents = () => [];
         rooms = new Map();
@@ -123,10 +127,18 @@ describe("RoomView", () => {
     afterEach(() => {
         unmockPlatformPeg();
         jest.clearAllMocks();
+
+        // Can't jest.restoreAllMocks() because some tests will break
+        jest.spyOn(pinnedEventHooks, "usePinnedEvents").mockRestore();
+        jest.spyOn(pinnedEventHooks, "useSortedFetchedPinnedEvents").mockRestore();
+
         cleanup();
     });
 
-    const mountRoomView = async (ref?: RefObject<RoomView | null>): Promise<RenderResult> => {
+    const mountRoomView = async (
+        ref?: RefObject<RoomView | null>,
+        props?: Partial<ComponentProps<typeof RoomView>>,
+    ): Promise<RenderResult> => {
         if (stores.roomViewStore.getRoomId() !== room.roomId) {
             const switchedRoom = new Promise<void>((resolve) => {
                 const subFn = () => {
@@ -150,18 +162,21 @@ describe("RoomView", () => {
         }
 
         const roomView = render(
-            <MatrixClientContext.Provider value={cli}>
-                <SDKContext.Provider value={stores}>
-                    <RoomView
-                        // threepidInvite should be optional on RoomView props
-                        // it is treated as optional in RoomView
-                        threepidInvite={undefined as any}
-                        resizeNotifier={new ResizeNotifier()}
-                        forceTimeline={false}
-                        ref={ref}
-                    />
-                </SDKContext.Provider>
-            </MatrixClientContext.Provider>,
+            <RoomView
+                // threepidInvite should be optional on RoomView props
+                // it is treated as optional in RoomView
+                threepidInvite={undefined as any}
+                forceTimeline={false}
+                ref={ref}
+                {...props}
+            />,
+            {
+                wrapper: ({ children }) => (
+                    <MatrixClientContext.Provider value={cli}>
+                        <SDKContext.Provider value={stores}>{children}</SDKContext.Provider>
+                    </MatrixClientContext.Provider>
+                ),
+            },
         );
         await flushPromises();
         return roomView;
@@ -195,7 +210,6 @@ describe("RoomView", () => {
                         // threepidInvite should be optional on RoomView props
                         // it is treated as optional in RoomView
                         threepidInvite={undefined}
-                        resizeNotifier={new ResizeNotifier()}
                         forceTimeline={false}
                         onRegistered={jest.fn()}
                     />
@@ -211,6 +225,26 @@ describe("RoomView", () => {
         return ref.current!;
     };
 
+    it("gets a room view store from MultiRoomViewStore when given a room ID", async () => {
+        stores.multiRoomViewStore.getRoomViewStoreForRoom = jest.fn().mockReturnValue(stores.roomViewStore);
+
+        const ref = createRef<RoomView>();
+        render(
+            <MatrixClientContext.Provider value={cli}>
+                <SDKContext.Provider value={stores}>
+                    <RoomView
+                        threepidInvite={undefined as any}
+                        forceTimeline={false}
+                        ref={ref}
+                        roomId="!room:example.dummy"
+                    />
+                </SDKContext.Provider>
+            </MatrixClientContext.Provider>,
+        );
+
+        expect(stores.multiRoomViewStore.getRoomViewStoreForRoom).toHaveBeenCalledWith("!room:example.dummy");
+    });
+
     it("should show member list right panel phase on Action.ViewUser without `payload.member`", async () => {
         const spy = jest.spyOn(stores.rightPanelStore, "showOrHidePhase");
         await renderRoomView(false);
@@ -231,12 +265,131 @@ describe("RoomView", () => {
         expect(instance.getHiddenHighlightCount()).toBe(0);
     });
 
+    it("should hide the composer when hideComposer=true", async () => {
+        // Join the room
+        jest.spyOn(room, "getMyMembership").mockReturnValue(KnownMembership.Join);
+        const { asFragment } = await mountRoomView(undefined, { hideComposer: true });
+
+        expect(screen.queryByRole("textbox", { name: "Send an unencrypted message…" })).not.toBeInTheDocument();
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should hide the header when hideHeader=true", async () => {
+        // Join the room
+        jest.spyOn(room, "getMyMembership").mockReturnValue(KnownMembership.Join);
+        const { asFragment } = await mountRoomView(undefined, { hideHeader: true });
+
+        // Check that the room name button in the header is not rendered
+        expect(screen.queryByRole("button", { name: room.name })).not.toBeInTheDocument();
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should hide the right panel when hideRightPanel=true", async () => {
+        // Join the room
+        jest.spyOn(room, "getMyMembership").mockReturnValue(KnownMembership.Join);
+        const { asFragment, rerender } = await mountRoomView(undefined);
+
+        defaultDispatcher.dispatch<ViewUserPayload>(
+            {
+                action: Action.ViewUser,
+                member: undefined,
+            },
+            true,
+        );
+
+        // Check that the right panel is rendered
+        await expect(screen.findByTestId("right-panel")).resolves.toBeTruthy();
+        // Now rerender with hideRightPanel=true
+        rerender(<RoomView threepidInvite={undefined} forceTimeline={false} hideRightPanel={true} />);
+        // Check that the right panel is not rendered
+        await expect(screen.findByTestId("right-panel")).rejects.toThrow();
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should hide the pinned message banner when hidePinnedMessageBanner=true", async () => {
+        // Join the room
+        jest.spyOn(room, "getMyMembership").mockReturnValue(KnownMembership.Join);
+
+        const pinnedEvent = new MatrixEvent({
+            type: EventType.RoomMessage,
+            sender: "@alice:example.org",
+            content: {
+                body: "First pinned message",
+                msgtype: "m.text",
+            },
+            room_id: room.roomId,
+            origin_server_ts: 0,
+            event_id: "$eventId",
+        });
+
+        jest.spyOn(pinnedEventHooks, "usePinnedEvents").mockReturnValue([pinnedEvent.getId()!]);
+        jest.spyOn(pinnedEventHooks, "useSortedFetchedPinnedEvents").mockReturnValue([pinnedEvent]);
+
+        const { asFragment, rerender } = await mountRoomView(undefined);
+        // Check that the pinned message banner is rendered
+        await expect(screen.findByTestId("pinned-message-banner")).resolves.toBeTruthy();
+        // Now rerender with hidePinnedMessagesBanner=true
+        rerender(<RoomView threepidInvite={undefined} forceTimeline={false} hidePinnedMessageBanner={true} />);
+        // Check that the pinned message banner is not rendered
+        await expect(screen.findByTestId("pinned-message-banner")).rejects.toThrow();
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    describe("enableReadReceiptsAndMarkersOnActivity", () => {
+        it.each([
+            {
+                enabled: false,
+                testName: "should send read receipts and update read marker on focus when disabled",
+                checkCall: (sendReadReceiptsSpy: jest.Mock, updateReadMarkerSpy: jest.Mock) => {
+                    expect(sendReadReceiptsSpy).toHaveBeenCalled();
+                    expect(updateReadMarkerSpy).toHaveBeenCalled();
+                },
+            },
+            {
+                enabled: true,
+                testName: "should not send read receipts and update read marker on focus when enabled",
+                checkCall: (sendReadReceiptsSpy: jest.Mock, updateReadMarkerSpy: jest.Mock) => {
+                    expect(sendReadReceiptsSpy).not.toHaveBeenCalled();
+                    expect(updateReadMarkerSpy).not.toHaveBeenCalled();
+                },
+            },
+        ])("$testName", async ({ enabled, checkCall }) => {
+            // Join the room
+            jest.spyOn(room, "getMyMembership").mockReturnValue(KnownMembership.Join);
+            const ref = createRef<RoomView>();
+            await mountRoomView(ref, {
+                enableReadReceiptsAndMarkersOnActivity: enabled,
+            });
+
+            // Wait for the timeline to be rendered
+            await waitFor(() => expect(screen.getByTestId("timeline")).not.toBeNull());
+
+            // Get the RoomView instance and mock the messagePanel methods
+            const instance = ref.current!;
+            const sendReadReceiptsSpy = jest.fn();
+            const updateReadMarkerSpy = jest.fn();
+            // @ts-ignore - accessing private property for testing
+            instance.messagePanel = {
+                sendReadReceipts: sendReadReceiptsSpy,
+                updateReadMarker: updateReadMarkerSpy,
+            };
+
+            // Find the main RoomView div and trigger focus
+            const timeline = screen.getByTestId("timeline");
+            fireEvent.focus(timeline);
+
+            // Verify that sendReadReceipts and updateReadMarker were called or not based on the enabled state
+            checkCall(sendReadReceiptsSpy, updateReadMarkerSpy);
+        });
+    });
+
     describe("invites", () => {
         beforeEach(() => {
             const member = new RoomMember(room.roomId, cli.getSafeUserId());
             member.membership = KnownMembership.Invite;
             member.events.member = new MatrixEvent({
                 sender: "@bob:example.org",
+                content: { membership: KnownMembership.Invite },
             });
             room.getMyMembership = jest.fn().mockReturnValue(KnownMembership.Invite);
             room.getMember = jest.fn().mockReturnValue(member);
@@ -271,10 +424,45 @@ describe("RoomView", () => {
                 finished: Promise.resolve([true, true, false]),
                 close: jest.fn(),
             });
-            await fireEvent.click(getByRole("button", { name: "Decline and block" }));
+            await act(() => fireEvent.click(getByRole("button", { name: "Decline and block" })));
             expect(cli.leave).toHaveBeenCalledWith(room.roomId);
             expect(cli.setIgnoredUsers).toHaveBeenCalledWith(["@carol:example.org", "@bob:example.org"]);
         });
+        it("prevents ignoring own user", async () => {
+            const member = new RoomMember(room.roomId, cli.getSafeUserId());
+            member.membership = KnownMembership.Invite;
+            member.events.member = new MatrixEvent({
+                /*
+                It doesn't matter that this is an invite event coming from own user, we just
+                want to simulate a situation where the sender of the membership event somehow
+                ends up being own user.
+                 */
+                sender: cli.getSafeUserId(),
+                content: { membership: KnownMembership.Invite },
+            });
+            jest.spyOn(room, "getMyMembership").mockReturnValue(KnownMembership.Invite);
+            jest.spyOn(room, "getMember").mockReturnValue(member);
+
+            const { getByRole } = await mountRoomView();
+            cli.getIgnoredUsers.mockReturnValue(["@carol:example.org"]);
+            jest.spyOn(Modal, "createDialog").mockReturnValue({
+                finished: Promise.resolve([true, true, false]),
+                close: jest.fn(),
+            });
+
+            await act(() => fireEvent.click(getByRole("button", { name: "Decline and block" })));
+
+            // Should show error in a modal dialog
+            await waitFor(() => {
+                expect(Modal.createDialog).toHaveBeenLastCalledWith(ErrorDialog, {
+                    title: "Failed to reject invite",
+                    description: "Cannot determine which user to ignore since the member event has changed.",
+                });
+            });
+
+            // The ignore call should not go through
+            expect(cli.setIgnoredUsers).not.toHaveBeenCalled();
+        });
         it("handles declining an invite and reporting the room", async () => {
             const { getByRole } = await mountRoomView();
             jest.spyOn(Modal, "createDialog").mockReturnValue({
@@ -405,7 +593,8 @@ describe("RoomView", () => {
         );
 
         const { container } = await renderRoomView();
-        await waitFor(() => expect(container.querySelector(".mx_E2EIcon_normal")).toBeInTheDocument());
+        // We no longer show the grey shield for encrypted rooms, so it should not be there.
+        await waitFor(() => expect(container.querySelector(".mx_E2EIcon_normal")).not.toBeInTheDocument());
 
         const verificationStatus = new UserVerificationStatus(true, true, false);
         jest.spyOn(cli.getCrypto()!, "getUserVerificationStatus").mockResolvedValue(verificationStatus);
@@ -545,8 +734,8 @@ describe("RoomView", () => {
             ).toBeInTheDocument();
 
             // no message composer
-            expect(screen.queryByText("Send an encrypted message…")).not.toBeInTheDocument();
             expect(screen.queryByText("Send a message…")).not.toBeInTheDocument();
+            expect(screen.queryByText("Send an unencrypted message…")).not.toBeInTheDocument();
         });
     });
 
@@ -670,7 +859,7 @@ describe("RoomView", () => {
         });
 
         it("should switch rooms when edit is clicked on a search result for a different room", async () => {
-            const room2 = new Room(`!${roomCount++}:example.org`, cli, "@alice:example.org");
+            const room2 = new Room(`!roomswitchtest:example.org`, cli, "@alice:example.org");
             rooms.set(room2.roomId, room2);
 
             room.getMyMembership = jest.fn().mockReturnValue(KnownMembership.Join);
@@ -867,4 +1056,52 @@ describe("RoomView", () => {
             });
         });
     });
+
+    it("should not change room when editing event in a room displayed in module", async () => {
+        const room2 = new Room("!room2:example.org", cli, "@alice:example.org");
+        rooms.set(room2.roomId, room2);
+        room.getMyMembership = jest.fn().mockReturnValue(KnownMembership.Join);
+        room2.getMyMembership = jest.fn().mockReturnValue(KnownMembership.Join);
+
+        await mountRoomView();
+
+        // Mock the spaceStore activeSpace and ModuleApi setup
+        jest.spyOn(stores.spaceStore, "activeSpace", "get").mockReturnValue("space1");
+        // Mock that room2 is displayed in a module
+        ModuleApi.instance.extras.getVisibleRoomBySpaceKey("space1", () => [room2.roomId]);
+
+        // Mock the roomViewStore method
+        jest.spyOn(stores.roomViewStore, "isRoomDisplayedInModule").mockReturnValue(true);
+
+        // Create an event in room2 to edit
+        const eventInRoom2 = new MatrixEvent({
+            type: "m.room.message",
+            event_id: "$edit-event:example.org",
+            room_id: room2.roomId,
+            sender: "@alice:example.org",
+            content: {
+                body: "Original message",
+                msgtype: "m.text",
+            },
+        });
+
+        const dispatchSpy = jest.spyOn(defaultDispatcher, "dispatch");
+
+        // Dispatch EditEvent for event in room2 (which is displayed in module)
+        defaultDispatcher.dispatch({
+            action: Action.EditEvent,
+            event: eventInRoom2,
+            timelineRenderingType: TimelineRenderingType.Room,
+        });
+
+        await flushPromises();
+
+        // Should not dispatch ViewRoom action since room2 is displayed in module
+        expect(dispatchSpy).not.toHaveBeenCalledWith(
+            expect.objectContaining({
+                action: Action.ViewRoom,
+                room_id: room2.roomId,
+            }),
+        );
+    });
 });
diff --git a/test/unit-tests/components/structures/SpaceHierarchy-test.tsx b/test/unit-tests/components/structures/SpaceHierarchy-test.tsx
index cea704b90b..4861b720d4 100644
--- a/test/unit-tests/components/structures/SpaceHierarchy-test.tsx
+++ b/test/unit-tests/components/structures/SpaceHierarchy-test.tsx
@@ -9,18 +9,19 @@ Please see LICENSE files in the repository root for full details.
 import React from "react";
 import { mocked } from "jest-mock";
 import { fireEvent, render, screen, waitFor, waitForElementToBeRemoved } from "jest-matrix-react";
-import { type HierarchyRoom, JoinRule, type MatrixClient, Room } from "matrix-js-sdk/src/matrix";
+import { type HierarchyRoom, JoinRule, MatrixError, type MatrixClient, Room } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { RoomHierarchy } from "matrix-js-sdk/src/room-hierarchy";
 
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import { mkStubRoom, stubClient } from "../../../test-utils";
 import dispatcher from "../../../../src/dispatcher/dispatcher";
-import SpaceHierarchy, { showRoom, toLocalRoom } from "../../../../src/components/structures/SpaceHierarchy";
+import SpaceHierarchy, { showRoom, toLocalRoom, joinRoom } from "../../../../src/components/structures/SpaceHierarchy";
 import { Action } from "../../../../src/dispatcher/actions";
 import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
 import DMRoomMap from "../../../../src/utils/DMRoomMap";
 import SettingsStore from "../../../../src/settings/SettingsStore";
+import { type RoomViewStore } from "../../../../src/stores/RoomViewStore";
 
 describe("SpaceHierarchy", () => {
     describe("showRoom", () => {
@@ -66,6 +67,59 @@ describe("SpaceHierarchy", () => {
         });
     });
 
+    describe("joinRoom", () => {
+        let client: MatrixClient;
+        let hierarchy: RoomHierarchy;
+        let roomViewStore: RoomViewStore;
+        let room: Room;
+        const roomId = "!room:server";
+
+        beforeEach(() => {
+            stubClient();
+            client = MatrixClientPeg.safeGet();
+            room = new Room("space-id", client, "@alice:example.com");
+            hierarchy = new RoomHierarchy(room);
+            roomViewStore = {
+                showJoinRoomError: jest.fn(),
+            } as unknown as RoomViewStore;
+
+            jest.spyOn(client, "isGuest").mockReturnValue(false);
+            jest.spyOn(dispatcher, "dispatch");
+        });
+
+        it("should handle MatrixError exceptions when joining room", async () => {
+            // Mock joinRoom to throw a MatrixError
+            const matrixError = new MatrixError({ errcode: "M_FORBIDDEN", error: "Access denied" });
+            mocked(client.joinRoom).mockRejectedValue(matrixError);
+
+            // Attempt to join the room
+            await expect(joinRoom(client, roomViewStore, hierarchy, roomId)).rejects.toThrow(matrixError);
+
+            // Verify that showJoinRoomError was called with the MatrixError
+            expect(roomViewStore.showJoinRoomError).toHaveBeenCalledWith(matrixError, roomId);
+        });
+
+        it("should handle non-MatrixError exceptions when joining room", async () => {
+            // Mock joinRoom to throw a non-MatrixError
+            const customError = new Error("Custom error");
+            mocked(client.joinRoom).mockRejectedValue(customError);
+
+            // Attempt to join the room
+            await expect(joinRoom(client, roomViewStore, hierarchy, roomId)).rejects.toThrow("Custom error");
+
+            // Verify that showJoinRoomError was called with a MatrixError wrapper
+            expect(roomViewStore.showJoinRoomError).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    errcode: undefined,
+                    data: expect.objectContaining({
+                        error: "Unknown error",
+                    }),
+                }),
+                roomId,
+            );
+        });
+    });
+
     describe("toLocalRoom", () => {
         stubClient();
         const client = MatrixClientPeg.safeGet();
@@ -169,11 +223,14 @@ describe("SpaceHierarchy", () => {
         const room2 = mkStubRoom("room-id-3", "Room 2", client);
         const space1 = mkStubRoom("space-id-4", "Space 2", client);
         const room3 = mkStubRoom("room-id-5", "Room 3", client);
+        const space2 = mkStubRoom("space-id-6", "Space 3", client);
         mocked(client.getRooms).mockReturnValue([root]);
         mocked(client.getRoom).mockImplementation(
             (roomId) => client.getRooms().find((room) => room.roomId === roomId) ?? null,
         );
-        [room1, room2, space1, room3].forEach((r) => mocked(r.getMyMembership).mockReturnValue(KnownMembership.Leave));
+        [room1, room2, space1, room3, space2].forEach((r) =>
+            mocked(r.getMyMembership).mockReturnValue(KnownMembership.Leave),
+        );
 
         const hierarchyRoot: HierarchyRoom = {
             room_id: root.roomId,
@@ -324,5 +381,36 @@ describe("SpaceHierarchy", () => {
                 undefined,
             );
         });
+
+        it("should not render cycles", async () => {
+            const hierarchySpace2: HierarchyRoom = {
+                room_id: space2.roomId,
+                name: "Space with cycle",
+                num_joined_members: 1,
+                room_type: "m.space",
+                children_state: [
+                    {
+                        state_key: root.roomId,
+                        content: { order: "1" },
+                        origin_server_ts: 111,
+                        type: "m.space.child",
+                        sender: "@other:server",
+                    },
+                ],
+                world_readable: true,
+                guest_can_join: true,
+            };
+
+            mocked(client.getRoomHierarchy).mockResolvedValue({
+                rooms: [hierarchyRoot, hierarchyRoom1, hierarchyRoom2, hierarchySpace1, hierarchySpace2],
+            });
+
+            const { getAllByText, queryByText, asFragment } = render(getComponent());
+            // Wait for spinners to go away
+            await waitForElementToBeRemoved(screen.getAllByRole("progressbar"));
+            expect(getAllByText("Nested space")).toHaveLength(1);
+            expect(queryByText("Space 1")).not.toBeInTheDocument();
+            expect(asFragment()).toMatchSnapshot();
+        });
     });
 });
diff --git a/test/unit-tests/components/structures/SpaceRoomView-test.tsx b/test/unit-tests/components/structures/SpaceRoomView-test.tsx
index f181b90576..6610587a50 100644
--- a/test/unit-tests/components/structures/SpaceRoomView-test.tsx
+++ b/test/unit-tests/components/structures/SpaceRoomView-test.tsx
@@ -7,8 +7,8 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import { mocked, type MockedObject } from "jest-mock";
-import { type MatrixClient, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
-import { render, cleanup, screen, fireEvent } from "jest-matrix-react";
+import { type MatrixClient, MatrixEvent, Preset, Room } from "matrix-js-sdk/src/matrix";
+import { render, cleanup, screen, fireEvent, waitFor, act } from "jest-matrix-react";
 
 import { stubClient, mockPlatformPeg, unmockPlatformPeg, withClientContextRenderOptions } from "../../../test-utils";
 import { RightPanelPhases } from "../../../../src/stores/right-panel/RightPanelStorePhases";
@@ -17,6 +17,8 @@ import ResizeNotifier from "../../../../src/utils/ResizeNotifier.ts";
 import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalinks.ts";
 import RightPanelStore from "../../../../src/stores/right-panel/RightPanelStore.ts";
 import DMRoomMap from "../../../../src/utils/DMRoomMap.ts";
+import { type IOpts } from "../../../../src/createRoom.ts";
+import SpaceStore from "../../../../src/stores/spaces/SpaceStore.ts";
 
 describe("SpaceRoomView", () => {
     let cli: MockedObject<MatrixClient>;
@@ -86,7 +88,7 @@ describe("SpaceRoomView", () => {
         cleanup();
     });
 
-    const renderSpaceRoomView = async (): Promise<ReturnType<typeof render>> => {
+    const renderSpaceRoomView = async (justCreatedOpts?: IOpts): Promise<ReturnType<typeof render>> => {
         const resizeNotifier = new ResizeNotifier();
         const permalinkCreator = new RoomPermalinkCreator(space);
 
@@ -97,6 +99,7 @@ describe("SpaceRoomView", () => {
                 permalinkCreator={permalinkCreator}
                 onJoinButtonClicked={jest.fn()}
                 onRejectButtonClicked={jest.fn()}
+                justCreatedOpts={justCreatedOpts}
             />,
             withClientContextRenderOptions(cli),
         );
@@ -113,5 +116,175 @@ describe("SpaceRoomView", () => {
 
             expect(spy).toHaveBeenCalledWith({ phase: RightPanelPhases.MemberList });
         });
+
+        it("shows SpaceLandingAddButton context menu when Add button is clicked", async () => {
+            await renderSpaceRoomView();
+            await expect(screen.findByText("Welcome to")).resolves.toBeVisible();
+
+            const addButton = screen.getByRole("button", { name: /add/i });
+            fireEvent.click(addButton);
+
+            expect(await screen.findByText(/new room/i)).toBeInTheDocument();
+            expect(screen.getByText(/add existing room/i)).toBeInTheDocument();
+        });
+    });
+
+    describe("Spaces: creating a new community space", () => {
+        it("asks what topics you want to discuss, creates rooms for them and offers to share", async () => {
+            cli.createRoom.mockResolvedValueOnce({ room_id: "room1" }).mockResolvedValueOnce({ room_id: "room2" });
+            SpaceStore.instance.addRoomToSpace = jest.fn();
+
+            // Given we are creating a space
+            const view = await renderSpaceRoomView({
+                createOpts: { preset: Preset.PublicChat },
+                name: "My MySpace Space",
+            });
+
+            // Then we are asked what topics we want
+            expect(
+                view.getByRole("heading", { name: "What are some things you want to discuss in My MySpace Space?" }),
+            ).toBeInTheDocument();
+
+            // And some defaults are suggested
+            expect(view.getByPlaceholderText(/general/i)).toBeInTheDocument();
+            expect(view.getByPlaceholderText(/random/i)).toBeInTheDocument();
+            expect(view.getByPlaceholderText(/support/i)).toBeInTheDocument();
+
+            // When we enter some room names
+            const input1 = view.getAllByRole("textbox")[0];
+            const input2 = view.getAllByRole("textbox")[1];
+            fireEvent.change(input1, { target: { value: "Room 1" } });
+            fireEvent.change(input2, { target: { value: "Room 2" } });
+
+            // And click "Continue"
+            const button = view.getByRole("button", { name: "Continue" });
+            fireEvent.click(button);
+
+            // Then we create 2 rooms
+            await waitFor(() => {
+                expect(cli.createRoom).toHaveBeenCalledTimes(2);
+            });
+
+            // And offer the user to share this space
+            await waitFor(() =>
+                expect(view.getByRole("heading", { name: "Share My MySpace Space" })).toBeInTheDocument(),
+            );
+            expect(view.getByRole("button", { name: /Share invite link/ })).toBeInTheDocument();
+
+            // And allow them to continue to the first room
+            expect(view.getByRole("button", { name: "Go to my first room" })).toBeInTheDocument();
+        });
+
+        it("shows 'Skip for now' when all fields are empty, 'Continue' when any field is filled", async () => {
+            // Given we are creating a space
+            const view = await renderSpaceRoomView({
+                createOpts: { preset: Preset.PublicChat },
+            });
+
+            // When we clear all the topics
+            view.getAllByRole("textbox").forEach((input) => fireEvent.change(input, { target: { value: "" } }));
+
+            // Then the button reads "Skip for now"
+            expect(view.getByRole("button", { name: "Skip for now" })).toBeVisible();
+
+            // But when we enter a topic
+            fireEvent.change(view.getAllByRole("textbox")[0], { target: { value: "Room" } });
+
+            // Then the button says "Continue"
+            expect(view.getByRole("button", { name: "Continue" })).toBeVisible();
+        });
+
+        it("shows error message if room creation fails", async () => {
+            // Given we are creating a space
+            const view = await renderSpaceRoomView({
+                createOpts: { preset: Preset.PublicChat },
+            });
+
+            // And when we create a room it will fail
+            cli.createRoom.mockRejectedValue(new Error("fail"));
+
+            // When we create the space
+            fireEvent.change(view.getAllByRole("textbox")[0], { target: { value: "Room A" } });
+            fireEvent.click(view.getByRole("button", { name: "Continue" }));
+
+            // Then we display an error message because it failed
+            await waitFor(() => {
+                expect(
+                    view.getByText((content) => content.toLowerCase().includes("failed to create initial space rooms")),
+                ).toBeInTheDocument();
+            });
+        });
+
+        it("disables button and shows 'Creating rooms' while busy", async () => {
+            // Given we are creating a space
+            const view = await renderSpaceRoomView({
+                createOpts: { preset: Preset.PublicChat },
+            });
+
+            // And creating a room will be slow
+            cli.createRoom.mockImplementation(
+                () =>
+                    new Promise(() => {
+                        // This promise never resolves
+                    }),
+            );
+
+            // When we create the space
+            fireEvent.change(view.getAllByRole("textbox")[0], { target: { value: "Room A" } });
+            fireEvent.click(view.getByRole("button", { name: "Continue" }));
+
+            // Then the "Creating rooms..." message is displayed
+            const button = view.getByRole("button");
+            expect(button).toBeDisabled();
+            expect(button).toHaveValue("Creating rooms…"); // Note the ellipsis
+        });
+    });
+
+    describe("Spaces: creating a new private space", () => {
+        it("creates rooms inside a private space for a team", async () => {
+            cli.createRoom.mockResolvedValueOnce({ room_id: "room1" }).mockResolvedValueOnce({ room_id: "room2" });
+            SpaceStore.instance.addRoomToSpace = jest.fn();
+
+            // When I create a private space
+            const view = await renderSpaceRoomView({
+                createOpts: { preset: Preset.PrivateChat },
+                name: "Private space",
+                topic: "a private space for team A",
+            });
+
+            // Then I am asked whether it's individual or team
+            expect(view.getByRole("heading", { name: "Who are you working with?" })).toBeInTheDocument();
+
+            // And when I say team
+            act(() =>
+                view
+                    .getByRole("button", {
+                        name: "Me and my teammates A private space for you and your teammates",
+                    })
+                    .click(),
+            );
+
+            // Then I am asked what rooms to create
+            expect(view.getByRole("heading", { name: "What projects are your team working on?" })).toBeInTheDocument();
+
+            expect(view.getByPlaceholderText(/general/i)).toBeInTheDocument();
+            expect(view.getByPlaceholderText(/random/i)).toBeInTheDocument();
+            expect(view.getByPlaceholderText(/support/i)).toBeInTheDocument();
+
+            // And when I enter some room names
+            const input1 = view.getAllByRole("textbox")[0];
+            const input2 = view.getAllByRole("textbox")[1];
+            fireEvent.change(input1, { target: { value: "Room 1" } });
+            fireEvent.change(input2, { target: { value: "Room 2" } });
+
+            // And click "Continue"
+            const button = view.getByRole("button", { name: "Continue" });
+            fireEvent.click(button);
+
+            // Then the rooms are created
+            await waitFor(() => {
+                expect(cli.createRoom).toHaveBeenCalledTimes(2);
+            });
+        });
     });
 });
diff --git a/test/unit-tests/components/structures/TabbedView-test.tsx b/test/unit-tests/components/structures/TabbedView-test.tsx
index 38349e288a..ac1996ec95 100644
--- a/test/unit-tests/components/structures/TabbedView-test.tsx
+++ b/test/unit-tests/components/structures/TabbedView-test.tsx
@@ -8,15 +8,16 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import { act, fireEvent, render } from "jest-matrix-react";
+import { SettingsSolidIcon, VisibilityOnIcon, LabsIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import TabbedView, { Tab, TabLocation } from "../../../../src/components/structures/TabbedView";
 import { type NonEmptyArray } from "../../../../src/@types/common";
 import { _t } from "../../../../src/languageHandler";
 
 describe("<TabbedView />", () => {
-    const generalTab = new Tab("GENERAL", "common|general", "general", <div>general</div>);
-    const labsTab = new Tab("LABS", "common|labs", "labs", <div>labs</div>);
-    const appearanceTab = new Tab("APPEARANCE", "common|appearance", "appearance", <div>appearance</div>);
+    const generalTab = new Tab("GENERAL", "common|general", <SettingsSolidIcon />, <div>general</div>);
+    const labsTab = new Tab("LABS", "common|labs", <LabsIcon />, <div>labs</div>);
+    const appearanceTab = new Tab("APPEARANCE", "common|appearance", <VisibilityOnIcon />, <div>appearance</div>);
     const defaultProps = {
         tabLocation: TabLocation.LEFT,
         tabs: [generalTab, labsTab, appearanceTab] as NonEmptyArray<Tab<any>>,
diff --git a/test/unit-tests/components/structures/ThreadPanel-test.tsx b/test/unit-tests/components/structures/ThreadPanel-test.tsx
index e2596b072f..591d990e93 100644
--- a/test/unit-tests/components/structures/ThreadPanel-test.tsx
+++ b/test/unit-tests/components/structures/ThreadPanel-test.tsx
@@ -26,8 +26,8 @@ import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalink
 import ResizeNotifier from "../../../../src/utils/ResizeNotifier";
 import { createTestClient, getRoomContext, mkRoom, mockPlatformPeg, stubClient } from "../../../test-utils";
 import { mkThread } from "../../../test-utils/threads";
-import { type IRoomState } from "../../../../src/components/structures/RoomView";
 import { ScopedRoomContextProvider } from "../../../../src/contexts/ScopedRoomContext.tsx";
+import type { RoomContextType } from "../../../../src/contexts/RoomContext.ts";
 
 jest.mock("../../../../src/utils/Feedback");
 
@@ -79,7 +79,7 @@ describe("ThreadPanel", () => {
             mockRoom.getLastLiveEvent.mockReturnValue(mockEvent);
             const roomContextObject = {
                 room: mockRoom,
-            } as unknown as IRoomState;
+            } as unknown as RoomContextType;
             const { container } = render(
                 <ScopedRoomContextProvider {...roomContextObject}>
                     <MatrixClientContext.Provider value={mockClient}>
diff --git a/test/unit-tests/components/structures/TimelinePanel-test.tsx b/test/unit-tests/components/structures/TimelinePanel-test.tsx
index 354036e282..0d3f80b433 100644
--- a/test/unit-tests/components/structures/TimelinePanel-test.tsx
+++ b/test/unit-tests/components/structures/TimelinePanel-test.tsx
@@ -33,15 +33,14 @@ import { type Mocked, mocked } from "jest-mock";
 import { forEachRight } from "lodash";
 
 import TimelinePanel from "../../../../src/components/structures/TimelinePanel";
-import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import {
+    clientAndSDKContextRenderOptions,
     filterConsole,
     flushPromises,
     mkMembership,
     mkRoom,
     stubClient,
-    withClientContextRenderOptions,
 } from "../../../test-utils";
 import { mkThread } from "../../../test-utils/threads";
 import { createMessageEventContent } from "../../../test-utils/events";
@@ -51,6 +50,8 @@ import defaultDispatcher from "../../../../src/dispatcher/dispatcher";
 import { Action } from "../../../../src/dispatcher/actions";
 import { SettingLevel } from "../../../../src/settings/SettingLevel";
 import MatrixClientBackedController from "../../../../src/settings/controllers/MatrixClientBackedController";
+import { SdkContextClass } from "../../../../src/contexts/SDKContext";
+import type Timer from "../../../../src/utils/Timer";
 
 // ScrollPanel calls this, but jsdom doesn't mock it for us
 HTMLDivElement.prototype.scrollBy = () => {};
@@ -159,6 +160,7 @@ const setupPagination = (
 
 describe("TimelinePanel", () => {
     let client: Mocked<MatrixClient>;
+    let sdkContext: SdkContextClass;
     let userId: string;
 
     filterConsole("checkForPreJoinUISI: showing all messages, skipping check");
@@ -166,6 +168,7 @@ describe("TimelinePanel", () => {
     beforeEach(() => {
         client = mocked(stubClient());
         userId = client.getSafeUserId();
+        sdkContext = new SdkContextClass();
     });
 
     describe("read receipts and markers", () => {
@@ -200,7 +203,7 @@ describe("TimelinePanel", () => {
                         timelinePanel = ref;
                     }}
                 />,
-                withClientContextRenderOptions(MatrixClientPeg.safeGet()),
+                clientAndSDKContextRenderOptions(client, sdkContext),
             );
             await flushPromises();
             await waitFor(() => expect(timelinePanel).toBeTruthy());
@@ -367,6 +370,56 @@ describe("TimelinePanel", () => {
         });
     });
 
+    describe("enableReadReceiptsAndMarkersOnActivity", () => {
+        it.each([
+            {
+                enabled: false,
+                testName: "should not set up activity timers when disabled",
+                checkCall: (readReceiptTimer: Timer | null, readMarkerTimer: Timer | null) => {
+                    expect(readReceiptTimer).toBeNull();
+                    expect(readMarkerTimer).toBeNull();
+                },
+            },
+            {
+                enabled: true,
+                testName: "should set up activity timers when enabled",
+                checkCall: (readReceiptTimer: Timer | null, readMarkerTimer: Timer | null) => {
+                    expect(readReceiptTimer).toBeTruthy();
+                    expect(readMarkerTimer).toBeTruthy();
+                },
+            },
+        ])("$testName", async ({ enabled, checkCall }) => {
+            const room = mkRoom(client, "roomId");
+            const events = mockEvents(room);
+            const [, timelineSet] = mkTimeline(room, events);
+
+            let timelinePanel: TimelinePanel | null = null;
+
+            render(
+                <TimelinePanel
+                    timelineSet={timelineSet}
+                    manageReadMarkers={true}
+                    manageReadReceipts={true}
+                    enableReadReceiptsAndMarkersOnActivity={enabled}
+                    ref={(ref) => {
+                        timelinePanel = ref;
+                    }}
+                />,
+                clientAndSDKContextRenderOptions(client, sdkContext),
+            );
+
+            await waitFor(() => expect(timelinePanel).toBeTruthy());
+
+            // Check if the activity timers were set up
+            // @ts-ignore - accessing private property for testing
+            const readReceiptTimer = timelinePanel!.readReceiptActivityTimer;
+            // @ts-ignore - accessing private property for testing
+            const readMarkerTimer = timelinePanel!.readMarkerActivityTimer;
+
+            checkCall(readReceiptTimer, readMarkerTimer);
+        });
+    });
+
     it("should scroll event into view when props.eventId changes", () => {
         const client = MatrixClientPeg.safeGet();
         const room = mkRoom(client, "roomId");
@@ -396,7 +449,7 @@ describe("TimelinePanel", () => {
         await withScrollPanelMountSpy(async (mountSpy) => {
             const { container } = render(
                 <TimelinePanel {...getProps(room, events)} timelineSet={timelineSet} />,
-                withClientContextRenderOptions(MatrixClientPeg.safeGet()),
+                clientAndSDKContextRenderOptions(client, sdkContext),
             );
 
             await waitFor(() => expectEvents(container, [events[1]]));
@@ -416,7 +469,7 @@ describe("TimelinePanel", () => {
         await withScrollPanelMountSpy(async (mountSpy) => {
             const { container } = render(
                 <TimelinePanel {...getProps(room, events)} />,
-                withClientContextRenderOptions(MatrixClientPeg.safeGet()),
+                clientAndSDKContextRenderOptions(client, sdkContext),
             );
 
             await waitFor(() => expectEvents(container, [events[0], events[1]]));
@@ -493,7 +546,7 @@ describe("TimelinePanel", () => {
 
             const paginateSpy = jest.spyOn(TimelineWindow.prototype, "paginate").mockClear();
 
-            render(<TimelinePanel {...props} />);
+            render(<TimelinePanel {...props} />, clientAndSDKContextRenderOptions(client, sdkContext));
 
             const event = new MatrixEvent({ type: RoomEvent.Timeline, origin_server_ts: 0 });
             const data = { timeline: props.timelineSet.getLiveTimeline(), liveEvent: true };
@@ -590,9 +643,8 @@ describe("TimelinePanel", () => {
             const replyToEvent = jest.spyOn(thread, "replyToEvent", "get");
 
             const dom = render(
-                <MatrixClientContext.Provider value={client}>
-                    <TimelinePanel timelineSet={allThreads} manageReadReceipts sendReadReceiptOnLoad />
-                </MatrixClientContext.Provider>,
+                <TimelinePanel timelineSet={allThreads} manageReadReceipts sendReadReceiptOnLoad />,
+                clientAndSDKContextRenderOptions(client, sdkContext),
             );
             await dom.findByText("RootEvent");
             await dom.findByText("ReplyEvent1");
@@ -645,9 +697,8 @@ describe("TimelinePanel", () => {
             };
 
             const dom = render(
-                <MatrixClientContext.Provider value={client}>
-                    <TimelinePanel timelineSet={allThreads} manageReadReceipts sendReadReceiptOnLoad />
-                </MatrixClientContext.Provider>,
+                <TimelinePanel timelineSet={allThreads} manageReadReceipts sendReadReceiptOnLoad />,
+                clientAndSDKContextRenderOptions(client, sdkContext),
             );
             await dom.findByText("RootEvent");
             await dom.findByText("ReplyEvent1");
@@ -718,9 +769,8 @@ describe("TimelinePanel", () => {
         }
 
         const { container } = render(
-            <MatrixClientContext.Provider value={client}>
-                <TimelinePanel timelineSet={timelineSet} manageReadReceipts={true} sendReadReceiptOnLoad={true} />
-            </MatrixClientContext.Provider>,
+            <TimelinePanel timelineSet={timelineSet} manageReadReceipts={true} sendReadReceiptOnLoad={true} />,
+            clientAndSDKContextRenderOptions(client, sdkContext),
         );
 
         await waitFor(() => expect(screen.queryByRole("progressbar")).toBeNull());
@@ -740,7 +790,7 @@ describe("TimelinePanel", () => {
         await withScrollPanelMountSpy(async () => {
             const { container } = render(
                 <TimelinePanel {...getProps(room, events)} timelineSet={timelineSet} />,
-                withClientContextRenderOptions(MatrixClientPeg.safeGet()),
+                clientAndSDKContextRenderOptions(client, sdkContext),
             );
 
             await waitFor(() => expectEvents(container, [events[1]]));
diff --git a/test/unit-tests/components/structures/UserMenu-test.tsx b/test/unit-tests/components/structures/UserMenu-test.tsx
index 177adbaf11..0bc9015c69 100644
--- a/test/unit-tests/components/structures/UserMenu-test.tsx
+++ b/test/unit-tests/components/structures/UserMenu-test.tsx
@@ -112,7 +112,6 @@ describe("<UserMenu>", () => {
 
     it("should render 'Link new device' button in OIDC native mode", async () => {
         sdkContext.client = stubClient();
-        mocked(sdkContext.client.getAuthIssuer).mockResolvedValue({ issuer: "https://issuer/" });
         const openIdMetadata = mockOpenIdConfiguration("https://issuer/");
         openIdMetadata.grant_types_supported.push(DEVICE_CODE_SCOPE);
         fetchMock.get("https://issuer/.well-known/openid-configuration", openIdMetadata);
diff --git a/test/unit-tests/components/structures/__snapshots__/FileDropTarget-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/FileDropTarget-test.tsx.snap
new file mode 100644
index 0000000000..0f0cd4f32f
--- /dev/null
+++ b/test/unit-tests/components/structures/__snapshots__/FileDropTarget-test.tsx.snap
@@ -0,0 +1,20 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`FileDropTarget should not render drop file prompt on mouse over with file if permissions do not allow 1`] = `<DocumentFragment />`;
+
+exports[`FileDropTarget should render drop file prompt on mouse over with file if permissions allow 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_FileDropTarget"
+  >
+    <img
+      alt=""
+      class="mx_FileDropTarget_image"
+      src="image-file-stub"
+    />
+    Drop file here to upload
+  </div>
+</DocumentFragment>
+`;
+
+exports[`FileDropTarget should render nothing when idle 1`] = `<DocumentFragment />`;
diff --git a/test/unit-tests/components/structures/__snapshots__/FilePanel-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/FilePanel-test.tsx.snap
index f311521960..9d77be8b68 100644
--- a/test/unit-tests/components/structures/__snapshots__/FilePanel-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/FilePanel-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`FilePanel renders empty state 1`] = `
 <DocumentFragment>
@@ -19,15 +19,16 @@ exports[`FilePanel renders empty state 1`] = `
         </p>
       </div>
       <button
-        aria-labelledby="«r0»"
-        class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+        aria-labelledby="_r_0_"
+        class="_icon-button_1pz9o_8"
+        data-kind="secondary"
         data-testid="base-card-close-button"
         role="button"
         style="--cpd-icon-button-size: 28px;"
         tabindex="0"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -51,7 +52,7 @@ exports[`FilePanel renders empty state 1`] = `
         class="mx_RoomView_empty"
       >
         <div
-          class="mx_Flex mx_EmptyState"
+          class="_flex_4dswl_9 mx_EmptyState"
           style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-4x); --mx-flex-wrap: nowrap;"
         >
           <svg
diff --git a/test/unit-tests/components/structures/__snapshots__/GenericDropdownMenu-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/GenericDropdownMenu-test.tsx.snap
new file mode 100644
index 0000000000..e7e2c8618a
--- /dev/null
+++ b/test/unit-tests/components/structures/__snapshots__/GenericDropdownMenu-test.tsx.snap
@@ -0,0 +1,52 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`GenericDropdownMenu should render check icon for checked option 1`] = `
+<div
+  class="mx_ContextualMenu mx_ContextualMenu_right"
+  role="menu"
+>
+  <div
+    aria-checked="true"
+    class="mx_AccessibleButton mx_GenericDropdownMenu_Option mx_GenericDropdownMenu_Option--item"
+    role="menuitemradio"
+    tabindex="0"
+  >
+    <svg
+      class="mx_GenericDropdownMenu_Option--checkIcon"
+      fill="currentColor"
+      height="1em"
+      viewBox="0 0 24 24"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+      />
+    </svg>
+    <div
+      class="mx_GenericDropdownMenu_Option--label"
+    >
+      <span>
+        Selected
+      </span>
+      <span>
+        This item is selected
+      </span>
+    </div>
+  </div>
+  <div
+    aria-checked="false"
+    class="mx_AccessibleButton mx_GenericDropdownMenu_Option mx_GenericDropdownMenu_Option--item"
+    role="menuitemradio"
+    tabindex="-1"
+  >
+    <div
+      class="mx_GenericDropdownMenu_Option--label"
+    >
+      <span>
+        Not selected
+      </span>
+    </div>
+  </div>
+</div>
+`;
diff --git a/test/unit-tests/components/structures/__snapshots__/MainSplit-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/MainSplit-test.tsx.snap
index 8f7800c82b..bba5067be2 100644
--- a/test/unit-tests/components/structures/__snapshots__/MainSplit-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/MainSplit-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<MainSplit/> renders 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap
index 1bdbe016d4..e6ad46de88 100644
--- a/test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<MatrixChat /> Multi-tab lockout shows the lockout page when a second tab opens after a session is restored 1`] = `
 <div>
@@ -95,13 +95,24 @@ exports[`<MatrixChat /> Multi-tab lockout waits for other tab to stop during sta
     <div
       class="mx_Spinner"
     >
-      <div
+      <svg
         aria-label="Loading…"
-        class="mx_Spinner_icon"
+        class="_icon_11k6c_18"
         data-testid="spinner"
+        fill="currentColor"
+        height="1em"
         role="progressbar"
         style="width: 32px; height: 32px;"
-      />
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          clip-rule="evenodd"
+          d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+          fill-rule="evenodd"
+        />
+      </svg>
     </div>
   </div>
 </div>
@@ -113,16 +124,18 @@ exports[`<MatrixChat /> Multi-tab lockout waits for other tab to stop during sta
     class="mx_AuthPage"
   >
     <div
-      class="mx_AuthPage_modal"
+      class="mx_AuthPage_modal mx_AuthPage_modal_withBlur"
       style="position: relative;"
     >
       <div
         class="mx_AuthPage_modalBlur"
         style="position: absolute; top: 0px; right: 0px; bottom: 0px; left: 0px; filter: blur(40px);"
       />
-      <div
+      <main
+        aria-live="polite"
         class="mx_AuthPage_modalContent"
-        style="display: flex; z-index: 1; background: rgba(255, 255, 255, 0.59); border-radius: 8px;"
+        style="display: flex; z-index: 1; border-radius: inherit;"
+        tabindex="-1"
       >
         <div
           class="mx_Welcome"
@@ -160,13 +173,22 @@ exports[`<MatrixChat /> Multi-tab lockout waits for other tab to stop during sta
                   English
                 </div>
               </div>
-              <span
+              <svg
                 class="mx_Dropdown_arrow"
-              />
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                />
+              </svg>
             </div>
           </div>
         </div>
-      </div>
+      </main>
     </div>
     <footer
       class="mx_AuthFooter"
@@ -213,13 +235,24 @@ exports[`<MatrixChat /> should render spinner while app is loading 1`] = `
     <div
       class="mx_Spinner"
     >
-      <div
+      <svg
         aria-label="Loading…"
-        class="mx_Spinner_icon"
+        class="_icon_11k6c_18"
         data-testid="spinner"
+        fill="currentColor"
+        height="1em"
         role="progressbar"
         style="width: 32px; height: 32px;"
-      />
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          clip-rule="evenodd"
+          d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+          fill-rule="evenodd"
+        />
+      </svg>
     </div>
   </div>
 </div>
@@ -231,16 +264,18 @@ exports[`<MatrixChat /> with a soft-logged-out session should show the soft-logo
     class="mx_AuthPage"
   >
     <div
-      class="mx_AuthPage_modal"
+      class="mx_AuthPage_modal mx_AuthPage_modal_withBlur"
       style="position: relative;"
     >
       <div
         class="mx_AuthPage_modalBlur"
         style="position: absolute; top: 0px; right: 0px; bottom: 0px; left: 0px; filter: blur(40px);"
       />
-      <div
+      <main
+        aria-live="polite"
         class="mx_AuthPage_modalContent"
-        style="display: flex; z-index: 1; background: rgba(255, 255, 255, 0.59); border-radius: 8px;"
+        style="display: flex; z-index: 1; border-radius: inherit;"
+        tabindex="-1"
       >
         <div
           class="mx_AuthHeader"
@@ -274,13 +309,22 @@ exports[`<MatrixChat /> with a soft-logged-out session should show the soft-logo
                   English
                 </div>
               </div>
-              <span
+              <svg
                 class="mx_Dropdown_arrow"
-              />
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                />
+              </svg>
             </div>
           </div>
         </div>
-        <main
+        <div
           class="mx_AuthBody"
         >
           <h1>
@@ -341,8 +385,8 @@ exports[`<MatrixChat /> with a soft-logged-out session should show the soft-logo
               Clear all data
             </div>
           </div>
-        </main>
-      </div>
+        </div>
+      </main>
     </div>
     <footer
       class="mx_AuthFooter"
@@ -388,6 +432,7 @@ exports[`<MatrixChat /> with an existing session onAction() room actions leave_r
   class="mx_QuestionDialog mx_Dialog_fixedWidth"
   data-focus-lock-disabled="false"
   role="dialog"
+  tabindex="-1"
 >
   <div
     class="mx_Dialog_header"
@@ -444,6 +489,7 @@ exports[`<MatrixChat /> with an existing session onAction() room actions leave_r
   class="mx_QuestionDialog mx_Dialog_fixedWidth"
   data-focus-lock-disabled="false"
   role="dialog"
+  tabindex="-1"
 >
   <div
     class="mx_Dialog_header"
diff --git a/test/unit-tests/components/structures/__snapshots__/MessagePanel-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/MessagePanel-test.tsx.snap
index bb748e820a..91a7bfb531 100644
--- a/test/unit-tests/components/structures/__snapshots__/MessagePanel-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/MessagePanel-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`MessagePanel should handle large numbers of hidden events quickly 1`] = `
 <DocumentFragment>
@@ -94,7 +94,7 @@ exports[`MessagePanel should handle lots of membership events quickly 1`] = `
                 class="mx_GenericEventListSummary_avatars"
               >
                 <span
-                  class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+                  class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
                   data-color="1"
                   data-testid="avatar-img"
                   data-type="round"
diff --git a/test/unit-tests/components/structures/__snapshots__/PictureInPictureDragger-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/PictureInPictureDragger-test.tsx.snap
index 0e382ea7f0..3d214ab98c 100644
--- a/test/unit-tests/components/structures/__snapshots__/PictureInPictureDragger-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/PictureInPictureDragger-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`PictureInPictureDragger when rendering the dragger with PiP content 1 and 2 should render both contents 1`] = `
 <div>
diff --git a/test/unit-tests/components/structures/__snapshots__/RoomStatusBar-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/RoomStatusBar-test.tsx.snap
index 54d8db3526..78a5a19aed 100644
--- a/test/unit-tests/components/structures/__snapshots__/RoomStatusBar-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/RoomStatusBar-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`RoomStatusBar <RoomStatusBar /> unsent messages should render warning when messages are unsent due to consent 1`] = `
 <div>
@@ -33,9 +33,21 @@ exports[`RoomStatusBar <RoomStatusBar /> unsent messages should render warning w
               target="_blank"
             >
               our terms and conditions
-              <i
+              <svg
                 class="mx_ExternalLink_icon"
-              />
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+                />
+                <path
+                  d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+                />
+              </svg>
             </a>
             .
           </span>
@@ -50,10 +62,21 @@ exports[`RoomStatusBar <RoomStatusBar /> unsent messages should render warning w
         class="mx_RoomStatusBar_unsentButtonBar"
       >
         <div
-          class="mx_AccessibleButton mx_RoomStatusBar_unsentCancelAllBtn"
+          class="mx_AccessibleButton"
           role="button"
           tabindex="0"
         >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M7 21q-.824 0-1.412-.587A1.93 1.93 0 0 1 5 19V6a.97.97 0 0 1-.713-.287A.97.97 0 0 1 4 5q0-.424.287-.713A.97.97 0 0 1 5 4h4q0-.424.287-.712A.97.97 0 0 1 10 3h4q.424 0 .713.288Q15 3.575 15 4h4q.424 0 .712.287Q20 4.576 20 5t-.288.713A.97.97 0 0 1 19 6v13q0 .824-.587 1.413A1.93 1.93 0 0 1 17 21zM7 6v13h10V6zm2 10q0 .424.287.712Q9.576 17 10 17t.713-.288A.97.97 0 0 0 11 16V9a.97.97 0 0 0-.287-.713A.97.97 0 0 0 10 8a.97.97 0 0 0-.713.287A.97.97 0 0 0 9 9zm4 0q0 .424.287.712.288.288.713.288.424 0 .713-.288A.97.97 0 0 0 15 16V9a.97.97 0 0 0-.287-.713A.97.97 0 0 0 14 8a.97.97 0 0 0-.713.287A.97.97 0 0 0 13 9z"
+            />
+          </svg>
           Delete all
         </div>
         <div
@@ -61,6 +84,17 @@ exports[`RoomStatusBar <RoomStatusBar /> unsent messages should render warning w
           role="button"
           tabindex="0"
         >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M18.93 8A8 8 0 1 1 4 12a1 1 0 1 0-2 0c0 5.523 4.477 10 10 10s10-4.477 10-10a10 10 0 0 0-.832-4A10 10 0 0 0 12 2a9.99 9.99 0 0 0-8 3.999V4a1 1 0 0 0-2 0v4a1 1 0 0 0 1 1h4a1 1 0 0 0 0-2H5.755A7.99 7.99 0 0 1 12 4a8 8 0 0 1 6.93 4"
+            />
+          </svg>
           Retry all
         </div>
       </div>
@@ -106,10 +140,21 @@ exports[`RoomStatusBar <RoomStatusBar /> unsent messages should render warning w
         class="mx_RoomStatusBar_unsentButtonBar"
       >
         <div
-          class="mx_AccessibleButton mx_RoomStatusBar_unsentCancelAllBtn"
+          class="mx_AccessibleButton"
           role="button"
           tabindex="0"
         >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M7 21q-.824 0-1.412-.587A1.93 1.93 0 0 1 5 19V6a.97.97 0 0 1-.713-.287A.97.97 0 0 1 4 5q0-.424.287-.713A.97.97 0 0 1 5 4h4q0-.424.287-.712A.97.97 0 0 1 10 3h4q.424 0 .713.288Q15 3.575 15 4h4q.424 0 .712.287Q20 4.576 20 5t-.288.713A.97.97 0 0 1 19 6v13q0 .824-.587 1.413A1.93 1.93 0 0 1 17 21zM7 6v13h10V6zm2 10q0 .424.287.712Q9.576 17 10 17t.713-.288A.97.97 0 0 0 11 16V9a.97.97 0 0 0-.287-.713A.97.97 0 0 0 10 8a.97.97 0 0 0-.713.287A.97.97 0 0 0 9 9zm4 0q0 .424.287.712.288.288.713.288.424 0 .713-.288A.97.97 0 0 0 15 16V9a.97.97 0 0 0-.287-.713A.97.97 0 0 0 14 8a.97.97 0 0 0-.713.287A.97.97 0 0 0 13 9z"
+            />
+          </svg>
           Delete all
         </div>
         <div
@@ -117,6 +162,17 @@ exports[`RoomStatusBar <RoomStatusBar /> unsent messages should render warning w
           role="button"
           tabindex="0"
         >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M18.93 8A8 8 0 1 1 4 12a1 1 0 1 0-2 0c0 5.523 4.477 10 10 10s10-4.477 10-10a10 10 0 0 0-.832-4A10 10 0 0 0 12 2a9.99 9.99 0 0 0-8 3.999V4a1 1 0 0 0-2 0v4a1 1 0 0 0 1 1h4a1 1 0 0 0 0-2H5.755A7.99 7.99 0 0 1 12 4a8 8 0 0 1 6.93 4"
+            />
+          </svg>
           Retry all
         </div>
       </div>
diff --git a/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
index b99ca68c28..31cae614d7 100644
--- a/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`RoomView for a local room in state CREATING should match the snapshot 1`] = `
 <div>
@@ -6,29 +6,28 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
     class="mx_RoomView mx_RoomView--local"
   >
     <header
-      class="mx_Flex mx_RoomHeader light-panel"
+      class="_flex_4dswl_9 mx_RoomHeader light-panel"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
     >
-      <button
+      <span
         aria-label="Open room settings"
-        aria-live="off"
-        class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+        class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
         data-color="3"
         data-testid="avatar-img"
         data-type="round"
-        role="button"
+        role="presentation"
         style="--cpd-avatar-size: 40px;"
         tabindex="-1"
       >
         u
-      </button>
+      </span>
       <button
         aria-label="Room info"
         class="mx_RoomHeader_infoWrapper"
         tabindex="0"
       >
         <div
-          class="mx_Box mx_RoomHeader_info mx_Box--flex"
+          class="mx_RoomHeader_info _box-flex_1odfs_9"
           style="--mx-box-flex: 1;"
         >
           <div
@@ -45,147 +44,6 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
           </div>
         </div>
       </button>
-      <button
-        aria-disabled="false"
-        aria-label="Video call"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            aria-labelledby="«rg4»"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M6 4h10a2 2 0 0 1 2 2v4.286l3.35-2.871a1 1 0 0 1 1.65.76v7.65a1 1 0 0 1-1.65.76L18 13.715V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-disabled="false"
-        aria-label="Voice call"
-        aria-labelledby="«rg9»"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="m20.958 16.374.039 3.527q0 .427-.33.756-.33.33-.756.33a16 16 0 0 1-6.57-1.105 16.2 16.2 0 0 1-5.563-3.663 16.1 16.1 0 0 1-3.653-5.573 16.3 16.3 0 0 1-1.115-6.56q0-.427.33-.757T4.095 3l3.528.039a1.07 1.07 0 0 1 1.085.93l.543 3.954q.039.271-.039.504a1.1 1.1 0 0 1-.271.426l-1.64 1.64q.505 1.008 1.154 1.909c.433.6 1.444 1.696 1.444 1.696s1.095 1.01 1.696 1.444q.9.65 1.909 1.153l1.64-1.64q.193-.193.426-.27t.504-.04l3.954.543q.406.059.668.359t.262.727"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-label="Threads"
-        aria-labelledby="«rge»"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            class=""
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M4 3h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H6l-2.293 2.293c-.63.63-1.707.184-1.707-.707V5a2 2 0 0 1 2-2m3 7h10q.424 0 .712-.287A.97.97 0 0 0 18 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 17 8H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 9q0 .424.287.713Q6.576 10 7 10m0 4h6q.424 0 .713-.287A.97.97 0 0 0 14 13a.97.97 0 0 0-.287-.713A.97.97 0 0 0 13 12H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 13q0 .424.287.713Q6.576 14 7 14"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-label="Room info"
-        aria-labelledby="«rgj»"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            class=""
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16v-4a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 11a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 12v4q0 .424.287.712.288.288.713.288m0-8q.424 0 .713-.287A.97.97 0 0 0 13 8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8q0 .424.287.713Q11.576 9 12 9m0 13a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
-            />
-          </svg>
-        </div>
-      </button>
-      <div
-        class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41"
-      >
-        <div
-          aria-label="2 members"
-          aria-labelledby="«rgo»"
-          class="mx_AccessibleButton mx_FacePile"
-          role="button"
-          tabindex="0"
-        >
-          <div
-            class="_stacked-avatars_1qbcf_102"
-          >
-            <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-              data-color="2"
-              data-testid="avatar-img"
-              data-type="round"
-              role="presentation"
-              style="--cpd-avatar-size: 20px;"
-            >
-              u
-            </span>
-            <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-              data-color="3"
-              data-testid="avatar-img"
-              data-type="round"
-              role="presentation"
-              style="--cpd-avatar-size: 20px;"
-            >
-              u
-            </span>
-          </div>
-          2
-        </div>
-      </div>
     </header>
     <div
       class="mx_RoomView_body"
@@ -196,13 +54,24 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
         <div
           class="mx_Spinner"
         >
-          <div
+          <svg
             aria-label="Loading…"
-            class="mx_Spinner_icon"
+            class="_icon_11k6c_18"
             data-testid="spinner"
+            fill="currentColor"
+            height="1em"
             role="progressbar"
             style="width: 45px; height: 45px;"
-          />
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              clip-rule="evenodd"
+              d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+              fill-rule="evenodd"
+            />
+          </svg>
         </div>
         <div
           class="mx_LargeLoader_text"
@@ -221,29 +90,28 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
     class="mx_RoomView mx_RoomView--local"
   >
     <header
-      class="mx_Flex mx_RoomHeader light-panel"
+      class="_flex_4dswl_9 mx_RoomHeader light-panel"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
     >
-      <button
+      <span
         aria-label="Open room settings"
-        aria-live="off"
-        class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+        class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
         data-color="3"
         data-testid="avatar-img"
         data-type="round"
-        role="button"
+        role="presentation"
         style="--cpd-avatar-size: 40px;"
         tabindex="-1"
       >
         u
-      </button>
+      </span>
       <button
         aria-label="Room info"
         class="mx_RoomHeader_infoWrapper"
         tabindex="0"
       >
         <div
-          class="mx_Box mx_RoomHeader_info mx_Box--flex"
+          class="mx_RoomHeader_info _box-flex_1odfs_9"
           style="--mx-box-flex: 1;"
         >
           <div
@@ -260,149 +128,9 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
           </div>
         </div>
       </button>
-      <button
-        aria-disabled="false"
-        aria-label="Video call"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            aria-labelledby="«rh2»"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M6 4h10a2 2 0 0 1 2 2v4.286l3.35-2.871a1 1 0 0 1 1.65.76v7.65a1 1 0 0 1-1.65.76L18 13.715V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-disabled="false"
-        aria-label="Voice call"
-        aria-labelledby="«rh7»"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="m20.958 16.374.039 3.527q0 .427-.33.756-.33.33-.756.33a16 16 0 0 1-6.57-1.105 16.2 16.2 0 0 1-5.563-3.663 16.1 16.1 0 0 1-3.653-5.573 16.3 16.3 0 0 1-1.115-6.56q0-.427.33-.757T4.095 3l3.528.039a1.07 1.07 0 0 1 1.085.93l.543 3.954q.039.271-.039.504a1.1 1.1 0 0 1-.271.426l-1.64 1.64q.505 1.008 1.154 1.909c.433.6 1.444 1.696 1.444 1.696s1.095 1.01 1.696 1.444q.9.65 1.909 1.153l1.64-1.64q.193-.193.426-.27t.504-.04l3.954.543q.406.059.668.359t.262.727"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-label="Threads"
-        aria-labelledby="«rhc»"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            class=""
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M4 3h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H6l-2.293 2.293c-.63.63-1.707.184-1.707-.707V5a2 2 0 0 1 2-2m3 7h10q.424 0 .712-.287A.97.97 0 0 0 18 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 17 8H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 9q0 .424.287.713Q6.576 10 7 10m0 4h6q.424 0 .713-.287A.97.97 0 0 0 14 13a.97.97 0 0 0-.287-.713A.97.97 0 0 0 13 12H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 13q0 .424.287.713Q6.576 14 7 14"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-label="Room info"
-        aria-labelledby="«rhh»"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            class=""
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16v-4a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 11a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 12v4q0 .424.287.712.288.288.713.288m0-8q.424 0 .713-.287A.97.97 0 0 0 13 8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8q0 .424.287.713Q11.576 9 12 9m0 13a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
-            />
-          </svg>
-        </div>
-      </button>
-      <div
-        class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41"
-      >
-        <div
-          aria-label="2 members"
-          aria-labelledby="«rhm»"
-          class="mx_AccessibleButton mx_FacePile"
-          role="button"
-          tabindex="0"
-        >
-          <div
-            class="_stacked-avatars_1qbcf_102"
-          >
-            <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-              data-color="2"
-              data-testid="avatar-img"
-              data-type="round"
-              role="presentation"
-              style="--cpd-avatar-size: 20px;"
-            >
-              u
-            </span>
-            <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-              data-color="3"
-              data-testid="avatar-img"
-              data-type="round"
-              role="presentation"
-              style="--cpd-avatar-size: 20px;"
-            >
-              u
-            </span>
-          </div>
-          2
-        </div>
-      </div>
     </header>
     <main
+      aria-label="Room content"
       class="mx_RoomView_body"
     >
       <div
@@ -445,7 +173,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
                 <button
                   aria-label="Avatar"
                   aria-live="off"
-                  class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+                  class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
                   data-color="3"
                   data-testid="avatar-img"
                   data-type="round"
@@ -501,10 +229,21 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
             class="mx_RoomStatusBar_unsentButtonBar"
           >
             <div
-              class="mx_AccessibleButton mx_RoomStatusBar_unsentRetry"
+              class="mx_AccessibleButton"
               role="button"
               tabindex="0"
             >
+              <svg
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M18.93 8A8 8 0 1 1 4 12a1 1 0 1 0-2 0c0 5.523 4.477 10 10 10s10-4.477 10-10a10 10 0 0 0-.832-4A10 10 0 0 0 12 2a9.99 9.99 0 0 0-8 3.999V4a1 1 0 0 0-2 0v4a1 1 0 0 0 1 1h4a1 1 0 0 0 0-2H5.755A7.99 7.99 0 0 1 12 4a8 8 0 0 1 6.93 4"
+                />
+              </svg>
               Retry
             </div>
           </div>
@@ -521,29 +260,28 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
     class="mx_RoomView mx_RoomView--local"
   >
     <header
-      class="mx_Flex mx_RoomHeader light-panel"
+      class="_flex_4dswl_9 mx_RoomHeader light-panel"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
     >
-      <button
+      <span
         aria-label="Open room settings"
-        aria-live="off"
-        class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+        class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
         data-color="3"
         data-testid="avatar-img"
         data-type="round"
-        role="button"
+        role="presentation"
         style="--cpd-avatar-size: 40px;"
         tabindex="-1"
       >
         u
-      </button>
+      </span>
       <button
         aria-label="Room info"
         class="mx_RoomHeader_infoWrapper"
         tabindex="0"
       >
         <div
-          class="mx_Box mx_RoomHeader_info mx_Box--flex"
+          class="mx_RoomHeader_info _box-flex_1odfs_9"
           style="--mx-box-flex: 1;"
         >
           <div
@@ -560,149 +298,9 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
           </div>
         </div>
       </button>
-      <button
-        aria-disabled="false"
-        aria-label="Video call"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            aria-labelledby="«rbo»"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M6 4h10a2 2 0 0 1 2 2v4.286l3.35-2.871a1 1 0 0 1 1.65.76v7.65a1 1 0 0 1-1.65.76L18 13.715V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-disabled="false"
-        aria-label="Voice call"
-        aria-labelledby="«rbt»"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="m20.958 16.374.039 3.527q0 .427-.33.756-.33.33-.756.33a16 16 0 0 1-6.57-1.105 16.2 16.2 0 0 1-5.563-3.663 16.1 16.1 0 0 1-3.653-5.573 16.3 16.3 0 0 1-1.115-6.56q0-.427.33-.757T4.095 3l3.528.039a1.07 1.07 0 0 1 1.085.93l.543 3.954q.039.271-.039.504a1.1 1.1 0 0 1-.271.426l-1.64 1.64q.505 1.008 1.154 1.909c.433.6 1.444 1.696 1.444 1.696s1.095 1.01 1.696 1.444q.9.65 1.909 1.153l1.64-1.64q.193-.193.426-.27t.504-.04l3.954.543q.406.059.668.359t.262.727"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-label="Threads"
-        aria-labelledby="«rc2»"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            class=""
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M4 3h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H6l-2.293 2.293c-.63.63-1.707.184-1.707-.707V5a2 2 0 0 1 2-2m3 7h10q.424 0 .712-.287A.97.97 0 0 0 18 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 17 8H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 9q0 .424.287.713Q6.576 10 7 10m0 4h6q.424 0 .713-.287A.97.97 0 0 0 14 13a.97.97 0 0 0-.287-.713A.97.97 0 0 0 13 12H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 13q0 .424.287.713Q6.576 14 7 14"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-label="Room info"
-        aria-labelledby="«rc7»"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            class=""
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16v-4a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 11a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 12v4q0 .424.287.712.288.288.713.288m0-8q.424 0 .713-.287A.97.97 0 0 0 13 8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8q0 .424.287.713Q11.576 9 12 9m0 13a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
-            />
-          </svg>
-        </div>
-      </button>
-      <div
-        class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41"
-      >
-        <div
-          aria-label="2 members"
-          aria-labelledby="«rcc»"
-          class="mx_AccessibleButton mx_FacePile"
-          role="button"
-          tabindex="0"
-        >
-          <div
-            class="_stacked-avatars_1qbcf_102"
-          >
-            <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-              data-color="2"
-              data-testid="avatar-img"
-              data-type="round"
-              role="presentation"
-              style="--cpd-avatar-size: 20px;"
-            >
-              u
-            </span>
-            <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-              data-color="3"
-              data-testid="avatar-img"
-              data-type="round"
-              role="presentation"
-              style="--cpd-avatar-size: 20px;"
-            >
-              u
-            </span>
-          </div>
-          2
-        </div>
-      </div>
     </header>
     <main
+      aria-label="Room content"
       class="mx_RoomView_body"
     >
       <div
@@ -745,7 +343,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
                 <button
                   aria-label="Avatar"
                   aria-live="off"
-                  class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+                  class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
                   data-color="3"
                   data-testid="avatar-img"
                   data-type="round"
@@ -773,7 +371,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
       </div>
       <div
         aria-label="Message composer"
-        class="mx_MessageComposer"
+        class="mx_MessageComposer mx_MessageComposer_e2eStatus"
         role="region"
       >
         <div
@@ -782,6 +380,25 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
           <div
             class="mx_MessageComposer_row"
           >
+            <div
+              class="mx_MessageComposer_e2eIconWrapper"
+            >
+              <svg
+                aria-label="Messages in this room are not end-to-end encrypted"
+                aria-labelledby="_r_o1_"
+                class="mx_E2EIcon mx_MessageComposer_e2eIcon"
+                color="var(--cpd-color-icon-info-primary)"
+                fill="currentColor"
+                height="12px"
+                viewBox="0 0 24 24"
+                width="12px"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M6 22q-.825 0-1.412-.587A1.93 1.93 0 0 1 4 20V10q0-.825.588-1.412a2 2 0 0 1 .702-.463L1.333 4.167a1 1 0 0 1 1.414-1.414L7 7.006v-.012l13 13v.012l1.247 1.247a1 1 0 1 1-1.414 1.414l-.896-.896A1.94 1.94 0 0 1 18 22zm14-4.834V10q0-.825-.587-1.412A1.93 1.93 0 0 0 18 8h-1V6q0-2.075-1.463-3.537Q14.075 1 12 1T8.463 2.463a4.9 4.9 0 0 0-1.22 1.946L9 6.166V6q0-1.25.875-2.125A2.9 2.9 0 0 1 12 3q1.25 0 2.125.875T15 6v2h-4.166z"
+                />
+              </svg>
+            </div>
             <div
               class="mx_SendMessageComposer"
             >
@@ -795,59 +412,131 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
                 >
                   <button
                     aria-label="Bold"
-                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconBold"
+                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                     role="button"
                     tabindex="0"
                     type="button"
-                  />
+                  >
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M8.8 19q-.824 0-1.413-.587A1.93 1.93 0 0 1 6.8 17V7q0-.824.587-1.412A1.93 1.93 0 0 1 8.8 5h3.525q1.624 0 3 1T16.7 8.775q0 1.275-.575 1.963-.575.687-1.075.987.626.275 1.387 1.025.763.75.763 2.25 0 2.224-1.625 3.113-1.625.887-3.05.887zm1.025-2.8h2.6q1.2 0 1.462-.612.263-.614.263-.888 0-.275-.263-.887-.262-.613-1.537-.613H9.825zm0-5.7h2.325q.825 0 1.2-.425a1.4 1.4 0 0 0 .375-.95q0-.6-.425-.975t-1.1-.375H9.825z"
+                      />
+                    </svg>
+                  </button>
                   <button
                     aria-label="Italics"
-                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconItalic"
+                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                     role="button"
                     tabindex="-1"
                     type="button"
-                  />
+                  >
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M6.25 19q-.525 0-.888-.363A1.2 1.2 0 0 1 5 17.75q0-.525.362-.887.363-.363.888-.363H9l3-9H9.25q-.525 0-.887-.362A1.2 1.2 0 0 1 8 6.25q0-.525.363-.888Q8.725 5 9.25 5h7.5q.525 0 .887.362.363.363.363.888t-.363.888a1.2 1.2 0 0 1-.887.362H14.5l-3 9h2.25q.525 0 .887.363.363.362.363.887t-.363.887a1.2 1.2 0 0 1-.887.363z"
+                      />
+                    </svg>
+                  </button>
                   <button
                     aria-label="Strikethrough"
-                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconStrikethrough"
+                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                     role="button"
                     tabindex="-1"
                     type="button"
-                  />
+                  >
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M12.15 20q-1.9 0-3.375-1.125T6.65 15.8l2.2-.95q.35 1.2 1.213 1.975.861.775 2.137.775 1.05 0 1.9-.5t.85-1.6q0-.45-.175-.825A2.4 2.4 0 0 0 14.3 14h2.8a4.3 4.3 0 0 1 .25 1.5q0 2.15-1.538 3.325Q14.277 20 12.15 20M3 12a.97.97 0 0 1-.712-.287A.97.97 0 0 1 2 11q0-.424.288-.713A.97.97 0 0 1 3 10h18q.424 0 .712.287.288.288.288.713 0 .424-.288.713A.97.97 0 0 1 21 12zm9.05-8.15q1.65 0 2.887.812T16.85 7.15l-2.2.975a3 3 0 0 0-.838-1.3Q13.2 6.25 12.1 6.25q-1.025 0-1.7.462-.675.463-.75 1.288h-2.4q.05-1.725 1.363-2.938Q9.925 3.85 12.05 3.85"
+                      />
+                    </svg>
+                  </button>
                   <button
                     aria-label="Code block"
-                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconCode"
+                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                     role="button"
                     tabindex="-1"
                     type="button"
-                  />
+                  >
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M14.958 5.62a1 1 0 0 0-1.916-.574l-4 13.333a1 1 0 0 0 1.916.575zM5.974 7.232a1 1 0 0 0-1.409.128l-3.333 4a1 1 0 0 0 0 1.28l3.333 4a1 1 0 1 0 1.537-1.28L3.302 12l2.8-3.36a1 1 0 0 0-.128-1.408m12.053 0a1 1 0 0 1 1.408.128l3.333 4a1 1 0 0 1 0 1.28l-3.333 4a1 1 0 1 1-1.537-1.28l2.8-3.36-2.8-3.36a1 1 0 0 1 .128-1.408"
+                      />
+                    </svg>
+                  </button>
                   <button
                     aria-label="Quote"
-                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconQuote"
+                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                     role="button"
                     tabindex="-1"
                     type="button"
-                  />
+                  >
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M4.719 4.34c.094-.642-.366-1.236-1.028-1.328-.663-.092-1.276.354-1.371.996l-.808 5.478c-.094.642.366 1.237 1.028 1.328.663.092 1.276-.354 1.371-.996zm12.115 10.174c.095-.642-.366-1.237-1.028-1.328-.662-.092-1.276.354-1.37.996l-.809 5.478c-.094.642.366 1.236 1.028 1.328.663.092 1.277-.354 1.371-.996zM9.318 3.009c.665.077 1.138.662 1.058 1.306l-.022.175a221 221 0 0 1-.266 2.006c-.161 1.171-.368 2.579-.535 3.386-.13.636-.769 1.049-1.425.921s-1.082-.745-.95-1.381c.148-.72.345-2.052.509-3.237a191 191 0 0 0 .262-1.981l.021-.17c.08-.644.684-1.103 1.348-1.025m13.17 11.505c.094-.642-.366-1.237-1.028-1.328-.663-.092-1.276.354-1.371.996l-.808 5.478c-.094.642.366 1.236 1.028 1.328.663.092 1.276-.354 1.371-.996z"
+                      />
+                    </svg>
+                  </button>
                   <button
                     aria-label="Insert link"
-                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconInsertLink"
+                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                     role="button"
                     tabindex="-1"
                     type="button"
-                  />
+                  >
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M12 19.071q-1.467 1.467-3.536 1.467-2.067 0-3.535-1.467t-1.467-3.535q0-2.07 1.467-3.536L7.05 9.879q.3-.3.707-.3t.707.3.301.707-.3.707l-2.122 2.121a2.9 2.9 0 0 0-.884 2.122q0 1.237.884 2.12.884.885 2.121.885t2.122-.884l2.121-2.121q.3-.3.707-.3t.707.3.3.707q0 .405-.3.707zm-1.414-4.243q-.3.3-.707.301a.97.97 0 0 1-.707-.3q-.3-.3-.301-.708 0-.405.3-.707l4.243-4.242q.3-.3.707-.3t.707.3.3.707-.3.707zm6.364-.707q-.3.3-.707.3a.97.97 0 0 1-.707-.3q-.3-.3-.301-.707 0-.405.3-.707l2.122-2.121q.884-.885.884-2.121 0-1.238-.884-2.122a2.9 2.9 0 0 0-2.121-.884q-1.237 0-2.122.884l-2.121 2.122q-.3.3-.707.3a.97.97 0 0 1-.707-.3q-.3-.3-.3-.708 0-.405.3-.707L12 4.93q1.467-1.467 3.536-1.467t3.535 1.467 1.467 3.536T19.071 12z"
+                      />
+                    </svg>
+                  </button>
                 </div>
                 <div
                   aria-autocomplete="list"
                   aria-disabled="false"
                   aria-haspopup="listbox"
-                  aria-label="Send a message…"
+                  aria-label="Send an unencrypted message…"
                   aria-multiline="true"
                   class="mx_BasicMessageComposer_input mx_BasicMessageComposer_input_shouldShowPillAvatar mx_BasicMessageComposer_inputEmpty"
                   contenteditable="true"
                   data-testid="basicmessagecomposer"
                   dir="auto"
                   role="textbox"
-                  style="--placeholder: 'Send\\ a\\ message…';"
+                  style="--placeholder: 'Send\\ an\\ unencrypted\\ message…';"
                   tabindex="0"
                   translate="no"
                 >
@@ -862,22 +551,61 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
             >
               <div
                 aria-label="Emoji"
-                class="mx_AccessibleButton mx_EmojiButton mx_MessageComposer_button mx_EmojiButton_icon"
+                class="mx_AccessibleButton mx_EmojiButton mx_MessageComposer_button"
                 role="button"
                 tabindex="0"
-              />
+              >
+                <svg
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M15.536 15.536a1 1 0 0 0-1.415-1.415 3 3 0 0 1-2.12.879 3 3 0 0 1-2.122-.879 1 1 0 1 0-1.414 1.415A5 5 0 0 0 12 17c1.38 0 2.632-.56 3.536-1.464M10 10.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m5.5 1.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3"
+                  />
+                  <path
+                    d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10m-2 0a8 8 0 1 0-16 0 8 8 0 0 0 16 0"
+                  />
+                </svg>
+              </div>
               <div
                 aria-label="Attachment"
-                class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_upload"
+                class="mx_AccessibleButton mx_MessageComposer_button"
                 role="button"
                 tabindex="0"
-              />
+              >
+                <svg
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
+                  />
+                </svg>
+              </div>
               <div
                 aria-label="More options"
                 class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_buttonMenu"
                 role="button"
                 tabindex="0"
-              />
+              >
+                <svg
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+                  />
+                </svg>
+              </div>
               <input
                 multiple=""
                 style="display: none;"
@@ -898,29 +626,28 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
     class="mx_RoomView mx_RoomView--local"
   >
     <header
-      class="mx_Flex mx_RoomHeader light-panel"
+      class="_flex_4dswl_9 mx_RoomHeader light-panel"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
     >
-      <button
+      <span
         aria-label="Open room settings"
-        aria-live="off"
-        class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+        class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
         data-color="3"
         data-testid="avatar-img"
         data-type="round"
-        role="button"
+        role="presentation"
         style="--cpd-avatar-size: 40px;"
         tabindex="-1"
       >
         u
-      </button>
+      </span>
       <button
         aria-label="Room info"
         class="mx_RoomHeader_infoWrapper"
         tabindex="0"
       >
         <div
-          class="mx_Box mx_RoomHeader_info mx_Box--flex"
+          class="mx_RoomHeader_info _box-flex_1odfs_9"
           style="--mx-box-flex: 1;"
         >
           <div
@@ -937,149 +664,9 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
           </div>
         </div>
       </button>
-      <button
-        aria-disabled="false"
-        aria-label="Video call"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            aria-labelledby="«rdu»"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M6 4h10a2 2 0 0 1 2 2v4.286l3.35-2.871a1 1 0 0 1 1.65.76v7.65a1 1 0 0 1-1.65.76L18 13.715V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-disabled="false"
-        aria-label="Voice call"
-        aria-labelledby="«re3»"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="m20.958 16.374.039 3.527q0 .427-.33.756-.33.33-.756.33a16 16 0 0 1-6.57-1.105 16.2 16.2 0 0 1-5.563-3.663 16.1 16.1 0 0 1-3.653-5.573 16.3 16.3 0 0 1-1.115-6.56q0-.427.33-.757T4.095 3l3.528.039a1.07 1.07 0 0 1 1.085.93l.543 3.954q.039.271-.039.504a1.1 1.1 0 0 1-.271.426l-1.64 1.64q.505 1.008 1.154 1.909c.433.6 1.444 1.696 1.444 1.696s1.095 1.01 1.696 1.444q.9.65 1.909 1.153l1.64-1.64q.193-.193.426-.27t.504-.04l3.954.543q.406.059.668.359t.262.727"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-label="Threads"
-        aria-labelledby="«re8»"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            class=""
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M4 3h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H6l-2.293 2.293c-.63.63-1.707.184-1.707-.707V5a2 2 0 0 1 2-2m3 7h10q.424 0 .712-.287A.97.97 0 0 0 18 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 17 8H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 9q0 .424.287.713Q6.576 10 7 10m0 4h6q.424 0 .713-.287A.97.97 0 0 0 14 13a.97.97 0 0 0-.287-.713A.97.97 0 0 0 13 12H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 13q0 .424.287.713Q6.576 14 7 14"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-label="Room info"
-        aria-labelledby="«red»"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            class=""
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16v-4a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 11a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 12v4q0 .424.287.712.288.288.713.288m0-8q.424 0 .713-.287A.97.97 0 0 0 13 8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8q0 .424.287.713Q11.576 9 12 9m0 13a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
-            />
-          </svg>
-        </div>
-      </button>
-      <div
-        class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41"
-      >
-        <div
-          aria-label="2 members"
-          aria-labelledby="«rei»"
-          class="mx_AccessibleButton mx_FacePile"
-          role="button"
-          tabindex="0"
-        >
-          <div
-            class="_stacked-avatars_1qbcf_102"
-          >
-            <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-              data-color="2"
-              data-testid="avatar-img"
-              data-type="round"
-              role="presentation"
-              style="--cpd-avatar-size: 20px;"
-            >
-              u
-            </span>
-            <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-              data-color="3"
-              data-testid="avatar-img"
-              data-type="round"
-              role="presentation"
-              style="--cpd-avatar-size: 20px;"
-            >
-              u
-            </span>
-          </div>
-          2
-        </div>
-      </div>
     </header>
     <main
+      aria-label="Room content"
       class="mx_RoomView_body"
     >
       <div
@@ -1117,7 +704,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
                 <button
                   aria-label="Avatar"
                   aria-live="off"
-                  class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+                  class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
                   data-color="3"
                   data-testid="avatar-img"
                   data-type="round"
@@ -1167,46 +754,118 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
                 >
                   <button
                     aria-label="Bold"
-                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconBold"
+                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                     role="button"
                     tabindex="0"
                     type="button"
-                  />
+                  >
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M8.8 19q-.824 0-1.413-.587A1.93 1.93 0 0 1 6.8 17V7q0-.824.587-1.412A1.93 1.93 0 0 1 8.8 5h3.525q1.624 0 3 1T16.7 8.775q0 1.275-.575 1.963-.575.687-1.075.987.626.275 1.387 1.025.763.75.763 2.25 0 2.224-1.625 3.113-1.625.887-3.05.887zm1.025-2.8h2.6q1.2 0 1.462-.612.263-.614.263-.888 0-.275-.263-.887-.262-.613-1.537-.613H9.825zm0-5.7h2.325q.825 0 1.2-.425a1.4 1.4 0 0 0 .375-.95q0-.6-.425-.975t-1.1-.375H9.825z"
+                      />
+                    </svg>
+                  </button>
                   <button
                     aria-label="Italics"
-                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconItalic"
+                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                     role="button"
                     tabindex="-1"
                     type="button"
-                  />
+                  >
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M6.25 19q-.525 0-.888-.363A1.2 1.2 0 0 1 5 17.75q0-.525.362-.887.363-.363.888-.363H9l3-9H9.25q-.525 0-.887-.362A1.2 1.2 0 0 1 8 6.25q0-.525.363-.888Q8.725 5 9.25 5h7.5q.525 0 .887.362.363.363.363.888t-.363.888a1.2 1.2 0 0 1-.887.362H14.5l-3 9h2.25q.525 0 .887.363.363.362.363.887t-.363.887a1.2 1.2 0 0 1-.887.363z"
+                      />
+                    </svg>
+                  </button>
                   <button
                     aria-label="Strikethrough"
-                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconStrikethrough"
+                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                     role="button"
                     tabindex="-1"
                     type="button"
-                  />
+                  >
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M12.15 20q-1.9 0-3.375-1.125T6.65 15.8l2.2-.95q.35 1.2 1.213 1.975.861.775 2.137.775 1.05 0 1.9-.5t.85-1.6q0-.45-.175-.825A2.4 2.4 0 0 0 14.3 14h2.8a4.3 4.3 0 0 1 .25 1.5q0 2.15-1.538 3.325Q14.277 20 12.15 20M3 12a.97.97 0 0 1-.712-.287A.97.97 0 0 1 2 11q0-.424.288-.713A.97.97 0 0 1 3 10h18q.424 0 .712.287.288.288.288.713 0 .424-.288.713A.97.97 0 0 1 21 12zm9.05-8.15q1.65 0 2.887.812T16.85 7.15l-2.2.975a3 3 0 0 0-.838-1.3Q13.2 6.25 12.1 6.25q-1.025 0-1.7.462-.675.463-.75 1.288h-2.4q.05-1.725 1.363-2.938Q9.925 3.85 12.05 3.85"
+                      />
+                    </svg>
+                  </button>
                   <button
                     aria-label="Code block"
-                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconCode"
+                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                     role="button"
                     tabindex="-1"
                     type="button"
-                  />
+                  >
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M14.958 5.62a1 1 0 0 0-1.916-.574l-4 13.333a1 1 0 0 0 1.916.575zM5.974 7.232a1 1 0 0 0-1.409.128l-3.333 4a1 1 0 0 0 0 1.28l3.333 4a1 1 0 1 0 1.537-1.28L3.302 12l2.8-3.36a1 1 0 0 0-.128-1.408m12.053 0a1 1 0 0 1 1.408.128l3.333 4a1 1 0 0 1 0 1.28l-3.333 4a1 1 0 1 1-1.537-1.28l2.8-3.36-2.8-3.36a1 1 0 0 1 .128-1.408"
+                      />
+                    </svg>
+                  </button>
                   <button
                     aria-label="Quote"
-                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconQuote"
+                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                     role="button"
                     tabindex="-1"
                     type="button"
-                  />
+                  >
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M4.719 4.34c.094-.642-.366-1.236-1.028-1.328-.663-.092-1.276.354-1.371.996l-.808 5.478c-.094.642.366 1.237 1.028 1.328.663.092 1.276-.354 1.371-.996zm12.115 10.174c.095-.642-.366-1.237-1.028-1.328-.662-.092-1.276.354-1.37.996l-.809 5.478c-.094.642.366 1.236 1.028 1.328.663.092 1.277-.354 1.371-.996zM9.318 3.009c.665.077 1.138.662 1.058 1.306l-.022.175a221 221 0 0 1-.266 2.006c-.161 1.171-.368 2.579-.535 3.386-.13.636-.769 1.049-1.425.921s-1.082-.745-.95-1.381c.148-.72.345-2.052.509-3.237a191 191 0 0 0 .262-1.981l.021-.17c.08-.644.684-1.103 1.348-1.025m13.17 11.505c.094-.642-.366-1.237-1.028-1.328-.663-.092-1.276.354-1.371.996l-.808 5.478c-.094.642.366 1.236 1.028 1.328.663.092 1.276-.354 1.371-.996z"
+                      />
+                    </svg>
+                  </button>
                   <button
                     aria-label="Insert link"
-                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconInsertLink"
+                    class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                     role="button"
                     tabindex="-1"
                     type="button"
-                  />
+                  >
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M12 19.071q-1.467 1.467-3.536 1.467-2.067 0-3.535-1.467t-1.467-3.535q0-2.07 1.467-3.536L7.05 9.879q.3-.3.707-.3t.707.3.301.707-.3.707l-2.122 2.121a2.9 2.9 0 0 0-.884 2.122q0 1.237.884 2.12.884.885 2.121.885t2.122-.884l2.121-2.121q.3-.3.707-.3t.707.3.3.707q0 .405-.3.707zm-1.414-4.243q-.3.3-.707.301a.97.97 0 0 1-.707-.3q-.3-.3-.301-.708 0-.405.3-.707l4.243-4.242q.3-.3.707-.3t.707.3.3.707-.3.707zm6.364-.707q-.3.3-.707.3a.97.97 0 0 1-.707-.3q-.3-.3-.301-.707 0-.405.3-.707l2.122-2.121q.884-.885.884-2.121 0-1.238-.884-2.122a2.9 2.9 0 0 0-2.121-.884q-1.237 0-2.122.884l-2.121 2.122q-.3.3-.707.3a.97.97 0 0 1-.707-.3q-.3-.3-.3-.708 0-.405.3-.707L12 4.93q1.467-1.467 3.536-1.467t3.535 1.467 1.467 3.536T19.071 12z"
+                      />
+                    </svg>
+                  </button>
                 </div>
                 <div
                   aria-autocomplete="list"
@@ -1234,22 +893,61 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
             >
               <div
                 aria-label="Emoji"
-                class="mx_AccessibleButton mx_EmojiButton mx_MessageComposer_button mx_EmojiButton_icon"
+                class="mx_AccessibleButton mx_EmojiButton mx_MessageComposer_button"
                 role="button"
                 tabindex="0"
-              />
+              >
+                <svg
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M15.536 15.536a1 1 0 0 0-1.415-1.415 3 3 0 0 1-2.12.879 3 3 0 0 1-2.122-.879 1 1 0 1 0-1.414 1.415A5 5 0 0 0 12 17c1.38 0 2.632-.56 3.536-1.464M10 10.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m5.5 1.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3"
+                  />
+                  <path
+                    d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10m-2 0a8 8 0 1 0-16 0 8 8 0 0 0 16 0"
+                  />
+                </svg>
+              </div>
               <div
                 aria-label="Attachment"
-                class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_upload"
+                class="mx_AccessibleButton mx_MessageComposer_button"
                 role="button"
                 tabindex="0"
-              />
+              >
+                <svg
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
+                  />
+                </svg>
+              </div>
               <div
                 aria-label="More options"
                 class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_buttonMenu"
                 role="button"
                 tabindex="0"
-              />
+              >
+                <svg
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+                  />
+                </svg>
+              </div>
               <input
                 multiple=""
                 style="display: none;"
@@ -1277,12 +975,12 @@ exports[`RoomView invites renders an invite room 1`] = `
         class="mx_RoomPreviewBar_message"
       >
         <h3>
-          Do you want to join !2:example.org?
+          Do you want to join !roomviewinvitesrendersaninviteroom:example.org?
         </h3>
         <p>
           <span
-            class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-            data-color="4"
+            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
+            data-color="2"
             data-testid="avatar-img"
             data-type="round"
             role="presentation"
@@ -1320,7 +1018,7 @@ exports[`RoomView invites renders an invite room 1`] = `
           Decline
         </div>
         <button
-          class="_button_vczzf_8 _destructive_vczzf_107"
+          class="_button_187yx_8 _destructive_187yx_107"
           data-kind="tertiary"
           data-size="lg"
           role="button"
@@ -1337,10 +1035,11 @@ exports[`RoomView invites renders an invite room 1`] = `
 </DocumentFragment>
 `;
 
-exports[`RoomView should not display the timeline when the room encryption is loading 1`] = `
+exports[`RoomView should hide the composer when hideComposer=true 1`] = `
 <DocumentFragment>
   <div
     class="mx_RoomView"
+    tabindex="-1"
   >
     <canvas
       aria-hidden="true"
@@ -1356,14 +1055,14 @@ exports[`RoomView should not display the timeline when the room encryption is lo
         data-layout="group"
       >
         <header
-          class="mx_Flex mx_RoomHeader light-panel"
+          class="_flex_4dswl_9 mx_RoomHeader light-panel"
           style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
         >
           <button
             aria-label="Open room settings"
             aria-live="off"
-            class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-            data-color="4"
+            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
+            data-color="2"
             data-testid="avatar-img"
             data-type="round"
             role="button"
@@ -1378,7 +1077,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
             tabindex="0"
           >
             <div
-              class="mx_Box mx_RoomHeader_info mx_Box--flex"
+              class="mx_RoomHeader_info _box-flex_1odfs_9"
               style="--mx-box-flex: 1;"
             >
               <div
@@ -1390,25 +1089,26 @@ exports[`RoomView should not display the timeline when the room encryption is lo
                 <span
                   class="mx_RoomHeader_truncated mx_lineClamp"
                 >
-                  !11:example.org
+                  !roomviewshouldhidethecomposerwhenhidecomposertrue:example.org
                 </span>
               </div>
             </div>
           </button>
           <button
-            aria-disabled="true"
-            aria-label="There's no one here to call"
-            class="_icon-button_m2erp_8"
+            aria-disabled="false"
+            aria-label="Video call"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
             role="button"
             style="--cpd-icon-button-size: 32px;"
             tabindex="0"
           >
             <div
-              class="_indicator-icon_zr2a0_17"
-              style="--cpd-icon-button-size: 100%; --cpd-color-icon-tertiary: var(--cpd-color-icon-disabled);"
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
             >
               <svg
-                aria-labelledby="«r2c»"
+                aria-labelledby="_r_0_"
                 fill="currentColor"
                 height="1em"
                 viewBox="0 0 24 24"
@@ -1422,19 +1122,20 @@ exports[`RoomView should not display the timeline when the room encryption is lo
             </div>
           </button>
           <button
-            aria-disabled="true"
-            aria-label="There's no one here to call"
-            aria-labelledby="«r2h»"
-            class="_icon-button_m2erp_8"
+            aria-disabled="false"
+            aria-label="Voice call"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
             role="button"
             style="--cpd-icon-button-size: 32px;"
             tabindex="0"
           >
             <div
-              class="_indicator-icon_zr2a0_17"
-              style="--cpd-icon-button-size: 100%; --cpd-color-icon-tertiary: var(--cpd-color-icon-disabled);"
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
             >
               <svg
+                aria-labelledby="_r_5_"
                 fill="currentColor"
                 height="1em"
                 viewBox="0 0 24 24"
@@ -1449,14 +1150,15 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           </button>
           <button
             aria-label="Threads"
-            aria-labelledby="«r2m»"
-            class="_icon-button_m2erp_8"
+            aria-labelledby="_r_a_"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
             role="button"
             style="--cpd-icon-button-size: 32px;"
             tabindex="0"
           >
             <div
-              class="_indicator-icon_zr2a0_17"
+              class="_indicator-icon_147l5_17"
               style="--cpd-icon-button-size: 100%;"
             >
               <svg
@@ -1475,14 +1177,15 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           </button>
           <button
             aria-label="Room info"
-            aria-labelledby="«r2r»"
-            class="_icon-button_m2erp_8"
+            aria-labelledby="_r_f_"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
             role="button"
             style="--cpd-icon-button-size: 32px;"
             tabindex="0"
           >
             <div
-              class="_indicator-icon_zr2a0_17"
+              class="_indicator-icon_147l5_17"
               style="--cpd-icon-button-size: 100%;"
             >
               <svg
@@ -1504,13 +1207,13 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           >
             <div
               aria-label="0 members"
-              aria-labelledby="«r30»"
+              aria-labelledby="_r_k_"
               class="mx_AccessibleButton mx_FacePile"
               role="button"
               tabindex="0"
             >
               <div
-                class="_stacked-avatars_1qbcf_102"
+                class="_stacked-avatars_zysgz_109"
               />
               0
             </div>
@@ -1525,6 +1228,1496 @@ exports[`RoomView should not display the timeline when the room encryption is lo
         </div>
         <main
           class="mx_RoomView_timeline mx_RoomView_timeline_rr_enabled"
+          data-testid="timeline"
+        >
+          <div
+            class="mx_AutoHideScrollbar mx_ScrollPanel mx_RoomView_messagePanel"
+            tabindex="-1"
+          >
+            <div
+              class="mx_RoomView_messageListWrapper"
+            >
+              <ol
+                aria-live="polite"
+                class="mx_RoomView_MessageList"
+                style="height: 400px;"
+              />
+            </div>
+          </div>
+        </main>
+        <div
+          aria-label="Room status bar"
+          class="mx_RoomView_statusArea"
+          role="region"
+        >
+          <div
+            class="mx_RoomView_statusAreaBox"
+          >
+            <div
+              class="mx_RoomView_statusAreaBox_line"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`RoomView should hide the header when hideHeader=true 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_RoomView"
+    tabindex="-1"
+  >
+    <canvas
+      aria-hidden="true"
+      height="768"
+      style="display: block; z-index: 999999; pointer-events: none; position: fixed; top: 0px; right: 0px;"
+      width="0"
+    />
+    <div
+      class="mx_MainSplit"
+    >
+      <div
+        class="mx_RoomView_body mx_MainSplit_timeline"
+        data-layout="group"
+      >
+        <div
+          class="mx_AutoHideScrollbar mx_AuxPanel"
+          role="region"
+          tabindex="-1"
+        >
+          <div />
+        </div>
+        <main
+          class="mx_RoomView_timeline mx_RoomView_timeline_rr_enabled"
+          data-testid="timeline"
+        >
+          <div
+            class="mx_AutoHideScrollbar mx_ScrollPanel mx_RoomView_messagePanel"
+            tabindex="-1"
+          >
+            <div
+              class="mx_RoomView_messageListWrapper"
+            >
+              <ol
+                aria-live="polite"
+                class="mx_RoomView_MessageList"
+                style="height: 400px;"
+              />
+            </div>
+          </div>
+        </main>
+        <div
+          aria-label="Room status bar"
+          class="mx_RoomView_statusArea"
+          role="region"
+        >
+          <div
+            class="mx_RoomView_statusAreaBox"
+          >
+            <div
+              class="mx_RoomView_statusAreaBox_line"
+            />
+          </div>
+        </div>
+        <div
+          aria-label="Message composer"
+          class="mx_MessageComposer mx_MessageComposer_e2eStatus"
+          role="region"
+        >
+          <div
+            class="mx_MessageComposer_wrapper"
+          >
+            <div
+              class="mx_MessageComposer_row"
+            >
+              <div
+                class="mx_MessageComposer_e2eIconWrapper"
+              >
+                <svg
+                  aria-label="Messages in this room are not end-to-end encrypted"
+                  aria-labelledby="_r_10_"
+                  class="mx_E2EIcon mx_MessageComposer_e2eIcon"
+                  color="var(--cpd-color-icon-info-primary)"
+                  fill="currentColor"
+                  height="12px"
+                  viewBox="0 0 24 24"
+                  width="12px"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M6 22q-.825 0-1.412-.587A1.93 1.93 0 0 1 4 20V10q0-.825.588-1.412a2 2 0 0 1 .702-.463L1.333 4.167a1 1 0 0 1 1.414-1.414L7 7.006v-.012l13 13v.012l1.247 1.247a1 1 0 1 1-1.414 1.414l-.896-.896A1.94 1.94 0 0 1 18 22zm14-4.834V10q0-.825-.587-1.412A1.93 1.93 0 0 0 18 8h-1V6q0-2.075-1.463-3.537Q14.075 1 12 1T8.463 2.463a4.9 4.9 0 0 0-1.22 1.946L9 6.166V6q0-1.25.875-2.125A2.9 2.9 0 0 1 12 3q1.25 0 2.125.875T15 6v2h-4.166z"
+                  />
+                </svg>
+              </div>
+              <div
+                class="mx_SendMessageComposer"
+              >
+                <div
+                  class="mx_BasicMessageComposer"
+                >
+                  <div
+                    aria-label="Formatting"
+                    class="mx_MessageComposerFormatBar"
+                    role="toolbar"
+                  >
+                    <button
+                      aria-label="Bold"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="0"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M8.8 19q-.824 0-1.413-.587A1.93 1.93 0 0 1 6.8 17V7q0-.824.587-1.412A1.93 1.93 0 0 1 8.8 5h3.525q1.624 0 3 1T16.7 8.775q0 1.275-.575 1.963-.575.687-1.075.987.626.275 1.387 1.025.763.75.763 2.25 0 2.224-1.625 3.113-1.625.887-3.05.887zm1.025-2.8h2.6q1.2 0 1.462-.612.263-.614.263-.888 0-.275-.263-.887-.262-.613-1.537-.613H9.825zm0-5.7h2.325q.825 0 1.2-.425a1.4 1.4 0 0 0 .375-.95q0-.6-.425-.975t-1.1-.375H9.825z"
+                        />
+                      </svg>
+                    </button>
+                    <button
+                      aria-label="Italics"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="-1"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M6.25 19q-.525 0-.888-.363A1.2 1.2 0 0 1 5 17.75q0-.525.362-.887.363-.363.888-.363H9l3-9H9.25q-.525 0-.887-.362A1.2 1.2 0 0 1 8 6.25q0-.525.363-.888Q8.725 5 9.25 5h7.5q.525 0 .887.362.363.363.363.888t-.363.888a1.2 1.2 0 0 1-.887.362H14.5l-3 9h2.25q.525 0 .887.363.363.362.363.887t-.363.887a1.2 1.2 0 0 1-.887.363z"
+                        />
+                      </svg>
+                    </button>
+                    <button
+                      aria-label="Strikethrough"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="-1"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M12.15 20q-1.9 0-3.375-1.125T6.65 15.8l2.2-.95q.35 1.2 1.213 1.975.861.775 2.137.775 1.05 0 1.9-.5t.85-1.6q0-.45-.175-.825A2.4 2.4 0 0 0 14.3 14h2.8a4.3 4.3 0 0 1 .25 1.5q0 2.15-1.538 3.325Q14.277 20 12.15 20M3 12a.97.97 0 0 1-.712-.287A.97.97 0 0 1 2 11q0-.424.288-.713A.97.97 0 0 1 3 10h18q.424 0 .712.287.288.288.288.713 0 .424-.288.713A.97.97 0 0 1 21 12zm9.05-8.15q1.65 0 2.887.812T16.85 7.15l-2.2.975a3 3 0 0 0-.838-1.3Q13.2 6.25 12.1 6.25q-1.025 0-1.7.462-.675.463-.75 1.288h-2.4q.05-1.725 1.363-2.938Q9.925 3.85 12.05 3.85"
+                        />
+                      </svg>
+                    </button>
+                    <button
+                      aria-label="Code block"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="-1"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M14.958 5.62a1 1 0 0 0-1.916-.574l-4 13.333a1 1 0 0 0 1.916.575zM5.974 7.232a1 1 0 0 0-1.409.128l-3.333 4a1 1 0 0 0 0 1.28l3.333 4a1 1 0 1 0 1.537-1.28L3.302 12l2.8-3.36a1 1 0 0 0-.128-1.408m12.053 0a1 1 0 0 1 1.408.128l3.333 4a1 1 0 0 1 0 1.28l-3.333 4a1 1 0 1 1-1.537-1.28l2.8-3.36-2.8-3.36a1 1 0 0 1 .128-1.408"
+                        />
+                      </svg>
+                    </button>
+                    <button
+                      aria-label="Quote"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="-1"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M4.719 4.34c.094-.642-.366-1.236-1.028-1.328-.663-.092-1.276.354-1.371.996l-.808 5.478c-.094.642.366 1.237 1.028 1.328.663.092 1.276-.354 1.371-.996zm12.115 10.174c.095-.642-.366-1.237-1.028-1.328-.662-.092-1.276.354-1.37.996l-.809 5.478c-.094.642.366 1.236 1.028 1.328.663.092 1.277-.354 1.371-.996zM9.318 3.009c.665.077 1.138.662 1.058 1.306l-.022.175a221 221 0 0 1-.266 2.006c-.161 1.171-.368 2.579-.535 3.386-.13.636-.769 1.049-1.425.921s-1.082-.745-.95-1.381c.148-.72.345-2.052.509-3.237a191 191 0 0 0 .262-1.981l.021-.17c.08-.644.684-1.103 1.348-1.025m13.17 11.505c.094-.642-.366-1.237-1.028-1.328-.663-.092-1.276.354-1.371.996l-.808 5.478c-.094.642.366 1.236 1.028 1.328.663.092 1.276-.354 1.371-.996z"
+                        />
+                      </svg>
+                    </button>
+                    <button
+                      aria-label="Insert link"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="-1"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M12 19.071q-1.467 1.467-3.536 1.467-2.067 0-3.535-1.467t-1.467-3.535q0-2.07 1.467-3.536L7.05 9.879q.3-.3.707-.3t.707.3.301.707-.3.707l-2.122 2.121a2.9 2.9 0 0 0-.884 2.122q0 1.237.884 2.12.884.885 2.121.885t2.122-.884l2.121-2.121q.3-.3.707-.3t.707.3.3.707q0 .405-.3.707zm-1.414-4.243q-.3.3-.707.301a.97.97 0 0 1-.707-.3q-.3-.3-.301-.708 0-.405.3-.707l4.243-4.242q.3-.3.707-.3t.707.3.3.707-.3.707zm6.364-.707q-.3.3-.707.3a.97.97 0 0 1-.707-.3q-.3-.3-.301-.707 0-.405.3-.707l2.122-2.121q.884-.885.884-2.121 0-1.238-.884-2.122a2.9 2.9 0 0 0-2.121-.884q-1.237 0-2.122.884l-2.121 2.122q-.3.3-.707.3a.97.97 0 0 1-.707-.3q-.3-.3-.3-.708 0-.405.3-.707L12 4.93q1.467-1.467 3.536-1.467t3.535 1.467 1.467 3.536T19.071 12z"
+                        />
+                      </svg>
+                    </button>
+                  </div>
+                  <div
+                    aria-autocomplete="list"
+                    aria-disabled="false"
+                    aria-haspopup="listbox"
+                    aria-label="Send an unencrypted message…"
+                    aria-multiline="true"
+                    class="mx_BasicMessageComposer_input mx_BasicMessageComposer_input_shouldShowPillAvatar mx_BasicMessageComposer_inputEmpty"
+                    contenteditable="true"
+                    data-testid="basicmessagecomposer"
+                    dir="auto"
+                    role="textbox"
+                    style="--placeholder: 'Send\\ an\\ unencrypted\\ message…';"
+                    tabindex="0"
+                    translate="no"
+                  >
+                    <div>
+                      <br />
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="mx_MessageComposer_actions"
+              >
+                <div
+                  aria-label="Emoji"
+                  class="mx_AccessibleButton mx_EmojiButton mx_MessageComposer_button"
+                  role="button"
+                  tabindex="0"
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M15.536 15.536a1 1 0 0 0-1.415-1.415 3 3 0 0 1-2.12.879 3 3 0 0 1-2.122-.879 1 1 0 1 0-1.414 1.415A5 5 0 0 0 12 17c1.38 0 2.632-.56 3.536-1.464M10 10.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m5.5 1.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3"
+                    />
+                    <path
+                      d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10m-2 0a8 8 0 1 0-16 0 8 8 0 0 0 16 0"
+                    />
+                  </svg>
+                </div>
+                <div
+                  aria-label="Attachment"
+                  class="mx_AccessibleButton mx_MessageComposer_button"
+                  role="button"
+                  tabindex="0"
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
+                    />
+                  </svg>
+                </div>
+                <div
+                  aria-label="More options"
+                  class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_buttonMenu"
+                  role="button"
+                  tabindex="0"
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+                    />
+                  </svg>
+                </div>
+                <input
+                  multiple=""
+                  style="display: none;"
+                  type="file"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`RoomView should hide the pinned message banner when hidePinnedMessageBanner=true 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_RoomView"
+    tabindex="-1"
+  >
+    <canvas
+      aria-hidden="true"
+      height="768"
+      style="display: block; z-index: 999999; pointer-events: none; position: fixed; top: 0px; right: 0px;"
+      width="0"
+    />
+    <div
+      class="mx_MainSplit"
+    >
+      <div
+        class="mx_RoomView_body mx_MainSplit_timeline"
+        data-layout="group"
+      >
+        <header
+          class="_flex_4dswl_9 mx_RoomHeader light-panel"
+          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+        >
+          <button
+            aria-label="Open room settings"
+            aria-live="off"
+            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
+            data-color="2"
+            data-testid="avatar-img"
+            data-type="round"
+            role="button"
+            style="--cpd-avatar-size: 40px;"
+            tabindex="-1"
+          >
+            !
+          </button>
+          <button
+            aria-label="Room info"
+            class="mx_RoomHeader_infoWrapper"
+            tabindex="0"
+          >
+            <div
+              class="mx_RoomHeader_info _box-flex_1odfs_9"
+              style="--mx-box-flex: 1;"
+            >
+              <div
+                aria-level="1"
+                class="_typography_6v6n8_153 _font-body-lg-semibold_6v6n8_74 mx_RoomHeader_heading"
+                dir="auto"
+                role="heading"
+              >
+                <span
+                  class="mx_RoomHeader_truncated mx_lineClamp"
+                >
+                  !roomviewshouldhidethepinnedmessagebannerwhenhidepinnedmessagebannertrue:example.org
+                </span>
+              </div>
+            </div>
+          </button>
+          <button
+            aria-disabled="false"
+            aria-label="Video call"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
+            role="button"
+            style="--cpd-icon-button-size: 32px;"
+            tabindex="0"
+          >
+            <div
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
+            >
+              <svg
+                aria-labelledby="_r_5b_"
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M6 4h10a2 2 0 0 1 2 2v4.286l3.35-2.871a1 1 0 0 1 1.65.76v7.65a1 1 0 0 1-1.65.76L18 13.715V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4"
+                />
+              </svg>
+            </div>
+          </button>
+          <button
+            aria-disabled="false"
+            aria-label="Voice call"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
+            role="button"
+            style="--cpd-icon-button-size: 32px;"
+            tabindex="0"
+          >
+            <div
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
+            >
+              <svg
+                aria-labelledby="_r_5g_"
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="m20.958 16.374.039 3.527q0 .427-.33.756-.33.33-.756.33a16 16 0 0 1-6.57-1.105 16.2 16.2 0 0 1-5.563-3.663 16.1 16.1 0 0 1-3.653-5.573 16.3 16.3 0 0 1-1.115-6.56q0-.427.33-.757T4.095 3l3.528.039a1.07 1.07 0 0 1 1.085.93l.543 3.954q.039.271-.039.504a1.1 1.1 0 0 1-.271.426l-1.64 1.64q.505 1.008 1.154 1.909c.433.6 1.444 1.696 1.444 1.696s1.095 1.01 1.696 1.444q.9.65 1.909 1.153l1.64-1.64q.193-.193.426-.27t.504-.04l3.954.543q.406.059.668.359t.262.727"
+                />
+              </svg>
+            </div>
+          </button>
+          <button
+            aria-label="Threads"
+            aria-labelledby="_r_5l_"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
+            role="button"
+            style="--cpd-icon-button-size: 32px;"
+            tabindex="0"
+          >
+            <div
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
+            >
+              <svg
+                class=""
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M4 3h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H6l-2.293 2.293c-.63.63-1.707.184-1.707-.707V5a2 2 0 0 1 2-2m3 7h10q.424 0 .712-.287A.97.97 0 0 0 18 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 17 8H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 9q0 .424.287.713Q6.576 10 7 10m0 4h6q.424 0 .713-.287A.97.97 0 0 0 14 13a.97.97 0 0 0-.287-.713A.97.97 0 0 0 13 12H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 13q0 .424.287.713Q6.576 14 7 14"
+                />
+              </svg>
+            </div>
+          </button>
+          <button
+            aria-label="Room info"
+            aria-labelledby="_r_5q_"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
+            role="button"
+            style="--cpd-icon-button-size: 32px;"
+            tabindex="0"
+          >
+            <div
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
+            >
+              <svg
+                class=""
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16v-4a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 11a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 12v4q0 .424.287.712.288.288.713.288m0-8q.424 0 .713-.287A.97.97 0 0 0 13 8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8q0 .424.287.713Q11.576 9 12 9m0 13a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+                />
+              </svg>
+            </div>
+          </button>
+          <div
+            class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41"
+          >
+            <div
+              aria-label="0 members"
+              aria-labelledby="_r_5v_"
+              class="mx_AccessibleButton mx_FacePile"
+              role="button"
+              tabindex="0"
+            >
+              <div
+                class="_stacked-avatars_zysgz_109"
+              />
+              0
+            </div>
+          </div>
+        </header>
+        <div
+          class="mx_AutoHideScrollbar mx_AuxPanel"
+          role="region"
+          tabindex="-1"
+        >
+          <div />
+        </div>
+        <main
+          class="mx_RoomView_timeline mx_RoomView_timeline_rr_enabled"
+          data-testid="timeline"
+        >
+          <div
+            class="mx_AutoHideScrollbar mx_ScrollPanel mx_RoomView_messagePanel"
+            tabindex="-1"
+          >
+            <div
+              class="mx_RoomView_messageListWrapper"
+            >
+              <ol
+                aria-live="polite"
+                class="mx_RoomView_MessageList"
+                style="height: 400px;"
+              />
+            </div>
+          </div>
+        </main>
+        <div
+          aria-label="Room status bar"
+          class="mx_RoomView_statusArea"
+          role="region"
+        >
+          <div
+            class="mx_RoomView_statusAreaBox"
+          >
+            <div
+              class="mx_RoomView_statusAreaBox_line"
+            />
+          </div>
+        </div>
+        <div
+          aria-label="Message composer"
+          class="mx_MessageComposer mx_MessageComposer_e2eStatus"
+          role="region"
+        >
+          <div
+            class="mx_MessageComposer_wrapper"
+          >
+            <div
+              class="mx_MessageComposer_row"
+            >
+              <div
+                class="mx_MessageComposer_e2eIconWrapper"
+              >
+                <svg
+                  aria-label="Messages in this room are not end-to-end encrypted"
+                  aria-labelledby="_r_6a_"
+                  class="mx_E2EIcon mx_MessageComposer_e2eIcon"
+                  color="var(--cpd-color-icon-info-primary)"
+                  fill="currentColor"
+                  height="12px"
+                  viewBox="0 0 24 24"
+                  width="12px"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M6 22q-.825 0-1.412-.587A1.93 1.93 0 0 1 4 20V10q0-.825.588-1.412a2 2 0 0 1 .702-.463L1.333 4.167a1 1 0 0 1 1.414-1.414L7 7.006v-.012l13 13v.012l1.247 1.247a1 1 0 1 1-1.414 1.414l-.896-.896A1.94 1.94 0 0 1 18 22zm14-4.834V10q0-.825-.587-1.412A1.93 1.93 0 0 0 18 8h-1V6q0-2.075-1.463-3.537Q14.075 1 12 1T8.463 2.463a4.9 4.9 0 0 0-1.22 1.946L9 6.166V6q0-1.25.875-2.125A2.9 2.9 0 0 1 12 3q1.25 0 2.125.875T15 6v2h-4.166z"
+                  />
+                </svg>
+              </div>
+              <div
+                class="mx_SendMessageComposer"
+              >
+                <div
+                  class="mx_BasicMessageComposer"
+                >
+                  <div
+                    aria-label="Formatting"
+                    class="mx_MessageComposerFormatBar"
+                    role="toolbar"
+                  >
+                    <button
+                      aria-label="Bold"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="0"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M8.8 19q-.824 0-1.413-.587A1.93 1.93 0 0 1 6.8 17V7q0-.824.587-1.412A1.93 1.93 0 0 1 8.8 5h3.525q1.624 0 3 1T16.7 8.775q0 1.275-.575 1.963-.575.687-1.075.987.626.275 1.387 1.025.763.75.763 2.25 0 2.224-1.625 3.113-1.625.887-3.05.887zm1.025-2.8h2.6q1.2 0 1.462-.612.263-.614.263-.888 0-.275-.263-.887-.262-.613-1.537-.613H9.825zm0-5.7h2.325q.825 0 1.2-.425a1.4 1.4 0 0 0 .375-.95q0-.6-.425-.975t-1.1-.375H9.825z"
+                        />
+                      </svg>
+                    </button>
+                    <button
+                      aria-label="Italics"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="-1"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M6.25 19q-.525 0-.888-.363A1.2 1.2 0 0 1 5 17.75q0-.525.362-.887.363-.363.888-.363H9l3-9H9.25q-.525 0-.887-.362A1.2 1.2 0 0 1 8 6.25q0-.525.363-.888Q8.725 5 9.25 5h7.5q.525 0 .887.362.363.363.363.888t-.363.888a1.2 1.2 0 0 1-.887.362H14.5l-3 9h2.25q.525 0 .887.363.363.362.363.887t-.363.887a1.2 1.2 0 0 1-.887.363z"
+                        />
+                      </svg>
+                    </button>
+                    <button
+                      aria-label="Strikethrough"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="-1"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M12.15 20q-1.9 0-3.375-1.125T6.65 15.8l2.2-.95q.35 1.2 1.213 1.975.861.775 2.137.775 1.05 0 1.9-.5t.85-1.6q0-.45-.175-.825A2.4 2.4 0 0 0 14.3 14h2.8a4.3 4.3 0 0 1 .25 1.5q0 2.15-1.538 3.325Q14.277 20 12.15 20M3 12a.97.97 0 0 1-.712-.287A.97.97 0 0 1 2 11q0-.424.288-.713A.97.97 0 0 1 3 10h18q.424 0 .712.287.288.288.288.713 0 .424-.288.713A.97.97 0 0 1 21 12zm9.05-8.15q1.65 0 2.887.812T16.85 7.15l-2.2.975a3 3 0 0 0-.838-1.3Q13.2 6.25 12.1 6.25q-1.025 0-1.7.462-.675.463-.75 1.288h-2.4q.05-1.725 1.363-2.938Q9.925 3.85 12.05 3.85"
+                        />
+                      </svg>
+                    </button>
+                    <button
+                      aria-label="Code block"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="-1"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M14.958 5.62a1 1 0 0 0-1.916-.574l-4 13.333a1 1 0 0 0 1.916.575zM5.974 7.232a1 1 0 0 0-1.409.128l-3.333 4a1 1 0 0 0 0 1.28l3.333 4a1 1 0 1 0 1.537-1.28L3.302 12l2.8-3.36a1 1 0 0 0-.128-1.408m12.053 0a1 1 0 0 1 1.408.128l3.333 4a1 1 0 0 1 0 1.28l-3.333 4a1 1 0 1 1-1.537-1.28l2.8-3.36-2.8-3.36a1 1 0 0 1 .128-1.408"
+                        />
+                      </svg>
+                    </button>
+                    <button
+                      aria-label="Quote"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="-1"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M4.719 4.34c.094-.642-.366-1.236-1.028-1.328-.663-.092-1.276.354-1.371.996l-.808 5.478c-.094.642.366 1.237 1.028 1.328.663.092 1.276-.354 1.371-.996zm12.115 10.174c.095-.642-.366-1.237-1.028-1.328-.662-.092-1.276.354-1.37.996l-.809 5.478c-.094.642.366 1.236 1.028 1.328.663.092 1.277-.354 1.371-.996zM9.318 3.009c.665.077 1.138.662 1.058 1.306l-.022.175a221 221 0 0 1-.266 2.006c-.161 1.171-.368 2.579-.535 3.386-.13.636-.769 1.049-1.425.921s-1.082-.745-.95-1.381c.148-.72.345-2.052.509-3.237a191 191 0 0 0 .262-1.981l.021-.17c.08-.644.684-1.103 1.348-1.025m13.17 11.505c.094-.642-.366-1.237-1.028-1.328-.663-.092-1.276.354-1.371.996l-.808 5.478c-.094.642.366 1.236 1.028 1.328.663.092 1.276-.354 1.371-.996z"
+                        />
+                      </svg>
+                    </button>
+                    <button
+                      aria-label="Insert link"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="-1"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M12 19.071q-1.467 1.467-3.536 1.467-2.067 0-3.535-1.467t-1.467-3.535q0-2.07 1.467-3.536L7.05 9.879q.3-.3.707-.3t.707.3.301.707-.3.707l-2.122 2.121a2.9 2.9 0 0 0-.884 2.122q0 1.237.884 2.12.884.885 2.121.885t2.122-.884l2.121-2.121q.3-.3.707-.3t.707.3.3.707q0 .405-.3.707zm-1.414-4.243q-.3.3-.707.301a.97.97 0 0 1-.707-.3q-.3-.3-.301-.708 0-.405.3-.707l4.243-4.242q.3-.3.707-.3t.707.3.3.707-.3.707zm6.364-.707q-.3.3-.707.3a.97.97 0 0 1-.707-.3q-.3-.3-.301-.707 0-.405.3-.707l2.122-2.121q.884-.885.884-2.121 0-1.238-.884-2.122a2.9 2.9 0 0 0-2.121-.884q-1.237 0-2.122.884l-2.121 2.122q-.3.3-.707.3a.97.97 0 0 1-.707-.3q-.3-.3-.3-.708 0-.405.3-.707L12 4.93q1.467-1.467 3.536-1.467t3.535 1.467 1.467 3.536T19.071 12z"
+                        />
+                      </svg>
+                    </button>
+                  </div>
+                  <div
+                    aria-autocomplete="list"
+                    aria-disabled="false"
+                    aria-haspopup="listbox"
+                    aria-label="Send an unencrypted message…"
+                    aria-multiline="true"
+                    class="mx_BasicMessageComposer_input mx_BasicMessageComposer_input_shouldShowPillAvatar mx_BasicMessageComposer_inputEmpty"
+                    contenteditable="true"
+                    data-testid="basicmessagecomposer"
+                    dir="auto"
+                    role="textbox"
+                    style="--placeholder: 'Send\\ an\\ unencrypted\\ message…';"
+                    tabindex="0"
+                    translate="no"
+                  >
+                    <div>
+                      <br />
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="mx_MessageComposer_actions"
+              >
+                <div
+                  aria-label="Emoji"
+                  class="mx_AccessibleButton mx_EmojiButton mx_MessageComposer_button"
+                  role="button"
+                  tabindex="0"
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M15.536 15.536a1 1 0 0 0-1.415-1.415 3 3 0 0 1-2.12.879 3 3 0 0 1-2.122-.879 1 1 0 1 0-1.414 1.415A5 5 0 0 0 12 17c1.38 0 2.632-.56 3.536-1.464M10 10.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m5.5 1.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3"
+                    />
+                    <path
+                      d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10m-2 0a8 8 0 1 0-16 0 8 8 0 0 0 16 0"
+                    />
+                  </svg>
+                </div>
+                <div
+                  aria-label="Attachment"
+                  class="mx_AccessibleButton mx_MessageComposer_button"
+                  role="button"
+                  tabindex="0"
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
+                    />
+                  </svg>
+                </div>
+                <div
+                  aria-label="More options"
+                  class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_buttonMenu"
+                  role="button"
+                  tabindex="0"
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+                    />
+                  </svg>
+                </div>
+                <input
+                  multiple=""
+                  style="display: none;"
+                  type="file"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`RoomView should hide the right panel when hideRightPanel=true 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_RoomView"
+    tabindex="-1"
+  >
+    <canvas
+      aria-hidden="true"
+      height="768"
+      style="display: block; z-index: 999999; pointer-events: none; position: fixed; top: 0px; right: 0px;"
+      width="0"
+    />
+    <div
+      class="mx_MainSplit"
+    >
+      <div
+        class="mx_RoomView_body mx_MainSplit_timeline"
+        data-layout="group"
+      >
+        <header
+          class="_flex_4dswl_9 mx_RoomHeader light-panel"
+          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+        >
+          <button
+            aria-label="Open room settings"
+            aria-live="off"
+            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
+            data-color="2"
+            data-testid="avatar-img"
+            data-type="round"
+            role="button"
+            style="--cpd-avatar-size: 40px;"
+            tabindex="-1"
+          >
+            !
+          </button>
+          <button
+            aria-label="Room info"
+            class="mx_RoomHeader_infoWrapper"
+            tabindex="0"
+          >
+            <div
+              class="mx_RoomHeader_info _box-flex_1odfs_9"
+              style="--mx-box-flex: 1;"
+            >
+              <div
+                aria-level="1"
+                class="_typography_6v6n8_153 _font-body-lg-semibold_6v6n8_74 mx_RoomHeader_heading"
+                dir="auto"
+                role="heading"
+              >
+                <span
+                  class="mx_RoomHeader_truncated mx_lineClamp"
+                >
+                  !roomviewshouldhidetherightpanelwhenhiderightpaneltrue:example.org
+                </span>
+              </div>
+            </div>
+          </button>
+          <button
+            aria-disabled="false"
+            aria-label="Video call"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
+            role="button"
+            style="--cpd-icon-button-size: 32px;"
+            tabindex="0"
+          >
+            <div
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
+            >
+              <svg
+                aria-labelledby="_r_2e_"
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M6 4h10a2 2 0 0 1 2 2v4.286l3.35-2.871a1 1 0 0 1 1.65.76v7.65a1 1 0 0 1-1.65.76L18 13.715V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4"
+                />
+              </svg>
+            </div>
+          </button>
+          <button
+            aria-disabled="false"
+            aria-label="Voice call"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
+            role="button"
+            style="--cpd-icon-button-size: 32px;"
+            tabindex="0"
+          >
+            <div
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
+            >
+              <svg
+                aria-labelledby="_r_2j_"
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="m20.958 16.374.039 3.527q0 .427-.33.756-.33.33-.756.33a16 16 0 0 1-6.57-1.105 16.2 16.2 0 0 1-5.563-3.663 16.1 16.1 0 0 1-3.653-5.573 16.3 16.3 0 0 1-1.115-6.56q0-.427.33-.757T4.095 3l3.528.039a1.07 1.07 0 0 1 1.085.93l.543 3.954q.039.271-.039.504a1.1 1.1 0 0 1-.271.426l-1.64 1.64q.505 1.008 1.154 1.909c.433.6 1.444 1.696 1.444 1.696s1.095 1.01 1.696 1.444q.9.65 1.909 1.153l1.64-1.64q.193-.193.426-.27t.504-.04l3.954.543q.406.059.668.359t.262.727"
+                />
+              </svg>
+            </div>
+          </button>
+          <button
+            aria-label="Threads"
+            aria-labelledby="_r_2o_"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
+            role="button"
+            style="--cpd-icon-button-size: 32px;"
+            tabindex="0"
+          >
+            <div
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
+            >
+              <svg
+                class=""
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M4 3h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H6l-2.293 2.293c-.63.63-1.707.184-1.707-.707V5a2 2 0 0 1 2-2m3 7h10q.424 0 .712-.287A.97.97 0 0 0 18 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 17 8H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 9q0 .424.287.713Q6.576 10 7 10m0 4h6q.424 0 .713-.287A.97.97 0 0 0 14 13a.97.97 0 0 0-.287-.713A.97.97 0 0 0 13 12H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 13q0 .424.287.713Q6.576 14 7 14"
+                />
+              </svg>
+            </div>
+          </button>
+          <button
+            aria-label="Room info"
+            aria-labelledby="_r_2t_"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
+            role="button"
+            style="--cpd-icon-button-size: 32px;"
+            tabindex="0"
+          >
+            <div
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
+            >
+              <svg
+                class=""
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16v-4a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 11a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 12v4q0 .424.287.712.288.288.713.288m0-8q.424 0 .713-.287A.97.97 0 0 0 13 8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8q0 .424.287.713Q11.576 9 12 9m0 13a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+                />
+              </svg>
+            </div>
+          </button>
+          <div
+            class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41"
+          >
+            <div
+              aria-label="0 members"
+              aria-labelledby="_r_32_"
+              class="mx_AccessibleButton mx_FacePile mx_FacePile_toggled"
+              role="button"
+              tabindex="0"
+            >
+              <div
+                class="_stacked-avatars_zysgz_109"
+              />
+              0
+            </div>
+          </div>
+        </header>
+        <div
+          class="mx_AutoHideScrollbar mx_AuxPanel"
+          role="region"
+          tabindex="-1"
+        >
+          <div />
+        </div>
+        <main
+          class="mx_RoomView_timeline mx_RoomView_timeline_rr_enabled"
+          data-testid="timeline"
+        >
+          <div
+            class="mx_AutoHideScrollbar mx_ScrollPanel mx_RoomView_messagePanel"
+            tabindex="-1"
+          >
+            <div
+              class="mx_RoomView_messageListWrapper"
+            >
+              <ol
+                aria-live="polite"
+                class="mx_RoomView_MessageList"
+                style="height: 400px;"
+              />
+            </div>
+          </div>
+        </main>
+        <div
+          aria-label="Room status bar"
+          class="mx_RoomView_statusArea"
+          role="region"
+        >
+          <div
+            class="mx_RoomView_statusAreaBox"
+          >
+            <div
+              class="mx_RoomView_statusAreaBox_line"
+            />
+          </div>
+        </div>
+        <div
+          aria-label="Message composer"
+          class="mx_MessageComposer mx_MessageComposer_e2eStatus"
+          role="region"
+        >
+          <div
+            class="mx_MessageComposer_wrapper"
+          >
+            <div
+              class="mx_MessageComposer_row"
+            >
+              <div
+                class="mx_MessageComposer_e2eIconWrapper"
+              >
+                <svg
+                  aria-label="Messages in this room are not end-to-end encrypted"
+                  aria-labelledby="_r_3d_"
+                  class="mx_E2EIcon mx_MessageComposer_e2eIcon"
+                  color="var(--cpd-color-icon-info-primary)"
+                  fill="currentColor"
+                  height="12px"
+                  viewBox="0 0 24 24"
+                  width="12px"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M6 22q-.825 0-1.412-.587A1.93 1.93 0 0 1 4 20V10q0-.825.588-1.412a2 2 0 0 1 .702-.463L1.333 4.167a1 1 0 0 1 1.414-1.414L7 7.006v-.012l13 13v.012l1.247 1.247a1 1 0 1 1-1.414 1.414l-.896-.896A1.94 1.94 0 0 1 18 22zm14-4.834V10q0-.825-.587-1.412A1.93 1.93 0 0 0 18 8h-1V6q0-2.075-1.463-3.537Q14.075 1 12 1T8.463 2.463a4.9 4.9 0 0 0-1.22 1.946L9 6.166V6q0-1.25.875-2.125A2.9 2.9 0 0 1 12 3q1.25 0 2.125.875T15 6v2h-4.166z"
+                  />
+                </svg>
+              </div>
+              <div
+                class="mx_SendMessageComposer"
+              >
+                <div
+                  class="mx_BasicMessageComposer"
+                >
+                  <div
+                    aria-label="Formatting"
+                    class="mx_MessageComposerFormatBar"
+                    role="toolbar"
+                  >
+                    <button
+                      aria-label="Bold"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="0"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M8.8 19q-.824 0-1.413-.587A1.93 1.93 0 0 1 6.8 17V7q0-.824.587-1.412A1.93 1.93 0 0 1 8.8 5h3.525q1.624 0 3 1T16.7 8.775q0 1.275-.575 1.963-.575.687-1.075.987.626.275 1.387 1.025.763.75.763 2.25 0 2.224-1.625 3.113-1.625.887-3.05.887zm1.025-2.8h2.6q1.2 0 1.462-.612.263-.614.263-.888 0-.275-.263-.887-.262-.613-1.537-.613H9.825zm0-5.7h2.325q.825 0 1.2-.425a1.4 1.4 0 0 0 .375-.95q0-.6-.425-.975t-1.1-.375H9.825z"
+                        />
+                      </svg>
+                    </button>
+                    <button
+                      aria-label="Italics"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="-1"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M6.25 19q-.525 0-.888-.363A1.2 1.2 0 0 1 5 17.75q0-.525.362-.887.363-.363.888-.363H9l3-9H9.25q-.525 0-.887-.362A1.2 1.2 0 0 1 8 6.25q0-.525.363-.888Q8.725 5 9.25 5h7.5q.525 0 .887.362.363.363.363.888t-.363.888a1.2 1.2 0 0 1-.887.362H14.5l-3 9h2.25q.525 0 .887.363.363.362.363.887t-.363.887a1.2 1.2 0 0 1-.887.363z"
+                        />
+                      </svg>
+                    </button>
+                    <button
+                      aria-label="Strikethrough"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="-1"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M12.15 20q-1.9 0-3.375-1.125T6.65 15.8l2.2-.95q.35 1.2 1.213 1.975.861.775 2.137.775 1.05 0 1.9-.5t.85-1.6q0-.45-.175-.825A2.4 2.4 0 0 0 14.3 14h2.8a4.3 4.3 0 0 1 .25 1.5q0 2.15-1.538 3.325Q14.277 20 12.15 20M3 12a.97.97 0 0 1-.712-.287A.97.97 0 0 1 2 11q0-.424.288-.713A.97.97 0 0 1 3 10h18q.424 0 .712.287.288.288.288.713 0 .424-.288.713A.97.97 0 0 1 21 12zm9.05-8.15q1.65 0 2.887.812T16.85 7.15l-2.2.975a3 3 0 0 0-.838-1.3Q13.2 6.25 12.1 6.25q-1.025 0-1.7.462-.675.463-.75 1.288h-2.4q.05-1.725 1.363-2.938Q9.925 3.85 12.05 3.85"
+                        />
+                      </svg>
+                    </button>
+                    <button
+                      aria-label="Code block"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="-1"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M14.958 5.62a1 1 0 0 0-1.916-.574l-4 13.333a1 1 0 0 0 1.916.575zM5.974 7.232a1 1 0 0 0-1.409.128l-3.333 4a1 1 0 0 0 0 1.28l3.333 4a1 1 0 1 0 1.537-1.28L3.302 12l2.8-3.36a1 1 0 0 0-.128-1.408m12.053 0a1 1 0 0 1 1.408.128l3.333 4a1 1 0 0 1 0 1.28l-3.333 4a1 1 0 1 1-1.537-1.28l2.8-3.36-2.8-3.36a1 1 0 0 1 .128-1.408"
+                        />
+                      </svg>
+                    </button>
+                    <button
+                      aria-label="Quote"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="-1"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M4.719 4.34c.094-.642-.366-1.236-1.028-1.328-.663-.092-1.276.354-1.371.996l-.808 5.478c-.094.642.366 1.237 1.028 1.328.663.092 1.276-.354 1.371-.996zm12.115 10.174c.095-.642-.366-1.237-1.028-1.328-.662-.092-1.276.354-1.37.996l-.809 5.478c-.094.642.366 1.236 1.028 1.328.663.092 1.277-.354 1.371-.996zM9.318 3.009c.665.077 1.138.662 1.058 1.306l-.022.175a221 221 0 0 1-.266 2.006c-.161 1.171-.368 2.579-.535 3.386-.13.636-.769 1.049-1.425.921s-1.082-.745-.95-1.381c.148-.72.345-2.052.509-3.237a191 191 0 0 0 .262-1.981l.021-.17c.08-.644.684-1.103 1.348-1.025m13.17 11.505c.094-.642-.366-1.237-1.028-1.328-.663-.092-1.276.354-1.371.996l-.808 5.478c-.094.642.366 1.236 1.028 1.328.663.092 1.276-.354 1.371-.996z"
+                        />
+                      </svg>
+                    </button>
+                    <button
+                      aria-label="Insert link"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
+                      role="button"
+                      tabindex="-1"
+                      type="button"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M12 19.071q-1.467 1.467-3.536 1.467-2.067 0-3.535-1.467t-1.467-3.535q0-2.07 1.467-3.536L7.05 9.879q.3-.3.707-.3t.707.3.301.707-.3.707l-2.122 2.121a2.9 2.9 0 0 0-.884 2.122q0 1.237.884 2.12.884.885 2.121.885t2.122-.884l2.121-2.121q.3-.3.707-.3t.707.3.3.707q0 .405-.3.707zm-1.414-4.243q-.3.3-.707.301a.97.97 0 0 1-.707-.3q-.3-.3-.301-.708 0-.405.3-.707l4.243-4.242q.3-.3.707-.3t.707.3.3.707-.3.707zm6.364-.707q-.3.3-.707.3a.97.97 0 0 1-.707-.3q-.3-.3-.301-.707 0-.405.3-.707l2.122-2.121q.884-.885.884-2.121 0-1.238-.884-2.122a2.9 2.9 0 0 0-2.121-.884q-1.237 0-2.122.884l-2.121 2.122q-.3.3-.707.3a.97.97 0 0 1-.707-.3q-.3-.3-.3-.708 0-.405.3-.707L12 4.93q1.467-1.467 3.536-1.467t3.535 1.467 1.467 3.536T19.071 12z"
+                        />
+                      </svg>
+                    </button>
+                  </div>
+                  <div
+                    aria-autocomplete="list"
+                    aria-disabled="false"
+                    aria-haspopup="listbox"
+                    aria-label="Send an unencrypted message…"
+                    aria-multiline="true"
+                    class="mx_BasicMessageComposer_input mx_BasicMessageComposer_input_shouldShowPillAvatar mx_BasicMessageComposer_inputEmpty"
+                    contenteditable="true"
+                    data-testid="basicmessagecomposer"
+                    dir="auto"
+                    role="textbox"
+                    style="--placeholder: 'Send\\ an\\ unencrypted\\ message…';"
+                    tabindex="0"
+                    translate="no"
+                  >
+                    <div>
+                      <br />
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="mx_MessageComposer_actions"
+              >
+                <div
+                  aria-label="Emoji"
+                  class="mx_AccessibleButton mx_EmojiButton mx_MessageComposer_button"
+                  role="button"
+                  tabindex="0"
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M15.536 15.536a1 1 0 0 0-1.415-1.415 3 3 0 0 1-2.12.879 3 3 0 0 1-2.122-.879 1 1 0 1 0-1.414 1.415A5 5 0 0 0 12 17c1.38 0 2.632-.56 3.536-1.464M10 10.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m5.5 1.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3"
+                    />
+                    <path
+                      d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10m-2 0a8 8 0 1 0-16 0 8 8 0 0 0 16 0"
+                    />
+                  </svg>
+                </div>
+                <div
+                  aria-label="Attachment"
+                  class="mx_AccessibleButton mx_MessageComposer_button"
+                  role="button"
+                  tabindex="0"
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
+                    />
+                  </svg>
+                </div>
+                <div
+                  aria-label="More options"
+                  class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_buttonMenu"
+                  role="button"
+                  tabindex="0"
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+                    />
+                  </svg>
+                </div>
+                <input
+                  multiple=""
+                  style="display: none;"
+                  type="file"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`RoomView should not display the timeline when the room encryption is loading 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_RoomView"
+    tabindex="-1"
+  >
+    <canvas
+      aria-hidden="true"
+      height="768"
+      style="display: block; z-index: 999999; pointer-events: none; position: fixed; top: 0px; right: 0px;"
+      width="0"
+    />
+    <div
+      class="mx_MainSplit"
+    >
+      <div
+        class="mx_RoomView_body mx_MainSplit_timeline"
+        data-layout="group"
+      >
+        <header
+          class="_flex_4dswl_9 mx_RoomHeader light-panel"
+          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+        >
+          <button
+            aria-label="Open room settings"
+            aria-live="off"
+            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
+            data-color="1"
+            data-testid="avatar-img"
+            data-type="round"
+            role="button"
+            style="--cpd-avatar-size: 40px;"
+            tabindex="-1"
+          >
+            !
+          </button>
+          <button
+            aria-label="Room info"
+            class="mx_RoomHeader_infoWrapper"
+            tabindex="0"
+          >
+            <div
+              class="mx_RoomHeader_info _box-flex_1odfs_9"
+              style="--mx-box-flex: 1;"
+            >
+              <div
+                aria-level="1"
+                class="_typography_6v6n8_153 _font-body-lg-semibold_6v6n8_74 mx_RoomHeader_heading"
+                dir="auto"
+                role="heading"
+              >
+                <span
+                  class="mx_RoomHeader_truncated mx_lineClamp"
+                >
+                  !roomviewshouldnotdisplaythetimelinewhentheroomencryptionisloading:example.org
+                </span>
+              </div>
+            </div>
+          </button>
+          <button
+            aria-disabled="false"
+            aria-label="Video call"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
+            role="button"
+            style="--cpd-icon-button-size: 32px;"
+            tabindex="0"
+          >
+            <div
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
+            >
+              <svg
+                aria-labelledby="_r_f5_"
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M6 4h10a2 2 0 0 1 2 2v4.286l3.35-2.871a1 1 0 0 1 1.65.76v7.65a1 1 0 0 1-1.65.76L18 13.715V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4"
+                />
+              </svg>
+            </div>
+          </button>
+          <button
+            aria-disabled="false"
+            aria-label="Voice call"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
+            role="button"
+            style="--cpd-icon-button-size: 32px;"
+            tabindex="0"
+          >
+            <div
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
+            >
+              <svg
+                aria-labelledby="_r_fa_"
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="m20.958 16.374.039 3.527q0 .427-.33.756-.33.33-.756.33a16 16 0 0 1-6.57-1.105 16.2 16.2 0 0 1-5.563-3.663 16.1 16.1 0 0 1-3.653-5.573 16.3 16.3 0 0 1-1.115-6.56q0-.427.33-.757T4.095 3l3.528.039a1.07 1.07 0 0 1 1.085.93l.543 3.954q.039.271-.039.504a1.1 1.1 0 0 1-.271.426l-1.64 1.64q.505 1.008 1.154 1.909c.433.6 1.444 1.696 1.444 1.696s1.095 1.01 1.696 1.444q.9.65 1.909 1.153l1.64-1.64q.193-.193.426-.27t.504-.04l3.954.543q.406.059.668.359t.262.727"
+                />
+              </svg>
+            </div>
+          </button>
+          <button
+            aria-label="Threads"
+            aria-labelledby="_r_ff_"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
+            role="button"
+            style="--cpd-icon-button-size: 32px;"
+            tabindex="0"
+          >
+            <div
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
+            >
+              <svg
+                class=""
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M4 3h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H6l-2.293 2.293c-.63.63-1.707.184-1.707-.707V5a2 2 0 0 1 2-2m3 7h10q.424 0 .712-.287A.97.97 0 0 0 18 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 17 8H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 9q0 .424.287.713Q6.576 10 7 10m0 4h6q.424 0 .713-.287A.97.97 0 0 0 14 13a.97.97 0 0 0-.287-.713A.97.97 0 0 0 13 12H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 13q0 .424.287.713Q6.576 14 7 14"
+                />
+              </svg>
+            </div>
+          </button>
+          <button
+            aria-label="Room info"
+            aria-labelledby="_r_fk_"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
+            role="button"
+            style="--cpd-icon-button-size: 32px;"
+            tabindex="0"
+          >
+            <div
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
+            >
+              <svg
+                class=""
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16v-4a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 11a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 12v4q0 .424.287.712.288.288.713.288m0-8q.424 0 .713-.287A.97.97 0 0 0 13 8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8q0 .424.287.713Q11.576 9 12 9m0 13a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+                />
+              </svg>
+            </div>
+          </button>
+          <div
+            class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41"
+          >
+            <div
+              aria-label="0 members"
+              aria-labelledby="_r_fp_"
+              class="mx_AccessibleButton mx_FacePile"
+              role="button"
+              tabindex="0"
+            >
+              <div
+                class="_stacked-avatars_zysgz_109"
+              />
+              0
+            </div>
+          </div>
+        </header>
+        <div
+          class="mx_AutoHideScrollbar mx_AuxPanel"
+          role="region"
+          tabindex="-1"
+        >
+          <div />
+        </div>
+        <main
+          class="mx_RoomView_timeline mx_RoomView_timeline_rr_enabled"
+          data-testid="timeline"
         />
         <div
           aria-label="Room status bar"
@@ -1549,6 +2742,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
 <DocumentFragment>
   <div
     class="mx_RoomView"
+    tabindex="-1"
   >
     <canvas
       aria-hidden="true"
@@ -1564,14 +2758,14 @@ exports[`RoomView should not display the timeline when the room encryption is lo
         data-layout="group"
       >
         <header
-          class="mx_Flex mx_RoomHeader light-panel"
+          class="_flex_4dswl_9 mx_RoomHeader light-panel"
           style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
         >
           <button
             aria-label="Open room settings"
             aria-live="off"
-            class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-            data-color="4"
+            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
+            data-color="1"
             data-testid="avatar-img"
             data-type="round"
             role="button"
@@ -1586,7 +2780,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
             tabindex="0"
           >
             <div
-              class="mx_Box mx_RoomHeader_info mx_Box--flex"
+              class="mx_RoomHeader_info _box-flex_1odfs_9"
               style="--mx-box-flex: 1;"
             >
               <div
@@ -1598,25 +2792,26 @@ exports[`RoomView should not display the timeline when the room encryption is lo
                 <span
                   class="mx_RoomHeader_truncated mx_lineClamp"
                 >
-                  !11:example.org
+                  !roomviewshouldnotdisplaythetimelinewhentheroomencryptionisloading:example.org
                 </span>
               </div>
             </div>
           </button>
           <button
-            aria-disabled="true"
-            aria-label="There's no one here to call"
-            class="_icon-button_m2erp_8"
+            aria-disabled="false"
+            aria-label="Video call"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
             role="button"
             style="--cpd-icon-button-size: 32px;"
             tabindex="0"
           >
             <div
-              class="_indicator-icon_zr2a0_17"
-              style="--cpd-icon-button-size: 100%; --cpd-color-icon-tertiary: var(--cpd-color-icon-disabled);"
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
             >
               <svg
-                aria-labelledby="«r2c»"
+                aria-labelledby="_r_f5_"
                 fill="currentColor"
                 height="1em"
                 viewBox="0 0 24 24"
@@ -1630,19 +2825,20 @@ exports[`RoomView should not display the timeline when the room encryption is lo
             </div>
           </button>
           <button
-            aria-disabled="true"
-            aria-label="There's no one here to call"
-            aria-labelledby="«r2h»"
-            class="_icon-button_m2erp_8"
+            aria-disabled="false"
+            aria-label="Voice call"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
             role="button"
             style="--cpd-icon-button-size: 32px;"
             tabindex="0"
           >
             <div
-              class="_indicator-icon_zr2a0_17"
-              style="--cpd-icon-button-size: 100%; --cpd-color-icon-tertiary: var(--cpd-color-icon-disabled);"
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
             >
               <svg
+                aria-labelledby="_r_fa_"
                 fill="currentColor"
                 height="1em"
                 viewBox="0 0 24 24"
@@ -1657,14 +2853,15 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           </button>
           <button
             aria-label="Threads"
-            aria-labelledby="«r2m»"
-            class="_icon-button_m2erp_8"
+            aria-labelledby="_r_ff_"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
             role="button"
             style="--cpd-icon-button-size: 32px;"
             tabindex="0"
           >
             <div
-              class="_indicator-icon_zr2a0_17"
+              class="_indicator-icon_147l5_17"
               style="--cpd-icon-button-size: 100%;"
             >
               <svg
@@ -1683,14 +2880,15 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           </button>
           <button
             aria-label="Room info"
-            aria-labelledby="«r2r»"
-            class="_icon-button_m2erp_8"
+            aria-labelledby="_r_fk_"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
             role="button"
             style="--cpd-icon-button-size: 32px;"
             tabindex="0"
           >
             <div
-              class="_indicator-icon_zr2a0_17"
+              class="_indicator-icon_147l5_17"
               style="--cpd-icon-button-size: 100%;"
             >
               <svg
@@ -1712,13 +2910,13 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           >
             <div
               aria-label="0 members"
-              aria-labelledby="«r30»"
+              aria-labelledby="_r_fp_"
               class="mx_AccessibleButton mx_FacePile"
               role="button"
               tabindex="0"
             >
               <div
-                class="_stacked-avatars_1qbcf_102"
+                class="_stacked-avatars_zysgz_109"
               />
               0
             </div>
@@ -1733,6 +2931,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
         </div>
         <main
           class="mx_RoomView_timeline mx_RoomView_timeline_rr_enabled"
+          data-testid="timeline"
         >
           <div
             class="mx_AutoHideScrollbar mx_ScrollPanel mx_RoomView_messagePanel"
@@ -1780,9 +2979,26 @@ exports[`RoomView should not display the timeline when the room encryption is lo
                   tabindex="0"
                 >
                   <div
-                    aria-labelledby="«r3e»"
-                    class="mx_E2EIcon mx_E2EIcon_verified mx_MessageComposer_e2eIcon"
-                  />
+                    aria-labelledby="_r_g4_"
+                    class="mx_E2EIcon mx_MessageComposer_e2eIcon"
+                    data-testid="e2e-icon"
+                    style="width: 12px; height: 12px;"
+                  >
+                    <svg
+                      class="mx_E2EIcon_verified"
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M11.106 2.447a2 2 0 0 1 1.789 0l6 3A2 2 0 0 1 20 7.237V12c0 6.742-5.773 9.246-7.51 9.846-.32.111-.66.111-.98 0C9.774 21.246 4 18.743 4 12V7.236a2 2 0 0 1 1.105-1.789zm4.601 6.846a1 1 0 0 0-1.414 0L11 12.586l-1.293-1.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0 0-1.414"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </div>
                 </span>
               </div>
               <div
@@ -1798,59 +3014,131 @@ exports[`RoomView should not display the timeline when the room encryption is lo
                   >
                     <button
                       aria-label="Bold"
-                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconBold"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                       role="button"
                       tabindex="0"
                       type="button"
-                    />
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M8.8 19q-.824 0-1.413-.587A1.93 1.93 0 0 1 6.8 17V7q0-.824.587-1.412A1.93 1.93 0 0 1 8.8 5h3.525q1.624 0 3 1T16.7 8.775q0 1.275-.575 1.963-.575.687-1.075.987.626.275 1.387 1.025.763.75.763 2.25 0 2.224-1.625 3.113-1.625.887-3.05.887zm1.025-2.8h2.6q1.2 0 1.462-.612.263-.614.263-.888 0-.275-.263-.887-.262-.613-1.537-.613H9.825zm0-5.7h2.325q.825 0 1.2-.425a1.4 1.4 0 0 0 .375-.95q0-.6-.425-.975t-1.1-.375H9.825z"
+                        />
+                      </svg>
+                    </button>
                     <button
                       aria-label="Italics"
-                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconItalic"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                       role="button"
                       tabindex="-1"
                       type="button"
-                    />
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M6.25 19q-.525 0-.888-.363A1.2 1.2 0 0 1 5 17.75q0-.525.362-.887.363-.363.888-.363H9l3-9H9.25q-.525 0-.887-.362A1.2 1.2 0 0 1 8 6.25q0-.525.363-.888Q8.725 5 9.25 5h7.5q.525 0 .887.362.363.363.363.888t-.363.888a1.2 1.2 0 0 1-.887.362H14.5l-3 9h2.25q.525 0 .887.363.363.362.363.887t-.363.887a1.2 1.2 0 0 1-.887.363z"
+                        />
+                      </svg>
+                    </button>
                     <button
                       aria-label="Strikethrough"
-                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconStrikethrough"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                       role="button"
                       tabindex="-1"
                       type="button"
-                    />
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M12.15 20q-1.9 0-3.375-1.125T6.65 15.8l2.2-.95q.35 1.2 1.213 1.975.861.775 2.137.775 1.05 0 1.9-.5t.85-1.6q0-.45-.175-.825A2.4 2.4 0 0 0 14.3 14h2.8a4.3 4.3 0 0 1 .25 1.5q0 2.15-1.538 3.325Q14.277 20 12.15 20M3 12a.97.97 0 0 1-.712-.287A.97.97 0 0 1 2 11q0-.424.288-.713A.97.97 0 0 1 3 10h18q.424 0 .712.287.288.288.288.713 0 .424-.288.713A.97.97 0 0 1 21 12zm9.05-8.15q1.65 0 2.887.812T16.85 7.15l-2.2.975a3 3 0 0 0-.838-1.3Q13.2 6.25 12.1 6.25q-1.025 0-1.7.462-.675.463-.75 1.288h-2.4q.05-1.725 1.363-2.938Q9.925 3.85 12.05 3.85"
+                        />
+                      </svg>
+                    </button>
                     <button
                       aria-label="Code block"
-                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconCode"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                       role="button"
                       tabindex="-1"
                       type="button"
-                    />
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M14.958 5.62a1 1 0 0 0-1.916-.574l-4 13.333a1 1 0 0 0 1.916.575zM5.974 7.232a1 1 0 0 0-1.409.128l-3.333 4a1 1 0 0 0 0 1.28l3.333 4a1 1 0 1 0 1.537-1.28L3.302 12l2.8-3.36a1 1 0 0 0-.128-1.408m12.053 0a1 1 0 0 1 1.408.128l3.333 4a1 1 0 0 1 0 1.28l-3.333 4a1 1 0 1 1-1.537-1.28l2.8-3.36-2.8-3.36a1 1 0 0 1 .128-1.408"
+                        />
+                      </svg>
+                    </button>
                     <button
                       aria-label="Quote"
-                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconQuote"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                       role="button"
                       tabindex="-1"
                       type="button"
-                    />
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M4.719 4.34c.094-.642-.366-1.236-1.028-1.328-.663-.092-1.276.354-1.371.996l-.808 5.478c-.094.642.366 1.237 1.028 1.328.663.092 1.276-.354 1.371-.996zm12.115 10.174c.095-.642-.366-1.237-1.028-1.328-.662-.092-1.276.354-1.37.996l-.809 5.478c-.094.642.366 1.236 1.028 1.328.663.092 1.277-.354 1.371-.996zM9.318 3.009c.665.077 1.138.662 1.058 1.306l-.022.175a221 221 0 0 1-.266 2.006c-.161 1.171-.368 2.579-.535 3.386-.13.636-.769 1.049-1.425.921s-1.082-.745-.95-1.381c.148-.72.345-2.052.509-3.237a191 191 0 0 0 .262-1.981l.021-.17c.08-.644.684-1.103 1.348-1.025m13.17 11.505c.094-.642-.366-1.237-1.028-1.328-.663-.092-1.276.354-1.371.996l-.808 5.478c-.094.642.366 1.236 1.028 1.328.663.092 1.276-.354 1.371-.996z"
+                        />
+                      </svg>
+                    </button>
                     <button
                       aria-label="Insert link"
-                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconInsertLink"
+                      class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                       role="button"
                       tabindex="-1"
                       type="button"
-                    />
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M12 19.071q-1.467 1.467-3.536 1.467-2.067 0-3.535-1.467t-1.467-3.535q0-2.07 1.467-3.536L7.05 9.879q.3-.3.707-.3t.707.3.301.707-.3.707l-2.122 2.121a2.9 2.9 0 0 0-.884 2.122q0 1.237.884 2.12.884.885 2.121.885t2.122-.884l2.121-2.121q.3-.3.707-.3t.707.3.3.707q0 .405-.3.707zm-1.414-4.243q-.3.3-.707.301a.97.97 0 0 1-.707-.3q-.3-.3-.301-.708 0-.405.3-.707l4.243-4.242q.3-.3.707-.3t.707.3.3.707-.3.707zm6.364-.707q-.3.3-.707.3a.97.97 0 0 1-.707-.3q-.3-.3-.301-.707 0-.405.3-.707l2.122-2.121q.884-.885.884-2.121 0-1.238-.884-2.122a2.9 2.9 0 0 0-2.121-.884q-1.237 0-2.122.884l-2.121 2.122q-.3.3-.707.3a.97.97 0 0 1-.707-.3q-.3-.3-.3-.708 0-.405.3-.707L12 4.93q1.467-1.467 3.536-1.467t3.535 1.467 1.467 3.536T19.071 12z"
+                        />
+                      </svg>
+                    </button>
                   </div>
                   <div
                     aria-autocomplete="list"
                     aria-disabled="false"
                     aria-haspopup="listbox"
-                    aria-label="Send an encrypted message…"
+                    aria-label="Send a message…"
                     aria-multiline="true"
                     class="mx_BasicMessageComposer_input mx_BasicMessageComposer_input_shouldShowPillAvatar mx_BasicMessageComposer_inputEmpty"
                     contenteditable="true"
                     data-testid="basicmessagecomposer"
                     dir="auto"
                     role="textbox"
-                    style="--placeholder: 'Send\\ an\\ encrypted\\ message…';"
+                    style="--placeholder: 'Send\\ a\\ message…';"
                     tabindex="0"
                     translate="no"
                   >
@@ -1865,22 +3153,61 @@ exports[`RoomView should not display the timeline when the room encryption is lo
               >
                 <div
                   aria-label="Emoji"
-                  class="mx_AccessibleButton mx_EmojiButton mx_MessageComposer_button mx_EmojiButton_icon"
+                  class="mx_AccessibleButton mx_EmojiButton mx_MessageComposer_button"
                   role="button"
                   tabindex="0"
-                />
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M15.536 15.536a1 1 0 0 0-1.415-1.415 3 3 0 0 1-2.12.879 3 3 0 0 1-2.122-.879 1 1 0 1 0-1.414 1.415A5 5 0 0 0 12 17c1.38 0 2.632-.56 3.536-1.464M10 10.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m5.5 1.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3"
+                    />
+                    <path
+                      d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10m-2 0a8 8 0 1 0-16 0 8 8 0 0 0 16 0"
+                    />
+                  </svg>
+                </div>
                 <div
                   aria-label="Attachment"
-                  class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_upload"
+                  class="mx_AccessibleButton mx_MessageComposer_button"
                   role="button"
                   tabindex="0"
-                />
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
+                    />
+                  </svg>
+                </div>
                 <div
                   aria-label="More options"
                   class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_buttonMenu"
                   role="button"
                   tabindex="0"
-                />
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+                    />
+                  </svg>
+                </div>
                 <input
                   multiple=""
                   style="display: none;"
@@ -1930,6 +3257,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
 <DocumentFragment>
   <div
     class="mx_RoomView mx_RoomView_immersive"
+    tabindex="-1"
   >
     <canvas
       aria-hidden="true"
@@ -1945,14 +3273,14 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
         data-layout="group"
       >
         <header
-          class="mx_Flex mx_RoomHeader light-panel"
+          class="_flex_4dswl_9 mx_RoomHeader light-panel"
           style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
         >
           <button
             aria-label="Open room settings"
             aria-live="off"
-            class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-            data-color="3"
+            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
+            data-color="2"
             data-testid="avatar-img"
             data-type="round"
             role="button"
@@ -1967,7 +3295,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
             tabindex="0"
           >
             <div
-              class="mx_Box mx_RoomHeader_info mx_Box--flex"
+              class="mx_RoomHeader_info _box-flex_1odfs_9"
               style="--mx-box-flex: 1;"
             >
               <div
@@ -1979,21 +3307,22 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
                 <span
                   class="mx_RoomHeader_truncated mx_lineClamp"
                 >
-                  !16:example.org
+                  !roomviewvideoroomsshouldrenderjoinedvideoroomview:example.org
                 </span>
               </div>
             </div>
           </button>
           <button
             aria-label="Chat"
-            aria-labelledby="«r7c»"
-            class="_icon-button_m2erp_8"
+            aria-labelledby="_r_k7_"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
             role="button"
             style="--cpd-icon-button-size: 32px;"
             tabindex="0"
           >
             <div
-              class="_indicator-icon_zr2a0_17"
+              class="_indicator-icon_147l5_17"
               style="--cpd-icon-button-size: 100%;"
             >
               <svg
@@ -2012,14 +3341,15 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
           </button>
           <button
             aria-label="Threads"
-            aria-labelledby="«r7h»"
-            class="_icon-button_m2erp_8"
+            aria-labelledby="_r_kc_"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
             role="button"
             style="--cpd-icon-button-size: 32px;"
             tabindex="0"
           >
             <div
-              class="_indicator-icon_zr2a0_17"
+              class="_indicator-icon_147l5_17"
               style="--cpd-icon-button-size: 100%;"
             >
               <svg
@@ -2038,14 +3368,15 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
           </button>
           <button
             aria-label="Room info"
-            aria-labelledby="«r7m»"
-            class="_icon-button_m2erp_8"
+            aria-labelledby="_r_kh_"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
             role="button"
             style="--cpd-icon-button-size: 32px;"
             tabindex="0"
           >
             <div
-              class="_indicator-icon_zr2a0_17"
+              class="_indicator-icon_147l5_17"
               style="--cpd-icon-button-size: 100%;"
             >
               <svg
@@ -2067,13 +3398,13 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
           >
             <div
               aria-label="0 members"
-              aria-labelledby="«r7r»"
+              aria-labelledby="_r_km_"
               class="mx_AccessibleButton mx_FacePile"
               role="button"
               tabindex="0"
             >
               <div
-                class="_stacked-avatars_1qbcf_102"
+                class="_stacked-avatars_zysgz_109"
               />
               0
             </div>
@@ -2102,13 +3433,24 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
                     Loading…
                   </div>
                    
-                  <div
+                  <svg
                     aria-label="Loading…"
-                    class="mx_Spinner_icon"
+                    class="_icon_11k6c_18"
                     data-testid="spinner"
+                    fill="currentColor"
+                    height="1em"
                     role="progressbar"
                     style="width: 32px; height: 32px;"
-                  />
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      clip-rule="evenodd"
+                      d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+                      fill-rule="evenodd"
+                    />
+                  </svg>
                 </div>
               </div>
             </div>
@@ -2141,15 +3483,16 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
                 </p>
               </div>
               <button
-                aria-labelledby="«r84»"
-                class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+                aria-labelledby="_r_kv_"
+                class="_icon-button_1pz9o_8"
+                data-kind="secondary"
                 data-testid="base-card-close-button"
                 role="button"
                 style="--cpd-icon-button-size: 28px;"
                 tabindex="0"
               >
                 <div
-                  class="_indicator-icon_zr2a0_17"
+                  class="_indicator-icon_147l5_17"
                   style="--cpd-icon-button-size: 100%;"
                 >
                   <svg
@@ -2186,7 +3529,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
             </div>
             <div
               aria-label="Message composer"
-              class="mx_MessageComposer mx_MessageComposer--compact"
+              class="mx_MessageComposer mx_MessageComposer--compact mx_MessageComposer_e2eStatus"
               role="region"
             >
               <div
@@ -2195,6 +3538,25 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
                 <div
                   class="mx_MessageComposer_row"
                 >
+                  <div
+                    class="mx_MessageComposer_e2eIconWrapper"
+                  >
+                    <svg
+                      aria-label="Messages in this room are not end-to-end encrypted"
+                      aria-labelledby="_r_l4_"
+                      class="mx_E2EIcon mx_MessageComposer_e2eIcon"
+                      color="var(--cpd-color-icon-info-primary)"
+                      fill="currentColor"
+                      height="12px"
+                      viewBox="0 0 24 24"
+                      width="12px"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M6 22q-.825 0-1.412-.587A1.93 1.93 0 0 1 4 20V10q0-.825.588-1.412a2 2 0 0 1 .702-.463L1.333 4.167a1 1 0 0 1 1.414-1.414L7 7.006v-.012l13 13v.012l1.247 1.247a1 1 0 1 1-1.414 1.414l-.896-.896A1.94 1.94 0 0 1 18 22zm14-4.834V10q0-.825-.587-1.412A1.93 1.93 0 0 0 18 8h-1V6q0-2.075-1.463-3.537Q14.075 1 12 1T8.463 2.463a4.9 4.9 0 0 0-1.22 1.946L9 6.166V6q0-1.25.875-2.125A2.9 2.9 0 0 1 12 3q1.25 0 2.125.875T15 6v2h-4.166z"
+                      />
+                    </svg>
+                  </div>
                   <div
                     class="mx_SendMessageComposer"
                   >
@@ -2208,59 +3570,131 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
                       >
                         <button
                           aria-label="Bold"
-                          class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconBold"
+                          class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                           role="button"
                           tabindex="0"
                           type="button"
-                        />
+                        >
+                          <svg
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M8.8 19q-.824 0-1.413-.587A1.93 1.93 0 0 1 6.8 17V7q0-.824.587-1.412A1.93 1.93 0 0 1 8.8 5h3.525q1.624 0 3 1T16.7 8.775q0 1.275-.575 1.963-.575.687-1.075.987.626.275 1.387 1.025.763.75.763 2.25 0 2.224-1.625 3.113-1.625.887-3.05.887zm1.025-2.8h2.6q1.2 0 1.462-.612.263-.614.263-.888 0-.275-.263-.887-.262-.613-1.537-.613H9.825zm0-5.7h2.325q.825 0 1.2-.425a1.4 1.4 0 0 0 .375-.95q0-.6-.425-.975t-1.1-.375H9.825z"
+                            />
+                          </svg>
+                        </button>
                         <button
                           aria-label="Italics"
-                          class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconItalic"
+                          class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                           role="button"
                           tabindex="-1"
                           type="button"
-                        />
+                        >
+                          <svg
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M6.25 19q-.525 0-.888-.363A1.2 1.2 0 0 1 5 17.75q0-.525.362-.887.363-.363.888-.363H9l3-9H9.25q-.525 0-.887-.362A1.2 1.2 0 0 1 8 6.25q0-.525.363-.888Q8.725 5 9.25 5h7.5q.525 0 .887.362.363.363.363.888t-.363.888a1.2 1.2 0 0 1-.887.362H14.5l-3 9h2.25q.525 0 .887.363.363.362.363.887t-.363.887a1.2 1.2 0 0 1-.887.363z"
+                            />
+                          </svg>
+                        </button>
                         <button
                           aria-label="Strikethrough"
-                          class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconStrikethrough"
+                          class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                           role="button"
                           tabindex="-1"
                           type="button"
-                        />
+                        >
+                          <svg
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M12.15 20q-1.9 0-3.375-1.125T6.65 15.8l2.2-.95q.35 1.2 1.213 1.975.861.775 2.137.775 1.05 0 1.9-.5t.85-1.6q0-.45-.175-.825A2.4 2.4 0 0 0 14.3 14h2.8a4.3 4.3 0 0 1 .25 1.5q0 2.15-1.538 3.325Q14.277 20 12.15 20M3 12a.97.97 0 0 1-.712-.287A.97.97 0 0 1 2 11q0-.424.288-.713A.97.97 0 0 1 3 10h18q.424 0 .712.287.288.288.288.713 0 .424-.288.713A.97.97 0 0 1 21 12zm9.05-8.15q1.65 0 2.887.812T16.85 7.15l-2.2.975a3 3 0 0 0-.838-1.3Q13.2 6.25 12.1 6.25q-1.025 0-1.7.462-.675.463-.75 1.288h-2.4q.05-1.725 1.363-2.938Q9.925 3.85 12.05 3.85"
+                            />
+                          </svg>
+                        </button>
                         <button
                           aria-label="Code block"
-                          class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconCode"
+                          class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                           role="button"
                           tabindex="-1"
                           type="button"
-                        />
+                        >
+                          <svg
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M14.958 5.62a1 1 0 0 0-1.916-.574l-4 13.333a1 1 0 0 0 1.916.575zM5.974 7.232a1 1 0 0 0-1.409.128l-3.333 4a1 1 0 0 0 0 1.28l3.333 4a1 1 0 1 0 1.537-1.28L3.302 12l2.8-3.36a1 1 0 0 0-.128-1.408m12.053 0a1 1 0 0 1 1.408.128l3.333 4a1 1 0 0 1 0 1.28l-3.333 4a1 1 0 1 1-1.537-1.28l2.8-3.36-2.8-3.36a1 1 0 0 1 .128-1.408"
+                            />
+                          </svg>
+                        </button>
                         <button
                           aria-label="Quote"
-                          class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconQuote"
+                          class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                           role="button"
                           tabindex="-1"
                           type="button"
-                        />
+                        >
+                          <svg
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M4.719 4.34c.094-.642-.366-1.236-1.028-1.328-.663-.092-1.276.354-1.371.996l-.808 5.478c-.094.642.366 1.237 1.028 1.328.663.092 1.276-.354 1.371-.996zm12.115 10.174c.095-.642-.366-1.237-1.028-1.328-.662-.092-1.276.354-1.37.996l-.809 5.478c-.094.642.366 1.236 1.028 1.328.663.092 1.277-.354 1.371-.996zM9.318 3.009c.665.077 1.138.662 1.058 1.306l-.022.175a221 221 0 0 1-.266 2.006c-.161 1.171-.368 2.579-.535 3.386-.13.636-.769 1.049-1.425.921s-1.082-.745-.95-1.381c.148-.72.345-2.052.509-3.237a191 191 0 0 0 .262-1.981l.021-.17c.08-.644.684-1.103 1.348-1.025m13.17 11.505c.094-.642-.366-1.237-1.028-1.328-.663-.092-1.276.354-1.371.996l-.808 5.478c-.094.642.366 1.236 1.028 1.328.663.092 1.276-.354 1.371-.996z"
+                            />
+                          </svg>
+                        </button>
                         <button
                           aria-label="Insert link"
-                          class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconInsertLink"
+                          class="mx_AccessibleButton mx_MessageComposerFormatBar_button"
                           role="button"
                           tabindex="-1"
                           type="button"
-                        />
+                        >
+                          <svg
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M12 19.071q-1.467 1.467-3.536 1.467-2.067 0-3.535-1.467t-1.467-3.535q0-2.07 1.467-3.536L7.05 9.879q.3-.3.707-.3t.707.3.301.707-.3.707l-2.122 2.121a2.9 2.9 0 0 0-.884 2.122q0 1.237.884 2.12.884.885 2.121.885t2.122-.884l2.121-2.121q.3-.3.707-.3t.707.3.3.707q0 .405-.3.707zm-1.414-4.243q-.3.3-.707.301a.97.97 0 0 1-.707-.3q-.3-.3-.301-.708 0-.405.3-.707l4.243-4.242q.3-.3.707-.3t.707.3.3.707-.3.707zm6.364-.707q-.3.3-.707.3a.97.97 0 0 1-.707-.3q-.3-.3-.301-.707 0-.405.3-.707l2.122-2.121q.884-.885.884-2.121 0-1.238-.884-2.122a2.9 2.9 0 0 0-2.121-.884q-1.237 0-2.122.884l-2.121 2.122q-.3.3-.707.3a.97.97 0 0 1-.707-.3q-.3-.3-.3-.708 0-.405.3-.707L12 4.93q1.467-1.467 3.536-1.467t3.535 1.467 1.467 3.536T19.071 12z"
+                            />
+                          </svg>
+                        </button>
                       </div>
                       <div
                         aria-autocomplete="list"
                         aria-disabled="false"
                         aria-haspopup="listbox"
-                        aria-label="Send a message…"
+                        aria-label="Send an unencrypted message…"
                         aria-multiline="true"
                         class="mx_BasicMessageComposer_input mx_BasicMessageComposer_input_shouldShowPillAvatar mx_BasicMessageComposer_inputEmpty"
                         contenteditable="true"
                         data-testid="basicmessagecomposer"
                         dir="auto"
                         role="textbox"
-                        style="--placeholder: 'Send\\ a\\ message…';"
+                        style="--placeholder: 'Send\\ an\\ unencrypted\\ message…';"
                         tabindex="0"
                         translate="no"
                       >
@@ -2275,22 +3709,61 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
                   >
                     <div
                       aria-label="Emoji"
-                      class="mx_AccessibleButton mx_EmojiButton mx_MessageComposer_button mx_EmojiButton_icon"
+                      class="mx_AccessibleButton mx_EmojiButton mx_MessageComposer_button"
                       role="button"
                       tabindex="0"
-                    />
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M15.536 15.536a1 1 0 0 0-1.415-1.415 3 3 0 0 1-2.12.879 3 3 0 0 1-2.122-.879 1 1 0 1 0-1.414 1.415A5 5 0 0 0 12 17c1.38 0 2.632-.56 3.536-1.464M10 10.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m5.5 1.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3"
+                        />
+                        <path
+                          d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10m-2 0a8 8 0 1 0-16 0 8 8 0 0 0 16 0"
+                        />
+                      </svg>
+                    </div>
                     <div
                       aria-label="Attachment"
-                      class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_upload"
+                      class="mx_AccessibleButton mx_MessageComposer_button"
                       role="button"
                       tabindex="0"
-                    />
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
+                        />
+                      </svg>
+                    </div>
                     <div
                       aria-label="More options"
                       class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_buttonMenu"
                       role="button"
                       tabindex="0"
-                    />
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+                        />
+                      </svg>
+                    </div>
                     <input
                       multiple=""
                       style="display: none;"
diff --git a/test/unit-tests/components/structures/__snapshots__/SpaceHierarchy-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/SpaceHierarchy-test.tsx.snap
index 0a64ec5f61..fac0319a1a 100644
--- a/test/unit-tests/components/structures/__snapshots__/SpaceHierarchy-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/SpaceHierarchy-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
 <DocumentFragment>
@@ -17,7 +17,19 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
       class="mx_AccessibleButton mx_SearchBox_closeButton"
       role="button"
       tabindex="-1"
-    />
+    >
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
+        />
+      </svg>
+    </div>
   </div>
   <div
     class="mx_SpaceHierarchy_listHeader"
@@ -58,7 +70,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
     role="tree"
   >
     <li
-      aria-labelledby="«r8»"
+      aria-labelledby="_r_8_"
       class="mx_SpaceHierarchy_roomTileWrapper"
       role="treeitem"
     >
@@ -74,7 +86,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
             class="mx_SpaceHierarchy_roomTile_avatar"
           >
             <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+              class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
               data-color="5"
               data-testid="avatar-img"
               data-type="round"
@@ -88,7 +100,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
             class="mx_SpaceHierarchy_roomTile_name"
           >
             <span
-              id="«r8»"
+              id="_r_8_"
             >
               Unnamed Room
             </span>
@@ -119,18 +131,18 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
                 class="_inline-field-control_19upo_44"
               >
                 <div
-                  class="_container_1hel1_10"
+                  class="_container_1md5v_10"
                 >
                   <input
-                    aria-labelledby="«r8»"
-                    class="_input_1hel1_18"
+                    aria-labelledby="_r_8_"
+                    class="_input_1md5v_18"
                     id="checkbox_MwbPDmfGtm"
                     role="presentation"
                     tabindex="-1"
                     type="checkbox"
                   />
                   <div
-                    class="_ui_1hel1_19"
+                    class="_ui_1md5v_19"
                   >
                     <svg
                       aria-hidden="true"
@@ -156,7 +168,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
       </div>
     </li>
     <li
-      aria-labelledby="«rc»"
+      aria-labelledby="_r_c_"
       class="mx_SpaceHierarchy_roomTileWrapper"
       role="treeitem"
     >
@@ -172,7 +184,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
             class="mx_SpaceHierarchy_roomTile_avatar"
           >
             <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+              class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
               data-color="6"
               data-testid="avatar-img"
               data-type="round"
@@ -186,7 +198,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
             class="mx_SpaceHierarchy_roomTile_name"
           >
             <span
-              id="«rc»"
+              id="_r_c_"
             >
               Unnamed Room
             </span>
@@ -217,116 +229,18 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
                 class="_inline-field-control_19upo_44"
               >
                 <div
-                  class="_container_1hel1_10"
+                  class="_container_1md5v_10"
                 >
                   <input
-                    aria-labelledby="«rc»"
-                    class="_input_1hel1_18"
+                    aria-labelledby="_r_c_"
+                    class="_input_1md5v_18"
                     id="checkbox_GQvdMWe954"
                     role="presentation"
                     tabindex="-1"
                     type="checkbox"
                   />
                   <div
-                    class="_ui_1hel1_19"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      fill="currentColor"
-                      height="1em"
-                      viewBox="0 0 24 24"
-                      width="1em"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="_inline-field-body_19upo_38"
-              />
-            </div>
-          </form>
-        </div>
-      </div>
-    </li>
-    <li
-      aria-labelledby="«rg»"
-      class="mx_SpaceHierarchy_roomTileWrapper"
-      role="treeitem"
-    >
-      <div
-        class="mx_AccessibleButton mx_SpaceHierarchy_roomTile"
-        role="button"
-        tabindex="-1"
-      >
-        <div
-          class="mx_SpaceHierarchy_roomTile_item"
-        >
-          <div
-            class="mx_SpaceHierarchy_roomTile_avatar"
-          >
-            <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-              data-color="6"
-              data-testid="avatar-img"
-              data-type="round"
-              role="presentation"
-              style="--cpd-avatar-size: 20px;"
-            >
-              K
-            </span>
-          </div>
-          <div
-            class="mx_SpaceHierarchy_roomTile_name"
-          >
-            <span
-              id="«rg»"
-            >
-              Knock room
-            </span>
-          </div>
-          <div
-            class="mx_SpaceHierarchy_roomTile_info"
-          >
-            3 members
-          </div>
-        </div>
-        <div
-          class="mx_SpaceHierarchy_actions"
-        >
-          <div
-            class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_outline"
-            role="button"
-            tabindex="-1"
-          >
-            View
-          </div>
-          <form
-            class="_root_19upo_16"
-          >
-            <div
-              class="_inline-field_19upo_32"
-            >
-              <div
-                class="_inline-field-control_19upo_44"
-              >
-                <div
-                  class="_container_1hel1_10"
-                >
-                  <input
-                    aria-labelledby="«rg»"
-                    class="_input_1hel1_18"
-                    id="checkbox_DVIAu5CsiH"
-                    role="presentation"
-                    tabindex="-1"
-                    type="checkbox"
-                  />
-                  <div
-                    class="_ui_1hel1_19"
+                    class="_ui_1md5v_19"
                   >
                     <svg
                       aria-hidden="true"
@@ -353,7 +267,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
     </li>
     <li
       aria-expanded="true"
-      aria-labelledby="«rk»"
+      aria-labelledby="_r_g_"
       class="mx_SpaceHierarchy_roomTileWrapper"
       role="treeitem"
     >
@@ -369,7 +283,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
             class="mx_SpaceHierarchy_roomTile_avatar"
           >
             <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+              class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
               data-color="2"
               data-testid="avatar-img"
               data-type="round"
@@ -383,7 +297,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
             class="mx_SpaceHierarchy_roomTile_name"
           >
             <span
-              id="«rk»"
+              id="_r_g_"
             >
               Nested space
             </span>
@@ -414,18 +328,18 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
                 class="_inline-field-control_19upo_44"
               >
                 <div
-                  class="_container_1hel1_10"
+                  class="_container_1md5v_10"
                 >
                   <input
-                    aria-labelledby="«rk»"
-                    class="_input_1hel1_18"
-                    id="checkbox_RD7nyrA2oh"
+                    aria-labelledby="_r_g_"
+                    class="_input_1md5v_18"
+                    id="checkbox_DVIAu5CsiH"
                     role="presentation"
                     tabindex="-1"
                     type="checkbox"
                   />
                   <div
-                    class="_ui_1hel1_19"
+                    class="_ui_1md5v_19"
                   >
                     <svg
                       aria-hidden="true"
@@ -450,7 +364,19 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
         </div>
         <div
           class="mx_SpaceHierarchy_subspace_toggle mx_SpaceHierarchy_subspace_toggle_shown"
-        />
+        >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+            />
+          </svg>
+        </div>
       </div>
       <div
         class="mx_SpaceHierarchy_subspace_children"
@@ -458,7 +384,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
       />
     </li>
     <li
-      aria-labelledby="«ro»"
+      aria-labelledby="_r_k_"
       class="mx_SpaceHierarchy_roomTileWrapper"
       role="treeitem"
     >
@@ -474,7 +400,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
             class="mx_SpaceHierarchy_roomTile_avatar"
           >
             <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+              class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
               data-color="2"
               data-testid="avatar-img"
               data-type="round"
@@ -488,7 +414,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
             class="mx_SpaceHierarchy_roomTile_name"
           >
             <span
-              id="«ro»"
+              id="_r_k_"
             >
               Nested room
             </span>
@@ -510,7 +436,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
             Join
           </div>
           <span
-            aria-labelledby="«rp»"
+            aria-labelledby="_r_l_"
             tabindex="0"
           >
             <form
@@ -523,19 +449,19 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
                   class="_inline-field-control_19upo_44"
                 >
                   <div
-                    class="_container_1hel1_10"
+                    class="_container_1md5v_10"
                   >
                     <input
-                      aria-labelledby="«ro»"
-                      class="_input_1hel1_18"
+                      aria-labelledby="_r_k_"
+                      class="_input_1md5v_18"
                       disabled=""
-                      id="checkbox_jWVJIPauy1"
+                      id="checkbox_RD7nyrA2oh"
                       role="presentation"
                       tabindex="-1"
                       type="checkbox"
                     />
                     <div
-                      class="_ui_1hel1_19"
+                      class="_ui_1md5v_19"
                     >
                       <svg
                         aria-hidden="true"
@@ -561,6 +487,491 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
         </div>
       </div>
     </li>
+    <li
+      aria-labelledby="_r_t_"
+      class="mx_SpaceHierarchy_roomTileWrapper"
+      role="treeitem"
+    >
+      <div
+        class="mx_AccessibleButton mx_SpaceHierarchy_roomTile"
+        role="button"
+        tabindex="-1"
+      >
+        <div
+          class="mx_SpaceHierarchy_roomTile_item"
+        >
+          <div
+            class="mx_SpaceHierarchy_roomTile_avatar"
+          >
+            <span
+              class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
+              data-color="6"
+              data-testid="avatar-img"
+              data-type="round"
+              role="presentation"
+              style="--cpd-avatar-size: 20px;"
+            >
+              K
+            </span>
+          </div>
+          <div
+            class="mx_SpaceHierarchy_roomTile_name"
+          >
+            <span
+              id="_r_t_"
+            >
+              Knock room
+            </span>
+          </div>
+          <div
+            class="mx_SpaceHierarchy_roomTile_info"
+          >
+            3 members
+          </div>
+        </div>
+        <div
+          class="mx_SpaceHierarchy_actions"
+        >
+          <div
+            class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_outline"
+            role="button"
+            tabindex="-1"
+          >
+            View
+          </div>
+          <form
+            class="_root_19upo_16"
+          >
+            <div
+              class="_inline-field_19upo_32"
+            >
+              <div
+                class="_inline-field-control_19upo_44"
+              >
+                <div
+                  class="_container_1md5v_10"
+                >
+                  <input
+                    aria-labelledby="_r_t_"
+                    class="_input_1md5v_18"
+                    id="checkbox_jWVJIPauy1"
+                    role="presentation"
+                    tabindex="-1"
+                    type="checkbox"
+                  />
+                  <div
+                    class="_ui_1md5v_19"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                      />
+                    </svg>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="_inline-field-body_19upo_38"
+              />
+            </div>
+          </form>
+        </div>
+      </div>
+    </li>
+  </ul>
+</DocumentFragment>
+`;
+
+exports[`SpaceHierarchy <SpaceHierarchy /> should not render cycles 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_SearchBox mx_textinput"
+  >
+    <input
+      autocomplete="off"
+      class="mx_textinput_icon mx_textinput_search mx_SpaceHierarchy_search mx_textinput_icon mx_textinput_search"
+      data-testid="searchbox-input"
+      placeholder="Search names and descriptions"
+      type="text"
+      value=""
+    />
+    <div
+      class="mx_AccessibleButton mx_SearchBox_closeButton"
+      role="button"
+      tabindex="-1"
+    >
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
+        />
+      </svg>
+    </div>
+  </div>
+  <div
+    class="mx_SpaceHierarchy_listHeader"
+  >
+    <h4
+      class="mx_SpaceHierarchy_listHeader_header"
+    >
+      Rooms and spaces
+    </h4>
+    <div
+      class="mx_SpaceHierarchy_listHeader_buttons"
+    >
+      <div
+        aria-disabled="true"
+        aria-label="Remove"
+        class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger_outline mx_AccessibleButton_disabled"
+        disabled=""
+        role="button"
+        tabindex="0"
+      >
+        Remove
+      </div>
+      <div
+        aria-disabled="true"
+        aria-label="Mark as not suggested"
+        class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_outline mx_AccessibleButton_disabled"
+        disabled=""
+        role="button"
+        tabindex="0"
+      >
+        Mark as not suggested
+      </div>
+    </div>
+  </div>
+  <ul
+    aria-label="Space"
+    class="mx_SpaceHierarchy_list"
+    role="tree"
+  >
+    <li
+      aria-labelledby="_r_3i_"
+      class="mx_SpaceHierarchy_roomTileWrapper"
+      role="treeitem"
+    >
+      <div
+        class="mx_AccessibleButton mx_SpaceHierarchy_roomTile"
+        role="button"
+        tabindex="0"
+      >
+        <div
+          class="mx_SpaceHierarchy_roomTile_item"
+        >
+          <div
+            class="mx_SpaceHierarchy_roomTile_avatar"
+          >
+            <span
+              class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
+              data-color="5"
+              data-testid="avatar-img"
+              data-type="round"
+              role="presentation"
+              style="--cpd-avatar-size: 20px;"
+            >
+              U
+            </span>
+          </div>
+          <div
+            class="mx_SpaceHierarchy_roomTile_name"
+          >
+            <span
+              id="_r_3i_"
+            >
+              Unnamed Room
+            </span>
+          </div>
+          <div
+            class="mx_SpaceHierarchy_roomTile_info"
+          >
+            2 members
+          </div>
+        </div>
+        <div
+          class="mx_SpaceHierarchy_actions"
+        >
+          <div
+            class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
+            role="button"
+            tabindex="0"
+          >
+            Join
+          </div>
+          <form
+            class="_root_19upo_16"
+          >
+            <div
+              class="_inline-field_19upo_32"
+            >
+              <div
+                class="_inline-field-control_19upo_44"
+              >
+                <div
+                  class="_container_1md5v_10"
+                >
+                  <input
+                    aria-labelledby="_r_3i_"
+                    class="_input_1md5v_18"
+                    id="checkbox_EetmBG4yVC"
+                    role="presentation"
+                    tabindex="-1"
+                    type="checkbox"
+                  />
+                  <div
+                    class="_ui_1md5v_19"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                      />
+                    </svg>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="_inline-field-body_19upo_38"
+              />
+            </div>
+          </form>
+        </div>
+      </div>
+    </li>
+    <li
+      aria-labelledby="_r_3m_"
+      class="mx_SpaceHierarchy_roomTileWrapper"
+      role="treeitem"
+    >
+      <div
+        class="mx_AccessibleButton mx_SpaceHierarchy_roomTile"
+        role="button"
+        tabindex="-1"
+      >
+        <div
+          class="mx_SpaceHierarchy_roomTile_item"
+        >
+          <div
+            class="mx_SpaceHierarchy_roomTile_avatar"
+          >
+            <span
+              class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
+              data-color="6"
+              data-testid="avatar-img"
+              data-type="round"
+              role="presentation"
+              style="--cpd-avatar-size: 20px;"
+            >
+              U
+            </span>
+          </div>
+          <div
+            class="mx_SpaceHierarchy_roomTile_name"
+          >
+            <span
+              id="_r_3m_"
+            >
+              Unnamed Room
+            </span>
+          </div>
+          <div
+            class="mx_SpaceHierarchy_roomTile_info"
+          >
+            3 members
+          </div>
+        </div>
+        <div
+          class="mx_SpaceHierarchy_actions"
+        >
+          <div
+            class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
+            role="button"
+            tabindex="-1"
+          >
+            Join
+          </div>
+          <form
+            class="_root_19upo_16"
+          >
+            <div
+              class="_inline-field_19upo_32"
+            >
+              <div
+                class="_inline-field-control_19upo_44"
+              >
+                <div
+                  class="_container_1md5v_10"
+                >
+                  <input
+                    aria-labelledby="_r_3m_"
+                    class="_input_1md5v_18"
+                    id="checkbox_eEefiPqpMR"
+                    role="presentation"
+                    tabindex="-1"
+                    type="checkbox"
+                  />
+                  <div
+                    class="_ui_1md5v_19"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                      />
+                    </svg>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="_inline-field-body_19upo_38"
+              />
+            </div>
+          </form>
+        </div>
+      </div>
+    </li>
+    <li
+      aria-expanded="true"
+      aria-labelledby="_r_3q_"
+      class="mx_SpaceHierarchy_roomTileWrapper"
+      role="treeitem"
+    >
+      <div
+        class="mx_AccessibleButton mx_SpaceHierarchy_roomTile mx_SpaceHierarchy_subspace"
+        role="button"
+        tabindex="-1"
+      >
+        <div
+          class="mx_SpaceHierarchy_roomTile_item"
+        >
+          <div
+            class="mx_SpaceHierarchy_roomTile_avatar"
+          >
+            <span
+              class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
+              data-color="2"
+              data-testid="avatar-img"
+              data-type="round"
+              role="presentation"
+              style="--cpd-avatar-size: 20px;"
+            >
+              N
+            </span>
+          </div>
+          <div
+            class="mx_SpaceHierarchy_roomTile_name"
+          >
+            <span
+              id="_r_3q_"
+            >
+              Nested space
+            </span>
+          </div>
+          <div
+            class="mx_SpaceHierarchy_roomTile_info"
+          >
+            1 member · 0 rooms
+          </div>
+        </div>
+        <div
+          class="mx_SpaceHierarchy_actions"
+        >
+          <div
+            class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
+            role="button"
+            tabindex="-1"
+          >
+            Join
+          </div>
+          <form
+            class="_root_19upo_16"
+          >
+            <div
+              class="_inline-field_19upo_32"
+            >
+              <div
+                class="_inline-field-control_19upo_44"
+              >
+                <div
+                  class="_container_1md5v_10"
+                >
+                  <input
+                    aria-labelledby="_r_3q_"
+                    class="_input_1md5v_18"
+                    id="checkbox_MwbPDmfGtm"
+                    role="presentation"
+                    tabindex="-1"
+                    type="checkbox"
+                  />
+                  <div
+                    class="_ui_1md5v_19"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                      />
+                    </svg>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="_inline-field-body_19upo_38"
+              />
+            </div>
+          </form>
+        </div>
+        <div
+          class="mx_SpaceHierarchy_subspace_toggle mx_SpaceHierarchy_subspace_toggle_shown"
+        >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+            />
+          </svg>
+        </div>
+      </div>
+      <div
+        class="mx_SpaceHierarchy_subspace_children"
+        role="group"
+      />
+    </li>
   </ul>
 </DocumentFragment>
 `;
diff --git a/test/unit-tests/components/structures/__snapshots__/TabbedView-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/TabbedView-test.tsx.snap
index 540cfd233a..cc3998f79b 100644
--- a/test/unit-tests/components/structures/__snapshots__/TabbedView-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/TabbedView-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<TabbedView /> renders tabs 1`] = `
 <div>
@@ -18,9 +18,17 @@ exports[`<TabbedView /> renders tabs 1`] = `
         role="tab"
         tabindex="0"
       >
-        <span
-          class="mx_TabbedView_maskedIcon general"
-        />
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12.731 2C13.432 2 14 2.568 14 3.269c0 .578.396 1.074.935 1.286q.128.052.253.106c.531.23 1.162.16 1.572-.25a1.27 1.27 0 0 1 1.794 0l1.034 1.035a1.27 1.27 0 0 1 0 1.794c-.41.41-.48 1.04-.248 1.572l.105.253c.212.539.708.935 1.286.935.701 0 1.269.568 1.269 1.269v1.462c0 .701-.568 1.269-1.269 1.269-.578 0-1.074.396-1.287.935q-.05.128-.104.253c-.232.531-.161 1.162.248 1.572a1.27 1.27 0 0 1 0 1.794l-1.034 1.034a1.27 1.27 0 0 1-1.794 0c-.41-.41-1.04-.48-1.572-.248a8 8 0 0 1-.253.105c-.539.212-.935.708-.935 1.286 0 .701-.568 1.269-1.269 1.269H11.27c-.702 0-1.27-.568-1.27-1.269 0-.578-.396-1.074-.935-1.287a8 8 0 0 1-.253-.104c-.531-.232-1.162-.161-1.572.248a1.27 1.27 0 0 1-1.794 0l-1.034-1.034a1.27 1.27 0 0 1 0-1.794c.41-.41.48-1.04.249-1.572a8 8 0 0 1-.106-.253C4.343 14.396 3.847 14 3.27 14 2.568 14 2 13.432 2 12.731V11.27c0-.702.568-1.27 1.269-1.27.578 0 1.074-.396 1.286-.935q.052-.128.106-.253c.23-.531.16-1.162-.25-1.572a1.27 1.27 0 0 1 0-1.794l1.035-1.034a1.27 1.27 0 0 1 1.794 0c.41.41 1.04.48 1.572.249a8 8 0 0 1 .253-.106c.539-.212.935-.708.935-1.286C10 2.568 10.568 2 11.269 2zM12 16a4 4 0 1 0 0-8 4 4 0 0 0 0 8"
+          />
+        </svg>
         <span
           class="mx_TabbedView_tabLabel_text"
           id="mx_tabpanel_GENERAL_label"
@@ -36,9 +44,25 @@ exports[`<TabbedView /> renders tabs 1`] = `
         role="tab"
         tabindex="-1"
       >
-        <span
-          class="mx_TabbedView_maskedIcon labs"
-        />
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12 5a1 1 0 0 1-1-1V3a1 1 0 1 1 2 0v1a1 1 0 0 1-1 1m-7.071-.071a1 1 0 0 1 1.414 0l.707.707A1 1 0 0 1 5.636 7.05l-.707-.707a1 1 0 0 1 0-1.414"
+          />
+          <path
+            clip-rule="evenodd"
+            d="M15.734 15.325C15.316 15.795 15 16.371 15 17v2a2 2 0 0 1-2 2h-2a2 2 0 0 1-2-2v-2c0-.63-.316-1.205-.734-1.675a5 5 0 1 1 7.468 0m-1.493-1.33a3 3 0 1 0-4.482 0c.433.486.894 1.166 1.112 2.005h2.258c.218-.84.679-1.52 1.112-2.005M13 18h-2v1h2z"
+            fill-rule="evenodd"
+          />
+          <path
+            d="M2 12a1 1 0 0 1 1-1h1a1 1 0 1 1 0 2H3a1 1 0 0 1-1-1m18-1a1 1 0 1 0 0 2h1a1 1 0 1 0 0-2zm-3.05-5.364a1 1 0 0 0 1.414 1.414l.707-.707a1 1 0 0 0-1.414-1.414z"
+          />
+        </svg>
         <span
           class="mx_TabbedView_tabLabel_text"
           id="mx_tabpanel_LABS_label"
@@ -54,9 +78,17 @@ exports[`<TabbedView /> renders tabs 1`] = `
         role="tab"
         tabindex="-1"
       >
-        <span
-          class="mx_TabbedView_maskedIcon appearance"
-        />
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12 16q1.875 0 3.188-1.312Q16.5 13.375 16.5 11.5t-1.312-3.187T12 7 8.813 8.313 7.5 11.5t1.313 3.188T12 16m0-1.8q-1.125 0-1.912-.787A2.6 2.6 0 0 1 9.3 11.5q0-1.125.787-1.912A2.6 2.6 0 0 1 12 8.8q1.125 0 1.912.787.788.788.788 1.913t-.787 1.912A2.6 2.6 0 0 1 12 14.2m0 4.8q-3.475 0-6.35-1.837Q2.775 15.324 1.3 12.2a.8.8 0 0 1-.1-.312 3 3 0 0 1 0-.775.8.8 0 0 1 .1-.313q1.475-3.125 4.35-4.962Q8.525 4 12 4t6.35 1.838T22.7 10.8a.8.8 0 0 1 .1.313 3 3 0 0 1 0 .774.8.8 0 0 1-.1.313q-1.475 3.125-4.35 4.963Q15.475 19 12 19m0-2a9.54 9.54 0 0 0 5.188-1.488A9.77 9.77 0 0 0 20.8 11.5a9.77 9.77 0 0 0-3.613-4.012A9.54 9.54 0 0 0 12 6a9.55 9.55 0 0 0-5.187 1.487A9.77 9.77 0 0 0 3.2 11.5a9.77 9.77 0 0 0 3.613 4.012A9.54 9.54 0 0 0 12 17"
+          />
+        </svg>
         <span
           class="mx_TabbedView_tabLabel_text"
           id="mx_tabpanel_APPEARANCE_label"
diff --git a/test/unit-tests/components/structures/__snapshots__/ThreadPanel-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/ThreadPanel-test.tsx.snap
index 41b789d831..84ee81bdd5 100644
--- a/test/unit-tests/components/structures/__snapshots__/ThreadPanel-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/ThreadPanel-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`ThreadPanel Header expect that All filter for ThreadPanelHeader properly renders Show: All threads 1`] = `
 <DocumentFragment>
@@ -6,14 +6,15 @@ exports[`ThreadPanel Header expect that All filter for ThreadPanelHeader properl
     class="mx_ThreadPanelHeader"
   >
     <button
-      aria-labelledby="«r0»"
-      class="_icon-button_m2erp_8"
+      aria-labelledby="_r_0_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
       role="button"
       style="--cpd-icon-button-size: 28px;"
       tabindex="0"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <div
@@ -33,6 +34,17 @@ exports[`ThreadPanel Header expect that All filter for ThreadPanelHeader properl
       tabindex="0"
     >
       Show: All threads
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+        />
+      </svg>
     </div>
   </div>
 </DocumentFragment>
@@ -44,14 +56,15 @@ exports[`ThreadPanel Header expect that My filter for ThreadPanelHeader properly
     class="mx_ThreadPanelHeader"
   >
     <button
-      aria-labelledby="«r6»"
-      class="_icon-button_m2erp_8"
+      aria-labelledby="_r_6_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
       role="button"
       style="--cpd-icon-button-size: 28px;"
       tabindex="0"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <div
@@ -71,6 +84,17 @@ exports[`ThreadPanel Header expect that My filter for ThreadPanelHeader properly
       tabindex="0"
     >
       Show: My threads
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+        />
+      </svg>
     </div>
   </div>
 </DocumentFragment>
@@ -83,6 +107,17 @@ exports[`ThreadPanel Header expect that ThreadPanelHeader has the correct option
   role="menuitemradio"
   tabindex="0"
 >
+  <svg
+    fill="currentColor"
+    height="1em"
+    viewBox="0 0 24 24"
+    width="1em"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+    />
+  </svg>
   <span>
     All threads
   </span>
diff --git a/test/unit-tests/components/structures/auth/CompleteSecurity-test.tsx b/test/unit-tests/components/structures/auth/CompleteSecurity-test.tsx
index c5efd81f0d..95024c6113 100644
--- a/test/unit-tests/components/structures/auth/CompleteSecurity-test.tsx
+++ b/test/unit-tests/components/structures/auth/CompleteSecurity-test.tsx
@@ -83,13 +83,66 @@ describe("CompleteSecurity", () => {
         jest.spyOn(SetupEncryptionStore, "sharedInstance").mockReturnValue(store);
         const panel = await act(() => render(<CompleteSecurity onFinished={() => {}} />));
 
+        // No recovery methods are available, so only the "Can't confirm?" button should be visible
+        expect(screen.queryByRole("button", { name: "Can't confirm?" })).toBeInTheDocument();
+        expect(screen.queryByRole("button", { name: "Use another device" })).not.toBeInTheDocument();
+        expect(screen.queryByRole("button", { name: "Use recovery key" })).not.toBeInTheDocument();
+
         // When we hit reset
-        await act(async () => panel.getByRole("button", { name: "Proceed with reset" }).click());
+        await act(async () => panel.getByRole("button", { name: "Can't confirm?" }).click());
 
         // Then the reset identity dialog appears
+        expect(screen.getByRole("heading", { name: "You need to reset your identity" })).toBeInTheDocument();
+        expect(panel.getByRole("button", { name: "Continue" })).toBeInTheDocument();
+    });
+
+    it("Allows verifying with another device if one is available", async () => {
+        // Given a store and a dialog based on it
+        const store = new SetupEncryptionStore();
+        jest.spyOn(store, "fetchKeyInfo").mockImplementation(async () => {
+            store.hasDevicesToVerifyAgainst = true;
+            store.phase = Phase.Intro;
+            store.emit("update");
+        });
+        jest.spyOn(SetupEncryptionStore, "sharedInstance").mockReturnValue(store);
+        const panel = await act(() => render(<CompleteSecurity onFinished={() => {}} />));
+
+        // The snapshot should have "Use another device" and "Can't confirm?"
+        // buttons, but no "Use recovery key".
+        expect(panel.asFragment()).toMatchSnapshot();
+
+        // When we hit reset
+        await act(async () => panel.getByRole("button", { name: "Can't confirm?" }).click());
+
+        // Then the reset identity dialog appears, and should have a different
+        // title from when there were no verification methods available.
+        expect(
+            screen.getByRole("heading", { name: "Are you sure you want to reset your identity?" }),
+        ).toBeInTheDocument();
+    });
+
+    it("Allows verifying with recovery key if one is available", async () => {
+        // Given a store and a dialog based on it
+        const store = new SetupEncryptionStore();
+        jest.spyOn(store, "fetchKeyInfo").mockImplementation(async () => {
+            store.keyInfo = {} as any;
+            store.phase = Phase.Intro;
+            store.emit("update");
+        });
+        jest.spyOn(SetupEncryptionStore, "sharedInstance").mockReturnValue(store);
+        const panel = await act(() => render(<CompleteSecurity onFinished={() => {}} />));
+
+        // The snapshot should have "Use recovery key" and "Can't confirm?"
+        // buttons, but no "Use another device".
+        expect(panel.asFragment()).toMatchSnapshot();
+
+        // When we hit reset
+        await act(async () => panel.getByRole("button", { name: "Can't confirm?" }).click());
+
+        // Then the reset identity dialog appears, and should have a different
+        // title from when there were no verification methods available.
         expect(
             screen.getByRole("heading", { name: "Are you sure you want to reset your identity?" }),
         ).toBeInTheDocument();
-        expect(panel.getByRole("button", { name: "Continue" })).toBeInTheDocument();
     });
 });
diff --git a/test/unit-tests/components/structures/auth/E2eSetup-test.tsx b/test/unit-tests/components/structures/auth/E2eSetup-test.tsx
new file mode 100644
index 0000000000..4e52a7f7ac
--- /dev/null
+++ b/test/unit-tests/components/structures/auth/E2eSetup-test.tsx
@@ -0,0 +1,35 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { render } from "jest-matrix-react";
+import { mocked } from "jest-mock";
+
+import E2eSetup from "../../../../../src/components/structures/auth/E2eSetup.tsx";
+import { InitialCryptoSetupStore } from "../../../../../src/stores/InitialCryptoSetupStore.ts";
+
+afterEach(() => jest.restoreAllMocks());
+
+describe("LeftPanel", () => {
+    it("should call `onCancelled` when the user clicks the cancel button", () => {
+        const mockInitialCryptoSetupStore = {
+            getStatus: jest.fn(),
+            on: jest.fn(),
+            off: jest.fn(),
+        };
+        jest.spyOn(InitialCryptoSetupStore, "sharedInstance").mockReturnValue(mockInitialCryptoSetupStore as any);
+
+        // We need the setup process to have failed, for the dialog to present a cancel button.
+        mocked(mockInitialCryptoSetupStore.getStatus).mockReturnValue("error");
+
+        const onCancelled = jest.fn();
+        const { getByRole } = render(<E2eSetup onCancelled={onCancelled} />);
+
+        getByRole("button", { name: "Cancel" }).click();
+        expect(onCancelled).toHaveBeenCalled();
+    });
+});
diff --git a/test/unit-tests/components/structures/auth/__snapshots__/CompleteSecurity-test.tsx.snap b/test/unit-tests/components/structures/auth/__snapshots__/CompleteSecurity-test.tsx.snap
new file mode 100644
index 0000000000..9606947f16
--- /dev/null
+++ b/test/unit-tests/components/structures/auth/__snapshots__/CompleteSecurity-test.tsx.snap
@@ -0,0 +1,350 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`CompleteSecurity Allows verifying with another device if one is available 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_AuthPage"
+  >
+    <div
+      class="mx_AuthPage_modal"
+      style="position: relative;"
+    >
+      <main
+        aria-live="polite"
+        class="mx_AuthPage_modalContent"
+        style="display: flex; z-index: 1; border-radius: inherit;"
+        tabindex="-1"
+      >
+        <div
+          class="mx_Dialog_border _glass_sepwu_8"
+        >
+          <div
+            class="mx_CompleteSecurityBody"
+          >
+            <h1
+              class="mx_CompleteSecurity_header"
+            >
+              <div
+                aria-label="Skip verification for now"
+                class="mx_AccessibleButton mx_CompleteSecurity_skip"
+                role="button"
+                tabindex="0"
+              />
+            </h1>
+            <div
+              class="mx_CompleteSecurity_body"
+            >
+              <div
+                class="mx_EncryptionCard mx_EncryptionCard_noBorder mx_SetupEncryptionBody"
+              >
+                <div
+                  class="mx_EncryptionCard_header"
+                >
+                  <div
+                    class="_content_1r8kr_8"
+                    data-size="large"
+                  >
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M6 22q-.824 0-1.412-.587A1.93 1.93 0 0 1 4 20V10q0-.825.588-1.412A1.93 1.93 0 0 1 6 8h1V6q0-2.075 1.463-3.537Q9.926 1 12 1q2.075 0 3.537 1.463Q17 3.925 17 6v2h1q.824 0 1.413.588Q20 9.175 20 10v10q0 .824-.587 1.413A1.93 1.93 0 0 1 18 22zM9 8h6V6q0-1.25-.875-2.125A2.9 2.9 0 0 0 12 3q-1.25 0-2.125.875A2.9 2.9 0 0 0 9 6z"
+                      />
+                    </svg>
+                  </div>
+                  <h2
+                    class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93"
+                  >
+                    Confirm your identity
+                  </h2>
+                </div>
+                <div
+                  class="_flex_4dswl_9 mx_EncryptionCard_emphasisedContent"
+                  style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: normal; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+                >
+                  <span>
+                    Verify this device to set up secure messaging
+                  </span>
+                  <span>
+                    <a
+                      class="mx_ExternalLink"
+                      href="https://element.io/help#encryption-device-verification"
+                      rel="noreferrer noopener"
+                      target="_blank"
+                    >
+                      Learn more
+                      <svg
+                        class="mx_ExternalLink_icon"
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+                        />
+                        <path
+                          d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+                        />
+                      </svg>
+                    </a>
+                  </span>
+                </div>
+                <div
+                  class="mx_EncryptionCard_buttons"
+                >
+                  <button
+                    class="_button_187yx_8"
+                    data-kind="primary"
+                    data-size="lg"
+                    role="button"
+                    tabindex="0"
+                  >
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M3.5 20q-.625 0-1.062-.437A1.45 1.45 0 0 1 2 18.5q0-.625.438-1.062A1.45 1.45 0 0 1 3.5 17H4V6q0-.824.588-1.412A1.93 1.93 0 0 1 6 4h14q.424 0 .712.287Q21 4.576 21 5t-.288.713A.97.97 0 0 1 20 6H6v11h4.5q.624 0 1.063.438.437.437.437 1.062t-.437 1.063A1.45 1.45 0 0 1 10.5 20zM15 20a.97.97 0 0 1-.713-.288A.97.97 0 0 1 14 19V9q0-.424.287-.713A.97.97 0 0 1 15 8h6q.424 0 .712.287Q22 8.576 22 9v10q0 .424-.288.712A.97.97 0 0 1 21 20zm1-3h4v-7h-4z"
+                      />
+                    </svg>
+                     Use another device
+                  </button>
+                  <button
+                    class="_button_187yx_8"
+                    data-kind="secondary"
+                    data-size="lg"
+                    role="button"
+                    tabindex="0"
+                  >
+                    Can't confirm?
+                  </button>
+                  <button
+                    class="_button_187yx_8"
+                    data-kind="tertiary"
+                    data-size="lg"
+                    role="button"
+                    tabindex="0"
+                  >
+                    Sign out
+                  </button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+    </div>
+    <footer
+      class="mx_AuthFooter"
+      role="contentinfo"
+    >
+      <a
+        href="https://element.io/blog"
+        rel="noreferrer noopener"
+        target="_blank"
+      >
+        Blog
+      </a>
+      <a
+        href="https://mastodon.matrix.org/@Element"
+        rel="noreferrer noopener"
+        target="_blank"
+      >
+        Mastodon
+      </a>
+      <a
+        href="https://github.com/element-hq/element-web"
+        rel="noreferrer noopener"
+        target="_blank"
+      >
+        GitHub
+      </a>
+      <a
+        href="https://matrix.org"
+        rel="noreferrer noopener"
+        target="_blank"
+      >
+        Powered by Matrix
+      </a>
+    </footer>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`CompleteSecurity Allows verifying with recovery key if one is available 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_AuthPage"
+  >
+    <div
+      class="mx_AuthPage_modal"
+      style="position: relative;"
+    >
+      <main
+        aria-live="polite"
+        class="mx_AuthPage_modalContent"
+        style="display: flex; z-index: 1; border-radius: inherit;"
+        tabindex="-1"
+      >
+        <div
+          class="mx_Dialog_border _glass_sepwu_8"
+        >
+          <div
+            class="mx_CompleteSecurityBody"
+          >
+            <h1
+              class="mx_CompleteSecurity_header"
+            >
+              <div
+                aria-label="Skip verification for now"
+                class="mx_AccessibleButton mx_CompleteSecurity_skip"
+                role="button"
+                tabindex="0"
+              />
+            </h1>
+            <div
+              class="mx_CompleteSecurity_body"
+            >
+              <div
+                class="mx_EncryptionCard mx_EncryptionCard_noBorder mx_SetupEncryptionBody"
+              >
+                <div
+                  class="mx_EncryptionCard_header"
+                >
+                  <div
+                    class="_content_1r8kr_8"
+                    data-size="large"
+                  >
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M6 22q-.824 0-1.412-.587A1.93 1.93 0 0 1 4 20V10q0-.825.588-1.412A1.93 1.93 0 0 1 6 8h1V6q0-2.075 1.463-3.537Q9.926 1 12 1q2.075 0 3.537 1.463Q17 3.925 17 6v2h1q.824 0 1.413.588Q20 9.175 20 10v10q0 .824-.587 1.413A1.93 1.93 0 0 1 18 22zM9 8h6V6q0-1.25-.875-2.125A2.9 2.9 0 0 0 12 3q-1.25 0-2.125.875A2.9 2.9 0 0 0 9 6z"
+                      />
+                    </svg>
+                  </div>
+                  <h2
+                    class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93"
+                  >
+                    Confirm your identity
+                  </h2>
+                </div>
+                <div
+                  class="_flex_4dswl_9 mx_EncryptionCard_emphasisedContent"
+                  style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: normal; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+                >
+                  <span>
+                    Verify this device to set up secure messaging
+                  </span>
+                  <span>
+                    <a
+                      class="mx_ExternalLink"
+                      href="https://element.io/help#encryption-device-verification"
+                      rel="noreferrer noopener"
+                      target="_blank"
+                    >
+                      Learn more
+                      <svg
+                        class="mx_ExternalLink_icon"
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+                        />
+                        <path
+                          d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+                        />
+                      </svg>
+                    </a>
+                  </span>
+                </div>
+                <div
+                  class="mx_EncryptionCard_buttons"
+                >
+                  <button
+                    class="_button_187yx_8"
+                    data-kind="primary"
+                    data-size="lg"
+                    role="button"
+                    tabindex="0"
+                  >
+                    Use recovery key
+                  </button>
+                  <button
+                    class="_button_187yx_8"
+                    data-kind="secondary"
+                    data-size="lg"
+                    role="button"
+                    tabindex="0"
+                  >
+                    Can't confirm?
+                  </button>
+                  <button
+                    class="_button_187yx_8"
+                    data-kind="tertiary"
+                    data-size="lg"
+                    role="button"
+                    tabindex="0"
+                  >
+                    Sign out
+                  </button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+    </div>
+    <footer
+      class="mx_AuthFooter"
+      role="contentinfo"
+    >
+      <a
+        href="https://element.io/blog"
+        rel="noreferrer noopener"
+        target="_blank"
+      >
+        Blog
+      </a>
+      <a
+        href="https://mastodon.matrix.org/@Element"
+        rel="noreferrer noopener"
+        target="_blank"
+      >
+        Mastodon
+      </a>
+      <a
+        href="https://github.com/element-hq/element-web"
+        rel="noreferrer noopener"
+        target="_blank"
+      >
+        GitHub
+      </a>
+      <a
+        href="https://matrix.org"
+        rel="noreferrer noopener"
+        target="_blank"
+      >
+        Powered by Matrix
+      </a>
+    </footer>
+  </div>
+</DocumentFragment>
+`;
diff --git a/test/unit-tests/components/structures/auth/__snapshots__/LoginSplashView-test.tsx.snap b/test/unit-tests/components/structures/auth/__snapshots__/LoginSplashView-test.tsx.snap
index d26455652c..62aee87218 100644
--- a/test/unit-tests/components/structures/auth/__snapshots__/LoginSplashView-test.tsx.snap
+++ b/test/unit-tests/components/structures/auth/__snapshots__/LoginSplashView-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<LoginSplashView /> Renders a spinner 1`] = `
 <DocumentFragment>
@@ -8,13 +8,24 @@ exports[`<LoginSplashView /> Renders a spinner 1`] = `
     <div
       class="mx_Spinner"
     >
-      <div
+      <svg
         aria-label="Loading…"
-        class="mx_Spinner_icon"
+        class="_icon_11k6c_18"
         data-testid="spinner"
+        fill="currentColor"
+        height="1em"
         role="progressbar"
         style="width: 32px; height: 32px;"
-      />
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          clip-rule="evenodd"
+          d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+          fill-rule="evenodd"
+        />
+      </svg>
     </div>
     <div
       class="mx_LoginSplashView_splashButtons"
@@ -46,13 +57,24 @@ exports[`<LoginSplashView /> Renders an error message 1`] = `
     <div
       class="mx_Spinner"
     >
-      <div
+      <svg
         aria-label="Loading…"
-        class="mx_Spinner_icon"
+        class="_icon_11k6c_18"
         data-testid="spinner"
+        fill="currentColor"
+        height="1em"
         role="progressbar"
         style="width: 32px; height: 32px;"
-      />
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          clip-rule="evenodd"
+          d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+          fill-rule="evenodd"
+        />
+      </svg>
     </div>
     <div
       class="mx_LoginSplashView_splashButtons"
diff --git a/test/unit-tests/components/viewmodels/avatars/RoomAvatarViewModel-test.tsx b/test/unit-tests/components/viewmodels/avatars/RoomAvatarViewModel-test.tsx
index ffaa152a53..d046307d92 100644
--- a/test/unit-tests/components/viewmodels/avatars/RoomAvatarViewModel-test.tsx
+++ b/test/unit-tests/components/viewmodels/avatars/RoomAvatarViewModel-test.tsx
@@ -8,10 +8,14 @@
 import { renderHook, waitFor } from "jest-matrix-react";
 import { JoinRule, type MatrixClient, type Room, RoomMember, User } from "matrix-js-sdk/src/matrix";
 
-import { useRoomAvatarViewModel } from "../../../../../src/components/viewmodels/avatars/RoomAvatarViewModel";
+import {
+    AvatarBadgeDecoration,
+    useRoomAvatarViewModel,
+} from "../../../../../src/components/viewmodels/avatars/RoomAvatarViewModel";
 import { createTestClient, mkStubRoom } from "../../../../test-utils";
 import DMRoomMap from "../../../../../src/utils/DMRoomMap";
 import * as PresenceIndicatorModule from "../../../../../src/components/views/avatars/WithPresenceIndicator";
+import { DefaultTagID } from "../../../../../src/stores/room-list/models";
 
 jest.mock("../../../../../src/utils/room/getJoinedNonFunctionalMembers", () => ({
     getJoinedNonFunctionalMembers: jest.fn().mockReturnValue([]),
@@ -26,41 +30,67 @@ describe("RoomAvatarViewModel", () => {
         room = mkStubRoom("roomId", "roomName", matrixClient);
 
         DMRoomMap.makeShared(matrixClient);
-        jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(null);
+        jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(undefined);
 
         jest.spyOn(PresenceIndicatorModule, "useDmMember").mockReturnValue(null);
         jest.spyOn(PresenceIndicatorModule, "usePresence").mockReturnValue(null);
     });
 
-    it("should has hasDecoration to false", async () => {
+    it("should have badgeDecoration set to LowPriority", () => {
+        room.tags[DefaultTagID.LowPriority] = {};
         const { result: vm } = renderHook(() => useRoomAvatarViewModel(room));
-        expect(vm.current.hasDecoration).toBe(false);
+        expect(vm.current.badgeDecoration).toBe(AvatarBadgeDecoration.LowPriority);
     });
 
-    it("should has isVideoRoom set to true", () => {
+    it("should have badgeDecoration set to VideoRoom", () => {
         jest.spyOn(room, "isCallRoom").mockReturnValue(true);
         const { result: vm } = renderHook(() => useRoomAvatarViewModel(room));
-        expect(vm.current.isVideoRoom).toBe(true);
-        expect(vm.current.hasDecoration).toBe(true);
+        expect(vm.current.badgeDecoration).toBe(AvatarBadgeDecoration.VideoRoom);
     });
 
-    it("should has isPublic set to true", () => {
+    it("should have badgeDecoration set to PublicRoom", () => {
         jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Public);
-
         const { result: vm } = renderHook(() => useRoomAvatarViewModel(room));
-        expect(vm.current.isPublic).toBe(true);
-        expect(vm.current.hasDecoration).toBe(true);
+        expect(vm.current.badgeDecoration).toBe(AvatarBadgeDecoration.PublicRoom);
+    });
+
+    it("should set badgeDecoration based on priority", () => {
+        // 1. Presence has the least priority
+        const user = User.createUser("userId", matrixClient);
+        const roomMember = new RoomMember(room.roomId, "userId");
+        roomMember.user = user;
+        jest.spyOn(PresenceIndicatorModule, "useDmMember").mockReturnValue(roomMember);
+        jest.spyOn(PresenceIndicatorModule, "usePresence").mockReturnValue(PresenceIndicatorModule.Presence.Online);
+
+        const { result: vm1 } = renderHook(() => useRoomAvatarViewModel(room));
+        expect(vm1.current.badgeDecoration).toBe(AvatarBadgeDecoration.Presence);
+
+        // 2. With presence and public room, presence takes precedence
+        jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Public);
+        // Render again, it's easier than mocking the event emitter.
+        const { result: vm, rerender } = renderHook(() => useRoomAvatarViewModel(room));
+        expect(vm.current.badgeDecoration).toBe(AvatarBadgeDecoration.PublicRoom);
+
+        // 3. With presence, public-room and video room, video room takes precedence
+        jest.spyOn(room, "isCallRoom").mockReturnValue(true);
+        rerender(room);
+        expect(vm.current.badgeDecoration).toBe(AvatarBadgeDecoration.VideoRoom);
+
+        // 4. With presence, public room, video room and low priority, low priority takes precedence
+        room.tags[DefaultTagID.LowPriority] = {};
+        rerender(room);
+        expect(vm.current.badgeDecoration).toBe(AvatarBadgeDecoration.LowPriority);
     });
 
     it("should recompute isPublic when room changed", async () => {
         const { result: vm, rerender } = renderHook((props) => useRoomAvatarViewModel(props), { initialProps: room });
-        expect(vm.current.isPublic).toBe(false);
+        expect(vm.current.badgeDecoration).not.toBe(AvatarBadgeDecoration.PublicRoom);
 
         const publicRoom = mkStubRoom("roomId2", "roomName2", matrixClient);
         jest.spyOn(publicRoom, "getJoinRule").mockReturnValue(JoinRule.Public);
         rerender(publicRoom);
 
-        await waitFor(() => expect(vm.current.isPublic).toBe(true));
+        await waitFor(() => expect(vm.current.badgeDecoration).toBe(AvatarBadgeDecoration.PublicRoom));
     });
 
     it("should return presence", async () => {
diff --git a/test/unit-tests/components/viewmodels/composer/HistoryVisibleBannerViewModel-test.tsx b/test/unit-tests/components/viewmodels/composer/HistoryVisibleBannerViewModel-test.tsx
new file mode 100644
index 0000000000..b1ab6ef7ff
--- /dev/null
+++ b/test/unit-tests/components/viewmodels/composer/HistoryVisibleBannerViewModel-test.tsx
@@ -0,0 +1,199 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { Room } from "matrix-js-sdk/src/matrix";
+
+import { SettingLevel } from "../../../../../src/settings/SettingLevel";
+import SettingsStore, { type CallbackFn } from "../../../../../src/settings/SettingsStore";
+import { mkEvent, stubClient, upsertRoomStateEvents } from "../../../../test-utils";
+import { HistoryVisibleBannerViewModel } from "../../../../../src/viewmodels/composer/HistoryVisibleBannerViewModel";
+
+describe("HistoryVisibleBannerViewModel", () => {
+    const ROOM_ID = "!roomId:example.org";
+
+    let room: Room;
+    let watcherCallbacks: CallbackFn[];
+    let acknowledgedHistoryVisibility: boolean;
+
+    beforeEach(() => {
+        watcherCallbacks = [];
+        acknowledgedHistoryVisibility = false;
+
+        jest.spyOn(SettingsStore, "setValue").mockImplementation(async (settingName, roomId, level, value) => {
+            if (settingName === "acknowledgedHistoryVisibility") {
+                acknowledgedHistoryVisibility = value;
+            }
+            watcherCallbacks.forEach((callbackFn) => callbackFn(settingName, roomId, level, value, value));
+        });
+
+        jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName, roomId) => {
+            if (settingName === "acknowledgedHistoryVisibility") {
+                return acknowledgedHistoryVisibility;
+            }
+            if (settingName === "feature_share_history_on_invite") {
+                return true;
+            }
+            return SettingsStore.getDefaultValue(settingName);
+        });
+
+        jest.spyOn(SettingsStore, "watchSetting").mockImplementation((settingName, roomId, callbackFn) => {
+            watcherCallbacks.push(callbackFn);
+            return `mockWatcherId-${settingName}-${roomId}`;
+        });
+
+        stubClient();
+        room = new Room(ROOM_ID, {} as any, "@user:example.org");
+    });
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it("should not show the banner in unencrypted rooms", () => {
+        const vm = new HistoryVisibleBannerViewModel({ room, canSendMessages: true, threadId: null });
+        expect(vm.getSnapshot().visible).toBe(false);
+    });
+
+    it("should not show the banner in encrypted rooms with joined history visibility", () => {
+        upsertRoomStateEvents(room, [
+            mkEvent({
+                event: true,
+                type: "m.room.encryption",
+                user: "@user1:server",
+                content: {},
+            }),
+            mkEvent({
+                event: true,
+                type: "m.room.history_visibility",
+                content: {
+                    history_visibility: "joined",
+                },
+                user: "@user1:server",
+            }),
+        ]);
+
+        const vm = new HistoryVisibleBannerViewModel({ room, canSendMessages: true, threadId: null });
+        expect(vm.getSnapshot().visible).toBe(false);
+    });
+
+    it("should not show the banner if it has been dismissed", async () => {
+        await SettingsStore.setValue("acknowledgedHistoryVisibility", ROOM_ID, SettingLevel.ROOM_ACCOUNT, true);
+        upsertRoomStateEvents(room, [
+            mkEvent({
+                event: true,
+                type: "m.room.encryption",
+                user: "@user1:server",
+                content: {},
+            }),
+            mkEvent({
+                event: true,
+                type: "m.room.history_visibility",
+                user: "@user1:server",
+                content: {
+                    history_visibility: "shared",
+                },
+            }),
+        ]);
+
+        const vm = new HistoryVisibleBannerViewModel({ room, canSendMessages: true, threadId: null });
+        expect(vm.getSnapshot().visible).toBe(false);
+        vm.dispose();
+    });
+
+    it("should not show the banner in threads", () => {
+        upsertRoomStateEvents(room, [
+            mkEvent({
+                event: true,
+                type: "m.room.encryption",
+                user: "@user1:server",
+                content: {},
+            }),
+            mkEvent({
+                event: true,
+                type: "m.room.history_visibility",
+                user: "@user1:server",
+                content: {
+                    history_visibility: "shared",
+                },
+            }),
+        ]);
+
+        const vm = new HistoryVisibleBannerViewModel({ room, canSendMessages: true, threadId: "some thread ID" });
+        expect(vm.getSnapshot().visible).toBe(false);
+        vm.dispose();
+    });
+
+    it("should not show the banner if the user cannot send messages", () => {
+        upsertRoomStateEvents(room, [
+            mkEvent({
+                event: true,
+                type: "m.room.encryption",
+                user: "@user1:server",
+                content: {},
+            }),
+            mkEvent({
+                event: true,
+                type: "m.room.history_visibility",
+                user: "@user1:server",
+                content: {
+                    history_visibility: "shared",
+                },
+            }),
+        ]);
+
+        const vm = new HistoryVisibleBannerViewModel({ room, canSendMessages: false, threadId: null });
+        expect(vm.getSnapshot().visible).toBe(false);
+        vm.dispose();
+    });
+
+    it("should not show the banner if history visibility is `invited`", () => {
+        upsertRoomStateEvents(room, [
+            mkEvent({
+                event: true,
+                type: "m.room.encryption",
+                user: "@user1:server",
+                content: {},
+            }),
+            mkEvent({
+                event: true,
+                type: "m.room.history_visibility",
+                user: "@user1:server",
+                content: {
+                    history_visibility: "invited",
+                },
+            }),
+        ]);
+
+        const vm = new HistoryVisibleBannerViewModel({ room, canSendMessages: true, threadId: null });
+        expect(vm.getSnapshot().visible).toBe(false);
+        vm.dispose();
+    });
+
+    it("should show the banner in encrypted rooms with shared history visibility", async () => {
+        upsertRoomStateEvents(room, [
+            mkEvent({
+                event: true,
+                type: "m.room.encryption",
+                user: "@user1:server",
+                content: {},
+            }),
+            mkEvent({
+                event: true,
+                type: "m.room.history_visibility",
+                user: "@user1:server",
+                content: {
+                    history_visibility: "shared",
+                },
+            }),
+        ]);
+
+        const vm = new HistoryVisibleBannerViewModel({ room, canSendMessages: true, threadId: null });
+        expect(vm.getSnapshot().visible).toBe(true);
+        await vm.onClose();
+        expect(vm.getSnapshot().visible).toBe(false);
+    });
+});
diff --git a/test/unit-tests/components/viewmodels/right_panel/user_info/UserInfoBasicOptionsViewModel-test.tsx b/test/unit-tests/components/viewmodels/right_panel/user_info/UserInfoBasicOptionsViewModel-test.tsx
new file mode 100644
index 0000000000..d3f731e20c
--- /dev/null
+++ b/test/unit-tests/components/viewmodels/right_panel/user_info/UserInfoBasicOptionsViewModel-test.tsx
@@ -0,0 +1,220 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import {
+    EventType,
+    KnownMembership,
+    type MatrixClient,
+    MatrixEvent,
+    type Room,
+    RoomMember,
+    type User,
+} from "matrix-js-sdk/src/matrix";
+import { renderHook, waitFor } from "jest-matrix-react";
+
+import { Action } from "../../../../../../src/dispatcher/actions";
+import Modal from "../../../../../../src/Modal";
+import MultiInviter from "../../../../../../src/utils/MultiInviter";
+import { createTestClient, mkRoom, withClientContextRenderOptions } from "../../../../../test-utils";
+import dis from "../../../../../../src/dispatcher/dispatcher";
+import { useUserInfoBasicOptionsViewModel } from "../../../../../../src/components/viewmodels/right_panel/user_info/UserInfoBasicOptionsViewModel";
+import DMRoomMap from "../../../../../../src/utils/DMRoomMap";
+import ErrorDialog from "../../../../../../src/components/views/dialogs/ErrorDialog";
+
+jest.mock("../../../../../../src/dispatcher/dispatcher");
+
+describe("<UserOptionsSection />", () => {
+    const defaultRoomId = "!fkfk";
+    const defaultUserId = "@user:example.com";
+    const meUserId = "@me:example.com";
+
+    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
+    let defaultProps: { room: Room; member: User | RoomMember };
+    let mockClient: MatrixClient;
+    let room: Room;
+
+    beforeEach(() => {
+        mockClient = createTestClient();
+        room = mkRoom(mockClient, defaultRoomId);
+        defaultProps = {
+            member: defaultMember,
+            room,
+        };
+        DMRoomMap.makeShared(mockClient);
+    });
+
+    const renderUserInfoBasicOptionsViewModelHook = (
+        props: {
+            member: User | RoomMember;
+            room: Room;
+        } = defaultProps,
+    ) => {
+        return renderHook(
+            () => useUserInfoBasicOptionsViewModel(props.room, props.member),
+            withClientContextRenderOptions(mockClient),
+        );
+    };
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        // Mock the current user account id. Which is different to the defaultMember which is the selected one
+        // When we want to mock the current user, needs to override this value
+        jest.spyOn(mockClient, "getUserId").mockReturnValue(meUserId);
+        jest.spyOn(mockClient, "getRoom").mockReturnValue(room);
+    });
+
+    it("should showInviteButton if current user can invite and selected user membership is LEAVE", () => {
+        // cant use mkRoomMember because instanceof check will failed in this case
+        const member: RoomMember = new RoomMember(defaultMember.userId, defaultMember.roomId);
+        const me: RoomMember = new RoomMember(meUserId, defaultMember.roomId);
+
+        console.log("member instanceof RoomMember", member instanceof RoomMember);
+
+        member.powerLevel = 1;
+        member.membership = KnownMembership.Leave;
+        me.powerLevel = 50;
+        me.membership = KnownMembership.Join;
+        const powerLevelEvents = new MatrixEvent({
+            type: EventType.RoomPowerLevels,
+            content: {
+                invite: 50,
+                state_default: 0,
+            },
+        });
+        jest.spyOn(room.currentState, "getStateEvents").mockReturnValue(powerLevelEvents);
+        // used to get the current me user
+        jest.spyOn(room, "getMember").mockReturnValue(me);
+        const { result } = renderUserInfoBasicOptionsViewModelHook({ ...defaultProps, member });
+
+        expect(result.current.showInviteButton).toBeTruthy();
+    });
+
+    it("should not showInviteButton if current cannot invite", () => {
+        const member: RoomMember = new RoomMember(defaultMember.userId, defaultMember.roomId);
+        const me: RoomMember = new RoomMember(meUserId, defaultMember.roomId);
+        member.powerLevel = 50;
+        member.membership = KnownMembership.Leave;
+        me.powerLevel = 0;
+        me.membership = KnownMembership.Join;
+        const powerLevelEvents = new MatrixEvent({
+            type: EventType.RoomPowerLevels,
+            content: {
+                invite: 50,
+                state_default: 0,
+            },
+        });
+        jest.spyOn(room.currentState, "getStateEvents").mockReturnValue(powerLevelEvents);
+        // used to get the current me user
+        jest.spyOn(room, "getMember").mockReturnValue(me);
+        const { result } = renderUserInfoBasicOptionsViewModelHook({ ...defaultProps, member });
+
+        expect(result.current.showInviteButton).toBeFalsy();
+    });
+
+    it("should not showInviteButton if selected user membership is not LEAVE", () => {
+        const member: RoomMember = new RoomMember(defaultMember.userId, defaultMember.roomId);
+        const me: RoomMember = new RoomMember(meUserId, defaultMember.roomId);
+        member.powerLevel = 50;
+        member.membership = KnownMembership.Join;
+        me.powerLevel = 50;
+        me.membership = KnownMembership.Join;
+        const powerLevelEvents = new MatrixEvent({
+            type: EventType.RoomPowerLevels,
+            content: {
+                invite: 50,
+                state_default: 0,
+            },
+        });
+        jest.spyOn(room.currentState, "getStateEvents").mockReturnValue(powerLevelEvents);
+        jest.spyOn(room, "getMember").mockReturnValue(me);
+        const { result } = renderUserInfoBasicOptionsViewModelHook({ ...defaultProps, member });
+
+        expect(result.current.showInviteButton).toBeFalsy();
+    });
+
+    it("should showInsertPillButton if room is not a space", () => {
+        jest.spyOn(room, "isSpaceRoom").mockReturnValue(false);
+        const { result } = renderUserInfoBasicOptionsViewModelHook();
+        expect(result.current.showInsertPillButton).toBeTruthy();
+    });
+
+    it("should not showInsertPillButton if room is a space", () => {
+        jest.spyOn(room, "isSpaceRoom").mockReturnValue(true);
+        const { result } = renderUserInfoBasicOptionsViewModelHook();
+        expect(result.current.showInsertPillButton).toBeFalsy();
+    });
+
+    it("should readReceiptButtonDisabled be true if all messages where read", () => {
+        jest.spyOn(room, "getEventReadUpTo").mockReturnValue(null);
+        const { result } = renderUserInfoBasicOptionsViewModelHook();
+        expect(result.current.readReceiptButtonDisabled).toBeTruthy();
+    });
+
+    it("should readReceiptButtonDisabled be false if some messages are available", () => {
+        jest.spyOn(room, "getEventReadUpTo").mockReturnValue("aneventId");
+        const { result } = renderUserInfoBasicOptionsViewModelHook();
+        expect(result.current.readReceiptButtonDisabled).toBeFalsy();
+    });
+
+    it("should readReceiptButtonDisabled be true if room is a space", () => {
+        jest.spyOn(room, "getEventReadUpTo").mockReturnValue("aneventId");
+        jest.spyOn(room, "isSpaceRoom").mockReturnValue(true);
+        const { result } = renderUserInfoBasicOptionsViewModelHook();
+        expect(result.current.readReceiptButtonDisabled).toBeTruthy();
+    });
+
+    it("firing onReadReceiptButton calls dispatch with correct event_id", () => {
+        const eventId = "aneventId";
+        jest.spyOn(room, "getEventReadUpTo").mockReturnValue(eventId);
+        jest.spyOn(room, "isSpaceRoom").mockReturnValue(false);
+        const { result } = renderUserInfoBasicOptionsViewModelHook();
+
+        result.current.onReadReceiptButton();
+
+        expect(dis.dispatch).toHaveBeenCalledWith({
+            action: "view_room",
+            event_id: eventId,
+            highlighted: true,
+            metricsTrigger: undefined,
+            room_id: defaultRoomId,
+        });
+    });
+
+    it("calling onInsertPillButton should calls dispatch", () => {
+        const { result } = renderUserInfoBasicOptionsViewModelHook();
+
+        result.current.onInsertPillButton();
+
+        expect(dis.dispatch).toHaveBeenCalledWith({
+            action: Action.ComposerInsert,
+            userId: defaultMember.userId,
+            timelineRenderingType: "Room",
+        });
+    });
+
+    it("calling onInviteUserButton will call MultiInviter.invite", async () => {
+        // to save mocking, we will reject the call to .invite
+        const mockErrorMessage = new Error("test error message");
+        const spy = jest.spyOn(MultiInviter.prototype, "invite");
+        spy.mockRejectedValue(mockErrorMessage);
+        jest.spyOn(Modal, "createDialog");
+
+        const { result } = renderUserInfoBasicOptionsViewModelHook();
+        result.current.onInviteUserButton("roomId", new Event("click"));
+
+        // check that we have called .invite
+        expect(spy).toHaveBeenCalledWith([defaultMember.userId]);
+
+        await waitFor(() => {
+            // check that the test error message is displayed
+            expect(Modal.createDialog).toHaveBeenCalledWith(ErrorDialog, {
+                description: "test error message",
+                title: "Failed to invite",
+            });
+        });
+    });
+});
diff --git a/test/unit-tests/components/viewmodels/right_panel/user_info/UserInfoBasicViewModel-test.tsx b/test/unit-tests/components/viewmodels/right_panel/user_info/UserInfoBasicViewModel-test.tsx
new file mode 100644
index 0000000000..17d6500278
--- /dev/null
+++ b/test/unit-tests/components/viewmodels/right_panel/user_info/UserInfoBasicViewModel-test.tsx
@@ -0,0 +1,149 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+import React from "react";
+import { EventType, type MatrixClient, MatrixEvent, type Room, RoomMember, type User } from "matrix-js-sdk/src/matrix";
+import { renderHook, waitFor } from "jest-matrix-react";
+
+import { createTestClient, mkRoom, withClientContextRenderOptions } from "../../../../../test-utils";
+import { useUserInfoBasicViewModel } from "../../../../../../src/components/viewmodels/right_panel/user_info/UserInfoBasicViewModel";
+import DMRoomMap from "../../../../../../src/utils/DMRoomMap";
+import Modal from "../../../../../../src/Modal";
+import QuestionDialog from "../../../../../../src/components/views/dialogs/QuestionDialog";
+
+jest.mock("../../../../../../src/customisations/UserIdentifier", () => {
+    return {
+        getDisplayUserIdentifier: jest.fn().mockReturnValue("customUserIdentifier"),
+    };
+});
+
+describe("useUserInfoHeaderViewModel", () => {
+    const defaultRoomId = "!fkfk";
+    const defaultUserId = "@user:example.com";
+
+    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
+    let mockClient: MatrixClient;
+
+    let defaultProps: {
+        member: User | RoomMember;
+        room: Room;
+    };
+
+    let room: Room;
+
+    beforeEach(() => {
+        mockClient = createTestClient();
+        mockClient.isSynapseAdministrator = jest.fn().mockResolvedValue(true);
+        mockClient.deactivateSynapseUser = jest.fn().mockResolvedValue({
+            id_server_unbind_result: "success",
+        });
+
+        room = mkRoom(mockClient, defaultRoomId);
+        defaultProps = {
+            member: defaultMember,
+            room,
+        };
+        DMRoomMap.makeShared(mockClient);
+        jest.spyOn(mockClient, "getRoom").mockReturnValue(room);
+    });
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    const renderUserInfoBasicViewModelHook = (
+        props: {
+            member: User | RoomMember;
+            room: Room;
+        } = defaultProps,
+    ) => {
+        return renderHook(
+            () => useUserInfoBasicViewModel(props.room, props.member),
+            withClientContextRenderOptions(mockClient),
+        );
+    };
+
+    it("should set showDeactivateButton value to true", async () => {
+        jest.spyOn(mockClient, "getDomain").mockReturnValue("example.com");
+        const { result } = renderUserInfoBasicViewModelHook();
+        // checking the synpase admin is an async operation, that is why we wait for it
+        await waitFor(() => {
+            expect(result.current.showDeactivateButton).toBe(true);
+        });
+    });
+
+    it("should set showDeactivateButton value to false because domain is not the same", async () => {
+        jest.spyOn(mockClient, "getDomain").mockReturnValue("toto.com");
+        const { result } = renderUserInfoBasicViewModelHook();
+
+        await waitFor(() => {
+            expect(result.current.showDeactivateButton).toBe(false);
+        });
+    });
+
+    it("should give powerlevels values", () => {
+        const powerLevelEvents = new MatrixEvent({
+            type: EventType.RoomPowerLevels,
+            content: {
+                invite: 1,
+                state_default: 1,
+            },
+        });
+        jest.spyOn(room.currentState, "getStateEvents").mockReturnValue(powerLevelEvents);
+        const { result } = renderUserInfoBasicViewModelHook();
+        expect(result.current.powerLevels).toStrictEqual({
+            invite: 1,
+            state_default: 1,
+        });
+    });
+
+    it("should set isRoomDMForMember to true if found in dmroommap", () => {
+        jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue("id");
+        const { result } = renderUserInfoBasicViewModelHook();
+        expect(result.current.isRoomDMForMember).toBeTruthy();
+    });
+
+    it("should set isRoomDMForMember to false if not found in dmroommap", () => {
+        jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(undefined);
+        const { result } = renderUserInfoBasicViewModelHook();
+        expect(result.current.isRoomDMForMember).toBeFalsy();
+    });
+
+    it("should display modal and call deactivateSynapseUser when calling onSynapaseDeactivate", async () => {
+        const powerLevelEvents = new MatrixEvent({
+            type: EventType.RoomPowerLevels,
+            content: {
+                invite: 1,
+                state_default: 1,
+            },
+        });
+        jest.spyOn(room.currentState, "getStateEvents").mockReturnValue(powerLevelEvents);
+        jest.spyOn(Modal, "createDialog").mockReturnValue({
+            finished: Promise.resolve([true, true, false]),
+            close: jest.fn(),
+        });
+
+        const { result } = renderUserInfoBasicViewModelHook();
+
+        await waitFor(() => result.current.onSynapseDeactivate());
+
+        await waitFor(() => {
+            expect(Modal.createDialog).toHaveBeenLastCalledWith(QuestionDialog, {
+                button: "Deactivate user",
+                danger: true,
+                description: (
+                    <div>
+                        Deactivating this user will log them out and prevent them from logging back in. Additionally,
+                        they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want
+                        to deactivate this user?
+                    </div>
+                ),
+                title: "Deactivate user?",
+            });
+        });
+        expect(mockClient.deactivateSynapseUser).toHaveBeenCalledWith(defaultMember.userId);
+    });
+});
diff --git a/test/unit-tests/components/viewmodels/right_panel/user_info/UserInfoHeaderVerificationViewModel-test.tsx b/test/unit-tests/components/viewmodels/right_panel/user_info/UserInfoHeaderVerificationViewModel-test.tsx
new file mode 100644
index 0000000000..fb9fc12fa6
--- /dev/null
+++ b/test/unit-tests/components/viewmodels/right_panel/user_info/UserInfoHeaderVerificationViewModel-test.tsx
@@ -0,0 +1,194 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { Device, type MatrixClient, RoomMember } from "matrix-js-sdk/src/matrix";
+import { type Mocked } from "jest-mock";
+import { UserVerificationStatus, type CryptoApi } from "matrix-js-sdk/src/crypto-api";
+import { renderHook, waitFor } from "jest-matrix-react";
+
+import { createTestClient, withClientContextRenderOptions } from "../../../../../test-utils";
+import { MatrixClientPeg } from "../../../../../../src/MatrixClientPeg";
+import { useUserInfoVerificationViewModel } from "../../../../../../src/components/viewmodels/right_panel/user_info/UserInfoHeaderVerificationViewModel";
+
+describe("useUserInfoVerificationHeaderViewModel", () => {
+    const defaultRoomId = "!fkfk";
+    const defaultUserId = "@user:example.com";
+
+    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
+
+    const defaultProps = {
+        devices: [] as Device[],
+        member: defaultMember,
+    };
+    let mockClient: MatrixClient;
+    let mockCrypto: Mocked<CryptoApi>;
+
+    beforeEach(() => {
+        mockCrypto = {
+            bootstrapSecretStorage: jest.fn(),
+            bootstrapCrossSigning: jest.fn(),
+            getCrossSigningKeyId: jest.fn(),
+            getVerificationRequestsToDeviceInProgress: jest.fn().mockReturnValue([]),
+            getUserDeviceInfo: jest.fn(),
+            getDeviceVerificationStatus: jest.fn(),
+            getUserVerificationStatus: jest.fn(),
+            isDehydrationSupported: jest.fn().mockResolvedValue(false),
+            startDehydration: jest.fn(),
+            getKeyBackupInfo: jest.fn().mockResolvedValue(null),
+            userHasCrossSigningKeys: jest.fn().mockResolvedValue(false),
+        } as unknown as Mocked<CryptoApi>;
+
+        mockClient = createTestClient();
+        jest.spyOn(mockClient, "doesServerSupportUnstableFeature").mockResolvedValue(true);
+        jest.spyOn(mockClient.secretStorage, "hasKey").mockResolvedValue(true);
+        jest.spyOn(mockClient, "getCrypto").mockReturnValue(mockCrypto);
+        jest.spyOn(MatrixClientPeg, "get").mockReturnValue(mockClient);
+        jest.spyOn(MatrixClientPeg, "safeGet").mockReturnValue(mockClient);
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    const renderUserInfoHeaderVerificationHook = (props = defaultProps) => {
+        return renderHook(
+            () => useUserInfoVerificationViewModel(props.member, props.devices),
+            withClientContextRenderOptions(mockClient),
+        );
+    };
+
+    it("should be able to verify user", async () => {
+        const notMeId = "@notMe";
+        const notMetMember = new RoomMember(defaultRoomId, notMeId);
+        const device1 = new Device({
+            deviceId: "d1",
+            userId: notMeId,
+            displayName: "my device",
+            algorithms: [],
+            keys: new Map(),
+        });
+
+        // mock the user as not verified
+        jest.spyOn(mockCrypto, "getUserVerificationStatus").mockResolvedValue(
+            new UserVerificationStatus(false, false, false),
+        );
+
+        jest.spyOn(mockClient, "getUserId").mockReturnValue(defaultMember.userId);
+
+        // the selected user is not the default user, so he can make user verification
+        const { result } = renderUserInfoHeaderVerificationHook({ member: notMetMember, devices: [device1] });
+        await waitFor(() => {
+            const canVerify = result.current.canVerify;
+
+            expect(canVerify).toBeTruthy();
+        });
+    });
+
+    it("should not be able to verify user if user is not me", async () => {
+        const device1 = new Device({
+            deviceId: "d1",
+            userId: defaultMember.userId,
+            displayName: "my device",
+            algorithms: [],
+            keys: new Map(),
+        });
+
+        // mock the user as not verified
+        jest.spyOn(mockCrypto, "getUserVerificationStatus").mockResolvedValue(
+            new UserVerificationStatus(false, false, false),
+        );
+
+        jest.spyOn(mockClient, "getUserId").mockReturnValue(defaultMember.userId);
+
+        const { result } = renderUserInfoHeaderVerificationHook({ member: defaultMember, devices: [device1] });
+        await waitFor(() => {
+            const canVerify = result.current.canVerify;
+
+            expect(canVerify).toBeFalsy();
+            // if we cant verify the user the hasCrossSigningKeys value should also be undefined
+            expect(result.current.hasCrossSigningKeys).toBeUndefined();
+        });
+    });
+
+    it("should not be able to verify user if im already verified", async () => {
+        const notMeId = "@notMe";
+        const notMetMember = new RoomMember(defaultRoomId, notMeId);
+        const device1 = new Device({
+            deviceId: "d1",
+            userId: notMeId,
+            displayName: "my device",
+            algorithms: [],
+            keys: new Map(),
+        });
+
+        // mock the user as already verified
+        jest.spyOn(mockCrypto, "getUserVerificationStatus").mockResolvedValue(
+            new UserVerificationStatus(true, true, false),
+        );
+
+        jest.spyOn(mockClient, "getUserId").mockReturnValue(defaultMember.userId);
+
+        // the selected user is not the default user, so he can make user verification
+        const { result } = renderUserInfoHeaderVerificationHook({ member: notMetMember, devices: [device1] });
+        await waitFor(() => {
+            const canVerify = result.current.canVerify;
+
+            expect(canVerify).toBeFalsy();
+            // if we cant verify the user the hasCrossSigningKeys value should also be undefined
+            expect(result.current.hasCrossSigningKeys).toBeUndefined();
+        });
+    });
+
+    it("should not be able to verify user there is no devices", async () => {
+        const notMeId = "@notMe";
+        const notMetMember = new RoomMember(defaultRoomId, notMeId);
+
+        // mock the user as not verified
+        jest.spyOn(mockCrypto, "getUserVerificationStatus").mockResolvedValue(
+            new UserVerificationStatus(false, false, false),
+        );
+
+        jest.spyOn(mockClient, "getUserId").mockReturnValue(defaultMember.userId);
+
+        // the selected user is not the default user, so he can make user verification
+        const { result } = renderUserInfoHeaderVerificationHook({ member: notMetMember, devices: [] });
+        await waitFor(() => {
+            const canVerify = result.current.canVerify;
+
+            expect(canVerify).toBeFalsy();
+            // if we cant verify the user the hasCrossSigningKeys value should also be undefined
+            expect(result.current.hasCrossSigningKeys).toBeUndefined();
+        });
+    });
+
+    it("should get correct hasCrossSigningKeys values", async () => {
+        const notMeId = "@notMe";
+        const notMetMember = new RoomMember(defaultRoomId, notMeId);
+        const device1 = new Device({
+            deviceId: "d1",
+            userId: notMeId,
+            displayName: "my device",
+            algorithms: [],
+            keys: new Map(),
+        });
+
+        // mock the user as not verified
+        jest.spyOn(mockCrypto, "getUserVerificationStatus").mockResolvedValue(
+            new UserVerificationStatus(false, false, false),
+        );
+
+        jest.spyOn(mockClient, "getUserId").mockReturnValue(defaultMember.userId);
+
+        jest.spyOn(mockCrypto, "userHasCrossSigningKeys").mockResolvedValue(true);
+        const { result } = renderUserInfoHeaderVerificationHook({ member: notMetMember, devices: [device1] });
+        await waitFor(() => {
+            const hasCrossSigningKeys = result.current.hasCrossSigningKeys;
+
+            expect(hasCrossSigningKeys).toBeTruthy();
+        });
+    });
+});
diff --git a/test/unit-tests/components/viewmodels/right_panel/user_info/UserInfoHeaderViewModel-test.tsx b/test/unit-tests/components/viewmodels/right_panel/user_info/UserInfoHeaderViewModel-test.tsx
new file mode 100644
index 0000000000..adab891435
--- /dev/null
+++ b/test/unit-tests/components/viewmodels/right_panel/user_info/UserInfoHeaderViewModel-test.tsx
@@ -0,0 +1,179 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type MatrixClient, RoomMember } from "matrix-js-sdk/src/matrix";
+import { mocked, type Mocked } from "jest-mock";
+import { type CryptoApi } from "matrix-js-sdk/src/crypto-api";
+import { renderHook } from "jest-matrix-react";
+
+import { withClientContextRenderOptions } from "../../../../../test-utils";
+import { MatrixClientPeg } from "../../../../../../src/MatrixClientPeg";
+import { useUserfoHeaderViewModel } from "../../../../../../src/components/viewmodels/right_panel/user_info/UserInfoHeaderViewModel";
+import * as UseTimezone from "../../../../../../src/hooks/useUserTimezone";
+import SdkConfig from "../../../../../../src/SdkConfig";
+import Modal from "../../../../../../src/Modal";
+import ImageView from "../../../../../../src/components/views/elements/ImageView";
+import * as Media from "../../../../../../src/customisations/Media";
+import { type IConfigOptions } from "../../../../../../src/IConfigOptions";
+
+jest.mock("../../../../../../src/customisations/UserIdentifier", () => {
+    return {
+        getDisplayUserIdentifier: jest.fn().mockReturnValue("customUserIdentifier"),
+    };
+});
+
+describe("useUserInfoHeaderViewModel", () => {
+    const defaultRoomId = "!fkfk";
+    const defaultUserId = "@user:example.com";
+
+    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
+
+    const defaultProps = {
+        member: defaultMember,
+        roomId: defaultRoomId,
+    };
+
+    let mockClient: Mocked<MatrixClient>;
+    let mockCrypto: Mocked<CryptoApi>;
+
+    const mockAvatarUrl = "mock-avatar-url";
+    const oldGet = SdkConfig.get;
+
+    beforeEach(() => {
+        mockCrypto = mocked({
+            getDeviceVerificationStatus: jest.fn(),
+            getUserDeviceInfo: jest.fn(),
+            userHasCrossSigningKeys: jest.fn().mockResolvedValue(false),
+            getUserVerificationStatus: jest.fn(),
+            isEncryptionEnabledInRoom: jest.fn().mockResolvedValue(false),
+        } as unknown as CryptoApi);
+
+        mockClient = mocked({
+            getUser: jest.fn(),
+            isGuest: jest.fn().mockReturnValue(false),
+            isUserIgnored: jest.fn(),
+            getIgnoredUsers: jest.fn(),
+            setIgnoredUsers: jest.fn(),
+            getUserId: jest.fn(),
+            getSafeUserId: jest.fn(),
+            getDomain: jest.fn(),
+            on: jest.fn(),
+            off: jest.fn(),
+            isSynapseAdministrator: jest.fn().mockResolvedValue(false),
+            doesServerSupportUnstableFeature: jest.fn().mockReturnValue(false),
+            doesServerSupportExtendedProfiles: jest.fn().mockResolvedValue(false),
+            getExtendedProfileProperty: jest.fn().mockRejectedValue(new Error("Not supported")),
+            mxcUrlToHttp: jest.fn().mockReturnValue(mockAvatarUrl),
+            removeListener: jest.fn(),
+            currentState: {
+                on: jest.fn(),
+            },
+            getRoom: jest.fn(),
+            credentials: {},
+            setPowerLevel: jest.fn(),
+            getCrypto: jest.fn().mockReturnValue(mockCrypto),
+            baseUrl: "homeserver.url",
+        } as unknown as MatrixClient);
+
+        jest.spyOn(MatrixClientPeg, "get").mockReturnValue(mockClient);
+        jest.spyOn(MatrixClientPeg, "safeGet").mockReturnValue(mockClient);
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    const renderUserInfoHeaderViewModelHook = (props = defaultProps) => {
+        return renderHook(() => useUserfoHeaderViewModel(props), withClientContextRenderOptions(mockClient));
+    };
+    it("should give user timezone info", () => {
+        const defaultTZ = { timezone: "FR", friendly: "fr" };
+        jest.spyOn(UseTimezone, "useUserTimezone").mockReturnValue(defaultTZ);
+
+        const { result } = renderUserInfoHeaderViewModelHook();
+        const timezone = result.current.timezoneInfo;
+
+        expect(UseTimezone.useUserTimezone).toHaveBeenCalledWith(mockClient, defaultMember.userId);
+        expect(timezone).toEqual(defaultTZ);
+    });
+
+    it("should give correct showPresence value based on enablePresenceByHsUrl", () => {
+        jest.spyOn(SdkConfig, "get").mockImplementation((key: string) => {
+            if (key === "enable_presence_by_hs_url") {
+                return {
+                    [mockClient.baseUrl]: false,
+                };
+            }
+            return oldGet(key as keyof IConfigOptions);
+        });
+        const { result } = renderUserInfoHeaderViewModelHook();
+        const showPresence = result.current.showPresence;
+        expect(showPresence).toBeFalsy();
+    });
+
+    it("should have default value true for showPresence", () => {
+        jest.spyOn(SdkConfig, "get").mockImplementation(() => false);
+        const { result } = renderUserInfoHeaderViewModelHook();
+        const showPresence = result.current.showPresence;
+        expect(showPresence).toBeTruthy();
+    });
+
+    it("should open image dialog when avatar is clicked", () => {
+        const props = Object.assign({}, defaultProps);
+        const spyModale = jest.spyOn(Modal, "createDialog");
+        const spyMedia = jest.spyOn(Media, "mediaFromMxc");
+        jest.spyOn(props.member, "getMxcAvatarUrl").mockReturnValue(mockAvatarUrl);
+
+        const { result } = renderUserInfoHeaderViewModelHook(props);
+
+        result.current.onMemberAvatarClick();
+
+        expect(spyModale).toHaveBeenCalledWith(
+            ImageView,
+            {
+                src: mockAvatarUrl,
+                name: defaultMember.name,
+            },
+            "mx_Dialog_lightbox",
+            undefined,
+            true,
+        );
+        expect(spyMedia).toHaveBeenCalledWith(mockAvatarUrl);
+    });
+
+    it("should not open image dialog when avatar url is null", () => {
+        const props = Object.assign({}, defaultProps);
+        const spyModale = jest.spyOn(Modal, "createDialog");
+        jest.spyOn(props.member, "getMxcAvatarUrl").mockReturnValue(mockAvatarUrl);
+        jest.spyOn(Media, "mediaFromMxc").mockReturnValue({
+            srcHttp: null,
+            isEncrypted: false,
+            srcMxc: "",
+            thumbnailMxc: undefined,
+            hasThumbnail: false,
+            thumbnailHttp: null,
+            getThumbnailHttp: function (width: number, height: number, mode?: "scale" | "crop"): string | null {
+                throw new Error("Function not implemented.");
+            },
+            getThumbnailOfSourceHttp: function (width: number, height: number, mode?: "scale" | "crop"): string | null {
+                throw new Error("Function not implemented.");
+            },
+            getSquareThumbnailHttp: function (dim: number): string | null {
+                throw new Error("Function not implemented.");
+            },
+            downloadSource: function (): Promise<Response> {
+                throw new Error("Function not implemented.");
+            },
+        });
+
+        const { result } = renderUserInfoHeaderViewModelHook(props);
+
+        result.current.onMemberAvatarClick();
+
+        expect(spyModale).not.toHaveBeenCalled();
+    });
+});
diff --git a/test/unit-tests/components/viewmodels/right_panel/user_info/UserInfoPowerLevelsViewModel-test.tsx b/test/unit-tests/components/viewmodels/right_panel/user_info/UserInfoPowerLevelsViewModel-test.tsx
new file mode 100644
index 0000000000..d69dc12779
--- /dev/null
+++ b/test/unit-tests/components/viewmodels/right_panel/user_info/UserInfoPowerLevelsViewModel-test.tsx
@@ -0,0 +1,222 @@
+/*
+Copyright 2025 New Vector Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { renderHook } from "jest-matrix-react";
+import { type Mocked, mocked } from "jest-mock";
+import { RoomMember, MatrixEvent, type Room, EventType, type MatrixClient } from "matrix-js-sdk/src/matrix";
+
+import { MatrixClientPeg } from "../../../../../../src/MatrixClientPeg";
+import { useUserInfoPowerlevelViewModel } from "../../../../../../src/components/viewmodels/right_panel/UserInfoPowerlevelViewModel";
+import { withClientContextRenderOptions } from "../../../../../test-utils";
+import { type IRoomPermissions } from "../../../../../../src/components/views/right_panel/UserInfo";
+import Modal from "../../../../../../src/Modal";
+import { warnSelfDemote } from "../../../../../../src/components/views/right_panel/UserInfo";
+
+jest.mock("../../../../../../src/Modal", () => ({
+    createDialog: jest.fn(),
+}));
+
+jest.mock("../../../../../../src/components/views/right_panel/UserInfo", () => ({
+    warnSelfDemote: jest.fn(),
+}));
+
+describe("UserInfoAdminPowerlevelViewModel", () => {
+    const defaultRoomId = "!fkfk";
+    const defaultUserId = "@user:example.com";
+    const defaultMeId = "@me:example.com";
+    const selfUser = new RoomMember(defaultRoomId, defaultMeId);
+    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
+    const startPowerLevel = 50;
+    const changedPowerLevel = 100;
+
+    let mockClient: Mocked<MatrixClient>;
+    let mockRoom: Mocked<Room>;
+    let defaultProps: {
+        user: RoomMember;
+        room: Room;
+        roomPermissions: IRoomPermissions;
+    };
+
+    beforeEach(() => {
+        defaultProps = {
+            user: defaultMember,
+            room: mockRoom,
+            roomPermissions: {
+                modifyLevelMax: 100,
+                canEdit: false,
+                canInvite: false,
+            },
+        };
+
+        mockRoom = mocked({
+            roomId: defaultRoomId,
+            getType: jest.fn().mockReturnValue(undefined),
+            isSpaceRoom: jest.fn().mockReturnValue(false),
+            getMember: jest.fn().mockReturnValue(undefined),
+            getMxcAvatarUrl: jest.fn().mockReturnValue("mock-avatar-url"),
+            name: "test room",
+            on: jest.fn(),
+            off: jest.fn(),
+            currentState: {
+                getStateEvents: jest.fn(),
+                on: jest.fn(),
+                off: jest.fn(),
+            },
+            getEventReadUpTo: jest.fn(),
+        } as unknown as Room);
+
+        mockClient = mocked({
+            getUser: jest.fn(),
+            isGuest: jest.fn().mockReturnValue(false),
+            isUserIgnored: jest.fn(),
+            getIgnoredUsers: jest.fn(),
+            setIgnoredUsers: jest.fn(),
+            getUserId: jest.fn(),
+            getSafeUserId: jest.fn(),
+            getDomain: jest.fn(),
+            on: jest.fn(),
+            off: jest.fn(),
+            isSynapseAdministrator: jest.fn().mockResolvedValue(false),
+            doesServerSupportUnstableFeature: jest.fn().mockReturnValue(false),
+            doesServerSupportExtendedProfiles: jest.fn().mockResolvedValue(false),
+            getExtendedProfileProperty: jest.fn().mockRejectedValue(new Error("Not supported")),
+            mxcUrlToHttp: jest.fn().mockReturnValue("mock-mxcUrlToHttp"),
+            removeListener: jest.fn(),
+            currentState: {
+                on: jest.fn(),
+            },
+            getRoom: jest.fn(),
+            credentials: {},
+            setPowerLevel: jest.fn().mockResolvedValueOnce({ event_id: "123" }),
+        } as unknown as MatrixClient);
+
+        jest.spyOn(MatrixClientPeg, "get").mockReturnValue(mockClient);
+        jest.spyOn(MatrixClientPeg, "safeGet").mockReturnValue(mockClient);
+
+        (Modal.createDialog as jest.Mock).mockImplementation(() => ({
+            finished: Promise.resolve([true]),
+        }));
+        (warnSelfDemote as jest.Mock).mockResolvedValue(true);
+    });
+
+    const renderComponentHook = (props = defaultProps, client = mockClient) => {
+        return renderHook(
+            () => useUserInfoPowerlevelViewModel(props.user, props.room),
+            withClientContextRenderOptions(client),
+        );
+    };
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it("should give default power level", () => {
+        const defaultPowerLevel = 1;
+        const powerLevelEvent = new MatrixEvent({
+            type: EventType.RoomPowerLevels,
+            content: { users: { [defaultUserId]: defaultPowerLevel }, users_default: defaultPowerLevel },
+        });
+        mockRoom.currentState.getStateEvents.mockReturnValue(powerLevelEvent);
+
+        const { result } = renderComponentHook({ ...defaultProps, room: mockRoom });
+
+        expect(result.current.powerLevelUsersDefault).toBe(defaultPowerLevel);
+    });
+
+    it("handles successful power level change", async () => {
+        const powerLevelEvent = new MatrixEvent({
+            type: EventType.RoomPowerLevels,
+            content: { users: { [defaultUserId]: startPowerLevel }, users_default: 1 },
+        });
+        mockRoom.currentState.getStateEvents.mockReturnValue(powerLevelEvent);
+        mockClient.getSafeUserId.mockReturnValueOnce(defaultUserId);
+        mockClient.getUserId.mockReturnValueOnce(defaultUserId);
+
+        const { result } = renderComponentHook({ ...defaultProps, room: mockRoom }, mockClient);
+
+        await result.current.onPowerChange(changedPowerLevel);
+
+        expect(mockClient.setPowerLevel).toHaveBeenCalledTimes(1);
+        expect(mockClient.setPowerLevel).toHaveBeenCalledWith(mockRoom.roomId, defaultMember.userId, changedPowerLevel);
+    });
+
+    it("shows warning when promoting user to higher power level", async () => {
+        const powerLevelEvent = new MatrixEvent({
+            type: EventType.RoomPowerLevels,
+            content: {
+                users: {
+                    [defaultUserId]: startPowerLevel,
+                    [defaultMeId]: startPowerLevel,
+                },
+                users_default: 1,
+            },
+        });
+        mockRoom.currentState.getStateEvents.mockReturnValue(powerLevelEvent);
+        mockClient.getUserId.mockReturnValue(defaultMeId);
+
+        const { result } = renderComponentHook({ ...defaultProps, room: mockRoom }, mockClient);
+
+        await result.current.onPowerChange(changedPowerLevel);
+
+        expect(Modal.createDialog).toHaveBeenCalled();
+        expect(mockClient.setPowerLevel).toHaveBeenCalled();
+    });
+
+    it("shows warning when self-demoting", async () => {
+        const powerLevelEvent = new MatrixEvent({
+            type: EventType.RoomPowerLevels,
+            content: {
+                users: { [defaultMeId]: changedPowerLevel },
+                users_default: 1,
+            },
+        });
+        mockRoom.currentState.getStateEvents.mockReturnValue(powerLevelEvent);
+        mockClient.getUserId.mockReturnValue(defaultMeId);
+
+        const { result } = renderComponentHook({ ...defaultProps, room: mockRoom, user: selfUser }, mockClient);
+
+        await result.current.onPowerChange(startPowerLevel);
+
+        expect(warnSelfDemote).toHaveBeenCalled();
+        expect(mockClient.setPowerLevel).toHaveBeenCalled();
+    });
+
+    it("cancels power level change when user declines warning", async () => {
+        (Modal.createDialog as jest.Mock).mockImplementation(() => ({
+            finished: Promise.resolve([false]),
+        }));
+
+        const powerLevelEvent = new MatrixEvent({
+            type: EventType.RoomPowerLevels,
+            content: {
+                users: {
+                    [defaultUserId]: startPowerLevel,
+                    "@me:example.com": startPowerLevel,
+                },
+                users_default: 1,
+            },
+        });
+        mockRoom.currentState.getStateEvents.mockReturnValue(powerLevelEvent);
+        mockClient.getUserId.mockReturnValue(defaultMeId);
+
+        const { result } = renderComponentHook({ ...defaultProps, room: mockRoom }, mockClient);
+
+        await result.current.onPowerChange(changedPowerLevel);
+
+        expect(Modal.createDialog).toHaveBeenCalled();
+        expect(mockClient.setPowerLevel).not.toHaveBeenCalled();
+    });
+
+    it("handles missing power level event", async () => {
+        mockRoom.currentState.getStateEvents.mockReturnValue(null);
+
+        const { result } = renderComponentHook({ ...defaultProps, room: mockRoom }, mockClient);
+
+        await result.current.onPowerChange(changedPowerLevel);
+
+        expect(mockClient.setPowerLevel).not.toHaveBeenCalled();
+    });
+});
diff --git a/test/unit-tests/components/viewmodels/right_panel/user_info/admin/UserInfoAdminToolsContainerViewModel-test.tsx b/test/unit-tests/components/viewmodels/right_panel/user_info/admin/UserInfoAdminToolsContainerViewModel-test.tsx
new file mode 100644
index 0000000000..d07bc1ad7a
--- /dev/null
+++ b/test/unit-tests/components/viewmodels/right_panel/user_info/admin/UserInfoAdminToolsContainerViewModel-test.tsx
@@ -0,0 +1,173 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { renderHook } from "jest-matrix-react";
+import { type Mocked, mocked } from "jest-mock";
+import { type Room, type MatrixClient, RoomMember, type IPowerLevelsContent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
+
+import { MatrixClientPeg } from "../../../../../../../src/MatrixClientPeg";
+import {
+    type RoomAdminToolsContainerProps,
+    useUserInfoAdminToolsContainerViewModel,
+} from "../../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoAdminToolsContainerViewModel";
+import { withClientContextRenderOptions } from "../../../../../../test-utils";
+
+describe("UserInfoAdminToolsContainerViewModel", () => {
+    const defaultRoomId = "!fkfk";
+    const defaultUserId = "@user:example.com";
+
+    let mockRoom: Mocked<Room>;
+    let mockClient: Mocked<MatrixClient>;
+    let mockPowerLevels: IPowerLevelsContent;
+
+    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
+
+    let defaultContainerProps: RoomAdminToolsContainerProps;
+
+    beforeEach(() => {
+        mockRoom = mocked({
+            roomId: defaultRoomId,
+            getType: jest.fn().mockReturnValue(undefined),
+            isSpaceRoom: jest.fn().mockReturnValue(false),
+            getMember: jest.fn().mockReturnValue(undefined),
+            getMxcAvatarUrl: jest.fn().mockReturnValue("mock-avatar-url"),
+            name: "test room",
+            on: jest.fn(),
+            off: jest.fn(),
+            currentState: {
+                getStateEvents: jest.fn(),
+                on: jest.fn(),
+                off: jest.fn(),
+            },
+            getEventReadUpTo: jest.fn(),
+        } as unknown as Room);
+
+        mockPowerLevels = {
+            users: {
+                "@currentuser:example.com": 100,
+            },
+            events: {},
+            state_default: 50,
+            ban: 50,
+            kick: 50,
+            redact: 50,
+        };
+
+        defaultContainerProps = {
+            room: mockRoom,
+            member: defaultMember,
+            powerLevels: mockPowerLevels,
+        };
+
+        mockClient = mocked({
+            getUser: jest.fn(),
+            isGuest: jest.fn().mockReturnValue(false),
+            isUserIgnored: jest.fn(),
+            getIgnoredUsers: jest.fn(),
+            setIgnoredUsers: jest.fn(),
+            getUserId: jest.fn().mockReturnValue(defaultUserId),
+            getSafeUserId: jest.fn(),
+            getDomain: jest.fn(),
+            on: jest.fn(),
+            off: jest.fn(),
+            isSynapseAdministrator: jest.fn().mockResolvedValue(false),
+            doesServerSupportUnstableFeature: jest.fn().mockReturnValue(false),
+            doesServerSupportExtendedProfiles: jest.fn().mockResolvedValue(false),
+            getExtendedProfileProperty: jest.fn().mockRejectedValue(new Error("Not supported")),
+            mxcUrlToHttp: jest.fn().mockReturnValue("mock-mxcUrlToHttp"),
+            removeListener: jest.fn(),
+            currentState: {
+                on: jest.fn(),
+            },
+            getRoom: jest.fn(),
+            credentials: {},
+            setPowerLevel: jest.fn(),
+        } as unknown as MatrixClient);
+
+        jest.spyOn(MatrixClientPeg, "get").mockReturnValue(mockClient);
+        jest.spyOn(MatrixClientPeg, "safeGet").mockReturnValue(mockClient);
+    });
+
+    const renderAdminToolsContainerHook = (props = defaultContainerProps) => {
+        return renderHook(
+            () => useUserInfoAdminToolsContainerViewModel(props),
+            withClientContextRenderOptions(mockClient),
+        );
+    };
+
+    describe("useUserInfoAdminToolsContainerViewModel", () => {
+        it("should return false when user is not in the room", () => {
+            mockRoom.getMember.mockReturnValue(null);
+            const { result } = renderAdminToolsContainerHook();
+            expect(result.current).toEqual({
+                isCurrentUserInTheRoom: false,
+                shouldShowKickButton: false,
+                shouldShowBanButton: false,
+                shouldShowMuteButton: false,
+                shouldShowRedactButton: false,
+            });
+        });
+
+        it("should not show kick, ban and mute buttons if user is me", () => {
+            const mockMeMember = new RoomMember(mockRoom.roomId, "arbitraryId");
+            mockMeMember.powerLevel = 51; // defaults to 50
+            mockRoom.getMember.mockReturnValueOnce(mockMeMember);
+
+            const props = {
+                ...defaultContainerProps,
+                room: mockRoom,
+                member: mockMeMember,
+                powerLevels: mockPowerLevels,
+            };
+            const { result } = renderAdminToolsContainerHook(props);
+
+            expect(result.current).toEqual({
+                isCurrentUserInTheRoom: true,
+                shouldShowKickButton: false,
+                shouldShowBanButton: false,
+                shouldShowMuteButton: false,
+                shouldShowRedactButton: true,
+            });
+        });
+
+        it("returns mute toggle button if conditions met", () => {
+            const mockMeMember = new RoomMember(mockRoom.roomId, "arbitraryId");
+            mockMeMember.powerLevel = 51; // defaults to 50
+            mockRoom.getMember.mockReturnValueOnce(mockMeMember);
+
+            const defaultMemberWithPowerLevelAndJoinMembership = {
+                ...defaultMember,
+                powerLevel: 0,
+                membership: KnownMembership.Join,
+            } as RoomMember;
+
+            const { result } = renderAdminToolsContainerHook({
+                ...defaultContainerProps,
+                member: defaultMemberWithPowerLevelAndJoinMembership,
+                powerLevels: { events: { "m.room.power_levels": 1 } },
+            });
+
+            expect(result.current.shouldShowMuteButton).toBe(true);
+        });
+
+        it("should not show mute button for one's own member", () => {
+            const mockMeMember = new RoomMember(mockRoom.roomId, mockClient.getSafeUserId());
+            mockMeMember.powerLevel = 51; // defaults to 50
+            mockRoom.getMember.mockReturnValueOnce(mockMeMember);
+            mockClient.getUserId.mockReturnValueOnce(mockMeMember.userId);
+
+            const { result } = renderAdminToolsContainerHook({
+                ...defaultContainerProps,
+                member: mockMeMember,
+                powerLevels: { events: { "m.room.power_levels": 100 } },
+            });
+
+            expect(result.current.shouldShowMuteButton).toBe(false);
+        });
+    });
+});
diff --git a/test/unit-tests/components/viewmodels/right_panel/user_info/admin/UserInfoBanButtonViewModel-test.tsx b/test/unit-tests/components/viewmodels/right_panel/user_info/admin/UserInfoBanButtonViewModel-test.tsx
new file mode 100644
index 0000000000..a4825d1550
--- /dev/null
+++ b/test/unit-tests/components/viewmodels/right_panel/user_info/admin/UserInfoBanButtonViewModel-test.tsx
@@ -0,0 +1,224 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { cleanup, renderHook } from "jest-matrix-react";
+import { type Mocked, mocked } from "jest-mock";
+import { type Room, type MatrixClient, RoomMember } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
+
+import { MatrixClientPeg } from "../../../../../../../src/MatrixClientPeg";
+import { type RoomAdminToolsProps } from "../../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoAdminToolsContainerViewModel";
+import { useBanButtonViewModel } from "../../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoBanButtonViewModel";
+import Modal from "../../../../../../../src/Modal";
+import { withClientContextRenderOptions } from "../../../../../../test-utils";
+
+describe("useBanButtonViewModel", () => {
+    const defaultRoomId = "!fkfk";
+    const defaultUserId = "@user:example.com";
+
+    let mockRoom: Mocked<Room>;
+    let mockSpace: Mocked<Room>;
+    let mockClient: Mocked<MatrixClient>;
+
+    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
+
+    const memberWithBanMembership = { ...defaultMember, membership: KnownMembership.Ban } as RoomMember;
+
+    let defaultAdminToolsProps: RoomAdminToolsProps;
+    const createDialogSpy: jest.SpyInstance = jest.spyOn(Modal, "createDialog");
+
+    beforeEach(() => {
+        mockRoom = mocked({
+            roomId: defaultRoomId,
+            getType: jest.fn().mockReturnValue(undefined),
+            isSpaceRoom: jest.fn().mockReturnValue(false),
+            getMember: jest.fn().mockReturnValue(undefined),
+            getMxcAvatarUrl: jest.fn().mockReturnValue("mock-avatar-url"),
+            name: "test room",
+            on: jest.fn(),
+            off: jest.fn(),
+            currentState: {
+                getStateEvents: jest.fn(),
+                on: jest.fn(),
+                off: jest.fn(),
+            },
+            getEventReadUpTo: jest.fn(),
+        } as unknown as Room);
+
+        mockSpace = mocked({
+            roomId: defaultRoomId,
+            getType: jest.fn().mockReturnValue("m.space"),
+            isSpaceRoom: jest.fn().mockReturnValue(true),
+            getMember: jest.fn().mockReturnValue(undefined),
+            getMxcAvatarUrl: jest.fn().mockReturnValue("mock-avatar-url"),
+            name: "test room",
+            on: jest.fn(),
+            off: jest.fn(),
+            currentState: {
+                getStateEvents: jest.fn(),
+                on: jest.fn(),
+                off: jest.fn(),
+            },
+            getEventReadUpTo: jest.fn(),
+        } as unknown as Room);
+
+        defaultAdminToolsProps = {
+            room: mockRoom,
+            member: defaultMember,
+            isUpdating: false,
+            startUpdating: jest.fn(),
+            stopUpdating: jest.fn(),
+        };
+
+        mockClient = mocked({
+            getUser: jest.fn(),
+            isGuest: jest.fn().mockReturnValue(false),
+            isUserIgnored: jest.fn(),
+            getIgnoredUsers: jest.fn(),
+            setIgnoredUsers: jest.fn(),
+            getUserId: jest.fn().mockReturnValue(defaultUserId),
+            getSafeUserId: jest.fn(),
+            getDomain: jest.fn(),
+            on: jest.fn(),
+            off: jest.fn(),
+            isSynapseAdministrator: jest.fn().mockResolvedValue(false),
+            doesServerSupportUnstableFeature: jest.fn().mockReturnValue(false),
+            doesServerSupportExtendedProfiles: jest.fn().mockResolvedValue(false),
+            getExtendedProfileProperty: jest.fn().mockRejectedValue(new Error("Not supported")),
+            mxcUrlToHttp: jest.fn().mockReturnValue("mock-mxcUrlToHttp"),
+            removeListener: jest.fn(),
+            currentState: {
+                on: jest.fn(),
+            },
+            getRoom: jest.fn(),
+            credentials: {},
+            setPowerLevel: jest.fn(),
+        } as unknown as MatrixClient);
+
+        jest.spyOn(MatrixClientPeg, "get").mockReturnValue(mockClient);
+        jest.spyOn(MatrixClientPeg, "safeGet").mockReturnValue(mockClient);
+        mockRoom.getMember.mockReturnValue(defaultMember);
+    });
+
+    const renderBanButtonHook = (props = defaultAdminToolsProps) => {
+        return renderHook(() => useBanButtonViewModel(props), withClientContextRenderOptions(mockClient));
+    };
+
+    it("renders the correct labels for banned and unbanned members", () => {
+        // test for room
+        const propsWithBanMembership = {
+            ...defaultAdminToolsProps,
+            member: memberWithBanMembership,
+        };
+
+        // defaultMember is not banned
+        const { result } = renderBanButtonHook();
+        expect(result.current.banLabel).toBe("Ban from room");
+        cleanup();
+
+        const { result: result2 } = renderBanButtonHook(propsWithBanMembership);
+        expect(result2.current.banLabel).toBe("Unban from room");
+        cleanup();
+
+        // test for space
+        const { result: result3 } = renderBanButtonHook({ ...defaultAdminToolsProps, room: mockSpace });
+        expect(result3.current.banLabel).toBe("Ban from space");
+        cleanup();
+
+        const { result: result4 } = renderBanButtonHook({
+            ...propsWithBanMembership,
+            room: mockSpace,
+        });
+        expect(result4.current.banLabel).toBe("Unban from space");
+        cleanup();
+    });
+
+    it("clicking the ban or unban button calls Modal.createDialog with the correct arguments if user is not banned", async () => {
+        createDialogSpy.mockReturnValueOnce({ finished: Promise.resolve([]), close: jest.fn() });
+
+        const propsWithSpace = {
+            ...defaultAdminToolsProps,
+            room: mockSpace,
+        };
+        const { result } = renderBanButtonHook(propsWithSpace);
+        await result.current.onBanOrUnbanClick();
+
+        // check the last call arguments and the presence of the spaceChildFilter callback
+        expect(createDialogSpy).toHaveBeenLastCalledWith(
+            expect.any(Function),
+            expect.objectContaining({ spaceChildFilter: expect.any(Function) }),
+            "mx_ConfirmSpaceUserActionDialog_wrapper",
+        );
+
+        // test the spaceChildFilter callback
+        const callback = createDialogSpy.mock.lastCall[1].spaceChildFilter;
+
+        // make dummy values for myMember and theirMember, then we will test
+        // null vs their member followed by
+        // truthy my member vs their member
+        const mockMyMember = { powerLevel: 1 };
+        const mockTheirMember = { membership: "is not ban", powerLevel: 0 };
+
+        const mockRoom = {
+            getMember: jest
+                .fn()
+                .mockReturnValueOnce(null)
+                .mockReturnValueOnce(mockTheirMember)
+                .mockReturnValueOnce(mockMyMember)
+                .mockReturnValueOnce(mockTheirMember),
+            currentState: {
+                hasSufficientPowerLevelFor: jest.fn().mockReturnValue(true),
+            },
+        };
+
+        expect(callback(mockRoom)).toBe(false);
+        expect(callback(mockRoom)).toBe(true);
+    });
+
+    it("clicking the ban or unban button calls Modal.createDialog with the correct arguments if user _is_ banned", async () => {
+        createDialogSpy.mockReturnValueOnce({ finished: Promise.resolve([]), close: jest.fn() });
+
+        const propsWithBanMembership = {
+            ...defaultAdminToolsProps,
+            member: memberWithBanMembership,
+            room: mockSpace,
+        };
+        const { result } = renderBanButtonHook(propsWithBanMembership);
+        await result.current.onBanOrUnbanClick();
+
+        // check the last call arguments and the presence of the spaceChildFilter callback
+        expect(createDialogSpy).toHaveBeenLastCalledWith(
+            expect.any(Function),
+            expect.objectContaining({ spaceChildFilter: expect.any(Function) }),
+            "mx_ConfirmSpaceUserActionDialog_wrapper",
+        );
+
+        // test the spaceChildFilter callback
+        const callback = createDialogSpy.mock.lastCall[1].spaceChildFilter;
+
+        // make dummy values for myMember and theirMember, then we will test
+        // null vs their member followed by
+        // my member vs their member
+        const mockMyMember = { powerLevel: 1 };
+        const mockTheirMember = { membership: KnownMembership.Ban, powerLevel: 0 };
+
+        const mockRoom = {
+            getMember: jest
+                .fn()
+                .mockReturnValueOnce(null)
+                .mockReturnValueOnce(mockTheirMember)
+                .mockReturnValueOnce(mockMyMember)
+                .mockReturnValueOnce(mockTheirMember),
+            currentState: {
+                hasSufficientPowerLevelFor: jest.fn().mockReturnValue(true),
+            },
+        };
+
+        expect(callback(mockRoom)).toBe(false);
+        expect(callback(mockRoom)).toBe(true);
+    });
+});
diff --git a/test/unit-tests/components/viewmodels/right_panel/user_info/admin/UserInfoKickButtonViewModel-test.tsx b/test/unit-tests/components/viewmodels/right_panel/user_info/admin/UserInfoKickButtonViewModel-test.tsx
new file mode 100644
index 0000000000..e4e0d578be
--- /dev/null
+++ b/test/unit-tests/components/viewmodels/right_panel/user_info/admin/UserInfoKickButtonViewModel-test.tsx
@@ -0,0 +1,232 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { cleanup, renderHook } from "jest-matrix-react";
+import { type Mocked, mocked } from "jest-mock";
+import { type Room, type MatrixClient, RoomMember } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
+
+import { MatrixClientPeg } from "../../../../../../../src/MatrixClientPeg";
+import { type RoomAdminToolsProps } from "../../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoAdminToolsContainerViewModel";
+import { useRoomKickButtonViewModel } from "../../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoKickButtonViewModel";
+import Modal from "../../../../../../../src/Modal";
+import { withClientContextRenderOptions } from "../../../../../../test-utils";
+
+describe("useRoomKickButtonViewModel", () => {
+    const defaultRoomId = "!fkfk";
+    const defaultUserId = "@user:example.com";
+
+    let mockRoom: Mocked<Room>;
+    let mockSpace: Mocked<Room>;
+    let mockClient: Mocked<MatrixClient>;
+
+    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
+    const memberWithInviteMembership = { ...defaultMember, membership: KnownMembership.Invite } as RoomMember;
+    const memberWithJoinMembership = { ...defaultMember, membership: KnownMembership.Join } as RoomMember;
+
+    const createDialogSpy: jest.SpyInstance = jest.spyOn(Modal, "createDialog");
+
+    let defaultAdminToolsProps: RoomAdminToolsProps;
+
+    beforeEach(() => {
+        mockRoom = mocked({
+            roomId: defaultRoomId,
+            getType: jest.fn().mockReturnValue(undefined),
+            isSpaceRoom: jest.fn().mockReturnValue(false),
+            getMember: jest.fn().mockReturnValue(undefined),
+            getMxcAvatarUrl: jest.fn().mockReturnValue("mock-avatar-url"),
+            name: "test room",
+            on: jest.fn(),
+            off: jest.fn(),
+            currentState: {
+                getStateEvents: jest.fn(),
+                on: jest.fn(),
+                off: jest.fn(),
+            },
+            getEventReadUpTo: jest.fn(),
+        } as unknown as Room);
+
+        mockSpace = mocked({
+            roomId: defaultRoomId,
+            getType: jest.fn().mockReturnValue("m.space"),
+            isSpaceRoom: jest.fn().mockReturnValue(true),
+            getMember: jest.fn().mockReturnValue(undefined),
+            getMxcAvatarUrl: jest.fn().mockReturnValue("mock-avatar-url"),
+            name: "test room",
+            on: jest.fn(),
+            off: jest.fn(),
+            currentState: {
+                getStateEvents: jest.fn(),
+                on: jest.fn(),
+                off: jest.fn(),
+            },
+            getEventReadUpTo: jest.fn(),
+        } as unknown as Room);
+
+        defaultAdminToolsProps = {
+            room: mockRoom,
+            member: defaultMember,
+            isUpdating: false,
+            startUpdating: jest.fn(),
+            stopUpdating: jest.fn(),
+        };
+
+        mockClient = mocked({
+            getUser: jest.fn(),
+            isGuest: jest.fn().mockReturnValue(false),
+            isUserIgnored: jest.fn(),
+            getIgnoredUsers: jest.fn(),
+            setIgnoredUsers: jest.fn(),
+            getUserId: jest.fn().mockReturnValue(defaultUserId),
+            getSafeUserId: jest.fn(),
+            getDomain: jest.fn(),
+            on: jest.fn(),
+            off: jest.fn(),
+            isSynapseAdministrator: jest.fn().mockResolvedValue(false),
+            doesServerSupportUnstableFeature: jest.fn().mockReturnValue(false),
+            doesServerSupportExtendedProfiles: jest.fn().mockResolvedValue(false),
+            getExtendedProfileProperty: jest.fn().mockRejectedValue(new Error("Not supported")),
+            mxcUrlToHttp: jest.fn().mockReturnValue("mock-mxcUrlToHttp"),
+            removeListener: jest.fn(),
+            currentState: {
+                on: jest.fn(),
+            },
+            getRoom: jest.fn(),
+            credentials: {},
+            setPowerLevel: jest.fn(),
+        } as unknown as MatrixClient);
+
+        jest.spyOn(MatrixClientPeg, "get").mockReturnValue(mockClient);
+        jest.spyOn(MatrixClientPeg, "safeGet").mockReturnValue(mockClient);
+        // mock useContext to return mockClient
+        // jest.spyOn(React, "useContext").mockReturnValue(mockClient);
+
+        mockRoom.getMember.mockReturnValue(defaultMember);
+    });
+
+    afterEach(() => {
+        createDialogSpy.mockReset();
+    });
+
+    const renderKickButtonHook = (props = defaultAdminToolsProps) => {
+        return renderHook(() => useRoomKickButtonViewModel(props), withClientContextRenderOptions(mockClient));
+    };
+
+    it("renders nothing if member.membership is undefined", () => {
+        // .membership is undefined in our member by default
+        const { result } = renderKickButtonHook();
+        expect(result.current.canUserBeKicked).toBe(false);
+    });
+
+    it("renders something if member.membership is 'invite' or 'join'", () => {
+        let props = {
+            ...defaultAdminToolsProps,
+            member: memberWithInviteMembership,
+        };
+        const { result } = renderKickButtonHook(props);
+        expect(result.current.canUserBeKicked).toBe(true);
+
+        cleanup();
+
+        props = {
+            ...defaultAdminToolsProps,
+            member: memberWithJoinMembership,
+        };
+        const { result: result2 } = renderKickButtonHook(props);
+        expect(result2.current.canUserBeKicked).toBe(true);
+    });
+
+    it("renders the correct label", () => {
+        // test for room
+        const propsWithJoinMembership = {
+            ...defaultAdminToolsProps,
+            member: memberWithJoinMembership,
+        };
+
+        const { result } = renderKickButtonHook(propsWithJoinMembership);
+        expect(result.current.kickLabel).toBe("Remove from room");
+        cleanup();
+
+        const propsWithInviteMembership = {
+            ...defaultAdminToolsProps,
+            member: memberWithInviteMembership,
+        };
+
+        const { result: result2 } = renderKickButtonHook(propsWithInviteMembership);
+        expect(result2.current.kickLabel).toBe("Disinvite from room");
+        cleanup();
+    });
+
+    it("renders the correct label for space", () => {
+        const propsWithInviteMembership = {
+            ...defaultAdminToolsProps,
+            room: mockSpace,
+            member: memberWithInviteMembership,
+        };
+
+        const propsWithJoinMembership = {
+            ...defaultAdminToolsProps,
+            room: mockSpace,
+            member: memberWithJoinMembership,
+        };
+
+        const { result: result3 } = renderKickButtonHook(propsWithJoinMembership);
+        expect(result3.current.kickLabel).toBe("Remove from space");
+        cleanup();
+
+        const { result: result4 } = renderKickButtonHook(propsWithInviteMembership);
+        expect(result4.current.kickLabel).toBe("Disinvite from space");
+        cleanup();
+    });
+
+    it("clicking the kick button calls Modal.createDialog with the correct arguments when room is a space", async () => {
+        createDialogSpy.mockReturnValueOnce({ finished: Promise.resolve([]), close: jest.fn() });
+
+        jest.spyOn(MatrixClientPeg, "get").mockReturnValue(mockClient);
+        jest.spyOn(MatrixClientPeg, "safeGet").mockReturnValue(mockClient);
+
+        const propsWithInviteMembership = {
+            ...defaultAdminToolsProps,
+            room: mockSpace,
+            member: memberWithInviteMembership,
+        };
+        const { result } = renderKickButtonHook(propsWithInviteMembership);
+
+        await result.current.onKickClick();
+
+        // check the last call arguments and the presence of the spaceChildFilter callback
+        expect(createDialogSpy).toHaveBeenLastCalledWith(
+            expect.any(Function),
+            expect.objectContaining({ spaceChildFilter: expect.any(Function) }),
+            "mx_ConfirmSpaceUserActionDialog_wrapper",
+        );
+
+        // test the spaceChildFilter callback
+        const callback = createDialogSpy.mock.lastCall[1].spaceChildFilter;
+
+        // make dummy values for myMember and theirMember, then we will test
+        // null vs their member followed by
+        // my member vs their member
+        const mockMyMember = { powerLevel: 1 };
+        const mockTheirMember = { membership: KnownMembership.Invite, powerLevel: 0 };
+
+        const mockRoom = {
+            getMember: jest
+                .fn()
+                .mockReturnValueOnce(null)
+                .mockReturnValueOnce(mockTheirMember)
+                .mockReturnValueOnce(mockMyMember)
+                .mockReturnValueOnce(mockTheirMember),
+            currentState: {
+                hasSufficientPowerLevelFor: jest.fn().mockReturnValue(true),
+            },
+        };
+
+        expect(callback(mockRoom)).toBe(false);
+        expect(callback(mockRoom)).toBe(true);
+    });
+});
diff --git a/test/unit-tests/components/viewmodels/right_panel/user_info/admin/UserInfoMuteButtonViewModel-test.tsx b/test/unit-tests/components/viewmodels/right_panel/user_info/admin/UserInfoMuteButtonViewModel-test.tsx
new file mode 100644
index 0000000000..5ebd537855
--- /dev/null
+++ b/test/unit-tests/components/viewmodels/right_panel/user_info/admin/UserInfoMuteButtonViewModel-test.tsx
@@ -0,0 +1,230 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { renderHook } from "jest-matrix-react";
+import { type Mocked, mocked } from "jest-mock";
+import {
+    type Room,
+    type MatrixClient,
+    RoomMember,
+    type MatrixEvent,
+    type ISendEventResponse,
+} from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
+
+import { MatrixClientPeg } from "../../../../../../../src/MatrixClientPeg";
+import { type RoomAdminToolsProps } from "../../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoAdminToolsContainerViewModel";
+import { useMuteButtonViewModel } from "../../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoMuteButtonViewModel";
+import { isMuted } from "../../../../../../../src/components/views/right_panel/UserInfo";
+import { withClientContextRenderOptions } from "../../../../../../test-utils";
+
+describe("useMuteButtonViewModel", () => {
+    const defaultRoomId = "!fkfk";
+    const defaultUserId = "@user:example.com";
+
+    let mockRoom: Mocked<Room>;
+    let mockClient: Mocked<MatrixClient>;
+
+    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
+
+    let defaultAdminToolsProps: RoomAdminToolsProps;
+
+    beforeEach(() => {
+        mockRoom = mocked({
+            roomId: defaultRoomId,
+            getType: jest.fn().mockReturnValue(undefined),
+            isSpaceRoom: jest.fn().mockReturnValue(false),
+            getMember: jest.fn().mockReturnValue(undefined),
+            getMxcAvatarUrl: jest.fn().mockReturnValue("mock-avatar-url"),
+            name: "test room",
+            on: jest.fn(),
+            off: jest.fn(),
+            currentState: {
+                getStateEvents: jest.fn(),
+                on: jest.fn(),
+                off: jest.fn(),
+            },
+            getEventReadUpTo: jest.fn(),
+        } as unknown as Room);
+
+        defaultAdminToolsProps = {
+            room: mockRoom,
+            member: defaultMember,
+            isUpdating: false,
+            startUpdating: jest.fn(),
+            stopUpdating: jest.fn(),
+        };
+
+        mockClient = mocked({
+            getUser: jest.fn(),
+            isGuest: jest.fn().mockReturnValue(false),
+            isUserIgnored: jest.fn(),
+            getIgnoredUsers: jest.fn(),
+            setIgnoredUsers: jest.fn(),
+            getUserId: jest.fn().mockReturnValue(defaultUserId),
+            getSafeUserId: jest.fn(),
+            getDomain: jest.fn(),
+            on: jest.fn(),
+            off: jest.fn(),
+            isSynapseAdministrator: jest.fn().mockResolvedValue(false),
+            doesServerSupportUnstableFeature: jest.fn().mockReturnValue(false),
+            doesServerSupportExtendedProfiles: jest.fn().mockResolvedValue(false),
+            getExtendedProfileProperty: jest.fn().mockRejectedValue(new Error("Not supported")),
+            mxcUrlToHttp: jest.fn().mockReturnValue("mock-mxcUrlToHttp"),
+            removeListener: jest.fn(),
+            currentState: {
+                on: jest.fn(),
+            },
+            getRoom: jest.fn(),
+            credentials: {},
+            setPowerLevel: jest.fn(),
+        } as unknown as MatrixClient);
+
+        jest.spyOn(MatrixClientPeg, "get").mockReturnValue(mockClient);
+        jest.spyOn(MatrixClientPeg, "safeGet").mockReturnValue(mockClient);
+
+        mockClient.setPowerLevel.mockImplementation(() => Promise.resolve({} as ISendEventResponse));
+
+        mockRoom.currentState.getStateEvents.mockReturnValueOnce({
+            getContent: jest.fn().mockReturnValue({
+                events: {
+                    "m.room.message": 0,
+                },
+                events_default: 0,
+            }),
+        } as unknown as MatrixEvent);
+
+        jest.spyOn(mockClient, "setPowerLevel").mockImplementation(() => Promise.resolve({} as ISendEventResponse));
+        jest.spyOn(mockRoom.currentState, "getStateEvents").mockReturnValue({
+            getContent: jest.fn().mockReturnValue({
+                events: {
+                    "m.room.message": 0,
+                },
+                events_default: 0,
+            }),
+        } as unknown as MatrixEvent);
+    });
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    const renderMuteButtonHook = (props = defaultAdminToolsProps) => {
+        return renderHook(() => useMuteButtonViewModel(props), withClientContextRenderOptions(mockClient));
+    };
+
+    it("should early return when isUpdating=true", async () => {
+        const defaultMemberWithPowerLevelAndJoinMembership = {
+            ...defaultMember,
+            powerLevel: 0,
+            membership: KnownMembership.Join,
+        } as RoomMember;
+
+        const { result } = renderMuteButtonHook({
+            ...defaultAdminToolsProps,
+            member: defaultMemberWithPowerLevelAndJoinMembership,
+            isUpdating: true,
+        });
+
+        const resultClick = await result.current.onMuteButtonClick();
+
+        expect(resultClick).toBe(undefined);
+    });
+
+    it("should stop updating when level is NaN", async () => {
+        const { result } = renderMuteButtonHook({
+            ...defaultAdminToolsProps,
+            member: defaultMember,
+            isUpdating: false,
+        });
+
+        jest.spyOn(mockRoom.currentState, "getStateEvents").mockReturnValueOnce({
+            getContent: jest.fn().mockReturnValue({
+                events: {
+                    "m.room.message": NaN,
+                },
+                events_default: NaN,
+            }),
+        } as unknown as MatrixEvent);
+
+        await result.current.onMuteButtonClick();
+
+        expect(defaultAdminToolsProps.stopUpdating).toHaveBeenCalled();
+    });
+
+    it("should set powerlevel to default when user is muted", async () => {
+        const defaultMutedMember = {
+            ...defaultMember,
+            powerLevel: -1,
+            membership: KnownMembership.Join,
+        } as RoomMember;
+
+        const { result } = renderMuteButtonHook({
+            ...defaultAdminToolsProps,
+            member: defaultMutedMember,
+            isUpdating: false,
+        });
+
+        await result.current.onMuteButtonClick();
+
+        expect(mockClient.setPowerLevel).toHaveBeenCalledWith(mockRoom.roomId, defaultMember.userId, 0);
+    });
+
+    it("should set powerlevel - 1 when user is unmuted", async () => {
+        const defaultUnmutedMember = {
+            ...defaultMember,
+            powerLevel: 0,
+            membership: KnownMembership.Join,
+        } as RoomMember;
+
+        const { result } = renderMuteButtonHook({
+            ...defaultAdminToolsProps,
+            member: defaultUnmutedMember,
+            isUpdating: false,
+        });
+
+        await result.current.onMuteButtonClick();
+
+        expect(mockClient.setPowerLevel).toHaveBeenCalledWith(mockRoom.roomId, defaultMember.userId, -1);
+    });
+
+    it("returns false if either argument is falsy", () => {
+        // @ts-ignore to let us purposely pass incorrect args
+        expect(isMuted(defaultMember, null)).toBe(false);
+        // @ts-ignore to let us purposely pass incorrect args
+        expect(isMuted(null, {})).toBe(false);
+    });
+
+    it("when powerLevelContent.events and .events_default are undefined, returns false", () => {
+        const powerLevelContents = {};
+        expect(isMuted(defaultMember, powerLevelContents)).toBe(false);
+    });
+
+    it("when powerLevelContent.events is undefined, uses .events_default", () => {
+        const higherPowerLevelContents = { events_default: 10 };
+        expect(isMuted(defaultMember, higherPowerLevelContents)).toBe(true);
+
+        const lowerPowerLevelContents = { events_default: -10 };
+        expect(isMuted(defaultMember, lowerPowerLevelContents)).toBe(false);
+    });
+
+    it("when powerLevelContent.events is defined but '.m.room.message' isn't, uses .events_default", () => {
+        const higherPowerLevelContents = { events: {}, events_default: 10 };
+        expect(isMuted(defaultMember, higherPowerLevelContents)).toBe(true);
+
+        const lowerPowerLevelContents = { events: {}, events_default: -10 };
+        expect(isMuted(defaultMember, lowerPowerLevelContents)).toBe(false);
+    });
+
+    it("when powerLevelContent.events and '.m.room.message' are defined, uses the value", () => {
+        const higherPowerLevelContents = { events: { "m.room.message": -10 }, events_default: 10 };
+        expect(isMuted(defaultMember, higherPowerLevelContents)).toBe(false);
+
+        const lowerPowerLevelContents = { events: { "m.room.message": 10 }, events_default: -10 };
+        expect(isMuted(defaultMember, lowerPowerLevelContents)).toBe(true);
+    });
+});
diff --git a/test/unit-tests/components/viewmodels/right_panel/user_info/admin/UserInfoRedactButtonViewModel-test.tsx b/test/unit-tests/components/viewmodels/right_panel/user_info/admin/UserInfoRedactButtonViewModel-test.tsx
new file mode 100644
index 0000000000..cb3187a82c
--- /dev/null
+++ b/test/unit-tests/components/viewmodels/right_panel/user_info/admin/UserInfoRedactButtonViewModel-test.tsx
@@ -0,0 +1,98 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { renderHook } from "jest-matrix-react";
+import { type Mocked, mocked } from "jest-mock";
+import { type Room, type MatrixClient, RoomMember } from "matrix-js-sdk/src/matrix";
+
+import { MatrixClientPeg } from "../../../../../../../src/MatrixClientPeg";
+import { useRedactMessagesButtonViewModel } from "../../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoRedactButtonViewModel";
+import Modal from "../../../../../../../src/Modal";
+import BulkRedactDialog from "../../../../../../../src/components/views/dialogs/BulkRedactDialog";
+import { withClientContextRenderOptions } from "../../../../../../test-utils";
+
+describe("useRedactMessagesButtonViewModel", () => {
+    const defaultRoomId = "!fkfk";
+    const defaultUserId = "@user:example.com";
+
+    let mockRoom: Mocked<Room>;
+    let mockClient: Mocked<MatrixClient>;
+
+    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
+
+    beforeEach(() => {
+        mockRoom = mocked({
+            roomId: defaultRoomId,
+            getType: jest.fn().mockReturnValue(undefined),
+            isSpaceRoom: jest.fn().mockReturnValue(false),
+            getMember: jest.fn().mockReturnValue(undefined),
+            getMxcAvatarUrl: jest.fn().mockReturnValue("mock-avatar-url"),
+            name: "test room",
+            on: jest.fn(),
+            off: jest.fn(),
+            currentState: {
+                getStateEvents: jest.fn(),
+                on: jest.fn(),
+                off: jest.fn(),
+            },
+            getEventReadUpTo: jest.fn(),
+        } as unknown as Room);
+
+        mockClient = mocked({
+            getUser: jest.fn(),
+            isGuest: jest.fn().mockReturnValue(false),
+            isUserIgnored: jest.fn(),
+            getIgnoredUsers: jest.fn(),
+            setIgnoredUsers: jest.fn(),
+            getUserId: jest.fn().mockReturnValue(defaultUserId),
+            getSafeUserId: jest.fn(),
+            getDomain: jest.fn(),
+            on: jest.fn(),
+            off: jest.fn(),
+            isSynapseAdministrator: jest.fn().mockResolvedValue(false),
+            doesServerSupportUnstableFeature: jest.fn().mockReturnValue(false),
+            doesServerSupportExtendedProfiles: jest.fn().mockResolvedValue(false),
+            getExtendedProfileProperty: jest.fn().mockRejectedValue(new Error("Not supported")),
+            mxcUrlToHttp: jest.fn().mockReturnValue("mock-mxcUrlToHttp"),
+            removeListener: jest.fn(),
+            currentState: {
+                on: jest.fn(),
+            },
+            getRoom: jest.fn(),
+            credentials: {},
+            setPowerLevel: jest.fn(),
+        } as unknown as MatrixClient);
+
+        jest.spyOn(MatrixClientPeg, "get").mockReturnValue(mockClient);
+        jest.spyOn(MatrixClientPeg, "safeGet").mockReturnValue(mockClient);
+    });
+
+    const renderRedactButtonHook = (props = defaultMember) => {
+        return renderHook(() => useRedactMessagesButtonViewModel(props), withClientContextRenderOptions(mockClient));
+    };
+
+    it("should show BulkRedactDialog upon clicking the Remove messages button", async () => {
+        const spy = jest.spyOn(Modal, "createDialog");
+
+        mockClient.getRoom.mockReturnValue(mockRoom);
+        mockClient.getUserId.mockReturnValue("@arbitraryId:server");
+        const mockMeMember = new RoomMember(mockRoom.roomId, mockClient.getUserId()!);
+        mockMeMember.powerLevel = 51; // defaults to 50
+        const defaultMemberWithPowerLevel = { ...defaultMember, powerLevel: 0 } as RoomMember;
+        mockRoom.getMember.mockImplementation((userId) =>
+            userId === mockClient.getUserId() ? mockMeMember : defaultMemberWithPowerLevel,
+        );
+
+        const { result } = renderRedactButtonHook();
+        await result.current.onRedactAllMessagesClick();
+
+        expect(spy).toHaveBeenCalledWith(
+            BulkRedactDialog,
+            expect.objectContaining({ member: defaultMemberWithPowerLevel }),
+        );
+    });
+});
diff --git a/test/unit-tests/components/viewmodels/roomlist/RoomListHeaderViewModel-test.tsx b/test/unit-tests/components/viewmodels/roomlist/RoomListHeaderViewModel-test.tsx
index 09109366cf..ba93dc9072 100644
--- a/test/unit-tests/components/viewmodels/roomlist/RoomListHeaderViewModel-test.tsx
+++ b/test/unit-tests/components/viewmodels/roomlist/RoomListHeaderViewModel-test.tsx
@@ -13,7 +13,7 @@ import { range } from "lodash";
 import { useRoomListHeaderViewModel } from "../../../../../src/components/viewmodels/roomlist/RoomListHeaderViewModel";
 import SpaceStore from "../../../../../src/stores/spaces/SpaceStore";
 import { mkStubRoom, stubClient, withClientContextRenderOptions } from "../../../../test-utils";
-import SettingsStore, { type CallbackFn } from "../../../../../src/settings/SettingsStore";
+import SettingsStore from "../../../../../src/settings/SettingsStore";
 import defaultDispatcher from "../../../../../src/dispatcher/dispatcher";
 import { Action } from "../../../../../src/dispatcher/actions";
 import {
@@ -24,7 +24,6 @@ import {
     showSpaceSettings,
 } from "../../../../../src/utils/space";
 import { createRoom, hasCreateRoomRights } from "../../../../../src/components/viewmodels/roomlist/utils";
-import { SettingLevel } from "../../../../../src/settings/SettingLevel";
 import RoomListStoreV3 from "../../../../../src/stores/room-list-v3/RoomListStoreV3";
 import { SortOption } from "../../../../../src/components/viewmodels/roomlist/useSorter";
 import { SortingAlgorithm } from "../../../../../src/stores/room-list-v3/skip-list/sorters";
@@ -49,6 +48,9 @@ describe("useRoomListHeaderViewModel", () => {
     beforeEach(() => {
         matrixClient = stubClient();
         space = mkStubRoom("spaceId", "spaceName", matrixClient);
+        jest.spyOn(SettingsStore, "getValue").mockImplementation((name: string): any => {
+            if (name === "RoomList.preferredSorting") return SortingAlgorithm.Recency;
+        });
     });
 
     afterEach(() => {
@@ -210,7 +212,7 @@ describe("useRoomListHeaderViewModel", () => {
             const rooms = range(10).map((i) => mkStubRoom(`foo${i}:matrix.org`, `Foo ${i}`, undefined));
             const fn = jest
                 .spyOn(RoomListStoreV3.instance, "getSortedRoomsInActiveSpace")
-                .mockImplementation(() => [...rooms]);
+                .mockImplementation(() => ({ spaceId: "home", rooms: [...rooms] }));
             return { rooms, fn };
         }
 
@@ -238,38 +240,4 @@ describe("useRoomListHeaderViewModel", () => {
             expect(vm.current.activeSortOption).toEqual(SortOption.AToZ);
         });
     });
-
-    describe("message preview toggle", () => {
-        it("should return shouldShowMessagePreview based on setting", () => {
-            jest.spyOn(SettingsStore, "getValue").mockImplementation(() => true);
-            const { result: vm } = render();
-            expect(vm.current.shouldShowMessagePreview).toEqual(true);
-        });
-
-        it("should update when setting changes", async () => {
-            jest.spyOn(SettingsStore, "getValue").mockImplementation(() => true);
-
-            let watchFn: CallbackFn;
-            jest.spyOn(SettingsStore, "watchSetting").mockImplementation((settingName, _roomId, fn) => {
-                if (settingName === "RoomList.showMessagePreview") watchFn = fn;
-                return "";
-            });
-            const { result: vm } = render();
-            expect(vm.current.shouldShowMessagePreview).toEqual(true);
-
-            jest.spyOn(SettingsStore, "getValue").mockImplementation(() => false);
-            act(() => watchFn("RoomList.showMessagePreview", "", SettingLevel.DEVICE, false, false));
-            expect(vm.current.shouldShowMessagePreview).toEqual(false);
-        });
-
-        it("should change setting on toggle", () => {
-            jest.spyOn(SettingsStore, "getValue").mockImplementation(() => true);
-            const fn = jest.spyOn(SettingsStore, "setValue").mockImplementation(async () => {});
-
-            const { result: vm } = render();
-            expect(vm.current.shouldShowMessagePreview).toEqual(true);
-            act(() => vm.current.toggleMessagePreview());
-            expect(fn).toHaveBeenCalledWith("RoomList.showMessagePreview", null, "device", false);
-        });
-    });
 });
diff --git a/test/unit-tests/components/viewmodels/roomlist/RoomListItemMenuViewModel-test.tsx b/test/unit-tests/components/viewmodels/roomlist/RoomListItemMenuViewModel-test.tsx
index ddb3cba609..d017084db5 100644
--- a/test/unit-tests/components/viewmodels/roomlist/RoomListItemMenuViewModel-test.tsx
+++ b/test/unit-tests/components/viewmodels/roomlist/RoomListItemMenuViewModel-test.tsx
@@ -56,7 +56,7 @@ describe("RoomListItemMenuViewModel", () => {
         room = mkStubRoom("roomId", "roomName", matrixClient);
 
         DMRoomMap.makeShared(matrixClient);
-        jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(null);
+        jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(undefined);
 
         mocked(useUnreadNotifications).mockReturnValue({ symbol: null, count: 0, level: NotificationLevel.None });
         mocked(useNotificationState).mockReturnValue([RoomNotifState.AllMessages, jest.fn()]);
diff --git a/test/unit-tests/components/viewmodels/roomlist/RoomListItemViewModel-test.tsx b/test/unit-tests/components/viewmodels/roomlist/RoomListItemViewModel-test.tsx
index c58ae4168c..96bc53016e 100644
--- a/test/unit-tests/components/viewmodels/roomlist/RoomListItemViewModel-test.tsx
+++ b/test/unit-tests/components/viewmodels/roomlist/RoomListItemViewModel-test.tsx
@@ -73,6 +73,15 @@ describe("RoomListItemViewModel", () => {
         );
     });
 
+    it("should show context menu if user has access to options menu", async () => {
+        mocked(hasAccessToOptionsMenu).mockReturnValue(true);
+        const { result: vm } = renderHook(
+            () => useRoomListItemViewModel(room),
+            withClientContextRenderOptions(room.client),
+        );
+        expect(vm.current.showContextMenu).toBe(true);
+    });
+
     it("should show hover menu if user has access to options menu", async () => {
         mocked(hasAccessToOptionsMenu).mockReturnValue(true);
         const { result: vm } = renderHook(
diff --git a/test/unit-tests/components/viewmodels/roomlist/RoomListViewModel-test.tsx b/test/unit-tests/components/viewmodels/roomlist/RoomListViewModel-test.tsx
index 3f4337608e..c8ede64320 100644
--- a/test/unit-tests/components/viewmodels/roomlist/RoomListViewModel-test.tsx
+++ b/test/unit-tests/components/viewmodels/roomlist/RoomListViewModel-test.tsx
@@ -30,7 +30,7 @@ describe("RoomListViewModel", () => {
         const rooms = range(10).map((i) => mkStubRoom(`foo${i}:matrix.org`, `Foo ${i}`, undefined));
         const fn = jest
             .spyOn(RoomListStoreV3.instance, "getSortedRoomsInActiveSpace")
-            .mockImplementation(() => [...rooms]);
+            .mockImplementation(() => ({ spaceId: "home", rooms: [...rooms] }));
         return { rooms, fn };
     }
 
@@ -42,9 +42,9 @@ describe("RoomListViewModel", () => {
         const { rooms } = mockAndCreateRooms();
         const { result: vm } = renderHook(() => useRoomListViewModel());
 
-        expect(vm.current.rooms).toHaveLength(10);
+        expect(vm.current.roomsResult.rooms).toHaveLength(10);
         for (const room of rooms) {
-            expect(vm.current.rooms).toContain(room);
+            expect(vm.current.roomsResult.rooms).toContain(room);
         }
     });
 
@@ -57,7 +57,7 @@ describe("RoomListViewModel", () => {
         await act(() => RoomListStoreV3.instance.emit(LISTS_UPDATE_EVENT));
 
         await waitFor(() => {
-            expect(vm.current.rooms).toContain(newRoom);
+            expect(vm.current.roomsResult.rooms).toContain(newRoom);
         });
     });
 
@@ -66,9 +66,17 @@ describe("RoomListViewModel", () => {
             mockAndCreateRooms();
             const { result: vm } = renderHook(() => useRoomListViewModel());
             // should have 6 filters
-            expect(vm.current.primaryFilters).toHaveLength(6);
+            expect(vm.current.primaryFilters).toHaveLength(7);
             // check the order
-            for (const [i, name] of ["Unreads", "People", "Rooms", "Mentions", "Invites", "Favourites"].entries()) {
+            for (const [i, name] of [
+                "Unreads",
+                "People",
+                "Rooms",
+                "Favourites",
+                "Mentions",
+                "Invites",
+                "Low priority",
+            ].entries()) {
                 expect(vm.current.primaryFilters[i].name).toEqual(name);
                 expect(vm.current.primaryFilters[i].active).toEqual(false);
             }
@@ -119,7 +127,7 @@ describe("RoomListViewModel", () => {
             expect(vm.current.activePrimaryFilter).toEqual(vm.current.primaryFilters[i]);
         });
 
-        it("should remove all filters when active space is changed", async () => {
+        it("should not remove all filters when active space is changed", async () => {
             mockAndCreateRooms();
             const { result: vm } = renderHook(() => useRoomListViewModel());
 
@@ -133,8 +141,8 @@ describe("RoomListViewModel", () => {
             // Simulate a space change
             await act(() => SpaceStore.instance.emit(UPDATE_SELECTED_SPACE));
 
-            // Primary filer should have been unapplied
-            expect(vm.current.activePrimaryFilter).toEqual(undefined);
+            // Primary filter should remain unchanged
+            expect(vm.current.activePrimaryFilter?.name).toEqual("People");
         });
     });
 
@@ -168,7 +176,7 @@ describe("RoomListViewModel", () => {
     describe("Sticky room and active index", () => {
         function expectActiveRoom(vm: ReturnType<typeof useRoomListViewModel>, i: number, roomId: string) {
             expect(vm.activeIndex).toEqual(i);
-            expect(vm.rooms[i].roomId).toEqual(roomId);
+            expect(vm.roomsResult.rooms[i].roomId).toEqual(roomId);
         }
 
         it("active index is calculated with the last opened room in a space", () => {
@@ -179,9 +187,9 @@ describe("RoomListViewModel", () => {
 
             const rooms = range(10).map((i) => mkStubRoom(`foo${i}:matrix.org`, `Foo ${i}`, undefined));
             // Let's say all the rooms are in space1
-            const roomsInSpace1 = [...rooms];
+            const roomsInSpace1 = { spaceId: currentSpace, rooms: [...rooms] };
             // Let's say all rooms with even index are in space 2
-            const roomsInSpace2 = [...rooms].filter((_, i) => i % 2 === 0);
+            const roomsInSpace2 = { spaceId: "!space2:matrix.org", rooms: [...rooms].filter((_, i) => i % 2 === 0) };
             jest.spyOn(RoomListStoreV3.instance, "getSortedRoomsInActiveSpace").mockImplementation(() =>
                 currentSpace === "!space1:matrix.org" ? roomsInSpace1 : roomsInSpace2,
             );
@@ -307,7 +315,7 @@ describe("RoomListViewModel", () => {
         it("active room index becomes undefined when active room is deleted", () => {
             const { rooms } = mockAndCreateRooms();
             // Let's say that the room at index 5 is active
-            let roomId: string | undefined = rooms[5].roomId;
+            let roomId: string | null = rooms[5].roomId;
             jest.spyOn(SdkContextClass.instance.roomViewStore, "getRoomId").mockImplementation(() => roomId);
 
             const { result: vm } = renderHook(() => useRoomListViewModel());
@@ -315,7 +323,7 @@ describe("RoomListViewModel", () => {
 
             // Let's remove the active room (i.e room at index 5)
             rooms.splice(5, 1);
-            roomId = undefined;
+            roomId = null;
             act(() => RoomListStoreV3.instance.emit(LISTS_UPDATE_EVENT));
             expect(vm.current.activeIndex).toBeUndefined();
         });
@@ -324,7 +332,7 @@ describe("RoomListViewModel", () => {
             mockAndCreateRooms();
 
             // Let's say that there's no active room currently
-            jest.spyOn(SdkContextClass.instance.roomViewStore, "getRoomId").mockImplementation(() => undefined);
+            jest.spyOn(SdkContextClass.instance.roomViewStore, "getRoomId").mockImplementation(() => null);
 
             const { result: vm } = renderHook(() => useRoomListViewModel());
             expect(vm.current.activeIndex).toEqual(undefined);
diff --git a/test/unit-tests/components/viewmodels/roomlist/useRoomListNavigation-test.ts b/test/unit-tests/components/viewmodels/roomlist/useRoomListNavigation-test.ts
index c82f9aa87d..1ae8606697 100644
--- a/test/unit-tests/components/viewmodels/roomlist/useRoomListNavigation-test.ts
+++ b/test/unit-tests/components/viewmodels/roomlist/useRoomListNavigation-test.ts
@@ -30,7 +30,7 @@ describe("useRoomListNavigation", () => {
         ];
 
         DMRoomMap.makeShared(matrixClient);
-        jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(null);
+        jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(undefined);
         jest.spyOn(dispatcher, "dispatch");
     });
 
diff --git a/test/unit-tests/components/viewmodels/settings/encryption/KeyStoragePanelViewModel-test.ts b/test/unit-tests/components/viewmodels/settings/encryption/KeyStoragePanelViewModel-test.ts
index d0132c7317..eb9c81c4a7 100644
--- a/test/unit-tests/components/viewmodels/settings/encryption/KeyStoragePanelViewModel-test.ts
+++ b/test/unit-tests/components/viewmodels/settings/encryption/KeyStoragePanelViewModel-test.ts
@@ -5,12 +5,13 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { renderHook } from "jest-matrix-react";
+import { renderHook, waitFor } from "jest-matrix-react";
 import { act } from "react";
 import { mocked } from "jest-mock";
+import { CryptoEvent } from "matrix-js-sdk/src/crypto-api";
 
 import type { MatrixClient } from "matrix-js-sdk/src/matrix";
-import type { KeyBackupCheck, KeyBackupInfo } from "matrix-js-sdk/src/crypto-api";
+import type { BackupTrustInfo, KeyBackupCheck, KeyBackupInfo } from "matrix-js-sdk/src/crypto-api";
 import { useKeyStoragePanelViewModel } from "../../../../../../src/components/viewmodels/settings/encryption/KeyStoragePanelViewModel";
 import { createTestClient, withClientContextRenderOptions } from "../../../../../test-utils";
 
@@ -37,6 +38,23 @@ describe("KeyStoragePanelViewModel", () => {
         expect(result.current.busy).toBe(true);
     });
 
+    it("should update if a KeyBackupStatus event is received", async () => {
+        const { result } = renderHook(
+            () => useKeyStoragePanelViewModel(),
+            withClientContextRenderOptions(matrixClient),
+        );
+        await waitFor(() => expect(result.current.isEnabled).toBe(false));
+
+        const mock = mocked(matrixClient.getCrypto()!.getActiveSessionBackupVersion);
+        mock.mockResolvedValue("1");
+        matrixClient.emit(CryptoEvent.KeyBackupStatus, true);
+        await waitFor(() => expect(result.current.isEnabled).toBe(true));
+
+        mock.mockResolvedValue(null);
+        matrixClient.emit(CryptoEvent.KeyBackupStatus, false);
+        await waitFor(() => expect(result.current.isEnabled).toBe(false));
+    });
+
     it("should call resetKeyBackup if there is no backup currently", async () => {
         mocked(matrixClient.getCrypto()!.checkKeyBackupAndEnable).mockResolvedValue(null);
 
@@ -49,8 +67,21 @@ describe("KeyStoragePanelViewModel", () => {
         expect(mocked(matrixClient.getCrypto()!.resetKeyBackup)).toHaveBeenCalled();
     });
 
-    it("should not call resetKeyBackup if there is a backup currently", async () => {
-        mocked(matrixClient.getCrypto()!.checkKeyBackupAndEnable).mockResolvedValue({} as KeyBackupCheck);
+    it.each<BackupTrustInfo>([
+        { trusted: true, matchesDecryptionKey: false },
+        { trusted: false, matchesDecryptionKey: true },
+        { trusted: true, matchesDecryptionKey: true },
+    ])("should not call resetKeyBackup if there is a backup currently and it is trusted", async (trustInfo) => {
+        mocked(matrixClient.getCrypto()!.checkKeyBackupAndEnable).mockResolvedValue({
+            backupInfo: {
+                version: "1",
+                algorithm: "foobar",
+                auth_data: {
+                    public_key: "foobar",
+                },
+            },
+            trustInfo,
+        });
 
         const { result } = renderHook(
             () => useKeyStoragePanelViewModel(),
@@ -61,6 +92,30 @@ describe("KeyStoragePanelViewModel", () => {
         expect(mocked(matrixClient.getCrypto()!.resetKeyBackup)).not.toHaveBeenCalled();
     });
 
+    it("should call resetKeyBackup if there is a backup currently but it is not trusted", async () => {
+        mocked(matrixClient.getCrypto()!.checkKeyBackupAndEnable).mockResolvedValue({
+            backupInfo: {
+                version: "1",
+                algorithm: "foobar",
+                auth_data: {
+                    public_key: "foobar",
+                },
+            },
+            trustInfo: {
+                trusted: false,
+                matchesDecryptionKey: false,
+            },
+        });
+
+        const { result } = renderHook(
+            () => useKeyStoragePanelViewModel(),
+            withClientContextRenderOptions(matrixClient),
+        );
+
+        await result.current.setEnabled(true);
+        expect(mocked(matrixClient.getCrypto()!.resetKeyBackup)).toHaveBeenCalled();
+    });
+
     it("should set account data flag when enabling", async () => {
         mocked(matrixClient.getCrypto()!.checkKeyBackupAndEnable).mockResolvedValue(null);
 
diff --git a/test/unit-tests/components/views/audio_messages/SeekBar-test.tsx b/test/unit-tests/components/views/audio_messages/LegacySeekBar-test.tsx
similarity index 90%
rename from test/unit-tests/components/views/audio_messages/SeekBar-test.tsx
rename to test/unit-tests/components/views/audio_messages/LegacySeekBar-test.tsx
index b723ccb1c4..951f140a09 100644
--- a/test/unit-tests/components/views/audio_messages/SeekBar-test.tsx
+++ b/test/unit-tests/components/views/audio_messages/LegacySeekBar-test.tsx
@@ -12,13 +12,13 @@ import { act, fireEvent, render, type RenderResult } from "jest-matrix-react";
 
 import { type Playback } from "../../../../../src/audio/Playback";
 import { createTestPlayback } from "../../../../test-utils/audio";
-import SeekBar from "../../../../../src/components/views/audio_messages/SeekBar";
+import LegacySeekBar from "../../../../../src/components/views/audio_messages/LegacySeekBar";
 
 describe("SeekBar", () => {
     let playback: Playback;
     let renderResult: RenderResult;
     let frameRequestCallback: FrameRequestCallback;
-    let seekBarRef: RefObject<SeekBar | null>;
+    let seekBarRef: RefObject<LegacySeekBar | null>;
 
     beforeEach(() => {
         seekBarRef = createRef();
@@ -38,7 +38,7 @@ describe("SeekBar", () => {
                 durationSeconds: 0,
                 timeSeconds: 0,
             });
-            renderResult = render(<SeekBar ref={seekBarRef} playback={playback} />);
+            renderResult = render(<LegacySeekBar ref={seekBarRef} playback={playback} />);
         });
 
         it("should render correctly", () => {
@@ -49,7 +49,7 @@ describe("SeekBar", () => {
     describe("when rendering a SeekBar", () => {
         beforeEach(() => {
             playback = createTestPlayback();
-            renderResult = render(<SeekBar ref={seekBarRef} playback={playback} />);
+            renderResult = render(<LegacySeekBar ref={seekBarRef} playback={playback} />);
         });
 
         it("should render the initial position", () => {
@@ -115,7 +115,7 @@ describe("SeekBar", () => {
 
     describe("when rendering a disabled SeekBar", () => {
         beforeEach(async () => {
-            renderResult = render(<SeekBar disabled={true} playback={playback} />);
+            renderResult = render(<LegacySeekBar disabled={true} playback={playback} />);
         });
 
         it("should render as expected", () => {
diff --git a/test/unit-tests/components/views/audio_messages/RecordingPlayback-test.tsx b/test/unit-tests/components/views/audio_messages/RecordingPlayback-test.tsx
index 243fea38b2..e4085bbc1f 100644
--- a/test/unit-tests/components/views/audio_messages/RecordingPlayback-test.tsx
+++ b/test/unit-tests/components/views/audio_messages/RecordingPlayback-test.tsx
@@ -15,10 +15,9 @@ import RecordingPlayback, {
     PlaybackLayout,
 } from "../../../../../src/components/views/audio_messages/RecordingPlayback";
 import { Playback } from "../../../../../src/audio/Playback";
-import { TimelineRenderingType } from "../../../../../src/contexts/RoomContext";
+import { type RoomContextType, TimelineRenderingType } from "../../../../../src/contexts/RoomContext";
 import { createAudioContext } from "../../../../../src/audio/compat";
 import { flushPromises } from "../../../../test-utils";
-import { type IRoomState } from "../../../../../src/components/structures/RoomView";
 import { ScopedRoomContextProvider } from "../../../../../src/contexts/ScopedRoomContext.tsx";
 
 jest.mock("../../../../../src/WorkerManager", () => ({
@@ -54,7 +53,10 @@ describe("<RecordingPlayback />", () => {
 
     const mockChannelData = new Float32Array();
 
-    const defaultRoom = { roomId: "!room:server.org", timelineRenderingType: TimelineRenderingType.File } as IRoomState;
+    const defaultRoom = {
+        roomId: "!room:server.org",
+        timelineRenderingType: TimelineRenderingType.File,
+    } as RoomContextType;
     const getComponent = (props: React.ComponentProps<typeof RecordingPlayback>, room = defaultRoom) =>
         render(
             <ScopedRoomContextProvider {...room}>
@@ -80,7 +82,6 @@ describe("<RecordingPlayback />", () => {
     it("disables play button while playback is decoding", async () => {
         const playback = new Playback(new ArrayBuffer(8));
         const component = getComponent({ playback });
-        expect(getPlayButton(component)).toHaveAttribute("disabled");
         expect(getPlayButton(component)).toHaveAttribute("aria-disabled", "true");
     });
 
@@ -88,7 +89,6 @@ describe("<RecordingPlayback />", () => {
         const playback = new Playback(new ArrayBuffer(8));
         const component = getComponent({ playback });
         await flushPromises();
-        expect(getPlayButton(component)).not.toHaveAttribute("disabled");
         expect(getPlayButton(component)).not.toHaveAttribute("aria-disabled", "true");
     });
 
@@ -108,7 +108,6 @@ describe("<RecordingPlayback />", () => {
         await playback.prepare();
         const component = getComponent({ playback });
         // playback already decoded, button is not disabled
-        expect(getPlayButton(component)).not.toHaveAttribute("disabled");
         expect(getPlayButton(component)).not.toHaveAttribute("aria-disabled", "true");
         expect(component.container.querySelector(".text-warning")).toBeFalsy();
     });
diff --git a/test/unit-tests/components/views/audio_messages/__snapshots__/SeekBar-test.tsx.snap b/test/unit-tests/components/views/audio_messages/__snapshots__/LegacySeekBar-test.tsx.snap
similarity index 95%
rename from test/unit-tests/components/views/audio_messages/__snapshots__/SeekBar-test.tsx.snap
rename to test/unit-tests/components/views/audio_messages/__snapshots__/LegacySeekBar-test.tsx.snap
index f341544917..a548b06fbe 100644
--- a/test/unit-tests/components/views/audio_messages/__snapshots__/SeekBar-test.tsx.snap
+++ b/test/unit-tests/components/views/audio_messages/__snapshots__/LegacySeekBar-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`SeekBar when rendering a SeekBar and the playback proceeds should render as expected 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/auth/__snapshots__/AuthFooter-test.tsx.snap b/test/unit-tests/components/views/auth/__snapshots__/AuthFooter-test.tsx.snap
index e206df6e6d..9c3e3449f9 100644
--- a/test/unit-tests/components/views/auth/__snapshots__/AuthFooter-test.tsx.snap
+++ b/test/unit-tests/components/views/auth/__snapshots__/AuthFooter-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<AuthFooter /> should match snapshot 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/auth/__snapshots__/AuthHeaderLogo-test.tsx.snap b/test/unit-tests/components/views/auth/__snapshots__/AuthHeaderLogo-test.tsx.snap
index 0b659b5fda..ad52706d2d 100644
--- a/test/unit-tests/components/views/auth/__snapshots__/AuthHeaderLogo-test.tsx.snap
+++ b/test/unit-tests/components/views/auth/__snapshots__/AuthHeaderLogo-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<AuthHeaderLogo /> should match snapshot 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/auth/__snapshots__/AuthPage-test.tsx.snap b/test/unit-tests/components/views/auth/__snapshots__/AuthPage-test.tsx.snap
index eebd65a4fd..82579e3db7 100644
--- a/test/unit-tests/components/views/auth/__snapshots__/AuthPage-test.tsx.snap
+++ b/test/unit-tests/components/views/auth/__snapshots__/AuthPage-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<AuthPage /> should match snapshot 1`] = `
 <DocumentFragment>
@@ -6,16 +6,18 @@ exports[`<AuthPage /> should match snapshot 1`] = `
     class="mx_AuthPage"
   >
     <div
-      class="mx_AuthPage_modal"
+      class="mx_AuthPage_modal mx_AuthPage_modal_withBlur"
       style="position: relative;"
     >
       <div
         class="mx_AuthPage_modalBlur"
         style="position: absolute; top: 0px; right: 0px; bottom: 0px; left: 0px; filter: blur(40px);"
       />
-      <div
+      <main
+        aria-live="polite"
         class="mx_AuthPage_modalContent"
-        style="display: flex; z-index: 1; background: rgba(255, 255, 255, 0.59); border-radius: 8px;"
+        style="display: flex; z-index: 1; border-radius: inherit;"
+        tabindex="-1"
       />
     </div>
     <footer
diff --git a/test/unit-tests/components/views/auth/__snapshots__/InteractiveAuthEntryComponents-test.tsx.snap b/test/unit-tests/components/views/auth/__snapshots__/InteractiveAuthEntryComponents-test.tsx.snap
index 17f61abcbb..e4c9ec4854 100644
--- a/test/unit-tests/components/views/auth/__snapshots__/InteractiveAuthEntryComponents-test.tsx.snap
+++ b/test/unit-tests/components/views/auth/__snapshots__/InteractiveAuthEntryComponents-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<EmailIdentityAuthEntry/> should render 1`] = `
 <div>
@@ -42,7 +42,7 @@ exports[`<MasUnlockCrossSigningAuthEntry/> should render 1`] = `
       class="mx_EncryptionCard_header"
     >
       <div
-        class="_content_o77nw_8"
+        class="_content_1r8kr_8"
         data-size="large"
       >
         <svg
@@ -73,7 +73,7 @@ exports[`<MasUnlockCrossSigningAuthEntry/> should render 1`] = `
       class="mx_EncryptionCard_buttons"
     >
       <button
-        class="_button_vczzf_8 mx_Dialog_nonDialogButton _has-icon_vczzf_57"
+        class="_button_187yx_8 mx_Dialog_nonDialogButton _has-icon_187yx_57"
         data-kind="primary"
         data-size="lg"
         role="button"
@@ -97,7 +97,7 @@ exports[`<MasUnlockCrossSigningAuthEntry/> should render 1`] = `
         Continue to account
       </button>
       <button
-        class="_button_vczzf_8 mx_Dialog_nonDialogButton"
+        class="_button_187yx_8 mx_Dialog_nonDialogButton"
         data-kind="tertiary"
         data-size="lg"
         role="button"
diff --git a/test/unit-tests/components/views/avatars/RoomAvatarView-test.tsx b/test/unit-tests/components/views/avatars/RoomAvatarView-test.tsx
index 020b92227d..fe403af510 100644
--- a/test/unit-tests/components/views/avatars/RoomAvatarView-test.tsx
+++ b/test/unit-tests/components/views/avatars/RoomAvatarView-test.tsx
@@ -12,6 +12,7 @@ import { mocked } from "jest-mock";
 import { RoomAvatarView } from "../../../../../src/components/views/avatars/RoomAvatarView";
 import { mkStubRoom, stubClient } from "../../../../test-utils";
 import {
+    AvatarBadgeDecoration,
     type RoomAvatarViewState,
     useRoomAvatarViewModel,
 } from "../../../../../src/components/viewmodels/avatars/RoomAvatarViewModel";
@@ -19,6 +20,7 @@ import DMRoomMap from "../../../../../src/utils/DMRoomMap";
 import { Presence } from "../../../../../src/components/views/avatars/WithPresenceIndicator";
 
 jest.mock("../../../../../src/components/viewmodels/avatars/RoomAvatarViewModel", () => ({
+    ...jest.requireActual("../../../../../src/components/viewmodels/avatars/RoomAvatarViewModel"),
     useRoomAvatarViewModel: jest.fn(),
 }));
 
@@ -27,15 +29,13 @@ describe("<RoomAvatarView />", () => {
     const room = mkStubRoom("roomId", "roomName", matrixClient);
 
     DMRoomMap.makeShared(matrixClient);
-    jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(null);
+    jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(undefined);
 
     let defaultValue: RoomAvatarViewState;
 
     beforeEach(() => {
         defaultValue = {
-            hasDecoration: true,
-            isPublic: true,
-            isVideoRoom: true,
+            badgeDecoration: undefined,
             presence: null,
         };
 
@@ -43,13 +43,27 @@ describe("<RoomAvatarView />", () => {
     });
 
     it("should not render a decoration", () => {
-        mocked(useRoomAvatarViewModel).mockReturnValue({ ...defaultValue, hasDecoration: false });
+        mocked(useRoomAvatarViewModel).mockReturnValue({ ...defaultValue });
         const { asFragment } = render(<RoomAvatarView room={room} />);
         expect(asFragment()).toMatchSnapshot();
     });
 
+    it("should render a low priority room decoration", () => {
+        mocked(useRoomAvatarViewModel).mockReturnValue({
+            ...defaultValue,
+            badgeDecoration: AvatarBadgeDecoration.LowPriority,
+        });
+        const { asFragment } = render(<RoomAvatarView room={room} />);
+
+        expect(screen.getByLabelText("This is a low priority room")).toBeInTheDocument();
+        expect(asFragment()).toMatchSnapshot();
+    });
+
     it("should render a video room decoration", () => {
-        mocked(useRoomAvatarViewModel).mockReturnValue({ ...defaultValue, hasDecoration: true, isVideoRoom: true });
+        mocked(useRoomAvatarViewModel).mockReturnValue({
+            ...defaultValue,
+            badgeDecoration: AvatarBadgeDecoration.VideoRoom,
+        });
         const { asFragment } = render(<RoomAvatarView room={room} />);
 
         expect(screen.getByLabelText("This room is a video room")).toBeInTheDocument();
@@ -59,9 +73,7 @@ describe("<RoomAvatarView />", () => {
     it("should render a public room decoration", () => {
         mocked(useRoomAvatarViewModel).mockReturnValue({
             ...defaultValue,
-            hasDecoration: true,
-            isPublic: true,
-            isVideoRoom: false,
+            badgeDecoration: AvatarBadgeDecoration.PublicRoom,
         });
         const { asFragment } = render(<RoomAvatarView room={room} />);
 
@@ -69,19 +81,6 @@ describe("<RoomAvatarView />", () => {
         expect(asFragment()).toMatchSnapshot();
     });
 
-    it("should not render a public room decoration if the room is a video room", () => {
-        mocked(useRoomAvatarViewModel).mockReturnValue({
-            ...defaultValue,
-            hasDecoration: true,
-            isPublic: true,
-            isVideoRoom: true,
-        });
-        render(<RoomAvatarView room={room} />);
-
-        expect(screen.getByLabelText("This room is a video room")).toBeInTheDocument();
-        expect(screen.queryByLabelText("This room is public")).toBeNull();
-    });
-
     it.each([
         { presence: Presence.Online, label: "Online" },
         { presence: Presence.Offline, label: "Offline" },
@@ -90,7 +89,7 @@ describe("<RoomAvatarView />", () => {
     ])("should render the $presence presence", ({ presence, label }) => {
         mocked(useRoomAvatarViewModel).mockReturnValue({
             ...defaultValue,
-            hasDecoration: true,
+            badgeDecoration: AvatarBadgeDecoration.Presence,
             presence,
         });
         const { asFragment } = render(<RoomAvatarView room={room} />);
diff --git a/test/unit-tests/components/views/avatars/__snapshots__/DecoratedRoomAvatar-test.tsx.snap b/test/unit-tests/components/views/avatars/__snapshots__/DecoratedRoomAvatar-test.tsx.snap
index 5250682916..db3bf6264b 100644
--- a/test/unit-tests/components/views/avatars/__snapshots__/DecoratedRoomAvatar-test.tsx.snap
+++ b/test/unit-tests/components/views/avatars/__snapshots__/DecoratedRoomAvatar-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`DecoratedRoomAvatar shows an avatar with globe icon and tooltip for public room 1`] = `
 <DocumentFragment>
@@ -6,7 +6,7 @@ exports[`DecoratedRoomAvatar shows an avatar with globe icon and tooltip for pub
     class="mx_DecoratedRoomAvatar mx_DecoratedRoomAvatar_cutout"
   >
     <span
-      class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+      class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
       data-color="1"
       data-testid="avatar-img"
       data-type="round"
@@ -16,7 +16,7 @@ exports[`DecoratedRoomAvatar shows an avatar with globe icon and tooltip for pub
       r
     </span>
     <div
-      aria-labelledby="«r0»"
+      aria-labelledby="_r_0_"
       class="mx_DecoratedRoomAvatar_icon mx_DecoratedRoomAvatar_icon_globe"
       tabindex="0"
     />
@@ -30,7 +30,7 @@ exports[`DecoratedRoomAvatar shows the presence indicator in a DM room that also
     class="mx_DecoratedRoomAvatar mx_DecoratedRoomAvatar_cutout"
   >
     <span
-      class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+      class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
       data-color="5"
       data-testid="avatar-img"
       data-type="round"
@@ -40,7 +40,7 @@ exports[`DecoratedRoomAvatar shows the presence indicator in a DM room that also
       r
     </span>
     <div
-      aria-labelledby="«r6»"
+      aria-labelledby="_r_6_"
       class="mx_DecoratedRoomAvatar_icon mx_DecoratedRoomAvatar_icon_online"
       tabindex="0"
     />
diff --git a/test/unit-tests/components/views/avatars/__snapshots__/RoomAvatar-test.tsx.snap b/test/unit-tests/components/views/avatars/__snapshots__/RoomAvatar-test.tsx.snap
index f77dcc6948..68af0da5a0 100644
--- a/test/unit-tests/components/views/avatars/__snapshots__/RoomAvatar-test.tsx.snap
+++ b/test/unit-tests/components/views/avatars/__snapshots__/RoomAvatar-test.tsx.snap
@@ -1,9 +1,9 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`RoomAvatar should not render an invite avatar if the user has disabled it 1`] = `
 <div>
   <span
-    class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+    class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
     data-color="6"
     data-testid="avatar-img"
     data-type="round"
@@ -19,7 +19,7 @@ exports[`RoomAvatar should render an avatar for a room the user is invited to 1`
 <div>
   <span
     aria-label="Avatar"
-    class="_avatar_1qbcf_8 mx_BaseAvatar"
+    class="_avatar_zysgz_8 mx_BaseAvatar"
     data-color="6"
     data-testid="avatar-img"
     data-type="round"
@@ -27,7 +27,7 @@ exports[`RoomAvatar should render an avatar for a room the user is invited to 1`
   >
     <img
       alt=""
-      class="_image_1qbcf_41"
+      class="_image_zysgz_43"
       data-type="round"
       height="36px"
       loading="lazy"
@@ -42,7 +42,7 @@ exports[`RoomAvatar should render an avatar for a room the user is invited to 1`
 exports[`RoomAvatar should render as expected for a DM room 1`] = `
 <div>
   <span
-    class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+    class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
     data-color="1"
     data-testid="avatar-img"
     data-type="round"
@@ -57,7 +57,7 @@ exports[`RoomAvatar should render as expected for a DM room 1`] = `
 exports[`RoomAvatar should render as expected for a LocalRoom 1`] = `
 <div>
   <span
-    class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+    class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
     data-color="3"
     data-testid="avatar-img"
     data-type="round"
@@ -72,7 +72,7 @@ exports[`RoomAvatar should render as expected for a LocalRoom 1`] = `
 exports[`RoomAvatar should render as expected for a Room 1`] = `
 <div>
   <span
-    class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+    class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
     data-color="6"
     data-testid="avatar-img"
     data-type="round"
diff --git a/test/unit-tests/components/views/avatars/__snapshots__/RoomAvatarView-test.tsx.snap b/test/unit-tests/components/views/avatars/__snapshots__/RoomAvatarView-test.tsx.snap
index 1a4263a0c9..8c9610eeb4 100644
--- a/test/unit-tests/components/views/avatars/__snapshots__/RoomAvatarView-test.tsx.snap
+++ b/test/unit-tests/components/views/avatars/__snapshots__/RoomAvatarView-test.tsx.snap
@@ -1,10 +1,10 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<RoomAvatarView /> should not render a decoration 1`] = `
 <DocumentFragment>
   <span
     aria-label="Avatar"
-    class="_avatar_1qbcf_8 mx_BaseAvatar"
+    class="_avatar_zysgz_8 mx_BaseAvatar"
     data-color="1"
     data-testid="avatar-img"
     data-type="round"
@@ -12,7 +12,7 @@ exports[`<RoomAvatarView /> should not render a decoration 1`] = `
   >
     <img
       alt=""
-      class="_image_1qbcf_41"
+      class="_image_zysgz_43"
       data-type="round"
       height="32px"
       loading="lazy"
@@ -24,14 +24,14 @@ exports[`<RoomAvatarView /> should not render a decoration 1`] = `
 </DocumentFragment>
 `;
 
-exports[`<RoomAvatarView /> should render a public room decoration 1`] = `
+exports[`<RoomAvatarView /> should render a low priority room decoration 1`] = `
 <DocumentFragment>
   <div
     class="mx_RoomAvatarView"
   >
     <span
       aria-label="Avatar"
-      class="_avatar_1qbcf_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_icon"
+      class="_avatar_zysgz_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_icon"
       data-color="1"
       data-testid="avatar-img"
       data-type="round"
@@ -39,7 +39,50 @@ exports[`<RoomAvatarView /> should render a public room decoration 1`] = `
     >
       <img
         alt=""
-        class="_image_1qbcf_41"
+        class="_image_zysgz_43"
+        data-type="round"
+        height="32px"
+        loading="lazy"
+        referrerpolicy="no-referrer"
+        src="http://this.is.a.url/avatar.url/room.png"
+        width="32px"
+      />
+    </span>
+    <svg
+      aria-label="This is a low priority room"
+      aria-labelledby="_r_0_"
+      class="mx_RoomAvatarView_icon"
+      color="var(--cpd-color-icon-tertiary)"
+      fill="currentColor"
+      height="16px"
+      viewBox="0 0 24 24"
+      width="16px"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M12 4.5a1 1 0 0 1 1 1v10.586l4.293-4.293a1 1 0 0 1 1.414 1.414l-6 6a1 1 0 0 1-1.414 0l-6-6a1 1 0 1 1 1.414-1.414L11 16.086V5.5a1 1 0 0 1 1-1"
+      />
+    </svg>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`<RoomAvatarView /> should render a public room decoration 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_RoomAvatarView"
+  >
+    <span
+      aria-label="Avatar"
+      class="_avatar_zysgz_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_icon"
+      data-color="1"
+      data-testid="avatar-img"
+      data-type="round"
+      style="--cpd-avatar-size: 32px;"
+    >
+      <img
+        alt=""
+        class="_image_zysgz_43"
         data-type="round"
         height="32px"
         loading="lazy"
@@ -50,8 +93,9 @@ exports[`<RoomAvatarView /> should render a public room decoration 1`] = `
     </span>
     <svg
       aria-label="This room is public"
+      aria-labelledby="_r_c_"
       class="mx_RoomAvatarView_icon"
-      color="var(--cpd-color-icon-tertiary)"
+      color="var(--cpd-color-icon-info-primary)"
       fill="currentColor"
       height="16px"
       viewBox="0 0 24 24"
@@ -73,7 +117,7 @@ exports[`<RoomAvatarView /> should render a video room decoration 1`] = `
   >
     <span
       aria-label="Avatar"
-      class="_avatar_1qbcf_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_icon"
+      class="_avatar_zysgz_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_icon"
       data-color="1"
       data-testid="avatar-img"
       data-type="round"
@@ -81,7 +125,7 @@ exports[`<RoomAvatarView /> should render a video room decoration 1`] = `
     >
       <img
         alt=""
-        class="_image_1qbcf_41"
+        class="_image_zysgz_43"
         data-type="round"
         height="32px"
         loading="lazy"
@@ -92,6 +136,7 @@ exports[`<RoomAvatarView /> should render a video room decoration 1`] = `
     </span>
     <svg
       aria-label="This room is a video room"
+      aria-labelledby="_r_6_"
       class="mx_RoomAvatarView_icon"
       color="var(--cpd-color-icon-tertiary)"
       fill="currentColor"
@@ -115,7 +160,7 @@ exports[`<RoomAvatarView /> should render the AWAY presence 1`] = `
   >
     <span
       aria-label="Avatar"
-      class="_avatar_1qbcf_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_icon mx_RoomAvatarView_RoomAvatar_presence"
+      class="_avatar_zysgz_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_presence"
       data-color="1"
       data-testid="avatar-img"
       data-type="round"
@@ -123,7 +168,7 @@ exports[`<RoomAvatarView /> should render the AWAY presence 1`] = `
     >
       <img
         alt=""
-        class="_image_1qbcf_41"
+        class="_image_zysgz_43"
         data-type="round"
         height="32px"
         loading="lazy"
@@ -132,22 +177,9 @@ exports[`<RoomAvatarView /> should render the AWAY presence 1`] = `
         width="32px"
       />
     </span>
-    <svg
-      aria-label="This room is a video room"
-      class="mx_RoomAvatarView_icon"
-      color="var(--cpd-color-icon-tertiary)"
-      fill="currentColor"
-      height="16px"
-      viewBox="0 0 24 24"
-      width="16px"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M6 4h10a2 2 0 0 1 2 2v4.286l3.35-2.871a1 1 0 0 1 1.65.76v7.65a1 1 0 0 1-1.65.76L18 13.715V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4"
-      />
-    </svg>
     <svg
       aria-label="Away"
+      aria-labelledby="_r_14_"
       class="mx_RoomAvatarView_PresenceDecoration"
       color="var(--cpd-color-icon-quaternary)"
       fill="currentColor"
@@ -184,7 +216,7 @@ exports[`<RoomAvatarView /> should render the BUSY presence 1`] = `
   >
     <span
       aria-label="Avatar"
-      class="_avatar_1qbcf_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_icon mx_RoomAvatarView_RoomAvatar_presence"
+      class="_avatar_zysgz_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_presence"
       data-color="1"
       data-testid="avatar-img"
       data-type="round"
@@ -192,7 +224,7 @@ exports[`<RoomAvatarView /> should render the BUSY presence 1`] = `
     >
       <img
         alt=""
-        class="_image_1qbcf_41"
+        class="_image_zysgz_43"
         data-type="round"
         height="32px"
         loading="lazy"
@@ -201,22 +233,9 @@ exports[`<RoomAvatarView /> should render the BUSY presence 1`] = `
         width="32px"
       />
     </span>
-    <svg
-      aria-label="This room is a video room"
-      class="mx_RoomAvatarView_icon"
-      color="var(--cpd-color-icon-tertiary)"
-      fill="currentColor"
-      height="16px"
-      viewBox="0 0 24 24"
-      width="16px"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M6 4h10a2 2 0 0 1 2 2v4.286l3.35-2.871a1 1 0 0 1 1.65.76v7.65a1 1 0 0 1-1.65.76L18 13.715V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4"
-      />
-    </svg>
     <svg
       aria-label="Busy"
+      aria-labelledby="_r_u_"
       class="mx_RoomAvatarView_PresenceDecoration"
       color="var(--cpd-color-icon-tertiary)"
       fill="currentColor"
@@ -255,7 +274,7 @@ exports[`<RoomAvatarView /> should render the OFFLINE presence 1`] = `
   >
     <span
       aria-label="Avatar"
-      class="_avatar_1qbcf_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_icon mx_RoomAvatarView_RoomAvatar_presence"
+      class="_avatar_zysgz_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_presence"
       data-color="1"
       data-testid="avatar-img"
       data-type="round"
@@ -263,7 +282,7 @@ exports[`<RoomAvatarView /> should render the OFFLINE presence 1`] = `
     >
       <img
         alt=""
-        class="_image_1qbcf_41"
+        class="_image_zysgz_43"
         data-type="round"
         height="32px"
         loading="lazy"
@@ -272,22 +291,9 @@ exports[`<RoomAvatarView /> should render the OFFLINE presence 1`] = `
         width="32px"
       />
     </span>
-    <svg
-      aria-label="This room is a video room"
-      class="mx_RoomAvatarView_icon"
-      color="var(--cpd-color-icon-tertiary)"
-      fill="currentColor"
-      height="16px"
-      viewBox="0 0 24 24"
-      width="16px"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M6 4h10a2 2 0 0 1 2 2v4.286l3.35-2.871a1 1 0 0 1 1.65.76v7.65a1 1 0 0 1-1.65.76L18 13.715V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4"
-      />
-    </svg>
     <svg
       aria-label="Offline"
+      aria-labelledby="_r_o_"
       class="mx_RoomAvatarView_PresenceDecoration"
       color="var(--cpd-color-icon-tertiary)"
       fill="currentColor"
@@ -326,7 +332,7 @@ exports[`<RoomAvatarView /> should render the ONLINE presence 1`] = `
   >
     <span
       aria-label="Avatar"
-      class="_avatar_1qbcf_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_icon mx_RoomAvatarView_RoomAvatar_presence"
+      class="_avatar_zysgz_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_presence"
       data-color="1"
       data-testid="avatar-img"
       data-type="round"
@@ -334,7 +340,7 @@ exports[`<RoomAvatarView /> should render the ONLINE presence 1`] = `
     >
       <img
         alt=""
-        class="_image_1qbcf_41"
+        class="_image_zysgz_43"
         data-type="round"
         height="32px"
         loading="lazy"
@@ -343,22 +349,9 @@ exports[`<RoomAvatarView /> should render the ONLINE presence 1`] = `
         width="32px"
       />
     </span>
-    <svg
-      aria-label="This room is a video room"
-      class="mx_RoomAvatarView_icon"
-      color="var(--cpd-color-icon-tertiary)"
-      fill="currentColor"
-      height="16px"
-      viewBox="0 0 24 24"
-      width="16px"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M6 4h10a2 2 0 0 1 2 2v4.286l3.35-2.871a1 1 0 0 1 1.65.76v7.65a1 1 0 0 1-1.65.76L18 13.715V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4"
-      />
-    </svg>
     <svg
       aria-label="Online"
+      aria-labelledby="_r_i_"
       class="mx_RoomAvatarView_PresenceDecoration"
       color="var(--cpd-color-icon-accent-primary)"
       fill="currentColor"
diff --git a/test/unit-tests/components/views/avatars/__snapshots__/WithPresenceIndicator-test.tsx.snap b/test/unit-tests/components/views/avatars/__snapshots__/WithPresenceIndicator-test.tsx.snap
index 07f947d6d6..137bed37f6 100644
--- a/test/unit-tests/components/views/avatars/__snapshots__/WithPresenceIndicator-test.tsx.snap
+++ b/test/unit-tests/components/views/avatars/__snapshots__/WithPresenceIndicator-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`WithPresenceIndicator renders presence indicator with tooltip for DM rooms 1`] = `
 <DocumentFragment>
@@ -7,7 +7,7 @@ exports[`WithPresenceIndicator renders presence indicator with tooltip for DM ro
   >
     <span />
     <div
-      aria-labelledby="«r0»"
+      aria-labelledby="_r_0_"
       class="mx_WithPresenceIndicator_icon mx_WithPresenceIndicator_icon_online"
       style="width: 32px; height: 32px;"
       tabindex="0"
@@ -23,7 +23,7 @@ exports[`WithPresenceIndicator renders presence indicator with tooltip for DM ro
   >
     <span />
     <div
-      aria-labelledby="«r6»"
+      aria-labelledby="_r_6_"
       class="mx_WithPresenceIndicator_icon mx_WithPresenceIndicator_icon_offline"
       style="width: 32px; height: 32px;"
       tabindex="0"
@@ -39,7 +39,7 @@ exports[`WithPresenceIndicator renders presence indicator with tooltip for DM ro
   >
     <span />
     <div
-      aria-labelledby="«rc»"
+      aria-labelledby="_r_c_"
       class="mx_WithPresenceIndicator_icon mx_WithPresenceIndicator_icon_away"
       style="width: 32px; height: 32px;"
       tabindex="0"
diff --git a/test/unit-tests/components/views/beacon/RoomCallBanner-test.tsx b/test/unit-tests/components/views/beacon/RoomCallBanner-test.tsx
index 38cb77eb03..caa5b23810 100644
--- a/test/unit-tests/components/views/beacon/RoomCallBanner-test.tsx
+++ b/test/unit-tests/components/views/beacon/RoomCallBanner-test.tsx
@@ -14,7 +14,7 @@ import {
     type RoomMember,
     RoomStateEvent,
 } from "matrix-js-sdk/src/matrix";
-import { type ClientWidgetApi, Widget } from "matrix-widget-api";
+import { Widget } from "matrix-widget-api";
 import { act, cleanup, render, screen } from "jest-matrix-react";
 import { mocked, type Mocked } from "jest-mock";
 
@@ -30,7 +30,9 @@ import { CallStore } from "../../../../../src/stores/CallStore";
 import { WidgetMessagingStore } from "../../../../../src/stores/widgets/WidgetMessagingStore";
 import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
 import { ConnectionState } from "../../../../../src/models/Call";
-import { SdkContextClass } from "../../../../../src/contexts/SDKContext";
+import { ScopedRoomContextProvider } from "../../../../../src/contexts/ScopedRoomContext";
+import RoomContext, { type RoomContextType } from "../../../../../src/contexts/RoomContext";
+import { type WidgetMessaging } from "../../../../../src/stores/widgets/WidgetMessaging";
 
 describe("<RoomCallBanner />", () => {
     let client: Mocked<MatrixClient>;
@@ -42,6 +44,15 @@ describe("<RoomCallBanner />", () => {
         roomId: "!1:example.org",
     };
 
+    const mockRoomViewStore = {
+        isViewingCall: jest.fn().mockReturnValue(false),
+        on: jest.fn(),
+        off: jest.fn(),
+        emit: jest.fn(),
+    };
+
+    let roomContext: RoomContextType;
+
     beforeEach(() => {
         stubClient();
 
@@ -59,6 +70,16 @@ describe("<RoomCallBanner />", () => {
 
         setupAsyncStoreWithClient(CallStore.instance, client);
         setupAsyncStoreWithClient(WidgetMessagingStore.instance, client);
+
+        // Reset the mock RoomViewStore
+        mockRoomViewStore.isViewingCall.mockReturnValue(false);
+
+        // Create a stable room context for this test
+        roomContext = {
+            ...RoomContext,
+            roomId: room.roomId,
+            roomViewStore: mockRoomViewStore,
+        } as unknown as RoomContextType;
     });
 
     afterEach(async () => {
@@ -66,7 +87,11 @@ describe("<RoomCallBanner />", () => {
     });
 
     const renderBanner = async (props = {}): Promise<void> => {
-        render(<RoomCallBanner {...defaultProps} {...props} />);
+        render(
+            <ScopedRoomContextProvider {...roomContext}>
+                <RoomCallBanner {...defaultProps} {...props} />
+            </ScopedRoomContextProvider>,
+        );
         await act(() => Promise.resolve()); // Let effects settle
     };
 
@@ -91,7 +116,7 @@ describe("<RoomCallBanner />", () => {
             widget = new Widget(call.widget);
             WidgetMessagingStore.instance.storeMessaging(widget, room.roomId, {
                 stop: () => {},
-            } as unknown as ClientWidgetApi);
+            } as unknown as WidgetMessaging);
         });
         afterEach(() => {
             cleanup(); // Unmount before we do any cleanup that might update the component
@@ -117,8 +142,7 @@ describe("<RoomCallBanner />", () => {
         });
 
         it("doesn't show banner if the call is shown", async () => {
-            jest.spyOn(SdkContextClass.instance.roomViewStore, "isViewingCall");
-            mocked(SdkContextClass.instance.roomViewStore.isViewingCall).mockReturnValue(true);
+            mockRoomViewStore.isViewingCall.mockReturnValue(true);
             await renderBanner();
             const banner = await screen.queryByText("Video call");
             expect(banner).toBeFalsy();
diff --git a/test/unit-tests/components/views/beacon/__snapshots__/BeaconListItem-test.tsx.snap b/test/unit-tests/components/views/beacon/__snapshots__/BeaconListItem-test.tsx.snap
index 234b32911d..1cc41fd9f3 100644
--- a/test/unit-tests/components/views/beacon/__snapshots__/BeaconListItem-test.tsx.snap
+++ b/test/unit-tests/components/views/beacon/__snapshots__/BeaconListItem-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<BeaconListItem /> when a beacon is live and has locations renders beacon info 1`] = `
 <DocumentFragment>
@@ -32,15 +32,27 @@ exports[`<BeaconListItem /> when a beacon is live and has locations renders beac
           class="mx_BeaconListItem_interactions"
         >
           <a
-            aria-labelledby="«r0»"
+            aria-labelledby="_r_0_"
             data-testid="open-location-in-osm"
             href="https://www.openstreetmap.org/?mlat=51&mlon=41#map=16/51/41"
             rel="noreferrer noopener"
             target="_blank"
           >
-            <div
+            <svg
               class="mx_ShareLatestLocation_icon"
-            />
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+              />
+              <path
+                d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+              />
+            </svg>
           </a>
           <div
             class="mx_CopyableText mx_ShareLatestLocation_copy"
@@ -50,7 +62,22 @@ exports[`<BeaconListItem /> when a beacon is live and has locations renders beac
               class="mx_AccessibleButton mx_CopyableText_copyButton"
               role="button"
               tabindex="0"
-            />
+            >
+              <svg
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+                />
+                <path
+                  d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+                />
+              </svg>
+            </div>
           </div>
         </div>
       </div>
diff --git a/test/unit-tests/components/views/beacon/__snapshots__/BeaconMarker-test.tsx.snap b/test/unit-tests/components/views/beacon/__snapshots__/BeaconMarker-test.tsx.snap
index e65ab9d83e..71d694a368 100644
--- a/test/unit-tests/components/views/beacon/__snapshots__/BeaconMarker-test.tsx.snap
+++ b/test/unit-tests/components/views/beacon/__snapshots__/BeaconMarker-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<BeaconMarker /> renders marker when beacon has location 1`] = `
 <DocumentFragment>
@@ -11,7 +11,7 @@ exports[`<BeaconMarker /> renders marker when beacon has location 1`] = `
         class="mx_Marker_border"
       >
         <span
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
           data-color="6"
           data-testid="avatar-img"
           data-type="round"
diff --git a/test/unit-tests/components/views/beacon/__snapshots__/BeaconStatus-test.tsx.snap b/test/unit-tests/components/views/beacon/__snapshots__/BeaconStatus-test.tsx.snap
index 4676c6554d..ed53bc8fad 100644
--- a/test/unit-tests/components/views/beacon/__snapshots__/BeaconStatus-test.tsx.snap
+++ b/test/unit-tests/components/views/beacon/__snapshots__/BeaconStatus-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<BeaconStatus /> active state renders with children 1`] = `
 <span
diff --git a/test/unit-tests/components/views/beacon/__snapshots__/BeaconViewDialog-test.tsx.snap b/test/unit-tests/components/views/beacon/__snapshots__/BeaconViewDialog-test.tsx.snap
index 7c225cb014..5abc12c29b 100644
--- a/test/unit-tests/components/views/beacon/__snapshots__/BeaconViewDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/beacon/__snapshots__/BeaconViewDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<BeaconViewDialog /> renders a fallback when there are no locations 1`] = `
 <div
@@ -41,7 +41,7 @@ exports[`<BeaconViewDialog /> renders own beacon status when user is live sharin
   class="mx_DialogOwnBeaconStatus"
 >
   <span
-    class="_avatar_1qbcf_8 mx_BaseAvatar mx_DialogOwnBeaconStatus_avatar _avatar-imageless_1qbcf_52"
+    class="_avatar_zysgz_8 mx_BaseAvatar mx_DialogOwnBeaconStatus_avatar _avatar-imageless_zysgz_55"
     data-color="6"
     data-testid="avatar-img"
     data-type="round"
diff --git a/test/unit-tests/components/views/beacon/__snapshots__/DialogSidebar-test.tsx.snap b/test/unit-tests/components/views/beacon/__snapshots__/DialogSidebar-test.tsx.snap
index b9364bb6db..3d5922fcbe 100644
--- a/test/unit-tests/components/views/beacon/__snapshots__/DialogSidebar-test.tsx.snap
+++ b/test/unit-tests/components/views/beacon/__snapshots__/DialogSidebar-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<DialogSidebar /> renders sidebar correctly with beacons 1`] = `
 <div>
@@ -41,7 +41,7 @@ exports[`<DialogSidebar /> renders sidebar correctly with beacons 1`] = `
         class="mx_BeaconListItem"
       >
         <span
-          class="_avatar_1qbcf_8 mx_BaseAvatar mx_BeaconListItem_avatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar mx_BeaconListItem_avatar _avatar-imageless_zysgz_55"
           data-color="1"
           data-testid="avatar-img"
           data-type="round"
@@ -72,15 +72,27 @@ exports[`<DialogSidebar /> renders sidebar correctly with beacons 1`] = `
               class="mx_BeaconListItem_interactions"
             >
               <a
-                aria-labelledby="«r8»"
+                aria-labelledby="_r_8_"
                 data-testid="open-location-in-osm"
                 href="https://www.openstreetmap.org/?mlat=51&mlon=41#map=16/51/41"
                 rel="noreferrer noopener"
                 target="_blank"
               >
-                <div
+                <svg
                   class="mx_ShareLatestLocation_icon"
-                />
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+                  />
+                  <path
+                    d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+                  />
+                </svg>
               </a>
               <div
                 class="mx_CopyableText mx_ShareLatestLocation_copy"
@@ -90,7 +102,22 @@ exports[`<DialogSidebar /> renders sidebar correctly with beacons 1`] = `
                   class="mx_AccessibleButton mx_CopyableText_copyButton"
                   role="button"
                   tabindex="0"
-                />
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+                    />
+                    <path
+                      d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+                    />
+                  </svg>
+                </div>
               </div>
             </div>
           </div>
diff --git a/test/unit-tests/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap b/test/unit-tests/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap
index f052aaf61b..46a4798190 100644
--- a/test/unit-tests/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap
+++ b/test/unit-tests/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<LeftPanelLiveShareWarning /> when user has live location monitor renders correctly when minimized 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/beacon/__snapshots__/OwnBeaconStatus-test.tsx.snap b/test/unit-tests/components/views/beacon/__snapshots__/OwnBeaconStatus-test.tsx.snap
index cb68078b65..96c8b2142d 100644
--- a/test/unit-tests/components/views/beacon/__snapshots__/OwnBeaconStatus-test.tsx.snap
+++ b/test/unit-tests/components/views/beacon/__snapshots__/OwnBeaconStatus-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<OwnBeaconStatus /> renders without a beacon instance 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/beacon/__snapshots__/ShareLatestLocation-test.tsx.snap b/test/unit-tests/components/views/beacon/__snapshots__/ShareLatestLocation-test.tsx.snap
index 09500389af..eab675f369 100644
--- a/test/unit-tests/components/views/beacon/__snapshots__/ShareLatestLocation-test.tsx.snap
+++ b/test/unit-tests/components/views/beacon/__snapshots__/ShareLatestLocation-test.tsx.snap
@@ -1,17 +1,29 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<ShareLatestLocation /> renders share buttons when there is a location 1`] = `
 <DocumentFragment>
   <a
-    aria-labelledby="«r0»"
+    aria-labelledby="_r_0_"
     data-testid="open-location-in-osm"
     href="https://www.openstreetmap.org/?mlat=51&mlon=42#map=16/51/42"
     rel="noreferrer noopener"
     target="_blank"
   >
-    <div
+    <svg
       class="mx_ShareLatestLocation_icon"
-    />
+      fill="currentColor"
+      height="1em"
+      viewBox="0 0 24 24"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+      />
+      <path
+        d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+      />
+    </svg>
   </a>
   <div
     class="mx_CopyableText mx_ShareLatestLocation_copy"
@@ -21,7 +33,22 @@ exports[`<ShareLatestLocation /> renders share buttons when there is a location
       class="mx_AccessibleButton mx_CopyableText_copyButton"
       role="button"
       tabindex="0"
-    />
+    >
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+        />
+        <path
+          d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+        />
+      </svg>
+    </div>
   </div>
 </DocumentFragment>
 `;
diff --git a/test/unit-tests/components/views/beacon/__snapshots__/StyledLiveBeaconIcon-test.tsx.snap b/test/unit-tests/components/views/beacon/__snapshots__/StyledLiveBeaconIcon-test.tsx.snap
index e1e2bf1faa..c6f9c5d9fc 100644
--- a/test/unit-tests/components/views/beacon/__snapshots__/StyledLiveBeaconIcon-test.tsx.snap
+++ b/test/unit-tests/components/views/beacon/__snapshots__/StyledLiveBeaconIcon-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<StyledLiveBeaconIcon /> renders 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/context_menus/DeviceContextMenu-test.tsx b/test/unit-tests/components/views/context_menus/DeviceContextMenu-test.tsx
new file mode 100644
index 0000000000..af0ca451ec
--- /dev/null
+++ b/test/unit-tests/components/views/context_menus/DeviceContextMenu-test.tsx
@@ -0,0 +1,39 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { render } from "jest-matrix-react";
+import React from "react";
+
+import { clearAllModals } from "../../../../test-utils";
+import DeviceContextMenu from "../../../../../src/components/views/context_menus/DeviceContextMenu.tsx";
+import MediaDeviceHandler from "../../../../../src/MediaDeviceHandler.ts";
+
+describe("DeviceContextMenu", () => {
+    afterEach(async () => {
+        await clearAllModals();
+    });
+
+    it("renders a menu with the selected device checked", async () => {
+        jest.spyOn(MediaDeviceHandler, "getDevices").mockResolvedValue({
+            videoinput: [
+                { deviceId: "A", label: "Camera 1" } as MediaDeviceInfo,
+                { deviceId: "B", label: "Camera 2" } as MediaDeviceInfo,
+                { deviceId: "C", label: "Camera 3" } as MediaDeviceInfo,
+            ],
+            audioinput: [],
+            audiooutput: [],
+        });
+        jest.spyOn(MediaDeviceHandler, "getDevice").mockReturnValue("B");
+
+        const { container, findByLabelText } = render(
+            <DeviceContextMenu deviceKinds={["videoinput"]} onFinished={jest.fn()} mountAsChild />,
+        );
+
+        await expect(findByLabelText("Camera 2")).resolves.toBeChecked();
+        expect(container).toMatchSnapshot();
+    });
+});
diff --git a/test/unit-tests/components/views/context_menus/EmbeddedPage-test.tsx b/test/unit-tests/components/views/context_menus/EmbeddedPage-test.tsx
index 1740963583..b1d3b063dc 100644
--- a/test/unit-tests/components/views/context_menus/EmbeddedPage-test.tsx
+++ b/test/unit-tests/components/views/context_menus/EmbeddedPage-test.tsx
@@ -19,10 +19,10 @@ jest.mock("../../../../../src/languageHandler", () => ({
 }));
 
 describe("<EmbeddedPage />", () => {
-    it("should translate _t strings", async () => {
+    it.each([`"`, `'`, `&#x27;`, `&#x34;`])("should translate _t strings", async (character) => {
         mocked(_t).mockReturnValue("Przeglądaj pokoje");
         fetchMock.get("https://home.page", {
-            body: '<h1>_t("Explore rooms")</h1>',
+            body: `<h1>_t(${character}Explore rooms${character})</h1>`,
         });
 
         const { asFragment } = render(<EmbeddedPage url="https://home.page" />);
diff --git a/test/unit-tests/components/views/context_menus/MessageContextMenu-test.tsx b/test/unit-tests/components/views/context_menus/MessageContextMenu-test.tsx
index 411cc5d0e4..cd9246267d 100644
--- a/test/unit-tests/components/views/context_menus/MessageContextMenu-test.tsx
+++ b/test/unit-tests/components/views/context_menus/MessageContextMenu-test.tsx
@@ -27,8 +27,7 @@ import { mocked } from "jest-mock";
 import userEvent from "@testing-library/user-event";
 
 import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
-import { TimelineRenderingType } from "../../../../../src/contexts/RoomContext";
-import { type IRoomState } from "../../../../../src/components/structures/RoomView";
+import { type RoomContextType, TimelineRenderingType } from "../../../../../src/contexts/RoomContext";
 import { canEditContent } from "../../../../../src/utils/EventUtils";
 import { copyPlaintext, getSelectedText } from "../../../../../src/utils/strings";
 import MessageContextMenu from "../../../../../src/components/views/context_menus/MessageContextMenu";
@@ -356,6 +355,226 @@ describe("MessageContextMenu", () => {
         });
     });
 
+    describe("quote button", () => {
+        beforeEach(() => {
+            jest.clearAllMocks();
+        });
+
+        it("shows quote button when selection is inside one MTextBody and getSelectedText returns text", () => {
+            mocked(getSelectedText).mockReturnValue("quoted text");
+            const isSelectionWithinSingleTextBody = jest
+                .spyOn(MessageContextMenu.prototype as any, "isSelectionWithinSingleTextBody")
+                .mockReturnValue(true);
+
+            createRightClickMenuWithContent(createMessageEventContent("hello"));
+            const quoteButton = document.querySelector('li[aria-label="Quote"]');
+            expect(quoteButton).toBeTruthy();
+
+            isSelectionWithinSingleTextBody.mockRestore();
+        });
+
+        it("does not show quote button when getSelectedText returns empty", () => {
+            mocked(getSelectedText).mockReturnValue("");
+            const isSelectionWithinSingleTextBody = jest
+                .spyOn(MessageContextMenu.prototype as any, "isSelectionWithinSingleTextBody")
+                .mockReturnValue(true);
+
+            createRightClickMenuWithContent(createMessageEventContent("hello"));
+            const quoteButton = document.querySelector('li[aria-label="Quote"]');
+            expect(quoteButton).toBeFalsy();
+
+            isSelectionWithinSingleTextBody.mockRestore();
+        });
+
+        it("does not show quote button when selection is not inside one MTextBody", () => {
+            mocked(getSelectedText).mockReturnValue("quoted text");
+            const isSelectionWithinSingleTextBody = jest
+                .spyOn(MessageContextMenu.prototype as any, "isSelectionWithinSingleTextBody")
+                .mockReturnValue(false);
+
+            createRightClickMenuWithContent(createMessageEventContent("hello"));
+            const quoteButton = document.querySelector('li[aria-label="Quote"]');
+            expect(quoteButton).toBeFalsy();
+
+            isSelectionWithinSingleTextBody.mockRestore();
+        });
+
+        it("dispatches ComposerInsert with quoted text when quote button is clicked", () => {
+            mocked(getSelectedText).mockReturnValue("line1\nline2");
+            const dispatchSpy = jest.spyOn(dispatcher, "dispatch");
+            const isSelectionWithinSingleTextBody = jest
+                .spyOn(MessageContextMenu.prototype as any, "isSelectionWithinSingleTextBody")
+                .mockReturnValue(true);
+
+            createRightClickMenuWithContent(createMessageEventContent("hello"));
+            const quoteButton = document.querySelector('li[aria-label="Quote"]')!;
+            fireEvent.mouseDown(quoteButton);
+
+            expect(dispatchSpy).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    action: Action.ComposerInsert,
+                    text: "\n> line1\n> line2\n\n ",
+                }),
+            );
+
+            isSelectionWithinSingleTextBody.mockRestore();
+        });
+
+        it("does not show quote button when getSelectedText returns only whitespace", () => {
+            mocked(getSelectedText).mockReturnValue("   \n\t  "); // whitespace only
+            const isSelectionWithinSingleTextBody = jest
+                .spyOn(MessageContextMenu.prototype as any, "isSelectionWithinSingleTextBody")
+                .mockReturnValue(true);
+
+            createRightClickMenuWithContent(createMessageEventContent("hello"));
+            const quoteButton = document.querySelector('li[aria-label="Quote"]');
+            expect(quoteButton).toBeFalsy();
+
+            isSelectionWithinSingleTextBody.mockRestore();
+        });
+    });
+
+    describe("isSelectionWithinSingleTextBody", () => {
+        let mockGetSelection: jest.SpyInstance;
+        let contextMenuInstance: MessageContextMenu;
+
+        beforeEach(() => {
+            jest.clearAllMocks();
+
+            mockGetSelection = jest.spyOn(window, "getSelection");
+
+            const eventContent = createMessageEventContent("hello");
+            const mxEvent = new MatrixEvent({ type: EventType.RoomMessage, content: eventContent });
+
+            contextMenuInstance = new MessageContextMenu({
+                mxEvent,
+                onFinished: jest.fn(),
+                rightClick: true,
+            } as any);
+        });
+
+        afterEach(() => {
+            mockGetSelection.mockRestore();
+        });
+
+        it("returns false when there is no selection", () => {
+            mockGetSelection.mockReturnValue(null);
+
+            const result = (contextMenuInstance as any).isSelectionWithinSingleTextBody();
+            expect(result).toBe(false);
+        });
+
+        it("returns false when selection has no ranges", () => {
+            mockGetSelection.mockReturnValue({
+                rangeCount: 0,
+                getRangeAt: jest.fn(),
+            } as any);
+
+            const result = (contextMenuInstance as any).isSelectionWithinSingleTextBody();
+            expect(result).toBe(false);
+        });
+
+        it("returns true when selection is within a single mx_MTextBody element", () => {
+            // Create a mock MTextBody element
+            const textBodyElement = document.createElement("div");
+            textBodyElement.classList.add("mx_MTextBody");
+
+            // Create mock text nodes within the MTextBody
+            const startTextNode = document.createTextNode("start");
+            const endTextNode = document.createTextNode("end");
+            textBodyElement.appendChild(startTextNode);
+            textBodyElement.appendChild(endTextNode);
+
+            // Create a mock range with the text nodes
+            const mockRange = {
+                startContainer: startTextNode,
+                endContainer: endTextNode,
+            } as unknown as Range;
+
+            mockGetSelection.mockReturnValue({
+                rangeCount: 1,
+                getRangeAt: jest.fn().mockReturnValue(mockRange),
+            } as any);
+
+            const result = (contextMenuInstance as any).isSelectionWithinSingleTextBody();
+            expect(result).toBe(true);
+        });
+
+        it("returns false when selection spans multiple mx_MTextBody elements", () => {
+            // Create two different MTextBody elements
+            const textBody1 = document.createElement("div");
+            textBody1.classList.add("mx_MTextBody");
+            const textBody2 = document.createElement("div");
+            textBody2.classList.add("mx_MTextBody");
+
+            const startTextNode = document.createTextNode("start");
+            const endTextNode = document.createTextNode("end");
+            textBody1.appendChild(startTextNode);
+            textBody2.appendChild(endTextNode);
+
+            // Create a mock range spanning different MTextBody elements
+            const mockRange = {
+                startContainer: startTextNode,
+                endContainer: endTextNode,
+            } as unknown as Range;
+
+            mockGetSelection.mockReturnValue({
+                rangeCount: 1,
+                getRangeAt: jest.fn().mockReturnValue(mockRange),
+            } as any);
+
+            const result = (contextMenuInstance as any).isSelectionWithinSingleTextBody();
+            expect(result).toBe(false);
+        });
+
+        it("returns false when selection is outside any mx_MTextBody element", () => {
+            // Create regular div elements without mx_MTextBody class
+            const regularDiv1 = document.createElement("div");
+            const regularDiv2 = document.createElement("div");
+
+            const startTextNode = document.createTextNode("start");
+            const endTextNode = document.createTextNode("end");
+            regularDiv1.appendChild(startTextNode);
+            regularDiv2.appendChild(endTextNode);
+
+            // Create a mock range outside MTextBody elements
+            const mockRange = {
+                startContainer: startTextNode,
+                endContainer: endTextNode,
+            } as unknown as Range;
+
+            mockGetSelection.mockReturnValue({
+                rangeCount: 1,
+                getRangeAt: jest.fn().mockReturnValue(mockRange),
+            } as any);
+
+            const result = (contextMenuInstance as any).isSelectionWithinSingleTextBody();
+            expect(result).toBe(false);
+        });
+
+        it("returns true when start and end are the same mx_MTextBody element", () => {
+            const textBodyElement = document.createElement("div");
+            textBodyElement.classList.add("mx_MTextBody");
+
+            const textNode = document.createTextNode("same text");
+            textBodyElement.appendChild(textNode);
+
+            // Create a mock range within the same MTextBody element
+            const mockRange = {
+                startContainer: textNode,
+                endContainer: textNode,
+            } as unknown as Range;
+
+            mockGetSelection.mockReturnValue({
+                rangeCount: 1,
+                getRangeAt: jest.fn().mockReturnValue(mockRange),
+            } as any);
+
+            const result = (contextMenuInstance as any).isSelectionWithinSingleTextBody();
+            expect(result).toBe(true);
+        });
+    });
+
     describe("right click", () => {
         it("copy button does work as expected", () => {
             const text = "hello";
@@ -491,18 +710,18 @@ describe("MessageContextMenu", () => {
     });
 });
 
-function createRightClickMenuWithContent(eventContent: object, context?: Partial<IRoomState>): RenderResult {
+function createRightClickMenuWithContent(eventContent: object, context?: Partial<RoomContextType>): RenderResult {
     return createMenuWithContent(eventContent, { rightClick: true }, context);
 }
 
-function createRightClickMenu(mxEvent: MatrixEvent, context?: Partial<IRoomState>): RenderResult {
+function createRightClickMenu(mxEvent: MatrixEvent, context?: Partial<RoomContextType>): RenderResult {
     return createMenu(mxEvent, { rightClick: true }, context);
 }
 
 function createMenuWithContent(
     eventContent: object,
     props?: Partial<MessageContextMenu["props"]>,
-    context?: Partial<IRoomState>,
+    context?: Partial<RoomContextType>,
 ): RenderResult {
     // XXX: We probably shouldn't be assuming all events are going to be message events, but considering this
     // test is for the Message context menu, it's a fairly safe assumption.
@@ -519,7 +738,7 @@ function makeDefaultRoom(): Room {
 function createMenu(
     mxEvent: MatrixEvent,
     props?: Partial<MessageContextMenu["props"]>,
-    context: Partial<IRoomState> = {},
+    context: Partial<RoomContextType> = {},
     beacons: Map<BeaconIdentifier, Beacon> = new Map(),
     room: Room = makeDefaultRoom(),
 ): RenderResult {
@@ -528,13 +747,14 @@ function createMenu(
     // @ts-ignore illegally set private prop
     room.currentState.beacons = beacons;
 
-    mxEvent.setStatus(EventStatus.SENT);
+    // The base case is that we have received the remote echo and have an eventId. No sending status.
+    mxEvent.setStatus(null);
 
     client.getUserId = jest.fn().mockReturnValue("@user:example.com");
     client.getRoom = jest.fn().mockReturnValue(room);
 
     return render(
-        <ScopedRoomContextProvider {...(context as IRoomState)}>
+        <ScopedRoomContextProvider {...(context as RoomContextType)}>
             <MessageContextMenu mxEvent={mxEvent} onFinished={jest.fn()} {...props} />
         </ScopedRoomContextProvider>,
     );
diff --git a/test/unit-tests/components/views/context_menus/__snapshots__/DeviceContextMenu-test.tsx.snap b/test/unit-tests/components/views/context_menus/__snapshots__/DeviceContextMenu-test.tsx.snap
new file mode 100644
index 0000000000..2702c8620a
--- /dev/null
+++ b/test/unit-tests/components/views/context_menus/__snapshots__/DeviceContextMenu-test.tsx.snap
@@ -0,0 +1,85 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`DeviceContextMenu renders a menu with the selected device checked 1`] = `
+<div>
+  <div
+    class="mx_ContextualMenu_wrapper"
+  >
+    <div
+      class="mx_ContextualMenu_background"
+    />
+    <div
+      class="mx_ContextualMenu"
+      role="menu"
+    >
+      <ul
+        class="mx_IconizedContextMenu mx_DeviceContextMenu mx_IconizedContextMenu_compact"
+        role="none"
+      >
+        <div
+          class="mx_IconizedContextMenu_optionList mx_IconizedContextMenu_optionList_notFirst"
+        >
+          <div>
+            <span
+              class="mx_IconizedContextMenu_optionList_label"
+            >
+              Cameras
+            </span>
+          </div>
+          <div
+            aria-checked="false"
+            aria-label="Camera 1"
+            class="mx_AccessibleButton mx_IconizedContextMenu_item"
+            role="menuitemradio"
+            tabindex="0"
+          >
+            <span
+              class="mx_IconizedContextMenu_label"
+            >
+              Camera 1
+            </span>
+          </div>
+          <div
+            aria-checked="true"
+            aria-label="Camera 2"
+            class="mx_AccessibleButton mx_IconizedContextMenu_item mx_IconizedContextMenu_active"
+            role="menuitemradio"
+            tabindex="-1"
+          >
+            <span
+              class="mx_IconizedContextMenu_label"
+            >
+              Camera 2
+            </span>
+            <svg
+              class="mx_IconizedContextMenu_checked"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+              />
+            </svg>
+          </div>
+          <div
+            aria-checked="false"
+            aria-label="Camera 3"
+            class="mx_AccessibleButton mx_IconizedContextMenu_item"
+            role="menuitemradio"
+            tabindex="-1"
+          >
+            <span
+              class="mx_IconizedContextMenu_label"
+            >
+              Camera 3
+            </span>
+          </div>
+        </div>
+      </ul>
+    </div>
+  </div>
+</div>
+`;
diff --git a/test/unit-tests/components/views/context_menus/__snapshots__/EmbeddedPage-test.tsx.snap b/test/unit-tests/components/views/context_menus/__snapshots__/EmbeddedPage-test.tsx.snap
index fd88987845..b1537afa6a 100644
--- a/test/unit-tests/components/views/context_menus/__snapshots__/EmbeddedPage-test.tsx.snap
+++ b/test/unit-tests/components/views/context_menus/__snapshots__/EmbeddedPage-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<EmbeddedPage /> should render nothing if no url given 1`] = `
 <DocumentFragment>
@@ -41,3 +41,51 @@ exports[`<EmbeddedPage /> should translate _t strings 1`] = `
   </div>
 </DocumentFragment>
 `;
+
+exports[`<EmbeddedPage /> should translate _t strings 2`] = `
+<DocumentFragment>
+  <div
+    class="undefined_guest"
+  >
+    <div
+      class="undefined_body"
+    >
+      <h1>
+        Przeglądaj pokoje
+      </h1>
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`<EmbeddedPage /> should translate _t strings 3`] = `
+<DocumentFragment>
+  <div
+    class="undefined_guest"
+  >
+    <div
+      class="undefined_body"
+    >
+      <h1>
+        Przeglądaj pokoje
+      </h1>
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`<EmbeddedPage /> should translate _t strings 4`] = `
+<DocumentFragment>
+  <div
+    class="undefined_guest"
+  >
+    <div
+      class="undefined_body"
+    >
+      <h1>
+        Przeglądaj pokoje
+      </h1>
+    </div>
+  </div>
+</DocumentFragment>
+`;
diff --git a/test/unit-tests/components/views/context_menus/__snapshots__/RoomGeneralContextMenu-test.tsx.snap b/test/unit-tests/components/views/context_menus/__snapshots__/RoomGeneralContextMenu-test.tsx.snap
index be217b26f2..5eb947b1ff 100644
--- a/test/unit-tests/components/views/context_menus/__snapshots__/RoomGeneralContextMenu-test.tsx.snap
+++ b/test/unit-tests/components/views/context_menus/__snapshots__/RoomGeneralContextMenu-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`RoomGeneralContextMenu renders an empty context menu for archived rooms 1`] = `
 <div>
@@ -32,9 +32,20 @@ exports[`RoomGeneralContextMenu renders an empty context menu for archived rooms
             role="menuitem"
             tabindex="-1"
           >
-            <span
-              class="mx_IconizedContextMenu_icon mx_RoomGeneralContextMenu_iconSignOut"
-            />
+            <svg
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M14 13q.424 0 .713-.287A.97.97 0 0 0 15 12a.97.97 0 0 0-.287-.713A.97.97 0 0 0 14 11a.97.97 0 0 0-.713.287A.97.97 0 0 0 13 12q0 .424.287.713.288.287.713.287"
+              />
+              <path
+                d="M10.385 21.788A1 1 0 0 1 10 21V3a1.003 1.003 0 0 1 1.242-.97l8 2A1 1 0 0 1 20 5v14a1 1 0 0 1-.758.97l-8 2a1 1 0 0 1-.857-.182M18 5.781l-6-1.5v15.438l6-1.5zM9 6H7v12h2v2H7a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h2z"
+              />
+            </svg>
             <span
               class="mx_IconizedContextMenu_label"
             >
@@ -80,9 +91,20 @@ exports[`RoomGeneralContextMenu renders the default context menu 1`] = `
             role="menuitem"
             tabindex="-1"
           >
-            <span
-              class="mx_IconizedContextMenu_icon mx_RoomGeneralContextMenu_iconSignOut"
-            />
+            <svg
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M14 13q.424 0 .713-.287A.97.97 0 0 0 15 12a.97.97 0 0 0-.287-.713A.97.97 0 0 0 14 11a.97.97 0 0 0-.713.287A.97.97 0 0 0 13 12q0 .424.287.713.288.287.713.287"
+              />
+              <path
+                d="M10.385 21.788A1 1 0 0 1 10 21V3a1.003 1.003 0 0 1 1.242-.97l8 2A1 1 0 0 1 20 5v14a1 1 0 0 1-.758.97l-8 2a1 1 0 0 1-.857-.182M18 5.781l-6-1.5v15.438l6-1.5zM9 6H7v12h2v2H7a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h2z"
+              />
+            </svg>
             <span
               class="mx_IconizedContextMenu_label"
             >
diff --git a/test/unit-tests/components/views/context_menus/__snapshots__/SpaceContextMenu-test.tsx.snap b/test/unit-tests/components/views/context_menus/__snapshots__/SpaceContextMenu-test.tsx.snap
index 5135e2bd86..a364662232 100644
--- a/test/unit-tests/components/views/context_menus/__snapshots__/SpaceContextMenu-test.tsx.snap
+++ b/test/unit-tests/components/views/context_menus/__snapshots__/SpaceContextMenu-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SpaceContextMenu /> renders menu correctly 1`] = `
 "<body>
@@ -34,9 +34,17 @@ exports[`<SpaceContextMenu /> renders menu correctly 1`] = `
               role="menuitem"
               tabindex="0"
             >
-              <span
-                class="mx_IconizedContextMenu_icon mx_SpacePanel_iconHome"
-              />
+              <svg
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="m12.971 3.54 7 3.889A2 2 0 0 1 21 9.177V19a2 2 0 0 1-2 2h-4v-9H9v9H5a2 2 0 0 1-2-2V9.177a2 2 0 0 1 1.029-1.748l7-3.89a2 2 0 0 1 1.942 0"
+                />
+              </svg>
               <span
                 class="mx_IconizedContextMenu_label"
               >
@@ -49,9 +57,17 @@ exports[`<SpaceContextMenu /> renders menu correctly 1`] = `
               role="menuitem"
               tabindex="-1"
             >
-              <span
-                class="mx_IconizedContextMenu_icon mx_SpacePanel_iconExplore"
-              />
+              <svg
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M15.05 16.463a7.5 7.5 0 1 1 1.414-1.414l3.243 3.244a1 1 0 0 1-1.414 1.414zM16 10.5a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0"
+                />
+              </svg>
               <span
                 class="mx_IconizedContextMenu_label"
               >
@@ -64,9 +80,19 @@ exports[`<SpaceContextMenu /> renders menu correctly 1`] = `
               role="menuitem"
               tabindex="-1"
             >
-              <span
-                class="mx_IconizedContextMenu_icon mx_SpacePanel_iconPreferences"
-              />
+              <svg
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  clip-rule="evenodd"
+                  d="M6.5 2h11a4.5 4.5 0 1 1 0 9h-11a4.5 4.5 0 0 1 0-9m0 2h7.258A4.5 4.5 0 0 0 13 6.5c0 .925.28 1.785.758 2.5H6.5a2.5 2.5 0 0 1 0-5M15 6.5a2.5 2.5 0 1 1 5 0 2.5 2.5 0 0 1-5 0m-13 11A4.5 4.5 0 0 1 6.5 13h11a4.5 4.5 0 1 1 0 9h-11q-.233 0-.46-.023A4.5 4.5 0 0 1 2 17.5m8.242-2.5H17.5a2.5 2.5 0 0 1 0 5h-7.258A4.5 4.5 0 0 0 11 17.5c0-.925-.28-1.785-.758-2.5M6.5 15a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5"
+                  fill-rule="evenodd"
+                />
+              </svg>
               <span
                 class="mx_IconizedContextMenu_label"
               >
@@ -80,9 +106,20 @@ exports[`<SpaceContextMenu /> renders menu correctly 1`] = `
               role="menuitem"
               tabindex="-1"
             >
-              <span
-                class="mx_IconizedContextMenu_icon mx_SpacePanel_iconLeave"
-              />
+              <svg
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M14 13q.424 0 .713-.287A.97.97 0 0 0 15 12a.97.97 0 0 0-.287-.713A.97.97 0 0 0 14 11a.97.97 0 0 0-.713.287A.97.97 0 0 0 13 12q0 .424.287.713.288.287.713.287"
+                />
+                <path
+                  d="M10.385 21.788A1 1 0 0 1 10 21V3a1.003 1.003 0 0 1 1.242-.97l8 2A1 1 0 0 1 20 5v14a1 1 0 0 1-.758.97l-8 2a1 1 0 0 1-.857-.182M18 5.781l-6-1.5v15.438l6-1.5zM9 6H7v12h2v2H7a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h2z"
+                />
+              </svg>
               <span
                 class="mx_IconizedContextMenu_label"
               >
diff --git a/test/unit-tests/components/views/dialogs/AccessSecretStorageDialog-test.tsx b/test/unit-tests/components/views/dialogs/AccessSecretStorageDialog-test.tsx
index 2d597f8e18..2f136cb0e8 100644
--- a/test/unit-tests/components/views/dialogs/AccessSecretStorageDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/AccessSecretStorageDialog-test.tsx
@@ -29,15 +29,15 @@ describe("AccessSecretStorageDialog", () => {
         render(<AccessSecretStorageDialog {...defaultProps} {...props} />);
     };
 
-    const enterRecoveryKey = (): void => {
-        act(() => {
-            fireEvent.change(screen.getByRole("textbox"), {
+    const enterRecoveryKey = async (valueToEnter: string = recoveryKey): Promise<void> => {
+        await act(async () => {
+            fireEvent.change(screen.getByTitle("Recovery key"), {
                 target: {
-                    value: recoveryKey,
+                    value: valueToEnter,
                 },
             });
-            // wait for debounce
-            jest.advanceTimersByTime(250);
+            // wait for debounce, and then give `checkPrivateKey` a chance to complete
+            await jest.advanceTimersByTimeAsync(250);
         });
     };
 
@@ -67,7 +67,7 @@ describe("AccessSecretStorageDialog", () => {
         renderComponent({ onFinished, checkPrivateKey });
 
         // check that the input field is focused
-        expect(screen.getByRole("textbox")).toHaveFocus();
+        expect(screen.getByTitle("Recovery key")).toHaveFocus();
 
         await enterRecoveryKey();
         await submitDialog();
@@ -111,9 +111,27 @@ describe("AccessSecretStorageDialog", () => {
         renderComponent({ checkPrivateKey, keyInfo });
 
         await enterRecoveryKey();
-        expect(screen.getByRole("textbox")).toHaveValue(recoveryKey);
+        expect(screen.getByTitle("Recovery key")).toHaveValue(recoveryKey);
 
         await expect(screen.findByText("The recovery key you entered is not correct.")).resolves.toBeInTheDocument();
         expect(screen.getByText("Continue")).toHaveAttribute("aria-disabled", "true");
     });
+
+    it("Clears the 'invalid recovery key' notice when the input is cleared", async function () {
+        renderComponent({ onFinished: () => {}, checkPrivateKey: () => false });
+
+        jest.spyOn(mockClient.secretStorage, "checkKey").mockRejectedValue(new Error("invalid key"));
+
+        // First, enter the wrong recovery key
+        await enterRecoveryKey();
+        expect(screen.getByText("The recovery key you entered is not correct.")).toBeInTheDocument();
+
+        // Now, clear the input: the notice should be cleared.
+        await enterRecoveryKey("");
+        expect(screen.queryByText("The recovery key you entered is not correct.")).not.toBeInTheDocument();
+        expect(
+            screen.getByText("If you have a security key or security phrase, this will work too."),
+        ).toBeInTheDocument();
+        expect(screen.getByText("Continue")).toHaveAttribute("aria-disabled", "true");
+    });
 });
diff --git a/test/unit-tests/components/views/dialogs/BaseDialog-test.tsx b/test/unit-tests/components/views/dialogs/BaseDialog-test.tsx
new file mode 100644
index 0000000000..41a396c5b6
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/BaseDialog-test.tsx
@@ -0,0 +1,26 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { render } from "jest-matrix-react";
+import userEvent from "@testing-library/user-event";
+
+import BaseDialog from "../../../../../src/components/views/dialogs/BaseDialog.tsx";
+
+describe("BaseDialog", () => {
+    it("calls onFinished when Escape is pressed", async () => {
+        const onFinished = jest.fn();
+        const { container } = render(<BaseDialog onFinished={onFinished} />);
+        // Autolock's autofocus in the empty dialog is focusing on the close button and bringing up the tooltip
+        // So we either need to call escape twice(one for the tooltip and one for the dialog) or focus
+        // on the dialog first.
+        const dialog = container.querySelector('[role="dialog"]') as HTMLElement;
+        dialog?.focus();
+        await userEvent.keyboard("{Escape}");
+        expect(onFinished).toHaveBeenCalled();
+    });
+});
diff --git a/test/unit-tests/components/views/dialogs/BugReportDialog-test.tsx b/test/unit-tests/components/views/dialogs/BugReportDialog-test.tsx
index 955ac64b2d..f48db6ed91 100644
--- a/test/unit-tests/components/views/dialogs/BugReportDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/BugReportDialog-test.tsx
@@ -16,6 +16,7 @@ import BugReportDialog, {
 } from "../../../../../src/components/views/dialogs/BugReportDialog";
 import SdkConfig from "../../../../../src/SdkConfig";
 import { type ConsoleLogger } from "../../../../../src/rageshake/rageshake";
+import SettingsStore from "../../../../../src/settings/SettingsStore";
 
 const BUG_REPORT_URL = "https://example.org/submit";
 
@@ -26,35 +27,37 @@ describe("BugReportDialog", () => {
         return render(<BugReportDialog onFinished={onFinished} />);
     }
 
+    let prevLogger: ConsoleLogger;
     beforeEach(() => {
         jest.resetAllMocks();
         SdkConfig.put({
             bug_report_endpoint_url: BUG_REPORT_URL,
         });
 
+        const originalGetValue = SettingsStore.getValue;
+        jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName, ...args) => {
+            // These settings rely on a controller that creates an AudioContext in
+            // order to test whether the setting can be enabled. For the sake of this test, disable that.
+            if (settingName === "notificationsEnabled" || settingName === "notificationBodyEnabled") {
+                return true;
+            }
+            return originalGetValue(settingName, ...args);
+        });
+
         const mockConsoleLogger = {
             flush: jest.fn(),
             consume: jest.fn(),
             warn: jest.fn(),
         } as unknown as Mocked<ConsoleLogger>;
+        mockConsoleLogger.flush.mockReturnValue("line 1\nline 2\n");
 
-        // @ts-ignore - mock the console logger
+        prevLogger = global.mx_rage_logger;
         global.mx_rage_logger = mockConsoleLogger;
-
-        // @ts-ignore
-        mockConsoleLogger.flush.mockReturnValue([
-            {
-                id: "instance-0",
-                line: "line 1",
-            },
-            {
-                id: "instance-1",
-                line: "line 2",
-            },
-        ]);
     });
 
     afterEach(() => {
+        global.mx_rage_logger = prevLogger;
+        jest.restoreAllMocks();
         SdkConfig.reset();
         fetchMock.restore();
     });
diff --git a/test/unit-tests/components/views/dialogs/CreateRoomDialog-test.tsx b/test/unit-tests/components/views/dialogs/CreateRoomDialog-test.tsx
index ad3dcd58e9..9f648bb32e 100644
--- a/test/unit-tests/components/views/dialogs/CreateRoomDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/CreateRoomDialog-test.tsx
@@ -7,34 +7,37 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
-import { fireEvent, render, screen, within } from "jest-matrix-react";
-import { JoinRule, MatrixError, Preset, Visibility } from "matrix-js-sdk/src/matrix";
+import { act, fireEvent, render, screen, within } from "jest-matrix-react";
+import { type Room, JoinRule, MatrixError, Preset, Visibility } from "matrix-js-sdk/src/matrix";
 
 import CreateRoomDialog from "../../../../../src/components/views/dialogs/CreateRoomDialog";
-import { flushPromises, getMockClientWithEventEmitter, mockClientMethodsUser } from "../../../../test-utils";
+import { flushPromises, getMockClientWithEventEmitter, mkSpace, mockClientMethodsUser } from "../../../../test-utils";
 import SettingsStore from "../../../../../src/settings/SettingsStore";
+import { UIFeature } from "../../../../../src/settings/UIFeature";
 
 describe("<CreateRoomDialog />", () => {
     const userId = "@alice:server.org";
-    const mockClient = getMockClientWithEventEmitter({
-        ...mockClientMethodsUser(userId),
-        getDomain: jest.fn().mockReturnValue("server.org"),
-        getClientWellKnown: jest.fn(),
-        doesServerForceEncryptionForPreset: jest.fn(),
-        // make every alias available
-        getRoomIdForAlias: jest.fn().mockRejectedValue(new MatrixError({ errcode: "M_NOT_FOUND" })),
-    });
 
     const getE2eeEnableToggleInputElement = () => screen.getByLabelText("Enable end-to-end encryption");
-    // labelled toggle switch doesn't set the disabled attribute, only aria-disabled
-    const getE2eeEnableToggleIsDisabled = () =>
-        getE2eeEnableToggleInputElement().getAttribute("aria-disabled") === "true";
 
+    let mockClient: ReturnType<typeof getMockClientWithEventEmitter>;
     beforeEach(() => {
+        mockClient = getMockClientWithEventEmitter({
+            ...mockClientMethodsUser(userId),
+            getDomain: jest.fn().mockReturnValue("server.org"),
+            getClientWellKnown: jest.fn(),
+            doesServerForceEncryptionForPreset: jest.fn(),
+            // make every alias available
+            getRoomIdForAlias: jest.fn().mockRejectedValue(new MatrixError({ errcode: "M_NOT_FOUND" })),
+        });
         mockClient.doesServerForceEncryptionForPreset.mockResolvedValue(false);
         mockClient.getClientWellKnown.mockReturnValue({});
     });
 
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
     const getComponent = (props = {}) => render(<CreateRoomDialog onFinished={jest.fn()} {...props} />);
 
     it("should default to private room", async () => {
@@ -52,6 +55,55 @@ describe("<CreateRoomDialog />", () => {
         expect(screen.getByLabelText("Name")).toHaveDisplayValue(defaultName);
     });
 
+    it("should include topic in room creation options", async () => {
+        const onFinished = jest.fn();
+        render(<CreateRoomDialog onFinished={onFinished} />);
+        await flushPromises();
+
+        const topic = "This is a test topic";
+
+        // Set room name and topic.
+        fireEvent.change(screen.getByLabelText("Name"), { target: { value: "Room with topic" } });
+        fireEvent.change(screen.getByLabelText("Topic (optional)"), { target: { value: topic } });
+
+        // Create the room.
+        fireEvent.click(screen.getByText("Create room"));
+        await flushPromises();
+
+        expect(onFinished).toHaveBeenCalledWith(
+            true,
+            expect.objectContaining({
+                name: "Room with topic",
+                topic,
+            }),
+        );
+    });
+
+    it("should include no federate option in room creation options when enabled", async () => {
+        const onFinished = jest.fn();
+        render(<CreateRoomDialog onFinished={onFinished} />);
+        await flushPromises();
+
+        // Set room name, and disable federation.
+        fireEvent.change(screen.getByLabelText("Name"), { target: { value: "NoFederate Room" } });
+        fireEvent.click(screen.getByLabelText("Block anyone not part of server.org from ever joining this room."));
+
+        fireEvent.click(screen.getByText("Create room"));
+        await flushPromises();
+
+        expect(onFinished).toHaveBeenCalledWith(
+            true,
+            expect.objectContaining({
+                name: "NoFederate Room",
+                createOpts: expect.objectContaining({
+                    creation_content: expect.objectContaining({
+                        "m.federate": false,
+                    }),
+                }),
+            }),
+        );
+    });
+
     describe("for a private room", () => {
         // default behaviour is a private room
 
@@ -66,7 +118,7 @@ describe("<CreateRoomDialog />", () => {
             await flushPromises();
 
             expect(getE2eeEnableToggleInputElement()).not.toBeChecked();
-            expect(getE2eeEnableToggleIsDisabled()).toBeFalsy();
+            expect(getE2eeEnableToggleInputElement()).not.toBeDisabled();
             expect(
                 screen.getByText(
                     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.",
@@ -86,7 +138,7 @@ describe("<CreateRoomDialog />", () => {
             await flushPromises();
 
             expect(getE2eeEnableToggleInputElement()).not.toBeChecked();
-            expect(getE2eeEnableToggleIsDisabled()).toBeTruthy();
+            expect(getE2eeEnableToggleInputElement()).toBeDisabled();
             expect(
                 screen.getByText(
                     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.",
@@ -106,7 +158,7 @@ describe("<CreateRoomDialog />", () => {
             await flushPromises();
             // encryption enabled
             expect(getE2eeEnableToggleInputElement()).toBeChecked();
-            expect(getE2eeEnableToggleIsDisabled()).toBeFalsy();
+            expect(getE2eeEnableToggleInputElement()).not.toBeDisabled();
         });
 
         it("should use defaultEncrypted prop when it is false", async () => {
@@ -122,7 +174,7 @@ describe("<CreateRoomDialog />", () => {
             // encryption disabled
             expect(getE2eeEnableToggleInputElement()).not.toBeChecked();
             // not forced to off
-            expect(getE2eeEnableToggleIsDisabled()).toBeFalsy();
+            expect(getE2eeEnableToggleInputElement()).not.toBeDisabled();
         });
 
         it("should override defaultEncrypted when server .well-known forces disabled encryption", async () => {
@@ -137,7 +189,7 @@ describe("<CreateRoomDialog />", () => {
 
             // server forces encryption to disabled, even though defaultEncrypted is false
             expect(getE2eeEnableToggleInputElement()).not.toBeChecked();
-            expect(getE2eeEnableToggleIsDisabled()).toBeTruthy();
+            expect(getE2eeEnableToggleInputElement()).toBeDisabled();
             expect(
                 screen.getByText(
                     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.",
@@ -152,7 +204,7 @@ describe("<CreateRoomDialog />", () => {
 
             // server forces encryption to enabled, even though defaultEncrypted is true
             expect(getE2eeEnableToggleInputElement()).toBeChecked();
-            expect(getE2eeEnableToggleIsDisabled()).toBeTruthy();
+            expect(getE2eeEnableToggleInputElement()).toBeDisabled();
             expect(screen.getByText("Your server requires encryption to be enabled in private rooms.")).toBeDefined();
         });
 
@@ -162,7 +214,7 @@ describe("<CreateRoomDialog />", () => {
 
             await flushPromises();
             expect(getE2eeEnableToggleInputElement()).toBeChecked();
-            expect(getE2eeEnableToggleIsDisabled()).toBeTruthy();
+            expect(getE2eeEnableToggleInputElement()).toBeDisabled();
 
             expect(screen.getByText("Your server requires encryption to be enabled in private rooms.")).toBeDefined();
         });
@@ -181,8 +233,9 @@ describe("<CreateRoomDialog />", () => {
 
         it("should create a private room", async () => {
             const onFinished = jest.fn();
-            getComponent({ onFinished });
+            const { asFragment } = getComponent({ onFinished });
             await flushPromises();
+            expect(asFragment()).toMatchSnapshot();
 
             const roomName = "Test Room Name";
             fireEvent.change(screen.getByLabelText("Name"), { target: { value: roomName } });
@@ -191,14 +244,46 @@ describe("<CreateRoomDialog />", () => {
             await flushPromises();
 
             expect(onFinished).toHaveBeenCalledWith(true, {
-                createOpts: {
-                    name: roomName,
-                },
+                createOpts: {},
+                name: roomName,
                 encryption: true,
+                stateEncryption: false,
                 parentSpace: undefined,
                 roomType: undefined,
             });
         });
+
+        it("should render not the advanced options when UI.advancedSettings is disabled", async () => {
+            jest.spyOn(SettingsStore, "getValue").mockImplementation(
+                (setting) => setting !== UIFeature.AdvancedSettings,
+            );
+            const { asFragment } = getComponent();
+            await flushPromises();
+            expect(asFragment()).toMatchSnapshot();
+        });
+
+        describe("when the state encryption labs flag is on", () => {
+            beforeEach(() => {
+                jest.spyOn(SettingsStore, "getValue").mockImplementation(
+                    (settingName) => settingName === "feature_msc4362_encrypted_state_events",
+                );
+            });
+
+            it("should turn on state encryption when toggled", async () => {
+                // Given we have the create room dialog open
+                const { asFragment } = getComponent();
+                await flushPromises();
+                expect(asFragment()).toMatchSnapshot();
+
+                // When I click the Encrypt state events toggle
+                const toggle = screen.getByRole("switch", { name: "Encrypt state events" });
+                expect(toggle).not.toBeChecked();
+                act(() => toggle.click());
+
+                // Then it changes state
+                expect(toggle).toBeChecked();
+            });
+        });
     });
 
     describe("for a knock room", () => {
@@ -243,10 +328,11 @@ describe("<CreateRoomDialog />", () => {
                 await flushPromises();
                 expect(onFinished).toHaveBeenCalledWith(true, {
                     createOpts: {
-                        name: roomName,
                         visibility: Visibility.Private,
                     },
+                    name: roomName,
                     encryption: true,
+                    stateEncryption: false,
                     joinRule: JoinRule.Knock,
                     parentSpace: undefined,
                     roomType: undefined,
@@ -255,16 +341,17 @@ describe("<CreateRoomDialog />", () => {
 
             it("should create a knock room with public visibility", async () => {
                 fireEvent.click(
-                    screen.getByRole("checkbox", { name: "Make this room visible in the public room directory." }),
+                    screen.getByRole("switch", { name: "Make this room visible in the public room directory." }),
                 );
                 fireEvent.click(screen.getByText("Create room"));
                 await flushPromises();
                 expect(onFinished).toHaveBeenCalledWith(true, {
                     createOpts: {
-                        name: roomName,
                         visibility: Visibility.Public,
                     },
+                    name: roomName,
                     encryption: true,
+                    stateEncryption: false,
                     joinRule: JoinRule.Knock,
                     parentSpace: undefined,
                     roomType: undefined,
@@ -333,15 +420,111 @@ describe("<CreateRoomDialog />", () => {
 
             expect(onFinished).toHaveBeenCalledWith(true, {
                 createOpts: {
-                    name: roomName,
                     preset: Preset.PublicChat,
                     room_alias_name: roomAlias,
                     visibility: Visibility.Public,
                 },
+                name: roomName,
                 guestAccess: false,
                 parentSpace: undefined,
                 roomType: undefined,
             });
         });
     });
+
+    describe("for a room in a space", () => {
+        let parentSpace: Room;
+        beforeEach(() => {
+            parentSpace = mkSpace(mockClient, "!space:server") as unknown as Room;
+        });
+
+        it("should create a room with restricted join rule when selected", async () => {
+            const onFinished = jest.fn();
+            render(<CreateRoomDialog parentSpace={parentSpace} onFinished={onFinished} />);
+            await flushPromises();
+
+            // Set room name and visibility.
+            fireEvent.change(screen.getByLabelText("Name"), { target: { value: "Restricted Room" } });
+            fireEvent.click(screen.getByLabelText("Room visibility"));
+            fireEvent.click(screen.getByRole("option", { name: "Visible to space members" }));
+
+            fireEvent.click(screen.getByText("Create room"));
+            await flushPromises();
+
+            expect(onFinished).toHaveBeenCalledWith(
+                true,
+                expect.objectContaining({
+                    name: "Restricted Room",
+                    joinRule: JoinRule.Restricted,
+                }),
+            );
+        });
+
+        it("should create a room with public join rule when selected", async () => {
+            const onFinished = jest.fn();
+            render(<CreateRoomDialog parentSpace={parentSpace} onFinished={onFinished} />);
+            await flushPromises();
+
+            // Set room name and visibility. Rooms in spaces also need an address.
+            fireEvent.change(screen.getByLabelText("Name"), { target: { value: "Public Room" } });
+            fireEvent.click(screen.getByLabelText("Room visibility"));
+            fireEvent.click(screen.getByRole("option", { name: "Public room" }));
+            fireEvent.change(screen.getByLabelText("Room address"), { target: { value: "testroom" } });
+
+            // Create the room.
+            fireEvent.click(screen.getByText("Create room"));
+            await flushPromises();
+
+            expect(onFinished).toHaveBeenCalledWith(
+                true,
+                expect.objectContaining({
+                    name: "Public Room",
+                    createOpts: expect.objectContaining({
+                        room_alias_name: "testroom",
+                        visibility: Visibility.Public,
+                        preset: Preset.PublicChat,
+                    }),
+                    guestAccess: false,
+                    roomType: undefined,
+                }),
+            );
+        });
+    });
+
+    describe("keyboard shortcuts", () => {
+        it("should submit the form when Enter is pressed", async () => {
+            const onFinished = jest.fn();
+            render(<CreateRoomDialog onFinished={onFinished} />);
+            await flushPromises();
+
+            // Simulate pressing the Enter key.
+            fireEvent.change(screen.getByLabelText("Name"), { target: { value: "Keyboard Room" } });
+            fireEvent.keyDown(screen.getByLabelText("Name"), { key: "Enter", code: "Enter", charCode: 13 });
+
+            await flushPromises();
+
+            expect(onFinished).toHaveBeenCalledWith(
+                true,
+                expect.objectContaining({
+                    name: "Keyboard Room",
+                }),
+            );
+        });
+
+        it("should cancel the dialog when Escape is pressed", async () => {
+            const onFinished = jest.fn();
+            render(<CreateRoomDialog onFinished={onFinished} />);
+            await flushPromises();
+
+            // Simulate pressing the Escape key.
+            fireEvent.keyDown(screen.getByLabelText("Name"), { key: "Escape", code: "Escape", charCode: 27 });
+
+            await flushPromises();
+
+            // BaseDialog passes no arguments, but DialogButtons pass false - might not be desirable?
+            expect(onFinished).toHaveBeenCalled();
+            const callArgs = onFinished.mock.calls[0];
+            expect(callArgs.length === 0 || callArgs[0] === false).toBe(true);
+        });
+    });
 });
diff --git a/test/unit-tests/components/views/dialogs/ForwardDialog-test.tsx b/test/unit-tests/components/views/dialogs/ForwardDialog-test.tsx
index b6ab8a7b38..370f612c9c 100644
--- a/test/unit-tests/components/views/dialogs/ForwardDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/ForwardDialog-test.tsx
@@ -153,8 +153,9 @@ describe("ForwardDialog", () => {
 
         await userEvent.keyboard("[Enter]");
         expect(mockClient.sendEvent).toHaveBeenCalledWith("A", "m.room.message", {
-            body: "Hello world!",
-            msgtype: "m.text",
+            "body": "Hello world!",
+            "msgtype": "m.text",
+            "m.mentions": {},
         });
     });
 
@@ -248,6 +249,37 @@ describe("ForwardDialog", () => {
         expect(secondButton.getAttribute("aria-disabled")).toBeFalsy();
     });
 
+    it("strips mentions from forwarded messages", async () => {
+        const messageWithMention = mkEvent({
+            type: "m.room.message",
+            room: sourceRoom,
+            user: "@bob:example.org",
+            content: {
+                "msgtype": "m.text",
+                "body": "Hi @alice:example.org",
+                "m.mentions": {
+                    user_ids: ["@alice:example.org"],
+                },
+            },
+            event: true,
+        });
+
+        const { container } = mountForwardDialog(messageWithMention);
+        const roomId = "a";
+
+        // Click the send button.
+        act(() => {
+            const sendButton = container.querySelector(".mx_ForwardList_sendButton");
+            fireEvent.click(sendButton!);
+        });
+
+        // Expected content should have mentions empty.
+        expect(mockClient.sendEvent).toHaveBeenCalledWith(roomId, messageWithMention.getType(), {
+            ...messageWithMention.getContent(),
+            "m.mentions": {},
+        });
+    });
+
     describe("Location events", () => {
         // 14.03.2022 16:15
         const now = 1647270879403;
@@ -357,11 +389,12 @@ describe("ForwardDialog", () => {
 
             sendToFirstRoom(container);
 
-            expect(mockClient.sendEvent).toHaveBeenCalledWith(
-                roomId,
-                pinDropLocationEvent.getType(),
-                pinDropLocationEvent.getContent(),
-            );
+            const expectedContent = {
+                ...pinDropLocationEvent.getContent(),
+                "m.mentions": {}, // Add mentions (explicitly set to empty)
+            };
+
+            expect(mockClient.sendEvent).toHaveBeenCalledWith(roomId, pinDropLocationEvent.getType(), expectedContent);
         });
     });
 
diff --git a/test/unit-tests/components/views/dialogs/IntegrationsDisabledDialog-test.tsx b/test/unit-tests/components/views/dialogs/IntegrationsDisabledDialog-test.tsx
new file mode 100644
index 0000000000..e89e33f4cd
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/IntegrationsDisabledDialog-test.tsx
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React from "react";
+import { fireEvent, render } from "jest-matrix-react";
+
+import { IntegrationsDisabledDialog } from "../../../../../src/components/views/dialogs/IntegrationsDisabledDialog.tsx";
+import defaultDispatcher from "../../../../../src/dispatcher/dispatcher.ts";
+import { Action } from "../../../../../src/dispatcher/actions.ts";
+import { UserTab } from "../../../../../src/components/views/dialogs/UserTab.ts";
+
+describe("<IntegrationsDisabledDialog />", () => {
+    const onFinished = jest.fn();
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    function renderComponent() {
+        return render(<IntegrationsDisabledDialog onFinished={onFinished} />);
+    }
+
+    it("should render as expected", () => {
+        const { asFragment } = renderComponent();
+        expect(asFragment()).toMatchSnapshot();
+    });
+    it("should do nothing on clicking OK", () => {
+        const { getByText } = renderComponent();
+        fireEvent.click(getByText("OK"));
+        expect(onFinished).toHaveBeenCalled();
+    });
+    it("should open the correct user settings tab on clicking Settings", () => {
+        jest.spyOn(defaultDispatcher, "dispatch").mockImplementation(() => {});
+        const { getByText } = renderComponent();
+        fireEvent.click(getByText("Settings"));
+        expect(onFinished).toHaveBeenCalled();
+        expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({
+            action: Action.ViewUserSettings,
+            initialTabId: UserTab.Security,
+        });
+    });
+});
diff --git a/test/unit-tests/components/views/dialogs/InviteDialog-test.tsx b/test/unit-tests/components/views/dialogs/InviteDialog-test.tsx
index 02d0d8dd2e..a9774a00b5 100644
--- a/test/unit-tests/components/views/dialogs/InviteDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/InviteDialog-test.tsx
@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
-import { fireEvent, render, screen } from "jest-matrix-react";
+import { fireEvent, render, screen, findByText } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
 import { RoomType, type MatrixClient, MatrixError, Room } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
@@ -72,6 +72,7 @@ const expectNoPill = (value: string) => {
     expect(getSearchField()).toHaveValue(value);
 };
 
+const serverDomain = "example.org";
 const roomId = "!111111111111111111:example.org";
 const aliceId = "@alice:example.org";
 const aliceEmail = "foobar@email.com";
@@ -103,6 +104,7 @@ describe("InviteDialog", () => {
 
     beforeEach(() => {
         mockClient = getMockClientWithEventEmitter({
+            getDomain: jest.fn().mockReturnValue(serverDomain),
             getUserId: jest.fn().mockReturnValue(bobId),
             getSafeUserId: jest.fn().mockReturnValue(bobId),
             isGuest: jest.fn().mockReturnValue(false),
@@ -135,6 +137,7 @@ describe("InviteDialog", () => {
             supportsThreads: jest.fn().mockReturnValue(false),
             isInitialSyncComplete: jest.fn().mockReturnValue(true),
             getClientWellKnown: jest.fn().mockResolvedValue({}),
+            invite: jest.fn(),
         });
         SdkConfig.put({ validated_server_config: {} as ValidatedServerConfig } as IConfigOptions);
         DMRoomMap.makeShared(mockClient);
@@ -395,15 +398,25 @@ describe("InviteDialog", () => {
         input.focus();
         await userEvent.keyboard(`${aliceId}`);
 
-        const btn = await screen.findByText(aliceId, {
-            selector: ".mx_InviteDialog_tile_nameStack_userId .mx_InviteDialog_tile--room_highlight",
-        });
+        const btn = await screen.findByRole("option", { name: aliceId });
         fireEvent.click(btn);
 
-        const tile = await screen.findByText(aliceId, { selector: ".mx_InviteDialog_userTile_name" });
+        const tile = await findByText(screen.getByTestId("invite-dialog-input-wrapper"), aliceId);
         expect(tile).toBeInTheDocument();
     });
 
+    describe("while the invite is in progress", () => {
+        it("should show a spinner", async () => {
+            mockClient.invite.mockReturnValue(new Promise(() => {}));
+
+            render(<InviteDialog kind={InviteKind.Invite} roomId={roomId} onFinished={jest.fn()} />);
+            await enterIntoSearchField(bobId);
+            await userEvent.click(screen.getByRole("button", { name: "Invite" }));
+
+            await screen.findByText("Preparing invitations...");
+        });
+    });
+
     describe("when inviting a user with an unknown profile", () => {
         beforeEach(async () => {
             render(<InviteDialog kind={InviteKind.Dm} onFinished={jest.fn()} />);
diff --git a/test/unit-tests/components/views/dialogs/InviteProgressBody-test.tsx b/test/unit-tests/components/views/dialogs/InviteProgressBody-test.tsx
new file mode 100644
index 0000000000..021a2fb6e7
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/InviteProgressBody-test.tsx
@@ -0,0 +1,18 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { render } from "jest-matrix-react";
+
+import InviteProgressBody from "../../../../../src/components/views/dialogs/InviteProgressBody.tsx";
+
+describe("InviteProgressBody", () => {
+    it("should match snapshot", () => {
+        const { asFragment } = render(<InviteProgressBody />);
+        expect(asFragment()).toMatchSnapshot();
+    });
+});
diff --git a/test/unit-tests/components/views/dialogs/LeaveSpaceDialog-test.tsx b/test/unit-tests/components/views/dialogs/LeaveSpaceDialog-test.tsx
new file mode 100644
index 0000000000..387af00d43
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/LeaveSpaceDialog-test.tsx
@@ -0,0 +1,50 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { render, screen } from "jest-matrix-react";
+import { MatrixEvent, type RoomMember } from "matrix-js-sdk/src/matrix";
+
+import LeaveSpaceDialog from "../../../../../src/components/views/dialogs/LeaveSpaceDialog";
+import { createTestClient, mkStubRoom } from "../../../../test-utils";
+
+describe("LeaveSpaceDialog", () => {
+    it("should warn about not being able to rejoin non-public space", () => {
+        const mockClient = createTestClient();
+        const mockSpace = mkStubRoom("myfakeroom", "myfakeroom", mockClient) as any;
+        jest.spyOn(mockSpace.currentState, "getStateEvents").mockReturnValue(
+            new MatrixEvent({
+                type: "m.room.join_rules",
+                content: {
+                    join_rule: "invite",
+                },
+            }),
+        );
+
+        render(<LeaveSpaceDialog space={mockSpace} onFinished={jest.fn()} />);
+
+        expect(screen.getByText(/You won't be able to rejoin unless you are re-invited/)).toBeInTheDocument();
+    });
+
+    it("should warn if user is the only admin", () => {
+        const mockClient = createTestClient();
+        const mockSpace = mkStubRoom("myfakeroom", "myfakeroom", mockClient) as any;
+        jest.spyOn(mockSpace, "getJoinedMembers").mockReturnValue([
+            { powerLevel: 100 } as unknown as RoomMember,
+            { powerLevel: 0 } as unknown as RoomMember,
+        ]);
+        jest.spyOn(mockSpace, "getMember").mockReturnValue({
+            powerLevel: 100,
+        } as unknown as RoomMember);
+
+        render(<LeaveSpaceDialog space={mockSpace} onFinished={jest.fn()} />);
+
+        expect(
+            screen.getByText(/You're the only admin of this space. Leaving it will mean no one has control over it./),
+        ).toBeInTheDocument();
+    });
+});
diff --git a/test/unit-tests/components/views/dialogs/LogoutDialog-test.tsx b/test/unit-tests/components/views/dialogs/LogoutDialog-test.tsx
index cee615380f..4e8a017ed8 100644
--- a/test/unit-tests/components/views/dialogs/LogoutDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/LogoutDialog-test.tsx
@@ -10,10 +10,13 @@ import React from "react";
 import { mocked, type MockedObject } from "jest-mock";
 import { type MatrixClient } from "matrix-js-sdk/src/matrix";
 import { type CryptoApi, type KeyBackupInfo } from "matrix-js-sdk/src/crypto-api";
-import { fireEvent, render, type RenderResult, screen } from "jest-matrix-react";
+import { fireEvent, render, type RenderResult, screen, waitFor } from "jest-matrix-react";
 
 import { filterConsole, getMockClientWithEventEmitter, mockClientMethodsCrypto } from "../../../../test-utils";
 import LogoutDialog from "../../../../../src/components/views/dialogs/LogoutDialog";
+import dispatch from "../../../../../src/dispatcher/dispatcher";
+import { Action } from "../../../../../src/dispatcher/actions";
+import { UserTab } from "../../../../../src/components/views/dialogs/UserTab";
 
 describe("LogoutDialog", () => {
     let mockClient: MockedObject<MatrixClient>;
@@ -56,17 +59,26 @@ describe("LogoutDialog", () => {
         await rendered.findByText("You'll lose access to your encrypted messages");
     });
 
-    it("Prompts user to connect backup if there is a backup on the server", async () => {
+    it("Prompts user to go to settings if there is a backup on the server", async () => {
         mockCrypto.getKeyBackupInfo.mockResolvedValue({} as KeyBackupInfo);
         const rendered = renderComponent();
-        await rendered.findByText("Connect this session to Key Backup");
+        await rendered.findByText("Go to Settings");
         expect(rendered.container).toMatchSnapshot();
+
+        jest.spyOn(dispatch, "dispatch");
+        fireEvent.click(await screen.findByRole("button", { name: "Go to Settings" }));
+        await waitFor(() =>
+            expect(dispatch.dispatch).toHaveBeenCalledWith({
+                action: Action.ViewUserSettings,
+                initialTabId: UserTab.Encryption,
+            }),
+        );
     });
 
-    it("Prompts user to set up backup if there is no backup on the server", async () => {
+    it("Prompts user to go to settings if there is no backup on the server", async () => {
         mockCrypto.getKeyBackupInfo.mockResolvedValue(null);
         const rendered = renderComponent();
-        await rendered.findByText("Start using Key Backup");
+        await rendered.findByText("Go to Settings");
         expect(rendered.container).toMatchSnapshot();
 
         fireEvent.click(await screen.findByRole("button", { name: "Manually export keys" }));
@@ -75,12 +87,12 @@ describe("LogoutDialog", () => {
 
     describe("when there is an error fetching backups", () => {
         filterConsole("Unable to fetch key backup status");
-        it("prompts user to set up backup", async () => {
+        it("prompts user to go to settings", async () => {
             mockCrypto.getKeyBackupInfo.mockImplementation(async () => {
                 throw new Error("beep");
             });
             const rendered = renderComponent();
-            await rendered.findByText("Start using Key Backup");
+            await rendered.findByText("Go to Settings");
         });
     });
 });
diff --git a/test/unit-tests/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx b/test/unit-tests/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx
new file mode 100644
index 0000000000..14fbb69663
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2024-2025 New Vector Ltd.
+ * Copyright 2023 The Matrix.org Foundation C.I.C.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React from "react";
+import { act, fireEvent, render, screen, waitFor } from "jest-matrix-react";
+import { type MatrixClient } from "matrix-js-sdk/src/matrix";
+import { DeviceVerificationStatus } from "matrix-js-sdk/src/crypto-api";
+
+import { clearAllModals, stubClient } from "../../../../test-utils";
+import { ManualDeviceKeyVerificationDialog } from "../../../../../src/components/views/dialogs/ManualDeviceKeyVerificationDialog";
+
+describe("ManualDeviceKeyVerificationDialog", () => {
+    let mockClient: MatrixClient;
+
+    function renderDialog(onFinished: (confirm: boolean) => void) {
+        return render(<ManualDeviceKeyVerificationDialog onFinished={onFinished} />);
+    }
+
+    beforeEach(async () => {
+        mockClient = stubClient();
+        mockExistingDevices();
+        await clearAllModals();
+    });
+
+    it("should render correctly", () => {
+        // When we render a dialog populated with data
+        const { dialog } = populateDialog("XYZ", "ABCDEFGH");
+
+        // Then the dialog looks as expected
+        expect(dialog.asFragment()).toMatchSnapshot();
+    });
+
+    it("should call onFinished and crossSignDevice if we click Verify", async () => {
+        // Given a dialog populated with correct data
+        const { dialog, onFinished } = populateDialog("DEVICEID", "FINGERPRINT");
+
+        // When we click Verify session
+        dialog.getByRole("button", { name: "Verify session" }).click();
+
+        // Then crossSignDevice is called
+        await waitFor(async () => {
+            expect(onFinished).toHaveBeenCalledWith(true);
+            expect(mockClient.getCrypto()?.crossSignDevice).toHaveBeenCalledWith("DEVICEID");
+        });
+    });
+
+    it("should not call crossSignDevice if fingerprint is wrong", async () => {
+        // Given a dialog populated with incorrect fingerprint
+        const { dialog, onFinished } = populateDialog("DEVICEID", "WRONG_FINGERPRINT");
+
+        // When we click Verify session
+        act(() => dialog.getByRole("button", { name: "Verify session" }).click());
+
+        // Then crossSignDevice is not called
+        await waitFor(async () => {
+            expect(onFinished).toHaveBeenCalledWith(true);
+            expect(mockClient.getCrypto()?.crossSignDevice).not.toHaveBeenCalled();
+        });
+
+        // And an error is displayed
+        expect(
+            screen.getByText(
+                "the supplied fingerprint 'WRONG_FINGERPRINT' does not match the device fingerprint, 'FINGERPRINT'",
+                { exact: false },
+            ),
+        ).toBeVisible();
+    });
+
+    it("should not call crossSignDevice if device is already verified", async () => {
+        // Given a dialog populated with a correct fingerprint for a verified device
+        const { dialog, onFinished } = populateDialog("VERIFIED_DEVICEID", "VERIFIED_FINGERPRINT");
+
+        // When we click Verify session
+        act(() => dialog.getByRole("button", { name: "Verify session" }).click());
+
+        // Then crossSignDevice is not called
+        await waitFor(async () => {
+            expect(onFinished).toHaveBeenCalledWith(true);
+            expect(mockClient.getCrypto()?.crossSignDevice).not.toHaveBeenCalled();
+        });
+
+        // And an error is displayed
+        await expect(
+            screen.findByText("Failed to verify 'VERIFIED_DEVICEID': This device is already verified"),
+        ).resolves.toBeVisible();
+    });
+
+    it("should not call crossSignDevice if device is already verified and fingerprint is wrong", async () => {
+        // Given a dialog populated with an incorrect fingerprint for a verified device
+        const { dialog, onFinished } = populateDialog("VERIFIED_DEVICEID", "WRONG_FINGERPRINT");
+
+        // When we click Verify session
+        act(() => dialog.getByRole("button", { name: "Verify session" }).click());
+
+        // Then crossSignDevice is not called
+        await waitFor(async () => {
+            expect(onFinished).toHaveBeenCalledWith(true);
+            expect(mockClient.getCrypto()?.crossSignDevice).not.toHaveBeenCalled();
+        });
+
+        // And an error is displayed
+        expect(
+            screen.getByText("The supplied fingerprint does not match, but the device is already verified!", {
+                exact: false,
+            }),
+        ).toBeVisible();
+    });
+
+    it("should not call crossSignDevice if device is not found", async () => {
+        // Given a dialog populated with incorrect device ID
+        const { dialog, onFinished } = populateDialog("WRONG_DEVICE_ID", "FINGERPRINT");
+
+        // When we click Verify session
+        act(() => dialog.getByRole("button", { name: "Verify session" }).click());
+
+        // Then crossSignDevice is not called
+        await waitFor(async () => {
+            expect(onFinished).toHaveBeenCalledWith(true);
+            expect(mockClient.getCrypto()?.crossSignDevice).not.toHaveBeenCalled();
+        });
+
+        // And an error is displayed
+        expect(screen.getByText("device 'WRONG_DEVICE_ID' was not found", { exact: false })).toBeVisible();
+    });
+
+    it("should call onFinished but not crossSignDevice if we click Cancel", () => {
+        // Given a dialog populated with correct data
+        const { dialog, onFinished } = populateDialog("DEVICEID", "FINGERPRINT");
+
+        // When we click cancel
+        dialog.getByRole("button", { name: "Cancel" }).click();
+
+        // Then only onFinished is called
+        expect(onFinished).toHaveBeenCalledWith(false);
+        expect(mockClient.getCrypto()?.crossSignDevice).not.toHaveBeenCalled();
+    });
+
+    function unverifiedDevice(): DeviceVerificationStatus {
+        return new DeviceVerificationStatus({});
+    }
+
+    function verifiedDevice(): DeviceVerificationStatus {
+        return new DeviceVerificationStatus({
+            signedByOwner: true,
+            crossSigningVerified: true,
+            tofu: true,
+            localVerified: true,
+            trustCrossSignedDevices: true,
+        });
+    }
+
+    /**
+     * Set up two devices: DEVICEID, which is unverified, and VERIFIED_DEVICEID, which is verified.
+     */
+    function mockExistingDevices() {
+        mockClient.getCrypto()!.getDeviceVerificationStatus = jest
+            .fn()
+            .mockImplementation(async (_userId, deviceId) =>
+                deviceId === "DEVICEID" ? unverifiedDevice() : verifiedDevice(),
+            );
+
+        mockClient.getCrypto()!.getUserDeviceInfo = jest.fn().mockImplementation(async (userIds) => {
+            const userDevices = new Map();
+            userDevices.set("DEVICEID", { getFingerprint: jest.fn().mockReturnValue("FINGERPRINT") });
+            userDevices.set("VERIFIED_DEVICEID", { getFingerprint: jest.fn().mockReturnValue("VERIFIED_FINGERPRINT") });
+
+            const deviceMap = new Map();
+            for (const userId of userIds) {
+                deviceMap.set(userId, userDevices);
+            }
+            return deviceMap;
+        });
+    }
+
+    function populateDialog(deviceId: string, fingerprint: string) {
+        const onFinished = jest.fn();
+        const dialog = renderDialog(onFinished);
+        const deviceIdBox = dialog.getByRole("textbox", { name: "Device ID" });
+        const fingerprintBox = dialog.getByRole("textbox", { name: "Fingerprint (session key)" });
+        fireEvent.change(deviceIdBox, { target: { value: deviceId } });
+        fireEvent.change(fingerprintBox, { target: { value: fingerprint } });
+        return { dialog, onFinished };
+    }
+});
diff --git a/test/unit-tests/components/views/dialogs/MessageEditHistoryDialog-test.tsx b/test/unit-tests/components/views/dialogs/MessageEditHistoryDialog-test.tsx
index 2f0b0a4974..028c415932 100644
--- a/test/unit-tests/components/views/dialogs/MessageEditHistoryDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/MessageEditHistoryDialog-test.tsx
@@ -13,10 +13,12 @@ import { EventType, MatrixEvent } from "matrix-js-sdk/src/matrix";
 import type { MatrixClient } from "matrix-js-sdk/src/matrix";
 import { flushPromises, mkMessage, stubClient } from "../../../../test-utils";
 import MessageEditHistoryDialog from "../../../../../src/components/views/dialogs/MessageEditHistoryDialog";
+import { SDKContext, SdkContextClass } from "../../../../../src/contexts/SDKContext";
 
 describe("<MessageEditHistory />", () => {
     const roomId = "!aroom:example.com";
     let client: jest.Mocked<MatrixClient>;
+    let sdkContext: SdkContextClass;
     let event: MatrixEvent;
 
     beforeEach(() => {
@@ -27,10 +29,13 @@ describe("<MessageEditHistory />", () => {
             room: "!room:example.com",
             msg: "My Great Message",
         });
+        sdkContext = new SdkContextClass();
     });
 
     async function renderComponent(): Promise<RenderResult> {
-        const result = render(<MessageEditHistoryDialog mxEvent={event} onFinished={jest.fn()} />);
+        const result = render(<MessageEditHistoryDialog mxEvent={event} onFinished={jest.fn()} />, {
+            wrapper: ({ children }) => <SDKContext.Provider value={sdkContext}>{children}</SDKContext.Provider>,
+        });
         await waitForElementToBeRemoved(() => result.queryByRole("progressbar"));
         await flushPromises();
         return result;
diff --git a/test/components/views/dialogs/ModalWidgetDialog-test.tsx b/test/unit-tests/components/views/dialogs/ModalWidgetDialog-test.tsx
similarity index 84%
rename from test/components/views/dialogs/ModalWidgetDialog-test.tsx
rename to test/unit-tests/components/views/dialogs/ModalWidgetDialog-test.tsx
index 134aa46ad6..e72712ec31 100644
--- a/test/components/views/dialogs/ModalWidgetDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/ModalWidgetDialog-test.tsx
@@ -12,11 +12,11 @@ import { TooltipProvider } from "@vector-im/compound-web";
 import { mocked } from "jest-mock";
 import { findLast, last } from "lodash";
 
-import ModalWidgetDialog from "../../../../src/components/views/dialogs/ModalWidgetDialog";
-import { stubClient } from "../../../test-utils";
-import defaultDispatcher from "../../../../src/dispatcher/dispatcher";
-import { Action } from "../../../../src/dispatcher/actions";
-import SettingsStore from "../../../../src/settings/SettingsStore";
+import ModalWidgetDialog from "../../../../../src/components/views/dialogs/ModalWidgetDialog";
+import { stubClient } from "../../../../test-utils";
+import defaultDispatcher from "../../../../../src/dispatcher/dispatcher";
+import { Action } from "../../../../../src/dispatcher/actions";
+import SettingsStore from "../../../../../src/settings/SettingsStore";
 
 jest.mock("matrix-widget-api", () => ({
     ...jest.requireActual("matrix-widget-api"),
diff --git a/test/unit-tests/components/views/dialogs/SlashCommandHelpDialog-test.tsx b/test/unit-tests/components/views/dialogs/SlashCommandHelpDialog-test.tsx
new file mode 100644
index 0000000000..00e4aa96db
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/SlashCommandHelpDialog-test.tsx
@@ -0,0 +1,90 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { render, screen } from "jest-matrix-react";
+
+import SlashCommandHelpDialog from "../../../../../src/components/views/dialogs/SlashCommandHelpDialog";
+import { stubClient } from "../../../../test-utils";
+import { Command } from "../../../../../src/slash-commands/command";
+import { CommandCategories } from "../../../../../src/slash-commands/interface";
+import { _t, _td } from "../../../../../src/languageHandler";
+import * as SlashCommands from "../../../../../src/SlashCommands";
+
+describe("SlashCommandHelpDialog", () => {
+    const roomId = "!room:server";
+
+    beforeEach(() => {
+        stubClient();
+    });
+
+    it("should filter out disabled commands", () => {
+        // Create commands with some enabled and some disabled
+        const enabledCommand = new Command({
+            command: "enabled",
+            args: "<arg>",
+            description: _td("slash_command|spoiler"),
+            runFn: jest.fn(),
+            category: CommandCategories.messages,
+            isEnabled: () => true,
+        });
+
+        const disabledCommand = new Command({
+            command: "disabled",
+            args: "<arg>",
+            description: _td("slash_command|shrug"),
+            runFn: jest.fn(),
+            category: CommandCategories.messages,
+            isEnabled: () => false,
+        });
+
+        // Mock the Commands array by replacing the property
+        Object.defineProperty(SlashCommands, "Commands", {
+            value: [enabledCommand, disabledCommand],
+            configurable: true,
+        });
+
+        const onFinished = jest.fn();
+        render(<SlashCommandHelpDialog roomId={roomId} onFinished={onFinished} />);
+
+        // The enabled command should be visible
+        expect(screen.getByText("/enabled")).toBeInTheDocument();
+
+        // The disabled command should not be visible
+        expect(screen.queryByText("/disabled")).not.toBeInTheDocument();
+    });
+
+    it("should group commands by category", () => {
+        const messageCommand = new Command({
+            command: "msg",
+            args: "",
+            description: _td("slash_command|plain"),
+            runFn: jest.fn(),
+            category: CommandCategories.messages,
+        });
+
+        const adminCommand = new Command({
+            command: "admin",
+            args: "",
+            description: _td("slash_command|upgraderoom"),
+            runFn: jest.fn(),
+            category: CommandCategories.admin,
+        });
+
+        Object.defineProperty(SlashCommands, "Commands", {
+            value: [messageCommand, adminCommand],
+            configurable: true,
+        });
+
+        const onFinished = jest.fn();
+        render(<SlashCommandHelpDialog roomId={roomId} onFinished={onFinished} />);
+
+        // Both category headers should be present
+        expect(screen.getByText(_t(CommandCategories.messages))).toBeInTheDocument();
+        expect(screen.getByText(_t(CommandCategories.admin))).toBeInTheDocument();
+    });
+});
diff --git a/test/unit-tests/components/views/dialogs/SpotlightDialog-test.tsx b/test/unit-tests/components/views/dialogs/SpotlightDialog-test.tsx
index 1c343a30a7..2cf9511686 100644
--- a/test/unit-tests/components/views/dialogs/SpotlightDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/SpotlightDialog-test.tsx
@@ -664,4 +664,39 @@ describe("Spotlight Dialog", () => {
             }),
         );
     });
+
+    describe("keyboard prompt filter and query checks", () => {
+        it("should show left and right arrow keys in keyboard hint when filter is null and no query", async () => {
+            render(<SpotlightDialog onFinished={() => null} />);
+            jest.advanceTimersByTime(200);
+            await flushPromisesWithFakeTimers();
+
+            const keyboardPrompt = document.querySelector("#mx_SpotlightDialog_keyboardPrompt");
+            expect(keyboardPrompt).toBeInTheDocument();
+            expect(keyboardPrompt?.textContent).toContain("←");
+            expect(keyboardPrompt?.textContent).toContain("→");
+        });
+
+        it("should not show left and right arrow keys in keyboard hint when filter is set", async () => {
+            render(<SpotlightDialog initialFilter={Filter.People} onFinished={() => null} />);
+            jest.advanceTimersByTime(200);
+            await flushPromisesWithFakeTimers();
+
+            const keyboardPrompt = document.querySelector("#mx_SpotlightDialog_keyboardPrompt");
+            expect(keyboardPrompt).toBeInTheDocument();
+            expect(keyboardPrompt?.textContent).not.toContain("←");
+            expect(keyboardPrompt?.textContent).not.toContain("→");
+        });
+
+        it("should not show left and right arrow keys in keyboard hint when query is present", async () => {
+            render(<SpotlightDialog initialText="test query" onFinished={() => null} />);
+            jest.advanceTimersByTime(200);
+            await flushPromisesWithFakeTimers();
+
+            const keyboardPrompt = document.querySelector("#mx_SpotlightDialog_keyboardPrompt");
+            expect(keyboardPrompt).toBeInTheDocument();
+            expect(keyboardPrompt?.textContent).not.toContain("←");
+            expect(keyboardPrompt?.textContent).not.toContain("→");
+        });
+    });
 });
diff --git a/test/unit-tests/components/views/dialogs/UploadConfirmDialog-test.tsx b/test/unit-tests/components/views/dialogs/UploadConfirmDialog-test.tsx
new file mode 100644
index 0000000000..43b3f912ac
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/UploadConfirmDialog-test.tsx
@@ -0,0 +1,27 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { render } from "jest-matrix-react";
+import { secureRandomString } from "matrix-js-sdk/src/randomstring";
+
+import UploadConfirmDialog from "../../../../../src/components/views/dialogs/UploadConfirmDialog.tsx";
+
+describe("<UploadConfirmDialog />", () => {
+    it("should display image preview", () => {
+        const url = "blob:null/1234-5678-9101-1121";
+        jest.spyOn(URL, "createObjectURL").mockReturnValue(url);
+
+        const file = new File([secureRandomString(1024 * 124)], "image.png", { type: "image/png" });
+        const { asFragment, getByRole } = render(
+            <UploadConfirmDialog file={file} currentIndex={0} totalFiles={1} onFinished={jest.fn()} />,
+        );
+
+        expect(getByRole("img")).toHaveAttribute("src", url);
+        expect(asFragment()).toMatchSnapshot();
+    });
+});
diff --git a/test/unit-tests/components/views/dialogs/UserSettingsDialog-test.tsx b/test/unit-tests/components/views/dialogs/UserSettingsDialog-test.tsx
index 8ffe9e3de6..6582bd4d3a 100644
--- a/test/unit-tests/components/views/dialogs/UserSettingsDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/UserSettingsDialog-test.tsx
@@ -7,9 +7,9 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type ReactElement } from "react";
-import { render, screen } from "jest-matrix-react";
+import { render, screen, waitFor } from "jest-matrix-react";
 import { mocked, type MockedObject } from "jest-mock";
-import { type MatrixClient } from "matrix-js-sdk/src/matrix";
+import { ClientEvent, MatrixEvent, type MatrixClient } from "matrix-js-sdk/src/matrix";
 
 import SettingsStore, { type CallbackFn } from "../../../../../src/settings/SettingsStore";
 import SdkConfig from "../../../../../src/SdkConfig";
@@ -250,4 +250,28 @@ describe("<UserSettingsDialog />", () => {
         // unwatches settings on unmount
         expect(mockSettingsStore.unwatchSetting).toHaveBeenCalledWith("mock-watcher-id-feature_mjolnir");
     });
+
+    it("displays an indicator when user needs to set up recovery", async () => {
+        // Initially, the user doesn't have secret storage, so it should display
+        // an indicator.
+        mockClient.secretStorage.getDefaultKeyId.mockResolvedValue(null);
+
+        const { container } = render(getComponent());
+
+        await waitFor(() => {
+            expect(container.querySelector(".mx_SettingsDialog_tabLabelsAlert")).toBeInTheDocument();
+        });
+
+        // Test that the handler ignores unknown account data
+        mockClient.emit(ClientEvent.AccountData, new MatrixEvent({ type: "bar" }));
+
+        // The user now has secret storage.  Trigger an update and check that
+        // the indicator disappears.
+        mockClient.secretStorage.getDefaultKeyId.mockResolvedValue("foo");
+        mockClient.emit(ClientEvent.AccountData, new MatrixEvent({ type: "m.secret_storage.default_key" }));
+
+        await waitFor(() => {
+            expect(container.querySelector(".mx_SettingsDialog_tabLabelsAlert")).not.toBeInTheDocument();
+        });
+    });
 });
diff --git a/test/unit-tests/components/views/dialogs/VerificationRequestDialog-test.tsx b/test/unit-tests/components/views/dialogs/VerificationRequestDialog-test.tsx
new file mode 100644
index 0000000000..e019faec4a
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/VerificationRequestDialog-test.tsx
@@ -0,0 +1,349 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { act, render, screen } from "jest-matrix-react";
+import { TypedEventEmitter, User } from "matrix-js-sdk/src/matrix";
+import {
+    type ShowSasCallbacks,
+    VerificationPhase,
+    type Verifier,
+    type VerificationRequest,
+    type ShowQrCodeCallbacks,
+    VerificationRequestEvent,
+    type VerificationRequestEventHandlerMap,
+} from "matrix-js-sdk/src/crypto-api";
+import { VerificationMethod } from "matrix-js-sdk/src/types";
+
+import { stubClient } from "../../../../test-utils";
+import VerificationRequestDialog from "../../../../../src/components/views/dialogs/VerificationRequestDialog";
+
+describe("VerificationRequestDialog", () => {
+    function renderComponent(phase: VerificationPhase, method?: "emoji" | "qr"): ReturnType<typeof render> {
+        const member = User.createUser("@alice:example.org", stubClient());
+        const request = createRequest(phase, method);
+
+        return render(
+            <VerificationRequestDialog onFinished={jest.fn()} member={member} verificationRequest={request} />,
+        );
+    }
+
+    it("Initially, asks how you would like to verify this device", async () => {
+        const dialog = renderComponent(VerificationPhase.Ready);
+
+        expect(screen.getByRole("heading", { name: "Choose how to verify" })).toBeInTheDocument();
+        expect(screen.getByText("Verify by completing one of the following:")).toBeInTheDocument();
+
+        expect(dialog.asFragment()).toMatchSnapshot();
+    });
+
+    it("After we started verification here, says we are waiting for the other device", async () => {
+        const dialog = renderComponent(VerificationPhase.Requested);
+
+        expect(screen.getByRole("heading", { name: "Start verification on the other device" })).toBeInTheDocument();
+        expect(screen.getByText("Once accepted you'll be able to continue with the verification.")).toBeInTheDocument();
+
+        expect(dialog.asFragment()).toMatchSnapshot();
+    });
+
+    it("When other device accepted emoji, displays emojis and asks for confirmation", async () => {
+        const dialog = renderComponent(VerificationPhase.Started, "emoji");
+
+        expect(screen.getByRole("heading", { name: "Compare emojis" })).toBeInTheDocument();
+
+        expect(
+            screen.getByText("Confirm that the emojis below match those shown on your other device."),
+        ).toBeInTheDocument();
+
+        expect(dialog.asFragment()).toMatchSnapshot();
+    });
+
+    it("After scanning QR, shows confirmation dialog", async () => {
+        const dialog = renderComponent(VerificationPhase.Started, "qr");
+
+        expect(
+            screen.getByRole("heading", {
+                name: "Confirm that you see a green shield on your other device",
+            }),
+        ).toBeInTheDocument();
+
+        // We used to have a subheading here: confirm it is not present.
+        expect(screen.queryByRole("heading", { name: "Verify by scanning" })).not.toBeInTheDocument();
+
+        expect(screen.getByText("Check again on your other device to finish verification.")).toBeInTheDocument();
+        expect(screen.getByRole("button", { name: "Yes, I see a green shield" })).toBeInTheDocument();
+        expect(screen.getByRole("button", { name: "No, I don't see a green shield" })).toBeInTheDocument();
+
+        expect(dialog.asFragment()).toMatchSnapshot();
+    });
+
+    it("Shows a successful message if verification finished normally", async () => {
+        const dialog = renderComponent(VerificationPhase.Done);
+
+        expect(screen.getByRole("heading", { name: "Device verified" })).toBeInTheDocument();
+
+        expect(
+            screen.getByText(
+                "Now you can read or send messages securely, and anyone you chat with can also trust this device.",
+            ),
+        ).toBeInTheDocument();
+
+        expect(dialog.asFragment()).toMatchSnapshot();
+    });
+
+    it("Shows a failure message if verification was cancelled", async () => {
+        const dialog = renderComponent(VerificationPhase.Cancelled);
+
+        expect(screen.getByRole("heading", { name: "Verification failed" })).toBeInTheDocument();
+
+        // We used to have a sub-heading here: confirm is it not present.
+        expect(screen.queryByRole("heading", { name: "Verification cancelled" })).not.toBeInTheDocument();
+
+        expect(
+            screen.getByText(
+                "Either the request timed out, the request was denied, or there was a verification mismatch.",
+            ),
+        ).toBeInTheDocument();
+
+        expect(dialog.asFragment()).toMatchSnapshot();
+    });
+
+    it("Renders correctly if the request is supplied later via a promise", async () => {
+        // Given we supply a promise of a request instead of a request
+        const member = User.createUser("@alice:example.org", stubClient());
+        const requestPromise = Promise.resolve(createRequest(VerificationPhase.Cancelled));
+
+        // When we render the dialog
+        render(
+            <VerificationRequestDialog
+                onFinished={jest.fn()}
+                member={member}
+                verificationRequestPromise={requestPromise}
+            />,
+        );
+
+        // And wait for the component to mount, the promise to resolve and the component state to update
+        await act(async () => await new Promise(process.nextTick));
+
+        // Then it renders the resolved information
+        expect(screen.getByRole("heading", { name: "Verification failed" })).toBeInTheDocument();
+
+        expect(
+            screen.getByText(
+                "Either the request timed out, the request was denied, or there was a verification mismatch.",
+            ),
+        ).toBeInTheDocument();
+    });
+
+    it("Renders the later promise request if both immediate and promise are supplied", async () => {
+        // Given we supply a promise of a request as well as a request
+        const member = User.createUser("@alice:example.org", stubClient());
+        const request = createRequest(VerificationPhase.Ready);
+        const requestPromise = Promise.resolve(createRequest(VerificationPhase.Cancelled));
+
+        // When we render the dialog
+        render(
+            <VerificationRequestDialog
+                onFinished={jest.fn()}
+                member={member}
+                verificationRequest={request}
+                verificationRequestPromise={requestPromise}
+            />,
+        );
+
+        // And wait for the component to mount, the promise to resolve and the component state to update
+        await act(async () => await new Promise(process.nextTick));
+
+        // Then it renders the information from the request in the promise
+        expect(screen.getByRole("heading", { name: "Verification failed" })).toBeInTheDocument();
+
+        expect(
+            screen.getByText(
+                "Either the request timed out, the request was denied, or there was a verification mismatch.",
+            ),
+        ).toBeInTheDocument();
+    });
+
+    it("Changes the dialog contents when the request changes phase", async () => {
+        // Given we rendered the component with a phase of Unsent
+        const member = User.createUser("@alice:example.org", stubClient());
+        const request = createRequest(VerificationPhase.Unsent);
+
+        render(<VerificationRequestDialog onFinished={jest.fn()} member={member} verificationRequest={request} />);
+
+        // When I cancel the request (which changes phase and emits a Changed event)
+        await act(async () => await request.cancel());
+
+        // Then the dialog is updated to reflect that
+        expect(screen.getByRole("heading", { name: "Verification failed" })).toBeInTheDocument();
+
+        expect(
+            screen.getByText(
+                "Either the request timed out, the request was denied, or there was a verification mismatch.",
+            ),
+        ).toBeInTheDocument();
+    });
+});
+
+function createRequest(phase: VerificationPhase, method?: "emoji" | "qr"): MockVerificationRequest {
+    let verifier = undefined;
+    let chosenMethod = null;
+
+    switch (method) {
+        case "emoji":
+            chosenMethod = VerificationMethod.Sas;
+            verifier = createEmojiVerifier();
+            break;
+        case "qr":
+            chosenMethod = VerificationMethod.Reciprocate;
+            verifier = createQrVerifier();
+            break;
+    }
+
+    return new MockVerificationRequest(phase, verifier, chosenMethod);
+}
+
+function createEmojiVerifier(): Verifier {
+    const showSasCallbacks = {
+        sas: {
+            emoji: [
+                // Example set of emoji to display.
+                ["🐶", "Dog"],
+                ["🐱", "Cat"],
+            ],
+        },
+    } as ShowSasCallbacks;
+
+    return {
+        getShowSasCallbacks: jest.fn().mockReturnValue(showSasCallbacks),
+        getReciprocateQrCodeCallbacks: jest.fn(),
+        on: jest.fn(),
+        off: jest.fn(),
+        verify: jest.fn(),
+    } as unknown as Verifier;
+}
+
+function createQrVerifier(): Verifier {
+    const reciprocateQrCodeCallbacks = {
+        confirm: jest.fn(),
+        cancel: jest.fn(),
+    } as ShowQrCodeCallbacks;
+
+    return {
+        getShowSasCallbacks: jest.fn(),
+        getReciprocateQrCodeCallbacks: jest.fn().mockReturnValue(reciprocateQrCodeCallbacks),
+        on: jest.fn(),
+        off: jest.fn(),
+        verify: jest.fn(),
+    } as unknown as Verifier;
+}
+
+class MockVerificationRequest
+    extends TypedEventEmitter<VerificationRequestEvent, VerificationRequestEventHandlerMap>
+    implements VerificationRequest
+{
+    phase_: VerificationPhase;
+    verifier_: Verifier | undefined;
+    chosenMethod_: string | null;
+
+    constructor(phase: VerificationPhase, verifier: Verifier | undefined, chosenMethod: string | null) {
+        super();
+        this.phase_ = phase;
+        this.verifier_ = verifier;
+        this.chosenMethod_ = chosenMethod;
+    }
+
+    get phase(): VerificationPhase {
+        return this.phase_;
+    }
+
+    get isSelfVerification(): boolean {
+        // So far we are only testing verification of our own devices
+        return true;
+    }
+
+    get initiatedByMe(): boolean {
+        // So far we are only testing verification started by this device
+        return true;
+    }
+
+    otherPartySupportsMethod(): boolean {
+        // This makes both emoji and QR verification options appear
+        return true;
+    }
+
+    get verifier(): Verifier | undefined {
+        return this.verifier_;
+    }
+
+    get chosenMethod(): string | null {
+        return this.chosenMethod_;
+    }
+
+    async cancel(): Promise<void> {
+        this.phase_ = VerificationPhase.Cancelled;
+        this.emit(VerificationRequestEvent.Change);
+    }
+
+    get transactionId(): string | undefined {
+        return undefined;
+    }
+
+    get roomId(): string | undefined {
+        return undefined;
+    }
+
+    get otherUserId(): string {
+        return "otheruser";
+    }
+
+    get otherDeviceId(): string | undefined {
+        return undefined;
+    }
+
+    get pending(): boolean {
+        return false;
+    }
+
+    get accepting(): boolean {
+        return false;
+    }
+
+    get declining(): boolean {
+        return false;
+    }
+
+    get timeout(): number | null {
+        return null;
+    }
+
+    get methods(): string[] {
+        return [];
+    }
+
+    async accept(): Promise<void> {}
+
+    startVerification(_method: string): Promise<Verifier> {
+        throw new Error("Method not implemented.");
+    }
+
+    scanQRCode(_qrCodeData: Uint8ClampedArray): Promise<Verifier> {
+        throw new Error("Method not implemented.");
+    }
+
+    async generateQRCode(): Promise<Uint8ClampedArray | undefined> {
+        return new Uint8ClampedArray();
+    }
+
+    get cancellationCode(): string | null {
+        return null;
+    }
+
+    get cancellingUserId(): string | undefined {
+        return "otheruser";
+    }
+}
diff --git a/test/unit-tests/components/views/dialogs/WidgetCapabilitiesPromptDialog-test.tsx b/test/unit-tests/components/views/dialogs/WidgetCapabilitiesPromptDialog-test.tsx
new file mode 100644
index 0000000000..5abc5ed93b
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/WidgetCapabilitiesPromptDialog-test.tsx
@@ -0,0 +1,133 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { render, screen } from "jest-matrix-react";
+import { WidgetKind } from "matrix-widget-api";
+
+import WidgetCapabilitiesPromptDialog from "../../../../../src/components/views/dialogs/WidgetCapabilitiesPromptDialog";
+import { stubClient } from "../../../../test-utils";
+
+describe("WidgetCapabilitiesPromptDialog", () => {
+    const mockWidget = {
+        id: "test-widget",
+        name: "Test Widget",
+    } as any;
+
+    const onFinished = jest.fn();
+
+    beforeEach(() => {
+        stubClient();
+        onFinished.mockClear();
+    });
+
+    describe("capability sorting", () => {
+        it("should sort non-timeline capabilities before timeline capabilities", () => {
+            // Create a mix of timeline and non-timeline capabilities
+            const capabilities = new Set([
+                "org.matrix.msc2762.timeline:*",
+                "org.matrix.msc2762.receive.event:m.room.message",
+                "org.matrix.msc2762.timeline:!room:example.com",
+                "org.matrix.msc2931.navigate",
+                "org.matrix.msc2762.receive.state_event:m.room.member#@user:example.com",
+            ]);
+
+            const { container } = render(
+                <WidgetCapabilitiesPromptDialog
+                    requestedCapabilities={capabilities}
+                    widget={mockWidget}
+                    widgetKind={WidgetKind.Room}
+                    onFinished={onFinished}
+                />,
+            );
+
+            const checkboxes = container.querySelectorAll(".mx_WidgetCapabilitiesPromptDialog_cap");
+
+            // Verify that we have all the capabilities rendered
+            expect(checkboxes.length).toBe(5);
+
+            // The dialog should render successfully with the mixed capabilities
+            expect(screen.getByText("Approve widget permissions")).toBeInTheDocument();
+        });
+
+        it("should sort capabilities lexicographically within the same type", () => {
+            // Create multiple non-timeline capabilities
+            const capabilities = new Set([
+                "org.matrix.msc2931.navigate",
+                "org.matrix.msc2762.receive.event:m.room.message",
+                "org.matrix.msc2762.receive.state_event:m.room.member",
+            ]);
+
+            render(
+                <WidgetCapabilitiesPromptDialog
+                    requestedCapabilities={capabilities}
+                    widget={mockWidget}
+                    widgetKind={WidgetKind.Room}
+                    onFinished={onFinished}
+                />,
+            );
+
+            // The dialog should render without errors and show the capabilities
+            expect(screen.getByText("Approve widget permissions")).toBeInTheDocument();
+        });
+
+        it("should handle only timeline capabilities", () => {
+            const capabilities = new Set([
+                "org.matrix.msc2762.timeline:!room1:example.com",
+                "org.matrix.msc2762.timeline:!room2:example.com",
+                "org.matrix.msc2762.timeline:*",
+            ]);
+
+            const { container } = render(
+                <WidgetCapabilitiesPromptDialog
+                    requestedCapabilities={capabilities}
+                    widget={mockWidget}
+                    widgetKind={WidgetKind.Room}
+                    onFinished={onFinished}
+                />,
+            );
+
+            const checkboxes = container.querySelectorAll(".mx_WidgetCapabilitiesPromptDialog_cap");
+            expect(checkboxes.length).toBe(3);
+        });
+
+        it("should handle only non-timeline capabilities", () => {
+            const capabilities = new Set([
+                "org.matrix.msc2931.navigate",
+                "org.matrix.msc2762.receive.event:m.room.message",
+            ]);
+
+            const { container } = render(
+                <WidgetCapabilitiesPromptDialog
+                    requestedCapabilities={capabilities}
+                    widget={mockWidget}
+                    widgetKind={WidgetKind.Room}
+                    onFinished={onFinished}
+                />,
+            );
+
+            const checkboxes = container.querySelectorAll(".mx_WidgetCapabilitiesPromptDialog_cap");
+            expect(checkboxes.length).toBe(2);
+        });
+
+        it("should handle empty capabilities", () => {
+            const capabilities = new Set<string>([]);
+
+            const { container } = render(
+                <WidgetCapabilitiesPromptDialog
+                    requestedCapabilities={capabilities}
+                    widget={mockWidget}
+                    widgetKind={WidgetKind.Room}
+                    onFinished={onFinished}
+                />,
+            );
+
+            const checkboxes = container.querySelectorAll(".mx_WidgetCapabilitiesPromptDialog_cap");
+            expect(checkboxes.length).toBe(0);
+        });
+    });
+});
diff --git a/test/unit-tests/components/views/dialogs/WidgetOpenIDPermissionsDialog-test.tsx b/test/unit-tests/components/views/dialogs/WidgetOpenIDPermissionsDialog-test.tsx
new file mode 100644
index 0000000000..2f1ddae972
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/WidgetOpenIDPermissionsDialog-test.tsx
@@ -0,0 +1,37 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { render } from "jest-matrix-react";
+import { WidgetKind } from "matrix-widget-api";
+
+import { stubClient } from "../../../../test-utils";
+import WidgetOpenIDPermissionsDialog from "../../../../../src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx";
+
+describe("WidgetOpenIDPermissionsDialog", () => {
+    const mockWidget = {
+        id: "test-widget",
+        name: "Test Widget",
+        templateUrl: "https://imawidget",
+    } as any;
+
+    const onFinished = jest.fn();
+
+    beforeEach(() => {
+        stubClient();
+        onFinished.mockClear();
+    });
+
+    it("should render", () => {
+        const dialog = render(
+            <WidgetOpenIDPermissionsDialog widget={mockWidget} widgetKind={WidgetKind.Room} onFinished={onFinished} />,
+        );
+
+        expect(dialog.getByText("Allow this widget to verify your identity")).toBeInTheDocument();
+        expect(dialog.asFragment()).toMatchSnapshot();
+    });
+});
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/ChangelogDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/ChangelogDialog-test.tsx.snap
index b38ccbc804..6f0d3ae91b 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/ChangelogDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/ChangelogDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<ChangelogDialog /> should fetch github proxy url for each repo with old and new version strings 1`] = `
 <DocumentFragment>
@@ -13,6 +13,7 @@ exports[`<ChangelogDialog /> should fetch github proxy url for each repo with ol
     class="mx_QuestionDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/ConfirmKeyStorageOffDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/ConfirmKeyStorageOffDialog-test.tsx.snap
index 9e0def2569..31abd1aedf 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/ConfirmKeyStorageOffDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/ConfirmKeyStorageOffDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`ConfirmKeyStorageOffDialog renders 1`] = `
 <DocumentFragment>
@@ -9,7 +9,7 @@ exports[`ConfirmKeyStorageOffDialog renders 1`] = `
       class="mx_EncryptionCard_header"
     >
       <div
-        class="_content_o77nw_8 _destructive_o77nw_34"
+        class="_content_1r8kr_8 _destructive_1r8kr_34"
         data-size="large"
       >
         <svg
@@ -34,7 +34,7 @@ exports[`ConfirmKeyStorageOffDialog renders 1`] = `
       If you sign out of all your devices you will lose your message history and will need to verify all your existing contacts again. 
       <br />
       <a
-        href="https://element.io/help#encryption5"
+        href="https://element.io/help#encryption"
         rel="noreferrer noopener"
         target="_blank"
       >
@@ -59,7 +59,7 @@ exports[`ConfirmKeyStorageOffDialog renders 1`] = `
       class="mx_EncryptionCard_buttons"
     >
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="primary"
         data-size="lg"
         role="button"
@@ -68,7 +68,7 @@ exports[`ConfirmKeyStorageOffDialog renders 1`] = `
         Go to Settings
       </button>
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="secondary"
         data-size="lg"
         role="button"
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/ConfirmRejectInviteDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/ConfirmRejectInviteDialog-test.tsx.snap
index c2ca9a5680..74b5bf31eb 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/ConfirmRejectInviteDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/ConfirmRejectInviteDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`ConfirmRejectInviteDialog can reject with options selected 1`] = `
 <div>
@@ -13,6 +13,7 @@ exports[`ConfirmRejectInviteDialog can reject with options selected 1`] = `
     class="mx_DeclineAndBlockInviteDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -31,67 +32,77 @@ exports[`ConfirmRejectInviteDialog can reject with options selected 1`] = `
         Are you sure you want to decline the invitation to join "foo"?
       </p>
       <div
-        class="mx_SettingsFlag"
+        class="_inline-field_19upo_32"
       >
-        <span
-          class="mx_SettingsFlag_label"
+        <div
+          class="_inline-field-control_19upo_44"
         >
           <div
-            id="mx_LabelledToggleSwitch_«r7»"
+            class="_container_udcm8_10"
+          >
+            <input
+              class="_input_udcm8_24"
+              id="_r_b_"
+              role="switch"
+              type="checkbox"
+            />
+            <div
+              class="_ui_udcm8_34"
+            />
+          </div>
+        </div>
+        <div
+          class="_inline-field-body_19upo_38"
+        >
+          <label
+            class="_label_19upo_59"
+            for="_r_b_"
           >
             Ignore user
-          </div>
+          </label>
           <span
-            class="mx_Caption"
-            id="mx_LabelledToggleSwitch_«r7»_caption"
+            class="_message_19upo_85 _help-message_19upo_91"
+            id="radix-_r_d_"
           >
             You will not see any messages or room invites from this user.
           </span>
-        </span>
-        <div
-          aria-checked="true"
-          aria-describedby="mx_LabelledToggleSwitch_«r7»_caption"
-          aria-disabled="false"
-          aria-labelledby="mx_LabelledToggleSwitch_«r7»"
-          class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
-          role="switch"
-          tabindex="0"
-        >
-          <div
-            class="mx_ToggleSwitch_ball"
-          />
         </div>
       </div>
       <div
-        class="mx_SettingsFlag"
+        class="_inline-field_19upo_32"
       >
-        <span
-          class="mx_SettingsFlag_label"
+        <div
+          class="_inline-field-control_19upo_44"
         >
           <div
-            id="mx_LabelledToggleSwitch_«r8»"
+            class="_container_udcm8_10"
+          >
+            <input
+              class="_input_udcm8_24"
+              id="_r_e_"
+              role="switch"
+              type="checkbox"
+            />
+            <div
+              class="_ui_udcm8_34"
+            />
+          </div>
+        </div>
+        <div
+          class="_inline-field-body_19upo_38"
+        >
+          <label
+            class="_label_19upo_59"
+            for="_r_e_"
           >
             Report room
-          </div>
+          </label>
           <span
-            class="mx_Caption"
-            id="mx_LabelledToggleSwitch_«r8»_caption"
+            class="_message_19upo_85 _help-message_19upo_91"
+            id="radix-_r_g_"
           >
             Report this room to your account provider.
           </span>
-        </span>
-        <div
-          aria-checked="true"
-          aria-describedby="mx_LabelledToggleSwitch_«r8»_caption"
-          aria-disabled="false"
-          aria-labelledby="mx_LabelledToggleSwitch_«r8»"
-          class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
-          role="switch"
-          tabindex="0"
-        >
-          <div
-            class="mx_ToggleSwitch_ball"
-          />
         </div>
       </div>
       <div
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/ConfirmUserActionDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/ConfirmUserActionDialog-test.tsx.snap
index d48b62c57d..95b407165c 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/ConfirmUserActionDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/ConfirmUserActionDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`ConfirmUserActionDialog renders 1`] = `
 <DocumentFragment>
@@ -13,6 +13,7 @@ exports[`ConfirmUserActionDialog renders 1`] = `
     class="mx_ConfirmUserActionDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -35,7 +36,7 @@ exports[`ConfirmUserActionDialog renders 1`] = `
           class="mx_ConfirmUserActionDialog_avatar"
         >
           <span
-            class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
             data-color="3"
             data-testid="avatar-img"
             data-type="round"
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/CreateRoomDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/CreateRoomDialog-test.tsx.snap
new file mode 100644
index 0000000000..314aafb29c
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/CreateRoomDialog-test.tsx.snap
@@ -0,0 +1,696 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`<CreateRoomDialog /> for a private room should create a private room 1`] = `
+<DocumentFragment>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+  <div
+    aria-labelledby="mx_BaseDialog_title"
+    class="mx_CreateRoomDialog mx_Dialog_fixedWidth"
+    data-focus-lock-disabled="false"
+    role="dialog"
+    tabindex="-1"
+  >
+    <div
+      class="mx_Dialog_header"
+    >
+      <h1
+        class="mx_Heading_h3 mx_Dialog_title"
+        id="mx_BaseDialog_title"
+      >
+        Create a private room
+      </h1>
+    </div>
+    <div
+      class="mx_Dialog_content"
+    >
+      <form
+        class="_root_19upo_16"
+      >
+        <div
+          class="mx_Field mx_Field_input mx_CreateRoomDialog_name"
+        >
+          <input
+            id="mx_Field_25"
+            label="Name"
+            placeholder="Name"
+            type="text"
+            value=""
+          />
+          <label
+            for="mx_Field_25"
+          >
+            Name
+          </label>
+        </div>
+        <div
+          class="mx_Field mx_Field_input mx_CreateRoomDialog_topic"
+        >
+          <input
+            id="mx_Field_26"
+            label="Topic (optional)"
+            placeholder="Topic (optional)"
+            type="text"
+            value=""
+          />
+          <label
+            for="mx_Field_26"
+          >
+            Topic (optional)
+          </label>
+        </div>
+        <div>
+          <div
+            class="mx_Dropdown mx_JoinRuleDropdown"
+          >
+            <div
+              aria-describedby="mx_JoinRuleDropdown_value"
+              aria-expanded="false"
+              aria-haspopup="listbox"
+              aria-label="Room visibility"
+              aria-owns="mx_JoinRuleDropdown_input"
+              class="mx_AccessibleButton mx_Dropdown_input mx_no_textinput"
+              role="button"
+              tabindex="0"
+            >
+              <div
+                class="mx_Dropdown_option"
+                id="mx_JoinRuleDropdown_value"
+              >
+                <div
+                  class="mx_JoinRuleDropdown_invite"
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M6 22q-.824 0-1.412-.587A1.93 1.93 0 0 1 4 20V10q0-.825.588-1.412A1.93 1.93 0 0 1 6 8h1V6q0-2.075 1.463-3.537Q9.926 1 12 1q2.075 0 3.537 1.463Q17 3.925 17 6v2h1q.824 0 1.413.588Q20 9.175 20 10v10q0 .824-.587 1.413A1.93 1.93 0 0 1 18 22zM9 8h6V6q0-1.25-.875-2.125A2.9 2.9 0 0 0 12 3q-1.25 0-2.125.875A2.9 2.9 0 0 0 9 6z"
+                    />
+                  </svg>
+                  Private room (invite only)
+                </div>
+              </div>
+              <svg
+                class="mx_Dropdown_arrow"
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                />
+              </svg>
+            </div>
+          </div>
+          <p>
+            Only people invited will be able to find and join this room. You can change this at any time from room settings.
+          </p>
+        </div>
+        <div
+          class="_inline-field_19upo_32"
+        >
+          <div
+            class="_inline-field-control_19upo_44"
+          >
+            <div
+              class="_container_udcm8_10"
+            >
+              <input
+                checked=""
+                class="_input_udcm8_24"
+                id="_r_72_"
+                role="switch"
+                type="checkbox"
+              />
+              <div
+                class="_ui_udcm8_34"
+              />
+            </div>
+          </div>
+          <div
+            class="_inline-field-body_19upo_38"
+          >
+            <label
+              class="_label_19upo_59"
+              for="_r_72_"
+            >
+              Enable end-to-end encryption
+            </label>
+            <span
+              class="_message_19upo_85 _help-message_19upo_91"
+              id="radix-_r_74_"
+            >
+              You can't disable this later. Bridges & most bots won't work yet.
+            </span>
+          </div>
+        </div>
+        <details
+          class="mx_CreateRoomDialog_details"
+        >
+          <summary
+            class="mx_CreateRoomDialog_details_summary"
+          >
+            Show advanced
+          </summary>
+          <div
+            class="_inline-field_19upo_32"
+          >
+            <div
+              class="_inline-field-control_19upo_44"
+            >
+              <div
+                class="_container_udcm8_10"
+              >
+                <input
+                  class="_input_udcm8_24"
+                  id="_r_75_"
+                  role="switch"
+                  type="checkbox"
+                />
+                <div
+                  class="_ui_udcm8_34"
+                />
+              </div>
+            </div>
+            <div
+              class="_inline-field-body_19upo_38"
+            >
+              <label
+                class="_label_19upo_59"
+                for="_r_75_"
+              >
+                Block anyone not part of server.org from ever joining this room.
+              </label>
+              <span
+                class="_message_19upo_85 _help-message_19upo_91"
+                id="radix-_r_77_"
+              >
+                You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.
+              </span>
+            </div>
+          </div>
+        </details>
+      </form>
+    </div>
+    <div
+      class="mx_Dialog_buttons"
+    >
+      <span
+        class="mx_Dialog_buttons_row"
+      >
+        <button
+          data-testid="dialog-cancel-button"
+          type="button"
+        >
+          Cancel
+        </button>
+        <button
+          class="mx_Dialog_primary"
+          data-testid="dialog-primary-button"
+          type="button"
+        >
+          Create room
+        </button>
+      </span>
+    </div>
+    <div
+      aria-label="Close dialog"
+      class="mx_AccessibleButton mx_Dialog_cancelButton"
+      role="button"
+      tabindex="0"
+    />
+  </div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+</DocumentFragment>
+`;
+
+exports[`<CreateRoomDialog /> for a private room should render not the advanced options when UI.advancedSettings is disabled 1`] = `
+<DocumentFragment>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+  <div
+    aria-labelledby="mx_BaseDialog_title"
+    class="mx_CreateRoomDialog mx_Dialog_fixedWidth"
+    data-focus-lock-disabled="false"
+    role="dialog"
+    tabindex="-1"
+  >
+    <div
+      class="mx_Dialog_header"
+    >
+      <h1
+        class="mx_Heading_h3 mx_Dialog_title"
+        id="mx_BaseDialog_title"
+      >
+        Create a private room
+      </h1>
+    </div>
+    <div
+      class="mx_Dialog_content"
+    >
+      <form
+        class="_root_19upo_16"
+      >
+        <div
+          class="mx_Field mx_Field_input mx_CreateRoomDialog_name"
+        >
+          <input
+            id="mx_Field_27"
+            label="Name"
+            placeholder="Name"
+            type="text"
+            value=""
+          />
+          <label
+            for="mx_Field_27"
+          >
+            Name
+          </label>
+        </div>
+        <div
+          class="mx_Field mx_Field_input mx_CreateRoomDialog_topic"
+        >
+          <input
+            id="mx_Field_28"
+            label="Topic (optional)"
+            placeholder="Topic (optional)"
+            type="text"
+            value=""
+          />
+          <label
+            for="mx_Field_28"
+          >
+            Topic (optional)
+          </label>
+        </div>
+        <div>
+          <div
+            class="mx_Dropdown mx_JoinRuleDropdown"
+          >
+            <div
+              aria-describedby="mx_JoinRuleDropdown_value"
+              aria-expanded="false"
+              aria-haspopup="listbox"
+              aria-label="Room visibility"
+              aria-owns="mx_JoinRuleDropdown_input"
+              class="mx_AccessibleButton mx_Dropdown_input mx_no_textinput"
+              role="button"
+              tabindex="0"
+            >
+              <div
+                class="mx_Dropdown_option"
+                id="mx_JoinRuleDropdown_value"
+              >
+                <div
+                  class="mx_JoinRuleDropdown_invite"
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M6 22q-.824 0-1.412-.587A1.93 1.93 0 0 1 4 20V10q0-.825.588-1.412A1.93 1.93 0 0 1 6 8h1V6q0-2.075 1.463-3.537Q9.926 1 12 1q2.075 0 3.537 1.463Q17 3.925 17 6v2h1q.824 0 1.413.588Q20 9.175 20 10v10q0 .824-.587 1.413A1.93 1.93 0 0 1 18 22zM9 8h6V6q0-1.25-.875-2.125A2.9 2.9 0 0 0 12 3q-1.25 0-2.125.875A2.9 2.9 0 0 0 9 6z"
+                    />
+                  </svg>
+                  Private room (invite only)
+                </div>
+              </div>
+              <svg
+                class="mx_Dropdown_arrow"
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                />
+              </svg>
+            </div>
+          </div>
+          <p>
+            Only people invited will be able to find and join this room. You can change this at any time from room settings.
+          </p>
+        </div>
+        <div
+          class="_inline-field_19upo_32"
+        >
+          <div
+            class="_inline-field-control_19upo_44"
+          >
+            <div
+              class="_container_udcm8_10"
+            >
+              <input
+                checked=""
+                class="_input_udcm8_24"
+                id="_r_7k_"
+                role="switch"
+                type="checkbox"
+              />
+              <div
+                class="_ui_udcm8_34"
+              />
+            </div>
+          </div>
+          <div
+            class="_inline-field-body_19upo_38"
+          >
+            <label
+              class="_label_19upo_59"
+              for="_r_7k_"
+            >
+              Enable end-to-end encryption
+            </label>
+            <span
+              class="_message_19upo_85 _help-message_19upo_91"
+              id="radix-_r_7m_"
+            >
+              You can't disable this later. Bridges & most bots won't work yet.
+            </span>
+          </div>
+        </div>
+        <div
+          class="_inline-field_19upo_32"
+        >
+          <div
+            class="_inline-field-control_19upo_44"
+          >
+            <div
+              class="_container_udcm8_10"
+            >
+              <input
+                class="_input_udcm8_24"
+                id="_r_7n_"
+                role="switch"
+                type="checkbox"
+              />
+              <div
+                class="_ui_udcm8_34"
+              />
+            </div>
+          </div>
+          <div
+            class="_inline-field-body_19upo_38"
+          >
+            <label
+              class="_label_19upo_59"
+              for="_r_7n_"
+            >
+              Encrypt state events
+            </label>
+            <span
+              class="_message_19upo_85 _help-message_19upo_91"
+              id="radix-_r_7p_"
+            >
+              Enables experimental support for encrypting state events, which hides metadata such as room names and topics from the server. This metadata will also be hidden from people joining rooms later, and people whose clients do not support MSC4362.
+            </span>
+          </div>
+        </div>
+      </form>
+    </div>
+    <div
+      class="mx_Dialog_buttons"
+    >
+      <span
+        class="mx_Dialog_buttons_row"
+      >
+        <button
+          data-testid="dialog-cancel-button"
+          type="button"
+        >
+          Cancel
+        </button>
+        <button
+          class="mx_Dialog_primary"
+          data-testid="dialog-primary-button"
+          type="button"
+        >
+          Create room
+        </button>
+      </span>
+    </div>
+    <div
+      aria-label="Close dialog"
+      class="mx_AccessibleButton mx_Dialog_cancelButton"
+      role="button"
+      tabindex="0"
+    />
+  </div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+</DocumentFragment>
+`;
+
+exports[`<CreateRoomDialog /> for a private room when the state encryption labs flag is on should turn on state encryption when toggled 1`] = `
+<DocumentFragment>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+  <div
+    aria-labelledby="mx_BaseDialog_title"
+    class="mx_CreateRoomDialog mx_Dialog_fixedWidth"
+    data-focus-lock-disabled="false"
+    role="dialog"
+    tabindex="-1"
+  >
+    <div
+      class="mx_Dialog_header"
+    >
+      <h1
+        class="mx_Heading_h3 mx_Dialog_title"
+        id="mx_BaseDialog_title"
+      >
+        Create a private room
+      </h1>
+    </div>
+    <div
+      class="mx_Dialog_content"
+    >
+      <form
+        class="_root_19upo_16"
+      >
+        <div
+          class="mx_Field mx_Field_input mx_CreateRoomDialog_name"
+        >
+          <input
+            id="mx_Field_29"
+            label="Name"
+            placeholder="Name"
+            type="text"
+            value=""
+          />
+          <label
+            for="mx_Field_29"
+          >
+            Name
+          </label>
+        </div>
+        <div
+          class="mx_Field mx_Field_input mx_CreateRoomDialog_topic"
+        >
+          <input
+            id="mx_Field_30"
+            label="Topic (optional)"
+            placeholder="Topic (optional)"
+            type="text"
+            value=""
+          />
+          <label
+            for="mx_Field_30"
+          >
+            Topic (optional)
+          </label>
+        </div>
+        <div>
+          <div
+            class="mx_Dropdown mx_JoinRuleDropdown mx_Dropdown_disabled"
+          >
+            <div
+              aria-describedby="mx_JoinRuleDropdown_value"
+              aria-disabled="true"
+              aria-expanded="false"
+              aria-haspopup="listbox"
+              aria-label="Room visibility"
+              aria-owns="mx_JoinRuleDropdown_input"
+              class="mx_AccessibleButton mx_Dropdown_input mx_no_textinput mx_AccessibleButton_disabled"
+              disabled=""
+              role="button"
+              tabindex="0"
+            >
+              <div
+                class="mx_Dropdown_option"
+                id="mx_JoinRuleDropdown_value"
+              >
+                <div
+                  class="mx_JoinRuleDropdown_invite"
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M6 22q-.824 0-1.412-.587A1.93 1.93 0 0 1 4 20V10q0-.825.588-1.412A1.93 1.93 0 0 1 6 8h1V6q0-2.075 1.463-3.537Q9.926 1 12 1q2.075 0 3.537 1.463Q17 3.925 17 6v2h1q.824 0 1.413.588Q20 9.175 20 10v10q0 .824-.587 1.413A1.93 1.93 0 0 1 18 22zM9 8h6V6q0-1.25-.875-2.125A2.9 2.9 0 0 0 12 3q-1.25 0-2.125.875A2.9 2.9 0 0 0 9 6z"
+                    />
+                  </svg>
+                  Private room (invite only)
+                </div>
+              </div>
+              <svg
+                class="mx_Dropdown_arrow"
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                />
+              </svg>
+            </div>
+          </div>
+          <p>
+            Only people invited will be able to find and join this room. You can change this at any time from room settings.
+          </p>
+        </div>
+        <div
+          class="_inline-field_19upo_32"
+        >
+          <div
+            class="_inline-field-control_19upo_44"
+          >
+            <div
+              class="_container_udcm8_10"
+            >
+              <input
+                checked=""
+                class="_input_udcm8_24"
+                id="_r_86_"
+                role="switch"
+                type="checkbox"
+              />
+              <div
+                class="_ui_udcm8_34"
+              />
+            </div>
+          </div>
+          <div
+            class="_inline-field-body_19upo_38"
+          >
+            <label
+              class="_label_19upo_59"
+              for="_r_86_"
+            >
+              Enable end-to-end encryption
+            </label>
+            <span
+              class="_message_19upo_85 _help-message_19upo_91"
+              id="radix-_r_88_"
+            >
+              You can't disable this later. Bridges & most bots won't work yet.
+            </span>
+          </div>
+        </div>
+        <div
+          class="_inline-field_19upo_32"
+        >
+          <div
+            class="_inline-field-control_19upo_44"
+          >
+            <div
+              class="_container_udcm8_10"
+            >
+              <input
+                class="_input_udcm8_24"
+                id="_r_89_"
+                role="switch"
+                type="checkbox"
+              />
+              <div
+                class="_ui_udcm8_34"
+              />
+            </div>
+          </div>
+          <div
+            class="_inline-field-body_19upo_38"
+          >
+            <label
+              class="_label_19upo_59"
+              for="_r_89_"
+            >
+              Encrypt state events
+            </label>
+            <span
+              class="_message_19upo_85 _help-message_19upo_91"
+              id="radix-_r_8b_"
+            >
+              Enables experimental support for encrypting state events, which hides metadata such as room names and topics from the server. This metadata will also be hidden from people joining rooms later, and people whose clients do not support MSC4362.
+            </span>
+          </div>
+        </div>
+      </form>
+    </div>
+    <div
+      class="mx_Dialog_buttons"
+    >
+      <span
+        class="mx_Dialog_buttons_row"
+      >
+        <button
+          data-testid="dialog-cancel-button"
+          type="button"
+        >
+          Cancel
+        </button>
+        <button
+          class="mx_Dialog_primary"
+          data-testid="dialog-primary-button"
+          type="button"
+        >
+          Create room
+        </button>
+      </span>
+    </div>
+    <div
+      aria-label="Close dialog"
+      class="mx_AccessibleButton mx_Dialog_cancelButton"
+      role="button"
+      tabindex="0"
+    />
+  </div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+</DocumentFragment>
+`;
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/DevtoolsDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/DevtoolsDialog-test.tsx.snap
index 2342bab71d..1a51e40cca 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/DevtoolsDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/DevtoolsDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`DevtoolsDialog renders the devtools dialog 1`] = `
 <DocumentFragment>
@@ -12,6 +12,7 @@ exports[`DevtoolsDialog renders the devtools dialog 1`] = `
     class="mx_QuestionDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -33,11 +34,27 @@ exports[`DevtoolsDialog renders the devtools dialog 1`] = `
     >
       Room ID: !id
       <div
+        aria-describedby="_r_2_"
         aria-label="Copy"
         class="mx_AccessibleButton mx_CopyableText_copyButton"
         role="button"
         tabindex="0"
-      />
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+          />
+          <path
+            d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+          />
+        </svg>
+      </div>
     </div>
     <div
       class="mx_DevTools_label_bottom"
@@ -46,9 +63,11 @@ exports[`DevtoolsDialog renders the devtools dialog 1`] = `
       class="mx_DevTools_content"
     >
       <div>
-        <h3>
+        <h2
+          class="mx_DevTools_toolHeading"
+        >
           Room
-        </h3>
+        </h2>
         <button
           class="mx_DevTools_button"
         >
@@ -79,11 +98,18 @@ exports[`DevtoolsDialog renders the devtools dialog 1`] = `
         >
           Active Widgets
         </button>
+        <button
+          class="mx_DevTools_button"
+        >
+          Users
+        </button>
       </div>
       <div>
-        <h3>
+        <h2
+          class="mx_DevTools_toolHeading"
+        >
           Other
-        </h3>
+        </h2>
         <button
           class="mx_DevTools_button"
         >
@@ -105,117 +131,133 @@ exports[`DevtoolsDialog renders the devtools dialog 1`] = `
           End-to-end encryption
         </button>
       </div>
-      <div>
-        <h3>
+      <form
+        class="_root_19upo_16 mx_DevTools_toggleForm"
+      >
+        <h2
+          class="mx_DevTools_toolHeading"
+        >
           Options
-        </h3>
+        </h2>
         <div
-          class="mx_SettingsFlag"
-        >
-          <label
-            class="mx_SettingsFlag_label"
-            for="mx_SettingsFlag_vY7Q4uEh9K38"
-          >
-            <span
-              class="mx_SettingsFlag_labelText"
-            >
-              Developer mode
-            </span>
-          </label>
-          <div
-            aria-checked="false"
-            aria-disabled="false"
-            aria-label="Developer mode"
-            class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
-            id="mx_SettingsFlag_vY7Q4uEh9K38"
-            role="switch"
-            tabindex="0"
-          >
-            <div
-              class="mx_ToggleSwitch_ball"
-            />
-          </div>
-        </div>
-        <div
-          class="mx_SettingsFlag"
-        >
-          <label
-            class="mx_SettingsFlag_label"
-            for="mx_SettingsFlag_QgU2PomxwKpa"
-          >
-            <span
-              class="mx_SettingsFlag_labelText"
-            >
-              Show hidden events in timeline
-            </span>
-          </label>
-          <div
-            aria-checked="false"
-            aria-disabled="false"
-            aria-label="Show hidden events in timeline"
-            class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
-            id="mx_SettingsFlag_QgU2PomxwKpa"
-            role="switch"
-            tabindex="0"
-          >
-            <div
-              class="mx_ToggleSwitch_ball"
-            />
-          </div>
-        </div>
-        <div
-          class="mx_SettingsFlag"
-        >
-          <label
-            class="mx_SettingsFlag_label"
-            for="mx_SettingsFlag_6hpi3YEetmBG"
-          >
-            <span
-              class="mx_SettingsFlag_labelText"
-            >
-              Enable widget screenshots on supported widgets
-            </span>
-          </label>
-          <div
-            aria-checked="false"
-            aria-disabled="false"
-            aria-label="Enable widget screenshots on supported widgets"
-            class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
-            id="mx_SettingsFlag_6hpi3YEetmBG"
-            role="switch"
-            tabindex="0"
-          >
-            <div
-              class="mx_ToggleSwitch_ball"
-            />
-          </div>
-        </div>
-        <form
-          class="_root_19upo_16"
+          class="_inline-field_19upo_32"
         >
           <div
-            class="_field_19upo_26"
+            class="_inline-field-control_19upo_44"
           >
-            <label
-              class="_label_19upo_59"
-              for="radix-«r4»"
-            >
-              Element Call URL
-            </label>
             <div
-              class="_controls_17lij_8"
+              class="_container_udcm8_10"
             >
               <input
-                class="_control_sqdq4_10"
-                id="radix-«r4»"
-                name="input"
-                title=""
-                value=""
+                class="_input_udcm8_24"
+                id="mx_SettingsFlag_vY7Q4uEh9K38"
+                role="switch"
+                type="checkbox"
+              />
+              <div
+                class="_ui_udcm8_34"
               />
             </div>
           </div>
-        </form>
-      </div>
+          <div
+            class="_inline-field-body_19upo_38"
+          >
+            <label
+              class="_label_19upo_59"
+              for="mx_SettingsFlag_vY7Q4uEh9K38"
+            >
+              Developer mode
+            </label>
+          </div>
+        </div>
+        <div
+          class="_inline-field_19upo_32"
+        >
+          <div
+            class="_inline-field-control_19upo_44"
+          >
+            <div
+              class="_container_udcm8_10"
+            >
+              <input
+                class="_input_udcm8_24"
+                id="mx_SettingsFlag_QgU2PomxwKpa"
+                role="switch"
+                type="checkbox"
+              />
+              <div
+                class="_ui_udcm8_34"
+              />
+            </div>
+          </div>
+          <div
+            class="_inline-field-body_19upo_38"
+          >
+            <label
+              class="_label_19upo_59"
+              for="mx_SettingsFlag_QgU2PomxwKpa"
+            >
+              Show hidden events in timeline
+            </label>
+          </div>
+        </div>
+        <div
+          class="_inline-field_19upo_32"
+        >
+          <div
+            class="_inline-field-control_19upo_44"
+          >
+            <div
+              class="_container_udcm8_10"
+            >
+              <input
+                class="_input_udcm8_24"
+                id="mx_SettingsFlag_6hpi3YEetmBG"
+                role="switch"
+                type="checkbox"
+              />
+              <div
+                class="_ui_udcm8_34"
+              />
+            </div>
+          </div>
+          <div
+            class="_inline-field-body_19upo_38"
+          >
+            <label
+              class="_label_19upo_59"
+              for="mx_SettingsFlag_6hpi3YEetmBG"
+            >
+              Enable widget screenshots on supported widgets
+            </label>
+          </div>
+        </div>
+      </form>
+      <form
+        class="_root_19upo_16"
+      >
+        <div
+          class="_field_19upo_26"
+        >
+          <label
+            class="_label_19upo_59"
+            for="radix-_r_a_"
+          >
+            Element Call URL
+          </label>
+          <div
+            class="_controls_17lij_8"
+          >
+            <input
+              class="_control_sqdq4_10"
+              id="radix-_r_a_"
+              name="input"
+              title=""
+              value=""
+            />
+          </div>
+        </div>
+      </form>
     </div>
     <div
       class="mx_Dialog_buttons"
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/ExportDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/ExportDialog-test.tsx.snap
index bb11ed96b2..fd3ec6425c 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/ExportDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/ExportDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<ExportDialog /> renders export dialog 1`] = `
 <div
@@ -7,6 +7,7 @@ exports[`<ExportDialog /> renders export dialog 1`] = `
   class="mx_ExportDialog false mx_Dialog_fixedWidth"
   data-focus-lock-disabled="false"
   role="dialog"
+  tabindex="-1"
 >
   <div
     class="mx_Dialog_header"
@@ -160,15 +161,15 @@ exports[`<ExportDialog /> renders export dialog 1`] = `
           class="_inline-field-control_19upo_44"
         >
           <div
-            class="_container_1hel1_10"
+            class="_container_1md5v_10"
           >
             <input
-              class="_input_1hel1_18"
+              class="_input_1md5v_18"
               id="include-attachments"
               type="checkbox"
             />
             <div
-              class="_ui_1hel1_19"
+              class="_ui_1md5v_19"
             >
               <svg
                 aria-hidden="true"
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/FeedbackDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/FeedbackDialog-test.tsx.snap
index 7b756db64d..8ef822dfc4 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/FeedbackDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/FeedbackDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`FeedbackDialog should respect feedback config 1`] = `
 <DocumentFragment>
@@ -13,6 +13,7 @@ exports[`FeedbackDialog should respect feedback config 1`] = `
     class="mx_QuestionDialog mx_FeedbackDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -29,8 +30,9 @@ exports[`FeedbackDialog should respect feedback config 1`] = `
       id="mx_Dialog_content"
     >
       <div
-        class="mx_FeedbackDialog_section mx_FeedbackDialog_reportBug"
+        class="mx_FeedbackDialog_section"
       >
+        <div />
         <h3>
           Report a bug
         </h3>
@@ -44,9 +46,21 @@ exports[`FeedbackDialog should respect feedback config 1`] = `
               target="_blank"
             >
               existing bugs on Github
-              <i
+              <svg
                 class="mx_ExternalLink_icon"
-              />
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+                />
+                <path
+                  d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+                />
+              </svg>
             </a>
              first. No match? 
             <a
@@ -56,9 +70,21 @@ exports[`FeedbackDialog should respect feedback config 1`] = `
               target="_blank"
             >
               Start a new one
-              <i
+              <svg
                 class="mx_ExternalLink_icon"
-              />
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+                />
+                <path
+                  d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+                />
+              </svg>
             </a>
             .
           </span>
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/IntegrationsDisabledDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/IntegrationsDisabledDialog-test.tsx.snap
new file mode 100644
index 0000000000..1d1fdbd307
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/IntegrationsDisabledDialog-test.tsx.snap
@@ -0,0 +1,68 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`<IntegrationsDisabledDialog /> should render as expected 1`] = `
+<DocumentFragment>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+  <div
+    aria-labelledby="mx_BaseDialog_title"
+    class="mx_IntegrationsDisabledDialog mx_Dialog_fixedWidth"
+    data-focus-lock-disabled="false"
+    role="dialog"
+    tabindex="-1"
+  >
+    <div
+      class="mx_Dialog_header"
+    >
+      <h1
+        class="mx_Heading_h3 mx_Dialog_title"
+        id="mx_BaseDialog_title"
+      >
+        Integrations are disabled
+      </h1>
+    </div>
+    <div
+      class="mx_IntegrationsDisabledDialog_content"
+    >
+      <p>
+        Enable 'Manage integrations' in Settings to do this.
+      </p>
+    </div>
+    <div
+      class="mx_Dialog_buttons"
+    >
+      <span
+        class="mx_Dialog_buttons_row"
+      >
+        <button
+          data-testid="dialog-cancel-button"
+          type="button"
+        >
+          OK
+        </button>
+        <button
+          class="mx_Dialog_primary"
+          data-testid="dialog-primary-button"
+          type="button"
+        >
+          Settings
+        </button>
+      </span>
+    </div>
+    <div
+      aria-label="Close dialog"
+      class="mx_AccessibleButton mx_Dialog_cancelButton"
+      role="button"
+      tabindex="0"
+    />
+  </div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+</DocumentFragment>
+`;
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/InviteProgressBody-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/InviteProgressBody-test.tsx.snap
new file mode 100644
index 0000000000..d233bd8b96
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/InviteProgressBody-test.tsx.snap
@@ -0,0 +1,36 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`InviteProgressBody should match snapshot 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_InviteProgressBody"
+  >
+    <span
+      class="mx_InlineSpinner"
+    >
+      <svg
+        aria-label="Loading…"
+        class="_icon_11k6c_18"
+        data-testid="spinner"
+        fill="currentColor"
+        height="1em"
+        role="progressbar"
+        style="width: 20px; height: 20px;"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          clip-rule="evenodd"
+          d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+          fill-rule="evenodd"
+        />
+      </svg>
+    </span>
+    <h1>
+      Preparing invitations...
+    </h1>
+    Do not close the app until finished.
+  </div>
+</DocumentFragment>
+`;
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/LogoutDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/LogoutDialog-test.tsx.snap
index c5db254cb2..f458ec15e3 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/LogoutDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/LogoutDialog-test.tsx.snap
@@ -1,6 +1,6 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
-exports[`LogoutDialog Prompts user to connect backup if there is a backup on the server 1`] = `
+exports[`LogoutDialog Prompts user to go to settings if there is a backup on the server 1`] = `
 <div>
   <div
     data-focus-guard="true"
@@ -13,6 +13,7 @@ exports[`LogoutDialog Prompts user to connect backup if there is a backup on the
     class="mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -55,7 +56,7 @@ exports[`LogoutDialog Prompts user to connect backup if there is a backup on the
             data-testid="dialog-primary-button"
             type="button"
           >
-            Connect this session to Key Backup
+            Go to Settings
           </button>
         </span>
       </div>
@@ -73,6 +74,7 @@ exports[`LogoutDialog Prompts user to connect backup if there is a backup on the
       </details>
     </div>
     <div
+      aria-describedby="_r_q_"
       aria-label="Close dialog"
       class="mx_AccessibleButton mx_Dialog_cancelButton"
       role="button"
@@ -87,7 +89,7 @@ exports[`LogoutDialog Prompts user to connect backup if there is a backup on the
 </div>
 `;
 
-exports[`LogoutDialog Prompts user to set up backup if there is no backup on the server 1`] = `
+exports[`LogoutDialog Prompts user to go to settings if there is no backup on the server 1`] = `
 <div>
   <div
     data-focus-guard="true"
@@ -100,6 +102,7 @@ exports[`LogoutDialog Prompts user to set up backup if there is no backup on the
     class="mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -142,7 +145,7 @@ exports[`LogoutDialog Prompts user to set up backup if there is no backup on the
             data-testid="dialog-primary-button"
             type="button"
           >
-            Start using Key Backup
+            Go to Settings
           </button>
         </span>
       </div>
@@ -160,6 +163,7 @@ exports[`LogoutDialog Prompts user to set up backup if there is no backup on the
       </details>
     </div>
     <div
+      aria-describedby="_r_10_"
       aria-label="Close dialog"
       class="mx_AccessibleButton mx_Dialog_cancelButton"
       role="button"
@@ -187,6 +191,7 @@ exports[`LogoutDialog shows a regular dialog when crypto is disabled 1`] = `
     class="mx_QuestionDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/ManageRestrictedJoinRuleDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/ManageRestrictedJoinRuleDialog-test.tsx.snap
index 627cd1087a..e8a7773166 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/ManageRestrictedJoinRuleDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/ManageRestrictedJoinRuleDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<ManageRestrictedJoinRuleDialog /> should list spaces which are not parents of the room 1`] = `
 <DocumentFragment>
@@ -12,6 +12,7 @@ exports[`<ManageRestrictedJoinRuleDialog /> should list spaces which are not par
     class="mx_ManageRestrictedJoinRuleDialog"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -47,7 +48,19 @@ exports[`<ManageRestrictedJoinRuleDialog /> should list spaces which are not par
         class="mx_AccessibleButton mx_SearchBox_closeButton"
         role="button"
         tabindex="-1"
-      />
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
+          />
+        </svg>
+      </div>
     </div>
     <div
       class="mx_AutoHideScrollbar mx_ManageRestrictedJoinRuleDialog_content"
@@ -72,16 +85,16 @@ exports[`<ManageRestrictedJoinRuleDialog /> should list spaces which are not par
                 class="_inline-field-control_19upo_44"
               >
                 <div
-                  class="_container_1hel1_10"
+                  class="_container_1md5v_10"
                 >
                   <input
-                    aria-describedby="«r5»"
-                    class="_input_1hel1_18"
+                    aria-describedby="_r_5_"
+                    class="_input_1md5v_18"
                     id="checkbox_vY7Q4uEh9K"
                     type="checkbox"
                   />
                   <div
-                    class="_ui_1hel1_19"
+                    class="_ui_1md5v_19"
                   >
                     <svg
                       aria-hidden="true"
@@ -107,7 +120,7 @@ exports[`<ManageRestrictedJoinRuleDialog /> should list spaces which are not par
                 >
                   <div>
                     <span
-                      class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+                      class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
                       data-color="1"
                       data-testid="avatar-img"
                       data-type="round"
@@ -125,7 +138,7 @@ exports[`<ManageRestrictedJoinRuleDialog /> should list spaces which are not par
                 </label>
                 <span
                   class="_message_19upo_85 _help-message_19upo_91"
-                  id="«r5»"
+                  id="_r_5_"
                 >
                   0 members
                 </span>
@@ -141,6 +154,17 @@ exports[`<ManageRestrictedJoinRuleDialog /> should list spaces which are not par
       <div
         class="mx_ManageRestrictedJoinRuleDialog_section_info"
       >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16v-4a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 11a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 12v4q0 .424.287.712.288.288.713.288m0-8q.424 0 .713-.287A.97.97 0 0 0 13 8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8q0 .424.287.713Q11.576 9 12 9m0 13a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+          />
+        </svg>
         You're removing all spaces. Access will default to invite only
       </div>
       <div
@@ -189,6 +213,7 @@ exports[`<ManageRestrictedJoinRuleDialog /> should render empty state 1`] = `
     class="mx_ManageRestrictedJoinRuleDialog"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -224,7 +249,19 @@ exports[`<ManageRestrictedJoinRuleDialog /> should render empty state 1`] = `
         class="mx_AccessibleButton mx_SearchBox_closeButton"
         role="button"
         tabindex="-1"
-      />
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
+          />
+        </svg>
+      </div>
     </div>
     <div
       class="mx_AutoHideScrollbar mx_ManageRestrictedJoinRuleDialog_content"
@@ -242,6 +279,17 @@ exports[`<ManageRestrictedJoinRuleDialog /> should render empty state 1`] = `
       <div
         class="mx_ManageRestrictedJoinRuleDialog_section_info"
       >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16v-4a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 11a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 12v4q0 .424.287.712.288.288.713.288m0-8q.424 0 .713-.287A.97.97 0 0 0 13 8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8q0 .424.287.713Q11.576 9 12 9m0 13a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+          />
+        </svg>
         You're removing all spaces. Access will default to invite only
       </div>
       <div
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/ManualDeviceKeyVerificationDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/ManualDeviceKeyVerificationDialog-test.tsx.snap
new file mode 100644
index 0000000000..65df19b937
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/ManualDeviceKeyVerificationDialog-test.tsx.snap
@@ -0,0 +1,108 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`ManualDeviceKeyVerificationDialog should render correctly 1`] = `
+<DocumentFragment>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+  <div
+    aria-describedby="mx_Dialog_content"
+    aria-labelledby="mx_BaseDialog_title"
+    class="mx_QuestionDialog mx_Dialog_fixedWidth"
+    data-focus-lock-disabled="false"
+    role="dialog"
+    tabindex="-1"
+  >
+    <div
+      class="mx_Dialog_header"
+    >
+      <h1
+        class="mx_Heading_h3 mx_Dialog_title"
+        id="mx_BaseDialog_title"
+      >
+        Verify session
+      </h1>
+    </div>
+    <div
+      class="mx_Dialog_content"
+      id="mx_Dialog_content"
+    >
+      <div>
+        <p>
+          Supply the ID and fingerprint of one of your own devices to verify it. NOTE this allows the other device to send and receive messages as you. IF SOMEONE TOLD YOU TO PASTE SOMETHING HERE, IT IS LIKELY YOU ARE BEING SCAMMED!
+        </p>
+        <div
+          class="mx_DeviceVerifyDialog_cryptoSection"
+        >
+          <div
+            class="mx_Field mx_Field_input mx_TextInputDialog_input"
+          >
+            <input
+              id="mx_Field_1"
+              label="Device ID"
+              placeholder="Device ID"
+              type="text"
+              value="XYZ"
+            />
+            <label
+              for="mx_Field_1"
+            >
+              Device ID
+            </label>
+          </div>
+          <div
+            class="mx_Field mx_Field_input mx_TextInputDialog_input"
+          >
+            <input
+              id="mx_Field_2"
+              label="Fingerprint (session key)"
+              placeholder="Fingerprint (session key)"
+              type="text"
+              value="ABCDEFGH"
+            />
+            <label
+              for="mx_Field_2"
+            >
+              Fingerprint (session key)
+            </label>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="mx_Dialog_buttons"
+    >
+      <span
+        class="mx_Dialog_buttons_row"
+      >
+        <button
+          data-testid="dialog-cancel-button"
+          type="button"
+        >
+          Cancel
+        </button>
+        <button
+          class="mx_Dialog_primary"
+          data-testid="dialog-primary-button"
+          type="button"
+        >
+          Verify session
+        </button>
+      </span>
+    </div>
+    <div
+      aria-label="Close dialog"
+      class="mx_AccessibleButton mx_Dialog_cancelButton"
+      role="button"
+      tabindex="0"
+    />
+  </div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+</DocumentFragment>
+`;
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/MessageEditHistoryDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/MessageEditHistoryDialog-test.tsx.snap
index 5f926ff703..8f1f32d8bb 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/MessageEditHistoryDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/MessageEditHistoryDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<MessageEditHistory /> should match the snapshot 1`] = `
 <div>
@@ -12,6 +12,7 @@ exports[`<MessageEditHistory /> should match the snapshot 1`] = `
     class="mx_MessageEditHistoryDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -102,6 +103,7 @@ exports[`<MessageEditHistory /> should match the snapshot 1`] = `
       </div>
     </div>
     <div
+      aria-describedby="_r_2_"
       aria-label="Close dialog"
       class="mx_AccessibleButton mx_Dialog_cancelButton"
       role="button"
@@ -128,6 +130,7 @@ exports[`<MessageEditHistory /> should support events with 1`] = `
     class="mx_MessageEditHistoryDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -315,6 +318,7 @@ exports[`<MessageEditHistory /> should support events with 1`] = `
       </div>
     </div>
     <div
+      aria-describedby="_r_8_"
       aria-label="Close dialog"
       class="mx_AccessibleButton mx_Dialog_cancelButton"
       role="button"
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/ReportRoomDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/ReportRoomDialog-test.tsx.snap
index ec84104044..00656e47ab 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/ReportRoomDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/ReportRoomDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`ReportRoomDialog displays admin message 1`] = `
 <div>
@@ -13,6 +13,7 @@ exports[`ReportRoomDialog displays admin message 1`] = `
     class="mx_ReportRoomDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -43,7 +44,7 @@ exports[`ReportRoomDialog displays admin message 1`] = `
         />
         <span
           class="_message_19upo_85 _help-message_19upo_91"
-          id="radix-«r8»"
+          id="radix-_r_9_"
         >
           Report this room to your account provider. If the messages are encrypted, your admin will not be able to read them.
         </span>
@@ -65,28 +66,34 @@ exports[`ReportRoomDialog displays admin message 1`] = `
 
       </p>
       <div
-        class="mx_SettingsFlag"
+        class="_inline-field_19upo_32"
       >
-        <span
-          class="mx_SettingsFlag_label"
+        <div
+          class="_inline-field-control_19upo_44"
         >
           <div
-            id="mx_LabelledToggleSwitch_«r9»"
+            class="_container_udcm8_10"
+          >
+            <input
+              class="_input_udcm8_24"
+              id="_r_a_"
+              role="switch"
+              type="checkbox"
+            />
+            <div
+              class="_ui_udcm8_34"
+            />
+          </div>
+        </div>
+        <div
+          class="_inline-field-body_19upo_38"
+        >
+          <label
+            class="_label_19upo_59"
+            for="_r_a_"
           >
             Leave room
-          </div>
-        </span>
-        <div
-          aria-checked="false"
-          aria-disabled="false"
-          aria-labelledby="mx_LabelledToggleSwitch_«r9»"
-          class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
-          role="switch"
-          tabindex="0"
-        >
-          <div
-            class="mx_ToggleSwitch_ball"
-          />
+          </label>
         </div>
       </div>
       <div
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/RoomSettingsDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/RoomSettingsDialog-test.tsx.snap
index 8f60a60c08..c57922ed30 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/RoomSettingsDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/RoomSettingsDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<RoomSettingsDialog /> Settings tabs renders default tabs correctly 1`] = `
 NodeList [
@@ -10,9 +10,20 @@ NodeList [
     role="tab"
     tabindex="0"
   >
-    <span
-      class="mx_TabbedView_maskedIcon mx_RoomSettingsDialog_settingsIcon"
-    />
+    <svg
+      fill="currentColor"
+      height="1em"
+      viewBox="0 0 24 24"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M16 12a4 4 0 1 1-8 0 4 4 0 0 1 8 0m-2 0a2 2 0 1 0-4 0 2 2 0 0 0 4 0"
+      />
+      <path
+        d="M11.312 2h1.376A2.31 2.31 0 0 1 15 4.312v.247l.002.003c.01.014.031.033.064.047.03.013.056.013.07.01h.002l.177-.177a2.31 2.31 0 0 1 3.27 0l.973.974a2.31 2.31 0 0 1 0 3.269l-.177.177v.003a.13.13 0 0 0 .01.07.15.15 0 0 0 .047.063l.003.002h.247A2.31 2.31 0 0 1 22 11.312v1.376A2.31 2.31 0 0 1 19.688 15h-.247l-.003.002a.15.15 0 0 0-.047.064.13.13 0 0 0-.01.07v.002l.177.177a2.31 2.31 0 0 1 0 3.27l-.974.973a2.31 2.31 0 0 1-3.269 0l-.177-.177h-.003a.13.13 0 0 0-.07.01.15.15 0 0 0-.063.047l-.002.003v.247A2.31 2.31 0 0 1 12.688 22h-1.376A2.31 2.31 0 0 1 9 19.688v-.247l-.002-.003a.15.15 0 0 0-.064-.047.13.13 0 0 0-.07-.01h-.002l-.177.177a2.31 2.31 0 0 1-3.27 0l-.973-.974a2.31 2.31 0 0 1 0-3.269l.177-.177v-.003a.14.14 0 0 0-.01-.07.15.15 0 0 0-.047-.063L4.559 15h-.247A2.31 2.31 0 0 1 2 12.688v-1.376A2.31 2.31 0 0 1 4.312 9h.247l.003-.002a.15.15 0 0 0 .047-.064.14.14 0 0 0 .01-.07v-.002l-.177-.177a2.31 2.31 0 0 1 0-3.27l.974-.973a2.31 2.31 0 0 1 3.269 0l.177.177h.003a.14.14 0 0 0 .07-.01.15.15 0 0 0 .063-.047L9 4.559v-.247A2.31 2.31 0 0 1 11.312 2M11 4.312v.257c0 .893-.59 1.593-1.299 1.887-.716.297-1.622.21-2.248-.418l-.182-.182a.31.31 0 0 0-.441 0l-.974.974a.31.31 0 0 0 0 .44l.182.183c.627.626.715 1.531.418 2.248C6.162 10.41 5.462 11 4.569 11h-.257a.31.31 0 0 0-.312.312v1.376c0 .172.14.312.312.312h.257c.893 0 1.593.59 1.887 1.299.297.716.21 1.622-.418 2.248l-.182.182a.31.31 0 0 0 0 .441l.974.973a.31.31 0 0 0 .44 0l.183-.181c.626-.627 1.532-.715 2.248-.418.709.294 1.299.994 1.299 1.887v.257c0 .172.14.312.312.312h1.376c.172 0 .312-.14.312-.312v-.257c0-.893.59-1.593 1.299-1.887.716-.297 1.622-.21 2.249.418l.181.181c.122.122.32.122.441 0l.973-.973a.31.31 0 0 0 0-.44l-.181-.183c-.627-.626-.715-1.532-.418-2.248.294-.709.994-1.299 1.887-1.299h.257c.172 0 .312-.14.312-.312v-1.376a.31.31 0 0 0-.312-.312h-.257c-.893 0-1.593-.59-1.887-1.299-.297-.717-.21-1.622.418-2.248l.181-.182a.31.31 0 0 0 0-.441l-.973-.974a.31.31 0 0 0-.44 0l-.183.182c-.626.627-1.532.715-2.248.418C13.59 6.162 13 5.462 13 4.569v-.257A.31.31 0 0 0 12.688 4h-1.376a.31.31 0 0 0-.312.312"
+      />
+    </svg>
     <span
       class="mx_TabbedView_tabLabel_text"
       id="mx_tabpanel_ROOM_GENERAL_TAB_label"
@@ -28,9 +39,17 @@ NodeList [
     role="tab"
     tabindex="-1"
   >
-    <span
-      class="mx_TabbedView_maskedIcon mx_RoomSettingsDialog_securityIcon"
-    />
+    <svg
+      fill="currentColor"
+      height="1em"
+      viewBox="0 0 24 24"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M6 22q-.824 0-1.412-.587A1.93 1.93 0 0 1 4 20V10q0-.825.588-1.412A1.93 1.93 0 0 1 6 8h1V6q0-2.075 1.463-3.537Q9.926 1 12 1q2.075 0 3.537 1.463Q17 3.925 17 6v2h1q.824 0 1.413.588Q20 9.175 20 10v10q0 .824-.587 1.413A1.93 1.93 0 0 1 18 22zm0-2h12V10H6zM9 8h6V6q0-1.25-.875-2.125A2.9 2.9 0 0 0 12 3q-1.25 0-2.125.875A2.9 2.9 0 0 0 9 6z"
+      />
+    </svg>
     <span
       class="mx_TabbedView_tabLabel_text"
       id="mx_tabpanel_ROOM_SECURITY_TAB_label"
@@ -46,9 +65,19 @@ NodeList [
     role="tab"
     tabindex="-1"
   >
-    <span
-      class="mx_TabbedView_maskedIcon mx_RoomSettingsDialog_rolesIcon"
-    />
+    <svg
+      fill="currentColor"
+      height="1em"
+      viewBox="0 0 24 24"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        clip-rule="evenodd"
+        d="m12 4.236-6 3V12c0 5.156 4.239 7.254 6 7.898 1.761-.644 6-2.742 6-7.898V7.236zm-.894-1.789a2 2 0 0 1 1.788 0l6 3A2 2 0 0 1 20 7.236V12c0 6.742-5.773 9.246-7.51 9.846-.32.111-.66.111-.98 0C9.774 21.246 4 18.743 4 12V7.236a2 2 0 0 1 1.106-1.789z"
+        fill-rule="evenodd"
+      />
+    </svg>
     <span
       class="mx_TabbedView_tabLabel_text"
       id="mx_tabpanel_ROOM_ROLES_TAB_label"
@@ -64,9 +93,17 @@ NodeList [
     role="tab"
     tabindex="-1"
   >
-    <span
-      class="mx_TabbedView_maskedIcon mx_RoomSettingsDialog_notificationsIcon"
-    />
+    <svg
+      fill="currentColor"
+      height="1em"
+      viewBox="0 0 24 24"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M12 3c7 0 7 7 7 7v6l1.293 1.293c.63.63.184 1.707-.707 1.707H4.414c-.89 0-1.337-1.077-.707-1.707L5 16v-6s0-7 7-7m5 7.01v-.022l-.009-.146a7 7 0 0 0-.073-.607 6.6 6.6 0 0 0-.582-1.84c-.319-.638-.766-1.215-1.398-1.637C14.318 5.344 13.4 5 12 5s-2.317.344-2.937.758c-.633.422-1.08.999-1.4 1.636a6.6 6.6 0 0 0-.58 1.841A7 7 0 0 0 7 9.988v6.84L6.828 17h10.344L17 16.828zM12 22a2 2 0 0 1-2-2h4a2 2 0 0 1-2 2"
+      />
+    </svg>
     <span
       class="mx_TabbedView_tabLabel_text"
       id="mx_tabpanel_ROOM_NOTIFICATIONS_TAB_label"
@@ -82,9 +119,17 @@ NodeList [
     role="tab"
     tabindex="-1"
   >
-    <span
-      class="mx_TabbedView_maskedIcon mx_RoomSettingsDialog_pollsIcon"
-    />
+    <svg
+      fill="currentColor"
+      height="1em"
+      viewBox="0 0 24 24"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M16 10q.424 0 .712-.287A.97.97 0 0 0 17 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 8h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 9q0 .424.287.713.288.287.713.287zm0 6q.424 0 .712-.287A.97.97 0 0 0 17 15a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 14h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 15q0 .424.287.713.288.287.713.287zm-7-5q.825 0 1.412-.588Q11 9.826 11 9t-.588-1.412A1.93 1.93 0 0 0 9 7q-.825 0-1.412.588A1.93 1.93 0 0 0 7 9q0 .825.588 1.412Q8.175 11 9 11m0 6q.825 0 1.412-.587Q11 15.825 11 15t-.588-1.412A1.93 1.93 0 0 0 9 13q-.825 0-1.412.588A1.93 1.93 0 0 0 7 15q0 .824.588 1.413Q8.175 17 9 17m-4 4q-.824 0-1.412-.587A1.93 1.93 0 0 1 3 19V5q0-.824.587-1.412A1.93 1.93 0 0 1 5 3h14q.824 0 1.413.587Q21 4.176 21 5v14q0 .824-.587 1.413A1.93 1.93 0 0 1 19 21zm0-2h14V5H5z"
+      />
+    </svg>
     <span
       class="mx_TabbedView_tabLabel_text"
       id="mx_tabpanel_ROOM_POLL_HISTORY_TAB_label"
@@ -142,15 +187,28 @@ exports[`<RoomSettingsDialog /> poll history displays poll history when tab clic
       <div
         class="mx_PollHistoryList_loading mx_PollHistoryList_noResultsYet"
       >
-        <div
+        <span
           class="mx_InlineSpinner"
         >
-          <div
+          <svg
             aria-label="Loading…"
-            class="mx_InlineSpinner_icon mx_Spinner_icon"
-            style="width: 16px; height: 16px;"
-          />
-        </div>
+            class="_icon_11k6c_18"
+            data-testid="spinner"
+            fill="currentColor"
+            height="1em"
+            role="progressbar"
+            style="width: 20px; height: 20px;"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              clip-rule="evenodd"
+              d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+              fill-rule="evenodd"
+            />
+          </svg>
+        </span>
         Loading polls
       </div>
     </div>
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/ServerPickerDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/ServerPickerDialog-test.tsx.snap
index 633dd34fe0..4352b3a826 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/ServerPickerDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/ServerPickerDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<ServerPickerDialog /> should render dialog 1`] = `
 <div>
@@ -13,6 +13,7 @@ exports[`<ServerPickerDialog /> should render dialog 1`] = `
     class="mx_ServerPickerDialog"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -50,7 +51,7 @@ exports[`<ServerPickerDialog /> should render dialog 1`] = `
           class="mx_StyledRadioButton_content"
         >
           <span
-            aria-labelledby="«r0»"
+            aria-labelledby="_r_0_"
             class="mx_Login_underlinedServerName"
             tabindex="0"
           >
@@ -121,9 +122,21 @@ exports[`<ServerPickerDialog /> should render dialog 1`] = `
         target="_blank"
       >
         About homeservers
-        <i
+        <svg
           class="mx_ExternalLink_icon"
-        />
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+          />
+          <path
+            d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+          />
+        </svg>
       </a>
     </form>
     <div
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/ShareDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/ShareDialog-test.tsx.snap
index 12760c8ca4..e6ead980dd 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/ShareDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/ShareDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`ShareDialog should not render the QR code if disabled 1`] = `
 <DocumentFragment>
@@ -13,6 +13,7 @@ exports[`ShareDialog should not render the QR code if disabled 1`] = `
     class="mx_ShareDialog"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -35,7 +36,7 @@ exports[`ShareDialog should not render the QR code if disabled 1`] = `
         </span>
       </div>
       <button
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="primary"
         data-size="lg"
         role="button"
@@ -143,6 +144,7 @@ exports[`ShareDialog should not render the socials if disabled 1`] = `
     class="mx_ShareDialog"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -166,13 +168,24 @@ exports[`ShareDialog should not render the socials if disabled 1`] = `
           <div
             class="mx_Spinner"
           >
-            <div
+            <svg
               aria-label="Loading…"
-              class="mx_Spinner_icon"
+              class="_icon_11k6c_18"
               data-testid="spinner"
+              fill="currentColor"
+              height="1em"
               role="progressbar"
               style="width: 32px; height: 32px;"
-            />
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+                fill-rule="evenodd"
+              />
+            </svg>
           </div>
         </div>
         <span>
@@ -180,7 +193,7 @@ exports[`ShareDialog should not render the socials if disabled 1`] = `
         </span>
       </div>
       <button
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="primary"
         data-size="lg"
         role="button"
@@ -229,6 +242,7 @@ exports[`ShareDialog should render a share dialog for a matrix event 1`] = `
     class="mx_ShareDialog"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -252,13 +266,24 @@ exports[`ShareDialog should render a share dialog for a matrix event 1`] = `
           <div
             class="mx_Spinner"
           >
-            <div
+            <svg
               aria-label="Loading…"
-              class="mx_Spinner_icon"
+              class="_icon_11k6c_18"
               data-testid="spinner"
+              fill="currentColor"
+              height="1em"
               role="progressbar"
               style="width: 32px; height: 32px;"
-            />
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+                fill-rule="evenodd"
+              />
+            </svg>
           </div>
         </div>
         <span>
@@ -267,15 +292,15 @@ exports[`ShareDialog should render a share dialog for a matrix event 1`] = `
       </div>
       <label>
         <div
-          class="_container_1hel1_10"
+          class="_container_1md5v_10"
         >
           <input
             checked=""
-            class="_input_1hel1_18"
+            class="_input_1md5v_18"
             type="checkbox"
           />
           <div
-            class="_ui_1hel1_19"
+            class="_ui_1md5v_19"
           >
             <svg
               aria-hidden="true"
@@ -294,7 +319,7 @@ exports[`ShareDialog should render a share dialog for a matrix event 1`] = `
         Link to selected message
       </label>
       <button
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="primary"
         data-size="lg"
         role="button"
@@ -402,6 +427,7 @@ exports[`ShareDialog should render a share dialog for a room 1`] = `
     class="mx_ShareDialog"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -425,13 +451,24 @@ exports[`ShareDialog should render a share dialog for a room 1`] = `
           <div
             class="mx_Spinner"
           >
-            <div
+            <svg
               aria-label="Loading…"
-              class="mx_Spinner_icon"
+              class="_icon_11k6c_18"
               data-testid="spinner"
+              fill="currentColor"
+              height="1em"
               role="progressbar"
               style="width: 32px; height: 32px;"
-            />
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+                fill-rule="evenodd"
+              />
+            </svg>
           </div>
         </div>
         <span>
@@ -440,14 +477,14 @@ exports[`ShareDialog should render a share dialog for a room 1`] = `
       </div>
       <label>
         <div
-          class="_container_1hel1_10"
+          class="_container_1md5v_10"
         >
           <input
-            class="_input_1hel1_18"
+            class="_input_1md5v_18"
             type="checkbox"
           />
           <div
-            class="_ui_1hel1_19"
+            class="_ui_1md5v_19"
           >
             <svg
               aria-hidden="true"
@@ -466,7 +503,7 @@ exports[`ShareDialog should render a share dialog for a room 1`] = `
         Link to most recent message
       </label>
       <button
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="primary"
         data-size="lg"
         role="button"
@@ -574,6 +611,7 @@ exports[`ShareDialog should render a share dialog for a room member 1`] = `
     class="mx_ShareDialog"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -597,13 +635,24 @@ exports[`ShareDialog should render a share dialog for a room member 1`] = `
           <div
             class="mx_Spinner"
           >
-            <div
+            <svg
               aria-label="Loading…"
-              class="mx_Spinner_icon"
+              class="_icon_11k6c_18"
               data-testid="spinner"
+              fill="currentColor"
+              height="1em"
               role="progressbar"
               style="width: 32px; height: 32px;"
-            />
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+                fill-rule="evenodd"
+              />
+            </svg>
           </div>
         </div>
         <span>
@@ -611,7 +660,7 @@ exports[`ShareDialog should render a share dialog for a room member 1`] = `
         </span>
       </div>
       <button
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="primary"
         data-size="lg"
         role="button"
@@ -719,6 +768,7 @@ exports[`ShareDialog should render a share dialog for an URL 1`] = `
     class="mx_ShareDialog"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -742,13 +792,24 @@ exports[`ShareDialog should render a share dialog for an URL 1`] = `
           <div
             class="mx_Spinner"
           >
-            <div
+            <svg
               aria-label="Loading…"
-              class="mx_Spinner_icon"
+              class="_icon_11k6c_18"
               data-testid="spinner"
+              fill="currentColor"
+              height="1em"
               role="progressbar"
               style="width: 32px; height: 32px;"
-            />
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+                fill-rule="evenodd"
+              />
+            </svg>
           </div>
         </div>
         <span>
@@ -756,7 +817,7 @@ exports[`ShareDialog should render a share dialog for an URL 1`] = `
         </span>
       </div>
       <button
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="primary"
         data-size="lg"
         role="button"
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/UnpinAllDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/UnpinAllDialog-test.tsx.snap
index 93aa25f399..044e0a2911 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/UnpinAllDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/UnpinAllDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<UnpinAllDialog /> should render 1`] = `
 <DocumentFragment>
@@ -12,6 +12,7 @@ exports[`<UnpinAllDialog /> should render 1`] = `
     class="mx_UnpinAllDialog"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -32,7 +33,7 @@ exports[`<UnpinAllDialog /> should render 1`] = `
       class="mx_UnpinAllDialog_buttons"
     >
       <button
-        class="_button_vczzf_8 _destructive_vczzf_107"
+        class="_button_187yx_8 _destructive_187yx_107"
         data-kind="primary"
         data-size="lg"
         role="button"
@@ -41,7 +42,7 @@ exports[`<UnpinAllDialog /> should render 1`] = `
         Continue
       </button>
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="tertiary"
         data-size="lg"
         role="button"
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/UntrustedDeviceDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/UntrustedDeviceDialog-test.tsx.snap
index 2fd5fdd249..d2da93910d 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/UntrustedDeviceDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/UntrustedDeviceDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<UntrustedDeviceDialog /> should display the dialog for the device of another user 1`] = `
 <DocumentFragment>
@@ -12,6 +12,7 @@ exports[`<UntrustedDeviceDialog /> should display the dialog for the device of a
     class="mx_UntrustedDeviceDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -21,9 +22,23 @@ exports[`<UntrustedDeviceDialog /> should display the dialog for the device of a
         id="mx_BaseDialog_title"
       >
         <div
-          class="mx_E2EIcon mx_E2EIcon_warning"
+          class="mx_E2EIcon"
+          data-testid="e2e-icon"
           style="width: 24px; height: 24px;"
-        />
+        >
+          <svg
+            class="mx_E2EIcon_warning"
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+            />
+          </svg>
+        </div>
         Not Trusted
       </h1>
     </div>
@@ -86,6 +101,7 @@ exports[`<UntrustedDeviceDialog /> should display the dialog for the device of t
     class="mx_UntrustedDeviceDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -95,9 +111,23 @@ exports[`<UntrustedDeviceDialog /> should display the dialog for the device of t
         id="mx_BaseDialog_title"
       >
         <div
-          class="mx_E2EIcon mx_E2EIcon_warning"
+          class="mx_E2EIcon"
+          data-testid="e2e-icon"
           style="width: 24px; height: 24px;"
-        />
+        >
+          <svg
+            class="mx_E2EIcon_warning"
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+            />
+          </svg>
+        </div>
         Not Trusted
       </h1>
     </div>
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/UploadConfirmDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/UploadConfirmDialog-test.tsx.snap
new file mode 100644
index 0000000000..689167e46c
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/UploadConfirmDialog-test.tsx.snap
@@ -0,0 +1,80 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`<UploadConfirmDialog /> should display image preview 1`] = `
+<DocumentFragment>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+  <div
+    aria-describedby="mx_Dialog_content"
+    aria-labelledby="mx_BaseDialog_title"
+    class="mx_UploadConfirmDialog"
+    data-focus-lock-disabled="false"
+    role="dialog"
+    tabindex="-1"
+  >
+    <div
+      class="mx_Dialog_header"
+    >
+      <h1
+        class="mx_Heading_h3 mx_Dialog_title"
+        id="mx_BaseDialog_title"
+      >
+        Upload files
+      </h1>
+    </div>
+    <div
+      id="mx_Dialog_content"
+    >
+      <div
+        class="mx_UploadConfirmDialog_previewOuter"
+      >
+        <div
+          class="mx_UploadConfirmDialog_previewInner"
+        >
+          <div>
+            <img
+              aria-labelledby="mx-uploadconfirmdialog-image.png"
+              class="mx_UploadConfirmDialog_imagePreview"
+              src="blob:null/1234-5678-9101-1121"
+            />
+          </div>
+          <div
+            id="mx-uploadconfirmdialog-image.png"
+          >
+            image.png (124 KB)
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="mx_Dialog_buttons"
+    >
+      <span
+        class="mx_Dialog_buttons_row"
+      >
+        <button
+          class="mx_Dialog_primary"
+          data-testid="dialog-primary-button"
+          type="button"
+        >
+          Upload
+        </button>
+      </span>
+    </div>
+    <div
+      aria-label="Close dialog"
+      class="mx_AccessibleButton mx_Dialog_cancelButton"
+      role="button"
+      tabindex="0"
+    />
+  </div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+</DocumentFragment>
+`;
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/UserSettingsDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/UserSettingsDialog-test.tsx.snap
index 3bdd88d373..2f515d8a96 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/UserSettingsDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/UserSettingsDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<UserSettingsDialog /> renders tabs correctly 1`] = `
 NodeList [
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/VerificationRequestDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/VerificationRequestDialog-test.tsx.snap
new file mode 100644
index 0000000000..8a42285ea0
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/VerificationRequestDialog-test.tsx.snap
@@ -0,0 +1,469 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`VerificationRequestDialog After scanning QR, shows confirmation dialog 1`] = `
+<DocumentFragment>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+  <div
+    aria-describedby="mx_Dialog_content"
+    aria-labelledby="mx_BaseDialog_title"
+    class="mx_InfoDialog mx_Dialog_fixedWidth"
+    data-focus-lock-disabled="false"
+    role="dialog"
+    tabindex="-1"
+  >
+    <div
+      class="mx_Dialog_header"
+    >
+      <h1
+        class="mx_Heading_h3 mx_Dialog_title"
+        id="mx_BaseDialog_title"
+      >
+        Confirm that you see a green shield on your other device
+      </h1>
+    </div>
+    <div
+      class="mx_UserInfo_container mx_VerificationPanel_reciprocate_section"
+    >
+      <p>
+        Check again on your other device to finish verification.
+      </p>
+      <div
+        class="mx_E2EIcon"
+        data-testid="e2e-icon"
+        style="width: 128px; height: 128px;"
+      >
+        <svg
+          class="mx_E2EIcon_verified"
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            clip-rule="evenodd"
+            d="M11.106 2.447a2 2 0 0 1 1.789 0l6 3A2 2 0 0 1 20 7.237V12c0 6.742-5.773 9.246-7.51 9.846-.32.111-.66.111-.98 0C9.774 21.246 4 18.743 4 12V7.236a2 2 0 0 1 1.105-1.789zm4.601 6.846a1 1 0 0 0-1.414 0L11 12.586l-1.293-1.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0 0-1.414"
+            fill-rule="evenodd"
+          />
+        </svg>
+      </div>
+      <div
+        class="mx_VerificationPanel_reciprocateButtons"
+      >
+        <div
+          class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
+          role="button"
+          tabindex="0"
+        >
+          Yes, I see a green shield
+        </div>
+        <div
+          class="mx_AccessibleButton"
+          role="button"
+          tabindex="0"
+        >
+          No, I don't see a green shield
+        </div>
+      </div>
+    </div>
+    <div
+      aria-label="Close dialog"
+      class="mx_AccessibleButton mx_Dialog_cancelButton"
+      role="button"
+      tabindex="0"
+    />
+  </div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+</DocumentFragment>
+`;
+
+exports[`VerificationRequestDialog After we started verification here, says we are waiting for the other device 1`] = `
+<DocumentFragment>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+  <div
+    aria-describedby="mx_Dialog_content"
+    aria-labelledby="mx_BaseDialog_title"
+    class="mx_InfoDialog mx_Dialog_fixedWidth"
+    data-focus-lock-disabled="false"
+    role="dialog"
+    tabindex="-1"
+  >
+    <div
+      class="mx_Dialog_header"
+    >
+      <h1
+        class="mx_Heading_h3 mx_Dialog_title"
+        id="mx_BaseDialog_title"
+      >
+        Start verification on the other device
+      </h1>
+    </div>
+    <div>
+      Once accepted you'll be able to continue with the verification.
+    </div>
+    <div
+      aria-describedby="_r_6_"
+      aria-label="Close dialog"
+      class="mx_AccessibleButton mx_Dialog_cancelButton"
+      role="button"
+      tabindex="0"
+    />
+  </div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+</DocumentFragment>
+`;
+
+exports[`VerificationRequestDialog Initially, asks how you would like to verify this device 1`] = `
+<DocumentFragment>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+  <div
+    aria-describedby="mx_Dialog_content"
+    aria-labelledby="mx_BaseDialog_title"
+    class="mx_InfoDialog mx_Dialog_fixedWidth"
+    data-focus-lock-disabled="false"
+    role="dialog"
+    tabindex="-1"
+  >
+    <div
+      class="mx_Dialog_header"
+    >
+      <h1
+        class="mx_Heading_h3 mx_Dialog_title"
+        id="mx_BaseDialog_title"
+      >
+        Choose how to verify
+      </h1>
+    </div>
+    <div>
+      Verify by completing one of the following:
+      <div
+        class="mx_VerificationPanel_QRPhase_startOptions"
+      >
+        <div
+          class="mx_VerificationPanel_QRPhase_startOption"
+        >
+          <p>
+            Scan this unique code
+          </p>
+          <div
+            class="mx_QRCode mx_VerificationQRCode"
+          >
+            <div
+              class="mx_Spinner"
+            >
+              <svg
+                aria-label="Loading…"
+                class="_icon_11k6c_18"
+                data-testid="spinner"
+                fill="currentColor"
+                height="1em"
+                role="progressbar"
+                style="width: 32px; height: 32px;"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  clip-rule="evenodd"
+                  d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+                  fill-rule="evenodd"
+                />
+              </svg>
+            </div>
+          </div>
+        </div>
+        <div
+          class="mx_VerificationPanel_QRPhase_betweenText"
+        >
+           or 
+        </div>
+        <div
+          class="mx_VerificationPanel_QRPhase_startOption"
+        >
+          <p>
+            Compare unique emoji
+          </p>
+          <span
+            class="mx_VerificationPanel_QRPhase_helpText"
+          >
+            Compare a unique set of emoji if you don't have a camera on either device
+          </span>
+          <div
+            class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
+            role="button"
+            tabindex="0"
+          >
+            Start
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      aria-label="Close dialog"
+      class="mx_AccessibleButton mx_Dialog_cancelButton"
+      role="button"
+      tabindex="0"
+    />
+  </div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+</DocumentFragment>
+`;
+
+exports[`VerificationRequestDialog Shows a failure message if verification was cancelled 1`] = `
+<DocumentFragment>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+  <div
+    aria-describedby="mx_Dialog_content"
+    aria-labelledby="mx_BaseDialog_title"
+    class="mx_InfoDialog mx_Dialog_fixedWidth"
+    data-focus-lock-disabled="false"
+    role="dialog"
+    tabindex="-1"
+  >
+    <div
+      class="mx_Dialog_header"
+    >
+      <h1
+        class="mx_Heading_h3 mx_Dialog_title"
+        id="mx_BaseDialog_title"
+      >
+        Verification failed
+      </h1>
+    </div>
+    <div
+      class="mx_UserInfo_container"
+    >
+      <p>
+        Either the request timed out, the request was denied, or there was a verification mismatch.
+      </p>
+      <div
+        class="mx_AccessibleButton mx_UserInfo_wideButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
+        role="button"
+        tabindex="0"
+      >
+        Got it
+      </div>
+    </div>
+    <div
+      aria-label="Close dialog"
+      class="mx_AccessibleButton mx_Dialog_cancelButton"
+      role="button"
+      tabindex="0"
+    />
+  </div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+</DocumentFragment>
+`;
+
+exports[`VerificationRequestDialog Shows a successful message if verification finished normally 1`] = `
+<DocumentFragment>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+  <div
+    aria-describedby="mx_Dialog_content"
+    aria-labelledby="mx_BaseDialog_title"
+    class="mx_InfoDialog mx_Dialog_fixedWidth"
+    data-focus-lock-disabled="false"
+    role="dialog"
+    tabindex="-1"
+  >
+    <div
+      class="mx_Dialog_header"
+    >
+      <h1
+        class="mx_Heading_h3 mx_Dialog_title"
+        id="mx_BaseDialog_title"
+      >
+        Device verified
+      </h1>
+    </div>
+    <div
+      class="mx_UserInfo_container mx_VerificationPanel_verified_section"
+    >
+      <p>
+        Now you can read or send messages securely, and anyone you chat with can also trust this device.
+      </p>
+      <div
+        class="mx_E2EIcon"
+        data-testid="e2e-icon"
+        style="width: 128px; height: 128px;"
+      >
+        <svg
+          class="mx_E2EIcon_verified"
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            clip-rule="evenodd"
+            d="M11.106 2.447a2 2 0 0 1 1.789 0l6 3A2 2 0 0 1 20 7.237V12c0 6.742-5.773 9.246-7.51 9.846-.32.111-.66.111-.98 0C9.774 21.246 4 18.743 4 12V7.236a2 2 0 0 1 1.105-1.789zm4.601 6.846a1 1 0 0 0-1.414 0L11 12.586l-1.293-1.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0 0-1.414"
+            fill-rule="evenodd"
+          />
+        </svg>
+      </div>
+      <div
+        class="mx_AccessibleButton mx_UserInfo_wideButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
+        role="button"
+        tabindex="0"
+      >
+        Got it
+      </div>
+    </div>
+    <div
+      aria-label="Close dialog"
+      class="mx_AccessibleButton mx_Dialog_cancelButton"
+      role="button"
+      tabindex="0"
+    />
+  </div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+</DocumentFragment>
+`;
+
+exports[`VerificationRequestDialog When other device accepted emoji, displays emojis and asks for confirmation 1`] = `
+<DocumentFragment>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+  <div
+    aria-describedby="mx_Dialog_content"
+    aria-labelledby="mx_BaseDialog_title"
+    class="mx_InfoDialog mx_Dialog_fixedWidth"
+    data-focus-lock-disabled="false"
+    role="dialog"
+    tabindex="-1"
+  >
+    <div
+      class="mx_Dialog_header"
+    >
+      <h1
+        class="mx_Heading_h3 mx_Dialog_title"
+        id="mx_BaseDialog_title"
+      >
+        Compare emojis
+      </h1>
+    </div>
+    <div
+      class="mx_UserInfo_container"
+    >
+      <div
+        class="mx_VerificationShowSas"
+      >
+        <p>
+          Confirm that the emojis below match those shown on your other device.
+        </p>
+        <div
+          class="mx_VerificationShowSas_emojiSas"
+        >
+          <div
+            class="mx_VerificationShowSas_emojiSas_block"
+          >
+            <div
+              aria-hidden="true"
+              class="mx_VerificationShowSas_emojiSas_emoji"
+            >
+              🐶
+            </div>
+            <div
+              class="mx_VerificationShowSas_emojiSas_label"
+            >
+              Dog
+            </div>
+          </div>
+          <div
+            class="mx_VerificationShowSas_emojiSas_block"
+          >
+            <div
+              aria-hidden="true"
+              class="mx_VerificationShowSas_emojiSas_emoji"
+            >
+              🐱
+            </div>
+            <div
+              class="mx_VerificationShowSas_emojiSas_label"
+            >
+              Cat
+            </div>
+          </div>
+          <div
+            class="mx_VerificationShowSas_emojiSas_break"
+          />
+        </div>
+        <p />
+        <div
+          class="mx_VerificationShowSas_buttonRow"
+        >
+          <div
+            class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
+            role="button"
+            tabindex="0"
+          >
+            They match
+          </div>
+          <div
+            class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_secondary"
+            role="button"
+            tabindex="0"
+          >
+            They don't match
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      aria-label="Close dialog"
+      class="mx_AccessibleButton mx_Dialog_cancelButton"
+      role="button"
+      tabindex="0"
+    />
+  </div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+</DocumentFragment>
+`;
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/WidgetOpenIDPermissionsDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/WidgetOpenIDPermissionsDialog-test.tsx.snap
new file mode 100644
index 0000000000..761dc94e49
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/WidgetOpenIDPermissionsDialog-test.tsx.snap
@@ -0,0 +1,112 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`WidgetOpenIDPermissionsDialog should render 1`] = `
+<DocumentFragment>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+  <div
+    aria-labelledby="mx_BaseDialog_title"
+    class="mx_WidgetOpenIDPermissionsDialog mx_Dialog_fixedWidth"
+    data-focus-lock-disabled="false"
+    role="dialog"
+    tabindex="-1"
+  >
+    <div
+      class="mx_Dialog_header"
+    >
+      <h1
+        class="mx_Heading_h3 mx_Dialog_title"
+        id="mx_BaseDialog_title"
+      >
+        Allow this widget to verify your identity
+      </h1>
+    </div>
+    <div
+      class="mx_WidgetOpenIDPermissionsDialog_content"
+    >
+      <p>
+        The widget will verify your user ID, but won't be able to perform actions for you:
+      </p>
+      <p
+        class="text-muted"
+      >
+        https://imawidget
+      </p>
+    </div>
+    <div
+      class="mx_Dialog_buttons"
+    >
+      <div
+        class="mx_Dialog_buttons_additive"
+      >
+        <form
+          class="_root_19upo_16"
+        >
+          <div
+            class="_inline-field_19upo_32"
+          >
+            <div
+              class="_inline-field-control_19upo_44"
+            >
+              <div
+                class="_container_udcm8_10"
+              >
+                <input
+                  class="_input_udcm8_24"
+                  id="_r_0_"
+                  role="switch"
+                  type="checkbox"
+                />
+                <div
+                  class="_ui_udcm8_34"
+                />
+              </div>
+            </div>
+            <div
+              class="_inline-field-body_19upo_38"
+            >
+              <label
+                class="_label_19upo_59"
+                for="_r_0_"
+              >
+                Remember this
+              </label>
+            </div>
+          </div>
+        </form>
+      </div>
+      <span
+        class="mx_Dialog_buttons_row"
+      >
+        <button
+          data-testid="dialog-cancel-button"
+          type="button"
+        >
+          Cancel
+        </button>
+        <button
+          class="mx_Dialog_primary"
+          data-testid="dialog-primary-button"
+          type="button"
+        >
+          Continue
+        </button>
+      </span>
+    </div>
+    <div
+      aria-label="Close dialog"
+      class="mx_AccessibleButton mx_Dialog_cancelButton"
+      role="button"
+      tabindex="0"
+    />
+  </div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+</DocumentFragment>
+`;
diff --git a/test/unit-tests/components/views/dialogs/devtools/Users-test.tsx b/test/unit-tests/components/views/dialogs/devtools/Users-test.tsx
new file mode 100644
index 0000000000..76ef540e6f
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/devtools/Users-test.tsx
@@ -0,0 +1,361 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React from "react";
+import { mocked } from "jest-mock";
+import { Device, DeviceVerification, type MatrixClient, MatrixEvent, RoomMember } from "matrix-js-sdk/src/matrix";
+import { render, screen, waitFor } from "jest-matrix-react";
+import { Room, PendingEventOrdering } from "matrix-js-sdk/src/matrix";
+import { type DeviceVerificationStatus, type UserVerificationStatus } from "matrix-js-sdk/src/crypto-api";
+
+import { createTestClient } from "../../../../../test-utils";
+import MatrixClientContext from "../../../../../../src/contexts/MatrixClientContext";
+import { DevtoolsContext } from "../../../../../../src/components/views/dialogs/devtools/BaseTool";
+import { UserList } from "../../../../../../src/components/views/dialogs/devtools/Users";
+
+const userId = "@alice:example.com";
+
+describe("<Users />", () => {
+    let matrixClient: MatrixClient;
+    beforeEach(() => {
+        matrixClient = createTestClient();
+    });
+
+    it("should render a user list", () => {
+        const room = new Room("!roomId", matrixClient, userId, {
+            pendingEventOrdering: PendingEventOrdering.Detached,
+        });
+        room.getJoinedMembers = jest.fn().mockReturnValue([]);
+
+        const { asFragment } = render(
+            <MatrixClientContext.Provider value={matrixClient}>
+                <DevtoolsContext.Provider value={{ room }}>
+                    <UserList onBack={() => {}} />
+                </DevtoolsContext.Provider>
+            </MatrixClientContext.Provider>,
+        );
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should render a single user", async () => {
+        const room = new Room("!roomId", matrixClient, userId, {
+            pendingEventOrdering: PendingEventOrdering.Detached,
+        });
+
+        const alice = new RoomMember("!roomId", userId);
+        alice.setMembershipEvent(
+            new MatrixEvent({
+                content: {
+                    membership: "join",
+                },
+                state_key: userId,
+                room_id: "!roomId",
+                type: "m.room.member",
+                sender: userId,
+            }),
+        );
+        room.getJoinedMembers = jest.fn().mockReturnValue([alice]);
+
+        mocked(matrixClient.getCrypto()!.getUserVerificationStatus).mockResolvedValue({
+            isCrossSigningVerified: jest.fn().mockReturnValue(true),
+            wasCrossSigningVerified: jest.fn().mockReturnValue(true),
+            needsUserApproval: false,
+        } as unknown as UserVerificationStatus);
+        mocked(matrixClient.getCrypto()!.getUserDeviceInfo).mockResolvedValue(
+            new Map([
+                [
+                    userId,
+                    new Map([
+                        [
+                            "VERIFIED",
+                            new Device({
+                                deviceId: "VERIFIED",
+                                userId: userId,
+                                algorithms: [],
+                                keys: new Map([
+                                    ["ed25519:VERIFIED", "an_ed25519_public_key"],
+                                    ["curve25519:VERIFIED", "a_curve25519_public_key"],
+                                ]),
+                            }),
+                        ],
+                        [
+                            "SIGNED",
+                            new Device({
+                                deviceId: "SIGNED",
+                                userId: userId,
+                                algorithms: [],
+                                keys: new Map([
+                                    ["ed25519:SIGNED", "an_ed25519_public_key"],
+                                    ["curve25519:SIGNED", "a_curve25519_public_key"],
+                                ]),
+                            }),
+                        ],
+                        [
+                            "UNSIGNED",
+                            new Device({
+                                deviceId: "UNSIGNED",
+                                userId: userId,
+                                algorithms: [],
+                                keys: new Map([
+                                    ["ed25519:UNSIGNED", "an_ed25519_public_key"],
+                                    ["curve25519:UNSIGNED", "a_curve25519_public_key"],
+                                ]),
+                            }),
+                        ],
+                    ]),
+                ],
+            ]),
+        );
+        mocked(matrixClient.getCrypto()!.getDeviceVerificationStatus).mockImplementation(
+            async (userId: string, deviceId: string) => {
+                switch (deviceId) {
+                    case "VERIFIED":
+                        return {
+                            signedByOwner: true,
+                            crossSigningVerified: true,
+                        } as unknown as DeviceVerificationStatus;
+                    case "SIGNED":
+                        return {
+                            signedByOwner: true,
+                            crossSigningVerified: false,
+                        } as unknown as DeviceVerificationStatus;
+                    case "UNSIGNED":
+                        return {
+                            signedByOwner: false,
+                            crossSigningVerified: false,
+                        } as unknown as DeviceVerificationStatus;
+                    default:
+                        return null;
+                }
+            },
+        );
+
+        const { asFragment } = render(
+            <MatrixClientContext.Provider value={matrixClient}>
+                <DevtoolsContext.Provider value={{ room }}>
+                    <UserList onBack={() => {}} />
+                </DevtoolsContext.Provider>
+            </MatrixClientContext.Provider>,
+        );
+
+        screen.getByRole("button", { name: userId }).click();
+
+        await waitFor(() => expect(screen.getByText(/Verification status:/)).toHaveTextContent(/Verified/));
+        await waitFor(() => expect(screen.getByRole("button", { name: "VERIFIED" })).toBeInTheDocument());
+
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should render a single device - verified by cross-signing", async () => {
+        const room = new Room("!roomId", matrixClient, userId, {
+            pendingEventOrdering: PendingEventOrdering.Detached,
+        });
+
+        const alice = new RoomMember("!roomId", userId);
+        alice.setMembershipEvent(
+            new MatrixEvent({
+                content: {
+                    membership: "join",
+                },
+                state_key: userId,
+                room_id: "!roomId",
+                type: "m.room.member",
+                sender: userId,
+            }),
+        );
+        room.getJoinedMembers = jest.fn().mockReturnValue([alice]);
+
+        mocked(matrixClient.getCrypto()!.getUserVerificationStatus).mockResolvedValue({
+            isCrossSigningVerified: jest.fn().mockReturnValue(true),
+            wasCrossSigningVerified: jest.fn().mockReturnValue(true),
+            needsUserApproval: false,
+        } as unknown as UserVerificationStatus);
+        mocked(matrixClient.getCrypto()!.getUserDeviceInfo).mockResolvedValue(
+            new Map([
+                [
+                    userId,
+                    new Map([
+                        [
+                            "VERIFIED",
+                            new Device({
+                                deviceId: "VERIFIED",
+                                userId: userId,
+                                algorithms: [],
+                                keys: new Map([
+                                    ["ed25519:VERIFIED", "an_ed25519_public_key"],
+                                    ["curve25519:VERIFIED", "a_curve25519_public_key"],
+                                ]),
+                            }),
+                        ],
+                    ]),
+                ],
+            ]),
+        );
+        mocked(matrixClient.getCrypto()!.getDeviceVerificationStatus).mockResolvedValue({
+            signedByOwner: true,
+            crossSigningVerified: true,
+        } as unknown as DeviceVerificationStatus);
+
+        const { asFragment } = render(
+            <MatrixClientContext.Provider value={matrixClient}>
+                <DevtoolsContext.Provider value={{ room }}>
+                    <UserList onBack={() => {}} />
+                </DevtoolsContext.Provider>
+            </MatrixClientContext.Provider>,
+        );
+
+        screen.getByRole("button", { name: userId }).click();
+
+        await waitFor(() => expect(screen.getByRole("button", { name: "VERIFIED" })).toBeInTheDocument());
+        screen.getByRole("button", { name: "VERIFIED" }).click();
+
+        await waitFor(() =>
+            expect(screen.getByText(/Verification status:/)).toHaveTextContent(/Verified by cross-signing/),
+        );
+
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should render a single device - signed by owner", async () => {
+        const room = new Room("!roomId", matrixClient, userId, {
+            pendingEventOrdering: PendingEventOrdering.Detached,
+        });
+
+        const alice = new RoomMember("!roomId", userId);
+        alice.setMembershipEvent(
+            new MatrixEvent({
+                content: {
+                    membership: "join",
+                },
+                state_key: userId,
+                room_id: "!roomId",
+                type: "m.room.member",
+                sender: userId,
+            }),
+        );
+        room.getJoinedMembers = jest.fn().mockReturnValue([alice]);
+
+        mocked(matrixClient.getCrypto()!.getUserVerificationStatus).mockResolvedValue({
+            isCrossSigningVerified: jest.fn().mockReturnValue(true),
+            wasCrossSigningVerified: jest.fn().mockReturnValue(true),
+            needsUserApproval: false,
+        } as unknown as UserVerificationStatus);
+        mocked(matrixClient.getCrypto()!.getUserDeviceInfo).mockResolvedValue(
+            new Map([
+                [
+                    userId,
+                    new Map([
+                        [
+                            "SIGNED",
+                            new Device({
+                                deviceId: "SIGNED",
+                                userId: userId,
+                                algorithms: [],
+                                keys: new Map([
+                                    ["ed25519:SIGNED", "an_ed25519_public_key"],
+                                    ["curve25519:SIGNED", "a_curve25519_public_key"],
+                                ]),
+                            }),
+                        ],
+                    ]),
+                ],
+            ]),
+        );
+        mocked(matrixClient.getCrypto()!.getDeviceVerificationStatus).mockResolvedValue({
+            signedByOwner: true,
+            crossSigningVerified: false,
+        } as unknown as DeviceVerificationStatus);
+
+        const { asFragment } = render(
+            <MatrixClientContext.Provider value={matrixClient}>
+                <DevtoolsContext.Provider value={{ room }}>
+                    <UserList onBack={() => {}} />
+                </DevtoolsContext.Provider>
+            </MatrixClientContext.Provider>,
+        );
+
+        screen.getByRole("button", { name: userId }).click();
+
+        await waitFor(() => expect(screen.getByRole("button", { name: "SIGNED" })).toBeInTheDocument());
+        screen.getByRole("button", { name: "SIGNED" }).click();
+
+        await waitFor(() => expect(screen.getByText(/Verification status:/)).toHaveTextContent(/Signed by owner/));
+
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should render a single device - unsigned", async () => {
+        const room = new Room("!roomId", matrixClient, userId, {
+            pendingEventOrdering: PendingEventOrdering.Detached,
+        });
+
+        const alice = new RoomMember("!roomId", userId);
+        alice.setMembershipEvent(
+            new MatrixEvent({
+                content: {
+                    membership: "join",
+                },
+                state_key: userId,
+                room_id: "!roomId",
+                type: "m.room.member",
+                sender: userId,
+            }),
+        );
+        room.getJoinedMembers = jest.fn().mockReturnValue([alice]);
+
+        mocked(matrixClient.getCrypto()!.getUserVerificationStatus).mockResolvedValue({
+            isCrossSigningVerified: jest.fn().mockReturnValue(true),
+            wasCrossSigningVerified: jest.fn().mockReturnValue(true),
+            needsUserApproval: false,
+        } as unknown as UserVerificationStatus);
+        mocked(matrixClient.getCrypto()!.getUserDeviceInfo).mockResolvedValue(
+            new Map([
+                [
+                    userId,
+                    new Map([
+                        [
+                            "UNSIGNED",
+                            new Device({
+                                deviceId: "UNSIGNED",
+                                userId: userId,
+                                algorithms: [],
+                                keys: new Map([
+                                    ["ed25519:UNSIGNED", "an_ed25519_public_key"],
+                                    ["curve25519:UNSIGNED", "a_curve25519_public_key"],
+                                ]),
+                                verified: DeviceVerification.Verified,
+                            }),
+                        ],
+                    ]),
+                ],
+            ]),
+        );
+        mocked(matrixClient.getCrypto()!.getDeviceVerificationStatus).mockResolvedValue({
+            signedByOwner: false,
+            crossSigningVerified: false,
+        } as unknown as DeviceVerificationStatus);
+
+        const { asFragment } = render(
+            <MatrixClientContext.Provider value={matrixClient}>
+                <DevtoolsContext.Provider value={{ room }}>
+                    <UserList onBack={() => {}} />
+                </DevtoolsContext.Provider>
+            </MatrixClientContext.Provider>,
+        );
+
+        screen.getByRole("button", { name: userId }).click();
+
+        await waitFor(() => expect(screen.getByText(/Verification status:/)).toHaveTextContent(/Verified/));
+
+        await waitFor(() => expect(screen.getByRole("button", { name: "UNSIGNED" })).toBeInTheDocument());
+        screen.getByRole("button", { name: "UNSIGNED" }).click();
+
+        await waitFor(() => expect(screen.getByText(/Verification status:/)).toHaveTextContent(/Not signed by owner/));
+
+        expect(asFragment()).toMatchSnapshot();
+    });
+});
diff --git a/test/unit-tests/components/views/dialogs/devtools/__snapshots__/Crypto-test.tsx.snap b/test/unit-tests/components/views/dialogs/devtools/__snapshots__/Crypto-test.tsx.snap
index c1f3f56902..4dfa8ecffc 100644
--- a/test/unit-tests/components/views/dialogs/devtools/__snapshots__/Crypto-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/devtools/__snapshots__/Crypto-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<Crypto /> <CrossSigning /> should display when the cross-signing data are available 1`] = `
 <table
diff --git a/test/unit-tests/components/views/dialogs/devtools/__snapshots__/Event-test.tsx.snap b/test/unit-tests/components/views/dialogs/devtools/__snapshots__/Event-test.tsx.snap
index d224b791fa..7fca222e84 100644
--- a/test/unit-tests/components/views/dialogs/devtools/__snapshots__/Event-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/devtools/__snapshots__/Event-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<EventEditor /> should render 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/dialogs/devtools/__snapshots__/RoomNotifications-test.tsx.snap b/test/unit-tests/components/views/dialogs/devtools/__snapshots__/RoomNotifications-test.tsx.snap
index a3c3559df8..2fc0258c49 100644
--- a/test/unit-tests/components/views/dialogs/devtools/__snapshots__/RoomNotifications-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/devtools/__snapshots__/RoomNotifications-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<RoomNotifications /> should render 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/dialogs/devtools/__snapshots__/Users-test.tsx.snap b/test/unit-tests/components/views/dialogs/devtools/__snapshots__/Users-test.tsx.snap
new file mode 100644
index 0000000000..ee3ebf88b5
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/devtools/__snapshots__/Users-test.tsx.snap
@@ -0,0 +1,737 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`<Users /> should render a single device - signed by owner 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_DevTools_content"
+  >
+    <ul>
+      <li>
+        <div
+          class="mx_CopyableText"
+        >
+          User ID: @alice:example.com
+          <div
+            aria-label="Copy"
+            class="mx_AccessibleButton mx_CopyableText_copyButton"
+            role="button"
+            tabindex="0"
+          >
+            <svg
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+              />
+              <path
+                d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+              />
+            </svg>
+          </div>
+        </div>
+      </li>
+      <li>
+        <div
+          class="mx_CopyableText"
+        >
+          Device ID: SIGNED
+          <div
+            aria-label="Copy"
+            class="mx_AccessibleButton mx_CopyableText_copyButton"
+            role="button"
+            tabindex="0"
+          >
+            <svg
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+              />
+              <path
+                d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+              />
+            </svg>
+          </div>
+        </div>
+      </li>
+      <li>
+        Displayname: 
+      </li>
+      <li>
+        <span>
+          Verification status: 
+          <div
+            class="mx_E2EIcon mx_E2EIcon_inline"
+            data-testid="e2e-icon"
+          >
+            <svg
+              class="mx_E2EIcon_normal"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M6 22q-.824 0-1.412-.587A1.93 1.93 0 0 1 4 20V10q0-.825.588-1.412A1.93 1.93 0 0 1 6 8h1V6q0-2.075 1.463-3.537Q9.926 1 12 1q2.075 0 3.537 1.463Q17 3.925 17 6v2h1q.824 0 1.413.588Q20 9.175 20 10v10q0 .824-.587 1.413A1.93 1.93 0 0 1 18 22zM9 8h6V6q0-1.25-.875-2.125A2.9 2.9 0 0 0 12 3q-1.25 0-2.125.875A2.9 2.9 0 0 0 9 6z"
+              />
+            </svg>
+          </div>
+           Signed by owner
+        </span>
+      </li>
+      <li>
+        Dehydrated: No
+      </li>
+      <li>
+        Device keys
+        <ul>
+          <li>
+            <div
+              class="mx_CopyableText"
+            >
+              ed25519: an_ed25519_public_key
+              <div
+                aria-label="Copy"
+                class="mx_AccessibleButton mx_CopyableText_copyButton"
+                role="button"
+                tabindex="0"
+              >
+                <svg
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+                  />
+                  <path
+                    d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+                  />
+                </svg>
+              </div>
+            </div>
+          </li>
+          <li>
+            <div
+              class="mx_CopyableText"
+            >
+              curve25519: a_curve25519_public_key
+              <div
+                aria-label="Copy"
+                class="mx_AccessibleButton mx_CopyableText_copyButton"
+                role="button"
+                tabindex="0"
+              >
+                <svg
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+                  />
+                  <path
+                    d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+                  />
+                </svg>
+              </div>
+            </div>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+  <div
+    class="mx_Dialog_buttons"
+  >
+    <button>
+      Back
+    </button>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`<Users /> should render a single device - unsigned 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_DevTools_content"
+  >
+    <ul>
+      <li>
+        <div
+          class="mx_CopyableText"
+        >
+          User ID: @alice:example.com
+          <div
+            aria-label="Copy"
+            class="mx_AccessibleButton mx_CopyableText_copyButton"
+            role="button"
+            tabindex="0"
+          >
+            <svg
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+              />
+              <path
+                d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+              />
+            </svg>
+          </div>
+        </div>
+      </li>
+      <li>
+        <div
+          class="mx_CopyableText"
+        >
+          Device ID: UNSIGNED
+          <div
+            aria-label="Copy"
+            class="mx_AccessibleButton mx_CopyableText_copyButton"
+            role="button"
+            tabindex="0"
+          >
+            <svg
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+              />
+              <path
+                d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+              />
+            </svg>
+          </div>
+        </div>
+      </li>
+      <li>
+        Displayname: 
+      </li>
+      <li>
+        <span>
+          Verification status: 
+          <div
+            class="mx_E2EIcon mx_E2EIcon_inline"
+            data-testid="e2e-icon"
+          >
+            <svg
+              class="mx_E2EIcon_warning"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+              />
+            </svg>
+          </div>
+           Not signed by owner
+        </span>
+      </li>
+      <li>
+        Dehydrated: No
+      </li>
+      <li>
+        Device keys
+        <ul>
+          <li>
+            <div
+              class="mx_CopyableText"
+            >
+              ed25519: an_ed25519_public_key
+              <div
+                aria-label="Copy"
+                class="mx_AccessibleButton mx_CopyableText_copyButton"
+                role="button"
+                tabindex="0"
+              >
+                <svg
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+                  />
+                  <path
+                    d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+                  />
+                </svg>
+              </div>
+            </div>
+          </li>
+          <li>
+            <div
+              class="mx_CopyableText"
+            >
+              curve25519: a_curve25519_public_key
+              <div
+                aria-label="Copy"
+                class="mx_AccessibleButton mx_CopyableText_copyButton"
+                role="button"
+                tabindex="0"
+              >
+                <svg
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+                  />
+                  <path
+                    d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+                  />
+                </svg>
+              </div>
+            </div>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+  <div
+    class="mx_Dialog_buttons"
+  >
+    <button>
+      Back
+    </button>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`<Users /> should render a single device - verified by cross-signing 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_DevTools_content"
+  >
+    <ul>
+      <li>
+        <div
+          class="mx_CopyableText"
+        >
+          User ID: @alice:example.com
+          <div
+            aria-label="Copy"
+            class="mx_AccessibleButton mx_CopyableText_copyButton"
+            role="button"
+            tabindex="0"
+          >
+            <svg
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+              />
+              <path
+                d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+              />
+            </svg>
+          </div>
+        </div>
+      </li>
+      <li>
+        <div
+          class="mx_CopyableText"
+        >
+          Device ID: VERIFIED
+          <div
+            aria-label="Copy"
+            class="mx_AccessibleButton mx_CopyableText_copyButton"
+            role="button"
+            tabindex="0"
+          >
+            <svg
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+              />
+              <path
+                d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+              />
+            </svg>
+          </div>
+        </div>
+      </li>
+      <li>
+        Displayname: 
+      </li>
+      <li>
+        <span>
+          Verification status: 
+          <div
+            class="mx_E2EIcon mx_E2EIcon_inline"
+            data-testid="e2e-icon"
+          >
+            <svg
+              class="mx_E2EIcon_verified"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M11.106 2.447a2 2 0 0 1 1.789 0l6 3A2 2 0 0 1 20 7.237V12c0 6.742-5.773 9.246-7.51 9.846-.32.111-.66.111-.98 0C9.774 21.246 4 18.743 4 12V7.236a2 2 0 0 1 1.105-1.789zm4.601 6.846a1 1 0 0 0-1.414 0L11 12.586l-1.293-1.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0 0-1.414"
+                fill-rule="evenodd"
+              />
+            </svg>
+          </div>
+           Verified by cross-signing
+        </span>
+      </li>
+      <li>
+        Dehydrated: No
+      </li>
+      <li>
+        Device keys
+        <ul>
+          <li>
+            <div
+              class="mx_CopyableText"
+            >
+              ed25519: an_ed25519_public_key
+              <div
+                aria-label="Copy"
+                class="mx_AccessibleButton mx_CopyableText_copyButton"
+                role="button"
+                tabindex="0"
+              >
+                <svg
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+                  />
+                  <path
+                    d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+                  />
+                </svg>
+              </div>
+            </div>
+          </li>
+          <li>
+            <div
+              class="mx_CopyableText"
+            >
+              curve25519: a_curve25519_public_key
+              <div
+                aria-label="Copy"
+                class="mx_AccessibleButton mx_CopyableText_copyButton"
+                role="button"
+                tabindex="0"
+              >
+                <svg
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+                  />
+                  <path
+                    d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+                  />
+                </svg>
+              </div>
+            </div>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+  <div
+    class="mx_Dialog_buttons"
+  >
+    <button>
+      Back
+    </button>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`<Users /> should render a single user 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_DevTools_content"
+  >
+    <ul>
+      <li>
+        <div
+          class="mx_CopyableText"
+        >
+          User ID: @alice:example.com
+          <div
+            aria-label="Copy"
+            class="mx_AccessibleButton mx_CopyableText_copyButton"
+            role="button"
+            tabindex="0"
+          >
+            <svg
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+              />
+              <path
+                d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+              />
+            </svg>
+          </div>
+        </div>
+      </li>
+      <li>
+        Membership: join
+      </li>
+      <li>
+        <span>
+          Displayname: 
+          <i>
+            None
+          </i>
+        </span>
+      </li>
+      <li>
+        <span>
+          Avatar: 
+          <i>
+            None
+          </i>
+        </span>
+      </li>
+      <li>
+        <span>
+          Verification status: 
+          <div
+            class="mx_E2EIcon mx_E2EIcon_inline"
+            data-testid="e2e-icon"
+          >
+            <svg
+              class="mx_E2EIcon_verified"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M11.106 2.447a2 2 0 0 1 1.789 0l6 3A2 2 0 0 1 20 7.237V12c0 6.742-5.773 9.246-7.51 9.846-.32.111-.66.111-.98 0C9.774 21.246 4 18.743 4 12V7.236a2 2 0 0 1 1.105-1.789zm4.601 6.846a1 1 0 0 0-1.414 0L11 12.586l-1.293-1.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0 0-1.414"
+                fill-rule="evenodd"
+              />
+            </svg>
+          </div>
+           Verified
+        </span>
+      </li>
+    </ul>
+    <section>
+      <h2>
+        Cryptographic devices (3)
+      </h2>
+      <ul>
+        <li>
+          <button
+            class="mx_DevTools_button"
+          >
+            <div
+              class="mx_E2EIcon mx_E2EIcon_inline"
+              data-testid="e2e-icon"
+            >
+              <svg
+                class="mx_E2EIcon_verified"
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  clip-rule="evenodd"
+                  d="M11.106 2.447a2 2 0 0 1 1.789 0l6 3A2 2 0 0 1 20 7.237V12c0 6.742-5.773 9.246-7.51 9.846-.32.111-.66.111-.98 0C9.774 21.246 4 18.743 4 12V7.236a2 2 0 0 1 1.105-1.789zm4.601 6.846a1 1 0 0 0-1.414 0L11 12.586l-1.293-1.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0 0-1.414"
+                  fill-rule="evenodd"
+                />
+              </svg>
+            </div>
+            VERIFIED
+          </button>
+        </li>
+        <li>
+          <button
+            class="mx_DevTools_button"
+          >
+            <div
+              class="mx_E2EIcon mx_E2EIcon_inline"
+              data-testid="e2e-icon"
+            >
+              <svg
+                class="mx_E2EIcon_normal"
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M6 22q-.824 0-1.412-.587A1.93 1.93 0 0 1 4 20V10q0-.825.588-1.412A1.93 1.93 0 0 1 6 8h1V6q0-2.075 1.463-3.537Q9.926 1 12 1q2.075 0 3.537 1.463Q17 3.925 17 6v2h1q.824 0 1.413.588Q20 9.175 20 10v10q0 .824-.587 1.413A1.93 1.93 0 0 1 18 22zM9 8h6V6q0-1.25-.875-2.125A2.9 2.9 0 0 0 12 3q-1.25 0-2.125.875A2.9 2.9 0 0 0 9 6z"
+                />
+              </svg>
+            </div>
+            SIGNED
+          </button>
+        </li>
+        <li>
+          <button
+            class="mx_DevTools_button"
+          >
+            <div
+              class="mx_E2EIcon mx_E2EIcon_inline"
+              data-testid="e2e-icon"
+            >
+              <svg
+                class="mx_E2EIcon_warning"
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+                />
+              </svg>
+            </div>
+            UNSIGNED
+          </button>
+        </li>
+      </ul>
+    </section>
+  </div>
+  <div
+    class="mx_Dialog_buttons"
+  >
+    <button>
+      Back
+    </button>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`<Users /> should render a user list 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_DevTools_content"
+  >
+    <div
+      class="mx_Field mx_Field_input mx_TextInputDialog_input mx_DevTools_RoomStateExplorer_query"
+    >
+      <input
+        autocomplete="off"
+        id="mx_Field_1"
+        label="Filter results"
+        placeholder="Filter results"
+        size="64"
+        type="text"
+        value=""
+      />
+      <label
+        for="mx_Field_1"
+      >
+        Filter results
+      </label>
+    </div>
+    No results found
+    <form
+      class="_root_19upo_16"
+    >
+      <div
+        class="_inline-field_19upo_32"
+      >
+        <div
+          class="_inline-field-control_19upo_44"
+        >
+          <div
+            class="_container_udcm8_10"
+          >
+            <input
+              checked=""
+              class="_input_udcm8_24"
+              id="_r_4_"
+              role="switch"
+              type="checkbox"
+            />
+            <div
+              class="_ui_udcm8_34"
+            />
+          </div>
+        </div>
+        <div
+          class="_inline-field-body_19upo_38"
+        >
+          <label
+            class="_label_19upo_59"
+            for="_r_4_"
+          >
+            Only joined users
+          </label>
+        </div>
+      </div>
+    </form>
+  </div>
+  <div
+    class="mx_Dialog_buttons"
+  >
+    <button>
+      Back
+    </button>
+  </div>
+</DocumentFragment>
+`;
diff --git a/test/unit-tests/components/views/dialogs/security/CreateKeyBackupDialog-test.tsx b/test/unit-tests/components/views/dialogs/security/CreateKeyBackupDialog-test.tsx
deleted file mode 100644
index b5f965cfa2..0000000000
--- a/test/unit-tests/components/views/dialogs/security/CreateKeyBackupDialog-test.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2024 New Vector Ltd.
- * Copyright 2023 The Matrix.org Foundation C.I.C.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-import { render, screen, waitFor } from "jest-matrix-react";
-import React from "react";
-import { mocked } from "jest-mock";
-
-import CreateKeyBackupDialog from "../../../../../../src/async-components/views/dialogs/security/CreateKeyBackupDialog";
-import { createTestClient } from "../../../../../test-utils";
-import { MatrixClientPeg } from "../../../../../../src/MatrixClientPeg";
-
-jest.mock("../../../../../../src/SecurityManager", () => ({
-    accessSecretStorage: jest.fn().mockResolvedValue(undefined),
-    withSecretStorageKeyCache: jest.fn().mockImplementation((fn) => fn()),
-}));
-
-describe("CreateKeyBackupDialog", () => {
-    beforeEach(() => {
-        MatrixClientPeg.safeGet = MatrixClientPeg.get = () => createTestClient();
-    });
-
-    it("should display the spinner when creating backup", () => {
-        const { asFragment } = render(<CreateKeyBackupDialog onFinished={jest.fn()} />);
-
-        // Check if the spinner is displayed
-        expect(screen.getByTestId("spinner")).toBeDefined();
-        expect(asFragment()).toMatchSnapshot();
-    });
-
-    it("should display an error message when backup creation failed", async () => {
-        const matrixClient = createTestClient();
-        jest.spyOn(matrixClient.secretStorage, "hasKey").mockResolvedValue(true);
-        mocked(matrixClient.getCrypto()!.resetKeyBackup).mockImplementation(() => {
-            throw new Error("failed");
-        });
-        MatrixClientPeg.safeGet = MatrixClientPeg.get = () => matrixClient;
-
-        const { asFragment } = render(<CreateKeyBackupDialog onFinished={jest.fn()} />);
-
-        // Check if the error message is displayed
-        await waitFor(() => expect(screen.getByText("Unable to create key backup")).toBeDefined());
-        expect(asFragment()).toMatchSnapshot();
-    });
-
-    it("should display an error message when there is no Crypto available", async () => {
-        const matrixClient = createTestClient();
-        jest.spyOn(matrixClient.secretStorage, "hasKey").mockResolvedValue(true);
-        mocked(matrixClient.getCrypto).mockReturnValue(undefined);
-        MatrixClientPeg.safeGet = MatrixClientPeg.get = () => matrixClient;
-
-        render(<CreateKeyBackupDialog onFinished={jest.fn()} />);
-
-        // Check if the error message is displayed
-        await waitFor(() => expect(screen.getByText("Unable to create key backup")).toBeDefined());
-    });
-
-    it("should display the success dialog when the key backup is finished", async () => {
-        const onFinished = jest.fn();
-        const { asFragment } = render(<CreateKeyBackupDialog onFinished={onFinished} />);
-
-        await waitFor(() =>
-            expect(
-                screen.getByText("Your keys are being backed up (the first backup could take a few minutes)."),
-            ).toBeDefined(),
-        );
-        expect(asFragment()).toMatchSnapshot();
-
-        // Click on the OK button
-        screen.getByRole("button", { name: "OK" }).click();
-        expect(onFinished).toHaveBeenCalledWith(true);
-    });
-});
diff --git a/test/unit-tests/components/views/dialogs/security/CreateSecretStorageDialog-test.tsx b/test/unit-tests/components/views/dialogs/security/CreateSecretStorageDialog-test.tsx
index 000f6efdb4..da68906c63 100644
--- a/test/unit-tests/components/views/dialogs/security/CreateSecretStorageDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/security/CreateSecretStorageDialog-test.tsx
@@ -13,7 +13,7 @@ import { mocked, type MockedObject } from "jest-mock";
 import { type MatrixClient, MatrixError } from "matrix-js-sdk/src/matrix";
 import { sleep } from "matrix-js-sdk/src/utils";
 
-import { filterConsole, flushPromises, stubClient } from "../../../../../test-utils";
+import { filterConsole, stubClient } from "../../../../../test-utils";
 import CreateSecretStorageDialog from "../../../../../../src/async-components/views/dialogs/security/CreateSecretStorageDialog";
 
 describe("CreateSecretStorageDialog", () => {
@@ -97,39 +97,4 @@ describe("CreateSecretStorageDialog", () => {
             await screen.findByText("Your keys are now being backed up from this device.");
         });
     });
-
-    it("resets keys in the right order when resetting secret storage and cross-signing", async () => {
-        const result = renderComponent({ forceReset: true, resetCrossSigning: true });
-
-        await result.findByText(/Set up Secure Backup/);
-        jest.spyOn(mockClient.getCrypto()!, "createRecoveryKeyFromPassphrase").mockResolvedValue({
-            privateKey: new Uint8Array(),
-            encodedPrivateKey: "abcd efgh ijkl",
-        });
-        result.getByRole("button", { name: "Continue" }).click();
-
-        await result.findByText(/Save your Recovery Key/);
-        result.getByRole("button", { name: "Copy" }).click();
-
-        // Resetting should reset secret storage, cross signing, and key
-        // backup.  We make sure that all three are reset, and done in the
-        // right order.
-        const resetFunctionCallLog: string[] = [];
-        jest.spyOn(mockClient.getCrypto()!, "bootstrapSecretStorage").mockImplementation(async () => {
-            resetFunctionCallLog.push("bootstrapSecretStorage");
-        });
-        jest.spyOn(mockClient.getCrypto()!, "bootstrapCrossSigning").mockImplementation(async () => {
-            resetFunctionCallLog.push("bootstrapCrossSigning");
-        });
-        jest.spyOn(mockClient.getCrypto()!, "resetKeyBackup").mockImplementation(async () => {
-            resetFunctionCallLog.push("resetKeyBackup");
-        });
-
-        await flushPromises();
-        result.getByRole("button", { name: "Continue" }).click();
-
-        await result.findByText("Your keys are now being backed up from this device.");
-
-        expect(resetFunctionCallLog).toEqual(["bootstrapSecretStorage", "bootstrapCrossSigning", "resetKeyBackup"]);
-    });
 });
diff --git a/test/components/views/dialogs/security/InitialCryptoSetupDialog-test.tsx b/test/unit-tests/components/views/dialogs/security/InitialCryptoSetupDialog-test.tsx
similarity index 75%
rename from test/components/views/dialogs/security/InitialCryptoSetupDialog-test.tsx
rename to test/unit-tests/components/views/dialogs/security/InitialCryptoSetupDialog-test.tsx
index 0e333da30a..5a3bdd83c6 100644
--- a/test/components/views/dialogs/security/InitialCryptoSetupDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/security/InitialCryptoSetupDialog-test.tsx
@@ -10,8 +10,8 @@ import React from "react";
 import { render, screen } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
 
-import { InitialCryptoSetupDialog } from "../../../../../src/components/views/dialogs/security/InitialCryptoSetupDialog";
-import { InitialCryptoSetupStore } from "../../../../../src/stores/InitialCryptoSetupStore";
+import { InitialCryptoSetupDialog } from "../../../../../../src/components/views/dialogs/security/InitialCryptoSetupDialog";
+import { InitialCryptoSetupStore } from "../../../../../../src/stores/InitialCryptoSetupStore";
 
 describe("InitialCryptoSetupDialog", () => {
     const storeMock = {
@@ -31,11 +31,9 @@ describe("InitialCryptoSetupDialog", () => {
     });
 
     it("should show a spinner while the setup is in progress", async () => {
-        const onFinished = jest.fn();
-
         storeMock.getStatus.mockReturnValue("in_progress");
 
-        render(<InitialCryptoSetupDialog onFinished={onFinished} />);
+        render(<InitialCryptoSetupDialog onCancelled={jest.fn()} />);
 
         expect(screen.getByTestId("spinner")).toBeInTheDocument();
     });
@@ -43,16 +41,15 @@ describe("InitialCryptoSetupDialog", () => {
     it("should display an error if setup has failed", async () => {
         storeMock.getStatus.mockReturnValue("error");
 
-        render(<InitialCryptoSetupDialog onFinished={jest.fn()} />);
+        render(<InitialCryptoSetupDialog onCancelled={jest.fn()} />);
 
         await expect(await screen.findByRole("button", { name: "Retry" })).toBeInTheDocument();
     });
 
     it("calls retry when retry button pressed", async () => {
-        const onFinished = jest.fn();
         storeMock.getStatus.mockReturnValue("error");
 
-        render(<InitialCryptoSetupDialog onFinished={onFinished} />);
+        render(<InitialCryptoSetupDialog onCancelled={jest.fn()} />);
 
         await userEvent.click(await screen.findByRole("button", { name: "Retry" }));
 
diff --git a/test/components/views/dialogs/security/ResetIdentityDialog-test.tsx b/test/unit-tests/components/views/dialogs/security/ResetIdentityDialog-test.tsx
similarity index 91%
rename from test/components/views/dialogs/security/ResetIdentityDialog-test.tsx
rename to test/unit-tests/components/views/dialogs/security/ResetIdentityDialog-test.tsx
index 5de2a0a043..37d8471dfd 100644
--- a/test/components/views/dialogs/security/ResetIdentityDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/security/ResetIdentityDialog-test.tsx
@@ -12,8 +12,8 @@ import { type CryptoApi } from "matrix-js-sdk/src/crypto-api";
 import { type Mocked } from "jest-mock";
 import { type MatrixClient } from "matrix-js-sdk/src/matrix";
 
-import { getMockClientWithEventEmitter } from "../../../../test-utils";
-import { ResetIdentityDialog } from "../../../../../src/components/views/dialogs/ResetIdentityDialog";
+import { getMockClientWithEventEmitter } from "../../../../../test-utils";
+import { ResetIdentityDialog } from "../../../../../../src/components/views/dialogs/ResetIdentityDialog";
 
 describe("ResetIdentityDialog", () => {
     afterEach(() => {
diff --git a/test/components/views/dialogs/security/SetupEncryptionDialog-test.tsx b/test/unit-tests/components/views/dialogs/security/SetupEncryptionDialog-test.tsx
similarity index 89%
rename from test/components/views/dialogs/security/SetupEncryptionDialog-test.tsx
rename to test/unit-tests/components/views/dialogs/security/SetupEncryptionDialog-test.tsx
index 885366c4e2..bfaa1b1f59 100644
--- a/test/components/views/dialogs/security/SetupEncryptionDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/security/SetupEncryptionDialog-test.tsx
@@ -11,10 +11,10 @@ import { render, screen } from "jest-matrix-react";
 import { type Mocked } from "jest-mock";
 import { type CryptoApi } from "matrix-js-sdk/src/crypto-api";
 
-import SetupEncryptionDialog from "../../../../../src/components/views/dialogs/security/SetupEncryptionDialog";
-import { getMockClientWithEventEmitter } from "../../../../test-utils";
-import { Phase, SetupEncryptionStore } from "../../../../../src/stores/SetupEncryptionStore";
-import Modal from "../../../../../src/Modal";
+import SetupEncryptionDialog from "../../../../../../src/components/views/dialogs/security/SetupEncryptionDialog";
+import { getMockClientWithEventEmitter } from "../../../../../test-utils";
+import { Phase, SetupEncryptionStore } from "../../../../../../src/stores/SetupEncryptionStore";
+import Modal from "../../../../../../src/Modal";
 
 describe("SetupEncryptionDialog", () => {
     afterEach(() => {
@@ -46,7 +46,7 @@ describe("SetupEncryptionDialog", () => {
 
         // And we hit the Proceed with reset button.
         // (The createDialog mock above simulates the user doing the reset)
-        await act(async () => screen.getByRole("button", { name: "Proceed with reset" }).click());
+        await act(async () => screen.getByRole("button", { name: "Can't confirm?" }).click());
 
         // Then the phase has been set to Finished
         expect(store.phase).toBe(Phase.Finished);
diff --git a/test/unit-tests/components/views/dialogs/security/__snapshots__/CreateKeyBackupDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/security/__snapshots__/CreateKeyBackupDialog-test.tsx.snap
deleted file mode 100644
index 60a051eec9..0000000000
--- a/test/unit-tests/components/views/dialogs/security/__snapshots__/CreateKeyBackupDialog-test.tsx.snap
+++ /dev/null
@@ -1,168 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`CreateKeyBackupDialog should display an error message when backup creation failed 1`] = `
-<DocumentFragment>
-  <div
-    data-focus-guard="true"
-    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-    tabindex="0"
-  />
-  <div
-    aria-labelledby="mx_BaseDialog_title"
-    class="mx_CreateKeyBackupDialog mx_Dialog_fixedWidth"
-    data-focus-lock-disabled="false"
-    role="dialog"
-  >
-    <div
-      class="mx_Dialog_header"
-    >
-      <h1
-        class="mx_Heading_h3 mx_Dialog_title"
-        id="mx_BaseDialog_title"
-      >
-        Starting backup…
-      </h1>
-    </div>
-    <div>
-      <div>
-        <p>
-          Unable to create key backup
-        </p>
-        <div
-          class="mx_Dialog_buttons"
-        >
-          <span
-            class="mx_Dialog_buttons_row"
-          >
-            <button
-              data-testid="dialog-cancel-button"
-              type="button"
-            >
-              Cancel
-            </button>
-            <button
-              class="mx_Dialog_primary"
-              data-testid="dialog-primary-button"
-              type="button"
-            >
-              Retry
-            </button>
-          </span>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    data-focus-guard="true"
-    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-    tabindex="0"
-  />
-</DocumentFragment>
-`;
-
-exports[`CreateKeyBackupDialog should display the spinner when creating backup 1`] = `
-<DocumentFragment>
-  <div
-    data-focus-guard="true"
-    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-    tabindex="0"
-  />
-  <div
-    aria-labelledby="mx_BaseDialog_title"
-    class="mx_CreateKeyBackupDialog mx_Dialog_fixedWidth"
-    data-focus-lock-disabled="false"
-    role="dialog"
-  >
-    <div
-      class="mx_Dialog_header"
-    >
-      <h1
-        class="mx_Heading_h3 mx_Dialog_title"
-        id="mx_BaseDialog_title"
-      >
-        Starting backup…
-      </h1>
-    </div>
-    <div>
-      <div>
-        <div
-          class="mx_Spinner"
-        >
-          <div
-            aria-label="Loading…"
-            class="mx_Spinner_icon"
-            data-testid="spinner"
-            role="progressbar"
-            style="width: 32px; height: 32px;"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    data-focus-guard="true"
-    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-    tabindex="0"
-  />
-</DocumentFragment>
-`;
-
-exports[`CreateKeyBackupDialog should display the success dialog when the key backup is finished 1`] = `
-<DocumentFragment>
-  <div
-    data-focus-guard="true"
-    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-    tabindex="0"
-  />
-  <div
-    aria-labelledby="mx_BaseDialog_title"
-    class="mx_CreateKeyBackupDialog mx_Dialog_fixedWidth"
-    data-focus-lock-disabled="false"
-    role="dialog"
-  >
-    <div
-      class="mx_Dialog_header"
-    >
-      <h1
-        class="mx_Heading_h3 mx_Dialog_title"
-        id="mx_BaseDialog_title"
-      >
-        Success!
-      </h1>
-    </div>
-    <div>
-      <div>
-        <p>
-          Your keys are being backed up (the first backup could take a few minutes).
-        </p>
-        <div
-          class="mx_Dialog_buttons"
-        >
-          <span
-            class="mx_Dialog_buttons_row"
-          >
-            <button
-              class="mx_Dialog_primary"
-              data-testid="dialog-primary-button"
-              type="button"
-            >
-              OK
-            </button>
-          </span>
-        </div>
-      </div>
-    </div>
-    <div
-      aria-label="Close dialog"
-      class="mx_AccessibleButton mx_Dialog_cancelButton"
-      role="button"
-      tabindex="0"
-    />
-  </div>
-  <div
-    data-focus-guard="true"
-    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-    tabindex="0"
-  />
-</DocumentFragment>
-`;
diff --git a/test/unit-tests/components/views/dialogs/security/__snapshots__/CreateSecretStorageDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/security/__snapshots__/CreateSecretStorageDialog-test.tsx.snap
index 39573190e0..138b79a609 100644
--- a/test/unit-tests/components/views/dialogs/security/__snapshots__/CreateSecretStorageDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/security/__snapshots__/CreateSecretStorageDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`CreateSecretStorageDialog handles the happy path 1`] = `
 <div>
@@ -12,6 +12,7 @@ exports[`CreateSecretStorageDialog handles the happy path 1`] = `
     class="mx_CreateSecretStorageDialog"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -140,6 +141,7 @@ exports[`CreateSecretStorageDialog handles the happy path 2`] = `
     class="mx_CreateSecretStorageDialog"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -231,6 +233,7 @@ exports[`CreateSecretStorageDialog when there is an error fetching the backup ve
     class="mx_CreateSecretStorageDialog"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
diff --git a/test/unit-tests/components/views/dialogs/security/__snapshots__/ExportE2eKeysDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/security/__snapshots__/ExportE2eKeysDialog-test.tsx.snap
index 3ca6e6ee02..25b1032e64 100644
--- a/test/unit-tests/components/views/dialogs/security/__snapshots__/ExportE2eKeysDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/security/__snapshots__/ExportE2eKeysDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`ExportE2eKeysDialog renders 1`] = `
 <DocumentFragment>
@@ -12,6 +12,7 @@ exports[`ExportE2eKeysDialog renders 1`] = `
     class="mx_exportE2eKeysDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
diff --git a/test/unit-tests/components/views/dialogs/security/__snapshots__/ImportE2eKeysDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/security/__snapshots__/ImportE2eKeysDialog-test.tsx.snap
index 6b8b1a8285..0923ef3469 100644
--- a/test/unit-tests/components/views/dialogs/security/__snapshots__/ImportE2eKeysDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/security/__snapshots__/ImportE2eKeysDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`ImportE2eKeysDialog renders 1`] = `
 <DocumentFragment>
@@ -12,6 +12,7 @@ exports[`ImportE2eKeysDialog renders 1`] = `
     class="mx_importE2eKeysDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
diff --git a/test/unit-tests/components/views/dialogs/security/__snapshots__/RestoreKeyBackupDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/security/__snapshots__/RestoreKeyBackupDialog-test.tsx.snap
index 3b5809dddf..76ebb04191 100644
--- a/test/unit-tests/components/views/dialogs/security/__snapshots__/RestoreKeyBackupDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/security/__snapshots__/RestoreKeyBackupDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<RestoreKeyBackupDialog /> should display an error when recovery key is invalid 1`] = `
 <DocumentFragment>
@@ -12,6 +12,7 @@ exports[`<RestoreKeyBackupDialog /> should display an error when recovery key is
     class="mx_RestoreKeyBackupDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -112,6 +113,7 @@ exports[`<RestoreKeyBackupDialog /> should not raise an error when recovery is v
     class="mx_RestoreKeyBackupDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -211,6 +213,7 @@ exports[`<RestoreKeyBackupDialog /> should render 1`] = `
     class="mx_RestoreKeyBackupDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -283,6 +286,7 @@ exports[`<RestoreKeyBackupDialog /> should render 1`] = `
       </div>
     </div>
     <div
+      aria-describedby="_r_2_"
       aria-label="Close dialog"
       class="mx_AccessibleButton mx_Dialog_cancelButton"
       role="button"
@@ -309,6 +313,7 @@ exports[`<RestoreKeyBackupDialog /> should restore key backup when Recovery key
     class="mx_RestoreKeyBackupDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -374,6 +379,7 @@ exports[`<RestoreKeyBackupDialog /> should restore key backup when passphrase is
     class="mx_RestoreKeyBackupDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -439,6 +445,7 @@ exports[`<RestoreKeyBackupDialog /> should restore key backup when the key is ca
     class="mx_RestoreKeyBackupDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -478,6 +485,7 @@ exports[`<RestoreKeyBackupDialog /> should restore key backup when the key is ca
       </div>
     </div>
     <div
+      aria-describedby="_r_k_"
       aria-label="Close dialog"
       class="mx_AccessibleButton mx_Dialog_cancelButton"
       role="button"
@@ -504,6 +512,7 @@ exports[`<RestoreKeyBackupDialog /> should restore key backup when the key is in
     class="mx_RestoreKeyBackupDialog mx_Dialog_fixedWidth"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -543,6 +552,7 @@ exports[`<RestoreKeyBackupDialog /> should restore key backup when the key is in
       </div>
     </div>
     <div
+      aria-describedby="_r_q_"
       aria-label="Close dialog"
       class="mx_AccessibleButton mx_Dialog_cancelButton"
       role="button"
diff --git a/test/unit-tests/components/views/dialogs/spotlight/__snapshots__/PublicRoomResultDetails-test.tsx.snap b/test/unit-tests/components/views/dialogs/spotlight/__snapshots__/PublicRoomResultDetails-test.tsx.snap
index e041ccfd10..0b4486e4c2 100644
--- a/test/unit-tests/components/views/dialogs/spotlight/__snapshots__/PublicRoomResultDetails-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/spotlight/__snapshots__/PublicRoomResultDetails-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`PublicRoomResultDetails Public room results 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/elements/AppTile-test.tsx b/test/unit-tests/components/views/elements/AppTile-test.tsx
index 1a21bda494..981e3c80ce 100644
--- a/test/unit-tests/components/views/elements/AppTile-test.tsx
+++ b/test/unit-tests/components/views/elements/AppTile-test.tsx
@@ -8,9 +8,8 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import { Room, type MatrixClient } from "matrix-js-sdk/src/matrix";
-import { type ClientWidgetApi, type IWidget, MatrixWidgetType } from "matrix-widget-api";
-import { type Optional } from "matrix-events-sdk";
-import { act, render, type RenderResult, waitForElementToBeRemoved, waitFor } from "jest-matrix-react";
+import { type IWidget, MatrixWidgetType } from "matrix-widget-api";
+import { act, render, waitForElementToBeRemoved, waitFor } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
 import {
     type ApprovalOpts,
@@ -21,7 +20,7 @@ import {
 import RightPanel from "../../../../../src/components/structures/RightPanel";
 import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
 import ResizeNotifier from "../../../../../src/utils/ResizeNotifier";
-import { stubClient } from "../../../../test-utils";
+import { clientAndSDKContextRenderOptions, stubClient } from "../../../../test-utils";
 import { Action } from "../../../../../src/dispatcher/actions";
 import dis from "../../../../../src/dispatcher/dispatcher";
 import DMRoomMap from "../../../../../src/utils/DMRoomMap";
@@ -35,14 +34,16 @@ import AppTile from "../../../../../src/components/views/elements/AppTile";
 import { Container, WidgetLayoutStore } from "../../../../../src/stores/widgets/WidgetLayoutStore";
 import AppsDrawer from "../../../../../src/components/views/rooms/AppsDrawer";
 import { ElementWidgetCapabilities } from "../../../../../src/stores/widgets/ElementWidgetCapabilities";
-import { ElementWidget } from "../../../../../src/stores/widgets/StopGapWidget";
+import { ElementWidget, type WidgetMessaging } from "../../../../../src/stores/widgets/WidgetMessaging";
 import { WidgetMessagingStore } from "../../../../../src/stores/widgets/WidgetMessagingStore";
 import { ModuleRunner } from "../../../../../src/modules/ModuleRunner";
 import { RoomPermalinkCreator } from "../../../../../src/utils/permalinks/Permalinks";
+import { SdkContextClass } from "../../../../../src/contexts/SDKContext";
 
 jest.mock("../../../../../src/stores/OwnProfileStore", () => ({
     OwnProfileStore: {
         instance: {
+            on: jest.fn(),
             isProfileInfoFetched: true,
             removeListener: jest.fn(),
             getHttpAvatarUrl: jest.fn().mockReturnValue("http://avatar_url"),
@@ -50,8 +51,11 @@ jest.mock("../../../../../src/stores/OwnProfileStore", () => ({
     },
 }));
 
+const realGetValue = SettingsStore.getValue;
+
 describe("AppTile", () => {
     let cli: MatrixClient;
+    let sdkContext: SdkContextClass;
     let r1: Room;
     let r2: Room;
     const resizeNotifier = new ResizeNotifier();
@@ -104,24 +108,40 @@ describe("AppTile", () => {
             if (roomId === "r2") return [app2];
             return [];
         });
+    });
+
+    afterAll(async () => {
+        jest.restoreAllMocks();
+    });
+
+    beforeEach(async () => {
+        // Do not carry across settings from previous tests
+        SettingsStore.reset();
+        sdkContext = new SdkContextClass();
+        // @ts-ignore
+        await WidgetMessagingStore.instance.onReady();
 
         // Wake up various stores we rely on
         WidgetLayoutStore.instance.useUnitTestClient(cli);
         // @ts-ignore
         await WidgetLayoutStore.instance.onReady();
+
         RightPanelStore.instance.useUnitTestClient(cli);
         // @ts-ignore
         await RightPanelStore.instance.onReady();
     });
 
-    beforeEach(() => {
+    afterEach(async () => {
         jest.spyOn(SettingsStore, "getValue").mockRestore();
+        // @ts-ignore
+        await WidgetLayoutStore.instance.onNotReady();
+        // @ts-ignore
+        await RightPanelStore.instance.onNotReady();
     });
 
     it("destroys non-persisted right panel widget on room change", async () => {
         // Set up right panel state
-        const realGetValue = SettingsStore.getValue;
-        const mockSettings = jest.spyOn(SettingsStore, "getValue").mockImplementation((name, roomId) => {
+        jest.spyOn(SettingsStore, "getValue").mockImplementation((name, roomId) => {
             if (name !== "RightPanel.phases") return realGetValue(name, roomId);
             if (roomId === "r1") {
                 return {
@@ -184,8 +204,6 @@ describe("AppTile", () => {
 
         expect(renderResult.queryByText("Example 1")).not.toBeInTheDocument();
         expect(ActiveWidgetStore.instance.isLive("1", "r1")).toBe(false);
-
-        mockSettings.mockRestore();
     });
 
     it("distinguishes widgets with the same ID in different rooms", async () => {
@@ -298,9 +316,8 @@ describe("AppTile", () => {
 
         // Run initial render with room 1, and also running lifecycle methods
         const renderResult = render(
-            <MatrixClientContext.Provider value={cli}>
-                <AppsDrawer userId={cli.getSafeUserId()} room={r1} resizeNotifier={resizeNotifier} />
-            </MatrixClientContext.Provider>,
+            <AppsDrawer userId={cli.getSafeUserId()} room={r1} />,
+            clientAndSDKContextRenderOptions(cli, sdkContext),
         );
 
         expect(renderResult.getByText("Example 1")).toBeInTheDocument();
@@ -323,50 +340,57 @@ describe("AppTile", () => {
         expect(ActiveWidgetStore.instance.isLive("1", "r1")).toBe(true);
     });
 
-    afterAll(async () => {
-        // @ts-ignore
-        await WidgetLayoutStore.instance.onNotReady();
-        // @ts-ignore
-        await RightPanelStore.instance.onNotReady();
-        jest.restoreAllMocks();
-    });
-
     describe("for a pinned widget", () => {
-        let renderResult: RenderResult;
         let moveToContainerSpy: jest.SpyInstance<void, [room: Room, widget: IWidget, toContainer: Container]>;
-
         beforeEach(async () => {
-            renderResult = render(
+            moveToContainerSpy = jest.spyOn(WidgetLayoutStore.instance, "moveToContainer");
+        });
+
+        it("should render", async () => {
+            const renderResult = render(
                 <MatrixClientContext.Provider value={cli}>
                     <AppTile key={app1.id} app={app1} room={r1} />
                 </MatrixClientContext.Provider>,
             );
-
-            moveToContainerSpy = jest.spyOn(WidgetLayoutStore.instance, "moveToContainer");
             await waitForElementToBeRemoved(() => renderResult.queryByRole("progressbar"));
-        });
-
-        it("should render", () => {
             const { asFragment } = renderResult;
 
             expect(asFragment()).toMatchSnapshot(); // Take a snapshot of the pinned widget
         });
 
-        it("should not display the »Popout widget« button", () => {
+        it("should not display the »Popout widget« button", async () => {
+            const renderResult = render(
+                <MatrixClientContext.Provider value={cli}>
+                    <AppTile key={app1.id} app={app1} room={r1} />
+                </MatrixClientContext.Provider>,
+            );
+            await waitForElementToBeRemoved(() => renderResult.queryByRole("progressbar"));
             expect(renderResult.queryByLabelText("Popout widget")).not.toBeInTheDocument();
         });
 
         it("clicking 'minimise' should send the widget to the right", async () => {
+            const renderResult = render(
+                <MatrixClientContext.Provider value={cli}>
+                    <AppTile key={app1.id} app={app1} room={r1} />
+                </MatrixClientContext.Provider>,
+            );
+            await waitForElementToBeRemoved(() => renderResult.queryByRole("progressbar"));
             await userEvent.click(renderResult.getByLabelText("Minimise"));
             expect(moveToContainerSpy).toHaveBeenCalledWith(r1, app1, Container.Right);
         });
 
         it("clicking 'maximise' should send the widget to the center", async () => {
+            const renderResult = render(
+                <MatrixClientContext.Provider value={cli}>
+                    <AppTile key={app1.id} app={app1} room={r1} />
+                </MatrixClientContext.Provider>,
+            );
+            await waitForElementToBeRemoved(() => renderResult.queryByRole("progressbar"));
             await userEvent.click(renderResult.getByLabelText("Maximise"));
             expect(moveToContainerSpy).toHaveBeenCalledWith(r1, app1, Container.Center);
         });
 
-        it("should render permission request", () => {
+        it("should render permission request", async () => {
             jest.spyOn(ModuleRunner.instance, "invoke").mockImplementation((lifecycleEvent, opts, widgetInfo) => {
                 if (lifecycleEvent === WidgetLifecycle.PreLoadRequest && (widgetInfo as WidgetInfo).id === app1.id) {
                     (opts as ApprovalOpts).approved = false;
@@ -374,21 +398,17 @@ describe("AppTile", () => {
             });
 
             // userId and creatorUserId are different
-            const renderResult = render(
+            const { container, asFragment, queryByRole } = render(
                 <MatrixClientContext.Provider value={cli}>
                     <AppTile key={app1.id} app={app1} room={r1} userId="@user1" creatorUserId="@userAnother" />
                 </MatrixClientContext.Provider>,
             );
-
-            const { container, asFragment } = renderResult;
-
             expect(container.querySelector(".mx_Spinner")).toBeFalsy();
+            expect(queryByRole("button", { name: "Continue" })).toBeInTheDocument();
             expect(asFragment()).toMatchSnapshot();
-
-            expect(renderResult.queryByRole("button", { name: "Continue" })).toBeInTheDocument();
         });
 
-        it("should not display 'Continue' button on permission load", () => {
+        it("should not display 'Continue' button on permission load", async () => {
             jest.spyOn(ModuleRunner.instance, "invoke").mockImplementation((lifecycleEvent, opts, widgetInfo) => {
                 if (lifecycleEvent === WidgetLifecycle.PreLoadRequest && (widgetInfo as WidgetInfo).id === app1.id) {
                     (opts as ApprovalOpts).approved = true;
@@ -401,6 +421,7 @@ describe("AppTile", () => {
                     <AppTile key={app1.id} app={app1} room={r1} userId="@user1" creatorUserId="@userAnother" />
                 </MatrixClientContext.Provider>,
             );
+            await waitForElementToBeRemoved(() => renderResult.queryByRole("progressbar"));
 
             expect(renderResult.queryByRole("button", { name: "Continue" })).not.toBeInTheDocument();
         });
@@ -408,13 +429,23 @@ describe("AppTile", () => {
         describe("for a maximised (centered) widget", () => {
             beforeEach(() => {
                 jest.spyOn(WidgetLayoutStore.instance, "isInContainer").mockImplementation(
-                    (room: Optional<Room>, widget: IWidget, container: Container) => {
+                    (room: Room | null, widget: IWidget, container: Container) => {
                         return room === r1 && widget === app1 && container === Container.Center;
                     },
                 );
             });
 
+            afterEach(() => {
+                jest.spyOn(WidgetLayoutStore.instance, "isInContainer").mockRestore();
+            });
+
             it("clicking 'un-maximise' should send the widget to the top", async () => {
+                const renderResult = render(
+                    <MatrixClientContext.Provider value={cli}>
+                        <AppTile key={app1.id} app={app1} room={r1} />
+                    </MatrixClientContext.Provider>,
+                );
+                await waitForElementToBeRemoved(() => renderResult.queryByRole("progressbar"));
                 await userEvent.click(renderResult.getByLabelText("Un-maximise"));
                 expect(moveToContainerSpy).toHaveBeenCalledWith(r1, app1, Container.Top);
             });
@@ -422,46 +453,42 @@ describe("AppTile", () => {
 
         describe("with an existing widgetApi with requiresClient = false", () => {
             beforeEach(() => {
-                const api = {
-                    hasCapability: (capability: ElementWidgetCapabilities): boolean => {
-                        return !(capability === ElementWidgetCapabilities.RequiresClient);
-                    },
-                    once: () => {},
+                const messaging = {
+                    on: () => {},
+                    off: () => {},
+                    prepare: async () => {},
                     stop: () => {},
-                } as unknown as ClientWidgetApi;
+                    widgetApi: {
+                        hasCapability: (capability: ElementWidgetCapabilities): boolean => {
+                            return !(capability === ElementWidgetCapabilities.RequiresClient);
+                        },
+                    },
+                } as unknown as WidgetMessaging;
 
                 const mockWidget = new ElementWidget(app1);
-                WidgetMessagingStore.instance.storeMessaging(mockWidget, r1.roomId, api);
+                WidgetMessagingStore.instance.storeMessaging(mockWidget, r1.roomId, messaging);
+            });
 
-                renderResult = render(
+            it("should display the »Popout widget« button", async () => {
+                const renderResult = render(
                     <MatrixClientContext.Provider value={cli}>
                         <AppTile key={app1.id} app={app1} room={r1} />
                     </MatrixClientContext.Provider>,
                 );
-            });
-
-            it("should display the »Popout widget« button", () => {
+                await waitForElementToBeRemoved(() => renderResult.queryByRole("progressbar"));
                 expect(renderResult.getByLabelText("Popout widget")).toBeInTheDocument();
             });
         });
     });
 
     describe("for a persistent app", () => {
-        let renderResult: RenderResult;
-
-        beforeEach(async () => {
-            renderResult = render(
+        it("should render", async () => {
+            const { asFragment, queryByRole } = render(
                 <MatrixClientContext.Provider value={cli}>
-                    <AppTile key={app1.id} app={app1} fullWidth={true} room={r1} miniMode={true} showMenubar={false} />
+                    <AppTile key={app1.id} app={app1} room={r1} fullWidth={true} miniMode={true} showMenubar={false} />
                 </MatrixClientContext.Provider>,
             );
-
-            await waitForElementToBeRemoved(() => renderResult.queryByRole("progressbar"));
-        });
-
-        it("should render", async () => {
-            const { asFragment } = renderResult;
-
+            await waitForElementToBeRemoved(() => queryByRole("progressbar"));
             expect(asFragment()).toMatchSnapshot();
         });
     });
diff --git a/test/unit-tests/components/views/elements/Dropdown-test.tsx b/test/unit-tests/components/views/elements/Dropdown-test.tsx
new file mode 100644
index 0000000000..ca428aff6e
--- /dev/null
+++ b/test/unit-tests/components/views/elements/Dropdown-test.tsx
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React, { type ReactElement } from "react";
+import { render, screen, fireEvent } from "jest-matrix-react";
+import userEvent from "@testing-library/user-event";
+
+import Dropdown from "../../../../../src/components/views/elements/Dropdown";
+import type { NonEmptyArray } from "../../../../../src/@types/common";
+
+describe("<Dropdown />", () => {
+    const placeholder = "Select an option";
+    const onOptionChange = jest.fn();
+
+    function renderDropdown(props?: Partial<React.ComponentProps<typeof Dropdown>>) {
+        return render(
+            <Dropdown
+                id="id"
+                label="Test Dropdown"
+                placeholder={placeholder}
+                onOptionChange={onOptionChange}
+                {...props}
+            >
+                {
+                    [<div key="one">one</div>, <div key="two">two</div>, <div key="three">three</div>] as NonEmptyArray<
+                        ReactElement & { key: string }
+                    >
+                }
+            </Dropdown>,
+        );
+    }
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it("renders with placeholder", () => {
+        const { asFragment } = renderDropdown();
+        expect(screen.getByText(placeholder)).toBeInTheDocument();
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("expands and collapses on click", async () => {
+        const user = userEvent.setup();
+        renderDropdown();
+
+        const button = screen.getByRole("button");
+        expect(screen.queryByRole("listbox")).not.toBeInTheDocument();
+        await user.click(button);
+        expect(screen.getByRole("listbox")).toBeInTheDocument();
+        // Collapse by clicking outside
+        await user.click(document.body);
+        expect(screen.queryByRole("listbox")).not.toBeInTheDocument();
+    });
+
+    it("calls onOptionChange when an option is selected", async () => {
+        renderDropdown();
+
+        await userEvent.click(screen.getByRole("button"));
+        const option = screen.getByRole("option", { name: "two" });
+        await userEvent.click(option);
+        expect(onOptionChange).toHaveBeenCalledWith("two");
+    });
+
+    it("handles keyboard navigation and selection", async () => {
+        renderDropdown();
+
+        const button = screen.getByRole("button");
+        await userEvent.click(button);
+        // Arrow down to "two"
+        fireEvent.keyDown(button, { key: "ArrowDown" });
+        expect(screen.getByRole("option", { name: "two" })).toHaveFocus();
+        // Arrow up to "one"
+        fireEvent.keyDown(button, { key: "ArrowUp" });
+        expect(screen.getByRole("option", { name: "one" })).toHaveFocus();
+        // Enter to select
+        fireEvent.keyDown(button, { key: "Enter" });
+        expect(onOptionChange).toHaveBeenCalledWith("one");
+    });
+
+    it("does not open when disabled", async () => {
+        renderDropdown({ disabled: true });
+
+        const button = screen.getByRole("button");
+        await userEvent.click(button);
+        expect(screen.queryByRole("listbox")).not.toBeInTheDocument();
+    });
+});
diff --git a/test/unit-tests/components/views/elements/ImageView-test.tsx b/test/unit-tests/components/views/elements/ImageView-test.tsx
index e9ba7cdd69..6537a3948a 100644
--- a/test/unit-tests/components/views/elements/ImageView-test.tsx
+++ b/test/unit-tests/components/views/elements/ImageView-test.tsx
@@ -10,11 +10,13 @@ import React from "react";
 import { mocked } from "jest-mock";
 import { render, fireEvent, waitFor } from "jest-matrix-react";
 import fetchMock from "fetch-mock-jest";
+import { MatrixEvent } from "matrix-js-sdk/src/matrix";
 
 import ImageView from "../../../../../src/components/views/elements/ImageView";
 import { FileDownloader } from "../../../../../src/utils/FileDownloader";
 import Modal from "../../../../../src/Modal";
 import ErrorDialog from "../../../../../src/components/views/dialogs/ErrorDialog";
+import { stubClient } from "../../../../test-utils";
 
 jest.mock("../../../../../src/utils/FileDownloader");
 
@@ -44,6 +46,61 @@ describe("<ImageView />", () => {
         expect(fetchMock).toHaveFetched("https://example.com/image.png");
     });
 
+    it("should use event as download source if given", async () => {
+        stubClient();
+
+        const event = new MatrixEvent({
+            event_id: "$eventId",
+            type: "m.image",
+            content: {
+                body: "fromEvent.png",
+                url: "mxc://test.dummy/fromEvent.png",
+                file_name: "filename.png",
+            },
+            origin_server_ts: new Date(2000, 0, 1, 0, 0, 0, 0).getTime(),
+        });
+
+        fetchMock.get("http://this.is.a.url/test.dummy/fromEvent.png", "TESTFILE");
+        const { getByRole } = render(
+            <ImageView
+                src="https://test.dummy/fromSrc.png"
+                name="fromName.png"
+                onFinished={jest.fn()}
+                mxEvent={event}
+            />,
+        );
+        fireEvent.click(getByRole("button", { name: "Download" }));
+        await waitFor(() =>
+            expect(mocked(FileDownloader).mock.instances[0].download).toHaveBeenCalledWith({
+                blob: expect.anything(),
+                name: "fromEvent.png",
+            }),
+        );
+        expect(fetchMock).toHaveFetched("http://this.is.a.url/test.dummy/fromEvent.png");
+    });
+
+    it("should start download on Ctrl+S", async () => {
+        fetchMock.get("https://example.com/image.png", "TESTFILE");
+
+        const { container } = render(
+            <ImageView src="https://example.com/image.png" name="filename.png" onFinished={jest.fn()} />,
+        );
+
+        const dialog = container.querySelector('[role="dialog"]') as HTMLElement;
+        dialog?.focus();
+
+        fireEvent.keyDown(dialog!, { key: "s", code: "KeyS", ctrlKey: true });
+
+        await waitFor(() => {
+            expect(mocked(FileDownloader).mock.instances[0].download).toHaveBeenCalledWith({
+                blob: expect.anything(),
+                name: "filename.png",
+            });
+        });
+
+        expect(fetchMock).toHaveFetched("https://example.com/image.png");
+    });
+
     it("should handle download errors", async () => {
         const modalSpy = jest.spyOn(Modal, "createDialog");
         fetchMock.get("https://example.com/image.png", { status: 500 });
diff --git a/test/unit-tests/components/views/elements/SettingsDropdown-test.tsx b/test/unit-tests/components/views/elements/SettingsDropdown-test.tsx
new file mode 100644
index 0000000000..40a6126147
--- /dev/null
+++ b/test/unit-tests/components/views/elements/SettingsDropdown-test.tsx
@@ -0,0 +1,37 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { render, screen } from "jest-matrix-react";
+
+import { SettingLevel } from "../../../../../src/settings/SettingLevel.ts";
+import SettingsDropdown from "../../../../../src/components/views/elements/SettingsDropdown.tsx";
+
+describe("<SettingsDropdown />", () => {
+    it("should render a disabled setting", async () => {
+        const { asFragment } = render(
+            <SettingsDropdown settingKey="Electron.autoLaunch" level={SettingLevel.PLATFORM} />,
+        );
+        expect(asFragment()).toMatchSnapshot();
+
+        const trigger = screen.getByRole("button");
+        expect(trigger).toHaveTextContent("No");
+        expect(trigger).toHaveAttribute("aria-disabled", "true");
+    });
+
+    it("should not render a disabled setting if hideIfCannotSet=true", async () => {
+        const { container } = render(
+            <SettingsDropdown settingKey="Electron.autoLaunch" level={SettingLevel.PLATFORM} hideIfCannotSet />,
+        );
+        expect(container).toBeEmptyDOMElement();
+    });
+
+    it("should not render a non-options setting", async () => {
+        const { container } = render(<SettingsDropdown settingKey="systemFont" level={SettingLevel.DEVICE} />);
+        expect(container).toBeEmptyDOMElement();
+    });
+});
diff --git a/test/unit-tests/components/views/elements/__snapshots__/AccessibleButton-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/AccessibleButton-test.tsx.snap
index ef77813231..321a5b6ad4 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/AccessibleButton-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/AccessibleButton-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<AccessibleButton /> renders a button element 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/elements/__snapshots__/AppTile-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/AppTile-test.tsx.snap
index ccbdf5d8fb..3c88a63cb6 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/AppTile-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/AppTile-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`AppTile destroys non-persisted right panel widget on room change 1`] = `
 <DocumentFragment>
@@ -16,11 +16,11 @@ exports[`AppTile destroys non-persisted right panel widget on room change 1`] =
         <div
           class="mx_BaseCard_header_title"
         >
-          <h4
+          <h1
             class="mx_Heading_h4 mx_BaseCard_header_title_heading"
           >
             Example 1
-          </h4>
+          </h1>
           <div
             aria-expanded="false"
             aria-haspopup="true"
@@ -31,15 +31,16 @@ exports[`AppTile destroys non-persisted right panel widget on room change 1`] =
           />
         </div>
         <button
-          aria-labelledby="«r0»"
-          class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+          aria-labelledby="_r_0_"
+          class="_icon-button_1pz9o_8"
+          data-kind="secondary"
           data-testid="base-card-close-button"
           role="button"
           style="--cpd-icon-button-size: 28px;"
           tabindex="0"
         >
           <div
-            class="_indicator-icon_zr2a0_17"
+            class="_indicator-icon_147l5_17"
             style="--cpd-icon-button-size: 100%;"
           >
             <svg
@@ -102,15 +103,16 @@ exports[`AppTile for a pinned widget should render 1`] = `
         <span>
           <span
             aria-label="Avatar"
-            class="_avatar_1qbcf_8 mx_BaseAvatar mx_WidgetAvatar"
+            class="_avatar_zysgz_8 mx_BaseAvatar mx_WidgetAvatar"
             data-color="1"
             data-testid="avatar-img"
             data-type="round"
+            role="img"
             style="--cpd-avatar-size: 20px;"
           >
             <img
               alt=""
-              class="_image_1qbcf_41"
+              class="_image_zysgz_43"
               data-type="round"
               height="20px"
               loading="lazy"
@@ -119,9 +121,9 @@ exports[`AppTile for a pinned widget should render 1`] = `
               width="20px"
             />
           </span>
-          <h3>
+          <h1>
             Example 1
-          </h3>
+          </h1>
           <span />
         </span>
       </span>
@@ -129,7 +131,7 @@ exports[`AppTile for a pinned widget should render 1`] = `
         class="mx_AppTileMenuBar_widgets"
       >
         <div
-          aria-label="Un-maximise"
+          aria-label="Maximise"
           class="mx_AccessibleButton mx_AppTileMenuBar_widgets_button"
           role="button"
           tabindex="0"
@@ -143,7 +145,7 @@ exports[`AppTile for a pinned widget should render 1`] = `
             xmlns="http://www.w3.org/2000/svg"
           >
             <path
-              d="M12 11.034a1 1 0 0 0 .29.702l.005.005c.18.18.43.29.705.29h8a1 1 0 0 0 0-2h-5.586L22 3.445a1 1 0 0 0-1.414-1.414L14 8.617V3.031a1 1 0 1 0-2 0zm0 1.963a1 1 0 0 0-.29-.702l-.005-.004A1 1 0 0 0 11 12H3a1 1 0 1 0 0 2h5.586L2 20.586A1 1 0 1 0 3.414 22L10 15.414V21a1 1 0 0 0 2 0z"
+              d="M21 3.997a1 1 0 0 0-.29-.702l-.005-.004A1 1 0 0 0 20 3h-8a1 1 0 1 0 0 2h5.586L5 17.586V12a1 1 0 1 0-2 0v8.003a1 1 0 0 0 .29.702l.005.004c.18.18.43.291.705.291h8a1 1 0 1 0 0-2H6.414L19 6.414V12a1 1 0 1 0 2 0z"
             />
           </svg>
         </div>
@@ -214,15 +216,16 @@ exports[`AppTile for a pinned widget should render permission request 1`] = `
         <span>
           <span
             aria-label="Avatar"
-            class="_avatar_1qbcf_8 mx_BaseAvatar mx_WidgetAvatar"
+            class="_avatar_zysgz_8 mx_BaseAvatar mx_WidgetAvatar"
             data-color="1"
             data-testid="avatar-img"
             data-type="round"
+            role="img"
             style="--cpd-avatar-size: 20px;"
           >
             <img
               alt=""
-              class="_image_1qbcf_41"
+              class="_image_zysgz_43"
               data-type="round"
               height="20px"
               loading="lazy"
@@ -231,9 +234,9 @@ exports[`AppTile for a pinned widget should render permission request 1`] = `
               width="20px"
             />
           </span>
-          <h3>
+          <h1>
             Example 1
-          </h3>
+          </h1>
           <span />
         </span>
       </span>
@@ -241,7 +244,7 @@ exports[`AppTile for a pinned widget should render permission request 1`] = `
         class="mx_AppTileMenuBar_widgets"
       >
         <div
-          aria-label="Un-maximise"
+          aria-label="Maximise"
           class="mx_AccessibleButton mx_AppTileMenuBar_widgets_button"
           role="button"
           tabindex="0"
@@ -255,7 +258,7 @@ exports[`AppTile for a pinned widget should render permission request 1`] = `
             xmlns="http://www.w3.org/2000/svg"
           >
             <path
-              d="M12 11.034a1 1 0 0 0 .29.702l.005.005c.18.18.43.29.705.29h8a1 1 0 0 0 0-2h-5.586L22 3.445a1 1 0 0 0-1.414-1.414L14 8.617V3.031a1 1 0 1 0-2 0zm0 1.963a1 1 0 0 0-.29-.702l-.005-.004A1 1 0 0 0 11 12H3a1 1 0 1 0 0 2h5.586L2 20.586A1 1 0 1 0 3.414 22L10 15.414V21a1 1 0 0 0 2 0z"
+              d="M21 3.997a1 1 0 0 0-.29-.702l-.005-.004A1 1 0 0 0 20 3h-8a1 1 0 1 0 0 2h5.586L5 17.586V12a1 1 0 1 0-2 0v8.003a1 1 0 0 0 .29.702l.005.004c.18.18.43.291.705.291h8a1 1 0 1 0 0-2H6.414L19 6.414V12a1 1 0 1 0 2 0z"
             />
           </svg>
         </div>
@@ -317,7 +320,7 @@ exports[`AppTile for a pinned widget should render permission request 1`] = `
           </div>
           <div>
             <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+              class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
               data-color="1"
               data-testid="avatar-img"
               data-type="round"
@@ -337,8 +340,8 @@ exports[`AppTile for a pinned widget should render permission request 1`] = `
             <span>
               Using this widget may share data 
               <div
-                aria-describedby="«r2j»"
-                aria-labelledby="«r2i»"
+                aria-describedby="_r_2f_"
+                aria-labelledby="_r_2e_"
                 class="mx_TextWithTooltip_target mx_TextWithTooltip_target--helpIcon"
               >
                 <svg
@@ -405,15 +408,16 @@ exports[`AppTile preserves non-persisted widget on container move 1`] = `
               <span>
                 <span
                   aria-label="Avatar"
-                  class="_avatar_1qbcf_8 mx_BaseAvatar mx_WidgetAvatar"
+                  class="_avatar_zysgz_8 mx_BaseAvatar mx_WidgetAvatar"
                   data-color="1"
                   data-testid="avatar-img"
                   data-type="round"
+                  role="img"
                   style="--cpd-avatar-size: 20px;"
                 >
                   <img
                     alt=""
-                    class="_image_1qbcf_41"
+                    class="_image_zysgz_43"
                     data-type="round"
                     height="20px"
                     loading="lazy"
@@ -422,9 +426,9 @@ exports[`AppTile preserves non-persisted widget on container move 1`] = `
                     width="20px"
                   />
                 </span>
-                <h3>
+                <h1>
                   Example 1
-                </h3>
+                </h1>
                 <span />
               </span>
             </span>
@@ -507,13 +511,24 @@ exports[`AppTile preserves non-persisted widget on container move 1`] = `
                   Loading…
                 </div>
                  
-                <div
+                <svg
                   aria-label="Loading…"
-                  class="mx_Spinner_icon"
+                  class="_icon_11k6c_18"
                   data-testid="spinner"
+                  fill="currentColor"
+                  height="1em"
                   role="progressbar"
                   style="width: 32px; height: 32px;"
-                />
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    clip-rule="evenodd"
+                    d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+                    fill-rule="evenodd"
+                  />
+                </svg>
               </div>
             </div>
           </div>
diff --git a/test/unit-tests/components/views/elements/__snapshots__/Dropdown-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/Dropdown-test.tsx.snap
new file mode 100644
index 0000000000..5f399616c0
--- /dev/null
+++ b/test/unit-tests/components/views/elements/__snapshots__/Dropdown-test.tsx.snap
@@ -0,0 +1,39 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`<Dropdown /> renders with placeholder 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_Dropdown"
+  >
+    <div
+      aria-describedby="id_value"
+      aria-expanded="false"
+      aria-haspopup="listbox"
+      aria-label="Test Dropdown"
+      aria-owns="id_input"
+      class="mx_AccessibleButton mx_Dropdown_input mx_no_textinput"
+      role="button"
+      tabindex="0"
+    >
+      <div
+        class="mx_Dropdown_option"
+        id="id_value"
+      >
+        Select an option
+      </div>
+      <svg
+        class="mx_Dropdown_arrow"
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+        />
+      </svg>
+    </div>
+  </div>
+</DocumentFragment>
+`;
diff --git a/test/unit-tests/components/views/elements/__snapshots__/EffectsOverlay-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/EffectsOverlay-test.tsx.snap
index 222d893e99..39aaa445f8 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/EffectsOverlay-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/EffectsOverlay-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<EffectsOverlay/> should render 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/elements/__snapshots__/ExternalLink-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/ExternalLink-test.tsx.snap
index 1cc44a5450..51389519f9 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/ExternalLink-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/ExternalLink-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<ExternalLink /> renders link correctly 1`] = `
 <DocumentFragment>
@@ -15,9 +15,21 @@ exports[`<ExternalLink /> renders link correctly 1`] = `
         children
       </b>
     </span>
-    <i
+    <svg
       class="mx_ExternalLink_icon"
-    />
+      fill="currentColor"
+      height="1em"
+      viewBox="0 0 24 24"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+      />
+      <path
+        d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+      />
+    </svg>
   </a>
 </DocumentFragment>
 `;
@@ -32,9 +44,21 @@ exports[`<ExternalLink /> renders plain text link correctly 1`] = `
     target="_blank"
   >
     test
-    <i
+    <svg
       class="mx_ExternalLink_icon"
-    />
+      fill="currentColor"
+      height="1em"
+      viewBox="0 0 24 24"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+      />
+      <path
+        d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+      />
+    </svg>
   </a>
 </DocumentFragment>
 `;
diff --git a/test/unit-tests/components/views/elements/__snapshots__/FacePile-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/FacePile-test.tsx.snap
index 62187854c3..f12f52b483 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/FacePile-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/FacePile-test.tsx.snap
@@ -1,18 +1,18 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<FacePile /> renders with a tooltip 1`] = `
 <DocumentFragment>
   <div
-    aria-labelledby="«r0»"
+    aria-labelledby="_r_0_"
     class="mx_AccessibleButton mx_FacePile"
     role="button"
     tabindex="0"
   >
     <div
-      class="_stacked-avatars_1qbcf_102"
+      class="_stacked-avatars_zysgz_109"
     >
       <span
-        class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+        class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
         data-color="4"
         data-testid="avatar-img"
         data-type="round"
diff --git a/test/unit-tests/components/views/elements/__snapshots__/FilterDropdown-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/FilterDropdown-test.tsx.snap
index 3f6d46f2fe..5d76e95d24 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/FilterDropdown-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/FilterDropdown-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<FilterDropdown /> renders dropdown options in menu 1`] = `
 <ul
@@ -11,6 +11,7 @@ exports[`<FilterDropdown /> renders dropdown options in menu 1`] = `
     class="mx_Dropdown_option mx_Dropdown_option_highlight"
     id="test__one"
     role="option"
+    tabindex="-1"
   >
     <div
       class="mx_FilterDropdown_option"
@@ -40,6 +41,7 @@ exports[`<FilterDropdown /> renders dropdown options in menu 1`] = `
     class="mx_Dropdown_option"
     id="test__two"
     role="option"
+    tabindex="-1"
   >
     <div
       class="mx_FilterDropdown_option"
@@ -81,9 +83,18 @@ exports[`<FilterDropdown /> renders selected option 1`] = `
       >
         Option one
       </div>
-      <span
+      <svg
         class="mx_Dropdown_arrow"
-      />
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+        />
+      </svg>
     </div>
   </div>
 </div>
@@ -110,9 +121,18 @@ exports[`<FilterDropdown /> renders selected option with selectedLabel 1`] = `
       >
         Show: Option one
       </div>
-      <span
+      <svg
         class="mx_Dropdown_arrow"
-      />
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+        />
+      </svg>
     </div>
   </div>
 </div>
@@ -137,9 +157,18 @@ exports[`<FilterDropdown /> renders when selected option is not in options 1`] =
         class="mx_Dropdown_option"
         id="test_value"
       />
-      <span
+      <svg
         class="mx_Dropdown_arrow"
-      />
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+        />
+      </svg>
     </div>
   </div>
 </div>
diff --git a/test/unit-tests/components/views/elements/__snapshots__/FilterTabGroup-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/FilterTabGroup-test.tsx.snap
index e87979a8ad..d69515c8c8 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/FilterTabGroup-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/FilterTabGroup-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<FilterTabGroup /> renders options 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/elements/__snapshots__/ImageView-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/ImageView-test.tsx.snap
index 26d819568a..40af301ccf 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/ImageView-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/ImageView-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<ImageView /> renders correctly 1`] = `
 <div>
@@ -21,6 +21,7 @@ exports[`<ImageView /> renders correctly 1`] = `
         class="mx_ImageView_toolbar"
       >
         <div
+          aria-describedby="_r_2_"
           aria-label="Zoom out"
           class="mx_AccessibleButton mx_ImageView_button mx_ImageView_button_zoomOut"
           role="button"
diff --git a/test/unit-tests/components/views/elements/__snapshots__/InfoTooltip-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/InfoTooltip-test.tsx.snap
index 438d3f0ecc..70f58d4bd3 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/InfoTooltip-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/InfoTooltip-test.tsx.snap
@@ -1,16 +1,33 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`InfoTooltip should show tooltip on hover 1`] = `
 <DocumentFragment>
   <div
-    aria-describedby="«r2»"
+    aria-describedby="_r_2_"
     class="mx_InfoTooltip"
     tabindex="0"
   >
     <span
       aria-label="Information"
-      class="mx_InfoTooltip_icon mx_InfoTooltip_icon_info"
-    />
+      class="mx_InfoTooltip_icon"
+    >
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M11.288 7.288A.97.97 0 0 1 12 7q.424 0 .713.287Q13 7.576 13 8t-.287.713A.97.97 0 0 1 12 9a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 8q0-.424.287-.713m.001 4.001A.97.97 0 0 1 12 11q.424 0 .713.287.287.288.287.713v4q0 .424-.287.712A.97.97 0 0 1 12 17a.97.97 0 0 1-.713-.288A.97.97 0 0 1 11 16v-4q0-.424.287-.713"
+        />
+        <path
+          clip-rule="evenodd"
+          d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10m-2 0a8 8 0 1 1-16 0 8 8 0 0 1 16 0"
+          fill-rule="evenodd"
+        />
+      </svg>
+    </span>
     Trigger text
   </div>
 </DocumentFragment>
diff --git a/test/unit-tests/components/views/elements/__snapshots__/LabelledCheckbox-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/LabelledCheckbox-test.tsx.snap
index 944cb23513..6e759d1810 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/LabelledCheckbox-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/LabelledCheckbox-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<LabelledCheckbox /> should render with byline of "this is a byline" 1`] = `
 <DocumentFragment>
@@ -15,17 +15,17 @@ exports[`<LabelledCheckbox /> should render with byline of "this is a byline" 1`
           class="_inline-field-control_19upo_44"
         >
           <div
-            class="_container_1hel1_10"
+            class="_container_1md5v_10"
           >
             <input
-              aria-describedby="«r4»"
+              aria-describedby="_r_4_"
               checked=""
-              class="_input_1hel1_18"
+              class="_input_1md5v_18"
               id="checkbox_vY7Q4uEh9K"
               type="checkbox"
             />
             <div
-              class="_ui_1hel1_19"
+              class="_ui_1md5v_19"
             >
               <svg
                 aria-hidden="true"
@@ -57,7 +57,7 @@ exports[`<LabelledCheckbox /> should render with byline of "this is a byline" 1`
           </label>
           <span
             class="_message_19upo_85 _help-message_19upo_91"
-            id="«r4»"
+            id="_r_4_"
           >
             this is a byline
           </span>
@@ -83,16 +83,16 @@ exports[`<LabelledCheckbox /> should render with byline of undefined 1`] = `
           class="_inline-field-control_19upo_44"
         >
           <div
-            class="_container_1hel1_10"
+            class="_container_1md5v_10"
           >
             <input
               checked=""
-              class="_input_1hel1_18"
+              class="_input_1md5v_18"
               id="checkbox_vY7Q4uEh9K"
               type="checkbox"
             />
             <div
-              class="_ui_1hel1_19"
+              class="_ui_1md5v_19"
             >
               <svg
                 aria-hidden="true"
diff --git a/test/unit-tests/components/views/elements/__snapshots__/LearnMore-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/LearnMore-test.tsx.snap
index 41904877c8..4191518f03 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/LearnMore-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/LearnMore-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<LearnMore /> renders button 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/elements/__snapshots__/Pill-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/Pill-test.tsx.snap
index 0f6acfd021..6b5c91b973 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/Pill-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/Pill-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<Pill> should not render a non-permalink 1`] = `
 <DocumentFragment>
@@ -40,7 +40,7 @@ exports[`<Pill> should render the expected pill for @room 1`] = `
         >
           <span
             aria-hidden="true"
-            class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
             data-color="1"
             data-testid="avatar-img"
             data-type="round"
@@ -71,7 +71,7 @@ exports[`<Pill> should render the expected pill for a known user not in the room
       >
         <span
           aria-hidden="true"
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
           data-color="5"
           data-testid="avatar-img"
           data-type="round"
@@ -101,7 +101,7 @@ exports[`<Pill> should render the expected pill for a message in another room 1`
       >
         <span
           aria-hidden="true"
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
           data-color="1"
           data-testid="avatar-img"
           data-type="round"
@@ -131,7 +131,7 @@ exports[`<Pill> should render the expected pill for a message in the same room 1
       >
         <span
           aria-hidden="true"
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
           data-color="4"
           data-testid="avatar-img"
           data-type="round"
@@ -161,7 +161,7 @@ exports[`<Pill> should render the expected pill for a room alias 1`] = `
       >
         <span
           aria-hidden="true"
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
           data-color="1"
           data-testid="avatar-img"
           data-type="round"
@@ -191,7 +191,7 @@ exports[`<Pill> should render the expected pill for a space 1`] = `
       >
         <span
           aria-hidden="true"
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
           data-color="2"
           data-testid="avatar-img"
           data-type="round"
@@ -252,7 +252,7 @@ exports[`<Pill> when rendering a pill for a room should render the expected pill
       >
         <span
           aria-hidden="true"
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
           data-color="1"
           data-testid="avatar-img"
           data-type="round"
@@ -282,7 +282,7 @@ exports[`<Pill> when rendering a pill for a user in the room should render as ex
       >
         <span
           aria-hidden="true"
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
           data-color="4"
           data-testid="avatar-img"
           data-type="round"
diff --git a/test/unit-tests/components/views/elements/__snapshots__/PollCreateDialog-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/PollCreateDialog-test.tsx.snap
index 0a92d2335f..93d794a179 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/PollCreateDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/PollCreateDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`PollCreateDialog renders a blank poll 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/elements/__snapshots__/QRCode-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/QRCode-test.tsx.snap
index eb82ed1b0d..9a9d7bb224 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/QRCode-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/QRCode-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<QRCode /> renders a QR with defaults 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/elements/__snapshots__/RoomFacePile-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/RoomFacePile-test.tsx.snap
index 4b396abded..c8e31e7b6f 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/RoomFacePile-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/RoomFacePile-test.tsx.snap
@@ -1,19 +1,19 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<RoomFacePile /> renders 1`] = `
 <DocumentFragment>
   <div
-    aria-describedby="«r1»"
-    aria-labelledby="«r0»"
+    aria-describedby="_r_1_"
+    aria-labelledby="_r_0_"
     class="mx_AccessibleButton mx_FacePile"
     role="button"
     tabindex="0"
   >
     <div
-      class="_stacked-avatars_1qbcf_102"
+      class="_stacked-avatars_zysgz_109"
     >
       <span
-        class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+        class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
         data-color="4"
         data-testid="avatar-img"
         data-type="round"
diff --git a/test/unit-tests/components/views/elements/__snapshots__/SearchWarning-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/SearchWarning-test.tsx.snap
index cb9d443bba..f2b8719b39 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/SearchWarning-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/SearchWarning-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SearchWarning /> with desktop builds available renders with a logo by default 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/elements/__snapshots__/SettingsDropdown-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/SettingsDropdown-test.tsx.snap
new file mode 100644
index 0000000000..2ecb0a7038
--- /dev/null
+++ b/test/unit-tests/components/views/elements/__snapshots__/SettingsDropdown-test.tsx.snap
@@ -0,0 +1,57 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`<SettingsDropdown /> should render a disabled setting 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_SettingsDropdown"
+  >
+    <label
+      class="mx_SettingsDropdown_label"
+      for="_r_0_"
+    >
+      <span
+        class="mx_SettingsDropdown_labelText"
+      >
+        Open %(brand)s when you log in to your computer
+      </span>
+    </label>
+    <div
+      class="mx_Dropdown mx_Dropdown_disabled"
+    >
+      <div
+        aria-describedby="_r_0__value"
+        aria-disabled="true"
+        aria-expanded="false"
+        aria-haspopup="listbox"
+        aria-label="Open %(brand)s when you log in to your computer"
+        aria-owns="_r_0__input"
+        class="mx_AccessibleButton mx_Dropdown_input mx_no_textinput mx_AccessibleButton_disabled"
+        disabled=""
+        role="button"
+        tabindex="0"
+      >
+        <div
+          class="mx_Dropdown_option"
+          id="_r_0__value"
+        >
+          <div>
+            No
+          </div>
+        </div>
+        <svg
+          class="mx_Dropdown_arrow"
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+          />
+        </svg>
+      </div>
+    </div>
+  </div>
+</DocumentFragment>
+`;
diff --git a/test/unit-tests/components/views/elements/__snapshots__/SettingsField-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/SettingsField-test.tsx.snap
index 3103159bce..be143cba28 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/SettingsField-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/SettingsField-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SettingsField /> should render with the default label 1`] = `
 <DocumentFragment>
@@ -10,7 +10,7 @@ exports[`<SettingsField /> should render with the default label 1`] = `
     >
       <label
         class="_label_19upo_59"
-        for="radix-«r0»"
+        for="radix-_r_0_"
       >
         Element Call URL
       </label>
@@ -19,7 +19,7 @@ exports[`<SettingsField /> should render with the default label 1`] = `
       >
         <input
           class="_control_sqdq4_10"
-          id="radix-«r0»"
+          id="radix-_r_0_"
           name="input"
           title=""
           value=""
diff --git a/test/unit-tests/components/views/elements/__snapshots__/SpellCheckLanguagesDropdown-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/SpellCheckLanguagesDropdown-test.tsx.snap
index b1b5f161c2..d558bf3192 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/SpellCheckLanguagesDropdown-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/SpellCheckLanguagesDropdown-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SpellCheckLanguagesDropdown /> renders as expected 1`] = `
 <DocumentFragment>
@@ -23,9 +23,18 @@ exports[`<SpellCheckLanguagesDropdown /> renders as expected 1`] = `
           English
         </div>
       </div>
-      <span
+      <svg
         class="mx_Dropdown_arrow"
-      />
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+        />
+      </svg>
     </div>
   </div>
 </DocumentFragment>
diff --git a/test/unit-tests/components/views/elements/__snapshots__/StyledRadioGroup-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/StyledRadioGroup-test.tsx.snap
index cb3c3374fd..625f55d7ca 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/StyledRadioGroup-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/StyledRadioGroup-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<StyledRadioGroup /> renders radios correctly when no value is provided 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/elements/__snapshots__/SyntaxHighlight-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/SyntaxHighlight-test.tsx.snap
index 9068995c59..b44dcaa96d 100644
--- a/test/unit-tests/components/views/elements/__snapshots__/SyntaxHighlight-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/__snapshots__/SyntaxHighlight-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SyntaxHighlight /> renders 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/elements/crypto/__snapshots__/VerificationQRCode-test.tsx.snap b/test/unit-tests/components/views/elements/crypto/__snapshots__/VerificationQRCode-test.tsx.snap
index 73f8203f1d..e2e03a6f30 100644
--- a/test/unit-tests/components/views/elements/crypto/__snapshots__/VerificationQRCode-test.tsx.snap
+++ b/test/unit-tests/components/views/elements/crypto/__snapshots__/VerificationQRCode-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<VerificationQRCode /> renders a QR code 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/emojipicker/EmojiPicker-test.tsx b/test/unit-tests/components/views/emojipicker/EmojiPicker-test.tsx
index a7dcadc9f7..951e17ce66 100644
--- a/test/unit-tests/components/views/emojipicker/EmojiPicker-test.tsx
+++ b/test/unit-tests/components/views/emojipicker/EmojiPicker-test.tsx
@@ -12,10 +12,122 @@ import userEvent from "@testing-library/user-event";
 
 import EmojiPicker from "../../../../../src/components/views/emojipicker/EmojiPicker";
 import { stubClient } from "../../../../test-utils";
+import SettingsStore from "../../../../../src/settings/SettingsStore";
 
 describe("EmojiPicker", function () {
     stubClient();
 
+    // Helper to get the currently active emoji's text content from the grid
+    const getActiveEmojiText = (container: HTMLElement): string =>
+        container.querySelector('.mx_EmojiPicker_body .mx_EmojiPicker_item_wrapper [tabindex="0"]')?.textContent || "";
+
+    beforeEach(() => {
+        // Clear recent emojis to prevent test pollution
+        jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName) => {
+            if (settingName === "recent_emoji") return [] as any;
+            return jest.requireActual("../../../../../src/settings/SettingsStore").default.getValue(settingName);
+        });
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it("should initialize categories with correct state when no recent emojis", () => {
+        const ref = createRef<EmojiPicker>();
+        render(<EmojiPicker ref={ref} onChoose={(str: string) => false} onFinished={jest.fn()} />);
+
+        //@ts-ignore private access
+        const categories = ref.current!.categories;
+
+        // Verify we have all expected categories
+        expect(categories).toHaveLength(9);
+        expect(categories.map((c) => c.id)).toEqual([
+            "recent",
+            "people",
+            "nature",
+            "foods",
+            "activity",
+            "places",
+            "objects",
+            "symbols",
+            "flags",
+        ]);
+
+        // Recent category should be disabled when empty
+        const recentCategory = categories.find((c) => c.id === "recent");
+        expect(recentCategory).toMatchObject({
+            id: "recent",
+            enabled: false,
+            visible: false,
+            firstVisible: false,
+        });
+
+        // People category should be the first visible when no recent emojis
+        const peopleCategory = categories.find((c) => c.id === "people");
+        expect(peopleCategory).toMatchObject({
+            id: "people",
+            enabled: true,
+            visible: true,
+            firstVisible: true,
+        });
+
+        // Other categories should start as not visible and not firstVisible
+        const natureCategory = categories.find((c) => c.id === "nature");
+        expect(natureCategory).toMatchObject({
+            id: "nature",
+            enabled: true,
+            visible: false,
+            firstVisible: false,
+        });
+
+        const flagsCategory = categories.find((c) => c.id === "flags");
+        expect(flagsCategory).toMatchObject({
+            id: "flags",
+            enabled: true,
+            visible: false,
+            firstVisible: false,
+        });
+
+        // All categories should have refs and names
+        categories.forEach((cat) => {
+            expect(cat.ref).toBeTruthy();
+            expect(cat.name).toBeTruthy();
+        });
+    });
+
+    it("should initialize categories with recent as firstVisible when recent emojis exist", () => {
+        // Mock recent emojis
+        jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName) => {
+            if (settingName === "recent_emoji") return ["😀", "🎉", "❤️"] as any;
+            return jest.requireActual("../../../../../src/settings/SettingsStore").default.getValue(settingName);
+        });
+
+        const ref = createRef<EmojiPicker>();
+        render(<EmojiPicker ref={ref} onChoose={(str: string) => false} onFinished={jest.fn()} />);
+
+        //@ts-ignore private access
+        const categories = ref.current!.categories;
+
+        // Recent category should be enabled and firstVisible
+        const recentCategory = categories.find((c) => c.id === "recent");
+        expect(recentCategory).toMatchObject({
+            id: "recent",
+            enabled: true,
+            visible: true,
+            firstVisible: true,
+        });
+
+        // People category should be visible but NOT firstVisible when recent exists
+        const peopleCategory = categories.find((c) => c.id === "people");
+        expect(peopleCategory).toMatchObject({
+            id: "people",
+            enabled: true,
+            visible: true,
+            firstVisible: false,
+        });
+    });
+
     it("should not mangle default order after filtering", async () => {
         const ref = createRef<EmojiPicker>();
         const { container } = render(
@@ -64,11 +176,14 @@ describe("EmojiPicker", function () {
         expect(input).toHaveFocus();
 
         function getEmoji(): string {
-            const activeDescendant = input.getAttribute("aria-activedescendant");
-            return container.querySelector("#" + activeDescendant)!.textContent!;
+            return getActiveEmojiText(container);
         }
 
         expect(getEmoji()).toEqual("😀");
+        // First arrow key press shows highlight without navigating
+        await userEvent.keyboard("[ArrowDown]");
+        expect(getEmoji()).toEqual("😀");
+        // Subsequent arrow keys navigate
         await userEvent.keyboard("[ArrowDown]");
         expect(getEmoji()).toEqual("🙂");
         await userEvent.keyboard("[ArrowUp]");
@@ -90,4 +205,290 @@ describe("EmojiPicker", function () {
         expect(onChoose).toHaveBeenCalledWith("📫️");
         expect(onFinished).toHaveBeenCalled();
     });
+
+    it("should move actual focus when navigating between emojis after Tab", async () => {
+        // mock offsetParent
+        Object.defineProperty(HTMLElement.prototype, "offsetParent", {
+            get() {
+                return this.parentNode;
+            },
+        });
+
+        const onChoose = jest.fn();
+        const onFinished = jest.fn();
+        const { container } = render(<EmojiPicker onChoose={onChoose} onFinished={onFinished} />);
+
+        const input = container.querySelector("input")!;
+        expect(input).toHaveFocus();
+
+        // Wait for emojis to render
+        await waitFor(() => {
+            expect(container.querySelector('[role="gridcell"]')).toBeInTheDocument();
+        });
+
+        function getEmoji(): string {
+            return document.activeElement?.textContent || "";
+        }
+
+        function getVirtuallyFocusedEmoji(): string {
+            return getActiveEmojiText(container);
+        }
+
+        // Initially, arrow keys use virtual focus (aria-activedescendant)
+        // The first emoji is virtually focused by default
+        expect(input).toHaveFocus();
+        expect(getVirtuallyFocusedEmoji()).toEqual("😀");
+        expect(getEmoji()).toEqual(""); // No actual emoji has focus
+
+        // First arrow key press shows highlight without navigating
+        await userEvent.keyboard("[ArrowDown]");
+        expect(input).toHaveFocus(); // Input still has focus
+        expect(getVirtuallyFocusedEmoji()).toEqual("😀"); // Virtual focus stayed on first emoji
+        expect(getEmoji()).toEqual(""); // No actual emoji has focus
+
+        // Second arrow key press navigates
+        await userEvent.keyboard("[ArrowDown]");
+        expect(input).toHaveFocus(); // Input still has focus
+        expect(getVirtuallyFocusedEmoji()).toEqual("🙂"); // Virtual focus moved
+        expect(getEmoji()).toEqual(""); // No actual emoji has focus
+
+        // Tab to move actual focus to the emoji
+        await userEvent.keyboard("[Tab]");
+        expect(input).not.toHaveFocus();
+        expect(getEmoji()).toEqual("🙂"); // Now emoji has actual focus
+
+        // Arrow keys now move actual DOM focus between emojis
+        await userEvent.keyboard("[ArrowDown]");
+        expect(getEmoji()).toEqual("🤩"); // Actual focus moved down one row
+        expect(input).not.toHaveFocus();
+
+        await userEvent.keyboard("[ArrowUp]");
+        expect(getEmoji()).toEqual("🙂"); // Actual focus moved back up
+        expect(input).not.toHaveFocus();
+
+        await userEvent.keyboard("[ArrowRight]");
+        expect(getEmoji()).toEqual("🙃"); // Actual focus moved right
+        expect(input).not.toHaveFocus();
+    });
+
+    it("should not select emoji on Enter press before highlight is shown", async () => {
+        // mock offsetParent
+        Object.defineProperty(HTMLElement.prototype, "offsetParent", {
+            get() {
+                return this.parentNode;
+            },
+        });
+
+        const onChoose = jest.fn();
+        const onFinished = jest.fn();
+        const { container } = render(<EmojiPicker onChoose={onChoose} onFinished={onFinished} />);
+
+        const input = container.querySelector("input")!;
+        expect(input).toHaveFocus();
+
+        // Wait for emojis to render
+        await waitFor(() => {
+            expect(container.querySelector('[role="gridcell"]')).toBeInTheDocument();
+        });
+
+        // Press Enter immediately without interacting with arrow keys or search
+        await userEvent.keyboard("[Enter]");
+
+        // onChoose and onFinished should not be called
+        expect(onChoose).not.toHaveBeenCalled();
+        expect(onFinished).not.toHaveBeenCalled();
+
+        // Now press arrow key to show highlight
+        await userEvent.keyboard("[ArrowDown]");
+
+        // Press Enter again - now it should work
+        await userEvent.keyboard("[Enter]");
+
+        // onChoose and onFinished should be called
+        expect(onChoose).toHaveBeenCalledWith("😀");
+        expect(onFinished).toHaveBeenCalled();
+    });
+
+    it("should reset to first emoji when filter is cleared after navigation", async () => {
+        // mock offsetParent
+        Object.defineProperty(HTMLElement.prototype, "offsetParent", {
+            get() {
+                return this.parentNode;
+            },
+        });
+
+        const onChoose = jest.fn();
+        const onFinished = jest.fn();
+        const { container } = render(<EmojiPicker onChoose={onChoose} onFinished={onFinished} />);
+
+        const input = container.querySelector("input")!;
+        expect(input).toHaveFocus();
+
+        function getEmoji(): string {
+            return getActiveEmojiText(container);
+        }
+
+        // Initially on first emoji
+        expect(getEmoji()).toEqual("😀");
+
+        // Show highlight with first arrow press
+        await userEvent.keyboard("[ArrowDown]");
+        expect(getEmoji()).toEqual("😀");
+
+        // Navigate to a different emoji
+        await userEvent.keyboard("[ArrowDown]");
+        expect(getEmoji()).toEqual("🙂");
+        await userEvent.keyboard("[ArrowDown]");
+        expect(getEmoji()).toEqual("🤩");
+
+        // Type a search query to filter emojis (this sets showHighlight=true)
+        await userEvent.type(input, "think");
+        await waitFor(() => {
+            // After filtering, we should be on the "thinking" emoji
+            expect(getEmoji()).toEqual("🤔");
+        });
+
+        // Clear the search filter
+        await userEvent.clear(input);
+
+        // After clearing, showHighlight is false, so the highlight is hidden
+        // The activeNode might still be on 🤔, but we can't see it
+
+        // Press arrow key - this should reset to first emoji AND show highlight
+        await userEvent.keyboard("[ArrowDown]");
+        await waitFor(() => {
+            expect(getEmoji()).toEqual("😀"); // Should now be on first emoji with highlight shown
+        });
+
+        // Next arrow key should navigate from first emoji
+        await userEvent.keyboard("[ArrowDown]");
+        expect(getEmoji()).toEqual("🙂");
+    });
+
+    describe("Category keyboard selection", () => {
+        beforeEach(() => {
+            // mock offsetParent
+            Object.defineProperty(HTMLElement.prototype, "offsetParent", {
+                get() {
+                    return this.parentNode;
+                },
+            });
+        });
+
+        it("check tabindex for the first category when no recent emojis", async () => {
+            const { container } = render(<EmojiPicker onChoose={jest.fn()} onFinished={jest.fn()} />);
+
+            await waitFor(() => {
+                expect(container.querySelector('[data-category-id="people"]')).toBeInTheDocument();
+            });
+
+            // People category should have tabindex="0"
+            const peopleTab = container.querySelector('[title*="Smileys"]');
+            expect(peopleTab).toHaveAttribute("tabindex", "0");
+            expect(peopleTab).toHaveAttribute("aria-selected", "true");
+
+            // Other categories should have tabindex="-1"
+            const natureTab = container.querySelector('[title*="Animals"]');
+            expect(natureTab).toHaveAttribute("tabindex", "-1");
+        });
+
+        it("check tabindex for recent category when recent emojis exist", async () => {
+            // Mock recent emojis
+            jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName) => {
+                if (settingName === "recent_emoji") return ["😀", "🎉"] as any;
+                return jest.requireActual("../../../../../src/settings/SettingsStore").default.getValue(settingName);
+            });
+
+            const { container } = render(<EmojiPicker onChoose={jest.fn()} onFinished={jest.fn()} />);
+
+            await waitFor(() => {
+                expect(container.querySelector('[data-category-id="recent"]')).toBeInTheDocument();
+            });
+
+            // Recent category should have tabindex="0"
+            const recentTab = container.querySelector('[title*="Frequently"]');
+            expect(recentTab).toHaveAttribute("tabindex", "0");
+            expect(recentTab).toHaveAttribute("aria-selected", "true");
+
+            // People category should have tabindex="-1"
+            const peopleTab = container.querySelector('[title*="Smileys"]');
+            expect(peopleTab).toHaveAttribute("tabindex", "-1");
+        });
+
+        it("should update table position when clicking on a different category tab", async () => {
+            const { container } = render(<EmojiPicker onChoose={jest.fn()} onFinished={jest.fn()} />);
+
+            await waitFor(() => {
+                expect(container.querySelector('[data-category-id="people"]')).toBeInTheDocument();
+            });
+
+            // Initially, people category should be visible
+            const peopleTab = container.querySelector('[title*="Smileys"]') as HTMLButtonElement;
+            expect(peopleTab).toHaveAttribute("tabindex", "0");
+
+            // Click on nature category tab
+            const natureTab = container.querySelector('[title*="Animals"]') as HTMLButtonElement;
+            await userEvent.click(natureTab);
+
+            // Wait for scroll and visibility update
+            await waitFor(() => {
+                const natureCategory = container.querySelector('[data-category-id="nature"]');
+                expect(natureCategory).toBeInTheDocument();
+            });
+        });
+
+        it("should navigate between category tabs using arrow keys", async () => {
+            const { container } = render(<EmojiPicker onChoose={jest.fn()} onFinished={jest.fn()} />);
+
+            await waitFor(() => {
+                expect(container.querySelector('[data-category-id="people"]')).toBeInTheDocument();
+            });
+
+            // Focus on the category header
+            const peopleTab = container.querySelector('[title*="Smileys"]') as HTMLButtonElement;
+            peopleTab.focus();
+            expect(peopleTab).toHaveFocus();
+
+            // Press ArrowRight to move to next category
+            await userEvent.keyboard("[ArrowRight]");
+
+            // Should focus on next enabled category and trigger scroll
+            await waitFor(() => {
+                // Verify focus moved away from people tab
+                expect(peopleTab).not.toHaveFocus();
+
+                // Verify some other category tab now has focus
+                const focusedTab = document.activeElement;
+                expect(focusedTab?.getAttribute("role")).toBe("tab");
+                expect(focusedTab).not.toBe(peopleTab);
+            });
+        });
+
+        it("should navigate to first/last category using Home/End keys", async () => {
+            const { container } = render(<EmojiPicker onChoose={jest.fn()} onFinished={jest.fn()} />);
+
+            await waitFor(() => {
+                expect(container.querySelector('[data-category-id="people"]')).toBeInTheDocument();
+            });
+
+            // Focus on the category header
+            const peopleTab = container.querySelector('[title*="Smileys"]') as HTMLButtonElement;
+            peopleTab.focus();
+
+            // Press End to jump to last category
+            await userEvent.keyboard("[End]");
+
+            await waitFor(() => {
+                const flagsTab = container.querySelector('[title*="Flags"]') as HTMLButtonElement;
+                expect(flagsTab).toHaveFocus();
+            });
+
+            // Press Home to jump to first category
+            await userEvent.keyboard("[Home]");
+
+            await waitFor(() => {
+                expect(peopleTab).toHaveFocus();
+            });
+        });
+    });
 });
diff --git a/test/unit-tests/components/views/location/LocationShareMenu-test.tsx b/test/unit-tests/components/views/location/LocationShareMenu-test.tsx
index c347ac91a9..d56691b3cd 100644
--- a/test/unit-tests/components/views/location/LocationShareMenu-test.tsx
+++ b/test/unit-tests/components/views/location/LocationShareMenu-test.tsx
@@ -48,6 +48,7 @@ jest.mock("../../../../../src/settings/SettingsStore", () => ({
 jest.mock("../../../../../src/stores/OwnProfileStore", () => ({
     OwnProfileStore: {
         instance: {
+            on: jest.fn(),
             displayName: "Ernie",
             getHttpAvatarUrl: jest.fn().mockReturnValue("image.com/img"),
         },
@@ -300,7 +301,7 @@ describe("<LocationShareMenu />", () => {
 
             setShareType(getByText, LocationShareType.Live);
 
-            expect(getByText("OK").hasAttribute("disabled")).toBeTruthy();
+            expect(getByText("OK")).toHaveAttribute("aria-disabled", "true");
         });
 
         it("enables OK button when labs flag is toggled to enabled", () => {
@@ -310,7 +311,7 @@ describe("<LocationShareMenu />", () => {
 
             fireEvent.click(getByLabelText("Enable live location sharing"));
 
-            expect(getByText("OK").hasAttribute("disabled")).toBeFalsy();
+            expect(getByText("OK")).not.toHaveAttribute("aria-disabled", "true");
         });
 
         it("enables live share setting on ok button submit", () => {
diff --git a/test/unit-tests/components/views/location/__snapshots__/LocationPicker-test.tsx.snap b/test/unit-tests/components/views/location/__snapshots__/LocationPicker-test.tsx.snap
index aeb7b88d8f..5b568833ee 100644
--- a/test/unit-tests/components/views/location/__snapshots__/LocationPicker-test.tsx.snap
+++ b/test/unit-tests/components/views/location/__snapshots__/LocationPicker-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`LocationPicker <LocationPicker /> for Live location share type updates selected duration 1`] = `
 <div
diff --git a/test/unit-tests/components/views/location/__snapshots__/LocationShareMenu-test.tsx.snap b/test/unit-tests/components/views/location/__snapshots__/LocationShareMenu-test.tsx.snap
index 3ab56061be..3216492774 100644
--- a/test/unit-tests/components/views/location/__snapshots__/LocationShareMenu-test.tsx.snap
+++ b/test/unit-tests/components/views/location/__snapshots__/LocationShareMenu-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<LocationShareMenu /> with live location disabled goes to labs flag screen after live options is clicked 1`] = `
 <div
@@ -18,41 +18,50 @@ exports[`<LocationShareMenu /> with live location disabled goes to labs flag scr
   >
     Please note: this is a labs feature using a temporary implementation. This means you will not be able to delete your location history, and advanced users will be able to see your location history even after you stop sharing your live location with this room.
   </p>
-  <div
-    class="mx_SettingsFlag"
-    data-testid="enable-live-share-toggle"
+  <form
+    class="_root_19upo_16"
   >
-    <span
-      class="mx_SettingsFlag_label"
+    <div
+      class="_inline-field_19upo_32"
     >
       <div
-        id="mx_LabelledToggleSwitch_«r0»"
+        class="_inline-field-control_19upo_44"
       >
-        Enable live location sharing
+        <div
+          class="_container_udcm8_10"
+        >
+          <input
+            class="_input_udcm8_24"
+            id="_r_0_"
+            role="switch"
+            type="checkbox"
+          />
+          <div
+            class="_ui_udcm8_34"
+          />
+        </div>
       </div>
-    </span>
-    <div
-      aria-checked="false"
-      aria-disabled="false"
-      aria-labelledby="mx_LabelledToggleSwitch_«r0»"
-      class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
-      role="switch"
+      <div
+        class="_inline-field-body_19upo_38"
+      >
+        <label
+          class="_label_19upo_59"
+          for="_r_0_"
+        >
+          Enable live location sharing
+        </label>
+      </div>
+    </div>
+    <button
+      aria-disabled="true"
+      class="_button_187yx_8 mx_EnableLiveShare_button"
+      data-kind="primary"
+      data-size="lg"
+      role="button"
       tabindex="0"
     >
-      <div
-        class="mx_ToggleSwitch_ball"
-      />
-    </div>
-  </div>
-  <button
-    aria-disabled="true"
-    class="mx_AccessibleButton mx_EnableLiveShare_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary mx_AccessibleButton_disabled"
-    data-testid="enable-live-share-submit"
-    disabled=""
-    role="button"
-    tabindex="0"
-  >
-    OK
-  </button>
+      OK
+    </button>
+  </form>
 </div>
 `;
diff --git a/test/unit-tests/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap b/test/unit-tests/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap
index c18ce7c602..690e1e02fc 100644
--- a/test/unit-tests/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<LocationViewDialog /> renders map correctly 1`] = `
 <div
@@ -32,6 +32,7 @@ exports[`<LocationViewDialog /> renders map correctly 1`] = `
     class="mx_ZoomButtons"
   >
     <div
+      aria-describedby="_r_6_"
       aria-label="Zoom in"
       class="mx_AccessibleButton mx_ZoomButtons_button"
       data-testid="map-zoom-in-button"
diff --git a/test/unit-tests/components/views/location/__snapshots__/MapError-test.tsx.snap b/test/unit-tests/components/views/location/__snapshots__/MapError-test.tsx.snap
index f0c4749153..61be99d0d4 100644
--- a/test/unit-tests/components/views/location/__snapshots__/MapError-test.tsx.snap
+++ b/test/unit-tests/components/views/location/__snapshots__/MapError-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<MapError /> applies class when isMinimised is truthy 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/location/__snapshots__/Marker-test.tsx.snap b/test/unit-tests/components/views/location/__snapshots__/Marker-test.tsx.snap
index 43d75c65a7..a4bb4f9914 100644
--- a/test/unit-tests/components/views/location/__snapshots__/Marker-test.tsx.snap
+++ b/test/unit-tests/components/views/location/__snapshots__/Marker-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<Marker /> renders with location icon when no room member 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/location/__snapshots__/SmartMarker-test.tsx.snap b/test/unit-tests/components/views/location/__snapshots__/SmartMarker-test.tsx.snap
index f1663bb751..674ea51594 100644
--- a/test/unit-tests/components/views/location/__snapshots__/SmartMarker-test.tsx.snap
+++ b/test/unit-tests/components/views/location/__snapshots__/SmartMarker-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SmartMarker /> creates a marker on mount 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/location/__snapshots__/ZoomButtons-test.tsx.snap b/test/unit-tests/components/views/location/__snapshots__/ZoomButtons-test.tsx.snap
index 02131a43d7..79223a7135 100644
--- a/test/unit-tests/components/views/location/__snapshots__/ZoomButtons-test.tsx.snap
+++ b/test/unit-tests/components/views/location/__snapshots__/ZoomButtons-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<ZoomButtons /> renders buttons 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/messages/CallEvent-test.tsx b/test/unit-tests/components/views/messages/CallEvent-test.tsx
index cc8e5a0a8e..4c5b3ce692 100644
--- a/test/unit-tests/components/views/messages/CallEvent-test.tsx
+++ b/test/unit-tests/components/views/messages/CallEvent-test.tsx
@@ -16,7 +16,7 @@ import {
     PendingEventOrdering,
     type RoomMember,
 } from "matrix-js-sdk/src/matrix";
-import { type ClientWidgetApi, Widget } from "matrix-widget-api";
+import { Widget } from "matrix-widget-api";
 
 import {
     useMockedCalls,
@@ -35,6 +35,7 @@ import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
 import { CallStore } from "../../../../../src/stores/CallStore";
 import { WidgetMessagingStore } from "../../../../../src/stores/widgets/WidgetMessagingStore";
 import { ConnectionState } from "../../../../../src/models/Call";
+import { type WidgetMessaging } from "../../../../../src/stores/widgets/WidgetMessaging";
 
 const CallEvent = wrapInMatrixClientContext(UnwrappedCallEvent);
 
@@ -86,7 +87,7 @@ describe("CallEvent", () => {
         widget = new Widget(call.widget);
         WidgetMessagingStore.instance.storeMessaging(widget, room.roomId, {
             stop: () => {},
-        } as unknown as ClientWidgetApi);
+        } as unknown as WidgetMessaging);
     });
 
     afterEach(async () => {
@@ -151,7 +152,7 @@ describe("CallEvent", () => {
             }),
         );
         defaultDispatcher.unregister(dispatcherRef);
-        await act(() => call.start());
+        act(() => call.setConnectionState(ConnectionState.Connected));
 
         // Test that the leave button works
         fireEvent.click(screen.getByRole("button", { name: "Leave" }));
diff --git a/test/unit-tests/components/views/messages/DateSeparator-test.tsx b/test/unit-tests/components/views/messages/DateSeparator-test.tsx
index 190872feea..f51b62933c 100644
--- a/test/unit-tests/components/views/messages/DateSeparator-test.tsx
+++ b/test/unit-tests/components/views/messages/DateSeparator-test.tsx
@@ -14,7 +14,6 @@ import { type TimestampToEventResponse, ConnectionError, HTTPError, MatrixError
 import dispatcher from "../../../../../src/dispatcher/dispatcher";
 import { Action } from "../../../../../src/dispatcher/actions";
 import { type ViewRoomPayload } from "../../../../../src/dispatcher/payloads/ViewRoomPayload";
-import { SdkContextClass } from "../../../../../src/contexts/SDKContext";
 import { formatFullDateNoTime } from "../../../../../src/DateUtils";
 import SettingsStore from "../../../../../src/settings/SettingsStore";
 import { UIFeature } from "../../../../../src/settings/UIFeature";
@@ -26,6 +25,8 @@ import {
     waitEnoughCyclesForModal,
 } from "../../../../test-utils";
 import DateSeparator from "../../../../../src/components/views/messages/DateSeparator";
+import { ScopedRoomContextProvider } from "../../../../../src/contexts/ScopedRoomContext";
+import RoomContext, { type RoomContextType } from "../../../../../src/contexts/RoomContext";
 
 jest.mock("../../../../../src/settings/SettingsStore");
 
@@ -40,13 +41,25 @@ describe("DateSeparator", () => {
         roomId,
     };
 
+    const mockRoomViewStore = {
+        getRoomId: jest.fn().mockReturnValue(roomId),
+    };
+
+    const defaultRoomContext = {
+        ...RoomContext,
+        roomId,
+        roomViewStore: mockRoomViewStore,
+    } as unknown as RoomContextType;
+
     const mockClient = getMockClientWithEventEmitter({
         timestampToEvent: jest.fn(),
     });
     const getComponent = (props = {}) =>
         render(
             <MatrixClientContext.Provider value={mockClient}>
-                <DateSeparator {...defaultProps} {...props} />
+                <ScopedRoomContextProvider {...defaultRoomContext}>
+                    <DateSeparator {...defaultProps} {...props} />
+                </ScopedRoomContextProvider>
             </MatrixClientContext.Provider>,
         );
 
@@ -74,7 +87,7 @@ describe("DateSeparator", () => {
                 return true;
             }
         });
-        jest.spyOn(SdkContextClass.instance.roomViewStore, "getRoomId").mockReturnValue(roomId);
+        mockRoomViewStore.getRoomId.mockReturnValue(roomId);
     });
 
     afterAll(() => {
@@ -200,7 +213,7 @@ describe("DateSeparator", () => {
             // network request is taking a while, so we got bored, switched rooms; we
             // shouldn't jump back to the previous room after the network request
             // happens to finish later.
-            jest.spyOn(SdkContextClass.instance.roomViewStore, "getRoomId").mockReturnValue("!some-other-room");
+            mockRoomViewStore.getRoomId.mockReturnValue("!some-other-room");
 
             // Jump to "last week"
             mockClient.timestampToEvent.mockResolvedValue({
@@ -230,7 +243,7 @@ describe("DateSeparator", () => {
             // network request is taking a while, so we got bored, switched rooms; we
             // shouldn't jump back to the previous room after the network request
             // happens to finish later.
-            jest.spyOn(SdkContextClass.instance.roomViewStore, "getRoomId").mockReturnValue("!some-other-room");
+            mockRoomViewStore.getRoomId.mockReturnValue("!some-other-room");
 
             // Try to jump to "last week" but we want an error to occur and ensure that
             // we don't show an error dialog for it since we already switched away to
diff --git a/test/unit-tests/components/views/messages/DownloadActionButton-test.tsx b/test/unit-tests/components/views/messages/DownloadActionButton-test.tsx
index a0cbe2c620..b127fbc4dc 100644
--- a/test/unit-tests/components/views/messages/DownloadActionButton-test.tsx
+++ b/test/unit-tests/components/views/messages/DownloadActionButton-test.tsx
@@ -11,14 +11,39 @@ import { mocked } from "jest-mock";
 import fetchMockJest from "fetch-mock-jest";
 import { fireEvent, render, screen, waitFor } from "jest-matrix-react";
 import { MatrixEvent } from "matrix-js-sdk/src/matrix";
+import userEvent from "@testing-library/user-event";
 
-import { stubClient } from "../../../../test-utils";
+import { clearAllModals, stubClient } from "../../../../test-utils";
 import DownloadActionButton from "../../../../../src/components/views/messages/DownloadActionButton";
 import Modal from "../../../../../src/Modal";
 import { MediaEventHelper } from "../../../../../src/utils/MediaEventHelper";
 import ErrorDialog from "../../../../../src/components/views/dialogs/ErrorDialog";
 
+jest.mock("matrix-encrypt-attachment", () => ({
+    decryptAttachment: jest.fn().mockResolvedValue(new Blob(["TESTFILE"], { type: "application/octet-stream" })),
+}));
+
 describe("DownloadActionButton", () => {
+    const plainEvent = new MatrixEvent({
+        room_id: "!room:id",
+        sender: "@user:id",
+        type: "m.room.message",
+        content: {
+            body: "test",
+            msgtype: "m.image",
+            url: "mxc://matrix.org/1234",
+        },
+    });
+
+    beforeEach(() => {
+        jest.restoreAllMocks();
+        fetchMockJest.restore();
+    });
+
+    afterEach(() => {
+        clearAllModals();
+    });
+
     it("should show error if media API returns one", async () => {
         const cli = stubClient();
         // eslint-disable-next-line no-restricted-properties
@@ -26,24 +51,14 @@ describe("DownloadActionButton", () => {
             (mxc) => `https://matrix.org/_matrix/media/r0/download/${mxc.slice(6)}`,
         );
 
-        fetchMockJest.get("https://matrix.org/_matrix/media/r0/download/matrix.org/1234", {
+        fetchMockJest.getOnce("https://matrix.org/_matrix/media/r0/download/matrix.org/1234", {
             status: 404,
             body: { errcode: "M_NOT_FOUND", error: "Not found" },
         });
 
-        const event = new MatrixEvent({
-            room_id: "!room:id",
-            sender: "@user:id",
-            type: "m.room.message",
-            content: {
-                body: "test",
-                msgtype: "m.image",
-                url: "mxc://matrix.org/1234",
-            },
-        });
-        const mediaEventHelper = new MediaEventHelper(event);
+        const mediaEventHelper = new MediaEventHelper(plainEvent);
 
-        render(<DownloadActionButton mxEvent={event} mediaEventHelperGet={() => mediaEventHelper} />);
+        render(<DownloadActionButton mxEvent={plainEvent} mediaEventHelperGet={() => mediaEventHelper} />);
 
         const spy = jest.spyOn(Modal, "createDialog");
 
@@ -57,4 +72,85 @@ describe("DownloadActionButton", () => {
             ),
         );
     });
+
+    it("should show download tooltip on hover", async () => {
+        stubClient();
+
+        const user = userEvent.setup();
+
+        fetchMockJest.getOnce("https://matrix.org/_matrix/media/r0/download/matrix.org/1234", "TESTFILE");
+
+        const event = new MatrixEvent({
+            room_id: "!room:id",
+            sender: "@user:id",
+            type: "m.room.message",
+            content: {
+                body: "test",
+                msgtype: "m.image",
+                url: "mxc://matrix.org/1234",
+            },
+        });
+
+        render(<DownloadActionButton mxEvent={event} mediaEventHelperGet={() => undefined} />);
+
+        const button = screen.getByRole("button");
+        await user.hover(button);
+
+        await waitFor(() => {
+            expect(screen.getByRole("tooltip")).toHaveTextContent("Download");
+        });
+    });
+
+    it("should show downloading tooltip while unencrypted files are downloading", async () => {
+        const user = userEvent.setup();
+
+        stubClient();
+
+        fetchMockJest.getOnce("http://this.is.a.url/matrix.org/1234", "TESTFILE");
+
+        const mediaEventHelper = new MediaEventHelper(plainEvent);
+
+        render(<DownloadActionButton mxEvent={plainEvent} mediaEventHelperGet={() => mediaEventHelper} />);
+
+        const button = screen.getByRole("button");
+        await user.hover(button);
+
+        await user.click(button);
+
+        await waitFor(() => {
+            expect(screen.getByRole("tooltip")).toHaveTextContent("Downloading");
+        });
+    });
+
+    it("should show decrypting tooltip while encrypted files are downloading", async () => {
+        const user = userEvent.setup();
+
+        stubClient();
+
+        fetchMockJest.getOnce("http://this.is.a.url/matrix.org/1234", "UFTUGJMF");
+
+        const e2eEvent = new MatrixEvent({
+            room_id: "!room:id",
+            sender: "@user:id",
+            type: "m.room.message",
+            content: {
+                body: "test",
+                msgtype: "m.image",
+                file: { url: "mxc://matrix.org/1234" },
+            },
+        });
+
+        const mediaEventHelper = new MediaEventHelper(e2eEvent);
+
+        render(<DownloadActionButton mxEvent={e2eEvent} mediaEventHelperGet={() => mediaEventHelper} />);
+
+        const button = screen.getByRole("button");
+        await user.hover(button);
+
+        await user.click(button);
+
+        await waitFor(() => {
+            expect(screen.getByRole("tooltip")).toHaveTextContent("Decrypting");
+        });
+    });
 });
diff --git a/test/unit-tests/components/views/messages/EncryptionEvent-test.tsx b/test/unit-tests/components/views/messages/EncryptionEvent-test.tsx
index c91a274c70..3375b6b0b5 100644
--- a/test/unit-tests/components/views/messages/EncryptionEvent-test.tsx
+++ b/test/unit-tests/components/views/messages/EncryptionEvent-test.tsx
@@ -72,6 +72,20 @@ describe("EncryptionEvent", () => {
             );
         });
 
+        it("should show the expected texts for experimental state event encryption", async () => {
+            client.enableEncryptedStateEvents = true;
+            event.event.content!["io.element.msc4362.encrypt_state_events"] = true;
+            renderEncryptionEvent(client, event);
+            await waitFor(() =>
+                checkTexts(
+                    "Experimental state encryption enabled",
+                    "Messages and state events in this room are end-to-end encrypted. " +
+                        "When people join, you can verify them in their profile, " +
+                        "just tap on their profile picture.",
+                ),
+            );
+        });
+
         describe("with same previous algorithm", () => {
             beforeEach(() => {
                 jest.spyOn(event, "getPrevContent").mockReturnValue({
@@ -112,16 +126,19 @@ describe("EncryptionEvent", () => {
     });
 
     describe("for an encrypted local room", () => {
+        let localRoom: LocalRoom;
+
         beforeEach(() => {
             event.event.content!.algorithm = algorithm;
-            jest.spyOn(client.getCrypto()!, "isEncryptionEnabledInRoom").mockResolvedValue(true);
-            const localRoom = new LocalRoom(roomId, client, client.getUserId()!);
+            // jest.spyOn(client.getCrypto()!, "isEncryptionEnabledInRoom").mockResolvedValue(true);
+            localRoom = new LocalRoom(roomId, client, client.getUserId()!);
+            jest.spyOn(localRoom, "isEncryptionEnabled").mockReturnValue(true);
             mocked(client.getRoom).mockReturnValue(localRoom);
             renderEncryptionEvent(client, event);
         });
 
         it("should show the expected texts", async () => {
-            expect(client.getCrypto()!.isEncryptionEnabledInRoom).toHaveBeenCalledWith(roomId);
+            expect(localRoom.isEncryptionEnabled).toHaveBeenCalled();
             await checkTexts("Encryption enabled", "Messages in this chat will be end-to-end encrypted.");
         });
     });
diff --git a/test/unit-tests/components/views/messages/HideActionButton-test.tsx b/test/unit-tests/components/views/messages/HideActionButton-test.tsx
index 650afe69e6..fbb8ab7dd0 100644
--- a/test/unit-tests/components/views/messages/HideActionButton-test.tsx
+++ b/test/unit-tests/components/views/messages/HideActionButton-test.tsx
@@ -48,6 +48,7 @@ describe("HideActionButton", () => {
     beforeEach(() => {
         cli = getMockClientWithEventEmitter({
             getRoom: jest.fn(),
+            getUserId: jest.fn(),
         });
     });
     afterEach(() => {
diff --git a/test/unit-tests/components/views/messages/MAudioBody-test.tsx b/test/unit-tests/components/views/messages/MAudioBody-test.tsx
new file mode 100644
index 0000000000..e2e2245c13
--- /dev/null
+++ b/test/unit-tests/components/views/messages/MAudioBody-test.tsx
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React from "react";
+import { EventType, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { render, screen, act } from "jest-matrix-react";
+
+import { MockedPlayback } from "../../../audio/MockedPlayback";
+import { type Playback, PlaybackState } from "../../../../../src/audio/Playback";
+import MAudioBody from "../../../../../src/components/views/messages/MAudioBody";
+import { PlaybackManager } from "../../../../../src/audio/PlaybackManager";
+import { type MediaEventHelper } from "../../../../../src/utils/MediaEventHelper";
+
+describe("<MAudioBody />", () => {
+    let event: MatrixEvent;
+    beforeEach(() => {
+        const playback = new MockedPlayback(PlaybackState.Decoding, 50, 10) as unknown as Playback;
+        jest.spyOn(PlaybackManager.instance, "createPlaybackInstance").mockReturnValue(playback);
+
+        event = new MatrixEvent({
+            room_id: "!room:server",
+            sender: "@alice.example.org",
+            type: EventType.RoomMessage,
+            content: {
+                body: "audio name ",
+                msgtype: "m.audio",
+                url: "mxc://server/audio",
+            },
+        });
+    });
+
+    it("should render", async () => {
+        const mediaEventHelper = {
+            sourceBlob: {
+                value: {
+                    arrayBuffer: () => new ArrayBuffer(8),
+                },
+            },
+        } as unknown as MediaEventHelper;
+
+        await act(() => render(<MAudioBody mxEvent={event} mediaEventHelper={mediaEventHelper} />));
+        expect(await screen.findByRole("region", { name: "Audio player" })).toBeInTheDocument();
+    });
+});
diff --git a/test/unit-tests/components/views/messages/MImageBody-test.tsx b/test/unit-tests/components/views/messages/MImageBody-test.tsx
index edda0d3add..41d89ff505 100644
--- a/test/unit-tests/components/views/messages/MImageBody-test.tsx
+++ b/test/unit-tests/components/views/messages/MImageBody-test.tsx
@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
-import { fireEvent, render, screen, waitFor, waitForElementToBeRemoved } from "jest-matrix-react";
+import { fireEvent, render, screen, waitFor, waitForElementToBeRemoved, within } from "jest-matrix-react";
 import { EventType, getHttpUriForMxc, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
 import fetchMock from "fetch-mock-jest";
 import encrypt from "matrix-encrypt-attachment";
@@ -35,10 +35,11 @@ jest.mock("matrix-encrypt-attachment", () => ({
 }));
 
 describe("<MImageBody/>", () => {
-    const userId = "@user:server";
+    const ourUserId = "@user:server";
+    const senderUserId = "@other_use:server";
     const deviceId = "DEADB33F";
     const cli = getMockClientWithEventEmitter({
-        ...mockClientMethodsUser(userId),
+        ...mockClientMethodsUser(ourUserId),
         ...mockClientMethodsServer(),
         ...mockClientMethodsDevice(deviceId),
         ...mockClientMethodsCrypto(),
@@ -62,13 +63,14 @@ describe("<MImageBody/>", () => {
     const encryptedMediaEvent = new MatrixEvent({
         event_id: "$foo:bar",
         room_id: "!room:server",
-        sender: userId,
+        sender: senderUserId,
         type: EventType.RoomMessage,
         content: {
             body: "alt for a test image",
             info: {
                 w: 40,
                 h: 50,
+                mimetype: "image/png",
             },
             file: {
                 url: "mxc://server/encrypted-image",
@@ -201,7 +203,7 @@ describe("<MImageBody/>", () => {
 
         const event = new MatrixEvent({
             room_id: "!room:server",
-            sender: userId,
+            sender: senderUserId,
             type: EventType.RoomMessage,
             content: {
                 body: "alt for a test image",
@@ -254,7 +256,7 @@ describe("<MImageBody/>", () => {
 
         const event = new MatrixEvent({
             room_id: "!room:server",
-            sender: userId,
+            sender: senderUserId,
             type: EventType.RoomMessage,
             content: {
                 body: "alt for a test image",
@@ -281,7 +283,7 @@ describe("<MImageBody/>", () => {
     it("should show banner on hover", async () => {
         const event = new MatrixEvent({
             room_id: "!room:server",
-            sender: userId,
+            sender: senderUserId,
             type: EventType.RoomMessage,
             content: {
                 body: "alt for a test image",
@@ -303,4 +305,76 @@ describe("<MImageBody/>", () => {
 
         expect(container.querySelector(".mx_MImageBody_banner")).toHaveTextContent("...alt for a test image");
     });
+
+    it("should render MFileBody for svg with no thumbnail", async () => {
+        const event = new MatrixEvent({
+            room_id: "!room:server",
+            sender: senderUserId,
+            type: EventType.RoomMessage,
+            content: {
+                info: {
+                    w: 40,
+                    h: 50,
+                    mimetype: "image/svg+xml",
+                },
+                file: {
+                    url: "mxc://server/encrypted-svg",
+                },
+            },
+        });
+
+        const { container, asFragment } = render(
+            <MImageBody {...props} mxEvent={event} mediaEventHelper={new MediaEventHelper(event)} />,
+            withClientContextRenderOptions(cli),
+        );
+
+        expect(container.querySelector(".mx_MFileBody")).toHaveTextContent("Attachment");
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should open ImageView using thumbnail for encrypted svg", async () => {
+        const url = "https://server/_matrix/media/v3/download/server/encrypted-svg";
+        fetchMock.getOnce(url, { status: 200 });
+        const thumbUrl = "https://server/_matrix/media/v3/download/server/svg-thumbnail";
+        fetchMock.getOnce(thumbUrl, { status: 200 });
+
+        const event = new MatrixEvent({
+            room_id: "!room:server",
+            sender: senderUserId,
+            type: EventType.RoomMessage,
+            origin_server_ts: 1234567890,
+            content: {
+                info: {
+                    w: 40,
+                    h: 50,
+                    mimetype: "image/svg+xml",
+                    thumbnail_file: {
+                        url: "mxc://server/svg-thumbnail",
+                    },
+                    thumbnail_info: { mimetype: "image/png" },
+                },
+                file: {
+                    url: "mxc://server/encrypted-svg",
+                },
+            },
+        });
+
+        const mediaEventHelper = new MediaEventHelper(event);
+        mediaEventHelper.thumbnailUrl["prom"] = Promise.resolve(thumbUrl);
+        mediaEventHelper.sourceUrl["prom"] = Promise.resolve(url);
+
+        const { findByRole } = render(
+            <MImageBody {...props} mxEvent={event} mediaEventHelper={mediaEventHelper} />,
+            withClientContextRenderOptions(cli),
+        );
+
+        fireEvent.click(await findByRole("link"));
+
+        const dialog = await screen.findByRole("dialog");
+        await expect(within(dialog).findByRole("img")).resolves.toHaveAttribute(
+            "src",
+            "https://server/_matrix/media/v3/download/server/svg-thumbnail",
+        );
+        expect(dialog).toMatchSnapshot();
+    });
 });
diff --git a/test/unit-tests/components/views/messages/MPollBody-test.tsx b/test/unit-tests/components/views/messages/MPollBody-test.tsx
index 52b015bfd0..360e5be4ae 100644
--- a/test/unit-tests/components/views/messages/MPollBody-test.tsx
+++ b/test/unit-tests/components/views/messages/MPollBody-test.tsx
@@ -505,11 +505,11 @@ describe("MPollBody", () => {
         expect(runFindTopAnswer([])).toEqual("");
     });
 
-    it("shows non-radio buttons if the poll is ended", async () => {
+    it("shows disabled radio buttons if the poll is ended", async () => {
         const events = [newPollEndEvent()];
         const { container } = await newMPollBody([], events);
-        expect(container.querySelector(".mx_StyledRadioButton")).not.toBeInTheDocument();
-        expect(container.querySelector('input[type="radio"]')).not.toBeInTheDocument();
+        expect(container.querySelector(".mx_StyledRadioButton")).toBeInTheDocument();
+        expect(container.querySelector('input[type="radio"][disabled]')).toBeInTheDocument();
     });
 
     it("counts votes as normal if the poll is ended", async () => {
@@ -551,8 +551,8 @@ describe("MPollBody", () => {
         const ends = [newPollEndEvent("@me:example.com", 25)];
         const renderResult = await newMPollBody(votes, ends);
 
-        expect(renderResult.container.querySelectorAll(".mx_StyledRadioButton")).toHaveLength(0);
-        expect(renderResult.container.querySelectorAll('input[type="radio"]')).toHaveLength(0);
+        expect(renderResult.container.querySelectorAll(".mx_StyledRadioButton")).toHaveLength(4);
+        expect(renderResult.container.querySelectorAll('input[type="radio"][disabled]')).toHaveLength(4);
         expect(endedVotesCount(renderResult, "pizza")).toBe("2 votes");
         expect(endedVotesCount(renderResult, "poutine")).toBe("0 votes");
         expect(endedVotesCount(renderResult, "italian")).toBe("0 votes");
@@ -646,9 +646,9 @@ describe("MPollBody", () => {
         expect(endedVoteChecked(renderResult, "wings")).toBe(true);
         expect(endedVoteChecked(renderResult, "pizza")).toBe(false);
 
-        // Double-check by looking for the endedOptionWinner class
-        expect(endedVoteDiv(renderResult, "wings").className.includes("mx_PollOption_endedOptionWinner")).toBe(true);
-        expect(endedVoteDiv(renderResult, "pizza").className.includes("mx_PollOption_endedOptionWinner")).toBe(false);
+        // Double-check by looking for the checked class
+        expect(endedVoteDiv(renderResult, "wings").className.includes("mx_PollOption_checked")).toBe(true);
+        expect(endedVoteDiv(renderResult, "pizza").className.includes("mx_PollOption_checked")).toBe(false);
     });
 
     it("highlights multiple winning votes", async () => {
@@ -731,9 +731,7 @@ describe("MPollBody", () => {
         });
         pollEvent.makeReplaced(replacingEvent);
         const { getByTestId, container } = await newMPollBodyFromEvent(pollEvent, []);
-        expect(getByTestId("pollQuestion").innerHTML).toEqual(
-            'new question<span class="mx_MPollBody_edited"> (edited)</span>',
-        );
+        expect(getByTestId("pollQuestion").textContent).toEqual("new question (edited)");
         const inputs = container.querySelectorAll('input[type="radio"]');
         expect(inputs).toHaveLength(3);
         expect(inputs[0].getAttribute("value")).toEqual("n1");
@@ -951,7 +949,7 @@ function endedVoteChecked({ getByTestId }: RenderResult, value: string): boolean
 }
 
 function endedVoteDiv({ getByTestId }: RenderResult, value: string): Element {
-    return getByTestId(`pollOption-${value}`).firstElementChild!;
+    return getByTestId(`pollOption-${value}`);
 }
 
 function endedVotesCount(renderResult: RenderResult, value: string): string {
diff --git a/test/unit-tests/components/views/messages/MPollEndBody-test.tsx b/test/unit-tests/components/views/messages/MPollEndBody-test.tsx
deleted file mode 100644
index 7015e3d1d9..0000000000
--- a/test/unit-tests/components/views/messages/MPollEndBody-test.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2023 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-import React from "react";
-import { render, waitFor } from "jest-matrix-react";
-import { type EventTimeline, type MatrixEvent, Room, M_TEXT } from "matrix-js-sdk/src/matrix";
-import { logger } from "matrix-js-sdk/src/logger";
-
-import { type IBodyProps } from "../../../../../src/components/views/messages/IBodyProps";
-import { MPollEndBody } from "../../../../../src/components/views/messages/MPollEndBody";
-import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
-import { type RoomPermalinkCreator } from "../../../../../src/utils/permalinks/Permalinks";
-import { type MediaEventHelper } from "../../../../../src/utils/MediaEventHelper";
-import {
-    flushPromises,
-    getMockClientWithEventEmitter,
-    makePollEndEvent,
-    makePollStartEvent,
-    mockClientMethodsEvents,
-    mockClientMethodsUser,
-    setupRoomWithPollEvents,
-} from "../../../../test-utils";
-
-describe("<MPollEndBody />", () => {
-    const userId = "@alice:domain.org";
-    const roomId = "!room:domain.org";
-    const mockClient = getMockClientWithEventEmitter({
-        ...mockClientMethodsUser(userId),
-        ...mockClientMethodsEvents(),
-        getRoom: jest.fn(),
-        relations: jest.fn(),
-        fetchRoomEvent: jest.fn(),
-    });
-    const pollStartEvent = makePollStartEvent("Question?", userId, undefined, { roomId });
-    const pollEndEvent = makePollEndEvent(pollStartEvent.getId()!, roomId, userId, 123);
-
-    const setupRoomWithEventsTimeline = async (pollEnd: MatrixEvent, pollStart?: MatrixEvent): Promise<Room> => {
-        if (pollStart) {
-            await setupRoomWithPollEvents([pollStart], [], [pollEnd], mockClient);
-        }
-        const room = mockClient.getRoom(roomId) || new Room(roomId, mockClient, userId);
-
-        // end events validate against this
-        jest.spyOn(room.currentState, "maySendRedactionForEvent").mockImplementation(
-            (_evt: MatrixEvent, id: string) => {
-                return id === mockClient.getSafeUserId();
-            },
-        );
-
-        const timelineSet = room.getUnfilteredTimelineSet();
-        const getTimelineForEventSpy = jest.spyOn(timelineSet, "getTimelineForEvent");
-        // if we have a pollStart, mock the room timeline to include it
-        if (pollStart) {
-            const eventTimeline = {
-                getEvents: jest.fn().mockReturnValue([pollEnd, pollStart]),
-            } as unknown as EventTimeline;
-            getTimelineForEventSpy.mockReturnValue(eventTimeline);
-        }
-        mockClient.getRoom.mockReturnValue(room);
-
-        return room;
-    };
-
-    const defaultProps = {
-        mxEvent: pollEndEvent,
-        highlightLink: "unused",
-        mediaEventHelper: {} as unknown as MediaEventHelper,
-        onMessageAllowed: () => {},
-        permalinkCreator: {} as unknown as RoomPermalinkCreator,
-        ref: undefined as any,
-    };
-
-    const getComponent = (props: Partial<IBodyProps> = {}) =>
-        render(<MPollEndBody {...defaultProps} {...props} />, {
-            wrapper: ({ children }) => (
-                <MatrixClientContext.Provider value={mockClient}>{children}</MatrixClientContext.Provider>
-            ),
-        });
-
-    beforeEach(() => {
-        mockClient.getRoom.mockReset();
-        mockClient.relations.mockResolvedValue({
-            events: [],
-        });
-        mockClient.fetchRoomEvent.mockResolvedValue(pollStartEvent.getEffectiveEvent());
-    });
-
-    afterEach(() => {
-        jest.spyOn(logger, "error").mockRestore();
-    });
-
-    describe("when poll start event exists in current timeline", () => {
-        it("renders an ended poll", async () => {
-            await setupRoomWithEventsTimeline(pollEndEvent, pollStartEvent);
-            const { container } = getComponent();
-
-            // ended poll rendered
-            expect(container).toMatchSnapshot();
-
-            // didnt try to fetch start event while it was already in timeline
-            expect(mockClient.fetchRoomEvent).not.toHaveBeenCalled();
-        });
-
-        it("does not render a poll tile when end event is invalid", async () => {
-            // sender of end event does not match start event
-            const invalidEndEvent = makePollEndEvent(pollStartEvent.getId()!, roomId, "@mallory:domain.org", 123);
-            await setupRoomWithEventsTimeline(invalidEndEvent, pollStartEvent);
-            const { getByText } = getComponent({ mxEvent: invalidEndEvent });
-
-            // no poll tile rendered
-            expect(getByText("The poll has ended. Something.")).toBeTruthy();
-        });
-    });
-
-    describe("when poll start event does not exist in current timeline", () => {
-        it("fetches the related poll start event and displays a poll tile", async () => {
-            await setupRoomWithEventsTimeline(pollEndEvent);
-            const { container, getByTestId, getByRole, queryByRole } = getComponent();
-
-            // while fetching event, only icon is shown
-            expect(container).toMatchSnapshot();
-
-            await waitFor(() => expect(getByRole("progressbar")).toBeInTheDocument());
-            await waitFor(() => expect(queryByRole("progressbar")).not.toBeInTheDocument());
-
-            expect(mockClient.fetchRoomEvent).toHaveBeenCalledWith(roomId, pollStartEvent.getId());
-
-            // quick check for poll tile
-            expect(getByTestId("pollQuestion").innerHTML).toEqual("Question?");
-            expect(getByTestId("totalVotes").innerHTML).toEqual("Final result based on 0 votes");
-        });
-
-        it("does not render a poll tile when end event is invalid", async () => {
-            // sender of end event does not match start event
-            const invalidEndEvent = makePollEndEvent(pollStartEvent.getId()!, roomId, "@mallory:domain.org", 123);
-            await setupRoomWithEventsTimeline(invalidEndEvent);
-            const { getByText } = getComponent({ mxEvent: invalidEndEvent });
-
-            // flush the fetch event promise
-            await flushPromises();
-
-            // no poll tile rendered
-            expect(getByText("The poll has ended. Something.")).toBeTruthy();
-        });
-
-        it("logs an error and displays the text fallback when fetching the start event fails", async () => {
-            await setupRoomWithEventsTimeline(pollEndEvent);
-            mockClient.fetchRoomEvent.mockRejectedValue({ code: 404 });
-            const logSpy = jest.spyOn(logger, "error").mockImplementation(() => {});
-            const { getByText } = getComponent();
-
-            // flush the fetch event promise
-            await flushPromises();
-
-            // poll end event fallback text used
-            expect(getByText("The poll has ended. Something.")).toBeTruthy();
-            expect(logSpy).toHaveBeenCalledWith("Failed to fetch related poll start event", { code: 404 });
-        });
-
-        it("logs an error and displays the extensible event text when fetching the start event fails", async () => {
-            await setupRoomWithEventsTimeline(pollEndEvent);
-            mockClient.fetchRoomEvent.mockRejectedValue({ code: 404 });
-            const logSpy = jest.spyOn(logger, "error").mockImplementation(() => {});
-            const { getByText } = getComponent();
-
-            // flush the fetch event promise
-            await flushPromises();
-
-            // poll end event fallback text used
-            expect(getByText("The poll has ended. Something.")).toBeTruthy();
-            expect(logSpy).toHaveBeenCalledWith("Failed to fetch related poll start event", { code: 404 });
-        });
-
-        it("displays fallback text when the poll end event does not have text", async () => {
-            const endWithoutText = makePollEndEvent(pollStartEvent.getId()!, roomId, userId, 123);
-            delete endWithoutText.getContent()[M_TEXT.name];
-            await setupRoomWithEventsTimeline(endWithoutText);
-            mockClient.fetchRoomEvent.mockRejectedValue({ code: 404 });
-            const { getByText } = getComponent({ mxEvent: endWithoutText });
-
-            // flush the fetch event promise
-            await flushPromises();
-
-            // default fallback text used
-            expect(getByText("@alice:domain.org has ended a poll")).toBeTruthy();
-        });
-    });
-});
diff --git a/test/unit-tests/components/views/messages/MVideoBody-test.tsx b/test/unit-tests/components/views/messages/MVideoBody-test.tsx
index 1d058a7b0c..a4fe79df96 100644
--- a/test/unit-tests/components/views/messages/MVideoBody-test.tsx
+++ b/test/unit-tests/components/views/messages/MVideoBody-test.tsx
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import { EventType, getHttpUriForMxc, type IContent, type MatrixClient, MatrixEvent } from "matrix-js-sdk/src/matrix";
-import { fireEvent, render, screen, type RenderResult } from "jest-matrix-react";
+import { fireEvent, render, screen } from "jest-matrix-react";
 import fetchMock from "fetch-mock-jest";
 import { type MockedObject } from "jest-mock";
 
@@ -34,7 +34,8 @@ jest.mock("matrix-encrypt-attachment", () => ({
 }));
 
 describe("MVideoBody", () => {
-    const userId = "@user:server";
+    const ourUserId = "@user:server";
+    const senderUserId = "@other_use:server";
     const deviceId = "DEADB33F";
 
     const thumbUrl = "https://server/_matrix/media/v3/download/server/encrypted-poster";
@@ -42,7 +43,7 @@ describe("MVideoBody", () => {
 
     beforeEach(() => {
         cli = getMockClientWithEventEmitter({
-            ...mockClientMethodsUser(userId),
+            ...mockClientMethodsUser(ourUserId),
             ...mockClientMethodsServer(),
             ...mockClientMethodsDevice(deviceId),
             ...mockClientMethodsCrypto(),
@@ -67,7 +68,7 @@ describe("MVideoBody", () => {
 
     const encryptedMediaEvent = new MatrixEvent({
         room_id: "!room:server",
-        sender: userId,
+        sender: senderUserId,
         type: EventType.RoomMessage,
         event_id: "$foo:bar",
         content: {
@@ -86,10 +87,47 @@ describe("MVideoBody", () => {
         },
     });
 
-    it("does not crash when given a portrait image", () => {
+    it("does not crash when given portrait dimensions", () => {
         // Check for an unreliable crash caused by a fractional-sized
         // image dimension being used for a CanvasImageData.
-        const { asFragment } = makeMVideoBody(720, 1280);
+        const content: IContent = {
+            info: {
+                "w": 720,
+                "h": 1280,
+                "mimetype": "video/mp4",
+                "size": 2495675,
+                "thumbnail_file": {
+                    url: "",
+                    key: { alg: "", key_ops: [], kty: "", k: "", ext: true },
+                    iv: "",
+                    hashes: {},
+                    v: "",
+                },
+                "thumbnail_info": { mimetype: "" },
+                "xyz.amorgan.blurhash": "TrGl6bofof~paxWC?bj[oL%2fPj]",
+            },
+            url: "http://example.com",
+        };
+
+        const event = new MatrixEvent({
+            content,
+        });
+
+        const defaultProps: IBodyProps = {
+            mxEvent: event,
+            highlights: [],
+            highlightLink: "",
+            onMessageAllowed: jest.fn(),
+            permalinkCreator: {} as RoomPermalinkCreator,
+            mediaEventHelper: { media: { isEncrypted: false } } as MediaEventHelper,
+        };
+
+        const { asFragment } = render(
+            <MatrixClientContext.Provider value={cli}>
+                <MVideoBody {...defaultProps} />
+            </MatrixClientContext.Provider>,
+            withClientContextRenderOptions(cli),
+        );
         expect(asFragment()).toMatchSnapshot();
         // If we get here, we did not crash.
     });
@@ -153,50 +191,39 @@ describe("MVideoBody", () => {
 
             expect(fetchMock).toHaveFetched(thumbUrl);
         });
+
+        it("should download video if we were the sender", async () => {
+            fetchMock.getOnce(thumbUrl, { status: 200 });
+            const ourEncryptedMediaEvent = new MatrixEvent({
+                room_id: "!room:server",
+                sender: ourUserId,
+                type: EventType.RoomMessage,
+                event_id: "$foo:bar",
+                content: {
+                    body: "alt for a test video",
+                    info: {
+                        duration: 420,
+                        w: 40,
+                        h: 50,
+                        thumbnail_file: {
+                            url: "mxc://server/encrypted-poster",
+                        },
+                    },
+                    file: {
+                        url: "mxc://server/encrypted-image",
+                    },
+                },
+            });
+            const { asFragment } = render(
+                <MVideoBody
+                    mxEvent={ourEncryptedMediaEvent}
+                    mediaEventHelper={new MediaEventHelper(ourEncryptedMediaEvent)}
+                />,
+                withClientContextRenderOptions(cli),
+            );
+
+            expect(fetchMock).toHaveFetched(thumbUrl);
+            expect(asFragment()).toMatchSnapshot();
+        });
     });
 });
-
-function makeMVideoBody(w: number, h: number): RenderResult {
-    const content: IContent = {
-        info: {
-            "w": w,
-            "h": h,
-            "mimetype": "video/mp4",
-            "size": 2495675,
-            "thumbnail_file": {
-                url: "",
-                key: { alg: "", key_ops: [], kty: "", k: "", ext: true },
-                iv: "",
-                hashes: {},
-                v: "",
-            },
-            "thumbnail_info": { mimetype: "" },
-            "xyz.amorgan.blurhash": "TrGl6bofof~paxWC?bj[oL%2fPj]",
-        },
-        url: "http://example.com",
-    };
-
-    const event = new MatrixEvent({
-        content,
-    });
-
-    const defaultProps: IBodyProps = {
-        mxEvent: event,
-        highlights: [],
-        highlightLink: "",
-        onMessageAllowed: jest.fn(),
-        permalinkCreator: {} as RoomPermalinkCreator,
-        mediaEventHelper: { media: { isEncrypted: false } } as MediaEventHelper,
-    };
-
-    const mockClient = getMockClientWithEventEmitter({
-        mxcUrlToHttp: jest.fn(),
-        getRoom: jest.fn(),
-    });
-
-    return render(
-        <MatrixClientContext.Provider value={mockClient}>
-            <MVideoBody {...defaultProps} />
-        </MatrixClientContext.Provider>,
-    );
-}
diff --git a/test/unit-tests/components/views/messages/MVoiceMessageBody-test.tsx b/test/unit-tests/components/views/messages/MVoiceMessageBody-test.tsx
new file mode 100644
index 0000000000..d31c6f7390
--- /dev/null
+++ b/test/unit-tests/components/views/messages/MVoiceMessageBody-test.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { EventType, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
+import { act, render, screen } from "jest-matrix-react";
+import React from "react";
+
+import { MockedPlayback } from "../../../audio/MockedPlayback";
+import { type Playback, PlaybackState } from "../../../../../src/audio/Playback";
+import { PlaybackManager } from "../../../../../src/audio/PlaybackManager";
+import type { MediaEventHelper } from "../../../../../src/utils/MediaEventHelper";
+import MVoiceMessageBody from "../../../../../src/components/views/messages/MVoiceMessageBody";
+import { PlaybackQueue } from "../../../../../src/audio/PlaybackQueue";
+import { createTestClient } from "../../../../test-utils";
+import { SdkContextClass } from "../../../../../src/contexts/SDKContext";
+
+describe("<MVvoiceMessageBody />", () => {
+    let event: MatrixEvent;
+    beforeEach(() => {
+        const playback = new MockedPlayback(PlaybackState.Decoding, 50, 10) as unknown as Playback;
+        jest.spyOn(PlaybackManager.instance, "createPlaybackInstance").mockReturnValue(playback);
+
+        const matrixClient = createTestClient();
+        const room = new Room("!TESTROOM", matrixClient, "@alice:example.org");
+        const playbackQueue = new PlaybackQueue(room, SdkContextClass.instance.roomViewStore);
+
+        jest.spyOn(PlaybackQueue, "forRoom").mockReturnValue(playbackQueue);
+        jest.spyOn(playbackQueue, "unsortedEnqueue").mockReturnValue(undefined);
+
+        event = new MatrixEvent({
+            room_id: "!room:server",
+            sender: "@alice.example.org",
+            type: EventType.RoomMessage,
+            content: {
+                "body": "audio name ",
+                "msgtype": "m.audio",
+                "url": "mxc://server/audio",
+                "org.matrix.msc3946.voice": true,
+            },
+        });
+    });
+
+    it("should render", async () => {
+        const mediaEventHelper = {
+            sourceBlob: {
+                value: {
+                    arrayBuffer: () => new ArrayBuffer(8),
+                },
+            },
+        } as unknown as MediaEventHelper;
+
+        await act(() => render(<MVoiceMessageBody mxEvent={event} mediaEventHelper={mediaEventHelper} />));
+        expect(await screen.findByTestId("recording-playback")).toBeInTheDocument();
+    });
+});
diff --git a/test/unit-tests/components/views/messages/MessageActionBar-test.tsx b/test/unit-tests/components/views/messages/MessageActionBar-test.tsx
index 1059263533..cab8dd4c11 100644
--- a/test/unit-tests/components/views/messages/MessageActionBar-test.tsx
+++ b/test/unit-tests/components/views/messages/MessageActionBar-test.tsx
@@ -29,8 +29,7 @@ import {
     makeBeaconInfoEvent,
 } from "../../../../test-utils";
 import { RoomPermalinkCreator } from "../../../../../src/utils/permalinks/Permalinks";
-import RoomContext, { TimelineRenderingType } from "../../../../../src/contexts/RoomContext";
-import { type IRoomState } from "../../../../../src/components/structures/RoomView";
+import RoomContext, { type RoomContextType, TimelineRenderingType } from "../../../../../src/contexts/RoomContext";
 import dispatcher from "../../../../../src/dispatcher/dispatcher";
 import SettingsStore from "../../../../../src/settings/SettingsStore";
 import { Action } from "../../../../../src/dispatcher/actions";
@@ -115,8 +114,8 @@ describe("<MessageActionBar />", () => {
         canSendMessages: true,
         canReact: true,
         room,
-    } as unknown as IRoomState;
-    const getComponent = (props = {}, roomContext: Partial<IRoomState> = {}) =>
+    } as unknown as RoomContextType;
+    const getComponent = (props = {}, roomContext: Partial<RoomContextType> = {}) =>
         render(
             <ScopedRoomContextProvider {...defaultRoomContext} {...roomContext}>
                 <MessageActionBar {...defaultProps} {...props} />
@@ -125,7 +124,8 @@ describe("<MessageActionBar />", () => {
 
     beforeEach(() => {
         jest.clearAllMocks();
-        alicesMessageEvent.setStatus(EventStatus.SENT);
+        // The base case is that we have received the remote echo and have an eventId. No sending status.
+        alicesMessageEvent.setStatus(null);
         jest.spyOn(SettingsStore, "getValue").mockReturnValue(false);
         jest.spyOn(SettingsStore, "setValue").mockResolvedValue(undefined);
     });
@@ -376,6 +376,25 @@ describe("<MessageActionBar />", () => {
             expect(queryByLabelText("Delete")).toBeTruthy();
         });
 
+        it("only shows retry and delete buttons when event could not be sent", () => {
+            // Enable pin and other features
+            jest.spyOn(SettingsStore, "getValue").mockReturnValue(true);
+
+            alicesMessageEvent.setStatus(EventStatus.NOT_SENT);
+            const { queryByLabelText } = getComponent({ mxEvent: alicesMessageEvent });
+
+            // Should show retry and cancel buttons
+            expect(queryByLabelText("Retry")).toBeTruthy();
+            expect(queryByLabelText("Delete")).toBeTruthy();
+
+            // Should NOT show edit, pin, react, reply buttons
+            expect(queryByLabelText("Edit")).toBeFalsy();
+            expect(queryByLabelText("Pin")).toBeFalsy();
+            expect(queryByLabelText("React")).toBeFalsy();
+            expect(queryByLabelText("Reply")).toBeFalsy();
+            expect(queryByLabelText("Reply in thread")).toBeFalsy();
+        });
+
         it.todo("unsends event on cancel click");
         it.todo("retrys event on retry click");
     });
diff --git a/test/unit-tests/components/views/messages/MessageTimestamp-test.tsx b/test/unit-tests/components/views/messages/MessageTimestamp-test.tsx
index 8840cad1db..ceaad8ea01 100644
--- a/test/unit-tests/components/views/messages/MessageTimestamp-test.tsx
+++ b/test/unit-tests/components/views/messages/MessageTimestamp-test.tsx
@@ -29,6 +29,7 @@ describe("MessageTimestamp", () => {
     aria-hidden="true"
     aria-live="off"
     class="mx_MessageTimestamp"
+    tabindex="0"
   >
     08:09
   </span>
diff --git a/test/unit-tests/components/views/messages/TextualBody-test.tsx b/test/unit-tests/components/views/messages/TextualBody-test.tsx
index cb3d755f8b..3c9daa5d44 100644
--- a/test/unit-tests/components/views/messages/TextualBody-test.tsx
+++ b/test/unit-tests/components/views/messages/TextualBody-test.tsx
@@ -188,7 +188,7 @@ describe("<TextualBody />", () => {
             const { container } = getComponent({ mxEvent: ev });
             const content = container.querySelector(".mx_EventTile_body");
             expect(content.innerHTML).toMatchInlineSnapshot(
-                `"Chat with <a href="https://matrix.to/#/@user:example.com" rel="noreferrer noopener" class="linkified">@user:example.com</a>"`,
+                `"Chat with <a href="https://matrix.to/#/@user:example.com" class="linkified" rel="noreferrer noopener">@user:example.com</a>"`,
             );
         });
 
@@ -197,7 +197,7 @@ describe("<TextualBody />", () => {
             const { container } = getComponent({ mxEvent: ev });
             const content = container.querySelector(".mx_EventTile_body");
             expect(content.innerHTML).toMatchInlineSnapshot(
-                `"Chat with <bdi><a class="mx_Pill mx_UserPill mx_UserPill_me" href="https://matrix.to/#/@user:example.com"><span aria-label="Profile picture" aria-hidden="true" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_1qbcf_8 mx_BaseAvatar" style="--cpd-avatar-size: 16px;"><img loading="lazy" alt="" referrerpolicy="no-referrer" class="_image_1qbcf_41" data-type="round" width="16px" height="16px" src="mxc://avatar.url/image.png"></span><span class="mx_Pill_text">Member</span></a></bdi>"`,
+                `"Chat with <bdi><a class="mx_Pill mx_UserPill mx_UserPill_me" href="https://matrix.to/#/@user:example.com"><span aria-label="Profile picture" aria-hidden="true" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_zysgz_8 mx_BaseAvatar" style="--cpd-avatar-size: 16px;"><img loading="lazy" alt="" referrerpolicy="no-referrer" class="_image_zysgz_43" data-type="round" width="16px" height="16px" src="mxc://avatar.url/image.png"></span><span class="mx_Pill_text">Member</span></a></bdi>"`,
             );
         });
 
@@ -206,7 +206,7 @@ describe("<TextualBody />", () => {
             const { container } = getComponent({ mxEvent: ev });
             const content = container.querySelector(".mx_EventTile_body");
             expect(content.innerHTML).toMatchInlineSnapshot(
-                `"Visit <a href="https://matrix.to/#/#room:example.com" rel="noreferrer noopener" class="linkified">#room:example.com</a>"`,
+                `"Visit <a href="https://matrix.to/#/#room:example.com" class="linkified" rel="noreferrer noopener">#room:example.com</a>"`,
             );
         });
 
diff --git a/test/unit-tests/components/views/messages/__snapshots__/DateSeparator-test.tsx.snap b/test/unit-tests/components/views/messages/__snapshots__/DateSeparator-test.tsx.snap
index 69de39e31d..3b5f687c70 100644
--- a/test/unit-tests/components/views/messages/__snapshots__/DateSeparator-test.tsx.snap
+++ b/test/unit-tests/components/views/messages/__snapshots__/DateSeparator-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`DateSeparator renders invalid date separator correctly 1`] = `
 <DocumentFragment>
@@ -79,9 +79,18 @@ exports[`DateSeparator when feature_jump_to_date is enabled renders the date sep
       >
         Fri, Dec 17, 2021
       </h2>
-      <div
+      <svg
         class="mx_DateSeparator_chevron"
-      />
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+        />
+      </svg>
     </div>
     <hr
       role="none"
diff --git a/test/unit-tests/components/views/messages/__snapshots__/DecryptionFailureBody-test.tsx.snap b/test/unit-tests/components/views/messages/__snapshots__/DecryptionFailureBody-test.tsx.snap
index 8c67d88bb4..823b1f5e6c 100644
--- a/test/unit-tests/components/views/messages/__snapshots__/DecryptionFailureBody-test.tsx.snap
+++ b/test/unit-tests/components/views/messages/__snapshots__/DecryptionFailureBody-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`DecryptionFailureBody Should display "The sender has blocked you from receiving this message" 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/messages/__snapshots__/JumpToDatePicker-test.tsx.snap b/test/unit-tests/components/views/messages/__snapshots__/JumpToDatePicker-test.tsx.snap
index 02d5d3a337..3e79a98240 100644
--- a/test/unit-tests/components/views/messages/__snapshots__/JumpToDatePicker-test.tsx.snap
+++ b/test/unit-tests/components/views/messages/__snapshots__/JumpToDatePicker-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`JumpToDatePicker renders the date picker correctly 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/messages/__snapshots__/MBeaconBody-test.tsx.snap b/test/unit-tests/components/views/messages/__snapshots__/MBeaconBody-test.tsx.snap
index 14007bd61a..e927ccd032 100644
--- a/test/unit-tests/components/views/messages/__snapshots__/MBeaconBody-test.tsx.snap
+++ b/test/unit-tests/components/views/messages/__snapshots__/MBeaconBody-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<MBeaconBody /> when map display is not configured renders maps unavailable error for a live beacon with location 1`] = `
 <div
diff --git a/test/unit-tests/components/views/messages/__snapshots__/MFileBody-test.tsx.snap b/test/unit-tests/components/views/messages/__snapshots__/MFileBody-test.tsx.snap
index a7356697e5..2e4b78b3bc 100644
--- a/test/unit-tests/components/views/messages/__snapshots__/MFileBody-test.tsx.snap
+++ b/test/unit-tests/components/views/messages/__snapshots__/MFileBody-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<MFileBody/> should show a download button in file rendering type 1`] = `
 <div>
@@ -9,11 +9,9 @@ exports[`<MFileBody/> should show a download button in file rendering type 1`] =
       class="mx_MFileBody_download"
     >
       <a
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="secondary"
         data-size="sm"
-        download="alt for a image"
-        href="https://server/_matrix/media/v3/download/server/image"
         rel="noreferrer noopener"
         role="link"
         tabindex="0"
diff --git a/test/unit-tests/components/views/messages/__snapshots__/MImageBody-test.tsx.snap b/test/unit-tests/components/views/messages/__snapshots__/MImageBody-test.tsx.snap
index 8b9950c681..7f54e73f9b 100644
--- a/test/unit-tests/components/views/messages/__snapshots__/MImageBody-test.tsx.snap
+++ b/test/unit-tests/components/views/messages/__snapshots__/MImageBody-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<MImageBody/> should generate a thumbnail if one isn't included for animated media 1`] = `
 <div>
@@ -10,7 +10,7 @@ exports[`<MImageBody/> should generate a thumbnail if one isn't included for ani
     >
       <div
         class="mx_MImageBody_thumbnail_container"
-        style="max-height: 50px; max-width: 40px;"
+        style="max-height: 50px; max-width: 40px; aspect-ratio: 40/50;"
       >
         <div
           class="mx_MImageBody_placeholder"
@@ -18,13 +18,24 @@ exports[`<MImageBody/> should generate a thumbnail if one isn't included for ani
           <div
             class="mx_Spinner"
           >
-            <div
+            <svg
               aria-label="Loading…"
-              class="mx_Spinner_icon"
+              class="_icon_11k6c_18"
               data-testid="spinner"
+              fill="currentColor"
+              height="1em"
               role="progressbar"
               style="width: 32px; height: 32px;"
-            />
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+                fill-rule="evenodd"
+              />
+            </svg>
           </div>
         </div>
         <div
@@ -47,6 +58,147 @@ exports[`<MImageBody/> should generate a thumbnail if one isn't included for ani
 </div>
 `;
 
+exports[`<MImageBody/> should open ImageView using thumbnail for encrypted svg 1`] = `
+<div
+  aria-label="Image view"
+  class="mx_ImageView"
+  data-focus-lock-disabled="false"
+  role="dialog"
+>
+  <div
+    class="mx_ImageView_panel"
+  >
+    <div
+      class="mx_ImageView_info_wrapper"
+    >
+      <button
+        aria-label="Profile picture"
+        aria-live="off"
+        class="_avatar_zysgz_8 mx_BaseAvatar mx_Dialog_nonDialogButton _avatar-imageless_zysgz_55"
+        data-color="2"
+        data-testid="avatar-img"
+        data-type="round"
+        role="button"
+        style="--cpd-avatar-size: 32px;"
+      >
+        o
+      </button>
+      <div
+        class="mx_ImageView_info"
+      >
+        <div
+          class="mx_ImageView_info_sender"
+        >
+          @other_use:server
+        </div>
+        <a
+          aria-live="off"
+          class="mx_MessageTimestamp"
+          href="https://matrix.to/#/!room:server/undefined"
+        >
+          Thu, Jan 15, 1970, 06:56
+        </a>
+      </div>
+    </div>
+    <div
+      class="mx_ImageView_title"
+    >
+      Image
+    </div>
+    <div
+      class="mx_ImageView_toolbar"
+    >
+      <div
+        aria-label="Zoom out"
+        class="mx_AccessibleButton mx_ImageView_button mx_ImageView_button_zoomOut"
+        role="button"
+        tabindex="0"
+      />
+      <div
+        aria-label="Zoom in"
+        class="mx_AccessibleButton mx_ImageView_button mx_ImageView_button_zoomIn"
+        role="button"
+        tabindex="0"
+      />
+      <div
+        aria-label="Rotate Left"
+        class="mx_AccessibleButton mx_ImageView_button mx_ImageView_button_rotateCCW"
+        role="button"
+        tabindex="0"
+      />
+      <div
+        aria-label="Rotate Right"
+        class="mx_AccessibleButton mx_ImageView_button mx_ImageView_button_rotateCW"
+        role="button"
+        tabindex="0"
+      />
+      <div
+        aria-label="Download"
+        class="mx_AccessibleButton mx_ImageView_button mx_ImageView_button_download"
+        role="button"
+        tabindex="0"
+      />
+      <div
+        aria-expanded="false"
+        aria-haspopup="true"
+        aria-label="Options"
+        class="mx_AccessibleButton mx_ImageView_button mx_ImageView_button_more"
+        role="button"
+        tabindex="0"
+      />
+      <div
+        aria-label="Close"
+        class="mx_AccessibleButton mx_ImageView_button mx_ImageView_button_close"
+        role="button"
+        tabindex="0"
+      />
+    </div>
+  </div>
+  <div
+    class="mx_ImageView_image_wrapper"
+  >
+    <img
+      alt="Attachment"
+      class="mx_ImageView_image "
+      draggable="true"
+      src="https://server/_matrix/media/v3/download/server/svg-thumbnail"
+      style="transform: translateX(-512px)
+                        translateY(NaNpx)
+                        scale(0)
+                        rotate(0deg); cursor: zoom-out;"
+    />
+  </div>
+</div>
+`;
+
+exports[`<MImageBody/> should render MFileBody for svg with no thumbnail 1`] = `
+<DocumentFragment>
+  <span
+    class="mx_MFileBody"
+  >
+    <div
+      class="mx_AccessibleButton mx_MediaBody mx_MFileBody_info"
+      role="button"
+      tabindex="0"
+    >
+      <span
+        class="mx_MFileBody_info_icon"
+      />
+      <span
+        aria-labelledby="_r_0_"
+        tabindex="0"
+      >
+        <span
+          class="mx_MFileBody_info_filename"
+        >
+          Attachment
+        </span>
+      </span>
+    </div>
+  </span>
+</DocumentFragment>
+`;
+
 exports[`<MImageBody/> should show a thumbnail while image is being downloaded 1`] = `
 <div>
   <div
@@ -54,7 +206,7 @@ exports[`<MImageBody/> should show a thumbnail while image is being downloaded 1
   >
     <div
       class="mx_MImageBody_thumbnail_container"
-      style="max-height: 50px; max-width: 40px;"
+      style="max-height: 50px; max-width: 40px; aspect-ratio: 40/50;"
     >
       <div
         class="mx_MImageBody_placeholder"
@@ -62,13 +214,24 @@ exports[`<MImageBody/> should show a thumbnail while image is being downloaded 1
         <div
           class="mx_Spinner"
         >
-          <div
+          <svg
             aria-label="Loading…"
-            class="mx_Spinner_icon"
+            class="_icon_11k6c_18"
             data-testid="spinner"
+            fill="currentColor"
+            height="1em"
             role="progressbar"
             style="width: 32px; height: 32px;"
-          />
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              clip-rule="evenodd"
+              d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+              fill-rule="evenodd"
+            />
+          </svg>
         </div>
       </div>
       <div
diff --git a/test/unit-tests/components/views/messages/__snapshots__/MLocationBody-test.tsx.snap b/test/unit-tests/components/views/messages/__snapshots__/MLocationBody-test.tsx.snap
index 6470175c3c..abcee23a75 100644
--- a/test/unit-tests/components/views/messages/__snapshots__/MLocationBody-test.tsx.snap
+++ b/test/unit-tests/components/views/messages/__snapshots__/MLocationBody-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`MLocationBody <MLocationBody> with error displays correct fallback content when map_style_url is misconfigured 1`] = `
 <div
@@ -34,7 +34,7 @@ exports[`MLocationBody <MLocationBody> without error renders map correctly 1`] =
     class="mx_MLocationBody"
   >
     <div
-      aria-labelledby="«ri»"
+      aria-labelledby="_r_i_"
       class="mx_MLocationBody_map"
     >
       <div
@@ -76,7 +76,7 @@ exports[`MLocationBody <MLocationBody> without error renders marker correctly fo
     class="mx_MLocationBody"
   >
     <div
-      aria-labelledby="«ru»"
+      aria-labelledby="_r_u_"
       class="mx_MLocationBody_map"
     >
       <div
@@ -92,7 +92,7 @@ exports[`MLocationBody <MLocationBody> without error renders marker correctly fo
               class="mx_Marker_border"
             >
               <span
-                class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+                class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
                 data-color="3"
                 data-testid="avatar-img"
                 data-type="round"
diff --git a/test/unit-tests/components/views/messages/__snapshots__/MPollBody-test.tsx.snap b/test/unit-tests/components/views/messages/__snapshots__/MPollBody-test.tsx.snap
index b24f80146d..1b57a0aa0f 100644
--- a/test/unit-tests/components/views/messages/__snapshots__/MPollBody-test.tsx.snap
+++ b/test/unit-tests/components/views/messages/__snapshots__/MPollBody-test.tsx.snap
@@ -1,15 +1,30 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`MPollBody renders a finished poll 1`] = `
 <div>
-  <div
+  <fieldset
     class="mx_MPollBody"
   >
-    <h2
+    <legend
       data-testid="pollQuestion"
     >
+      <svg
+        aria-label="Poll ended"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M21 10.659V19q0 .824-.587 1.413A1.93 1.93 0 0 1 19 21H5q-.824 0-1.412-.587A1.93 1.93 0 0 1 3 19V5q0-.824.587-1.412A1.93 1.93 0 0 1 5 3h8.341A6 6 0 0 0 13 5H5v14h14v-8a6 6 0 0 0 2-.341"
+        />
+        <path
+          d="M13.803 8a6 6 0 0 0 1.88 2H13a.97.97 0 0 1-.713-.287A.97.97 0 0 1 12 9q0-.424.287-.713A.97.97 0 0 1 13 8zm2.91 7.713A.97.97 0 0 1 16 16h-3a.97.97 0 0 1-.713-.287A.97.97 0 0 1 12 15q0-.424.287-.713A.97.97 0 0 1 13 14h3q.424 0 .712.287.288.288.288.713 0 .424-.288.713m-6.299-5.3A1.93 1.93 0 0 1 9 11q-.825 0-1.412-.588A1.93 1.93 0 0 1 7 9q0-.825.588-1.412A1.93 1.93 0 0 1 9 7q.825 0 1.412.588Q11 8.175 11 9t-.588 1.412m.001 6.001A1.93 1.93 0 0 1 9 17q-.825 0-1.412-.587A1.93 1.93 0 0 1 7 15q0-.825.588-1.412A1.93 1.93 0 0 1 9 13q.825 0 1.412.588Q11 14.175 11 15q0 .824-.588 1.413m12.295-14.12a1 1 0 0 1 0 1.414l-4 4a1 1 0 0 1-1.414 0l-2-2a1 1 0 0 1 1.414-1.414L18 5.586l3.293-3.293a1 1 0 0 1 1.414 0"
+        />
+      </svg>
       What should we order for the party?
-    </h2>
+    </legend>
     <div
       class="mx_MPollBody_allOptions"
     >
@@ -17,25 +32,45 @@ exports[`MPollBody renders a finished poll 1`] = `
         class="mx_PollOption mx_PollOption_ended"
         data-testid="pollOption-pizza"
       >
-        <div
-          class="mx_PollOption_endedOption"
-          data-value="pizza"
+        <label
+          class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_disabled"
         >
+          <input
+            aria-label="Option 1, Pizza, 0 votes"
+            disabled=""
+            name="poll_answer_select-$mypoll"
+            type="radio"
+            value="pizza"
+          />
+          <div>
+            <div />
+          </div>
           <div
-            class="mx_PollOption_content"
+            class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_optionText"
+              aria-hidden="true"
             >
-              Pizza
-            </div>
-            <div
-              class="mx_PollOption_optionVoteCount"
-            >
-              0 votes
+              <div
+                class="mx_PollOption_content"
+              >
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Pizza
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  0 votes
+                </div>
+              </div>
             </div>
           </div>
-        </div>
+          <div
+            class="mx_StyledRadioButton_spacer"
+          />
+        </label>
         <div
           class="mx_PollOption_popularityBackground"
         >
@@ -49,25 +84,45 @@ exports[`MPollBody renders a finished poll 1`] = `
         class="mx_PollOption mx_PollOption_ended"
         data-testid="pollOption-poutine"
       >
-        <div
-          class="mx_PollOption_endedOption"
-          data-value="poutine"
+        <label
+          class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_disabled"
         >
+          <input
+            aria-label="Option 2, Poutine, 0 votes"
+            disabled=""
+            name="poll_answer_select-$mypoll"
+            type="radio"
+            value="poutine"
+          />
+          <div>
+            <div />
+          </div>
           <div
-            class="mx_PollOption_content"
+            class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_optionText"
+              aria-hidden="true"
             >
-              Poutine
-            </div>
-            <div
-              class="mx_PollOption_optionVoteCount"
-            >
-              0 votes
+              <div
+                class="mx_PollOption_content"
+              >
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Poutine
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  0 votes
+                </div>
+              </div>
             </div>
           </div>
-        </div>
+          <div
+            class="mx_StyledRadioButton_spacer"
+          />
+        </label>
         <div
           class="mx_PollOption_popularityBackground"
         >
@@ -81,28 +136,48 @@ exports[`MPollBody renders a finished poll 1`] = `
         class="mx_PollOption mx_PollOption_checked mx_PollOption_ended"
         data-testid="pollOption-italian"
       >
-        <div
-          class="mx_PollOption_endedOption mx_PollOption_endedOptionWinner"
-          data-value="italian"
+        <label
+          class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_disabled mx_StyledRadioButton_checked"
         >
+          <input
+            aria-label="Option 3, Italian, winning option, 2 votes"
+            disabled=""
+            name="poll_answer_select-$mypoll"
+            type="radio"
+            value="italian"
+          />
+          <div>
+            <div />
+          </div>
           <div
-            class="mx_PollOption_content"
+            class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_optionText"
-            >
-              Italian
-            </div>
-            <div
-              class="mx_PollOption_optionVoteCount"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_winnerIcon"
-              />
-              2 votes
+                class="mx_PollOption_content"
+              >
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Italian
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  <div
+                    class="mx_PollOption_winnerIcon"
+                  />
+                  2 votes
+                </div>
+              </div>
             </div>
           </div>
-        </div>
+          <div
+            class="mx_StyledRadioButton_spacer"
+          />
+        </label>
         <div
           class="mx_PollOption_popularityBackground"
         >
@@ -116,25 +191,45 @@ exports[`MPollBody renders a finished poll 1`] = `
         class="mx_PollOption mx_PollOption_ended"
         data-testid="pollOption-wings"
       >
-        <div
-          class="mx_PollOption_endedOption"
-          data-value="wings"
+        <label
+          class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_disabled"
         >
+          <input
+            aria-label="Option 4, Wings, 1 vote"
+            disabled=""
+            name="poll_answer_select-$mypoll"
+            type="radio"
+            value="wings"
+          />
+          <div>
+            <div />
+          </div>
           <div
-            class="mx_PollOption_content"
+            class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_optionText"
+              aria-hidden="true"
             >
-              Wings
-            </div>
-            <div
-              class="mx_PollOption_optionVoteCount"
-            >
-              1 vote
+              <div
+                class="mx_PollOption_content"
+              >
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Wings
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  1 vote
+                </div>
+              </div>
             </div>
           </div>
-        </div>
+          <div
+            class="mx_StyledRadioButton_spacer"
+          />
+        </label>
         <div
           class="mx_PollOption_popularityBackground"
         >
@@ -151,20 +246,35 @@ exports[`MPollBody renders a finished poll 1`] = `
     >
       Final result based on 3 votes
     </div>
-  </div>
+  </fieldset>
 </div>
 `;
 
 exports[`MPollBody renders a finished poll with multiple winners 1`] = `
 <div>
-  <div
+  <fieldset
     class="mx_MPollBody"
   >
-    <h2
+    <legend
       data-testid="pollQuestion"
     >
+      <svg
+        aria-label="Poll ended"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M21 10.659V19q0 .824-.587 1.413A1.93 1.93 0 0 1 19 21H5q-.824 0-1.412-.587A1.93 1.93 0 0 1 3 19V5q0-.824.587-1.412A1.93 1.93 0 0 1 5 3h8.341A6 6 0 0 0 13 5H5v14h14v-8a6 6 0 0 0 2-.341"
+        />
+        <path
+          d="M13.803 8a6 6 0 0 0 1.88 2H13a.97.97 0 0 1-.713-.287A.97.97 0 0 1 12 9q0-.424.287-.713A.97.97 0 0 1 13 8zm2.91 7.713A.97.97 0 0 1 16 16h-3a.97.97 0 0 1-.713-.287A.97.97 0 0 1 12 15q0-.424.287-.713A.97.97 0 0 1 13 14h3q.424 0 .712.287.288.288.288.713 0 .424-.288.713m-6.299-5.3A1.93 1.93 0 0 1 9 11q-.825 0-1.412-.588A1.93 1.93 0 0 1 7 9q0-.825.588-1.412A1.93 1.93 0 0 1 9 7q.825 0 1.412.588Q11 8.175 11 9t-.588 1.412m.001 6.001A1.93 1.93 0 0 1 9 17q-.825 0-1.412-.587A1.93 1.93 0 0 1 7 15q0-.825.588-1.412A1.93 1.93 0 0 1 9 13q.825 0 1.412.588Q11 14.175 11 15q0 .824-.588 1.413m12.295-14.12a1 1 0 0 1 0 1.414l-4 4a1 1 0 0 1-1.414 0l-2-2a1 1 0 0 1 1.414-1.414L18 5.586l3.293-3.293a1 1 0 0 1 1.414 0"
+        />
+      </svg>
       What should we order for the party?
-    </h2>
+    </legend>
     <div
       class="mx_MPollBody_allOptions"
     >
@@ -172,28 +282,48 @@ exports[`MPollBody renders a finished poll with multiple winners 1`] = `
         class="mx_PollOption mx_PollOption_checked mx_PollOption_ended"
         data-testid="pollOption-pizza"
       >
-        <div
-          class="mx_PollOption_endedOption mx_PollOption_endedOptionWinner"
-          data-value="pizza"
+        <label
+          class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_disabled mx_StyledRadioButton_checked"
         >
+          <input
+            aria-label="Option 1, Pizza, winning option, 2 votes"
+            disabled=""
+            name="poll_answer_select-$mypoll"
+            type="radio"
+            value="pizza"
+          />
+          <div>
+            <div />
+          </div>
           <div
-            class="mx_PollOption_content"
+            class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_optionText"
-            >
-              Pizza
-            </div>
-            <div
-              class="mx_PollOption_optionVoteCount"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_winnerIcon"
-              />
-              2 votes
+                class="mx_PollOption_content"
+              >
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Pizza
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  <div
+                    class="mx_PollOption_winnerIcon"
+                  />
+                  2 votes
+                </div>
+              </div>
             </div>
           </div>
-        </div>
+          <div
+            class="mx_StyledRadioButton_spacer"
+          />
+        </label>
         <div
           class="mx_PollOption_popularityBackground"
         >
@@ -207,25 +337,45 @@ exports[`MPollBody renders a finished poll with multiple winners 1`] = `
         class="mx_PollOption mx_PollOption_ended"
         data-testid="pollOption-poutine"
       >
-        <div
-          class="mx_PollOption_endedOption"
-          data-value="poutine"
+        <label
+          class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_disabled"
         >
+          <input
+            aria-label="Option 2, Poutine, 0 votes"
+            disabled=""
+            name="poll_answer_select-$mypoll"
+            type="radio"
+            value="poutine"
+          />
+          <div>
+            <div />
+          </div>
           <div
-            class="mx_PollOption_content"
+            class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_optionText"
+              aria-hidden="true"
             >
-              Poutine
-            </div>
-            <div
-              class="mx_PollOption_optionVoteCount"
-            >
-              0 votes
+              <div
+                class="mx_PollOption_content"
+              >
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Poutine
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  0 votes
+                </div>
+              </div>
             </div>
           </div>
-        </div>
+          <div
+            class="mx_StyledRadioButton_spacer"
+          />
+        </label>
         <div
           class="mx_PollOption_popularityBackground"
         >
@@ -239,25 +389,45 @@ exports[`MPollBody renders a finished poll with multiple winners 1`] = `
         class="mx_PollOption mx_PollOption_ended"
         data-testid="pollOption-italian"
       >
-        <div
-          class="mx_PollOption_endedOption"
-          data-value="italian"
+        <label
+          class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_disabled"
         >
+          <input
+            aria-label="Option 3, Italian, 0 votes"
+            disabled=""
+            name="poll_answer_select-$mypoll"
+            type="radio"
+            value="italian"
+          />
+          <div>
+            <div />
+          </div>
           <div
-            class="mx_PollOption_content"
+            class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_optionText"
+              aria-hidden="true"
             >
-              Italian
-            </div>
-            <div
-              class="mx_PollOption_optionVoteCount"
-            >
-              0 votes
+              <div
+                class="mx_PollOption_content"
+              >
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Italian
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  0 votes
+                </div>
+              </div>
             </div>
           </div>
-        </div>
+          <div
+            class="mx_StyledRadioButton_spacer"
+          />
+        </label>
         <div
           class="mx_PollOption_popularityBackground"
         >
@@ -271,28 +441,48 @@ exports[`MPollBody renders a finished poll with multiple winners 1`] = `
         class="mx_PollOption mx_PollOption_checked mx_PollOption_ended"
         data-testid="pollOption-wings"
       >
-        <div
-          class="mx_PollOption_endedOption mx_PollOption_endedOptionWinner"
-          data-value="wings"
+        <label
+          class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_disabled mx_StyledRadioButton_checked"
         >
+          <input
+            aria-label="Option 4, Wings, winning option, 2 votes"
+            disabled=""
+            name="poll_answer_select-$mypoll"
+            type="radio"
+            value="wings"
+          />
+          <div>
+            <div />
+          </div>
           <div
-            class="mx_PollOption_content"
+            class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_optionText"
-            >
-              Wings
-            </div>
-            <div
-              class="mx_PollOption_optionVoteCount"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_winnerIcon"
-              />
-              2 votes
+                class="mx_PollOption_content"
+              >
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Wings
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  <div
+                    class="mx_PollOption_winnerIcon"
+                  />
+                  2 votes
+                </div>
+              </div>
             </div>
           </div>
-        </div>
+          <div
+            class="mx_StyledRadioButton_spacer"
+          />
+        </label>
         <div
           class="mx_PollOption_popularityBackground"
         >
@@ -309,20 +499,35 @@ exports[`MPollBody renders a finished poll with multiple winners 1`] = `
     >
       Final result based on 4 votes
     </div>
-  </div>
+  </fieldset>
 </div>
 `;
 
 exports[`MPollBody renders a finished poll with no votes 1`] = `
 <div>
-  <div
+  <fieldset
     class="mx_MPollBody"
   >
-    <h2
+    <legend
       data-testid="pollQuestion"
     >
+      <svg
+        aria-label="Poll ended"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M21 10.659V19q0 .824-.587 1.413A1.93 1.93 0 0 1 19 21H5q-.824 0-1.412-.587A1.93 1.93 0 0 1 3 19V5q0-.824.587-1.412A1.93 1.93 0 0 1 5 3h8.341A6 6 0 0 0 13 5H5v14h14v-8a6 6 0 0 0 2-.341"
+        />
+        <path
+          d="M13.803 8a6 6 0 0 0 1.88 2H13a.97.97 0 0 1-.713-.287A.97.97 0 0 1 12 9q0-.424.287-.713A.97.97 0 0 1 13 8zm2.91 7.713A.97.97 0 0 1 16 16h-3a.97.97 0 0 1-.713-.287A.97.97 0 0 1 12 15q0-.424.287-.713A.97.97 0 0 1 13 14h3q.424 0 .712.287.288.288.288.713 0 .424-.288.713m-6.299-5.3A1.93 1.93 0 0 1 9 11q-.825 0-1.412-.588A1.93 1.93 0 0 1 7 9q0-.825.588-1.412A1.93 1.93 0 0 1 9 7q.825 0 1.412.588Q11 8.175 11 9t-.588 1.412m.001 6.001A1.93 1.93 0 0 1 9 17q-.825 0-1.412-.587A1.93 1.93 0 0 1 7 15q0-.825.588-1.412A1.93 1.93 0 0 1 9 13q.825 0 1.412.588Q11 14.175 11 15q0 .824-.588 1.413m12.295-14.12a1 1 0 0 1 0 1.414l-4 4a1 1 0 0 1-1.414 0l-2-2a1 1 0 0 1 1.414-1.414L18 5.586l3.293-3.293a1 1 0 0 1 1.414 0"
+        />
+      </svg>
       What should we order for the party?
-    </h2>
+    </legend>
     <div
       class="mx_MPollBody_allOptions"
     >
@@ -330,25 +535,45 @@ exports[`MPollBody renders a finished poll with no votes 1`] = `
         class="mx_PollOption mx_PollOption_ended"
         data-testid="pollOption-pizza"
       >
-        <div
-          class="mx_PollOption_endedOption"
-          data-value="pizza"
+        <label
+          class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_disabled"
         >
+          <input
+            aria-label="Option 1, Pizza, 0 votes"
+            disabled=""
+            name="poll_answer_select-$mypoll"
+            type="radio"
+            value="pizza"
+          />
+          <div>
+            <div />
+          </div>
           <div
-            class="mx_PollOption_content"
+            class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_optionText"
+              aria-hidden="true"
             >
-              Pizza
-            </div>
-            <div
-              class="mx_PollOption_optionVoteCount"
-            >
-              0 votes
+              <div
+                class="mx_PollOption_content"
+              >
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Pizza
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  0 votes
+                </div>
+              </div>
             </div>
           </div>
-        </div>
+          <div
+            class="mx_StyledRadioButton_spacer"
+          />
+        </label>
         <div
           class="mx_PollOption_popularityBackground"
         >
@@ -362,25 +587,45 @@ exports[`MPollBody renders a finished poll with no votes 1`] = `
         class="mx_PollOption mx_PollOption_ended"
         data-testid="pollOption-poutine"
       >
-        <div
-          class="mx_PollOption_endedOption"
-          data-value="poutine"
+        <label
+          class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_disabled"
         >
+          <input
+            aria-label="Option 2, Poutine, 0 votes"
+            disabled=""
+            name="poll_answer_select-$mypoll"
+            type="radio"
+            value="poutine"
+          />
+          <div>
+            <div />
+          </div>
           <div
-            class="mx_PollOption_content"
+            class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_optionText"
+              aria-hidden="true"
             >
-              Poutine
-            </div>
-            <div
-              class="mx_PollOption_optionVoteCount"
-            >
-              0 votes
+              <div
+                class="mx_PollOption_content"
+              >
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Poutine
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  0 votes
+                </div>
+              </div>
             </div>
           </div>
-        </div>
+          <div
+            class="mx_StyledRadioButton_spacer"
+          />
+        </label>
         <div
           class="mx_PollOption_popularityBackground"
         >
@@ -394,25 +639,45 @@ exports[`MPollBody renders a finished poll with no votes 1`] = `
         class="mx_PollOption mx_PollOption_ended"
         data-testid="pollOption-italian"
       >
-        <div
-          class="mx_PollOption_endedOption"
-          data-value="italian"
+        <label
+          class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_disabled"
         >
+          <input
+            aria-label="Option 3, Italian, 0 votes"
+            disabled=""
+            name="poll_answer_select-$mypoll"
+            type="radio"
+            value="italian"
+          />
+          <div>
+            <div />
+          </div>
           <div
-            class="mx_PollOption_content"
+            class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_optionText"
+              aria-hidden="true"
             >
-              Italian
-            </div>
-            <div
-              class="mx_PollOption_optionVoteCount"
-            >
-              0 votes
+              <div
+                class="mx_PollOption_content"
+              >
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Italian
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  0 votes
+                </div>
+              </div>
             </div>
           </div>
-        </div>
+          <div
+            class="mx_StyledRadioButton_spacer"
+          />
+        </label>
         <div
           class="mx_PollOption_popularityBackground"
         >
@@ -426,25 +691,45 @@ exports[`MPollBody renders a finished poll with no votes 1`] = `
         class="mx_PollOption mx_PollOption_ended"
         data-testid="pollOption-wings"
       >
-        <div
-          class="mx_PollOption_endedOption"
-          data-value="wings"
+        <label
+          class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_disabled"
         >
+          <input
+            aria-label="Option 4, Wings, 0 votes"
+            disabled=""
+            name="poll_answer_select-$mypoll"
+            type="radio"
+            value="wings"
+          />
+          <div>
+            <div />
+          </div>
           <div
-            class="mx_PollOption_content"
+            class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_optionText"
+              aria-hidden="true"
             >
-              Wings
-            </div>
-            <div
-              class="mx_PollOption_optionVoteCount"
-            >
-              0 votes
+              <div
+                class="mx_PollOption_content"
+              >
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Wings
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  0 votes
+                </div>
+              </div>
             </div>
           </div>
-        </div>
+          <div
+            class="mx_StyledRadioButton_spacer"
+          />
+        </label>
         <div
           class="mx_PollOption_popularityBackground"
         >
@@ -461,20 +746,32 @@ exports[`MPollBody renders a finished poll with no votes 1`] = `
     >
       Final result based on 0 votes
     </div>
-  </div>
+  </fieldset>
 </div>
 `;
 
 exports[`MPollBody renders a poll that I have not voted in 1`] = `
 <div>
-  <div
+  <fieldset
     class="mx_MPollBody"
   >
-    <h2
+    <legend
       data-testid="pollQuestion"
     >
+      <svg
+        aria-label="Poll"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M16 10q.424 0 .712-.287A.97.97 0 0 0 17 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 8h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 9q0 .424.287.713.288.287.713.287zm0 6q.424 0 .712-.287A.97.97 0 0 0 17 15a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 14h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 15q0 .424.287.713.288.287.713.287zm-7-5q.825 0 1.412-.588Q11 9.826 11 9t-.588-1.412A1.93 1.93 0 0 0 9 7q-.825 0-1.412.588A1.93 1.93 0 0 0 7 9q0 .825.588 1.412Q8.175 11 9 11m0 6q.825 0 1.412-.587Q11 15.825 11 15t-.588-1.412A1.93 1.93 0 0 0 9 13q-.825 0-1.412.588A1.93 1.93 0 0 0 7 15q0 .824.588 1.413Q8.175 17 9 17m-4 4q-.824 0-1.412-.587A1.93 1.93 0 0 1 3 19V5q0-.824.587-1.412A1.93 1.93 0 0 1 5 3h14q.824 0 1.413.587Q21 4.176 21 5v14q0 .824-.587 1.413A1.93 1.93 0 0 1 19 21zm0-2h14V5H5z"
+        />
+      </svg>
       What should we order for the party?
-    </h2>
+    </legend>
     <div
       class="mx_MPollBody_allOptions"
     >
@@ -486,6 +783,7 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 1, Pizza"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="pizza"
@@ -497,16 +795,20 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Pizza
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Pizza
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                />
               </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              />
             </div>
           </div>
           <div
@@ -530,6 +832,7 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 2, Poutine"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="poutine"
@@ -541,16 +844,20 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Poutine
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Poutine
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                />
               </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              />
             </div>
           </div>
           <div
@@ -574,6 +881,7 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 3, Italian"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="italian"
@@ -585,16 +893,20 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Italian
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Italian
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                />
               </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              />
             </div>
           </div>
           <div
@@ -618,6 +930,7 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 4, Wings"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="wings"
@@ -629,16 +942,20 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Wings
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Wings
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                />
               </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              />
             </div>
           </div>
           <div
@@ -661,20 +978,32 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
     >
       3 votes cast. Vote to see the results
     </div>
-  </div>
+  </fieldset>
 </div>
 `;
 
 exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] = `
 <div>
-  <div
+  <fieldset
     class="mx_MPollBody"
   >
-    <h2
+    <legend
       data-testid="pollQuestion"
     >
+      <svg
+        aria-label="Poll"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M16 10q.424 0 .712-.287A.97.97 0 0 0 17 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 8h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 9q0 .424.287.713.288.287.713.287zm0 6q.424 0 .712-.287A.97.97 0 0 0 17 15a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 14h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 15q0 .424.287.713.288.287.713.287zm-7-5q.825 0 1.412-.588Q11 9.826 11 9t-.588-1.412A1.93 1.93 0 0 0 9 7q-.825 0-1.412.588A1.93 1.93 0 0 0 7 9q0 .825.588 1.412Q8.175 11 9 11m0 6q.825 0 1.412-.587Q11 15.825 11 15t-.588-1.412A1.93 1.93 0 0 0 9 13q-.825 0-1.412.588A1.93 1.93 0 0 0 7 15q0 .824.588 1.413Q8.175 17 9 17m-4 4q-.824 0-1.412-.587A1.93 1.93 0 0 1 3 19V5q0-.824.587-1.412A1.93 1.93 0 0 1 5 3h14q.824 0 1.413.587Q21 4.176 21 5v14q0 .824-.587 1.413A1.93 1.93 0 0 1 19 21zm0-2h14V5H5z"
+        />
+      </svg>
       What should we order for the party?
-    </h2>
+    </legend>
     <div
       class="mx_MPollBody_allOptions"
     >
@@ -686,6 +1015,7 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 1, Pizza, 1 vote"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="pizza"
@@ -697,17 +1027,21 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Pizza
-              </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              >
-                1 vote
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Pizza
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  1 vote
+                </div>
               </div>
             </div>
           </div>
@@ -732,6 +1066,7 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 2, Poutine, 0 votes"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="poutine"
@@ -743,17 +1078,21 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Poutine
-              </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              >
-                0 votes
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Poutine
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  0 votes
+                </div>
               </div>
             </div>
           </div>
@@ -778,6 +1117,7 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled mx_StyledRadioButton_checked"
         >
           <input
+            aria-label="Option 3, Italian, 3 votes"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="italian"
@@ -789,17 +1129,21 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Italian
-              </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              >
-                3 votes
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Italian
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  3 votes
+                </div>
               </div>
             </div>
           </div>
@@ -824,6 +1168,7 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 4, Wings, 1 vote"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="wings"
@@ -835,17 +1180,21 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Wings
-              </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              >
-                1 vote
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Wings
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  1 vote
+                </div>
               </div>
             </div>
           </div>
@@ -869,20 +1218,32 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
     >
       Based on 5 votes
     </div>
-  </div>
+  </fieldset>
 </div>
 `;
 
 exports[`MPollBody renders a poll with no votes 1`] = `
 <div>
-  <div
+  <fieldset
     class="mx_MPollBody"
   >
-    <h2
+    <legend
       data-testid="pollQuestion"
     >
+      <svg
+        aria-label="Poll"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M16 10q.424 0 .712-.287A.97.97 0 0 0 17 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 8h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 9q0 .424.287.713.288.287.713.287zm0 6q.424 0 .712-.287A.97.97 0 0 0 17 15a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 14h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 15q0 .424.287.713.288.287.713.287zm-7-5q.825 0 1.412-.588Q11 9.826 11 9t-.588-1.412A1.93 1.93 0 0 0 9 7q-.825 0-1.412.588A1.93 1.93 0 0 0 7 9q0 .825.588 1.412Q8.175 11 9 11m0 6q.825 0 1.412-.587Q11 15.825 11 15t-.588-1.412A1.93 1.93 0 0 0 9 13q-.825 0-1.412.588A1.93 1.93 0 0 0 7 15q0 .824.588 1.413Q8.175 17 9 17m-4 4q-.824 0-1.412-.587A1.93 1.93 0 0 1 3 19V5q0-.824.587-1.412A1.93 1.93 0 0 1 5 3h14q.824 0 1.413.587Q21 4.176 21 5v14q0 .824-.587 1.413A1.93 1.93 0 0 1 19 21zm0-2h14V5H5z"
+        />
+      </svg>
       What should we order for the party?
-    </h2>
+    </legend>
     <div
       class="mx_MPollBody_allOptions"
     >
@@ -894,6 +1255,7 @@ exports[`MPollBody renders a poll with no votes 1`] = `
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 1, Pizza"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="pizza"
@@ -905,16 +1267,20 @@ exports[`MPollBody renders a poll with no votes 1`] = `
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Pizza
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Pizza
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                />
               </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              />
             </div>
           </div>
           <div
@@ -938,6 +1304,7 @@ exports[`MPollBody renders a poll with no votes 1`] = `
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 2, Poutine"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="poutine"
@@ -949,16 +1316,20 @@ exports[`MPollBody renders a poll with no votes 1`] = `
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Poutine
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Poutine
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                />
               </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              />
             </div>
           </div>
           <div
@@ -982,6 +1353,7 @@ exports[`MPollBody renders a poll with no votes 1`] = `
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 3, Italian"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="italian"
@@ -993,16 +1365,20 @@ exports[`MPollBody renders a poll with no votes 1`] = `
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Italian
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Italian
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                />
               </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              />
             </div>
           </div>
           <div
@@ -1026,6 +1402,7 @@ exports[`MPollBody renders a poll with no votes 1`] = `
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 4, Wings"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="wings"
@@ -1037,16 +1414,20 @@ exports[`MPollBody renders a poll with no votes 1`] = `
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Wings
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Wings
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                />
               </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              />
             </div>
           </div>
           <div
@@ -1069,20 +1450,32 @@ exports[`MPollBody renders a poll with no votes 1`] = `
     >
       No votes cast
     </div>
-  </div>
+  </fieldset>
 </div>
 `;
 
 exports[`MPollBody renders a poll with only non-local votes 1`] = `
 <div>
-  <div
+  <fieldset
     class="mx_MPollBody"
   >
-    <h2
+    <legend
       data-testid="pollQuestion"
     >
+      <svg
+        aria-label="Poll"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M16 10q.424 0 .712-.287A.97.97 0 0 0 17 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 8h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 9q0 .424.287.713.288.287.713.287zm0 6q.424 0 .712-.287A.97.97 0 0 0 17 15a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 14h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 15q0 .424.287.713.288.287.713.287zm-7-5q.825 0 1.412-.588Q11 9.826 11 9t-.588-1.412A1.93 1.93 0 0 0 9 7q-.825 0-1.412.588A1.93 1.93 0 0 0 7 9q0 .825.588 1.412Q8.175 11 9 11m0 6q.825 0 1.412-.587Q11 15.825 11 15t-.588-1.412A1.93 1.93 0 0 0 9 13q-.825 0-1.412.588A1.93 1.93 0 0 0 7 15q0 .824.588 1.413Q8.175 17 9 17m-4 4q-.824 0-1.412-.587A1.93 1.93 0 0 1 3 19V5q0-.824.587-1.412A1.93 1.93 0 0 1 5 3h14q.824 0 1.413.587Q21 4.176 21 5v14q0 .824-.587 1.413A1.93 1.93 0 0 1 19 21zm0-2h14V5H5z"
+        />
+      </svg>
       What should we order for the party?
-    </h2>
+    </legend>
     <div
       class="mx_MPollBody_allOptions"
     >
@@ -1094,6 +1487,7 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 1, Pizza, 0 votes"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="pizza"
@@ -1105,17 +1499,21 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Pizza
-              </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              >
-                0 votes
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Pizza
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  0 votes
+                </div>
               </div>
             </div>
           </div>
@@ -1140,6 +1538,7 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 2, Poutine, 0 votes"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="poutine"
@@ -1151,17 +1550,21 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Poutine
-              </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              >
-                0 votes
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Poutine
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  0 votes
+                </div>
               </div>
             </div>
           </div>
@@ -1186,6 +1589,7 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 3, Italian, 2 votes"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="italian"
@@ -1197,17 +1601,21 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Italian
-              </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              >
-                2 votes
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Italian
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  2 votes
+                </div>
               </div>
             </div>
           </div>
@@ -1232,6 +1640,7 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled mx_StyledRadioButton_checked"
         >
           <input
+            aria-label="Option 4, Wings, 1 vote"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="wings"
@@ -1243,17 +1652,21 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Wings
-              </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              >
-                1 vote
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Wings
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  1 vote
+                </div>
               </div>
             </div>
           </div>
@@ -1277,20 +1690,35 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
     >
       Based on 3 votes
     </div>
-  </div>
+  </fieldset>
 </div>
 `;
 
 exports[`MPollBody renders an undisclosed, finished poll 1`] = `
 <div>
-  <div
+  <fieldset
     class="mx_MPollBody"
   >
-    <h2
+    <legend
       data-testid="pollQuestion"
     >
+      <svg
+        aria-label="Poll ended"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M21 10.659V19q0 .824-.587 1.413A1.93 1.93 0 0 1 19 21H5q-.824 0-1.412-.587A1.93 1.93 0 0 1 3 19V5q0-.824.587-1.412A1.93 1.93 0 0 1 5 3h8.341A6 6 0 0 0 13 5H5v14h14v-8a6 6 0 0 0 2-.341"
+        />
+        <path
+          d="M13.803 8a6 6 0 0 0 1.88 2H13a.97.97 0 0 1-.713-.287A.97.97 0 0 1 12 9q0-.424.287-.713A.97.97 0 0 1 13 8zm2.91 7.713A.97.97 0 0 1 16 16h-3a.97.97 0 0 1-.713-.287A.97.97 0 0 1 12 15q0-.424.287-.713A.97.97 0 0 1 13 14h3q.424 0 .712.287.288.288.288.713 0 .424-.288.713m-6.299-5.3A1.93 1.93 0 0 1 9 11q-.825 0-1.412-.588A1.93 1.93 0 0 1 7 9q0-.825.588-1.412A1.93 1.93 0 0 1 9 7q.825 0 1.412.588Q11 8.175 11 9t-.588 1.412m.001 6.001A1.93 1.93 0 0 1 9 17q-.825 0-1.412-.587A1.93 1.93 0 0 1 7 15q0-.825.588-1.412A1.93 1.93 0 0 1 9 13q.825 0 1.412.588Q11 14.175 11 15q0 .824-.588 1.413m12.295-14.12a1 1 0 0 1 0 1.414l-4 4a1 1 0 0 1-1.414 0l-2-2a1 1 0 0 1 1.414-1.414L18 5.586l3.293-3.293a1 1 0 0 1 1.414 0"
+        />
+      </svg>
       What should we order for the party?
-    </h2>
+    </legend>
     <div
       class="mx_MPollBody_allOptions"
     >
@@ -1298,28 +1726,48 @@ exports[`MPollBody renders an undisclosed, finished poll 1`] = `
         class="mx_PollOption mx_PollOption_checked mx_PollOption_ended"
         data-testid="pollOption-pizza"
       >
-        <div
-          class="mx_PollOption_endedOption mx_PollOption_endedOptionWinner"
-          data-value="pizza"
+        <label
+          class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_disabled mx_StyledRadioButton_checked"
         >
+          <input
+            aria-label="Option 1, Pizza, winning option, 2 votes"
+            disabled=""
+            name="poll_answer_select-$mypoll"
+            type="radio"
+            value="pizza"
+          />
+          <div>
+            <div />
+          </div>
           <div
-            class="mx_PollOption_content"
+            class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_optionText"
-            >
-              Pizza
-            </div>
-            <div
-              class="mx_PollOption_optionVoteCount"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_winnerIcon"
-              />
-              2 votes
+                class="mx_PollOption_content"
+              >
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Pizza
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  <div
+                    class="mx_PollOption_winnerIcon"
+                  />
+                  2 votes
+                </div>
+              </div>
             </div>
           </div>
-        </div>
+          <div
+            class="mx_StyledRadioButton_spacer"
+          />
+        </label>
         <div
           class="mx_PollOption_popularityBackground"
         >
@@ -1333,25 +1781,45 @@ exports[`MPollBody renders an undisclosed, finished poll 1`] = `
         class="mx_PollOption mx_PollOption_ended"
         data-testid="pollOption-poutine"
       >
-        <div
-          class="mx_PollOption_endedOption"
-          data-value="poutine"
+        <label
+          class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_disabled"
         >
+          <input
+            aria-label="Option 2, Poutine, 0 votes"
+            disabled=""
+            name="poll_answer_select-$mypoll"
+            type="radio"
+            value="poutine"
+          />
+          <div>
+            <div />
+          </div>
           <div
-            class="mx_PollOption_content"
+            class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_optionText"
+              aria-hidden="true"
             >
-              Poutine
-            </div>
-            <div
-              class="mx_PollOption_optionVoteCount"
-            >
-              0 votes
+              <div
+                class="mx_PollOption_content"
+              >
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Poutine
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  0 votes
+                </div>
+              </div>
             </div>
           </div>
-        </div>
+          <div
+            class="mx_StyledRadioButton_spacer"
+          />
+        </label>
         <div
           class="mx_PollOption_popularityBackground"
         >
@@ -1365,25 +1833,45 @@ exports[`MPollBody renders an undisclosed, finished poll 1`] = `
         class="mx_PollOption mx_PollOption_ended"
         data-testid="pollOption-italian"
       >
-        <div
-          class="mx_PollOption_endedOption"
-          data-value="italian"
+        <label
+          class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_disabled"
         >
+          <input
+            aria-label="Option 3, Italian, 0 votes"
+            disabled=""
+            name="poll_answer_select-$mypoll"
+            type="radio"
+            value="italian"
+          />
+          <div>
+            <div />
+          </div>
           <div
-            class="mx_PollOption_content"
+            class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_optionText"
+              aria-hidden="true"
             >
-              Italian
-            </div>
-            <div
-              class="mx_PollOption_optionVoteCount"
-            >
-              0 votes
+              <div
+                class="mx_PollOption_content"
+              >
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Italian
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  0 votes
+                </div>
+              </div>
             </div>
           </div>
-        </div>
+          <div
+            class="mx_StyledRadioButton_spacer"
+          />
+        </label>
         <div
           class="mx_PollOption_popularityBackground"
         >
@@ -1397,28 +1885,48 @@ exports[`MPollBody renders an undisclosed, finished poll 1`] = `
         class="mx_PollOption mx_PollOption_checked mx_PollOption_ended"
         data-testid="pollOption-wings"
       >
-        <div
-          class="mx_PollOption_endedOption mx_PollOption_endedOptionWinner"
-          data-value="wings"
+        <label
+          class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_disabled mx_StyledRadioButton_checked"
         >
+          <input
+            aria-label="Option 4, Wings, winning option, 2 votes"
+            disabled=""
+            name="poll_answer_select-$mypoll"
+            type="radio"
+            value="wings"
+          />
+          <div>
+            <div />
+          </div>
           <div
-            class="mx_PollOption_content"
+            class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_optionText"
-            >
-              Wings
-            </div>
-            <div
-              class="mx_PollOption_optionVoteCount"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_winnerIcon"
-              />
-              2 votes
+                class="mx_PollOption_content"
+              >
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Wings
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                >
+                  <div
+                    class="mx_PollOption_winnerIcon"
+                  />
+                  2 votes
+                </div>
+              </div>
             </div>
           </div>
-        </div>
+          <div
+            class="mx_StyledRadioButton_spacer"
+          />
+        </label>
         <div
           class="mx_PollOption_popularityBackground"
         >
@@ -1435,20 +1943,32 @@ exports[`MPollBody renders an undisclosed, finished poll 1`] = `
     >
       Final result based on 4 votes
     </div>
-  </div>
+  </fieldset>
 </div>
 `;
 
 exports[`MPollBody renders an undisclosed, unfinished poll 1`] = `
 <div>
-  <div
+  <fieldset
     class="mx_MPollBody"
   >
-    <h2
+    <legend
       data-testid="pollQuestion"
     >
+      <svg
+        aria-label="Poll"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M16 10q.424 0 .712-.287A.97.97 0 0 0 17 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 8h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 9q0 .424.287.713.288.287.713.287zm0 6q.424 0 .712-.287A.97.97 0 0 0 17 15a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 14h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 15q0 .424.287.713.288.287.713.287zm-7-5q.825 0 1.412-.588Q11 9.826 11 9t-.588-1.412A1.93 1.93 0 0 0 9 7q-.825 0-1.412.588A1.93 1.93 0 0 0 7 9q0 .825.588 1.412Q8.175 11 9 11m0 6q.825 0 1.412-.587Q11 15.825 11 15t-.588-1.412A1.93 1.93 0 0 0 9 13q-.825 0-1.412.588A1.93 1.93 0 0 0 7 15q0 .824.588 1.413Q8.175 17 9 17m-4 4q-.824 0-1.412-.587A1.93 1.93 0 0 1 3 19V5q0-.824.587-1.412A1.93 1.93 0 0 1 5 3h14q.824 0 1.413.587Q21 4.176 21 5v14q0 .824-.587 1.413A1.93 1.93 0 0 1 19 21zm0-2h14V5H5z"
+        />
+      </svg>
       What should we order for the party?
-    </h2>
+    </legend>
     <div
       class="mx_MPollBody_allOptions"
     >
@@ -1460,6 +1980,7 @@ exports[`MPollBody renders an undisclosed, unfinished poll 1`] = `
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 1, Pizza"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="pizza"
@@ -1471,16 +1992,20 @@ exports[`MPollBody renders an undisclosed, unfinished poll 1`] = `
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Pizza
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Pizza
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                />
               </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              />
             </div>
           </div>
           <div
@@ -1504,6 +2029,7 @@ exports[`MPollBody renders an undisclosed, unfinished poll 1`] = `
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 2, Poutine"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="poutine"
@@ -1515,16 +2041,20 @@ exports[`MPollBody renders an undisclosed, unfinished poll 1`] = `
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Poutine
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Poutine
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                />
               </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              />
             </div>
           </div>
           <div
@@ -1548,6 +2078,7 @@ exports[`MPollBody renders an undisclosed, unfinished poll 1`] = `
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 3, Italian"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="italian"
@@ -1559,16 +2090,20 @@ exports[`MPollBody renders an undisclosed, unfinished poll 1`] = `
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Italian
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Italian
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                />
               </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              />
             </div>
           </div>
           <div
@@ -1592,6 +2127,7 @@ exports[`MPollBody renders an undisclosed, unfinished poll 1`] = `
           class="mx_StyledRadioButton mx_PollOption_live-option mx_StyledRadioButton_enabled"
         >
           <input
+            aria-label="Option 4, Wings"
             name="poll_answer_select-$mypoll"
             type="radio"
             value="wings"
@@ -1603,16 +2139,20 @@ exports[`MPollBody renders an undisclosed, unfinished poll 1`] = `
             class="mx_StyledRadioButton_content"
           >
             <div
-              class="mx_PollOption_content"
+              aria-hidden="true"
             >
               <div
-                class="mx_PollOption_optionText"
+                class="mx_PollOption_content"
               >
-                Wings
+                <div
+                  class="mx_PollOption_optionText"
+                >
+                  Wings
+                </div>
+                <div
+                  class="mx_PollOption_optionVoteCount"
+                />
               </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              />
             </div>
           </div>
           <div
@@ -1635,6 +2175,6 @@ exports[`MPollBody renders an undisclosed, unfinished poll 1`] = `
     >
       Results will be visible when the poll is ended
     </div>
-  </div>
+  </fieldset>
 </div>
 `;
diff --git a/test/unit-tests/components/views/messages/__snapshots__/MPollEndBody-test.tsx.snap b/test/unit-tests/components/views/messages/__snapshots__/MPollEndBody-test.tsx.snap
deleted file mode 100644
index ac2603d89d..0000000000
--- a/test/unit-tests/components/views/messages/__snapshots__/MPollEndBody-test.tsx.snap
+++ /dev/null
@@ -1,117 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<MPollEndBody /> when poll start event does not exist in current timeline fetches the related poll start event and displays a poll tile 1`] = `
-<div>
-  <div
-    class="mx_MPollEndBody_icon"
-  />
-</div>
-`;
-
-exports[`<MPollEndBody /> when poll start event exists in current timeline renders an ended poll 1`] = `
-<div>
-  <div
-    class="mx_MPollEndBody"
-  >
-    <span
-      class="mx_Caption"
-    >
-      Ended a poll
-    </span>
-    <div
-      class="mx_MPollBody"
-    >
-      <h2
-        data-testid="pollQuestion"
-      >
-        Question?
-      </h2>
-      <div
-        class="mx_MPollBody_allOptions"
-      >
-        <div
-          class="mx_PollOption mx_PollOption_ended"
-          data-testid="pollOption-socks"
-        >
-          <div
-            class="mx_PollOption_endedOption"
-            data-value="socks"
-          >
-            <div
-              class="mx_PollOption_content"
-            >
-              <div
-                class="mx_PollOption_optionText"
-              >
-                Socks
-              </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              >
-                0 votes
-              </div>
-            </div>
-          </div>
-          <div
-            class="mx_PollOption_popularityBackground"
-          >
-            <div
-              class="mx_PollOption_popularityAmount"
-              style="width: 0%;"
-            />
-          </div>
-        </div>
-        <div
-          class="mx_PollOption mx_PollOption_ended"
-          data-testid="pollOption-shoes"
-        >
-          <div
-            class="mx_PollOption_endedOption"
-            data-value="shoes"
-          >
-            <div
-              class="mx_PollOption_content"
-            >
-              <div
-                class="mx_PollOption_optionText"
-              >
-                Shoes
-              </div>
-              <div
-                class="mx_PollOption_optionVoteCount"
-              >
-                0 votes
-              </div>
-            </div>
-          </div>
-          <div
-            class="mx_PollOption_popularityBackground"
-          >
-            <div
-              class="mx_PollOption_popularityAmount"
-              style="width: 0%;"
-            />
-          </div>
-        </div>
-      </div>
-      <div
-        class="mx_MPollBody_totalVotes"
-        data-testid="totalVotes"
-      >
-        Final result based on 0 votes
-        <div
-          class="mx_Spinner"
-        >
-          <div
-            aria-label="Loading…"
-            class="mx_Spinner_icon"
-            data-testid="spinner"
-            role="progressbar"
-            style="width: 16px; height: 16px;"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/test/unit-tests/components/views/messages/__snapshots__/MVideoBody-test.tsx.snap b/test/unit-tests/components/views/messages/__snapshots__/MVideoBody-test.tsx.snap
index 086941082c..adb6974d72 100644
--- a/test/unit-tests/components/views/messages/__snapshots__/MVideoBody-test.tsx.snap
+++ b/test/unit-tests/components/views/messages/__snapshots__/MVideoBody-test.tsx.snap
@@ -1,13 +1,13 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
-exports[`MVideoBody does not crash when given a portrait image 1`] = `
+exports[`MVideoBody does not crash when given portrait dimensions 1`] = `
 <DocumentFragment>
   <span
     class="mx_MVideoBody"
   >
     <div
       class="mx_MVideoBody_container"
-      style="max-width: 182px; max-height: 324px;"
+      style="max-width: 182px; max-height: 324px; aspect-ratio: 720/1280;"
     >
       <video
         class="mx_MVideoBody"
@@ -31,7 +31,32 @@ exports[`MVideoBody should show poster for encrypted media before downloading it
   >
     <div
       class="mx_MVideoBody_container"
-      style="max-width: 40px; max-height: 50px;"
+      style="max-width: 40px; max-height: 50px; aspect-ratio: 40/50;"
+    >
+      <video
+        class="mx_MVideoBody"
+        controls=""
+        controlslist="nodownload"
+        poster="https://server/_matrix/media/v3/download/server/encrypted-poster"
+        preload="none"
+        title="alt for a test video"
+      />
+      <div
+        style="width: 40px; height: 50px;"
+      />
+    </div>
+  </span>
+</DocumentFragment>
+`;
+
+exports[`MVideoBody with video previews/thumbnails disabled should download video if we were the sender 1`] = `
+<DocumentFragment>
+  <span
+    class="mx_MVideoBody"
+  >
+    <div
+      class="mx_MVideoBody_container"
+      style="max-width: 40px; max-height: 50px; aspect-ratio: 40/50;"
     >
       <video
         class="mx_MVideoBody"
diff --git a/test/unit-tests/components/views/messages/__snapshots__/PinnedMessageBadge-test.tsx.snap b/test/unit-tests/components/views/messages/__snapshots__/PinnedMessageBadge-test.tsx.snap
index 043f60f880..dd321a1c16 100644
--- a/test/unit-tests/components/views/messages/__snapshots__/PinnedMessageBadge-test.tsx.snap
+++ b/test/unit-tests/components/views/messages/__snapshots__/PinnedMessageBadge-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`PinnedMessageBadge should render 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/messages/__snapshots__/ReactionsRowButton-test.tsx.snap b/test/unit-tests/components/views/messages/__snapshots__/ReactionsRowButton-test.tsx.snap
index 0105892bad..db868189dd 100644
--- a/test/unit-tests/components/views/messages/__snapshots__/ReactionsRowButton-test.tsx.snap
+++ b/test/unit-tests/components/views/messages/__snapshots__/ReactionsRowButton-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`ReactionsRowButton renders reaction row button custom image reactions correctly 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/messages/__snapshots__/RoomPredecessorTile-test.tsx.snap b/test/unit-tests/components/views/messages/__snapshots__/RoomPredecessorTile-test.tsx.snap
index 2b8670a752..0c2f2dc9ec 100644
--- a/test/unit-tests/components/views/messages/__snapshots__/RoomPredecessorTile-test.tsx.snap
+++ b/test/unit-tests/components/views/messages/__snapshots__/RoomPredecessorTile-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<RoomPredecessorTile /> Renders as expected 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/messages/__snapshots__/TextualBody-test.tsx.snap b/test/unit-tests/components/views/messages/__snapshots__/TextualBody-test.tsx.snap
index ae1c638a90..40d88d54bd 100644
--- a/test/unit-tests/components/views/messages/__snapshots__/TextualBody-test.tsx.snap
+++ b/test/unit-tests/components/views/messages/__snapshots__/TextualBody-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<TextualBody /> renders formatted m.text correctly italics, bold, underline and strikethrough render as expected 1`] = `
 <div
@@ -64,7 +64,22 @@ exports[`<TextualBody /> renders formatted m.text correctly linkification is not
       class="mx_AccessibleButton mx_EventTile_button mx_EventTile_copyButton"
       role="button"
       tabindex="0"
-    />
+    >
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+        />
+        <path
+          d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+        />
+      </svg>
+    </div>
   </div>
   
 
@@ -85,7 +100,7 @@ exports[`<TextualBody /> renders formatted m.text correctly pills appear for an
       <span
         aria-hidden="true"
         aria-label="Profile picture"
-        class="_avatar_1qbcf_8 mx_BaseAvatar"
+        class="_avatar_zysgz_8 mx_BaseAvatar"
         data-color="2"
         data-testid="avatar-img"
         data-type="round"
@@ -93,7 +108,7 @@ exports[`<TextualBody /> renders formatted m.text correctly pills appear for an
       >
         <img
           alt=""
-          class="_image_1qbcf_41"
+          class="_image_zysgz_43"
           data-type="round"
           height="16px"
           loading="lazy"
@@ -130,7 +145,7 @@ exports[`<TextualBody /> renders formatted m.text correctly pills appear for eve
           <span
             aria-hidden="true"
             aria-label="Avatar"
-            class="_avatar_1qbcf_8 mx_BaseAvatar"
+            class="_avatar_zysgz_8 mx_BaseAvatar"
             data-color="1"
             data-testid="avatar-img"
             data-type="round"
@@ -138,7 +153,7 @@ exports[`<TextualBody /> renders formatted m.text correctly pills appear for eve
           >
             <img
               alt=""
-              class="_image_1qbcf_41"
+              class="_image_zysgz_43"
               data-type="round"
               height="16px"
               loading="lazy"
@@ -177,7 +192,7 @@ exports[`<TextualBody /> renders formatted m.text correctly pills appear for roo
           <span
             aria-hidden="true"
             aria-label="Avatar"
-            class="_avatar_1qbcf_8 mx_BaseAvatar"
+            class="_avatar_zysgz_8 mx_BaseAvatar"
             data-color="1"
             data-testid="avatar-img"
             data-type="round"
@@ -185,7 +200,7 @@ exports[`<TextualBody /> renders formatted m.text correctly pills appear for roo
           >
             <img
               alt=""
-              class="_image_1qbcf_41"
+              class="_image_zysgz_43"
               data-type="round"
               height="16px"
               loading="lazy"
@@ -268,7 +283,22 @@ exports[`<TextualBody /> renders formatted m.text correctly pills do not appear
       class="mx_AccessibleButton mx_EventTile_button mx_EventTile_copyButton"
       role="button"
       tabindex="0"
-    />
+    >
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+        />
+        <path
+          d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+        />
+      </svg>
+    </div>
   </div>
   
 
@@ -289,7 +319,7 @@ exports[`<TextualBody /> renders formatted m.text correctly pills get injected c
       <span
         aria-hidden="true"
         aria-label="Profile picture"
-        class="_avatar_1qbcf_8 mx_BaseAvatar"
+        class="_avatar_zysgz_8 mx_BaseAvatar"
         data-color="2"
         data-testid="avatar-img"
         data-type="round"
@@ -297,7 +327,7 @@ exports[`<TextualBody /> renders formatted m.text correctly pills get injected c
       >
         <img
           alt=""
-          class="_image_1qbcf_41"
+          class="_image_zysgz_43"
           data-type="round"
           height="16px"
           loading="lazy"
@@ -438,14 +468,41 @@ num_sqrt = num **
       </div>
     </pre>
     <span
-      class="mx_EventTile_button mx_EventTile_expandButton"
-    />
+      class="mx_EventTile_button"
+    >
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M21 3.997a1 1 0 0 0-.29-.702l-.005-.004A1 1 0 0 0 20 3h-8a1 1 0 1 0 0 2h5.586L5 17.586V12a1 1 0 1 0-2 0v8.003a1 1 0 0 0 .29.702l.005.004c.18.18.43.291.705.291h8a1 1 0 1 0 0-2H6.414L19 6.414V12a1 1 0 1 0 2 0z"
+        />
+      </svg>
+    </span>
     <div
       aria-label="Copy"
       class="mx_AccessibleButton mx_EventTile_button mx_EventTile_copyButton mx_EventTile_buttonBottom"
       role="button"
       tabindex="0"
-    />
+    >
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+        />
+        <path
+          d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+        />
+      </svg>
+    </div>
   </div>
   
 
@@ -510,9 +567,9 @@ exports[`<TextualBody /> renders plain-text m.text correctly linkification get a
 </div>
 `;
 
-exports[`<TextualBody /> renders plain-text m.text correctly should pillify a permalink to a message in the same room with the label »Message from Member« 1`] = `"Visit <bdi><a class="mx_Pill mx_EventPill" href="https://matrix.to/#/!room1:example.com/%event_id%"><span aria-label="Profile picture" aria-hidden="true" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_1qbcf_8 mx_BaseAvatar" style="--cpd-avatar-size: 16px;"><img loading="lazy" alt="" referrerpolicy="no-referrer" class="_image_1qbcf_41" data-type="round" width="16px" height="16px" src="mxc://avatar.url/image.png"></span><span class="mx_Pill_text">Message from Member</span></a></bdi>"`;
+exports[`<TextualBody /> renders plain-text m.text correctly should pillify a permalink to a message in the same room with the label »Message from Member« 1`] = `"Visit <bdi><a class="mx_Pill mx_EventPill" href="https://matrix.to/#/!room1:example.com/%event_id%"><span aria-label="Profile picture" aria-hidden="true" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_zysgz_8 mx_BaseAvatar" style="--cpd-avatar-size: 16px;"><img loading="lazy" alt="" referrerpolicy="no-referrer" class="_image_zysgz_43" data-type="round" width="16px" height="16px" src="mxc://avatar.url/image.png"></span><span class="mx_Pill_text">Message from Member</span></a></bdi>"`;
 
-exports[`<TextualBody /> renders plain-text m.text correctly should pillify a permalink to an event in another room with the label »Message in Room 2« 1`] = `"Visit <bdi><a class="mx_Pill mx_EventPill" href="https://matrix.to/#/!room2:example.com/%event_id%"><span aria-label="Avatar" aria-hidden="true" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_1qbcf_8 mx_BaseAvatar" style="--cpd-avatar-size: 16px;"><img loading="lazy" alt="" referrerpolicy="no-referrer" class="_image_1qbcf_41" data-type="round" width="16px" height="16px" src="mxc://avatar.url/room.png"></span><span class="mx_Pill_text">Message in Room 2</span></a></bdi>"`;
+exports[`<TextualBody /> renders plain-text m.text correctly should pillify a permalink to an event in another room with the label »Message in Room 2« 1`] = `"Visit <bdi><a class="mx_Pill mx_EventPill" href="https://matrix.to/#/!room2:example.com/%event_id%"><span aria-label="Avatar" aria-hidden="true" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_zysgz_8 mx_BaseAvatar" style="--cpd-avatar-size: 16px;"><img loading="lazy" alt="" referrerpolicy="no-referrer" class="_image_zysgz_43" data-type="round" width="16px" height="16px" src="mxc://avatar.url/room.png"></span><span class="mx_Pill_text">Message in Room 2</span></a></bdi>"`;
 
 exports[`<TextualBody /> renders plain-text m.text correctly should pillify a permalink to an unknown message in the same room with the label »Message« 1`] = `
 <div
diff --git a/test/unit-tests/components/views/messages/shared/__snapshots__/MediaProcessingError-test.tsx.snap b/test/unit-tests/components/views/messages/shared/__snapshots__/MediaProcessingError-test.tsx.snap
index 6b50edce75..f890c7228e 100644
--- a/test/unit-tests/components/views/messages/shared/__snapshots__/MediaProcessingError-test.tsx.snap
+++ b/test/unit-tests/components/views/messages/shared/__snapshots__/MediaProcessingError-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<MediaProcessingError /> renders 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/polls/pollHistory/PollListItemEnded-test.tsx b/test/unit-tests/components/views/polls/pollHistory/PollListItemEnded-test.tsx
index 219c616327..844f9e2cca 100644
--- a/test/unit-tests/components/views/polls/pollHistory/PollListItemEnded-test.tsx
+++ b/test/unit-tests/components/views/polls/pollHistory/PollListItemEnded-test.tsx
@@ -158,4 +158,53 @@ describe("<PollListItemEnded />", () => {
         expect(getByText("Nissan Silvia S15")).toBeInTheDocument();
         expect(queryByText("Mitsubishi Lancer Evolution IX")).not.toBeInTheDocument();
     });
+
+    it("maintains correct option numbers when only later answers win", async () => {
+        // Create a poll with 3 answers
+        const answerThree = {
+            id: "answerThreeId",
+            [M_TEXT.name]: "Toyota Supra MK4",
+        };
+        const pollStartEventThreeAnswers = makePollStartEvent(
+            "Question?",
+            userId,
+            [answerOne, answerTwo, answerThree],
+            {
+                roomId,
+                id: pollId,
+                ts: timestamp,
+            },
+        );
+
+        // Only answer 3 (index 2) wins with 2 votes, answers 1 and 2 (indices 0 and 1) get 0 or 1 votes
+        const responses = [
+            makePollResponseEvent(pollId, [answerOne.id], userId, roomId, timestamp + 1),
+            makePollResponseEvent(pollId, [answerThree.id], "@bob:domain.org", roomId, timestamp + 1),
+            makePollResponseEvent(pollId, [answerThree.id], "@charlie:domain.org", roomId, timestamp + 1),
+        ];
+
+        await setupRoomWithPollEvents([pollStartEventThreeAnswers], responses, [pollEndEvent], mockClient, room);
+        const poll = room.polls.get(pollId)!;
+
+        const { getByText, queryByText, findByText, getByTestId } = getComponent({
+            event: pollStartEventThreeAnswers,
+            poll,
+        });
+
+        await expect(findByText("Final result based on 3 votes")).resolves.toBeInTheDocument();
+
+        // Only the third answer should be shown (it won)
+        expect(queryByText("Nissan Silvia S15")).not.toBeInTheDocument();
+        expect(queryByText("Mitsubishi Lancer Evolution IX")).not.toBeInTheDocument();
+        expect(getByText("Toyota Supra MK4")).toBeInTheDocument();
+
+        // The option number should be 3 (original index 2 + 1), not 1
+        // PollOption component receives optionNumber prop which is used in its aria-label
+        const pollOption = getByTestId("pollOption-answerThreeId");
+        expect(pollOption).toBeInTheDocument();
+
+        // The optionNumber is maintained correctly
+        const radioInput = pollOption.querySelector('input[type="radio"]');
+        expect(radioInput).toHaveAttribute("aria-label", expect.stringContaining("Option 3, Toyota Supra MK4"));
+    });
 });
diff --git a/test/unit-tests/components/views/polls/pollHistory/__snapshots__/PollHistory-test.tsx.snap b/test/unit-tests/components/views/polls/pollHistory/__snapshots__/PollHistory-test.tsx.snap
index 89c4ff0ba2..7dbc54b7b2 100644
--- a/test/unit-tests/components/views/polls/pollHistory/__snapshots__/PollHistory-test.tsx.snap
+++ b/test/unit-tests/components/views/polls/pollHistory/__snapshots__/PollHistory-test.tsx.snap
@@ -1,19 +1,46 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<PollHistory /> Poll detail displays poll detail on active poll list item click 1`] = `
-<h2
+<legend
   data-testid="pollQuestion"
 >
+  <svg
+    aria-label="Poll"
+    fill="currentColor"
+    height="20"
+    viewBox="0 0 24 24"
+    width="20"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M16 10q.424 0 .712-.287A.97.97 0 0 0 17 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 8h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 9q0 .424.287.713.288.287.713.287zm0 6q.424 0 .712-.287A.97.97 0 0 0 17 15a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 14h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 15q0 .424.287.713.288.287.713.287zm-7-5q.825 0 1.412-.588Q11 9.826 11 9t-.588-1.412A1.93 1.93 0 0 0 9 7q-.825 0-1.412.588A1.93 1.93 0 0 0 7 9q0 .825.588 1.412Q8.175 11 9 11m0 6q.825 0 1.412-.587Q11 15.825 11 15t-.588-1.412A1.93 1.93 0 0 0 9 13q-.825 0-1.412.588A1.93 1.93 0 0 0 7 15q0 .824.588 1.413Q8.175 17 9 17m-4 4q-.824 0-1.412-.587A1.93 1.93 0 0 1 3 19V5q0-.824.587-1.412A1.93 1.93 0 0 1 5 3h14q.824 0 1.413.587Q21 4.176 21 5v14q0 .824-.587 1.413A1.93 1.93 0 0 1 19 21zm0-2h14V5H5z"
+    />
+  </svg>
   Question?
-</h2>
+</legend>
 `;
 
 exports[`<PollHistory /> Poll detail displays poll detail on past poll list item click 1`] = `
-<h2
+<legend
   data-testid="pollQuestion"
 >
+  <svg
+    aria-label="Poll ended"
+    fill="currentColor"
+    height="20"
+    viewBox="0 0 24 24"
+    width="20"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M21 10.659V19q0 .824-.587 1.413A1.93 1.93 0 0 1 19 21H5q-.824 0-1.412-.587A1.93 1.93 0 0 1 3 19V5q0-.824.587-1.412A1.93 1.93 0 0 1 5 3h8.341A6 6 0 0 0 13 5H5v14h14v-8a6 6 0 0 0 2-.341"
+    />
+    <path
+      d="M13.803 8a6 6 0 0 0 1.88 2H13a.97.97 0 0 1-.713-.287A.97.97 0 0 1 12 9q0-.424.287-.713A.97.97 0 0 1 13 8zm2.91 7.713A.97.97 0 0 1 16 16h-3a.97.97 0 0 1-.713-.287A.97.97 0 0 1 12 15q0-.424.287-.713A.97.97 0 0 1 13 14h3q.424 0 .712.287.288.288.288.713 0 .424-.288.713m-6.299-5.3A1.93 1.93 0 0 1 9 11q-.825 0-1.412-.588A1.93 1.93 0 0 1 7 9q0-.825.588-1.412A1.93 1.93 0 0 1 9 7q.825 0 1.412.588Q11 8.175 11 9t-.588 1.412m.001 6.001A1.93 1.93 0 0 1 9 17q-.825 0-1.412-.587A1.93 1.93 0 0 1 7 15q0-.825.588-1.412A1.93 1.93 0 0 1 9 13q.825 0 1.412.588Q11 14.175 11 15q0 .824-.588 1.413m12.295-14.12a1 1 0 0 1 0 1.414l-4 4a1 1 0 0 1-1.414 0l-2-2a1 1 0 0 1 1.414-1.414L18 5.586l3.293-3.293a1 1 0 0 1 1.414 0"
+    />
+  </svg>
   What?
-</h2>
+</legend>
 `;
 
 exports[`<PollHistory /> Poll detail navigates back to poll list from detail view on header click 1`] = `
@@ -91,15 +118,24 @@ exports[`<PollHistory /> renders a list of active polls when there are polls in
             tabindex="0"
           >
             <div
-              aria-labelledby="«ra»"
+              aria-labelledby="_r_a_"
               class="mx_PollListItem_content"
             >
               <span>
                 02/02/23
               </span>
-              <div
+              <svg
                 class="mx_PollListItem_icon"
-              />
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M16 10q.424 0 .712-.287A.97.97 0 0 0 17 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 8h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 9q0 .424.287.713.288.287.713.287zm0 6q.424 0 .712-.287A.97.97 0 0 0 17 15a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 14h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 15q0 .424.287.713.288.287.713.287zm-7-5q.825 0 1.412-.588Q11 9.826 11 9t-.588-1.412A1.93 1.93 0 0 0 9 7q-.825 0-1.412.588A1.93 1.93 0 0 0 7 9q0 .825.588 1.412Q8.175 11 9 11m0 6q.825 0 1.412-.587Q11 15.825 11 15t-.588-1.412A1.93 1.93 0 0 0 9 13q-.825 0-1.412.588A1.93 1.93 0 0 0 7 15q0 .824.588 1.413Q8.175 17 9 17m-4 4q-.824 0-1.412-.587A1.93 1.93 0 0 1 3 19V5q0-.824.587-1.412A1.93 1.93 0 0 1 5 3h14q.824 0 1.413.587Q21 4.176 21 5v14q0 .824-.587 1.413A1.93 1.93 0 0 1 19 21zm0-2h14V5H5z"
+                />
+              </svg>
               <span
                 class="mx_PollListItem_question"
               >
@@ -116,15 +152,24 @@ exports[`<PollHistory /> renders a list of active polls when there are polls in
             tabindex="0"
           >
             <div
-              aria-labelledby="«rf»"
+              aria-labelledby="_r_f_"
               class="mx_PollListItem_content"
             >
               <span>
                 02/02/23
               </span>
-              <div
+              <svg
                 class="mx_PollListItem_icon"
-              />
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M16 10q.424 0 .712-.287A.97.97 0 0 0 17 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 8h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 9q0 .424.287.713.288.287.713.287zm0 6q.424 0 .712-.287A.97.97 0 0 0 17 15a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 14h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 15q0 .424.287.713.288.287.713.287zm-7-5q.825 0 1.412-.588Q11 9.826 11 9t-.588-1.412A1.93 1.93 0 0 0 9 7q-.825 0-1.412.588A1.93 1.93 0 0 0 7 9q0 .825.588 1.412Q8.175 11 9 11m0 6q.825 0 1.412-.587Q11 15.825 11 15t-.588-1.412A1.93 1.93 0 0 0 9 13q-.825 0-1.412.588A1.93 1.93 0 0 0 7 15q0 .824.588 1.413Q8.175 17 9 17m-4 4q-.824 0-1.412-.587A1.93 1.93 0 0 1 3 19V5q0-.824.587-1.412A1.93 1.93 0 0 1 5 3h14q.824 0 1.413.587Q21 4.176 21 5v14q0 .824-.587 1.413A1.93 1.93 0 0 1 19 21zm0-2h14V5H5z"
+                />
+              </svg>
               <span
                 class="mx_PollListItem_question"
               >
@@ -146,15 +191,28 @@ exports[`<PollHistory /> renders a no polls message and a load more button when
   tabindex="0"
 >
   Load more polls
-  <div
+  <span
     class="mx_InlineSpinner"
   >
-    <div
+    <svg
       aria-label="Loading…"
-      class="mx_InlineSpinner_icon mx_Spinner_icon"
-      style="width: 16px; height: 16px;"
-    />
-  </div>
+      class="_icon_11k6c_18"
+      data-testid="spinner"
+      fill="currentColor"
+      height="1em"
+      role="progressbar"
+      style="width: 20px; height: 20px;"
+      viewBox="0 0 24 24"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        clip-rule="evenodd"
+        d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+        fill-rule="evenodd"
+      />
+    </svg>
+  </span>
 </div>
 `;
 
diff --git a/test/unit-tests/components/views/polls/pollHistory/__snapshots__/PollListItem-test.tsx.snap b/test/unit-tests/components/views/polls/pollHistory/__snapshots__/PollListItem-test.tsx.snap
index 3319ae3856..558e4ef98a 100644
--- a/test/unit-tests/components/views/polls/pollHistory/__snapshots__/PollListItem-test.tsx.snap
+++ b/test/unit-tests/components/views/polls/pollHistory/__snapshots__/PollListItem-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<PollListItem /> renders a poll 1`] = `
 <div>
@@ -10,15 +10,24 @@ exports[`<PollListItem /> renders a poll 1`] = `
       tabindex="0"
     >
       <div
-        aria-labelledby="«r0»"
+        aria-labelledby="_r_0_"
         class="mx_PollListItem_content"
       >
         <span>
           01/01/70
         </span>
-        <div
+        <svg
           class="mx_PollListItem_icon"
-        />
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M16 10q.424 0 .712-.287A.97.97 0 0 0 17 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 8h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 9q0 .424.287.713.288.287.713.287zm0 6q.424 0 .712-.287A.97.97 0 0 0 17 15a.97.97 0 0 0-.288-.713A.97.97 0 0 0 16 14h-3a.97.97 0 0 0-.713.287A.97.97 0 0 0 12 15q0 .424.287.713.288.287.713.287zm-7-5q.825 0 1.412-.588Q11 9.826 11 9t-.588-1.412A1.93 1.93 0 0 0 9 7q-.825 0-1.412.588A1.93 1.93 0 0 0 7 9q0 .825.588 1.412Q8.175 11 9 11m0 6q.825 0 1.412-.587Q11 15.825 11 15t-.588-1.412A1.93 1.93 0 0 0 9 13q-.825 0-1.412.588A1.93 1.93 0 0 0 7 15q0 .824.588 1.413Q8.175 17 9 17m-4 4q-.824 0-1.412-.587A1.93 1.93 0 0 1 3 19V5q0-.824.587-1.412A1.93 1.93 0 0 1 5 3h14q.824 0 1.413.587Q21 4.176 21 5v14q0 .824-.587 1.413A1.93 1.93 0 0 1 19 21zm0-2h14V5H5z"
+          />
+        </svg>
         <span
           class="mx_PollListItem_question"
         >
diff --git a/test/unit-tests/components/views/polls/pollHistory/__snapshots__/PollListItemEnded-test.tsx.snap b/test/unit-tests/components/views/polls/pollHistory/__snapshots__/PollListItemEnded-test.tsx.snap
index 1ae7a6b9d7..635ef0e140 100644
--- a/test/unit-tests/components/views/polls/pollHistory/__snapshots__/PollListItemEnded-test.tsx.snap
+++ b/test/unit-tests/components/views/polls/pollHistory/__snapshots__/PollListItemEnded-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<PollListItemEnded /> renders a poll with no responses 1`] = `
 <div>
@@ -10,15 +10,27 @@ exports[`<PollListItemEnded /> renders a poll with no responses 1`] = `
       tabindex="0"
     >
       <div
-        aria-labelledby="«r0»"
+        aria-labelledby="_r_0_"
         class="mx_PollListItemEnded_content"
       >
         <div
           class="mx_PollListItemEnded_title"
         >
-          <div
+          <svg
             class="mx_PollListItemEnded_icon"
-          />
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M21 10.659V19q0 .824-.587 1.413A1.93 1.93 0 0 1 19 21H5q-.824 0-1.412-.587A1.93 1.93 0 0 1 3 19V5q0-.824.587-1.412A1.93 1.93 0 0 1 5 3h8.341A6 6 0 0 0 13 5H5v14h14v-8a6 6 0 0 0 2-.341"
+            />
+            <path
+              d="M13.803 8a6 6 0 0 0 1.88 2H13a.97.97 0 0 1-.713-.287A.97.97 0 0 1 12 9q0-.424.287-.713A.97.97 0 0 1 13 8zm2.91 7.713A.97.97 0 0 1 16 16h-3a.97.97 0 0 1-.713-.287A.97.97 0 0 1 12 15q0-.424.287-.713A.97.97 0 0 1 13 14h3q.424 0 .712.287.288.288.288.713 0 .424-.288.713m-6.299-5.3A1.93 1.93 0 0 1 9 11q-.825 0-1.412-.588A1.93 1.93 0 0 1 7 9q0-.825.588-1.412A1.93 1.93 0 0 1 9 7q.825 0 1.412.588Q11 8.175 11 9t-.588 1.412m.001 6.001A1.93 1.93 0 0 1 9 17q-.825 0-1.412-.587A1.93 1.93 0 0 1 7 15q0-.825.588-1.412A1.93 1.93 0 0 1 9 13q.825 0 1.412.588Q11 14.175 11 15q0 .824-.588 1.413m12.295-14.12a1 1 0 0 1 0 1.414l-4 4a1 1 0 0 1-1.414 0l-2-2a1 1 0 0 1 1.414-1.414L18 5.586l3.293-3.293a1 1 0 0 1 1.414 0"
+            />
+          </svg>
           <span
             class="mx_PollListItemEnded_question"
           >
diff --git a/test/unit-tests/components/views/right_panel/UserInfo-test.tsx b/test/unit-tests/components/views/right_panel/UserInfo-test.tsx
index 1a58b1e2e0..47dc1826b5 100644
--- a/test/unit-tests/components/views/right_panel/UserInfo-test.tsx
+++ b/test/unit-tests/components/views/right_panel/UserInfo-test.tsx
@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
-import { fireEvent, render, screen, cleanup, act, waitForElementToBeRemoved, waitFor } from "jest-matrix-react";
+import { render, screen, act, waitForElementToBeRemoved } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
 import { type Mocked, mocked } from "jest-mock";
 import {
@@ -15,11 +15,10 @@ import {
     User,
     type MatrixClient,
     RoomMember,
-    MatrixEvent,
-    EventType,
     Device,
+    ProfileKeyTimezone,
+    ProfileKeyMSC4175Timezone,
 } from "matrix-js-sdk/src/matrix";
-import { KnownMembership } from "matrix-js-sdk/src/types";
 import { EventEmitter } from "events";
 import {
     UserVerificationStatus,
@@ -29,31 +28,16 @@ import {
     type CryptoApi,
 } from "matrix-js-sdk/src/crypto-api";
 
-import UserInfo, {
-    BanToggleButton,
-    disambiguateDevices,
-    getPowerLevels,
-    isMuted,
-    PowerLevelEditor,
-    RoomAdminToolsContainer,
-    RoomKickButton,
-    UserInfoHeader,
-    UserOptionsSection,
-} from "../../../../../src/components/views/right_panel/UserInfo";
-import dis from "../../../../../src/dispatcher/dispatcher";
+import UserInfo, { disambiguateDevices } from "../../../../../src/components/views/right_panel/UserInfo";
+import { getPowerLevels } from "../../../../../src/components/viewmodels/right_panel/user_info/UserInfoBasicViewModel";
 import { RightPanelPhases } from "../../../../../src/stores/right-panel/RightPanelStorePhases";
 import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
 import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
-import MultiInviter from "../../../../../src/utils/MultiInviter";
 import Modal from "../../../../../src/Modal";
-import { DirectoryMember, startDmOnFirstMessage } from "../../../../../src/utils/direct-messages";
 import { clearAllModals, flushPromises } from "../../../../test-utils";
 import ErrorDialog from "../../../../../src/components/views/dialogs/ErrorDialog";
 import { shouldShowComponent } from "../../../../../src/customisations/helpers/UIComponents";
 import { UIComponent } from "../../../../../src/settings/UIFeature";
-import { Action } from "../../../../../src/dispatcher/actions";
-import { ShareDialog } from "../../../../../src/components/views/dialogs/ShareDialog";
-import BulkRedactDialog from "../../../../../src/components/views/dialogs/BulkRedactDialog";
 
 jest.mock("../../../../../src/utils/direct-messages", () => ({
     ...jest.requireActual("../../../../../src/utils/direct-messages"),
@@ -92,7 +76,6 @@ const defaultUserId = "@user:example.com";
 const defaultUser = new User(defaultUserId);
 
 let mockRoom: Mocked<Room>;
-let mockSpace: Mocked<Room>;
 let mockClient: Mocked<MatrixClient>;
 let mockCrypto: Mocked<CryptoApi>;
 const origDate = global.Date.prototype.toLocaleString;
@@ -115,23 +98,6 @@ beforeEach(() => {
         getEventReadUpTo: jest.fn(),
     } as unknown as Room);
 
-    mockSpace = mocked({
-        roomId: defaultRoomId,
-        getType: jest.fn().mockReturnValue("m.space"),
-        isSpaceRoom: jest.fn().mockReturnValue(true),
-        getMember: jest.fn().mockReturnValue(undefined),
-        getMxcAvatarUrl: jest.fn().mockReturnValue("mock-avatar-url"),
-        name: "test room",
-        on: jest.fn(),
-        off: jest.fn(),
-        currentState: {
-            getStateEvents: jest.fn(),
-            on: jest.fn(),
-            off: jest.fn(),
-        },
-        getEventReadUpTo: jest.fn(),
-    } as unknown as Room);
-
     mockCrypto = mocked({
         getDeviceVerificationStatus: jest.fn(),
         getUserDeviceInfo: jest.fn(),
@@ -154,7 +120,7 @@ beforeEach(() => {
         isSynapseAdministrator: jest.fn().mockResolvedValue(false),
         doesServerSupportUnstableFeature: jest.fn().mockReturnValue(false),
         doesServerSupportExtendedProfiles: jest.fn().mockResolvedValue(false),
-        getExtendedProfileProperty: jest.fn().mockRejectedValue(new Error("Not supported")),
+        getExtendedProfile: jest.fn().mockRejectedValue(new Error("Not supported")),
         mxcUrlToHttp: jest.fn().mockReturnValue("mock-mxcUrlToHttp"),
         removeListener: jest.fn(),
         currentState: {
@@ -233,29 +199,31 @@ describe("<UserInfo />", () => {
             expect(screen.getByRole("heading", { name: defaultUserId })).toBeInTheDocument();
         });
 
-        it("renders user timezone if set", async () => {
-            // For timezone, force a consistent locale.
-            jest.spyOn(global.Date.prototype, "toLocaleString").mockImplementation(function (
-                this: Date,
-                _locale,
-                opts,
-            ) {
-                return origDate.call(this, "en-US", {
-                    ...opts,
-                    hourCycle: "h12",
+        describe.each([[ProfileKeyTimezone], [ProfileKeyMSC4175Timezone]])("timezone rendering (%s)", (profileKey) => {
+            it("renders user timezone if set", async () => {
+                // For timezone, force a consistent locale.
+                jest.spyOn(global.Date.prototype, "toLocaleString").mockImplementation(function (
+                    this: Date,
+                    _locale,
+                    opts,
+                ) {
+                    return origDate.call(this, "en-US", {
+                        ...opts,
+                        hourCycle: "h12",
+                    });
                 });
+                mockClient.doesServerSupportExtendedProfiles.mockResolvedValue(true);
+                mockClient.getExtendedProfile.mockResolvedValue({ [profileKey]: "Europe/London" });
+                renderComponent();
+                await expect(screen.findByText(/\d\d:\d\d (AM|PM)/)).resolves.toBeInTheDocument();
             });
-            mockClient.doesServerSupportExtendedProfiles.mockResolvedValue(true);
-            mockClient.getExtendedProfileProperty.mockResolvedValue("Europe/London");
-            renderComponent();
-            await expect(screen.findByText(/\d\d:\d\d (AM|PM)/)).resolves.toBeInTheDocument();
-        });
 
-        it("does not renders user timezone if timezone is invalid", async () => {
-            mockClient.doesServerSupportExtendedProfiles.mockResolvedValue(true);
-            mockClient.getExtendedProfileProperty.mockResolvedValue("invalid-tz");
-            renderComponent();
-            expect(screen.queryByText(/\d\d:\d\d (AM|PM)/)).not.toBeInTheDocument();
+            it("does not renders user timezone if timezone is invalid", async () => {
+                mockClient.doesServerSupportExtendedProfiles.mockResolvedValue(true);
+                mockClient.getExtendedProfile.mockResolvedValue({ [profileKey]: "invalid-tz" });
+                renderComponent();
+                expect(screen.queryByText(/\d\d:\d\d (AM|PM)/)).not.toBeInTheDocument();
+            });
         });
 
         it("renders encryption info panel without pending verification", () => {
@@ -473,711 +441,6 @@ describe("<UserInfo />", () => {
     });
 });
 
-describe("<UserInfoHeader />", () => {
-    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
-
-    const defaultProps = {
-        member: defaultMember,
-        roomId: defaultRoomId,
-    };
-
-    const renderComponent = (props = {}) => {
-        const device1 = new Device({
-            deviceId: "d1",
-            userId: defaultUserId,
-            displayName: "my device",
-            algorithms: [],
-            keys: new Map(),
-        });
-        const devicesMap = new Map<string, Device>([[device1.deviceId, device1]]);
-        const userDeviceMap = new Map<string, Map<string, Device>>([[defaultUserId, devicesMap]]);
-        mockCrypto.getUserDeviceInfo.mockResolvedValue(userDeviceMap);
-        mockClient.doesServerSupportUnstableFeature.mockResolvedValue(true);
-        const Wrapper = (wrapperProps = {}) => {
-            return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
-        };
-
-        return render(<UserInfoHeader {...defaultProps} {...props} devices={[device1]} />, {
-            wrapper: Wrapper,
-        });
-    };
-
-    it("renders custom user identifiers in the header", () => {
-        renderComponent();
-        expect(screen.getByText("customUserIdentifier")).toBeInTheDocument();
-    });
-
-    it("renders verified badge when user is verified", async () => {
-        mockCrypto.getUserVerificationStatus.mockResolvedValue(new UserVerificationStatus(true, true, false));
-        const { container } = renderComponent();
-        await waitFor(() => expect(screen.getByText("Verified")).toBeInTheDocument());
-        expect(container).toMatchSnapshot();
-    });
-
-    it("renders verify button", async () => {
-        mockCrypto.getUserVerificationStatus.mockResolvedValue(new UserVerificationStatus(false, false, false));
-        mockCrypto.userHasCrossSigningKeys.mockResolvedValue(true);
-        const { container } = renderComponent();
-        await waitFor(() => expect(screen.getByText("Verify User")).toBeInTheDocument());
-        expect(container).toMatchSnapshot();
-    });
-
-    it("renders verification unavailable message", async () => {
-        mockCrypto.getUserVerificationStatus.mockResolvedValue(new UserVerificationStatus(false, false, false));
-        mockCrypto.userHasCrossSigningKeys.mockResolvedValue(false);
-        const { container } = renderComponent();
-        await waitFor(() => expect(screen.getByText("(User verification unavailable)")).toBeInTheDocument());
-        expect(container).toMatchSnapshot();
-    });
-});
-
-describe("<UserOptionsSection />", () => {
-    const member = new RoomMember(defaultRoomId, defaultUserId);
-    const defaultProps = { member, canInvite: false, isSpace: false };
-
-    const renderComponent = (props = {}) => {
-        const Wrapper = (wrapperProps = {}) => {
-            return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
-        };
-
-        return render(<UserOptionsSection {...defaultProps} {...props} />, {
-            wrapper: Wrapper,
-        });
-    };
-
-    const inviteSpy = jest.spyOn(MultiInviter.prototype, "invite");
-
-    beforeEach(() => {
-        inviteSpy.mockReset();
-        mockClient.setIgnoredUsers.mockClear();
-    });
-
-    afterEach(async () => {
-        await clearAllModals();
-    });
-
-    afterAll(() => {
-        inviteSpy.mockRestore();
-    });
-
-    it("always shows share user button and clicking it should produce a ShareDialog", async () => {
-        const spy = jest.spyOn(Modal, "createDialog");
-
-        renderComponent();
-        await userEvent.click(screen.getByRole("button", { name: "Share profile" }));
-
-        expect(spy).toHaveBeenCalledWith(ShareDialog, { target: defaultProps.member });
-    });
-
-    it("does not show ignore or direct message buttons when member userId matches client userId", () => {
-        mockClient.getSafeUserId.mockReturnValueOnce(member.userId);
-        mockClient.getUserId.mockReturnValueOnce(member.userId);
-        renderComponent();
-
-        expect(screen.queryByRole("button", { name: /ignore/i })).not.toBeInTheDocument();
-        expect(screen.queryByRole("button", { name: /message/i })).not.toBeInTheDocument();
-    });
-
-    it("shows direct message and mention buttons when member userId does not match client userId", () => {
-        // call to client.getUserId returns undefined, which will not match member.userId
-        renderComponent();
-
-        expect(screen.getByRole("button", { name: "Send message" })).toBeInTheDocument();
-        expect(screen.getByRole("button", { name: "Mention" })).toBeInTheDocument();
-    });
-
-    it("mention button fires ComposerInsert Action", async () => {
-        renderComponent();
-
-        const button = screen.getByRole("button", { name: "Mention" });
-        await userEvent.click(button);
-        expect(dis.dispatch).toHaveBeenCalledWith({
-            action: Action.ComposerInsert,
-            timelineRenderingType: "Room",
-            userId: "@user:example.com",
-        });
-    });
-
-    it("when call to client.getRoom is null, shows disabled read receipt button", () => {
-        mockClient.getRoom.mockReturnValueOnce(null);
-        renderComponent();
-
-        expect(screen.queryByRole("button", { name: "Jump to read receipt" })).toBeDisabled();
-    });
-
-    it("when call to client.getRoom is non-null and room.getEventReadUpTo is null, shows disabled read receipt button", () => {
-        mockRoom.getEventReadUpTo.mockReturnValueOnce(null);
-        mockClient.getRoom.mockReturnValueOnce(mockRoom);
-        renderComponent();
-
-        expect(screen.queryByRole("button", { name: "Jump to read receipt" })).toBeDisabled();
-    });
-
-    it("when calls to client.getRoom and room.getEventReadUpTo are non-null, shows read receipt button", () => {
-        mockRoom.getEventReadUpTo.mockReturnValueOnce("1234");
-        mockClient.getRoom.mockReturnValueOnce(mockRoom);
-        renderComponent();
-
-        expect(screen.getByRole("button", { name: "Jump to read receipt" })).toBeInTheDocument();
-    });
-
-    it("clicking the read receipt button calls dispatch with correct event_id", async () => {
-        const mockEventId = "1234";
-        mockRoom.getEventReadUpTo.mockReturnValue(mockEventId);
-        mockClient.getRoom.mockReturnValue(mockRoom);
-        renderComponent();
-
-        const readReceiptButton = screen.getByRole("button", { name: "Jump to read receipt" });
-
-        expect(readReceiptButton).toBeInTheDocument();
-        await userEvent.click(readReceiptButton);
-        expect(dis.dispatch).toHaveBeenCalledWith({
-            action: "view_room",
-            event_id: mockEventId,
-            highlighted: true,
-            metricsTrigger: undefined,
-            room_id: "!fkfk",
-        });
-
-        mockRoom.getEventReadUpTo.mockReset();
-        mockClient.getRoom.mockReset();
-    });
-
-    it("firing the read receipt event handler with a null event_id calls dispatch with undefined not null", async () => {
-        const mockEventId = "1234";
-        // the first call is the check to see if we should render the button, second call is
-        // when the button is clicked
-        mockRoom.getEventReadUpTo.mockReturnValueOnce(mockEventId).mockReturnValueOnce(null);
-        mockClient.getRoom.mockReturnValue(mockRoom);
-        renderComponent();
-
-        const readReceiptButton = screen.getByRole("button", { name: "Jump to read receipt" });
-
-        expect(readReceiptButton).toBeInTheDocument();
-        await userEvent.click(readReceiptButton);
-        expect(dis.dispatch).toHaveBeenCalledWith({
-            action: "view_room",
-            event_id: undefined,
-            highlighted: true,
-            metricsTrigger: undefined,
-            room_id: "!fkfk",
-        });
-
-        mockClient.getRoom.mockReset();
-    });
-
-    it("does not show the invite button when canInvite is false", () => {
-        renderComponent();
-        expect(screen.queryByRole("button", { name: /invite/i })).not.toBeInTheDocument();
-    });
-
-    it("shows the invite button when canInvite is true", () => {
-        renderComponent({ canInvite: true });
-        expect(screen.getByRole("button", { name: /invite/i })).toBeInTheDocument();
-    });
-
-    it("clicking the invite button will call MultiInviter.invite", async () => {
-        // to save mocking, we will reject the call to .invite
-        const mockErrorMessage = new Error("test error message");
-        inviteSpy.mockRejectedValue(mockErrorMessage);
-
-        // render the component and click the button
-        renderComponent({ canInvite: true });
-        const inviteButton = screen.getByRole("button", { name: /invite/i });
-        expect(inviteButton).toBeInTheDocument();
-        await userEvent.click(inviteButton);
-
-        // check that we have called .invite
-        expect(inviteSpy).toHaveBeenCalledWith([member.userId]);
-
-        // check that the test error message is displayed
-        await expect(screen.findByText(mockErrorMessage.message)).resolves.toBeInTheDocument();
-    });
-
-    it("if calling .invite throws something strange, show default error message", async () => {
-        inviteSpy.mockRejectedValue({ this: "could be anything" });
-
-        // render the component and click the button
-        renderComponent({ canInvite: true });
-        const inviteButton = screen.getByRole("button", { name: /invite/i });
-        expect(inviteButton).toBeInTheDocument();
-        await userEvent.click(inviteButton);
-
-        // check that the default test error message is displayed
-        await expect(screen.findByText(/operation failed/i)).resolves.toBeInTheDocument();
-    });
-
-    it.each([
-        ["for a RoomMember", member, member.getMxcAvatarUrl()],
-        ["for a User", defaultUser, defaultUser.avatarUrl],
-    ])(
-        "clicking »message« %s should start a DM",
-        async (test: string, member: RoomMember | User, expectedAvatarUrl: string | undefined) => {
-            const deferred = Promise.withResolvers<string>();
-            mocked(startDmOnFirstMessage).mockReturnValue(deferred.promise);
-
-            renderComponent({ member });
-            await userEvent.click(screen.getByRole("button", { name: "Send message" }));
-
-            // Checking the attribute, because the button is a DIV and toBeDisabled() does not work.
-            expect(screen.getByRole("button", { name: "Send message" })).toBeDisabled();
-
-            expect(startDmOnFirstMessage).toHaveBeenCalledWith(mockClient, [
-                new DirectoryMember({
-                    user_id: member.userId,
-                    display_name: member.rawDisplayName,
-                    avatar_url: expectedAvatarUrl,
-                }),
-            ]);
-
-            await act(async () => {
-                deferred.resolve("!dm:example.com");
-                await flushPromises();
-            });
-
-            // Checking the attribute, because the button is a DIV and toBeDisabled() does not work.
-            expect(screen.getByRole("button", { name: "Send message" })).not.toBeDisabled();
-        },
-    );
-});
-
-describe("<PowerLevelEditor />", () => {
-    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
-
-    let defaultProps: Parameters<typeof PowerLevelEditor>[0];
-    beforeEach(() => {
-        defaultProps = {
-            user: defaultMember,
-            room: mockRoom,
-            roomPermissions: {
-                modifyLevelMax: 100,
-                canEdit: false,
-                canInvite: false,
-            },
-        };
-    });
-
-    const renderComponent = (props = {}) => {
-        const Wrapper = (wrapperProps = {}) => {
-            return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
-        };
-
-        return render(<PowerLevelEditor {...defaultProps} {...props} />, {
-            wrapper: Wrapper,
-        });
-    };
-
-    it("renders a power level combobox", () => {
-        renderComponent();
-
-        expect(screen.getByRole("combobox", { name: "Power level" })).toBeInTheDocument();
-    });
-
-    it("renders a combobox and attempts to change power level on change of the combobox", async () => {
-        const startPowerLevel = 999;
-        const powerLevelEvent = new MatrixEvent({
-            type: EventType.RoomPowerLevels,
-            content: { users: { [defaultUserId]: startPowerLevel }, users_default: 1 },
-        });
-        mockRoom.currentState.getStateEvents.mockReturnValue(powerLevelEvent);
-        mockClient.getSafeUserId.mockReturnValueOnce(defaultUserId);
-        mockClient.getUserId.mockReturnValueOnce(defaultUserId);
-        mockClient.setPowerLevel.mockResolvedValueOnce({ event_id: "123" });
-        renderComponent();
-
-        const changedPowerLevel = 100;
-
-        fireEvent.change(screen.getByRole("combobox", { name: "Power level" }), {
-            target: { value: changedPowerLevel },
-        });
-
-        await screen.findByText("Demote", { exact: true });
-
-        // firing the event will raise a dialog warning about self demotion, wait for this to appear then click on it
-        await userEvent.click(await screen.findByText("Demote", { exact: true }));
-        expect(mockClient.setPowerLevel).toHaveBeenCalledTimes(1);
-        expect(mockClient.setPowerLevel).toHaveBeenCalledWith(mockRoom.roomId, defaultMember.userId, changedPowerLevel);
-    });
-});
-
-describe("<RoomKickButton />", () => {
-    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
-    const memberWithInviteMembership = { ...defaultMember, membership: KnownMembership.Invite };
-    const memberWithJoinMembership = { ...defaultMember, membership: KnownMembership.Join };
-
-    let defaultProps: Parameters<typeof RoomKickButton>[0];
-    beforeEach(() => {
-        defaultProps = {
-            room: mockRoom,
-            member: defaultMember,
-            startUpdating: jest.fn(),
-            stopUpdating: jest.fn(),
-            isUpdating: false,
-        };
-    });
-
-    const renderComponent = (props = {}) => {
-        const Wrapper = (wrapperProps = {}) => {
-            return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
-        };
-
-        return render(<RoomKickButton {...defaultProps} {...props} />, {
-            wrapper: Wrapper,
-        });
-    };
-
-    const createDialogSpy: jest.SpyInstance = jest.spyOn(Modal, "createDialog");
-
-    afterEach(() => {
-        createDialogSpy.mockReset();
-    });
-
-    it("renders nothing if member.membership is undefined", () => {
-        // .membership is undefined in our member by default
-        const { container } = renderComponent();
-        expect(container).toBeEmptyDOMElement();
-    });
-
-    it("renders something if member.membership is 'invite' or 'join'", () => {
-        let result = renderComponent({ member: memberWithInviteMembership });
-        expect(result.container).not.toBeEmptyDOMElement();
-
-        cleanup();
-
-        result = renderComponent({ member: memberWithJoinMembership });
-        expect(result.container).not.toBeEmptyDOMElement();
-    });
-
-    it("renders the correct label", () => {
-        // test for room
-        renderComponent({ member: memberWithJoinMembership });
-        expect(screen.getByText(/remove from room/i)).toBeInTheDocument();
-        cleanup();
-
-        renderComponent({ member: memberWithInviteMembership });
-        expect(screen.getByText(/disinvite from room/i)).toBeInTheDocument();
-        cleanup();
-
-        // test for space
-        mockRoom.isSpaceRoom.mockReturnValue(true);
-        renderComponent({ member: memberWithJoinMembership });
-        expect(screen.getByText(/remove from space/i)).toBeInTheDocument();
-        cleanup();
-
-        renderComponent({ member: memberWithInviteMembership });
-        expect(screen.getByText(/disinvite from space/i)).toBeInTheDocument();
-        cleanup();
-        mockRoom.isSpaceRoom.mockReturnValue(false);
-    });
-
-    it("clicking the kick button calls Modal.createDialog with the correct arguments", async () => {
-        createDialogSpy.mockReturnValueOnce({ finished: Promise.resolve([]), close: jest.fn() });
-
-        renderComponent({ room: mockSpace, member: memberWithInviteMembership });
-        await userEvent.click(screen.getByText(/disinvite from/i));
-
-        // check the last call arguments and the presence of the spaceChildFilter callback
-        expect(createDialogSpy).toHaveBeenLastCalledWith(
-            expect.any(Function),
-            expect.objectContaining({ spaceChildFilter: expect.any(Function) }),
-            "mx_ConfirmSpaceUserActionDialog_wrapper",
-        );
-
-        // test the spaceChildFilter callback
-        const callback = createDialogSpy.mock.lastCall[1].spaceChildFilter;
-
-        // make dummy values for myMember and theirMember, then we will test
-        // null vs their member followed by
-        // my member vs their member
-        const mockMyMember = { powerLevel: 1 };
-        const mockTheirMember = { membership: KnownMembership.Invite, powerLevel: 0 };
-
-        const mockRoom = {
-            getMember: jest
-                .fn()
-                .mockReturnValueOnce(null)
-                .mockReturnValueOnce(mockTheirMember)
-                .mockReturnValueOnce(mockMyMember)
-                .mockReturnValueOnce(mockTheirMember),
-            currentState: {
-                hasSufficientPowerLevelFor: jest.fn().mockReturnValue(true),
-            },
-        };
-
-        expect(callback(mockRoom)).toBe(false);
-        expect(callback(mockRoom)).toBe(true);
-    });
-});
-
-describe("<BanToggleButton />", () => {
-    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
-    const memberWithBanMembership = { ...defaultMember, membership: KnownMembership.Ban };
-    let defaultProps: Parameters<typeof BanToggleButton>[0];
-    beforeEach(() => {
-        defaultProps = {
-            room: mockRoom,
-            member: defaultMember,
-            startUpdating: jest.fn(),
-            stopUpdating: jest.fn(),
-            isUpdating: false,
-        };
-    });
-
-    const renderComponent = (props = {}) => {
-        const Wrapper = (wrapperProps = {}) => {
-            return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
-        };
-
-        return render(<BanToggleButton {...defaultProps} {...props} />, {
-            wrapper: Wrapper,
-        });
-    };
-
-    const createDialogSpy: jest.SpyInstance = jest.spyOn(Modal, "createDialog");
-
-    afterEach(() => {
-        createDialogSpy.mockReset();
-    });
-
-    it("renders the correct labels for banned and unbanned members", () => {
-        // test for room
-        // defaultMember is not banned
-        renderComponent();
-        expect(screen.getByText("Ban from room")).toBeInTheDocument();
-        cleanup();
-
-        renderComponent({ member: memberWithBanMembership });
-        expect(screen.getByText("Unban from room")).toBeInTheDocument();
-        cleanup();
-
-        // test for space
-        mockRoom.isSpaceRoom.mockReturnValue(true);
-        renderComponent();
-        expect(screen.getByText("Ban from space")).toBeInTheDocument();
-        cleanup();
-
-        renderComponent({ member: memberWithBanMembership });
-        expect(screen.getByText("Unban from space")).toBeInTheDocument();
-        cleanup();
-        mockRoom.isSpaceRoom.mockReturnValue(false);
-    });
-
-    it("clicking the ban or unban button calls Modal.createDialog with the correct arguments if user is not banned", async () => {
-        createDialogSpy.mockReturnValueOnce({ finished: Promise.resolve([]), close: jest.fn() });
-
-        renderComponent({ room: mockSpace });
-        await userEvent.click(screen.getByText(/ban from/i));
-
-        // check the last call arguments and the presence of the spaceChildFilter callback
-        expect(createDialogSpy).toHaveBeenLastCalledWith(
-            expect.any(Function),
-            expect.objectContaining({ spaceChildFilter: expect.any(Function) }),
-            "mx_ConfirmSpaceUserActionDialog_wrapper",
-        );
-
-        // test the spaceChildFilter callback
-        const callback = createDialogSpy.mock.lastCall[1].spaceChildFilter;
-
-        // make dummy values for myMember and theirMember, then we will test
-        // null vs their member followed by
-        // truthy my member vs their member
-        const mockMyMember = { powerLevel: 1 };
-        const mockTheirMember = { membership: "is not ban", powerLevel: 0 };
-
-        const mockRoom = {
-            getMember: jest
-                .fn()
-                .mockReturnValueOnce(null)
-                .mockReturnValueOnce(mockTheirMember)
-                .mockReturnValueOnce(mockMyMember)
-                .mockReturnValueOnce(mockTheirMember),
-            currentState: {
-                hasSufficientPowerLevelFor: jest.fn().mockReturnValue(true),
-            },
-        };
-
-        expect(callback(mockRoom)).toBe(false);
-        expect(callback(mockRoom)).toBe(true);
-    });
-
-    it("clicking the ban or unban button calls Modal.createDialog with the correct arguments if user _is_ banned", async () => {
-        createDialogSpy.mockReturnValueOnce({ finished: Promise.resolve([]), close: jest.fn() });
-
-        renderComponent({ room: mockSpace, member: memberWithBanMembership });
-        await userEvent.click(screen.getByText(/ban from/i));
-
-        // check the last call arguments and the presence of the spaceChildFilter callback
-        expect(createDialogSpy).toHaveBeenLastCalledWith(
-            expect.any(Function),
-            expect.objectContaining({ spaceChildFilter: expect.any(Function) }),
-            "mx_ConfirmSpaceUserActionDialog_wrapper",
-        );
-
-        // test the spaceChildFilter callback
-        const callback = createDialogSpy.mock.lastCall[1].spaceChildFilter;
-
-        // make dummy values for myMember and theirMember, then we will test
-        // null vs their member followed by
-        // my member vs their member
-        const mockMyMember = { powerLevel: 1 };
-        const mockTheirMember = { membership: KnownMembership.Ban, powerLevel: 0 };
-
-        const mockRoom = {
-            getMember: jest
-                .fn()
-                .mockReturnValueOnce(null)
-                .mockReturnValueOnce(mockTheirMember)
-                .mockReturnValueOnce(mockMyMember)
-                .mockReturnValueOnce(mockTheirMember),
-            currentState: {
-                hasSufficientPowerLevelFor: jest.fn().mockReturnValue(true),
-            },
-        };
-
-        expect(callback(mockRoom)).toBe(false);
-        expect(callback(mockRoom)).toBe(true);
-    });
-});
-
-describe("<RoomAdminToolsContainer />", () => {
-    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
-    defaultMember.membership = KnownMembership.Invite;
-
-    let defaultProps: Parameters<typeof RoomAdminToolsContainer>[0];
-    beforeEach(() => {
-        defaultProps = {
-            room: mockRoom,
-            member: defaultMember,
-            isUpdating: false,
-            startUpdating: jest.fn(),
-            stopUpdating: jest.fn(),
-            powerLevels: {},
-        };
-    });
-
-    const renderComponent = (props = {}) => {
-        const Wrapper = (wrapperProps = {}) => {
-            return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
-        };
-
-        return render(<RoomAdminToolsContainer {...defaultProps} {...props} />, {
-            wrapper: Wrapper,
-        });
-    };
-
-    it("returns a single empty div if room.getMember is falsy", () => {
-        const { asFragment } = renderComponent();
-        expect(asFragment()).toMatchInlineSnapshot(`
-            <DocumentFragment>
-              <div />
-            </DocumentFragment>
-        `);
-    });
-
-    it("can return a single empty div in case where room.getMember is not falsy", () => {
-        mockRoom.getMember.mockReturnValueOnce(defaultMember);
-        const { asFragment } = renderComponent();
-        expect(asFragment()).toMatchInlineSnapshot(`
-            <DocumentFragment>
-              <div />
-            </DocumentFragment>
-        `);
-    });
-
-    it("returns kick, redact messages, ban buttons if conditions met", () => {
-        const mockMeMember = new RoomMember(mockRoom.roomId, "arbitraryId");
-        mockMeMember.powerLevel = 51; // defaults to 50
-        mockRoom.getMember.mockReturnValueOnce(mockMeMember);
-
-        const defaultMemberWithPowerLevel = { ...defaultMember, powerLevel: 0 };
-
-        renderComponent({ member: defaultMemberWithPowerLevel });
-
-        expect(screen.getByRole("button", { name: "Disinvite from room" })).toBeInTheDocument();
-        expect(screen.getByRole("button", { name: "Ban from room" })).toBeInTheDocument();
-        expect(screen.getByRole("button", { name: "Remove messages" })).toBeInTheDocument();
-    });
-
-    it("should show BulkRedactDialog upon clicking the Remove messages button", async () => {
-        const spy = jest.spyOn(Modal, "createDialog");
-
-        mockClient.getRoom.mockReturnValue(mockRoom);
-        mockClient.getUserId.mockReturnValue("@arbitraryId:server");
-        const mockMeMember = new RoomMember(mockRoom.roomId, mockClient.getUserId()!);
-        mockMeMember.powerLevel = 51; // defaults to 50
-        const defaultMemberWithPowerLevel = { ...defaultMember, powerLevel: 0 } as RoomMember;
-        mockRoom.getMember.mockImplementation((userId) =>
-            userId === mockClient.getUserId() ? mockMeMember : defaultMemberWithPowerLevel,
-        );
-
-        renderComponent({ member: defaultMemberWithPowerLevel });
-        await userEvent.click(screen.getByRole("button", { name: "Remove messages" }));
-
-        expect(spy).toHaveBeenCalledWith(
-            BulkRedactDialog,
-            expect.objectContaining({ member: defaultMemberWithPowerLevel }),
-        );
-    });
-
-    it("returns mute toggle button if conditions met", () => {
-        const mockMeMember = new RoomMember(mockRoom.roomId, "arbitraryId");
-        mockMeMember.powerLevel = 51; // defaults to 50
-        mockRoom.getMember.mockReturnValueOnce(mockMeMember);
-
-        const defaultMemberWithPowerLevelAndJoinMembership = {
-            ...defaultMember,
-            powerLevel: 0,
-            membership: KnownMembership.Join,
-        };
-
-        renderComponent({
-            member: defaultMemberWithPowerLevelAndJoinMembership,
-            powerLevels: { events: { "m.room.power_levels": 1 } },
-        });
-
-        const button = screen.getByText(/mute/i);
-        expect(button).toBeInTheDocument();
-        fireEvent.click(button);
-        expect(defaultProps.startUpdating).toHaveBeenCalled();
-    });
-
-    it("should disable buttons when isUpdating=true", () => {
-        const mockMeMember = new RoomMember(mockRoom.roomId, "arbitraryId");
-        mockMeMember.powerLevel = 51; // defaults to 50
-        mockRoom.getMember.mockReturnValueOnce(mockMeMember);
-
-        const defaultMemberWithPowerLevelAndJoinMembership = {
-            ...defaultMember,
-            powerLevel: 0,
-            membership: KnownMembership.Join,
-        };
-
-        renderComponent({
-            member: defaultMemberWithPowerLevelAndJoinMembership,
-            powerLevels: { events: { "m.room.power_levels": 1 } },
-            isUpdating: true,
-        });
-
-        const button = screen.getByRole("button", { name: "Mute" });
-        expect(button).toBeInTheDocument();
-        expect(button).toBeDisabled();
-    });
-
-    it("should not show mute button for one's own member", () => {
-        const mockMeMember = new RoomMember(mockRoom.roomId, mockClient.getSafeUserId());
-        mockMeMember.powerLevel = 51; // defaults to 50
-        mockRoom.getMember.mockReturnValueOnce(mockMeMember);
-
-        renderComponent({
-            member: mockMeMember,
-            powerLevels: { events: { "m.room.power_levels": 100 } },
-        });
-
-        const button = screen.queryByText(/mute/i);
-        expect(button).not.toBeInTheDocument();
-    });
-});
-
 describe("disambiguateDevices", () => {
     it("does not add ambiguous key to unique names", () => {
         const initialDevices = [
@@ -1217,47 +480,6 @@ describe("disambiguateDevices", () => {
     });
 });
 
-describe("isMuted", () => {
-    // this member has a power level of 0
-    const isMutedMember = new RoomMember(defaultRoomId, defaultUserId);
-
-    it("returns false if either argument is falsy", () => {
-        // @ts-ignore to let us purposely pass incorrect args
-        expect(isMuted(isMutedMember, null)).toBe(false);
-        // @ts-ignore to let us purposely pass incorrect args
-        expect(isMuted(null, {})).toBe(false);
-    });
-
-    it("when powerLevelContent.events and .events_default are undefined, returns false", () => {
-        const powerLevelContents = {};
-        expect(isMuted(isMutedMember, powerLevelContents)).toBe(false);
-    });
-
-    it("when powerLevelContent.events is undefined, uses .events_default", () => {
-        const higherPowerLevelContents = { events_default: 10 };
-        expect(isMuted(isMutedMember, higherPowerLevelContents)).toBe(true);
-
-        const lowerPowerLevelContents = { events_default: -10 };
-        expect(isMuted(isMutedMember, lowerPowerLevelContents)).toBe(false);
-    });
-
-    it("when powerLevelContent.events is defined but '.m.room.message' isn't, uses .events_default", () => {
-        const higherPowerLevelContents = { events: {}, events_default: 10 };
-        expect(isMuted(isMutedMember, higherPowerLevelContents)).toBe(true);
-
-        const lowerPowerLevelContents = { events: {}, events_default: -10 };
-        expect(isMuted(isMutedMember, lowerPowerLevelContents)).toBe(false);
-    });
-
-    it("when powerLevelContent.events and '.m.room.message' are defined, uses the value", () => {
-        const higherPowerLevelContents = { events: { "m.room.message": -10 }, events_default: 10 };
-        expect(isMuted(isMutedMember, higherPowerLevelContents)).toBe(false);
-
-        const lowerPowerLevelContents = { events: { "m.room.message": 10 }, events_default: -10 };
-        expect(isMuted(isMutedMember, lowerPowerLevelContents)).toBe(true);
-    });
-});
-
 describe("getPowerLevels", () => {
     it("returns an empty object when room.currentState.getStateEvents return null", () => {
         mockRoom.currentState.getStateEvents.mockReturnValueOnce(null);
diff --git a/test/unit-tests/components/views/right_panel/__snapshots__/BaseCard-test.tsx.snap b/test/unit-tests/components/views/right_panel/__snapshots__/BaseCard-test.tsx.snap
index ef91df63af..284997b93a 100644
--- a/test/unit-tests/components/views/right_panel/__snapshots__/BaseCard-test.tsx.snap
+++ b/test/unit-tests/components/views/right_panel/__snapshots__/BaseCard-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<BaseCard /> should close when clicking X button 1`] = `
 <DocumentFragment>
@@ -19,15 +19,16 @@ exports[`<BaseCard /> should close when clicking X button 1`] = `
         </p>
       </div>
       <button
-        aria-labelledby="«r0»"
-        class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+        aria-labelledby="_r_0_"
+        class="_icon-button_1pz9o_8"
+        data-kind="secondary"
         data-testid="base-card-close-button"
         role="button"
         style="--cpd-icon-button-size: 28px;"
         tabindex="0"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
diff --git a/test/unit-tests/components/views/right_panel/__snapshots__/ExtensionsCard-test.tsx.snap b/test/unit-tests/components/views/right_panel/__snapshots__/ExtensionsCard-test.tsx.snap
index b3a84240f0..5041fa294c 100644
--- a/test/unit-tests/components/views/right_panel/__snapshots__/ExtensionsCard-test.tsx.snap
+++ b/test/unit-tests/components/views/right_panel/__snapshots__/ExtensionsCard-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<ExtensionsCard /> should render empty state 1`] = `
 <DocumentFragment>
@@ -19,15 +19,16 @@ exports[`<ExtensionsCard /> should render empty state 1`] = `
         </p>
       </div>
       <button
-        aria-labelledby="«r0»"
-        class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+        aria-labelledby="_r_0_"
+        class="_icon-button_1pz9o_8"
+        data-kind="secondary"
         data-testid="base-card-close-button"
         role="button"
         style="--cpd-icon-button-size: 28px;"
         tabindex="0"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -49,7 +50,7 @@ exports[`<ExtensionsCard /> should render empty state 1`] = `
       tabindex="-1"
     >
       <button
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="secondary"
         data-size="sm"
         role="button"
@@ -70,7 +71,7 @@ exports[`<ExtensionsCard /> should render empty state 1`] = `
         Add extensions
       </button>
       <div
-        class="mx_Flex mx_EmptyState"
+        class="_flex_4dswl_9 mx_EmptyState"
         style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-4x); --mx-flex-wrap: nowrap;"
       >
         <svg
@@ -119,15 +120,16 @@ exports[`<ExtensionsCard /> should render widgets 1`] = `
         </p>
       </div>
       <button
-        aria-labelledby="«r6»"
-        class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+        aria-labelledby="_r_6_"
+        class="_icon-button_1pz9o_8"
+        data-kind="secondary"
         data-testid="base-card-close-button"
         role="button"
         style="--cpd-icon-button-size: 28px;"
         tabindex="0"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -149,7 +151,7 @@ exports[`<ExtensionsCard /> should render widgets 1`] = `
       tabindex="-1"
     >
       <button
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="secondary"
         data-size="sm"
         role="button"
@@ -170,7 +172,7 @@ exports[`<ExtensionsCard /> should render widgets 1`] = `
         Add extensions
       </button>
       <div
-        class="_separator_7ckbw_8"
+        class="_separator_cqpyv_8"
         data-kind="primary"
         data-orientation="horizontal"
         role="separator"
@@ -185,15 +187,16 @@ exports[`<ExtensionsCard /> should render widgets 1`] = `
         >
           <span
             aria-label="Avatar"
-            class="_avatar_1qbcf_8 mx_BaseAvatar mx_WidgetAvatar"
+            class="_avatar_zysgz_8 mx_BaseAvatar mx_WidgetAvatar"
             data-color="1"
             data-testid="avatar-img"
             data-type="round"
+            role="img"
             style="--cpd-avatar-size: 24px;"
           >
             <img
               alt=""
-              class="_image_1qbcf_41"
+              class="_image_zysgz_43"
               data-type="round"
               height="24px"
               loading="lazy"
@@ -225,15 +228,16 @@ exports[`<ExtensionsCard /> should render widgets 1`] = `
         >
           <span
             aria-label="Avatar"
-            class="_avatar_1qbcf_8 mx_BaseAvatar mx_WidgetAvatar"
+            class="_avatar_zysgz_8 mx_BaseAvatar mx_WidgetAvatar"
             data-color="1"
             data-testid="avatar-img"
             data-type="round"
+            role="img"
             style="--cpd-avatar-size: 24px;"
           >
             <img
               alt=""
-              class="_image_1qbcf_41"
+              class="_image_zysgz_43"
               data-type="round"
               height="24px"
               loading="lazy"
diff --git a/test/unit-tests/components/views/right_panel/__snapshots__/PinnedMessagesCard-test.tsx.snap b/test/unit-tests/components/views/right_panel/__snapshots__/PinnedMessagesCard-test.tsx.snap
index e0052d818c..5d528a853c 100644
--- a/test/unit-tests/components/views/right_panel/__snapshots__/PinnedMessagesCard-test.tsx.snap
+++ b/test/unit-tests/components/views/right_panel/__snapshots__/PinnedMessagesCard-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<PinnedMessagesCard /> should show the empty state when there are no pins 1`] = `
 <DocumentFragment>
@@ -19,15 +19,16 @@ exports[`<PinnedMessagesCard /> should show the empty state when there are no pi
         </p>
       </div>
       <button
-        aria-labelledby="«re»"
-        class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+        aria-labelledby="_r_f_"
+        class="_icon-button_1pz9o_8"
+        data-kind="secondary"
         data-testid="base-card-close-button"
         role="button"
         style="--cpd-icon-button-size: 28px;"
         tabindex="0"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -49,7 +50,7 @@ exports[`<PinnedMessagesCard /> should show the empty state when there are no pi
       tabindex="-1"
     >
       <div
-        class="mx_Flex mx_EmptyState"
+        class="_flex_4dswl_9 mx_EmptyState"
         style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-4x); --mx-flex-wrap: nowrap;"
       >
         <svg
@@ -100,15 +101,16 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
         </p>
       </div>
       <button
-        aria-labelledby="«rk»"
-        class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+        aria-labelledby="_r_l_"
+        class="_icon-button_1pz9o_8"
+        data-kind="secondary"
         data-testid="base-card-close-button"
         role="button"
         style="--cpd-icon-button-size: 28px;"
         tabindex="0"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -139,7 +141,7 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
         >
           <div>
             <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar mx_PinnedEventTile_senderAvatar _avatar-imageless_1qbcf_52"
+              class="_avatar_zysgz_8 mx_BaseAvatar mx_PinnedEventTile_senderAvatar _avatar-imageless_zysgz_55"
               data-color="3"
               data-testid="avatar-img"
               data-type="round"
@@ -157,26 +159,28 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
               class="mx_PinnedEventTile_top"
             >
               <span
-                aria-labelledby="«rq»"
+                aria-labelledby="_r_s_"
                 class="mx_PinnedEventTile_sender mx_Username_color3"
               >
                 @alice:example.org
               </span>
               <button
+                aria-describedby="_r_r_"
                 aria-disabled="false"
                 aria-expanded="false"
                 aria-haspopup="menu"
                 aria-label="Open menu"
-                class="_icon-button_m2erp_8"
+                class="_icon-button_1pz9o_8"
+                data-kind="primary"
                 data-state="closed"
-                id="radix-«rv»"
+                id="radix-_r_11_"
                 role="button"
                 style="--cpd-icon-button-size: 24px;"
                 tabindex="0"
                 type="button"
               >
                 <div
-                  class="_indicator-icon_zr2a0_17"
+                  class="_indicator-icon_147l5_17"
                   style="--cpd-icon-button-size: 100%;"
                 >
                   <svg
@@ -195,6 +199,7 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
             </div>
             <div
               class="mx_MTextBody mx_EventTile_content"
+              id="_r_r_"
             >
               <div
                 class="mx_EventTile_body translate"
@@ -206,7 +211,7 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
           </div>
         </div>
         <div
-          class="_separator_7ckbw_8 mx_PinnedMessagesCard_Separator"
+          class="_separator_cqpyv_8 mx_PinnedMessagesCard_Separator"
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
@@ -217,7 +222,7 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
         >
           <div>
             <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar mx_PinnedEventTile_senderAvatar _avatar-imageless_1qbcf_52"
+              class="_avatar_zysgz_8 mx_BaseAvatar mx_PinnedEventTile_senderAvatar _avatar-imageless_zysgz_55"
               data-color="3"
               data-testid="avatar-img"
               data-type="round"
@@ -235,26 +240,28 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
               class="mx_PinnedEventTile_top"
             >
               <span
-                aria-labelledby="«r11»"
+                aria-labelledby="_r_14_"
                 class="mx_PinnedEventTile_sender mx_Username_color3"
               >
                 @alice:example.org
               </span>
               <button
+                aria-describedby="_r_13_"
                 aria-disabled="false"
                 aria-expanded="false"
                 aria-haspopup="menu"
                 aria-label="Open menu"
-                class="_icon-button_m2erp_8"
+                class="_icon-button_1pz9o_8"
+                data-kind="primary"
                 data-state="closed"
-                id="radix-«r16»"
+                id="radix-_r_19_"
                 role="button"
                 style="--cpd-icon-button-size: 24px;"
                 tabindex="0"
                 type="button"
               >
                 <div
-                  class="_indicator-icon_zr2a0_17"
+                  class="_indicator-icon_147l5_17"
                   style="--cpd-icon-button-size: 100%;"
                 >
                   <svg
@@ -273,6 +280,7 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
             </div>
             <div
               class="mx_MTextBody mx_EventTile_content"
+              id="_r_13_"
             >
               <div
                 class="mx_EventTile_body translate"
@@ -288,7 +296,7 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
         class="mx_PinnedMessagesCard_unpin"
       >
         <button
-          class="_button_vczzf_8"
+          class="_button_187yx_8"
           data-kind="tertiary"
           data-size="lg"
           role="button"
@@ -321,15 +329,16 @@ exports[`<PinnedMessagesCard /> unpin all should not allow to unpinall 1`] = `
         </p>
       </div>
       <button
-        aria-labelledby="«rt2»"
-        class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+        aria-labelledby="_r_10f_"
+        class="_icon-button_1pz9o_8"
+        data-kind="secondary"
         data-testid="base-card-close-button"
         role="button"
         style="--cpd-icon-button-size: 28px;"
         tabindex="0"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -360,7 +369,7 @@ exports[`<PinnedMessagesCard /> unpin all should not allow to unpinall 1`] = `
         >
           <div>
             <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar mx_PinnedEventTile_senderAvatar _avatar-imageless_1qbcf_52"
+              class="_avatar_zysgz_8 mx_BaseAvatar mx_PinnedEventTile_senderAvatar _avatar-imageless_zysgz_55"
               data-color="3"
               data-testid="avatar-img"
               data-type="round"
@@ -378,26 +387,28 @@ exports[`<PinnedMessagesCard /> unpin all should not allow to unpinall 1`] = `
               class="mx_PinnedEventTile_top"
             >
               <span
-                aria-labelledby="«rt8»"
+                aria-labelledby="_r_10m_"
                 class="mx_PinnedEventTile_sender mx_Username_color3"
               >
                 @alice:example.org
               </span>
               <button
+                aria-describedby="_r_10l_"
                 aria-disabled="false"
                 aria-expanded="false"
                 aria-haspopup="menu"
                 aria-label="Open menu"
-                class="_icon-button_m2erp_8"
+                class="_icon-button_1pz9o_8"
+                data-kind="primary"
                 data-state="closed"
-                id="radix-«rtd»"
+                id="radix-_r_10r_"
                 role="button"
                 style="--cpd-icon-button-size: 24px;"
                 tabindex="0"
                 type="button"
               >
                 <div
-                  class="_indicator-icon_zr2a0_17"
+                  class="_indicator-icon_147l5_17"
                   style="--cpd-icon-button-size: 100%;"
                 >
                   <svg
@@ -416,6 +427,7 @@ exports[`<PinnedMessagesCard /> unpin all should not allow to unpinall 1`] = `
             </div>
             <div
               class="mx_MTextBody mx_EventTile_content"
+              id="_r_10l_"
             >
               <div
                 class="mx_EventTile_body translate"
@@ -427,7 +439,7 @@ exports[`<PinnedMessagesCard /> unpin all should not allow to unpinall 1`] = `
           </div>
         </div>
         <div
-          class="_separator_7ckbw_8 mx_PinnedMessagesCard_Separator"
+          class="_separator_cqpyv_8 mx_PinnedMessagesCard_Separator"
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
@@ -438,7 +450,7 @@ exports[`<PinnedMessagesCard /> unpin all should not allow to unpinall 1`] = `
         >
           <div>
             <span
-              class="_avatar_1qbcf_8 mx_BaseAvatar mx_PinnedEventTile_senderAvatar _avatar-imageless_1qbcf_52"
+              class="_avatar_zysgz_8 mx_BaseAvatar mx_PinnedEventTile_senderAvatar _avatar-imageless_zysgz_55"
               data-color="3"
               data-testid="avatar-img"
               data-type="round"
@@ -456,26 +468,28 @@ exports[`<PinnedMessagesCard /> unpin all should not allow to unpinall 1`] = `
               class="mx_PinnedEventTile_top"
             >
               <span
-                aria-labelledby="«rtf»"
+                aria-labelledby="_r_10u_"
                 class="mx_PinnedEventTile_sender mx_Username_color3"
               >
                 @alice:example.org
               </span>
               <button
+                aria-describedby="_r_10t_"
                 aria-disabled="false"
                 aria-expanded="false"
                 aria-haspopup="menu"
                 aria-label="Open menu"
-                class="_icon-button_m2erp_8"
+                class="_icon-button_1pz9o_8"
+                data-kind="primary"
                 data-state="closed"
-                id="radix-«rtk»"
+                id="radix-_r_113_"
                 role="button"
                 style="--cpd-icon-button-size: 24px;"
                 tabindex="0"
                 type="button"
               >
                 <div
-                  class="_indicator-icon_zr2a0_17"
+                  class="_indicator-icon_147l5_17"
                   style="--cpd-icon-button-size: 100%;"
                 >
                   <svg
@@ -494,6 +508,7 @@ exports[`<PinnedMessagesCard /> unpin all should not allow to unpinall 1`] = `
             </div>
             <div
               class="mx_MTextBody mx_EventTile_content"
+              id="_r_10t_"
             >
               <div
                 class="mx_EventTile_body translate"
diff --git a/test/unit-tests/components/views/right_panel/__snapshots__/RoomSummaryCardView-test.tsx.snap b/test/unit-tests/components/views/right_panel/__snapshots__/RoomSummaryCardView-test.tsx.snap
index 10e9ae776d..350de43185 100644
--- a/test/unit-tests/components/views/right_panel/__snapshots__/RoomSummaryCardView-test.tsx.snap
+++ b/test/unit-tests/components/views/right_panel/__snapshots__/RoomSummaryCardView-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
 <div>
@@ -10,21 +10,21 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
   >
     <div
       class="mx_BaseCard_header"
-      data-floating-ui-inert=""
     >
       <div
         class="mx_BaseCard_header_spacer"
       />
       <button
-        aria-labelledby="«rq»"
-        class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+        aria-labelledby="_r_e_"
+        class="_icon-button_1pz9o_8"
+        data-kind="secondary"
         data-testid="base-card-close-button"
         role="button"
         style="--cpd-icon-button-size: 28px;"
         tabindex="0"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -47,10 +47,9 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
     >
       <header
         class="mx_RoomSummaryCard_container"
-        data-floating-ui-inert=""
       >
         <span
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
           data-color="1"
           data-testid="avatar-img"
           data-type="round"
@@ -70,14 +69,15 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
           title=""
         />
         <section
-          class="mx_Flex mx_RoomSummaryCard_badges"
+          class="_flex_4dswl_9 mx_RoomSummaryCard_badges"
           style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
         >
           <span
-            class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_1t12g_8"
-            data-kind="grey"
+            class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_18gm1_8"
+            data-kind="blue"
           >
             <svg
+              color="var(--cpd-color-icon-info-primary)"
               fill="currentColor"
               height="1em"
               viewBox="0 0 24 24"
@@ -91,10 +91,11 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
             Public room
           </span>
           <span
-            class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_1t12g_8"
-            data-kind="grey"
+            class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_18gm1_8"
+            data-kind="blue"
           >
             <svg
+              color="var(--cpd-color-icon-info-primary)"
               fill="currentColor"
               height="1em"
               viewBox="0 0 24 24"
@@ -109,11 +110,11 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
           </span>
         </section>
         <section
-          class="mx_Flex mx_RoomSummaryCard_topic"
+          class="_flex_4dswl_9 mx_RoomSummaryCard_topic"
           style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: start; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
         >
           <div
-            class="mx_Box mx_RoomSummaryCard_topic_container mx_Box--flex"
+            class="mx_RoomSummaryCard_topic_container mx_RoomSummaryCard_topic_box _box-flex_1odfs_9"
             style="--mx-box-flex: 1;"
           >
             <p
@@ -126,13 +127,14 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
               </span>
             </p>
             <button
-              class="_icon-button_m2erp_8 mx_RoomSummaryCard_topic_chevron"
+              class="_icon-button_1pz9o_8 mx_RoomSummaryCard_topic_chevron"
+              data-kind="primary"
               role="button"
               style="--cpd-icon-button-size: 24px;"
               tabindex="0"
             >
               <div
-                class="_indicator-icon_zr2a0_17"
+                class="_indicator-icon_147l5_17"
                 style="--cpd-icon-button-size: 100%;"
               >
                 <svg
@@ -150,7 +152,7 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
             </button>
           </div>
           <div
-            class="mx_Box mx_RoomSummaryCard_topic_edit mx_Box--flex"
+            class="mx_RoomSummaryCard_topic_edit _box-flex_1odfs_9"
             style="--mx-box-flex: 1;"
           >
             <a
@@ -169,8 +171,7 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
         </section>
       </header>
       <div
-        class="_separator_7ckbw_8"
-        data-floating-ui-inert=""
+        class="_separator_cqpyv_8"
         data-kind="primary"
         data-orientation="horizontal"
         role="separator"
@@ -182,7 +183,6 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
         <div
           aria-checked="false"
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitemcheckbox"
         >
@@ -205,22 +205,22 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
             Favourite
           </span>
           <div
-            class="_container_19o42_10"
+            class="_container_udcm8_10"
           >
             <input
               aria-hidden="true"
-              class="_input_19o42_24"
-              id="«rv»"
+              class="_input_udcm8_24"
+              id="_r_j_"
+              role="switch"
               type="checkbox"
             />
             <div
-              class="_ui_19o42_34"
+              class="_ui_udcm8_34"
             />
           </div>
         </div>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -257,15 +257,13 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
           </svg>
         </button>
         <div
-          class="_separator_7ckbw_8"
-          data-floating-ui-inert=""
+          class="_separator_cqpyv_8"
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -309,7 +307,6 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
         </button>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -348,86 +345,52 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
             />
           </svg>
         </button>
-        <div
-          aria-controls="«r12»"
-          aria-describedby="«r12»"
-          aria-expanded="true"
-          aria-haspopup="dialog"
-          data-floating-ui-inert=""
-        >
-          <button
-            class="_item_dyt4i_8 _interactive_dyt4i_26"
-            data-kind="primary"
-            role="menuitem"
-          >
-            <svg
-              aria-hidden="true"
-              class="_icon_dyt4i_50"
-              fill="currentColor"
-              height="24"
-              viewBox="0 0 24 24"
-              width="24"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                clip-rule="evenodd"
-                d="M6.119 2a.5.5 0 0 0-.35.857L7.85 4.9a.5.5 0 0 1 .15.357v4.487a.5.5 0 0 1-.15.356l-3.7 3.644A.5.5 0 0 0 4 14.1v1.4a.5.5 0 0 0 .5.5H11v6a1 1 0 1 0 2 0v-6h6.5a.5.5 0 0 0 .5-.5v-1.4a.5.5 0 0 0-.15-.356l-3.7-3.644a.5.5 0 0 1-.15-.356V5.257a.5.5 0 0 1 .15-.357l2.081-2.043a.5.5 0 0 0-.35-.857zM10 4h4v5.744a2.5 2.5 0 0 0 .746 1.781L17.26 14H6.74l2.514-2.475A2.5 2.5 0 0 0 10 9.744z"
-                fill-rule="evenodd"
-              />
-            </svg>
-            <span
-              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
-            >
-              Pinned messages
-            </span>
-            <svg
-              aria-hidden="true"
-              class="_nav-hint_dyt4i_59"
-              fill="currentColor"
-              height="24"
-              viewBox="8 0 8 24"
-              width="8"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M8.7 17.3a.95.95 0 0 1-.275-.7q0-.425.275-.7l3.9-3.9-3.9-3.9a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l4.6 4.6q.15.15.213.325.062.175.062.375t-.062.375a.9.9 0 0 1-.213.325l-4.6 4.6a.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
-              />
-            </svg>
-            <span
-              class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
-            >
-              0
-            </span>
-          </button>
-        </div>
-        <span
-          aria-hidden="true"
-          data-floating-ui-inert=""
-          style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
-          tabindex="-1"
-        />
-        <span
-          data-floating-ui-focus-guard=""
-          data-type="outside"
-          role="button"
-          style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
-          tabindex="0"
-        />
-        <span
-          aria-owns="«r14»"
-          data-floating-ui-inert=""
-          style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
-        />
-        <span
-          data-floating-ui-focus-guard=""
-          data-type="outside"
-          role="button"
-          style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
-          tabindex="0"
-        />
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
+          data-kind="primary"
+          role="menuitem"
+        >
+          <svg
+            aria-hidden="true"
+            class="_icon_dyt4i_50"
+            fill="currentColor"
+            height="24"
+            viewBox="0 0 24 24"
+            width="24"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              clip-rule="evenodd"
+              d="M6.119 2a.5.5 0 0 0-.35.857L7.85 4.9a.5.5 0 0 1 .15.357v4.487a.5.5 0 0 1-.15.356l-3.7 3.644A.5.5 0 0 0 4 14.1v1.4a.5.5 0 0 0 .5.5H11v6a1 1 0 1 0 2 0v-6h6.5a.5.5 0 0 0 .5-.5v-1.4a.5.5 0 0 0-.15-.356l-3.7-3.644a.5.5 0 0 1-.15-.356V5.257a.5.5 0 0 1 .15-.357l2.081-2.043a.5.5 0 0 0-.35-.857zM10 4h4v5.744a2.5 2.5 0 0 0 .746 1.781L17.26 14H6.74l2.514-2.475A2.5 2.5 0 0 0 10 9.744z"
+              fill-rule="evenodd"
+            />
+          </svg>
+          <span
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
+          >
+            Pinned messages
+          </span>
+          <svg
+            aria-hidden="true"
+            class="_nav-hint_dyt4i_59"
+            fill="currentColor"
+            height="24"
+            viewBox="8 0 8 24"
+            width="8"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M8.7 17.3a.95.95 0 0 1-.275-.7q0-.425.275-.7l3.9-3.9-3.9-3.9a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l4.6 4.6q.15.15.213.325.062.175.062.375t-.062.375a.9.9 0 0 1-.213.325l-4.6 4.6a.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
+            />
+          </svg>
+          <span
+            class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
+          >
+            0
+          </span>
+        </button>
+        <button
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
           data-kind="primary"
           role="menuitem"
         >
@@ -465,7 +428,6 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
         </button>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -502,15 +464,13 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
           </svg>
         </button>
         <div
-          class="_separator_7ckbw_8"
-          data-floating-ui-inert=""
+          class="_separator_cqpyv_8"
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -548,7 +508,6 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
         </button>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -586,7 +545,6 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
         </button>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -624,7 +582,6 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
         </button>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -664,15 +621,13 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
           </svg>
         </button>
         <div
-          class="_separator_7ckbw_8"
-          data-floating-ui-inert=""
+          class="_separator_cqpyv_8"
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <div
           class="mx_RoomSummaryCard_bottomOptions"
-          data-floating-ui-inert=""
         >
           <button
             class="_item_dyt4i_8 _interactive_dyt4i_26"
@@ -768,21 +723,21 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
   >
     <div
       class="mx_BaseCard_header"
-      data-floating-ui-inert=""
     >
       <div
         class="mx_BaseCard_header_spacer"
       />
       <button
-        aria-labelledby="«r0»"
-        class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+        aria-labelledby="_r_0_"
+        class="_icon-button_1pz9o_8"
+        data-kind="secondary"
         data-testid="base-card-close-button"
         role="button"
         style="--cpd-icon-button-size: 28px;"
         tabindex="0"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -805,10 +760,9 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
     >
       <header
         class="mx_RoomSummaryCard_container"
-        data-floating-ui-inert=""
       >
         <span
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
           data-color="1"
           data-testid="avatar-img"
           data-type="round"
@@ -828,14 +782,15 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
           title=""
         />
         <section
-          class="mx_Flex mx_RoomSummaryCard_badges"
+          class="_flex_4dswl_9 mx_RoomSummaryCard_badges"
           style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
         >
           <span
-            class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_1t12g_8"
-            data-kind="grey"
+            class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_18gm1_8"
+            data-kind="blue"
           >
             <svg
+              color="var(--cpd-color-icon-info-primary)"
               fill="currentColor"
               height="1em"
               viewBox="0 0 24 24"
@@ -849,10 +804,11 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
             Public room
           </span>
           <span
-            class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_1t12g_8"
-            data-kind="grey"
+            class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_18gm1_8"
+            data-kind="blue"
           >
             <svg
+              color="var(--cpd-color-icon-info-primary)"
               fill="currentColor"
               height="1em"
               viewBox="0 0 24 24"
@@ -867,11 +823,11 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
           </span>
         </section>
         <section
-          class="mx_Flex mx_RoomSummaryCard_topic"
+          class="_flex_4dswl_9 mx_RoomSummaryCard_topic"
           style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: start; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
         >
           <div
-            class="mx_Box mx_Box--flex"
+            class="mx_RoomSummaryCard_topic_box _box-flex_1odfs_9"
             style="--mx-box-flex: 1;"
           >
             <a
@@ -890,8 +846,7 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
         </section>
       </header>
       <div
-        class="_separator_7ckbw_8"
-        data-floating-ui-inert=""
+        class="_separator_cqpyv_8"
         data-kind="primary"
         data-orientation="horizontal"
         role="separator"
@@ -903,7 +858,6 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
         <div
           aria-checked="false"
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitemcheckbox"
         >
@@ -926,22 +880,22 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
             Favourite
           </span>
           <div
-            class="_container_19o42_10"
+            class="_container_udcm8_10"
           >
             <input
               aria-hidden="true"
-              class="_input_19o42_24"
-              id="«r5»"
+              class="_input_udcm8_24"
+              id="_r_5_"
+              role="switch"
               type="checkbox"
             />
             <div
-              class="_ui_19o42_34"
+              class="_ui_udcm8_34"
             />
           </div>
         </div>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -978,15 +932,13 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
           </svg>
         </button>
         <div
-          class="_separator_7ckbw_8"
-          data-floating-ui-inert=""
+          class="_separator_cqpyv_8"
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -1030,7 +982,6 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
         </button>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -1069,86 +1020,52 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
             />
           </svg>
         </button>
-        <div
-          aria-controls="«r8»"
-          aria-describedby="«r8»"
-          aria-expanded="true"
-          aria-haspopup="dialog"
-          data-floating-ui-inert=""
-        >
-          <button
-            class="_item_dyt4i_8 _interactive_dyt4i_26"
-            data-kind="primary"
-            role="menuitem"
-          >
-            <svg
-              aria-hidden="true"
-              class="_icon_dyt4i_50"
-              fill="currentColor"
-              height="24"
-              viewBox="0 0 24 24"
-              width="24"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                clip-rule="evenodd"
-                d="M6.119 2a.5.5 0 0 0-.35.857L7.85 4.9a.5.5 0 0 1 .15.357v4.487a.5.5 0 0 1-.15.356l-3.7 3.644A.5.5 0 0 0 4 14.1v1.4a.5.5 0 0 0 .5.5H11v6a1 1 0 1 0 2 0v-6h6.5a.5.5 0 0 0 .5-.5v-1.4a.5.5 0 0 0-.15-.356l-3.7-3.644a.5.5 0 0 1-.15-.356V5.257a.5.5 0 0 1 .15-.357l2.081-2.043a.5.5 0 0 0-.35-.857zM10 4h4v5.744a2.5 2.5 0 0 0 .746 1.781L17.26 14H6.74l2.514-2.475A2.5 2.5 0 0 0 10 9.744z"
-                fill-rule="evenodd"
-              />
-            </svg>
-            <span
-              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
-            >
-              Pinned messages
-            </span>
-            <svg
-              aria-hidden="true"
-              class="_nav-hint_dyt4i_59"
-              fill="currentColor"
-              height="24"
-              viewBox="8 0 8 24"
-              width="8"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M8.7 17.3a.95.95 0 0 1-.275-.7q0-.425.275-.7l3.9-3.9-3.9-3.9a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l4.6 4.6q.15.15.213.325.062.175.062.375t-.062.375a.9.9 0 0 1-.213.325l-4.6 4.6a.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
-              />
-            </svg>
-            <span
-              class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
-            >
-              0
-            </span>
-          </button>
-        </div>
-        <span
-          aria-hidden="true"
-          data-floating-ui-inert=""
-          style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
-          tabindex="-1"
-        />
-        <span
-          data-floating-ui-focus-guard=""
-          data-type="outside"
-          role="button"
-          style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
-          tabindex="0"
-        />
-        <span
-          aria-owns="«ra»"
-          data-floating-ui-inert=""
-          style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
-        />
-        <span
-          data-floating-ui-focus-guard=""
-          data-type="outside"
-          role="button"
-          style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
-          tabindex="0"
-        />
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
+          data-kind="primary"
+          role="menuitem"
+        >
+          <svg
+            aria-hidden="true"
+            class="_icon_dyt4i_50"
+            fill="currentColor"
+            height="24"
+            viewBox="0 0 24 24"
+            width="24"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              clip-rule="evenodd"
+              d="M6.119 2a.5.5 0 0 0-.35.857L7.85 4.9a.5.5 0 0 1 .15.357v4.487a.5.5 0 0 1-.15.356l-3.7 3.644A.5.5 0 0 0 4 14.1v1.4a.5.5 0 0 0 .5.5H11v6a1 1 0 1 0 2 0v-6h6.5a.5.5 0 0 0 .5-.5v-1.4a.5.5 0 0 0-.15-.356l-3.7-3.644a.5.5 0 0 1-.15-.356V5.257a.5.5 0 0 1 .15-.357l2.081-2.043a.5.5 0 0 0-.35-.857zM10 4h4v5.744a2.5 2.5 0 0 0 .746 1.781L17.26 14H6.74l2.514-2.475A2.5 2.5 0 0 0 10 9.744z"
+              fill-rule="evenodd"
+            />
+          </svg>
+          <span
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
+          >
+            Pinned messages
+          </span>
+          <svg
+            aria-hidden="true"
+            class="_nav-hint_dyt4i_59"
+            fill="currentColor"
+            height="24"
+            viewBox="8 0 8 24"
+            width="8"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M8.7 17.3a.95.95 0 0 1-.275-.7q0-.425.275-.7l3.9-3.9-3.9-3.9a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l4.6 4.6q.15.15.213.325.062.175.062.375t-.062.375a.9.9 0 0 1-.213.325l-4.6 4.6a.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
+            />
+          </svg>
+          <span
+            class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
+          >
+            0
+          </span>
+        </button>
+        <button
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
           data-kind="primary"
           role="menuitem"
         >
@@ -1186,7 +1103,6 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
         </button>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -1223,15 +1139,13 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
           </svg>
         </button>
         <div
-          class="_separator_7ckbw_8"
-          data-floating-ui-inert=""
+          class="_separator_cqpyv_8"
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -1269,7 +1183,6 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
         </button>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -1307,7 +1220,6 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
         </button>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -1345,7 +1257,6 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
         </button>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -1385,15 +1296,13 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
           </svg>
         </button>
         <div
-          class="_separator_7ckbw_8"
-          data-floating-ui-inert=""
+          class="_separator_cqpyv_8"
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <div
           class="mx_RoomSummaryCard_bottomOptions"
-          data-floating-ui-inert=""
         >
           <button
             class="_item_dyt4i_8 _interactive_dyt4i_26"
@@ -1489,21 +1398,21 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
   >
     <div
       class="mx_BaseCard_header"
-      data-floating-ui-inert=""
     >
       <div
         class="mx_BaseCard_header_spacer"
       />
       <button
-        aria-labelledby="«rd»"
-        class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+        aria-labelledby="_r_7_"
+        class="_icon-button_1pz9o_8"
+        data-kind="secondary"
         data-testid="base-card-close-button"
         role="button"
         style="--cpd-icon-button-size: 28px;"
         tabindex="0"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -1526,10 +1435,9 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
     >
       <header
         class="mx_RoomSummaryCard_container"
-        data-floating-ui-inert=""
       >
         <span
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
           data-color="1"
           data-testid="avatar-img"
           data-type="round"
@@ -1549,14 +1457,15 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
           title=""
         />
         <section
-          class="mx_Flex mx_RoomSummaryCard_badges"
+          class="_flex_4dswl_9 mx_RoomSummaryCard_badges"
           style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
         >
           <span
-            class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_1t12g_8"
-            data-kind="grey"
+            class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_18gm1_8"
+            data-kind="blue"
           >
             <svg
+              color="var(--cpd-color-icon-info-primary)"
               fill="currentColor"
               height="1em"
               viewBox="0 0 24 24"
@@ -1570,10 +1479,11 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
             Public room
           </span>
           <span
-            class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_1t12g_8"
-            data-kind="grey"
+            class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_18gm1_8"
+            data-kind="blue"
           >
             <svg
+              color="var(--cpd-color-icon-info-primary)"
               fill="currentColor"
               height="1em"
               viewBox="0 0 24 24"
@@ -1588,11 +1498,11 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
           </span>
         </section>
         <section
-          class="mx_Flex mx_RoomSummaryCard_topic"
+          class="_flex_4dswl_9 mx_RoomSummaryCard_topic"
           style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: start; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
         >
           <div
-            class="mx_Box mx_RoomSummaryCard_topic_container mx_Box--flex"
+            class="mx_RoomSummaryCard_topic_container mx_RoomSummaryCard_topic_box _box-flex_1odfs_9"
             style="--mx-box-flex: 1;"
           >
             <p
@@ -1605,13 +1515,14 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
               </span>
             </p>
             <button
-              class="_icon-button_m2erp_8 mx_RoomSummaryCard_topic_chevron"
+              class="_icon-button_1pz9o_8 mx_RoomSummaryCard_topic_chevron"
+              data-kind="primary"
               role="button"
               style="--cpd-icon-button-size: 24px;"
               tabindex="0"
             >
               <div
-                class="_indicator-icon_zr2a0_17"
+                class="_indicator-icon_147l5_17"
                 style="--cpd-icon-button-size: 100%;"
               >
                 <svg
@@ -1629,7 +1540,7 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
             </button>
           </div>
           <div
-            class="mx_Box mx_RoomSummaryCard_topic_edit mx_Box--flex"
+            class="mx_RoomSummaryCard_topic_edit _box-flex_1odfs_9"
             style="--mx-box-flex: 1;"
           >
             <a
@@ -1648,8 +1559,7 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
         </section>
       </header>
       <div
-        class="_separator_7ckbw_8"
-        data-floating-ui-inert=""
+        class="_separator_cqpyv_8"
         data-kind="primary"
         data-orientation="horizontal"
         role="separator"
@@ -1661,7 +1571,6 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
         <div
           aria-checked="false"
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitemcheckbox"
         >
@@ -1684,22 +1593,22 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
             Favourite
           </span>
           <div
-            class="_container_19o42_10"
+            class="_container_udcm8_10"
           >
             <input
               aria-hidden="true"
-              class="_input_19o42_24"
-              id="«ri»"
+              class="_input_udcm8_24"
+              id="_r_c_"
+              role="switch"
               type="checkbox"
             />
             <div
-              class="_ui_19o42_34"
+              class="_ui_udcm8_34"
             />
           </div>
         </div>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -1736,15 +1645,13 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
           </svg>
         </button>
         <div
-          class="_separator_7ckbw_8"
-          data-floating-ui-inert=""
+          class="_separator_cqpyv_8"
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -1788,7 +1695,6 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
         </button>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -1827,86 +1733,52 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
             />
           </svg>
         </button>
-        <div
-          aria-controls="«rl»"
-          aria-describedby="«rl»"
-          aria-expanded="true"
-          aria-haspopup="dialog"
-          data-floating-ui-inert=""
-        >
-          <button
-            class="_item_dyt4i_8 _interactive_dyt4i_26"
-            data-kind="primary"
-            role="menuitem"
-          >
-            <svg
-              aria-hidden="true"
-              class="_icon_dyt4i_50"
-              fill="currentColor"
-              height="24"
-              viewBox="0 0 24 24"
-              width="24"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                clip-rule="evenodd"
-                d="M6.119 2a.5.5 0 0 0-.35.857L7.85 4.9a.5.5 0 0 1 .15.357v4.487a.5.5 0 0 1-.15.356l-3.7 3.644A.5.5 0 0 0 4 14.1v1.4a.5.5 0 0 0 .5.5H11v6a1 1 0 1 0 2 0v-6h6.5a.5.5 0 0 0 .5-.5v-1.4a.5.5 0 0 0-.15-.356l-3.7-3.644a.5.5 0 0 1-.15-.356V5.257a.5.5 0 0 1 .15-.357l2.081-2.043a.5.5 0 0 0-.35-.857zM10 4h4v5.744a2.5 2.5 0 0 0 .746 1.781L17.26 14H6.74l2.514-2.475A2.5 2.5 0 0 0 10 9.744z"
-                fill-rule="evenodd"
-              />
-            </svg>
-            <span
-              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
-            >
-              Pinned messages
-            </span>
-            <svg
-              aria-hidden="true"
-              class="_nav-hint_dyt4i_59"
-              fill="currentColor"
-              height="24"
-              viewBox="8 0 8 24"
-              width="8"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M8.7 17.3a.95.95 0 0 1-.275-.7q0-.425.275-.7l3.9-3.9-3.9-3.9a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l4.6 4.6q.15.15.213.325.062.175.062.375t-.062.375a.9.9 0 0 1-.213.325l-4.6 4.6a.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
-              />
-            </svg>
-            <span
-              class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
-            >
-              0
-            </span>
-          </button>
-        </div>
-        <span
-          aria-hidden="true"
-          data-floating-ui-inert=""
-          style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
-          tabindex="-1"
-        />
-        <span
-          data-floating-ui-focus-guard=""
-          data-type="outside"
-          role="button"
-          style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
-          tabindex="0"
-        />
-        <span
-          aria-owns="«rn»"
-          data-floating-ui-inert=""
-          style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
-        />
-        <span
-          data-floating-ui-focus-guard=""
-          data-type="outside"
-          role="button"
-          style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
-          tabindex="0"
-        />
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
+          data-kind="primary"
+          role="menuitem"
+        >
+          <svg
+            aria-hidden="true"
+            class="_icon_dyt4i_50"
+            fill="currentColor"
+            height="24"
+            viewBox="0 0 24 24"
+            width="24"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              clip-rule="evenodd"
+              d="M6.119 2a.5.5 0 0 0-.35.857L7.85 4.9a.5.5 0 0 1 .15.357v4.487a.5.5 0 0 1-.15.356l-3.7 3.644A.5.5 0 0 0 4 14.1v1.4a.5.5 0 0 0 .5.5H11v6a1 1 0 1 0 2 0v-6h6.5a.5.5 0 0 0 .5-.5v-1.4a.5.5 0 0 0-.15-.356l-3.7-3.644a.5.5 0 0 1-.15-.356V5.257a.5.5 0 0 1 .15-.357l2.081-2.043a.5.5 0 0 0-.35-.857zM10 4h4v5.744a2.5 2.5 0 0 0 .746 1.781L17.26 14H6.74l2.514-2.475A2.5 2.5 0 0 0 10 9.744z"
+              fill-rule="evenodd"
+            />
+          </svg>
+          <span
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
+          >
+            Pinned messages
+          </span>
+          <svg
+            aria-hidden="true"
+            class="_nav-hint_dyt4i_59"
+            fill="currentColor"
+            height="24"
+            viewBox="8 0 8 24"
+            width="8"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M8.7 17.3a.95.95 0 0 1-.275-.7q0-.425.275-.7l3.9-3.9-3.9-3.9a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l4.6 4.6q.15.15.213.325.062.175.062.375t-.062.375a.9.9 0 0 1-.213.325l-4.6 4.6a.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
+            />
+          </svg>
+          <span
+            class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
+          >
+            0
+          </span>
+        </button>
+        <button
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
           data-kind="primary"
           role="menuitem"
         >
@@ -1944,7 +1816,6 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
         </button>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -1981,15 +1852,13 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
           </svg>
         </button>
         <div
-          class="_separator_7ckbw_8"
-          data-floating-ui-inert=""
+          class="_separator_cqpyv_8"
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -2027,7 +1896,6 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
         </button>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -2065,7 +1933,6 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
         </button>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -2103,7 +1970,6 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
         </button>
         <button
           class="_item_dyt4i_8 _interactive_dyt4i_26"
-          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
@@ -2143,15 +2009,13 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
           </svg>
         </button>
         <div
-          class="_separator_7ckbw_8"
-          data-floating-ui-inert=""
+          class="_separator_cqpyv_8"
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <div
           class="mx_RoomSummaryCard_bottomOptions"
-          data-floating-ui-inert=""
         >
           <button
             class="_item_dyt4i_8 _interactive_dyt4i_26"
diff --git a/test/unit-tests/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap b/test/unit-tests/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap
index 654db50e0f..14c06a6abc 100644
--- a/test/unit-tests/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap
+++ b/test/unit-tests/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
 <div>
@@ -19,15 +19,16 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
         </p>
       </div>
       <button
-        aria-labelledby="«r6i»"
-        class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+        aria-labelledby="_r_7c_"
+        class="_icon-button_1pz9o_8"
+        data-kind="secondary"
         data-testid="base-card-close-button"
         role="button"
         style="--cpd-icon-button-size: 28px;"
         tabindex="0"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -60,7 +61,7 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
             <button
               aria-label="Profile picture"
               aria-live="off"
-              class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+              class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
               data-color="3"
               data-testid="avatar-img"
               data-type="round"
@@ -76,7 +77,7 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
         class="mx_UserInfo_container mx_UserInfo_header"
       >
         <div
-          class="mx_Flex mx_UserInfo_profile"
+          class="_flex_4dswl_9 mx_UserInfo_profile"
           style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
         >
           <h1
@@ -84,7 +85,7 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
             dir="auto"
           >
             <div
-              class="mx_Flex mx_UserInfo_profile_name"
+              class="_flex_4dswl_9 mx_UserInfo_profile_name"
               style="--mx-flex-display: flex; --mx-flex-direction: row-reverse; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
             >
               @user:example.com
@@ -107,12 +108,27 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
                 class="mx_AccessibleButton mx_CopyableText_copyButton"
                 role="button"
                 tabindex="0"
-              />
+              >
+                <svg
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+                  />
+                  <path
+                    d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+                  />
+                </svg>
+              </div>
             </div>
           </p>
         </div>
         <div
-          class="mx_Flex mx_UserInfo_verification"
+          class="_flex_4dswl_9 mx_UserInfo_verification"
           style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
         >
           <p
@@ -305,15 +321,16 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
         </p>
       </div>
       <button
-        aria-labelledby="«r6s»"
-        class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+        aria-labelledby="_r_7m_"
+        class="_icon-button_1pz9o_8"
+        data-kind="secondary"
         data-testid="base-card-close-button"
         role="button"
         style="--cpd-icon-button-size: 28px;"
         tabindex="0"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -346,7 +363,7 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
             <button
               aria-label="Profile picture"
               aria-live="off"
-              class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+              class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
               data-color="3"
               data-testid="avatar-img"
               data-type="round"
@@ -362,7 +379,7 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
         class="mx_UserInfo_container mx_UserInfo_header"
       >
         <div
-          class="mx_Flex mx_UserInfo_profile"
+          class="_flex_4dswl_9 mx_UserInfo_profile"
           style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
         >
           <h1
@@ -370,7 +387,7 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
             dir="auto"
           >
             <div
-              class="mx_Flex mx_UserInfo_profile_name"
+              class="_flex_4dswl_9 mx_UserInfo_profile_name"
               style="--mx-flex-display: flex; --mx-flex-direction: row-reverse; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
             >
               @user:example.com
@@ -393,12 +410,27 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
                 class="mx_AccessibleButton mx_CopyableText_copyButton"
                 role="button"
                 tabindex="0"
-              />
+              >
+                <svg
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+                  />
+                  <path
+                    d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+                  />
+                </svg>
+              </div>
             </div>
           </p>
         </div>
         <div
-          class="mx_Flex mx_UserInfo_verification"
+          class="_flex_4dswl_9 mx_UserInfo_verification"
           style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
         >
           <p
@@ -612,270 +644,3 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
   </div>
 </div>
 `;
-
-exports[`<UserInfoHeader /> renders verification unavailable message 1`] = `
-<div>
-  <div
-    class="mx_UserInfo_avatar"
-  >
-    <div
-      class="mx_UserInfo_avatar_transition"
-    >
-      <div
-        class="mx_UserInfo_avatar_transition_child"
-      >
-        <button
-          aria-label="Profile picture"
-          aria-live="off"
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-          data-color="3"
-          data-testid="avatar-img"
-          data-type="round"
-          role="button"
-          style="--cpd-avatar-size: 120px;"
-          title="customUserIdentifier"
-        >
-          u
-        </button>
-      </div>
-    </div>
-  </div>
-  <div
-    class="mx_UserInfo_container mx_UserInfo_header"
-  >
-    <div
-      class="mx_Flex mx_UserInfo_profile"
-      style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-    >
-      <h1
-        class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93"
-        dir="auto"
-      >
-        <div
-          class="mx_Flex mx_UserInfo_profile_name"
-          style="--mx-flex-display: flex; --mx-flex-direction: row-reverse; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-        >
-          @user:example.com
-        </div>
-      </h1>
-      <div
-        class="mx_PresenceLabel mx_UserInfo_profileStatus"
-      >
-        Unknown
-      </div>
-      <p
-        class="_typography_6v6n8_153 _font-body-sm-semibold_6v6n8_36 mx_UserInfo_profile_mxid"
-      >
-        <div
-          class="mx_CopyableText"
-        >
-          customUserIdentifier
-          <div
-            aria-label="Copy"
-            class="mx_AccessibleButton mx_CopyableText_copyButton"
-            role="button"
-            tabindex="0"
-          />
-        </div>
-      </p>
-    </div>
-    <div
-      class="mx_Flex mx_UserInfo_verification"
-      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-    >
-      <p
-        class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31 mx_UserInfo_verification_unavailable"
-      >
-        (
-        User verification unavailable
-        )
-      </p>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<UserInfoHeader /> renders verified badge when user is verified 1`] = `
-<div>
-  <div
-    class="mx_UserInfo_avatar"
-  >
-    <div
-      class="mx_UserInfo_avatar_transition"
-    >
-      <div
-        class="mx_UserInfo_avatar_transition_child"
-      >
-        <button
-          aria-label="Profile picture"
-          aria-live="off"
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-          data-color="3"
-          data-testid="avatar-img"
-          data-type="round"
-          role="button"
-          style="--cpd-avatar-size: 120px;"
-          title="customUserIdentifier"
-        >
-          u
-        </button>
-      </div>
-    </div>
-  </div>
-  <div
-    class="mx_UserInfo_container mx_UserInfo_header"
-  >
-    <div
-      class="mx_Flex mx_UserInfo_profile"
-      style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-    >
-      <h1
-        class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93"
-        dir="auto"
-      >
-        <div
-          class="mx_Flex mx_UserInfo_profile_name"
-          style="--mx-flex-display: flex; --mx-flex-direction: row-reverse; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-        >
-          @user:example.com
-        </div>
-      </h1>
-      <div
-        class="mx_PresenceLabel mx_UserInfo_profileStatus"
-      >
-        Unknown
-      </div>
-      <p
-        class="_typography_6v6n8_153 _font-body-sm-semibold_6v6n8_36 mx_UserInfo_profile_mxid"
-      >
-        <div
-          class="mx_CopyableText"
-        >
-          customUserIdentifier
-          <div
-            aria-label="Copy"
-            class="mx_AccessibleButton mx_CopyableText_copyButton"
-            role="button"
-            tabindex="0"
-          />
-        </div>
-      </p>
-    </div>
-    <div
-      class="mx_Flex mx_UserInfo_verification"
-      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-    >
-      <span
-        class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_1t12g_8 mx_UserInfo_verified_badge"
-        data-kind="green"
-      >
-        <svg
-          class="mx_UserInfo_verified_icon"
-          fill="currentColor"
-          height="16px"
-          viewBox="0 0 24 24"
-          width="16px"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M8.15 21.75 6.7 19.3l-2.75-.6a.94.94 0 0 1-.6-.387.93.93 0 0 1-.175-.688L3.45 14.8l-1.875-2.15a.93.93 0 0 1-.25-.65q0-.375.25-.65L3.45 9.2l-.275-2.825a.93.93 0 0 1 .175-.687.94.94 0 0 1 .6-.388l2.75-.6 1.45-2.45a.98.98 0 0 1 .55-.437.97.97 0 0 1 .7.037l2.6 1.1 2.6-1.1a.97.97 0 0 1 .7-.038q.35.112.55.438L17.3 4.7l2.75.6q.375.075.6.388.225.312.175.687L20.55 9.2l1.875 2.15q.25.275.25.65t-.25.65L20.55 14.8l.275 2.825a.93.93 0 0 1-.175.688.94.94 0 0 1-.6.387l-2.75.6-1.45 2.45a.98.98 0 0 1-.55.438.97.97 0 0 1-.7-.038l-2.6-1.1-2.6 1.1a.97.97 0 0 1-.7.038.98.98 0 0 1-.55-.438m2.8-9.05L9.5 11.275A.93.93 0 0 0 8.812 11q-.412 0-.712.3a.95.95 0 0 0-.275.7q0 .425.275.7l2.15 2.15q.3.3.7.3t.7-.3l4.25-4.25q.3-.3.287-.7a1.06 1.06 0 0 0-.287-.7 1.02 1.02 0 0 0-.713-.312.93.93 0 0 0-.712.287z"
-          />
-        </svg>
-        <p
-          class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 mx_UserInfo_verified_label"
-        >
-          Verified
-        </p>
-      </span>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<UserInfoHeader /> renders verify button 1`] = `
-<div>
-  <div
-    class="mx_UserInfo_avatar"
-  >
-    <div
-      class="mx_UserInfo_avatar_transition"
-    >
-      <div
-        class="mx_UserInfo_avatar_transition_child"
-      >
-        <button
-          aria-label="Profile picture"
-          aria-live="off"
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-          data-color="3"
-          data-testid="avatar-img"
-          data-type="round"
-          role="button"
-          style="--cpd-avatar-size: 120px;"
-          title="customUserIdentifier"
-        >
-          u
-        </button>
-      </div>
-    </div>
-  </div>
-  <div
-    class="mx_UserInfo_container mx_UserInfo_header"
-  >
-    <div
-      class="mx_Flex mx_UserInfo_profile"
-      style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-    >
-      <h1
-        class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93"
-        dir="auto"
-      >
-        <div
-          class="mx_Flex mx_UserInfo_profile_name"
-          style="--mx-flex-display: flex; --mx-flex-direction: row-reverse; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-        >
-          @user:example.com
-        </div>
-      </h1>
-      <div
-        class="mx_PresenceLabel mx_UserInfo_profileStatus"
-      >
-        Unknown
-      </div>
-      <p
-        class="_typography_6v6n8_153 _font-body-sm-semibold_6v6n8_36 mx_UserInfo_profile_mxid"
-      >
-        <div
-          class="mx_CopyableText"
-        >
-          customUserIdentifier
-          <div
-            aria-label="Copy"
-            class="mx_AccessibleButton mx_CopyableText_copyButton"
-            role="button"
-            tabindex="0"
-          />
-        </div>
-      </p>
-    </div>
-    <div
-      class="mx_Flex mx_UserInfo_verification"
-      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-    >
-      <div
-        class="mx_UserInfo_container_verifyButton"
-      >
-        <button
-          class="_button_vczzf_8 mx_UserInfo_verify_button"
-          data-kind="tertiary"
-          data-size="sm"
-          role="button"
-          tabindex="0"
-        >
-          Verify User
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/test/unit-tests/components/views/right_panel/user_info/UserInfoAdminToolsContainer-test.tsx b/test/unit-tests/components/views/right_panel/user_info/UserInfoAdminToolsContainer-test.tsx
new file mode 100644
index 0000000000..524c76a515
--- /dev/null
+++ b/test/unit-tests/components/views/right_panel/user_info/UserInfoAdminToolsContainer-test.tsx
@@ -0,0 +1,315 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { render, screen, fireEvent } from "jest-matrix-react";
+import { type Room, type RoomMember } from "matrix-js-sdk/src/matrix";
+import { mocked } from "jest-mock";
+
+import { UserInfoAdminToolsContainer } from "../../../../../../src/components/views/right_panel/user_info/UserInfoAdminToolsContainer";
+import { useUserInfoAdminToolsContainerViewModel } from "../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoAdminToolsContainerViewModel";
+import { useRoomKickButtonViewModel } from "../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoKickButtonViewModel";
+import { useBanButtonViewModel } from "../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoBanButtonViewModel";
+import { useMuteButtonViewModel } from "../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoMuteButtonViewModel";
+import { useRedactMessagesButtonViewModel } from "../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoRedactButtonViewModel";
+import { stubClient } from "../../../../../test-utils";
+import MatrixClientContext from "../../../../../../src/contexts/MatrixClientContext";
+
+jest.mock("../../../../../../src/utils/DMRoomMap", () => {
+    const mock = {
+        getUserIdForRoomId: jest.fn(),
+        getDMRoomsForUserId: jest.fn(),
+    };
+
+    return {
+        shared: jest.fn().mockReturnValue(mock),
+        sharedInstance: mock,
+    };
+});
+
+jest.mock(
+    "../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoAdminToolsContainerViewModel",
+    () => ({
+        useUserInfoAdminToolsContainerViewModel: jest.fn().mockReturnValue({
+            isCurrentUserInTheRoom: true,
+            shouldShowKickButton: true,
+            shouldShowBanButton: true,
+            shouldShowMuteButton: true,
+            shouldShowRedactButton: true,
+        }),
+    }),
+);
+
+jest.mock(
+    "../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoKickButtonViewModel",
+    () => ({
+        useRoomKickButtonViewModel: jest.fn().mockReturnValue({
+            canUserBeKicked: true,
+            kickLabel: "Kick",
+            onKickClick: jest.fn(),
+        }),
+    }),
+);
+
+jest.mock("../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoBanButtonViewModel", () => ({
+    useBanButtonViewModel: jest.fn().mockReturnValue({
+        banLabel: "Ban",
+        onBanOrUnbanClick: jest.fn(),
+    }),
+}));
+
+jest.mock(
+    "../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoMuteButtonViewModel",
+    () => ({
+        useMuteButtonViewModel: jest.fn().mockReturnValue({
+            isMemberInTheRoom: true,
+            muteLabel: "Mute",
+            onMuteButtonClick: jest.fn(),
+        }),
+    }),
+);
+
+jest.mock(
+    "../../../../../../src/components/viewmodels/right_panel/user_info/admin/UserInfoRedactButtonViewModel",
+    () => ({
+        useRedactMessagesButtonViewModel: jest.fn().mockReturnValue({
+            onRedactAllMessagesClick: jest.fn(),
+        }),
+    }),
+);
+
+const defaultRoomId = "!fkfk";
+
+describe("UserInfoAdminToolsContainer", () => {
+    // Setup it data
+    const mockRoom = mocked({
+        roomId: defaultRoomId,
+        getType: jest.fn().mockReturnValue(undefined),
+        isSpaceRoom: jest.fn().mockReturnValue(false),
+        getMember: jest.fn().mockReturnValue(undefined),
+        getMxcAvatarUrl: jest.fn().mockReturnValue("mock-avatar-url"),
+        name: "test room",
+        on: jest.fn(),
+        off: jest.fn(),
+        currentState: {
+            getStateEvents: jest.fn(),
+            on: jest.fn(),
+            off: jest.fn(),
+        },
+        getEventReadUpTo: jest.fn(),
+    } as unknown as Room);
+
+    const mockMember = {
+        userId: "@user:example.com",
+        membership: "join",
+        powerLevel: 0,
+    } as unknown as RoomMember;
+
+    const mockPowerLevels = {
+        users: {
+            "@currentuser:example.com": 100,
+        },
+        events: {},
+        state_default: 50,
+        ban: 50,
+        kick: 50,
+        redact: 50,
+    };
+
+    const defaultProps = {
+        room: mockRoom,
+        member: mockMember,
+        powerLevels: mockPowerLevels,
+        isUpdating: false,
+        startUpdating: jest.fn(),
+        stopUpdating: jest.fn(),
+    };
+
+    const mockMatrixClient = stubClient();
+
+    const renderComponent = (props = defaultProps) => {
+        return render(
+            <MatrixClientContext.Provider value={mockMatrixClient}>
+                <UserInfoAdminToolsContainer {...props} />
+            </MatrixClientContext.Provider>,
+        );
+    };
+
+    beforeEach(() => {
+        mocked(useUserInfoAdminToolsContainerViewModel).mockReturnValue({
+            isCurrentUserInTheRoom: true,
+            shouldShowKickButton: true,
+            shouldShowBanButton: true,
+            shouldShowMuteButton: true,
+            shouldShowRedactButton: true,
+        });
+        jest.clearAllMocks();
+    });
+
+    it("renders all admin tools when user has permissions", () => {
+        renderComponent();
+
+        // Check that all buttons are rendered
+        expect(screen.getByText("Mute")).toBeInTheDocument();
+        expect(screen.getByText("Kick")).toBeInTheDocument();
+        expect(screen.getByText("Ban")).toBeInTheDocument();
+        expect(screen.getByText("Remove messages")).toBeInTheDocument();
+    });
+
+    it("renders no admin tools when current user is not in the room", () => {
+        mocked(useUserInfoAdminToolsContainerViewModel).mockReturnValue({
+            isCurrentUserInTheRoom: false,
+            shouldShowKickButton: false,
+            shouldShowBanButton: false,
+            shouldShowMuteButton: false,
+            shouldShowRedactButton: false,
+        });
+
+        const { container } = renderComponent();
+
+        // Should render an empty div
+        expect(container.firstChild).toBeEmptyDOMElement();
+    });
+
+    it("renders children when provided", () => {
+        render(
+            <UserInfoAdminToolsContainer {...defaultProps}>
+                <div data-testid="child-element">Custom Child</div>
+            </UserInfoAdminToolsContainer>,
+        );
+
+        expect(screen.getByTestId("child-element")).toBeInTheDocument();
+        expect(screen.getByText("Custom Child")).toBeInTheDocument();
+    });
+
+    describe("Kick behavior", () => {
+        it("clicking kick button calls the appropriate handler", () => {
+            const mockedOnKickClick = jest.fn();
+            mocked(useRoomKickButtonViewModel).mockReturnValue({
+                canUserBeKicked: true,
+                kickLabel: "Kick",
+                onKickClick: mockedOnKickClick,
+            });
+            renderComponent();
+
+            const kickButton = screen.getByText("Kick");
+            fireEvent.click(kickButton);
+
+            expect(mockedOnKickClick).toHaveBeenCalled();
+        });
+
+        it("should not display kick buttun if user can't be kicked", () => {
+            mocked(useRoomKickButtonViewModel).mockReturnValue({
+                canUserBeKicked: false,
+                kickLabel: "Kick",
+                onKickClick: jest.fn(),
+            });
+
+            renderComponent();
+
+            expect(screen.queryByText("Kick")).not.toBeInTheDocument();
+        });
+
+        it("should display the correct label when user can be disinvited", () => {
+            mocked(useRoomKickButtonViewModel).mockReturnValue({
+                canUserBeKicked: true,
+                kickLabel: "Disinvite",
+                onKickClick: jest.fn(),
+            });
+
+            renderComponent({
+                ...defaultProps,
+                member: mockMember,
+            });
+
+            expect(screen.getByText("Disinvite")).toBeInTheDocument();
+        });
+    });
+
+    describe("Ban behavior", () => {
+        it("clicking ban button calls the appropriate handler", () => {
+            const mockedOnBanOrUnbanClick = jest.fn();
+            mocked(useBanButtonViewModel).mockReturnValue({
+                banLabel: "Ban",
+                onBanOrUnbanClick: mockedOnBanOrUnbanClick,
+            });
+            renderComponent();
+
+            const banButton = screen.getByText("Ban");
+            fireEvent.click(banButton);
+
+            expect(mockedOnBanOrUnbanClick).toHaveBeenCalled();
+        });
+
+        it("should display the correct label", () => {
+            const mockedOnBanOrUnbanClick = jest.fn();
+            mocked(useBanButtonViewModel).mockReturnValue({
+                banLabel: "Unban",
+                onBanOrUnbanClick: mockedOnBanOrUnbanClick,
+            });
+            renderComponent();
+
+            // The label should be "Unban"
+            expect(screen.getByText("Unban")).toBeInTheDocument();
+        });
+    });
+
+    describe("Mute behavior", () => {
+        it("clicking mute button calls the appropriate handler", () => {
+            const mockedOnMuteButtonClick = jest.fn();
+            mocked(useMuteButtonViewModel).mockReturnValue({
+                isMemberInTheRoom: true,
+                muteLabel: "Mute",
+                onMuteButtonClick: mockedOnMuteButtonClick,
+            });
+            renderComponent();
+
+            const muteButton = screen.getByText("Mute");
+            fireEvent.click(muteButton);
+
+            expect(mockedOnMuteButtonClick).toHaveBeenCalled();
+        });
+
+        it("should not display mute button if user is not in the room", () => {
+            mocked(useMuteButtonViewModel).mockReturnValue({
+                isMemberInTheRoom: false,
+                muteLabel: "Mute",
+                onMuteButtonClick: jest.fn(),
+            });
+
+            renderComponent();
+
+            expect(screen.queryByText("Mute")).not.toBeInTheDocument();
+        });
+
+        it("should display the correct label", () => {
+            mocked(useMuteButtonViewModel).mockReturnValue({
+                isMemberInTheRoom: true,
+                muteLabel: "Mute",
+                onMuteButtonClick: jest.fn(),
+            });
+            renderComponent();
+
+            expect(screen.getByText("Mute")).toBeInTheDocument();
+        });
+    });
+
+    describe("Redact behavior", () => {
+        it("clicking redact button calls the appropriate handler", () => {
+            const mockedOnRedactAllMessagesClick = jest.fn();
+            mocked(useRedactMessagesButtonViewModel).mockReturnValue({
+                onRedactAllMessagesClick: mockedOnRedactAllMessagesClick,
+            });
+            renderComponent();
+
+            const redactButton = screen.getByText("Remove messages");
+            fireEvent.click(redactButton);
+
+            expect(mockedOnRedactAllMessagesClick).toHaveBeenCalled();
+        });
+    });
+});
diff --git a/test/unit-tests/components/views/right_panel/user_info/UserInfoBasic-test.tsx b/test/unit-tests/components/views/right_panel/user_info/UserInfoBasic-test.tsx
new file mode 100644
index 0000000000..3fb67c6876
--- /dev/null
+++ b/test/unit-tests/components/views/right_panel/user_info/UserInfoBasic-test.tsx
@@ -0,0 +1,112 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { mocked } from "jest-mock";
+import { type MatrixClient, type Room, RoomMember, type User } from "matrix-js-sdk/src/matrix";
+import { logRoles, render, screen } from "jest-matrix-react";
+
+import { createTestClient, mkStubRoom } from "../../../../../test-utils";
+import {
+    type UserInfoBasicState,
+    useUserInfoBasicViewModel,
+} from "../../../../../../src/components/viewmodels/right_panel/user_info/UserInfoBasicViewModel";
+import { UserInfoBasicView } from "../../../../../../src/components/views/right_panel/user_info/UserInfoBasicView";
+import MatrixClientContext from "../../../../../../src/contexts/MatrixClientContext";
+
+const defaultRoomPermissions = {
+    canEdit: true,
+    canInvite: true,
+    modifyLevelMax: -1,
+};
+jest.mock("../../../../../../src/components/viewmodels/right_panel/user_info/UserInfoBasicViewModel", () => ({
+    useUserInfoBasicViewModel: jest.fn(),
+    useRoomPermissions: () => defaultRoomPermissions,
+}));
+
+describe("<UserInfoBasic />", () => {
+    const defaultValue: UserInfoBasicState = {
+        powerLevels: {},
+        roomPermissions: defaultRoomPermissions,
+        pendingUpdateCount: 0,
+        isMe: false,
+        isRoomDMForMember: false,
+        showDeactivateButton: true,
+        onSynapseDeactivate: jest.fn(),
+        startUpdating: jest.fn(),
+        stopUpdating: jest.fn(),
+    };
+
+    const defaultRoomId = "!fkfk";
+    const defaultUserId = "@user:example.com";
+
+    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
+    let defaultRoom: Room;
+
+    let defaultProps: { member: User | RoomMember; room: Room };
+    let matrixClient: MatrixClient;
+
+    const renderComponent = (props = defaultProps) => {
+        return render(
+            <MatrixClientContext.Provider value={matrixClient}>
+                <UserInfoBasicView {...props} />
+            </MatrixClientContext.Provider>,
+        );
+    };
+    beforeEach(() => {
+        matrixClient = createTestClient();
+        defaultRoom = mkStubRoom(defaultRoomId, defaultRoomId, matrixClient);
+        defaultProps = {
+            member: defaultMember,
+            room: defaultRoom,
+        };
+    });
+
+    it("should display the defaut values", () => {
+        mocked(useUserInfoBasicViewModel).mockReturnValue(defaultValue);
+        const { container } = renderComponent();
+        logRoles(container);
+        expect(container).toMatchSnapshot();
+    });
+
+    it("should not show ignore button if user is me", () => {
+        const state: UserInfoBasicState = { ...defaultValue, isMe: true };
+        mocked(useUserInfoBasicViewModel).mockReturnValue(state);
+        renderComponent();
+
+        const ignoreButton = screen.queryByRole("button", { name: "Ignore" });
+        expect(ignoreButton).not.toBeInTheDocument();
+    });
+
+    it("should not show deactivate button", () => {
+        const state: UserInfoBasicState = { ...defaultValue, showDeactivateButton: false };
+        mocked(useUserInfoBasicViewModel).mockReturnValue(state);
+        renderComponent();
+
+        const deactivateButton = screen.queryByRole("button", { name: "Deactivate user" });
+        expect(deactivateButton).not.toBeInTheDocument();
+    });
+
+    it("should not show powerlevels selector for dm", () => {
+        const state: UserInfoBasicState = { ...defaultValue, isRoomDMForMember: true };
+        mocked(useUserInfoBasicViewModel).mockReturnValue(state);
+        const { container } = renderComponent();
+
+        logRoles(container);
+        const powserlevel = screen.queryByRole("option", { name: "Default" });
+        expect(powserlevel).not.toBeInTheDocument();
+    });
+
+    it("should show spinner if pending update is > 0", () => {
+        const state: UserInfoBasicState = { ...defaultValue, pendingUpdateCount: 2 };
+        mocked(useUserInfoBasicViewModel).mockReturnValue(state);
+        renderComponent();
+
+        const spinner = screen.getByTestId("spinner");
+        expect(spinner).toBeInTheDocument();
+    });
+});
diff --git a/test/unit-tests/components/views/right_panel/user_info/UserInfoBasicOptionsView-test.tsx b/test/unit-tests/components/views/right_panel/user_info/UserInfoBasicOptionsView-test.tsx
new file mode 100644
index 0000000000..8f0f4411da
--- /dev/null
+++ b/test/unit-tests/components/views/right_panel/user_info/UserInfoBasicOptionsView-test.tsx
@@ -0,0 +1,208 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { mocked } from "jest-mock";
+import { type Room, RoomMember, type User } from "matrix-js-sdk/src/matrix";
+import { fireEvent, render, screen } from "jest-matrix-react";
+
+import { mkStubRoom, stubClient } from "../../../../../test-utils";
+import {
+    useUserInfoBasicOptionsViewModel,
+    type UserInfoBasicOptionsState,
+} from "../../../../../../src/components/viewmodels/right_panel/user_info/UserInfoBasicOptionsViewModel";
+import { UserInfoBasicOptionsView } from "../../../../../../src/components/views/right_panel/user_info/UserInfoBasicOptionsView";
+import { UIComponent } from "../../../../../../src/settings/UIFeature";
+import { shouldShowComponent } from "../../../../../../src/customisations/helpers/UIComponents";
+import { type Member } from "../../../../../../src/components/views/right_panel/UserInfo";
+
+jest.mock("../../../../../../src/components/viewmodels/right_panel/user_info/UserInfoBasicOptionsViewModel", () => ({
+    useUserInfoBasicOptionsViewModel: jest.fn(),
+}));
+
+jest.mock("../../../../../../src/customisations/helpers/UIComponents", () => {
+    const original = jest.requireActual("../../../../../../src/customisations/helpers/UIComponents");
+    return {
+        shouldShowComponent: jest.fn().mockImplementation(original.shouldShowComponent),
+    };
+});
+
+describe("<UserOptionsSection />", () => {
+    const defaultValue: UserInfoBasicOptionsState = {
+        isMe: false,
+        showInviteButton: false,
+        showInsertPillButton: false,
+        readReceiptButtonDisabled: false,
+        onInsertPillButton: () => jest.fn(),
+        onReadReceiptButton: () => jest.fn(),
+        onShareUserClick: () => jest.fn(),
+        onInviteUserButton: (fallbackRoomId: string, evt: Event) => Promise.resolve(),
+        onOpenDmForUser: (member: Member) => Promise.resolve(),
+    };
+
+    const defaultRoomId = "!fkfk";
+    const defaultUserId = "@user:example.com";
+
+    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
+    let defaultRoom: Room;
+
+    let defaultProps: { member: User | RoomMember; room: Room };
+
+    beforeEach(() => {
+        const matrixClient = stubClient();
+        defaultRoom = mkStubRoom(defaultRoomId, defaultRoomId, matrixClient);
+        defaultProps = {
+            member: defaultMember,
+            room: defaultRoom,
+        };
+    });
+
+    afterEach(() => {
+        jest.resetAllMocks();
+    });
+
+    it("should always display sharedButton when user is not me", () => {
+        // User is not me by default
+        mocked(useUserInfoBasicOptionsViewModel).mockReturnValue({ ...defaultValue });
+        render(<UserInfoBasicOptionsView {...defaultProps} />);
+        const sharedButton = screen.getByRole("button", { name: "Share profile" });
+        expect(sharedButton).toBeInTheDocument();
+    });
+
+    it("should always display sharedButton when user is me", () => {
+        const propsWithMe = { ...defaultProps };
+        const onShareUserClick = jest.fn();
+        const state = { ...defaultValue, isMe: true, onShareUserClick };
+
+        mocked(useUserInfoBasicOptionsViewModel).mockReturnValue(state);
+        render(<UserInfoBasicOptionsView {...propsWithMe} />);
+
+        const sharedButton2 = screen.getByRole("button", { name: "Share profile" });
+        expect(sharedButton2).toBeInTheDocument();
+
+        // clicking on the share profile button
+        fireEvent.click(sharedButton2);
+
+        expect(onShareUserClick).toHaveBeenCalled();
+    });
+
+    it("should show insert pill button when user is not me and showinsertpill is true", () => {
+        const onInsertPillButton = jest.fn();
+        const state = { ...defaultValue, showInsertPillButton: true, onInsertPillButton };
+        // User is not me and showInsertpill is true
+        mocked(useUserInfoBasicOptionsViewModel).mockReturnValue(state);
+        render(<UserInfoBasicOptionsView {...defaultProps} />);
+
+        const insertPillButton = screen.getByRole("button", { name: "Mention" });
+        expect(insertPillButton).toBeInTheDocument();
+
+        // clicking on the insert pill button
+        fireEvent.click(insertPillButton);
+
+        expect(onInsertPillButton).toHaveBeenCalled();
+    });
+
+    it("should not show insert pill button when user is not me and showinsertpill is false", () => {
+        mocked(useUserInfoBasicOptionsViewModel).mockReturnValue({ ...defaultValue, showInsertPillButton: false });
+        render(<UserInfoBasicOptionsView {...defaultProps} />);
+        const insertPillButton = screen.queryByRole("button", { name: "Mention" });
+        expect(insertPillButton).not.toBeInTheDocument();
+    });
+
+    it("should not show insert pill button when user is me", () => {
+        // User is me, should not see the insert button even when show insertpill is true
+        mocked(useUserInfoBasicOptionsViewModel).mockReturnValue({
+            ...defaultValue,
+            showInsertPillButton: true,
+            isMe: true,
+        });
+        const propsWithMe = { ...defaultProps };
+        render(<UserInfoBasicOptionsView {...propsWithMe} />);
+        const insertPillButton = screen.queryByRole("button", { name: "Mention" });
+        expect(insertPillButton).not.toBeInTheDocument();
+    });
+
+    it("should not show readreceiptbutton when user is me", () => {
+        mocked(useUserInfoBasicOptionsViewModel).mockReturnValue({
+            ...defaultValue,
+            readReceiptButtonDisabled: true,
+            isMe: true,
+        });
+        const propsWithMe = { ...defaultProps };
+        render(<UserInfoBasicOptionsView {...propsWithMe} />);
+
+        const readReceiptButton = screen.queryByRole("button", { name: "Jump to read receipt" });
+        expect(readReceiptButton).not.toBeInTheDocument();
+    });
+
+    it("should show disable readreceiptbutton when readReceiptButtonDisabled is true", () => {
+        mocked(useUserInfoBasicOptionsViewModel).mockReturnValue({ ...defaultValue, readReceiptButtonDisabled: true });
+        render(<UserInfoBasicOptionsView {...defaultProps} />);
+
+        const readReceiptButton = screen.getByRole("button", { name: "Jump to read receipt" });
+        expect(readReceiptButton).toBeDisabled();
+    });
+
+    it("should not show disable readreceiptbutton when readReceiptButtonDisabled is false", () => {
+        const onReadReceiptButton = jest.fn();
+        const state = { ...defaultValue, readReceiptButtonDisabled: false, onReadReceiptButton };
+        mocked(useUserInfoBasicOptionsViewModel).mockReturnValue(state);
+        render(<UserInfoBasicOptionsView {...defaultProps} />);
+
+        const readReceiptButton = screen.getByRole("button", { name: "Jump to read receipt" });
+        expect(readReceiptButton).not.toBeDisabled();
+
+        // clicking on the read receipt button
+        fireEvent.click(readReceiptButton);
+
+        expect(onReadReceiptButton).toHaveBeenCalled();
+    });
+
+    it("should show not show invite button if shouldShowComponent is false", () => {
+        mocked(useUserInfoBasicOptionsViewModel).mockReturnValue({ ...defaultValue, showInviteButton: true });
+        mocked(shouldShowComponent).mockReturnValue(false);
+        render(<UserInfoBasicOptionsView {...defaultProps} />);
+
+        const inviteButton = screen.queryByRole("button", { name: "Invite" });
+        expect(shouldShowComponent).toHaveBeenCalledWith(UIComponent.InviteUsers);
+        expect(inviteButton).not.toBeInTheDocument();
+    });
+
+    it("should show show invite button if shouldShowComponent is true", () => {
+        const onInviteUserButton = jest.fn();
+        const state = { ...defaultValue, showInviteButton: true, onInviteUserButton };
+        mocked(useUserInfoBasicOptionsViewModel).mockReturnValue(state);
+        mocked(shouldShowComponent).mockReturnValue(true);
+        render(<UserInfoBasicOptionsView {...defaultProps} />);
+
+        const inviteButton = screen.getByRole("button", { name: "Invite" });
+        expect(shouldShowComponent).toHaveBeenCalledWith(UIComponent.InviteUsers);
+        expect(inviteButton).toBeInTheDocument();
+
+        // clicking on the invite button
+        fireEvent.click(inviteButton);
+        expect(onInviteUserButton).toHaveBeenCalled();
+    });
+
+    it("should show directMessageButton when user is not me", () => {
+        // User is not me, direct message button should display
+        mocked(useUserInfoBasicOptionsViewModel).mockReturnValue(defaultValue);
+        mocked(shouldShowComponent).mockReturnValue(true);
+        render(<UserInfoBasicOptionsView {...defaultProps} />);
+        const dmButton = screen.getByRole("button", { name: "Send message" });
+        expect(dmButton).toBeInTheDocument();
+    });
+
+    it("should not show directMessageButton when user is me", () => {
+        mocked(useUserInfoBasicOptionsViewModel).mockReturnValue({ ...defaultValue, isMe: true });
+        mocked(shouldShowComponent).mockReturnValue(true);
+        const propsWithMe = { ...defaultProps };
+        render(<UserInfoBasicOptionsView {...propsWithMe} />);
+        const dmButton = screen.queryByRole("button", { name: "Send message" });
+        expect(dmButton).not.toBeInTheDocument();
+    });
+});
diff --git a/test/unit-tests/components/views/right_panel/user_info/UserInfoHeaderVerificationView-test.tsx b/test/unit-tests/components/views/right_panel/user_info/UserInfoHeaderVerificationView-test.tsx
new file mode 100644
index 0000000000..7c54d167c3
--- /dev/null
+++ b/test/unit-tests/components/views/right_panel/user_info/UserInfoHeaderVerificationView-test.tsx
@@ -0,0 +1,96 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { mocked, type Mocked } from "jest-mock";
+import { type MatrixClient } from "matrix-js-sdk/src/matrix";
+import { UserVerificationStatus, type CryptoApi } from "matrix-js-sdk/src/crypto-api";
+import { Device, RoomMember } from "matrix-js-sdk/src/matrix";
+import { render, waitFor, screen } from "jest-matrix-react";
+import React from "react";
+
+import { MatrixClientPeg } from "../../../../../../src/MatrixClientPeg";
+import MatrixClientContext from "../../../../../../src/contexts/MatrixClientContext";
+import { UserInfoHeaderVerificationView } from "../../../../../../src/components/views/right_panel/user_info/UserInfoHeaderVerificationView";
+import { createTestClient } from "../../../../../test-utils";
+
+describe("<UserInfoHeaderVerificationView />", () => {
+    const defaultRoomId = "!fkfk";
+    const defaultUserId = "@user:example.com";
+
+    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
+
+    let mockClient: MatrixClient;
+    let mockCrypto: Mocked<CryptoApi>;
+
+    beforeEach(() => {
+        mockCrypto = mocked({
+            bootstrapSecretStorage: jest.fn(),
+            bootstrapCrossSigning: jest.fn(),
+            getCrossSigningKeyId: jest.fn(),
+            getVerificationRequestsToDeviceInProgress: jest.fn().mockReturnValue([]),
+            getUserDeviceInfo: jest.fn(),
+            getDeviceVerificationStatus: jest.fn(),
+            getUserVerificationStatus: jest.fn(),
+            isDehydrationSupported: jest.fn().mockResolvedValue(false),
+            startDehydration: jest.fn(),
+            getKeyBackupInfo: jest.fn().mockResolvedValue(null),
+            userHasCrossSigningKeys: jest.fn().mockResolvedValue(false),
+        } as unknown as CryptoApi);
+
+        mockClient = createTestClient();
+        jest.spyOn(mockClient, "doesServerSupportUnstableFeature").mockResolvedValue(true);
+        jest.spyOn(mockClient.secretStorage, "hasKey").mockResolvedValue(true);
+        jest.spyOn(mockClient, "getCrypto").mockReturnValue(mockCrypto);
+        jest.spyOn(MatrixClientPeg, "get").mockReturnValue(mockClient);
+        jest.spyOn(MatrixClientPeg, "safeGet").mockReturnValue(mockClient);
+    });
+
+    const renderComponent = () => {
+        const device1 = new Device({
+            deviceId: "d1",
+            userId: defaultUserId,
+            displayName: "my device",
+            algorithms: [],
+            keys: new Map(),
+        });
+        const devicesMap = new Map<string, Device>([[device1.deviceId, device1]]);
+        const userDeviceMap = new Map<string, Map<string, Device>>([[defaultUserId, devicesMap]]);
+
+        mockCrypto.getUserDeviceInfo.mockResolvedValue(userDeviceMap);
+        jest.spyOn(mockClient, "doesServerSupportUnstableFeature").mockResolvedValue(true);
+        const Wrapper = (wrapperProps = {}) => {
+            return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
+        };
+
+        return render(<UserInfoHeaderVerificationView member={defaultMember} devices={[device1]} />, {
+            wrapper: Wrapper,
+        });
+    };
+
+    it("renders verified badge when user is verified", async () => {
+        mockCrypto.getUserVerificationStatus.mockResolvedValue(new UserVerificationStatus(true, true, false));
+        const { container } = renderComponent();
+        await waitFor(() => expect(screen.getByText("Verified")).toBeInTheDocument());
+        expect(container).toMatchSnapshot();
+    });
+
+    it("renders verify button", async () => {
+        mockCrypto.getUserVerificationStatus.mockResolvedValue(new UserVerificationStatus(false, false, false));
+        mockCrypto.userHasCrossSigningKeys.mockResolvedValue(true);
+        const { container } = renderComponent();
+        await waitFor(() => expect(screen.getByText("Verify User")).toBeInTheDocument());
+        expect(container).toMatchSnapshot();
+    });
+
+    it("renders verification unavailable message", async () => {
+        mockCrypto.getUserVerificationStatus.mockResolvedValue(new UserVerificationStatus(false, false, false));
+        mockCrypto.userHasCrossSigningKeys.mockResolvedValue(false);
+        const { container } = renderComponent();
+        await waitFor(() => expect(screen.getByText("(User verification unavailable)")).toBeInTheDocument());
+        expect(container).toMatchSnapshot();
+    });
+});
diff --git a/test/unit-tests/components/views/right_panel/user_info/UserInfoHeaderView-test.tsx b/test/unit-tests/components/views/right_panel/user_info/UserInfoHeaderView-test.tsx
new file mode 100644
index 0000000000..31da372b2a
--- /dev/null
+++ b/test/unit-tests/components/views/right_panel/user_info/UserInfoHeaderView-test.tsx
@@ -0,0 +1,195 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { mocked, type Mocked } from "jest-mock";
+import { type MatrixClient } from "matrix-js-sdk/src/matrix";
+import { type CryptoApi } from "matrix-js-sdk/src/crypto-api";
+import { Device, RoomMember } from "matrix-js-sdk/src/matrix";
+import { fireEvent, render, screen } from "jest-matrix-react";
+import React from "react";
+
+import { MatrixClientPeg } from "../../../../../../src/MatrixClientPeg";
+import MatrixClientContext from "../../../../../../src/contexts/MatrixClientContext";
+import { UserInfoHeaderView } from "../../../../../../src/components/views/right_panel/user_info/UserInfoHeaderView";
+import { createTestClient } from "../../../../../test-utils";
+import { useUserfoHeaderViewModel } from "../../../../../../src/components/viewmodels/right_panel/user_info/UserInfoHeaderViewModel";
+
+// Mock the viewmodel hooks
+jest.mock("../../../../../../src/components/viewmodels/right_panel/user_info/UserInfoHeaderViewModel", () => ({
+    useUserfoHeaderViewModel: jest.fn().mockReturnValue({
+        onMemberAvatarClick: jest.fn(),
+        precenseInfo: {
+            lastActiveAgo: undefined,
+            currentlyActive: undefined,
+            state: undefined,
+        },
+        showPresence: false,
+        timezoneInfo: null,
+        userIdentifier: "customUserIdentifier",
+    }),
+}));
+
+describe("<UserInfoHeaderView />", () => {
+    const defaultRoomId = "!fkfk";
+    const defaultUserId = "@user:example.com";
+
+    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
+    const defaultProps = {
+        member: defaultMember,
+        roomId: defaultRoomId,
+    };
+
+    let mockClient: MatrixClient;
+    let mockCrypto: Mocked<CryptoApi>;
+
+    beforeEach(() => {
+        mockCrypto = mocked({
+            bootstrapSecretStorage: jest.fn(),
+            bootstrapCrossSigning: jest.fn(),
+            getCrossSigningKeyId: jest.fn(),
+            getVerificationRequestsToDeviceInProgress: jest.fn().mockReturnValue([]),
+            getUserDeviceInfo: jest.fn(),
+            getDeviceVerificationStatus: jest.fn(),
+            getUserVerificationStatus: jest.fn(),
+            isDehydrationSupported: jest.fn().mockResolvedValue(false),
+            startDehydration: jest.fn(),
+            getKeyBackupInfo: jest.fn().mockResolvedValue(null),
+            userHasCrossSigningKeys: jest.fn().mockResolvedValue(false),
+        } as unknown as CryptoApi);
+
+        mockClient = createTestClient();
+        mockClient.doesServerSupportExtendedProfiles = () => Promise.resolve(false);
+
+        jest.spyOn(mockClient, "doesServerSupportUnstableFeature").mockResolvedValue(true);
+        jest.spyOn(mockClient.secretStorage, "hasKey").mockResolvedValue(true);
+        jest.spyOn(mockClient, "getCrypto").mockReturnValue(mockCrypto);
+        jest.spyOn(mockClient, "doesServerSupportUnstableFeature").mockResolvedValue(true);
+        jest.spyOn(MatrixClientPeg, "get").mockReturnValue(mockClient);
+        jest.spyOn(MatrixClientPeg, "safeGet").mockReturnValue(mockClient);
+    });
+
+    const renderComponent = (
+        props = {
+            hideVerificationSection: false,
+        },
+    ) => {
+        const device1 = new Device({
+            deviceId: "d1",
+            userId: defaultUserId,
+            displayName: "my device",
+            algorithms: [],
+            keys: new Map(),
+        });
+
+        const devicesMap = new Map<string, Device>([[device1.deviceId, device1]]);
+        const userDeviceMap = new Map<string, Map<string, Device>>([[defaultUserId, devicesMap]]);
+
+        mockCrypto.getUserDeviceInfo.mockResolvedValue(userDeviceMap);
+
+        const Wrapper = (wrapperProps = {}) => {
+            return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
+        };
+
+        return render(
+            <UserInfoHeaderView
+                {...defaultProps}
+                {...props}
+                devices={[device1]}
+                hideVerificationSection={props.hideVerificationSection}
+            />,
+            {
+                wrapper: Wrapper,
+            },
+        );
+    };
+
+    it("renders custom user identifiers in the header", () => {
+        const { container } = renderComponent();
+        expect(screen.getByText("customUserIdentifier")).toBeInTheDocument();
+        expect(container).toMatchSnapshot();
+    });
+
+    it("should not render verification view if hideVerificationSection is true", () => {
+        mocked(useUserfoHeaderViewModel).mockReturnValue({
+            onMemberAvatarClick: jest.fn(),
+            precenseInfo: {
+                lastActiveAgo: undefined,
+                currentlyActive: undefined,
+                state: undefined,
+            },
+            showPresence: false,
+            timezoneInfo: null,
+            userIdentifier: "null",
+        });
+
+        const { container } = renderComponent({ hideVerificationSection: true });
+        const verificationClass = container.getElementsByClassName("mx_UserInfo_verification").length;
+
+        expect(verificationClass).toEqual(0);
+    });
+
+    it("should render timezone if it exist", () => {
+        mocked(useUserfoHeaderViewModel).mockReturnValue({
+            onMemberAvatarClick: jest.fn(),
+            precenseInfo: {
+                lastActiveAgo: undefined,
+                currentlyActive: undefined,
+                state: undefined,
+            },
+            showPresence: false,
+            timezoneInfo: {
+                timezone: "FR",
+                friendly: "paris",
+            },
+            userIdentifier: null,
+        });
+
+        renderComponent({ hideVerificationSection: false });
+        expect(screen.getByText("paris")).toBeInTheDocument();
+    });
+
+    it("should render correct presence label", () => {
+        mocked(useUserfoHeaderViewModel).mockReturnValue({
+            onMemberAvatarClick: jest.fn(),
+            precenseInfo: {
+                lastActiveAgo: 0,
+                currentlyActive: true,
+                state: "online",
+            },
+            showPresence: true,
+            timezoneInfo: null,
+            userIdentifier: null,
+        });
+
+        renderComponent({ hideVerificationSection: false });
+        expect(screen.getByText("Online")).toBeInTheDocument();
+    });
+
+    it("should be able to click on member avatar", () => {
+        const onMemberAvatarClick = jest.fn();
+        mocked(useUserfoHeaderViewModel).mockReturnValue({
+            onMemberAvatarClick,
+            precenseInfo: {
+                lastActiveAgo: undefined,
+                currentlyActive: undefined,
+                state: undefined,
+            },
+            showPresence: false,
+            timezoneInfo: {
+                timezone: "FR",
+                friendly: "paris",
+            },
+            userIdentifier: null,
+        });
+        renderComponent();
+        const avatar = screen.getByRole("button", { name: "Profile picture" });
+
+        fireEvent.click(avatar);
+
+        expect(onMemberAvatarClick).toHaveBeenCalled();
+    });
+});
diff --git a/test/unit-tests/components/views/right_panel/user_info/UserInfoPowerLevels-test.tsx b/test/unit-tests/components/views/right_panel/user_info/UserInfoPowerLevels-test.tsx
new file mode 100644
index 0000000000..2b871dd469
--- /dev/null
+++ b/test/unit-tests/components/views/right_panel/user_info/UserInfoPowerLevels-test.tsx
@@ -0,0 +1,164 @@
+/*
+Copyright 2025 New Vector Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import userEvent from "@testing-library/user-event";
+import { fireEvent, render, screen } from "jest-matrix-react";
+import { type Mocked, mocked } from "jest-mock";
+import { MatrixEvent, type MatrixClient, RoomMember, type Room, EventType } from "matrix-js-sdk/src/matrix";
+
+import MatrixClientContext from "../../../../../../src/contexts/MatrixClientContext";
+import { MatrixClientPeg } from "../../../../../../src/MatrixClientPeg";
+import { type IRoomPermissions } from "../../../../../../src/components/views/right_panel/UserInfo";
+import { PowerLevelSection } from "../../../../../../src/components/views/right_panel/user_info/UserInfoPowerLevels";
+
+describe("<PowerLevelEditor />", () => {
+    const defaultRoomId = "!fkfk";
+    const defaultUserId = "@user:example.com";
+    const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
+
+    let mockClient: Mocked<MatrixClient>;
+    let mockRoom: Mocked<Room>;
+    let defaultProps: {
+        user: RoomMember;
+        room: Room;
+        roomPermissions: IRoomPermissions;
+    };
+
+    beforeEach(() => {
+        defaultProps = {
+            user: defaultMember,
+            room: mockRoom,
+            roomPermissions: {
+                modifyLevelMax: 100,
+                canEdit: false,
+                canInvite: false,
+            },
+        };
+
+        mockRoom = mocked({
+            roomId: defaultRoomId,
+            getType: jest.fn().mockReturnValue(undefined),
+            isSpaceRoom: jest.fn().mockReturnValue(false),
+            getMember: jest.fn().mockReturnValue(undefined),
+            getMxcAvatarUrl: jest.fn().mockReturnValue("mock-avatar-url"),
+            name: "test room",
+            on: jest.fn(),
+            off: jest.fn(),
+            currentState: {
+                getStateEvents: jest.fn(),
+                on: jest.fn(),
+                off: jest.fn(),
+            },
+            getEventReadUpTo: jest.fn(),
+        } as unknown as Room);
+
+        mockClient = mocked({
+            getUser: jest.fn(),
+            isGuest: jest.fn().mockReturnValue(false),
+            isUserIgnored: jest.fn(),
+            getIgnoredUsers: jest.fn(),
+            setIgnoredUsers: jest.fn(),
+            getUserId: jest.fn(),
+            getSafeUserId: jest.fn(),
+            getDomain: jest.fn(),
+            on: jest.fn(),
+            off: jest.fn(),
+            isSynapseAdministrator: jest.fn().mockResolvedValue(false),
+            doesServerSupportUnstableFeature: jest.fn().mockReturnValue(false),
+            doesServerSupportExtendedProfiles: jest.fn().mockResolvedValue(false),
+            getExtendedProfileProperty: jest.fn().mockRejectedValue(new Error("Not supported")),
+            mxcUrlToHttp: jest.fn().mockReturnValue("mock-mxcUrlToHttp"),
+            removeListener: jest.fn(),
+            currentState: {
+                on: jest.fn(),
+            },
+            getRoom: jest.fn(),
+            credentials: {},
+            setPowerLevel: jest.fn().mockResolvedValueOnce({ event_id: "123" }),
+        } as unknown as MatrixClient);
+
+        jest.spyOn(MatrixClientPeg, "get").mockReturnValue(mockClient);
+        jest.spyOn(MatrixClientPeg, "safeGet").mockReturnValue(mockClient);
+    });
+
+    afterAll(() => {
+        defaultProps = {
+            user: defaultMember,
+            room: mockRoom,
+            roomPermissions: {
+                modifyLevelMax: 100,
+                canEdit: false,
+                canInvite: false,
+            },
+        };
+        jest.clearAllMocks();
+    });
+
+    const renderComponent = (props = defaultProps) => {
+        const Wrapper = (wrapperProps = {}) => {
+            return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
+        };
+
+        return render(<PowerLevelSection {...props} />, {
+            wrapper: Wrapper,
+        });
+    };
+
+    it("renders a power level combobox if can edit is true", () => {
+        const startPowerLevel = 999;
+        const powerLevelEvent = new MatrixEvent({
+            type: EventType.RoomPowerLevels,
+            content: { users: { [defaultUserId]: startPowerLevel }, users_default: 1 },
+        });
+        mockRoom.currentState.getStateEvents.mockReturnValue(powerLevelEvent);
+
+        renderComponent({
+            ...defaultProps,
+            room: mockRoom,
+            roomPermissions: { ...defaultProps.roomPermissions, canEdit: true },
+        });
+
+        expect(screen.getByRole("combobox", { name: "Power level" })).toBeInTheDocument();
+    });
+
+    it("renders a user role if can edit is false", () => {
+        const member = new RoomMember(defaultRoomId, defaultUserId);
+        member.powerLevel = 100;
+        renderComponent({ ...defaultProps, user: member });
+
+        expect(screen.getByText("Admin")).toBeInTheDocument();
+    });
+
+    it("renders a combobox and attempts to change power level on change of the combobox", async () => {
+        const startPowerLevel = 999;
+        const powerLevelEvent = new MatrixEvent({
+            type: EventType.RoomPowerLevels,
+            content: { users: { [defaultUserId]: startPowerLevel }, users_default: 1 },
+        });
+        mockRoom.currentState.getStateEvents.mockReturnValue(powerLevelEvent);
+        mockClient.getSafeUserId.mockReturnValueOnce(defaultUserId);
+        mockClient.getUserId.mockReturnValueOnce(defaultUserId);
+        renderComponent({
+            ...defaultProps,
+            room: mockRoom,
+            roomPermissions: { ...defaultProps.roomPermissions, canEdit: true },
+        });
+
+        const changedPowerLevel = 100;
+
+        fireEvent.change(screen.getByRole("combobox", { name: "Power level" }), {
+            target: { value: changedPowerLevel },
+        });
+
+        await screen.findByText("Demote", { exact: true });
+
+        // firing the event will raise a dialog warning about self demotion, wait for this to appear then click on it
+        await userEvent.click(await screen.findByText("Demote", { exact: true }));
+        expect(mockClient.setPowerLevel).toHaveBeenCalledTimes(1);
+        expect(mockClient.setPowerLevel).toHaveBeenCalledWith(mockRoom.roomId, defaultMember.userId, changedPowerLevel);
+    });
+});
diff --git a/test/unit-tests/components/views/right_panel/user_info/__snapshots__/UserInfoBasic-test.tsx.snap b/test/unit-tests/components/views/right_panel/user_info/__snapshots__/UserInfoBasic-test.tsx.snap
new file mode 100644
index 0000000000..5573712618
--- /dev/null
+++ b/test/unit-tests/components/views/right_panel/user_info/__snapshots__/UserInfoBasic-test.tsx.snap
@@ -0,0 +1,315 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`<UserInfoBasic /> should display the defaut values 1`] = `
+<div>
+  <div
+    class="mx_UserInfo_container"
+  >
+    <div
+      class="mx_UserInfo_profileField"
+    >
+      <div
+        class="mx_PowerSelector"
+      >
+        <div
+          class="mx_Field mx_Field_select"
+        >
+          <select
+            data-testid="power-level-select-element"
+            id="mx_Field_1"
+            label="Power level"
+            placeholder="Power level"
+            type="text"
+          >
+            <option
+              data-testid="power-level-option-0"
+              value="0"
+            >
+              Default
+            </option>
+            <option
+              data-testid="power-level-option-SELECT_VALUE_CUSTOM"
+              value="SELECT_VALUE_CUSTOM"
+            >
+              Custom level
+            </option>
+          </select>
+          <label
+            for="mx_Field_1"
+          >
+            Power level
+          </label>
+        </div>
+      </div>
+    </div>
+    <button
+      class="_item_dyt4i_8 _interactive_dyt4i_26"
+      data-kind="primary"
+      role="button"
+    >
+      <svg
+        aria-hidden="true"
+        class="_icon_dyt4i_50"
+        fill="currentColor"
+        height="24"
+        viewBox="0 0 24 24"
+        width="24"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="m1.5 21.25 1.45-4.95a10.2 10.2 0 0 1-.712-2.1A10.2 10.2 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22q-1.125 0-2.2-.238a10.2 10.2 0 0 1-2.1-.712L2.75 22.5a.94.94 0 0 1-1-.25.94.94 0 0 1-.25-1m2.45-1.2 3.2-.95a1 1 0 0 1 .275-.062q.15-.013.275-.013.225 0 .438.038.212.036.412.137a7.4 7.4 0 0 0 1.675.6Q11.1 20 12 20q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4 6.325 6.325 4 12q0 .9.2 1.775t.6 1.675q.176.325.188.688t-.088.712z"
+        />
+      </svg>
+      <span
+        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
+      >
+        Send message
+      </span>
+      <svg
+        aria-hidden="true"
+        class="_nav-hint_dyt4i_59"
+        fill="currentColor"
+        height="24"
+        viewBox="8 0 8 24"
+        width="8"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M8.7 17.3a.95.95 0 0 1-.275-.7q0-.425.275-.7l3.9-3.9-3.9-3.9a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l4.6 4.6q.15.15.213.325.062.175.062.375t-.062.375a.9.9 0 0 1-.213.325l-4.6 4.6a.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
+        />
+      </svg>
+    </button>
+    <button
+      class="_item_dyt4i_8 _interactive_dyt4i_26"
+      data-kind="primary"
+      role="button"
+    >
+      <svg
+        aria-hidden="true"
+        class="_icon_dyt4i_50"
+        fill="currentColor"
+        height="24"
+        viewBox="0 0 24 24"
+        width="24"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M10 12q-1.65 0-2.825-1.175T6 8t1.175-2.825T10 4t2.825 1.175T14 8t-1.175 2.825T10 12m-8 6v-.8q0-.85.438-1.562.437-.713 1.162-1.088a14.8 14.8 0 0 1 3.15-1.163A13.8 13.8 0 0 1 10 13q1.65 0 3.25.387 1.6.388 3.15 1.163.724.375 1.163 1.087Q18 16.35 18 17.2v.8q0 .824-.587 1.413A1.93 1.93 0 0 1 16 20H4q-.824 0-1.412-.587A1.93 1.93 0 0 1 2 18m2 0h12v-.8a.97.97 0 0 0-.5-.85q-1.35-.675-2.725-1.012a11.6 11.6 0 0 0-5.55 0Q5.85 15.675 4.5 16.35a.97.97 0 0 0-.5.85zm6-8q.825 0 1.412-.588Q12 8.826 12 8q0-.824-.588-1.412A1.93 1.93 0 0 0 10 6q-.825 0-1.412.588A1.93 1.93 0 0 0 8 8q0 .825.588 1.412Q9.175 10 10 10m7 1h2v2q0 .424.288.713.287.287.712.287.424 0 .712-.287A.97.97 0 0 0 21 13v-2h2q.424 0 .712-.287A.97.97 0 0 0 24 10a.97.97 0 0 0-.288-.713A.97.97 0 0 0 23 9h-2V7a.97.97 0 0 0-.288-.713A.97.97 0 0 0 20 6a.97.97 0 0 0-.712.287A.97.97 0 0 0 19 7v2h-2a.97.97 0 0 0-.712.287A.97.97 0 0 0 16 10q0 .424.288.713.287.287.712.287"
+        />
+      </svg>
+      <span
+        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
+      >
+        Invite
+      </span>
+      <svg
+        aria-hidden="true"
+        class="_nav-hint_dyt4i_59"
+        fill="currentColor"
+        height="24"
+        viewBox="8 0 8 24"
+        width="8"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M8.7 17.3a.95.95 0 0 1-.275-.7q0-.425.275-.7l3.9-3.9-3.9-3.9a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l4.6 4.6q.15.15.213.325.062.175.062.375t-.062.375a.9.9 0 0 1-.213.325l-4.6 4.6a.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
+        />
+      </svg>
+    </button>
+    <button
+      class="_item_dyt4i_8 _interactive_dyt4i_26 _disabled_dyt4i_118"
+      data-kind="primary"
+      disabled=""
+      role="button"
+    >
+      <svg
+        aria-hidden="true"
+        class="_icon_dyt4i_50"
+        fill="currentColor"
+        height="24"
+        viewBox="0 0 24 24"
+        width="24"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+        />
+      </svg>
+      <span
+        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
+      >
+        Jump to read receipt
+      </span>
+      <svg
+        aria-hidden="true"
+        class="_nav-hint_dyt4i_59"
+        fill="currentColor"
+        height="24"
+        viewBox="8 0 8 24"
+        width="8"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M8.7 17.3a.95.95 0 0 1-.275-.7q0-.425.275-.7l3.9-3.9-3.9-3.9a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l4.6 4.6q.15.15.213.325.062.175.062.375t-.062.375a.9.9 0 0 1-.213.325l-4.6 4.6a.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
+        />
+      </svg>
+    </button>
+    <button
+      class="_item_dyt4i_8 _interactive_dyt4i_26"
+      data-kind="primary"
+      role="button"
+    >
+      <svg
+        aria-hidden="true"
+        class="_icon_dyt4i_50"
+        fill="currentColor"
+        height="24"
+        viewBox="0 0 24 24"
+        width="24"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 16a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 15V7.85L9.125 9.725q-.3.3-.7.3T7.7 9.7a.93.93 0 0 1-.288-.713A.98.98 0 0 1 7.7 8.3l3.6-3.6q.15-.15.325-.213.175-.062.375-.062t.375.062a.9.9 0 0 1 .325.213l3.6 3.6q.3.3.287.712a.98.98 0 0 1-.287.688q-.3.3-.713.313a.93.93 0 0 1-.712-.288L13 7.85V15q0 .424-.287.713A.97.97 0 0 1 12 16m-6 4q-.824 0-1.412-.587A1.93 1.93 0 0 1 4 18v-2q0-.424.287-.713A.97.97 0 0 1 5 15q.424 0 .713.287Q6 15.576 6 16v2h12v-2q0-.424.288-.713A.97.97 0 0 1 19 15q.424 0 .712.287.288.288.288.713v2q0 .824-.587 1.413A1.93 1.93 0 0 1 18 20z"
+        />
+      </svg>
+      <span
+        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
+      >
+        Share profile
+      </span>
+      <svg
+        aria-hidden="true"
+        class="_nav-hint_dyt4i_59"
+        fill="currentColor"
+        height="24"
+        viewBox="8 0 8 24"
+        width="8"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M8.7 17.3a.95.95 0 0 1-.275-.7q0-.425.275-.7l3.9-3.9-3.9-3.9a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l4.6 4.6q.15.15.213.325.062.175.062.375t-.062.375a.9.9 0 0 1-.213.325l-4.6 4.6a.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
+        />
+      </svg>
+    </button>
+    <button
+      class="_item_dyt4i_8 _interactive_dyt4i_26"
+      data-kind="primary"
+      role="button"
+    >
+      <svg
+        aria-hidden="true"
+        class="_icon_dyt4i_50"
+        fill="currentColor"
+        height="24"
+        viewBox="0 0 24 24"
+        width="24"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 4a8 8 0 1 0 0 16 1 1 0 1 1 0 2C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10v1.5a3.5 3.5 0 0 1-6.396 1.966A5 5 0 1 1 17 12v1.5a1.5 1.5 0 0 0 3 0V12a8 8 0 0 0-8-8m3 8a3 3 0 1 0-6 0 3 3 0 0 0 6 0"
+        />
+      </svg>
+      <span
+        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
+      >
+        Mention
+      </span>
+      <svg
+        aria-hidden="true"
+        class="_nav-hint_dyt4i_59"
+        fill="currentColor"
+        height="24"
+        viewBox="8 0 8 24"
+        width="8"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M8.7 17.3a.95.95 0 0 1-.275-.7q0-.425.275-.7l3.9-3.9-3.9-3.9a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l4.6 4.6q.15.15.213.325.062.175.062.375t-.062.375a.9.9 0 0 1-.213.325l-4.6 4.6a.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
+        />
+      </svg>
+    </button>
+  </div>
+  <div
+    class="mx_UserInfo_container"
+  >
+    <button
+      class="_item_dyt4i_8 _interactive_dyt4i_26"
+      data-kind="critical"
+      role="button"
+    >
+      <svg
+        aria-hidden="true"
+        class="_icon_dyt4i_50"
+        fill="currentColor"
+        height="24"
+        viewBox="0 0 24 24"
+        width="24"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M7 21q-.824 0-1.412-.587A1.93 1.93 0 0 1 5 19V6a.97.97 0 0 1-.713-.287A.97.97 0 0 1 4 5q0-.424.287-.713A.97.97 0 0 1 5 4h4q0-.424.287-.712A.97.97 0 0 1 10 3h4q.424 0 .713.288Q15 3.575 15 4h4q.424 0 .712.287Q20 4.576 20 5t-.288.713A.97.97 0 0 1 19 6v13q0 .824-.587 1.413A1.93 1.93 0 0 1 17 21zM7 6v13h10V6zm2 10q0 .424.287.712Q9.576 17 10 17t.713-.288A.97.97 0 0 0 11 16V9a.97.97 0 0 0-.287-.713A.97.97 0 0 0 10 8a.97.97 0 0 0-.713.287A.97.97 0 0 0 9 9zm4 0q0 .424.287.712.288.288.713.288.424 0 .713-.288A.97.97 0 0 0 15 16V9a.97.97 0 0 0-.287-.713A.97.97 0 0 0 14 8a.97.97 0 0 0-.713.287A.97.97 0 0 0 13 9z"
+        />
+      </svg>
+      <span
+        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
+      >
+        Deactivate user
+      </span>
+      <svg
+        aria-hidden="true"
+        class="_nav-hint_dyt4i_59"
+        fill="currentColor"
+        height="24"
+        viewBox="8 0 8 24"
+        width="8"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M8.7 17.3a.95.95 0 0 1-.275-.7q0-.425.275-.7l3.9-3.9-3.9-3.9a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l4.6 4.6q.15.15.213.325.062.175.062.375t-.062.375a.9.9 0 0 1-.213.325l-4.6 4.6a.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
+        />
+      </svg>
+    </button>
+  </div>
+  <div
+    class="mx_UserInfo_container"
+  >
+    <button
+      class="_item_dyt4i_8 _interactive_dyt4i_26"
+      data-kind="critical"
+      role="button"
+    >
+      <svg
+        aria-hidden="true"
+        class="_icon_dyt4i_50"
+        fill="currentColor"
+        height="24"
+        viewBox="0 0 24 24"
+        width="24"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 22a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22m0-2q3.35 0 5.675-2.325T20 12q0-1.35-.437-2.6A8 8 0 0 0 18.3 7.1L7.1 18.3q1.05.825 2.3 1.262T12 20m-6.3-3.1L16.9 5.7a8 8 0 0 0-2.3-1.263A7.8 7.8 0 0 0 12 4Q8.65 4 6.325 6.325T4 12q0 1.35.438 2.6A8 8 0 0 0 5.7 16.9"
+        />
+      </svg>
+      <span
+        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
+      >
+        Ignore
+      </span>
+      <svg
+        aria-hidden="true"
+        class="_nav-hint_dyt4i_59"
+        fill="currentColor"
+        height="24"
+        viewBox="8 0 8 24"
+        width="8"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M8.7 17.3a.95.95 0 0 1-.275-.7q0-.425.275-.7l3.9-3.9-3.9-3.9a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l4.6 4.6q.15.15.213.325.062.175.062.375t-.062.375a.9.9 0 0 1-.213.325l-4.6 4.6a.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
+        />
+      </svg>
+    </button>
+  </div>
+</div>
+`;
diff --git a/test/unit-tests/components/views/right_panel/user_info/__snapshots__/UserInfoHeaderVerificationView-test.tsx.snap b/test/unit-tests/components/views/right_panel/user_info/__snapshots__/UserInfoHeaderVerificationView-test.tsx.snap
new file mode 100644
index 0000000000..87b7c5011a
--- /dev/null
+++ b/test/unit-tests/components/views/right_panel/user_info/__snapshots__/UserInfoHeaderVerificationView-test.tsx.snap
@@ -0,0 +1,73 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`<UserInfoHeaderVerificationView /> renders verification unavailable message 1`] = `
+<div>
+  <div
+    class="_flex_4dswl_9 mx_UserInfo_verification"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+  >
+    <p
+      class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31 mx_UserInfo_verification_unavailable"
+    >
+      (
+      User verification unavailable
+      )
+    </p>
+  </div>
+</div>
+`;
+
+exports[`<UserInfoHeaderVerificationView /> renders verified badge when user is verified 1`] = `
+<div>
+  <div
+    class="_flex_4dswl_9 mx_UserInfo_verification"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+  >
+    <span
+      class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_18gm1_8 mx_UserInfo_verified_badge"
+      data-kind="green"
+    >
+      <svg
+        class="mx_UserInfo_verified_icon"
+        fill="currentColor"
+        height="16px"
+        viewBox="0 0 24 24"
+        width="16px"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M8.15 21.75 6.7 19.3l-2.75-.6a.94.94 0 0 1-.6-.387.93.93 0 0 1-.175-.688L3.45 14.8l-1.875-2.15a.93.93 0 0 1-.25-.65q0-.375.25-.65L3.45 9.2l-.275-2.825a.93.93 0 0 1 .175-.687.94.94 0 0 1 .6-.388l2.75-.6 1.45-2.45a.98.98 0 0 1 .55-.437.97.97 0 0 1 .7.037l2.6 1.1 2.6-1.1a.97.97 0 0 1 .7-.038q.35.112.55.438L17.3 4.7l2.75.6q.375.075.6.388.225.312.175.687L20.55 9.2l1.875 2.15q.25.275.25.65t-.25.65L20.55 14.8l.275 2.825a.93.93 0 0 1-.175.688.94.94 0 0 1-.6.387l-2.75.6-1.45 2.45a.98.98 0 0 1-.55.438.97.97 0 0 1-.7-.038l-2.6-1.1-2.6 1.1a.97.97 0 0 1-.7.038.98.98 0 0 1-.55-.438m2.8-9.05L9.5 11.275A.93.93 0 0 0 8.812 11q-.412 0-.712.3a.95.95 0 0 0-.275.7q0 .425.275.7l2.15 2.15q.3.3.7.3t.7-.3l4.25-4.25q.3-.3.287-.7a1.06 1.06 0 0 0-.287-.7 1.02 1.02 0 0 0-.713-.312.93.93 0 0 0-.712.287z"
+        />
+      </svg>
+      <p
+        class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 mx_UserInfo_verified_label"
+      >
+        Verified
+      </p>
+    </span>
+  </div>
+</div>
+`;
+
+exports[`<UserInfoHeaderVerificationView /> renders verify button 1`] = `
+<div>
+  <div
+    class="_flex_4dswl_9 mx_UserInfo_verification"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+  >
+    <div
+      class="mx_UserInfo_container_verifyButton"
+    >
+      <button
+        class="_button_187yx_8 mx_UserInfo_verify_button"
+        data-kind="tertiary"
+        data-size="sm"
+        role="button"
+        tabindex="0"
+      >
+        Verify User
+      </button>
+    </div>
+  </div>
+</div>
+`;
diff --git a/test/unit-tests/components/views/right_panel/user_info/__snapshots__/UserInfoHeaderView-test.tsx.snap b/test/unit-tests/components/views/right_panel/user_info/__snapshots__/UserInfoHeaderView-test.tsx.snap
new file mode 100644
index 0000000000..7374a49367
--- /dev/null
+++ b/test/unit-tests/components/views/right_panel/user_info/__snapshots__/UserInfoHeaderView-test.tsx.snap
@@ -0,0 +1,101 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`<UserInfoHeaderView /> renders custom user identifiers in the header 1`] = `
+<div>
+  <div
+    class="mx_UserInfo_avatar"
+  >
+    <div
+      class="mx_UserInfo_avatar_transition"
+    >
+      <div
+        class="mx_UserInfo_avatar_transition_child"
+      >
+        <button
+          aria-label="Profile picture"
+          aria-live="off"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
+          data-color="3"
+          data-testid="avatar-img"
+          data-type="round"
+          role="button"
+          style="--cpd-avatar-size: 120px;"
+          title="@user:example.com"
+        >
+          u
+        </button>
+      </div>
+    </div>
+  </div>
+  <div
+    class="mx_UserInfo_container mx_UserInfo_header"
+  >
+    <div
+      class="_flex_4dswl_9 mx_UserInfo_profile"
+      style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+    >
+      <h1
+        class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93"
+        dir="auto"
+      >
+        <div
+          class="_flex_4dswl_9 mx_UserInfo_profile_name"
+          style="--mx-flex-display: flex; --mx-flex-direction: row-reverse; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+        >
+          @user:example.com
+        </div>
+      </h1>
+      <p
+        class="_typography_6v6n8_153 _font-body-sm-semibold_6v6n8_36 mx_UserInfo_profile_mxid"
+      >
+        <div
+          class="mx_CopyableText"
+        >
+          customUserIdentifier
+          <div
+            aria-label="Copy"
+            class="mx_AccessibleButton mx_CopyableText_copyButton"
+            role="button"
+            tabindex="0"
+          >
+            <svg
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+              />
+              <path
+                d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+              />
+            </svg>
+          </div>
+        </div>
+      </p>
+    </div>
+    <div
+      class="_flex_4dswl_9 mx_UserInfo_verification"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
+    >
+      <svg
+        class="_icon_11k6c_18"
+        fill="currentColor"
+        height="1em"
+        style="width: 24px; height: 24px;"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          clip-rule="evenodd"
+          d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+          fill-rule="evenodd"
+        />
+      </svg>
+    </div>
+  </div>
+</div>
+`;
diff --git a/test/unit-tests/components/views/room_settings/UrlPreviewSettings-test.tsx b/test/unit-tests/components/views/room_settings/UrlPreviewSettings-test.tsx
index c392788e38..23e9b12682 100644
--- a/test/unit-tests/components/views/room_settings/UrlPreviewSettings-test.tsx
+++ b/test/unit-tests/components/views/room_settings/UrlPreviewSettings-test.tsx
@@ -9,6 +9,7 @@ import React from "react";
 import { type MatrixClient, type Room } from "matrix-js-sdk/src/matrix";
 import { render, screen } from "jest-matrix-react";
 import { waitFor } from "@testing-library/dom";
+import { Form } from "@vector-im/compound-web";
 
 import { createTestClient, mkStubRoom, withClientContextRenderOptions } from "../../../../test-utils";
 import { UrlPreviewSettings } from "../../../../../src/components/views/room_settings/UrlPreviewSettings.tsx";
@@ -30,7 +31,12 @@ describe("UrlPreviewSettings", () => {
     });
 
     function renderComponent() {
-        return render(<UrlPreviewSettings room={room} />, withClientContextRenderOptions(client));
+        return render(
+            <Form.Root>
+                <UrlPreviewSettings room={room} />
+            </Form.Root>,
+            withClientContextRenderOptions(client),
+        );
     }
 
     it("should display the correct preview when the setting is in a loading state", () => {
diff --git a/test/unit-tests/components/views/room_settings/__snapshots__/UrlPreviewSettings-test.tsx.snap b/test/unit-tests/components/views/room_settings/__snapshots__/UrlPreviewSettings-test.tsx.snap
index 017f4bc2bb..cbb3153219 100644
--- a/test/unit-tests/components/views/room_settings/__snapshots__/UrlPreviewSettings-test.tsx.snap
+++ b/test/unit-tests/components/views/room_settings/__snapshots__/UrlPreviewSettings-test.tsx.snap
@@ -1,236 +1,270 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`UrlPreviewSettings should display the correct preview when the room is encrypted and the url preview is enabled 1`] = `
 <DocumentFragment>
-  <fieldset
-    class="mx_SettingsFieldset"
+  <form
+    class="_root_19upo_16"
   >
-    <legend
-      class="mx_SettingsFieldset_legend"
+    <fieldset
+      class="mx_SettingsFieldset"
     >
-      URL Previews
-    </legend>
-    <div
-      class="mx_SettingsFieldset_description"
-    >
-      <div
-        class="mx_SettingsSubsection_text"
+      <legend
+        class="mx_SettingsFieldset_legend"
       >
-        <p>
-          When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.
-        </p>
-        <p>
-          In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.
-        </p>
-      </div>
-    </div>
-    <div
-      class="mx_SettingsFieldset_content"
-    >
+        URL Previews
+      </legend>
       <div
-        class="mx_SettingsFlag"
+        class="mx_SettingsFieldset_description"
       >
-        <label
-          class="mx_SettingsFlag_label"
-          for="mx_SettingsFlag_vY7Q4uEh9K38"
-        >
-          <span
-            class="mx_SettingsFlag_labelText"
-          />
-        </label>
         <div
-          aria-checked="true"
-          aria-disabled="false"
-          class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
-          id="mx_SettingsFlag_vY7Q4uEh9K38"
-          role="switch"
-          tabindex="0"
+          class="mx_SettingsSubsection_text"
         >
-          <div
-            class="mx_ToggleSwitch_ball"
-          />
+          <p>
+            When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.
+          </p>
+          <p>
+            In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.
+          </p>
         </div>
       </div>
-    </div>
-  </fieldset>
+      <div
+        class="mx_SettingsFieldset_content"
+      >
+        <div
+          class="_inline-field_19upo_32"
+        >
+          <div
+            class="_inline-field-control_19upo_44"
+          >
+            <div
+              class="_container_udcm8_10"
+            >
+              <input
+                checked=""
+                class="_input_udcm8_24"
+                id="mx_SettingsFlag_vY7Q4uEh9K38"
+                role="switch"
+                type="checkbox"
+              />
+              <div
+                class="_ui_udcm8_34"
+              />
+            </div>
+          </div>
+          <div
+            class="_inline-field-body_19upo_38"
+          >
+            <label
+              class="_label_19upo_59"
+              for="mx_SettingsFlag_vY7Q4uEh9K38"
+            >
+              urlPreviewsEnabled_e2ee
+            </label>
+          </div>
+        </div>
+      </div>
+    </fieldset>
+  </form>
 </DocumentFragment>
 `;
 
 exports[`UrlPreviewSettings should display the correct preview when the room is unencrypted and the url preview is disabled 1`] = `
 <DocumentFragment>
-  <fieldset
-    class="mx_SettingsFieldset"
+  <form
+    class="_root_19upo_16"
   >
-    <legend
-      class="mx_SettingsFieldset_legend"
+    <fieldset
+      class="mx_SettingsFieldset"
     >
-      URL Previews
-    </legend>
-    <div
-      class="mx_SettingsFieldset_description"
-    >
-      <div
-        class="mx_SettingsSubsection_text"
+      <legend
+        class="mx_SettingsFieldset_legend"
+      >
+        URL Previews
+      </legend>
+      <div
+        class="mx_SettingsFieldset_description"
       >
-        <p>
-          When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.
-        </p>
-        <p>
-          <span>
-            You have 
-          </span>
-        </p>
         <div
-          class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
-          role="button"
-          tabindex="0"
+          class="mx_SettingsSubsection_text"
         >
-          disabled
-        </div>
-         URL previews by default.
-        <p />
-      </div>
-    </div>
-    <div
-      class="mx_SettingsFieldset_content"
-    >
-      <div>
-        URL previews are disabled by default for participants in this room.
-      </div>
-      <div
-        class="mx_SettingsFlag"
-      >
-        <label
-          class="mx_SettingsFlag_label"
-          for="mx_SettingsFlag_vY7Q4uEh9K38"
-        >
-          <span
-            class="mx_SettingsFlag_labelText"
+          <p>
+            When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.
+          </p>
+          <p>
+            <span>
+              You have 
+            </span>
+          </p>
+          <div
+            class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
+            role="button"
+            tabindex="0"
           >
-            Enable inline URL previews by default
-          </span>
-        </label>
+            disabled
+          </div>
+           URL previews by default.
+          <p />
+        </div>
+      </div>
+      <div
+        class="mx_SettingsFieldset_content"
+      >
+        <div>
+          URL previews are disabled by default for participants in this room.
+        </div>
         <div
-          aria-checked="false"
-          aria-disabled="true"
-          aria-label="Enable inline URL previews by default"
-          class="mx_AccessibleButton mx_ToggleSwitch"
-          id="mx_SettingsFlag_vY7Q4uEh9K38"
-          role="switch"
-          tabindex="0"
+          class="_inline-field_19upo_32"
         >
           <div
-            class="mx_ToggleSwitch_ball"
-          />
+            class="_inline-field-control_19upo_44"
+          >
+            <div
+              class="_container_udcm8_10"
+            >
+              <input
+                class="_input_udcm8_24"
+                disabled=""
+                id="mx_SettingsFlag_vY7Q4uEh9K38"
+                role="switch"
+                type="checkbox"
+              />
+              <div
+                class="_ui_udcm8_34"
+              />
+            </div>
+          </div>
+          <div
+            class="_inline-field-body_19upo_38"
+          >
+            <label
+              class="_label_19upo_59"
+              for="mx_SettingsFlag_vY7Q4uEh9K38"
+            >
+              Enable inline URL previews by default
+            </label>
+          </div>
         </div>
       </div>
-    </div>
-  </fieldset>
+    </fieldset>
+  </form>
 </DocumentFragment>
 `;
 
 exports[`UrlPreviewSettings should display the correct preview when the room is unencrypted and the url preview is enabled 1`] = `
 <DocumentFragment>
-  <fieldset
-    class="mx_SettingsFieldset"
+  <form
+    class="_root_19upo_16"
   >
-    <legend
-      class="mx_SettingsFieldset_legend"
+    <fieldset
+      class="mx_SettingsFieldset"
     >
-      URL Previews
-    </legend>
-    <div
-      class="mx_SettingsFieldset_description"
-    >
-      <div
-        class="mx_SettingsSubsection_text"
+      <legend
+        class="mx_SettingsFieldset_legend"
+      >
+        URL Previews
+      </legend>
+      <div
+        class="mx_SettingsFieldset_description"
       >
-        <p>
-          When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.
-        </p>
-        <p>
-          <span>
-            You have 
-          </span>
-        </p>
         <div
-          class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
-          role="button"
-          tabindex="0"
+          class="mx_SettingsSubsection_text"
         >
-          enabled
-        </div>
-         URL previews by default.
-        <p />
-      </div>
-    </div>
-    <div
-      class="mx_SettingsFieldset_content"
-    >
-      <div>
-        URL previews are enabled by default for participants in this room.
-      </div>
-      <div
-        class="mx_SettingsFlag"
-      >
-        <label
-          class="mx_SettingsFlag_label"
-          for="mx_SettingsFlag_vY7Q4uEh9K38"
-        >
-          <span
-            class="mx_SettingsFlag_labelText"
+          <p>
+            When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.
+          </p>
+          <p>
+            <span>
+              You have 
+            </span>
+          </p>
+          <div
+            class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
+            role="button"
+            tabindex="0"
           >
-            Enable inline URL previews by default
-          </span>
-        </label>
+            enabled
+          </div>
+           URL previews by default.
+          <p />
+        </div>
+      </div>
+      <div
+        class="mx_SettingsFieldset_content"
+      >
+        <div>
+          URL previews are enabled by default for participants in this room.
+        </div>
         <div
-          aria-checked="true"
-          aria-disabled="false"
-          aria-label="Enable inline URL previews by default"
-          class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
-          id="mx_SettingsFlag_vY7Q4uEh9K38"
-          role="switch"
-          tabindex="0"
+          class="_inline-field_19upo_32"
         >
           <div
-            class="mx_ToggleSwitch_ball"
-          />
+            class="_inline-field-control_19upo_44"
+          >
+            <div
+              class="_container_udcm8_10"
+            >
+              <input
+                checked=""
+                class="_input_udcm8_24"
+                id="mx_SettingsFlag_vY7Q4uEh9K38"
+                role="switch"
+                type="checkbox"
+              />
+              <div
+                class="_ui_udcm8_34"
+              />
+            </div>
+          </div>
+          <div
+            class="_inline-field-body_19upo_38"
+          >
+            <label
+              class="_label_19upo_59"
+              for="mx_SettingsFlag_vY7Q4uEh9K38"
+            >
+              Enable inline URL previews by default
+            </label>
+          </div>
         </div>
       </div>
-    </div>
-  </fieldset>
+    </fieldset>
+  </form>
 </DocumentFragment>
 `;
 
 exports[`UrlPreviewSettings should display the correct preview when the setting is in a loading state 1`] = `
 <DocumentFragment>
-  <fieldset
-    class="mx_SettingsFieldset"
+  <form
+    class="_root_19upo_16"
   >
-    <legend
-      class="mx_SettingsFieldset_legend"
+    <fieldset
+      class="mx_SettingsFieldset"
     >
-      URL Previews
-    </legend>
-    <div
-      class="mx_SettingsFieldset_content"
-    >
-      <svg
-        class="_icon_11k6c_18"
-        fill="currentColor"
-        height="1em"
-        style="width: 20px; height: 20px;"
-        viewBox="0 0 24 24"
-        width="1em"
-        xmlns="http://www.w3.org/2000/svg"
+      <legend
+        class="mx_SettingsFieldset_legend"
       >
-        <path
-          clip-rule="evenodd"
-          d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
-          fill-rule="evenodd"
-        />
-      </svg>
-    </div>
-  </fieldset>
+        URL Previews
+      </legend>
+      <div
+        class="mx_SettingsFieldset_content"
+      >
+        <svg
+          class="_icon_11k6c_18"
+          fill="currentColor"
+          height="1em"
+          style="width: 20px; height: 20px;"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            clip-rule="evenodd"
+            d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+            fill-rule="evenodd"
+          />
+        </svg>
+      </div>
+    </fieldset>
+  </form>
 </DocumentFragment>
 `;
diff --git a/test/unit-tests/components/views/rooms/AppsDrawer-test.tsx b/test/unit-tests/components/views/rooms/AppsDrawer-test.tsx
index 14c8bde3a2..38efbc1eb8 100644
--- a/test/unit-tests/components/views/rooms/AppsDrawer-test.tsx
+++ b/test/unit-tests/components/views/rooms/AppsDrawer-test.tsx
@@ -13,23 +13,23 @@ import { render } from "jest-matrix-react";
 import { stubClient } from "../../../../test-utils";
 import AppsDrawer from "../../../../../src/components/views/rooms/AppsDrawer";
 import SdkConfig from "../../../../../src/SdkConfig";
-import ResizeNotifier from "../../../../../src/utils/ResizeNotifier";
 import { WidgetLayoutStore } from "../../../../../src/stores/widgets/WidgetLayoutStore";
 import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
+import { SDKContext, SdkContextClass } from "../../../../../src/contexts/SDKContext";
 
 const ROOM_ID = "!room:id";
 
 describe("AppsDrawer", () => {
     let client: MatrixClient;
     let room: Room;
-    let dummyResizeNotifier: ResizeNotifier;
+    let sdkContext: SdkContextClass;
 
     beforeEach(async () => {
         client = stubClient();
         room = new Room(ROOM_ID, client, client.getUserId()!, {
             pendingEventOrdering: PendingEventOrdering.Detached,
         });
-        dummyResizeNotifier = new ResizeNotifier();
+        sdkContext = new SdkContextClass();
     });
 
     afterEach(() => {
@@ -58,17 +58,13 @@ describe("AppsDrawer", () => {
             return [];
         });
 
-        const { container } = render(
-            <AppsDrawer
-                userId={client.getUserId()!}
-                room={room}
-                resizeNotifier={dummyResizeNotifier}
-                showApps={true}
-            />,
-            {
-                wrapper: ({ ...rest }) => <MatrixClientContext.Provider value={client} {...rest} />,
-            },
-        );
+        const { container } = render(<AppsDrawer userId={client.getUserId()!} room={room} showApps={true} />, {
+            wrapper: ({ ...rest }) => (
+                <SDKContext.Provider value={sdkContext}>
+                    <MatrixClientContext.Provider value={client} {...rest} />
+                </SDKContext.Provider>
+            ),
+        });
 
         const appsDrawerResizer = container.getElementsByClassName("mx_AppsDrawer_resizer")[0] as HTMLElement;
         expect(appsDrawerResizer.style.height).toBe("500px");
diff --git a/test/unit-tests/components/views/rooms/BasicMessageComposer-test.tsx b/test/unit-tests/components/views/rooms/BasicMessageComposer-test.tsx
index 798f948114..e1b2aa00a5 100644
--- a/test/unit-tests/components/views/rooms/BasicMessageComposer-test.tsx
+++ b/test/unit-tests/components/views/rooms/BasicMessageComposer-test.tsx
@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
-import { render, screen } from "jest-matrix-react";
+import { fireEvent, render, screen } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
 import { type MatrixClient, Room } from "matrix-js-sdk/src/matrix";
 
@@ -16,6 +16,9 @@ import * as TestUtils from "../../../../test-utils";
 import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
 import EditorModel from "../../../../../src/editor/model";
 import { createPartCreator, createRenderer } from "../../../editor/mock";
+import { CommandPartCreator } from "../../../../../src/editor/parts";
+import DocumentOffset from "../../../../../src/editor/offset";
+import { SdkContextClass } from "../../../../../src/contexts/SDKContext";
 import SettingsStore from "../../../../../src/settings/SettingsStore";
 
 describe("BasicMessageComposer", () => {
@@ -103,6 +106,92 @@ describe("BasicMessageComposer", () => {
         const placeholder = input[0].style.getPropertyValue("--placeholder");
         expect(placeholder).toMatch("'w\\\\e'");
     });
+
+    it("should not consider typing for unknown or disabled slash commands", async () => {
+        // create a command part which represents a slash command the client doesn't recognise
+        const commandPc = new CommandPartCreator(room as unknown as Room, client as unknown as MatrixClient, null);
+        const commandPart = commandPc.command("/unknown do stuff");
+        const model = new EditorModel([commandPart], commandPc, renderer);
+
+        // spy on typingStore.setSelfTyping
+        const spy = jest.spyOn(SdkContextClass.instance.typingStore, "setSelfTyping");
+
+        render(<BasicMessageComposer model={model} room={room} />);
+
+        // simulate typing by updating the model - this will call the component's update callback
+        await model.update(commandPart.text, "insertText", new DocumentOffset(commandPart.text.length, true));
+
+        // Since the command is not in CommandMap, it should not be considered typing
+        expect(spy).toHaveBeenCalledWith(room.roomId, null, false);
+        spy.mockRestore();
+    });
+
+    it("should ignore keydown events during IME composition", () => {
+        const model = new EditorModel([], pc, renderer);
+        render(<BasicMessageComposer model={model} room={room} />);
+        const input = screen.getByRole("textbox");
+
+        // Start IME composition
+        fireEvent.compositionStart(input);
+
+        // Simulate Tab key during IME composition
+        // The keydown should be ignored, so we check that the model state doesn't change
+        const initialAutoComplete = model.autoComplete;
+        const initialPartsLength = model.parts.length;
+
+        // Create a keyboard event with isComposing flag
+        const tabKeyEvent = new KeyboardEvent("keydown", {
+            key: "Tab",
+            bubbles: true,
+            cancelable: true,
+        });
+        Object.defineProperty(tabKeyEvent, "isComposing", {
+            value: true,
+            writable: false,
+        });
+
+        // Fire the keydown event with isComposing flag
+        fireEvent.keyDown(input, {
+            ...tabKeyEvent,
+            nativeEvent: tabKeyEvent,
+        } as unknown as React.KeyboardEvent);
+
+        // During IME composition, the keydown should be ignored
+        // The model should not have changed
+        expect(model.autoComplete).toBe(initialAutoComplete);
+        expect(model.parts.length).toBe(initialPartsLength);
+
+        // End IME composition
+        fireEvent.compositionEnd(input);
+    });
+
+    it("should handle keydown events normally when not composing", () => {
+        const model = new EditorModel([], pc, renderer);
+        render(<BasicMessageComposer model={model} room={room} />);
+        const input = screen.getByRole("textbox");
+
+        // Simulate Tab key when NOT composing
+        const tabKeyEvent = new KeyboardEvent("keydown", {
+            key: "Tab",
+            bubbles: true,
+            cancelable: true,
+        });
+        Object.defineProperty(tabKeyEvent, "isComposing", {
+            value: false,
+            writable: false,
+        });
+
+        // Fire the keydown event without isComposing flag
+        fireEvent.keyDown(input, {
+            ...tabKeyEvent,
+            nativeEvent: tabKeyEvent,
+        } as unknown as React.KeyboardEvent);
+
+        // The event should be processed normally (not ignored)
+        // We can't easily verify tabCompleteName was called since it's private,
+        // but the important thing is that the event wasn't ignored
+        // The test passes if no errors are thrown and the event is handled
+    });
 });
 
 function generateMockDataTransferForString(string: string): DataTransfer {
diff --git a/test/unit-tests/components/views/rooms/EditMessageComposer-test.tsx b/test/unit-tests/components/views/rooms/EditMessageComposer-test.tsx
index 86dd8566d1..39ae0a4b6f 100644
--- a/test/unit-tests/components/views/rooms/EditMessageComposer-test.tsx
+++ b/test/unit-tests/components/views/rooms/EditMessageComposer-test.tsx
@@ -27,12 +27,12 @@ import {
 import DocumentOffset from "../../../../../src/editor/offset";
 import SettingsStore from "../../../../../src/settings/SettingsStore";
 import EditorStateTransfer from "../../../../../src/utils/EditorStateTransfer";
-import { type IRoomState } from "../../../../../src/components/structures/RoomView";
 import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
 import Autocompleter, { type IProviderCompletions } from "../../../../../src/autocomplete/Autocompleter";
 import NotifProvider from "../../../../../src/autocomplete/NotifProvider";
 import DMRoomMap from "../../../../../src/utils/DMRoomMap";
 import { ScopedRoomContextProvider } from "../../../../../src/contexts/ScopedRoomContext.tsx";
+import type { RoomContextType } from "../../../../../src/contexts/RoomContext.ts";
 
 describe("<EditMessageComposer/>", () => {
     const userId = "@alice:server.org";
@@ -75,7 +75,7 @@ describe("<EditMessageComposer/>", () => {
 
     const defaultRoomContext = getRoomContext(room, {});
 
-    const getComponent = (editState: EditorStateTransfer, roomContext: IRoomState = defaultRoomContext) =>
+    const getComponent = (editState: EditorStateTransfer, roomContext: RoomContextType = defaultRoomContext) =>
         render(<EditMessageComposerWithMatrixClient editState={editState} />, {
             wrapper: ({ children }) => (
                 <MatrixClientContext.Provider value={mockClient}>
diff --git a/test/unit-tests/components/views/rooms/EventTile-test.tsx b/test/unit-tests/components/views/rooms/EventTile-test.tsx
index b04633925a..db8e2c44c3 100644
--- a/test/unit-tests/components/views/rooms/EventTile-test.tsx
+++ b/test/unit-tests/components/views/rooms/EventTile-test.tsx
@@ -30,14 +30,13 @@ import { mkEncryptedMatrixEvent } from "matrix-js-sdk/src/testing";
 
 import EventTile, { type EventTileProps } from "../../../../../src/components/views/rooms/EventTile";
 import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
-import { TimelineRenderingType } from "../../../../../src/contexts/RoomContext";
+import { type RoomContextType, TimelineRenderingType } from "../../../../../src/contexts/RoomContext";
 import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
 import { filterConsole, flushPromises, getRoomContext, mkEvent, mkMessage, stubClient } from "../../../../test-utils";
 import { mkThread } from "../../../../test-utils/threads";
 import DMRoomMap from "../../../../../src/utils/DMRoomMap";
 import dis from "../../../../../src/dispatcher/dispatcher";
 import { Action } from "../../../../../src/dispatcher/actions";
-import { type IRoomState } from "../../../../../src/components/structures/RoomView";
 import PinningUtils from "../../../../../src/utils/PinningUtils";
 import { Layout } from "../../../../../src/settings/enums/Layout";
 import { ScopedRoomContextProvider } from "../../../../../src/contexts/ScopedRoomContext.tsx";
@@ -52,7 +51,7 @@ describe("EventTile", () => {
 
     /** wrap the EventTile up in context providers, and with basic properties, as it would be by MessagePanel normally. */
     function WrappedEventTile(props: {
-        roomContext: IRoomState;
+        roomContext: RoomContextType;
         eventTilePropertyOverrides?: Partial<EventTileProps>;
     }) {
         return (
@@ -71,7 +70,7 @@ describe("EventTile", () => {
     function getComponent(
         overrides: Partial<EventTileProps> = {},
         renderingType: TimelineRenderingType = TimelineRenderingType.Room,
-        roomContext: Partial<IRoomState> = {},
+        roomContext: Partial<RoomContextType> = {},
     ) {
         const context = getRoomContext(room, {
             timelineRenderingType: renderingType,
@@ -306,6 +305,10 @@ describe("EventTile", () => {
             [EventShieldReason.MISMATCHED_SENDER_KEY, "Encrypted by an unverified session"],
             [EventShieldReason.SENT_IN_CLEAR, "Not encrypted"],
             [EventShieldReason.VERIFICATION_VIOLATION, "Sender's verified identity was reset"],
+            [
+                EventShieldReason.MISMATCHED_SENDER,
+                "The sender of the event does not match the owner of the device that sent it.",
+            ],
         ])("shows the correct reason code for %i (%s)", async (reasonCode: EventShieldReason, expectedText: string) => {
             mxEvent = await mkEncryptedMatrixEvent({
                 plainContent: { msgtype: "m.text", body: "msg1" },
@@ -499,14 +502,24 @@ describe("EventTile", () => {
             expect(isHighlighted(container)).toBeFalsy();
         });
 
-        it(`does not highlight when message's push actions does not have a highlight tweak`, () => {
+        it("does not highlight when message's push actions does not have a highlight tweak", () => {
             mocked(client.getPushActionsForEvent).mockReturnValue({ notify: true, tweaks: {} });
             const { container } = getComponent();
 
             expect(isHighlighted(container)).toBeFalsy();
         });
 
-        it(`highlights when message's push actions have a highlight tweak`, () => {
+        it("does not highlight when message's push actions have a highlight tweak but message has been redacted", () => {
+            mocked(client.getPushActionsForEvent).mockReturnValue({
+                notify: true,
+                tweaks: { [TweakName.Highlight]: true },
+            });
+            const { container } = getComponent({ isRedacted: true });
+
+            expect(isHighlighted(container)).toBeFalsy();
+        });
+
+        it("highlights when message's push actions have a highlight tweak", () => {
             mocked(client.getPushActionsForEvent).mockReturnValue({
                 notify: true,
                 tweaks: { [TweakName.Highlight]: true },
diff --git a/test/unit-tests/components/views/rooms/EventTile/__snapshots__/EventTileThreadToolbar-test.tsx.snap b/test/unit-tests/components/views/rooms/EventTile/__snapshots__/EventTileThreadToolbar-test.tsx.snap
index acd9d3baae..0a6c0aeba5 100644
--- a/test/unit-tests/components/views/rooms/EventTile/__snapshots__/EventTileThreadToolbar-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/EventTile/__snapshots__/EventTileThreadToolbar-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`EventTileThreadToolbar renders 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/rooms/MessageComposer-test.tsx b/test/unit-tests/components/views/rooms/MessageComposer-test.tsx
index c12aa7e7e4..bfd9c88448 100644
--- a/test/unit-tests/components/views/rooms/MessageComposer-test.tsx
+++ b/test/unit-tests/components/views/rooms/MessageComposer-test.tsx
@@ -24,7 +24,6 @@ import {
 import MessageComposer from "../../../../../src/components/views/rooms/MessageComposer";
 import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
 import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
-import { type IRoomState } from "../../../../../src/components/structures/RoomView";
 import ResizeNotifier from "../../../../../src/utils/ResizeNotifier";
 import { RoomPermalinkCreator } from "../../../../../src/utils/permalinks/Permalinks";
 import { LocalRoom } from "../../../../../src/models/LocalRoom";
@@ -36,6 +35,7 @@ import { addTextToComposerRTL } from "../../../../test-utils/composer";
 import UIStore, { UI_EVENTS } from "../../../../../src/stores/UIStore";
 import { Action } from "../../../../../src/dispatcher/actions";
 import { ScopedRoomContextProvider } from "../../../../../src/contexts/ScopedRoomContext.tsx";
+import type { RoomContextType } from "../../../../../src/contexts/RoomContext.ts";
 
 const openStickerPicker = async (): Promise<void> => {
     await userEvent.click(screen.getByLabelText("More options"));
@@ -125,12 +125,12 @@ describe("MessageComposer", () => {
 
         it("Renders a SendMessageComposer and MessageComposerButtons by default", () => {
             wrapAndRender({ room });
-            expect(screen.getByLabelText("Send a message…")).toBeInTheDocument();
+            expect(screen.getByLabelText("Send an unencrypted message…")).toBeInTheDocument();
         });
 
         it("Does not render a SendMessageComposer or MessageComposerButtons when user has no permission", () => {
             wrapAndRender({ room }, false);
-            expect(screen.queryByLabelText("Send a message…")).not.toBeInTheDocument();
+            expect(screen.queryByLabelText("Send an unencrypted message…")).not.toBeInTheDocument();
             expect(screen.getByText("You do not have permission to post to this room")).toBeInTheDocument();
         });
 
@@ -150,12 +150,12 @@ describe("MessageComposer", () => {
                 }),
             );
 
-            expect(screen.queryByLabelText("Send a message…")).not.toBeInTheDocument();
+            expect(screen.queryByLabelText("Send an unencrypted message…")).not.toBeInTheDocument();
             expect(screen.getByText("This room has been replaced and is no longer active.")).toBeInTheDocument();
         });
 
         describe("when receiving a »reply_to_event«", () => {
-            let roomContext: IRoomState;
+            let roomContext: RoomContextType;
             let resizeNotifier: ResizeNotifier;
 
             beforeEach(() => {
@@ -336,7 +336,7 @@ describe("MessageComposer", () => {
         describe("when not replying to an event", () => {
             it("should pass the expected placeholder to SendMessageComposer", () => {
                 wrapAndRender({ room });
-                expect(screen.getByLabelText("Send a message…")).toBeInTheDocument();
+                expect(screen.getByLabelText("Send an unencrypted message…")).toBeInTheDocument();
             });
 
             it("and an e2e status it should pass the expected placeholder to SendMessageComposer", () => {
@@ -344,7 +344,7 @@ describe("MessageComposer", () => {
                     room,
                     e2eStatus: E2EStatus.Normal,
                 });
-                expect(screen.getByLabelText("Send an encrypted message…")).toBeInTheDocument();
+                expect(screen.getByLabelText("Send a message…")).toBeInTheDocument();
             });
         });
 
@@ -380,12 +380,12 @@ describe("MessageComposer", () => {
             });
 
             describe("without encryption", () => {
-                checkPlaceholder("Send a reply…");
+                checkPlaceholder("Send an unencrypted reply…");
             });
 
             describe("with encryption", () => {
                 setEncrypted();
-                checkPlaceholder("Send an encrypted reply…");
+                checkPlaceholder("Send a reply…");
             });
 
             describe("with a non-thread relation", () => {
@@ -393,7 +393,7 @@ describe("MessageComposer", () => {
                     props.relation = { rel_type: "test" };
                 });
 
-                checkPlaceholder("Send a reply…");
+                checkPlaceholder("Send an unencrypted reply…");
             });
 
             describe("that is a thread", () => {
@@ -401,11 +401,11 @@ describe("MessageComposer", () => {
                     props.relation = { rel_type: THREAD_RELATION_TYPE.name };
                 });
 
-                checkPlaceholder("Reply to thread…");
+                checkPlaceholder("Reply to unencrypted thread…");
 
                 describe("with encryption", () => {
                     setEncrypted();
-                    checkPlaceholder("Reply to encrypted thread…");
+                    checkPlaceholder("Reply to thread…");
                 });
             });
         });
@@ -458,7 +458,7 @@ function wrapAndRender(
         canSendMessages,
         tombstone,
         narrow,
-    } as unknown as IRoomState;
+    } as unknown as RoomContextType;
 
     const defaultProps = {
         room,
diff --git a/test/unit-tests/components/views/rooms/MessageComposerButtons-test.tsx b/test/unit-tests/components/views/rooms/MessageComposerButtons-test.tsx
index 634a72866d..58a58185d0 100644
--- a/test/unit-tests/components/views/rooms/MessageComposerButtons-test.tsx
+++ b/test/unit-tests/components/views/rooms/MessageComposerButtons-test.tsx
@@ -11,10 +11,10 @@ import { render, screen, waitFor } from "jest-matrix-react";
 
 import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
 import { createTestClient, getRoomContext, mkStubRoom } from "../../../../test-utils";
-import { type IRoomState } from "../../../../../src/components/structures/RoomView";
 import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
 import MessageComposerButtons from "../../../../../src/components/views/rooms/MessageComposerButtons";
 import { ScopedRoomContextProvider } from "../../../../../src/contexts/ScopedRoomContext.tsx";
+import type { RoomContextType } from "../../../../../src/contexts/RoomContext.ts";
 
 describe("MessageComposerButtons", () => {
     // @ts-ignore - we're deliberately not implementing the whole interface here, but
@@ -50,7 +50,7 @@ describe("MessageComposerButtons", () => {
 
     function wrapAndRender(component: React.ReactElement, narrow: boolean) {
         const mockRoom = mkStubRoom("myfakeroom", "myfakeroom", mockClient) as any;
-        const defaultRoomContext: IRoomState = getRoomContext(mockRoom, { narrow });
+        const defaultRoomContext: RoomContextType = getRoomContext(mockRoom, { narrow });
 
         return render(
             <MatrixClientContext.Provider value={mockClient}>
diff --git a/test/unit-tests/components/views/rooms/NewRoomIntro-test.tsx b/test/unit-tests/components/views/rooms/NewRoomIntro-test.tsx
index 333e0e1020..8d31e6d84c 100644
--- a/test/unit-tests/components/views/rooms/NewRoomIntro-test.tsx
+++ b/test/unit-tests/components/views/rooms/NewRoomIntro-test.tsx
@@ -9,21 +9,29 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import { render, screen } from "jest-matrix-react";
-import { type MatrixClient, Room } from "matrix-js-sdk/src/matrix";
+import { EventTimeline, type MatrixClient, Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { LocalRoom } from "../../../../../src/models/LocalRoom";
-import { filterConsole, mkRoomMemberJoinEvent, mkThirdPartyInviteEvent, stubClient } from "../../../../test-utils";
+import {
+    filterConsole,
+    mkEvent,
+    mkRoomMemberJoinEvent,
+    mkThirdPartyInviteEvent,
+    stubClient,
+} from "../../../../test-utils";
 import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
 import NewRoomIntro from "../../../../../src/components/views/rooms/NewRoomIntro";
-import { type IRoomState } from "../../../../../src/components/structures/RoomView";
 import DMRoomMap from "../../../../../src/utils/DMRoomMap";
 import { DirectoryMember } from "../../../../../src/utils/direct-messages";
 import { ScopedRoomContextProvider } from "../../../../../src/contexts/ScopedRoomContext.tsx";
+import defaultDispatcher from "../../../../../src/dispatcher/dispatcher";
+import type { RoomContextType } from "../../../../../src/contexts/RoomContext.ts";
 
 const renderNewRoomIntro = (client: MatrixClient, room: Room | LocalRoom) => {
     render(
         <MatrixClientContext.Provider value={client}>
-            <ScopedRoomContextProvider {...({ room, roomId: room.roomId } as unknown as IRoomState)}>
+            <ScopedRoomContextProvider {...({ room, roomId: room.roomId } as unknown as RoomContextType)}>
                 <NewRoomIntro />
             </ScopedRoomContextProvider>
         </MatrixClientContext.Provider>,
@@ -37,11 +45,15 @@ describe("NewRoomIntro", () => {
 
     filterConsole("Room !room:example.com does not have an m.room.create event");
 
-    beforeAll(() => {
+    beforeEach(() => {
         client = stubClient();
         DMRoomMap.makeShared(client);
     });
 
+    afterEach(() => {
+        jest.resetAllMocks();
+    });
+
     describe("for a DM Room", () => {
         beforeEach(() => {
             jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(userId);
@@ -88,4 +100,62 @@ describe("NewRoomIntro", () => {
             screen.getByText((id, element) => element?.tagName === "SPAN" && element?.textContent === expected);
         });
     });
+
+    describe("topic", () => {
+        let room: Room;
+
+        beforeEach(() => {
+            room = new Room(roomId, client, userId);
+            room.getLiveTimeline()
+                .getState(EventTimeline.FORWARDS)
+                ?.setStateEvents([mkRoomMemberJoinEvent(client.getSafeUserId(), room.roomId)]);
+            jest.spyOn(DMRoomMap.shared(), "getRoomIds").mockReturnValue(new Set([room.roomId]));
+        });
+
+        function addTopicToRoom(topic: string) {
+            const topicEvent = mkEvent({
+                type: "m.room.topic",
+                room: roomId,
+                user: userId,
+                content: {
+                    topic,
+                },
+                ts: 123,
+                event: true,
+            });
+
+            room.addLiveEvents([topicEvent], { addToState: true });
+        }
+
+        it("should render the topic", () => {
+            addTopicToRoom("Test topic");
+            renderNewRoomIntro(client, room);
+            screen.getByText("Test topic");
+        });
+
+        it("should render a link in the topic", () => {
+            addTopicToRoom("This is a link: https://matrix.org/");
+            renderNewRoomIntro(client, room);
+            expect(screen.getByTestId("topic")).toMatchSnapshot();
+        });
+
+        it("should be able to add a topic", () => {
+            addTopicToRoom("Test topic");
+            jest.spyOn(room, "getMyMembership").mockReturnValue(KnownMembership.Join);
+            jest.spyOn(room.getLiveTimeline().getState(EventTimeline.FORWARDS)!, "maySendStateEvent").mockReturnValue(
+                true,
+            );
+            const spyDispatcher = jest.spyOn(defaultDispatcher, "dispatch");
+
+            renderNewRoomIntro(client, room);
+            screen.getByRole("button", { name: "edit" }).click();
+            expect(spyDispatcher).toHaveBeenCalledWith(
+                {
+                    action: "open_room_settings",
+                    room_id: room.roomId,
+                },
+                true,
+            );
+        });
+    });
 });
diff --git a/test/unit-tests/components/views/rooms/NotificationDecoration-test.tsx b/test/unit-tests/components/views/rooms/NotificationDecoration-test.tsx
index c54e16215e..deeab46bc5 100644
--- a/test/unit-tests/components/views/rooms/NotificationDecoration-test.tsx
+++ b/test/unit-tests/components/views/rooms/NotificationDecoration-test.tsx
@@ -7,6 +7,7 @@
 
 import React from "react";
 import { render, screen } from "jest-matrix-react";
+import { CallType } from "matrix-js-sdk/src/webrtc/call";
 
 import { RoomNotificationState } from "../../../../../src/stores/notifications/RoomNotificationState";
 import { NotificationDecoration } from "../../../../../src/components/views/rooms/NotificationDecoration";
@@ -22,7 +23,7 @@ describe("<NotificationDecoration />", () => {
 
     it("should not render if RoomNotificationState.hasAnyNotificationOrActivity=true", () => {
         jest.spyOn(roomNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(false);
-        render(<NotificationDecoration notificationState={roomNotificationState} hasVideoCall={false} />);
+        render(<NotificationDecoration notificationState={roomNotificationState} callType={undefined} />);
         expect(screen.queryByTestId("notification-decoration")).toBeNull();
     });
 
@@ -30,7 +31,7 @@ describe("<NotificationDecoration />", () => {
         jest.spyOn(roomNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(true);
         jest.spyOn(roomNotificationState, "isUnsentMessage", "get").mockReturnValue(true);
         const { asFragment } = render(
-            <NotificationDecoration notificationState={roomNotificationState} hasVideoCall={false} />,
+            <NotificationDecoration notificationState={roomNotificationState} callType={undefined} />,
         );
         expect(asFragment()).toMatchSnapshot();
     });
@@ -39,7 +40,7 @@ describe("<NotificationDecoration />", () => {
         jest.spyOn(roomNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(true);
         jest.spyOn(roomNotificationState, "invited", "get").mockReturnValue(true);
         const { asFragment } = render(
-            <NotificationDecoration notificationState={roomNotificationState} hasVideoCall={false} />,
+            <NotificationDecoration notificationState={roomNotificationState} callType={undefined} />,
         );
         expect(asFragment()).toMatchSnapshot();
     });
@@ -49,7 +50,7 @@ describe("<NotificationDecoration />", () => {
         jest.spyOn(roomNotificationState, "isMention", "get").mockReturnValue(true);
         jest.spyOn(roomNotificationState, "count", "get").mockReturnValue(1);
         const { asFragment } = render(
-            <NotificationDecoration notificationState={roomNotificationState} hasVideoCall={false} />,
+            <NotificationDecoration notificationState={roomNotificationState} callType={undefined} />,
         );
         expect(asFragment()).toMatchSnapshot();
     });
@@ -59,7 +60,7 @@ describe("<NotificationDecoration />", () => {
         jest.spyOn(roomNotificationState, "isNotification", "get").mockReturnValue(true);
         jest.spyOn(roomNotificationState, "count", "get").mockReturnValue(1);
         const { asFragment } = render(
-            <NotificationDecoration notificationState={roomNotificationState} hasVideoCall={false} />,
+            <NotificationDecoration notificationState={roomNotificationState} callType={undefined} />,
         );
         expect(asFragment()).toMatchSnapshot();
     });
@@ -69,7 +70,7 @@ describe("<NotificationDecoration />", () => {
         jest.spyOn(roomNotificationState, "isNotification", "get").mockReturnValue(true);
         jest.spyOn(roomNotificationState, "count", "get").mockReturnValue(0);
         const { asFragment } = render(
-            <NotificationDecoration notificationState={roomNotificationState} hasVideoCall={false} />,
+            <NotificationDecoration notificationState={roomNotificationState} callType={undefined} />,
         );
         expect(asFragment()).toMatchSnapshot();
     });
@@ -78,7 +79,7 @@ describe("<NotificationDecoration />", () => {
         jest.spyOn(roomNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(true);
         jest.spyOn(roomNotificationState, "isActivityNotification", "get").mockReturnValue(true);
         const { asFragment } = render(
-            <NotificationDecoration notificationState={roomNotificationState} hasVideoCall={false} />,
+            <NotificationDecoration notificationState={roomNotificationState} callType={undefined} />,
         );
         expect(asFragment()).toMatchSnapshot();
     });
@@ -87,14 +88,21 @@ describe("<NotificationDecoration />", () => {
         jest.spyOn(roomNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(true);
         jest.spyOn(roomNotificationState, "muted", "get").mockReturnValue(true);
         const { asFragment } = render(
-            <NotificationDecoration notificationState={roomNotificationState} hasVideoCall={false} />,
+            <NotificationDecoration notificationState={roomNotificationState} callType={undefined} />,
         );
         expect(asFragment()).toMatchSnapshot();
     });
-    it("should render the video decoration", () => {
+    it("should render the video call decoration", () => {
         jest.spyOn(roomNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(false);
         const { asFragment } = render(
-            <NotificationDecoration notificationState={roomNotificationState} hasVideoCall={true} />,
+            <NotificationDecoration notificationState={roomNotificationState} callType={CallType.Video} />,
+        );
+        expect(asFragment()).toMatchSnapshot();
+    });
+    it("should render the audio call decoration", () => {
+        jest.spyOn(roomNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(false);
+        const { asFragment } = render(
+            <NotificationDecoration notificationState={roomNotificationState} callType={CallType.Voice} />,
         );
         expect(asFragment()).toMatchSnapshot();
     });
diff --git a/test/unit-tests/components/views/rooms/PinnedMessageBanner-test.tsx b/test/unit-tests/components/views/rooms/PinnedMessageBanner-test.tsx
index b7c0e4a430..da6ba71e90 100644
--- a/test/unit-tests/components/views/rooms/PinnedMessageBanner-test.tsx
+++ b/test/unit-tests/components/views/rooms/PinnedMessageBanner-test.tsx
@@ -14,13 +14,13 @@ import userEvent from "@testing-library/user-event";
 import * as pinnedEventHooks from "../../../../../src/hooks/usePinnedEvents";
 import { PinnedMessageBanner } from "../../../../../src/components/views/rooms/PinnedMessageBanner";
 import { RoomPermalinkCreator } from "../../../../../src/utils/permalinks/Permalinks";
-import { makePollStartEvent, stubClient, withClientContextRenderOptions } from "../../../../test-utils";
+import { makePollStartEvent, stubClient, clientAndSDKContextRenderOptions } from "../../../../test-utils";
 import dis from "../../../../../src/dispatcher/dispatcher";
 import RightPanelStore from "../../../../../src/stores/right-panel/RightPanelStore";
 import { RightPanelPhases } from "../../../../../src/stores/right-panel/RightPanelStorePhases";
 import { UPDATE_EVENT } from "../../../../../src/stores/AsyncStore";
 import { Action } from "../../../../../src/dispatcher/actions";
-import ResizeNotifier from "../../../../../src/utils/ResizeNotifier.ts";
+import { SdkContextClass } from "../../../../../src/contexts/SDKContext.ts";
 
 describe("<PinnedMessageBanner />", () => {
     const userId = "@alice:server.org";
@@ -29,12 +29,12 @@ describe("<PinnedMessageBanner />", () => {
     let mockClient: MatrixClient;
     let room: Room;
     let permalinkCreator: RoomPermalinkCreator;
-    let resizeNotifier: ResizeNotifier;
+    let sdkContext: SdkContextClass;
     beforeEach(() => {
         mockClient = stubClient();
         room = new Room(roomId, mockClient, userId);
         permalinkCreator = new RoomPermalinkCreator(room);
-        resizeNotifier = new ResizeNotifier();
+        sdkContext = new SdkContextClass();
         jest.spyOn(dis, "dispatch").mockReturnValue(undefined);
     });
 
@@ -80,8 +80,8 @@ describe("<PinnedMessageBanner />", () => {
      */
     function renderBanner() {
         return render(
-            <PinnedMessageBanner permalinkCreator={permalinkCreator} room={room} resizeNotifier={resizeNotifier} />,
-            withClientContextRenderOptions(mockClient),
+            <PinnedMessageBanner permalinkCreator={permalinkCreator} room={room} />,
+            clientAndSDKContextRenderOptions(mockClient, sdkContext),
         );
     }
 
@@ -139,7 +139,12 @@ describe("<PinnedMessageBanner />", () => {
         jest.spyOn(pinnedEventHooks, "useSortedFetchedPinnedEvents").mockReturnValue([event1, event2]);
 
         const { asFragment, rerender } = renderBanner();
-        await userEvent.click(screen.getByRole("button", { name: "View the pinned message in the timeline." }));
+        await expect(screen.findByText("Second pinned message")).resolves.toBeVisible();
+        await userEvent.click(
+            screen.getByRole("button", {
+                name: "View the pinned message in the timeline and the newest pinned message here",
+            }),
+        );
         expect(screen.getByText("First pinned message")).toBeVisible();
 
         jest.spyOn(pinnedEventHooks, "usePinnedEvents").mockReturnValue([
@@ -148,9 +153,7 @@ describe("<PinnedMessageBanner />", () => {
             event3.getId()!,
         ]);
         jest.spyOn(pinnedEventHooks, "useSortedFetchedPinnedEvents").mockReturnValue([event1, event2, event3]);
-        rerender(
-            <PinnedMessageBanner permalinkCreator={permalinkCreator} room={room} resizeNotifier={resizeNotifier} />,
-        );
+        rerender(<PinnedMessageBanner permalinkCreator={permalinkCreator} room={room} />);
         await expect(screen.findByText("Third pinned message")).resolves.toBeVisible();
         expect(asFragment()).toMatchSnapshot();
     });
@@ -162,7 +165,11 @@ describe("<PinnedMessageBanner />", () => {
         renderBanner();
         await expect(screen.findByText("Second pinned message")).resolves.toBeVisible();
 
-        await userEvent.click(screen.getByRole("button", { name: "View the pinned message in the timeline." }));
+        await userEvent.click(
+            screen.getByRole("button", {
+                name: "View the pinned message in the timeline and the newest pinned message here",
+            }),
+        );
         expect(screen.getByText("First pinned message")).toBeVisible();
         expect(screen.getByTestId("banner-counter")).toHaveTextContent("1 of 2 Pinned messages");
         expect(dis.dispatch).toHaveBeenCalledWith({
@@ -173,7 +180,11 @@ describe("<PinnedMessageBanner />", () => {
             metricsTrigger: undefined, // room doesn't change
         });
 
-        await userEvent.click(screen.getByRole("button", { name: "View the pinned message in the timeline." }));
+        await userEvent.click(
+            screen.getByRole("button", {
+                name: "View the pinned message in the timeline and the next oldest pinned message here",
+            }),
+        );
         expect(screen.getByText("Second pinned message")).toBeVisible();
         expect(screen.getByTestId("banner-counter")).toHaveTextContent("2 of 2 Pinned messages");
         expect(dis.dispatch).toHaveBeenCalledWith({
@@ -213,7 +224,7 @@ describe("<PinnedMessageBanner />", () => {
 
     describe("Notify the timeline to resize", () => {
         beforeEach(() => {
-            jest.spyOn(resizeNotifier, "notifyTimelineHeightChanged");
+            jest.spyOn(sdkContext.resizeNotifier, "notifyTimelineHeightChanged");
             jest.spyOn(pinnedEventHooks, "usePinnedEvents").mockReturnValue([event1.getId()!, event2.getId()!]);
             jest.spyOn(pinnedEventHooks, "useSortedFetchedPinnedEvents").mockReturnValue([event1, event2]);
         });
@@ -222,28 +233,30 @@ describe("<PinnedMessageBanner />", () => {
             renderBanner();
             await expect(screen.findByText("Second pinned message")).resolves.toBeVisible();
             // The banner is displayed, so we need to resize the timeline
-            expect(resizeNotifier.notifyTimelineHeightChanged).toHaveBeenCalledTimes(1);
+            expect(sdkContext.resizeNotifier.notifyTimelineHeightChanged).toHaveBeenCalledTimes(1);
 
-            await userEvent.click(screen.getByRole("button", { name: "View the pinned message in the timeline." }));
+            await userEvent.click(
+                screen.getByRole("button", {
+                    name: "View the pinned message in the timeline and the newest pinned message here",
+                }),
+            );
             await expect(screen.findByText("First pinned message")).resolves.toBeVisible();
             // The banner is already displayed, so we don't need to resize the timeline
-            expect(resizeNotifier.notifyTimelineHeightChanged).toHaveBeenCalledTimes(1);
+            expect(sdkContext.resizeNotifier.notifyTimelineHeightChanged).toHaveBeenCalledTimes(1);
         });
 
         it("should notify the timeline to resize when we hide the banner", async () => {
             const { rerender } = renderBanner();
             await expect(screen.findByText("Second pinned message")).resolves.toBeVisible();
             // The banner is displayed, so we need to resize the timeline
-            expect(resizeNotifier.notifyTimelineHeightChanged).toHaveBeenCalledTimes(1);
+            expect(sdkContext.resizeNotifier.notifyTimelineHeightChanged).toHaveBeenCalledTimes(1);
 
             // The banner has no event to display and is hidden
             jest.spyOn(pinnedEventHooks, "usePinnedEvents").mockReturnValue([]);
             jest.spyOn(pinnedEventHooks, "useSortedFetchedPinnedEvents").mockReturnValue([]);
-            rerender(
-                <PinnedMessageBanner permalinkCreator={permalinkCreator} room={room} resizeNotifier={resizeNotifier} />,
-            );
+            rerender(<PinnedMessageBanner permalinkCreator={permalinkCreator} room={room} />);
             // The timeline should be resized
-            expect(resizeNotifier.notifyTimelineHeightChanged).toHaveBeenCalledTimes(2);
+            expect(sdkContext.resizeNotifier.notifyTimelineHeightChanged).toHaveBeenCalledTimes(2);
         });
     });
 
diff --git a/test/unit-tests/components/views/rooms/ReadReceiptGroup-test.tsx b/test/unit-tests/components/views/rooms/ReadReceiptGroup-test.tsx
index 0a3cfafb85..0af49f767d 100644
--- a/test/unit-tests/components/views/rooms/ReadReceiptGroup-test.tsx
+++ b/test/unit-tests/components/views/rooms/ReadReceiptGroup-test.tsx
@@ -142,5 +142,10 @@ describe("ReadReceiptGroup", () => {
                 }),
             );
         });
+
+        it("should fall back to userId if roomMember unspecified", async () => {
+            const { container } = renderReadReceipt({ roomMember: null });
+            expect(container).toMatchSnapshot();
+        });
     });
 });
diff --git a/test/unit-tests/components/views/rooms/RoomHeader/RoomHeader-test.tsx b/test/unit-tests/components/views/rooms/RoomHeader/RoomHeader-test.tsx
index b93a26c412..2d9162f505 100644
--- a/test/unit-tests/components/views/rooms/RoomHeader/RoomHeader-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomHeader/RoomHeader-test.tsx
@@ -1,4 +1,5 @@
 /*
+Copyright (C) 2025 Element Creations Ltd
 Copyright 2024, 2025 New Vector Ltd.
 Copyright 2023 The Matrix.org Foundation C.I.C.
 
@@ -26,7 +27,6 @@ import {
     getAllByLabelText,
     getByLabelText,
     getByText,
-    queryAllByLabelText,
     queryByLabelText,
     render,
     type RenderOptions,
@@ -41,6 +41,8 @@ import { filterConsole, stubClient } from "../../../../../test-utils";
 import RoomHeader from "../../../../../../src/components/views/rooms/RoomHeader/RoomHeader";
 import DMRoomMap from "../../../../../../src/utils/DMRoomMap";
 import { MatrixClientPeg } from "../../../../../../src/MatrixClientPeg";
+import { ScopedRoomContextProvider } from "../../../../../../src/contexts/ScopedRoomContext";
+import RoomContext, { type RoomContextType } from "../../../../../../src/contexts/RoomContext";
 import RightPanelStore from "../../../../../../src/stores/right-panel/RightPanelStore";
 import { RightPanelPhases } from "../../../../../../src/stores/right-panel/RightPanelStorePhases";
 import LegacyCallHandler from "../../../../../../src/LegacyCallHandler";
@@ -48,16 +50,15 @@ import SettingsStore from "../../../../../../src/settings/SettingsStore";
 import SdkConfig from "../../../../../../src/SdkConfig";
 import dispatcher from "../../../../../../src/dispatcher/dispatcher";
 import { CallStore } from "../../../../../../src/stores/CallStore";
-import { type Call, ElementCall } from "../../../../../../src/models/Call";
+import { type Call } from "../../../../../../src/models/Call";
 import * as ShieldUtils from "../../../../../../src/utils/ShieldUtils";
 import { Container, WidgetLayoutStore } from "../../../../../../src/stores/widgets/WidgetLayoutStore";
 import MatrixClientContext from "../../../../../../src/contexts/MatrixClientContext";
 import { _t } from "../../../../../../src/languageHandler";
-import * as UseCall from "../../../../../../src/hooks/useCall";
-import { SdkContextClass } from "../../../../../../src/contexts/SDKContext";
 import WidgetStore, { type IApp } from "../../../../../../src/stores/WidgetStore";
 import { UIFeature } from "../../../../../../src/settings/UIFeature";
 import { SettingLevel } from "../../../../../../src/settings/SettingLevel";
+import { ElementCallMemberEventType } from "../../../../../../src/call-types";
 
 jest.mock("../../../../../../src/utils/ShieldUtils");
 jest.mock("../../../../../../src/hooks/right-panel/useCurrentPhase", () => ({
@@ -66,14 +67,6 @@ jest.mock("../../../../../../src/hooks/right-panel/useCurrentPhase", () => ({
     },
 }));
 
-function getWrapper(): RenderOptions {
-    return {
-        wrapper: ({ children }) => (
-            <MatrixClientContext.Provider value={MatrixClientPeg.safeGet()}>{children}</MatrixClientContext.Provider>
-        ),
-    };
-}
-
 describe("RoomHeader", () => {
     filterConsole(
         "[getType] Room !1:example.org does not have an m.room.create event",
@@ -85,6 +78,25 @@ describe("RoomHeader", () => {
 
     let setCardSpy: jest.SpyInstance | undefined;
 
+    const mockRoomViewStore = {
+        isViewingCall: jest.fn().mockReturnValue(false),
+        on: jest.fn(),
+        off: jest.fn(),
+        emit: jest.fn(),
+    };
+
+    let roomContext: RoomContextType;
+
+    function getWrapper(): RenderOptions {
+        return {
+            wrapper: ({ children }) => (
+                <MatrixClientContext.Provider value={MatrixClientPeg.safeGet()}>
+                    <ScopedRoomContextProvider {...roomContext}>{children}</ScopedRoomContextProvider>
+                </MatrixClientContext.Provider>
+            ),
+        };
+    }
+
     beforeEach(async () => {
         stubClient();
         room = new Room(ROOM_ID, MatrixClientPeg.get()!, "@alice:example.org", {
@@ -96,6 +108,20 @@ describe("RoomHeader", () => {
 
         setCardSpy = jest.spyOn(RightPanelStore.instance, "setCard");
         jest.spyOn(ShieldUtils, "shieldStatusForRoom").mockResolvedValue(ShieldUtils.E2EStatus.Normal);
+
+        // Mock CallStore.instance.getCall to return null by default
+        // Individual tests can override this when they need a specific Call object
+        jest.spyOn(CallStore.instance, "getCall").mockReturnValue(null);
+
+        // Reset the mock RoomViewStore
+        mockRoomViewStore.isViewingCall.mockReturnValue(false);
+
+        // Create a stable room context for this test
+        roomContext = {
+            ...RoomContext,
+            roomId: ROOM_ID,
+            roomViewStore: mockRoomViewStore,
+        } as unknown as RoomContextType;
     });
 
     afterEach(() => {
@@ -326,14 +352,6 @@ describe("RoomHeader", () => {
             SdkConfig.reset();
         });
 
-        it("you can't call if you're alone", () => {
-            mockRoomMembers(room, 1);
-            const { container } = render(<RoomHeader room={room} />, getWrapper());
-            for (const button of getAllByLabelText(container, "There's no one here to call")) {
-                expect(button).toHaveAttribute("aria-disabled", "true");
-            }
-        });
-
         it("you can call when you're two in the room", async () => {
             const user = userEvent.setup();
             mockRoomMembers(room, 2);
@@ -441,7 +459,10 @@ describe("RoomHeader", () => {
             } as unknown as Call);
             jest.spyOn(WidgetStore.instance, "getApps").mockReturnValue([widget]);
             render(<RoomHeader room={room} />, getWrapper());
-            expect(screen.getByRole("button", { name: "Ongoing call" })).toHaveAttribute("aria-disabled", "true");
+            // Voice and video
+            for (const button of screen.getAllByRole("button", { name: "Ongoing call" })) {
+                expect(button).toHaveAttribute("aria-disabled", "true");
+            }
         });
 
         it("clicking on ongoing (unpinned) call re-pins it", async () => {
@@ -488,71 +509,6 @@ describe("RoomHeader", () => {
             }
         });
 
-        it("can't call if you have no friends and cannot invite friends", () => {
-            mockRoomMembers(room, 1);
-            const { container } = render(<RoomHeader room={room} />, getWrapper());
-            for (const button of getAllByLabelText(container, "There's no one here to call")) {
-                expect(button).toHaveAttribute("aria-disabled", "true");
-            }
-        });
-
-        it("can call if you have no friends but can invite friends", () => {
-            mockRoomMembers(room, 1);
-            // go through all the different `canInvite` and `getJoinRule` combinations
-
-            // check where we can't do anything but can upgrade
-            jest.spyOn(room.currentState, "maySendStateEvent").mockReturnValue(true);
-            jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Invite);
-            jest.spyOn(room, "canInvite").mockReturnValue(false);
-            SdkConfig.add({
-                element_call: {
-                    guest_spa_url: "https://guest_spa_url.com",
-                },
-            });
-            const { container: containerNoInviteNotPublicCanUpgradeAccess } = render(
-                <RoomHeader room={room} />,
-                getWrapper(),
-            );
-            expect(
-                queryAllByLabelText(containerNoInviteNotPublicCanUpgradeAccess, "There's no one here to call"),
-            ).toHaveLength(0);
-
-            // dont allow upgrading anymore and go through the other combinations
-            jest.spyOn(room.currentState, "maySendStateEvent").mockReturnValue(false);
-            jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Invite);
-            jest.spyOn(room, "canInvite").mockReturnValue(false);
-            SdkConfig.add({
-                element_call: {
-                    guest_spa_url: "https://guest_spa_url.com",
-                },
-            });
-            const { container: containerNoInviteNotPublic } = render(<RoomHeader room={room} />, getWrapper());
-            expect(queryAllByLabelText(containerNoInviteNotPublic, "There's no one here to call")).toHaveLength(2);
-
-            jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Knock);
-            jest.spyOn(room, "canInvite").mockReturnValue(false);
-            const { container: containerNoInvitePublic } = render(<RoomHeader room={room} />, getWrapper());
-            expect(queryAllByLabelText(containerNoInvitePublic, "There's no one here to call")).toHaveLength(2);
-
-            jest.spyOn(room, "canInvite").mockReturnValue(true);
-            jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Invite);
-            const { container: containerInviteNotPublic } = render(<RoomHeader room={room} />, getWrapper());
-            expect(queryAllByLabelText(containerInviteNotPublic, "There's no one here to call")).toHaveLength(2);
-
-            jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Knock);
-            jest.spyOn(room, "canInvite").mockReturnValue(true);
-            const { container: containerInvitePublic } = render(<RoomHeader room={room} />, getWrapper());
-            expect(queryAllByLabelText(containerInvitePublic, "There's no one here to call")).toHaveLength(0);
-
-            // Clear guest_spa_url
-            SdkConfig.reset();
-            // last we can allow everything but without guest_spa_url nothing will work
-            const { container: containerAllAllowedButNoGuestSpaUrl } = render(<RoomHeader room={room} />, getWrapper());
-            expect(
-                queryAllByLabelText(containerAllAllowedButNoGuestSpaUrl, "There's no one here to call"),
-            ).toHaveLength(2);
-        });
-
         it("calls using legacy or jitsi", async () => {
             const user = userEvent.setup();
             mockRoomMembers(room, 2);
@@ -599,7 +555,7 @@ describe("RoomHeader", () => {
             mockRoomMembers(room, 3);
 
             jest.spyOn(room.currentState, "mayClientSendStateEvent").mockImplementation((key) => {
-                if (key === ElementCall.MEMBER_EVENT_TYPE.name) return true;
+                if (key === ElementCallMemberEventType.name) return true;
                 return false;
             });
 
@@ -628,7 +584,8 @@ describe("RoomHeader", () => {
 
         it("join button is shown if there is an ongoing call", async () => {
             mockRoomMembers(room, 3);
-            jest.spyOn(UseCall, "useParticipantCount").mockReturnValue(3);
+            // Mock CallStore to return a call with 3 participants
+            jest.spyOn(CallStore.instance, "getCall").mockReturnValue(createMockCall(ROOM_ID, 3));
             render(<RoomHeader room={room} />, getWrapper());
             const joinButton = getByLabelText(document.body, "Join");
             expect(joinButton).not.toHaveAttribute("aria-disabled", "true");
@@ -636,7 +593,8 @@ describe("RoomHeader", () => {
 
         it("join button is disabled if there is an other ongoing call", async () => {
             mockRoomMembers(room, 3);
-            jest.spyOn(UseCall, "useParticipantCount").mockReturnValue(3);
+            // Mock CallStore to return a call with 3 participants
+            jest.spyOn(CallStore.instance, "getCall").mockReturnValue(createMockCall(ROOM_ID, 3));
             jest.spyOn(CallStore.prototype, "connectedCalls", "get").mockReturnValue(
                 new Set([{ roomId: "some_other_room" } as Call]),
             );
@@ -649,34 +607,70 @@ describe("RoomHeader", () => {
         it("close lobby button is shown", async () => {
             mockRoomMembers(room, 3);
 
-            jest.spyOn(SdkContextClass.instance.roomViewStore, "isViewingCall").mockReturnValue(true);
+            mockRoomViewStore.isViewingCall.mockReturnValue(true);
             render(<RoomHeader room={room} />, getWrapper());
             getByLabelText(document.body, "Close lobby");
         });
 
         it("close lobby button is shown if there is an ongoing call but we are viewing the lobby", async () => {
             mockRoomMembers(room, 3);
-            jest.spyOn(UseCall, "useParticipantCount").mockReturnValue(3);
-            jest.spyOn(SdkContextClass.instance.roomViewStore, "isViewingCall").mockReturnValue(true);
+            // Mock CallStore to return a call with 3 participants
+            jest.spyOn(CallStore.instance, "getCall").mockReturnValue(createMockCall(ROOM_ID, 3));
+            mockRoomViewStore.isViewingCall.mockReturnValue(true);
 
             render(<RoomHeader room={room} />, getWrapper());
             getByLabelText(document.body, "Close lobby");
         });
 
         it("don't show external conference button if the call is not shown", () => {
-            jest.spyOn(SdkContextClass.instance.roomViewStore, "isViewingCall").mockReturnValue(false);
+            mockRoomViewStore.isViewingCall.mockReturnValue(false);
             jest.spyOn(SdkConfig, "get").mockImplementation((key) => {
                 return { guest_spa_url: "https://guest_spa_url.com", url: "https://spa_url.com" };
             });
             render(<RoomHeader room={room} />, getWrapper());
             expect(screen.queryByLabelText(_t("voip|get_call_link"))).not.toBeInTheDocument();
 
-            jest.spyOn(SdkContextClass.instance.roomViewStore, "isViewingCall").mockReturnValue(true);
+            mockRoomViewStore.isViewingCall.mockReturnValue(true);
 
             render(<RoomHeader room={room} />, getWrapper());
 
             expect(getByLabelText(document.body, _t("voip|get_call_link"))).toBeInTheDocument();
         });
+
+        it("gives the option of element call or legacy calling for video", async () => {
+            const user = userEvent.setup();
+            mockRoomMembers(room, 2);
+            jest.spyOn(room.currentState, "mayClientSendStateEvent").mockImplementation((key) => {
+                if (key === ElementCallMemberEventType.name) return true;
+                return false;
+            });
+            render(<RoomHeader room={room} />, getWrapper());
+
+            const button = screen.getByRole("button", { name: "Video call" });
+            expect(button).not.toHaveAttribute("aria-disabled", "true");
+            await user.click(button);
+            const elementCallButton = screen.getByRole("menuitem", { name: "Element Call" });
+            const legacyCallButton = screen.getByRole("menuitem", { name: "Legacy Call" });
+            expect(elementCallButton).toBeInTheDocument();
+            expect(legacyCallButton).toBeInTheDocument();
+        });
+        it("gives the option of element call or legacy calling for voice in DM rooms", async () => {
+            const user = userEvent.setup();
+            mockRoomMembers(room, 2);
+            jest.spyOn(room.currentState, "mayClientSendStateEvent").mockImplementation((key) => {
+                if (key === ElementCallMemberEventType.name) return true;
+                return false;
+            });
+            render(<RoomHeader room={room} />, getWrapper());
+
+            const button = screen.getByRole("button", { name: "Voice call" });
+            expect(button).not.toHaveAttribute("aria-disabled", "true");
+            await user.click(button);
+            const elementCallButton = screen.getByRole("menuitem", { name: "Element Call" });
+            const legacyCallButton = screen.getByRole("menuitem", { name: "Legacy Call" });
+            expect(elementCallButton).toBeInTheDocument();
+            expect(legacyCallButton).toBeInTheDocument();
+        });
     });
 
     describe("public room", () => {
@@ -862,6 +856,34 @@ describe("RoomHeader", () => {
     });
 });
 
+/**
+ * Creates a mock Call object with stable participants to prevent React dependency errors
+ */
+function createMockCall(roomId: string = "!1:example.org", participantCount: number = 0): Call {
+    const participants = new Map();
+
+    // Create mock participants with devices
+    for (let i = 0; i < participantCount; i++) {
+        const mockMember = {
+            userId: `@user-${i}:example.org`,
+            name: `Member ${i}`,
+        } as RoomMember;
+
+        const deviceSet = new Set([`device-${i}`]);
+        participants.set(mockMember, deviceSet);
+    }
+
+    return {
+        roomId,
+        participants,
+        widget: { id: "test-widget" },
+        connectionState: "disconnected",
+        on: jest.fn(),
+        off: jest.fn(),
+        emit: jest.fn(),
+    } as unknown as Call;
+}
+
 /**
  *
  * @param count the number of users to create
diff --git a/test/unit-tests/components/views/rooms/RoomHeader/__snapshots__/RoomHeader-test.tsx.snap b/test/unit-tests/components/views/rooms/RoomHeader/__snapshots__/RoomHeader-test.tsx.snap
index a32d00d282..7cbcb60c52 100644
--- a/test/unit-tests/components/views/rooms/RoomHeader/__snapshots__/RoomHeader-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/RoomHeader/__snapshots__/RoomHeader-test.tsx.snap
@@ -1,15 +1,15 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`RoomHeader dm does not show the face pile for DMs 1`] = `
 <DocumentFragment>
   <header
-    class="mx_Flex mx_RoomHeader light-panel"
+    class="_flex_4dswl_9 mx_RoomHeader light-panel"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
   >
     <button
       aria-label="Open room settings"
       aria-live="off"
-      class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+      class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
       data-color="3"
       data-testid="avatar-img"
       data-type="round"
@@ -25,7 +25,7 @@ exports[`RoomHeader dm does not show the face pile for DMs 1`] = `
       tabindex="0"
     >
       <div
-        class="mx_Box mx_RoomHeader_info mx_Box--flex"
+        class="mx_RoomHeader_info _box-flex_1odfs_9"
         style="--mx-box-flex: 1;"
       >
         <div
@@ -43,19 +43,20 @@ exports[`RoomHeader dm does not show the face pile for DMs 1`] = `
       </div>
     </button>
     <button
-      aria-disabled="true"
-      aria-label="There's no one here to call"
-      class="_icon-button_m2erp_8"
+      aria-disabled="false"
+      aria-label="Video call"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
       role="button"
       style="--cpd-icon-button-size: 32px;"
       tabindex="0"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
-        style="--cpd-icon-button-size: 100%; --cpd-color-icon-tertiary: var(--cpd-color-icon-disabled);"
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
       >
         <svg
-          aria-labelledby="«r1do»"
+          aria-labelledby="_r_17e_"
           fill="currentColor"
           height="1em"
           viewBox="0 0 24 24"
@@ -69,19 +70,20 @@ exports[`RoomHeader dm does not show the face pile for DMs 1`] = `
       </div>
     </button>
     <button
-      aria-disabled="true"
-      aria-label="There's no one here to call"
-      aria-labelledby="«r1dt»"
-      class="_icon-button_m2erp_8"
+      aria-disabled="false"
+      aria-label="Voice call"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
       role="button"
       style="--cpd-icon-button-size: 32px;"
       tabindex="0"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
-        style="--cpd-icon-button-size: 100%; --cpd-color-icon-tertiary: var(--cpd-color-icon-disabled);"
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
       >
         <svg
+          aria-labelledby="_r_17j_"
           fill="currentColor"
           height="1em"
           viewBox="0 0 24 24"
@@ -96,14 +98,15 @@ exports[`RoomHeader dm does not show the face pile for DMs 1`] = `
     </button>
     <button
       aria-label="Threads"
-      aria-labelledby="«r1e2»"
-      class="_icon-button_m2erp_8"
+      aria-labelledby="_r_17o_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
       role="button"
       style="--cpd-icon-button-size: 32px;"
       tabindex="0"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <svg
@@ -122,14 +125,15 @@ exports[`RoomHeader dm does not show the face pile for DMs 1`] = `
     </button>
     <button
       aria-label="Room info"
-      aria-labelledby="«r1e7»"
-      class="_icon-button_m2erp_8"
+      aria-labelledby="_r_17t_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
       role="button"
       style="--cpd-icon-button-size: 32px;"
       tabindex="0"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <svg
diff --git a/test/unit-tests/components/views/rooms/RoomHeader/__snapshots__/VideoRoomChatButton-test.tsx.snap b/test/unit-tests/components/views/rooms/RoomHeader/__snapshots__/VideoRoomChatButton-test.tsx.snap
index ec92f780ea..c17f66e35c 100644
--- a/test/unit-tests/components/views/rooms/RoomHeader/__snapshots__/VideoRoomChatButton-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/RoomHeader/__snapshots__/VideoRoomChatButton-test.tsx.snap
@@ -1,17 +1,18 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<VideoRoomChatButton /> renders button with an unread marker when room is unread 1`] = `
 <button
   aria-label="Chat"
-  aria-labelledby="«r6»"
-  class="_icon-button_m2erp_8"
+  aria-labelledby="_r_6_"
+  class="_icon-button_1pz9o_8"
   data-indicator="default"
+  data-kind="primary"
   role="button"
   style="--cpd-icon-button-size: 32px;"
   tabindex="0"
 >
   <div
-    class="_indicator-icon_zr2a0_17"
+    class="_indicator-icon_147l5_17"
     data-indicator="default"
     style="--cpd-icon-button-size: 100%;"
   >
diff --git a/test/unit-tests/components/views/rooms/RoomInfoLine-test.tsx b/test/unit-tests/components/views/rooms/RoomInfoLine-test.tsx
new file mode 100644
index 0000000000..434f78dfc4
--- /dev/null
+++ b/test/unit-tests/components/views/rooms/RoomInfoLine-test.tsx
@@ -0,0 +1,36 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { render } from "jest-matrix-react";
+import React from "react";
+import { MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
+
+import RoomInfoLine from "../../../../../src/components/views/rooms/RoomInfoLine.tsx";
+import { stubClient } from "../../../../test-utils";
+
+describe("RoomInfoLine", () => {
+    it("renders for public room", () => {
+        const cli = stubClient();
+        const room = new Room("!roomId", cli, cli.getUserId()!);
+        room.currentState.setStateEvents([
+            new MatrixEvent({
+                sender: cli.getUserId()!,
+                room_id: room.roomId,
+                state_key: "",
+                event_id: "$eventId",
+                type: "m.room.join_rules",
+                content: {
+                    join_rule: "public",
+                },
+            }),
+        ]);
+
+        const { asFragment, getByText } = render(<RoomInfoLine room={room} />);
+        expect(getByText("Public room")).toBeVisible();
+        expect(asFragment()).toMatchSnapshot();
+    });
+});
diff --git a/test/unit-tests/components/views/rooms/RoomListHeader-test.tsx b/test/unit-tests/components/views/rooms/RoomListHeader-test.tsx
index a4c4b4795a..ab1cac83a7 100644
--- a/test/unit-tests/components/views/rooms/RoomListHeader-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListHeader-test.tsx
@@ -93,7 +93,10 @@ const checkMenuLabels = (items: NodeListOf<Element>, labelArray: Array<string>)
 describe("RoomListHeader", () => {
     let client: MatrixClient;
 
-    beforeEach(() => {
+    beforeEach(async () => {
+        // This tests the header from the old room list/left panel, the new one is now enabled by default,
+        // so needs to be explicitly disabled to test the old list here.
+        await SettingsStore.setValue("feature_new_room_list", null, SettingLevel.DEVICE, false);
         jest.resetAllMocks();
 
         const dmRoomMap = {
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/EmptyRoomList-test.tsx b/test/unit-tests/components/views/rooms/RoomListPanel/EmptyRoomList-test.tsx
index a8f87a4241..92466f685c 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/EmptyRoomList-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/EmptyRoomList-test.tsx
@@ -19,7 +19,7 @@ describe("<EmptyRoomList />", () => {
     beforeEach(() => {
         vm = {
             isLoadingRooms: false,
-            rooms: [],
+            roomsResult: { spaceId: "home", rooms: [] },
             primaryFilters: [],
             createRoom: jest.fn(),
             createChatRoom: jest.fn(),
@@ -35,7 +35,7 @@ describe("<EmptyRoomList />", () => {
         expect(screen.getByText("No chats yet")).toBeInTheDocument();
         expect(asFragment()).toMatchSnapshot();
 
-        await user.click(screen.getByRole("button", { name: "New message" }));
+        await user.click(screen.getByRole("button", { name: "Start chat" }));
         expect(vm.createChatRoom).toHaveBeenCalled();
 
         await user.click(screen.getByRole("button", { name: "New room" }));
@@ -54,6 +54,7 @@ describe("<EmptyRoomList />", () => {
         { key: FilterKey.UnreadFilter, name: "unread", action: "Show all chats" },
         { key: FilterKey.MentionsFilter, name: "mention", action: "See all activity" },
         { key: FilterKey.InvitesFilter, name: "invite", action: "See all activity" },
+        { key: FilterKey.LowPriorityFilter, name: "low priority", action: "See all activity" },
     ])("should display the empty state for the $name filter", async ({ key, name, action }) => {
         const user = userEvent.setup();
         const activePrimaryFilter = {
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/RoomList-test.tsx b/test/unit-tests/components/views/rooms/RoomListPanel/RoomList-test.tsx
index d5229ff667..04593777f5 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomList-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomList-test.tsx
@@ -9,28 +9,25 @@ import React from "react";
 import { type MatrixClient } from "matrix-js-sdk/src/matrix";
 import { render } from "jest-matrix-react";
 import { fireEvent } from "@testing-library/dom";
+import { VirtuosoMockContext } from "react-virtuoso";
 
-import { mkRoom, stubClient } from "../../../../../test-utils";
 import { type RoomListViewState } from "../../../../../../src/components/viewmodels/roomlist/RoomListViewModel";
 import { RoomList } from "../../../../../../src/components/views/rooms/RoomListPanel/RoomList";
 import DMRoomMap from "../../../../../../src/utils/DMRoomMap";
+import MatrixClientContext from "../../../../../../src/contexts/MatrixClientContext";
 import { Landmark, LandmarkNavigation } from "../../../../../../src/accessibility/LandmarkNavigation";
+import { mkRoom, stubClient } from "../../../../../test-utils";
 
 describe("<RoomList />", () => {
     let matrixClient: MatrixClient;
     let vm: RoomListViewState;
 
     beforeEach(() => {
-        // Needed to render the virtualized list in rtl tests
-        // https://github.com/bvaughn/react-virtualized/issues/493#issuecomment-640084107
-        jest.spyOn(HTMLElement.prototype, "offsetHeight", "get").mockReturnValue(1500);
-        jest.spyOn(HTMLElement.prototype, "offsetWidth", "get").mockReturnValue(1500);
-
         matrixClient = stubClient();
         const rooms = Array.from({ length: 10 }, (_, i) => mkRoom(matrixClient, `room${i}`));
         vm = {
             isLoadingRooms: false,
-            rooms,
+            roomsResult: { spaceId: "home", rooms },
             primaryFilters: [],
             createRoom: jest.fn(),
             createChatRoom: jest.fn(),
@@ -40,11 +37,22 @@ describe("<RoomList />", () => {
 
         // Needed to render a room list cell
         DMRoomMap.makeShared(matrixClient);
-        jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(null);
+        jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(undefined);
     });
 
     it("should render a room list", () => {
-        const { asFragment } = render(<RoomList vm={vm} />);
+        const { asFragment } = render(<RoomList vm={vm} />, {
+            wrapper: ({ children }) => (
+                <MatrixClientContext.Provider value={matrixClient}>
+                    <VirtuosoMockContext.Provider value={{ viewportHeight: 600, itemHeight: 56 }}>
+                        <>{children}</>
+                    </VirtuosoMockContext.Provider>
+                </MatrixClientContext.Provider>
+            ),
+        });
+        // At the moment the context prop on Virtuoso gets rendered in the dom as "[object Object]".
+        // This is a general issue with the react-virtuoso library.
+        // TODO: Update the snapshot when the following issue is resolved: https://github.com/petyosi/react-virtuoso/issues/1281
         expect(asFragment()).toMatchSnapshot();
     });
 
@@ -53,7 +61,15 @@ describe("<RoomList />", () => {
         { shortcut: { key: "F6", ctrlKey: true }, isPreviousLandmark: false, label: "NextLandmark" },
     ])("should navigate to the landmark on NextLandmark.$label action", ({ shortcut, isPreviousLandmark }) => {
         const spyFindLandmark = jest.spyOn(LandmarkNavigation, "findAndFocusNextLandmark").mockReturnValue();
-        const { getByTestId } = render(<RoomList vm={vm} />);
+        const { getByTestId } = render(<RoomList vm={vm} />, {
+            wrapper: ({ children }) => (
+                <MatrixClientContext.Provider value={matrixClient}>
+                    <VirtuosoMockContext.Provider value={{ viewportHeight: 600, itemHeight: 56 }}>
+                        <>{children}</>
+                    </VirtuosoMockContext.Provider>
+                </MatrixClientContext.Provider>
+            ),
+        });
         const roomList = getByTestId("room-list");
         fireEvent.keyDown(roomList, shortcut);
 
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListHeaderView-test.tsx b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListHeaderView-test.tsx
index 4840808fe4..8a8c441246 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListHeaderView-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListHeaderView-test.tsx
@@ -32,8 +32,6 @@ describe("<RoomListHeaderView />", () => {
         canAccessSpaceSettings: true,
         sort: jest.fn(),
         activeSortOption: SortOption.Activity,
-        shouldShowMessagePreview: false,
-        toggleMessagePreview: jest.fn(),
         createRoom: jest.fn(),
         createVideoRoom: jest.fn(),
         createChatRoom: jest.fn(),
@@ -59,7 +57,7 @@ describe("<RoomListHeaderView />", () => {
             mocked(useRoomListHeaderViewModel).mockReturnValue(defaultValue);
 
             const { asFragment } = render(<RoomListHeaderView />);
-            expect(screen.queryByRole("button", { name: "Add" })).toBeInTheDocument();
+            expect(screen.queryByRole("button", { name: "New conversation" })).toBeInTheDocument();
             expect(asFragment()).toMatchSnapshot();
         });
 
@@ -68,10 +66,10 @@ describe("<RoomListHeaderView />", () => {
             mocked(useRoomListHeaderViewModel).mockReturnValue({ ...defaultValue, displayComposeMenu: false });
 
             const { asFragment } = render(<RoomListHeaderView />);
-            expect(screen.queryByRole("button", { name: "Add" })).toBeNull();
+            expect(screen.queryByRole("button", { name: "New conversation" })).toBeInTheDocument();
             expect(asFragment()).toMatchSnapshot();
 
-            await user.click(screen.getByRole("button", { name: "New message" }));
+            await user.click(screen.getByRole("button", { name: "New conversation" }));
             expect(defaultValue.createChatRoom).toHaveBeenCalled();
         });
 
@@ -79,10 +77,10 @@ describe("<RoomListHeaderView />", () => {
             const user = userEvent.setup();
             mocked(useRoomListHeaderViewModel).mockReturnValue(defaultValue);
             render(<RoomListHeaderView />);
-            const openMenu = screen.getByRole("button", { name: "Add" });
+            const openMenu = screen.getByRole("button", { name: "New conversation" });
             await user.click(openMenu);
 
-            await user.click(screen.getByRole("menuitem", { name: "New message" }));
+            await user.click(screen.getByRole("menuitem", { name: "Start chat" }));
             expect(defaultValue.createChatRoom).toHaveBeenCalled();
 
             await user.click(openMenu);
@@ -103,7 +101,7 @@ describe("<RoomListHeaderView />", () => {
             });
 
             render(<RoomListHeaderView />);
-            await user.click(screen.getByRole("button", { name: "Add" }));
+            await user.click(screen.getByRole("button", { name: "New conversation" }));
 
             expect(screen.queryByRole("menuitem", { name: "New room" })).toBeNull();
             expect(screen.queryByRole("menuitem", { name: "New video room" })).toBeNull();
@@ -159,7 +157,7 @@ describe("<RoomListHeaderView />", () => {
             });
 
             render(<RoomListHeaderView />);
-            await user.click(screen.getByRole("button", { name: "Add" }));
+            await user.click(screen.getByRole("button", { name: "Open space menu" }));
 
             expect(screen.queryByRole("menuitem", { name: "Invite" })).toBeNull();
             expect(screen.queryByRole("menuitem", { name: "Space Setting" })).toBeNull();
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListItemMenuView-test.tsx b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListItemMenuView-test.tsx
index 2994d7629c..58ab0c672b 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListItemMenuView-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListItemMenuView-test.tsx
@@ -28,6 +28,7 @@ describe("<RoomListItemMenuView />", () => {
         showMoreOptionsMenu: true,
         showNotificationMenu: true,
         isFavourite: true,
+        isLowPriority: true,
         canInvite: true,
         canMarkAsUnread: true,
         canMarkAsRead: true,
@@ -55,8 +56,8 @@ describe("<RoomListItemMenuView />", () => {
         room = mkRoom(matrixClient, "room1");
     });
 
-    function renderMenu(setMenuOpen = jest.fn()) {
-        return render(<RoomListItemMenuView room={room} setMenuOpen={setMenuOpen} />);
+    function renderMenu() {
+        return render(<RoomListItemMenuView room={room} />);
     }
 
     it("should render the more options menu", () => {
@@ -83,18 +84,6 @@ describe("<RoomListItemMenuView />", () => {
         expect(screen.queryByRole("button", { name: "Notification options" })).toBeNull();
     });
 
-    it.each([["More Options"], ["Notification options"]])(
-        "should call setMenuOpen when the menu is opened for %s menu",
-        async (label) => {
-            const user = userEvent.setup();
-            const setMenuOpen = jest.fn();
-            renderMenu(setMenuOpen);
-
-            await user.click(screen.getByRole("button", { name: label }));
-            expect(setMenuOpen).toHaveBeenCalledWith(true);
-        },
-    );
-
     it("should display all the buttons and have the actions linked for the more options menu", async () => {
         const user = userEvent.setup();
         renderMenu();
@@ -114,7 +103,7 @@ describe("<RoomListItemMenuView />", () => {
         expect(defaultValue.toggleFavorite).toHaveBeenCalled();
 
         await user.click(openMenu);
-        await user.click(screen.getByRole("menuitem", { name: "Low priority" }));
+        await user.click(screen.getByRole("menuitemcheckbox", { name: "Low priority" }));
         expect(defaultValue.toggleLowPriority).toHaveBeenCalled();
 
         await user.click(openMenu);
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListItemView-test.tsx b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListItemView-test.tsx
index 914d33ee18..b6127e1189 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListItemView-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListItemView-test.tsx
@@ -10,6 +10,7 @@ import { type MatrixClient, type Room } from "matrix-js-sdk/src/matrix";
 import { render, screen, waitFor } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
 import { mocked } from "jest-mock";
+import { CallType } from "matrix-js-sdk/src/webrtc/call";
 
 import { mkRoom, stubClient, withClientContextRenderOptions } from "../../../../../test-utils";
 import { RoomListItemView } from "../../../../../../src/components/views/rooms/RoomListPanel/RoomListItemView";
@@ -28,12 +29,27 @@ describe("<RoomListItemView />", () => {
     let defaultValue: RoomListItemViewState;
     let matrixClient: MatrixClient;
     let room: Room;
+
+    const renderRoomListItem = (props: Partial<React.ComponentProps<typeof RoomListItemView>> = {}) => {
+        const defaultProps = {
+            room,
+            isSelected: false,
+            isFocused: false,
+            onFocus: jest.fn(),
+            roomIndex: 0,
+            roomCount: 1,
+            listIsScrolling: false,
+        };
+
+        return render(<RoomListItemView {...defaultProps} {...props} />, withClientContextRenderOptions(matrixClient));
+    };
+
     beforeEach(() => {
         matrixClient = stubClient();
         room = mkRoom(matrixClient, "room1");
 
         DMRoomMap.makeShared(matrixClient);
-        jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(null);
+        jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(undefined);
 
         const notificationState = new RoomNotificationState(room, false);
         jest.spyOn(notificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(true);
@@ -42,12 +58,14 @@ describe("<RoomListItemView />", () => {
 
         defaultValue = {
             openRoom: jest.fn(),
+            showContextMenu: false,
             showHoverMenu: false,
             notificationState,
             a11yLabel: "Open room room1",
             isBold: false,
             isVideoRoom: false,
             callConnectionState: null,
+            callType: CallType.Video,
             hasParticipantInCall: false,
             name: room.name,
             showNotificationDecoration: false,
@@ -59,52 +77,37 @@ describe("<RoomListItemView />", () => {
 
     test("should render a room item", () => {
         const onClick = jest.fn();
-        const { asFragment } = render(<RoomListItemView room={room} onClick={onClick} isSelected={false} />);
+        const { asFragment } = renderRoomListItem({
+            onClick,
+            roomCount: 0,
+        });
         expect(asFragment()).toMatchSnapshot();
     });
 
     test("should render a room item with a message preview", () => {
-        defaultValue.messagePreview = "The message looks list this";
+        defaultValue.messagePreview = "The message looks like this";
 
         const onClick = jest.fn();
-        const { asFragment } = render(<RoomListItemView room={room} onClick={onClick} isSelected={false} />);
+        const { asFragment } = renderRoomListItem({
+            onClick,
+        });
         expect(asFragment()).toMatchSnapshot();
     });
 
     test("should call openRoom when clicked", async () => {
         const user = userEvent.setup();
-        render(<RoomListItemView room={room} isSelected={false} />);
+        renderRoomListItem();
 
-        await user.click(screen.getByRole("button", { name: `Open room ${room.name}` }));
+        await user.click(screen.getByRole("option", { name: `Open room ${room.name}` }));
         expect(defaultValue.openRoom).toHaveBeenCalled();
     });
 
-    test("should hover decoration if hovered", async () => {
-        mocked(useRoomListItemViewModel).mockReturnValue({ ...defaultValue, showHoverMenu: true });
-
-        const user = userEvent.setup();
-        render(<RoomListItemView room={room} isSelected={false} />, withClientContextRenderOptions(matrixClient));
-        const listItem = screen.getByRole("button", { name: `Open room ${room.name}` });
-        expect(screen.queryByRole("button", { name: "More Options" })).toBeNull();
-
-        await user.hover(listItem);
-        await waitFor(() => expect(screen.getByRole("button", { name: "More Options" })).toBeInTheDocument());
-    });
-
-    test("should hover decoration if focused", async () => {
-        const user = userEvent.setup();
-        render(<RoomListItemView room={room} isSelected={false} />, withClientContextRenderOptions(matrixClient));
-        const listItem = screen.getByRole("button", { name: `Open room ${room.name}` });
-        await user.click(listItem);
-        expect(listItem).toHaveClass("mx_RoomListItemView_hover");
-
-        await user.tab();
-        await waitFor(() => expect(listItem).not.toHaveClass("mx_RoomListItemView_hover"));
-    });
-
     test("should be selected if isSelected=true", async () => {
-        const { asFragment } = render(<RoomListItemView room={room} isSelected={true} />);
-        expect(screen.queryByRole("button", { name: `Open room ${room.name}` })).toHaveAttribute(
+        const { asFragment } = renderRoomListItem({
+            isSelected: true,
+        });
+
+        expect(screen.queryByRole("option", { name: `Open room ${room.name}` })).toHaveAttribute(
             "aria-selected",
             "true",
         );
@@ -117,7 +120,8 @@ describe("<RoomListItemView />", () => {
             showNotificationDecoration: true,
         });
 
-        const { asFragment } = render(<RoomListItemView room={room} isSelected={false} />);
+        const { asFragment } = renderRoomListItem();
+
         expect(screen.getByTestId("notification-decoration")).toBeInTheDocument();
         expect(asFragment()).toMatchSnapshot();
     });
@@ -130,10 +134,29 @@ describe("<RoomListItemView />", () => {
             showNotificationDecoration: true,
         });
 
-        render(<RoomListItemView room={room} isSelected={false} />);
-        const listItem = screen.getByRole("button", { name: `Open room ${room.name}` });
+        renderRoomListItem();
+
+        const listItem = screen.getByRole("option", { name: `Open room ${room.name}` });
         await user.hover(listItem);
 
         expect(screen.queryByRole("notification-decoration")).toBeNull();
     });
+
+    test("should render the context menu", async () => {
+        const user = userEvent.setup();
+
+        mocked(useRoomListItemViewModel).mockReturnValue({
+            ...defaultValue,
+            showContextMenu: true,
+        });
+
+        renderRoomListItem();
+
+        const button = screen.getByRole("option", { name: `Open room ${room.name}` });
+        await user.pointer([{ target: button }, { keys: "[MouseRight]", target: button }]);
+        await waitFor(() => expect(screen.getByRole("menu")).toBeInTheDocument());
+        // Menu should close
+        await user.keyboard("{Escape}");
+        expect(screen.queryByRole("menu")).toBeNull();
+    });
 });
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListOptionsMenu-test.tsx b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListOptionsMenu-test.tsx
index c476bda0d1..02ba7eb54d 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListOptionsMenu-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListOptionsMenu-test.tsx
@@ -91,48 +91,4 @@ describe("<RoomListOptionsMenu />", () => {
 
         expect(vm.sort).toHaveBeenCalledWith("Recency");
     });
-
-    it("should show message previews disabled", async () => {
-        const user = userEvent.setup();
-
-        const vm = {
-            shouldShowMessagePreview: false,
-        } as unknown as RoomListHeaderViewState;
-
-        render(<RoomListOptionsMenu vm={vm} />);
-
-        await user.click(screen.getByRole("button", { name: "Room Options" }));
-
-        expect(screen.getByRole("menuitemcheckbox", { name: "Show message previews" })).not.toBeChecked();
-    });
-
-    it("should show message previews enabled", async () => {
-        const user = userEvent.setup();
-
-        const vm = {
-            shouldShowMessagePreview: true,
-        } as unknown as RoomListHeaderViewState;
-
-        render(<RoomListOptionsMenu vm={vm} />);
-
-        await user.click(screen.getByRole("button", { name: "Room Options" }));
-
-        expect(screen.getByRole("menuitemcheckbox", { name: "Show message previews" })).toBeChecked();
-    });
-
-    it("should toggle message previews", async () => {
-        const user = userEvent.setup();
-
-        const vm = {
-            toggleMessagePreview: jest.fn(),
-        } as unknown as RoomListHeaderViewState;
-
-        render(<RoomListOptionsMenu vm={vm} />);
-
-        await user.click(screen.getByRole("button", { name: "Room Options" }));
-
-        await user.click(screen.getByRole("menuitemcheckbox", { name: "Show message previews" }));
-
-        expect(vm.toggleMessagePreview).toHaveBeenCalled();
-    });
 });
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListPanel-test.tsx b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListPanel-test.tsx
index 525a17e1ac..79148d5041 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListPanel-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListPanel-test.tsx
@@ -8,36 +8,85 @@
 import React from "react";
 import { render, screen } from "jest-matrix-react";
 import { mocked } from "jest-mock";
+import userEvent from "@testing-library/user-event";
 
 import { RoomListPanel } from "../../../../../../src/components/views/rooms/RoomListPanel";
 import { shouldShowComponent } from "../../../../../../src/customisations/helpers/UIComponents";
 import { MetaSpace } from "../../../../../../src/stores/spaces";
+import { LandmarkNavigation } from "../../../../../../src/accessibility/LandmarkNavigation";
+import { ReleaseAnnouncementStore } from "../../../../../../src/stores/ReleaseAnnouncementStore";
 
 jest.mock("../../../../../../src/customisations/helpers/UIComponents", () => ({
     shouldShowComponent: jest.fn(),
 }));
 
+jest.mock("../../../../../../src/accessibility/LandmarkNavigation", () => ({
+    LandmarkNavigation: {
+        findAndFocusNextLandmark: jest.fn(),
+    },
+    Landmark: {
+        ROOM_SEARCH: "something",
+    },
+}));
+
+// mock out release announcements as they interfere with what's focused
+// (this can be removed once the new room list announcement is gone)
+jest.spyOn(ReleaseAnnouncementStore.instance, "getReleaseAnnouncement").mockReturnValue(null);
+
 describe("<RoomListPanel />", () => {
     function renderComponent() {
         return render(<RoomListPanel activeSpace={MetaSpace.Home} />);
     }
 
     beforeEach(() => {
+        jest.clearAllMocks();
+
         // By default, we consider shouldShowComponent(UIComponent.FilterContainer) should return true
         mocked(shouldShowComponent).mockReturnValue(true);
     });
 
     it("should render the RoomListSearch component when UIComponent.FilterContainer is at true", () => {
-        const { asFragment } = renderComponent();
+        renderComponent();
         expect(screen.getByRole("button", { name: "Search Ctrl K" })).toBeInTheDocument();
-        expect(asFragment()).toMatchSnapshot();
     });
 
     it("should not render the RoomListSearch component when UIComponent.FilterContainer is at false", () => {
         mocked(shouldShowComponent).mockReturnValue(false);
-        const { asFragment } = renderComponent();
-
+        renderComponent();
         expect(screen.queryByRole("button", { name: "Search Ctrl K" })).toBeNull();
-        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should move to the next landmark when the shortcut key is pressed", async () => {
+        renderComponent();
+
+        const userEv = userEvent.setup();
+
+        // Pick something arbitrary and focusable in the room list component and focus it
+        const exploreRooms = screen.getByRole("button", { name: "Explore rooms" });
+        exploreRooms.focus();
+        expect(exploreRooms).toHaveFocus();
+
+        screen.getByRole("navigation", { name: "Room list" }).focus();
+        await userEv.keyboard("{Control>}{F6}{/Control}");
+
+        expect(LandmarkNavigation.findAndFocusNextLandmark).toHaveBeenCalled();
+    });
+
+    it("should not move to the next landmark if room list loses focus", async () => {
+        renderComponent();
+
+        const userEv = userEvent.setup();
+
+        // Pick something arbitrary and focusable in the room list component and focus it
+        const exploreRooms = screen.getByRole("button", { name: "Explore rooms" });
+        exploreRooms.focus();
+        expect(exploreRooms).toHaveFocus();
+
+        exploreRooms.blur();
+        expect(exploreRooms).not.toHaveFocus();
+
+        await userEv.keyboard("{Control>}{F6}{/Control}");
+
+        expect(LandmarkNavigation.findAndFocusNextLandmark).not.toHaveBeenCalled();
     });
 });
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListPrimaryFilters-test.tsx b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListPrimaryFilters-test.tsx
index fe605ce70f..8276c7340f 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListPrimaryFilters-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListPrimaryFilters-test.tsx
@@ -5,7 +5,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import React from "react";
+import React, { act } from "react";
 import { render, screen } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
 
@@ -15,31 +15,141 @@ import { FilterKey } from "../../../../../../src/stores/room-list-v3/skip-list/f
 
 describe("<RoomListPrimaryFilters />", () => {
     let vm: RoomListViewState;
+    const filterToggleMocks = [jest.fn(), jest.fn(), jest.fn()];
+
+    let resizeCallback: ResizeObserverCallback;
 
     beforeEach(() => {
+        // Reset mocks between tests
+        filterToggleMocks.forEach((mock) => mock.mockClear());
+
+        // Mock ResizeObserver
+        global.ResizeObserver = jest.fn().mockImplementation((callback) => {
+            resizeCallback = callback;
+            return {
+                observe: jest.fn(),
+                unobserve: jest.fn(),
+                disconnect: jest.fn(),
+            };
+        });
+
         vm = {
-            isLoadingRooms: false,
-            rooms: [],
-            canCreateRoom: true,
-            createRoom: jest.fn(),
-            createChatRoom: jest.fn(),
             primaryFilters: [
-                { name: "People", active: false, toggle: jest.fn(), key: FilterKey.PeopleFilter },
-                { name: "Rooms", active: true, toggle: jest.fn(), key: FilterKey.RoomsFilter },
+                { name: "People", active: true, toggle: filterToggleMocks[0], key: FilterKey.PeopleFilter },
+                { name: "Rooms", active: false, toggle: filterToggleMocks[1], key: FilterKey.RoomsFilter },
+                { name: "Unreads", active: false, toggle: filterToggleMocks[2], key: FilterKey.UnreadFilter },
             ],
-            activeIndex: undefined,
-        };
+        } as unknown as RoomListViewState;
     });
 
-    it("should render primary filters", async () => {
-        const user = userEvent.setup();
+    function mockFiltersOffsetLeft() {
+        // Use `getByText` instead of `getByRole` to bypass the aria-hidden
+        jest.spyOn(screen.getByText("People"), "offsetLeft", "get").mockReturnValue(0);
+        jest.spyOn(screen.getByText("Rooms"), "offsetLeft", "get").mockReturnValue(30);
+        jest.spyOn(screen.getByText("Unreads"), "offsetLeft", "get").mockReturnValue(60);
 
+        // @ts-ignore
+        act(() => resizeCallback([{ target: screen.getByRole("listbox", { name: "Room list filters" }) }]));
+    }
+
+    it("should renders all filters correctly", () => {
         const { asFragment } = render(<RoomListPrimaryFilters vm={vm} />);
-        expect(screen.getByRole("option", { name: "People" })).toBeInTheDocument();
-        expect(screen.getByRole("option", { name: "Rooms" })).toHaveAttribute("aria-selected", "true");
-        expect(asFragment()).toMatchSnapshot();
+        mockFiltersOffsetLeft();
 
-        await user.click(screen.getByRole("button", { name: "People" }));
-        expect(vm.primaryFilters[0].toggle).toHaveBeenCalled();
+        // Check that all filters are rendered
+        expect(screen.getByRole("option", { name: "People" })).toBeInTheDocument();
+        expect(screen.getByRole("option", { name: "Rooms" })).toBeInTheDocument();
+        expect(screen.getByRole("option", { name: "Unreads" })).toBeInTheDocument();
+
+        // Check that the active filter is marked as selected
+        expect(screen.getByRole("option", { name: "People" })).toHaveAttribute("aria-selected", "true");
+        expect(screen.getByRole("option", { name: "Rooms" })).toHaveAttribute("aria-selected", "false");
+        expect(screen.getByRole("option", { name: "Unreads" })).toHaveAttribute("aria-selected", "false");
+
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should call toggle function when a filter is clicked", async () => {
+        const user = userEvent.setup();
+        render(<RoomListPrimaryFilters vm={vm} />);
+        mockFiltersOffsetLeft();
+
+        // Click on an inactive filter
+        await user.click(screen.getByRole("option", { name: "People" }));
+
+        // Check that the toggle function was called
+        expect(filterToggleMocks[0]).toHaveBeenCalledTimes(1);
+    });
+
+    function makeUnreadWrapping() {
+        // Use `getByText` instead of `getByRole` to bypass the aria-hidden
+        jest.spyOn(screen.getByText("People"), "offsetLeft", "get").mockReturnValue(0);
+        jest.spyOn(screen.getByText("Rooms"), "offsetLeft", "get").mockReturnValue(30);
+        // Unreads is wrapping
+        jest.spyOn(screen.getByText("Unreads"), "offsetLeft", "get").mockReturnValue(0);
+
+        // @ts-ignore
+        act(() => resizeCallback([{ target: screen.getByRole("listbox", { name: "Room list filters" }) }]));
+    }
+
+    it("should hide or display filters if they are wrapping", async () => {
+        const user = userEvent.setup();
+        render(<RoomListPrimaryFilters vm={vm} />);
+        mockFiltersOffsetLeft();
+
+        // No filter is wrapping, so chevron shouldn't be visible
+        expect(screen.queryByRole("button", { name: "Expand filter list" })).toBeNull();
+        expect(screen.queryByRole("option", { name: "Unreads" })).toBeVisible();
+
+        makeUnreadWrapping();
+
+        // The Unreads filter is wrapping, it should not be visible
+        expect(screen.queryByRole("option", { name: "Unreads" })).toBeNull();
+        // Now filters are wrapping, so chevron should be visible
+        await user.click(screen.getByRole("button", { name: "Expand filter list" }));
+        // The list is expanded, so Unreads should be visible
+        expect(screen.getByRole("option", { name: "Unreads" })).toBeVisible();
+    });
+
+    it("should move the active filter if the list is collapsed and the filter is wrapping", async () => {
+        vm = {
+            primaryFilters: [
+                { name: "People", active: false, toggle: filterToggleMocks[0], key: FilterKey.PeopleFilter },
+                { name: "Rooms", active: false, toggle: filterToggleMocks[1], key: FilterKey.RoomsFilter },
+                { name: "Unreads", active: true, toggle: filterToggleMocks[2], key: FilterKey.UnreadFilter },
+            ],
+        } as unknown as RoomListViewState;
+
+        const user = userEvent.setup();
+        render(<RoomListPrimaryFilters vm={vm} />);
+        makeUnreadWrapping();
+
+        // Unread filter should be moved to the first position
+        expect(screen.getByRole("listbox", { name: "Room list filters" }).children[0]).toBe(
+            screen.getByRole("option", { name: "Unreads" }),
+        );
+
+        // When the list is expanded, the Unreads filter should move to its original position
+        await user.click(screen.getByRole("button", { name: "Expand filter list" }));
+        expect(screen.getByRole("listbox", { name: "Room list filters" }).children[0]).not.toEqual(
+            screen.getByRole("option", { name: "Unreads" }),
+        );
+    });
+
+    it("should hide the filter is the previous is on the same vertical position", async () => {
+        render(<RoomListPrimaryFilters vm={vm} />);
+        mockFiltersOffsetLeft();
+
+        jest.spyOn(screen.getByRole("option", { name: "People" }), "offsetLeft", "get").mockReturnValue(0);
+        // Rooms is wrapping
+        jest.spyOn(screen.getByRole("option", { name: "Rooms" }), "offsetLeft", "get").mockReturnValue(0);
+
+        // @ts-ignore
+        act(() => resizeCallback([{ target: screen.getByRole("listbox", { name: "Room list filters" }) }]));
+
+        // The Unreads filter is wrapping, it should not be visible
+        expect(screen.queryByRole("option", { name: "Rooms" })).toBeNull();
+        // Now filters are wrapping, so chevron should be visible
+        expect(screen.getByRole("button", { name: "Expand filter list" })).toBeVisible();
     });
 });
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListSearch-test.tsx b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListSearch-test.tsx
index 47ecc69cc3..d6fab31bcf 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListSearch-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListSearch-test.tsx
@@ -6,15 +6,12 @@
  */
 
 import React from "react";
-import { render, screen } from "jest-matrix-react";
+import { render } from "jest-matrix-react";
 import { mocked } from "jest-mock";
-import userEvent from "@testing-library/user-event";
 
 import { RoomListSearch } from "../../../../../../src/components/views/rooms/RoomListPanel/RoomListSearch";
 import { MetaSpace } from "../../../../../../src/stores/spaces";
 import { shouldShowComponent } from "../../../../../../src/customisations/helpers/UIComponents";
-import defaultDispatcher from "../../../../../../src/dispatcher/dispatcher";
-import { Action } from "../../../../../../src/dispatcher/actions";
 import LegacyCallHandler from "../../../../../../src/LegacyCallHandler";
 
 jest.mock("../../../../../../src/customisations/helpers/UIComponents", () => ({
@@ -32,79 +29,8 @@ describe("<RoomListSearch />", () => {
         jest.spyOn(LegacyCallHandler.instance, "getSupportsPstnProtocol").mockReturnValue(false);
     });
 
-    it("should display search and explore buttons", () => {
-        const { asFragment } = renderComponent();
-
-        // The search and explore buttons should be displayed
-        expect(screen.getByRole("button", { name: "Search Ctrl K" })).toBeInTheDocument();
-        expect(screen.getByRole("button", { name: "Explore rooms" })).toBeInTheDocument();
-        // The dial button should not be displayed
-        expect(screen.queryByRole("button", { name: "Open dial pad" })).not.toBeInTheDocument();
-        expect(asFragment()).toMatchSnapshot();
-    });
-
-    it("should hide the explore button when the active space is not MetaSpace.Home", () => {
+    it("renders", () => {
         const { asFragment } = renderComponent(MetaSpace.VideoRooms);
-
-        // The search button should be displayed but not the explore button
-        expect(screen.getByRole("button", { name: "Search Ctrl K" })).toBeInTheDocument();
-        expect(screen.queryByRole("button", { name: "Explore rooms" })).not.toBeInTheDocument();
         expect(asFragment()).toMatchSnapshot();
     });
-
-    it("should hide the explore button when UIComponent.ExploreRooms is disabled", () => {
-        mocked(shouldShowComponent).mockReturnValue(false);
-        const { asFragment } = renderComponent();
-
-        // The search button should be displayed but not the explore button
-        expect(screen.getByRole("button", { name: "Search Ctrl K" })).toBeInTheDocument();
-        expect(screen.queryByRole("button", { name: "Explore rooms" })).not.toBeInTheDocument();
-        expect(asFragment()).toMatchSnapshot();
-    });
-
-    it("should display the dial button when the PTSN protocol is not supported", () => {
-        jest.spyOn(LegacyCallHandler.instance, "getSupportsPstnProtocol").mockReturnValue(true);
-        const { asFragment } = renderComponent();
-
-        // The dial button should be displayed
-        expect(screen.getByRole("button", { name: "Open dial pad" })).toBeInTheDocument();
-        expect(asFragment()).toMatchSnapshot();
-    });
-
-    it("should open the spotlight when the search button is clicked", async () => {
-        const fireSpy = jest.spyOn(defaultDispatcher, "fire");
-        const user = userEvent.setup();
-        renderComponent();
-
-        // Click on the search button
-        await user.click(screen.getByRole("button", { name: "Search Ctrl K" }));
-
-        // The spotlight should be opened
-        expect(fireSpy).toHaveBeenCalledWith(Action.OpenSpotlight);
-    });
-
-    it("should open the room directory when the explore button is clicked", async () => {
-        const fireSpy = jest.spyOn(defaultDispatcher, "fire");
-        const user = userEvent.setup();
-        renderComponent();
-
-        // Click on the search button
-        await user.click(screen.getByRole("button", { name: "Explore rooms" }));
-
-        // The spotlight should be opened
-        expect(fireSpy).toHaveBeenCalledWith(Action.ViewRoomDirectory);
-    });
-
-    it("should open the dial pad when the dial button is clicked", async () => {
-        jest.spyOn(LegacyCallHandler.instance, "getSupportsPstnProtocol").mockReturnValue(true);
-        const fireSpy = jest.spyOn(defaultDispatcher, "fire");
-        const user = userEvent.setup();
-        renderComponent();
-
-        // Click on the search button
-        await user.click(screen.getByRole("button", { name: "Open dial pad" }));
-
-        // The spotlight should be opened
-        expect(fireSpy).toHaveBeenCalledWith(Action.OpenDialPad);
-    });
 });
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListView-test.tsx b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListView-test.tsx
index 4ebe6fc4c7..0081c6f350 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListView-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListView-test.tsx
@@ -23,7 +23,7 @@ jest.mock("../../../../../../src/components/viewmodels/roomlist/RoomListViewMode
 describe("<RoomListView />", () => {
     const defaultValue: RoomListViewState = {
         isLoadingRooms: false,
-        rooms: [],
+        roomsResult: { spaceId: "home", rooms: [] },
         primaryFilters: [],
         createRoom: jest.fn(),
         createChatRoom: jest.fn(),
@@ -56,10 +56,10 @@ describe("<RoomListView />", () => {
     it("should render a room list", () => {
         mocked(useRoomListViewModel).mockReturnValue({
             ...defaultValue,
-            rooms: [mkRoom(matrixClient, "testing room")],
+            roomsResult: { spaceId: "home", rooms: [mkRoom(matrixClient, "testing room")] },
         });
 
         render(<RoomListView />);
-        expect(screen.getByRole("grid", { name: "Room list" })).toBeInTheDocument();
+        expect(screen.getByRole("listbox", { name: "Room list" })).toBeInTheDocument();
     });
 });
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/EmptyRoomList-test.tsx.snap b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/EmptyRoomList-test.tsx.snap
index 1e6fb38ab1..c368925df1 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/EmptyRoomList-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/EmptyRoomList-test.tsx.snap
@@ -1,16 +1,16 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<EmptyRoomList /> should display empty state for filter favourite 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex mx_EmptyRoomList_GenericPlaceholder"
+    class="_flex_4dswl_9 mx_EmptyRoomList_GenericPlaceholder"
     data-testid="empty-room-list"
     style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: stretch; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
   >
     <span
       class="mx_EmptyRoomList_GenericPlaceholder_title"
     >
-      You don't have favourite chat yet
+      You don't have favourite chats yet
     </span>
     <span
       class="mx_EmptyRoomList_GenericPlaceholder_description"
@@ -24,7 +24,7 @@ exports[`<EmptyRoomList /> should display empty state for filter favourite 1`] =
 exports[`<EmptyRoomList /> should display empty state for filter people 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex mx_EmptyRoomList_GenericPlaceholder"
+    class="_flex_4dswl_9 mx_EmptyRoomList_GenericPlaceholder"
     data-testid="empty-room-list"
     style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: stretch; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
   >
@@ -45,7 +45,7 @@ exports[`<EmptyRoomList /> should display empty state for filter people 1`] = `
 exports[`<EmptyRoomList /> should display empty state for filter rooms 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex mx_EmptyRoomList_GenericPlaceholder"
+    class="_flex_4dswl_9 mx_EmptyRoomList_GenericPlaceholder"
     data-testid="empty-room-list"
     style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: stretch; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
   >
@@ -66,7 +66,7 @@ exports[`<EmptyRoomList /> should display empty state for filter rooms 1`] = `
 exports[`<EmptyRoomList /> should display the empty state for the invite filter 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex mx_EmptyRoomList_GenericPlaceholder"
+    class="_flex_4dswl_9 mx_EmptyRoomList_GenericPlaceholder"
     data-testid="empty-room-list"
     style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: stretch; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
   >
@@ -76,7 +76,32 @@ exports[`<EmptyRoomList /> should display the empty state for the invite filter
       You don't have any unread invites
     </span>
     <button
-      class="_button_vczzf_8"
+      class="_button_187yx_8"
+      data-kind="tertiary"
+      data-size="lg"
+      role="button"
+      tabindex="0"
+    >
+      See all activity
+    </button>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`<EmptyRoomList /> should display the empty state for the low priority filter 1`] = `
+<DocumentFragment>
+  <div
+    class="_flex_4dswl_9 mx_EmptyRoomList_GenericPlaceholder"
+    data-testid="empty-room-list"
+    style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: stretch; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+  >
+    <span
+      class="mx_EmptyRoomList_GenericPlaceholder_title"
+    >
+      You don't have any low priority rooms
+    </span>
+    <button
+      class="_button_187yx_8"
       data-kind="tertiary"
       data-size="lg"
       role="button"
@@ -91,7 +116,7 @@ exports[`<EmptyRoomList /> should display the empty state for the invite filter
 exports[`<EmptyRoomList /> should display the empty state for the mention filter 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex mx_EmptyRoomList_GenericPlaceholder"
+    class="_flex_4dswl_9 mx_EmptyRoomList_GenericPlaceholder"
     data-testid="empty-room-list"
     style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: stretch; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
   >
@@ -101,7 +126,7 @@ exports[`<EmptyRoomList /> should display the empty state for the mention filter
       You don't have any unread mentions
     </span>
     <button
-      class="_button_vczzf_8"
+      class="_button_187yx_8"
       data-kind="tertiary"
       data-size="lg"
       role="button"
@@ -116,7 +141,7 @@ exports[`<EmptyRoomList /> should display the empty state for the mention filter
 exports[`<EmptyRoomList /> should display the empty state for the unread filter 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex mx_EmptyRoomList_GenericPlaceholder"
+    class="_flex_4dswl_9 mx_EmptyRoomList_GenericPlaceholder"
     data-testid="empty-room-list"
     style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: stretch; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
   >
@@ -126,7 +151,7 @@ exports[`<EmptyRoomList /> should display the empty state for the unread filter
       Congrats! You don’t have any unread messages
     </span>
     <button
-      class="_button_vczzf_8"
+      class="_button_187yx_8"
       data-kind="tertiary"
       data-size="lg"
       role="button"
@@ -141,7 +166,7 @@ exports[`<EmptyRoomList /> should display the empty state for the unread filter
 exports[`<EmptyRoomList /> should not render the new room button if the user doesn't have the rights to create a room 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex mx_EmptyRoomList_GenericPlaceholder"
+    class="_flex_4dswl_9 mx_EmptyRoomList_GenericPlaceholder"
     data-testid="empty-room-list"
     style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: stretch; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
   >
@@ -156,11 +181,11 @@ exports[`<EmptyRoomList /> should not render the new room button if the user doe
       Get started by messaging someone
     </span>
     <div
-      class="mx_Flex mx_EmptyRoomList_DefaultPlaceholder"
+      class="_flex_4dswl_9 mx_EmptyRoomList_DefaultPlaceholder"
       style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-4x); --mx-flex-wrap: nowrap;"
     >
       <button
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="secondary"
         data-size="sm"
         role="button"
@@ -175,10 +200,10 @@ exports[`<EmptyRoomList /> should not render the new room button if the user doe
           xmlns="http://www.w3.org/2000/svg"
         >
           <path
-            d="M10 12q-1.65 0-2.825-1.175T6 8t1.175-2.825T10 4t2.825 1.175T14 8t-1.175 2.825T10 12m-8 6v-.8q0-.85.438-1.562.437-.713 1.162-1.088a14.8 14.8 0 0 1 3.15-1.163A13.8 13.8 0 0 1 10 13q1.65 0 3.25.387 1.6.388 3.15 1.163.724.375 1.163 1.087Q18 16.35 18 17.2v.8q0 .824-.587 1.413A1.93 1.93 0 0 1 16 20H4q-.824 0-1.412-.587A1.93 1.93 0 0 1 2 18m2 0h12v-.8a.97.97 0 0 0-.5-.85q-1.35-.675-2.725-1.012a11.6 11.6 0 0 0-5.55 0Q5.85 15.675 4.5 16.35a.97.97 0 0 0-.5.85zm6-8q.825 0 1.412-.588Q12 8.826 12 8q0-.824-.588-1.412A1.93 1.93 0 0 0 10 6q-.825 0-1.412.588A1.93 1.93 0 0 0 8 8q0 .825.588 1.412Q9.175 10 10 10m7 1h2v2q0 .424.288.713.287.287.712.287.424 0 .712-.287A.97.97 0 0 0 21 13v-2h2q.424 0 .712-.287A.97.97 0 0 0 24 10a.97.97 0 0 0-.288-.713A.97.97 0 0 0 23 9h-2V7a.97.97 0 0 0-.288-.713A.97.97 0 0 0 20 6a.97.97 0 0 0-.712.287A.97.97 0 0 0 19 7v2h-2a.97.97 0 0 0-.712.287A.97.97 0 0 0 16 10q0 .424.288.713.287.287.712.287"
+            d="m1.5 21.25 1.45-4.95a10.2 10.2 0 0 1-.712-2.1A10.2 10.2 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22q-1.125 0-2.2-.238a10.2 10.2 0 0 1-2.1-.712L2.75 22.5a.94.94 0 0 1-1-.25.94.94 0 0 1-.25-1m2.45-1.2 3.2-.95a1 1 0 0 1 .275-.062q.15-.013.275-.013.225 0 .438.038.212.036.412.137a7.4 7.4 0 0 0 1.675.6Q11.1 20 12 20q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4 6.325 6.325 4 12q0 .9.2 1.775t.6 1.675q.176.325.188.688t-.088.712z"
           />
         </svg>
-        New message
+        Start chat
       </button>
     </div>
   </div>
@@ -188,7 +213,7 @@ exports[`<EmptyRoomList /> should not render the new room button if the user doe
 exports[`<EmptyRoomList /> should render the default placeholder when there is no filter 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex mx_EmptyRoomList_GenericPlaceholder"
+    class="_flex_4dswl_9 mx_EmptyRoomList_GenericPlaceholder"
     data-testid="empty-room-list"
     style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: stretch; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
   >
@@ -203,11 +228,11 @@ exports[`<EmptyRoomList /> should render the default placeholder when there is n
       Get started by messaging someone or by creating a room
     </span>
     <div
-      class="mx_Flex mx_EmptyRoomList_DefaultPlaceholder"
+      class="_flex_4dswl_9 mx_EmptyRoomList_DefaultPlaceholder"
       style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-4x); --mx-flex-wrap: nowrap;"
     >
       <button
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="secondary"
         data-size="sm"
         role="button"
@@ -222,13 +247,13 @@ exports[`<EmptyRoomList /> should render the default placeholder when there is n
           xmlns="http://www.w3.org/2000/svg"
         >
           <path
-            d="M10 12q-1.65 0-2.825-1.175T6 8t1.175-2.825T10 4t2.825 1.175T14 8t-1.175 2.825T10 12m-8 6v-.8q0-.85.438-1.562.437-.713 1.162-1.088a14.8 14.8 0 0 1 3.15-1.163A13.8 13.8 0 0 1 10 13q1.65 0 3.25.387 1.6.388 3.15 1.163.724.375 1.163 1.087Q18 16.35 18 17.2v.8q0 .824-.587 1.413A1.93 1.93 0 0 1 16 20H4q-.824 0-1.412-.587A1.93 1.93 0 0 1 2 18m2 0h12v-.8a.97.97 0 0 0-.5-.85q-1.35-.675-2.725-1.012a11.6 11.6 0 0 0-5.55 0Q5.85 15.675 4.5 16.35a.97.97 0 0 0-.5.85zm6-8q.825 0 1.412-.588Q12 8.826 12 8q0-.824-.588-1.412A1.93 1.93 0 0 0 10 6q-.825 0-1.412.588A1.93 1.93 0 0 0 8 8q0 .825.588 1.412Q9.175 10 10 10m7 1h2v2q0 .424.288.713.287.287.712.287.424 0 .712-.287A.97.97 0 0 0 21 13v-2h2q.424 0 .712-.287A.97.97 0 0 0 24 10a.97.97 0 0 0-.288-.713A.97.97 0 0 0 23 9h-2V7a.97.97 0 0 0-.288-.713A.97.97 0 0 0 20 6a.97.97 0 0 0-.712.287A.97.97 0 0 0 19 7v2h-2a.97.97 0 0 0-.712.287A.97.97 0 0 0 16 10q0 .424.288.713.287.287.712.287"
+            d="m1.5 21.25 1.45-4.95a10.2 10.2 0 0 1-.712-2.1A10.2 10.2 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22q-1.125 0-2.2-.238a10.2 10.2 0 0 1-2.1-.712L2.75 22.5a.94.94 0 0 1-1-.25.94.94 0 0 1-.25-1m2.45-1.2 3.2-.95a1 1 0 0 1 .275-.062q.15-.013.275-.013.225 0 .438.038.212.036.412.137a7.4 7.4 0 0 0 1.675.6Q11.1 20 12 20q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4 6.325 6.325 4 12q0 .9.2 1.775t.6 1.675q.176.325.188.688t-.088.712z"
           />
         </svg>
-        New message
+        Start chat
       </button>
       <button
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="secondary"
         data-size="sm"
         role="button"
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomList-test.tsx.snap b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomList-test.tsx.snap
index 3ab510bfca..4456a46f1c 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomList-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomList-test.tsx.snap
@@ -1,564 +1,1255 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<RoomList /> should render a room list 1`] = `
 <DocumentFragment>
   <div
-    class="mx_RoomList"
+    aria-label="Room list"
     data-testid="room-list"
+    data-virtuoso-scroller="true"
+    role="listbox"
+    style="height: 100%; outline: none; overflow-y: auto; position: relative; -webkit-overflow-scrolling: touch;"
+    tabindex="0"
   >
     <div
-      style="overflow: visible; height: 0px; width: 0px;"
+      data-viewport-type="element"
+      style="height: 100%; position: absolute; top: 0px; width: 100%;"
     >
       <div
-        aria-label="Room list"
-        aria-readonly="true"
-        class="ReactVirtualized__Grid ReactVirtualized__List mx_RoomList_List"
-        role="grid"
-        style="box-sizing: border-box; direction: ltr; height: 1500px; position: relative; width: 1500px; will-change: transform; overflow-x: hidden; overflow-y: hidden;"
-        tabindex="-1"
+        data-testid="virtuoso-item-list"
+        style="box-sizing: border-box; margin-top: 0px; padding-bottom: 0px; padding-top: 0px;"
       >
         <div
-          class="ReactVirtualized__Grid__innerScrollContainer"
-          role="row"
-          style="width: auto; height: 480px; max-width: 1500px; max-height: 480px; overflow: hidden; position: relative;"
+          data-index="0"
+          data-item-index="0"
+          data-known-size="48"
+          style="overflow-anchor: none;"
         >
           <button
+            aria-haspopup="menu"
             aria-label="Open room room0"
+            aria-posinset="1"
             aria-selected="false"
-            class="mx_RoomListItemView"
-            role="gridcell"
-            style="height: 48px; left: 0px; position: absolute; top: 0px; width: 100%;"
+            aria-setsize="10"
+            class="_flex_4dswl_9 mx_RoomListItemView mx_RoomListItemView_has_menu"
+            data-state="closed"
+            role="option"
+            style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+            tabindex="0"
+            type="button"
+          >
+            <span
+              aria-label="Avatar"
+              class="_avatar_zysgz_8 mx_BaseAvatar"
+              data-color="2"
+              data-testid="avatar-img"
+              data-type="round"
+              style="--cpd-avatar-size: 32px;"
+            >
+              <img
+                alt=""
+                class="_image_zysgz_43"
+                data-type="round"
+                height="32px"
+                loading="lazy"
+                referrerpolicy="no-referrer"
+                src="http://this.is.a.url/avatar.url/room.png"
+                width="32px"
+              />
+            </span>
+            <div
+              class="_flex_4dswl_9 mx_RoomListItemView_content"
+              style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+            >
+              <div
+                class="mx_RoomListItemView_text"
+              >
+                <div
+                  class="mx_RoomListItemView_roomName"
+                  title="room0"
+                >
+                  room0
+                </div>
+              </div>
+              <div
+                class="_flex_4dswl_9 mx_RoomListItemMenuView mx_RoomListItemView_menu"
+                style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+              />
+            </div>
+          </button>
+          <button
+            aria-disabled="false"
+            aria-expanded="false"
+            aria-haspopup="menu"
+            aria-label="More Options"
+            aria-labelledby="_r_2_"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
+            data-state="closed"
+            id="radix-_r_0_"
+            role="button"
+            style="--cpd-icon-button-size: 24px;"
             tabindex="0"
             type="button"
           >
             <div
-              class="mx_Flex mx_RoomListItemView_container"
-              style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
             >
-              <span
-                aria-label="Avatar"
-                class="_avatar_1qbcf_8 mx_BaseAvatar"
-                data-color="2"
-                data-testid="avatar-img"
-                data-type="round"
-                style="--cpd-avatar-size: 32px;"
+              <svg
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
               >
-                <img
-                  alt=""
-                  class="_image_1qbcf_41"
-                  data-type="round"
-                  height="32px"
-                  loading="lazy"
-                  referrerpolicy="no-referrer"
-                  src="http://this.is.a.url/avatar.url/room.png"
-                  width="32px"
+                <path
+                  d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
                 />
-              </span>
-              <div
-                class="mx_Flex mx_RoomListItemView_content"
-                style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
-              >
-                <div
-                  class="mx_RoomListItemView_text"
-                >
-                  <div
-                    class="mx_RoomListItemView_roomName"
-                    title="room0"
-                  >
-                    room0
-                  </div>
-                  <div
-                    class="mx_RoomListItemView_messagePreview"
-                  />
-                </div>
-              </div>
+              </svg>
             </div>
           </button>
           <button
-            aria-label="Open room room1"
-            aria-selected="false"
-            class="mx_RoomListItemView"
-            role="gridcell"
-            style="height: 48px; left: 0px; position: absolute; top: 48px; width: 100%;"
-            tabindex="-1"
+            aria-disabled="false"
+            aria-expanded="false"
+            aria-haspopup="menu"
+            aria-label="Notification options"
+            aria-labelledby="_r_9_"
+            class="_icon-button_1pz9o_8"
+            data-kind="primary"
+            data-state="closed"
+            id="radix-_r_7_"
+            role="button"
+            style="--cpd-icon-button-size: 24px;"
+            tabindex="0"
             type="button"
           >
             <div
-              class="mx_Flex mx_RoomListItemView_container"
-              style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+              class="_indicator-icon_147l5_17"
+              style="--cpd-icon-button-size: 100%;"
             >
-              <span
-                aria-label="Avatar"
-                class="_avatar_1qbcf_8 mx_BaseAvatar"
-                data-color="3"
-                data-testid="avatar-img"
-                data-type="round"
-                style="--cpd-avatar-size: 32px;"
+              <svg
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
               >
-                <img
-                  alt=""
-                  class="_image_1qbcf_41"
-                  data-type="round"
-                  height="32px"
-                  loading="lazy"
-                  referrerpolicy="no-referrer"
-                  src="http://this.is.a.url/avatar.url/room.png"
-                  width="32px"
+                <path
+                  d="M20.293 17.293c.63.63.184 1.707-.707 1.707H4.414c-.89 0-1.337-1.077-.707-1.707L5 16v-6s0-7 7-7 7 7 7 7v6zM12 22a2 2 0 0 1-2-2h4a2 2 0 0 1-2 2"
                 />
-              </span>
-              <div
-                class="mx_Flex mx_RoomListItemView_content"
-                style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
-              >
-                <div
-                  class="mx_RoomListItemView_text"
-                >
-                  <div
-                    class="mx_RoomListItemView_roomName"
-                    title="room1"
-                  >
-                    room1
-                  </div>
-                  <div
-                    class="mx_RoomListItemView_messagePreview"
-                  />
-                </div>
-              </div>
-            </div>
-          </button>
-          <button
-            aria-label="Open room room2"
-            aria-selected="false"
-            class="mx_RoomListItemView"
-            role="gridcell"
-            style="height: 48px; left: 0px; position: absolute; top: 96px; width: 100%;"
-            tabindex="-1"
-            type="button"
-          >
-            <div
-              class="mx_Flex mx_RoomListItemView_container"
-              style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
-            >
-              <span
-                aria-label="Avatar"
-                class="_avatar_1qbcf_8 mx_BaseAvatar"
-                data-color="4"
-                data-testid="avatar-img"
-                data-type="round"
-                style="--cpd-avatar-size: 32px;"
-              >
-                <img
-                  alt=""
-                  class="_image_1qbcf_41"
-                  data-type="round"
-                  height="32px"
-                  loading="lazy"
-                  referrerpolicy="no-referrer"
-                  src="http://this.is.a.url/avatar.url/room.png"
-                  width="32px"
-                />
-              </span>
-              <div
-                class="mx_Flex mx_RoomListItemView_content"
-                style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
-              >
-                <div
-                  class="mx_RoomListItemView_text"
-                >
-                  <div
-                    class="mx_RoomListItemView_roomName"
-                    title="room2"
-                  >
-                    room2
-                  </div>
-                  <div
-                    class="mx_RoomListItemView_messagePreview"
-                  />
-                </div>
-              </div>
-            </div>
-          </button>
-          <button
-            aria-label="Open room room3"
-            aria-selected="false"
-            class="mx_RoomListItemView"
-            role="gridcell"
-            style="height: 48px; left: 0px; position: absolute; top: 144px; width: 100%;"
-            tabindex="-1"
-            type="button"
-          >
-            <div
-              class="mx_Flex mx_RoomListItemView_container"
-              style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
-            >
-              <span
-                aria-label="Avatar"
-                class="_avatar_1qbcf_8 mx_BaseAvatar"
-                data-color="5"
-                data-testid="avatar-img"
-                data-type="round"
-                style="--cpd-avatar-size: 32px;"
-              >
-                <img
-                  alt=""
-                  class="_image_1qbcf_41"
-                  data-type="round"
-                  height="32px"
-                  loading="lazy"
-                  referrerpolicy="no-referrer"
-                  src="http://this.is.a.url/avatar.url/room.png"
-                  width="32px"
-                />
-              </span>
-              <div
-                class="mx_Flex mx_RoomListItemView_content"
-                style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
-              >
-                <div
-                  class="mx_RoomListItemView_text"
-                >
-                  <div
-                    class="mx_RoomListItemView_roomName"
-                    title="room3"
-                  >
-                    room3
-                  </div>
-                  <div
-                    class="mx_RoomListItemView_messagePreview"
-                  />
-                </div>
-              </div>
-            </div>
-          </button>
-          <button
-            aria-label="Open room room4"
-            aria-selected="false"
-            class="mx_RoomListItemView"
-            role="gridcell"
-            style="height: 48px; left: 0px; position: absolute; top: 192px; width: 100%;"
-            tabindex="-1"
-            type="button"
-          >
-            <div
-              class="mx_Flex mx_RoomListItemView_container"
-              style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
-            >
-              <span
-                aria-label="Avatar"
-                class="_avatar_1qbcf_8 mx_BaseAvatar"
-                data-color="6"
-                data-testid="avatar-img"
-                data-type="round"
-                style="--cpd-avatar-size: 32px;"
-              >
-                <img
-                  alt=""
-                  class="_image_1qbcf_41"
-                  data-type="round"
-                  height="32px"
-                  loading="lazy"
-                  referrerpolicy="no-referrer"
-                  src="http://this.is.a.url/avatar.url/room.png"
-                  width="32px"
-                />
-              </span>
-              <div
-                class="mx_Flex mx_RoomListItemView_content"
-                style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
-              >
-                <div
-                  class="mx_RoomListItemView_text"
-                >
-                  <div
-                    class="mx_RoomListItemView_roomName"
-                    title="room4"
-                  >
-                    room4
-                  </div>
-                  <div
-                    class="mx_RoomListItemView_messagePreview"
-                  />
-                </div>
-              </div>
-            </div>
-          </button>
-          <button
-            aria-label="Open room room5"
-            aria-selected="false"
-            class="mx_RoomListItemView"
-            role="gridcell"
-            style="height: 48px; left: 0px; position: absolute; top: 240px; width: 100%;"
-            tabindex="-1"
-            type="button"
-          >
-            <div
-              class="mx_Flex mx_RoomListItemView_container"
-              style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
-            >
-              <span
-                aria-label="Avatar"
-                class="_avatar_1qbcf_8 mx_BaseAvatar"
-                data-color="1"
-                data-testid="avatar-img"
-                data-type="round"
-                style="--cpd-avatar-size: 32px;"
-              >
-                <img
-                  alt=""
-                  class="_image_1qbcf_41"
-                  data-type="round"
-                  height="32px"
-                  loading="lazy"
-                  referrerpolicy="no-referrer"
-                  src="http://this.is.a.url/avatar.url/room.png"
-                  width="32px"
-                />
-              </span>
-              <div
-                class="mx_Flex mx_RoomListItemView_content"
-                style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
-              >
-                <div
-                  class="mx_RoomListItemView_text"
-                >
-                  <div
-                    class="mx_RoomListItemView_roomName"
-                    title="room5"
-                  >
-                    room5
-                  </div>
-                  <div
-                    class="mx_RoomListItemView_messagePreview"
-                  />
-                </div>
-              </div>
-            </div>
-          </button>
-          <button
-            aria-label="Open room room6"
-            aria-selected="false"
-            class="mx_RoomListItemView"
-            role="gridcell"
-            style="height: 48px; left: 0px; position: absolute; top: 288px; width: 100%;"
-            tabindex="-1"
-            type="button"
-          >
-            <div
-              class="mx_Flex mx_RoomListItemView_container"
-              style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
-            >
-              <span
-                aria-label="Avatar"
-                class="_avatar_1qbcf_8 mx_BaseAvatar"
-                data-color="2"
-                data-testid="avatar-img"
-                data-type="round"
-                style="--cpd-avatar-size: 32px;"
-              >
-                <img
-                  alt=""
-                  class="_image_1qbcf_41"
-                  data-type="round"
-                  height="32px"
-                  loading="lazy"
-                  referrerpolicy="no-referrer"
-                  src="http://this.is.a.url/avatar.url/room.png"
-                  width="32px"
-                />
-              </span>
-              <div
-                class="mx_Flex mx_RoomListItemView_content"
-                style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
-              >
-                <div
-                  class="mx_RoomListItemView_text"
-                >
-                  <div
-                    class="mx_RoomListItemView_roomName"
-                    title="room6"
-                  >
-                    room6
-                  </div>
-                  <div
-                    class="mx_RoomListItemView_messagePreview"
-                  />
-                </div>
-              </div>
-            </div>
-          </button>
-          <button
-            aria-label="Open room room7"
-            aria-selected="false"
-            class="mx_RoomListItemView"
-            role="gridcell"
-            style="height: 48px; left: 0px; position: absolute; top: 336px; width: 100%;"
-            tabindex="-1"
-            type="button"
-          >
-            <div
-              class="mx_Flex mx_RoomListItemView_container"
-              style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
-            >
-              <span
-                aria-label="Avatar"
-                class="_avatar_1qbcf_8 mx_BaseAvatar"
-                data-color="3"
-                data-testid="avatar-img"
-                data-type="round"
-                style="--cpd-avatar-size: 32px;"
-              >
-                <img
-                  alt=""
-                  class="_image_1qbcf_41"
-                  data-type="round"
-                  height="32px"
-                  loading="lazy"
-                  referrerpolicy="no-referrer"
-                  src="http://this.is.a.url/avatar.url/room.png"
-                  width="32px"
-                />
-              </span>
-              <div
-                class="mx_Flex mx_RoomListItemView_content"
-                style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
-              >
-                <div
-                  class="mx_RoomListItemView_text"
-                >
-                  <div
-                    class="mx_RoomListItemView_roomName"
-                    title="room7"
-                  >
-                    room7
-                  </div>
-                  <div
-                    class="mx_RoomListItemView_messagePreview"
-                  />
-                </div>
-              </div>
-            </div>
-          </button>
-          <button
-            aria-label="Open room room8"
-            aria-selected="false"
-            class="mx_RoomListItemView"
-            role="gridcell"
-            style="height: 48px; left: 0px; position: absolute; top: 384px; width: 100%;"
-            tabindex="-1"
-            type="button"
-          >
-            <div
-              class="mx_Flex mx_RoomListItemView_container"
-              style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
-            >
-              <span
-                aria-label="Avatar"
-                class="_avatar_1qbcf_8 mx_BaseAvatar"
-                data-color="4"
-                data-testid="avatar-img"
-                data-type="round"
-                style="--cpd-avatar-size: 32px;"
-              >
-                <img
-                  alt=""
-                  class="_image_1qbcf_41"
-                  data-type="round"
-                  height="32px"
-                  loading="lazy"
-                  referrerpolicy="no-referrer"
-                  src="http://this.is.a.url/avatar.url/room.png"
-                  width="32px"
-                />
-              </span>
-              <div
-                class="mx_Flex mx_RoomListItemView_content"
-                style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
-              >
-                <div
-                  class="mx_RoomListItemView_text"
-                >
-                  <div
-                    class="mx_RoomListItemView_roomName"
-                    title="room8"
-                  >
-                    room8
-                  </div>
-                  <div
-                    class="mx_RoomListItemView_messagePreview"
-                  />
-                </div>
-              </div>
-            </div>
-          </button>
-          <button
-            aria-label="Open room room9"
-            aria-selected="false"
-            class="mx_RoomListItemView"
-            role="gridcell"
-            style="height: 48px; left: 0px; position: absolute; top: 432px; width: 100%;"
-            tabindex="-1"
-            type="button"
-          >
-            <div
-              class="mx_Flex mx_RoomListItemView_container"
-              style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
-            >
-              <span
-                aria-label="Avatar"
-                class="_avatar_1qbcf_8 mx_BaseAvatar"
-                data-color="5"
-                data-testid="avatar-img"
-                data-type="round"
-                style="--cpd-avatar-size: 32px;"
-              >
-                <img
-                  alt=""
-                  class="_image_1qbcf_41"
-                  data-type="round"
-                  height="32px"
-                  loading="lazy"
-                  referrerpolicy="no-referrer"
-                  src="http://this.is.a.url/avatar.url/room.png"
-                  width="32px"
-                />
-              </span>
-              <div
-                class="mx_Flex mx_RoomListItemView_content"
-                style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
-              >
-                <div
-                  class="mx_RoomListItemView_text"
-                >
-                  <div
-                    class="mx_RoomListItemView_roomName"
-                    title="room9"
-                  >
-                    room9
-                  </div>
-                  <div
-                    class="mx_RoomListItemView_messagePreview"
-                  />
-                </div>
-              </div>
+              </svg>
             </div>
           </button>
         </div>
       </div>
     </div>
     <div
-      class="resize-triggers"
+      data-index="1"
+      data-item-index="1"
+      data-known-size="48"
+      style="overflow-anchor: none;"
     >
-      <div
-        class="expand-trigger"
+      <button
+        aria-haspopup="menu"
+        aria-label="Open room room1"
+        aria-posinset="2"
+        aria-selected="false"
+        aria-setsize="10"
+        class="_flex_4dswl_9 mx_RoomListItemView mx_RoomListItemView_has_menu"
+        data-state="closed"
+        role="option"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+        tabindex="-1"
+        type="button"
+      >
+        <span
+          aria-label="Avatar"
+          class="_avatar_zysgz_8 mx_BaseAvatar"
+          data-color="3"
+          data-testid="avatar-img"
+          data-type="round"
+          style="--cpd-avatar-size: 32px;"
+        >
+          <img
+            alt=""
+            class="_image_zysgz_43"
+            data-type="round"
+            height="32px"
+            loading="lazy"
+            referrerpolicy="no-referrer"
+            src="http://this.is.a.url/avatar.url/room.png"
+            width="32px"
+          />
+        </span>
+        <div
+          class="_flex_4dswl_9 mx_RoomListItemView_content"
+          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+        >
+          <div
+            class="mx_RoomListItemView_text"
+          >
+            <div
+              class="mx_RoomListItemView_roomName"
+              title="room1"
+            >
+              room1
+            </div>
+          </div>
+          <div
+            class="_flex_4dswl_9 mx_RoomListItemMenuView mx_RoomListItemView_menu"
+            style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+          />
+        </div>
+      </button>
+      <button
+        aria-disabled="false"
+        aria-expanded="false"
+        aria-haspopup="menu"
+        aria-label="More Options"
+        aria-labelledby="_r_g_"
+        class="_icon-button_1pz9o_8"
+        data-kind="primary"
+        data-state="closed"
+        id="radix-_r_e_"
+        role="button"
+        style="--cpd-icon-button-size: 24px;"
+        tabindex="0"
+        type="button"
       >
         <div
-          style="width: 1501px; height: 1501px;"
+          class="_indicator-icon_147l5_17"
+          style="--cpd-icon-button-size: 100%;"
+        >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+            />
+          </svg>
+        </div>
+      </button>
+      <button
+        aria-disabled="false"
+        aria-expanded="false"
+        aria-haspopup="menu"
+        aria-label="Notification options"
+        aria-labelledby="_r_n_"
+        class="_icon-button_1pz9o_8"
+        data-kind="primary"
+        data-state="closed"
+        id="radix-_r_l_"
+        role="button"
+        style="--cpd-icon-button-size: 24px;"
+        tabindex="0"
+        type="button"
+      >
+        <div
+          class="_indicator-icon_147l5_17"
+          style="--cpd-icon-button-size: 100%;"
+        >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M20.293 17.293c.63.63.184 1.707-.707 1.707H4.414c-.89 0-1.337-1.077-.707-1.707L5 16v-6s0-7 7-7 7 7 7 7v6zM12 22a2 2 0 0 1-2-2h4a2 2 0 0 1-2 2"
+            />
+          </svg>
+        </div>
+      </button>
+    </div>
+  </div>
+  <div
+    data-index="2"
+    data-item-index="2"
+    data-known-size="48"
+    style="overflow-anchor: none;"
+  >
+    <button
+      aria-haspopup="menu"
+      aria-label="Open room room2"
+      aria-posinset="3"
+      aria-selected="false"
+      aria-setsize="10"
+      class="_flex_4dswl_9 mx_RoomListItemView mx_RoomListItemView_has_menu"
+      data-state="closed"
+      role="option"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+      tabindex="-1"
+      type="button"
+    >
+      <span
+        aria-label="Avatar"
+        class="_avatar_zysgz_8 mx_BaseAvatar"
+        data-color="4"
+        data-testid="avatar-img"
+        data-type="round"
+        style="--cpd-avatar-size: 32px;"
+      >
+        <img
+          alt=""
+          class="_image_zysgz_43"
+          data-type="round"
+          height="32px"
+          loading="lazy"
+          referrerpolicy="no-referrer"
+          src="http://this.is.a.url/avatar.url/room.png"
+          width="32px"
+        />
+      </span>
+      <div
+        class="_flex_4dswl_9 mx_RoomListItemView_content"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+      >
+        <div
+          class="mx_RoomListItemView_text"
+        >
+          <div
+            class="mx_RoomListItemView_roomName"
+            title="room2"
+          >
+            room2
+          </div>
+        </div>
+        <div
+          class="_flex_4dswl_9 mx_RoomListItemMenuView mx_RoomListItemView_menu"
+          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
         />
       </div>
+    </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="More Options"
+      aria-labelledby="_r_u_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
+      data-state="closed"
+      id="radix-_r_s_"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
       <div
-        class="contract-trigger"
-      />
-    </div>
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+          />
+        </svg>
+      </div>
+    </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="Notification options"
+      aria-labelledby="_r_15_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
+      data-state="closed"
+      id="radix-_r_13_"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M20.293 17.293c.63.63.184 1.707-.707 1.707H4.414c-.89 0-1.337-1.077-.707-1.707L5 16v-6s0-7 7-7 7 7 7 7v6zM12 22a2 2 0 0 1-2-2h4a2 2 0 0 1-2 2"
+          />
+        </svg>
+      </div>
+    </button>
+  </div>
+  <div
+    data-index="3"
+    data-item-index="3"
+    data-known-size="48"
+    style="overflow-anchor: none;"
+  >
+    <button
+      aria-haspopup="menu"
+      aria-label="Open room room3"
+      aria-posinset="4"
+      aria-selected="false"
+      aria-setsize="10"
+      class="_flex_4dswl_9 mx_RoomListItemView mx_RoomListItemView_has_menu"
+      data-state="closed"
+      role="option"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+      tabindex="-1"
+      type="button"
+    >
+      <span
+        aria-label="Avatar"
+        class="_avatar_zysgz_8 mx_BaseAvatar"
+        data-color="5"
+        data-testid="avatar-img"
+        data-type="round"
+        style="--cpd-avatar-size: 32px;"
+      >
+        <img
+          alt=""
+          class="_image_zysgz_43"
+          data-type="round"
+          height="32px"
+          loading="lazy"
+          referrerpolicy="no-referrer"
+          src="http://this.is.a.url/avatar.url/room.png"
+          width="32px"
+        />
+      </span>
+      <div
+        class="_flex_4dswl_9 mx_RoomListItemView_content"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+      >
+        <div
+          class="mx_RoomListItemView_text"
+        >
+          <div
+            class="mx_RoomListItemView_roomName"
+            title="room3"
+          >
+            room3
+          </div>
+        </div>
+        <div
+          class="_flex_4dswl_9 mx_RoomListItemMenuView mx_RoomListItemView_menu"
+          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+        />
+      </div>
+    </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="More Options"
+      aria-labelledby="_r_1c_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
+      data-state="closed"
+      id="radix-_r_1a_"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+          />
+        </svg>
+      </div>
+    </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="Notification options"
+      aria-labelledby="_r_1j_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
+      data-state="closed"
+      id="radix-_r_1h_"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M20.293 17.293c.63.63.184 1.707-.707 1.707H4.414c-.89 0-1.337-1.077-.707-1.707L5 16v-6s0-7 7-7 7 7 7 7v6zM12 22a2 2 0 0 1-2-2h4a2 2 0 0 1-2 2"
+          />
+        </svg>
+      </div>
+    </button>
+  </div>
+  <div
+    data-index="4"
+    data-item-index="4"
+    data-known-size="48"
+    style="overflow-anchor: none;"
+  >
+    <button
+      aria-haspopup="menu"
+      aria-label="Open room room4"
+      aria-posinset="5"
+      aria-selected="false"
+      aria-setsize="10"
+      class="_flex_4dswl_9 mx_RoomListItemView mx_RoomListItemView_has_menu"
+      data-state="closed"
+      role="option"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+      tabindex="-1"
+      type="button"
+    >
+      <span
+        aria-label="Avatar"
+        class="_avatar_zysgz_8 mx_BaseAvatar"
+        data-color="6"
+        data-testid="avatar-img"
+        data-type="round"
+        style="--cpd-avatar-size: 32px;"
+      >
+        <img
+          alt=""
+          class="_image_zysgz_43"
+          data-type="round"
+          height="32px"
+          loading="lazy"
+          referrerpolicy="no-referrer"
+          src="http://this.is.a.url/avatar.url/room.png"
+          width="32px"
+        />
+      </span>
+      <div
+        class="_flex_4dswl_9 mx_RoomListItemView_content"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+      >
+        <div
+          class="mx_RoomListItemView_text"
+        >
+          <div
+            class="mx_RoomListItemView_roomName"
+            title="room4"
+          >
+            room4
+          </div>
+        </div>
+        <div
+          class="_flex_4dswl_9 mx_RoomListItemMenuView mx_RoomListItemView_menu"
+          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+        />
+      </div>
+    </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="More Options"
+      aria-labelledby="_r_1q_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
+      data-state="closed"
+      id="radix-_r_1o_"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+          />
+        </svg>
+      </div>
+    </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="Notification options"
+      aria-labelledby="_r_21_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
+      data-state="closed"
+      id="radix-_r_1v_"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M20.293 17.293c.63.63.184 1.707-.707 1.707H4.414c-.89 0-1.337-1.077-.707-1.707L5 16v-6s0-7 7-7 7 7 7 7v6zM12 22a2 2 0 0 1-2-2h4a2 2 0 0 1-2 2"
+          />
+        </svg>
+      </div>
+    </button>
+  </div>
+  <div
+    data-index="5"
+    data-item-index="5"
+    data-known-size="48"
+    style="overflow-anchor: none;"
+  >
+    <button
+      aria-haspopup="menu"
+      aria-label="Open room room5"
+      aria-posinset="6"
+      aria-selected="false"
+      aria-setsize="10"
+      class="_flex_4dswl_9 mx_RoomListItemView mx_RoomListItemView_has_menu"
+      data-state="closed"
+      role="option"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+      tabindex="-1"
+      type="button"
+    >
+      <span
+        aria-label="Avatar"
+        class="_avatar_zysgz_8 mx_BaseAvatar"
+        data-color="1"
+        data-testid="avatar-img"
+        data-type="round"
+        style="--cpd-avatar-size: 32px;"
+      >
+        <img
+          alt=""
+          class="_image_zysgz_43"
+          data-type="round"
+          height="32px"
+          loading="lazy"
+          referrerpolicy="no-referrer"
+          src="http://this.is.a.url/avatar.url/room.png"
+          width="32px"
+        />
+      </span>
+      <div
+        class="_flex_4dswl_9 mx_RoomListItemView_content"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+      >
+        <div
+          class="mx_RoomListItemView_text"
+        >
+          <div
+            class="mx_RoomListItemView_roomName"
+            title="room5"
+          >
+            room5
+          </div>
+        </div>
+        <div
+          class="_flex_4dswl_9 mx_RoomListItemMenuView mx_RoomListItemView_menu"
+          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+        />
+      </div>
+    </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="More Options"
+      aria-labelledby="_r_28_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
+      data-state="closed"
+      id="radix-_r_26_"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+          />
+        </svg>
+      </div>
+    </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="Notification options"
+      aria-labelledby="_r_2f_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
+      data-state="closed"
+      id="radix-_r_2d_"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M20.293 17.293c.63.63.184 1.707-.707 1.707H4.414c-.89 0-1.337-1.077-.707-1.707L5 16v-6s0-7 7-7 7 7 7 7v6zM12 22a2 2 0 0 1-2-2h4a2 2 0 0 1-2 2"
+          />
+        </svg>
+      </div>
+    </button>
+  </div>
+  <div
+    data-index="6"
+    data-item-index="6"
+    data-known-size="48"
+    style="overflow-anchor: none;"
+  >
+    <button
+      aria-haspopup="menu"
+      aria-label="Open room room6"
+      aria-posinset="7"
+      aria-selected="false"
+      aria-setsize="10"
+      class="_flex_4dswl_9 mx_RoomListItemView mx_RoomListItemView_has_menu"
+      data-state="closed"
+      role="option"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+      tabindex="-1"
+      type="button"
+    >
+      <span
+        aria-label="Avatar"
+        class="_avatar_zysgz_8 mx_BaseAvatar"
+        data-color="2"
+        data-testid="avatar-img"
+        data-type="round"
+        style="--cpd-avatar-size: 32px;"
+      >
+        <img
+          alt=""
+          class="_image_zysgz_43"
+          data-type="round"
+          height="32px"
+          loading="lazy"
+          referrerpolicy="no-referrer"
+          src="http://this.is.a.url/avatar.url/room.png"
+          width="32px"
+        />
+      </span>
+      <div
+        class="_flex_4dswl_9 mx_RoomListItemView_content"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+      >
+        <div
+          class="mx_RoomListItemView_text"
+        >
+          <div
+            class="mx_RoomListItemView_roomName"
+            title="room6"
+          >
+            room6
+          </div>
+        </div>
+        <div
+          class="_flex_4dswl_9 mx_RoomListItemMenuView mx_RoomListItemView_menu"
+          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+        />
+      </div>
+    </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="More Options"
+      aria-labelledby="_r_2m_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
+      data-state="closed"
+      id="radix-_r_2k_"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+          />
+        </svg>
+      </div>
+    </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="Notification options"
+      aria-labelledby="_r_2t_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
+      data-state="closed"
+      id="radix-_r_2r_"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M20.293 17.293c.63.63.184 1.707-.707 1.707H4.414c-.89 0-1.337-1.077-.707-1.707L5 16v-6s0-7 7-7 7 7 7 7v6zM12 22a2 2 0 0 1-2-2h4a2 2 0 0 1-2 2"
+          />
+        </svg>
+      </div>
+    </button>
+  </div>
+  <div
+    data-index="7"
+    data-item-index="7"
+    data-known-size="48"
+    style="overflow-anchor: none;"
+  >
+    <button
+      aria-haspopup="menu"
+      aria-label="Open room room7"
+      aria-posinset="8"
+      aria-selected="false"
+      aria-setsize="10"
+      class="_flex_4dswl_9 mx_RoomListItemView mx_RoomListItemView_has_menu"
+      data-state="closed"
+      role="option"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+      tabindex="-1"
+      type="button"
+    >
+      <span
+        aria-label="Avatar"
+        class="_avatar_zysgz_8 mx_BaseAvatar"
+        data-color="3"
+        data-testid="avatar-img"
+        data-type="round"
+        style="--cpd-avatar-size: 32px;"
+      >
+        <img
+          alt=""
+          class="_image_zysgz_43"
+          data-type="round"
+          height="32px"
+          loading="lazy"
+          referrerpolicy="no-referrer"
+          src="http://this.is.a.url/avatar.url/room.png"
+          width="32px"
+        />
+      </span>
+      <div
+        class="_flex_4dswl_9 mx_RoomListItemView_content"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+      >
+        <div
+          class="mx_RoomListItemView_text"
+        >
+          <div
+            class="mx_RoomListItemView_roomName"
+            title="room7"
+          >
+            room7
+          </div>
+        </div>
+        <div
+          class="_flex_4dswl_9 mx_RoomListItemMenuView mx_RoomListItemView_menu"
+          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+        />
+      </div>
+    </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="More Options"
+      aria-labelledby="_r_34_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
+      data-state="closed"
+      id="radix-_r_32_"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+          />
+        </svg>
+      </div>
+    </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="Notification options"
+      aria-labelledby="_r_3b_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
+      data-state="closed"
+      id="radix-_r_39_"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M20.293 17.293c.63.63.184 1.707-.707 1.707H4.414c-.89 0-1.337-1.077-.707-1.707L5 16v-6s0-7 7-7 7 7 7 7v6zM12 22a2 2 0 0 1-2-2h4a2 2 0 0 1-2 2"
+          />
+        </svg>
+      </div>
+    </button>
+  </div>
+  <div
+    data-index="8"
+    data-item-index="8"
+    data-known-size="48"
+    style="overflow-anchor: none;"
+  >
+    <button
+      aria-haspopup="menu"
+      aria-label="Open room room8"
+      aria-posinset="9"
+      aria-selected="false"
+      aria-setsize="10"
+      class="_flex_4dswl_9 mx_RoomListItemView mx_RoomListItemView_has_menu"
+      data-state="closed"
+      role="option"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+      tabindex="-1"
+      type="button"
+    >
+      <span
+        aria-label="Avatar"
+        class="_avatar_zysgz_8 mx_BaseAvatar"
+        data-color="4"
+        data-testid="avatar-img"
+        data-type="round"
+        style="--cpd-avatar-size: 32px;"
+      >
+        <img
+          alt=""
+          class="_image_zysgz_43"
+          data-type="round"
+          height="32px"
+          loading="lazy"
+          referrerpolicy="no-referrer"
+          src="http://this.is.a.url/avatar.url/room.png"
+          width="32px"
+        />
+      </span>
+      <div
+        class="_flex_4dswl_9 mx_RoomListItemView_content"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+      >
+        <div
+          class="mx_RoomListItemView_text"
+        >
+          <div
+            class="mx_RoomListItemView_roomName"
+            title="room8"
+          >
+            room8
+          </div>
+        </div>
+        <div
+          class="_flex_4dswl_9 mx_RoomListItemMenuView mx_RoomListItemView_menu"
+          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+        />
+      </div>
+    </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="More Options"
+      aria-labelledby="_r_3i_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
+      data-state="closed"
+      id="radix-_r_3g_"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+          />
+        </svg>
+      </div>
+    </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="Notification options"
+      aria-labelledby="_r_3p_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
+      data-state="closed"
+      id="radix-_r_3n_"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M20.293 17.293c.63.63.184 1.707-.707 1.707H4.414c-.89 0-1.337-1.077-.707-1.707L5 16v-6s0-7 7-7 7 7 7 7v6zM12 22a2 2 0 0 1-2-2h4a2 2 0 0 1-2 2"
+          />
+        </svg>
+      </div>
+    </button>
+  </div>
+  <div
+    data-index="9"
+    data-item-index="9"
+    data-known-size="48"
+    style="overflow-anchor: none;"
+  >
+    <button
+      aria-haspopup="menu"
+      aria-label="Open room room9"
+      aria-posinset="10"
+      aria-selected="false"
+      aria-setsize="10"
+      class="_flex_4dswl_9 mx_RoomListItemView mx_RoomListItemView_has_menu"
+      data-state="closed"
+      role="option"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+      tabindex="-1"
+      type="button"
+    >
+      <span
+        aria-label="Avatar"
+        class="_avatar_zysgz_8 mx_BaseAvatar"
+        data-color="5"
+        data-testid="avatar-img"
+        data-type="round"
+        style="--cpd-avatar-size: 32px;"
+      >
+        <img
+          alt=""
+          class="_image_zysgz_43"
+          data-type="round"
+          height="32px"
+          loading="lazy"
+          referrerpolicy="no-referrer"
+          src="http://this.is.a.url/avatar.url/room.png"
+          width="32px"
+        />
+      </span>
+      <div
+        class="_flex_4dswl_9 mx_RoomListItemView_content"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+      >
+        <div
+          class="mx_RoomListItemView_text"
+        >
+          <div
+            class="mx_RoomListItemView_roomName"
+            title="room9"
+          >
+            room9
+          </div>
+        </div>
+        <div
+          class="_flex_4dswl_9 mx_RoomListItemMenuView mx_RoomListItemView_menu"
+          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+        />
+      </div>
+    </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="More Options"
+      aria-labelledby="_r_40_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
+      data-state="closed"
+      id="radix-_r_3u_"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+          />
+        </svg>
+      </div>
+    </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="Notification options"
+      aria-labelledby="_r_47_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
+      data-state="closed"
+      id="radix-_r_45_"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M20.293 17.293c.63.63.184 1.707-.707 1.707H4.414c-.89 0-1.337-1.077-.707-1.707L5 16v-6s0-7 7-7 7 7 7 7v6zM12 22a2 2 0 0 1-2-2h4a2 2 0 0 1-2 2"
+          />
+        </svg>
+      </div>
+    </button>
   </div>
 </DocumentFragment>
 `;
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListHeaderView-test.tsx.snap b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListHeaderView-test.tsx.snap
index 8a3caa1587..16a67295af 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListHeaderView-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListHeaderView-test.tsx.snap
@@ -1,15 +1,15 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<RoomListHeaderView /> compose menu should display the compose menu 1`] = `
 <DocumentFragment>
   <header
     aria-label="Room options"
-    class="mx_Flex mx_RoomListHeaderView"
+    class="_flex_4dswl_9 mx_RoomListHeaderView"
     data-testid="room-list-header"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
   >
     <div
-      class="mx_Flex mx_RoomListHeaderView_title"
+      class="_flex_4dswl_9 mx_RoomListHeaderView_title"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
     >
       <h1
@@ -22,16 +22,17 @@ exports[`<RoomListHeaderView /> compose menu should display the compose menu 1`]
         aria-expanded="false"
         aria-haspopup="menu"
         aria-label="Open space menu"
-        class="_icon-button_m2erp_8 mx_SpaceMenu_button"
+        class="_icon-button_1pz9o_8 mx_SpaceMenu_button"
+        data-kind="primary"
         data-state="closed"
-        id="radix-«rc»"
+        id="radix-_r_i_"
         role="button"
         style="--cpd-icon-button-size: 20px;"
         tabindex="0"
         type="button"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -50,77 +51,88 @@ exports[`<RoomListHeaderView /> compose menu should display the compose menu 1`]
       </button>
     </div>
     <div
-      class="mx_Flex"
+      class="_flex_4dswl_9"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
     >
-      <button
-        aria-disabled="false"
-        aria-expanded="false"
-        aria-haspopup="menu"
-        aria-label="Room Options"
-        aria-labelledby="«rg»"
-        class="_icon-button_m2erp_8"
-        data-state="closed"
-        id="radix-«re»"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-        type="button"
+      <div
+        class="mx_RoomListHeaderView_ReleaseAnnouncementAnchor"
       >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
+        <button
+          aria-disabled="false"
+          aria-expanded="false"
+          aria-haspopup="menu"
+          aria-label="Room Options"
+          aria-labelledby="_r_m_"
+          class="_icon-button_1pz9o_8"
+          data-kind="primary"
+          data-state="closed"
+          id="radix-_r_k_"
+          role="button"
+          style="--cpd-icon-button-size: 32px;"
+          tabindex="0"
+          type="button"
         >
-          <svg
-            color="var(--cpd-color-icon-secondary)"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
+          <div
+            class="_indicator-icon_147l5_17"
+            style="--cpd-icon-button-size: 100%;"
           >
-            <path
-              d="M5 7a1 1 0 0 0 0 2h14a1 1 0 1 0 0-2zm3 4a1 1 0 1 0 0 2h8a1 1 0 1 0 0-2zm2 5a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-disabled="false"
-        aria-expanded="false"
-        aria-haspopup="menu"
-        aria-label="Add"
-        class="_icon-button_m2erp_8"
-        data-state="closed"
-        id="radix-«rl»"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-        type="button"
+            <svg
+              color="var(--cpd-color-icon-secondary)"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+              />
+            </svg>
+          </div>
+        </button>
+      </div>
+      <div
+        class="mx_RoomListHeaderView_ReleaseAnnouncementAnchor"
       >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
+        <button
+          aria-disabled="false"
+          aria-expanded="false"
+          aria-haspopup="menu"
+          aria-labelledby="_r_t_"
+          class="_icon-button_1pz9o_8"
+          data-kind="primary"
+          data-state="closed"
+          id="radix-_r_r_"
+          role="button"
+          style="--cpd-icon-button-size: 32px;"
+          tabindex="0"
+          type="button"
         >
-          <svg
-            color="var(--cpd-color-icon-secondary)"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
+          <div
+            class="_indicator-icon_147l5_17"
+            style="--cpd-icon-button-size: 100%;"
           >
-            <path
-              clip-rule="evenodd"
-              d="M16.937 2.82a2 2 0 0 1 2.828 0l1.415 1.414a2 2 0 0 1 0 2.829l-7.071 7.07c-.195.196-.42.342-.66.44a1 1 0 0 1-.168.072l-3.993 1.331a1 1 0 0 1-1.265-1.265l1.331-3.992q.03-.09.073-.168m10.338-4.903-6.717 6.718-1.414-1.414 6.717-6.718z"
-              fill-rule="evenodd"
-            />
-            <path
-              d="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
-            />
-          </svg>
-        </div>
-      </button>
+            <svg
+              aria-hidden="true"
+              color="var(--cpd-color-icon-secondary)"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M16.937 2.82a2 2 0 0 1 2.828 0l1.415 1.414a2 2 0 0 1 0 2.829l-7.071 7.07c-.195.196-.42.342-.66.44a1 1 0 0 1-.168.072l-3.993 1.331a1 1 0 0 1-1.265-1.265l1.331-3.992q.03-.09.073-.168m10.338-4.903-6.717 6.718-1.414-1.414 6.717-6.718z"
+                fill-rule="evenodd"
+              />
+              <path
+                d="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
+              />
+            </svg>
+          </div>
+        </button>
+      </div>
     </div>
   </header>
 </DocumentFragment>
@@ -130,12 +142,12 @@ exports[`<RoomListHeaderView /> compose menu should not display the compose menu
 <DocumentFragment>
   <header
     aria-label="Room options"
-    class="mx_Flex mx_RoomListHeaderView"
+    class="_flex_4dswl_9 mx_RoomListHeaderView"
     data-testid="room-list-header"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
   >
     <div
-      class="mx_Flex mx_RoomListHeaderView_title"
+      class="_flex_4dswl_9 mx_RoomListHeaderView_title"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
     >
       <h1
@@ -148,16 +160,17 @@ exports[`<RoomListHeaderView /> compose menu should not display the compose menu
         aria-expanded="false"
         aria-haspopup="menu"
         aria-label="Open space menu"
-        class="_icon-button_m2erp_8 mx_SpaceMenu_button"
+        class="_icon-button_1pz9o_8 mx_SpaceMenu_button"
+        data-kind="primary"
         data-state="closed"
-        id="radix-«ro»"
+        id="radix-_r_14_"
         role="button"
         style="--cpd-icon-button-size: 20px;"
         tabindex="0"
         type="button"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -176,71 +189,82 @@ exports[`<RoomListHeaderView /> compose menu should not display the compose menu
       </button>
     </div>
     <div
-      class="mx_Flex"
+      class="_flex_4dswl_9"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
     >
-      <button
-        aria-disabled="false"
-        aria-expanded="false"
-        aria-haspopup="menu"
-        aria-label="Room Options"
-        aria-labelledby="«rs»"
-        class="_icon-button_m2erp_8"
-        data-state="closed"
-        id="radix-«rq»"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-        type="button"
+      <div
+        class="mx_RoomListHeaderView_ReleaseAnnouncementAnchor"
       >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
+        <button
+          aria-disabled="false"
+          aria-expanded="false"
+          aria-haspopup="menu"
+          aria-label="Room Options"
+          aria-labelledby="_r_18_"
+          class="_icon-button_1pz9o_8"
+          data-kind="primary"
+          data-state="closed"
+          id="radix-_r_16_"
+          role="button"
+          style="--cpd-icon-button-size: 32px;"
+          tabindex="0"
+          type="button"
         >
-          <svg
-            color="var(--cpd-color-icon-secondary)"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
+          <div
+            class="_indicator-icon_147l5_17"
+            style="--cpd-icon-button-size: 100%;"
           >
-            <path
-              d="M5 7a1 1 0 0 0 0 2h14a1 1 0 1 0 0-2zm3 4a1 1 0 1 0 0 2h8a1 1 0 1 0 0-2zm2 5a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-label="New message"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
+            <svg
+              color="var(--cpd-color-icon-secondary)"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+              />
+            </svg>
+          </div>
+        </button>
+      </div>
+      <div
+        class="mx_RoomListHeaderView_ReleaseAnnouncementAnchor"
       >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
+        <button
+          aria-labelledby="_r_1d_"
+          class="_icon-button_1pz9o_8"
+          data-kind="primary"
+          role="button"
+          style="--cpd-icon-button-size: 32px;"
+          tabindex="0"
         >
-          <svg
-            color="var(--cpd-color-icon-secondary)"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
+          <div
+            class="_indicator-icon_147l5_17"
+            style="--cpd-icon-button-size: 100%;"
           >
-            <path
-              clip-rule="evenodd"
-              d="M16.937 2.82a2 2 0 0 1 2.828 0l1.415 1.414a2 2 0 0 1 0 2.829l-7.071 7.07c-.195.196-.42.342-.66.44a1 1 0 0 1-.168.072l-3.993 1.331a1 1 0 0 1-1.265-1.265l1.331-3.992q.03-.09.073-.168m10.338-4.903-6.717 6.718-1.414-1.414 6.717-6.718z"
-              fill-rule="evenodd"
-            />
-            <path
-              d="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
-            />
-          </svg>
-        </div>
-      </button>
+            <svg
+              aria-hidden="true"
+              color="var(--cpd-color-icon-secondary)"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M16.937 2.82a2 2 0 0 1 2.828 0l1.415 1.414a2 2 0 0 1 0 2.829l-7.071 7.07c-.195.196-.42.342-.66.44a1 1 0 0 1-.168.072l-3.993 1.331a1 1 0 0 1-1.265-1.265l1.331-3.992q.03-.09.073-.168m10.338-4.903-6.717 6.718-1.414-1.414 6.717-6.718z"
+                fill-rule="evenodd"
+              />
+              <path
+                d="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
+              />
+            </svg>
+          </div>
+        </button>
+      </div>
     </div>
   </header>
 </DocumentFragment>
@@ -250,12 +274,12 @@ exports[`<RoomListHeaderView /> should render 'room options' button 1`] = `
 <DocumentFragment>
   <header
     aria-label="Room options"
-    class="mx_Flex mx_RoomListHeaderView"
+    class="_flex_4dswl_9 mx_RoomListHeaderView"
     data-testid="room-list-header"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
   >
     <div
-      class="mx_Flex mx_RoomListHeaderView_title"
+      class="_flex_4dswl_9 mx_RoomListHeaderView_title"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
     >
       <h1
@@ -268,16 +292,17 @@ exports[`<RoomListHeaderView /> should render 'room options' button 1`] = `
         aria-expanded="false"
         aria-haspopup="menu"
         aria-label="Open space menu"
-        class="_icon-button_m2erp_8 mx_SpaceMenu_button"
+        class="_icon-button_1pz9o_8 mx_SpaceMenu_button"
+        data-kind="primary"
         data-state="closed"
-        id="radix-«r0»"
+        id="radix-_r_0_"
         role="button"
         style="--cpd-icon-button-size: 20px;"
         tabindex="0"
         type="button"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -296,77 +321,88 @@ exports[`<RoomListHeaderView /> should render 'room options' button 1`] = `
       </button>
     </div>
     <div
-      class="mx_Flex"
+      class="_flex_4dswl_9"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
     >
-      <button
-        aria-disabled="false"
-        aria-expanded="false"
-        aria-haspopup="menu"
-        aria-label="Room Options"
-        aria-labelledby="«r4»"
-        class="_icon-button_m2erp_8"
-        data-state="closed"
-        id="radix-«r2»"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-        type="button"
+      <div
+        class="mx_RoomListHeaderView_ReleaseAnnouncementAnchor"
       >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
+        <button
+          aria-disabled="false"
+          aria-expanded="false"
+          aria-haspopup="menu"
+          aria-label="Room Options"
+          aria-labelledby="_r_4_"
+          class="_icon-button_1pz9o_8"
+          data-kind="primary"
+          data-state="closed"
+          id="radix-_r_2_"
+          role="button"
+          style="--cpd-icon-button-size: 32px;"
+          tabindex="0"
+          type="button"
         >
-          <svg
-            color="var(--cpd-color-icon-secondary)"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
+          <div
+            class="_indicator-icon_147l5_17"
+            style="--cpd-icon-button-size: 100%;"
           >
-            <path
-              d="M5 7a1 1 0 0 0 0 2h14a1 1 0 1 0 0-2zm3 4a1 1 0 1 0 0 2h8a1 1 0 1 0 0-2zm2 5a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-disabled="false"
-        aria-expanded="false"
-        aria-haspopup="menu"
-        aria-label="Add"
-        class="_icon-button_m2erp_8"
-        data-state="closed"
-        id="radix-«r9»"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-        type="button"
+            <svg
+              color="var(--cpd-color-icon-secondary)"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+              />
+            </svg>
+          </div>
+        </button>
+      </div>
+      <div
+        class="mx_RoomListHeaderView_ReleaseAnnouncementAnchor"
       >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
+        <button
+          aria-disabled="false"
+          aria-expanded="false"
+          aria-haspopup="menu"
+          aria-labelledby="_r_b_"
+          class="_icon-button_1pz9o_8"
+          data-kind="primary"
+          data-state="closed"
+          id="radix-_r_9_"
+          role="button"
+          style="--cpd-icon-button-size: 32px;"
+          tabindex="0"
+          type="button"
         >
-          <svg
-            color="var(--cpd-color-icon-secondary)"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
+          <div
+            class="_indicator-icon_147l5_17"
+            style="--cpd-icon-button-size: 100%;"
           >
-            <path
-              clip-rule="evenodd"
-              d="M16.937 2.82a2 2 0 0 1 2.828 0l1.415 1.414a2 2 0 0 1 0 2.829l-7.071 7.07c-.195.196-.42.342-.66.44a1 1 0 0 1-.168.072l-3.993 1.331a1 1 0 0 1-1.265-1.265l1.331-3.992q.03-.09.073-.168m10.338-4.903-6.717 6.718-1.414-1.414 6.717-6.718z"
-              fill-rule="evenodd"
-            />
-            <path
-              d="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
-            />
-          </svg>
-        </div>
-      </button>
+            <svg
+              aria-hidden="true"
+              color="var(--cpd-color-icon-secondary)"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M16.937 2.82a2 2 0 0 1 2.828 0l1.415 1.414a2 2 0 0 1 0 2.829l-7.071 7.07c-.195.196-.42.342-.66.44a1 1 0 0 1-.168.072l-3.993 1.331a1 1 0 0 1-1.265-1.265l1.331-3.992q.03-.09.073-.168m10.338-4.903-6.717 6.718-1.414-1.414 6.717-6.718z"
+                fill-rule="evenodd"
+              />
+              <path
+                d="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
+              />
+            </svg>
+          </div>
+        </button>
+      </div>
     </div>
   </header>
 </DocumentFragment>
@@ -376,12 +412,12 @@ exports[`<RoomListHeaderView /> space menu should display the space menu 1`] = `
 <DocumentFragment>
   <header
     aria-label="Room options"
-    class="mx_Flex mx_RoomListHeaderView"
+    class="_flex_4dswl_9 mx_RoomListHeaderView"
     data-testid="room-list-header"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
   >
     <div
-      class="mx_Flex mx_RoomListHeaderView_title"
+      class="_flex_4dswl_9 mx_RoomListHeaderView_title"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
     >
       <h1
@@ -394,16 +430,17 @@ exports[`<RoomListHeaderView /> space menu should display the space menu 1`] = `
         aria-expanded="false"
         aria-haspopup="menu"
         aria-label="Open space menu"
-        class="_icon-button_m2erp_8 mx_SpaceMenu_button"
+        class="_icon-button_1pz9o_8 mx_SpaceMenu_button"
+        data-kind="primary"
         data-state="closed"
-        id="radix-«r28»"
+        id="radix-_r_36_"
         role="button"
         style="--cpd-icon-button-size: 20px;"
         tabindex="0"
         type="button"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -422,77 +459,88 @@ exports[`<RoomListHeaderView /> space menu should display the space menu 1`] = `
       </button>
     </div>
     <div
-      class="mx_Flex"
+      class="_flex_4dswl_9"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
     >
-      <button
-        aria-disabled="false"
-        aria-expanded="false"
-        aria-haspopup="menu"
-        aria-label="Room Options"
-        aria-labelledby="«r2c»"
-        class="_icon-button_m2erp_8"
-        data-state="closed"
-        id="radix-«r2a»"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-        type="button"
+      <div
+        class="mx_RoomListHeaderView_ReleaseAnnouncementAnchor"
       >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
+        <button
+          aria-disabled="false"
+          aria-expanded="false"
+          aria-haspopup="menu"
+          aria-label="Room Options"
+          aria-labelledby="_r_3a_"
+          class="_icon-button_1pz9o_8"
+          data-kind="primary"
+          data-state="closed"
+          id="radix-_r_38_"
+          role="button"
+          style="--cpd-icon-button-size: 32px;"
+          tabindex="0"
+          type="button"
         >
-          <svg
-            color="var(--cpd-color-icon-secondary)"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
+          <div
+            class="_indicator-icon_147l5_17"
+            style="--cpd-icon-button-size: 100%;"
           >
-            <path
-              d="M5 7a1 1 0 0 0 0 2h14a1 1 0 1 0 0-2zm3 4a1 1 0 1 0 0 2h8a1 1 0 1 0 0-2zm2 5a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-disabled="false"
-        aria-expanded="false"
-        aria-haspopup="menu"
-        aria-label="Add"
-        class="_icon-button_m2erp_8"
-        data-state="closed"
-        id="radix-«r2h»"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-        type="button"
+            <svg
+              color="var(--cpd-color-icon-secondary)"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+              />
+            </svg>
+          </div>
+        </button>
+      </div>
+      <div
+        class="mx_RoomListHeaderView_ReleaseAnnouncementAnchor"
       >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
+        <button
+          aria-disabled="false"
+          aria-expanded="false"
+          aria-haspopup="menu"
+          aria-labelledby="_r_3h_"
+          class="_icon-button_1pz9o_8"
+          data-kind="primary"
+          data-state="closed"
+          id="radix-_r_3f_"
+          role="button"
+          style="--cpd-icon-button-size: 32px;"
+          tabindex="0"
+          type="button"
         >
-          <svg
-            color="var(--cpd-color-icon-secondary)"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
+          <div
+            class="_indicator-icon_147l5_17"
+            style="--cpd-icon-button-size: 100%;"
           >
-            <path
-              clip-rule="evenodd"
-              d="M16.937 2.82a2 2 0 0 1 2.828 0l1.415 1.414a2 2 0 0 1 0 2.829l-7.071 7.07c-.195.196-.42.342-.66.44a1 1 0 0 1-.168.072l-3.993 1.331a1 1 0 0 1-1.265-1.265l1.331-3.992q.03-.09.073-.168m10.338-4.903-6.717 6.718-1.414-1.414 6.717-6.718z"
-              fill-rule="evenodd"
-            />
-            <path
-              d="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
-            />
-          </svg>
-        </div>
-      </button>
+            <svg
+              aria-hidden="true"
+              color="var(--cpd-color-icon-secondary)"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M16.937 2.82a2 2 0 0 1 2.828 0l1.415 1.414a2 2 0 0 1 0 2.829l-7.071 7.07c-.195.196-.42.342-.66.44a1 1 0 0 1-.168.072l-3.993 1.331a1 1 0 0 1-1.265-1.265l1.331-3.992q.03-.09.073-.168m10.338-4.903-6.717 6.718-1.414-1.414 6.717-6.718z"
+                fill-rule="evenodd"
+              />
+              <path
+                d="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
+              />
+            </svg>
+          </div>
+        </button>
+      </div>
     </div>
   </header>
 </DocumentFragment>
@@ -502,12 +550,12 @@ exports[`<RoomListHeaderView /> space menu should not display the space menu 1`]
 <DocumentFragment>
   <header
     aria-label="Room options"
-    class="mx_Flex mx_RoomListHeaderView"
+    class="_flex_4dswl_9 mx_RoomListHeaderView"
     data-testid="room-list-header"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
   >
     <div
-      class="mx_Flex mx_RoomListHeaderView_title"
+      class="_flex_4dswl_9 mx_RoomListHeaderView_title"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
     >
       <h1
@@ -517,77 +565,88 @@ exports[`<RoomListHeaderView /> space menu should not display the space menu 1`]
       </h1>
     </div>
     <div
-      class="mx_Flex"
+      class="_flex_4dswl_9"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
     >
-      <button
-        aria-disabled="false"
-        aria-expanded="false"
-        aria-haspopup="menu"
-        aria-label="Room Options"
-        aria-labelledby="«r2m»"
-        class="_icon-button_m2erp_8"
-        data-state="closed"
-        id="radix-«r2k»"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-        type="button"
+      <div
+        class="mx_RoomListHeaderView_ReleaseAnnouncementAnchor"
       >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
+        <button
+          aria-disabled="false"
+          aria-expanded="false"
+          aria-haspopup="menu"
+          aria-label="Room Options"
+          aria-labelledby="_r_3q_"
+          class="_icon-button_1pz9o_8"
+          data-kind="primary"
+          data-state="closed"
+          id="radix-_r_3o_"
+          role="button"
+          style="--cpd-icon-button-size: 32px;"
+          tabindex="0"
+          type="button"
         >
-          <svg
-            color="var(--cpd-color-icon-secondary)"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
+          <div
+            class="_indicator-icon_147l5_17"
+            style="--cpd-icon-button-size: 100%;"
           >
-            <path
-              d="M5 7a1 1 0 0 0 0 2h14a1 1 0 1 0 0-2zm3 4a1 1 0 1 0 0 2h8a1 1 0 1 0 0-2zm2 5a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1"
-            />
-          </svg>
-        </div>
-      </button>
-      <button
-        aria-disabled="false"
-        aria-expanded="false"
-        aria-haspopup="menu"
-        aria-label="Add"
-        class="_icon-button_m2erp_8"
-        data-state="closed"
-        id="radix-«r2r»"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-        type="button"
+            <svg
+              color="var(--cpd-color-icon-secondary)"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+              />
+            </svg>
+          </div>
+        </button>
+      </div>
+      <div
+        class="mx_RoomListHeaderView_ReleaseAnnouncementAnchor"
       >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
+        <button
+          aria-disabled="false"
+          aria-expanded="false"
+          aria-haspopup="menu"
+          aria-labelledby="_r_41_"
+          class="_icon-button_1pz9o_8"
+          data-kind="primary"
+          data-state="closed"
+          id="radix-_r_3v_"
+          role="button"
+          style="--cpd-icon-button-size: 32px;"
+          tabindex="0"
+          type="button"
         >
-          <svg
-            color="var(--cpd-color-icon-secondary)"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
+          <div
+            class="_indicator-icon_147l5_17"
+            style="--cpd-icon-button-size: 100%;"
           >
-            <path
-              clip-rule="evenodd"
-              d="M16.937 2.82a2 2 0 0 1 2.828 0l1.415 1.414a2 2 0 0 1 0 2.829l-7.071 7.07c-.195.196-.42.342-.66.44a1 1 0 0 1-.168.072l-3.993 1.331a1 1 0 0 1-1.265-1.265l1.331-3.992q.03-.09.073-.168m10.338-4.903-6.717 6.718-1.414-1.414 6.717-6.718z"
-              fill-rule="evenodd"
-            />
-            <path
-              d="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
-            />
-          </svg>
-        </div>
-      </button>
+            <svg
+              aria-hidden="true"
+              color="var(--cpd-color-icon-secondary)"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M16.937 2.82a2 2 0 0 1 2.828 0l1.415 1.414a2 2 0 0 1 0 2.829l-7.071 7.07c-.195.196-.42.342-.66.44a1 1 0 0 1-.168.072l-3.993 1.331a1 1 0 0 1-1.265-1.265l1.331-3.992q.03-.09.073-.168m10.338-4.903-6.717 6.718-1.414-1.414 6.717-6.718z"
+                fill-rule="evenodd"
+              />
+              <path
+                d="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
+              />
+            </svg>
+          </div>
+        </button>
+      </div>
     </div>
   </header>
 </DocumentFragment>
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListItemMenuView-test.tsx.snap b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListItemMenuView-test.tsx.snap
index 7bb17cbd4f..91e687412f 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListItemMenuView-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListItemMenuView-test.tsx.snap
@@ -1,9 +1,9 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<RoomListItemMenuView /> should render the more options menu 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex mx_RoomListItemMenuView"
+    class="_flex_4dswl_9 mx_RoomListItemMenuView"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
   >
     <button
@@ -11,17 +11,18 @@ exports[`<RoomListItemMenuView /> should render the more options menu 1`] = `
       aria-expanded="false"
       aria-haspopup="menu"
       aria-label="More Options"
-      aria-labelledby="«r2»"
-      class="_icon-button_m2erp_8"
+      aria-labelledby="_r_2_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
       data-state="closed"
-      id="radix-«r0»"
+      id="radix-_r_0_"
       role="button"
       style="--cpd-icon-button-size: 24px;"
       tabindex="0"
       type="button"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <svg
@@ -42,17 +43,18 @@ exports[`<RoomListItemMenuView /> should render the more options menu 1`] = `
       aria-expanded="false"
       aria-haspopup="menu"
       aria-label="Notification options"
-      aria-labelledby="«r9»"
-      class="_icon-button_m2erp_8"
+      aria-labelledby="_r_9_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
       data-state="closed"
-      id="radix-«r7»"
+      id="radix-_r_7_"
       role="button"
       style="--cpd-icon-button-size: 24px;"
       tabindex="0"
       type="button"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <svg
@@ -78,7 +80,7 @@ exports[`<RoomListItemMenuView /> should render the more options menu 1`] = `
 exports[`<RoomListItemMenuView /> should render the notification options menu 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex mx_RoomListItemMenuView"
+    class="_flex_4dswl_9 mx_RoomListItemMenuView"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
   >
     <button
@@ -86,17 +88,18 @@ exports[`<RoomListItemMenuView /> should render the notification options menu 1`
       aria-expanded="false"
       aria-haspopup="menu"
       aria-label="More Options"
-      aria-labelledby="«ri»"
-      class="_icon-button_m2erp_8"
+      aria-labelledby="_r_i_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
       data-state="closed"
-      id="radix-«rg»"
+      id="radix-_r_g_"
       role="button"
       style="--cpd-icon-button-size: 24px;"
       tabindex="0"
       type="button"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <svg
@@ -117,17 +120,18 @@ exports[`<RoomListItemMenuView /> should render the notification options menu 1`
       aria-expanded="false"
       aria-haspopup="menu"
       aria-label="Notification options"
-      aria-labelledby="«rp»"
-      class="_icon-button_m2erp_8"
+      aria-labelledby="_r_p_"
+      class="_icon-button_1pz9o_8"
+      data-kind="primary"
       data-state="closed"
-      id="radix-«rn»"
+      id="radix-_r_n_"
       role="button"
       style="--cpd-icon-button-size: 24px;"
       tabindex="0"
       type="button"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <svg
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListItemView-test.tsx.snap b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListItemView-test.tsx.snap
index 4340cb4200..f46588370f 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListItemView-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListItemView-test.tsx.snap
@@ -1,53 +1,49 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<RoomListItemView /> should be selected if isSelected=true 1`] = `
 <DocumentFragment>
   <button
     aria-label="Open room room1"
+    aria-posinset="1"
     aria-selected="true"
-    class="mx_RoomListItemView mx_RoomListItemView_selected"
+    aria-setsize="1"
+    class="_flex_4dswl_9 mx_RoomListItemView mx_RoomListItemView_selected"
+    role="option"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
     tabindex="-1"
     type="button"
   >
-    <div
-      class="mx_Flex mx_RoomListItemView_container"
-      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+    <span
+      aria-label="Avatar"
+      class="_avatar_zysgz_8 mx_BaseAvatar"
+      data-color="3"
+      data-testid="avatar-img"
+      data-type="round"
+      style="--cpd-avatar-size: 32px;"
     >
-      <span
-        aria-label="Avatar"
-        class="_avatar_1qbcf_8 mx_BaseAvatar"
-        data-color="3"
-        data-testid="avatar-img"
+      <img
+        alt=""
+        class="_image_zysgz_43"
         data-type="round"
-        style="--cpd-avatar-size: 32px;"
-      >
-        <img
-          alt=""
-          class="_image_1qbcf_41"
-          data-type="round"
-          height="32px"
-          loading="lazy"
-          referrerpolicy="no-referrer"
-          src="http://this.is.a.url/avatar.url/room.png"
-          width="32px"
-        />
-      </span>
+        height="32px"
+        loading="lazy"
+        referrerpolicy="no-referrer"
+        src="http://this.is.a.url/avatar.url/room.png"
+        width="32px"
+      />
+    </span>
+    <div
+      class="_flex_4dswl_9 mx_RoomListItemView_content"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+    >
       <div
-        class="mx_Flex mx_RoomListItemView_content"
-        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+        class="mx_RoomListItemView_text"
       >
         <div
-          class="mx_RoomListItemView_text"
+          class="mx_RoomListItemView_roomName"
+          title="room1"
         >
-          <div
-            class="mx_RoomListItemView_roomName"
-            title="room1"
-          >
-            room1
-          </div>
-          <div
-            class="mx_RoomListItemView_messagePreview"
-          />
+          room1
         </div>
       </div>
     </div>
@@ -59,63 +55,70 @@ exports[`<RoomListItemView /> should display notification decoration 1`] = `
 <DocumentFragment>
   <button
     aria-label="Open room room1"
+    aria-posinset="1"
     aria-selected="false"
-    class="mx_RoomListItemView"
+    aria-setsize="1"
+    class="_flex_4dswl_9 mx_RoomListItemView"
+    role="option"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
     tabindex="-1"
     type="button"
   >
-    <div
-      class="mx_Flex mx_RoomListItemView_container"
-      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+    <span
+      aria-label="Avatar"
+      class="_avatar_zysgz_8 mx_BaseAvatar"
+      data-color="3"
+      data-testid="avatar-img"
+      data-type="round"
+      style="--cpd-avatar-size: 32px;"
     >
-      <span
-        aria-label="Avatar"
-        class="_avatar_1qbcf_8 mx_BaseAvatar"
-        data-color="3"
-        data-testid="avatar-img"
+      <img
+        alt=""
+        class="_image_zysgz_43"
         data-type="round"
-        style="--cpd-avatar-size: 32px;"
-      >
-        <img
-          alt=""
-          class="_image_1qbcf_41"
-          data-type="round"
-          height="32px"
-          loading="lazy"
-          referrerpolicy="no-referrer"
-          src="http://this.is.a.url/avatar.url/room.png"
-          width="32px"
-        />
-      </span>
+        height="32px"
+        loading="lazy"
+        referrerpolicy="no-referrer"
+        src="http://this.is.a.url/avatar.url/room.png"
+        width="32px"
+      />
+    </span>
+    <div
+      class="_flex_4dswl_9 mx_RoomListItemView_content"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+    >
       <div
-        class="mx_Flex mx_RoomListItemView_content"
-        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+        class="mx_RoomListItemView_text"
       >
         <div
-          class="mx_RoomListItemView_text"
+          class="mx_RoomListItemView_roomName"
+          title="room1"
         >
-          <div
-            class="mx_RoomListItemView_roomName"
-            title="room1"
-          >
-            room1
-          </div>
-          <div
-            class="mx_RoomListItemView_messagePreview"
+          room1
+        </div>
+      </div>
+      <div
+        aria-hidden="true"
+        class="_flex_4dswl_9 mx_RoomListItemView_notificationDecoration"
+        data-testid="notification-decoration"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+      >
+        <svg
+          fill="var(--cpd-color-icon-accent-primary)"
+          height="20px"
+          viewBox="0 0 24 24"
+          width="20px"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M6 4h10a2 2 0 0 1 2 2v4.286l3.35-2.871a1 1 0 0 1 1.65.76v7.65a1 1 0 0 1-1.65.76L18 13.715V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4"
           />
-        </div>
-        <div
-          aria-hidden="true"
-          class="mx_Flex"
-          data-testid="notification-decoration"
-          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+        </svg>
+        <span
+          class="_unread-counter_1147r_8"
         >
-          <span
-            class="_unread-counter_9mg0k_8"
-          >
-            1
-          </span>
-        </div>
+          1
+        </span>
       </div>
     </div>
   </button>
@@ -126,50 +129,46 @@ exports[`<RoomListItemView /> should render a room item 1`] = `
 <DocumentFragment>
   <button
     aria-label="Open room room1"
+    aria-posinset="1"
     aria-selected="false"
-    class="mx_RoomListItemView"
+    aria-setsize="0"
+    class="_flex_4dswl_9 mx_RoomListItemView"
+    role="option"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
     tabindex="-1"
     type="button"
   >
-    <div
-      class="mx_Flex mx_RoomListItemView_container"
-      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+    <span
+      aria-label="Avatar"
+      class="_avatar_zysgz_8 mx_BaseAvatar"
+      data-color="3"
+      data-testid="avatar-img"
+      data-type="round"
+      style="--cpd-avatar-size: 32px;"
     >
-      <span
-        aria-label="Avatar"
-        class="_avatar_1qbcf_8 mx_BaseAvatar"
-        data-color="3"
-        data-testid="avatar-img"
+      <img
+        alt=""
+        class="_image_zysgz_43"
         data-type="round"
-        style="--cpd-avatar-size: 32px;"
-      >
-        <img
-          alt=""
-          class="_image_1qbcf_41"
-          data-type="round"
-          height="32px"
-          loading="lazy"
-          referrerpolicy="no-referrer"
-          src="http://this.is.a.url/avatar.url/room.png"
-          width="32px"
-        />
-      </span>
+        height="32px"
+        loading="lazy"
+        referrerpolicy="no-referrer"
+        src="http://this.is.a.url/avatar.url/room.png"
+        width="32px"
+      />
+    </span>
+    <div
+      class="_flex_4dswl_9 mx_RoomListItemView_content"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+    >
       <div
-        class="mx_Flex mx_RoomListItemView_content"
-        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+        class="mx_RoomListItemView_text"
       >
         <div
-          class="mx_RoomListItemView_text"
+          class="mx_RoomListItemView_roomName"
+          title="room1"
         >
-          <div
-            class="mx_RoomListItemView_roomName"
-            title="room1"
-          >
-            room1
-          </div>
-          <div
-            class="mx_RoomListItemView_messagePreview"
-          />
+          room1
         </div>
       </div>
     </div>
@@ -181,52 +180,52 @@ exports[`<RoomListItemView /> should render a room item with a message preview 1
 <DocumentFragment>
   <button
     aria-label="Open room room1"
+    aria-posinset="1"
     aria-selected="false"
-    class="mx_RoomListItemView"
+    aria-setsize="1"
+    class="_flex_4dswl_9 mx_RoomListItemView"
+    role="option"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
     tabindex="-1"
     type="button"
   >
-    <div
-      class="mx_Flex mx_RoomListItemView_container"
-      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
+    <span
+      aria-label="Avatar"
+      class="_avatar_zysgz_8 mx_BaseAvatar"
+      data-color="3"
+      data-testid="avatar-img"
+      data-type="round"
+      style="--cpd-avatar-size: 32px;"
     >
-      <span
-        aria-label="Avatar"
-        class="_avatar_1qbcf_8 mx_BaseAvatar"
-        data-color="3"
-        data-testid="avatar-img"
+      <img
+        alt=""
+        class="_image_zysgz_43"
         data-type="round"
-        style="--cpd-avatar-size: 32px;"
-      >
-        <img
-          alt=""
-          class="_image_1qbcf_41"
-          data-type="round"
-          height="32px"
-          loading="lazy"
-          referrerpolicy="no-referrer"
-          src="http://this.is.a.url/avatar.url/room.png"
-          width="32px"
-        />
-      </span>
+        height="32px"
+        loading="lazy"
+        referrerpolicy="no-referrer"
+        src="http://this.is.a.url/avatar.url/room.png"
+        width="32px"
+      />
+    </span>
+    <div
+      class="_flex_4dswl_9 mx_RoomListItemView_content"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+    >
       <div
-        class="mx_Flex mx_RoomListItemView_content"
-        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
+        class="mx_RoomListItemView_text"
       >
         <div
-          class="mx_RoomListItemView_text"
+          class="mx_RoomListItemView_roomName"
+          title="room1"
         >
-          <div
-            class="mx_RoomListItemView_roomName"
-            title="room1"
-          >
-            room1
-          </div>
-          <div
-            class="mx_RoomListItemView_messagePreview"
-          >
-            The message looks list this
-          </div>
+          room1
+        </div>
+        <div
+          class="mx_RoomListItemView_messagePreview"
+          title="The message looks like this"
+        >
+          The message looks like this
         </div>
       </div>
     </div>
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListOptionsMenu-test.tsx.snap b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListOptionsMenu-test.tsx.snap
index aafcede2ad..574fcbd094 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListOptionsMenu-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListOptionsMenu-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<RoomListOptionsMenu /> should match snapshot 1`] = `
 <DocumentFragment>
@@ -7,17 +7,18 @@ exports[`<RoomListOptionsMenu /> should match snapshot 1`] = `
     aria-expanded="false"
     aria-haspopup="menu"
     aria-label="Room Options"
-    aria-labelledby="«r2»"
-    class="_icon-button_m2erp_8"
+    aria-labelledby="_r_2_"
+    class="_icon-button_1pz9o_8"
+    data-kind="primary"
     data-state="closed"
-    id="radix-«r0»"
+    id="radix-_r_0_"
     role="button"
     style="--cpd-icon-button-size: 32px;"
     tabindex="0"
     type="button"
   >
     <div
-      class="_indicator-icon_zr2a0_17"
+      class="_indicator-icon_147l5_17"
       style="--cpd-icon-button-size: 100%;"
     >
       <svg
@@ -29,7 +30,7 @@ exports[`<RoomListOptionsMenu /> should match snapshot 1`] = `
         xmlns="http://www.w3.org/2000/svg"
       >
         <path
-          d="M5 7a1 1 0 0 0 0 2h14a1 1 0 1 0 0-2zm3 4a1 1 0 1 0 0 2h8a1 1 0 1 0 0-2zm2 5a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1"
+          d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
         />
       </svg>
     </div>
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListPanel-test.tsx.snap b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListPanel-test.tsx.snap
deleted file mode 100644
index 1cfb170829..0000000000
--- a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListPanel-test.tsx.snap
+++ /dev/null
@@ -1,433 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<RoomListPanel /> should not render the RoomListSearch component when UIComponent.FilterContainer is at false 1`] = `
-<DocumentFragment>
-  <section
-    class="mx_Flex mx_RoomListPanel"
-    data-testid="room-list-panel"
-    style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: stretch; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-  >
-    <header
-      aria-label="Room options"
-      class="mx_Flex mx_RoomListHeaderView"
-      data-testid="room-list-header"
-      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-    >
-      <div
-        class="mx_Flex mx_RoomListHeaderView_title"
-        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
-      >
-        <h1
-          title="Home"
-        >
-          Home
-        </h1>
-      </div>
-      <div
-        class="mx_Flex"
-        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
-      >
-        <button
-          aria-disabled="false"
-          aria-expanded="false"
-          aria-haspopup="menu"
-          aria-label="Room Options"
-          aria-labelledby="«rc»"
-          class="_icon-button_m2erp_8"
-          data-state="closed"
-          id="radix-«ra»"
-          role="button"
-          style="--cpd-icon-button-size: 32px;"
-          tabindex="0"
-          type="button"
-        >
-          <div
-            class="_indicator-icon_zr2a0_17"
-            style="--cpd-icon-button-size: 100%;"
-          >
-            <svg
-              color="var(--cpd-color-icon-secondary)"
-              fill="currentColor"
-              height="1em"
-              viewBox="0 0 24 24"
-              width="1em"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M5 7a1 1 0 0 0 0 2h14a1 1 0 1 0 0-2zm3 4a1 1 0 1 0 0 2h8a1 1 0 1 0 0-2zm2 5a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1"
-              />
-            </svg>
-          </div>
-        </button>
-        <button
-          aria-label="New message"
-          class="_icon-button_m2erp_8"
-          role="button"
-          style="--cpd-icon-button-size: 32px;"
-          tabindex="0"
-        >
-          <div
-            class="_indicator-icon_zr2a0_17"
-            style="--cpd-icon-button-size: 100%;"
-          >
-            <svg
-              color="var(--cpd-color-icon-secondary)"
-              fill="currentColor"
-              height="1em"
-              viewBox="0 0 24 24"
-              width="1em"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                clip-rule="evenodd"
-                d="M16.937 2.82a2 2 0 0 1 2.828 0l1.415 1.414a2 2 0 0 1 0 2.829l-7.071 7.07c-.195.196-.42.342-.66.44a1 1 0 0 1-.168.072l-3.993 1.331a1 1 0 0 1-1.265-1.265l1.331-3.992q.03-.09.073-.168m10.338-4.903-6.717 6.718-1.414-1.414 6.717-6.718z"
-                fill-rule="evenodd"
-              />
-              <path
-                d="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
-              />
-            </svg>
-          </div>
-        </button>
-      </div>
-    </header>
-    <ul
-      aria-label="Room list filters"
-      class="mx_Flex mx_RoomListPrimaryFilters"
-      role="listbox"
-      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: wrap;"
-    >
-      <li
-        aria-selected="false"
-        role="option"
-      >
-        <button
-          aria-selected="false"
-          class="_chat-filter_5qdp0_8"
-          role="button"
-          tabindex="0"
-        >
-          Unreads
-        </button>
-      </li>
-      <li
-        aria-selected="false"
-        role="option"
-      >
-        <button
-          aria-selected="false"
-          class="_chat-filter_5qdp0_8"
-          role="button"
-          tabindex="0"
-        >
-          People
-        </button>
-      </li>
-      <li
-        aria-selected="false"
-        role="option"
-      >
-        <button
-          aria-selected="false"
-          class="_chat-filter_5qdp0_8"
-          role="button"
-          tabindex="0"
-        >
-          Rooms
-        </button>
-      </li>
-      <li
-        aria-selected="false"
-        role="option"
-      >
-        <button
-          aria-selected="false"
-          class="_chat-filter_5qdp0_8"
-          role="button"
-          tabindex="0"
-        >
-          Mentions
-        </button>
-      </li>
-      <li
-        aria-selected="false"
-        role="option"
-      >
-        <button
-          aria-selected="false"
-          class="_chat-filter_5qdp0_8"
-          role="button"
-          tabindex="0"
-        >
-          Invites
-        </button>
-      </li>
-      <li
-        aria-selected="false"
-        role="option"
-      >
-        <button
-          aria-selected="false"
-          class="_chat-filter_5qdp0_8"
-          role="button"
-          tabindex="0"
-        >
-          Favourites
-        </button>
-      </li>
-    </ul>
-    <div
-      class="mx_RoomListSkeleton"
-    />
-  </section>
-</DocumentFragment>
-`;
-
-exports[`<RoomListPanel /> should render the RoomListSearch component when UIComponent.FilterContainer is at true 1`] = `
-<DocumentFragment>
-  <section
-    class="mx_Flex mx_RoomListPanel"
-    data-testid="room-list-panel"
-    style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: stretch; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-  >
-    <div
-      class="mx_Flex mx_RoomListSearch"
-      role="search"
-      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
-    >
-      <button
-        class="_button_vczzf_8 mx_RoomListSearch_search _has-icon_vczzf_57"
-        data-kind="secondary"
-        data-size="sm"
-        role="button"
-        tabindex="0"
-      >
-        <svg
-          aria-hidden="true"
-          fill="currentColor"
-          height="20"
-          viewBox="0 0 24 24"
-          width="20"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M15.05 16.463a7.5 7.5 0 1 1 1.414-1.414l3.243 3.244a1 1 0 0 1-1.414 1.414zM16 10.5a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0"
-          />
-        </svg>
-        <span
-          class="mx_Flex"
-          style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: space-between; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-        >
-          <span
-            class="mx_RoomListSearch_search_text"
-          >
-            Search
-          </span>
-          <kbd>
-            Ctrl K
-          </kbd>
-        </span>
-      </button>
-      <button
-        aria-label="Explore rooms"
-        class="_button_vczzf_8 mx_RoomListSearch_button _has-icon_vczzf_57 _icon-only_vczzf_50"
-        data-kind="secondary"
-        data-size="sm"
-        role="button"
-        tabindex="0"
-      >
-        <svg
-          aria-hidden="true"
-          fill="currentColor"
-          height="20"
-          viewBox="0 0 24 24"
-          width="20"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M12 13a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 12q0-.424.287-.713A.97.97 0 0 1 12 11q.424 0 .713.287.287.288.287.713 0 .424-.287.713A.97.97 0 0 1 12 13m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22m0-2q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4 6.325 6.325 4 12t2.325 5.675T12 20m0 0q-3.35 0-5.675-2.325T4 12t2.325-5.675T12 4t5.675 2.325T20 12t-2.325 5.675T12 20m1.675-5.85q.15-.075.275-.2t.2-.275l2.925-6.25q.125-.25-.062-.437-.188-.188-.438-.063l-6.25 2.925q-.15.075-.275.2t-.2.275l-2.925 6.25q-.125.25.063.438.186.186.437.062z"
-          />
-        </svg>
-      </button>
-    </div>
-    <header
-      aria-label="Room options"
-      class="mx_Flex mx_RoomListHeaderView"
-      data-testid="room-list-header"
-      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-    >
-      <div
-        class="mx_Flex mx_RoomListHeaderView_title"
-        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
-      >
-        <h1
-          title="Home"
-        >
-          Home
-        </h1>
-      </div>
-      <div
-        class="mx_Flex"
-        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
-      >
-        <button
-          aria-disabled="false"
-          aria-expanded="false"
-          aria-haspopup="menu"
-          aria-label="Room Options"
-          aria-labelledby="«r2»"
-          class="_icon-button_m2erp_8"
-          data-state="closed"
-          id="radix-«r0»"
-          role="button"
-          style="--cpd-icon-button-size: 32px;"
-          tabindex="0"
-          type="button"
-        >
-          <div
-            class="_indicator-icon_zr2a0_17"
-            style="--cpd-icon-button-size: 100%;"
-          >
-            <svg
-              color="var(--cpd-color-icon-secondary)"
-              fill="currentColor"
-              height="1em"
-              viewBox="0 0 24 24"
-              width="1em"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M5 7a1 1 0 0 0 0 2h14a1 1 0 1 0 0-2zm3 4a1 1 0 1 0 0 2h8a1 1 0 1 0 0-2zm2 5a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1"
-              />
-            </svg>
-          </div>
-        </button>
-        <button
-          aria-disabled="false"
-          aria-expanded="false"
-          aria-haspopup="menu"
-          aria-label="Add"
-          class="_icon-button_m2erp_8"
-          data-state="closed"
-          id="radix-«r7»"
-          role="button"
-          style="--cpd-icon-button-size: 32px;"
-          tabindex="0"
-          type="button"
-        >
-          <div
-            class="_indicator-icon_zr2a0_17"
-            style="--cpd-icon-button-size: 100%;"
-          >
-            <svg
-              color="var(--cpd-color-icon-secondary)"
-              fill="currentColor"
-              height="1em"
-              viewBox="0 0 24 24"
-              width="1em"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                clip-rule="evenodd"
-                d="M16.937 2.82a2 2 0 0 1 2.828 0l1.415 1.414a2 2 0 0 1 0 2.829l-7.071 7.07c-.195.196-.42.342-.66.44a1 1 0 0 1-.168.072l-3.993 1.331a1 1 0 0 1-1.265-1.265l1.331-3.992q.03-.09.073-.168m10.338-4.903-6.717 6.718-1.414-1.414 6.717-6.718z"
-                fill-rule="evenodd"
-              />
-              <path
-                d="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
-              />
-            </svg>
-          </div>
-        </button>
-      </div>
-    </header>
-    <ul
-      aria-label="Room list filters"
-      class="mx_Flex mx_RoomListPrimaryFilters"
-      role="listbox"
-      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: wrap;"
-    >
-      <li
-        aria-selected="false"
-        role="option"
-      >
-        <button
-          aria-selected="false"
-          class="_chat-filter_5qdp0_8"
-          role="button"
-          tabindex="0"
-        >
-          Unreads
-        </button>
-      </li>
-      <li
-        aria-selected="false"
-        role="option"
-      >
-        <button
-          aria-selected="false"
-          class="_chat-filter_5qdp0_8"
-          role="button"
-          tabindex="0"
-        >
-          People
-        </button>
-      </li>
-      <li
-        aria-selected="false"
-        role="option"
-      >
-        <button
-          aria-selected="false"
-          class="_chat-filter_5qdp0_8"
-          role="button"
-          tabindex="0"
-        >
-          Rooms
-        </button>
-      </li>
-      <li
-        aria-selected="false"
-        role="option"
-      >
-        <button
-          aria-selected="false"
-          class="_chat-filter_5qdp0_8"
-          role="button"
-          tabindex="0"
-        >
-          Mentions
-        </button>
-      </li>
-      <li
-        aria-selected="false"
-        role="option"
-      >
-        <button
-          aria-selected="false"
-          class="_chat-filter_5qdp0_8"
-          role="button"
-          tabindex="0"
-        >
-          Invites
-        </button>
-      </li>
-      <li
-        aria-selected="false"
-        role="option"
-      >
-        <button
-          aria-selected="false"
-          class="_chat-filter_5qdp0_8"
-          role="button"
-          tabindex="0"
-        >
-          Favourites
-        </button>
-      </li>
-    </ul>
-    <div
-      class="mx_RoomListSkeleton"
-    />
-  </section>
-</DocumentFragment>
-`;
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListPrimaryFilters-test.tsx.snap b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListPrimaryFilters-test.tsx.snap
index 6c705944b8..ec71f70c95 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListPrimaryFilters-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListPrimaryFilters-test.tsx.snap
@@ -1,39 +1,47 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
-exports[`<RoomListPrimaryFilters /> should render primary filters 1`] = `
+exports[`<RoomListPrimaryFilters /> should renders all filters correctly 1`] = `
 <DocumentFragment>
-  <ul
-    aria-label="Room list filters"
-    class="mx_Flex mx_RoomListPrimaryFilters"
-    role="listbox"
-    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: wrap;"
+  <div
+    class="_flex_4dswl_9 mx_RoomListPrimaryFilters"
+    data-testid="primary-filters"
+    style="--mx-flex-display: flex; --mx-flex-direction: row-reverse; --mx-flex-align: start; --mx-flex-justify: space-between; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
   >
-    <li
-      aria-selected="false"
-      role="option"
+    <div
+      aria-label="Room list filters"
+      class="_flex_4dswl_9 mx_RoomListPrimaryFilters_list"
+      id="_r_0_"
+      role="listbox"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: wrap;"
     >
       <button
-        aria-selected="false"
+        aria-hidden="false"
+        aria-selected="true"
         class="_chat-filter_5qdp0_8"
-        role="button"
+        role="option"
         tabindex="0"
       >
         People
       </button>
-    </li>
-    <li
-      aria-selected="true"
-      role="option"
-    >
       <button
-        aria-selected="true"
+        aria-hidden="false"
+        aria-selected="false"
         class="_chat-filter_5qdp0_8"
-        role="button"
+        role="option"
         tabindex="0"
       >
         Rooms
       </button>
-    </li>
-  </ul>
+      <button
+        aria-hidden="false"
+        aria-selected="false"
+        class="_chat-filter_5qdp0_8"
+        role="option"
+        tabindex="0"
+      >
+        Unreads
+      </button>
+    </div>
+  </div>
 </DocumentFragment>
 `;
diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListSearch-test.tsx.snap b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListSearch-test.tsx.snap
index e52842ba3a..24377d678f 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListSearch-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListSearch-test.tsx.snap
@@ -1,16 +1,18 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
-exports[`<RoomListSearch /> should display search and explore buttons 1`] = `
+exports[`<RoomListSearch /> renders 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex mx_RoomListSearch"
+    class="_flex_4dswl_9 _view_z7ks9_8"
+    data-testid="room-list-search"
     role="search"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
   >
     <button
-      class="_button_vczzf_8 mx_RoomListSearch_search _has-icon_vczzf_57"
+      class="_button_187yx_8 _search_z7ks9_16 _has-icon_187yx_57"
       data-kind="secondary"
       data-size="sm"
+      id="room-list-search-button"
       role="button"
       tabindex="0"
     >
@@ -27,206 +29,11 @@ exports[`<RoomListSearch /> should display search and explore buttons 1`] = `
         />
       </svg>
       <span
-        class="mx_Flex"
+        class="_flex_4dswl_9 _search_container_z7ks9_29"
         style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: space-between; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
       >
         <span
-          class="mx_RoomListSearch_search_text"
-        >
-          Search
-        </span>
-        <kbd>
-          Ctrl K
-        </kbd>
-      </span>
-    </button>
-    <button
-      aria-label="Explore rooms"
-      class="_button_vczzf_8 mx_RoomListSearch_button _has-icon_vczzf_57 _icon-only_vczzf_50"
-      data-kind="secondary"
-      data-size="sm"
-      role="button"
-      tabindex="0"
-    >
-      <svg
-        aria-hidden="true"
-        fill="currentColor"
-        height="20"
-        viewBox="0 0 24 24"
-        width="20"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M12 13a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 12q0-.424.287-.713A.97.97 0 0 1 12 11q.424 0 .713.287.287.288.287.713 0 .424-.287.713A.97.97 0 0 1 12 13m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22m0-2q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4 6.325 6.325 4 12t2.325 5.675T12 20m0 0q-3.35 0-5.675-2.325T4 12t2.325-5.675T12 4t5.675 2.325T20 12t-2.325 5.675T12 20m1.675-5.85q.15-.075.275-.2t.2-.275l2.925-6.25q.125-.25-.062-.437-.188-.188-.438-.063l-6.25 2.925q-.15.075-.275.2t-.2.275l-2.925 6.25q-.125.25.063.438.186.186.437.062z"
-        />
-      </svg>
-    </button>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`<RoomListSearch /> should display the dial button when the PTSN protocol is not supported 1`] = `
-<DocumentFragment>
-  <div
-    class="mx_Flex mx_RoomListSearch"
-    role="search"
-    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
-  >
-    <button
-      class="_button_vczzf_8 mx_RoomListSearch_search _has-icon_vczzf_57"
-      data-kind="secondary"
-      data-size="sm"
-      role="button"
-      tabindex="0"
-    >
-      <svg
-        aria-hidden="true"
-        fill="currentColor"
-        height="20"
-        viewBox="0 0 24 24"
-        width="20"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M15.05 16.463a7.5 7.5 0 1 1 1.414-1.414l3.243 3.244a1 1 0 0 1-1.414 1.414zM16 10.5a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0"
-        />
-      </svg>
-      <span
-        class="mx_Flex"
-        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: space-between; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-      >
-        <span
-          class="mx_RoomListSearch_search_text"
-        >
-          Search
-        </span>
-        <kbd>
-          Ctrl K
-        </kbd>
-      </span>
-    </button>
-    <button
-      aria-label="Open dial pad"
-      class="_button_vczzf_8 mx_RoomListSearch_button _has-icon_vczzf_57 _icon-only_vczzf_50"
-      data-kind="secondary"
-      data-size="sm"
-      role="button"
-      tabindex="0"
-    >
-      <svg
-        aria-hidden="true"
-        fill="currentColor"
-        height="20"
-        viewBox="0 0 24 24"
-        width="20"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M12 18.6c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8M6.6 2.4c-.99 0-1.8.81-1.8 1.8S5.61 6 6.6 6s1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m0 5.4c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m0 5.4c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8M17.4 6c.99 0 1.8-.81 1.8-1.8s-.81-1.8-1.8-1.8-1.8.81-1.8 1.8.81 1.8 1.8 1.8M12 13.2c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m5.4 0c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m0-5.4c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m-5.4 0c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m0-5.4c-.99 0-1.8.81-1.8 1.8S11.01 6 12 6s1.8-.81 1.8-1.8-.81-1.8-1.8-1.8"
-        />
-      </svg>
-    </button>
-    <button
-      aria-label="Explore rooms"
-      class="_button_vczzf_8 mx_RoomListSearch_button _has-icon_vczzf_57 _icon-only_vczzf_50"
-      data-kind="secondary"
-      data-size="sm"
-      role="button"
-      tabindex="0"
-    >
-      <svg
-        aria-hidden="true"
-        fill="currentColor"
-        height="20"
-        viewBox="0 0 24 24"
-        width="20"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M12 13a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 12q0-.424.287-.713A.97.97 0 0 1 12 11q.424 0 .713.287.287.288.287.713 0 .424-.287.713A.97.97 0 0 1 12 13m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22m0-2q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4 6.325 6.325 4 12t2.325 5.675T12 20m0 0q-3.35 0-5.675-2.325T4 12t2.325-5.675T12 4t5.675 2.325T20 12t-2.325 5.675T12 20m1.675-5.85q.15-.075.275-.2t.2-.275l2.925-6.25q.125-.25-.062-.437-.188-.188-.438-.063l-6.25 2.925q-.15.075-.275.2t-.2.275l-2.925 6.25q-.125.25.063.438.186.186.437.062z"
-        />
-      </svg>
-    </button>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`<RoomListSearch /> should hide the explore button when UIComponent.ExploreRooms is disabled 1`] = `
-<DocumentFragment>
-  <div
-    class="mx_Flex mx_RoomListSearch"
-    role="search"
-    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
-  >
-    <button
-      class="_button_vczzf_8 mx_RoomListSearch_search _has-icon_vczzf_57"
-      data-kind="secondary"
-      data-size="sm"
-      role="button"
-      tabindex="0"
-    >
-      <svg
-        aria-hidden="true"
-        fill="currentColor"
-        height="20"
-        viewBox="0 0 24 24"
-        width="20"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M15.05 16.463a7.5 7.5 0 1 1 1.414-1.414l3.243 3.244a1 1 0 0 1-1.414 1.414zM16 10.5a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0"
-        />
-      </svg>
-      <span
-        class="mx_Flex"
-        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: space-between; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-      >
-        <span
-          class="mx_RoomListSearch_search_text"
-        >
-          Search
-        </span>
-        <kbd>
-          Ctrl K
-        </kbd>
-      </span>
-    </button>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`<RoomListSearch /> should hide the explore button when the active space is not MetaSpace.Home 1`] = `
-<DocumentFragment>
-  <div
-    class="mx_Flex mx_RoomListSearch"
-    role="search"
-    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
-  >
-    <button
-      class="_button_vczzf_8 mx_RoomListSearch_search _has-icon_vczzf_57"
-      data-kind="secondary"
-      data-size="sm"
-      role="button"
-      tabindex="0"
-    >
-      <svg
-        aria-hidden="true"
-        fill="currentColor"
-        height="20"
-        viewBox="0 0 24 24"
-        width="20"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M15.05 16.463a7.5 7.5 0 1 1 1.414-1.414l3.243 3.244a1 1 0 0 1-1.414 1.414zM16 10.5a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0"
-        />
-      </svg>
-      <span
-        class="mx_Flex"
-        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: space-between; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
-      >
-        <span
-          class="mx_RoomListSearch_search_text"
+          class="_search_text_z7ks9_41"
         >
           Search
         </span>
diff --git a/test/unit-tests/components/views/rooms/RoomPreviewBar-test.tsx b/test/unit-tests/components/views/rooms/RoomPreviewBar-test.tsx
index fb6691af78..5ee9d51cbb 100644
--- a/test/unit-tests/components/views/rooms/RoomPreviewBar-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomPreviewBar-test.tsx
@@ -16,6 +16,7 @@ import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
 import DMRoomMap from "../../../../../src/utils/DMRoomMap";
 import RoomPreviewBar from "../../../../../src/components/views/rooms/RoomPreviewBar";
 import defaultDispatcher from "../../../../../src/dispatcher/dispatcher";
+import { ModuleApi } from "../../../../../src/modules/Api.ts";
 
 jest.mock("../../../../../src/IdentityAuthClient", () => {
     return jest.fn().mockImplementation(() => {
@@ -497,4 +498,12 @@ describe("<RoomPreviewBar />", () => {
             expect(onCancelAskToJoin).toHaveBeenCalled();
         });
     });
+
+    it("should render Module roomPreviewBarRenderer if specified", () => {
+        jest.spyOn(ModuleApi.instance.customComponents, "roomPreviewBarRenderer", "get").mockReturnValue(() => (
+            <>Test component</>
+        ));
+        const { getByText } = render(<RoomPreviewBar />);
+        expect(getByText("Test component")).toBeTruthy();
+    });
 });
diff --git a/test/unit-tests/components/views/rooms/RoomTile-test.tsx b/test/unit-tests/components/views/rooms/RoomTile-test.tsx
index 68b47a037a..f093840f1a 100644
--- a/test/unit-tests/components/views/rooms/RoomTile-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomTile-test.tsx
@@ -20,7 +20,6 @@ import {
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { Widget } from "matrix-widget-api";
 
-import type { ClientWidgetApi } from "matrix-widget-api";
 import {
     stubClient,
     mkRoomMember,
@@ -46,6 +45,8 @@ import { UIComponent } from "../../../../../src/settings/UIFeature";
 import { MessagePreviewStore } from "../../../../../src/stores/room-list/MessagePreviewStore";
 import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
 import SettingsStore from "../../../../../src/settings/SettingsStore";
+import { ConnectionState } from "../../../../../src/models/Call";
+import { type WidgetMessaging } from "../../../../../src/stores/widgets/WidgetMessaging";
 
 jest.mock("../../../../../src/customisations/helpers/UIComponents", () => ({
     shouldShowComponent: jest.fn(),
@@ -203,7 +204,7 @@ describe("RoomTile", () => {
                 widget = new Widget(call.widget);
                 WidgetMessagingStore.instance.storeMessaging(widget, room.roomId, {
                     stop: () => {},
-                } as unknown as ClientWidgetApi);
+                } as unknown as WidgetMessaging);
             });
 
             afterEach(() => {
@@ -215,7 +216,7 @@ describe("RoomTile", () => {
             it("tracks connection state", async () => {
                 renderRoomTile();
                 screen.getByText("Video");
-                await act(() => call.start());
+                act(() => call.setConnectionState(ConnectionState.Connected));
                 screen.getByText("Joined");
                 await act(() => call.disconnect());
                 screen.getByText("Video");
diff --git a/test/unit-tests/components/views/rooms/SendMessageComposer-test.tsx b/test/unit-tests/components/views/rooms/SendMessageComposer-test.tsx
index 412065353d..fcc215a73f 100644
--- a/test/unit-tests/components/views/rooms/SendMessageComposer-test.tsx
+++ b/test/unit-tests/components/views/rooms/SendMessageComposer-test.tsx
@@ -8,17 +8,16 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import { fireEvent, render, waitFor } from "jest-matrix-react";
-import { type IContent, type MatrixClient, MsgType } from "matrix-js-sdk/src/matrix";
+import { type MatrixClient, MsgType } from "matrix-js-sdk/src/matrix";
 import { mocked } from "jest-mock";
 import userEvent from "@testing-library/user-event";
 
 import SendMessageComposer, {
-    attachMentions,
     createMessageContent,
     isQuickReaction,
 } from "../../../../../src/components/views/rooms/SendMessageComposer";
 import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
-import { TimelineRenderingType } from "../../../../../src/contexts/RoomContext";
+import { type RoomContextType, TimelineRenderingType } from "../../../../../src/contexts/RoomContext";
 import EditorModel from "../../../../../src/editor/model";
 import { createPartCreator } from "../../../editor/mock";
 import { createTestClient, mkEvent, mkStubRoom, stubClient } from "../../../../test-utils";
@@ -26,18 +25,20 @@ import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
 import defaultDispatcher from "../../../../../src/dispatcher/dispatcher";
 import DocumentOffset from "../../../../../src/editor/offset";
 import { Layout } from "../../../../../src/settings/enums/Layout";
-import { type IRoomState, MainSplitContentType } from "../../../../../src/components/structures/RoomView";
+import { MainSplitContentType } from "../../../../../src/components/structures/RoomView";
 import { mockPlatformPeg } from "../../../../test-utils/platform";
 import { doMaybeLocalRoomAction } from "../../../../../src/utils/local-room";
 import { addTextToComposer } from "../../../../test-utils/composer";
 import { ScopedRoomContextProvider } from "../../../../../src/contexts/ScopedRoomContext.tsx";
+import { SdkContextClass } from "../../../../../src/contexts/SDKContext.ts";
 
 jest.mock("../../../../../src/utils/local-room", () => ({
     doMaybeLocalRoomAction: jest.fn(),
 }));
 
 describe("<SendMessageComposer/>", () => {
-    const defaultRoomContext: IRoomState = {
+    const defaultRoomContext: RoomContextType = {
+        roomViewStore: SdkContextClass.instance.roomViewStore,
         roomLoading: true,
         peekLoading: false,
         shouldPeek: true,
@@ -157,186 +158,6 @@ describe("<SendMessageComposer/>", () => {
         });
     });
 
-    describe("attachMentions", () => {
-        const partsCreator = createPartCreator();
-
-        it("no mentions", () => {
-            const model = new EditorModel([], partsCreator);
-            const content: IContent = {};
-            attachMentions("@alice:test", content, model, undefined);
-            expect(content).toEqual({
-                "m.mentions": {},
-            });
-        });
-
-        it("test user mentions", () => {
-            const model = new EditorModel([partsCreator.userPill("Bob", "@bob:test")], partsCreator);
-            const content: IContent = {};
-            attachMentions("@alice:test", content, model, undefined);
-            expect(content).toEqual({
-                "m.mentions": { user_ids: ["@bob:test"] },
-            });
-        });
-
-        it("test reply", () => {
-            // Replying to an event adds the sender to the list of mentioned users.
-            const model = new EditorModel([], partsCreator);
-            let replyToEvent = mkEvent({
-                type: "m.room.message",
-                user: "@bob:test",
-                room: "!abc:test",
-                content: { "m.mentions": {} },
-                event: true,
-            });
-            let content: IContent = {};
-            attachMentions("@alice:test", content, model, replyToEvent);
-            expect(content).toEqual({
-                "m.mentions": { user_ids: ["@bob:test"] },
-            });
-
-            // It no longer adds any other mentioned users
-            replyToEvent = mkEvent({
-                type: "m.room.message",
-                user: "@bob:test",
-                room: "!abc:test",
-                content: { "m.mentions": { user_ids: ["@alice:test", "@charlie:test"] } },
-                event: true,
-            });
-            content = {};
-            attachMentions("@alice:test", content, model, replyToEvent);
-            expect(content).toEqual({
-                "m.mentions": { user_ids: ["@bob:test"] },
-            });
-        });
-
-        it("test room mention", () => {
-            const model = new EditorModel([partsCreator.atRoomPill("@room")], partsCreator);
-            const content: IContent = {};
-            attachMentions("@alice:test", content, model, undefined);
-            expect(content).toEqual({
-                "m.mentions": { room: true },
-            });
-        });
-
-        it("test reply to room mention", () => {
-            // Replying to a room mention shouldn't automatically be a room mention.
-            const model = new EditorModel([], partsCreator);
-            const replyToEvent = mkEvent({
-                type: "m.room.message",
-                user: "@alice:test",
-                room: "!abc:test",
-                content: { "m.mentions": { room: true } },
-                event: true,
-            });
-            const content: IContent = {};
-            attachMentions("@alice:test", content, model, replyToEvent);
-            expect(content).toEqual({
-                "m.mentions": {},
-            });
-        });
-
-        it("test broken mentions", () => {
-            // Replying to a room mention shouldn't automatically be a room mention.
-            const model = new EditorModel([], partsCreator);
-            const replyToEvent = mkEvent({
-                type: "m.room.message",
-                user: "@alice:test",
-                room: "!abc:test",
-                // @ts-ignore - Purposefully testing invalid data.
-                content: { "m.mentions": { user_ids: "@bob:test" } },
-                event: true,
-            });
-            const content: IContent = {};
-            attachMentions("@alice:test", content, model, replyToEvent);
-            expect(content).toEqual({
-                "m.mentions": {},
-            });
-        });
-
-        describe("attachMentions with edit", () => {
-            it("no mentions", () => {
-                const model = new EditorModel([], partsCreator);
-                const content: IContent = { "m.new_content": {} };
-                const prevContent: IContent = {};
-                attachMentions("@alice:test", content, model, undefined, prevContent);
-                expect(content).toEqual({
-                    "m.mentions": {},
-                    "m.new_content": { "m.mentions": {} },
-                });
-            });
-
-            it("mentions do not propagate", () => {
-                const model = new EditorModel([], partsCreator);
-                const content: IContent = { "m.new_content": {} };
-                const prevContent: IContent = {
-                    "m.mentions": { user_ids: ["@bob:test"], room: true },
-                };
-                attachMentions("@alice:test", content, model, undefined, prevContent);
-                expect(content).toEqual({
-                    "m.mentions": {},
-                    "m.new_content": { "m.mentions": {} },
-                });
-            });
-
-            it("test user mentions", () => {
-                const model = new EditorModel([partsCreator.userPill("Bob", "@bob:test")], partsCreator);
-                const content: IContent = { "m.new_content": {} };
-                const prevContent: IContent = {};
-                attachMentions("@alice:test", content, model, undefined, prevContent);
-                expect(content).toEqual({
-                    "m.mentions": { user_ids: ["@bob:test"] },
-                    "m.new_content": { "m.mentions": { user_ids: ["@bob:test"] } },
-                });
-            });
-
-            it("test prev user mentions", () => {
-                const model = new EditorModel([partsCreator.userPill("Bob", "@bob:test")], partsCreator);
-                const content: IContent = { "m.new_content": {} };
-                const prevContent: IContent = { "m.mentions": { user_ids: ["@bob:test"] } };
-                attachMentions("@alice:test", content, model, undefined, prevContent);
-                expect(content).toEqual({
-                    "m.mentions": {},
-                    "m.new_content": { "m.mentions": { user_ids: ["@bob:test"] } },
-                });
-            });
-
-            it("test room mention", () => {
-                const model = new EditorModel([partsCreator.atRoomPill("@room")], partsCreator);
-                const content: IContent = { "m.new_content": {} };
-                const prevContent: IContent = {};
-                attachMentions("@alice:test", content, model, undefined, prevContent);
-                expect(content).toEqual({
-                    "m.mentions": { room: true },
-                    "m.new_content": { "m.mentions": { room: true } },
-                });
-            });
-
-            it("test prev room mention", () => {
-                const model = new EditorModel([partsCreator.atRoomPill("@room")], partsCreator);
-                const content: IContent = { "m.new_content": {} };
-                const prevContent: IContent = { "m.mentions": { room: true } };
-                attachMentions("@alice:test", content, model, undefined, prevContent);
-                expect(content).toEqual({
-                    "m.mentions": {},
-                    "m.new_content": { "m.mentions": { room: true } },
-                });
-            });
-
-            it("test broken mentions", () => {
-                // Replying to a room mention shouldn't automatically be a room mention.
-                const model = new EditorModel([], partsCreator);
-                const content: IContent = { "m.new_content": {} };
-                // @ts-ignore - Purposefully testing invalid data.
-                const prevContent: IContent = { "m.mentions": { user_ids: "@bob:test" } };
-                attachMentions("@alice:test", content, model, undefined, prevContent);
-                expect(content).toEqual({
-                    "m.mentions": {},
-                    "m.new_content": { "m.mentions": {} },
-                });
-            });
-        });
-    });
-
     describe("functions correctly mounted", () => {
         const mockClient = createTestClient();
         jest.spyOn(MatrixClientPeg, "get").mockReturnValue(mockClient);
diff --git a/test/unit-tests/components/views/rooms/__snapshots__/ExtraTile-test.tsx.snap b/test/unit-tests/components/views/rooms/__snapshots__/ExtraTile-test.tsx.snap
index 421abe6533..e489a11bd5 100644
--- a/test/unit-tests/components/views/rooms/__snapshots__/ExtraTile-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/__snapshots__/ExtraTile-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`ExtraTile renders 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/rooms/__snapshots__/NewRoomIntro-test.tsx.snap b/test/unit-tests/components/views/rooms/__snapshots__/NewRoomIntro-test.tsx.snap
new file mode 100644
index 0000000000..e8401c135c
--- /dev/null
+++ b/test/unit-tests/components/views/rooms/__snapshots__/NewRoomIntro-test.tsx.snap
@@ -0,0 +1,24 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`NewRoomIntro topic should render a link in the topic 1`] = `
+<p
+  data-testid="topic"
+>
+  <span>
+    Topic: 
+    <span
+      dir="auto"
+    >
+      This is a link: 
+      <a
+        class="linkified"
+        href="https://matrix.org/"
+        rel="noreferrer noopener"
+        target="_blank"
+      >
+        https://matrix.org/
+      </a>
+    </span>
+  </span>
+</p>
+`;
diff --git a/test/unit-tests/components/views/rooms/__snapshots__/NotificationDecoration-test.tsx.snap b/test/unit-tests/components/views/rooms/__snapshots__/NotificationDecoration-test.tsx.snap
index 5d400fba98..9cbc1a6464 100644
--- a/test/unit-tests/components/views/rooms/__snapshots__/NotificationDecoration-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/__snapshots__/NotificationDecoration-test.tsx.snap
@@ -1,14 +1,14 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<NotificationDecoration /> should render the activity decoration 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex"
+    class="_flex_4dswl_9"
     data-testid="notification-decoration"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
   >
     <div
-      class="_unread_1k06b_8"
+      class="_unread_cti0f_8"
     >
       <div />
     </div>
@@ -16,10 +16,32 @@ exports[`<NotificationDecoration /> should render the activity decoration 1`] =
 </DocumentFragment>
 `;
 
+exports[`<NotificationDecoration /> should render the audio call decoration 1`] = `
+<DocumentFragment>
+  <div
+    class="_flex_4dswl_9"
+    data-testid="notification-decoration"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
+  >
+    <svg
+      fill="var(--cpd-color-icon-accent-primary)"
+      height="20px"
+      viewBox="0 0 24 24"
+      width="20px"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="m20.958 16.374.039 3.527q0 .427-.33.756-.33.33-.756.33a16 16 0 0 1-6.57-1.105 16.2 16.2 0 0 1-5.563-3.663 16.1 16.1 0 0 1-3.653-5.573 16.3 16.3 0 0 1-1.115-6.56q0-.427.33-.757T4.095 3l3.528.039a1.07 1.07 0 0 1 1.085.93l.543 3.954q.039.271-.039.504a1.1 1.1 0 0 1-.271.426l-1.64 1.64q.505 1.008 1.154 1.909c.433.6 1.444 1.696 1.444 1.696s1.095 1.01 1.696 1.444q.9.65 1.909 1.153l1.64-1.64q.193-.193.426-.27t.504-.04l3.954.543q.406.059.668.359t.262.727"
+      />
+    </svg>
+  </div>
+</DocumentFragment>
+`;
+
 exports[`<NotificationDecoration /> should render the invitation decoration 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex"
+    class="_flex_4dswl_9"
     data-testid="notification-decoration"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
   >
@@ -41,7 +63,7 @@ exports[`<NotificationDecoration /> should render the invitation decoration 1`]
 exports[`<NotificationDecoration /> should render the mention decoration 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex"
+    class="_flex_4dswl_9"
     data-testid="notification-decoration"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
   >
@@ -57,7 +79,7 @@ exports[`<NotificationDecoration /> should render the mention decoration 1`] = `
       />
     </svg>
     <span
-      class="_unread-counter_9mg0k_8"
+      class="_unread-counter_1147r_8"
     >
       1
     </span>
@@ -68,7 +90,7 @@ exports[`<NotificationDecoration /> should render the mention decoration 1`] = `
 exports[`<NotificationDecoration /> should render the muted decoration 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex"
+    class="_flex_4dswl_9"
     data-testid="notification-decoration"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
   >
@@ -93,12 +115,12 @@ exports[`<NotificationDecoration /> should render the muted decoration 1`] = `
 exports[`<NotificationDecoration /> should render the notification decoration 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex"
+    class="_flex_4dswl_9"
     data-testid="notification-decoration"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
   >
     <span
-      class="_unread-counter_9mg0k_8"
+      class="_unread-counter_1147r_8"
     >
       1
     </span>
@@ -109,12 +131,12 @@ exports[`<NotificationDecoration /> should render the notification decoration 1`
 exports[`<NotificationDecoration /> should render the notification decoration without count 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex"
+    class="_flex_4dswl_9"
     data-testid="notification-decoration"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
   >
     <div
-      class="_unread-counter_9mg0k_8"
+      class="_unread-counter_1147r_8"
     />
   </div>
 </DocumentFragment>
@@ -123,7 +145,7 @@ exports[`<NotificationDecoration /> should render the notification decoration wi
 exports[`<NotificationDecoration /> should render the unset message decoration 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex"
+    class="_flex_4dswl_9"
     data-testid="notification-decoration"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
   >
@@ -142,10 +164,10 @@ exports[`<NotificationDecoration /> should render the unset message decoration 1
 </DocumentFragment>
 `;
 
-exports[`<NotificationDecoration /> should render the video decoration 1`] = `
+exports[`<NotificationDecoration /> should render the video call decoration 1`] = `
 <DocumentFragment>
   <div
-    class="mx_Flex"
+    class="_flex_4dswl_9"
     data-testid="notification-decoration"
     style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-1x); --mx-flex-wrap: nowrap;"
   >
diff --git a/test/unit-tests/components/views/rooms/__snapshots__/PinnedEventTile-test.tsx.snap b/test/unit-tests/components/views/rooms/__snapshots__/PinnedEventTile-test.tsx.snap
index 84a4da73ef..92a846ab05 100644
--- a/test/unit-tests/components/views/rooms/__snapshots__/PinnedEventTile-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/__snapshots__/PinnedEventTile-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<PinnedEventTile /> should render pinned event 1`] = `
 <div>
@@ -8,7 +8,7 @@ exports[`<PinnedEventTile /> should render pinned event 1`] = `
   >
     <div>
       <span
-        class="_avatar_1qbcf_8 mx_BaseAvatar mx_PinnedEventTile_senderAvatar _avatar-imageless_1qbcf_52"
+        class="_avatar_zysgz_8 mx_BaseAvatar mx_PinnedEventTile_senderAvatar _avatar-imageless_zysgz_55"
         data-color="2"
         data-testid="avatar-img"
         data-type="round"
@@ -25,26 +25,28 @@ exports[`<PinnedEventTile /> should render pinned event 1`] = `
         class="mx_PinnedEventTile_top"
       >
         <span
-          aria-labelledby="«r0»"
+          aria-labelledby="_r_1_"
           class="mx_PinnedEventTile_sender mx_Username_color2"
         >
           @alice:server.org
         </span>
         <button
+          aria-describedby="_r_0_"
           aria-disabled="false"
           aria-expanded="false"
           aria-haspopup="menu"
           aria-label="Open menu"
-          class="_icon-button_m2erp_8"
+          class="_icon-button_1pz9o_8"
+          data-kind="primary"
           data-state="closed"
-          id="radix-«r5»"
+          id="radix-_r_6_"
           role="button"
           style="--cpd-icon-button-size: 24px;"
           tabindex="0"
           type="button"
         >
           <div
-            class="_indicator-icon_zr2a0_17"
+            class="_indicator-icon_147l5_17"
             style="--cpd-icon-button-size: 100%;"
           >
             <svg
@@ -63,6 +65,7 @@ exports[`<PinnedEventTile /> should render pinned event 1`] = `
       </div>
       <div
         class="mx_MTextBody mx_EventTile_content"
+        id="_r_0_"
       >
         <div
           class="mx_EventTile_body translate"
@@ -84,7 +87,7 @@ exports[`<PinnedEventTile /> should render pinned event with thread info 1`] = `
   >
     <div>
       <span
-        class="_avatar_1qbcf_8 mx_BaseAvatar mx_PinnedEventTile_senderAvatar _avatar-imageless_1qbcf_52"
+        class="_avatar_zysgz_8 mx_BaseAvatar mx_PinnedEventTile_senderAvatar _avatar-imageless_zysgz_55"
         data-color="2"
         data-testid="avatar-img"
         data-type="round"
@@ -101,26 +104,28 @@ exports[`<PinnedEventTile /> should render pinned event with thread info 1`] = `
         class="mx_PinnedEventTile_top"
       >
         <span
-          aria-labelledby="«r8»"
+          aria-labelledby="_r_a_"
           class="mx_PinnedEventTile_sender mx_Username_color2"
         >
           @alice:server.org
         </span>
         <button
+          aria-describedby="_r_9_"
           aria-disabled="false"
           aria-expanded="false"
           aria-haspopup="menu"
           aria-label="Open menu"
-          class="_icon-button_m2erp_8"
+          class="_icon-button_1pz9o_8"
+          data-kind="primary"
           data-state="closed"
-          id="radix-«rd»"
+          id="radix-_r_f_"
           role="button"
           style="--cpd-icon-button-size: 24px;"
           tabindex="0"
           type="button"
         >
           <div
-            class="_indicator-icon_zr2a0_17"
+            class="_indicator-icon_147l5_17"
             style="--cpd-icon-button-size: 100%;"
           >
             <svg
@@ -139,6 +144,7 @@ exports[`<PinnedEventTile /> should render pinned event with thread info 1`] = `
       </div>
       <div
         class="mx_MTextBody mx_EventTile_content"
+        id="_r_9_"
       >
         <div
           class="mx_EventTile_body translate"
@@ -181,16 +187,16 @@ exports[`<PinnedEventTile /> should render pinned event with thread info 1`] = `
 exports[`<PinnedEventTile /> should render the menu with all the options 1`] = `
 <div
   aria-label="Open menu"
-  aria-labelledby="radix-«r10»"
+  aria-labelledby="radix-_r_14_"
   aria-orientation="vertical"
-  class="_menu_19sse_8"
+  class="_menu_1glhz_8"
   data-align="start"
   data-orientation="vertical"
   data-radix-menu-content=""
   data-side="right"
   data-state="open"
   dir="ltr"
-  id="radix-«r11»"
+  id="radix-_r_15_"
   role="menu"
   style="outline: none; --radix-dropdown-menu-content-transform-origin: var(--radix-popper-transform-origin); --radix-dropdown-menu-content-available-width: var(--radix-popper-available-width); --radix-dropdown-menu-content-available-height: var(--radix-popper-available-height); --radix-dropdown-menu-trigger-width: var(--radix-popper-anchor-width); --radix-dropdown-menu-trigger-height: var(--radix-popper-anchor-height); pointer-events: auto;"
   tabindex="-1"
@@ -321,7 +327,7 @@ exports[`<PinnedEventTile /> should render the menu with all the options 1`] = `
     </svg>
   </button>
   <div
-    class="_separator_7ckbw_8"
+    class="_separator_cqpyv_8"
     data-kind="primary"
     data-orientation="horizontal"
     role="separator"
@@ -372,16 +378,16 @@ exports[`<PinnedEventTile /> should render the menu with all the options 1`] = `
 exports[`<PinnedEventTile /> should render the menu without unpin and delete 1`] = `
 <div
   aria-label="Open menu"
-  aria-labelledby="radix-«rl»"
+  aria-labelledby="radix-_r_o_"
   aria-orientation="vertical"
-  class="_menu_19sse_8"
+  class="_menu_1glhz_8"
   data-align="start"
   data-orientation="vertical"
   data-radix-menu-content=""
   data-side="right"
   data-state="open"
   dir="ltr"
-  id="radix-«rm»"
+  id="radix-_r_p_"
   role="menu"
   style="outline: none; --radix-dropdown-menu-content-transform-origin: var(--radix-popper-transform-origin); --radix-dropdown-menu-content-available-width: var(--radix-popper-available-width); --radix-dropdown-menu-content-available-height: var(--radix-popper-available-height); --radix-dropdown-menu-trigger-width: var(--radix-popper-anchor-width); --radix-dropdown-menu-trigger-height: var(--radix-popper-anchor-height); pointer-events: auto;"
   tabindex="-1"
diff --git a/test/unit-tests/components/views/rooms/__snapshots__/PinnedMessageBanner-test.tsx.snap b/test/unit-tests/components/views/rooms/__snapshots__/PinnedMessageBanner-test.tsx.snap
index 7b4bedeffa..25e7a01264 100644
--- a/test/unit-tests/components/views/rooms/__snapshots__/PinnedMessageBanner-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/__snapshots__/PinnedMessageBanner-test.tsx.snap
@@ -1,20 +1,23 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<PinnedMessageBanner /> should display display a poll event 1`] = `
 <DocumentFragment>
   <div
-    aria-label="This room has pinned messages. Click to view them."
+    aria-label="Pinned messages"
     class="mx_PinnedMessageBanner"
     data-single-message="true"
     data-testid="pinned-message-banner"
+    role="region"
   >
     <button
-      aria-label="View the pinned message in the timeline."
+      aria-describedby="_r_a_"
+      aria-label="View the pinned message in the timeline and the newest pinned message here"
       class="mx_PinnedMessageBanner_main"
       type="button"
     >
       <div
         class="mx_PinnedMessageBanner_content"
+        id="_r_a_"
       >
         <div
           class="mx_PinnedMessageBanner_Indicators"
@@ -58,18 +61,21 @@ exports[`<PinnedMessageBanner /> should display display a poll event 1`] = `
 exports[`<PinnedMessageBanner /> should display the last message when the pinned event array changed 1`] = `
 <DocumentFragment>
   <div
-    aria-label="This room has pinned messages. Click to view them."
+    aria-label="Pinned messages"
     class="mx_PinnedMessageBanner"
     data-single-message="false"
     data-testid="pinned-message-banner"
+    role="region"
   >
     <button
-      aria-label="View the pinned message in the timeline."
+      aria-describedby="_r_4_"
+      aria-label="View the pinned message in the timeline and the newest pinned message here"
       class="mx_PinnedMessageBanner_main"
       type="button"
     >
       <div
         class="mx_PinnedMessageBanner_content"
+        id="_r_4_"
       >
         <div
           class="mx_PinnedMessageBanner_Indicators"
@@ -122,7 +128,7 @@ exports[`<PinnedMessageBanner /> should display the last message when the pinned
       </div>
     </button>
     <button
-      class="_button_vczzf_8 mx_PinnedMessageBanner_actions"
+      class="_button_187yx_8 mx_PinnedMessageBanner_actions"
       data-kind="tertiary"
       data-size="lg"
       role="button"
@@ -137,18 +143,21 @@ exports[`<PinnedMessageBanner /> should display the last message when the pinned
 exports[`<PinnedMessageBanner /> should display the m.audio event type 1`] = `
 <DocumentFragment>
   <div
-    aria-label="This room has pinned messages. Click to view them."
+    aria-label="Pinned messages"
     class="mx_PinnedMessageBanner"
     data-single-message="true"
     data-testid="pinned-message-banner"
+    role="region"
   >
     <button
-      aria-label="View the pinned message in the timeline."
+      aria-describedby="_r_7_"
+      aria-label="View the pinned message in the timeline and the newest pinned message here"
       class="mx_PinnedMessageBanner_main"
       type="button"
     >
       <div
         class="mx_PinnedMessageBanner_content"
+        id="_r_7_"
       >
         <div
           class="mx_PinnedMessageBanner_Indicators"
@@ -192,18 +201,21 @@ exports[`<PinnedMessageBanner /> should display the m.audio event type 1`] = `
 exports[`<PinnedMessageBanner /> should display the m.file event type 1`] = `
 <DocumentFragment>
   <div
-    aria-label="This room has pinned messages. Click to view them."
+    aria-label="Pinned messages"
     class="mx_PinnedMessageBanner"
     data-single-message="true"
     data-testid="pinned-message-banner"
+    role="region"
   >
     <button
-      aria-label="View the pinned message in the timeline."
+      aria-describedby="_r_6_"
+      aria-label="View the pinned message in the timeline and the newest pinned message here"
       class="mx_PinnedMessageBanner_main"
       type="button"
     >
       <div
         class="mx_PinnedMessageBanner_content"
+        id="_r_6_"
       >
         <div
           class="mx_PinnedMessageBanner_Indicators"
@@ -247,18 +259,21 @@ exports[`<PinnedMessageBanner /> should display the m.file event type 1`] = `
 exports[`<PinnedMessageBanner /> should display the m.image event type 1`] = `
 <DocumentFragment>
   <div
-    aria-label="This room has pinned messages. Click to view them."
+    aria-label="Pinned messages"
     class="mx_PinnedMessageBanner"
     data-single-message="true"
     data-testid="pinned-message-banner"
+    role="region"
   >
     <button
-      aria-label="View the pinned message in the timeline."
+      aria-describedby="_r_9_"
+      aria-label="View the pinned message in the timeline and the newest pinned message here"
       class="mx_PinnedMessageBanner_main"
       type="button"
     >
       <div
         class="mx_PinnedMessageBanner_content"
+        id="_r_9_"
       >
         <div
           class="mx_PinnedMessageBanner_Indicators"
@@ -302,18 +317,21 @@ exports[`<PinnedMessageBanner /> should display the m.image event type 1`] = `
 exports[`<PinnedMessageBanner /> should display the m.video event type 1`] = `
 <DocumentFragment>
   <div
-    aria-label="This room has pinned messages. Click to view them."
+    aria-label="Pinned messages"
     class="mx_PinnedMessageBanner"
     data-single-message="true"
     data-testid="pinned-message-banner"
+    role="region"
   >
     <button
-      aria-label="View the pinned message in the timeline."
+      aria-describedby="_r_8_"
+      aria-label="View the pinned message in the timeline and the newest pinned message here"
       class="mx_PinnedMessageBanner_main"
       type="button"
     >
       <div
         class="mx_PinnedMessageBanner_content"
+        id="_r_8_"
       >
         <div
           class="mx_PinnedMessageBanner_Indicators"
@@ -357,18 +375,21 @@ exports[`<PinnedMessageBanner /> should display the m.video event type 1`] = `
 exports[`<PinnedMessageBanner /> should render 2 pinned event 1`] = `
 <DocumentFragment>
   <div
-    aria-label="This room has pinned messages. Click to view them."
+    aria-label="Pinned messages"
     class="mx_PinnedMessageBanner"
     data-single-message="false"
     data-testid="pinned-message-banner"
+    role="region"
   >
     <button
-      aria-label="View the pinned message in the timeline."
+      aria-describedby="_r_2_"
+      aria-label="View the pinned message in the timeline and the newest pinned message here"
       class="mx_PinnedMessageBanner_main"
       type="button"
     >
       <div
         class="mx_PinnedMessageBanner_content"
+        id="_r_2_"
       >
         <div
           class="mx_PinnedMessageBanner_Indicators"
@@ -417,7 +438,7 @@ exports[`<PinnedMessageBanner /> should render 2 pinned event 1`] = `
       </div>
     </button>
     <button
-      class="_button_vczzf_8 mx_PinnedMessageBanner_actions"
+      class="_button_187yx_8 mx_PinnedMessageBanner_actions"
       data-kind="tertiary"
       data-size="lg"
       role="button"
@@ -432,18 +453,21 @@ exports[`<PinnedMessageBanner /> should render 2 pinned event 1`] = `
 exports[`<PinnedMessageBanner /> should render 4 pinned event 1`] = `
 <DocumentFragment>
   <div
-    aria-label="This room has pinned messages. Click to view them."
+    aria-label="Pinned messages"
     class="mx_PinnedMessageBanner"
     data-single-message="false"
     data-testid="pinned-message-banner"
+    role="region"
   >
     <button
-      aria-label="View the pinned message in the timeline."
+      aria-describedby="_r_3_"
+      aria-label="View the pinned message in the timeline and the newest pinned message here"
       class="mx_PinnedMessageBanner_main"
       type="button"
     >
       <div
         class="mx_PinnedMessageBanner_content"
+        id="_r_3_"
       >
         <div
           class="mx_PinnedMessageBanner_Indicators"
@@ -496,7 +520,7 @@ exports[`<PinnedMessageBanner /> should render 4 pinned event 1`] = `
       </div>
     </button>
     <button
-      class="_button_vczzf_8 mx_PinnedMessageBanner_actions"
+      class="_button_187yx_8 mx_PinnedMessageBanner_actions"
       data-kind="tertiary"
       data-size="lg"
       role="button"
@@ -511,18 +535,21 @@ exports[`<PinnedMessageBanner /> should render 4 pinned event 1`] = `
 exports[`<PinnedMessageBanner /> should render a single pinned event 1`] = `
 <DocumentFragment>
   <div
-    aria-label="This room has pinned messages. Click to view them."
+    aria-label="Pinned messages"
     class="mx_PinnedMessageBanner"
     data-single-message="true"
     data-testid="pinned-message-banner"
+    role="region"
   >
     <button
-      aria-label="View the pinned message in the timeline."
+      aria-describedby="_r_1_"
+      aria-label="View the pinned message in the timeline and the newest pinned message here"
       class="mx_PinnedMessageBanner_main"
       type="button"
     >
       <div
         class="mx_PinnedMessageBanner_content"
+        id="_r_1_"
       >
         <div
           class="mx_PinnedMessageBanner_Indicators"
diff --git a/test/unit-tests/components/views/rooms/__snapshots__/ReadReceiptGroup-test.tsx.snap b/test/unit-tests/components/views/rooms/__snapshots__/ReadReceiptGroup-test.tsx.snap
index 1778426866..dd09e7bde9 100644
--- a/test/unit-tests/components/views/rooms/__snapshots__/ReadReceiptGroup-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/__snapshots__/ReadReceiptGroup-test.tsx.snap
@@ -1,19 +1,19 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`ReadReceiptGroup <ReadReceiptPerson /> should display a tooltip 1`] = `
 <div
-  class="_tooltip_6ode6_8"
+  class="_tooltip_1nqnq_8"
   data-floating-ui-focusable=""
-  id="«r6»"
+  id="_r_6_"
   role="tooltip"
-  style="position: absolute; left: 0px; top: 0px; transform: translate(0px, 0px);"
+  style="position: absolute; left: 0px; top: 0px; transform: translate(5px, -6px);"
   tabindex="-1"
 >
   <svg
     aria-hidden="true"
-    class="_arrow_6ode6_33"
+    class="_arrow_1nqnq_33"
     height="10"
-    style="position: absolute; pointer-events: none; top: 100%;"
+    style="position: absolute; pointer-events: none; top: 100%; left: -1px;"
     viewBox="0 0 10 10"
     width="10"
   >
@@ -22,7 +22,7 @@ exports[`ReadReceiptGroup <ReadReceiptPerson /> should display a tooltip 1`] = `
       stroke="none"
     />
     <clippath
-      id="«r9»"
+      id="_r_9_"
     >
       <rect
         height="10"
@@ -33,22 +33,63 @@ exports[`ReadReceiptGroup <ReadReceiptPerson /> should display a tooltip 1`] = `
     </clippath>
   </svg>
   <span
-    id="«r4»"
+    id="_r_4_"
   >
     Alice
   </span>
   <span
-    class="_caption_6ode6_28 cpd-theme-dark"
-    id="«r5»"
+    class="_caption_1nqnq_28 cpd-theme-dark"
+    id="_r_5_"
   >
     @alice:example.org
   </span>
 </div>
 `;
 
+exports[`ReadReceiptGroup <ReadReceiptPerson /> should fall back to userId if roomMember unspecified 1`] = `
+<div>
+  <span
+    tabindex="0"
+  >
+    <div
+      class="mx_AccessibleButton mx_ReadReceiptGroup_person"
+      role="menuitem"
+      tabindex="-1"
+    >
+      <span
+        aria-hidden="true"
+        aria-live="off"
+        class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
+        data-color="3"
+        data-testid="avatar-img"
+        data-type="round"
+        role="presentation"
+        style="--cpd-avatar-size: 24px;"
+      >
+        a
+      </span>
+      <div
+        class="mx_ReadReceiptGroup_name"
+      >
+        <p>
+          @alice:example.org
+        </p>
+        <p
+          class="mx_ReadReceiptGroup_secondary"
+        >
+          ==MOCK FORMATTED DATE==
+        </p>
+      </div>
+    </div>
+  </span>
+</div>
+`;
+
 exports[`ReadReceiptGroup <ReadReceiptPerson /> should render 1`] = `
 <div>
-  <div>
+  <span
+    tabindex="0"
+  >
     <div
       class="mx_AccessibleButton mx_ReadReceiptGroup_person"
       role="menuitem"
@@ -58,7 +99,7 @@ exports[`ReadReceiptGroup <ReadReceiptPerson /> should render 1`] = `
         aria-hidden="true"
         aria-label="Profile picture"
         aria-live="off"
-        class="_avatar_1qbcf_8 mx_BaseAvatar"
+        class="_avatar_zysgz_8 mx_BaseAvatar"
         data-color="3"
         data-testid="avatar-img"
         data-type="round"
@@ -66,7 +107,7 @@ exports[`ReadReceiptGroup <ReadReceiptPerson /> should render 1`] = `
       >
         <img
           alt=""
-          class="_image_1qbcf_41"
+          class="_image_zysgz_43"
           data-type="round"
           height="24px"
           loading="lazy"
@@ -88,6 +129,6 @@ exports[`ReadReceiptGroup <ReadReceiptPerson /> should render 1`] = `
         </p>
       </div>
     </div>
-  </div>
+  </span>
 </div>
 `;
diff --git a/test/unit-tests/components/views/rooms/__snapshots__/RoomInfoLine-test.tsx.snap b/test/unit-tests/components/views/rooms/__snapshots__/RoomInfoLine-test.tsx.snap
new file mode 100644
index 0000000000..643c3b3bf0
--- /dev/null
+++ b/test/unit-tests/components/views/rooms/__snapshots__/RoomInfoLine-test.tsx.snap
@@ -0,0 +1,22 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`RoomInfoLine renders for public room 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_RoomInfoLine"
+  >
+    <svg
+      fill="currentColor"
+      height="1em"
+      viewBox="0 0 24 24"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M12 22a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22m-1-2.05V18q-.825 0-1.412-.587A1.93 1.93 0 0 1 9 16v-1l-4.8-4.8q-.075.45-.138.9Q4 11.55 4 12q0 3.025 1.987 5.3T11 19.95m6.9-2.55q.5-.55.9-1.187.4-.638.662-1.326.263-.687.4-1.412Q20 12.75 20 12a7.85 7.85 0 0 0-1.363-4.475A7.7 7.7 0 0 0 15 4.6V5q0 .824-.588 1.412A1.93 1.93 0 0 1 13 7h-2v2q0 .424-.287.713A.97.97 0 0 1 10 10H8v2h6q.424 0 .713.287.287.288.287.713v3h1q.65 0 1.175.387.525.388.725 1.013"
+      />
+    </svg>
+    Public room
+  </div>
+</DocumentFragment>
+`;
diff --git a/test/unit-tests/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap b/test/unit-tests/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap
index dc44db8d21..c4a4957397 100644
--- a/test/unit-tests/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<RoomPreviewBar /> message case AskToJoin renders the corresponding actions 1`] = `
 <div
@@ -23,7 +23,7 @@ exports[`<RoomPreviewBar /> message case AskToJoin renders the corresponding mes
   </h3>
   <p>
     <span
-      class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+      class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
       data-color="6"
       data-testid="avatar-img"
       data-type="round"
@@ -48,7 +48,7 @@ exports[`<RoomPreviewBar /> message case AskToJoin renders the corresponding mes
   </h3>
   <p>
     <span
-      class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+      class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
       data-color="6"
       data-testid="avatar-img"
       data-type="round"
@@ -73,7 +73,7 @@ exports[`<RoomPreviewBar /> message case AskToJoin renders the corresponding mes
   </h3>
   <p>
     <span
-      class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+      class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
       data-color="1"
       data-testid="avatar-img"
       data-type="round"
@@ -111,9 +111,18 @@ exports[`<RoomPreviewBar /> message case Knocked renders the corresponding messa
     Request to join sent
   </h3>
   <p>
-    <div
+    <svg
       class="mx_Icon mx_Icon_16 mx_RoomPreviewBar_icon"
-    />
+      fill="currentColor"
+      height="1em"
+      viewBox="0 0 24 24"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M12 18.156q.478 0 .802-.323.323-.324.323-.802h-2.25q0 .478.323.802.324.323.802.323M8.063 16.47h7.874a.54.54 0 0 0 .394-.169.54.54 0 0 0 0-.788.54.54 0 0 0-.393-.168h-.563V12.7q0-1.237-.675-2.25a3 3 0 0 0-1.856-1.294v-.281a.82.82 0 0 0-.24-.605.82.82 0 0 0-.604-.239.82.82 0 0 0-.844.844v.281A3 3 0 0 0 9.3 10.45a3.97 3.97 0 0 0-.675 2.25v2.644h-.562a.54.54 0 0 0-.394.168.54.54 0 0 0 0 .788.54.54 0 0 0 .394.169M3 19.844V9.719q0-.534.24-1.013.238-.478.66-.787l6.75-5.063q.31-.225.647-.337.338-.113.703-.113.366 0 .703.113.337.112.647.337L20.1 7.92q.422.309.66.787.24.479.24 1.013v10.125q0 .927-.66 1.589-.662.66-1.59.66H5.25q-.928 0-1.59-.66-.66-.66-.66-1.59m2.25 0h13.5V9.719L12 4.656 5.25 9.72z"
+      />
+    </svg>
     Your request to join is pending.
   </p>
 </div>
@@ -252,7 +261,7 @@ exports[`<RoomPreviewBar /> with an invite with an invited email when client has
   </h3>
   <p>
     <span
-      class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+      class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
       data-color="6"
       data-testid="avatar-img"
       data-type="round"
@@ -310,7 +319,7 @@ exports[`<RoomPreviewBar /> with an invite without an invited email for a dm roo
   </h3>
   <p>
     <span
-      class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+      class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
       data-color="6"
       data-testid="avatar-img"
       data-type="round"
@@ -348,7 +357,7 @@ exports[`<RoomPreviewBar /> with an invite without an invited email for a non-dm
   </h3>
   <p>
     <span
-      class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+      class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
       data-color="6"
       data-testid="avatar-img"
       data-type="round"
diff --git a/test/unit-tests/components/views/rooms/__snapshots__/RoomTile-test.tsx.snap b/test/unit-tests/components/views/rooms/__snapshots__/RoomTile-test.tsx.snap
index 160aa6efb5..1567cb594b 100644
--- a/test/unit-tests/components/views/rooms/__snapshots__/RoomTile-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/__snapshots__/RoomTile-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`RoomTile when message previews are enabled and there is a message in a thread should render as expected 1`] = `
 <DocumentFragment>
@@ -14,7 +14,7 @@ exports[`RoomTile when message previews are enabled and there is a message in a
       class="mx_DecoratedRoomAvatar"
     >
       <span
-        class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+        class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
         data-color="3"
         data-testid="avatar-img"
         data-type="round"
@@ -61,7 +61,19 @@ exports[`RoomTile when message previews are enabled and there is a message in a
       class="mx_AccessibleButton mx_RoomTile_menuButton"
       role="button"
       tabindex="0"
-    />
+    >
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+        />
+      </svg>
+    </div>
     <div
       aria-expanded="false"
       aria-haspopup="true"
@@ -88,7 +100,7 @@ exports[`RoomTile when message previews are enabled and there is a message in th
       class="mx_DecoratedRoomAvatar"
     >
       <span
-        class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+        class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
         data-color="3"
         data-testid="avatar-img"
         data-type="round"
@@ -143,7 +155,19 @@ exports[`RoomTile when message previews are enabled and there is a message in th
       class="mx_AccessibleButton mx_RoomTile_menuButton"
       role="button"
       tabindex="0"
-    />
+    >
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+        />
+      </svg>
+    </div>
     <div
       aria-expanded="false"
       aria-haspopup="true"
@@ -170,7 +194,7 @@ exports[`RoomTile when message previews are enabled should render a room without
       class="mx_DecoratedRoomAvatar"
     >
       <span
-        class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+        class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
         data-color="3"
         data-testid="avatar-img"
         data-type="round"
@@ -206,7 +230,19 @@ exports[`RoomTile when message previews are enabled should render a room without
       class="mx_AccessibleButton mx_RoomTile_menuButton"
       role="button"
       tabindex="0"
-    />
+    >
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+        />
+      </svg>
+    </div>
     <div
       aria-expanded="false"
       aria-haspopup="true"
@@ -232,7 +268,7 @@ exports[`RoomTile when message previews are not enabled should render the room 1
       class="mx_DecoratedRoomAvatar"
     >
       <span
-        class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+        class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
         data-color="3"
         data-testid="avatar-img"
         data-type="round"
@@ -268,7 +304,19 @@ exports[`RoomTile when message previews are not enabled should render the room 1
       class="mx_AccessibleButton mx_RoomTile_menuButton"
       role="button"
       tabindex="0"
-    />
+    >
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+        />
+      </svg>
+    </div>
     <div
       aria-expanded="false"
       aria-haspopup="true"
diff --git a/test/unit-tests/components/views/rooms/__snapshots__/ThirdPartyMemberInfo-test.tsx.snap b/test/unit-tests/components/views/rooms/__snapshots__/ThirdPartyMemberInfo-test.tsx.snap
index 75d559f390..81c3d70b58 100644
--- a/test/unit-tests/components/views/rooms/__snapshots__/ThirdPartyMemberInfo-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/__snapshots__/ThirdPartyMemberInfo-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<ThirdPartyMemberInfo /> should render invite 1`] = `
 <div>
@@ -19,15 +19,16 @@ exports[`<ThirdPartyMemberInfo /> should render invite 1`] = `
         </p>
       </div>
       <button
-        aria-labelledby="«r0»"
-        class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+        aria-labelledby="_r_0_"
+        class="_icon-button_1pz9o_8"
+        data-kind="secondary"
         data-testid="base-card-close-button"
         role="button"
         style="--cpd-icon-button-size: 28px;"
         tabindex="0"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -49,11 +50,11 @@ exports[`<ThirdPartyMemberInfo /> should render invite 1`] = `
       tabindex="-1"
     >
       <div
-        class="mx_Flex mx_ThirdPartyMemberInfo"
+        class="_flex_4dswl_9 mx_ThirdPartyMemberInfo"
         style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-4x); --mx-flex-wrap: nowrap;"
       >
         <section
-          class="mx_Flex"
+          class="_flex_4dswl_9"
           style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
         >
           <span
@@ -93,15 +94,16 @@ exports[`<ThirdPartyMemberInfo /> should render invite when room in not availabl
         </p>
       </div>
       <button
-        aria-labelledby="«r6»"
-        class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+        aria-labelledby="_r_6_"
+        class="_icon-button_1pz9o_8"
+        data-kind="secondary"
         data-testid="base-card-close-button"
         role="button"
         style="--cpd-icon-button-size: 28px;"
         tabindex="0"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -123,11 +125,11 @@ exports[`<ThirdPartyMemberInfo /> should render invite when room in not availabl
       tabindex="-1"
     >
       <div
-        class="mx_Flex mx_ThirdPartyMemberInfo"
+        class="_flex_4dswl_9 mx_ThirdPartyMemberInfo"
         style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-4x); --mx-flex-wrap: nowrap;"
       >
         <section
-          class="mx_Flex"
+          class="_flex_4dswl_9"
           style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: nowrap;"
         >
           <span
diff --git a/test/unit-tests/components/views/rooms/memberlist/MemberListHeaderView-test.tsx b/test/unit-tests/components/views/rooms/memberlist/MemberListHeaderView-test.tsx
index b4ab471cc0..f072a0360e 100644
--- a/test/unit-tests/components/views/rooms/memberlist/MemberListHeaderView-test.tsx
+++ b/test/unit-tests/components/views/rooms/memberlist/MemberListHeaderView-test.tsx
@@ -11,7 +11,6 @@ import { act, fireEvent, screen, waitFor } from "jest-matrix-react";
 import { RoomMember, User, RoomEvent } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { mocked } from "jest-mock";
-import { type JSX } from "react";
 
 import { shouldShowComponent } from "../../../../../../src/customisations/helpers/UIComponents";
 import defaultDispatcher from "../../../../../../src/dispatcher/dispatcher";
@@ -21,14 +20,6 @@ jest.mock("../../../../../../src/customisations/helpers/UIComponents", () => ({
     shouldShowComponent: jest.fn(),
 }));
 
-type Children = (args: { height: number; width: number }) => JSX.Element;
-jest.mock("react-virtualized", () => {
-    const ReactVirtualized = jest.requireActual("react-virtualized");
-    return {
-        ...ReactVirtualized,
-        AutoSizer: ({ children }: { children: Children }) => children({ height: 1000, width: 1000 }),
-    };
-});
 jest.spyOn(HTMLElement.prototype, "offsetHeight", "get").mockReturnValue(1500);
 jest.spyOn(HTMLElement.prototype, "offsetWidth", "get").mockReturnValue(1500);
 
diff --git a/test/unit-tests/components/views/rooms/memberlist/MemberListView-test.tsx b/test/unit-tests/components/views/rooms/memberlist/MemberListView-test.tsx
index 240ad8a502..228bc0e9e1 100644
--- a/test/unit-tests/components/views/rooms/memberlist/MemberListView-test.tsx
+++ b/test/unit-tests/components/views/rooms/memberlist/MemberListView-test.tsx
@@ -8,9 +8,8 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { act } from "react";
-import { waitFor } from "jest-matrix-react";
+import { waitFor, fireEvent } from "jest-matrix-react";
 import { type Room, type RoomMember, MatrixEvent } from "matrix-js-sdk/src/matrix";
-import { type JSX } from "react";
 
 import { filterConsole } from "../../../../../test-utils";
 import { type Rendered, renderMemberList } from "./common";
@@ -19,14 +18,6 @@ jest.mock("../../../../../../src/customisations/helpers/UIComponents", () => ({
     shouldShowComponent: jest.fn(),
 }));
 
-type Children = (args: { height: number; width: number }) => JSX.Element;
-jest.mock("react-virtualized", () => {
-    const ReactVirtualized = jest.requireActual("react-virtualized");
-    return {
-        ...ReactVirtualized,
-        AutoSizer: ({ children }: { children: Children }) => children({ height: 1000, width: 1000 }),
-    };
-});
 jest.spyOn(HTMLElement.prototype, "offsetHeight", "get").mockReturnValue(1500);
 jest.spyOn(HTMLElement.prototype, "offsetWidth", "get").mockReturnValue(1500);
 
@@ -154,6 +145,16 @@ describe("MemberListView and MemberlistHeaderView", () => {
                 expect(root.container.querySelector(".mx_PresenceIconView_unavailable")).not.toBeNull();
             });
         });
+
+        it("should prevent default form submission", async () => {
+            const { root } = rendered;
+            const form = root.container.querySelector("form");
+            expect(form).not.toBeNull();
+            const submitEvent = new Event("submit", { bubbles: true, cancelable: true });
+            const preventDefaultSpy = jest.spyOn(submitEvent, "preventDefault");
+            fireEvent(form!, submitEvent);
+            expect(preventDefaultSpy).toHaveBeenCalled();
+        });
     });
 
     describe.each([true, false])("does order members correctly (presence %s)", (enablePresence) => {
@@ -190,7 +191,7 @@ describe("MemberListView and MemberlistHeaderView", () => {
                     u.user!.presence = "offline";
                 });
 
-                await reRender();
+                await act(reRender);
 
                 const tiles = root.container.querySelectorAll(".mx_MemberTileView");
                 expectOrderedByPresenceAndPowerLevel(memberListRoom, tiles, enablePresence);
@@ -200,7 +201,7 @@ describe("MemberListView and MemberlistHeaderView", () => {
                 const { reRender, root, memberListRoom } = rendered;
                 // We already have admin, moderator, and default users so leave them alone
 
-                await reRender();
+                await act(reRender);
 
                 const tiles = root.container.querySelectorAll(".mx_EntityTile");
                 expectOrderedByPresenceAndPowerLevel(memberListRoom, tiles, enablePresence);
@@ -228,7 +229,7 @@ describe("MemberListView and MemberlistHeaderView", () => {
                     u.user!.lastActiveAgo = 100;
                 });
 
-                await reRender();
+                await act(reRender);
 
                 const tiles = root.container.querySelectorAll(".mx_EntityTile");
                 expectOrderedByPresenceAndPowerLevel(memberListRoom, tiles, enablePresence);
@@ -246,7 +247,7 @@ describe("MemberListView and MemberlistHeaderView", () => {
                     u.powerLevel = 100;
                 });
 
-                await reRender();
+                await act(reRender);
 
                 const tiles = root.container.querySelectorAll(".mx_EntityTile");
                 expectOrderedByPresenceAndPowerLevel(memberListRoom, tiles, enablePresence);
diff --git a/test/unit-tests/components/views/rooms/memberlist/MemberTileView-test.tsx b/test/unit-tests/components/views/rooms/memberlist/MemberTileView-test.tsx
index 4f06c90b43..b82caced89 100644
--- a/test/unit-tests/components/views/rooms/memberlist/MemberTileView-test.tsx
+++ b/test/unit-tests/components/views/rooms/memberlist/MemberTileView-test.tsx
@@ -17,13 +17,16 @@ import * as TestUtils from "../../../../../test-utils";
 import { type RoomMember } from "../../../../../../src/models/rooms/RoomMember";
 import {
     getPending3PidInvites,
+    type MemberWithSeparator,
     sdkRoomMemberToRoomMember,
 } from "../../../../../../src/components/viewmodels/memberlist/MemberListViewModel";
 import { RoomMemberTileView } from "../../../../../../src/components/views/rooms/MemberList/tiles/RoomMemberTileView";
 import { ThreePidInviteTileView } from "../../../../../../src/components/views/rooms/MemberList/tiles/ThreePidInviteTileView";
+import { type ThreePIDInvite } from "../../../../../../src/models/rooms/ThreePIDInvite";
 
 describe("MemberTileView", () => {
     describe("RoomMemberTileView", () => {
+        const item = {} as { member: RoomMember };
         let matrixClient: MatrixClient;
         let member: RoomMember;
 
@@ -32,10 +35,13 @@ describe("MemberTileView", () => {
             mocked(matrixClient.isRoomEncrypted).mockReturnValue(true);
             const sdkMember = new SdkRoomMember("roomId", matrixClient.getUserId()!);
             member = sdkRoomMemberToRoomMember(sdkMember)!.member!;
+            item.member = member;
         });
 
         it("should not display an E2EIcon when the e2E status = normal", () => {
-            const { container } = render(<RoomMemberTileView member={member} />);
+            const { container } = render(
+                <RoomMemberTileView item={item} member={member} index={0} memberCount={1} onFocus={jest.fn()} />,
+            );
             const e2eIcon = container.querySelector(".mx_E2EIconView");
             expect(e2eIcon).toBeNull();
             expect(container).toMatchSnapshot();
@@ -47,7 +53,9 @@ describe("MemberTileView", () => {
                 wasCrossSigningVerified: jest.fn().mockReturnValue(true),
             } as unknown as UserVerificationStatus);
 
-            const { container } = render(<RoomMemberTileView member={member} />);
+            const { container } = render(
+                <RoomMemberTileView item={item} member={member} index={0} memberCount={1} onFocus={jest.fn()} />,
+            );
             await waitFor(async () => {
                 await userEvent.hover(container.querySelector(".mx_E2EIcon")!);
                 expect(screen.getByText("This user has not verified all of their sessions.")).toBeInTheDocument();
@@ -68,7 +76,9 @@ describe("MemberTileView", () => {
                 crossSigningVerified: true,
             } as DeviceVerificationStatus);
 
-            const { container } = render(<RoomMemberTileView member={member} />);
+            const { container } = render(
+                <RoomMemberTileView item={item} member={member} index={0} memberCount={1} onFocus={jest.fn()} />,
+            );
 
             await waitFor(async () => {
                 await userEvent.hover(container.querySelector(".mx_E2EIcon")!);
@@ -81,22 +91,47 @@ describe("MemberTileView", () => {
 
         it("renders user labels correctly", async () => {
             member.powerLevel = 50;
-            const { container: container1 } = render(<RoomMemberTileView member={member} />);
+            const { container: container1 } = render(
+                <RoomMemberTileView item={item} member={member} index={0} memberCount={1} onFocus={jest.fn()} />,
+            );
             expect(container1).toHaveTextContent("Moderator");
 
             member.powerLevel = 100;
-            const { container: container2 } = render(<RoomMemberTileView member={member} />);
+            const { container: container2 } = render(
+                <RoomMemberTileView item={item} member={member} index={0} memberCount={1} onFocus={jest.fn()} />,
+            );
             expect(container2).toHaveTextContent("Admin");
 
+            member.powerLevel = Infinity;
+            const { container: container3 } = render(
+                <RoomMemberTileView item={item} member={member} index={0} memberCount={1} onFocus={jest.fn()} />,
+            );
+            expect(container3).toHaveTextContent("Owner");
+
             member.isInvite = true;
-            const { container: container3 } = render(<RoomMemberTileView member={member} />);
-            expect(container3).toHaveTextContent("Invited");
+            const { container: container4 } = render(
+                <RoomMemberTileView item={item} member={member} index={0} memberCount={1} onFocus={jest.fn()} />,
+            );
+            expect(container4).toHaveTextContent("Invited");
+        });
+
+        it("should call onFocus handler when focused", async () => {
+            const user = userEvent.setup();
+            const onFocus = jest.fn();
+            render(<RoomMemberTileView item={item} member={member} index={0} memberCount={1} onFocus={onFocus} />);
+
+            const button = screen.getByRole("option", { name: member.userId });
+            await user.click(button);
+
+            expect(onFocus).toHaveBeenCalledWith(item, expect.anything());
         });
     });
 
     describe("ThreePidInviteTileView", () => {
+        const member = {} as MemberWithSeparator;
         let cli: MatrixClient;
         let room: Room;
+        let threePidInvite: ThreePIDInvite;
 
         beforeEach(() => {
             cli = TestUtils.stubClient();
@@ -105,12 +140,39 @@ describe("MemberTileView", () => {
                 TestUtils.mkThirdPartyInviteEvent(cli.getSafeUserId(), "Foobar", room.roomId),
                 { toStartOfTimeline: false, addToState: true },
             );
+            threePidInvite = getPending3PidInvites(room)[0].threePidInvite!;
         });
 
         it("renders ThreePidInvite correctly", async () => {
-            const [{ threePidInvite }] = getPending3PidInvites(room);
-            const { container } = render(<ThreePidInviteTileView threePidInvite={threePidInvite!} />);
+            const { container } = render(
+                <ThreePidInviteTileView
+                    item={member}
+                    threePidInvite={threePidInvite}
+                    memberIndex={0}
+                    memberCount={1}
+                    onFocus={jest.fn()}
+                />,
+            );
             expect(container).toMatchSnapshot();
         });
+
+        it("should call onFocus handler when focused", async () => {
+            const user = userEvent.setup();
+            const onFocus = jest.fn();
+            render(
+                <ThreePidInviteTileView
+                    item={member}
+                    threePidInvite={threePidInvite}
+                    memberIndex={0}
+                    memberCount={1}
+                    onFocus={onFocus}
+                />,
+            );
+
+            const button = screen.getByRole("option", { name: threePidInvite.event.getContent().display_name });
+            await user.click(button);
+
+            expect(onFocus).toHaveBeenCalledWith(member, expect.anything());
+        });
     });
 });
diff --git a/test/unit-tests/components/views/rooms/memberlist/__snapshots__/MemberTileView-test.tsx.snap b/test/unit-tests/components/views/rooms/memberlist/__snapshots__/MemberTileView-test.tsx.snap
index f4c503c403..4b5fbda763 100644
--- a/test/unit-tests/components/views/rooms/memberlist/__snapshots__/MemberTileView-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/memberlist/__snapshots__/MemberTileView-test.tsx.snap
@@ -1,22 +1,25 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`MemberTileView RoomMemberTileView should display an verified E2EIcon when the e2E status = Verified 1`] = `
 <div>
   <div>
     <div
-      aria-label="@userId:matrix.org (power 0)"
+      aria-label="@userId:matrix.org"
+      aria-posinset="1"
+      aria-setsize="1"
       class="mx_AccessibleButton mx_MemberTileView"
-      role="button"
-      tabindex="-1"
+      role="option"
+      tabindex="0"
     >
       <div
+        aria-hidden="true"
         class="mx_MemberTileView_left"
       >
         <div
           class="mx_MemberTileView_avatar"
         >
           <span
-            class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
             data-color="2"
             data-testid="avatar-img"
             data-type="round"
@@ -33,6 +36,7 @@ exports[`MemberTileView RoomMemberTileView should display an verified E2EIcon wh
         >
           <div
             class="mx_DisambiguatedProfile"
+            title="@userId:matrix.org (@userId:matrix.org)"
           >
             <span
               class=""
@@ -44,10 +48,11 @@ exports[`MemberTileView RoomMemberTileView should display an verified E2EIcon wh
         </div>
       </div>
       <div
+        aria-hidden="true"
         class="mx_MemberTileView_right"
       >
         <div
-          aria-labelledby="«ri»"
+          aria-labelledby="_r_6_"
           class="mx_E2EIconView"
         >
           <svg
@@ -73,19 +78,22 @@ exports[`MemberTileView RoomMemberTileView should display an warning E2EIcon whe
 <div>
   <div>
     <div
-      aria-label="@userId:matrix.org (power 0)"
+      aria-label="@userId:matrix.org"
+      aria-posinset="1"
+      aria-setsize="1"
       class="mx_AccessibleButton mx_MemberTileView"
-      role="button"
-      tabindex="-1"
+      role="option"
+      tabindex="0"
     >
       <div
+        aria-hidden="true"
         class="mx_MemberTileView_left"
       >
         <div
           class="mx_MemberTileView_avatar"
         >
           <span
-            class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
             data-color="2"
             data-testid="avatar-img"
             data-type="round"
@@ -102,6 +110,7 @@ exports[`MemberTileView RoomMemberTileView should display an warning E2EIcon whe
         >
           <div
             class="mx_DisambiguatedProfile"
+            title="@userId:matrix.org (@userId:matrix.org)"
           >
             <span
               class=""
@@ -113,10 +122,11 @@ exports[`MemberTileView RoomMemberTileView should display an warning E2EIcon whe
         </div>
       </div>
       <div
+        aria-hidden="true"
         class="mx_MemberTileView_right"
       >
         <div
-          aria-labelledby="«r8»"
+          aria-labelledby="_r_0_"
           class="mx_E2EIconView"
         >
           <svg
@@ -142,19 +152,22 @@ exports[`MemberTileView RoomMemberTileView should not display an E2EIcon when th
 <div>
   <div>
     <div
-      aria-label="@userId:matrix.org (power 0)"
+      aria-label="@userId:matrix.org"
+      aria-posinset="1"
+      aria-setsize="1"
       class="mx_AccessibleButton mx_MemberTileView"
-      role="button"
-      tabindex="-1"
+      role="option"
+      tabindex="0"
     >
       <div
+        aria-hidden="true"
         class="mx_MemberTileView_left"
       >
         <div
           class="mx_MemberTileView_avatar"
         >
           <span
-            class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
             data-color="2"
             data-testid="avatar-img"
             data-type="round"
@@ -171,6 +184,7 @@ exports[`MemberTileView RoomMemberTileView should not display an E2EIcon when th
         >
           <div
             class="mx_DisambiguatedProfile"
+            title="@userId:matrix.org (@userId:matrix.org)"
           >
             <span
               class=""
@@ -182,6 +196,7 @@ exports[`MemberTileView RoomMemberTileView should not display an E2EIcon when th
         </div>
       </div>
       <div
+        aria-hidden="true"
         class="mx_MemberTileView_right"
       />
     </div>
@@ -193,11 +208,15 @@ exports[`MemberTileView ThreePidInviteTileView renders ThreePidInvite correctly
 <div>
   <div>
     <div
+      aria-label="Foobar"
+      aria-posinset="1"
+      aria-setsize="1"
       class="mx_AccessibleButton mx_MemberTileView"
-      role="button"
-      tabindex="-1"
+      role="option"
+      tabindex="0"
     >
       <div
+        aria-hidden="true"
         class="mx_MemberTileView_left"
       >
         <div
@@ -205,7 +224,7 @@ exports[`MemberTileView ThreePidInviteTileView renders ThreePidInvite correctly
         >
           <span
             aria-hidden="true"
-            class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
             data-color="1"
             data-testid="avatar-img"
             data-type="round"
@@ -223,6 +242,7 @@ exports[`MemberTileView ThreePidInviteTileView renders ThreePidInvite correctly
         </div>
       </div>
       <div
+        aria-hidden="true"
         class="mx_MemberTileView_right"
       >
         <div
@@ -231,7 +251,7 @@ exports[`MemberTileView ThreePidInviteTileView renders ThreePidInvite correctly
           Invited
         </div>
         <div
-          class="mx_Flex mx_InvitedIconView"
+          class="_flex_4dswl_9 mx_InvitedIconView"
           style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: 0; --mx-flex-wrap: nowrap;"
         >
           <svg
diff --git a/test/unit-tests/components/views/rooms/memberlist/__snapshots__/PresenceIconView-test.tsx.snap b/test/unit-tests/components/views/rooms/memberlist/__snapshots__/PresenceIconView-test.tsx.snap
index fa0f72239f..0ea051a108 100644
--- a/test/unit-tests/components/views/rooms/memberlist/__snapshots__/PresenceIconView-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/memberlist/__snapshots__/PresenceIconView-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<PresenceIconView/> renders correctly for presence=busy 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/rooms/memberlist/common.tsx b/test/unit-tests/components/views/rooms/memberlist/common.tsx
index 786c9c875e..30ea7e9c81 100644
--- a/test/unit-tests/components/views/rooms/memberlist/common.tsx
+++ b/test/unit-tests/components/views/rooms/memberlist/common.tsx
@@ -9,6 +9,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { act } from "react";
 import { render, type RenderResult, waitFor } from "jest-matrix-react";
+import { VirtuosoMockContext } from "react-virtuoso";
 import {
     Room,
     type MatrixClient,
@@ -107,6 +108,12 @@ export async function renderMemberList(
         members: {},
         getMember: jest.fn(),
         getStateEvents: ((eventType, stateKey) => (stateKey === undefined ? [] : null)) as RoomState["getStateEvents"], // ignore 3pid invites
+        getInvitedMemberCount: jest.fn().mockReturnValue(0),
+        getJoinedMemberCount: jest
+            .fn()
+            .mockReturnValue(adminUsers.length + moderatorUsers.length + defaultUsers.length),
+        on: jest.fn(),
+        off: jest.fn(),
     } as unknown as RoomState;
     for (const member of [...adminUsers, ...moderatorUsers, ...defaultUsers]) {
         memberListRoom.currentState.members[member.userId] = member;
@@ -121,6 +128,13 @@ export async function renderMemberList(
                 <MemberListView roomId={memberListRoom.roomId} onClose={() => {}} />
             </SDKContext.Provider>
         </MatrixClientContext.Provider>,
+        {
+            wrapper: ({ children }) => (
+                <VirtuosoMockContext.Provider value={{ viewportHeight: 600, itemHeight: 56 }}>
+                    <>{children}</>
+                </VirtuosoMockContext.Provider>
+            ),
+        },
     );
     await waitFor(async () => {
         expect(root.container.querySelectorAll(".mx_MemberTileView")).toHaveLength(usersPerLevel * 3);
diff --git a/test/unit-tests/components/views/rooms/wysiwyg_composer/SendWysiwygComposer-test.tsx b/test/unit-tests/components/views/rooms/wysiwyg_composer/SendWysiwygComposer-test.tsx
index d8215a101e..c38b95a1a5 100644
--- a/test/unit-tests/components/views/rooms/wysiwyg_composer/SendWysiwygComposer-test.tsx
+++ b/test/unit-tests/components/views/rooms/wysiwyg_composer/SendWysiwygComposer-test.tsx
@@ -24,6 +24,7 @@ import {
 import { setSelection } from "../../../../../../src/components/views/rooms/wysiwyg_composer/utils/selection";
 import { createMocks } from "./utils";
 import { ScopedRoomContextProvider } from "../../../../../../src/contexts/ScopedRoomContext.tsx";
+import { E2EStatus } from "../../../../../../src/utils/ShieldUtils.ts";
 
 jest.mock("../../../../../../src/components/views/rooms/EmojiButton", () => ({
     EmojiButton: ({ addEmoji }: { addEmoji: (emoji: string) => void }) => {
@@ -69,6 +70,7 @@ describe("SendWysiwygComposer", () => {
         disabled = false,
         isRichTextEnabled = true,
         placeholder?: string,
+        e2eStatus?: E2EStatus,
     ) => {
         return render(
             <MatrixClientContext.Provider value={mockClient}>
@@ -80,6 +82,7 @@ describe("SendWysiwygComposer", () => {
                         isRichTextEnabled={isRichTextEnabled}
                         menuPosition={aboveLeftOf({ top: 0, bottom: 0, right: 0 })}
                         placeholder={placeholder}
+                        e2eStatus={e2eStatus}
                     />
                 </ScopedRoomContextProvider>
             </MatrixClientContext.Provider>,
@@ -322,4 +325,30 @@ describe("SendWysiwygComposer", () => {
             });
         },
     );
+
+    describe.each([{ isRichTextEnabled: true }, { isRichTextEnabled: false }])(
+        "Left icon when %s",
+        ({ isRichTextEnabled }) => {
+            it.each([
+                [E2EStatus.Verified, "mx_E2EIcon_verified"],
+                [E2EStatus.Warning, "mx_E2EIcon_warning"],
+                [undefined, undefined],
+            ])("Should render left icon when e2eStatus is %s", async (e2eStatus, expectedClass) => {
+                // When
+                customRender(jest.fn(), jest.fn(), false, isRichTextEnabled, undefined, e2eStatus);
+                await waitFor(() => expect(screen.getByRole("textbox")).toHaveAttribute("contentEditable", "true"));
+                const leftIcon = screen.getByTestId("e2e-icon");
+                // Then
+                expect(leftIcon).toBeInTheDocument();
+                expect(leftIcon).toHaveClass("mx_E2EIcon");
+                if (expectedClass) {
+                    // eslint-disable-next-line jest/no-conditional-expect
+                    expect(leftIcon.querySelector("svg")).toHaveClass(expectedClass);
+                } else {
+                    // eslint-disable-next-line jest/no-conditional-expect
+                    expect(leftIcon.querySelector("svg")).not.toBeInTheDocument();
+                }
+            });
+        },
+    );
 });
diff --git a/test/unit-tests/components/views/rooms/wysiwyg_composer/components/FormattingButtons-test.tsx b/test/unit-tests/components/views/rooms/wysiwyg_composer/components/FormattingButtons-test.tsx
index 94d207eb91..5412f96892 100644
--- a/test/unit-tests/components/views/rooms/wysiwyg_composer/components/FormattingButtons-test.tsx
+++ b/test/unit-tests/components/views/rooms/wysiwyg_composer/components/FormattingButtons-test.tsx
@@ -194,4 +194,14 @@ describe("FormattingButtons", () => {
         expect(screen.getByLabelText("Indent increase")).toBeInTheDocument();
         expect(screen.getByLabelText("Indent decrease")).toBeInTheDocument();
     });
+
+    it("Every button should when disabled the component is disabled", () => {
+        renderComponent({ disabled: true });
+
+        Object.values(testCases).forEach((testCase) => {
+            const { label } = testCase;
+            expect(screen.getByLabelText(label)).toHaveClass(classes.disabled);
+            expect(screen.getByLabelText(label)).toBeDisabled();
+        });
+    });
 });
diff --git a/test/unit-tests/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete-test.tsx b/test/unit-tests/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete-test.tsx
index 8a3d0af791..70809716a4 100644
--- a/test/unit-tests/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete-test.tsx
+++ b/test/unit-tests/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete-test.tsx
@@ -66,6 +66,7 @@ describe("WysiwygAutocomplete", () => {
     const mockHandleMention = jest.fn();
     const mockHandleCommand = jest.fn();
     const mockHandleAtRoomMention = jest.fn();
+    const mockHandleEmoji = jest.fn();
 
     const renderComponent = (props: Partial<React.ComponentProps<typeof WysiwygAutocomplete>> = {}) => {
         const mockClient = stubClient();
@@ -81,6 +82,7 @@ describe("WysiwygAutocomplete", () => {
                         handleMention={mockHandleMention}
                         handleCommand={mockHandleCommand}
                         handleAtRoomMention={mockHandleAtRoomMention}
+                        handleEmoji={mockHandleEmoji}
                         {...props}
                     />
                 </ScopedRoomContextProvider>
@@ -96,6 +98,7 @@ describe("WysiwygAutocomplete", () => {
                 handleMention={mockHandleMention}
                 handleCommand={mockHandleCommand}
                 handleAtRoomMention={mockHandleAtRoomMention}
+                handleEmoji={mockHandleEmoji}
             />,
         );
         expect(screen.queryByTestId("autocomplete-wrapper")).not.toBeInTheDocument();
diff --git a/test/unit-tests/components/views/rooms/wysiwyg_composer/components/WysiwygComposer-test.tsx b/test/unit-tests/components/views/rooms/wysiwyg_composer/components/WysiwygComposer-test.tsx
index 2d670dbc6b..ce4eb8634f 100644
--- a/test/unit-tests/components/views/rooms/wysiwyg_composer/components/WysiwygComposer-test.tsx
+++ b/test/unit-tests/components/views/rooms/wysiwyg_composer/components/WysiwygComposer-test.tsx
@@ -151,6 +151,25 @@ describe("WysiwygComposer", () => {
             // Then it sends a message
             await waitFor(() => expect(onSend).toHaveBeenCalledTimes(0));
         });
+
+        it("Should disable formatting buttons when a slash command is entered", async () => {
+            // When
+            fireEvent.input(screen.getByRole("textbox"), {
+                data: "/rainbow",
+                inputType: "insertText",
+            });
+
+            // Then - wait for all buttons to be rendered and have the disabled class
+            await waitFor(() => {
+                const container = screen.getByTestId("WysiwygComposer");
+                const formattingButtons = container.querySelectorAll(".mx_FormattingButtons_Button");
+                expect(formattingButtons.length).toBeGreaterThan(0);
+
+                formattingButtons.forEach((btn) => {
+                    expect(btn).toHaveClass("mx_FormattingButtons_disabled");
+                });
+            });
+        });
     });
 
     describe("Mentions and commands", () => {
@@ -215,6 +234,11 @@ describe("WysiwygComposer", () => {
                 range: { start: 1, end: 1 },
                 component: <div>community</div>,
             },
+            {
+                completion: "😄",
+                range: { start: 1, end: 1 },
+                component: <div>😄</div>,
+            },
         ];
 
         const constructMockProvider = (data: ICompletion[]) =>
@@ -416,6 +440,16 @@ describe("WysiwygComposer", () => {
             // check that it we still have the initial text
             expect(screen.getByText(initialInput)).toBeInTheDocument();
         });
+
+        it("selecting an emoji suggestion inserts the emoji", async () => {
+            await insertMentionInput();
+
+            // select the room suggestion
+            await userEvent.click(screen.getByText("😄"));
+
+            // check that it has inserted the plain text
+            expect(screen.getByText("😄")).toBeInTheDocument();
+        });
     });
 
     describe("When emoticons should be replaced by emojis", () => {
diff --git a/test/unit-tests/components/views/rooms/wysiwyg_composer/components/__snapshots__/FormattingButtons-test.tsx.snap b/test/unit-tests/components/views/rooms/wysiwyg_composer/components/__snapshots__/FormattingButtons-test.tsx.snap
index 602c40f615..c27d3922e1 100644
--- a/test/unit-tests/components/views/rooms/wysiwyg_composer/components/__snapshots__/FormattingButtons-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/wysiwyg_composer/components/__snapshots__/FormattingButtons-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`FormattingButtons renders in german 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/rooms/wysiwyg_composer/hooks/useContainsCommand-test.tsx b/test/unit-tests/components/views/rooms/wysiwyg_composer/hooks/useContainsCommand-test.tsx
new file mode 100644
index 0000000000..084c2b487f
--- /dev/null
+++ b/test/unit-tests/components/views/rooms/wysiwyg_composer/hooks/useContainsCommand-test.tsx
@@ -0,0 +1,161 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { renderHook, waitFor } from "jest-matrix-react";
+import { Room } from "matrix-js-sdk/src/matrix";
+
+import { useContainsCommand } from "../../../../../../../src/components/views/rooms/wysiwyg_composer/hooks/useContainsCommand";
+import { stubClient } from "../../../../../../test-utils";
+
+// Mock CommandProvider
+const mockGetCompletions = jest.fn();
+jest.mock("../../../../../../../src/autocomplete/CommandProvider", () => {
+    return jest.fn().mockImplementation(() => ({
+        getCompletions: mockGetCompletions,
+    }));
+});
+
+describe("useContainsCommand", () => {
+    let room: Room;
+
+    beforeEach(() => {
+        const client = stubClient();
+        room = new Room("!room:example.com", client, "@user:example.com");
+        mockGetCompletions.mockClear();
+        // Default mock to return empty promise
+        mockGetCompletions.mockResolvedValue([]);
+    });
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it("should return false when content is null", async () => {
+        mockGetCompletions.mockResolvedValue([]);
+
+        const { result } = renderHook(() => useContainsCommand(null, room));
+
+        await waitFor(() => {
+            expect(result.current).toBe(false);
+        });
+        expect(mockGetCompletions).not.toHaveBeenCalled();
+    });
+
+    it("should return false when content is empty string", async () => {
+        mockGetCompletions.mockResolvedValue([]);
+
+        const { result } = renderHook(() => useContainsCommand("", room));
+
+        await waitFor(() => {
+            expect(result.current).toBe(false);
+        });
+        expect(mockGetCompletions).not.toHaveBeenCalled();
+    });
+
+    it("should return true when content contains a valid command", async () => {
+        mockGetCompletions.mockResolvedValue([{ type: "command", completion: "/spoiler" }]);
+
+        const { result } = renderHook(() => useContainsCommand("/spoiler test message", room));
+
+        await waitFor(() => {
+            expect(result.current).toBe(true);
+        });
+        expect(mockGetCompletions).toHaveBeenCalledWith("/spoiler test message", { start: 0, end: 0 });
+    });
+
+    it("should return false when content contains no valid commands", async () => {
+        mockGetCompletions.mockResolvedValue([]);
+
+        const { result } = renderHook(() => useContainsCommand("/invalidcommand", room));
+
+        await waitFor(() => {
+            expect(result.current).toBe(false);
+        });
+        expect(mockGetCompletions).toHaveBeenCalledWith("/invalidcommand", { start: 0, end: 0 });
+    });
+
+    it("should return true for partial command matches", async () => {
+        mockGetCompletions.mockResolvedValue([
+            { type: "command", completion: "/spoiler" },
+            { type: "command", completion: "/shrug" },
+        ]);
+
+        const { result } = renderHook(() => useContainsCommand("/sp", room));
+
+        await waitFor(() => {
+            expect(result.current).toBe(true);
+        });
+        expect(mockGetCompletions).toHaveBeenCalledWith("/sp", { start: 0, end: 0 });
+    });
+
+    it("should update when content changes", async () => {
+        mockGetCompletions.mockResolvedValue([]);
+
+        const { result, rerender } = renderHook(({ content, room }) => useContainsCommand(content, room), {
+            initialProps: { content: "/invalid", room },
+        });
+
+        await waitFor(() => {
+            expect(result.current).toBe(false);
+        });
+
+        // Change to valid command
+        mockGetCompletions.mockResolvedValue([{ type: "command", completion: "/spoiler" }]);
+
+        rerender({ content: "/spoiler", room });
+
+        await waitFor(() => {
+            expect(result.current).toBe(true);
+        });
+        expect(mockGetCompletions).toHaveBeenCalledWith("/spoiler", { start: 0, end: 0 });
+    });
+
+    it("should handle CommandProvider errors gracefully", async () => {
+        mockGetCompletions.mockRejectedValueOnce(new Error("Provider error"));
+
+        const { result } = renderHook(() => useContainsCommand("/test", room));
+
+        // Should remain false even if promise rejects
+        await waitFor(() => {
+            expect(result.current).toBe(false);
+        });
+    });
+
+    it("should return false for non-command content", async () => {
+        mockGetCompletions.mockResolvedValue([]); // CommandProvider returns empty for non-commands
+
+        const { result } = renderHook(() => useContainsCommand("regular message", room));
+
+        await waitFor(() => {
+            expect(result.current).toBe(false);
+        });
+        expect(mockGetCompletions).toHaveBeenCalledWith("regular message", { start: 0, end: 0 });
+    });
+
+    it("should reset to false when switching to null content", async () => {
+        mockGetCompletions.mockResolvedValue([{ type: "command", completion: "/spoiler" }]);
+
+        const { result, rerender } = renderHook(
+            ({ content, room }: { content: string | null; room: Room | undefined }) =>
+                useContainsCommand(content, room),
+            {
+                initialProps: { content: "/spoiler" as string | null, room: room as Room | undefined },
+            },
+        );
+
+        await waitFor(() => {
+            expect(result.current).toBe(true);
+        });
+
+        // Switch to null content
+        rerender({ content: null, room });
+
+        await waitFor(() => {
+            expect(result.current).toBe(false);
+        });
+    });
+});
diff --git a/test/unit-tests/components/views/rooms/wysiwyg_composer/hooks/useSuggestion-test.tsx b/test/unit-tests/components/views/rooms/wysiwyg_composer/hooks/useSuggestion-test.tsx
index 203f82cc66..8adc38a638 100644
--- a/test/unit-tests/components/views/rooms/wysiwyg_composer/hooks/useSuggestion-test.tsx
+++ b/test/unit-tests/components/views/rooms/wysiwyg_composer/hooks/useSuggestion-test.tsx
@@ -14,6 +14,7 @@ import {
     processEmojiReplacement,
     processMention,
     processSelectionChange,
+    processTextReplacement,
 } from "../../../../../../../src/components/views/rooms/wysiwyg_composer/hooks/useSuggestion";
 
 function createMockPlainTextSuggestionPattern(props: Partial<Suggestion> = {}): Suggestion {
@@ -382,6 +383,95 @@ describe("findSuggestionInText", () => {
     });
 });
 
+describe("processTextReplacement", () => {
+    it("does not change parent hook state if suggestionData is null", () => {
+        const mockSetSuggestionData = jest.fn();
+        const mockSetText = jest.fn();
+        const replacementText = "replacement";
+
+        // call the function with null suggestionData
+        processTextReplacement(replacementText, null, mockSetSuggestionData, mockSetText);
+
+        // check that the parent state setters have not been called
+        expect(mockSetText).not.toHaveBeenCalled();
+        expect(mockSetSuggestionData).not.toHaveBeenCalled();
+    });
+
+    it("does not change parent hook state if existingContent is null", () => {
+        const mockSetSuggestionData = jest.fn();
+        const mockSetText = jest.fn();
+        const replacementText = "replacement";
+
+        // create a mock node with null textContent
+        const mockNode = {
+            textContent: null,
+        } as unknown as Text;
+
+        const mockSuggestion: Suggestion = {
+            mappedSuggestion: { keyChar: ":", type: "emoji", text: ":)" },
+            node: mockNode,
+            startOffset: 0,
+            endOffset: 2,
+        };
+
+        // call the function with a node that has null textContent
+        processTextReplacement(replacementText, mockSuggestion, mockSetSuggestionData, mockSetText);
+
+        // check that the parent state setters have not been called
+        expect(mockSetText).not.toHaveBeenCalled();
+        expect(mockSetSuggestionData).not.toHaveBeenCalled();
+    });
+
+    it("can replace text content when both suggestionData and existingContent are valid", () => {
+        const mockSetSuggestionData = jest.fn();
+        const mockSetText = jest.fn();
+        const replacementText = "🙂";
+        const initialText = "Hello :) world";
+
+        // create a div and append a text node to it
+        const editorDiv = document.createElement("div");
+        const textNode = document.createTextNode(initialText);
+        editorDiv.appendChild(textNode);
+        document.body.appendChild(editorDiv);
+
+        const mockSuggestion: Suggestion = {
+            mappedSuggestion: { keyChar: ":", type: "emoji", text: ":)" },
+            node: textNode,
+            startOffset: 6, // position of ":)"
+            endOffset: 8, // end of ":)"
+        };
+
+        // mock document.getSelection
+        const mockSelection = {
+            setBaseAndExtent: jest.fn(),
+        };
+        jest.spyOn(document, "getSelection").mockReturnValue(mockSelection as any);
+
+        // call the function
+        processTextReplacement(replacementText, mockSuggestion, mockSetSuggestionData, mockSetText);
+
+        // check that the text content was updated correctly
+        expect(textNode.textContent).toBe("Hello 🙂 world");
+
+        // check that setText was called with the new content
+        expect(mockSetText).toHaveBeenCalledWith("Hello 🙂 world");
+
+        // check that suggestionData was cleared
+        expect(mockSetSuggestionData).toHaveBeenCalledWith(null);
+
+        // check that the cursor was positioned at the end
+        expect(mockSelection.setBaseAndExtent).toHaveBeenCalledWith(
+            textNode,
+            "Hello 🙂 world".length,
+            textNode,
+            "Hello 🙂 world".length,
+        );
+
+        // clean up
+        document.body.removeChild(editorDiv);
+    });
+});
+
 describe("getMappedSuggestion", () => {
     it("returns null when the first character is not / # @", () => {
         expect(getMappedSuggestion("Zzz")).toBe(null);
diff --git a/test/unit-tests/components/views/rooms/wysiwyg_composer/hooks/utils-test.tsx b/test/unit-tests/components/views/rooms/wysiwyg_composer/hooks/utils-test.tsx
index f47c8075fd..8ee3302824 100644
--- a/test/unit-tests/components/views/rooms/wysiwyg_composer/hooks/utils-test.tsx
+++ b/test/unit-tests/components/views/rooms/wysiwyg_composer/hooks/utils-test.tsx
@@ -85,12 +85,13 @@ describe("handleClipboardEvent", () => {
             clipboardData: { files: ["something here"], types: [] },
         });
         const output = handleClipboardEvent(originalEvent, originalEvent.clipboardData, mockRoomState, mockClient);
-
+        const mockReplyToEvent = {} as unknown as MatrixEvent;
         expect(sendContentListToRoomSpy).toHaveBeenCalledTimes(1);
         expect(sendContentListToRoomSpy).toHaveBeenCalledWith(
             originalEvent.clipboardData?.files,
             mockRoom.roomId,
             undefined, // this is the event relation, an optional arg
+            mockReplyToEvent,
             mockClient,
             mockRoomState.timelineRenderingType,
         );
@@ -103,6 +104,7 @@ describe("handleClipboardEvent", () => {
             clipboardData: { files: ["something here"], types: [] },
         });
         const mockEventRelation = {} as unknown as IEventRelation;
+        const mockReplyToEvent = {} as unknown as MatrixEvent;
         const output = handleClipboardEvent(
             originalEvent,
             originalEvent.clipboardData,
@@ -116,6 +118,7 @@ describe("handleClipboardEvent", () => {
             originalEvent.clipboardData?.files,
             mockRoom.roomId,
             mockEventRelation, // this is the event relation, an optional arg
+            mockReplyToEvent,
             mockClient,
             mockRoomState.timelineRenderingType,
         );
diff --git a/test/unit-tests/components/views/rooms/wysiwyg_composer/utils.ts b/test/unit-tests/components/views/rooms/wysiwyg_composer/utils.ts
index 3a9e18fd0a..816f9ab672 100644
--- a/test/unit-tests/components/views/rooms/wysiwyg_composer/utils.ts
+++ b/test/unit-tests/components/views/rooms/wysiwyg_composer/utils.ts
@@ -9,8 +9,8 @@ Please see LICENSE files in the repository root for full details.
 import { type EventTimeline, type MatrixEvent } from "matrix-js-sdk/src/matrix";
 
 import { getRoomContext, mkEvent, mkStubRoom, stubClient } from "../../../../../test-utils";
-import { type IRoomState } from "../../../../../../src/components/structures/RoomView";
 import EditorStateTransfer from "../../../../../../src/utils/EditorStateTransfer";
+import type { RoomContextType } from "../../../../../../src/contexts/RoomContext";
 
 export function createMocks(eventContent = "Replying <strong>to</strong> this new content") {
     const mockClient = stubClient();
@@ -31,7 +31,7 @@ export function createMocks(eventContent = "Replying <strong>to</strong> this ne
         return eventId === mockEvent.getId() ? mockEvent : null;
     });
 
-    const defaultRoomContext: IRoomState = getRoomContext(mockRoom, {
+    const defaultRoomContext: RoomContextType = getRoomContext(mockRoom, {
         liveTimeline: { getEvents: (): MatrixEvent[] => [] } as unknown as EventTimeline,
     });
 
diff --git a/test/unit-tests/components/views/rooms/wysiwyg_composer/utils/message-test.ts b/test/unit-tests/components/views/rooms/wysiwyg_composer/utils/message-test.ts
index 23f46244db..c5dbea367d 100644
--- a/test/unit-tests/components/views/rooms/wysiwyg_composer/utils/message-test.ts
+++ b/test/unit-tests/components/views/rooms/wysiwyg_composer/utils/message-test.ts
@@ -230,7 +230,7 @@ describe("message", () => {
                 });
 
                 // Then
-                expect(getCommandSpy).toHaveBeenCalledWith(validCommand);
+                expect(getCommandSpy).toHaveBeenCalledWith(mockRoom.roomId, validCommand);
             });
 
             it("does not call getCommand for valid command with invalid prefix", async () => {
diff --git a/test/unit-tests/components/views/settings/AddRemoveThreepids-test.tsx b/test/unit-tests/components/views/settings/AddRemoveThreepids-test.tsx
index 6d3d3de692..58306a508d 100644
--- a/test/unit-tests/components/views/settings/AddRemoveThreepids-test.tsx
+++ b/test/unit-tests/components/views/settings/AddRemoveThreepids-test.tsx
@@ -45,9 +45,9 @@ describe("AddRemoveThreepids", () => {
         client = stubClient();
     });
 
-    afterEach(() => {
+    afterEach(async () => {
         jest.restoreAllMocks();
-        clearAllModals();
+        await clearAllModals();
         cleanup();
     });
 
diff --git a/test/unit-tests/components/views/settings/AvatarSetting-test.tsx b/test/unit-tests/components/views/settings/AvatarSetting-test.tsx
index f6c4181b21..2d09c76232 100644
--- a/test/unit-tests/components/views/settings/AvatarSetting-test.tsx
+++ b/test/unit-tests/components/views/settings/AvatarSetting-test.tsx
@@ -25,18 +25,18 @@ describe("<AvatarSetting />", () => {
         stubClient();
     });
 
-    it("renders avatar with specified alt text", async () => {
-        const { queryByAltText } = render(
+    it("renders avatar with specified accessible name", async () => {
+        const { getByRole } = render(
             <AvatarSetting
                 placeholderId="blee"
                 placeholderName="boo"
-                avatarAltText="Avatar of Peter Fox"
+                avatarAccessibleName="Avatar of Peter Fox"
                 avatar="mxc://example.org/my-avatar"
             />,
         );
 
-        const imgElement = queryByAltText("Avatar of Peter Fox");
-        expect(imgElement).toBeInTheDocument();
+        const avatarButton = getByRole("button", { name: "Avatar of Peter Fox" });
+        expect(avatarButton).toBeInTheDocument();
     });
 
     it("renders a file as the avatar when supplied", async () => {
@@ -44,12 +44,13 @@ describe("<AvatarSetting />", () => {
             <AvatarSetting
                 placeholderId="blee"
                 placeholderName="boo"
-                avatarAltText="Avatar of Peter Fox"
+                avatarAccessibleName="Avatar of Peter Fox"
                 avatar={AVATAR_FILE}
             />,
         );
 
-        const imgElement = await screen.findByRole("button", { name: "Avatar of Peter Fox" });
+        const avatarButton = await screen.findByRole("button", { name: "Avatar of Peter Fox" });
+        const imgElement = avatarButton.querySelector("img");
         expect(imgElement).toBeInTheDocument();
         expect(imgElement).toHaveAttribute("src", "data:image/gif;base64," + BASE64_GIF);
     });
@@ -63,7 +64,7 @@ describe("<AvatarSetting />", () => {
                 placeholderId="blee"
                 placeholderName="boo"
                 avatar="mxc://example.org/my-avatar"
-                avatarAltText="Avatar of Peter Fox"
+                avatarAccessibleName="Avatar of Peter Fox"
                 onChange={onChange}
             />,
         );
@@ -82,7 +83,7 @@ describe("<AvatarSetting />", () => {
                 placeholderId="blee"
                 placeholderName="boo"
                 avatar="mxc://example.org/my-avatar"
-                avatarAltText="Avatar of Peter Fox"
+                avatarAccessibleName="Avatar of Peter Fox"
                 onChange={onChange}
             />,
         );
@@ -102,7 +103,7 @@ describe("<AvatarSetting />", () => {
                 placeholderId="blee"
                 placeholderName="boo"
                 avatar="mxc://example.org/my-avatar"
-                avatarAltText="Avatar of Peter Fox"
+                avatarAccessibleName="Avatar of Peter Fox"
                 onChange={onChange}
             />,
         );
diff --git a/test/unit-tests/components/views/settings/LayoutSwitcher-test.tsx b/test/unit-tests/components/views/settings/LayoutSwitcher-test.tsx
index 5d3f1709e2..5ff5f888c7 100644
--- a/test/unit-tests/components/views/settings/LayoutSwitcher-test.tsx
+++ b/test/unit-tests/components/views/settings/LayoutSwitcher-test.tsx
@@ -70,12 +70,12 @@ describe("<LayoutSwitcher />", () => {
             await SettingsStore.setValue("useCompactLayout", null, SettingLevel.DEVICE, true);
             await renderLayoutSwitcher();
 
-            expect(screen.getByRole("checkbox", { name: "Show compact text and messages" })).toBeChecked();
+            expect(screen.getByRole("switch", { name: "Show compact text and messages" })).toBeChecked();
         });
 
         it("should change the setting when toggled", async () => {
             await renderLayoutSwitcher();
-            act(() => screen.getByRole("checkbox", { name: "Show compact text and messages" }).click());
+            act(() => screen.getByRole("switch", { name: "Show compact text and messages" }).click());
 
             await waitFor(() => expect(SettingsStore.getValue("useCompactLayout")).toBe(true));
         });
@@ -83,7 +83,7 @@ describe("<LayoutSwitcher />", () => {
         it("should be disabled when the modern layout is not enabled", async () => {
             await SettingsStore.setValue("layout", null, SettingLevel.DEVICE, Layout.Bubble);
             await renderLayoutSwitcher();
-            expect(screen.getByRole("checkbox", { name: "Show compact text and messages" })).toBeDisabled();
+            expect(screen.getByRole("switch", { name: "Show compact text and messages" })).toBeDisabled();
         });
     });
 });
diff --git a/test/unit-tests/components/views/settings/Notifications-test.tsx b/test/unit-tests/components/views/settings/Notifications-test.tsx
index 1566013aba..6e349baef0 100644
--- a/test/unit-tests/components/views/settings/Notifications-test.tsx
+++ b/test/unit-tests/components/views/settings/Notifications-test.tsx
@@ -37,6 +37,7 @@ import {
 import { mocked } from "jest-mock";
 import userEvent from "@testing-library/user-event";
 import { PushProcessor } from "matrix-js-sdk/src/pushprocessor";
+import { Form } from "@vector-im/compound-web";
 
 import Notifications from "../../../../../src/components/views/settings/Notifications";
 import SettingsStore from "../../../../../src/settings/SettingsStore";
@@ -248,7 +249,12 @@ const pushRules: IPushRules = {
 const flushPromises = async () => await new Promise((resolve) => window.setTimeout(resolve));
 
 describe("<Notifications />", () => {
-    const getComponent = () => render(<Notifications />);
+    const getComponent = () =>
+        render(
+            <Form.Root>
+                <Notifications />
+            </Form.Root>,
+        );
 
     // get component, wait for async data and force a render
     const getComponentAndWait = async () => {
@@ -347,11 +353,11 @@ describe("<Notifications />", () => {
         it("renders switches correctly", async () => {
             await getComponentAndWait();
 
-            expect(screen.getByTestId("notif-master-switch")).toBeInTheDocument();
-            expect(screen.getByTestId("notif-device-switch")).toBeInTheDocument();
-            expect(screen.getByTestId("notif-setting-notificationsEnabled")).toBeInTheDocument();
-            expect(screen.getByTestId("notif-setting-notificationBodyEnabled")).toBeInTheDocument();
-            expect(screen.getByTestId("notif-setting-audioNotificationsEnabled")).toBeInTheDocument();
+            expect(screen.getByLabelText("Enable notifications for this account")).toBeInTheDocument();
+            expect(screen.getByLabelText("Enable notifications for this device")).toBeInTheDocument();
+            expect(screen.getByLabelText("Enable desktop notifications for this session")).toBeInTheDocument();
+            expect(screen.getByLabelText("Show message in desktop notification")).toBeInTheDocument();
+            expect(screen.getByLabelText("Enable audible notifications for this session")).toBeInTheDocument();
         });
 
         describe("email switches", () => {
@@ -370,7 +376,7 @@ describe("<Notifications />", () => {
 
             it("renders email switches correctly when email 3pids exist", async () => {
                 await getComponentAndWait();
-                expect(screen.getByTestId("notif-email-switch")).toBeInTheDocument();
+                expect(screen.getByLabelText(`Enable email notifications for ${testEmail}`)).toBeInTheDocument();
             });
 
             it("renders email switches correctly when notifications are on for email", async () => {
@@ -379,14 +385,14 @@ describe("<Notifications />", () => {
                 });
                 await getComponentAndWait();
 
-                const emailSwitch = screen.getByTestId("notif-email-switch");
-                expect(emailSwitch.querySelector('[aria-checked="true"]')).toBeInTheDocument();
+                const emailSwitch = screen.getByLabelText(`Enable email notifications for ${testEmail}`);
+                expect(emailSwitch).toBeChecked();
             });
 
             it("enables email notification when toggling on", async () => {
                 await getComponentAndWait();
 
-                const emailToggle = screen.getByTestId("notif-email-switch").querySelector('div[role="switch"]')!;
+                const emailToggle = screen.getByLabelText(`Enable email notifications for ${testEmail}`);
                 fireEvent.click(emailToggle);
 
                 expect(mockClient.setPusher).toHaveBeenCalledWith(
@@ -405,7 +411,7 @@ describe("<Notifications />", () => {
                 mockClient.setPusher.mockRejectedValue({});
                 await getComponentAndWait();
 
-                const emailToggle = screen.getByTestId("notif-email-switch").querySelector('div[role="switch"]')!;
+                const emailToggle = screen.getByLabelText(`Enable email notifications for ${testEmail}`);
                 fireEvent.click(emailToggle);
 
                 // force render
@@ -431,7 +437,7 @@ describe("<Notifications />", () => {
                 mockClient.getPushers.mockResolvedValue({ pushers: [testPusher] });
                 await getComponentAndWait();
 
-                const emailToggle = screen.getByTestId("notif-email-switch").querySelector('div[role="switch"]')!;
+                const emailToggle = screen.getByLabelText(`Enable email notifications for ${testEmail}`);
                 fireEvent.click(emailToggle);
 
                 expect(mockClient.removePusher).toHaveBeenCalledWith(testPusher.pushkey, testPusher.app_id);
@@ -452,22 +458,20 @@ describe("<Notifications />", () => {
 
         it("toggles and sets settings correctly", async () => {
             await getComponentAndWait();
-            let audioNotifsToggle!: HTMLDivElement;
+            let audioNotifsToggle!: HTMLInputElement;
 
             const update = () => {
-                audioNotifsToggle = screen
-                    .getByTestId("notif-setting-audioNotificationsEnabled")
-                    .querySelector('div[role="switch"]')!;
+                audioNotifsToggle = screen.getByLabelText("Enable audible notifications for this session");
             };
             update();
 
-            expect(audioNotifsToggle.getAttribute("aria-checked")).toEqual("true");
+            expect(audioNotifsToggle).toBeChecked();
             expect(SettingsStore.getValue("audioNotificationsEnabled")).toEqual(true);
 
             fireEvent.click(audioNotifsToggle);
             update();
 
-            expect(audioNotifsToggle.getAttribute("aria-checked")).toEqual("false");
+            expect(audioNotifsToggle).not.toBeChecked();
             expect(SettingsStore.getValue("audioNotificationsEnabled")).toEqual(false);
         });
     });
diff --git a/test/unit-tests/components/views/settings/ThemeChoicePanel-test.tsx b/test/unit-tests/components/views/settings/ThemeChoicePanel-test.tsx
index f1dbc9a2e0..5332845d1b 100644
--- a/test/unit-tests/components/views/settings/ThemeChoicePanel-test.tsx
+++ b/test/unit-tests/components/views/settings/ThemeChoicePanel-test.tsx
@@ -56,24 +56,24 @@ describe("<ThemeChoicePanel />", () => {
         describe("system theme", () => {
             it("should disable Match system theme", async () => {
                 render(<ThemeChoicePanel />);
-                expect(screen.getByRole("checkbox", { name: "Match system theme" })).not.toBeChecked();
+                expect(screen.getByRole("switch", { name: "Match system theme" })).not.toBeChecked();
             });
 
             it("should enable Match system theme", async () => {
                 await enableSystemTheme(true);
 
                 render(<ThemeChoicePanel />);
-                expect(screen.getByRole("checkbox", { name: "Match system theme" })).toBeChecked();
+                expect(screen.getByRole("switch", { name: "Match system theme" })).toBeChecked();
             });
 
             it("should change the system theme when clicked", async () => {
                 jest.spyOn(SettingsStore, "setValue");
 
                 render(<ThemeChoicePanel />);
-                act(() => screen.getByRole("checkbox", { name: "Match system theme" }).click());
+                act(() => screen.getByRole("switch", { name: "Match system theme" }).click());
 
                 // The system theme should be enabled
-                expect(screen.getByRole("checkbox", { name: "Match system theme" })).toBeChecked();
+                expect(screen.getByRole("switch", { name: "Match system theme" })).toBeChecked();
                 expect(SettingsStore.setValue).toHaveBeenCalledWith("use_system_theme", null, "device", true);
             });
         });
diff --git a/test/unit-tests/components/views/settings/__snapshots__/AddRemoveThreepids-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/AddRemoveThreepids-test.tsx.snap
index 0258ce7092..c77a16ed7f 100644
--- a/test/unit-tests/components/views/settings/__snapshots__/AddRemoveThreepids-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/__snapshots__/AddRemoveThreepids-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`AddRemoveThreepids should handle no email addresses 1`] = `
 <div>
@@ -61,14 +61,14 @@ exports[`AddRemoveThreepids should render email addresses 1`] = `
     >
       <input
         autocomplete="email"
-        id="mx_Field_14"
+        id="mx_Field_15"
         label="Email Address"
         placeholder="Email Address"
         type="text"
         value=""
       />
       <label
-        for="mx_Field_14"
+        for="mx_Field_15"
       >
         Email Address
       </label>
@@ -140,22 +140,31 @@ exports[`AddRemoveThreepids should render phone numbers 1`] = `
                 +1
               </span>
             </div>
-            <span
+            <svg
               class="mx_Dropdown_arrow"
-            />
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+              />
+            </svg>
           </div>
         </div>
       </span>
       <input
         autocomplete="tel-national"
-        id="mx_Field_15"
+        id="mx_Field_16"
         label="Phone Number"
         placeholder="Phone Number"
         type="text"
         value=""
       />
       <label
-        for="mx_Field_15"
+        for="mx_Field_16"
       >
         Phone Number
       </label>
diff --git a/test/unit-tests/components/views/settings/__snapshots__/ChangePassword-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/ChangePassword-test.tsx.snap
index be6c17d5af..c965beda7e 100644
--- a/test/unit-tests/components/views/settings/__snapshots__/ChangePassword-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/__snapshots__/ChangePassword-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<ChangePassword /> renders expected fields 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/settings/__snapshots__/EventIndexPanel-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/EventIndexPanel-test.tsx.snap
index 305b9e2d6a..e26a581e6e 100644
--- a/test/unit-tests/components/views/settings/__snapshots__/EventIndexPanel-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/__snapshots__/EventIndexPanel-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<EventIndexPanel /> when event index is initialised renders event index information 1`] = `
 <div>
@@ -26,14 +26,26 @@ exports[`<EventIndexPanel /> when event indexing is not supported renders link t
       Element can't securely cache encrypted messages locally while running in a web browser. Use 
       <a
         class="mx_ExternalLink"
-        href="https://element.io/get-started"
+        href="https://element.io/download"
         rel="noreferrer noopener"
         target="_blank"
       >
         Element Desktop
-        <i
+        <svg
           class="mx_ExternalLink_icon"
-        />
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+          />
+          <path
+            d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+          />
+        </svg>
       </a>
        for encrypted messages to appear in search results.
     </span>
@@ -55,9 +67,21 @@ exports[`<EventIndexPanel /> when event indexing is supported but not installed
         target="_blank"
       >
         search components added
-        <i
+        <svg
           class="mx_ExternalLink_icon"
-        />
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+          />
+          <path
+            d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+          />
+        </svg>
       </a>
       .
     </span>
diff --git a/test/unit-tests/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap
index a118c32823..772ab01eeb 100644
--- a/test/unit-tests/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`FontScalingPanel renders the font scaling UI 1`] = `
 <DocumentFragment>
@@ -135,13 +135,24 @@ exports[`FontScalingPanel renders the font scaling UI 1`] = `
         <div
           class="mx_Spinner"
         >
-          <div
+          <svg
             aria-label="Loading…"
-            class="mx_Spinner_icon"
+            class="_icon_11k6c_18"
             data-testid="spinner"
+            fill="currentColor"
+            height="1em"
             role="progressbar"
             style="width: 32px; height: 32px;"
-          />
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              clip-rule="evenodd"
+              d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+              fill-rule="evenodd"
+            />
+          </svg>
         </div>
       </div>
     </div>
diff --git a/test/unit-tests/components/views/settings/__snapshots__/KeyboardShortcut-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/KeyboardShortcut-test.tsx.snap
index e452b0a47a..268d7c30aa 100644
--- a/test/unit-tests/components/views/settings/__snapshots__/KeyboardShortcut-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/__snapshots__/KeyboardShortcut-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`KeyboardShortcut doesn't render + if last 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/settings/__snapshots__/LayoutSwitcher-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/LayoutSwitcher-test.tsx.snap
index 6c99c3fbeb..339a3e7d4a 100644
--- a/test/unit-tests/components/views/settings/__snapshots__/LayoutSwitcher-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/__snapshots__/LayoutSwitcher-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<LayoutSwitcher /> should render 1`] = `
 <DocumentFragment>
@@ -27,25 +27,25 @@ exports[`<LayoutSwitcher /> should render 1`] = `
           <label
             aria-label="Modern"
             class="_label_19upo_59"
-            for="radix-«r0»"
+            for="radix-_r_0_"
           >
             <div
               class="mxLayoutSwitcher_LayoutSelector_LayoutRadio_inline"
             >
               <div
-                class="_container_1e0uz_10"
+                class="_container_1qhtc_10"
               >
                 <input
                   checked=""
-                  class="_input_1e0uz_18"
-                  id="radix-«r0»"
+                  class="_input_1qhtc_18"
+                  id="radix-_r_0_"
                   name="layout"
                   title=""
                   type="radio"
                   value="group"
                 />
                 <div
-                  class="_ui_1e0uz_19"
+                  class="_ui_1qhtc_19"
                 />
               </div>
               <span>
@@ -84,7 +84,7 @@ exports[`<LayoutSwitcher /> should render 1`] = `
                   class="mx_EventTile_avatar"
                 >
                   <span
-                    class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+                    class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
                     data-color="2"
                     data-testid="avatar-img"
                     data-type="round"
@@ -97,6 +97,7 @@ exports[`<LayoutSwitcher /> should render 1`] = `
                 </div>
                 <div
                   class="mx_EventTile_line"
+                  id="1"
                 >
                   <div
                     class="mx_MTextBody mx_EventTile_content"
@@ -120,7 +121,19 @@ exports[`<LayoutSwitcher /> should render 1`] = `
                       role="button"
                       tabindex="0"
                     >
-                      <div />
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          clip-rule="evenodd"
+                          d="M15.706 2.637a2 2 0 0 1 2.829 0l2.828 2.828a2 2 0 0 1 0 2.829L9.605 20.052a1 1 0 0 1-.465.263L3.483 21.73a1 1 0 0 1-1.212-1.213l1.414-5.657a1 1 0 0 1 .263-.465zm1.224 7.262L14.102 7.07l-8.544 8.544-.943 3.771 3.771-.943z"
+                          fill-rule="evenodd"
+                        />
+                      </svg>
                     </div>
                     <div
                       aria-expanded="false"
@@ -154,24 +167,24 @@ exports[`<LayoutSwitcher /> should render 1`] = `
           <label
             aria-label="Message bubbles"
             class="_label_19upo_59"
-            for="radix-«r9»"
+            for="radix-_r_9_"
           >
             <div
               class="mxLayoutSwitcher_LayoutSelector_LayoutRadio_inline"
             >
               <div
-                class="_container_1e0uz_10"
+                class="_container_1qhtc_10"
               >
                 <input
-                  class="_input_1e0uz_18"
-                  id="radix-«r9»"
+                  class="_input_1qhtc_18"
+                  id="radix-_r_9_"
                   name="layout"
                   title=""
                   type="radio"
                   value="bubble"
                 />
                 <div
-                  class="_ui_1e0uz_19"
+                  class="_ui_1qhtc_19"
                 />
               </div>
               <span>
@@ -210,7 +223,7 @@ exports[`<LayoutSwitcher /> should render 1`] = `
                   class="mx_EventTile_avatar"
                 >
                   <span
-                    class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+                    class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
                     data-color="2"
                     data-testid="avatar-img"
                     data-type="round"
@@ -223,6 +236,7 @@ exports[`<LayoutSwitcher /> should render 1`] = `
                 </div>
                 <div
                   class="mx_EventTile_line"
+                  id="2"
                 >
                   <div
                     class="mx_MTextBody mx_EventTile_content"
@@ -246,7 +260,19 @@ exports[`<LayoutSwitcher /> should render 1`] = `
                       role="button"
                       tabindex="0"
                     >
-                      <div />
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          clip-rule="evenodd"
+                          d="M15.706 2.637a2 2 0 0 1 2.829 0l2.828 2.828a2 2 0 0 1 0 2.829L9.605 20.052a1 1 0 0 1-.465.263L3.483 21.73a1 1 0 0 1-1.212-1.213l1.414-5.657a1 1 0 0 1 .263-.465zm1.224 7.262L14.102 7.07l-8.544 8.544-.943 3.771 3.771-.943z"
+                          fill-rule="evenodd"
+                        />
+                      </svg>
                     </div>
                     <div
                       aria-expanded="false"
@@ -280,24 +306,24 @@ exports[`<LayoutSwitcher /> should render 1`] = `
           <label
             aria-label="IRC (experimental)"
             class="_label_19upo_59"
-            for="radix-«ri»"
+            for="radix-_r_i_"
           >
             <div
               class="mxLayoutSwitcher_LayoutSelector_LayoutRadio_inline"
             >
               <div
-                class="_container_1e0uz_10"
+                class="_container_1qhtc_10"
               >
                 <input
-                  class="_input_1e0uz_18"
-                  id="radix-«ri»"
+                  class="_input_1qhtc_18"
+                  id="radix-_r_i_"
                   name="layout"
                   title=""
                   type="radio"
                   value="irc"
                 />
                 <div
-                  class="_ui_1e0uz_19"
+                  class="_ui_1qhtc_19"
                 />
               </div>
               <span>
@@ -322,6 +348,9 @@ exports[`<LayoutSwitcher /> should render 1`] = `
                 data-self="true"
                 tabindex="-1"
               >
+                <span
+                  class="mx_MessageTimestamp"
+                />
                 <div
                   class="mx_DisambiguatedProfile"
                 >
@@ -336,7 +365,7 @@ exports[`<LayoutSwitcher /> should render 1`] = `
                   class="mx_EventTile_avatar"
                 >
                   <span
-                    class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+                    class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
                     data-color="2"
                     data-testid="avatar-img"
                     data-type="round"
@@ -349,6 +378,7 @@ exports[`<LayoutSwitcher /> should render 1`] = `
                 </div>
                 <div
                   class="mx_EventTile_line"
+                  id="3"
                 >
                   <div
                     class="mx_MTextBody mx_EventTile_content"
@@ -372,7 +402,19 @@ exports[`<LayoutSwitcher /> should render 1`] = `
                       role="button"
                       tabindex="0"
                     >
-                      <div />
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          clip-rule="evenodd"
+                          d="M15.706 2.637a2 2 0 0 1 2.829 0l2.828 2.828a2 2 0 0 1 0 2.829L9.605 20.052a1 1 0 0 1-.465.263L3.483 21.73a1 1 0 0 1-1.212-1.213l1.414-5.657a1 1 0 0 1 .263-.465zm1.224 7.262L14.102 7.07l-8.544 8.544-.943 3.771 3.771-.943z"
+                          fill-rule="evenodd"
+                        />
+                      </svg>
                     </div>
                     <div
                       aria-expanded="false"
@@ -411,18 +453,19 @@ exports[`<LayoutSwitcher /> should render 1`] = `
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_19o42_10"
+              class="_container_udcm8_10"
             >
               <input
-                aria-describedby="radix-«rs»"
-                class="_input_19o42_24"
-                id="radix-«rr»"
+                aria-describedby="radix-_r_s_"
+                class="_input_udcm8_24"
+                id="radix-_r_r_"
                 name="compactLayout"
+                role="switch"
                 title=""
                 type="checkbox"
               />
               <div
-                class="_ui_19o42_34"
+                class="_ui_udcm8_34"
               />
             </div>
           </div>
@@ -431,13 +474,13 @@ exports[`<LayoutSwitcher /> should render 1`] = `
           >
             <label
               class="_label_19upo_59"
-              for="radix-«rr»"
+              for="radix-_r_r_"
             >
               Show compact text and messages
             </label>
             <span
               class="_message_19upo_85 _help-message_19upo_91"
-              id="radix-«rs»"
+              id="radix-_r_s_"
             >
               Modern layout must be selected to use this feature.
             </span>
@@ -446,7 +489,7 @@ exports[`<LayoutSwitcher /> should render 1`] = `
       </form>
     </div>
     <div
-      class="_separator_7ckbw_8"
+      class="_separator_cqpyv_8"
       data-kind="primary"
       data-orientation="horizontal"
       role="separator"
diff --git a/test/unit-tests/components/views/settings/__snapshots__/Notifications-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/Notifications-test.tsx.snap
index ae8a4aa46e..d971d9001b 100644
--- a/test/unit-tests/components/views/settings/__snapshots__/Notifications-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/__snapshots__/Notifications-test.tsx.snap
@@ -1,95 +1,115 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<Notifications /> main notification switches renders only enable notifications switch when notifications are disabled 1`] = `
 <div>
-  <div
-    class="mx_SettingsFlag"
-    data-testid="notif-master-switch"
+  <form
+    class="_root_19upo_16"
   >
-    <span
-      class="mx_SettingsFlag_label"
-    >
-      <div
-        id="mx_LabelledToggleSwitch_«r0»"
-      >
-        Enable notifications for this account
-      </div>
-      <span
-        class="mx_Caption"
-        id="mx_LabelledToggleSwitch_«r0»_caption"
-      >
-        Turn off to disable notifications on all your devices and sessions
-      </span>
-    </span>
     <div
-      aria-checked="false"
-      aria-describedby="mx_LabelledToggleSwitch_«r0»_caption"
-      aria-disabled="false"
-      aria-labelledby="mx_LabelledToggleSwitch_«r0»"
-      class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
-      role="switch"
-      tabindex="0"
+      class="_inline-field_19upo_32"
     >
       <div
-        class="mx_ToggleSwitch_ball"
-      />
-    </div>
-  </div>
-  <div>
-    <div
-      class="mx_SettingsFlag"
-    >
-      <label
-        class="mx_SettingsFlag_label"
-        for="mx_SettingsFlag_testid_0"
-      >
-        <span
-          class="mx_SettingsFlag_labelText"
-        >
-          Show all activity in the room list (dots or number of unread messages)
-        </span>
-      </label>
-      <div
-        aria-checked="true"
-        aria-disabled="false"
-        aria-label="Show all activity in the room list (dots or number of unread messages)"
-        class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
-        id="mx_SettingsFlag_testid_0"
-        role="switch"
-        tabindex="0"
+        class="_inline-field-control_19upo_44"
       >
         <div
-          class="mx_ToggleSwitch_ball"
-        />
+          class="_container_udcm8_10"
+        >
+          <input
+            class="_input_udcm8_24"
+            id="_r_0_"
+            role="switch"
+            type="checkbox"
+          />
+          <div
+            class="_ui_udcm8_34"
+          />
+        </div>
+      </div>
+      <div
+        class="_inline-field-body_19upo_38"
+      >
+        <label
+          class="_label_19upo_59"
+          for="_r_0_"
+        >
+          Enable notifications for this account
+        </label>
+        <span
+          class="_message_19upo_85 _help-message_19upo_91"
+          id="radix-_r_2_"
+        >
+          Turn off to disable notifications on all your devices and sessions
+        </span>
       </div>
     </div>
-    <div
-      class="mx_SettingsFlag"
+    <form
+      class="_root_19upo_16"
     >
-      <label
-        class="mx_SettingsFlag_label"
-        for="mx_SettingsFlag_testid_1"
-      >
-        <span
-          class="mx_SettingsFlag_labelText"
-        >
-          Only show notifications in the thread activity centre
-        </span>
-      </label>
       <div
-        aria-checked="true"
-        aria-disabled="false"
-        aria-label="Only show notifications in the thread activity centre"
-        class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
-        id="mx_SettingsFlag_testid_1"
-        role="switch"
-        tabindex="0"
+        class="_inline-field_19upo_32"
       >
         <div
-          class="mx_ToggleSwitch_ball"
-        />
+          class="_inline-field-control_19upo_44"
+        >
+          <div
+            class="_container_udcm8_10"
+          >
+            <input
+              checked=""
+              class="_input_udcm8_24"
+              id="mx_SettingsFlag_testid_0"
+              role="switch"
+              type="checkbox"
+            />
+            <div
+              class="_ui_udcm8_34"
+            />
+          </div>
+        </div>
+        <div
+          class="_inline-field-body_19upo_38"
+        >
+          <label
+            class="_label_19upo_59"
+            for="mx_SettingsFlag_testid_0"
+          >
+            Show all activity in the room list (dots or number of unread messages)
+          </label>
+        </div>
       </div>
-    </div>
-  </div>
+      <div
+        class="_inline-field_19upo_32"
+      >
+        <div
+          class="_inline-field-control_19upo_44"
+        >
+          <div
+            class="_container_udcm8_10"
+          >
+            <input
+              checked=""
+              class="_input_udcm8_24"
+              id="mx_SettingsFlag_testid_1"
+              role="switch"
+              type="checkbox"
+            />
+            <div
+              class="_ui_udcm8_34"
+            />
+          </div>
+        </div>
+        <div
+          class="_inline-field-body_19upo_38"
+        >
+          <label
+            class="_label_19upo_59"
+            for="mx_SettingsFlag_testid_1"
+          >
+            Only show notifications in the thread activity centre
+          </label>
+        </div>
+      </div>
+    </form>
+  </form>
 </div>
 `;
diff --git a/test/unit-tests/components/views/settings/__snapshots__/PowerLevelSelector-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/PowerLevelSelector-test.tsx.snap
index 812dc08b6a..86f466cf6f 100644
--- a/test/unit-tests/components/views/settings/__snapshots__/PowerLevelSelector-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/__snapshots__/PowerLevelSelector-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`PowerLevelSelector should display only the current user 1`] = `
 <fieldset
@@ -60,7 +60,7 @@ exports[`PowerLevelSelector should display only the current user 1`] = `
     <button
       aria-disabled="true"
       aria-label="Apply"
-      class="_button_vczzf_8 mx_Dialog_nonDialogButton mx_PowerLevelSelector_Button"
+      class="_button_187yx_8 mx_Dialog_nonDialogButton mx_PowerLevelSelector_Button"
       data-kind="primary"
       data-size="sm"
       role="button"
@@ -222,7 +222,7 @@ exports[`PowerLevelSelector should render 1`] = `
     <button
       aria-disabled="true"
       aria-label="Apply"
-      class="_button_vczzf_8 mx_Dialog_nonDialogButton mx_PowerLevelSelector_Button"
+      class="_button_187yx_8 mx_Dialog_nonDialogButton mx_PowerLevelSelector_Button"
       data-kind="primary"
       data-size="sm"
       role="button"
diff --git a/test/unit-tests/components/views/settings/__snapshots__/SetIdServer-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/SetIdServer-test.tsx.snap
index 3a6dfcd5d6..707171b2c5 100644
--- a/test/unit-tests/components/views/settings/__snapshots__/SetIdServer-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/__snapshots__/SetIdServer-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SetIdServer /> renders expected fields 1`] = `
 <DocumentFragment>
@@ -30,7 +30,7 @@ exports[`<SetIdServer /> renders expected fields 1`] = `
         >
           <label
             class="_label_19upo_59"
-            for="radix-«r0»"
+            for="radix-_r_0_"
           >
             Enter a new identity server
           </label>
@@ -39,7 +39,7 @@ exports[`<SetIdServer /> renders expected fields 1`] = `
           >
             <input
               class="_control_sqdq4_10"
-              id="radix-«r0»"
+              id="radix-_r_0_"
               name="input"
               placeholder=""
               title=""
diff --git a/test/unit-tests/components/views/settings/__snapshots__/SetIntegrationManager-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/SetIntegrationManager-test.tsx.snap
index 025afc3c97..edb42d8c67 100644
--- a/test/unit-tests/components/views/settings/__snapshots__/SetIntegrationManager-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/__snapshots__/SetIntegrationManager-test.tsx.snap
@@ -1,8 +1,8 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`SetIntegrationManager should render manage integrations sections 1`] = `
-<div
-  class="mx_SetIntegrationManager"
+<form
+  class="_root_19upo_16 mx_SetIntegrationManager"
   data-testid="mx_SetIntegrationManager"
 >
   <div
@@ -18,6 +18,7 @@ exports[`SetIntegrationManager should render manage integrations sections 1`] =
       </h3>
       <h4
         class="mx_Heading_h4"
+        id="mx_SetIntegrationManager_ManagerName"
       >
         (scalar.vector.im)
       </h4>
@@ -25,6 +26,7 @@ exports[`SetIntegrationManager should render manage integrations sections 1`] =
   </div>
   <div
     class="mx_SettingsSubsection_text"
+    id="mx_SetIntegrationManager_BodyText"
   >
     <span>
       Use an integration manager 
@@ -39,40 +41,36 @@ exports[`SetIntegrationManager should render manage integrations sections 1`] =
   >
     Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.
   </div>
-  <form
-    class="_root_19upo_16"
+  <div
+    class="_inline-field_19upo_32"
   >
     <div
-      class="_inline-field_19upo_32"
+      class="_inline-field-control_19upo_44"
     >
       <div
-        class="_inline-field-control_19upo_44"
+        class="_container_udcm8_10"
       >
+        <input
+          class="_input_udcm8_24"
+          id="_r_0_"
+          role="switch"
+          type="checkbox"
+        />
         <div
-          class="_container_19o42_10"
-        >
-          <input
-            class="_input_19o42_24"
-            id="mx_SetIntegrationManager_Toggle"
-            role="switch"
-            type="checkbox"
-          />
-          <div
-            class="_ui_19o42_34"
-          />
-        </div>
-      </div>
-      <div
-        class="_inline-field-body_19upo_38"
-      >
-        <label
-          class="_label_19upo_59"
-          for="mx_SetIntegrationManager_Toggle"
-        >
-          Enable the integration manager
-        </label>
+          class="_ui_udcm8_34"
+        />
       </div>
     </div>
-  </form>
-</div>
+    <div
+      class="_inline-field-body_19upo_38"
+    >
+      <label
+        class="_label_19upo_59"
+        for="_r_0_"
+      >
+        Enable the integration manager
+      </label>
+    </div>
+  </div>
+</form>
 `;
diff --git a/test/unit-tests/components/views/settings/__snapshots__/SettingsFieldset-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/SettingsFieldset-test.tsx.snap
index 4ac3bbb1e1..e323737f0c 100644
--- a/test/unit-tests/components/views/settings/__snapshots__/SettingsFieldset-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/__snapshots__/SettingsFieldset-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SettingsFieldset /> renders fieldset with plain text description 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/settings/__snapshots__/SettingsHeader-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/SettingsHeader-test.tsx.snap
index 676233259f..d1fa54a2b5 100644
--- a/test/unit-tests/components/views/settings/__snapshots__/SettingsHeader-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/__snapshots__/SettingsHeader-test.tsx.snap
@@ -1,11 +1,11 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SettingsHeader /> should render the component 1`] = `
 <DocumentFragment>
   <h2
     class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93 mx_SettingsHeader"
   >
-    Settings Header 
+    Settings Header
   </h2>
 </DocumentFragment>
 `;
@@ -13,12 +13,9 @@ exports[`<SettingsHeader /> should render the component 1`] = `
 exports[`<SettingsHeader /> should render the component with the recommended tag 1`] = `
 <DocumentFragment>
   <h2
-    class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93 mx_SettingsHeader"
+    class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93 mx_SettingsHeader mx_SettingsHeader_recommended"
   >
-    Settings Header 
-    <span>
-      Recommended
-    </span>
+    Settings Header
   </h2>
 </DocumentFragment>
 `;
diff --git a/test/unit-tests/components/views/settings/__snapshots__/SettingsSubheader-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/SettingsSubheader-test.tsx.snap
index f6539735b3..37ab8343c3 100644
--- a/test/unit-tests/components/views/settings/__snapshots__/SettingsSubheader-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/__snapshots__/SettingsSubheader-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SettingsSubheader /> should display a check icon when in success 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/settings/__snapshots__/ThemeChoicePanel-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/ThemeChoicePanel-test.tsx.snap
index 64b9312ae8..c86e81f8c5 100644
--- a/test/unit-tests/components/views/settings/__snapshots__/ThemeChoicePanel-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/__snapshots__/ThemeChoicePanel-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
 <DocumentFragment>
@@ -28,17 +28,18 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_19o42_10"
+              class="_container_udcm8_10"
             >
               <input
-                class="_input_19o42_24"
-                id="radix-«r28»"
+                class="_input_udcm8_24"
+                id="radix-_r_28_"
                 name="systemTheme"
+                role="switch"
                 title=""
                 type="checkbox"
               />
               <div
-                class="_ui_19o42_34"
+                class="_ui_udcm8_34"
               />
             </div>
           </div>
@@ -47,7 +48,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
           >
             <label
               class="_label_19upo_59"
-              for="radix-«r28»"
+              for="radix-_r_28_"
             >
               Match system theme
             </label>
@@ -64,19 +65,19 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_1e0uz_10"
+              class="_container_1qhtc_10"
             >
               <input
                 checked=""
-                class="_input_1e0uz_18"
-                id="radix-«r29»"
+                class="_input_1qhtc_18"
+                id="radix-_r_29_"
                 name="themeSelector"
                 title=""
                 type="radio"
                 value="light"
               />
               <div
-                class="_ui_1e0uz_19"
+                class="_ui_1qhtc_19"
               />
             </div>
           </div>
@@ -85,7 +86,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-«r29»"
+              for="radix-_r_29_"
             >
               Light
             </label>
@@ -98,18 +99,18 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_1e0uz_10"
+              class="_container_1qhtc_10"
             >
               <input
-                class="_input_1e0uz_18"
-                id="radix-«r2a»"
+                class="_input_1qhtc_18"
+                id="radix-_r_2a_"
                 name="themeSelector"
                 title=""
                 type="radio"
                 value="dark"
               />
               <div
-                class="_ui_1e0uz_19"
+                class="_ui_1qhtc_19"
               />
             </div>
           </div>
@@ -118,7 +119,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-«r2a»"
+              for="radix-_r_2a_"
             >
               Dark
             </label>
@@ -131,18 +132,18 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_1e0uz_10"
+              class="_container_1qhtc_10"
             >
               <input
-                class="_input_1e0uz_18"
-                id="radix-«r2b»"
+                class="_input_1qhtc_18"
+                id="radix-_r_2b_"
                 name="themeSelector"
                 title=""
                 type="radio"
                 value="light-high-contrast"
               />
               <div
-                class="_ui_1e0uz_19"
+                class="_ui_1qhtc_19"
               />
             </div>
           </div>
@@ -151,7 +152,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-«r2b»"
+              for="radix-_r_2b_"
             >
               High contrast
             </label>
@@ -164,18 +165,18 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_1e0uz_10"
+              class="_container_1qhtc_10"
             >
               <input
-                class="_input_1e0uz_18"
-                id="radix-«r2c»"
+                class="_input_1qhtc_18"
+                id="radix-_r_2c_"
                 name="themeSelector"
                 title=""
                 type="radio"
                 value="custom-Alice theme"
               />
               <div
-                class="_ui_1e0uz_19"
+                class="_ui_1qhtc_19"
               />
             </div>
           </div>
@@ -184,7 +185,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-«r2c»"
+              for="radix-_r_2c_"
             >
               Alice theme
             </label>
@@ -202,7 +203,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
           >
             <label
               class="_label_19upo_59"
-              for="radix-«r2d»"
+              for="radix-_r_2d_"
             >
               Add custom theme
             </label>
@@ -210,9 +211,9 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
               class="_controls_17lij_8"
             >
               <input
-                aria-describedby="radix-«r2e»"
+                aria-describedby="radix-_r_2e_"
                 class="_control_sqdq4_10"
-                id="radix-«r2d»"
+                id="radix-_r_2d_"
                 name="input"
                 title=""
                 value=""
@@ -220,7 +221,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
             </div>
             <span
               class="_message_19upo_85 _help-message_19upo_91"
-              id="radix-«r2e»"
+              id="radix-_r_2e_"
             >
               Enter the URL of a custom theme you want to apply.
             </span>
@@ -240,14 +241,15 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
             </span>
             <button
               aria-label="Delete"
-              aria-labelledby="«r2f»"
-              class="_icon-button_m2erp_8 _destructive_m2erp_74"
+              aria-labelledby="_r_2f_"
+              class="_icon-button_1pz9o_8 _destructive_1pz9o_95"
+              data-kind="primary"
               role="button"
               style="--cpd-icon-button-size: 32px;"
               tabindex="0"
             >
               <div
-                class="_indicator-icon_zr2a0_17"
+                class="_indicator-icon_147l5_17"
                 style="--cpd-icon-button-size: 100%;"
               >
                 <svg
@@ -268,7 +270,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
       </div>
     </div>
     <div
-      class="_separator_7ckbw_8"
+      class="_separator_cqpyv_8"
       data-kind="primary"
       data-orientation="horizontal"
       role="separator"
@@ -305,17 +307,18 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_19o42_10"
+              class="_container_udcm8_10"
             >
               <input
-                class="_input_19o42_24"
-                id="radix-«r10»"
+                class="_input_udcm8_24"
+                id="radix-_r_10_"
                 name="systemTheme"
+                role="switch"
                 title=""
                 type="checkbox"
               />
               <div
-                class="_ui_19o42_34"
+                class="_ui_udcm8_34"
               />
             </div>
           </div>
@@ -324,7 +327,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
           >
             <label
               class="_label_19upo_59"
-              for="radix-«r10»"
+              for="radix-_r_10_"
             >
               Match system theme
             </label>
@@ -341,19 +344,19 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_1e0uz_10"
+              class="_container_1qhtc_10"
             >
               <input
                 checked=""
-                class="_input_1e0uz_18"
-                id="radix-«r11»"
+                class="_input_1qhtc_18"
+                id="radix-_r_11_"
                 name="themeSelector"
                 title=""
                 type="radio"
                 value="light"
               />
               <div
-                class="_ui_1e0uz_19"
+                class="_ui_1qhtc_19"
               />
             </div>
           </div>
@@ -362,7 +365,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-«r11»"
+              for="radix-_r_11_"
             >
               Light
             </label>
@@ -375,18 +378,18 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_1e0uz_10"
+              class="_container_1qhtc_10"
             >
               <input
-                class="_input_1e0uz_18"
-                id="radix-«r12»"
+                class="_input_1qhtc_18"
+                id="radix-_r_12_"
                 name="themeSelector"
                 title=""
                 type="radio"
                 value="dark"
               />
               <div
-                class="_ui_1e0uz_19"
+                class="_ui_1qhtc_19"
               />
             </div>
           </div>
@@ -395,7 +398,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-«r12»"
+              for="radix-_r_12_"
             >
               Dark
             </label>
@@ -408,18 +411,18 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_1e0uz_10"
+              class="_container_1qhtc_10"
             >
               <input
-                class="_input_1e0uz_18"
-                id="radix-«r13»"
+                class="_input_1qhtc_18"
+                id="radix-_r_13_"
                 name="themeSelector"
                 title=""
                 type="radio"
                 value="light-high-contrast"
               />
               <div
-                class="_ui_1e0uz_19"
+                class="_ui_1qhtc_19"
               />
             </div>
           </div>
@@ -428,7 +431,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-«r13»"
+              for="radix-_r_13_"
             >
               High contrast
             </label>
@@ -441,18 +444,18 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_1e0uz_10"
+              class="_container_1qhtc_10"
             >
               <input
-                class="_input_1e0uz_18"
-                id="radix-«r14»"
+                class="_input_1qhtc_18"
+                id="radix-_r_14_"
                 name="themeSelector"
                 title=""
                 type="radio"
                 value="custom-Alice theme"
               />
               <div
-                class="_ui_1e0uz_19"
+                class="_ui_1qhtc_19"
               />
             </div>
           </div>
@@ -461,7 +464,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-«r14»"
+              for="radix-_r_14_"
             >
               Alice theme
             </label>
@@ -479,7 +482,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
           >
             <label
               class="_label_19upo_59"
-              for="radix-«r15»"
+              for="radix-_r_15_"
             >
               Add custom theme
             </label>
@@ -487,9 +490,9 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
               class="_controls_17lij_8"
             >
               <input
-                aria-describedby="radix-«r16»"
+                aria-describedby="radix-_r_16_"
                 class="_control_sqdq4_10"
-                id="radix-«r15»"
+                id="radix-_r_15_"
                 name="input"
                 title=""
                 value=""
@@ -497,7 +500,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
             </div>
             <span
               class="_message_19upo_85 _help-message_19upo_91"
-              id="radix-«r16»"
+              id="radix-_r_16_"
             >
               Enter the URL of a custom theme you want to apply.
             </span>
@@ -517,14 +520,15 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
             </span>
             <button
               aria-label="Delete"
-              aria-labelledby="«r17»"
-              class="_icon-button_m2erp_8 _destructive_m2erp_74"
+              aria-labelledby="_r_17_"
+              class="_icon-button_1pz9o_8 _destructive_1pz9o_95"
+              data-kind="primary"
               role="button"
               style="--cpd-icon-button-size: 32px;"
               tabindex="0"
             >
               <div
-                class="_indicator-icon_zr2a0_17"
+                class="_indicator-icon_147l5_17"
                 style="--cpd-icon-button-size: 100%;"
               >
                 <svg
@@ -545,7 +549,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
       </div>
     </div>
     <div
-      class="_separator_7ckbw_8"
+      class="_separator_cqpyv_8"
       data-kind="primary"
       data-orientation="horizontal"
       role="separator"
@@ -582,17 +586,18 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_19o42_10"
+              class="_container_udcm8_10"
             >
               <input
-                class="_input_19o42_24"
-                id="radix-«r0»"
+                class="_input_udcm8_24"
+                id="radix-_r_0_"
                 name="systemTheme"
+                role="switch"
                 title=""
                 type="checkbox"
               />
               <div
-                class="_ui_19o42_34"
+                class="_ui_udcm8_34"
               />
             </div>
           </div>
@@ -601,7 +606,7 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
           >
             <label
               class="_label_19upo_59"
-              for="radix-«r0»"
+              for="radix-_r_0_"
             >
               Match system theme
             </label>
@@ -618,19 +623,19 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_1e0uz_10"
+              class="_container_1qhtc_10"
             >
               <input
                 checked=""
-                class="_input_1e0uz_18"
-                id="radix-«r1»"
+                class="_input_1qhtc_18"
+                id="radix-_r_1_"
                 name="themeSelector"
                 title=""
                 type="radio"
                 value="light"
               />
               <div
-                class="_ui_1e0uz_19"
+                class="_ui_1qhtc_19"
               />
             </div>
           </div>
@@ -639,7 +644,7 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-«r1»"
+              for="radix-_r_1_"
             >
               Light
             </label>
@@ -652,18 +657,18 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_1e0uz_10"
+              class="_container_1qhtc_10"
             >
               <input
-                class="_input_1e0uz_18"
-                id="radix-«r2»"
+                class="_input_1qhtc_18"
+                id="radix-_r_2_"
                 name="themeSelector"
                 title=""
                 type="radio"
                 value="dark"
               />
               <div
-                class="_ui_1e0uz_19"
+                class="_ui_1qhtc_19"
               />
             </div>
           </div>
@@ -672,7 +677,7 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-«r2»"
+              for="radix-_r_2_"
             >
               Dark
             </label>
@@ -685,18 +690,18 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_1e0uz_10"
+              class="_container_1qhtc_10"
             >
               <input
-                class="_input_1e0uz_18"
-                id="radix-«r3»"
+                class="_input_1qhtc_18"
+                id="radix-_r_3_"
                 name="themeSelector"
                 title=""
                 type="radio"
                 value="light-high-contrast"
               />
               <div
-                class="_ui_1e0uz_19"
+                class="_ui_1qhtc_19"
               />
             </div>
           </div>
@@ -705,7 +710,7 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-«r3»"
+              for="radix-_r_3_"
             >
               High contrast
             </label>
@@ -714,7 +719,7 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
       </form>
     </div>
     <div
-      class="_separator_7ckbw_8"
+      class="_separator_cqpyv_8"
       data-kind="primary"
       data-orientation="horizontal"
       role="separator"
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap
index a6f1e06c29..47558388b6 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<CurrentDeviceSection /> displays device details on toggle click 1`] = `
 HTMLCollection [
@@ -33,10 +33,17 @@ HTMLCollection [
         <div
           class="mx_DeviceSecurityCard_icon Unverified"
         >
-          <div
+          <svg
+            fill="currentColor"
             height="16"
+            viewBox="0 0 24 24"
             width="16"
-          />
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+            />
+          </svg>
         </div>
         <div
           class="mx_DeviceSecurityCard_content"
@@ -223,11 +230,20 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
               role="img"
             />
           </div>
-          <div
+          <svg
             aria-label="Unverified"
             class="mx_DeviceTypeIcon_verificationIcon unverified"
+            fill="currentColor"
+            height="1em"
             role="img"
-          />
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+            />
+          </svg>
         </div>
         <div
           class="mx_DeviceTile_info"
@@ -285,10 +301,17 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
         <div
           class="mx_DeviceSecurityCard_icon Unverified"
         >
-          <div
+          <svg
+            fill="currentColor"
             height="16"
+            viewBox="0 0 24 24"
             width="16"
-          />
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+            />
+          </svg>
         </div>
         <div
           class="mx_DeviceSecurityCard_content"
@@ -385,11 +408,20 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
               role="img"
             />
           </div>
-          <div
+          <svg
             aria-label="Unverified"
             class="mx_DeviceTypeIcon_verificationIcon unverified"
+            fill="currentColor"
+            height="1em"
             role="img"
-          />
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+            />
+          </svg>
         </div>
         <div
           class="mx_DeviceTile_info"
@@ -447,10 +479,17 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
         <div
           class="mx_DeviceSecurityCard_icon Unverified"
         >
-          <div
+          <svg
+            fill="currentColor"
             height="16"
+            viewBox="0 0 24 24"
             width="16"
-          />
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+            />
+          </svg>
         </div>
         <div
           class="mx_DeviceSecurityCard_content"
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceDetailHeading-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceDetailHeading-test.tsx.snap
index b9c63774cd..0ae4008ba9 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceDetailHeading-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceDetailHeading-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<DeviceDetailHeading /> displays name edit form on rename button click 1`] = `
 {
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceDetails-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceDetails-test.tsx.snap
index ff25c3a2c8..dc82fd7c4b 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceDetails-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceDetails-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<DeviceDetails /> renders a verified device 1`] = `
 <div>
@@ -33,10 +33,19 @@ exports[`<DeviceDetails /> renders a verified device 1`] = `
         <div
           class="mx_DeviceSecurityCard_icon Verified"
         >
-          <div
+          <svg
+            fill="currentColor"
             height="16"
+            viewBox="0 0 24 24"
             width="16"
-          />
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              clip-rule="evenodd"
+              d="M11.106 2.447a2 2 0 0 1 1.789 0l6 3A2 2 0 0 1 20 7.237V12c0 6.742-5.773 9.246-7.51 9.846-.32.111-.66.111-.98 0C9.774 21.246 4 18.743 4 12V7.236a2 2 0 0 1 1.105-1.789zm4.601 6.846a1 1 0 0 0-1.414 0L11 12.586l-1.293-1.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0 0-1.414"
+              fill-rule="evenodd"
+            />
+          </svg>
         </div>
         <div
           class="mx_DeviceSecurityCard_content"
@@ -142,10 +151,17 @@ exports[`<DeviceDetails /> renders device with metadata 1`] = `
         <div
           class="mx_DeviceSecurityCard_icon Unverified"
         >
-          <div
+          <svg
+            fill="currentColor"
             height="16"
+            viewBox="0 0 24 24"
             width="16"
-          />
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+            />
+          </svg>
         </div>
         <div
           class="mx_DeviceSecurityCard_content"
@@ -351,10 +367,17 @@ exports[`<DeviceDetails /> renders device without metadata 1`] = `
         <div
           class="mx_DeviceSecurityCard_icon Unverified"
         >
-          <div
+          <svg
+            fill="currentColor"
             height="16"
+            viewBox="0 0 24 24"
             width="16"
-          />
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+            />
+          </svg>
         </div>
         <div
           class="mx_DeviceSecurityCard_content"
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceExpandDetailsButton-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceExpandDetailsButton-test.tsx.snap
index 2c2e0a05b0..34a8d29c36 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceExpandDetailsButton-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceExpandDetailsButton-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<DeviceExpandDetailsButton /> renders when expanded 1`] = `
 {
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceSecurityCard-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceSecurityCard-test.tsx.snap
index 8988694795..b3e857f03c 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceSecurityCard-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceSecurityCard-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<DeviceSecurityCard /> renders basic card 1`] = `
 <div>
@@ -8,10 +8,19 @@ exports[`<DeviceSecurityCard /> renders basic card 1`] = `
     <div
       class="mx_DeviceSecurityCard_icon Verified"
     >
-      <div
+      <svg
+        fill="currentColor"
         height="16"
+        viewBox="0 0 24 24"
         width="16"
-      />
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          clip-rule="evenodd"
+          d="M11.106 2.447a2 2 0 0 1 1.789 0l6 3A2 2 0 0 1 20 7.237V12c0 6.742-5.773 9.246-7.51 9.846-.32.111-.66.111-.98 0C9.774 21.246 4 18.743 4 12V7.236a2 2 0 0 1 1.105-1.789zm4.601 6.846a1 1 0 0 0-1.414 0L11 12.586l-1.293-1.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0 0-1.414"
+          fill-rule="evenodd"
+        />
+      </svg>
     </div>
     <div
       class="mx_DeviceSecurityCard_content"
@@ -39,10 +48,17 @@ exports[`<DeviceSecurityCard /> renders with children 1`] = `
     <div
       class="mx_DeviceSecurityCard_icon Unverified"
     >
-      <div
+      <svg
+        fill="currentColor"
         height="16"
+        viewBox="0 0 24 24"
         width="16"
-      />
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+        />
+      </svg>
     </div>
     <div
       class="mx_DeviceSecurityCard_content"
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceTile-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceTile-test.tsx.snap
index 2d0d4a8d40..62a4fc44ce 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceTile-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceTile-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<DeviceTile /> renders a device with no metadata 1`] = `
 <div>
@@ -18,11 +18,20 @@ exports[`<DeviceTile /> renders a device with no metadata 1`] = `
           role="img"
         />
       </div>
-      <div
+      <svg
         aria-label="Unverified"
         class="mx_DeviceTypeIcon_verificationIcon unverified"
+        fill="currentColor"
+        height="1em"
         role="img"
-      />
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+        />
+      </svg>
     </div>
     <div
       class="mx_DeviceTile_info"
@@ -73,11 +82,20 @@ exports[`<DeviceTile /> renders a verified device with no metadata 1`] = `
           role="img"
         />
       </div>
-      <div
+      <svg
         aria-label="Unverified"
         class="mx_DeviceTypeIcon_verificationIcon unverified"
+        fill="currentColor"
+        height="1em"
         role="img"
-      />
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+        />
+      </svg>
     </div>
     <div
       class="mx_DeviceTile_info"
@@ -128,11 +146,20 @@ exports[`<DeviceTile /> renders display name with a tooltip 1`] = `
           role="img"
         />
       </div>
-      <div
+      <svg
         aria-label="Unverified"
         class="mx_DeviceTypeIcon_verificationIcon unverified"
+        fill="currentColor"
+        height="1em"
         role="img"
-      />
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+        />
+      </svg>
     </div>
     <div
       class="mx_DeviceTile_info"
@@ -183,11 +210,20 @@ exports[`<DeviceTile /> separates metadata with a dot 1`] = `
           role="img"
         />
       </div>
-      <div
+      <svg
         aria-label="Unverified"
         class="mx_DeviceTypeIcon_verificationIcon unverified"
+        fill="currentColor"
+        height="1em"
         role="img"
-      />
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+        />
+      </svg>
     </div>
     <div
       class="mx_DeviceTile_info"
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceTypeIcon-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceTypeIcon-test.tsx.snap
index 74e398d0b9..2a9a53a83a 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceTypeIcon-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceTypeIcon-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<DeviceTypeIcon /> renders a verified device 1`] = `
 <div>
@@ -14,11 +14,22 @@ exports[`<DeviceTypeIcon /> renders a verified device 1`] = `
         role="img"
       />
     </div>
-    <div
+    <svg
       aria-label="Verified"
       class="mx_DeviceTypeIcon_verificationIcon verified"
+      fill="currentColor"
+      height="1em"
       role="img"
-    />
+      viewBox="0 0 24 24"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        clip-rule="evenodd"
+        d="M11.106 2.447a2 2 0 0 1 1.789 0l6 3A2 2 0 0 1 20 7.237V12c0 6.742-5.773 9.246-7.51 9.846-.32.111-.66.111-.98 0C9.774 21.246 4 18.743 4 12V7.236a2 2 0 0 1 1.105-1.789zm4.601 6.846a1 1 0 0 0-1.414 0L11 12.586l-1.293-1.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0 0-1.414"
+        fill-rule="evenodd"
+      />
+    </svg>
   </div>
 </div>
 `;
@@ -37,11 +48,20 @@ exports[`<DeviceTypeIcon /> renders an unverified device 1`] = `
         role="img"
       />
     </div>
-    <div
+    <svg
       aria-label="Unverified"
       class="mx_DeviceTypeIcon_verificationIcon unverified"
+      fill="currentColor"
+      height="1em"
       role="img"
-    />
+      viewBox="0 0 24 24"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+      />
+    </svg>
   </div>
 </div>
 `;
@@ -60,11 +80,20 @@ exports[`<DeviceTypeIcon /> renders correctly when selected 1`] = `
         role="img"
       />
     </div>
-    <div
+    <svg
       aria-label="Unverified"
       class="mx_DeviceTypeIcon_verificationIcon unverified"
+      fill="currentColor"
+      height="1em"
       role="img"
-    />
+      viewBox="0 0 24 24"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+      />
+    </svg>
   </div>
 </div>
 `;
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceVerificationStatusCard-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceVerificationStatusCard-test.tsx.snap
index 6e42937c28..933bdade5a 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceVerificationStatusCard-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceVerificationStatusCard-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<DeviceVerificationStatusCard /> renders a verified device 1`] = `
 <div>
@@ -8,10 +8,19 @@ exports[`<DeviceVerificationStatusCard /> renders a verified device 1`] = `
     <div
       class="mx_DeviceSecurityCard_icon Verified"
     >
-      <div
+      <svg
+        fill="currentColor"
         height="16"
+        viewBox="0 0 24 24"
         width="16"
-      />
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          clip-rule="evenodd"
+          d="M11.106 2.447a2 2 0 0 1 1.789 0l6 3A2 2 0 0 1 20 7.237V12c0 6.742-5.773 9.246-7.51 9.846-.32.111-.66.111-.98 0C9.774 21.246 4 18.743 4 12V7.236a2 2 0 0 1 1.105-1.789zm4.601 6.846a1 1 0 0 0-1.414 0L11 12.586l-1.293-1.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0 0-1.414"
+          fill-rule="evenodd"
+        />
+      </svg>
     </div>
     <div
       class="mx_DeviceSecurityCard_content"
@@ -46,10 +55,17 @@ exports[`<DeviceVerificationStatusCard /> renders an unverifiable device 1`] = `
     <div
       class="mx_DeviceSecurityCard_icon Unverified"
     >
-      <div
+      <svg
+        fill="currentColor"
         height="16"
+        viewBox="0 0 24 24"
         width="16"
-      />
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+        />
+      </svg>
     </div>
     <div
       class="mx_DeviceSecurityCard_content"
@@ -84,10 +100,17 @@ exports[`<DeviceVerificationStatusCard /> renders an unverified device 1`] = `
     <div
       class="mx_DeviceSecurityCard_icon Unverified"
     >
-      <div
+      <svg
+        fill="currentColor"
         height="16"
+        viewBox="0 0 24 24"
         width="16"
-      />
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+        />
+      </svg>
     </div>
     <div
       class="mx_DeviceSecurityCard_content"
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/FilteredDeviceList-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/FilteredDeviceList-test.tsx.snap
index 62a6cd94d1..14cb63021d 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/FilteredDeviceList-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/devices/__snapshots__/FilteredDeviceList-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<FilteredDeviceList /> displays no results message when there are no devices 1`] = `
 HTMLCollection [
@@ -65,10 +65,17 @@ HTMLCollection [
       <div
         class="mx_DeviceSecurityCard_icon Unverified"
       >
-        <div
+        <svg
+          fill="currentColor"
           height="16"
+          viewBox="0 0 24 24"
           width="16"
-        />
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+          />
+        </svg>
       </div>
       <div
         class="mx_DeviceSecurityCard_content"
@@ -109,10 +116,19 @@ HTMLCollection [
       <div
         class="mx_DeviceSecurityCard_icon Verified"
       >
-        <div
+        <svg
+          fill="currentColor"
           height="16"
+          viewBox="0 0 24 24"
           width="16"
-        />
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            clip-rule="evenodd"
+            d="M11.106 2.447a2 2 0 0 1 1.789 0l6 3A2 2 0 0 1 20 7.237V12c0 6.742-5.773 9.246-7.51 9.846-.32.111-.66.111-.98 0C9.774 21.246 4 18.743 4 12V7.236a2 2 0 0 1 1.105-1.789zm4.601 6.846a1 1 0 0 0-1.414 0L11 12.586l-1.293-1.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0 0-1.414"
+            fill-rule="evenodd"
+          />
+        </svg>
       </div>
       <div
         class="mx_DeviceSecurityCard_content"
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/FilteredDeviceListHeader-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/FilteredDeviceListHeader-test.tsx.snap
index 5d99112dd5..3a41085d0a 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/FilteredDeviceListHeader-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/devices/__snapshots__/FilteredDeviceListHeader-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<FilteredDeviceListHeader /> renders correctly when all devices are selected 1`] = `
 <div>
@@ -19,19 +19,19 @@ exports[`<FilteredDeviceListHeader /> renders correctly when all devices are sel
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_1hel1_10"
+              class="_container_1md5v_10"
             >
               <input
                 aria-label="Deselect all"
-                aria-labelledby="«r9»"
+                aria-labelledby="_r_9_"
                 checked=""
-                class="_input_1hel1_18"
+                class="_input_1md5v_18"
                 data-testid="device-select-all-checkbox"
                 id="device-select-all-checkbox"
                 type="checkbox"
               />
               <div
-                class="_ui_1hel1_19"
+                class="_ui_1md5v_19"
               >
                 <svg
                   aria-hidden="true"
@@ -85,18 +85,18 @@ exports[`<FilteredDeviceListHeader /> renders correctly when no devices are sele
             class="_inline-field-control_19upo_44"
           >
             <div
-              class="_container_1hel1_10"
+              class="_container_1md5v_10"
             >
               <input
                 aria-label="Select all"
-                aria-labelledby="«r0»"
-                class="_input_1hel1_18"
+                aria-labelledby="_r_0_"
+                class="_input_1md5v_18"
                 data-testid="device-select-all-checkbox"
                 id="device-select-all-checkbox"
                 type="checkbox"
               />
               <div
-                class="_ui_1hel1_19"
+                class="_ui_1md5v_19"
               >
                 <svg
                   aria-hidden="true"
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap
index 8df6a41d90..0664d5d5b8 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<LoginWithQRFlow /> errors renders authorization_expired 1`] = `
 <div>
@@ -970,13 +970,24 @@ exports[`<LoginWithQRFlow /> renders spinner while loading 1`] = `
           <div
             class="mx_Spinner"
           >
-            <div
+            <svg
               aria-label="Loading…"
-              class="mx_Spinner_icon"
+              class="_icon_11k6c_18"
               data-testid="spinner"
+              fill="currentColor"
+              height="1em"
               role="progressbar"
               style="width: 32px; height: 32px;"
-            />
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+                fill-rule="evenodd"
+              />
+            </svg>
           </div>
         </div>
       </div>
@@ -1034,13 +1045,24 @@ exports[`<LoginWithQRFlow /> renders spinner while signing in 1`] = `
           <div
             class="mx_Spinner"
           >
-            <div
+            <svg
               aria-label="Loading…"
-              class="mx_Spinner_icon"
+              class="_icon_11k6c_18"
               data-testid="spinner"
+              fill="currentColor"
+              height="1em"
               role="progressbar"
               style="width: 32px; height: 32px;"
-            />
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+                fill-rule="evenodd"
+              />
+            </svg>
           </div>
           <p>
             Waiting for device to sign in
@@ -1110,13 +1132,24 @@ exports[`<LoginWithQRFlow /> renders spinner while verifying 1`] = `
           <div
             class="mx_Spinner"
           >
-            <div
+            <svg
               aria-label="Loading…"
-              class="mx_Spinner_icon"
+              class="_icon_11k6c_18"
               data-testid="spinner"
+              fill="currentColor"
+              height="1em"
               role="progressbar"
               style="width: 32px; height: 32px;"
-            />
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+                fill-rule="evenodd"
+              />
+            </svg>
           </div>
           <p>
             Completing set up of your new device
@@ -1177,13 +1210,24 @@ exports[`<LoginWithQRFlow /> renders spinner whilst QR generating 1`] = `
           <div
             class="mx_Spinner"
           >
-            <div
+            <svg
               aria-label="Loading…"
-              class="mx_Spinner_icon"
+              class="_icon_11k6c_18"
               data-testid="spinner"
+              fill="currentColor"
+              height="1em"
               role="progressbar"
               style="width: 32px; height: 32px;"
-            />
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+                fill-rule="evenodd"
+              />
+            </svg>
           </div>
         </div>
       </div>
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/SecurityRecommendations-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/SecurityRecommendations-test.tsx.snap
index fe6c3396aa..0bfb0d299e 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/SecurityRecommendations-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/devices/__snapshots__/SecurityRecommendations-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SecurityRecommendations /> renders both cards when user has both unverified and inactive devices 1`] = `
 <div>
@@ -33,10 +33,17 @@ exports[`<SecurityRecommendations /> renders both cards when user has both unver
         <div
           class="mx_DeviceSecurityCard_icon Unverified"
         >
-          <div
+          <svg
+            fill="currentColor"
             height="16"
+            viewBox="0 0 24 24"
             width="16"
-          />
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+            />
+          </svg>
         </div>
         <div
           class="mx_DeviceSecurityCard_content"
@@ -158,10 +165,17 @@ exports[`<SecurityRecommendations /> renders inactive devices section when user
         <div
           class="mx_DeviceSecurityCard_icon Unverified"
         >
-          <div
+          <svg
+            fill="currentColor"
             height="16"
+            viewBox="0 0 24 24"
             width="16"
-          />
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+            />
+          </svg>
         </div>
         <div
           class="mx_DeviceSecurityCard_content"
@@ -283,10 +297,17 @@ exports[`<SecurityRecommendations /> renders unverified devices section when use
         <div
           class="mx_DeviceSecurityCard_icon Unverified"
         >
-          <div
+          <svg
+            fill="currentColor"
             height="16"
+            viewBox="0 0 24 24"
             width="16"
-          />
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+            />
+          </svg>
         </div>
         <div
           class="mx_DeviceSecurityCard_content"
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/SelectableDeviceTile-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/SelectableDeviceTile-test.tsx.snap
index d7d96b2d54..ec94e4ef33 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/SelectableDeviceTile-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/devices/__snapshots__/SelectableDeviceTile-test.tsx.snap
@@ -1,9 +1,9 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SelectableDeviceTile /> renders selected tile 1`] = `
 <input
   checked=""
-  class="_input_1hel1_18"
+  class="_input_1md5v_18"
   data-testid="device-tile-checkbox-my-device"
   id="device-tile-checkbox-my-device"
   type="checkbox"
@@ -25,16 +25,16 @@ exports[`<SelectableDeviceTile /> renders unselected device tile with checkbox 1
           class="_inline-field-control_19upo_44"
         >
           <div
-            class="_container_1hel1_10"
+            class="_container_1md5v_10"
           >
             <input
-              class="_input_1hel1_18"
+              class="_input_1md5v_18"
               data-testid="device-tile-checkbox-my-device"
               id="device-tile-checkbox-my-device"
               type="checkbox"
             />
             <div
-              class="_ui_1hel1_19"
+              class="_ui_1md5v_19"
             >
               <svg
                 aria-hidden="true"
@@ -74,11 +74,20 @@ exports[`<SelectableDeviceTile /> renders unselected device tile with checkbox 1
                     role="img"
                   />
                 </div>
-                <div
+                <svg
                   aria-label="Unverified"
                   class="mx_DeviceTypeIcon_verificationIcon unverified"
+                  fill="currentColor"
+                  height="1em"
                   role="img"
-                />
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+                  />
+                </svg>
               </div>
               <div
                 class="mx_DeviceTile_info"
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/deleteDevices-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/deleteDevices-test.tsx.snap
index 8233fd6495..c1849af2dc 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/deleteDevices-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/devices/__snapshots__/deleteDevices-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`deleteDevices() opens interactive auth dialog when delete fails with 401 1`] = `
 {
diff --git a/test/unit-tests/components/views/settings/encryption/AdvancedPanel-test.tsx b/test/unit-tests/components/views/settings/encryption/AdvancedPanel-test.tsx
index ad98fa4e43..1876b607bb 100644
--- a/test/unit-tests/components/views/settings/encryption/AdvancedPanel-test.tsx
+++ b/test/unit-tests/components/views/settings/encryption/AdvancedPanel-test.tsx
@@ -74,7 +74,7 @@ describe("<AdvancedPanel />", () => {
             await renderAdvancedPanel();
 
             expect(screen.getByTestId("otherSettings")).toMatchSnapshot();
-            const checkbox = screen.getByRole("checkbox", {
+            const checkbox = screen.getByRole("switch", {
                 name: "In encrypted rooms, only send messages to verified users",
             });
             expect(checkbox).toBeChecked();
diff --git a/test/unit-tests/components/views/settings/encryption/ChangeRecoveryKey-test.tsx b/test/unit-tests/components/views/settings/encryption/ChangeRecoveryKey-test.tsx
index 706efb2b90..7b494e28ca 100644
--- a/test/unit-tests/components/views/settings/encryption/ChangeRecoveryKey-test.tsx
+++ b/test/unit-tests/components/views/settings/encryption/ChangeRecoveryKey-test.tsx
@@ -14,6 +14,9 @@ import { mocked } from "jest-mock";
 import { ChangeRecoveryKey } from "../../../../../../src/components/views/settings/encryption/ChangeRecoveryKey";
 import { createTestClient, withClientContextRenderOptions } from "../../../../../test-utils";
 import { copyPlaintext } from "../../../../../../src/utils/strings";
+import Modal from "../../../../../../src/Modal";
+import ErrorDialog from "../../../../../../src/components/views/dialogs/ErrorDialog";
+import DeviceListener from "../../../../../../src/DeviceListener";
 
 jest.mock("../../../../../../src/utils/strings", () => ({
     copyPlaintext: jest.fn(),
@@ -80,6 +83,8 @@ describe("<ChangeRecoveryKey />", () => {
         });
 
         it("should ask the user to enter the recovery key", async () => {
+            jest.spyOn(DeviceListener.sharedInstance(), "keyStorageOutOfSyncNeedsBackupReset").mockResolvedValue(false);
+
             const user = userEvent.setup();
 
             const onFinish = jest.fn();
@@ -96,7 +101,7 @@ describe("<ChangeRecoveryKey />", () => {
             const finishButton = screen.getByRole("button", { name: "Finish set up" });
             expect(finishButton).toHaveAttribute("aria-disabled", "true");
 
-            const input = screen.getByRole("textbox");
+            const input = screen.getByTitle("Enter recovery key");
             // If the user enters an incorrect recovery key, the finish button should be disabled
             // and we display an error message
             await userEvent.type(input, "wrong recovery key");
@@ -104,22 +109,24 @@ describe("<ChangeRecoveryKey />", () => {
             expect(screen.getByText("The recovery key you entered is not correct.")).toBeInTheDocument();
             expect(asFragment()).toMatchSnapshot();
 
+            const setAccountDataSpy = jest.spyOn(matrixClient, "setAccountData");
             await userEvent.clear(input);
             // If the user enters the correct recovery key, the finish button should be enabled
             await userEvent.type(input, "encoded private key");
             await waitFor(() => expect(finishButton).not.toHaveAttribute("aria-disabled", "true"));
 
             await user.click(finishButton);
+            expect(setAccountDataSpy).toHaveBeenCalledWith("io.element.recovery", { enabled: true });
             expect(onFinish).toHaveBeenCalledWith();
         });
 
-        it("should display errors from bootstrapSecretStorage", async () => {
-            const consoleErrorSpy = jest.spyOn(console, "error").mockReturnValue(undefined);
-            mocked(matrixClient.getCrypto()!).bootstrapSecretStorage.mockRejectedValue(new Error("can't bootstrap"));
+        it("should reset key backup if needed", async () => {
+            jest.spyOn(DeviceListener.sharedInstance(), "keyStorageOutOfSyncNeedsBackupReset").mockResolvedValue(true);
 
             const user = userEvent.setup();
-            renderComponent(false);
 
+            const onFinish = jest.fn();
+            renderComponent(false, onFinish);
             // Display the recovery key to save
             await waitFor(() => user.click(screen.getByRole("button", { name: "Continue" })));
             // Display the form to confirm the recovery key
@@ -128,17 +135,111 @@ describe("<ChangeRecoveryKey />", () => {
             await waitFor(() => expect(screen.getByText("Enter your recovery key to confirm")).toBeInTheDocument());
 
             const finishButton = screen.getByRole("button", { name: "Finish set up" });
-            const input = screen.getByRole("textbox");
+
+            const input = screen.getByTitle("Enter recovery key");
+
+            // If the user enters the correct recovery key, the finish button should be enabled
             await userEvent.type(input, "encoded private key");
+
+            await user.click(finishButton);
+            expect(matrixClient.getCrypto()!.resetKeyBackup).toHaveBeenCalled();
+        });
+
+        it("should not reset key backup if not needed", async () => {
+            jest.spyOn(DeviceListener.sharedInstance(), "keyStorageOutOfSyncNeedsBackupReset").mockResolvedValue(false);
+
+            const user = userEvent.setup();
+
+            const onFinish = jest.fn();
+            renderComponent(false, onFinish);
+            // Display the recovery key to save
+            await waitFor(() => user.click(screen.getByRole("button", { name: "Continue" })));
+            // Display the form to confirm the recovery key
+            await waitFor(() => user.click(screen.getByRole("button", { name: "Continue" })));
+
+            await waitFor(() => expect(screen.getByText("Enter your recovery key to confirm")).toBeInTheDocument());
+
+            const finishButton = screen.getByRole("button", { name: "Finish set up" });
+
+            const input = screen.getByTitle("Enter recovery key");
+
+            // If the user enters the correct recovery key, the finish button should be enabled
+            await userEvent.type(input, "encoded private key");
+
+            await user.click(finishButton);
+            expect(matrixClient.getCrypto()!.resetKeyBackup).not.toHaveBeenCalled();
+        });
+
+        it("should display errors from bootstrapSecretStorage", async () => {
+            const consoleErrorSpy = jest.spyOn(console, "error").mockReturnValue(undefined);
+            mocked(matrixClient.getCrypto()!).bootstrapSecretStorage.mockRejectedValue(new Error("can't bootstrap"));
+
+            const user = userEvent.setup();
+            const { getByRole, getByText, getByTitle } = renderComponent(false);
+
+            // Display the recovery key to save
+            await waitFor(() => user.click(getByRole("button", { name: "Continue" })));
+            // Display the form to confirm the recovery key
+            await waitFor(() => user.click(getByRole("button", { name: "Continue" })));
+
+            await waitFor(() => expect(getByText("Enter your recovery key to confirm")).toBeInTheDocument());
+
+            const finishButton = getByRole("button", { name: "Finish set up" });
+            const input = getByTitle("Enter recovery key");
+            await userEvent.type(input, "encoded private key");
+
+            await waitFor(() => {
+                expect(finishButton).not.toBeDisabled();
+            });
+
+            jest.spyOn(Modal, "createDialog");
+
             await user.click(finishButton);
 
-            await screen.findByText("Failed to set up secret storage");
-            await screen.findByText("Error: can't bootstrap");
+            expect(Modal.createDialog).toHaveBeenCalledWith(ErrorDialog, {
+                title: "Failed to set up secret storage",
+                description: "Error: can't bootstrap",
+            });
+            await waitFor(() => user.click(getByRole("button", { name: "OK" })));
+
             expect(consoleErrorSpy).toHaveBeenCalledWith(
                 "Failed to set up secret storage:",
                 new Error("can't bootstrap"),
             );
         });
+
+        it("should disallow repeated attempts to change the recovery key", async () => {
+            jest.spyOn(DeviceListener.sharedInstance(), "keyStorageOutOfSyncNeedsBackupReset").mockResolvedValue(false);
+
+            const mockFn = mocked(matrixClient.getCrypto()!).bootstrapSecretStorage.mockImplementation(() => {
+                // Pretend to do some work.
+                return new Promise((r) => setTimeout(r, 200));
+            });
+
+            const user = userEvent.setup();
+            const { getByRole, getByText, getByTitle } = renderComponent(false);
+
+            // Display the recovery key to save
+            await waitFor(() => user.click(getByRole("button", { name: "Continue" })));
+            // Display the form to confirm the recovery key
+            await waitFor(() => user.click(getByRole("button", { name: "Continue" })));
+
+            await waitFor(() => expect(getByText("Enter your recovery key to confirm")).toBeInTheDocument());
+
+            const finishButton = getByRole("button", { name: "Finish set up" });
+            const input = getByTitle("Enter recovery key");
+            await userEvent.type(input, "encoded private key");
+
+            await waitFor(() => {
+                expect(finishButton).not.toBeDisabled();
+            });
+
+            await user.click(finishButton);
+            await user.click(finishButton);
+            await user.click(finishButton);
+
+            await waitFor(() => expect(mockFn).toHaveBeenCalledTimes(1));
+        });
     });
 
     describe("flow to change the recovery key", () => {
diff --git a/test/unit-tests/components/views/settings/encryption/RecoveryPanelOutOfSync-test.tsx b/test/unit-tests/components/views/settings/encryption/RecoveryPanelOutOfSync-test.tsx
index 36e35dbe83..7f1d37b329 100644
--- a/test/unit-tests/components/views/settings/encryption/RecoveryPanelOutOfSync-test.tsx
+++ b/test/unit-tests/components/views/settings/encryption/RecoveryPanelOutOfSync-test.tsx
@@ -9,19 +9,45 @@ import React from "react";
 import { render, screen } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
 import { mocked } from "jest-mock";
+import { type MatrixClient } from "matrix-js-sdk/src/matrix";
 
 import { RecoveryPanelOutOfSync } from "../../../../../../src/components/views/settings/encryption/RecoveryPanelOutOfSync";
-import { accessSecretStorage } from "../../../../../../src/SecurityManager";
+import { AccessCancelledError, accessSecretStorage } from "../../../../../../src/SecurityManager";
+import DeviceListener from "../../../../../../src/DeviceListener";
+import { createTestClient, withClientContextRenderOptions } from "../../../../../test-utils";
 
-jest.mock("../../../../../../src/SecurityManager", () => ({
-    accessSecretStorage: jest.fn(),
-}));
+jest.mock("../../../../../../src/SecurityManager", () => {
+    const originalModule = jest.requireActual("../../../../../../src/SecurityManager");
+
+    return {
+        ...originalModule,
+        accessSecretStorage: jest.fn(),
+    };
+});
 
 describe("<RecoveyPanelOutOfSync />", () => {
-    function renderComponent(onFinish = jest.fn(), onForgotRecoveryKey = jest.fn()) {
-        return render(<RecoveryPanelOutOfSync onFinish={onFinish} onForgotRecoveryKey={onForgotRecoveryKey} />);
+    let matrixClient: MatrixClient;
+
+    function renderComponent(
+        onFinish = jest.fn(),
+        onForgotRecoveryKey = jest.fn(),
+        onAccessSecretStorageFailed = jest.fn(),
+    ) {
+        matrixClient = createTestClient();
+        return render(
+            <RecoveryPanelOutOfSync
+                onFinish={onFinish}
+                onForgotRecoveryKey={onForgotRecoveryKey}
+                onAccessSecretStorageFailed={onAccessSecretStorageFailed}
+            />,
+            withClientContextRenderOptions(matrixClient),
+        );
     }
 
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
     it("should render", () => {
         const { asFragment } = renderComponent();
         expect(asFragment()).toMatchSnapshot();
@@ -38,8 +64,12 @@ describe("<RecoveyPanelOutOfSync />", () => {
     });
 
     it("should access to 4S and call onFinish when 'Enter recovery key' is clicked", async () => {
+        jest.spyOn(DeviceListener.sharedInstance(), "keyStorageOutOfSyncNeedsBackupReset").mockResolvedValue(false);
+
         const user = userEvent.setup();
-        mocked(accessSecretStorage).mockClear().mockResolvedValue();
+        mocked(accessSecretStorage).mockImplementation(async (func = async (): Promise<void> => {}) => {
+            return await func();
+        });
 
         const onFinish = jest.fn();
         renderComponent(onFinish);
@@ -47,5 +77,59 @@ describe("<RecoveyPanelOutOfSync />", () => {
         await user.click(screen.getByRole("button", { name: "Enter recovery key" }));
         expect(accessSecretStorage).toHaveBeenCalled();
         expect(onFinish).toHaveBeenCalled();
+
+        expect(matrixClient.getCrypto()!.resetKeyBackup).not.toHaveBeenCalled();
+    });
+
+    it("should reset key backup if needed", async () => {
+        jest.spyOn(DeviceListener.sharedInstance(), "keyStorageOutOfSyncNeedsBackupReset").mockResolvedValue(true);
+
+        const user = userEvent.setup();
+        mocked(accessSecretStorage).mockImplementation(async (func = async (): Promise<void> => {}) => {
+            return await func();
+        });
+
+        const onFinish = jest.fn();
+        renderComponent(onFinish);
+
+        await user.click(screen.getByRole("button", { name: "Enter recovery key" }));
+        expect(accessSecretStorage).toHaveBeenCalled();
+        expect(onFinish).toHaveBeenCalled();
+
+        expect(matrixClient.getCrypto()!.resetKeyBackup).toHaveBeenCalled();
+    });
+
+    it("should call onAccessSecretStorageFailed on failure", async () => {
+        jest.spyOn(DeviceListener.sharedInstance(), "keyStorageOutOfSyncNeedsBackupReset").mockResolvedValue(true);
+
+        const user = userEvent.setup();
+        mocked(accessSecretStorage).mockImplementation(async (func = async (): Promise<void> => {}) => {
+            throw new Error("Error");
+        });
+
+        const onAccessSecretStorageFailed = jest.fn();
+        renderComponent(jest.fn(), jest.fn(), onAccessSecretStorageFailed);
+
+        await user.click(screen.getByRole("button", { name: "Enter recovery key" }));
+        expect(accessSecretStorage).toHaveBeenCalled();
+        expect(onAccessSecretStorageFailed).toHaveBeenCalled();
+    });
+
+    it("should not call onAccessSecretStorageFailed when cancelled", async () => {
+        jest.spyOn(DeviceListener.sharedInstance(), "keyStorageOutOfSyncNeedsBackupReset").mockResolvedValue(true);
+
+        const user = userEvent.setup();
+        mocked(accessSecretStorage).mockImplementation(async (func = async (): Promise<void> => {}) => {
+            throw new AccessCancelledError();
+        });
+
+        const onFinish = jest.fn();
+        const onAccessSecretStorageFailed = jest.fn();
+        renderComponent(onFinish, jest.fn(), onAccessSecretStorageFailed);
+
+        await user.click(screen.getByRole("button", { name: "Enter recovery key" }));
+        expect(accessSecretStorage).toHaveBeenCalled();
+        expect(onFinish).not.toHaveBeenCalled();
+        expect(onAccessSecretStorageFailed).not.toHaveBeenCalled();
     });
 });
diff --git a/test/unit-tests/components/views/settings/encryption/__snapshots__/AdvancedPanel-test.tsx.snap b/test/unit-tests/components/views/settings/encryption/__snapshots__/AdvancedPanel-test.tsx.snap
index 6fc4a56841..f3b6f92ee8 100644
--- a/test/unit-tests/components/views/settings/encryption/__snapshots__/AdvancedPanel-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/encryption/__snapshots__/AdvancedPanel-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<AdvancedPanel /> <EncryptionDetails /> should display a spinner when loading the device keys 1`] = `
 <div
@@ -53,28 +53,7 @@ exports[`<AdvancedPanel /> <EncryptionDetails /> should display a spinner when l
     class="mx_EncryptionDetails_buttons"
   >
     <button
-      class="_button_vczzf_8 _has-icon_vczzf_57"
-      data-kind="secondary"
-      data-size="sm"
-      role="button"
-      tabindex="0"
-    >
-      <svg
-        aria-hidden="true"
-        fill="currentColor"
-        height="20"
-        viewBox="0 0 24 24"
-        width="20"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M12 16a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 15V7.85L9.125 9.725q-.3.3-.7.3T7.7 9.7a.93.93 0 0 1-.288-.713A.98.98 0 0 1 7.7 8.3l3.6-3.6q.15-.15.325-.213.175-.062.375-.062t.375.062a.9.9 0 0 1 .325.213l3.6 3.6q.3.3.287.712a.98.98 0 0 1-.287.688q-.3.3-.713.313a.93.93 0 0 1-.712-.288L13 7.85V15q0 .424-.287.713A.97.97 0 0 1 12 16m-6 4q-.824 0-1.412-.587A1.93 1.93 0 0 1 4 18v-2q0-.424.287-.713A.97.97 0 0 1 5 15q.424 0 .713.287Q6 15.576 6 16v2h12v-2q0-.424.288-.713A.97.97 0 0 1 19 15q.424 0 .712.287.288.288.288.713v2q0 .824-.587 1.413A1.93 1.93 0 0 1 18 20z"
-        />
-      </svg>
-      Export keys
-    </button>
-    <button
-      class="_button_vczzf_8 _has-icon_vczzf_57"
+      class="_button_187yx_8 _has-icon_187yx_57"
       data-kind="secondary"
       data-size="sm"
       role="button"
@@ -92,11 +71,32 @@ exports[`<AdvancedPanel /> <EncryptionDetails /> should display a spinner when l
           d="M12 15.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-3.6-3.6a.95.95 0 0 1-.275-.7q0-.425.275-.7.274-.275.712-.288t.713.263L11 12.15V5q0-.424.287-.713A.97.97 0 0 1 12 4q.424 0 .713.287Q13 4.576 13 5v7.15l1.875-1.875q.274-.274.713-.263.437.014.712.288a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-3.6 3.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063M6 20q-.824 0-1.412-.587A1.93 1.93 0 0 1 4 18v-2q0-.424.287-.713A.97.97 0 0 1 5 15q.424 0 .713.287Q6 15.576 6 16v2h12v-2q0-.424.288-.713A.97.97 0 0 1 19 15q.424 0 .712.287.288.288.288.713v2q0 .824-.587 1.413A1.93 1.93 0 0 1 18 20z"
         />
       </svg>
+      Export keys
+    </button>
+    <button
+      class="_button_187yx_8 _has-icon_187yx_57"
+      data-kind="secondary"
+      data-size="sm"
+      role="button"
+      tabindex="0"
+    >
+      <svg
+        aria-hidden="true"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 16a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 15V7.85L9.125 9.725q-.3.3-.7.3T7.7 9.7a.93.93 0 0 1-.288-.713A.98.98 0 0 1 7.7 8.3l3.6-3.6q.15-.15.325-.213.175-.062.375-.062t.375.062a.9.9 0 0 1 .325.213l3.6 3.6q.3.3.287.712a.98.98 0 0 1-.287.688q-.3.3-.713.313a.93.93 0 0 1-.712-.288L13 7.85V15q0 .424-.287.713A.97.97 0 0 1 12 16m-6 4q-.824 0-1.412-.587A1.93 1.93 0 0 1 4 18v-2q0-.424.287-.713A.97.97 0 0 1 5 15q.424 0 .713.287Q6 15.576 6 16v2h12v-2q0-.424.288-.713A.97.97 0 0 1 19 15q.424 0 .712.287.288.288.288.713v2q0 .824-.587 1.413A1.93 1.93 0 0 1 18 20z"
+        />
+      </svg>
       Import keys
     </button>
   </div>
   <button
-    class="_button_vczzf_8 _destructive_vczzf_107"
+    class="_button_187yx_8 _destructive_187yx_107"
     data-kind="tertiary"
     data-size="sm"
     role="button"
@@ -145,28 +145,7 @@ exports[`<AdvancedPanel /> <EncryptionDetails /> should display the device keys
     class="mx_EncryptionDetails_buttons"
   >
     <button
-      class="_button_vczzf_8 _has-icon_vczzf_57"
-      data-kind="secondary"
-      data-size="sm"
-      role="button"
-      tabindex="0"
-    >
-      <svg
-        aria-hidden="true"
-        fill="currentColor"
-        height="20"
-        viewBox="0 0 24 24"
-        width="20"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M12 16a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 15V7.85L9.125 9.725q-.3.3-.7.3T7.7 9.7a.93.93 0 0 1-.288-.713A.98.98 0 0 1 7.7 8.3l3.6-3.6q.15-.15.325-.213.175-.062.375-.062t.375.062a.9.9 0 0 1 .325.213l3.6 3.6q.3.3.287.712a.98.98 0 0 1-.287.688q-.3.3-.713.313a.93.93 0 0 1-.712-.288L13 7.85V15q0 .424-.287.713A.97.97 0 0 1 12 16m-6 4q-.824 0-1.412-.587A1.93 1.93 0 0 1 4 18v-2q0-.424.287-.713A.97.97 0 0 1 5 15q.424 0 .713.287Q6 15.576 6 16v2h12v-2q0-.424.288-.713A.97.97 0 0 1 19 15q.424 0 .712.287.288.288.288.713v2q0 .824-.587 1.413A1.93 1.93 0 0 1 18 20z"
-        />
-      </svg>
-      Export keys
-    </button>
-    <button
-      class="_button_vczzf_8 _has-icon_vczzf_57"
+      class="_button_187yx_8 _has-icon_187yx_57"
       data-kind="secondary"
       data-size="sm"
       role="button"
@@ -184,11 +163,32 @@ exports[`<AdvancedPanel /> <EncryptionDetails /> should display the device keys
           d="M12 15.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-3.6-3.6a.95.95 0 0 1-.275-.7q0-.425.275-.7.274-.275.712-.288t.713.263L11 12.15V5q0-.424.287-.713A.97.97 0 0 1 12 4q.424 0 .713.287Q13 4.576 13 5v7.15l1.875-1.875q.274-.274.713-.263.437.014.712.288a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-3.6 3.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063M6 20q-.824 0-1.412-.587A1.93 1.93 0 0 1 4 18v-2q0-.424.287-.713A.97.97 0 0 1 5 15q.424 0 .713.287Q6 15.576 6 16v2h12v-2q0-.424.288-.713A.97.97 0 0 1 19 15q.424 0 .712.287.288.288.288.713v2q0 .824-.587 1.413A1.93 1.93 0 0 1 18 20z"
         />
       </svg>
+      Export keys
+    </button>
+    <button
+      class="_button_187yx_8 _has-icon_187yx_57"
+      data-kind="secondary"
+      data-size="sm"
+      role="button"
+      tabindex="0"
+    >
+      <svg
+        aria-hidden="true"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 16a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 15V7.85L9.125 9.725q-.3.3-.7.3T7.7 9.7a.93.93 0 0 1-.288-.713A.98.98 0 0 1 7.7 8.3l3.6-3.6q.15-.15.325-.213.175-.062.375-.062t.375.062a.9.9 0 0 1 .325.213l3.6 3.6q.3.3.287.712a.98.98 0 0 1-.287.688q-.3.3-.713.313a.93.93 0 0 1-.712-.288L13 7.85V15q0 .424-.287.713A.97.97 0 0 1 12 16m-6 4q-.824 0-1.412-.587A1.93 1.93 0 0 1 4 18v-2q0-.424.287-.713A.97.97 0 0 1 5 15q.424 0 .713.287Q6 15.576 6 16v2h12v-2q0-.424.288-.713A.97.97 0 0 1 19 15q.424 0 .712.287.288.288.288.713v2q0 .824-.587 1.413A1.93 1.93 0 0 1 18 20z"
+        />
+      </svg>
       Import keys
     </button>
   </div>
   <button
-    class="_button_vczzf_8 _destructive_vczzf_107"
+    class="_button_187yx_8 _destructive_187yx_107"
     data-kind="tertiary"
     data-size="sm"
     role="button"
@@ -216,19 +216,20 @@ exports[`<AdvancedPanel /> <OtherSettings /> should display the blacklist of unv
       class="_inline-field-control_19upo_44"
     >
       <div
-        class="_container_19o42_10"
+        class="_container_udcm8_10"
       >
         <input
-          aria-describedby="radix-«r7»"
+          aria-describedby="radix-_r_7_"
           checked=""
-          class="_input_19o42_24"
-          id="radix-«r6»"
+          class="_input_udcm8_24"
+          id="radix-_r_6_"
           name="neverSendEncrypted"
+          role="switch"
           title=""
           type="checkbox"
         />
         <div
-          class="_ui_19o42_34"
+          class="_ui_udcm8_34"
         />
       </div>
     </div>
@@ -237,15 +238,15 @@ exports[`<AdvancedPanel /> <OtherSettings /> should display the blacklist of unv
     >
       <label
         class="_label_19upo_59"
-        for="radix-«r6»"
+        for="radix-_r_6_"
       >
         In encrypted rooms, only send messages to verified users
       </label>
       <span
         class="_message_19upo_85 _help-message_19upo_91"
-        id="radix-«r7»"
+        id="radix-_r_7_"
       >
-        Warning: users who have not explicitly verified with you (e.g. using emoji) will not receive your encrypted messages. Also, unverified devices of verified users will not receive your encrypted messages.
+        Warning: users who have not explicitly verified with you (e.g. using emoji) will not receive your encrypted messages. Also, unverified devices of verified users will not receive your encrypted messages. Changes require an application restart to take effect.
       </span>
     </div>
   </div>
diff --git a/test/unit-tests/components/views/settings/encryption/__snapshots__/ChangeRecoveryKey-test.tsx.snap b/test/unit-tests/components/views/settings/encryption/__snapshots__/ChangeRecoveryKey-test.tsx.snap
index c9fa65a64e..8f6e0fed33 100644
--- a/test/unit-tests/components/views/settings/encryption/__snapshots__/ChangeRecoveryKey-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/encryption/__snapshots__/ChangeRecoveryKey-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<ChangeRecoveryKey /> flow to change the recovery key should display the recovery key 1`] = `
 <DocumentFragment>
@@ -7,13 +7,14 @@ exports[`<ChangeRecoveryKey /> flow to change the recovery key should display th
   >
     <button
       aria-label="Back"
-      class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+      class="_icon-button_1pz9o_8"
+      data-kind="secondary"
       role="button"
       style="--cpd-icon-button-size: 28px;"
       tabindex="0"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <svg
@@ -61,7 +62,7 @@ exports[`<ChangeRecoveryKey /> flow to change the recovery key should display th
       class="mx_EncryptionCard_header"
     >
       <div
-        class="_content_o77nw_8"
+        class="_content_1r8kr_8"
         data-size="large"
       >
         <svg
@@ -108,13 +109,14 @@ exports[`<ChangeRecoveryKey /> flow to change the recovery key should display th
       </div>
       <button
         aria-label="Copy"
-        class="_icon-button_m2erp_8"
+        class="_icon-button_1pz9o_8"
+        data-kind="primary"
         role="button"
         style="--cpd-icon-button-size: 28px;"
         tabindex="0"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -138,7 +140,7 @@ exports[`<ChangeRecoveryKey /> flow to change the recovery key should display th
       class="mx_EncryptionCard_buttons"
     >
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="primary"
         data-size="lg"
         role="button"
@@ -147,7 +149,7 @@ exports[`<ChangeRecoveryKey /> flow to change the recovery key should display th
         Continue
       </button>
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="tertiary"
         data-size="lg"
         role="button"
@@ -167,13 +169,14 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should ask the user
   >
     <button
       aria-label="Back"
-      class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+      class="_icon-button_1pz9o_8"
+      data-kind="secondary"
       role="button"
       style="--cpd-icon-button-size: 28px;"
       tabindex="0"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <svg
@@ -221,7 +224,7 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should ask the user
       class="mx_EncryptionCard_header"
     >
       <div
-        class="_content_o77nw_8"
+        class="_content_1r8kr_8"
         data-size="large"
       >
         <svg
@@ -253,24 +256,49 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should ask the user
       >
         <label
           class="_label_19upo_59"
-          for="radix-«r0»"
+          for="radix-_r_0_"
         >
           Enter recovery key
         </label>
-        <input
-          class="_control_sqdq4_10"
-          id="radix-«r0»"
-          name="recoveryKey"
-          required=""
-          title=""
-        />
+        <div
+          class="_container_1s836_8 mx_KeyForm_password mx_no_textinput"
+          id="_r_1_"
+        >
+          <input
+            class="_control_sqdq4_10 _control_1s836_13"
+            id="radix-_r_0_"
+            name="recoveryKey"
+            required=""
+            title="Enter recovery key"
+            type="password"
+          />
+          <button
+            aria-controls="_r_1_"
+            aria-labelledby="_r_2_"
+            class="_action_1s836_24"
+            type="button"
+          >
+            <svg
+              aria-hidden="true"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="m16.1 13.3-1.45-1.45q.225-1.175-.675-2.2t-2.325-.8L10.2 7.4q.424-.2.863-.3A4.2 4.2 0 0 1 12 7q1.875 0 3.188 1.312Q16.5 9.625 16.5 11.5q0 .5-.1.938t-.3.862m3.2 3.15-1.45-1.4a11 11 0 0 0 1.688-1.588A9 9 0 0 0 20.8 11.5q-1.25-2.524-3.588-4.013Q14.875 6 12 6q-.724 0-1.425.1a10 10 0 0 0-1.375.3L7.65 4.85A11.1 11.1 0 0 1 12 4q3.575 0 6.425 1.887T22.7 10.8a.8.8 0 0 1 .1.313q.025.188.025.387a2 2 0 0 1-.125.7 10.9 10.9 0 0 1-3.4 4.25m-.2 5.45-3.5-3.45q-.874.274-1.762.413Q12.95 19 12 19q-3.575 0-6.425-1.887T1.3 12.2a.8.8 0 0 1-.1-.312 3 3 0 0 1 0-.763.8.8 0 0 1 .1-.3Q1.825 9.7 2.55 8.75A13.3 13.3 0 0 1 4.15 7L2.075 4.9a.93.93 0 0 1-.275-.688q0-.412.3-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275l17 17q.275.275.288.688a.93.93 0 0 1-.288.712.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275M5.55 8.4q-.725.65-1.325 1.425A9 9 0 0 0 3.2 11.5q1.25 2.524 3.588 4.012T12 17q.5 0 .975-.062.475-.063.975-.138l-.9-.95q-.274.075-.525.113A3.5 3.5 0 0 1 12 16q-1.875 0-3.187-1.312Q7.5 13.375 7.5 11.5q0-.274.038-.525.037-.25.112-.525z"
+              />
+            </svg>
+          </button>
+        </div>
       </div>
       <div
         class="mx_EncryptionCard_buttons"
       >
         <button
           aria-disabled="true"
-          class="_button_vczzf_8"
+          class="_button_187yx_8"
           data-kind="primary"
           data-size="lg"
           role="button"
@@ -279,7 +307,7 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should ask the user
           Finish set up
         </button>
         <button
-          class="_button_vczzf_8"
+          class="_button_187yx_8"
           data-kind="tertiary"
           data-size="lg"
           role="button"
@@ -300,13 +328,14 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should ask the user
   >
     <button
       aria-label="Back"
-      class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+      class="_icon-button_1pz9o_8"
+      data-kind="secondary"
       role="button"
       style="--cpd-icon-button-size: 28px;"
       tabindex="0"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <svg
@@ -354,7 +383,7 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should ask the user
       class="mx_EncryptionCard_header"
     >
       <div
-        class="_content_o77nw_8"
+        class="_content_1r8kr_8"
         data-size="large"
       >
         <svg
@@ -388,23 +417,48 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should ask the user
         <label
           class="_label_19upo_59"
           data-invalid="true"
-          for="radix-«r0»"
+          for="radix-_r_0_"
         >
           Enter recovery key
         </label>
-        <input
-          aria-describedby="radix-«r1»"
-          aria-invalid="true"
-          class="_control_sqdq4_10"
-          data-invalid="true"
-          id="radix-«r0»"
-          name="recoveryKey"
-          required=""
-          title=""
-        />
+        <div
+          class="_container_1s836_8 mx_KeyForm_password mx_no_textinput"
+          id="_r_1_"
+        >
+          <input
+            aria-describedby="radix-_r_8_"
+            aria-invalid="true"
+            class="_control_sqdq4_10 _control_1s836_13"
+            data-invalid="true"
+            id="radix-_r_0_"
+            name="recoveryKey"
+            required=""
+            title="Enter recovery key"
+            type="password"
+          />
+          <button
+            aria-controls="_r_1_"
+            aria-labelledby="_r_2_"
+            class="_action_1s836_24"
+            type="button"
+          >
+            <svg
+              aria-hidden="true"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="m16.1 13.3-1.45-1.45q.225-1.175-.675-2.2t-2.325-.8L10.2 7.4q.424-.2.863-.3A4.2 4.2 0 0 1 12 7q1.875 0 3.188 1.312Q16.5 9.625 16.5 11.5q0 .5-.1.938t-.3.862m3.2 3.15-1.45-1.4a11 11 0 0 0 1.688-1.588A9 9 0 0 0 20.8 11.5q-1.25-2.524-3.588-4.013Q14.875 6 12 6q-.724 0-1.425.1a10 10 0 0 0-1.375.3L7.65 4.85A11.1 11.1 0 0 1 12 4q3.575 0 6.425 1.887T22.7 10.8a.8.8 0 0 1 .1.313q.025.188.025.387a2 2 0 0 1-.125.7 10.9 10.9 0 0 1-3.4 4.25m-.2 5.45-3.5-3.45q-.874.274-1.762.413Q12.95 19 12 19q-3.575 0-6.425-1.887T1.3 12.2a.8.8 0 0 1-.1-.312 3 3 0 0 1 0-.763.8.8 0 0 1 .1-.3Q1.825 9.7 2.55 8.75A13.3 13.3 0 0 1 4.15 7L2.075 4.9a.93.93 0 0 1-.275-.688q0-.412.3-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275l17 17q.275.275.288.688a.93.93 0 0 1-.288.712.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275M5.55 8.4q-.725.65-1.325 1.425A9 9 0 0 0 3.2 11.5q1.25 2.524 3.588 4.012T12 17q.5 0 .975-.062.475-.063.975-.138l-.9-.95q-.274.075-.525.113A3.5 3.5 0 0 1 12 16q-1.875 0-3.187-1.312Q7.5 13.375 7.5 11.5q0-.274.038-.525.037-.25.112-.525z"
+              />
+            </svg>
+          </button>
+        </div>
         <span
           class="_message_19upo_85 _error-message_19upo_95"
-          id="radix-«r1»"
+          id="radix-_r_8_"
         >
           <svg
             fill="currentColor"
@@ -425,7 +479,7 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should ask the user
       >
         <button
           aria-disabled="true"
-          class="_button_vczzf_8"
+          class="_button_187yx_8"
           data-kind="primary"
           data-size="lg"
           role="button"
@@ -434,7 +488,7 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should ask the user
           Finish set up
         </button>
         <button
-          class="_button_vczzf_8"
+          class="_button_187yx_8"
           data-kind="tertiary"
           data-size="lg"
           role="button"
@@ -455,13 +509,14 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should display info
   >
     <button
       aria-label="Back"
-      class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+      class="_icon-button_1pz9o_8"
+      data-kind="secondary"
       role="button"
       style="--cpd-icon-button-size: 28px;"
       tabindex="0"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <svg
@@ -509,7 +564,7 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should display info
       class="mx_EncryptionCard_header"
     >
       <div
-        class="_content_o77nw_8"
+        class="_content_1r8kr_8"
         data-size="large"
       >
         <svg
@@ -542,7 +597,7 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should display info
       class="mx_EncryptionCard_buttons"
     >
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="primary"
         data-size="lg"
         role="button"
@@ -551,7 +606,7 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should display info
         Continue
       </button>
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="tertiary"
         data-size="lg"
         role="button"
@@ -571,13 +626,14 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should display the
   >
     <button
       aria-label="Back"
-      class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+      class="_icon-button_1pz9o_8"
+      data-kind="secondary"
       role="button"
       style="--cpd-icon-button-size: 28px;"
       tabindex="0"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <svg
@@ -625,7 +681,7 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should display the
       class="mx_EncryptionCard_header"
     >
       <div
-        class="_content_o77nw_8"
+        class="_content_1r8kr_8"
         data-size="large"
       >
         <svg
@@ -672,13 +728,14 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should display the
       </div>
       <button
         aria-label="Copy"
-        class="_icon-button_m2erp_8"
+        class="_icon-button_1pz9o_8"
+        data-kind="primary"
         role="button"
         style="--cpd-icon-button-size: 28px;"
         tabindex="0"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -702,7 +759,7 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should display the
       class="mx_EncryptionCard_buttons"
     >
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="primary"
         data-size="lg"
         role="button"
@@ -711,7 +768,7 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should display the
         Continue
       </button>
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="tertiary"
         data-size="lg"
         role="button"
diff --git a/test/unit-tests/components/views/settings/encryption/__snapshots__/DeleteKeyStoragePanel-test.tsx.snap b/test/unit-tests/components/views/settings/encryption/__snapshots__/DeleteKeyStoragePanel-test.tsx.snap
index 52541c468b..d82823b1e3 100644
--- a/test/unit-tests/components/views/settings/encryption/__snapshots__/DeleteKeyStoragePanel-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/encryption/__snapshots__/DeleteKeyStoragePanel-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<DeleteKeyStoragePanel /> should match snapshot 1`] = `
 <DocumentFragment>
@@ -7,13 +7,14 @@ exports[`<DeleteKeyStoragePanel /> should match snapshot 1`] = `
   >
     <button
       aria-label="Back"
-      class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+      class="_icon-button_1pz9o_8"
+      data-kind="secondary"
       role="button"
       style="--cpd-icon-button-size: 28px;"
       tabindex="0"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <svg
@@ -61,7 +62,7 @@ exports[`<DeleteKeyStoragePanel /> should match snapshot 1`] = `
       class="mx_EncryptionCard_header"
     >
       <div
-        class="_content_o77nw_8 _destructive_o77nw_34"
+        class="_content_1r8kr_8 _destructive_1r8kr_34"
         data-size="large"
       >
         <svg
@@ -83,19 +84,19 @@ exports[`<DeleteKeyStoragePanel /> should match snapshot 1`] = `
       </h2>
     </div>
     <div
-      class="mx_Flex mx_EncryptionCard_emphasisedContent"
+      class="_flex_4dswl_9 mx_EncryptionCard_emphasisedContent"
       style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: normal; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
     >
       Deleting key storage will remove your cryptographic identity and message keys from the server and turn off the following security features:
       <ul
-        class="_visual-list_15wzx_8"
+        class="_visual-list_1mgc1_8"
       >
         <li
-          class="_visual-list-item_1ma3e_8"
+          class="_visual-list-item_1nc1y_8"
         >
           <svg
             aria-hidden="true"
-            class="_visual-list-item-icon_1ma3e_17 _visual-list-item-icon-destructive_1ma3e_26"
+            class="_visual-list-item-icon_1nc1y_17 _visual-list-item-icon-destructive_1nc1y_26"
             fill="currentColor"
             height="24px"
             viewBox="0 0 24 24"
@@ -109,11 +110,11 @@ exports[`<DeleteKeyStoragePanel /> should match snapshot 1`] = `
           You will not have encrypted message history on new devices
         </li>
         <li
-          class="_visual-list-item_1ma3e_8"
+          class="_visual-list-item_1nc1y_8"
         >
           <svg
             aria-hidden="true"
-            class="_visual-list-item-icon_1ma3e_17 _visual-list-item-icon-destructive_1ma3e_26"
+            class="_visual-list-item-icon_1nc1y_17 _visual-list-item-icon-destructive_1nc1y_26"
             fill="currentColor"
             height="24px"
             viewBox="0 0 24 24"
@@ -133,7 +134,7 @@ exports[`<DeleteKeyStoragePanel /> should match snapshot 1`] = `
     >
       <button
         aria-disabled="false"
-        class="_button_vczzf_8 _destructive_vczzf_107"
+        class="_button_187yx_8 _destructive_187yx_107"
         data-kind="primary"
         data-size="lg"
         role="button"
@@ -142,7 +143,7 @@ exports[`<DeleteKeyStoragePanel /> should match snapshot 1`] = `
         Delete key storage
       </button>
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="tertiary"
         data-size="lg"
         role="button"
diff --git a/test/unit-tests/components/views/settings/encryption/__snapshots__/EncryptionCard-test.tsx.snap b/test/unit-tests/components/views/settings/encryption/__snapshots__/EncryptionCard-test.tsx.snap
index 39aedb2637..3c72479607 100644
--- a/test/unit-tests/components/views/settings/encryption/__snapshots__/EncryptionCard-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/encryption/__snapshots__/EncryptionCard-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<EncryptionCard /> should render 1`] = `
 <DocumentFragment>
@@ -9,7 +9,7 @@ exports[`<EncryptionCard /> should render 1`] = `
       class="mx_EncryptionCard_header"
     >
       <div
-        class="_content_o77nw_8"
+        class="_content_1r8kr_8"
         data-size="large"
       >
         <svg
diff --git a/test/unit-tests/components/views/settings/encryption/__snapshots__/RecoveryPanel-test.tsx.snap b/test/unit-tests/components/views/settings/encryption/__snapshots__/RecoveryPanel-test.tsx.snap
index fda6b29aa1..1a79467c60 100644
--- a/test/unit-tests/components/views/settings/encryption/__snapshots__/RecoveryPanel-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/encryption/__snapshots__/RecoveryPanel-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<RecoveryPanel /> should allow to change the recovery key when everything is good 1`] = `
 <DocumentFragment>
@@ -12,12 +12,12 @@ exports[`<RecoveryPanel /> should allow to change the recovery key when everythi
       <h2
         class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93 mx_SettingsHeader"
       >
-        Recovery 
+        Recovery
       </h2>
       Recover your cryptographic identity and message history with a recovery key if you’ve lost all your existing devices.
     </div>
     <button
-      class="_button_vczzf_8 _has-icon_vczzf_57"
+      class="_button_187yx_8 _has-icon_187yx_57"
       data-kind="secondary"
       data-size="sm"
       role="button"
@@ -51,17 +51,14 @@ exports[`<RecoveryPanel /> should ask to set up a recovery key when there is no
       class="mx_SettingsSection_header"
     >
       <h2
-        class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93 mx_SettingsHeader"
+        class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93 mx_SettingsHeader mx_SettingsHeader_recommended"
       >
-        Recovery 
-        <span>
-          Recommended
-        </span>
+        Recovery
       </h2>
       Recover your cryptographic identity and message history with a recovery key if you’ve lost all your existing devices.
     </div>
     <button
-      class="_button_vczzf_8 _has-icon_vczzf_57"
+      class="_button_187yx_8 _has-icon_187yx_57"
       data-kind="primary"
       data-size="sm"
       role="button"
@@ -97,7 +94,7 @@ exports[`<RecoveryPanel /> should be in loading state when checking the recovery
       <h2
         class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93 mx_SettingsHeader"
       >
-        Recovery 
+        Recovery
       </h2>
       Recover your cryptographic identity and message history with a recovery key if you’ve lost all your existing devices.
     </div>
diff --git a/test/unit-tests/components/views/settings/encryption/__snapshots__/RecoveryPanelOutOfSync-test.tsx.snap b/test/unit-tests/components/views/settings/encryption/__snapshots__/RecoveryPanelOutOfSync-test.tsx.snap
index edf7de5af9..a6d26193a0 100644
--- a/test/unit-tests/components/views/settings/encryption/__snapshots__/RecoveryPanelOutOfSync-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/encryption/__snapshots__/RecoveryPanelOutOfSync-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<RecoveyPanelOutOfSync /> should render 1`] = `
 <DocumentFragment>
@@ -12,7 +12,7 @@ exports[`<RecoveyPanelOutOfSync /> should render 1`] = `
       <h2
         class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93 mx_SettingsHeader"
       >
-        Recovery 
+        Recovery
       </h2>
       <div
         class="mx_SettingsSubheader"
@@ -40,7 +40,7 @@ exports[`<RecoveyPanelOutOfSync /> should render 1`] = `
       class="mx_RecoveryPanelOutOfSync"
     >
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="secondary"
         data-size="sm"
         role="button"
@@ -49,7 +49,7 @@ exports[`<RecoveyPanelOutOfSync /> should render 1`] = `
         Forgot recovery key?
       </button>
       <button
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="primary"
         data-size="sm"
         role="button"
diff --git a/test/unit-tests/components/views/settings/encryption/__snapshots__/ResetIdentityPanel-test.tsx.snap b/test/unit-tests/components/views/settings/encryption/__snapshots__/ResetIdentityPanel-test.tsx.snap
index 894abf4842..84ea93adfa 100644
--- a/test/unit-tests/components/views/settings/encryption/__snapshots__/ResetIdentityPanel-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/encryption/__snapshots__/ResetIdentityPanel-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<ResetIdentityPanel /> should display the 'forgot recovery key' variant correctly 1`] = `
 <DocumentFragment>
@@ -7,13 +7,14 @@ exports[`<ResetIdentityPanel /> should display the 'forgot recovery key' variant
   >
     <button
       aria-label="Back"
-      class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+      class="_icon-button_1pz9o_8"
+      data-kind="secondary"
       role="button"
       style="--cpd-icon-button-size: 28px;"
       tabindex="0"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <svg
@@ -61,7 +62,7 @@ exports[`<ResetIdentityPanel /> should display the 'forgot recovery key' variant
       class="mx_EncryptionCard_header"
     >
       <div
-        class="_content_o77nw_8 _destructive_o77nw_34"
+        class="_content_1r8kr_8 _destructive_1r8kr_34"
         data-size="large"
       >
         <svg
@@ -83,18 +84,18 @@ exports[`<ResetIdentityPanel /> should display the 'forgot recovery key' variant
       </h2>
     </div>
     <div
-      class="mx_Flex mx_EncryptionCard_emphasisedContent"
+      class="_flex_4dswl_9 mx_EncryptionCard_emphasisedContent"
       style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: normal; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
     >
       <ul
-        class="_visual-list_15wzx_8"
+        class="_visual-list_1mgc1_8"
       >
         <li
-          class="_visual-list-item_1ma3e_8"
+          class="_visual-list-item_1nc1y_8"
         >
           <svg
             aria-hidden="true"
-            class="_visual-list-item-icon_1ma3e_17 _visual-list-item-icon-success_1ma3e_22"
+            class="_visual-list-item-icon_1nc1y_17 _visual-list-item-icon-success_1nc1y_22"
             fill="currentColor"
             height="24px"
             viewBox="0 0 24 24"
@@ -108,11 +109,11 @@ exports[`<ResetIdentityPanel /> should display the 'forgot recovery key' variant
           Your account details, contacts, preferences, and chat list will be kept
         </li>
         <li
-          class="_visual-list-item_1ma3e_8"
+          class="_visual-list-item_1nc1y_8"
         >
           <svg
             aria-hidden="true"
-            class="_visual-list-item-icon_1ma3e_17"
+            class="_visual-list-item-icon_1nc1y_17"
             fill="currentColor"
             height="24px"
             viewBox="0 0 24 24"
@@ -131,11 +132,11 @@ exports[`<ResetIdentityPanel /> should display the 'forgot recovery key' variant
           You will lose any message history that’s stored only on the server
         </li>
         <li
-          class="_visual-list-item_1ma3e_8"
+          class="_visual-list-item_1nc1y_8"
         >
           <svg
             aria-hidden="true"
-            class="_visual-list-item-icon_1ma3e_17"
+            class="_visual-list-item-icon_1nc1y_17"
             fill="currentColor"
             height="24px"
             viewBox="0 0 24 24"
@@ -160,7 +161,7 @@ exports[`<ResetIdentityPanel /> should display the 'forgot recovery key' variant
     >
       <button
         aria-disabled="false"
-        class="_button_vczzf_8 _destructive_vczzf_107"
+        class="_button_187yx_8 _destructive_187yx_107"
         data-kind="primary"
         data-size="lg"
         role="button"
@@ -169,7 +170,7 @@ exports[`<ResetIdentityPanel /> should display the 'forgot recovery key' variant
         Continue
       </button>
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="tertiary"
         data-size="lg"
         role="button"
@@ -189,13 +190,14 @@ exports[`<ResetIdentityPanel /> should display the 'sync failed' variant correct
   >
     <button
       aria-label="Back"
-      class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+      class="_icon-button_1pz9o_8"
+      data-kind="secondary"
       role="button"
       style="--cpd-icon-button-size: 28px;"
       tabindex="0"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <svg
@@ -243,7 +245,7 @@ exports[`<ResetIdentityPanel /> should display the 'sync failed' variant correct
       class="mx_EncryptionCard_header"
     >
       <div
-        class="_content_o77nw_8 _destructive_o77nw_34"
+        class="_content_1r8kr_8 _destructive_1r8kr_34"
         data-size="large"
       >
         <svg
@@ -265,18 +267,18 @@ exports[`<ResetIdentityPanel /> should display the 'sync failed' variant correct
       </h2>
     </div>
     <div
-      class="mx_Flex mx_EncryptionCard_emphasisedContent"
+      class="_flex_4dswl_9 mx_EncryptionCard_emphasisedContent"
       style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: normal; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
     >
       <ul
-        class="_visual-list_15wzx_8"
+        class="_visual-list_1mgc1_8"
       >
         <li
-          class="_visual-list-item_1ma3e_8"
+          class="_visual-list-item_1nc1y_8"
         >
           <svg
             aria-hidden="true"
-            class="_visual-list-item-icon_1ma3e_17 _visual-list-item-icon-success_1ma3e_22"
+            class="_visual-list-item-icon_1nc1y_17 _visual-list-item-icon-success_1nc1y_22"
             fill="currentColor"
             height="24px"
             viewBox="0 0 24 24"
@@ -290,11 +292,11 @@ exports[`<ResetIdentityPanel /> should display the 'sync failed' variant correct
           Your account details, contacts, preferences, and chat list will be kept
         </li>
         <li
-          class="_visual-list-item_1ma3e_8"
+          class="_visual-list-item_1nc1y_8"
         >
           <svg
             aria-hidden="true"
-            class="_visual-list-item-icon_1ma3e_17"
+            class="_visual-list-item-icon_1nc1y_17"
             fill="currentColor"
             height="24px"
             viewBox="0 0 24 24"
@@ -313,11 +315,11 @@ exports[`<ResetIdentityPanel /> should display the 'sync failed' variant correct
           You will lose any message history that’s stored only on the server
         </li>
         <li
-          class="_visual-list-item_1ma3e_8"
+          class="_visual-list-item_1nc1y_8"
         >
           <svg
             aria-hidden="true"
-            class="_visual-list-item-icon_1ma3e_17"
+            class="_visual-list-item-icon_1nc1y_17"
             fill="currentColor"
             height="24px"
             viewBox="0 0 24 24"
@@ -342,7 +344,7 @@ exports[`<ResetIdentityPanel /> should display the 'sync failed' variant correct
     >
       <button
         aria-disabled="false"
-        class="_button_vczzf_8 _destructive_vczzf_107"
+        class="_button_187yx_8 _destructive_187yx_107"
         data-kind="primary"
         data-size="lg"
         role="button"
@@ -351,7 +353,7 @@ exports[`<ResetIdentityPanel /> should display the 'sync failed' variant correct
         Continue
       </button>
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="tertiary"
         data-size="lg"
         role="button"
@@ -371,13 +373,14 @@ exports[`<ResetIdentityPanel /> should reset the encryption when the continue bu
   >
     <button
       aria-label="Back"
-      class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+      class="_icon-button_1pz9o_8"
+      data-kind="secondary"
       role="button"
       style="--cpd-icon-button-size: 28px;"
       tabindex="0"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <svg
@@ -425,7 +428,7 @@ exports[`<ResetIdentityPanel /> should reset the encryption when the continue bu
       class="mx_EncryptionCard_header"
     >
       <div
-        class="_content_o77nw_8 _destructive_o77nw_34"
+        class="_content_1r8kr_8 _destructive_1r8kr_34"
         data-size="large"
       >
         <svg
@@ -447,18 +450,18 @@ exports[`<ResetIdentityPanel /> should reset the encryption when the continue bu
       </h2>
     </div>
     <div
-      class="mx_Flex mx_EncryptionCard_emphasisedContent"
+      class="_flex_4dswl_9 mx_EncryptionCard_emphasisedContent"
       style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: normal; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
     >
       <ul
-        class="_visual-list_15wzx_8"
+        class="_visual-list_1mgc1_8"
       >
         <li
-          class="_visual-list-item_1ma3e_8"
+          class="_visual-list-item_1nc1y_8"
         >
           <svg
             aria-hidden="true"
-            class="_visual-list-item-icon_1ma3e_17 _visual-list-item-icon-success_1ma3e_22"
+            class="_visual-list-item-icon_1nc1y_17 _visual-list-item-icon-success_1nc1y_22"
             fill="currentColor"
             height="24px"
             viewBox="0 0 24 24"
@@ -472,11 +475,11 @@ exports[`<ResetIdentityPanel /> should reset the encryption when the continue bu
           Your account details, contacts, preferences, and chat list will be kept
         </li>
         <li
-          class="_visual-list-item_1ma3e_8"
+          class="_visual-list-item_1nc1y_8"
         >
           <svg
             aria-hidden="true"
-            class="_visual-list-item-icon_1ma3e_17"
+            class="_visual-list-item-icon_1nc1y_17"
             fill="currentColor"
             height="24px"
             viewBox="0 0 24 24"
@@ -495,11 +498,11 @@ exports[`<ResetIdentityPanel /> should reset the encryption when the continue bu
           You will lose any message history that’s stored only on the server
         </li>
         <li
-          class="_visual-list-item_1ma3e_8"
+          class="_visual-list-item_1nc1y_8"
         >
           <svg
             aria-hidden="true"
-            class="_visual-list-item-icon_1ma3e_17"
+            class="_visual-list-item-icon_1nc1y_17"
             fill="currentColor"
             height="24px"
             viewBox="0 0 24 24"
@@ -527,7 +530,7 @@ exports[`<ResetIdentityPanel /> should reset the encryption when the continue bu
     >
       <button
         aria-disabled="false"
-        class="_button_vczzf_8 _destructive_vczzf_107"
+        class="_button_187yx_8 _destructive_187yx_107"
         data-kind="primary"
         data-size="lg"
         role="button"
@@ -536,7 +539,7 @@ exports[`<ResetIdentityPanel /> should reset the encryption when the continue bu
         Continue
       </button>
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="tertiary"
         data-size="lg"
         role="button"
@@ -556,13 +559,14 @@ exports[`<ResetIdentityPanel /> should reset the encryption when the continue bu
   >
     <button
       aria-label="Back"
-      class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+      class="_icon-button_1pz9o_8"
+      data-kind="secondary"
       role="button"
       style="--cpd-icon-button-size: 28px;"
       tabindex="0"
     >
       <div
-        class="_indicator-icon_zr2a0_17"
+        class="_indicator-icon_147l5_17"
         style="--cpd-icon-button-size: 100%;"
       >
         <svg
@@ -610,7 +614,7 @@ exports[`<ResetIdentityPanel /> should reset the encryption when the continue bu
       class="mx_EncryptionCard_header"
     >
       <div
-        class="_content_o77nw_8 _destructive_o77nw_34"
+        class="_content_1r8kr_8 _destructive_1r8kr_34"
         data-size="large"
       >
         <svg
@@ -632,18 +636,18 @@ exports[`<ResetIdentityPanel /> should reset the encryption when the continue bu
       </h2>
     </div>
     <div
-      class="mx_Flex mx_EncryptionCard_emphasisedContent"
+      class="_flex_4dswl_9 mx_EncryptionCard_emphasisedContent"
       style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: normal; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
     >
       <ul
-        class="_visual-list_15wzx_8"
+        class="_visual-list_1mgc1_8"
       >
         <li
-          class="_visual-list-item_1ma3e_8"
+          class="_visual-list-item_1nc1y_8"
         >
           <svg
             aria-hidden="true"
-            class="_visual-list-item-icon_1ma3e_17 _visual-list-item-icon-success_1ma3e_22"
+            class="_visual-list-item-icon_1nc1y_17 _visual-list-item-icon-success_1nc1y_22"
             fill="currentColor"
             height="24px"
             viewBox="0 0 24 24"
@@ -657,11 +661,11 @@ exports[`<ResetIdentityPanel /> should reset the encryption when the continue bu
           Your account details, contacts, preferences, and chat list will be kept
         </li>
         <li
-          class="_visual-list-item_1ma3e_8"
+          class="_visual-list-item_1nc1y_8"
         >
           <svg
             aria-hidden="true"
-            class="_visual-list-item-icon_1ma3e_17"
+            class="_visual-list-item-icon_1nc1y_17"
             fill="currentColor"
             height="24px"
             viewBox="0 0 24 24"
@@ -680,11 +684,11 @@ exports[`<ResetIdentityPanel /> should reset the encryption when the continue bu
           You will lose any message history that’s stored only on the server
         </li>
         <li
-          class="_visual-list-item_1ma3e_8"
+          class="_visual-list-item_1nc1y_8"
         >
           <svg
             aria-hidden="true"
-            class="_visual-list-item-icon_1ma3e_17"
+            class="_visual-list-item-icon_1nc1y_17"
             fill="currentColor"
             height="24px"
             viewBox="0 0 24 24"
@@ -712,7 +716,7 @@ exports[`<ResetIdentityPanel /> should reset the encryption when the continue bu
     >
       <button
         aria-disabled="true"
-        class="_button_vczzf_8 _destructive_vczzf_107"
+        class="_button_187yx_8 _destructive_187yx_107"
         data-kind="primary"
         data-size="lg"
         role="button"
@@ -736,7 +740,7 @@ exports[`<ResetIdentityPanel /> should reset the encryption when the continue bu
          Reset in progress...
       </button>
       <div
-        class="mx_Flex mx_EncryptionCard_emphasisedContent"
+        class="_flex_4dswl_9 mx_EncryptionCard_emphasisedContent"
         style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: normal; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
       >
         <span
diff --git a/test/unit-tests/components/views/settings/notifications/Notifications2-test.tsx b/test/unit-tests/components/views/settings/notifications/Notifications2-test.tsx
index d33b5c4e26..0f8289a42c 100644
--- a/test/unit-tests/components/views/settings/notifications/Notifications2-test.tsx
+++ b/test/unit-tests/components/views/settings/notifications/Notifications2-test.tsx
@@ -18,6 +18,7 @@ import {
     RuleId,
 } from "matrix-js-sdk/src/matrix";
 import React from "react";
+import { Form } from "@vector-im/compound-web";
 
 import NotificationSettings2 from "../../../../../../src/components/views/settings/notifications/NotificationSettings2";
 import MatrixClientContext from "../../../../../../src/contexts/MatrixClientContext";
@@ -93,7 +94,9 @@ describe("<Notifications />", () => {
 
         const screen = render(
             <MatrixClientContext.Provider value={cli}>
-                <NotificationSettings2 />
+                <Form.Root>
+                    <NotificationSettings2 />
+                </Form.Root>
             </MatrixClientContext.Provider>,
         );
         await act(waitForUpdate);
@@ -106,7 +109,9 @@ describe("<Notifications />", () => {
         const user = userEvent.setup();
         const screen = render(
             <MatrixClientContext.Provider value={cli}>
-                <NotificationSettings2 />
+                <Form.Root>
+                    <NotificationSettings2 />
+                </Form.Root>
             </MatrixClientContext.Provider>,
         );
         await act(async () => {
@@ -114,7 +119,7 @@ describe("<Notifications />", () => {
             expect(screen.container).toMatchSnapshot();
 
             const globalMute = screen.getByLabelText(labelGlobalMute);
-            expect(globalMute).toHaveAttribute("aria-disabled", "true");
+            expect(globalMute).toBeDisabled();
 
             const levelAllMessages = screen.getByLabelText(labelLevelAllMessage);
             expect(levelAllMessages).toBeDisabled();
@@ -167,7 +172,9 @@ describe("<Notifications />", () => {
             const user = userEvent.setup();
             const screen = render(
                 <MatrixClientContext.Provider value={cli}>
-                    <NotificationSettings2 />
+                    <Form.Root>
+                        <NotificationSettings2 />
+                    </Form.Root>
                 </MatrixClientContext.Provider>,
             );
             await act(waitForUpdate);
@@ -183,7 +190,9 @@ describe("<Notifications />", () => {
             const user = userEvent.setup();
             const screen = render(
                 <MatrixClientContext.Provider value={cli}>
-                    <NotificationSettings2 />
+                    <Form.Root>
+                        <NotificationSettings2 />
+                    </Form.Root>
                 </MatrixClientContext.Provider>,
             );
             await act(waitForUpdate);
@@ -221,7 +230,9 @@ describe("<Notifications />", () => {
                 const user = userEvent.setup();
                 const screen = render(
                     <MatrixClientContext.Provider value={cli}>
-                        <NotificationSettings2 />
+                        <Form.Root>
+                            <NotificationSettings2 />
+                        </Form.Root>
                     </MatrixClientContext.Provider>,
                 );
                 await act(waitForUpdate);
@@ -256,7 +267,9 @@ describe("<Notifications />", () => {
                 const user = userEvent.setup();
                 const screen = render(
                     <MatrixClientContext.Provider value={cli}>
-                        <NotificationSettings2 />
+                        <Form.Root>
+                            <NotificationSettings2 />
+                        </Form.Root>
                     </MatrixClientContext.Provider>,
                 );
                 await act(waitForUpdate);
@@ -285,7 +298,9 @@ describe("<Notifications />", () => {
                 const user = userEvent.setup();
                 const screen = render(
                     <MatrixClientContext.Provider value={cli}>
-                        <NotificationSettings2 />
+                        <Form.Root>
+                            <NotificationSettings2 />
+                        </Form.Root>
                     </MatrixClientContext.Provider>,
                 );
                 await act(waitForUpdate);
@@ -310,7 +325,9 @@ describe("<Notifications />", () => {
                 const user = userEvent.setup();
                 const screen = render(
                     <MatrixClientContext.Provider value={cli}>
-                        <NotificationSettings2 />
+                        <Form.Root>
+                            <NotificationSettings2 />
+                        </Form.Root>
                     </MatrixClientContext.Provider>,
                 );
                 await act(waitForUpdate);
@@ -332,7 +349,9 @@ describe("<Notifications />", () => {
                 const user = userEvent.setup();
                 const screen = render(
                     <MatrixClientContext.Provider value={cli}>
-                        <NotificationSettings2 />
+                        <Form.Root>
+                            <NotificationSettings2 />
+                        </Form.Root>
                     </MatrixClientContext.Provider>,
                 );
                 await act(waitForUpdate);
@@ -360,7 +379,9 @@ describe("<Notifications />", () => {
                 const user = userEvent.setup();
                 const screen = render(
                     <MatrixClientContext.Provider value={cli}>
-                        <NotificationSettings2 />
+                        <Form.Root>
+                            <NotificationSettings2 />
+                        </Form.Root>
                     </MatrixClientContext.Provider>,
                 );
                 await act(waitForUpdate);
@@ -384,7 +405,9 @@ describe("<Notifications />", () => {
                 const user = userEvent.setup();
                 const screen = render(
                     <MatrixClientContext.Provider value={cli}>
-                        <NotificationSettings2 />
+                        <Form.Root>
+                            <NotificationSettings2 />
+                        </Form.Root>
                     </MatrixClientContext.Provider>,
                 );
                 await act(waitForUpdate);
@@ -406,7 +429,9 @@ describe("<Notifications />", () => {
                 const user = userEvent.setup();
                 const screen = render(
                     <MatrixClientContext.Provider value={cli}>
-                        <NotificationSettings2 />
+                        <Form.Root>
+                            <NotificationSettings2 />
+                        </Form.Root>
                     </MatrixClientContext.Provider>,
                 );
                 await act(waitForUpdate);
@@ -434,7 +459,9 @@ describe("<Notifications />", () => {
                 const user = userEvent.setup();
                 const screen = render(
                     <MatrixClientContext.Provider value={cli}>
-                        <NotificationSettings2 />
+                        <Form.Root>
+                            <NotificationSettings2 />
+                        </Form.Root>
                     </MatrixClientContext.Provider>,
                 );
                 await act(waitForUpdate);
@@ -458,7 +485,9 @@ describe("<Notifications />", () => {
                 const user = userEvent.setup();
                 const screen = render(
                     <MatrixClientContext.Provider value={cli}>
-                        <NotificationSettings2 />
+                        <Form.Root>
+                            <NotificationSettings2 />
+                        </Form.Root>
                     </MatrixClientContext.Provider>,
                 );
                 await act(waitForUpdate);
@@ -485,7 +514,9 @@ describe("<Notifications />", () => {
                 const user = userEvent.setup();
                 const screen = render(
                     <MatrixClientContext.Provider value={cli}>
-                        <NotificationSettings2 />
+                        <Form.Root>
+                            <NotificationSettings2 />
+                        </Form.Root>
                     </MatrixClientContext.Provider>,
                 );
                 await act(waitForUpdate);
@@ -504,7 +535,9 @@ describe("<Notifications />", () => {
             const user = userEvent.setup();
             const screen = render(
                 <MatrixClientContext.Provider value={cli}>
-                    <NotificationSettings2 />
+                    <Form.Root>
+                        <NotificationSettings2 />
+                    </Form.Root>
                 </MatrixClientContext.Provider>,
             );
             await act(waitForUpdate);
@@ -615,7 +648,9 @@ describe("<Notifications />", () => {
             const user = userEvent.setup();
             const screen = render(
                 <MatrixClientContext.Provider value={cli}>
-                    <NotificationSettings2 />
+                    <Form.Root>
+                        <NotificationSettings2 />
+                    </Form.Root>
                 </MatrixClientContext.Provider>,
             );
             await act(waitForUpdate);
@@ -674,7 +709,9 @@ describe("<Notifications />", () => {
             const user = userEvent.setup();
             const screen = render(
                 <MatrixClientContext.Provider value={cli}>
-                    <NotificationSettings2 />
+                    <Form.Root>
+                        <NotificationSettings2 />
+                    </Form.Root>
                 </MatrixClientContext.Provider>,
             );
             await act(waitForUpdate);
@@ -694,7 +731,9 @@ describe("<Notifications />", () => {
 
             const { container } = render(
                 <MatrixClientContext.Provider value={cli}>
-                    <NotificationSettings2 />
+                    <Form.Root>
+                        <NotificationSettings2 />
+                    </Form.Root>
                 </MatrixClientContext.Provider>,
             );
             await waitForUpdate();
@@ -721,7 +760,9 @@ describe("<Notifications />", () => {
             const user = userEvent.setup();
             const { container } = render(
                 <MatrixClientContext.Provider value={cli}>
-                    <NotificationSettings2 />
+                    <Form.Root>
+                        <NotificationSettings2 />
+                    </Form.Root>
                 </MatrixClientContext.Provider>,
             );
             await waitForUpdate();
diff --git a/test/unit-tests/components/views/settings/notifications/__snapshots__/Notifications2-test.tsx.snap b/test/unit-tests/components/views/settings/notifications/__snapshots__/Notifications2-test.tsx.snap
index 6ec9599fe1..2474759a7e 100644
--- a/test/unit-tests/components/views/settings/notifications/__snapshots__/Notifications2-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/notifications/__snapshots__/Notifications2-test.tsx.snap
@@ -1,2126 +1,266 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
 <div>
-  <div
-    class="mx_NotificationSettings2"
+  <form
+    class="_root_19upo_16"
   >
     <div
-      class="mx_SettingsSection"
+      class="mx_NotificationSettings2"
     >
       <div
-        class="mx_SettingsSection_subSections"
+        class="mx_SettingsSection"
       >
         <div
-          class="mx_SettingsSubsection_content mx_NotificationSettings2_flags"
+          class="mx_SettingsSection_subSections"
         >
           <div
-            class="mx_SettingsFlag"
-          >
-            <span
-              class="mx_SettingsFlag_label"
-            >
-              <div
-                id="mx_LabelledToggleSwitch_«r17»"
-              >
-                Enable notifications for this account
-              </div>
-            </span>
-            <div
-              aria-checked="true"
-              aria-disabled="true"
-              aria-labelledby="mx_LabelledToggleSwitch_«r17»"
-              class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-              role="switch"
-              tabindex="0"
-            >
-              <div
-                class="mx_ToggleSwitch_ball"
-              />
-            </div>
-          </div>
-          <div
-            class="mx_SettingsFlag"
-          >
-            <span
-              class="mx_SettingsFlag_label"
-            >
-              <div
-                id="mx_LabelledToggleSwitch_«r18»"
-              >
-                Enable desktop notifications for this session
-              </div>
-            </span>
-            <div
-              aria-checked="false"
-              aria-disabled="false"
-              aria-labelledby="mx_LabelledToggleSwitch_«r18»"
-              class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
-              role="switch"
-              tabindex="0"
-            >
-              <div
-                class="mx_ToggleSwitch_ball"
-              />
-            </div>
-          </div>
-          <div
-            class="mx_SettingsFlag"
-          >
-            <span
-              class="mx_SettingsFlag_label"
-            >
-              <div
-                id="mx_LabelledToggleSwitch_«r19»"
-              >
-                Show message preview in desktop notification
-              </div>
-            </span>
-            <div
-              aria-checked="false"
-              aria-disabled="false"
-              aria-labelledby="mx_LabelledToggleSwitch_«r19»"
-              class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
-              role="switch"
-              tabindex="0"
-            >
-              <div
-                class="mx_ToggleSwitch_ball"
-              />
-            </div>
-          </div>
-          <div
-            class="mx_SettingsFlag"
-          >
-            <span
-              class="mx_SettingsFlag_label"
-            >
-              <div
-                id="mx_LabelledToggleSwitch_«r1a»"
-              >
-                Enable audible notifications for this session
-              </div>
-            </span>
-            <div
-              aria-checked="true"
-              aria-disabled="false"
-              aria-labelledby="mx_LabelledToggleSwitch_«r1a»"
-              class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
-              role="switch"
-              tabindex="0"
-            >
-              <div
-                class="mx_ToggleSwitch_ball"
-              />
-            </div>
-          </div>
-        </div>
-        <div
-          class="mx_SettingsSubsection"
-        >
-          <div
-            class="mx_SettingsSubsectionHeading"
-          >
-            <h3
-              class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-            >
-              I want to be notified for (Default Setting)
-            </h3>
-          </div>
-          <div
-            class="mx_SettingsSubsection_description"
+            class="mx_SettingsSubsection_content mx_NotificationSettings2_flags"
           >
             <div
-              class="mx_SettingsSubsection_text"
+              class="_inline-field_19upo_32"
             >
-              This setting will be applied by default to all your rooms.
-            </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection_content"
-          >
-            <label
-              class="mx_StyledRadioButton mx_StyledRadioButton_disabled mx_StyledRadioButton_checked"
-            >
-              <input
-                checked=""
-                disabled=""
-                id="defaultNotificationLevel-all_messages"
-                name="defaultNotificationLevel"
-                type="radio"
-                value="all_messages"
-              />
-              <div>
-                <div />
-              </div>
               <div
-                class="mx_StyledRadioButton_content"
-              >
-                All messages
-              </div>
-              <div
-                class="mx_StyledRadioButton_spacer"
-              />
-            </label>
-            <label
-              class="mx_StyledRadioButton mx_StyledRadioButton_disabled"
-            >
-              <input
-                disabled=""
-                id="defaultNotificationLevel-people_mentions_keywords"
-                name="defaultNotificationLevel"
-                type="radio"
-                value="people_mentions_keywords"
-              />
-              <div>
-                <div />
-              </div>
-              <div
-                class="mx_StyledRadioButton_content"
-              >
-                People, Mentions and Keywords
-              </div>
-              <div
-                class="mx_StyledRadioButton_spacer"
-              />
-            </label>
-            <label
-              class="mx_StyledRadioButton mx_StyledRadioButton_disabled"
-            >
-              <input
-                disabled=""
-                id="defaultNotificationLevel-mentions_keywords"
-                name="defaultNotificationLevel"
-                type="radio"
-                value="mentions_keywords"
-              />
-              <div>
-                <div />
-              </div>
-              <div
-                class="mx_StyledRadioButton_content"
-              >
-                Mentions and Keywords only
-              </div>
-              <div
-                class="mx_StyledRadioButton_spacer"
-              />
-            </label>
-          </div>
-        </div>
-        <div
-          class="mx_SettingsSubsection"
-        >
-          <div
-            class="mx_SettingsSubsectionHeading"
-          >
-            <h3
-              class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-            >
-              Play a sound for
-            </h3>
-          </div>
-          <div
-            class="mx_SettingsSubsection_description"
-          >
-            <div
-              class="mx_SettingsSubsection_text"
-            >
-              Applied by default to all rooms on all devices.
-            </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection_content"
-          >
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
+                class="_inline-field-control_19upo_44"
               >
                 <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        checked=""
-                        class="_input_1hel1_18"
-                        disabled=""
-                        id="checkbox_vY7Q4uEh9K"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_vY7Q4uEh9K"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        People
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </form>
-            </div>
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        checked=""
-                        class="_input_1hel1_18"
-                        disabled=""
-                        id="checkbox_38QgU2Pomx"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_38QgU2Pomx"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        Mentions and Keywords
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </form>
-            </div>
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        checked=""
-                        class="_input_1hel1_18"
-                        disabled=""
-                        id="checkbox_wKpa6hpi3Y"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_wKpa6hpi3Y"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        Audio and Video calls
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </form>
-            </div>
-          </div>
-        </div>
-        <div
-          class="mx_SettingsSubsection"
-        >
-          <div
-            class="mx_SettingsSubsectionHeading"
-          >
-            <h3
-              class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-            >
-              Other things we think you might be interested in:
-            </h3>
-          </div>
-          <div
-            class="mx_SettingsSubsection_content"
-          >
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        checked=""
-                        class="_input_1hel1_18"
-                        disabled=""
-                        id="checkbox_EetmBG4yVC"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_EetmBG4yVC"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        Invited to a room
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </form>
-            </div>
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        class="_input_1hel1_18"
-                        disabled=""
-                        id="checkbox_eEefiPqpMR"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_eEefiPqpMR"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        New room activity, upgrades and status messages occur
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </form>
-            </div>
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        checked=""
-                        class="_input_1hel1_18"
-                        disabled=""
-                        id="checkbox_MwbPDmfGtm"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_MwbPDmfGtm"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        Messages sent by bots
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </form>
-            </div>
-          </div>
-        </div>
-        <div
-          class="mx_SettingsSubsection"
-        >
-          <div
-            class="mx_SettingsSubsectionHeading"
-          >
-            <h3
-              class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-            >
-              Mentions and Keywords
-            </h3>
-          </div>
-          <div
-            class="mx_SettingsSubsection_description"
-          >
-            <div
-              class="mx_SettingsSubsection_text"
-            >
-              <span>
-                Show a badge 
-                <div
-                  class="mx_NotificationBadge mx_NotificationBadge_visible mx_NotificationBadge_level_notification mx_NotificationBadge_2char cpd-theme-light"
-                >
-                  <span
-                    class="mx_NotificationBadge_count"
-                  >
-                    1
-                  </span>
-                </div>
-                 when keywords are used in a room.
-              </span>
-            </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection_content"
-          >
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        checked=""
-                        class="_input_1hel1_18"
-                        disabled=""
-                        id="checkbox_GQvdMWe954"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_GQvdMWe954"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        Notify when someone mentions using @room
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </form>
-            </div>
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        checked=""
-                        class="_input_1hel1_18"
-                        disabled=""
-                        id="checkbox_DVIAu5CsiH"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_DVIAu5CsiH"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        Notify when someone mentions using @displayname or @userId:matrix.org
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </form>
-            </div>
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        aria-describedby="«r24»"
-                        checked=""
-                        class="_input_1hel1_18"
-                        disabled=""
-                        id="checkbox_RD7nyrA2oh"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_RD7nyrA2oh"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        Notify when someone uses a keyword
-                      </span>
-                    </label>
-                    <span
-                      class="_message_19upo_85 _help-message_19upo_91"
-                      id="«r24»"
-                    >
-                      Enter keywords here, or use for spelling variations or nicknames
-                    </span>
-                  </div>
-                </div>
-              </form>
-            </div>
-            <div
-              class="mx_TagComposer mx_TagComposer_disabled"
-            >
-              <form
-                class="mx_TagComposer_input"
-              >
-                <div
-                  class="mx_Field mx_Field_input"
+                  class="_container_udcm8_10"
                 >
                   <input
-                    autocomplete="off"
+                    checked=""
+                    class="_input_udcm8_24"
                     disabled=""
-                    id="mx_NotificationSettings2_Keywords_field"
-                    label="Keyword"
-                    placeholder="New keyword"
-                    type="text"
-                    value=""
+                    id="_r_1f_"
+                    role="switch"
+                    type="checkbox"
+                  />
+                  <div
+                    class="_ui_udcm8_34"
                   />
-                  <label
-                    for="mx_NotificationSettings2_Keywords_field"
-                  >
-                    Keyword
-                  </label>
                 </div>
-                <div
-                  aria-disabled="true"
-                  class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary mx_AccessibleButton_disabled"
-                  disabled=""
-                  role="button"
-                  tabindex="0"
-                >
-                  Add
-                </div>
-              </form>
+              </div>
               <div
-                class="mx_TagComposer_tags"
-                role="list"
-              />
-            </div>
-            <div
-              class="mx_SettingsFlag"
-            >
-              <label
-                class="mx_SettingsFlag_label"
-                for="mx_SettingsFlag_jWVJIPauy1Om"
+                class="_inline-field-body_19upo_38"
               >
-                <span
-                  class="mx_SettingsFlag_labelText"
+                <label
+                  class="_label_19upo_59"
+                  for="_r_1f_"
                 >
-                  Show all activity in the room list (dots or number of unread messages)
-                </span>
-              </label>
-              <div
-                aria-checked="true"
-                aria-disabled="false"
-                aria-label="Show all activity in the room list (dots or number of unread messages)"
-                class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
-                id="mx_SettingsFlag_jWVJIPauy1Om"
-                role="switch"
-                tabindex="0"
-              >
-                <div
-                  class="mx_ToggleSwitch_ball"
-                />
+                  Enable notifications for this account
+                </label>
               </div>
             </div>
             <div
-              class="mx_SettingsFlag"
+              class="_inline-field_19upo_32"
             >
-              <label
-                class="mx_SettingsFlag_label"
-                for="mx_SettingsFlag_nTidX4ePDS0O"
-              >
-                <span
-                  class="mx_SettingsFlag_labelText"
-                >
-                  Only show notifications in the thread activity centre
-                </span>
-              </label>
               <div
-                aria-checked="true"
-                aria-disabled="false"
-                aria-label="Only show notifications in the thread activity centre"
-                class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
-                id="mx_SettingsFlag_nTidX4ePDS0O"
-                role="switch"
-                tabindex="0"
+                class="_inline-field-control_19upo_44"
               >
                 <div
-                  class="mx_ToggleSwitch_ball"
-                />
-              </div>
-            </div>
-          </div>
-        </div>
-        <div
-          class="mx_SettingsSubsection"
-        >
-          <div
-            class="mx_SettingsSubsectionHeading"
-          >
-            <h3
-              class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-            >
-              Email summary
-            </h3>
-          </div>
-          <div
-            class="mx_SettingsSubsection_content"
-          >
-            <div
-              class="mx_SettingsSubsection_text"
-            >
-              Receive an email summary of missed notifications
-            </div>
-            <div
-              class="mx_SettingsSubsection_description mx_NotificationPusherSettings_detail"
-            >
-              <div
-                class="mx_SettingsSubsection_text"
-              >
-                <span>
-                  Select which emails you want to send summaries to. Manage your emails in 
-                  <div
-                    class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
-                    role="button"
-                    tabindex="0"
-                  >
-                    General
-                  </div>
-                  .
-                </span>
-              </div>
-            </div>
-            <div
-              class="mx_SettingsIndent"
-            />
-          </div>
-        </div>
-        <div
-          class="mx_SettingsSubsection"
-        >
-          <div
-            class="mx_SettingsSubsectionHeading"
-          >
-            <h3
-              class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-            >
-              Quick Actions
-            </h3>
-          </div>
-          <div
-            class="mx_SettingsSubsection_content"
-          >
-            <div
-              aria-disabled="true"
-              class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger_outline mx_AccessibleButton_disabled"
-              disabled=""
-              role="button"
-              tabindex="0"
-            >
-              Reset to default settings
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<Notifications /> matches the snapshot 1`] = `
-<div>
-  <div
-    class="mx_NotificationSettings2"
-  >
-    <div
-      class="mx_SettingsSection"
-    >
-      <div
-        class="mx_SettingsSection_subSections"
-      >
-        <div
-          class="mx_SettingsSubsection_content mx_NotificationSettings2_flags"
-        >
-          <div
-            class="mx_SettingsFlag"
-          >
-            <span
-              class="mx_SettingsFlag_label"
-            >
-              <div
-                id="mx_LabelledToggleSwitch_«r0»"
-              >
-                Enable notifications for this account
-              </div>
-            </span>
-            <div
-              aria-checked="true"
-              aria-disabled="false"
-              aria-labelledby="mx_LabelledToggleSwitch_«r0»"
-              class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
-              role="switch"
-              tabindex="0"
-            >
-              <div
-                class="mx_ToggleSwitch_ball"
-              />
-            </div>
-          </div>
-          <div
-            class="mx_SettingsFlag"
-          >
-            <span
-              class="mx_SettingsFlag_label"
-            >
-              <div
-                id="mx_LabelledToggleSwitch_«r1»"
-              >
-                Enable desktop notifications for this session
-              </div>
-            </span>
-            <div
-              aria-checked="false"
-              aria-disabled="false"
-              aria-labelledby="mx_LabelledToggleSwitch_«r1»"
-              class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
-              role="switch"
-              tabindex="0"
-            >
-              <div
-                class="mx_ToggleSwitch_ball"
-              />
-            </div>
-          </div>
-          <div
-            class="mx_SettingsFlag"
-          >
-            <span
-              class="mx_SettingsFlag_label"
-            >
-              <div
-                id="mx_LabelledToggleSwitch_«r2»"
-              >
-                Show message preview in desktop notification
-              </div>
-            </span>
-            <div
-              aria-checked="false"
-              aria-disabled="false"
-              aria-labelledby="mx_LabelledToggleSwitch_«r2»"
-              class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
-              role="switch"
-              tabindex="0"
-            >
-              <div
-                class="mx_ToggleSwitch_ball"
-              />
-            </div>
-          </div>
-          <div
-            class="mx_SettingsFlag"
-          >
-            <span
-              class="mx_SettingsFlag_label"
-            >
-              <div
-                id="mx_LabelledToggleSwitch_«r3»"
-              >
-                Enable audible notifications for this session
-              </div>
-            </span>
-            <div
-              aria-checked="true"
-              aria-disabled="false"
-              aria-labelledby="mx_LabelledToggleSwitch_«r3»"
-              class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
-              role="switch"
-              tabindex="0"
-            >
-              <div
-                class="mx_ToggleSwitch_ball"
-              />
-            </div>
-          </div>
-        </div>
-        <div
-          class="mx_SettingsSubsection"
-        >
-          <div
-            class="mx_SettingsSubsectionHeading"
-          >
-            <h3
-              class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-            >
-              I want to be notified for (Default Setting)
-            </h3>
-          </div>
-          <div
-            class="mx_SettingsSubsection_description"
-          >
-            <div
-              class="mx_SettingsSubsection_text"
-            >
-              This setting will be applied by default to all your rooms.
-            </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection_content"
-          >
-            <label
-              class="mx_StyledRadioButton mx_StyledRadioButton_enabled"
-            >
-              <input
-                checked=""
-                id="defaultNotificationLevel-all_messages"
-                name="defaultNotificationLevel"
-                type="radio"
-                value="all_messages"
-              />
-              <div>
-                <div />
-              </div>
-              <div
-                class="mx_StyledRadioButton_content"
-              >
-                All messages
-              </div>
-              <div
-                class="mx_StyledRadioButton_spacer"
-              />
-            </label>
-            <label
-              class="mx_StyledRadioButton mx_StyledRadioButton_enabled mx_StyledRadioButton_checked"
-            >
-              <input
-                id="defaultNotificationLevel-people_mentions_keywords"
-                name="defaultNotificationLevel"
-                type="radio"
-                value="people_mentions_keywords"
-              />
-              <div>
-                <div />
-              </div>
-              <div
-                class="mx_StyledRadioButton_content"
-              >
-                People, Mentions and Keywords
-              </div>
-              <div
-                class="mx_StyledRadioButton_spacer"
-              />
-            </label>
-            <label
-              class="mx_StyledRadioButton mx_StyledRadioButton_enabled"
-            >
-              <input
-                id="defaultNotificationLevel-mentions_keywords"
-                name="defaultNotificationLevel"
-                type="radio"
-                value="mentions_keywords"
-              />
-              <div>
-                <div />
-              </div>
-              <div
-                class="mx_StyledRadioButton_content"
-              >
-                Mentions and Keywords only
-              </div>
-              <div
-                class="mx_StyledRadioButton_spacer"
-              />
-            </label>
-          </div>
-        </div>
-        <div
-          class="mx_SettingsSubsection"
-        >
-          <div
-            class="mx_SettingsSubsectionHeading"
-          >
-            <h3
-              class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-            >
-              Play a sound for
-            </h3>
-          </div>
-          <div
-            class="mx_SettingsSubsection_description"
-          >
-            <div
-              class="mx_SettingsSubsection_text"
-            >
-              Applied by default to all rooms on all devices.
-            </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection_content"
-          >
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        checked=""
-                        class="_input_1hel1_18"
-                        id="checkbox_pWwAHG75JN"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_pWwAHG75JN"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        People
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </form>
-            </div>
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        checked=""
-                        class="_input_1hel1_18"
-                        id="checkbox_TNkNU64raT"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_TNkNU64raT"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        Mentions and Keywords
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </form>
-            </div>
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        checked=""
-                        class="_input_1hel1_18"
-                        id="checkbox_LcRsQRlYy7"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_LcRsQRlYy7"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        Audio and Video calls
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </form>
-            </div>
-          </div>
-        </div>
-        <div
-          class="mx_SettingsSubsection"
-        >
-          <div
-            class="mx_SettingsSubsectionHeading"
-          >
-            <h3
-              class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-            >
-              Other things we think you might be interested in:
-            </h3>
-          </div>
-          <div
-            class="mx_SettingsSubsection_content"
-          >
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        checked=""
-                        class="_input_1hel1_18"
-                        id="checkbox_5nfv5bOEPN"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_5nfv5bOEPN"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        Invited to a room
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </form>
-            </div>
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        class="_input_1hel1_18"
-                        id="checkbox_1su1JYVtOy"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_1su1JYVtOy"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        New room activity, upgrades and status messages occur
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </form>
-            </div>
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        checked=""
-                        class="_input_1hel1_18"
-                        id="checkbox_R5kbu3pEwu"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_R5kbu3pEwu"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        Messages sent by bots
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </form>
-            </div>
-          </div>
-        </div>
-        <div
-          class="mx_SettingsSubsection"
-        >
-          <div
-            class="mx_SettingsSubsectionHeading"
-          >
-            <h3
-              class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-            >
-              Mentions and Keywords
-            </h3>
-          </div>
-          <div
-            class="mx_SettingsSubsection_description"
-          >
-            <div
-              class="mx_SettingsSubsection_text"
-            >
-              <span>
-                Show a badge 
-                <div
-                  class="mx_NotificationBadge mx_NotificationBadge_visible mx_NotificationBadge_level_notification mx_NotificationBadge_2char cpd-theme-light"
-                >
-                  <span
-                    class="mx_NotificationBadge_count"
-                  >
-                    1
-                  </span>
-                </div>
-                 when keywords are used in a room.
-              </span>
-            </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection_content"
-          >
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        checked=""
-                        class="_input_1hel1_18"
-                        id="checkbox_Ln9EnnYuxf"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_Ln9EnnYuxf"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        Notify when someone mentions using @room
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </form>
-            </div>
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        checked=""
-                        class="_input_1hel1_18"
-                        id="checkbox_FEpOsztWhQ"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_FEpOsztWhQ"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        Notify when someone mentions using @displayname or @userId:matrix.org
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </form>
-            </div>
-            <div
-              class="mx_LabelledCheckbox"
-            >
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        aria-describedby="«rt»"
-                        checked=""
-                        class="_input_1hel1_18"
-                        id="checkbox_kBerF1ejc4"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_kBerF1ejc4"
-                    >
-                      <span
-                        class="mx_LabelledCheckbox_label"
-                      >
-                        Notify when someone uses a keyword
-                      </span>
-                    </label>
-                    <span
-                      class="_message_19upo_85 _help-message_19upo_91"
-                      id="«rt»"
-                    >
-                      Enter keywords here, or use for spelling variations or nicknames
-                    </span>
-                  </div>
-                </div>
-              </form>
-            </div>
-            <div
-              class="mx_TagComposer"
-            >
-              <form
-                class="mx_TagComposer_input"
-              >
-                <div
-                  class="mx_Field mx_Field_input"
+                  class="_container_udcm8_10"
                 >
                   <input
-                    autocomplete="off"
-                    id="mx_NotificationSettings2_Keywords_field"
-                    label="Keyword"
-                    placeholder="New keyword"
-                    type="text"
-                    value=""
+                    class="_input_udcm8_24"
+                    id="mx_SettingsFlag_vY7Q4uEh9K38"
+                    role="switch"
+                    type="checkbox"
+                  />
+                  <div
+                    class="_ui_udcm8_34"
                   />
-                  <label
-                    for="mx_NotificationSettings2_Keywords_field"
-                  >
-                    Keyword
-                  </label>
                 </div>
-                <div
-                  class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
-                  role="button"
-                  tabindex="0"
-                >
-                  Add
-                </div>
-              </form>
+              </div>
               <div
-                class="mx_TagComposer_tags"
-                role="list"
+                class="_inline-field-body_19upo_38"
               >
-                <div
-                  class="mx_Tag"
-                  role="listitem"
+                <label
+                  class="_label_19upo_59"
+                  for="mx_SettingsFlag_vY7Q4uEh9K38"
                 >
-                  justjann3
-                  <div
-                    aria-label="Remove"
-                    class="mx_AccessibleButton mx_Tag_delete"
-                    role="button"
-                    tabindex="0"
-                  >
-                    <svg
-                      fill="currentColor"
-                      height="1em"
-                      viewBox="0 0 24 24"
-                      width="1em"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
-                      />
-                    </svg>
-                  </div>
-                </div>
-                <div
-                  class="mx_Tag"
-                  role="listitem"
-                >
-                  justj4nn3
-                  <div
-                    aria-label="Remove"
-                    class="mx_AccessibleButton mx_Tag_delete"
-                    role="button"
-                    tabindex="0"
-                  >
-                    <svg
-                      fill="currentColor"
-                      height="1em"
-                      viewBox="0 0 24 24"
-                      width="1em"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
-                      />
-                    </svg>
-                  </div>
-                </div>
-                <div
-                  class="mx_Tag"
-                  role="listitem"
-                >
-                  justj4nne
-                  <div
-                    aria-label="Remove"
-                    class="mx_AccessibleButton mx_Tag_delete"
-                    role="button"
-                    tabindex="0"
-                  >
-                    <svg
-                      fill="currentColor"
-                      height="1em"
-                      viewBox="0 0 24 24"
-                      width="1em"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
-                      />
-                    </svg>
-                  </div>
-                </div>
-                <div
-                  class="mx_Tag"
-                  role="listitem"
-                >
-                  Janne
-                  <div
-                    aria-label="Remove"
-                    class="mx_AccessibleButton mx_Tag_delete"
-                    role="button"
-                    tabindex="0"
-                  >
-                    <svg
-                      fill="currentColor"
-                      height="1em"
-                      viewBox="0 0 24 24"
-                      width="1em"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
-                      />
-                    </svg>
-                  </div>
-                </div>
-                <div
-                  class="mx_Tag"
-                  role="listitem"
-                >
-                  J4nne
-                  <div
-                    aria-label="Remove"
-                    class="mx_AccessibleButton mx_Tag_delete"
-                    role="button"
-                    tabindex="0"
-                  >
-                    <svg
-                      fill="currentColor"
-                      height="1em"
-                      viewBox="0 0 24 24"
-                      width="1em"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
-                      />
-                    </svg>
-                  </div>
-                </div>
-                <div
-                  class="mx_Tag"
-                  role="listitem"
-                >
-                  Jann3
-                  <div
-                    aria-label="Remove"
-                    class="mx_AccessibleButton mx_Tag_delete"
-                    role="button"
-                    tabindex="0"
-                  >
-                    <svg
-                      fill="currentColor"
-                      height="1em"
-                      viewBox="0 0 24 24"
-                      width="1em"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
-                      />
-                    </svg>
-                  </div>
-                </div>
-                <div
-                  class="mx_Tag"
-                  role="listitem"
-                >
-                  jann3
-                  <div
-                    aria-label="Remove"
-                    class="mx_AccessibleButton mx_Tag_delete"
-                    role="button"
-                    tabindex="0"
-                  >
-                    <svg
-                      fill="currentColor"
-                      height="1em"
-                      viewBox="0 0 24 24"
-                      width="1em"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
-                      />
-                    </svg>
-                  </div>
-                </div>
-                <div
-                  class="mx_Tag"
-                  role="listitem"
-                >
-                  j4nne
-                  <div
-                    aria-label="Remove"
-                    class="mx_AccessibleButton mx_Tag_delete"
-                    role="button"
-                    tabindex="0"
-                  >
-                    <svg
-                      fill="currentColor"
-                      height="1em"
-                      viewBox="0 0 24 24"
-                      width="1em"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
-                      />
-                    </svg>
-                  </div>
-                </div>
-                <div
-                  class="mx_Tag"
-                  role="listitem"
-                >
-                  janne
-                  <div
-                    aria-label="Remove"
-                    class="mx_AccessibleButton mx_Tag_delete"
-                    role="button"
-                    tabindex="0"
-                  >
-                    <svg
-                      fill="currentColor"
-                      height="1em"
-                      viewBox="0 0 24 24"
-                      width="1em"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
-                      />
-                    </svg>
-                  </div>
-                </div>
+                  Enable desktop notifications for this session
+                </label>
               </div>
             </div>
             <div
-              class="mx_SettingsFlag"
+              class="_inline-field_19upo_32"
             >
-              <label
-                class="mx_SettingsFlag_label"
-                for="mx_SettingsFlag_jWVJIPauy1Om"
-              >
-                <span
-                  class="mx_SettingsFlag_labelText"
-                >
-                  Show all activity in the room list (dots or number of unread messages)
-                </span>
-              </label>
               <div
-                aria-checked="true"
-                aria-disabled="false"
-                aria-label="Show all activity in the room list (dots or number of unread messages)"
-                class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
-                id="mx_SettingsFlag_jWVJIPauy1Om"
-                role="switch"
-                tabindex="0"
+                class="_inline-field-control_19upo_44"
               >
                 <div
-                  class="mx_ToggleSwitch_ball"
-                />
+                  class="_container_udcm8_10"
+                >
+                  <input
+                    class="_input_udcm8_24"
+                    id="mx_SettingsFlag_QgU2PomxwKpa"
+                    role="switch"
+                    type="checkbox"
+                  />
+                  <div
+                    class="_ui_udcm8_34"
+                  />
+                </div>
+              </div>
+              <div
+                class="_inline-field-body_19upo_38"
+              >
+                <label
+                  class="_label_19upo_59"
+                  for="mx_SettingsFlag_QgU2PomxwKpa"
+                >
+                  Show message preview in desktop notification
+                </label>
               </div>
             </div>
             <div
-              class="mx_SettingsFlag"
+              class="_inline-field_19upo_32"
             >
-              <label
-                class="mx_SettingsFlag_label"
-                for="mx_SettingsFlag_nTidX4ePDS0O"
-              >
-                <span
-                  class="mx_SettingsFlag_labelText"
-                >
-                  Only show notifications in the thread activity centre
-                </span>
-              </label>
               <div
-                aria-checked="true"
-                aria-disabled="false"
-                aria-label="Only show notifications in the thread activity centre"
-                class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
-                id="mx_SettingsFlag_nTidX4ePDS0O"
-                role="switch"
-                tabindex="0"
+                class="_inline-field-control_19upo_44"
               >
                 <div
-                  class="mx_ToggleSwitch_ball"
-                />
+                  class="_container_udcm8_10"
+                >
+                  <input
+                    checked=""
+                    class="_input_udcm8_24"
+                    id="mx_SettingsFlag_6hpi3YEetmBG"
+                    role="switch"
+                    type="checkbox"
+                  />
+                  <div
+                    class="_ui_udcm8_34"
+                  />
+                </div>
+              </div>
+              <div
+                class="_inline-field-body_19upo_38"
+              >
+                <label
+                  class="_label_19upo_59"
+                  for="mx_SettingsFlag_6hpi3YEetmBG"
+                >
+                  Enable audible notifications for this session
+                </label>
               </div>
             </div>
           </div>
-        </div>
-        <div
-          class="mx_SettingsSubsection"
-        >
           <div
-            class="mx_SettingsSubsectionHeading"
-          >
-            <h3
-              class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-            >
-              Email summary
-            </h3>
-          </div>
-          <div
-            class="mx_SettingsSubsection_content"
+            class="mx_SettingsSubsection"
           >
             <div
-              class="mx_SettingsSubsection_text"
+              class="mx_SettingsSubsectionHeading"
             >
-              Receive an email summary of missed notifications
+              <h2
+                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+              >
+                I want to be notified for (Default Setting)
+              </h2>
             </div>
             <div
-              class="mx_SettingsSubsection_description mx_NotificationPusherSettings_detail"
+              class="mx_SettingsSubsection_description"
             >
               <div
                 class="mx_SettingsSubsection_text"
               >
-                <span>
-                  Select which emails you want to send summaries to. Manage your emails in 
-                  <div
-                    class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
-                    role="button"
-                    tabindex="0"
-                  >
-                    General
-                  </div>
-                  .
-                </span>
+                This setting will be applied by default to all your rooms.
               </div>
             </div>
             <div
-              class="mx_SettingsIndent"
+              class="mx_SettingsSubsection_content"
+            >
+              <label
+                class="mx_StyledRadioButton mx_StyledRadioButton_disabled mx_StyledRadioButton_checked"
+              >
+                <input
+                  checked=""
+                  disabled=""
+                  id="defaultNotificationLevel-all_messages"
+                  name="defaultNotificationLevel"
+                  type="radio"
+                  value="all_messages"
+                />
+                <div>
+                  <div />
+                </div>
+                <div
+                  class="mx_StyledRadioButton_content"
+                >
+                  All messages
+                </div>
+                <div
+                  class="mx_StyledRadioButton_spacer"
+                />
+              </label>
+              <label
+                class="mx_StyledRadioButton mx_StyledRadioButton_disabled"
+              >
+                <input
+                  disabled=""
+                  id="defaultNotificationLevel-people_mentions_keywords"
+                  name="defaultNotificationLevel"
+                  type="radio"
+                  value="people_mentions_keywords"
+                />
+                <div>
+                  <div />
+                </div>
+                <div
+                  class="mx_StyledRadioButton_content"
+                >
+                  People, Mentions and Keywords
+                </div>
+                <div
+                  class="mx_StyledRadioButton_spacer"
+                />
+              </label>
+              <label
+                class="mx_StyledRadioButton mx_StyledRadioButton_disabled"
+              >
+                <input
+                  disabled=""
+                  id="defaultNotificationLevel-mentions_keywords"
+                  name="defaultNotificationLevel"
+                  type="radio"
+                  value="mentions_keywords"
+                />
+                <div>
+                  <div />
+                </div>
+                <div
+                  class="mx_StyledRadioButton_content"
+                >
+                  Mentions and Keywords only
+                </div>
+                <div
+                  class="mx_StyledRadioButton_spacer"
+                />
+              </label>
+            </div>
+          </div>
+          <div
+            class="mx_SettingsSubsection"
+          >
+            <div
+              class="mx_SettingsSubsectionHeading"
+            >
+              <h2
+                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+              >
+                Play a sound for
+              </h2>
+            </div>
+            <div
+              class="mx_SettingsSubsection_description"
+            >
+              <div
+                class="mx_SettingsSubsection_text"
+              >
+                Applied by default to all rooms on all devices.
+              </div>
+            </div>
+            <div
+              class="mx_SettingsSubsection_content"
             >
               <div
                 class="mx_LabelledCheckbox"
@@ -2135,15 +275,17 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                       class="_inline-field-control_19upo_44"
                     >
                       <div
-                        class="_container_1hel1_10"
+                        class="_container_1md5v_10"
                       >
                         <input
-                          class="_input_1hel1_18"
-                          id="checkbox_GFes1UFzOK"
+                          checked=""
+                          class="_input_1md5v_18"
+                          disabled=""
+                          id="checkbox_4yVCeEefiP"
                           type="checkbox"
                         />
                         <div
-                          class="_ui_1hel1_19"
+                          class="_ui_1md5v_19"
                         >
                           <svg
                             aria-hidden="true"
@@ -2165,12 +307,126 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                     >
                       <label
                         class="_label_19upo_59"
-                        for="checkbox_GFes1UFzOK"
+                        for="checkbox_4yVCeEefiP"
                       >
                         <span
                           class="mx_LabelledCheckbox_label"
                         >
-                          test@example.tld
+                          People
+                        </span>
+                      </label>
+                    </div>
+                  </div>
+                </form>
+              </div>
+              <div
+                class="mx_LabelledCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          checked=""
+                          class="_input_1md5v_18"
+                          disabled=""
+                          id="checkbox_qpMRMwbPDm"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_qpMRMwbPDm"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          Mentions and Keywords
+                        </span>
+                      </label>
+                    </div>
+                  </div>
+                </form>
+              </div>
+              <div
+                class="mx_LabelledCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          checked=""
+                          class="_input_1md5v_18"
+                          disabled=""
+                          id="checkbox_fGtmGQvdMW"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_fGtmGQvdMW"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          Audio and Video calls
                         </span>
                       </label>
                     </div>
@@ -2179,55 +435,1900 @@ exports[`<Notifications /> matches the snapshot 1`] = `
               </div>
             </div>
           </div>
-        </div>
-        <div
-          class="mx_SettingsSubsection"
-        >
           <div
-            class="mx_SettingsSubsectionHeading"
-          >
-            <h3
-              class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-            >
-              Notification targets
-            </h3>
-          </div>
-          <div
-            class="mx_SettingsSubsection_content"
-          >
-            <ul>
-              <li>
-                My EyeFon
-              </li>
-            </ul>
-          </div>
-        </div>
-        <div
-          class="mx_SettingsSubsection"
-        >
-          <div
-            class="mx_SettingsSubsectionHeading"
-          >
-            <h3
-              class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-            >
-              Quick Actions
-            </h3>
-          </div>
-          <div
-            class="mx_SettingsSubsection_content"
+            class="mx_SettingsSubsection"
           >
             <div
-              class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger_outline"
-              role="button"
-              tabindex="0"
+              class="mx_SettingsSubsectionHeading"
             >
-              Reset to default settings
+              <h2
+                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+              >
+                Other things we think you might be interested in:
+              </h2>
+            </div>
+            <div
+              class="mx_SettingsSubsection_content"
+            >
+              <div
+                class="mx_LabelledCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          checked=""
+                          class="_input_1md5v_18"
+                          disabled=""
+                          id="checkbox_e954DVIAu5"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_e954DVIAu5"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          Invited to a room
+                        </span>
+                      </label>
+                    </div>
+                  </div>
+                </form>
+              </div>
+              <div
+                class="mx_LabelledCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          class="_input_1md5v_18"
+                          disabled=""
+                          id="checkbox_CsiHRD7nyr"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_CsiHRD7nyr"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          New room activity, upgrades and status messages occur
+                        </span>
+                      </label>
+                    </div>
+                  </div>
+                </form>
+              </div>
+              <div
+                class="mx_LabelledCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          checked=""
+                          class="_input_1md5v_18"
+                          disabled=""
+                          id="checkbox_A2ohjWVJIP"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_A2ohjWVJIP"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          Messages sent by bots
+                        </span>
+                      </label>
+                    </div>
+                  </div>
+                </form>
+              </div>
+            </div>
+          </div>
+          <div
+            class="mx_SettingsSubsection"
+          >
+            <div
+              class="mx_SettingsSubsectionHeading"
+            >
+              <h2
+                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+              >
+                Mentions and Keywords
+              </h2>
+            </div>
+            <div
+              class="mx_SettingsSubsection_description"
+            >
+              <div
+                class="mx_SettingsSubsection_text"
+              >
+                <span>
+                  Show a badge 
+                  <div
+                    class="mx_NotificationBadge mx_NotificationBadge_visible mx_NotificationBadge_level_notification mx_NotificationBadge_2char cpd-theme-light"
+                  >
+                    <span
+                      class="mx_NotificationBadge_count"
+                    >
+                      1
+                    </span>
+                  </div>
+                   when keywords are used in a room.
+                </span>
+              </div>
+            </div>
+            <div
+              class="mx_SettingsSubsection_content"
+            >
+              <div
+                class="mx_LabelledCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          checked=""
+                          class="_input_1md5v_18"
+                          disabled=""
+                          id="checkbox_auy1OmnTid"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_auy1OmnTid"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          Notify when someone mentions using @room
+                        </span>
+                      </label>
+                    </div>
+                  </div>
+                </form>
+              </div>
+              <div
+                class="mx_LabelledCheckbox"
+                id="mx_NotificationSettings2_MentionCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          checked=""
+                          class="_input_1md5v_18"
+                          disabled=""
+                          id="checkbox_X4ePDS0OpW"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_X4ePDS0OpW"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          Notify when someone mentions using @displayname or @userId:matrix.org
+                        </span>
+                      </label>
+                    </div>
+                  </div>
+                </form>
+              </div>
+              <div
+                class="mx_LabelledCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          aria-describedby="_r_2g_"
+                          checked=""
+                          class="_input_1md5v_18"
+                          disabled=""
+                          id="checkbox_wAHG75JNTN"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_wAHG75JNTN"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          Notify when someone uses a keyword
+                        </span>
+                      </label>
+                      <span
+                        class="_message_19upo_85 _help-message_19upo_91"
+                        id="_r_2g_"
+                      >
+                        Enter keywords here, or use for spelling variations or nicknames
+                      </span>
+                    </div>
+                  </div>
+                </form>
+              </div>
+              <div
+                class="mx_TagComposer mx_TagComposer_disabled"
+              >
+                <form
+                  class="mx_TagComposer_input"
+                >
+                  <div
+                    class="mx_Field mx_Field_input"
+                  >
+                    <input
+                      autocomplete="off"
+                      disabled=""
+                      id="mx_NotificationSettings2_Keywords_field"
+                      label="Keyword"
+                      placeholder="New keyword"
+                      type="text"
+                      value=""
+                    />
+                    <label
+                      for="mx_NotificationSettings2_Keywords_field"
+                    >
+                      Keyword
+                    </label>
+                  </div>
+                  <div
+                    aria-disabled="true"
+                    class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary mx_AccessibleButton_disabled"
+                    disabled=""
+                    role="button"
+                    tabindex="0"
+                  >
+                    Add
+                  </div>
+                </form>
+                <div
+                  class="mx_TagComposer_tags"
+                  role="list"
+                />
+              </div>
+              <div
+                class="_inline-field_19upo_32"
+              >
+                <div
+                  class="_inline-field-control_19upo_44"
+                >
+                  <div
+                    class="_container_udcm8_10"
+                  >
+                    <input
+                      checked=""
+                      class="_input_udcm8_24"
+                      id="mx_SettingsFlag_kNU64raTLcRs"
+                      role="switch"
+                      type="checkbox"
+                    />
+                    <div
+                      class="_ui_udcm8_34"
+                    />
+                  </div>
+                </div>
+                <div
+                  class="_inline-field-body_19upo_38"
+                >
+                  <label
+                    class="_label_19upo_59"
+                    for="mx_SettingsFlag_kNU64raTLcRs"
+                  >
+                    Show all activity in the room list (dots or number of unread messages)
+                  </label>
+                </div>
+              </div>
+              <div
+                class="_inline-field_19upo_32"
+              >
+                <div
+                  class="_inline-field-control_19upo_44"
+                >
+                  <div
+                    class="_container_udcm8_10"
+                  >
+                    <input
+                      checked=""
+                      class="_input_udcm8_24"
+                      id="mx_SettingsFlag_QRlYy75nfv5b"
+                      role="switch"
+                      type="checkbox"
+                    />
+                    <div
+                      class="_ui_udcm8_34"
+                    />
+                  </div>
+                </div>
+                <div
+                  class="_inline-field-body_19upo_38"
+                >
+                  <label
+                    class="_label_19upo_59"
+                    for="mx_SettingsFlag_QRlYy75nfv5b"
+                  >
+                    Only show notifications in the thread activity centre
+                  </label>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="mx_SettingsSubsection mx_SettingsSubsection_newUi"
+          >
+            <div
+              class="mx_SettingsSubsectionHeading"
+            >
+              <h3
+                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+              >
+                Email summary
+              </h3>
+            </div>
+            <div
+              class="mx_SettingsSubsection_content mx_SettingsSubsection_content_newUi"
+            >
+              <div
+                class="mx_SettingsSubsection_text"
+              >
+                Receive an email summary of missed notifications
+              </div>
+              <div
+                class="mx_SettingsSubsection_description mx_NotificationPusherSettings_detail"
+              >
+                <div
+                  class="mx_SettingsSubsection_text"
+                >
+                  <span>
+                    Select which emails you want to send summaries to. Manage your emails in 
+                    <div
+                      class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
+                      role="button"
+                      tabindex="0"
+                    >
+                      General
+                    </div>
+                    .
+                  </span>
+                </div>
+              </div>
+              <div
+                class="mx_SettingsIndent"
+              />
+            </div>
+            <div
+              class="_separator_cqpyv_8"
+              data-kind="primary"
+              data-orientation="horizontal"
+              role="separator"
+            />
+          </div>
+          <div
+            class="mx_SettingsSubsection"
+          >
+            <div
+              class="mx_SettingsSubsectionHeading"
+            >
+              <h3
+                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+              >
+                Quick Actions
+              </h3>
+            </div>
+            <div
+              class="mx_SettingsSubsection_content"
+            >
+              <div
+                aria-disabled="true"
+                class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger_outline mx_AccessibleButton_disabled"
+                disabled=""
+                role="button"
+                tabindex="0"
+              >
+                Reset to default settings
+              </div>
             </div>
           </div>
         </div>
       </div>
     </div>
-  </div>
+  </form>
+</div>
+`;
+
+exports[`<Notifications /> matches the snapshot 1`] = `
+<div>
+  <form
+    class="_root_19upo_16"
+  >
+    <div
+      class="mx_NotificationSettings2"
+    >
+      <div
+        class="mx_SettingsSection"
+      >
+        <div
+          class="mx_SettingsSection_subSections"
+        >
+          <div
+            class="mx_SettingsSubsection_content mx_NotificationSettings2_flags"
+          >
+            <div
+              class="_inline-field_19upo_32"
+            >
+              <div
+                class="_inline-field-control_19upo_44"
+              >
+                <div
+                  class="_container_udcm8_10"
+                >
+                  <input
+                    checked=""
+                    class="_input_udcm8_24"
+                    id="_r_0_"
+                    role="switch"
+                    type="checkbox"
+                  />
+                  <div
+                    class="_ui_udcm8_34"
+                  />
+                </div>
+              </div>
+              <div
+                class="_inline-field-body_19upo_38"
+              >
+                <label
+                  class="_label_19upo_59"
+                  for="_r_0_"
+                >
+                  Enable notifications for this account
+                </label>
+              </div>
+            </div>
+            <div
+              class="_inline-field_19upo_32"
+            >
+              <div
+                class="_inline-field-control_19upo_44"
+              >
+                <div
+                  class="_container_udcm8_10"
+                >
+                  <input
+                    class="_input_udcm8_24"
+                    id="mx_SettingsFlag_vY7Q4uEh9K38"
+                    role="switch"
+                    type="checkbox"
+                  />
+                  <div
+                    class="_ui_udcm8_34"
+                  />
+                </div>
+              </div>
+              <div
+                class="_inline-field-body_19upo_38"
+              >
+                <label
+                  class="_label_19upo_59"
+                  for="mx_SettingsFlag_vY7Q4uEh9K38"
+                >
+                  Enable desktop notifications for this session
+                </label>
+              </div>
+            </div>
+            <div
+              class="_inline-field_19upo_32"
+            >
+              <div
+                class="_inline-field-control_19upo_44"
+              >
+                <div
+                  class="_container_udcm8_10"
+                >
+                  <input
+                    class="_input_udcm8_24"
+                    id="mx_SettingsFlag_QgU2PomxwKpa"
+                    role="switch"
+                    type="checkbox"
+                  />
+                  <div
+                    class="_ui_udcm8_34"
+                  />
+                </div>
+              </div>
+              <div
+                class="_inline-field-body_19upo_38"
+              >
+                <label
+                  class="_label_19upo_59"
+                  for="mx_SettingsFlag_QgU2PomxwKpa"
+                >
+                  Show message preview in desktop notification
+                </label>
+              </div>
+            </div>
+            <div
+              class="_inline-field_19upo_32"
+            >
+              <div
+                class="_inline-field-control_19upo_44"
+              >
+                <div
+                  class="_container_udcm8_10"
+                >
+                  <input
+                    checked=""
+                    class="_input_udcm8_24"
+                    id="mx_SettingsFlag_6hpi3YEetmBG"
+                    role="switch"
+                    type="checkbox"
+                  />
+                  <div
+                    class="_ui_udcm8_34"
+                  />
+                </div>
+              </div>
+              <div
+                class="_inline-field-body_19upo_38"
+              >
+                <label
+                  class="_label_19upo_59"
+                  for="mx_SettingsFlag_6hpi3YEetmBG"
+                >
+                  Enable audible notifications for this session
+                </label>
+              </div>
+            </div>
+          </div>
+          <div
+            class="mx_SettingsSubsection"
+          >
+            <div
+              class="mx_SettingsSubsectionHeading"
+            >
+              <h2
+                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+              >
+                I want to be notified for (Default Setting)
+              </h2>
+            </div>
+            <div
+              class="mx_SettingsSubsection_description"
+            >
+              <div
+                class="mx_SettingsSubsection_text"
+              >
+                This setting will be applied by default to all your rooms.
+              </div>
+            </div>
+            <div
+              class="mx_SettingsSubsection_content"
+            >
+              <label
+                class="mx_StyledRadioButton mx_StyledRadioButton_enabled"
+              >
+                <input
+                  checked=""
+                  id="defaultNotificationLevel-all_messages"
+                  name="defaultNotificationLevel"
+                  type="radio"
+                  value="all_messages"
+                />
+                <div>
+                  <div />
+                </div>
+                <div
+                  class="mx_StyledRadioButton_content"
+                >
+                  All messages
+                </div>
+                <div
+                  class="mx_StyledRadioButton_spacer"
+                />
+              </label>
+              <label
+                class="mx_StyledRadioButton mx_StyledRadioButton_enabled mx_StyledRadioButton_checked"
+              >
+                <input
+                  id="defaultNotificationLevel-people_mentions_keywords"
+                  name="defaultNotificationLevel"
+                  type="radio"
+                  value="people_mentions_keywords"
+                />
+                <div>
+                  <div />
+                </div>
+                <div
+                  class="mx_StyledRadioButton_content"
+                >
+                  People, Mentions and Keywords
+                </div>
+                <div
+                  class="mx_StyledRadioButton_spacer"
+                />
+              </label>
+              <label
+                class="mx_StyledRadioButton mx_StyledRadioButton_enabled"
+              >
+                <input
+                  id="defaultNotificationLevel-mentions_keywords"
+                  name="defaultNotificationLevel"
+                  type="radio"
+                  value="mentions_keywords"
+                />
+                <div>
+                  <div />
+                </div>
+                <div
+                  class="mx_StyledRadioButton_content"
+                >
+                  Mentions and Keywords only
+                </div>
+                <div
+                  class="mx_StyledRadioButton_spacer"
+                />
+              </label>
+            </div>
+          </div>
+          <div
+            class="mx_SettingsSubsection"
+          >
+            <div
+              class="mx_SettingsSubsectionHeading"
+            >
+              <h2
+                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+              >
+                Play a sound for
+              </h2>
+            </div>
+            <div
+              class="mx_SettingsSubsection_description"
+            >
+              <div
+                class="mx_SettingsSubsection_text"
+              >
+                Applied by default to all rooms on all devices.
+              </div>
+            </div>
+            <div
+              class="mx_SettingsSubsection_content"
+            >
+              <div
+                class="mx_LabelledCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          checked=""
+                          class="_input_1md5v_18"
+                          id="checkbox_OEPN1su1JY"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_OEPN1su1JY"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          People
+                        </span>
+                      </label>
+                    </div>
+                  </div>
+                </form>
+              </div>
+              <div
+                class="mx_LabelledCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          checked=""
+                          class="_input_1md5v_18"
+                          id="checkbox_VtOyR5kbu3"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_VtOyR5kbu3"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          Mentions and Keywords
+                        </span>
+                      </label>
+                    </div>
+                  </div>
+                </form>
+              </div>
+              <div
+                class="mx_LabelledCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          checked=""
+                          class="_input_1md5v_18"
+                          id="checkbox_pEwuLn9Enn"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_pEwuLn9Enn"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          Audio and Video calls
+                        </span>
+                      </label>
+                    </div>
+                  </div>
+                </form>
+              </div>
+            </div>
+          </div>
+          <div
+            class="mx_SettingsSubsection"
+          >
+            <div
+              class="mx_SettingsSubsectionHeading"
+            >
+              <h2
+                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+              >
+                Other things we think you might be interested in:
+              </h2>
+            </div>
+            <div
+              class="mx_SettingsSubsection_content"
+            >
+              <div
+                class="mx_LabelledCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          checked=""
+                          class="_input_1md5v_18"
+                          id="checkbox_YuxfFEpOsz"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_YuxfFEpOsz"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          Invited to a room
+                        </span>
+                      </label>
+                    </div>
+                  </div>
+                </form>
+              </div>
+              <div
+                class="mx_LabelledCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          class="_input_1md5v_18"
+                          id="checkbox_tWhQkBerF1"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_tWhQkBerF1"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          New room activity, upgrades and status messages occur
+                        </span>
+                      </label>
+                    </div>
+                  </div>
+                </form>
+              </div>
+              <div
+                class="mx_LabelledCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          checked=""
+                          class="_input_1md5v_18"
+                          id="checkbox_ejc4GFes1U"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_ejc4GFes1U"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          Messages sent by bots
+                        </span>
+                      </label>
+                    </div>
+                  </div>
+                </form>
+              </div>
+            </div>
+          </div>
+          <div
+            class="mx_SettingsSubsection"
+          >
+            <div
+              class="mx_SettingsSubsectionHeading"
+            >
+              <h2
+                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+              >
+                Mentions and Keywords
+              </h2>
+            </div>
+            <div
+              class="mx_SettingsSubsection_description"
+            >
+              <div
+                class="mx_SettingsSubsection_text"
+              >
+                <span>
+                  Show a badge 
+                  <div
+                    class="mx_NotificationBadge mx_NotificationBadge_visible mx_NotificationBadge_level_notification mx_NotificationBadge_2char cpd-theme-light"
+                  >
+                    <span
+                      class="mx_NotificationBadge_count"
+                    >
+                      1
+                    </span>
+                  </div>
+                   when keywords are used in a room.
+                </span>
+              </div>
+            </div>
+            <div
+              class="mx_SettingsSubsection_content"
+            >
+              <div
+                class="mx_LabelledCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          checked=""
+                          class="_input_1md5v_18"
+                          id="checkbox_FzOK2nvfGF"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_FzOK2nvfGF"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          Notify when someone mentions using @room
+                        </span>
+                      </label>
+                    </div>
+                  </div>
+                </form>
+              </div>
+              <div
+                class="mx_LabelledCheckbox"
+                id="mx_NotificationSettings2_MentionCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          checked=""
+                          class="_input_1md5v_18"
+                          id="checkbox_MldL2r2vbs"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_MldL2r2vbs"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          Notify when someone mentions using @displayname or @userId:matrix.org
+                        </span>
+                      </label>
+                    </div>
+                  </div>
+                </form>
+              </div>
+              <div
+                class="mx_LabelledCheckbox"
+              >
+                <form
+                  class="_root_19upo_16"
+                >
+                  <div
+                    class="_inline-field_19upo_32"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1md5v_10"
+                      >
+                        <input
+                          aria-describedby="_r_11_"
+                          checked=""
+                          class="_input_1md5v_18"
+                          id="checkbox_SwicmKUiOB"
+                          type="checkbox"
+                        />
+                        <div
+                          class="_ui_1md5v_19"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            fill="currentColor"
+                            height="1em"
+                            viewBox="0 0 24 24"
+                            width="1em"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="checkbox_SwicmKUiOB"
+                      >
+                        <span
+                          class="mx_LabelledCheckbox_label"
+                        >
+                          Notify when someone uses a keyword
+                        </span>
+                      </label>
+                      <span
+                        class="_message_19upo_85 _help-message_19upo_91"
+                        id="_r_11_"
+                      >
+                        Enter keywords here, or use for spelling variations or nicknames
+                      </span>
+                    </div>
+                  </div>
+                </form>
+              </div>
+              <div
+                class="mx_TagComposer"
+              >
+                <form
+                  class="mx_TagComposer_input"
+                >
+                  <div
+                    class="mx_Field mx_Field_input"
+                  >
+                    <input
+                      autocomplete="off"
+                      id="mx_NotificationSettings2_Keywords_field"
+                      label="Keyword"
+                      placeholder="New keyword"
+                      type="text"
+                      value=""
+                    />
+                    <label
+                      for="mx_NotificationSettings2_Keywords_field"
+                    >
+                      Keyword
+                    </label>
+                  </div>
+                  <div
+                    class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
+                    role="button"
+                    tabindex="0"
+                  >
+                    Add
+                  </div>
+                </form>
+                <div
+                  class="mx_TagComposer_tags"
+                  role="list"
+                >
+                  <div
+                    class="mx_Tag"
+                    role="listitem"
+                  >
+                    justjann3
+                    <div
+                      aria-label="Remove"
+                      class="mx_AccessibleButton mx_Tag_delete"
+                      role="button"
+                      tabindex="0"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                  <div
+                    class="mx_Tag"
+                    role="listitem"
+                  >
+                    justj4nn3
+                    <div
+                      aria-label="Remove"
+                      class="mx_AccessibleButton mx_Tag_delete"
+                      role="button"
+                      tabindex="0"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                  <div
+                    class="mx_Tag"
+                    role="listitem"
+                  >
+                    justj4nne
+                    <div
+                      aria-label="Remove"
+                      class="mx_AccessibleButton mx_Tag_delete"
+                      role="button"
+                      tabindex="0"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                  <div
+                    class="mx_Tag"
+                    role="listitem"
+                  >
+                    Janne
+                    <div
+                      aria-label="Remove"
+                      class="mx_AccessibleButton mx_Tag_delete"
+                      role="button"
+                      tabindex="0"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                  <div
+                    class="mx_Tag"
+                    role="listitem"
+                  >
+                    J4nne
+                    <div
+                      aria-label="Remove"
+                      class="mx_AccessibleButton mx_Tag_delete"
+                      role="button"
+                      tabindex="0"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                  <div
+                    class="mx_Tag"
+                    role="listitem"
+                  >
+                    Jann3
+                    <div
+                      aria-label="Remove"
+                      class="mx_AccessibleButton mx_Tag_delete"
+                      role="button"
+                      tabindex="0"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                  <div
+                    class="mx_Tag"
+                    role="listitem"
+                  >
+                    jann3
+                    <div
+                      aria-label="Remove"
+                      class="mx_AccessibleButton mx_Tag_delete"
+                      role="button"
+                      tabindex="0"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                  <div
+                    class="mx_Tag"
+                    role="listitem"
+                  >
+                    j4nne
+                    <div
+                      aria-label="Remove"
+                      class="mx_AccessibleButton mx_Tag_delete"
+                      role="button"
+                      tabindex="0"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                  <div
+                    class="mx_Tag"
+                    role="listitem"
+                  >
+                    janne
+                    <div
+                      aria-label="Remove"
+                      class="mx_AccessibleButton mx_Tag_delete"
+                      role="button"
+                      tabindex="0"
+                    >
+                      <svg
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="_inline-field_19upo_32"
+              >
+                <div
+                  class="_inline-field-control_19upo_44"
+                >
+                  <div
+                    class="_container_udcm8_10"
+                  >
+                    <input
+                      checked=""
+                      class="_input_udcm8_24"
+                      id="mx_SettingsFlag_kNU64raTLcRs"
+                      role="switch"
+                      type="checkbox"
+                    />
+                    <div
+                      class="_ui_udcm8_34"
+                    />
+                  </div>
+                </div>
+                <div
+                  class="_inline-field-body_19upo_38"
+                >
+                  <label
+                    class="_label_19upo_59"
+                    for="mx_SettingsFlag_kNU64raTLcRs"
+                  >
+                    Show all activity in the room list (dots or number of unread messages)
+                  </label>
+                </div>
+              </div>
+              <div
+                class="_inline-field_19upo_32"
+              >
+                <div
+                  class="_inline-field-control_19upo_44"
+                >
+                  <div
+                    class="_container_udcm8_10"
+                  >
+                    <input
+                      checked=""
+                      class="_input_udcm8_24"
+                      id="mx_SettingsFlag_QRlYy75nfv5b"
+                      role="switch"
+                      type="checkbox"
+                    />
+                    <div
+                      class="_ui_udcm8_34"
+                    />
+                  </div>
+                </div>
+                <div
+                  class="_inline-field-body_19upo_38"
+                >
+                  <label
+                    class="_label_19upo_59"
+                    for="mx_SettingsFlag_QRlYy75nfv5b"
+                  >
+                    Only show notifications in the thread activity centre
+                  </label>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="mx_SettingsSubsection mx_SettingsSubsection_newUi"
+          >
+            <div
+              class="mx_SettingsSubsectionHeading"
+            >
+              <h3
+                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+              >
+                Email summary
+              </h3>
+            </div>
+            <div
+              class="mx_SettingsSubsection_content mx_SettingsSubsection_content_newUi"
+            >
+              <div
+                class="mx_SettingsSubsection_text"
+              >
+                Receive an email summary of missed notifications
+              </div>
+              <div
+                class="mx_SettingsSubsection_description mx_NotificationPusherSettings_detail"
+              >
+                <div
+                  class="mx_SettingsSubsection_text"
+                >
+                  <span>
+                    Select which emails you want to send summaries to. Manage your emails in 
+                    <div
+                      class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
+                      role="button"
+                      tabindex="0"
+                    >
+                      General
+                    </div>
+                    .
+                  </span>
+                </div>
+              </div>
+              <div
+                class="mx_SettingsIndent"
+              >
+                <div
+                  class="mx_LabelledCheckbox"
+                >
+                  <form
+                    class="_root_19upo_16"
+                  >
+                    <div
+                      class="_inline-field_19upo_32"
+                    >
+                      <div
+                        class="_inline-field-control_19upo_44"
+                      >
+                        <div
+                          class="_container_1md5v_10"
+                        >
+                          <input
+                            class="_input_1md5v_18"
+                            id="checkbox_dvqsxEaZtl"
+                            type="checkbox"
+                          />
+                          <div
+                            class="_ui_1md5v_19"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              fill="currentColor"
+                              height="1em"
+                              viewBox="0 0 24 24"
+                              width="1em"
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                      <div
+                        class="_inline-field-body_19upo_38"
+                      >
+                        <label
+                          class="_label_19upo_59"
+                          for="checkbox_dvqsxEaZtl"
+                        >
+                          <span
+                            class="mx_LabelledCheckbox_label"
+                          >
+                            test@example.tld
+                          </span>
+                        </label>
+                      </div>
+                    </div>
+                  </form>
+                </div>
+              </div>
+            </div>
+            <div
+              class="_separator_cqpyv_8"
+              data-kind="primary"
+              data-orientation="horizontal"
+              role="separator"
+            />
+          </div>
+          <div
+            class="mx_SettingsSubsection mx_SettingsSubsection_newUi"
+          >
+            <div
+              class="mx_SettingsSubsectionHeading"
+            >
+              <h3
+                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+              >
+                Notification targets
+              </h3>
+            </div>
+            <div
+              class="mx_SettingsSubsection_content mx_SettingsSubsection_content_newUi"
+            >
+              <ul>
+                <li>
+                  My EyeFon
+                </li>
+              </ul>
+            </div>
+            <div
+              class="_separator_cqpyv_8"
+              data-kind="primary"
+              data-orientation="horizontal"
+              role="separator"
+            />
+          </div>
+          <div
+            class="mx_SettingsSubsection"
+          >
+            <div
+              class="mx_SettingsSubsectionHeading"
+            >
+              <h3
+                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+              >
+                Quick Actions
+              </h3>
+            </div>
+            <div
+              class="mx_SettingsSubsection_content"
+            >
+              <div
+                class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger_outline"
+                role="button"
+                tabindex="0"
+              >
+                Reset to default settings
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </form>
 </div>
 `;
diff --git a/test/unit-tests/components/views/settings/shared/__snapshots__/SettingsSubsection-test.tsx.snap b/test/unit-tests/components/views/settings/shared/__snapshots__/SettingsSubsection-test.tsx.snap
index 5866484b0d..f32cf4ddbd 100644
--- a/test/unit-tests/components/views/settings/shared/__snapshots__/SettingsSubsection-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/shared/__snapshots__/SettingsSubsection-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SettingsSubsection /> renders with plain text description 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/settings/shared/__snapshots__/SettingsSubsectionHeading-test.tsx.snap b/test/unit-tests/components/views/settings/shared/__snapshots__/SettingsSubsectionHeading-test.tsx.snap
index 1a79ac83da..98d8edebfc 100644
--- a/test/unit-tests/components/views/settings/shared/__snapshots__/SettingsSubsectionHeading-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/shared/__snapshots__/SettingsSubsectionHeading-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SettingsSubsectionHeading /> renders with children 1`] = `
 {
diff --git a/test/unit-tests/components/views/settings/tabs/__snapshots__/SettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/__snapshots__/SettingsTab-test.tsx.snap
index cbebf4d8db..e4894c2513 100644
--- a/test/unit-tests/components/views/settings/tabs/__snapshots__/SettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/__snapshots__/SettingsTab-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SettingsTab /> renders tab 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx b/test/unit-tests/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx
index afd84ab33a..44ec287862 100644
--- a/test/unit-tests/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx
+++ b/test/unit-tests/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx
@@ -24,7 +24,7 @@ import RolesRoomSettingsTab from "../../../../../../../src/components/views/sett
 import { mkStubRoom, withClientContextRenderOptions, stubClient } from "../../../../../../test-utils";
 import { MatrixClientPeg } from "../../../../../../../src/MatrixClientPeg";
 import SettingsStore from "../../../../../../../src/settings/SettingsStore";
-import { ElementCall } from "../../../../../../../src/models/Call";
+import { ElementCallEventType, ElementCallMemberEventType } from "../../../../../../../src/call-types";
 
 describe("RolesRoomSettingsTab", () => {
     const userId = "@alice:server.org";
@@ -116,7 +116,7 @@ describe("RolesRoomSettingsTab", () => {
                     expect(getJoinCallSelectedOption(tab)?.textContent).toBe("Default");
                     expect(cli.sendStateEvent).toHaveBeenCalledWith(roomId, EventType.RoomPowerLevels, {
                         events: {
-                            [ElementCall.MEMBER_EVENT_TYPE.name]: 0,
+                            [ElementCallMemberEventType.name]: 0,
                         },
                     });
                 });
@@ -137,7 +137,7 @@ describe("RolesRoomSettingsTab", () => {
                     expect(getStartCallSelectedOption(tab)?.textContent).toBe("Default");
                     expect(cli.sendStateEvent).toHaveBeenCalledWith(roomId, EventType.RoomPowerLevels, {
                         events: {
-                            [ElementCall.CALL_EVENT_TYPE.name]: 0,
+                            [ElementCallEventType.name]: 0,
                         },
                     });
                 });
@@ -247,4 +247,42 @@ describe("RolesRoomSettingsTab", () => {
         deferred.reject("Error");
         await waitFor(() => expect(selector).toHaveValue("100"));
     });
+
+    it("should allow changing events power levels", async () => {
+        mocked(cli.sendStateEvent).mockResolvedValue({ event_id: "$eventId" });
+        mocked(cli.getRoom).mockReturnValue(room);
+        mocked(room.currentState.mayClientSendStateEvent).mockReturnValue(true);
+        const { container } = await renderTab();
+
+        const selector = container.querySelector(`[placeholder="Change topic"]`)!;
+        fireEvent.change(selector, { target: { value: "0" } });
+
+        expect(cli.sendStateEvent).toHaveBeenCalledWith(
+            room.roomId,
+            "m.room.power_levels",
+            expect.objectContaining({
+                events: expect.objectContaining({
+                    "m.room.topic": 0,
+                }),
+            }),
+        );
+    });
+
+    it("should allow changing top level power levels", async () => {
+        mocked(cli.sendStateEvent).mockResolvedValue({ event_id: "$eventId" });
+        mocked(cli.getRoom).mockReturnValue(room);
+        mocked(room.currentState.mayClientSendStateEvent).mockReturnValue(true);
+        const { container } = await renderTab();
+
+        const selector = container.querySelector(`[placeholder="Remove users"]`)!;
+        fireEvent.change(selector, { target: { value: "0" } });
+
+        expect(cli.sendStateEvent).toHaveBeenCalledWith(
+            room.roomId,
+            "m.room.power_levels",
+            expect.objectContaining({
+                kick: 0,
+            }),
+        );
+    });
 });
diff --git a/test/unit-tests/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx b/test/unit-tests/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx
index bb5300fc03..bf702f8199 100644
--- a/test/unit-tests/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx
+++ b/test/unit-tests/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx
@@ -11,6 +11,7 @@ import { fireEvent, render, screen, waitFor, within } from "jest-matrix-react";
 import { EventType, GuestAccess, HistoryVisibility, JoinRule, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import { mocked } from "jest-mock";
+import { type RoomPowerLevelsEventContent } from "matrix-js-sdk/src/types";
 
 import SecurityRoomSettingsTab from "../../../../../../../src/components/views/settings/tabs/room/SecurityRoomSettingsTab";
 import MatrixClientContext from "../../../../../../../src/contexts/MatrixClientContext";
@@ -123,6 +124,88 @@ describe("<SecurityRoomSettingsTab />", () => {
             );
         });
 
+        it("handles changing room to private with world_readable history visiblity", async () => {
+            const room = new Room(roomId, client, userId);
+            setRoomStateEvents(room, JoinRule.Public, undefined, HistoryVisibility.WorldReadable);
+
+            getComponent(room);
+
+            fireEvent.click(screen.getByLabelText("Private (invite only)"));
+
+            await flushPromises();
+
+            expect(client.sendStateEvent).toHaveBeenCalledWith(
+                room.roomId,
+                EventType.RoomHistoryVisibility,
+                {
+                    history_visibility: HistoryVisibility.Shared,
+                },
+                "",
+            );
+            expect(client.sendStateEvent).toHaveBeenCalledWith(
+                room.roomId,
+                EventType.RoomJoinRules,
+                {
+                    join_rule: JoinRule.Invite,
+                },
+                "",
+            );
+        });
+
+        it("doesn't change room to private when user lacks permissions for history visibility", async () => {
+            const room = new Room(roomId, client, userId);
+            setRoomStateEvents(room, JoinRule.Public, undefined, HistoryVisibility.WorldReadable);
+            room.currentState.setStateEvents([
+                new MatrixEvent({
+                    type: EventType.RoomPowerLevels,
+                    content: {
+                        users: { [userId]: 50 },
+                        state_default: 50,
+                        events: {
+                            [EventType.RoomJoinRules]: 50,
+                            [EventType.RoomHistoryVisibility]: 100,
+                        },
+                    } as RoomPowerLevelsEventContent,
+                    sender: userId,
+                    state_key: "",
+                    room_id: room.roomId,
+                }),
+            ]);
+
+            getComponent(room);
+            fireEvent.click(screen.getByLabelText("Private (invite only)"));
+            await flushPromises();
+            // Ensure we don't make any changes
+            expect(client.sendStateEvent).not.toHaveBeenCalled();
+        });
+
+        it("doesn't change room to private when history visibility change fails", async () => {
+            client.sendStateEvent.mockRejectedValue("Failed");
+            const room = new Room(roomId, client, userId);
+            setRoomStateEvents(room, JoinRule.Public, undefined, HistoryVisibility.WorldReadable);
+
+            getComponent(room);
+            fireEvent.click(screen.getByLabelText("Private (invite only)"));
+            await flushPromises();
+            expect(client.sendStateEvent).toHaveBeenCalledWith(
+                room.roomId,
+                EventType.RoomHistoryVisibility,
+                {
+                    history_visibility: HistoryVisibility.Shared,
+                },
+                "",
+            );
+            // Ensure we don't make any changes
+            expect(client.sendStateEvent).not.toHaveBeenCalledWith(
+                room.roomId,
+                EventType.RoomJoinRules,
+                {
+                    join_rule: JoinRule.Invite,
+                },
+                "",
+            );
+        });
+
         it("handles error when updating join rule fails", async () => {
             const room = new Room(roomId, client, userId);
             client.sendStateEvent.mockRejectedValue("oups");
@@ -169,7 +252,7 @@ describe("<SecurityRoomSettingsTab />", () => {
 
             fireEvent.click(screen.getByText("Show advanced"));
 
-            expect(screen.getByLabelText("Enable guest access").getAttribute("aria-checked")).toBe("false");
+            expect(screen.getByLabelText("Enable guest access")).not.toBeChecked();
         });
 
         it("updates guest access on toggle", () => {
@@ -181,7 +264,7 @@ describe("<SecurityRoomSettingsTab />", () => {
             fireEvent.click(screen.getByLabelText("Enable guest access"));
 
             // toggle set immediately
-            expect(screen.getByLabelText("Enable guest access").getAttribute("aria-checked")).toBe("true");
+            expect(screen.getByLabelText("Enable guest access")).toBeChecked();
 
             expect(client.sendStateEvent).toHaveBeenCalledWith(
                 room.roomId,
@@ -202,14 +285,14 @@ describe("<SecurityRoomSettingsTab />", () => {
             fireEvent.click(screen.getByLabelText("Enable guest access"));
 
             // toggle set immediately
-            expect(screen.getByLabelText("Enable guest access").getAttribute("aria-checked")).toBe("false");
+            expect(screen.getByLabelText("Enable guest access")).not.toBeChecked();
 
             await flushPromises();
             expect(client.sendStateEvent).toHaveBeenCalled();
             expect(logger.error).toHaveBeenCalledWith("oups");
 
             // toggle reset to old value
-            expect(screen.getByLabelText("Enable guest access").getAttribute("aria-checked")).toBe("true");
+            expect(screen.getByLabelText("Enable guest access")).toBeChecked();
         });
     });
 
@@ -305,7 +388,7 @@ describe("<SecurityRoomSettingsTab />", () => {
 
             await waitFor(() => expect(screen.getByLabelText("Encrypted")).toBeChecked());
             // can't disable encryption once enabled
-            expect(screen.getByLabelText("Encrypted").getAttribute("aria-disabled")).toEqual("true");
+            expect(screen.getByLabelText("Encrypted")).toBeDisabled();
         });
 
         it("asks users to confirm when setting room to encrypted", async () => {
@@ -412,7 +495,7 @@ describe("<SecurityRoomSettingsTab />", () => {
                 getComponent(room);
 
                 await waitFor(() => expect(screen.getByLabelText("Encrypted")).toBeChecked());
-                expect(screen.getByLabelText("Encrypted").getAttribute("aria-disabled")).toEqual("true");
+                expect(screen.getByLabelText("Encrypted")).toBeDisabled();
                 expect(screen.getByText("Once enabled, encryption cannot be disabled.")).toBeInTheDocument();
             });
 
@@ -422,7 +505,7 @@ describe("<SecurityRoomSettingsTab />", () => {
                 getComponent(room);
 
                 await waitFor(() => expect(screen.getByLabelText("Encrypted")).not.toBeChecked());
-                expect(screen.getByLabelText("Encrypted").getAttribute("aria-disabled")).toEqual("true");
+                expect(screen.getByLabelText("Encrypted")).toBeDisabled();
                 expect(screen.queryByText("Once enabled, encryption cannot be disabled.")).not.toBeInTheDocument();
                 expect(screen.getByText("Your server requires encryption to be disabled.")).toBeInTheDocument();
             });
diff --git a/test/unit-tests/components/views/settings/tabs/room/VoipRoomSettingsTab-test.tsx b/test/unit-tests/components/views/settings/tabs/room/VoipRoomSettingsTab-test.tsx
index 4184e76360..13c7912f29 100644
--- a/test/unit-tests/components/views/settings/tabs/room/VoipRoomSettingsTab-test.tsx
+++ b/test/unit-tests/components/views/settings/tabs/room/VoipRoomSettingsTab-test.tsx
@@ -13,7 +13,7 @@ import { type MatrixClient, type Room, type MatrixEvent, EventType, JoinRule } f
 import { mkStubRoom, stubClient } from "../../../../../../test-utils";
 import { MatrixClientPeg } from "../../../../../../../src/MatrixClientPeg";
 import { VoipRoomSettingsTab } from "../../../../../../../src/components/views/settings/tabs/room/VoipRoomSettingsTab";
-import { ElementCall } from "../../../../../../../src/models/Call";
+import { ElementCallEventType, ElementCallMemberEventType } from "../../../../../../../src/call-types";
 
 describe("VoipRoomSettingsTab", () => {
     const roomId = "!room:example.com";
@@ -43,31 +43,31 @@ describe("VoipRoomSettingsTab", () => {
         };
 
         const getElementCallSwitch = (tab: RenderResult): HTMLElement => {
-            return tab.container.querySelector("[data-testid='element-call-switch']")!;
+            return tab.getByLabelText("Enable Element Call as an additional calling option in this room")!;
         };
 
         describe("correct state", () => {
             it("shows enabled when call member power level is 0", () => {
-                mockPowerLevels({ [ElementCall.MEMBER_EVENT_TYPE.name]: 0 });
+                mockPowerLevels({ [ElementCallMemberEventType.name]: 0 });
 
                 const tab = renderTab();
 
-                expect(getElementCallSwitch(tab).querySelector("[aria-checked='true']")).toBeTruthy();
+                expect(getElementCallSwitch(tab)).toBeChecked();
             });
 
             it.each([1, 50, 100])("shows disabled when call member power level is 0", (level: number) => {
-                mockPowerLevels({ [ElementCall.MEMBER_EVENT_TYPE.name]: level });
+                mockPowerLevels({ [ElementCallMemberEventType.name]: level });
 
                 const tab = renderTab();
 
-                expect(getElementCallSwitch(tab).querySelector("[aria-checked='false']")).toBeTruthy();
+                expect(getElementCallSwitch(tab)).not.toBeChecked();
             });
         });
 
         describe("enabling/disabling", () => {
             describe("enabling Element calls", () => {
                 beforeEach(() => {
-                    mockPowerLevels({ [ElementCall.MEMBER_EVENT_TYPE.name]: 100 });
+                    mockPowerLevels({ [ElementCallMemberEventType.name]: 100 });
                 });
 
                 it("enables Element calls in public room", async () => {
@@ -75,15 +75,15 @@ describe("VoipRoomSettingsTab", () => {
 
                     const tab = renderTab();
 
-                    fireEvent.click(getElementCallSwitch(tab).querySelector(".mx_ToggleSwitch")!);
+                    fireEvent.click(getElementCallSwitch(tab));
                     await waitFor(() =>
                         expect(cli.sendStateEvent).toHaveBeenCalledWith(
                             room.roomId,
                             EventType.RoomPowerLevels,
                             expect.objectContaining({
                                 events: {
-                                    [ElementCall.CALL_EVENT_TYPE.name]: 50,
-                                    [ElementCall.MEMBER_EVENT_TYPE.name]: 0,
+                                    [ElementCallEventType.name]: 50,
+                                    [ElementCallMemberEventType.name]: 0,
                                 },
                             }),
                         ),
@@ -95,15 +95,15 @@ describe("VoipRoomSettingsTab", () => {
 
                     const tab = renderTab();
 
-                    fireEvent.click(getElementCallSwitch(tab).querySelector(".mx_ToggleSwitch")!);
+                    fireEvent.click(getElementCallSwitch(tab));
                     await waitFor(() =>
                         expect(cli.sendStateEvent).toHaveBeenCalledWith(
                             room.roomId,
                             EventType.RoomPowerLevels,
                             expect.objectContaining({
                                 events: {
-                                    [ElementCall.CALL_EVENT_TYPE.name]: 0,
-                                    [ElementCall.MEMBER_EVENT_TYPE.name]: 0,
+                                    [ElementCallEventType.name]: 0,
+                                    [ElementCallMemberEventType.name]: 0,
                                 },
                             }),
                         ),
@@ -112,19 +112,19 @@ describe("VoipRoomSettingsTab", () => {
             });
 
             it("disables Element calls", async () => {
-                mockPowerLevels({ [ElementCall.MEMBER_EVENT_TYPE.name]: 0 });
+                mockPowerLevels({ [ElementCallMemberEventType.name]: 0 });
 
                 const tab = renderTab();
 
-                fireEvent.click(getElementCallSwitch(tab).querySelector(".mx_ToggleSwitch")!);
+                fireEvent.click(getElementCallSwitch(tab));
                 await waitFor(() =>
                     expect(cli.sendStateEvent).toHaveBeenCalledWith(
                         room.roomId,
                         EventType.RoomPowerLevels,
                         expect.objectContaining({
                             events: {
-                                [ElementCall.CALL_EVENT_TYPE.name]: 100,
-                                [ElementCall.MEMBER_EVENT_TYPE.name]: 100,
+                                [ElementCallEventType.name]: 100,
+                                [ElementCallMemberEventType.name]: 100,
                             },
                         }),
                     ),
diff --git a/test/unit-tests/components/views/settings/tabs/room/__snapshots__/AdvancedRoomSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/room/__snapshots__/AdvancedRoomSettingsTab-test.tsx.snap
index 17390e6b00..813e759967 100644
--- a/test/unit-tests/components/views/settings/tabs/room/__snapshots__/AdvancedRoomSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/room/__snapshots__/AdvancedRoomSettingsTab-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`AdvancedRoomSettingsTab should render as expected 1`] = `
 <DocumentFragment>
@@ -47,7 +47,22 @@ exports[`AdvancedRoomSettingsTab should render as expected 1`] = `
                     class="mx_AccessibleButton mx_CopyableText_copyButton"
                     role="button"
                     tabindex="0"
-                  />
+                  >
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"
+                      />
+                      <path
+                        d="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2zm2 0v9h9v-9z"
+                      />
+                    </svg>
+                  </div>
                 </div>
               </div>
             </div>
diff --git a/test/unit-tests/components/views/settings/tabs/room/__snapshots__/BridgeSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/room/__snapshots__/BridgeSettingsTab-test.tsx.snap
index 81f01b2036..5c4f023676 100644
--- a/test/unit-tests/components/views/settings/tabs/room/__snapshots__/BridgeSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/room/__snapshots__/BridgeSettingsTab-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<BridgeSettingsTab /> renders when room is bridging messages 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/settings/tabs/room/__snapshots__/PeopleRoomSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/room/__snapshots__/PeopleRoomSettingsTab-test.tsx.snap
index f46355bbd0..e9dcae3c93 100644
--- a/test/unit-tests/components/views/settings/tabs/room/__snapshots__/PeopleRoomSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/room/__snapshots__/PeopleRoomSettingsTab-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`PeopleRoomSettingsTab with requests to join renders requests fully 1`] = `
 <fieldset
@@ -17,7 +17,7 @@ exports[`PeopleRoomSettingsTab with requests to join renders requests fully 1`]
     >
       <span
         aria-label="Profile picture"
-        class="_avatar_1qbcf_8 mx_BaseAvatar mx_PeopleRoomSettingsTab_avatar"
+        class="_avatar_zysgz_8 mx_BaseAvatar mx_PeopleRoomSettingsTab_avatar"
         data-color="4"
         data-testid="avatar-img"
         data-type="round"
@@ -26,7 +26,7 @@ exports[`PeopleRoomSettingsTab with requests to join renders requests fully 1`]
       >
         <img
           alt=""
-          class="_image_1qbcf_41"
+          class="_image_zysgz_43"
           data-type="round"
           height="42px"
           loading="lazy"
@@ -123,7 +123,7 @@ exports[`PeopleRoomSettingsTab with requests to join renders requests reduced 1`
       class="mx_PeopleRoomSettingsTab_knock"
     >
       <span
-        class="_avatar_1qbcf_8 mx_BaseAvatar mx_PeopleRoomSettingsTab_avatar _avatar-imageless_1qbcf_52"
+        class="_avatar_zysgz_8 mx_BaseAvatar mx_PeopleRoomSettingsTab_avatar _avatar-imageless_zysgz_55"
         data-color="4"
         data-testid="avatar-img"
         data-type="round"
diff --git a/test/unit-tests/components/views/settings/tabs/room/__snapshots__/RolesRoomSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/room/__snapshots__/RolesRoomSettingsTab-test.tsx.snap
index e589363309..59d3f00a52 100644
--- a/test/unit-tests/components/views/settings/tabs/room/__snapshots__/RolesRoomSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/room/__snapshots__/RolesRoomSettingsTab-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`RolesRoomSettingsTab Banned users renders banned users 1`] = `
 <fieldset
diff --git a/test/unit-tests/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap
index a4579bc970..920ef3c0bf 100644
--- a/test/unit-tests/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SecurityRoomSettingsTab /> history visibility uses shared as default history visibility when no state event found 1`] = `
 <fieldset
@@ -15,7 +15,7 @@ exports[`<SecurityRoomSettingsTab /> history visibility uses shared as default h
     <div
       class="mx_SettingsSubsection_text"
     >
-      Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.
+      The visibility of existing history will not be changed.
     </div>
   </div>
   <div
@@ -117,6 +117,7 @@ exports[`<SecurityRoomSettingsTab /> join rule handles error when updating join
   class="mx_ErrorDialog mx_Dialog_fixedWidth"
   data-focus-lock-disabled="false"
   role="dialog"
+  tabindex="-1"
 >
   <div
     class="mx_Dialog_header"
@@ -159,6 +160,7 @@ exports[`<SecurityRoomSettingsTab /> join rule warns when trying to make an encr
   class="mx_QuestionDialog mx_Dialog_fixedWidth"
   data-focus-lock-disabled="false"
   role="dialog"
+  tabindex="-1"
 >
   <div
     class="mx_Dialog_header"
diff --git a/test/unit-tests/components/views/settings/tabs/user/EncryptionUserSettingsTab-test.tsx b/test/unit-tests/components/views/settings/tabs/user/EncryptionUserSettingsTab-test.tsx
index 018ec25ef3..d86f8fbdec 100644
--- a/test/unit-tests/components/views/settings/tabs/user/EncryptionUserSettingsTab-test.tsx
+++ b/test/unit-tests/components/views/settings/tabs/user/EncryptionUserSettingsTab-test.tsx
@@ -5,6 +5,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+import { mocked } from "jest-mock";
 import React from "react";
 import { act, render, screen } from "jest-matrix-react";
 import { type MatrixClient } from "matrix-js-sdk/src/matrix";
@@ -18,6 +19,7 @@ import {
 } from "../../../../../../../src/components/views/settings/tabs/user/EncryptionUserSettingsTab";
 import { createTestClient, withClientContextRenderOptions } from "../../../../../../test-utils";
 import Modal from "../../../../../../../src/Modal";
+import DeviceListener from "../../../../../../../src/DeviceListener";
 
 describe("<EncryptionUserSettingsTab />", () => {
     let matrixClient: MatrixClient;
@@ -37,22 +39,21 @@ describe("<EncryptionUserSettingsTab />", () => {
                 userSigningKey: true,
             },
         });
+
+        jest.spyOn(DeviceListener.sharedInstance(), "getDeviceState").mockReturnValue("ok");
+    });
+
+    afterEach(() => {
+        jest.resetAllMocks();
     });
 
     function renderComponent(props: { initialState?: State } = {}) {
         return render(<EncryptionUserSettingsTab {...props} />, withClientContextRenderOptions(matrixClient));
     }
 
-    it("should display a loading state when the encryption state is computed", () => {
-        jest.spyOn(matrixClient.getCrypto()!, "isCrossSigningReady").mockImplementation(() => new Promise(() => {}));
-
-        renderComponent();
-        expect(screen.getByLabelText("Loading…")).toBeInTheDocument();
-    });
-
     it("should display a verify button when the encryption is not set up", async () => {
         const user = userEvent.setup();
-        jest.spyOn(matrixClient.getCrypto()!, "isCrossSigningReady").mockResolvedValue(false);
+        mocked(DeviceListener.sharedInstance().getDeviceState).mockReturnValue("verify_this_session");
 
         const { asFragment } = renderComponent();
         await waitFor(() =>
@@ -81,17 +82,7 @@ describe("<EncryptionUserSettingsTab />", () => {
     });
 
     it("should display the recovery out of sync panel when secrets are not cached", async () => {
-        jest.spyOn(matrixClient.getCrypto()!, "getActiveSessionBackupVersion").mockResolvedValue("1");
-        // Secrets are not cached
-        jest.spyOn(matrixClient.getCrypto()!, "getCrossSigningStatus").mockResolvedValue({
-            privateKeysInSecretStorage: true,
-            publicKeysOnDevice: true,
-            privateKeysCachedLocally: {
-                masterKey: false,
-                selfSigningKey: true,
-                userSigningKey: true,
-            },
-        });
+        mocked(DeviceListener.sharedInstance().getDeviceState).mockReturnValue("key_storage_out_of_sync");
 
         const user = userEvent.setup();
         const { asFragment } = renderComponent();
@@ -196,18 +187,7 @@ describe("<EncryptionUserSettingsTab />", () => {
     it("should re-check the encryption state and displays the correct panel when the user clicks cancel the reset identity flow", async () => {
         const user = userEvent.setup();
 
-        jest.spyOn(matrixClient.getCrypto()!, "getActiveSessionBackupVersion").mockResolvedValue("1");
-
-        // Secrets are not cached
-        jest.spyOn(matrixClient.getCrypto()!, "getCrossSigningStatus").mockResolvedValue({
-            privateKeysInSecretStorage: true,
-            publicKeysOnDevice: true,
-            privateKeysCachedLocally: {
-                masterKey: false,
-                selfSigningKey: true,
-                userSigningKey: true,
-            },
-        });
+        mocked(DeviceListener.sharedInstance().getDeviceState).mockReturnValue("key_storage_out_of_sync");
 
         renderComponent({ initialState: "reset_identity_forgot" });
 
@@ -220,4 +200,17 @@ describe("<EncryptionUserSettingsTab />", () => {
             screen.getByText("Your key storage is out of sync. Click one of the buttons below to fix the problem."),
         );
     });
+
+    it("should display the identity needs reset panel when the user's identity needs resetting", async () => {
+        mocked(DeviceListener.sharedInstance().getDeviceState).mockReturnValue("identity_needs_reset");
+
+        const user = userEvent.setup();
+        const { asFragment } = renderComponent();
+
+        await waitFor(() => screen.getByRole("button", { name: "Continue with reset" }));
+        expect(asFragment()).toMatchSnapshot();
+
+        await user.click(screen.getByRole("button", { name: "Continue with reset" }));
+        expect(screen.getByRole("heading", { name: "You need to reset your identity" })).toBeVisible();
+    });
 });
diff --git a/test/unit-tests/components/views/settings/tabs/user/InviteRulesAccountSetting-test.tsx b/test/unit-tests/components/views/settings/tabs/user/InviteRulesAccountSetting-test.tsx
new file mode 100644
index 0000000000..3c766138e5
--- /dev/null
+++ b/test/unit-tests/components/views/settings/tabs/user/InviteRulesAccountSetting-test.tsx
@@ -0,0 +1,144 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+import React from "react";
+import { render } from "jest-matrix-react";
+import userEvent from "@testing-library/user-event";
+
+import { InviteRulesAccountSetting } from "../../../../../../../src/components/views/settings/tabs/user/InviteRulesAccountSettings";
+import SettingsStore from "../../../../../../../src/settings/SettingsStore";
+import { type ComputedInviteConfig } from "../../../../../../../src/@types/invite-rules";
+import { SettingLevel } from "../../../../../../../src/settings/SettingLevel";
+
+function mockSetting(inviteRules: ComputedInviteConfig, blockInvites: boolean) {
+    jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName) => {
+        if (settingName === "inviteRules") {
+            return inviteRules;
+        }
+        if (settingName === "blockInvites") {
+            return blockInvites;
+        }
+        throw Error(`Unexpected setting ${settingName}`);
+    });
+}
+
+function mockDisabledMessage(msc4155supported: boolean, msc4380Supported: boolean) {
+    jest.spyOn(SettingsStore, "disabledMessage").mockImplementation((settingName) => {
+        if (settingName === "inviteRules") {
+            return msc4155supported ? undefined : "test-not-supported";
+        }
+        if (settingName === "blockInvites") {
+            return msc4380Supported ? undefined : "test-not-supported";
+        }
+        throw Error(`Unexpected setting ${settingName}`);
+    });
+}
+
+describe("InviteRulesAccountSetting", () => {
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it("does not render if neither MSC4155 nor MSC4380 are supported", async () => {
+        mockSetting({ allBlocked: false }, false);
+        mockDisabledMessage(false, false);
+        const { findByText, findByLabelText } = render(<InviteRulesAccountSetting />);
+        const input = await findByLabelText("Allow users to invite you to rooms");
+        await userEvent.hover(input);
+        const result = await findByText("test-not-supported");
+        expect(result).toBeInTheDocument();
+    });
+
+    describe("when MSC4155 is supported", () => {
+        beforeEach(() => {
+            mockDisabledMessage(true, false);
+        });
+
+        it("renders correct state when invites are not blocked", async () => {
+            mockSetting({ allBlocked: false }, false);
+            const { findByLabelText } = render(<InviteRulesAccountSetting />);
+            const result = await findByLabelText("Allow users to invite you to rooms");
+            expect(result).toBeChecked();
+        });
+
+        it("renders correct state when invites are blocked", async () => {
+            mockSetting({ allBlocked: true }, false);
+            const { findByLabelText } = render(<InviteRulesAccountSetting />);
+            const result = await findByLabelText("Allow users to invite you to rooms");
+            expect(result).not.toBeChecked();
+        });
+
+        it("handles disabling all invites", async () => {
+            mockSetting({ allBlocked: false }, false);
+            jest.spyOn(SettingsStore, "setValue").mockImplementation();
+            const { findByLabelText } = render(<InviteRulesAccountSetting />);
+            const result = await findByLabelText("Allow users to invite you to rooms");
+            await userEvent.click(result);
+            expect(SettingsStore.setValue).toHaveBeenCalledTimes(1);
+            expect(SettingsStore.setValue).toHaveBeenCalledWith("inviteRules", null, SettingLevel.ACCOUNT, {
+                allBlocked: true,
+            });
+        });
+
+        it("handles enabling all invites", async () => {
+            mockSetting({ allBlocked: true }, true);
+            jest.spyOn(SettingsStore, "setValue").mockImplementation();
+            const { findByLabelText } = render(<InviteRulesAccountSetting />);
+            const result = await findByLabelText("Allow users to invite you to rooms");
+            await userEvent.click(result);
+            // Should clear both MSC4155 and MSC4380 settings
+            expect(SettingsStore.setValue).toHaveBeenCalledTimes(2);
+            expect(SettingsStore.setValue).toHaveBeenCalledWith("inviteRules", null, SettingLevel.ACCOUNT, {
+                allBlocked: false,
+            });
+            expect(SettingsStore.setValue).toHaveBeenCalledWith("blockInvites", null, SettingLevel.ACCOUNT, false);
+        });
+    });
+
+    describe("when MSC4380 is supported", () => {
+        beforeEach(() => {
+            mockDisabledMessage(false, true);
+        });
+
+        it("renders correct state when invites are not blocked", async () => {
+            mockSetting({ allBlocked: false }, false);
+            const { findByLabelText } = render(<InviteRulesAccountSetting />);
+            const result = await findByLabelText("Allow users to invite you to rooms");
+            expect(result).toBeChecked();
+        });
+
+        it("renders correct state when invites are blocked", async () => {
+            mockSetting({ allBlocked: false }, true);
+            const { findByLabelText } = render(<InviteRulesAccountSetting />);
+            const result = await findByLabelText("Allow users to invite you to rooms");
+            expect(result).not.toBeChecked();
+        });
+
+        it("handles disabling all invites", async () => {
+            mockSetting({ allBlocked: false }, false);
+            jest.spyOn(SettingsStore, "setValue").mockImplementation();
+            const { findByLabelText } = render(<InviteRulesAccountSetting />);
+            const result = await findByLabelText("Allow users to invite you to rooms");
+            await userEvent.click(result);
+            expect(SettingsStore.setValue).toHaveBeenCalledTimes(1);
+            expect(SettingsStore.setValue).toHaveBeenCalledWith("blockInvites", null, SettingLevel.ACCOUNT, true);
+        });
+
+        it("handles enabling all invites", async () => {
+            mockSetting({ allBlocked: true }, true);
+            jest.spyOn(SettingsStore, "setValue").mockImplementation();
+            const { findByLabelText } = render(<InviteRulesAccountSetting />);
+            const result = await findByLabelText("Allow users to invite you to rooms");
+            await userEvent.click(result);
+            // Should clear both MSC4155 and MSC4380 settings
+            expect(SettingsStore.setValue).toHaveBeenCalledTimes(2);
+            expect(SettingsStore.setValue).toHaveBeenCalledWith("inviteRules", null, SettingLevel.ACCOUNT, {
+                allBlocked: false,
+            });
+            expect(SettingsStore.setValue).toHaveBeenCalledWith("blockInvites", null, SettingLevel.ACCOUNT, false);
+        });
+    });
+});
diff --git a/test/unit-tests/components/views/settings/tabs/user/PreferencesUserSettingsTab-test.tsx b/test/unit-tests/components/views/settings/tabs/user/PreferencesUserSettingsTab-test.tsx
index 0918b7809f..b0f17fae4c 100644
--- a/test/unit-tests/components/views/settings/tabs/user/PreferencesUserSettingsTab-test.tsx
+++ b/test/unit-tests/components/views/settings/tabs/user/PreferencesUserSettingsTab-test.tsx
@@ -89,7 +89,7 @@ describe("PreferencesUserSettingsTab", () => {
 
         renderTab();
         const toggle = await screen.findByRole("switch", { name: "Allow spell check" });
-        expect(toggle).toHaveAttribute("aria-checked", "false");
+        expect(toggle).not.toBeDisabled();
 
         await userEvent.click(toggle);
 
@@ -149,7 +149,7 @@ describe("PreferencesUserSettingsTab", () => {
                 mockGetValue(false);
                 const toggle = getToggle();
 
-                await waitFor(() => expect(toggle).toHaveAttribute("aria-disabled", "false"));
+                await waitFor(() => expect(toggle).not.toBeDisabled());
                 fireEvent.click(toggle);
                 expectSetValueToHaveBeenCalled("sendReadReceipts", null, SettingLevel.ACCOUNT, true);
             });
@@ -158,7 +158,7 @@ describe("PreferencesUserSettingsTab", () => {
                 mockGetValue(true);
                 const toggle = getToggle();
 
-                await waitFor(() => expect(toggle).toHaveAttribute("aria-disabled", "false"));
+                await waitFor(() => expect(toggle).not.toBeDisabled());
                 fireEvent.click(toggle);
                 expectSetValueToHaveBeenCalled("sendReadReceipts", null, SettingLevel.ACCOUNT, false);
             });
@@ -172,8 +172,8 @@ describe("PreferencesUserSettingsTab", () => {
             it("is forcibly enabled", async () => {
                 const toggle = getToggle();
                 await waitFor(() => {
-                    expect(toggle).toHaveAttribute("aria-checked", "true");
-                    expect(toggle).toHaveAttribute("aria-disabled", "true");
+                    expect(toggle).toBeChecked();
+                    expect(toggle).toBeDisabled();
                 });
             });
 
@@ -181,7 +181,8 @@ describe("PreferencesUserSettingsTab", () => {
                 mockGetValue(true);
                 const toggle = getToggle();
 
-                await waitFor(() => expect(toggle).toHaveAttribute("aria-disabled", "true"));
+                await waitFor(() => expect(toggle).toBeDisabled());
+                console.log(toggle.innerHTML);
                 fireEvent.click(toggle);
                 expect(SettingsStore.setValue).not.toHaveBeenCalled();
             });
diff --git a/test/unit-tests/components/views/settings/tabs/user/VoiceUserSettingsTab-test.tsx b/test/unit-tests/components/views/settings/tabs/user/VoiceUserSettingsTab-test.tsx
index d4519d429a..b30ed7a716 100644
--- a/test/unit-tests/components/views/settings/tabs/user/VoiceUserSettingsTab-test.tsx
+++ b/test/unit-tests/components/views/settings/tabs/user/VoiceUserSettingsTab-test.tsx
@@ -113,10 +113,10 @@ describe("<VoiceUserSettingsTab />", () => {
     });
 
     it("renders audio processing settings", () => {
-        const { getByTestId } = render(getComponent());
-        expect(getByTestId("voice-auto-gain")).toBeTruthy();
-        expect(getByTestId("voice-noise-suppression")).toBeTruthy();
-        expect(getByTestId("voice-echo-cancellation")).toBeTruthy();
+        const { getByRole } = render(getComponent());
+        expect(getByRole("switch", { name: "Automatically adjust the microphone volume" })).toBeTruthy();
+        expect(getByRole("switch", { name: "Noise suppression" })).toBeTruthy();
+        expect(getByRole("switch", { name: "Echo cancellation" })).toBeTruthy();
     });
 
     it("sets and displays audio processing settings", () => {
diff --git a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/AccountUserSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/AccountUserSettingsTab-test.tsx.snap
index 1387b984d8..c6a31f0b12 100644
--- a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/AccountUserSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/AccountUserSettingsTab-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<AccountUserSettingsTab /> 3pids should display 3pid email addresses and phone numbers 1`] = `
 <div
@@ -137,9 +137,18 @@ exports[`<AccountUserSettingsTab /> 3pids should display 3pid email addresses an
                   +1
                 </span>
               </div>
-              <span
+              <svg
                 class="mx_Dropdown_arrow"
-              />
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                />
+              </svg>
             </div>
           </div>
         </span>
diff --git a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/AppearanceUserSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/AppearanceUserSettingsTab-test.tsx.snap
index 6c0407a9e8..9df918d95d 100644
--- a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/AppearanceUserSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/AppearanceUserSettingsTab-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`AppearanceUserSettingsTab should render 1`] = `
 <DocumentFragment>
@@ -41,19 +41,19 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                     class="_inline-field-control_19upo_44"
                   >
                     <div
-                      class="_container_1e0uz_10"
+                      class="_container_1qhtc_10"
                     >
                       <input
-                        class="_input_1e0uz_18"
+                        class="_input_1qhtc_18"
                         disabled=""
-                        id="radix-«r0»"
+                        id="radix-_r_0_"
                         name="themeSelector"
                         title=""
                         type="radio"
                         value="light"
                       />
                       <div
-                        class="_ui_1e0uz_19"
+                        class="_ui_1qhtc_19"
                       />
                     </div>
                   </div>
@@ -62,7 +62,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                   >
                     <label
                       class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-                      for="radix-«r0»"
+                      for="radix-_r_0_"
                     >
                       Light
                     </label>
@@ -75,19 +75,19 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                     class="_inline-field-control_19upo_44"
                   >
                     <div
-                      class="_container_1e0uz_10"
+                      class="_container_1qhtc_10"
                     >
                       <input
-                        class="_input_1e0uz_18"
+                        class="_input_1qhtc_18"
                         disabled=""
-                        id="radix-«r1»"
+                        id="radix-_r_1_"
                         name="themeSelector"
                         title=""
                         type="radio"
                         value="dark"
                       />
                       <div
-                        class="_ui_1e0uz_19"
+                        class="_ui_1qhtc_19"
                       />
                     </div>
                   </div>
@@ -96,7 +96,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                   >
                     <label
                       class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-                      for="radix-«r1»"
+                      for="radix-_r_1_"
                     >
                       Dark
                     </label>
@@ -109,19 +109,19 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                     class="_inline-field-control_19upo_44"
                   >
                     <div
-                      class="_container_1e0uz_10"
+                      class="_container_1qhtc_10"
                     >
                       <input
-                        class="_input_1e0uz_18"
+                        class="_input_1qhtc_18"
                         disabled=""
-                        id="radix-«r2»"
+                        id="radix-_r_2_"
                         name="themeSelector"
                         title=""
                         type="radio"
                         value="light-high-contrast"
                       />
                       <div
-                        class="_ui_1e0uz_19"
+                        class="_ui_1qhtc_19"
                       />
                     </div>
                   </div>
@@ -130,7 +130,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                   >
                     <label
                       class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-                      for="radix-«r2»"
+                      for="radix-_r_2_"
                     >
                       High contrast
                     </label>
@@ -139,7 +139,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
               </form>
             </div>
             <div
-              class="_separator_7ckbw_8"
+              class="_separator_cqpyv_8"
               data-kind="primary"
               data-orientation="horizontal"
               role="separator"
@@ -170,25 +170,25 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                   <label
                     aria-label="Modern"
                     class="_label_19upo_59"
-                    for="radix-«r3»"
+                    for="radix-_r_3_"
                   >
                     <div
                       class="mxLayoutSwitcher_LayoutSelector_LayoutRadio_inline"
                     >
                       <div
-                        class="_container_1e0uz_10"
+                        class="_container_1qhtc_10"
                       >
                         <input
                           checked=""
-                          class="_input_1e0uz_18"
-                          id="radix-«r3»"
+                          class="_input_1qhtc_18"
+                          id="radix-_r_3_"
                           name="layout"
                           title=""
                           type="radio"
                           value="group"
                         />
                         <div
-                          class="_ui_1e0uz_19"
+                          class="_ui_1qhtc_19"
                         />
                       </div>
                       <span>
@@ -227,7 +227,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                           class="mx_EventTile_avatar"
                         >
                           <span
-                            class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+                            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
                             data-color="2"
                             data-testid="avatar-img"
                             data-type="round"
@@ -240,6 +240,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                         </div>
                         <div
                           class="mx_EventTile_line"
+                          id="1"
                         >
                           <div
                             class="mx_MTextBody mx_EventTile_content"
@@ -263,7 +264,19 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                               role="button"
                               tabindex="0"
                             >
-                              <div />
+                              <svg
+                                fill="currentColor"
+                                height="1em"
+                                viewBox="0 0 24 24"
+                                width="1em"
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  clip-rule="evenodd"
+                                  d="M15.706 2.637a2 2 0 0 1 2.829 0l2.828 2.828a2 2 0 0 1 0 2.829L9.605 20.052a1 1 0 0 1-.465.263L3.483 21.73a1 1 0 0 1-1.212-1.213l1.414-5.657a1 1 0 0 1 .263-.465zm1.224 7.262L14.102 7.07l-8.544 8.544-.943 3.771 3.771-.943z"
+                                  fill-rule="evenodd"
+                                />
+                              </svg>
                             </div>
                             <div
                               aria-expanded="false"
@@ -297,24 +310,24 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                   <label
                     aria-label="Message bubbles"
                     class="_label_19upo_59"
-                    for="radix-«rc»"
+                    for="radix-_r_c_"
                   >
                     <div
                       class="mxLayoutSwitcher_LayoutSelector_LayoutRadio_inline"
                     >
                       <div
-                        class="_container_1e0uz_10"
+                        class="_container_1qhtc_10"
                       >
                         <input
-                          class="_input_1e0uz_18"
-                          id="radix-«rc»"
+                          class="_input_1qhtc_18"
+                          id="radix-_r_c_"
                           name="layout"
                           title=""
                           type="radio"
                           value="bubble"
                         />
                         <div
-                          class="_ui_1e0uz_19"
+                          class="_ui_1qhtc_19"
                         />
                       </div>
                       <span>
@@ -353,7 +366,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                           class="mx_EventTile_avatar"
                         >
                           <span
-                            class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+                            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
                             data-color="2"
                             data-testid="avatar-img"
                             data-type="round"
@@ -366,6 +379,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                         </div>
                         <div
                           class="mx_EventTile_line"
+                          id="2"
                         >
                           <div
                             class="mx_MTextBody mx_EventTile_content"
@@ -389,7 +403,19 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                               role="button"
                               tabindex="0"
                             >
-                              <div />
+                              <svg
+                                fill="currentColor"
+                                height="1em"
+                                viewBox="0 0 24 24"
+                                width="1em"
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  clip-rule="evenodd"
+                                  d="M15.706 2.637a2 2 0 0 1 2.829 0l2.828 2.828a2 2 0 0 1 0 2.829L9.605 20.052a1 1 0 0 1-.465.263L3.483 21.73a1 1 0 0 1-1.212-1.213l1.414-5.657a1 1 0 0 1 .263-.465zm1.224 7.262L14.102 7.07l-8.544 8.544-.943 3.771 3.771-.943z"
+                                  fill-rule="evenodd"
+                                />
+                              </svg>
                             </div>
                             <div
                               aria-expanded="false"
@@ -423,24 +449,24 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                   <label
                     aria-label="IRC (experimental)"
                     class="_label_19upo_59"
-                    for="radix-«rl»"
+                    for="radix-_r_l_"
                   >
                     <div
                       class="mxLayoutSwitcher_LayoutSelector_LayoutRadio_inline"
                     >
                       <div
-                        class="_container_1e0uz_10"
+                        class="_container_1qhtc_10"
                       >
                         <input
-                          class="_input_1e0uz_18"
-                          id="radix-«rl»"
+                          class="_input_1qhtc_18"
+                          id="radix-_r_l_"
                           name="layout"
                           title=""
                           type="radio"
                           value="irc"
                         />
                         <div
-                          class="_ui_1e0uz_19"
+                          class="_ui_1qhtc_19"
                         />
                       </div>
                       <span>
@@ -465,6 +491,9 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                         data-self="true"
                         tabindex="-1"
                       >
+                        <span
+                          class="mx_MessageTimestamp"
+                        />
                         <div
                           class="mx_DisambiguatedProfile"
                         >
@@ -479,7 +508,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                           class="mx_EventTile_avatar"
                         >
                           <span
-                            class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+                            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
                             data-color="2"
                             data-testid="avatar-img"
                             data-type="round"
@@ -492,6 +521,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                         </div>
                         <div
                           class="mx_EventTile_line"
+                          id="3"
                         >
                           <div
                             class="mx_MTextBody mx_EventTile_content"
@@ -515,7 +545,19 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                               role="button"
                               tabindex="0"
                             >
-                              <div />
+                              <svg
+                                fill="currentColor"
+                                height="1em"
+                                viewBox="0 0 24 24"
+                                width="1em"
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  clip-rule="evenodd"
+                                  d="M15.706 2.637a2 2 0 0 1 2.829 0l2.828 2.828a2 2 0 0 1 0 2.829L9.605 20.052a1 1 0 0 1-.465.263L3.483 21.73a1 1 0 0 1-1.212-1.213l1.414-5.657a1 1 0 0 1 .263-.465zm1.224 7.262L14.102 7.07l-8.544 8.544-.943 3.771 3.771-.943z"
+                                  fill-rule="evenodd"
+                                />
+                              </svg>
                             </div>
                             <div
                               aria-expanded="false"
@@ -554,18 +596,19 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                     class="_inline-field-control_19upo_44"
                   >
                     <div
-                      class="_container_19o42_10"
+                      class="_container_udcm8_10"
                     >
                       <input
-                        aria-describedby="radix-«rv»"
-                        class="_input_19o42_24"
-                        id="radix-«ru»"
+                        aria-describedby="radix-_r_v_"
+                        class="_input_udcm8_24"
+                        id="radix-_r_u_"
                         name="compactLayout"
+                        role="switch"
                         title=""
                         type="checkbox"
                       />
                       <div
-                        class="_ui_19o42_34"
+                        class="_ui_udcm8_34"
                       />
                     </div>
                   </div>
@@ -574,13 +617,13 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="radix-«ru»"
+                      for="radix-_r_u_"
                     >
                       Show compact text and messages
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id="radix-«rv»"
+                      id="radix-_r_v_"
                     >
                       Modern layout must be selected to use this feature.
                     </span>
@@ -589,7 +632,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
               </form>
             </div>
             <div
-              class="_separator_7ckbw_8"
+              class="_separator_cqpyv_8"
               data-kind="primary"
               data-orientation="horizontal"
               role="separator"
@@ -728,13 +771,24 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                 <div
                   class="mx_Spinner"
                 >
-                  <div
+                  <svg
                     aria-label="Loading…"
-                    class="mx_Spinner_icon"
+                    class="_icon_11k6c_18"
                     data-testid="spinner"
+                    fill="currentColor"
+                    height="1em"
                     role="progressbar"
                     style="width: 32px; height: 32px;"
-                  />
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      clip-rule="evenodd"
+                      d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+                      fill-rule="evenodd"
+                    />
+                  </svg>
                 </div>
               </div>
             </div>
diff --git a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/EncryptionUserSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/EncryptionUserSettingsTab-test.tsx.snap
index bff7a9ab57..d82653a180 100644
--- a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/EncryptionUserSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/EncryptionUserSettingsTab-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<EncryptionUserSettingsTab /> should display a verify button when the encryption is not set up 1`] = `
 <DocumentFragment>
@@ -18,7 +18,7 @@ exports[`<EncryptionUserSettingsTab /> should display a verify button when the e
           <h2
             class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93 mx_SettingsHeader"
           >
-            Device not verified 
+            Device not verified
           </h2>
           <div
             class="mx_SettingsSubheader"
@@ -42,7 +42,7 @@ exports[`<EncryptionUserSettingsTab /> should display a verify button when the e
           </div>
         </div>
         <button
-          class="_button_vczzf_8 _has-icon_vczzf_57"
+          class="_button_187yx_8 _has-icon_187yx_57"
           data-kind="primary"
           data-size="sm"
           role="button"
@@ -81,6 +81,64 @@ exports[`<EncryptionUserSettingsTab /> should display the change recovery key pa
 </DocumentFragment>
 `;
 
+exports[`<EncryptionUserSettingsTab /> should display the identity needs reset panel when the user's identity needs resetting 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_SettingsTab mx_EncryptionUserSettingsTab"
+    data-testid="encryptionTab"
+  >
+    <div
+      class="mx_SettingsTab_sections"
+    >
+      <div
+        class="mx_SettingsSection mx_SettingsSection_newUi"
+      >
+        <div
+          class="mx_SettingsSection_header"
+        >
+          <h2
+            class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93 mx_SettingsHeader"
+          >
+            Your key storage is out of sync.
+          </h2>
+          <div
+            class="mx_SettingsSubheader"
+          >
+            <span
+              class="mx_SettingsSubheader_error"
+            >
+              <svg
+                fill="currentColor"
+                height="20px"
+                viewBox="0 0 24 24"
+                width="20px"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+                />
+              </svg>
+              You have to reset your cryptographic identity in order to ensure access to your message history
+            </span>
+          </div>
+        </div>
+        <div>
+          <button
+            class="_button_187yx_8"
+            data-kind="primary"
+            data-size="sm"
+            role="button"
+            tabindex="0"
+          >
+            Continue with reset
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
 exports[`<EncryptionUserSettingsTab /> should display the recovery out of sync panel when secrets are not cached 1`] = `
 <DocumentFragment>
   <div
@@ -100,7 +158,7 @@ exports[`<EncryptionUserSettingsTab /> should display the recovery out of sync p
           <h2
             class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93 mx_SettingsHeader"
           >
-            Recovery 
+            Recovery
           </h2>
           <div
             class="mx_SettingsSubheader"
@@ -128,7 +186,7 @@ exports[`<EncryptionUserSettingsTab /> should display the recovery out of sync p
           class="mx_RecoveryPanelOutOfSync"
         >
           <button
-            class="_button_vczzf_8"
+            class="_button_187yx_8"
             data-kind="secondary"
             data-size="sm"
             role="button"
@@ -137,7 +195,7 @@ exports[`<EncryptionUserSettingsTab /> should display the recovery out of sync p
             Forgot recovery key?
           </button>
           <button
-            class="_button_vczzf_8 _has-icon_vczzf_57"
+            class="_button_187yx_8 _has-icon_187yx_57"
             data-kind="primary"
             data-size="sm"
             role="button"
@@ -178,13 +236,14 @@ exports[`<EncryptionUserSettingsTab /> should display the reset identity panel w
       >
         <button
           aria-label="Back"
-          class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+          class="_icon-button_1pz9o_8"
+          data-kind="secondary"
           role="button"
           style="--cpd-icon-button-size: 28px;"
           tabindex="0"
         >
           <div
-            class="_indicator-icon_zr2a0_17"
+            class="_indicator-icon_147l5_17"
             style="--cpd-icon-button-size: 100%;"
           >
             <svg
@@ -232,7 +291,7 @@ exports[`<EncryptionUserSettingsTab /> should display the reset identity panel w
           class="mx_EncryptionCard_header"
         >
           <div
-            class="_content_o77nw_8 _destructive_o77nw_34"
+            class="_content_1r8kr_8 _destructive_1r8kr_34"
             data-size="large"
           >
             <svg
@@ -254,18 +313,18 @@ exports[`<EncryptionUserSettingsTab /> should display the reset identity panel w
           </h2>
         </div>
         <div
-          class="mx_Flex mx_EncryptionCard_emphasisedContent"
+          class="_flex_4dswl_9 mx_EncryptionCard_emphasisedContent"
           style="--mx-flex-display: flex; --mx-flex-direction: column; --mx-flex-align: normal; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x); --mx-flex-wrap: nowrap;"
         >
           <ul
-            class="_visual-list_15wzx_8"
+            class="_visual-list_1mgc1_8"
           >
             <li
-              class="_visual-list-item_1ma3e_8"
+              class="_visual-list-item_1nc1y_8"
             >
               <svg
                 aria-hidden="true"
-                class="_visual-list-item-icon_1ma3e_17 _visual-list-item-icon-success_1ma3e_22"
+                class="_visual-list-item-icon_1nc1y_17 _visual-list-item-icon-success_1nc1y_22"
                 fill="currentColor"
                 height="24px"
                 viewBox="0 0 24 24"
@@ -279,11 +338,11 @@ exports[`<EncryptionUserSettingsTab /> should display the reset identity panel w
               Your account details, contacts, preferences, and chat list will be kept
             </li>
             <li
-              class="_visual-list-item_1ma3e_8"
+              class="_visual-list-item_1nc1y_8"
             >
               <svg
                 aria-hidden="true"
-                class="_visual-list-item-icon_1ma3e_17"
+                class="_visual-list-item-icon_1nc1y_17"
                 fill="currentColor"
                 height="24px"
                 viewBox="0 0 24 24"
@@ -302,11 +361,11 @@ exports[`<EncryptionUserSettingsTab /> should display the reset identity panel w
               You will lose any message history that’s stored only on the server
             </li>
             <li
-              class="_visual-list-item_1ma3e_8"
+              class="_visual-list-item_1nc1y_8"
             >
               <svg
                 aria-hidden="true"
-                class="_visual-list-item-icon_1ma3e_17"
+                class="_visual-list-item-icon_1nc1y_17"
                 fill="currentColor"
                 height="24px"
                 viewBox="0 0 24 24"
@@ -334,7 +393,7 @@ exports[`<EncryptionUserSettingsTab /> should display the reset identity panel w
         >
           <button
             aria-disabled="false"
-            class="_button_vczzf_8 _destructive_vczzf_107"
+            class="_button_187yx_8 _destructive_187yx_107"
             data-kind="primary"
             data-size="lg"
             role="button"
@@ -343,7 +402,7 @@ exports[`<EncryptionUserSettingsTab /> should display the reset identity panel w
             Continue
           </button>
           <button
-            class="_button_vczzf_8"
+            class="_button_187yx_8"
             data-kind="tertiary"
             data-size="lg"
             role="button"
diff --git a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/KeyboardUserSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/KeyboardUserSettingsTab-test.tsx.snap
index fb733bdbeb..ed7803eaa8 100644
--- a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/KeyboardUserSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/KeyboardUserSettingsTab-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`KeyboardUserSettingsTab renders list of keyboard shortcuts 1`] = `
 <div>
@@ -742,6 +742,26 @@ exports[`KeyboardUserSettingsTab renders list of keyboard shortcuts 1`] = `
                     </kbd>
                   </div>
                 </li>
+                <li
+                  class="mx_KeyboardShortcut_shortcutRow"
+                >
+                  Save
+                  <div
+                    class="mx_KeyboardShortcut"
+                  >
+                    <kbd>
+                       
+                      Ctrl
+                       
+                    </kbd>
+                    +
+                    <kbd>
+                       
+                      s
+                       
+                    </kbd>
+                  </div>
+                </li>
               </ul>
             </div>
           </div>
diff --git a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/LabsUserSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/LabsUserSettingsTab-test.tsx.snap
index 4e65f7b61f..5bcba0e2dc 100644
--- a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/LabsUserSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/LabsUserSettingsTab-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<LabsUserSettingsTab /> renders settings marked as beta as beta cards 1`] = `
 <div
diff --git a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/MjolnirUserSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/MjolnirUserSettingsTab-test.tsx.snap
index 17986bd3bc..7f4e8104d8 100644
--- a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/MjolnirUserSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/MjolnirUserSettingsTab-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<MjolnirUserSettingsTab /> renders correctly when user has no ignored users 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/PreferencesUserSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/PreferencesUserSettingsTab-test.tsx.snap
index 3e3662bd68..3b2643c841 100644
--- a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/PreferencesUserSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/PreferencesUserSettingsTab-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`PreferencesUserSettingsTab should render 1`] = `
 <DocumentFragment>
@@ -15,1134 +15,1385 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
         <div
           class="mx_SettingsSection_subSections"
         >
-          <div
-            class="mx_SettingsSubsection"
+          <form
+            class="_root_19upo_16"
           >
             <div
-              class="mx_SettingsSubsectionHeading"
-            >
-              <h3
-                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-              >
-                Language
-              </h3>
-            </div>
-            <div
-              class="mx_SettingsSubsection_content"
+              class="mx_SettingsSubsection"
             >
               <div
-                class="mx_SettingsSubsection_dropdown"
+                class="mx_SettingsSubsectionHeading"
               >
-                Application language
-                <div
-                  class="mx_Spinner"
+                <h3
+                  class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
                 >
-                  <div
-                    aria-label="Loading…"
-                    class="mx_Spinner_icon"
-                    data-testid="spinner"
-                    role="progressbar"
-                    style="width: 32px; height: 32px;"
-                  />
-                </div>
-                <div
-                  class="mx_PreferencesUserSettingsTab_section_hint"
-                >
-                  The app will reload after selecting another language
-                </div>
+                  Language
+                </h3>
               </div>
-            </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection"
-          >
-            <div
-              class="mx_SettingsSubsectionHeading"
-            >
-              <h3
-                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-              >
-                Room list
-              </h3>
-            </div>
-            <div
-              class="mx_SettingsSubsection_content"
-            >
               <div
-                class="mx_SettingsFlag"
+                class="mx_SettingsSubsection_content"
               >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_vY7Q4uEh9K38"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Show shortcuts to recently viewed rooms above the room list
-                  </span>
-                </label>
                 <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Show shortcuts to recently viewed rooms above the room list"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_vY7Q4uEh9K38"
-                  role="switch"
-                  tabindex="0"
+                  class="mx_SettingsSubsection_dropdown"
                 >
+                  Application language
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection"
-          >
-            <div
-              class="mx_SettingsSubsectionHeading"
-            >
-              <h3
-                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-              >
-                Spaces
-              </h3>
-            </div>
-            <div
-              class="mx_SettingsSubsection_content"
-            >
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_QgU2PomxwKpa"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
+                    class="mx_Spinner"
                   >
-                    Show all rooms in Home
-                  </span>
-                  <div
-                    class="mx_SettingsFlag_microcopy"
-                  >
-                    All rooms you're in will appear in Home.
+                    <svg
+                      aria-label="Loading…"
+                      class="_icon_11k6c_18"
+                      data-testid="spinner"
+                      fill="currentColor"
+                      height="1em"
+                      role="progressbar"
+                      style="width: 32px; height: 32px;"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
                   </div>
-                </label>
-                <div
-                  aria-checked="false"
-                  aria-disabled="true"
-                  aria-label="Show all rooms in Home"
-                  class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_QgU2PomxwKpa"
-                  role="switch"
-                  tabindex="0"
-                >
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection"
-          >
-            <div
-              class="mx_SettingsSubsectionHeading"
-            >
-              <h3
-                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-              >
-                Keyboard shortcuts
-              </h3>
-            </div>
-            <div
-              class="mx_SettingsSubsection_description"
-            >
-              <div
-                class="mx_SettingsSubsection_text"
-              >
-                <span>
-                  To view all keyboard shortcuts, 
-                  <div
-                    class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
-                    role="button"
-                    tabindex="0"
+                    class="mx_PreferencesUserSettingsTab_section_hint"
                   >
-                    click here
+                    The app will reload after selecting another language
                   </div>
-                  .
-                </span>
-              </div>
-            </div>
-            <div
-              class="mx_SettingsSubsection_content"
-            >
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_6hpi3YEetmBG"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Use Ctrl + F to search timeline
-                  </span>
-                </label>
-                <div
-                  aria-checked="false"
-                  aria-disabled="true"
-                  aria-label="Use Ctrl + F to search timeline"
-                  class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_6hpi3YEetmBG"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
                 </div>
               </div>
             </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection"
+          </form>
+          <form
+            class="_root_19upo_16"
           >
             <div
-              class="mx_SettingsSubsectionHeading"
-            >
-              <h3
-                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-              >
-                Displaying time
-              </h3>
-            </div>
-            <div
-              class="mx_SettingsSubsection_content"
+              class="mx_SettingsSubsection"
             >
               <div
-                class="mx_SettingsSubsection_dropdown"
+                class="mx_SettingsSubsectionHeading"
+              >
+                <h3
+                  class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+                >
+                  Room list
+                </h3>
+              </div>
+              <div
+                class="mx_SettingsSubsection_content"
               >
-                Set timezone
                 <div
-                  class="mx_Dropdown mx_dropdownUserTimezone"
+                  class="_inline-field_19upo_32"
                 >
                   <div
-                    aria-describedby="mx_dropdownUserTimezone_value"
-                    aria-expanded="false"
-                    aria-haspopup="listbox"
-                    aria-label="Set timezone"
-                    aria-owns="mx_dropdownUserTimezone_input"
-                    class="mx_AccessibleButton mx_Dropdown_input mx_no_textinput"
-                    role="button"
-                    tabindex="0"
+                    class="_inline-field-control_19upo_44"
                   >
                     <div
-                      class="mx_Dropdown_option"
-                      id="mx_dropdownUserTimezone_value"
+                      class="_container_udcm8_10"
                     >
-                      Browser default (UTC)
+                      <input
+                        class="_input_udcm8_24"
+                        id="mx_SettingsFlag_vY7Q4uEh9K38"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
                     </div>
-                    <span
-                      class="mx_Dropdown_arrow"
-                    />
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_vY7Q4uEh9K38"
+                    >
+                      Show message previews
+                    </label>
                   </div>
                 </div>
               </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_4yVCeEefiPqp"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Show timestamps in 12 hour format (e.g. 2:30pm)
-                  </span>
-                </label>
-                <div
-                  aria-checked="false"
-                  aria-disabled="true"
-                  aria-label="Show timestamps in 12 hour format (e.g. 2:30pm)"
-                  class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_4yVCeEefiPqp"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_MRMwbPDmfGtm"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Always show message timestamps
-                  </span>
-                </label>
-                <div
-                  aria-checked="false"
-                  aria-disabled="true"
-                  aria-label="Always show message timestamps"
-                  class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_MRMwbPDmfGtm"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_GQvdMWe954DV"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Publish timezone on public profile
-                  </span>
-                </label>
-                <div
-                  aria-checked="false"
-                  aria-disabled="true"
-                  aria-label="Publish timezone on public profile"
-                  class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_GQvdMWe954DV"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
             </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection"
+          </form>
+          <form
+            class="_root_19upo_16"
           >
             <div
-              class="mx_SettingsSubsectionHeading"
-            >
-              <h3
-                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-              >
-                Presence
-              </h3>
-            </div>
-            <div
-              class="mx_SettingsSubsection_description"
+              class="mx_SettingsSubsection"
             >
               <div
-                class="mx_SettingsSubsection_text"
+                class="mx_SettingsSubsectionHeading"
               >
-                Share your activity and status with others.
-              </div>
-            </div>
-            <div
-              class="mx_SettingsSubsection_content"
-            >
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_IAu5CsiHRD7n"
+                <h3
+                  class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
                 >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Send read receipts
-                  </span>
-                </label>
+                  Spaces
+                </h3>
+              </div>
+              <div
+                class="mx_SettingsSubsection_content"
+              >
                 <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Send read receipts"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_IAu5CsiHRD7n"
-                  role="switch"
-                  tabindex="0"
+                  class="_inline-field_19upo_32"
                 >
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_yrA2ohjWVJIP"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
+                    class="_inline-field-control_19upo_44"
                   >
-                    Send typing notifications
-                  </span>
-                </label>
-                <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Send typing notifications"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_yrA2ohjWVJIP"
-                  role="switch"
-                  tabindex="0"
-                >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_QgU2PomxwKpa"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection"
-          >
-            <div
-              class="mx_SettingsSubsectionHeading"
-            >
-              <h3
-                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-              >
-                Composer
-              </h3>
-            </div>
-            <div
-              class="mx_SettingsSubsection_content"
-            >
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_auy1OmnTidX4"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
+                    class="_inline-field-body_19upo_38"
                   >
-                    Automatically replace plain text Emoji
-                  </span>
-                </label>
-                <div
-                  aria-checked="false"
-                  aria-disabled="true"
-                  aria-label="Automatically replace plain text Emoji"
-                  class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_auy1OmnTidX4"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_ePDS0OpWwAHG"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Enable Markdown
-                  </span>
-                  <div
-                    class="mx_SettingsFlag_microcopy"
-                  >
-                    <span>
-                      Start messages with 
-                      <code>
-                        /plain
-                      </code>
-                       to send without markdown.
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_QgU2PomxwKpa"
+                    >
+                      Show all rooms in Home
+                    </label>
+                    <span
+                      class="_message_19upo_85 _help-message_19upo_91"
+                      id="radix-_r_4_"
+                    >
+                      All rooms you're in will appear in Home.
                     </span>
                   </div>
-                </label>
-                <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Enable Markdown"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_ePDS0OpWwAHG"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_75JNTNkNU64r"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Enable Emoji suggestions while typing
-                  </span>
-                </label>
-                <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Enable Emoji suggestions while typing"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_75JNTNkNU64r"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_aTLcRsQRlYy7"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Use Ctrl + Enter to send a message
-                  </span>
-                </label>
-                <div
-                  aria-checked="false"
-                  aria-disabled="true"
-                  aria-label="Use Ctrl + Enter to send a message"
-                  class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_aTLcRsQRlYy7"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_5nfv5bOEPN1s"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Surround selected text when typing special characters
-                  </span>
-                </label>
-                <div
-                  aria-checked="false"
-                  aria-disabled="true"
-                  aria-label="Surround selected text when typing special characters"
-                  class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_5nfv5bOEPN1s"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_u1JYVtOyR5kb"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Show stickers button
-                  </span>
-                </label>
-                <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Show stickers button"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_u1JYVtOyR5kb"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_u3pEwuLn9Enn"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Insert a trailing colon after user mentions at the start of a message
-                  </span>
-                </label>
-                <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Insert a trailing colon after user mentions at the start of a message"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_u3pEwuLn9Enn"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
                 </div>
               </div>
             </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection"
+          </form>
+          <form
+            class="_root_19upo_16"
           >
             <div
-              class="mx_SettingsSubsectionHeading"
-            >
-              <h3
-                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-              >
-                Code blocks
-              </h3>
-            </div>
-            <div
-              class="mx_SettingsSubsection_content"
+              class="mx_SettingsSubsection"
             >
               <div
-                class="mx_SettingsFlag"
+                class="mx_SettingsSubsectionHeading"
               >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_YuxfFEpOsztW"
+                <h3
+                  class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
                 >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Enable automatic language detection for syntax highlighting
-                  </span>
-                </label>
+                  Keyboard shortcuts
+                </h3>
+              </div>
+              <div
+                class="mx_SettingsSubsection_description"
+              >
                 <div
-                  aria-checked="false"
-                  aria-disabled="true"
-                  aria-label="Enable automatic language detection for syntax highlighting"
-                  class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_YuxfFEpOsztW"
-                  role="switch"
-                  tabindex="0"
+                  class="mx_SettingsSubsection_text"
                 >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
+                  <span>
+                    To view all keyboard shortcuts, 
+                    <div
+                      class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
+                      role="button"
+                      tabindex="0"
+                    >
+                      click here
+                    </div>
+                    .
+                  </span>
                 </div>
               </div>
               <div
-                class="mx_SettingsFlag"
+                class="mx_SettingsSubsection_content"
               >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_hQkBerF1ejc4"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Expand code blocks by default
-                  </span>
-                </label>
                 <div
-                  aria-checked="false"
-                  aria-disabled="true"
-                  aria-label="Expand code blocks by default"
-                  class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_hQkBerF1ejc4"
-                  role="switch"
-                  tabindex="0"
+                  class="_inline-field_19upo_32"
                 >
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_GFes1UFzOK2n"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
+                    class="_inline-field-control_19upo_44"
                   >
-                    Show line numbers in code blocks
-                  </span>
-                </label>
-                <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Show line numbers in code blocks"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_GFes1UFzOK2n"
-                  role="switch"
-                  tabindex="0"
-                >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_6hpi3YEetmBG"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_6hpi3YEetmBG"
+                    >
+                      Use Ctrl + F to search timeline
+                    </label>
+                  </div>
                 </div>
               </div>
             </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection"
+          </form>
+          <form
+            class="_root_19upo_16"
           >
             <div
-              class="mx_SettingsSubsectionHeading"
-            >
-              <h3
-                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-              >
-                Images, GIFs and videos
-              </h3>
-            </div>
-            <div
-              class="mx_SettingsSubsection_content"
+              class="mx_SettingsSubsection"
             >
               <div
-                class="mx_SettingsFlag"
+                class="mx_SettingsSubsectionHeading"
               >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_vfGFMldL2r2v"
+                <h3
+                  class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
                 >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Enable inline URL previews by default
-                  </span>
-                </label>
-                <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Enable inline URL previews by default"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_vfGFMldL2r2v"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
+                  Displaying time
+                </h3>
               </div>
               <div
-                class="mx_SettingsFlag"
+                class="mx_SettingsSubsection_content"
               >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_bsSwicmKUiOB"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Autoplay GIFs
-                  </span>
-                </label>
                 <div
-                  aria-checked="false"
-                  aria-disabled="true"
-                  aria-label="Autoplay GIFs"
-                  class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_bsSwicmKUiOB"
-                  role="switch"
-                  tabindex="0"
+                  class="mx_SettingsSubsection_dropdown"
                 >
+                  Set timezone
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
+                    class="mx_Dropdown mx_dropdownUserTimezone"
+                  >
+                    <div
+                      aria-describedby="mx_dropdownUserTimezone_value"
+                      aria-expanded="false"
+                      aria-haspopup="listbox"
+                      aria-label="Set timezone"
+                      aria-owns="mx_dropdownUserTimezone_input"
+                      class="mx_AccessibleButton mx_Dropdown_input mx_no_textinput"
+                      role="button"
+                      tabindex="0"
+                    >
+                      <div
+                        class="mx_Dropdown_option"
+                        id="mx_dropdownUserTimezone_value"
+                      >
+                        Browser default (UTC)
+                      </div>
+                      <svg
+                        class="mx_Dropdown_arrow"
+                        fill="currentColor"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+                        />
+                      </svg>
+                    </div>
+                  </div>
                 </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_dvqsxEaZtl3A"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Autoplay videos
-                  </span>
-                </label>
                 <div
-                  aria-checked="false"
-                  aria-disabled="true"
-                  aria-label="Autoplay videos"
-                  class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_dvqsxEaZtl3A"
-                  role="switch"
-                  tabindex="0"
+                  class="_inline-field_19upo_32"
                 >
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_4yVCeEefiPqp"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_4yVCeEefiPqp"
+                    >
+                      Show timestamps in 12 hour format (e.g. 2:30pm)
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_MRMwbPDmfGtm"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_MRMwbPDmfGtm"
+                    >
+                      Always show message timestamps
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_GQvdMWe954DV"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_GQvdMWe954DV"
+                    >
+                      Publish timezone on public profile
+                    </label>
+                    <span
+                      class="_message_19upo_85 _help-message_19upo_91"
+                      id="radix-_r_d_"
+                    >
+                      Requires your server to support MSC4133
+                    </span>
+                  </div>
                 </div>
               </div>
             </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection"
+          </form>
+          <form
+            class="_root_19upo_16"
           >
             <div
-              class="mx_SettingsSubsectionHeading"
+              class="mx_SettingsSubsection"
             >
-              <h3
-                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+              <div
+                class="mx_SettingsSubsectionHeading"
               >
-                Timeline
-              </h3>
+                <h3
+                  class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+                >
+                  Presence
+                </h3>
+              </div>
+              <div
+                class="mx_SettingsSubsection_description"
+              >
+                <div
+                  class="mx_SettingsSubsection_text"
+                >
+                  Share your activity and status with others.
+                </div>
+              </div>
+              <div
+                class="mx_SettingsSubsection_content"
+              >
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_IAu5CsiHRD7n"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_IAu5CsiHRD7n"
+                    >
+                      Send read receipts
+                    </label>
+                    <span
+                      class="_message_19upo_85 _help-message_19upo_91"
+                      id="radix-_r_g_"
+                    >
+                      Your server doesn't support disabling sending read receipts.
+                    </span>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_yrA2ohjWVJIP"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_yrA2ohjWVJIP"
+                    >
+                      Send typing notifications
+                    </label>
+                  </div>
+                </div>
+              </div>
             </div>
+          </form>
+          <form
+            class="_root_19upo_16"
+          >
             <div
-              class="mx_SettingsSubsection_content"
+              class="mx_SettingsSubsection"
             >
               <div
-                class="mx_SettingsFlag"
+                class="mx_SettingsSubsectionHeading"
               >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_NIiWzqsApP1c"
+                <h3
+                  class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
                 >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Show typing notifications
-                  </span>
-                </label>
-                <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Show typing notifications"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_NIiWzqsApP1c"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
+                  Composer
+                </h3>
               </div>
               <div
-                class="mx_SettingsFlag"
+                class="mx_SettingsSubsection_content"
               >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_q1SIAPqLMVXh"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Show a placeholder for removed messages
-                  </span>
-                </label>
                 <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Show a placeholder for removed messages"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_q1SIAPqLMVXh"
-                  role="switch"
-                  tabindex="0"
+                  class="_inline-field_19upo_32"
                 >
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_auy1OmnTidX4"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_auy1OmnTidX4"
+                    >
+                      Automatically replace plain text Emoji
+                    </label>
+                  </div>
                 </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_dXFDGgBsKXay"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Show read receipts sent by other users
-                  </span>
-                </label>
                 <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Show read receipts sent by other users"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_dXFDGgBsKXay"
-                  role="switch"
-                  tabindex="0"
+                  class="_inline-field_19upo_32"
                 >
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_ePDS0OpWwAHG"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_ePDS0OpWwAHG"
+                    >
+                      Enable Markdown
+                    </label>
+                    <span
+                      class="_message_19upo_85 _help-message_19upo_91"
+                      id="radix-_r_n_"
+                    >
+                      <span>
+                        Start messages with 
+                        <code>
+                          /plain
+                        </code>
+                         to send without markdown.
+                      </span>
+                    </span>
+                  </div>
                 </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_7Az0xw4Bs4Tt"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Show join/leave messages (invites/removes/bans unaffected)
-                  </span>
-                </label>
                 <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Show join/leave messages (invites/removes/bans unaffected)"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_7Az0xw4Bs4Tt"
-                  role="switch"
-                  tabindex="0"
+                  class="_inline-field_19upo_32"
                 >
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_75JNTNkNU64r"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_75JNTNkNU64r"
+                    >
+                      Enable Emoji suggestions while typing
+                    </label>
+                  </div>
                 </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_8jmzPIlPoBCv"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Show display name changes
-                  </span>
-                </label>
                 <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Show display name changes"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_8jmzPIlPoBCv"
-                  role="switch"
-                  tabindex="0"
+                  class="_inline-field_19upo_32"
                 >
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_aTLcRsQRlYy7"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_aTLcRsQRlYy7"
+                    >
+                      Use Ctrl + Enter to send a message
+                    </label>
+                  </div>
                 </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_enFRaTjdsFou"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Show chat effects (animations when receiving e.g. confetti)
-                  </span>
-                </label>
                 <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Show chat effects (animations when receiving e.g. confetti)"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_enFRaTjdsFou"
-                  role="switch"
-                  tabindex="0"
+                  class="_inline-field_19upo_32"
                 >
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_5nfv5bOEPN1s"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_5nfv5bOEPN1s"
+                    >
+                      Surround selected text when typing special characters
+                    </label>
+                  </div>
                 </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_bfwnd5rz4XNX"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Show profile picture changes
-                  </span>
-                </label>
                 <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Show profile picture changes"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_bfwnd5rz4XNX"
-                  role="switch"
-                  tabindex="0"
+                  class="_inline-field_19upo_32"
                 >
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_u1JYVtOyR5kb"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_u1JYVtOyR5kb"
+                    >
+                      Show stickers button
+                    </label>
+                  </div>
                 </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_gs5uWEzYzZrS"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Show avatars in user, room and event mentions
-                  </span>
-                </label>
                 <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Show avatars in user, room and event mentions"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_gs5uWEzYzZrS"
-                  role="switch"
-                  tabindex="0"
+                  class="_inline-field_19upo_32"
                 >
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_qWg7OgID1yRR"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
+                    class="_inline-field-control_19upo_44"
                   >
-                    Enable big emoji in chat
-                  </span>
-                </label>
-                <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Enable big emoji in chat"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_qWg7OgID1yRR"
-                  role="switch"
-                  tabindex="0"
-                >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_u3pEwuLn9Enn"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_pOPewl7rtMbV"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
+                    class="_inline-field-body_19upo_38"
                   >
-                    Jump to the bottom of the timeline when you send a message
-                  </span>
-                </label>
-                <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Jump to the bottom of the timeline when you send a message"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_pOPewl7rtMbV"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_cmt3PZSyNp3v"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Show current profile picture and name for users in message history
-                  </span>
-                </label>
-                <div
-                  aria-checked="false"
-                  aria-disabled="true"
-                  aria-label="Show current profile picture and name for users in message history"
-                  class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_cmt3PZSyNp3v"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_u3pEwuLn9Enn"
+                    >
+                      Insert a trailing colon after user mentions at the start of a message
+                    </label>
+                  </div>
                 </div>
               </div>
             </div>
-          </div>
+          </form>
+          <form
+            class="_root_19upo_16"
+          >
+            <div
+              class="mx_SettingsSubsection"
+            >
+              <div
+                class="mx_SettingsSubsectionHeading"
+              >
+                <h3
+                  class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+                >
+                  Code blocks
+                </h3>
+              </div>
+              <div
+                class="mx_SettingsSubsection_content"
+              >
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_YuxfFEpOsztW"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_YuxfFEpOsztW"
+                    >
+                      Enable automatic language detection for syntax highlighting
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_hQkBerF1ejc4"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_hQkBerF1ejc4"
+                    >
+                      Expand code blocks by default
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_GFes1UFzOK2n"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_GFes1UFzOK2n"
+                    >
+                      Show line numbers in code blocks
+                    </label>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </form>
+          <form
+            class="_root_19upo_16"
+          >
+            <div
+              class="mx_SettingsSubsection"
+            >
+              <div
+                class="mx_SettingsSubsectionHeading"
+              >
+                <h3
+                  class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+                >
+                  Images, GIFs and videos
+                </h3>
+              </div>
+              <div
+                class="mx_SettingsSubsection_content"
+              >
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_vfGFMldL2r2v"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_vfGFMldL2r2v"
+                    >
+                      Enable inline URL previews by default
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_bsSwicmKUiOB"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_bsSwicmKUiOB"
+                    >
+                      Autoplay GIFs
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_dvqsxEaZtl3A"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_dvqsxEaZtl3A"
+                    >
+                      Autoplay videos
+                    </label>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </form>
+          <form
+            class="_root_19upo_16"
+          >
+            <div
+              class="mx_SettingsSubsection"
+            >
+              <div
+                class="mx_SettingsSubsectionHeading"
+              >
+                <h3
+                  class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+                >
+                  Timeline
+                </h3>
+              </div>
+              <div
+                class="mx_SettingsSubsection_content"
+              >
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_NIiWzqsApP1c"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_NIiWzqsApP1c"
+                    >
+                      Show typing notifications
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_q1SIAPqLMVXh"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_q1SIAPqLMVXh"
+                    >
+                      Show a placeholder for removed messages
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_dXFDGgBsKXay"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_dXFDGgBsKXay"
+                    >
+                      Show read receipts sent by other users
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_7Az0xw4Bs4Tt"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_7Az0xw4Bs4Tt"
+                    >
+                      Show join/leave messages (invites/removes/bans unaffected)
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_8jmzPIlPoBCv"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_8jmzPIlPoBCv"
+                    >
+                      Show display name changes
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_enFRaTjdsFou"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_enFRaTjdsFou"
+                    >
+                      Show chat effects (animations when receiving e.g. confetti)
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_bfwnd5rz4XNX"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_bfwnd5rz4XNX"
+                    >
+                      Show profile picture changes
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_gs5uWEzYzZrS"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_gs5uWEzYzZrS"
+                    >
+                      Show avatars in user, room and event mentions
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_qWg7OgID1yRR"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_qWg7OgID1yRR"
+                    >
+                      Enable big emoji in chat
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_pOPewl7rtMbV"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_pOPewl7rtMbV"
+                    >
+                      Jump to the bottom of the timeline when you send a message
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="_inline-field_19upo_32"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_cmt3PZSyNp3v"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_cmt3PZSyNp3v"
+                    >
+                      Show current profile picture and name for users in message history
+                    </label>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </form>
           <div
             class="mx_SettingsSubsection mx_SettingsSubsection_newUi"
           >
@@ -1162,28 +1413,34 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                 class="_root_19upo_16 mx_MediaPreviewAccountSetting_Form"
               >
                 <div
-                  class="mx_SettingsFlag mx_MediaPreviewAccountSetting_ToggleSwitch"
+                  class="_inline-field_19upo_32"
                 >
-                  <span
-                    class="mx_SettingsFlag_label"
+                  <div
+                    class="_inline-field-control_19upo_44"
                   >
                     <div
-                      id="mx_LabelledToggleSwitch_«r8»"
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        class="_input_udcm8_24"
+                        id="_r_24_"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="_r_24_"
                     >
                       Hide avatars of room and inviter
-                    </div>
-                  </span>
-                  <div
-                    aria-checked="false"
-                    aria-disabled="false"
-                    aria-labelledby="mx_LabelledToggleSwitch_«r8»"
-                    class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
-                    role="switch"
-                    tabindex="0"
-                  >
-                    <div
-                      class="mx_ToggleSwitch_ball"
-                    />
+                    </label>
                   </div>
                 </div>
                 <div
@@ -1194,13 +1451,13 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                 >
                   <label
                     class="_label_19upo_59"
-                    for="radix-«r9»"
+                    for="radix-_r_26_"
                   >
                     Show media in timeline
                   </label>
                   <span
                     class="_message_19upo_85 _help-message_19upo_91 mx_MediaPreviewAccountSetting_RadioHelp"
-                    id="radix-«ra»"
+                    id="radix-_r_27_"
                   >
                     A hidden media can always be shown by tapping on it
                   </span>
@@ -1211,15 +1468,15 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                       class="_inline-field-control_19upo_44"
                     >
                       <div
-                        class="_container_1e0uz_10"
+                        class="_container_1qhtc_10"
                       >
                         <input
-                          class="_input_1e0uz_18"
+                          class="_input_1qhtc_18"
                           id="mx_media_previews_off"
                           type="radio"
                         />
                         <div
-                          class="_ui_1e0uz_19"
+                          class="_ui_1qhtc_19"
                         />
                       </div>
                     </div>
@@ -1241,15 +1498,15 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                       class="_inline-field-control_19upo_44"
                     >
                       <div
-                        class="_container_1e0uz_10"
+                        class="_container_1qhtc_10"
                       >
                         <input
-                          class="_input_1e0uz_18"
+                          class="_input_1qhtc_18"
                           id="mx_media_previews_private"
                           type="radio"
                         />
                         <div
-                          class="_ui_1e0uz_19"
+                          class="_ui_1qhtc_19"
                         />
                       </div>
                     </div>
@@ -1271,16 +1528,16 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                       class="_inline-field-control_19upo_44"
                     >
                       <div
-                        class="_container_1e0uz_10"
+                        class="_container_1qhtc_10"
                       >
                         <input
                           checked=""
-                          class="_input_1e0uz_18"
+                          class="_input_1qhtc_18"
                           id="mx_media_previews_on"
                           type="radio"
                         />
                         <div
-                          class="_ui_1e0uz_19"
+                          class="_ui_1qhtc_19"
                         />
                       </div>
                     </div>
@@ -1297,150 +1554,212 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   </div>
                 </div>
               </form>
+              <form
+                class="_root_19upo_16 mx_MediaPreviewAccountSetting_Form"
+              >
+                <div
+                  class="_inline-field_19upo_32 mx_MediaPreviewAccountSetting_ToggleSwitch"
+                >
+                  <div
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="_r_2b_"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="_r_2b_"
+                    >
+                      Allow users to invite you to rooms
+                    </label>
+                    <span
+                      class="_message_19upo_85 _help-message_19upo_91"
+                      id="radix-_r_2d_"
+                    >
+                      Your server does not implement this feature.
+                    </span>
+                  </div>
+                </div>
+              </form>
             </div>
             <div
-              class="_separator_7ckbw_8"
+              class="_separator_cqpyv_8"
               data-kind="primary"
               data-orientation="horizontal"
               role="separator"
             />
           </div>
-          <div
-            class="mx_SettingsSubsection"
+          <form
+            class="_root_19upo_16"
           >
             <div
-              class="mx_SettingsSubsectionHeading"
-            >
-              <h3
-                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-              >
-                Room directory
-              </h3>
-            </div>
-            <div
-              class="mx_SettingsSubsection_content"
+              class="mx_SettingsSubsection"
             >
               <div
-                class="mx_SettingsFlag"
+                class="mx_SettingsSubsectionHeading"
               >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_dJJz3lHUv9XX"
+                <h3
+                  class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
                 >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Show NSFW content
-                  </span>
-                </label>
+                  Room directory
+                </h3>
+              </div>
+              <div
+                class="mx_SettingsSubsection_content"
+              >
                 <div
-                  aria-checked="false"
-                  aria-disabled="true"
-                  aria-label="Show NSFW content"
-                  class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_dJJz3lHUv9XX"
-                  role="switch"
-                  tabindex="0"
+                  class="_inline-field_19upo_32"
                 >
                   <div
-                    class="mx_ToggleSwitch_ball"
-                  />
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_dJJz3lHUv9XX"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_dJJz3lHUv9XX"
+                    >
+                      Show NSFW content
+                    </label>
+                  </div>
                 </div>
               </div>
             </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection"
+          </form>
+          <form
+            class="_root_19upo_16"
           >
             <div
-              class="mx_SettingsSubsectionHeading"
-            >
-              <h3
-                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-              >
-                General
-              </h3>
-            </div>
-            <div
-              class="mx_SettingsSubsection_content mx_SettingsSubsection_contentStretch"
+              class="mx_SettingsSubsection"
             >
               <div
-                class="mx_SettingsFlag"
+                class="mx_SettingsSubsectionHeading"
               >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_SBSSOZDRlzlA"
+                <h3
+                  class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
                 >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Prompt before sending invites to potentially invalid matrix IDs
-                  </span>
-                </label>
+                  General
+                </h3>
+              </div>
+              <div
+                class="mx_SettingsSubsection_content mx_SettingsSubsection_contentStretch"
+              >
                 <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Prompt before sending invites to potentially invalid matrix IDs"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_SBSSOZDRlzlA"
-                  role="switch"
-                  tabindex="0"
+                  class="_inline-field_19upo_32"
                 >
                   <div
-                    class="mx_ToggleSwitch_ball"
+                    class="_inline-field-control_19upo_44"
+                  >
+                    <div
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        disabled=""
+                        id="mx_SettingsFlag_SBSSOZDRlzlA"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="mx_SettingsFlag_SBSSOZDRlzlA"
+                    >
+                      Prompt before sending invites to potentially invalid matrix IDs
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="mx_Field mx_Field_input"
+                >
+                  <input
+                    id="mx_Field_1"
+                    label="Autocomplete delay (ms)"
+                    placeholder="Autocomplete delay (ms)"
+                    type="number"
+                    value="200"
                   />
+                  <label
+                    for="mx_Field_1"
+                  >
+                    Autocomplete delay (ms)
+                  </label>
+                </div>
+                <div
+                  class="mx_Field mx_Field_input"
+                >
+                  <input
+                    id="mx_Field_2"
+                    label="Read Marker lifetime (ms)"
+                    placeholder="Read Marker lifetime (ms)"
+                    type="number"
+                    value="3000"
+                  />
+                  <label
+                    for="mx_Field_2"
+                  >
+                    Read Marker lifetime (ms)
+                  </label>
+                </div>
+                <div
+                  class="mx_Field mx_Field_input"
+                >
+                  <input
+                    id="mx_Field_3"
+                    label="Read Marker off-screen lifetime (ms)"
+                    placeholder="Read Marker off-screen lifetime (ms)"
+                    type="number"
+                    value="30000"
+                  />
+                  <label
+                    for="mx_Field_3"
+                  >
+                    Read Marker off-screen lifetime (ms)
+                  </label>
                 </div>
               </div>
-              <div
-                class="mx_Field mx_Field_input"
-              >
-                <input
-                  id="mx_Field_1"
-                  label="Autocomplete delay (ms)"
-                  placeholder="Autocomplete delay (ms)"
-                  type="number"
-                  value="200"
-                />
-                <label
-                  for="mx_Field_1"
-                >
-                  Autocomplete delay (ms)
-                </label>
-              </div>
-              <div
-                class="mx_Field mx_Field_input"
-              >
-                <input
-                  id="mx_Field_2"
-                  label="Read Marker lifetime (ms)"
-                  placeholder="Read Marker lifetime (ms)"
-                  type="number"
-                  value="3000"
-                />
-                <label
-                  for="mx_Field_2"
-                >
-                  Read Marker lifetime (ms)
-                </label>
-              </div>
-              <div
-                class="mx_Field mx_Field_input"
-              >
-                <input
-                  id="mx_Field_3"
-                  label="Read Marker off-screen lifetime (ms)"
-                  placeholder="Read Marker off-screen lifetime (ms)"
-                  type="number"
-                  value="30000"
-                />
-                <label
-                  for="mx_Field_3"
-                >
-                  Read Marker off-screen lifetime (ms)
-                </label>
-              </div>
             </div>
-          </div>
+          </form>
         </div>
       </div>
     </div>
diff --git a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap
index ffa91ae7b1..2bf0bb846c 100644
--- a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SecurityUserSettingsTab /> renders ignored users 1`] = `
 <ul
@@ -34,8 +34,8 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
     <div
       class="mx_SettingsTab_sections"
     >
-      <div
-        class="mx_SetIntegrationManager"
+      <form
+        class="_root_19upo_16 mx_SetIntegrationManager"
         data-testid="mx_SetIntegrationManager"
       >
         <div
@@ -51,6 +51,7 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
             </h3>
             <h4
               class="mx_Heading_h4"
+              id="mx_SetIntegrationManager_ManagerName"
             >
               (scalar.vector.im)
             </h4>
@@ -58,6 +59,7 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
         </div>
         <div
           class="mx_SettingsSubsection_text"
+          id="mx_SetIntegrationManager_BodyText"
         >
           <span>
             Use an integration manager 
@@ -72,43 +74,39 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
         >
           Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.
         </div>
-        <form
-          class="_root_19upo_16"
+        <div
+          class="_inline-field_19upo_32"
         >
           <div
-            class="_inline-field_19upo_32"
+            class="_inline-field-control_19upo_44"
           >
             <div
-              class="_inline-field-control_19upo_44"
+              class="_container_udcm8_10"
             >
+              <input
+                checked=""
+                class="_input_udcm8_24"
+                id="_r_0_"
+                role="switch"
+                type="checkbox"
+              />
               <div
-                class="_container_19o42_10"
-              >
-                <input
-                  checked=""
-                  class="_input_19o42_24"
-                  id="mx_SetIntegrationManager_Toggle"
-                  role="switch"
-                  type="checkbox"
-                />
-                <div
-                  class="_ui_19o42_34"
-                />
-              </div>
-            </div>
-            <div
-              class="_inline-field-body_19upo_38"
-            >
-              <label
-                class="_label_19upo_59"
-                for="mx_SetIntegrationManager_Toggle"
-              >
-                Enable the integration manager
-              </label>
+                class="_ui_udcm8_34"
+              />
             </div>
           </div>
-        </form>
-      </div>
+          <div
+            class="_inline-field-body_19upo_38"
+          >
+            <label
+              class="_label_19upo_59"
+              for="_r_0_"
+            >
+              Enable the integration manager
+            </label>
+          </div>
+        </div>
+      </form>
       <div
         class="mx_SettingsSection"
       >
@@ -142,14 +140,26 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
                   Element can't securely cache encrypted messages locally while running in a web browser. Use 
                   <a
                     class="mx_ExternalLink"
-                    href="https://element.io/get-started"
+                    href="https://element.io/download"
                     rel="noreferrer noopener"
                     target="_blank"
                   >
                     Element Desktop
-                    <i
+                    <svg
                       class="mx_ExternalLink_icon"
-                    />
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+                      />
+                      <path
+                        d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+                      />
+                    </svg>
                   </a>
                    for encrypted messages to appear in search results.
                 </span>
@@ -213,7 +223,7 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
                     >
                       <label
                         class="_label_19upo_59"
-                        for="radix-«r1»"
+                        for="radix-_r_2_"
                       >
                         Enter a new identity server
                       </label>
@@ -222,7 +232,7 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
                       >
                         <input
                           class="_control_sqdq4_10"
-                          id="radix-«r1»"
+                          id="radix-_r_2_"
                           name="input"
                           placeholder=""
                           title=""
diff --git a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/SessionManagerTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/SessionManagerTab-test.tsx.snap
index c417e39156..2f7bec39d5 100644
--- a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/SessionManagerTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/SessionManagerTab-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SessionManagerTab /> Device verification does not allow device verification on session that do not support encryption 1`] = `
 HTMLCollection [
@@ -8,10 +8,17 @@ HTMLCollection [
     <div
       class="mx_DeviceSecurityCard_icon Unverified"
     >
-      <div
+      <svg
+        fill="currentColor"
         height="16"
+        viewBox="0 0 24 24"
         width="16"
-      />
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+        />
+      </svg>
     </div>
     <div
       class="mx_DeviceSecurityCard_content"
@@ -123,11 +130,22 @@ exports[`<SessionManagerTab /> current session section renders current session s
             role="img"
           />
         </div>
-        <div
+        <svg
           aria-label="Verified"
           class="mx_DeviceTypeIcon_verificationIcon verified"
+          fill="currentColor"
+          height="1em"
           role="img"
-        />
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            clip-rule="evenodd"
+            d="M11.106 2.447a2 2 0 0 1 1.789 0l6 3A2 2 0 0 1 20 7.237V12c0 6.742-5.773 9.246-7.51 9.846-.32.111-.66.111-.98 0C9.774 21.246 4 18.743 4 12V7.236a2 2 0 0 1 1.105-1.789zm4.601 6.846a1 1 0 0 0-1.414 0L11 12.586l-1.293-1.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0 0-1.414"
+            fill-rule="evenodd"
+          />
+        </svg>
       </div>
       <div
         class="mx_DeviceTile_info"
@@ -185,10 +203,19 @@ exports[`<SessionManagerTab /> current session section renders current session s
       <div
         class="mx_DeviceSecurityCard_icon Verified"
       >
-        <div
+        <svg
+          fill="currentColor"
           height="16"
+          viewBox="0 0 24 24"
           width="16"
-        />
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            clip-rule="evenodd"
+            d="M11.106 2.447a2 2 0 0 1 1.789 0l6 3A2 2 0 0 1 20 7.237V12c0 6.742-5.773 9.246-7.51 9.846-.32.111-.66.111-.98 0C9.774 21.246 4 18.743 4 12V7.236a2 2 0 0 1 1.105-1.789zm4.601 6.846a1 1 0 0 0-1.414 0L11 12.586l-1.293-1.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0 0-1.414"
+            fill-rule="evenodd"
+          />
+        </svg>
       </div>
       <div
         class="mx_DeviceSecurityCard_content"
@@ -271,11 +298,20 @@ exports[`<SessionManagerTab /> current session section renders current session s
             role="img"
           />
         </div>
-        <div
+        <svg
           aria-label="Unverified"
           class="mx_DeviceTypeIcon_verificationIcon unverified"
+          fill="currentColor"
+          height="1em"
           role="img"
-        />
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+          />
+        </svg>
       </div>
       <div
         class="mx_DeviceTile_info"
@@ -333,10 +369,17 @@ exports[`<SessionManagerTab /> current session section renders current session s
       <div
         class="mx_DeviceSecurityCard_icon Unverified"
       >
-        <div
+        <svg
+          fill="currentColor"
           height="16"
+          viewBox="0 0 24 24"
           width="16"
-        />
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+          />
+        </svg>
       </div>
       <div
         class="mx_DeviceSecurityCard_content"
@@ -393,18 +436,18 @@ exports[`<SessionManagerTab /> goes to filtered list from security recommendatio
           class="_inline-field-control_19upo_44"
         >
           <div
-            class="_container_1hel1_10"
+            class="_container_1md5v_10"
           >
             <input
               aria-label="Select all"
-              aria-labelledby="«r4q»"
-              class="_input_1hel1_18"
+              aria-labelledby="_r_4q_"
+              class="_input_1md5v_18"
               data-testid="device-select-all-checkbox"
               id="device-select-all-checkbox"
               type="checkbox"
             />
             <div
-              class="_ui_1hel1_19"
+              class="_ui_1md5v_19"
             >
               <svg
                 aria-hidden="true"
@@ -451,9 +494,18 @@ exports[`<SessionManagerTab /> goes to filtered list from security recommendatio
       >
         Show: Unverified
       </div>
-      <span
+      <svg
         class="mx_Dropdown_arrow"
-      />
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+        />
+      </svg>
     </div>
   </div>
 </div>
diff --git a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/SidebarUserSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/SidebarUserSettingsTab-test.tsx.snap
index 0557761e2b..891213fe1b 100644
--- a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/SidebarUserSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/SidebarUserSettingsTab-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url 1`] = `
 <div>
@@ -48,18 +48,18 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                     class="_inline-field-control_19upo_44"
                   >
                     <div
-                      class="_container_1hel1_10"
+                      class="_container_1md5v_10"
                     >
                       <input
-                        aria-describedby="«r1»"
+                        aria-describedby="_r_1_"
                         checked=""
-                        class="_input_1hel1_18"
+                        class="_input_1md5v_18"
                         disabled=""
                         id="checkbox_vY7Q4uEh9K"
                         type="checkbox"
                       />
                       <div
-                        class="_ui_1hel1_19"
+                        class="_ui_1md5v_19"
                       >
                         <svg
                           aria-hidden="true"
@@ -99,7 +99,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id="«r1»"
+                      id="_r_1_"
                     >
                       Home is useful for getting an overview of everything.
                     </span>
@@ -116,17 +116,17 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                     class="_inline-field-control_19upo_44"
                   >
                     <div
-                      class="_container_1hel1_10"
+                      class="_container_1md5v_10"
                     >
                       <input
-                        aria-describedby="«r5»"
-                        class="_input_1hel1_18"
+                        aria-describedby="_r_5_"
+                        class="_input_1md5v_18"
                         data-testid="mx_SidebarUserSettingsTab_homeAllRoomsCheckbox"
                         id="checkbox_38QgU2Pomx"
                         type="checkbox"
                       />
                       <div
-                        class="_ui_1hel1_19"
+                        class="_ui_1md5v_19"
                       >
                         <svg
                           aria-hidden="true"
@@ -154,7 +154,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id="«r5»"
+                      id="_r_5_"
                     >
                       Show all your rooms in Home, even if they're in a space.
                     </span>
@@ -171,16 +171,16 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                     class="_inline-field-control_19upo_44"
                   >
                     <div
-                      class="_container_1hel1_10"
+                      class="_container_1md5v_10"
                     >
                       <input
-                        aria-describedby="«r9»"
-                        class="_input_1hel1_18"
+                        aria-describedby="_r_9_"
+                        class="_input_1md5v_18"
                         id="checkbox_wKpa6hpi3Y"
                         type="checkbox"
                       />
                       <div
-                        class="_ui_1hel1_19"
+                        class="_ui_1md5v_19"
                       >
                         <svg
                           aria-hidden="true"
@@ -204,25 +204,13 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                       class="_label_19upo_59"
                       for="checkbox_wKpa6hpi3Y"
                     >
-                      <svg
-                        class="mx_SidebarUserSettingsTab_icon"
-                        fill="currentColor"
-                        height="1em"
-                        viewBox="0 0 24 24"
-                        width="1em"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          d="m12.897 2.817 2.336 4.733 5.223.76a1 1 0 0 1 .555 1.705L17.23 13.7l.892 5.202a1 1 0 0 1-1.45 1.054L12 17.5l-4.672 2.456a1 1 0 0 1-1.451-1.054l.892-5.202-3.78-3.685a1 1 0 0 1 .555-1.706l5.223-.759 2.336-4.733a1 1 0 0 1 1.794 0"
-                        />
-                      </svg>
-                      Favourites
+                      Rooms outside of a space
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id="«r9»"
+                      id="_r_9_"
                     >
-                      Group all your favourite rooms and people in one place.
+                      Group all your rooms that aren't part of a space in one place.
                     </span>
                   </div>
                 </div>
@@ -237,16 +225,16 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                     class="_inline-field-control_19upo_44"
                   >
                     <div
-                      class="_container_1hel1_10"
+                      class="_container_1md5v_10"
                     >
                       <input
-                        aria-describedby="«rd»"
-                        class="_input_1hel1_18"
+                        aria-describedby="_r_d_"
+                        class="_input_1md5v_18"
                         id="checkbox_EetmBG4yVC"
                         type="checkbox"
                       />
                       <div
-                        class="_ui_1hel1_19"
+                        class="_ui_1md5v_19"
                       >
                         <svg
                           aria-hidden="true"
@@ -269,129 +257,6 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                     <label
                       class="_label_19upo_59"
                       for="checkbox_EetmBG4yVC"
-                    >
-                      <svg
-                        class="mx_SidebarUserSettingsTab_icon"
-                        fill="currentColor"
-                        height="1em"
-                        viewBox="0 0 24 24"
-                        width="1em"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          d="M12 15q-1.65 0-2.825-1.175T8 11t1.175-2.825T12 7t2.825 1.175T16 11t-1.175 2.825T12 15"
-                        />
-                        <path
-                          d="M19.528 18.583A9.96 9.96 0 0 0 22 12c0-5.523-4.477-10-10-10S2 6.477 2 12c0 2.52.933 4.824 2.472 6.583A9.98 9.98 0 0 0 12 22a9.98 9.98 0 0 0 7.528-3.417M8.75 16.388q-1.373.332-2.709.95a8 8 0 1 1 11.918 0 14.7 14.7 0 0 0-2.709-.95A13.8 13.8 0 0 0 12 16q-1.65 0-3.25.387"
-                        />
-                      </svg>
-                      People
-                    </label>
-                    <span
-                      class="_message_19upo_85 _help-message_19upo_91"
-                      id="«rd»"
-                    >
-                      Group all your people in one place.
-                    </span>
-                  </div>
-                </div>
-              </form>
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32 mx_SidebarUserSettingsTab_checkbox"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        aria-describedby="«rh»"
-                        class="_input_1hel1_18"
-                        id="checkbox_eEefiPqpMR"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_eEefiPqpMR"
-                    >
-                      Rooms outside of a space
-                    </label>
-                    <span
-                      class="_message_19upo_85 _help-message_19upo_91"
-                      id="«rh»"
-                    >
-                      Group all your rooms that aren't part of a space in one place.
-                    </span>
-                  </div>
-                </div>
-              </form>
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32 mx_SidebarUserSettingsTab_checkbox"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        aria-describedby="«rl»"
-                        class="_input_1hel1_18"
-                        id="checkbox_MwbPDmfGtm"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_MwbPDmfGtm"
                     >
                       <svg
                         class="mx_SidebarUserSettingsTab_icon"
@@ -409,7 +274,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id="«rl»"
+                      id="_r_d_"
                     >
                       Group all private video rooms and conferences. In conferences you can invite people outside of matrix.
                     </span>
@@ -473,18 +338,18 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                     class="_inline-field-control_19upo_44"
                   >
                     <div
-                      class="_container_1hel1_10"
+                      class="_container_1md5v_10"
                     >
                       <input
-                        aria-describedby="«rp»"
+                        aria-describedby="_r_h_"
                         checked=""
-                        class="_input_1hel1_18"
+                        class="_input_1md5v_18"
                         disabled=""
                         id="checkbox_vY7Q4uEh9K"
                         type="checkbox"
                       />
                       <div
-                        class="_ui_1hel1_19"
+                        class="_ui_1md5v_19"
                       >
                         <svg
                           aria-hidden="true"
@@ -524,7 +389,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id="«rp»"
+                      id="_r_h_"
                     >
                       Home is useful for getting an overview of everything.
                     </span>
@@ -541,17 +406,17 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                     class="_inline-field-control_19upo_44"
                   >
                     <div
-                      class="_container_1hel1_10"
+                      class="_container_1md5v_10"
                     >
                       <input
-                        aria-describedby="«rt»"
-                        class="_input_1hel1_18"
+                        aria-describedby="_r_l_"
+                        class="_input_1md5v_18"
                         data-testid="mx_SidebarUserSettingsTab_homeAllRoomsCheckbox"
                         id="checkbox_38QgU2Pomx"
                         type="checkbox"
                       />
                       <div
-                        class="_ui_1hel1_19"
+                        class="_ui_1md5v_19"
                       >
                         <svg
                           aria-hidden="true"
@@ -579,7 +444,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id="«rt»"
+                      id="_r_l_"
                     >
                       Show all your rooms in Home, even if they're in a space.
                     </span>
@@ -596,16 +461,16 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                     class="_inline-field-control_19upo_44"
                   >
                     <div
-                      class="_container_1hel1_10"
+                      class="_container_1md5v_10"
                     >
                       <input
-                        aria-describedby="«r11»"
-                        class="_input_1hel1_18"
+                        aria-describedby="_r_p_"
+                        class="_input_1md5v_18"
                         id="checkbox_wKpa6hpi3Y"
                         type="checkbox"
                       />
                       <div
-                        class="_ui_1hel1_19"
+                        class="_ui_1md5v_19"
                       >
                         <svg
                           aria-hidden="true"
@@ -629,25 +494,13 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                       class="_label_19upo_59"
                       for="checkbox_wKpa6hpi3Y"
                     >
-                      <svg
-                        class="mx_SidebarUserSettingsTab_icon"
-                        fill="currentColor"
-                        height="1em"
-                        viewBox="0 0 24 24"
-                        width="1em"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          d="m12.897 2.817 2.336 4.733 5.223.76a1 1 0 0 1 .555 1.705L17.23 13.7l.892 5.202a1 1 0 0 1-1.45 1.054L12 17.5l-4.672 2.456a1 1 0 0 1-1.451-1.054l.892-5.202-3.78-3.685a1 1 0 0 1 .555-1.706l5.223-.759 2.336-4.733a1 1 0 0 1 1.794 0"
-                        />
-                      </svg>
-                      Favourites
+                      Rooms outside of a space
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id="«r11»"
+                      id="_r_p_"
                     >
-                      Group all your favourite rooms and people in one place.
+                      Group all your rooms that aren't part of a space in one place.
                     </span>
                   </div>
                 </div>
@@ -662,16 +515,16 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                     class="_inline-field-control_19upo_44"
                   >
                     <div
-                      class="_container_1hel1_10"
+                      class="_container_1md5v_10"
                     >
                       <input
-                        aria-describedby="«r15»"
-                        class="_input_1hel1_18"
+                        aria-describedby="_r_t_"
+                        class="_input_1md5v_18"
                         id="checkbox_EetmBG4yVC"
                         type="checkbox"
                       />
                       <div
-                        class="_ui_1hel1_19"
+                        class="_ui_1md5v_19"
                       >
                         <svg
                           aria-hidden="true"
@@ -694,129 +547,6 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                     <label
                       class="_label_19upo_59"
                       for="checkbox_EetmBG4yVC"
-                    >
-                      <svg
-                        class="mx_SidebarUserSettingsTab_icon"
-                        fill="currentColor"
-                        height="1em"
-                        viewBox="0 0 24 24"
-                        width="1em"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          d="M12 15q-1.65 0-2.825-1.175T8 11t1.175-2.825T12 7t2.825 1.175T16 11t-1.175 2.825T12 15"
-                        />
-                        <path
-                          d="M19.528 18.583A9.96 9.96 0 0 0 22 12c0-5.523-4.477-10-10-10S2 6.477 2 12c0 2.52.933 4.824 2.472 6.583A9.98 9.98 0 0 0 12 22a9.98 9.98 0 0 0 7.528-3.417M8.75 16.388q-1.373.332-2.709.95a8 8 0 1 1 11.918 0 14.7 14.7 0 0 0-2.709-.95A13.8 13.8 0 0 0 12 16q-1.65 0-3.25.387"
-                        />
-                      </svg>
-                      People
-                    </label>
-                    <span
-                      class="_message_19upo_85 _help-message_19upo_91"
-                      id="«r15»"
-                    >
-                      Group all your people in one place.
-                    </span>
-                  </div>
-                </div>
-              </form>
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32 mx_SidebarUserSettingsTab_checkbox"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        aria-describedby="«r19»"
-                        class="_input_1hel1_18"
-                        id="checkbox_eEefiPqpMR"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_eEefiPqpMR"
-                    >
-                      Rooms outside of a space
-                    </label>
-                    <span
-                      class="_message_19upo_85 _help-message_19upo_91"
-                      id="«r19»"
-                    >
-                      Group all your rooms that aren't part of a space in one place.
-                    </span>
-                  </div>
-                </div>
-              </form>
-              <form
-                class="_root_19upo_16"
-              >
-                <div
-                  class="_inline-field_19upo_32 mx_SidebarUserSettingsTab_checkbox"
-                >
-                  <div
-                    class="_inline-field-control_19upo_44"
-                  >
-                    <div
-                      class="_container_1hel1_10"
-                    >
-                      <input
-                        aria-describedby="«r1d»"
-                        class="_input_1hel1_18"
-                        id="checkbox_MwbPDmfGtm"
-                        type="checkbox"
-                      />
-                      <div
-                        class="_ui_1hel1_19"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          fill="currentColor"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M9.55 17.575q-.2 0-.375-.062a.9.9 0 0 1-.325-.213L4.55 13q-.274-.274-.262-.713.012-.437.287-.712a.95.95 0 0 1 .7-.275q.425 0 .7.275L9.55 15.15l8.475-8.475q.274-.275.713-.275.437 0 .712.275.275.274.275.713 0 .437-.275.712l-9.2 9.2q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="_inline-field-body_19upo_38"
-                  >
-                    <label
-                      class="_label_19upo_59"
-                      for="checkbox_MwbPDmfGtm"
                     >
                       <svg
                         class="mx_SidebarUserSettingsTab_icon"
@@ -834,7 +564,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id="«r1d»"
+                      id="_r_t_"
                     >
                       Group all private video rooms and conferences.
                     </span>
diff --git a/test/unit-tests/components/views/spaces/QuickSettingsButton-test.tsx b/test/unit-tests/components/views/spaces/QuickSettingsButton-test.tsx
index af3fe770ff..7ca3d573bb 100644
--- a/test/unit-tests/components/views/spaces/QuickSettingsButton-test.tsx
+++ b/test/unit-tests/components/views/spaces/QuickSettingsButton-test.tsx
@@ -28,7 +28,7 @@ describe("QuickSettingsButton", () => {
 
     const openQuickSettings = async () => {
         await userEvent.click(getQuickSettingsButton());
-        await screen.findByText("Quick settings");
+        await screen.findByRole("heading", { name: "Quick settings" });
     };
 
     it("should render the quick settings button", () => {
diff --git a/test/unit-tests/components/views/spaces/SpaceCreateMenu-test.tsx b/test/unit-tests/components/views/spaces/SpaceCreateMenu-test.tsx
new file mode 100644
index 0000000000..ad8c3ad86e
--- /dev/null
+++ b/test/unit-tests/components/views/spaces/SpaceCreateMenu-test.tsx
@@ -0,0 +1,121 @@
+/*
+Copyright 2024 New Vector Ltd.
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { render, cleanup } from "jest-matrix-react";
+import { type MatrixClient } from "matrix-js-sdk/src/matrix";
+import userEvent from "@testing-library/user-event";
+import { MatrixError } from "matrix-js-sdk/src/matrix";
+import { type MockedObject } from "jest-mock";
+
+import SpaceCreateMenu from "../../../../../src/components/views/spaces/SpaceCreateMenu";
+import {
+    getMockClientWithEventEmitter,
+    mockClientMethodsRooms,
+    mockClientMethodsServer,
+    mockClientMethodsUser,
+    withClientContextRenderOptions,
+} from "../../../../test-utils";
+import { UIFeature } from "../../../../../src/settings/UIFeature";
+import SettingsStore from "../../../../../src/settings/SettingsStore";
+
+describe("<SpaceCreateMenu />", () => {
+    let client: MockedObject<MatrixClient>;
+
+    beforeEach(() => {
+        client = getMockClientWithEventEmitter({
+            ...mockClientMethodsUser(),
+            ...mockClientMethodsServer(),
+            ...mockClientMethodsRooms(),
+            createRoom: jest.fn(),
+            getRoomIdForAlias: jest.fn().mockImplementation(async () => {
+                throw new MatrixError({ errcode: "M_NOT_FOUND", error: "Test says no alias found" }, 404);
+            }),
+        });
+    });
+
+    afterEach(() => {
+        cleanup();
+        jest.restoreAllMocks();
+    });
+
+    it("should render", async () => {
+        const { asFragment } = render(
+            <SpaceCreateMenu onFinished={jest.fn()} />,
+            withClientContextRenderOptions(client),
+        );
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should be able to create a public space", async () => {
+        const onFinished = jest.fn();
+        client.createRoom.mockResolvedValue({ room_id: "!room:id" });
+        const { getByText, getByLabelText } = render(
+            <SpaceCreateMenu onFinished={onFinished} />,
+            withClientContextRenderOptions(client),
+        );
+        await userEvent.click(getByText("Public"));
+        await userEvent.type(getByLabelText("Name"), "My Name");
+        await userEvent.type(getByLabelText("Address"), "foobar");
+        await userEvent.type(getByLabelText("Description"), "A description");
+        await userEvent.click(getByText("Create"));
+        expect(onFinished).toHaveBeenCalledTimes(1);
+        expect(client.createRoom).toHaveBeenCalledWith({
+            creation_content: { type: "m.space" },
+            initial_state: [
+                { content: { guest_access: "can_join" }, state_key: "", type: "m.room.guest_access" },
+                { content: { history_visibility: "world_readable" }, type: "m.room.history_visibility" },
+            ],
+            name: "My Name",
+            power_level_content_override: {
+                events_default: 100,
+                invite: 0,
+            },
+            preset: "public_chat",
+            room_alias_name: "my-namefoobar",
+            topic: "A description",
+            visibility: "private",
+        });
+    });
+
+    it("should be prompted to automatically create a private space when configured", async () => {
+        const realGetValue = SettingsStore.getValue;
+        jest.spyOn(SettingsStore, "getValue").mockImplementation((name, roomId) => {
+            if (name === UIFeature.AllowCreatingPublicSpaces) {
+                return false;
+            }
+            return realGetValue(name, roomId);
+        });
+        const onFinished = jest.fn();
+        client.createRoom.mockResolvedValue({ room_id: "!room:id" });
+        const { getByText, getByLabelText } = render(
+            <SpaceCreateMenu onFinished={onFinished} />,
+            withClientContextRenderOptions(client),
+        );
+        await userEvent.type(getByLabelText("Name"), "My Name");
+        await userEvent.type(getByLabelText("Description"), "A description");
+        await userEvent.click(getByText("Create"));
+        expect(onFinished).toHaveBeenCalledTimes(1);
+        expect(client.createRoom).toHaveBeenCalledWith({
+            creation_content: { type: "m.space" },
+            initial_state: [
+                { content: { guest_access: "can_join" }, state_key: "", type: "m.room.guest_access" },
+                { content: { history_visibility: "invited" }, type: "m.room.history_visibility" },
+            ],
+            name: "My Name",
+            power_level_content_override: {
+                events_default: 100,
+                invite: 50,
+            },
+            room_alias_name: undefined,
+            preset: "private_chat",
+            topic: "A description",
+            visibility: "private",
+        });
+    });
+});
diff --git a/test/unit-tests/components/views/spaces/SpaceSettingsVisibilityTab-test.tsx b/test/unit-tests/components/views/spaces/SpaceSettingsVisibilityTab-test.tsx
index a8b4dd895c..c73fc861d8 100644
--- a/test/unit-tests/components/views/spaces/SpaceSettingsVisibilityTab-test.tsx
+++ b/test/unit-tests/components/views/spaces/SpaceSettingsVisibilityTab-test.tsx
@@ -150,7 +150,7 @@ describe("<SpaceSettingsVisibilityTab />", () => {
                 await toggleGuestAccessSection(component);
                 const guestAccessInput = getGuestAccessToggle(component);
 
-                expect(guestAccessInput?.getAttribute("aria-checked")).toEqual("true");
+                expect(guestAccessInput).toBeChecked();
 
                 fireEvent.click(guestAccessInput!);
                 expect(mockMatrixClient.sendStateEvent).toHaveBeenCalledWith(
@@ -162,7 +162,7 @@ describe("<SpaceSettingsVisibilityTab />", () => {
                 );
 
                 // toggled off
-                expect(guestAccessInput?.getAttribute("aria-checked")).toEqual("false");
+                expect(guestAccessInput).not.toBeChecked();
             });
 
             it("renders error message when update fails", async () => {
@@ -184,7 +184,7 @@ describe("<SpaceSettingsVisibilityTab />", () => {
 
                 await toggleGuestAccessSection(component);
 
-                expect(getGuestAccessToggle(component)?.getAttribute("aria-disabled")).toEqual("true");
+                expect(getGuestAccessToggle(component)).toBeDisabled();
             });
         });
 
@@ -194,7 +194,7 @@ describe("<SpaceSettingsVisibilityTab />", () => {
                 const component = getComponent({ space });
 
                 // toggle off because space settings is != WorldReadable
-                expect(getHistoryVisibilityToggle(component)?.getAttribute("aria-checked")).toEqual("false");
+                expect(getHistoryVisibilityToggle(component)).not.toBeChecked();
             });
 
             it("updates history visibility on toggle", () => {
@@ -202,7 +202,7 @@ describe("<SpaceSettingsVisibilityTab />", () => {
                 const component = getComponent({ space });
 
                 // toggle off because space settings is != WorldReadable
-                expect(getHistoryVisibilityToggle(component)?.getAttribute("aria-checked")).toEqual("false");
+                expect(getHistoryVisibilityToggle(component)).not.toBeChecked();
 
                 fireEvent.click(getHistoryVisibilityToggle(component)!);
                 expect(mockMatrixClient.sendStateEvent).toHaveBeenCalledWith(
@@ -212,7 +212,7 @@ describe("<SpaceSettingsVisibilityTab />", () => {
                     "",
                 );
 
-                expect(getHistoryVisibilityToggle(component)?.getAttribute("aria-checked")).toEqual("true");
+                expect(getHistoryVisibilityToggle(component)).toBeChecked();
             });
 
             it("renders error message when history update fails", async () => {
@@ -231,7 +231,7 @@ describe("<SpaceSettingsVisibilityTab />", () => {
                 const space = makeMockSpace(mockMatrixClient, joinRule, guestRule, historyRule);
                 (space.currentState.maySendStateEvent as jest.Mock).mockReturnValue(false);
                 const component = getComponent({ space });
-                expect(getHistoryVisibilityToggle(component)?.getAttribute("aria-disabled")).toEqual("true");
+                expect(getHistoryVisibilityToggle(component)).toBeDisabled();
             });
         });
 
diff --git a/test/unit-tests/components/views/spaces/SpaceTreeLevel-test.tsx b/test/unit-tests/components/views/spaces/SpaceTreeLevel-test.tsx
index c46b9681a9..2dd6ac5016 100644
--- a/test/unit-tests/components/views/spaces/SpaceTreeLevel-test.tsx
+++ b/test/unit-tests/components/views/spaces/SpaceTreeLevel-test.tsx
@@ -8,13 +8,14 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import { fireEvent, getByTestId, render } from "jest-matrix-react";
+import { mocked } from "jest-mock";
 
 import { mkRoom, stubClient } from "../../../../test-utils";
 import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
 import DMRoomMap from "../../../../../src/utils/DMRoomMap";
 import defaultDispatcher from "../../../../../src/dispatcher/dispatcher";
 import { Action } from "../../../../../src/dispatcher/actions";
-import { SpaceButton } from "../../../../../src/components/views/spaces/SpaceTreeLevel";
+import { SpaceItem, SpaceButton } from "../../../../../src/components/views/spaces/SpaceTreeLevel";
 import { MetaSpace, type SpaceKey } from "../../../../../src/stores/spaces";
 import SpaceStore from "../../../../../src/stores/spaces/SpaceStore";
 import { StaticNotificationState } from "../../../../../src/stores/notifications/StaticNotificationState";
@@ -26,6 +27,8 @@ jest.mock("../../../../../src/stores/spaces/SpaceStore", () => {
     class MockSpaceStore extends EventEmitter {
         activeSpace: SpaceKey = "!space1";
         setActiveSpace = jest.fn();
+        getChildSpaces = jest.fn();
+        getNotificationState = jest.fn();
     }
 
     return { instance: new MockSpaceStore() };
@@ -127,3 +130,28 @@ describe("SpaceButton", () => {
         });
     });
 });
+
+describe("SpaceItem", () => {
+    const cli = stubClient();
+    const space = mkRoom(cli, "!1:example.org");
+    space.name = "Root Space";
+    const subspace = mkRoom(cli, "!2:example.org");
+    subspace.name = "Subspace";
+
+    it("should render a space with subspaces", () => {
+        mocked(SpaceStore.instance.getChildSpaces).mockImplementation((spaceId) =>
+            spaceId === space.roomId ? [subspace] : [],
+        );
+
+        const { asFragment, queryByText, getByLabelText } = render(<SpaceItem space={space} activeSpaces={[]} />);
+
+        expect(queryByText("Root Space")).toBeVisible();
+        expect(queryByText("Subspace")).toBeNull();
+        expect(asFragment()).toMatchSnapshot();
+
+        fireEvent.click(getByLabelText("Expand"));
+        expect(queryByText("Root Space")).toBeVisible();
+        expect(queryByText("Subspace")).toBeVisible();
+        expect(asFragment()).toMatchSnapshot();
+    });
+});
diff --git a/test/unit-tests/components/views/spaces/ThreadsActivityCentre-test.tsx b/test/unit-tests/components/views/spaces/ThreadsActivityCentre-test.tsx
index ed03dc6012..2e722eea3d 100644
--- a/test/unit-tests/components/views/spaces/ThreadsActivityCentre-test.tsx
+++ b/test/unit-tests/components/views/spaces/ThreadsActivityCentre-test.tsx
@@ -17,9 +17,6 @@ import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext
 import { stubClient } from "../../../../test-utils";
 import { populateThread } from "../../../../test-utils/threads";
 import DMRoomMap from "../../../../../src/utils/DMRoomMap";
-import SettingsStore from "../../../../../src/settings/SettingsStore";
-import { SettingLevel } from "../../../../../src/settings/SettingLevel";
-import { Features } from "../../../../../src/settings/Settings.tsx";
 
 describe("ThreadsActivityCentre", () => {
     const getTACButton = () => {
@@ -92,44 +89,11 @@ describe("ThreadsActivityCentre", () => {
         );
     });
 
-    beforeEach(async () => {
-        await SettingsStore.setValue(Features.ReleaseAnnouncement, null, SettingLevel.DEVICE, false);
-    });
-
     it("should render the threads activity centre button", async () => {
         renderTAC();
         expect(getTACButton()).toBeInTheDocument();
     });
 
-    it("should render the release announcement", async () => {
-        // Enable release announcement
-        await SettingsStore.setValue(Features.ReleaseAnnouncement, null, SettingLevel.DEVICE, true);
-
-        renderTAC();
-        expect(document.body).toMatchSnapshot();
-    });
-
-    it("should render not display the tooltip when the release announcement is displayed", async () => {
-        // Enable release announcement
-        await SettingsStore.setValue(Features.ReleaseAnnouncement, null, SettingLevel.DEVICE, true);
-
-        renderTAC();
-
-        // The tooltip should not be displayed
-        await userEvent.hover(getTACButton());
-        expect(screen.queryByRole("tooltip")).toBeNull();
-    });
-
-    it("should close the release announcement when the TAC button is clicked", async () => {
-        // Enable release announcement
-        await SettingsStore.setValue(Features.ReleaseAnnouncement, null, SettingLevel.DEVICE, true);
-
-        renderTAC();
-        await userEvent.click(getTACButton());
-        expect(getTACMenu()).toBeInTheDocument();
-        expect(document.body).toMatchSnapshot();
-    });
-
     it("should render the threads activity centre button and the display label", async () => {
         const { container } = renderTAC({ displayButtonLabel: true });
         expect(getTACButton()).toBeInTheDocument();
diff --git a/test/unit-tests/components/views/spaces/__snapshots__/AddExistingToSpaceDialog-test.tsx.snap b/test/unit-tests/components/views/spaces/__snapshots__/AddExistingToSpaceDialog-test.tsx.snap
index c3d3134e68..0019095223 100644
--- a/test/unit-tests/components/views/spaces/__snapshots__/AddExistingToSpaceDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/spaces/__snapshots__/AddExistingToSpaceDialog-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<AddExistingToSpaceDialog /> looks as expected 1`] = `
 <DocumentFragment>
@@ -13,6 +13,7 @@ exports[`<AddExistingToSpaceDialog /> looks as expected 1`] = `
     class="mx_AddExistingToSpaceDialog"
     data-focus-lock-disabled="false"
     role="dialog"
+    tabindex="-1"
   >
     <div
       class="mx_Dialog_header"
@@ -26,7 +27,7 @@ exports[`<AddExistingToSpaceDialog /> looks as expected 1`] = `
         >
           <span
             aria-label="Avatar"
-            class="_avatar_1qbcf_8 mx_BaseAvatar"
+            class="_avatar_zysgz_8 mx_BaseAvatar"
             data-color="2"
             data-testid="avatar-img"
             data-type="square"
@@ -34,7 +35,7 @@ exports[`<AddExistingToSpaceDialog /> looks as expected 1`] = `
           >
             <img
               alt=""
-              class="_image_1qbcf_41"
+              class="_image_zysgz_43"
               data-type="square"
               height="40px"
               loading="lazy"
@@ -74,7 +75,19 @@ exports[`<AddExistingToSpaceDialog /> looks as expected 1`] = `
           class="mx_AccessibleButton mx_SearchBox_closeButton"
           role="button"
           tabindex="-1"
-        />
+        >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
+            />
+          </svg>
+        </div>
       </div>
       <div
         class="mx_AutoHideScrollbar mx_AddExistingToSpace_content"
diff --git a/test/unit-tests/components/views/spaces/__snapshots__/QuickSettingsButton-test.tsx.snap b/test/unit-tests/components/views/spaces/__snapshots__/QuickSettingsButton-test.tsx.snap
index fa2f4ca481..da465e2ee9 100644
--- a/test/unit-tests/components/views/spaces/__snapshots__/QuickSettingsButton-test.tsx.snap
+++ b/test/unit-tests/components/views/spaces/__snapshots__/QuickSettingsButton-test.tsx.snap
@@ -1,15 +1,38 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`QuickSettingsButton should render the quick settings button in expanded mode 1`] = `
 <DocumentFragment>
-  <div
+  <button
     aria-expanded="true"
     aria-label="Quick settings"
-    class="mx_AccessibleButton mx_QuickSettingsButton expanded"
+    class="_icon-button_1pz9o_8 mx_QuickSettingsButton expanded"
+    data-kind="primary"
     role="button"
+    style="--cpd-icon-button-size: 32px;"
     tabindex="0"
   >
-    Settings
-  </div>
+    <div
+      class="_indicator-icon_147l5_17"
+      style="--cpd-icon-button-size: 100%;"
+    >
+      <svg
+        fill="currentColor"
+        height="1em"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12.731 2C13.432 2 14 2.568 14 3.269c0 .578.396 1.074.935 1.286q.128.052.253.106c.531.23 1.162.16 1.572-.25a1.27 1.27 0 0 1 1.794 0l1.034 1.035a1.27 1.27 0 0 1 0 1.794c-.41.41-.48 1.04-.248 1.572l.105.253c.212.539.708.935 1.286.935.701 0 1.269.568 1.269 1.269v1.462c0 .701-.568 1.269-1.269 1.269-.578 0-1.074.396-1.287.935q-.05.128-.104.253c-.232.531-.161 1.162.248 1.572a1.27 1.27 0 0 1 0 1.794l-1.034 1.034a1.27 1.27 0 0 1-1.794 0c-.41-.41-1.04-.48-1.572-.248a8 8 0 0 1-.253.105c-.539.212-.935.708-.935 1.286 0 .701-.568 1.269-1.269 1.269H11.27c-.702 0-1.27-.568-1.27-1.269 0-.578-.396-1.074-.935-1.287a8 8 0 0 1-.253-.104c-.531-.232-1.162-.161-1.572.248a1.27 1.27 0 0 1-1.794 0l-1.034-1.034a1.27 1.27 0 0 1 0-1.794c.41-.41.48-1.04.249-1.572a8 8 0 0 1-.106-.253C4.343 14.396 3.847 14 3.27 14 2.568 14 2 13.432 2 12.731V11.27c0-.702.568-1.27 1.269-1.27.578 0 1.074-.396 1.286-.935q.052-.128.106-.253c.23-.531.16-1.162-.25-1.572a1.27 1.27 0 0 1 0-1.794l1.035-1.034a1.27 1.27 0 0 1 1.794 0c.41.41 1.04.48 1.572.249a8 8 0 0 1 .253-.106c.539-.212.935-.708.935-1.286C10 2.568 10.568 2 11.269 2zM12 16a4 4 0 1 0 0-8 4 4 0 0 0 0 8"
+        />
+      </svg>
+      <span
+        class="_typography_6v6n8_153 _font-body-md-regular_6v6n8_50 mx_QuickSettingsButton_label"
+        title="Settings"
+      >
+        Settings
+      </span>
+    </div>
+  </button>
 </DocumentFragment>
 `;
diff --git a/test/unit-tests/components/views/spaces/__snapshots__/SpaceCreateMenu-test.tsx.snap b/test/unit-tests/components/views/spaces/__snapshots__/SpaceCreateMenu-test.tsx.snap
new file mode 100644
index 0000000000..ab60449679
--- /dev/null
+++ b/test/unit-tests/components/views/spaces/__snapshots__/SpaceCreateMenu-test.tsx.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`<SpaceCreateMenu /> should render 1`] = `<DocumentFragment />`;
diff --git a/test/unit-tests/components/views/spaces/__snapshots__/SpacePanel-test.tsx.snap b/test/unit-tests/components/views/spaces/__snapshots__/SpacePanel-test.tsx.snap
index 5086a8aafc..110f6e6313 100644
--- a/test/unit-tests/components/views/spaces/__snapshots__/SpacePanel-test.tsx.snap
+++ b/test/unit-tests/components/views/spaces/__snapshots__/SpacePanel-test.tsx.snap
@@ -1,10 +1,10 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SpacePanel /> should show all activated MetaSpaces in the correct order 1`] = `
 <DocumentFragment>
   <nav
     aria-label="Spaces"
-    class="mx_SpacePanel collapsed"
+    class="mx_SpacePanel collapsed newUi"
   >
     <div
       class="mx_UserMenu"
@@ -21,7 +21,7 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
           class="mx_UserMenu_userAvatar"
         >
           <span
-            class="_avatar_1qbcf_8 mx_BaseAvatar mx_UserMenu_userAvatar_BaseAvatar _avatar-imageless_1qbcf_52"
+            class="_avatar_zysgz_8 mx_BaseAvatar mx_UserMenu_userAvatar_BaseAvatar _avatar-imageless_zysgz_55"
             data-color="5"
             data-testid="avatar-img"
             data-type="round"
@@ -37,7 +37,19 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
         class="mx_AccessibleButton mx_SpacePanel_toggleCollapse"
         role="button"
         tabindex="0"
-      />
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M8.7 17.3a.95.95 0 0 1-.275-.7q0-.425.275-.7l3.9-3.9-3.9-3.9a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l4.6 4.6q.15.15.213.325.062.175.062.375t-.062.375a.9.9 0 0 1-.213.325l-4.6 4.6a.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
+          />
+        </svg>
+      </div>
     </div>
     <ul
       aria-label="Spaces"
@@ -54,7 +66,7 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
       >
         <div
           aria-label="Home"
-          class="mx_AccessibleButton mx_SpaceButton mx_SpaceButton_home mx_SpaceButton_narrow"
+          class="mx_AccessibleButton mx_SpaceButton mx_SpaceButton_narrow mx_SpaceButton_withIcon"
           role="button"
           tabindex="0"
         >
@@ -69,7 +81,19 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
               >
                 <div
                   class="mx_SpaceButton_icon"
-                />
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="m12.971 3.54 7 3.889A2 2 0 0 1 21 9.177V19a2 2 0 0 1-2 2h-4v-9H9v9H5a2 2 0 0 1-2-2V9.177a2 2 0 0 1 1.029-1.748l7-3.89a2 2 0 0 1 1.942 0"
+                    />
+                  </svg>
+                </div>
               </div>
             </div>
             <div
@@ -79,7 +103,19 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
               class="mx_AccessibleButton mx_SpaceButton_menuButton"
               role="button"
               tabindex="0"
-            />
+            >
+              <svg
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+                />
+              </svg>
+            </div>
           </div>
         </div>
       </li>
@@ -90,7 +126,7 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
       >
         <div
           aria-label="Favourites"
-          class="mx_AccessibleButton mx_SpaceButton mx_SpaceButton_favourites mx_SpaceButton_narrow"
+          class="mx_AccessibleButton mx_SpaceButton mx_SpaceButton_narrow mx_SpaceButton_withIcon"
           role="button"
           tabindex="-1"
         >
@@ -105,7 +141,19 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
               >
                 <div
                   class="mx_SpaceButton_icon"
-                />
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="m12.897 2.817 2.336 4.733 5.223.76a1 1 0 0 1 .555 1.705L17.23 13.7l.892 5.202a1 1 0 0 1-1.45 1.054L12 17.5l-4.672 2.456a1 1 0 0 1-1.451-1.054l.892-5.202-3.78-3.685a1 1 0 0 1 .555-1.706l5.223-.759 2.336-4.733a1 1 0 0 1 1.794 0"
+                    />
+                  </svg>
+                </div>
               </div>
             </div>
           </div>
@@ -118,7 +166,7 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
       >
         <div
           aria-label="People"
-          class="mx_AccessibleButton mx_SpaceButton mx_SpaceButton_people mx_SpaceButton_narrow"
+          class="mx_AccessibleButton mx_SpaceButton mx_SpaceButton_narrow mx_SpaceButton_withIcon"
           role="button"
           tabindex="-1"
         >
@@ -133,7 +181,22 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
               >
                 <div
                   class="mx_SpaceButton_icon"
-                />
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M12 15q-1.65 0-2.825-1.175T8 11t1.175-2.825T12 7t2.825 1.175T16 11t-1.175 2.825T12 15"
+                    />
+                    <path
+                      d="M19.528 18.583A9.96 9.96 0 0 0 22 12c0-5.523-4.477-10-10-10S2 6.477 2 12c0 2.52.933 4.824 2.472 6.583A9.98 9.98 0 0 0 12 22a9.98 9.98 0 0 0 7.528-3.417M8.75 16.388q-1.373.332-2.709.95a8 8 0 1 1 11.918 0 14.7 14.7 0 0 0-2.709-.95A13.8 13.8 0 0 0 12 16q-1.65 0-3.25.387"
+                    />
+                  </svg>
+                </div>
               </div>
             </div>
           </div>
@@ -146,7 +209,7 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
       >
         <div
           aria-label="Other rooms"
-          class="mx_AccessibleButton mx_SpaceButton mx_SpaceButton_orphans mx_SpaceButton_narrow"
+          class="mx_AccessibleButton mx_SpaceButton mx_SpaceButton_narrow mx_SpaceButton_withIcon"
           role="button"
           tabindex="-1"
         >
@@ -161,7 +224,19 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
               >
                 <div
                   class="mx_SpaceButton_icon"
-                />
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="m8.566 17-.944 4.094q-.086.406-.372.656t-.687.25q-.543 0-.887-.469a1.18 1.18 0 0 1-.2-1.031l.801-3.5H3.158q-.572 0-.916-.484a1.27 1.27 0 0 1-.2-1.078 1.12 1.12 0 0 1 1.116-.938H6.85l1.145-5h-3.12q-.57 0-.915-.484a1.27 1.27 0 0 1-.2-1.078A1.12 1.12 0 0 1 4.875 7h3.691l.945-4.094q.085-.406.372-.656.286-.25.686-.25.544 0 .887.469.345.468.2 1.031l-.8 3.5h4.578l.944-4.094q.085-.406.372-.656.286-.25.687-.25.543 0 .887.469t.2 1.031L17.723 7h3.119q.573 0 .916.484.343.485.2 1.079a1.12 1.12 0 0 1-1.116.937H17.15l-1.145 5h3.12q.57 0 .915.484.343.485.2 1.079a1.12 1.12 0 0 1-1.116.937h-3.691l-.944 4.094q-.087.406-.373.656t-.686.25q-.544 0-.887-.469a1.18 1.18 0 0 1-.2-1.031l.8-3.5zm.573-2.5h4.578l1.144-5h-4.578z"
+                    />
+                  </svg>
+                </div>
               </div>
             </div>
           </div>
@@ -174,7 +249,7 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
       >
         <div
           aria-label="Conferences"
-          class="mx_AccessibleButton mx_SpaceButton mx_SpaceButton_videoRooms mx_SpaceButton_narrow"
+          class="mx_AccessibleButton mx_SpaceButton mx_SpaceButton_narrow mx_SpaceButton_withIcon"
           role="button"
           tabindex="-1"
         >
@@ -189,7 +264,19 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
               >
                 <div
                   class="mx_SpaceButton_icon"
-                />
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M6 4h10a2 2 0 0 1 2 2v4.286l3.35-2.871a1 1 0 0 1 1.65.76v7.65a1 1 0 0 1-1.65.76L18 13.715V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4"
+                    />
+                  </svg>
+                </div>
               </div>
             </div>
           </div>
@@ -202,7 +289,7 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
       >
         <div
           aria-label="Create a space"
-          class="mx_AccessibleButton mx_SpaceButton mx_SpaceButton_new mx_SpaceButton_narrow"
+          class="mx_AccessibleButton mx_SpaceButton mx_SpaceButton_new mx_SpaceButton_narrow mx_SpaceButton_withIcon"
           data-testid="create-space-button"
           role="button"
           tabindex="-1"
@@ -218,7 +305,19 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
               >
                 <div
                   class="mx_SpaceButton_icon"
-                />
+                >
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M11 13H6a.97.97 0 0 1-.713-.287A.97.97 0 0 1 5 12q0-.424.287-.713A.97.97 0 0 1 6 11h5V6q0-.424.287-.713A.97.97 0 0 1 12 5q.424 0 .713.287Q13 5.576 13 6v5h5q.424 0 .712.287.288.288.288.713 0 .424-.288.713A.97.97 0 0 1 18 13h-5v5q0 .424-.287.712A.97.97 0 0 1 12 19a.97.97 0 0 1-.713-.288A.97.97 0 0 1 11 18z"
+                    />
+                  </svg>
+                </div>
               </div>
             </div>
           </div>
@@ -233,17 +332,18 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
         aria-expanded="false"
         aria-haspopup="menu"
         aria-label="Threads"
-        aria-labelledby="«r12»"
-        class="_icon-button_m2erp_8 mx_ThreadsActivityCentreButton"
+        aria-labelledby="_r_12_"
+        class="_icon-button_1pz9o_8 mx_ThreadsActivityCentreButton"
+        data-kind="primary"
         data-state="closed"
-        id="radix-«r10»"
+        id="radix-_r_10_"
         role="button"
         style="--cpd-icon-button-size: 32px;"
         tabindex="0"
         type="button"
       >
         <div
-          class="_indicator-icon_zr2a0_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -261,13 +361,34 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
         </div>
       </button>
     </div>
-    <div
+    <button
       aria-expanded="false"
       aria-label="Quick settings"
-      class="mx_AccessibleButton mx_QuickSettingsButton"
+      aria-labelledby="_r_17_"
+      class="_icon-button_1pz9o_8 mx_QuickSettingsButton"
+      data-kind="primary"
       role="button"
+      style="--cpd-icon-button-size: 32px;"
       tabindex="0"
-    />
+      title="Quick settings"
+    >
+      <div
+        class="_indicator-icon_147l5_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12.731 2C13.432 2 14 2.568 14 3.269c0 .578.396 1.074.935 1.286q.128.052.253.106c.531.23 1.162.16 1.572-.25a1.27 1.27 0 0 1 1.794 0l1.034 1.035a1.27 1.27 0 0 1 0 1.794c-.41.41-.48 1.04-.248 1.572l.105.253c.212.539.708.935 1.286.935.701 0 1.269.568 1.269 1.269v1.462c0 .701-.568 1.269-1.269 1.269-.578 0-1.074.396-1.287.935q-.05.128-.104.253c-.232.531-.161 1.162.248 1.572a1.27 1.27 0 0 1 0 1.794l-1.034 1.034a1.27 1.27 0 0 1-1.794 0c-.41-.41-1.04-.48-1.572-.248a8 8 0 0 1-.253.105c-.539.212-.935.708-.935 1.286 0 .701-.568 1.269-1.269 1.269H11.27c-.702 0-1.27-.568-1.27-1.269 0-.578-.396-1.074-.935-1.287a8 8 0 0 1-.253-.104c-.531-.232-1.162-.161-1.572.248a1.27 1.27 0 0 1-1.794 0l-1.034-1.034a1.27 1.27 0 0 1 0-1.794c.41-.41.48-1.04.249-1.572a8 8 0 0 1-.106-.253C4.343 14.396 3.847 14 3.27 14 2.568 14 2 13.432 2 12.731V11.27c0-.702.568-1.27 1.269-1.27.578 0 1.074-.396 1.286-.935q.052-.128.106-.253c.23-.531.16-1.162-.25-1.572a1.27 1.27 0 0 1 0-1.794l1.035-1.034a1.27 1.27 0 0 1 1.794 0c.41.41 1.04.48 1.572.249a8 8 0 0 1 .253-.106c.539-.212.935-.708.935-1.286C10 2.568 10.568 2 11.269 2zM12 16a4 4 0 1 0 0-8 4 4 0 0 0 0 8"
+          />
+        </svg>
+      </div>
+    </button>
   </nav>
 </DocumentFragment>
 `;
diff --git a/test/unit-tests/components/views/spaces/__snapshots__/SpaceSettingsVisibilityTab-test.tsx.snap b/test/unit-tests/components/views/spaces/__snapshots__/SpaceSettingsVisibilityTab-test.tsx.snap
index 9e9ab218bc..22ef6a657d 100644
--- a/test/unit-tests/components/views/spaces/__snapshots__/SpaceSettingsVisibilityTab-test.tsx.snap
+++ b/test/unit-tests/components/views/spaces/__snapshots__/SpaceSettingsVisibilityTab-test.tsx.snap
@@ -1,18 +1,13 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<SpaceSettingsVisibilityTab /> for a public space Access renders guest access section toggle 1`] = `
-<div
-  aria-checked="true"
-  aria-disabled="false"
-  aria-labelledby="mx_LabelledToggleSwitch_«rb»"
-  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
+<input
+  checked=""
+  class="_input_udcm8_24"
+  id="_r_h_"
   role="switch"
-  tabindex="0"
->
-  <div
-    class="mx_ToggleSwitch_ball"
-  />
-</div>
+  type="checkbox"
+/>
 `;
 
 exports[`<SpaceSettingsVisibilityTab /> renders container 1`] = `
@@ -112,42 +107,53 @@ exports[`<SpaceSettingsVisibilityTab /> renders container 1`] = `
               >
                 Anyone can find and join.
               </span>
-              <div
-                class="mx_SettingsTab_toggleWithDescription"
+              <form
+                class="_root_19upo_16"
               >
                 <div
-                  class="mx_SettingsFlag"
+                  class="_inline-field_19upo_32"
                 >
-                  <span
-                    class="mx_SettingsFlag_label"
+                  <div
+                    class="_inline-field-control_19upo_44"
                   >
                     <div
-                      id="mx_LabelledToggleSwitch_«r0»"
+                      class="_container_udcm8_10"
+                    >
+                      <input
+                        checked=""
+                        class="_input_udcm8_24"
+                        id="_r_0_"
+                        role="switch"
+                        type="checkbox"
+                      />
+                      <div
+                        class="_ui_udcm8_34"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field-body_19upo_38"
+                  >
+                    <label
+                      class="_label_19upo_59"
+                      for="_r_0_"
                     >
                       Preview Space
-                    </div>
-                  </span>
-                  <div
-                    aria-checked="true"
-                    aria-disabled="false"
-                    aria-labelledby="mx_LabelledToggleSwitch_«r0»"
-                    class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
-                    role="switch"
-                    tabindex="0"
-                  >
-                    <div
-                      class="mx_ToggleSwitch_ball"
-                    />
+                    </label>
+                    <span
+                      class="_message_19upo_85 _help-message_19upo_91"
+                      id="radix-_r_2_"
+                    >
+                      Allow people to preview your space before they join.
+                    </span>
                   </div>
                 </div>
                 <p>
-                  Allow people to preview your space before they join.
-                  <br />
                   <strong>
                     Recommended for public spaces.
                   </strong>
                 </p>
-              </div>
+              </form>
             </div>
           </fieldset>
         </div>
diff --git a/test/unit-tests/components/views/spaces/__snapshots__/SpaceTreeLevel-test.tsx.snap b/test/unit-tests/components/views/spaces/__snapshots__/SpaceTreeLevel-test.tsx.snap
index ac89c05d0a..64e735bb66 100644
--- a/test/unit-tests/components/views/spaces/__snapshots__/SpaceTreeLevel-test.tsx.snap
+++ b/test/unit-tests/components/views/spaces/__snapshots__/SpaceTreeLevel-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`SpaceButton metaspace should render notificationState if one is provided 1`] = `
 <DocumentFragment>
@@ -47,3 +47,251 @@ exports[`SpaceButton metaspace should render notificationState if one is provide
   </div>
 </DocumentFragment>
 `;
+
+exports[`SpaceItem should render a space with subspaces 1`] = `
+<DocumentFragment>
+  <li
+    aria-expanded="false"
+    aria-selected="false"
+    class="mx_SpaceItem collapsed hasSubSpaces"
+    role="treeitem"
+  >
+    <div
+      aria-label="Root Space"
+      class="mx_AccessibleButton mx_SpaceButton"
+      role="button"
+      tabindex="-1"
+    >
+      <div
+        aria-label="Expand"
+        class="mx_AccessibleButton mx_SpaceButton_toggleCollapse"
+        role="button"
+        tabindex="-1"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M8.7 17.3a.95.95 0 0 1-.275-.7q0-.425.275-.7l3.9-3.9-3.9-3.9a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l4.6 4.6q.15.15.213.325.062.175.062.375t-.062.375a.9.9 0 0 1-.213.325l-4.6 4.6a.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
+          />
+        </svg>
+      </div>
+      <div
+        class="mx_SpaceButton_selectionWrapper"
+      >
+        <div
+          class="mx_SpaceButton_avatarWrapper"
+        >
+          <span
+            aria-label="Avatar"
+            class="_avatar_zysgz_8 mx_BaseAvatar"
+            data-color="3"
+            data-testid="avatar-img"
+            data-type="round"
+            style="--cpd-avatar-size: 32px;"
+          >
+            <img
+              alt=""
+              class="_image_zysgz_43"
+              data-type="round"
+              height="32px"
+              loading="lazy"
+              referrerpolicy="no-referrer"
+              src="http://this.is.a.url/avatar.url/room.png"
+              width="32px"
+            />
+          </span>
+        </div>
+        <span
+          class="mx_SpaceButton_name"
+        >
+          Root Space
+        </span>
+        <div
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="Space options"
+          class="mx_AccessibleButton mx_SpaceButton_menuButton"
+          role="button"
+          tabindex="0"
+        >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+            />
+          </svg>
+        </div>
+      </div>
+    </div>
+  </li>
+</DocumentFragment>
+`;
+
+exports[`SpaceItem should render a space with subspaces 2`] = `
+<DocumentFragment>
+  <li
+    aria-expanded="true"
+    aria-selected="false"
+    class="mx_SpaceItem hasSubSpaces"
+    role="treeitem"
+  >
+    <div
+      aria-label="Root Space"
+      class="mx_AccessibleButton mx_SpaceButton"
+      role="button"
+      tabindex="-1"
+    >
+      <div
+        aria-label="Collapse"
+        class="mx_AccessibleButton mx_SpaceButton_toggleCollapse"
+        role="button"
+        tabindex="-1"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+          />
+        </svg>
+      </div>
+      <div
+        class="mx_SpaceButton_selectionWrapper"
+      >
+        <div
+          class="mx_SpaceButton_avatarWrapper"
+        >
+          <span
+            aria-label="Avatar"
+            class="_avatar_zysgz_8 mx_BaseAvatar"
+            data-color="3"
+            data-testid="avatar-img"
+            data-type="round"
+            style="--cpd-avatar-size: 32px;"
+          >
+            <img
+              alt=""
+              class="_image_zysgz_43"
+              data-type="round"
+              height="32px"
+              loading="lazy"
+              referrerpolicy="no-referrer"
+              src="http://this.is.a.url/avatar.url/room.png"
+              width="32px"
+            />
+          </span>
+        </div>
+        <span
+          class="mx_SpaceButton_name"
+        >
+          Root Space
+        </span>
+        <div
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="Space options"
+          class="mx_AccessibleButton mx_SpaceButton_menuButton"
+          role="button"
+          tabindex="0"
+        >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+            />
+          </svg>
+        </div>
+      </div>
+    </div>
+    <ul
+      class="mx_SpaceTreeLevel"
+      role="group"
+    >
+      <li
+        aria-selected="false"
+        class="mx_SpaceItem"
+        role="treeitem"
+      >
+        <div
+          aria-label="Subspace"
+          class="mx_AccessibleButton mx_SpaceButton"
+          role="button"
+          tabindex="-1"
+        >
+          <div
+            class="mx_SpaceButton_selectionWrapper"
+          >
+            <div
+              class="mx_SpaceButton_avatarWrapper"
+            >
+              <span
+                aria-label="Avatar"
+                class="_avatar_zysgz_8 mx_BaseAvatar"
+                data-color="4"
+                data-testid="avatar-img"
+                data-type="round"
+                style="--cpd-avatar-size: 24px;"
+              >
+                <img
+                  alt=""
+                  class="_image_zysgz_43"
+                  data-type="round"
+                  height="24px"
+                  loading="lazy"
+                  referrerpolicy="no-referrer"
+                  src="http://this.is.a.url/avatar.url/room.png"
+                  width="24px"
+                />
+              </span>
+            </div>
+            <span
+              class="mx_SpaceButton_name"
+            >
+              Subspace
+            </span>
+            <div
+              aria-expanded="false"
+              aria-haspopup="true"
+              aria-label="Space options"
+              class="mx_AccessibleButton mx_SpaceButton_menuButton"
+              role="button"
+              tabindex="0"
+            >
+              <svg
+                fill="currentColor"
+                height="1em"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
+                />
+              </svg>
+            </div>
+          </div>
+        </div>
+      </li>
+    </ul>
+  </li>
+</DocumentFragment>
+`;
diff --git a/test/unit-tests/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap b/test/unit-tests/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap
index 41eefaf277..38e5fcede0 100644
--- a/test/unit-tests/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap
+++ b/test/unit-tests/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap
@@ -1,24 +1,24 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] = `
 <div
-  aria-labelledby="radix-«r2f»"
+  aria-labelledby="radix-_r_1m_"
   aria-orientation="vertical"
-  class="_menu_19sse_8"
+  class="_menu_1glhz_8"
   data-align="start"
   data-orientation="vertical"
   data-radix-menu-content=""
   data-side="top"
   data-state="open"
   dir="ltr"
-  id="radix-«r2g»"
+  id="radix-_r_1n_"
   role="menu"
   style="outline: none; --radix-dropdown-menu-content-transform-origin: var(--radix-popper-transform-origin); --radix-dropdown-menu-content-available-width: var(--radix-popper-available-width); --radix-dropdown-menu-content-available-height: var(--radix-popper-available-height); --radix-dropdown-menu-trigger-width: var(--radix-popper-anchor-width); --radix-dropdown-menu-trigger-height: var(--radix-popper-anchor-height); pointer-events: auto;"
   tabindex="-1"
 >
   <h3
-    class="_typography_6v6n8_153 _font-body-sm-semibold_6v6n8_36 _menu-title_1sgvx_8 _title_19sse_74"
-    id="«r2n»"
+    class="_typography_6v6n8_153 _font-body-sm-semibold_6v6n8_36 _menu-title_1sgvx_8 _title_1glhz_74"
+    id="_r_1u_"
   >
     Threads activity
   </h3>
@@ -37,7 +37,7 @@ exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] =
         class="_icon_dyt4i_50"
       >
         <span
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
           data-color="3"
           data-testid="avatar-img"
           data-type="round"
@@ -85,7 +85,7 @@ exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] =
         class="_icon_dyt4i_50"
       >
         <span
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
           data-color="2"
           data-testid="avatar-img"
           data-type="round"
@@ -125,168 +125,25 @@ exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] =
 </div>
 `;
 
-exports[`ThreadsActivityCentre should close the release announcement when the TAC button is clicked 1`] = `
-<body
-  data-scroll-locked="1"
-  style="pointer-events: none;"
->
-  <span
-    aria-hidden="true"
-    data-aria-hidden="true"
-    data-radix-focus-guard=""
-    style="outline: none; opacity: 0; position: fixed; pointer-events: none;"
-    tabindex="0"
-  />
-  <div
-    aria-hidden="true"
-    data-aria-hidden="true"
-  >
-    <div
-      class="mx_ThreadsActivityCentre_container"
-    >
-      <button
-        aria-controls="radix-«rp»"
-        aria-disabled="false"
-        aria-expanded="true"
-        aria-haspopup="menu"
-        aria-label="Threads"
-        aria-labelledby="«rq»"
-        class="_icon-button_m2erp_8 mx_ThreadsActivityCentreButton"
-        data-state="open"
-        id="radix-«ro»"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-        type="button"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            class="mx_ThreadsActivityCentreButton_Icon"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M4 3h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H6l-2.293 2.293c-.63.63-1.707.184-1.707-.707V5a2 2 0 0 1 2-2m3 7h10q.424 0 .712-.287A.97.97 0 0 0 18 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 17 8H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 9q0 .424.287.713Q6.576 10 7 10m0 4h6q.424 0 .713-.287A.97.97 0 0 0 14 13a.97.97 0 0 0-.287-.713A.97.97 0 0 0 13 12H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 13q0 .424.287.713Q6.576 14 7 14"
-            />
-          </svg>
-        </div>
-      </button>
-    </div>
-  </div>
-  <div
-    aria-hidden="true"
-    data-aria-hidden="true"
-    data-floating-ui-portal=""
-    id="«ru»"
-  >
-    <div
-      class="_tooltip_6ode6_8 _invisible_6ode6_21"
-      data-floating-ui-focusable=""
-      style="position: absolute; left: 0px; top: 0px; transform: translate(6px, 5px);"
-      tabindex="-1"
-    >
-      <svg
-        aria-hidden="true"
-        class="_arrow_6ode6_33"
-        height="10"
-        style="position: absolute; pointer-events: none; right: calc(100% - 0px); transform: rotate(90deg); top: -1px;"
-        viewBox="0 0 10 10"
-        width="10"
-      >
-        <path
-          d="M0,0 H10 L5,6 Q5,6 5,6 Z"
-          stroke="none"
-        />
-        <clippath
-          id="«rv»"
-        >
-          <rect
-            height="10"
-            width="10"
-            x="0"
-            y="0"
-          />
-        </clippath>
-      </svg>
-      <span
-        id="«rq»"
-      >
-        Threads
-      </span>
-    </div>
-  </div>
-  <div
-    data-radix-popper-content-wrapper=""
-    dir="ltr"
-    style="position: fixed; left: 0px; top: 0px; transform: translate(0px, -8px); min-width: max-content; --radix-popper-transform-origin: 0% 0px; --radix-popper-available-width: 0px; --radix-popper-available-height: -8px; --radix-popper-anchor-width: 0px; --radix-popper-anchor-height: 0px;"
-  >
-    <div
-      aria-labelledby="radix-«ro»"
-      aria-orientation="vertical"
-      class="_menu_19sse_8"
-      data-align="start"
-      data-orientation="vertical"
-      data-radix-menu-content=""
-      data-side="top"
-      data-state="open"
-      dir="ltr"
-      id="radix-«rp»"
-      role="menu"
-      style="outline: none; --radix-dropdown-menu-content-transform-origin: var(--radix-popper-transform-origin); --radix-dropdown-menu-content-available-width: var(--radix-popper-available-width); --radix-dropdown-menu-content-available-height: var(--radix-popper-available-height); --radix-dropdown-menu-trigger-width: var(--radix-popper-anchor-width); --radix-dropdown-menu-trigger-height: var(--radix-popper-anchor-height); pointer-events: auto;"
-      tabindex="-1"
-    >
-      <h3
-        class="_typography_6v6n8_153 _font-body-sm-semibold_6v6n8_36 _menu-title_1sgvx_8 _title_19sse_74"
-        id="«r10»"
-      >
-        Threads activity
-      </h3>
-      <div
-        class="mx_ThreadsActivityCentre_rows"
-      >
-        <div
-          class="mx_ThreadsActivityCentre_emptyCaption"
-        >
-          You don't have rooms with thread notifications yet.
-        </div>
-      </div>
-    </div>
-  </div>
-  <span
-    aria-hidden="true"
-    data-aria-hidden="true"
-    data-radix-focus-guard=""
-    style="outline: none; opacity: 0; position: fixed; pointer-events: none;"
-    tabindex="0"
-  />
-</body>
-`;
-
 exports[`ThreadsActivityCentre should match snapshot when empty 1`] = `
 <div
-  aria-labelledby="radix-«r33»"
+  aria-labelledby="radix-_r_2a_"
   aria-orientation="vertical"
-  class="_menu_19sse_8"
+  class="_menu_1glhz_8"
   data-align="start"
   data-orientation="vertical"
   data-radix-menu-content=""
   data-side="top"
   data-state="open"
   dir="ltr"
-  id="radix-«r34»"
+  id="radix-_r_2b_"
   role="menu"
   style="outline: none; --radix-dropdown-menu-content-transform-origin: var(--radix-popper-transform-origin); --radix-dropdown-menu-content-available-width: var(--radix-popper-available-width); --radix-dropdown-menu-content-available-height: var(--radix-popper-available-height); --radix-dropdown-menu-trigger-width: var(--radix-popper-anchor-width); --radix-dropdown-menu-trigger-height: var(--radix-popper-anchor-height); pointer-events: auto;"
   tabindex="-1"
 >
   <h3
-    class="_typography_6v6n8_153 _font-body-sm-semibold_6v6n8_36 _menu-title_1sgvx_8 _title_19sse_74"
-    id="«r3b»"
+    class="_typography_6v6n8_153 _font-body-sm-semibold_6v6n8_36 _menu-title_1sgvx_8 _title_1glhz_74"
+    id="_r_2i_"
   >
     Threads activity
   </h3>
@@ -304,23 +161,23 @@ exports[`ThreadsActivityCentre should match snapshot when empty 1`] = `
 
 exports[`ThreadsActivityCentre should order the room with the same notification level by most recent 1`] = `
 <div
-  aria-labelledby="radix-«r3c»"
+  aria-labelledby="radix-_r_2j_"
   aria-orientation="vertical"
-  class="_menu_19sse_8"
+  class="_menu_1glhz_8"
   data-align="start"
   data-orientation="vertical"
   data-radix-menu-content=""
   data-side="top"
   data-state="open"
   dir="ltr"
-  id="radix-«r3d»"
+  id="radix-_r_2k_"
   role="menu"
   style="outline: none; --radix-dropdown-menu-content-transform-origin: var(--radix-popper-transform-origin); --radix-dropdown-menu-content-available-width: var(--radix-popper-available-width); --radix-dropdown-menu-content-available-height: var(--radix-popper-available-height); --radix-dropdown-menu-trigger-width: var(--radix-popper-anchor-width); --radix-dropdown-menu-trigger-height: var(--radix-popper-anchor-height); pointer-events: auto;"
   tabindex="-1"
 >
   <h3
-    class="_typography_6v6n8_153 _font-body-sm-semibold_6v6n8_36 _menu-title_1sgvx_8 _title_19sse_74"
-    id="«r3k»"
+    class="_typography_6v6n8_153 _font-body-sm-semibold_6v6n8_36 _menu-title_1sgvx_8 _title_1glhz_74"
+    id="_r_2r_"
   >
     Threads activity
   </h3>
@@ -339,7 +196,7 @@ exports[`ThreadsActivityCentre should order the room with the same notification
         class="_icon_dyt4i_50"
       >
         <span
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
           data-color="5"
           data-testid="avatar-img"
           data-type="round"
@@ -387,7 +244,7 @@ exports[`ThreadsActivityCentre should order the room with the same notification
         class="_icon_dyt4i_50"
       >
         <span
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
           data-color="3"
           data-testid="avatar-img"
           data-type="round"
@@ -435,7 +292,7 @@ exports[`ThreadsActivityCentre should order the room with the same notification
         class="_icon_dyt4i_50"
       >
         <span
-          class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+          class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
           data-color="4"
           data-testid="avatar-img"
           data-type="round"
@@ -474,86 +331,3 @@ exports[`ThreadsActivityCentre should order the room with the same notification
   </div>
 </div>
 `;
-
-exports[`ThreadsActivityCentre should render the release announcement 1`] = `
-<body>
-  <div>
-    <div
-      class="mx_ThreadsActivityCentre_container"
-    >
-      <button
-        aria-disabled="false"
-        aria-expanded="false"
-        aria-haspopup="menu"
-        aria-label="Threads"
-        aria-labelledby="«ra»"
-        class="_icon-button_m2erp_8 mx_ThreadsActivityCentreButton"
-        data-state="closed"
-        id="radix-«r8»"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-        type="button"
-      >
-        <div
-          class="_indicator-icon_zr2a0_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            class="mx_ThreadsActivityCentreButton_Icon"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M4 3h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H6l-2.293 2.293c-.63.63-1.707.184-1.707-.707V5a2 2 0 0 1 2-2m3 7h10q.424 0 .712-.287A.97.97 0 0 0 18 9a.97.97 0 0 0-.288-.713A.97.97 0 0 0 17 8H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 9q0 .424.287.713Q6.576 10 7 10m0 4h6q.424 0 .713-.287A.97.97 0 0 0 14 13a.97.97 0 0 0-.287-.713A.97.97 0 0 0 13 12H7a.97.97 0 0 0-.713.287A.97.97 0 0 0 6 13q0 .424.287.713Q6.576 14 7 14"
-            />
-          </svg>
-        </div>
-      </button>
-    </div>
-  </div>
-  <div
-    data-floating-ui-portal=""
-    id="«re»"
-  >
-    <div
-      class="_tooltip_6ode6_8 _invisible_6ode6_21"
-      data-floating-ui-focusable=""
-      style="position: absolute; left: 0px; top: 0px; transform: translate(0px, 0px);"
-      tabindex="-1"
-    >
-      <svg
-        aria-hidden="true"
-        class="_arrow_6ode6_33"
-        height="10"
-        style="position: absolute; pointer-events: none; right: calc(100% - 0px); transform: rotate(90deg);"
-        viewBox="0 0 10 10"
-        width="10"
-      >
-        <path
-          d="M0,0 H10 L5,6 Q5,6 5,6 Z"
-          stroke="none"
-        />
-        <clippath
-          id="«rf»"
-        >
-          <rect
-            height="10"
-            width="10"
-            x="0"
-            y="0"
-          />
-        </clippath>
-      </svg>
-      <span
-        id="«ra»"
-      >
-        Threads
-      </span>
-    </div>
-  </div>
-</body>
-`;
diff --git a/test/unit-tests/components/views/toasts/__snapshots__/GenericToast-test.tsx.snap b/test/unit-tests/components/views/toasts/__snapshots__/GenericToast-test.tsx.snap
index dff4803f41..cf523ee745 100644
--- a/test/unit-tests/components/views/toasts/__snapshots__/GenericToast-test.tsx.snap
+++ b/test/unit-tests/components/views/toasts/__snapshots__/GenericToast-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`GenericToast should render as expected with detail content 1`] = `
 <DocumentFragment>
@@ -15,7 +15,7 @@ exports[`GenericToast should render as expected with detail content 1`] = `
       class="mx_Toast_buttons"
     >
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="secondary"
         data-size="sm"
         role="button"
@@ -24,7 +24,7 @@ exports[`GenericToast should render as expected with detail content 1`] = `
         Reject
       </button>
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="primary"
         data-size="sm"
         role="button"
@@ -57,7 +57,7 @@ exports[`GenericToast should render as expected without detail content 1`] = `
       class="mx_Toast_buttons"
     >
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="secondary"
         data-size="sm"
         role="button"
@@ -66,7 +66,7 @@ exports[`GenericToast should render as expected without detail content 1`] = `
         Reject
       </button>
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="primary"
         data-size="sm"
         role="button"
diff --git a/test/unit-tests/components/views/toasts/__snapshots__/VerificationRequestToast-test.tsx.snap b/test/unit-tests/components/views/toasts/__snapshots__/VerificationRequestToast-test.tsx.snap
index 6250f932d4..98946f5f37 100644
--- a/test/unit-tests/components/views/toasts/__snapshots__/VerificationRequestToast-test.tsx.snap
+++ b/test/unit-tests/components/views/toasts/__snapshots__/VerificationRequestToast-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`VerificationRequestToast should render a cross-user verification 1`] = `
 <div>
@@ -13,7 +13,7 @@ exports[`VerificationRequestToast should render a cross-user verification 1`] =
       class="mx_Toast_buttons"
     >
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="secondary"
         data-size="sm"
         role="button"
@@ -22,13 +22,13 @@ exports[`VerificationRequestToast should render a cross-user verification 1`] =
         Ignore
       </button>
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="primary"
         data-size="sm"
         role="button"
         tabindex="0"
       >
-        Verify Session
+        Start Verification
       </button>
     </div>
   </div>
@@ -53,7 +53,7 @@ exports[`VerificationRequestToast should render a self-verification 1`] = `
       class="mx_Toast_buttons"
     >
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="secondary"
         data-size="sm"
         role="button"
@@ -62,13 +62,13 @@ exports[`VerificationRequestToast should render a self-verification 1`] = `
         Ignore
       </button>
       <button
-        class="_button_vczzf_8"
+        class="_button_187yx_8"
         data-kind="primary"
         data-size="sm"
         role="button"
         tabindex="0"
       >
-        Verify Session
+        Start Verification
       </button>
     </div>
   </div>
diff --git a/test/unit-tests/components/views/typography/__snapshots__/Caption-test.tsx.snap b/test/unit-tests/components/views/typography/__snapshots__/Caption-test.tsx.snap
index b17d5044b0..daf52266b1 100644
--- a/test/unit-tests/components/views/typography/__snapshots__/Caption-test.tsx.snap
+++ b/test/unit-tests/components/views/typography/__snapshots__/Caption-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<Caption /> renders an error message 1`] = `
 {
diff --git a/test/unit-tests/components/views/typography/__snapshots__/Heading-test.tsx.snap b/test/unit-tests/components/views/typography/__snapshots__/Heading-test.tsx.snap
index 69a9261c0e..c59f41fce3 100644
--- a/test/unit-tests/components/views/typography/__snapshots__/Heading-test.tsx.snap
+++ b/test/unit-tests/components/views/typography/__snapshots__/Heading-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<Heading /> can have different appearance to its heading level 1`] = `
 <DocumentFragment>
diff --git a/test/unit-tests/components/views/utils/ListView-test.tsx b/test/unit-tests/components/views/utils/ListView-test.tsx
new file mode 100644
index 0000000000..0cae681f73
--- /dev/null
+++ b/test/unit-tests/components/views/utils/ListView-test.tsx
@@ -0,0 +1,476 @@
+/*
+Copyright 2024 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { render, screen, fireEvent } from "jest-matrix-react";
+import { VirtuosoMockContext } from "react-virtuoso";
+
+import { ListView, type IListViewProps } from "../../../../../src/components/utils/ListView";
+
+interface TestItem {
+    id: string;
+    name: string;
+    isFocusable?: boolean;
+}
+
+const SEPARATOR_ITEM = "SEPARATOR" as const;
+type TestItemWithSeparator = TestItem | typeof SEPARATOR_ITEM;
+
+describe("ListView", () => {
+    const mockGetItemComponent = jest.fn();
+    const mockIsItemFocusable = jest.fn();
+
+    const defaultItems: TestItemWithSeparator[] = [
+        { id: "1", name: "Item 1" },
+        SEPARATOR_ITEM,
+        { id: "2", name: "Item 2" },
+        { id: "3", name: "Item 3" },
+    ];
+
+    const defaultProps: IListViewProps<TestItemWithSeparator, any> = {
+        items: defaultItems,
+        getItemComponent: mockGetItemComponent,
+        isItemFocusable: mockIsItemFocusable,
+        getItemKey: (item) => (typeof item === "string" ? item : item.id),
+    };
+
+    const getListViewComponent = (props: Partial<IListViewProps<TestItemWithSeparator, any>> = {}) => {
+        const mergedProps = { ...defaultProps, ...props };
+        return <ListView {...mergedProps} role="grid" aria-rowcount={props.items?.length} aria-colcount={1} />;
+    };
+
+    const renderListViewWithHeight = (props: Partial<IListViewProps<TestItemWithSeparator, any>> = {}) => {
+        const mergedProps = { ...defaultProps, ...props };
+        return render(getListViewComponent(mergedProps), {
+            wrapper: ({ children }) => (
+                <VirtuosoMockContext.Provider value={{ viewportHeight: 400, itemHeight: 56 }}>
+                    <>{children}</>
+                </VirtuosoMockContext.Provider>
+            ),
+        });
+    };
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockGetItemComponent.mockImplementation((index: number, item: TestItemWithSeparator, context: any) => {
+            const itemKey = typeof item === "string" ? item : item.id;
+            const isFocused = context.tabIndexKey === itemKey;
+            return (
+                <div className="mx_item" data-testid={`row-${index}`} tabIndex={isFocused ? 0 : -1}>
+                    {item === SEPARATOR_ITEM ? "---" : (item as TestItem).name}
+                </div>
+            );
+        });
+        mockIsItemFocusable.mockImplementation((item: TestItemWithSeparator) => item !== SEPARATOR_ITEM);
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    describe("Rendering", () => {
+        it("should render the ListView component", () => {
+            renderListViewWithHeight();
+            expect(screen.getByRole("grid")).toBeInTheDocument();
+        });
+
+        it("should render with empty items array", () => {
+            renderListViewWithHeight({ items: [] });
+            expect(screen.getByRole("grid")).toBeInTheDocument();
+        });
+    });
+
+    describe("Keyboard Navigation", () => {
+        it("should handle ArrowDown key navigation", () => {
+            renderListViewWithHeight();
+            const container = screen.getByRole("grid");
+
+            fireEvent.focus(container);
+            fireEvent.keyDown(container, { code: "ArrowDown" });
+
+            // ArrowDown should skip the non-focusable item at index 1 and go to index 2
+            const items = container.querySelectorAll(".mx_item");
+            expect(items[2]).toHaveAttribute("tabindex", "0");
+            expect(items[0]).toHaveAttribute("tabindex", "-1");
+            expect(items[1]).toHaveAttribute("tabindex", "-1");
+        });
+
+        it("should handle ArrowUp key navigation", () => {
+            renderListViewWithHeight();
+            const container = screen.getByRole("grid");
+
+            // First focus and navigate down to second item
+            fireEvent.focus(container);
+            fireEvent.keyDown(container, { code: "ArrowDown" });
+
+            // Then navigate back up
+            fireEvent.keyDown(container, { code: "ArrowUp" });
+
+            // Verify focus moved back to first item
+            const items = container.querySelectorAll(".mx_item");
+            expect(items[0]).toHaveAttribute("tabindex", "0");
+            expect(items[1]).toHaveAttribute("tabindex", "-1");
+        });
+
+        it("should handle Home key navigation", () => {
+            renderListViewWithHeight();
+            const container = screen.getByRole("grid");
+
+            // First focus and navigate to a later item
+            fireEvent.focus(container);
+            fireEvent.keyDown(container, { code: "ArrowDown" });
+            fireEvent.keyDown(container, { code: "ArrowDown" });
+
+            // Then press Home to go to first item
+            fireEvent.keyDown(container, { code: "Home" });
+
+            // Verify focus moved to first item
+            const items = container.querySelectorAll(".mx_item");
+            expect(items[0]).toHaveAttribute("tabindex", "0");
+            // Check that other items are not focused
+            for (let i = 1; i < items.length; i++) {
+                expect(items[i]).toHaveAttribute("tabindex", "-1");
+            }
+        });
+
+        it("should handle End key navigation", () => {
+            renderListViewWithHeight();
+            const container = screen.getByRole("grid");
+
+            // First focus on the list (starts at first item)
+            fireEvent.focus(container);
+
+            // Then press End to go to last item
+            fireEvent.keyDown(container, { code: "End" });
+
+            // Verify focus moved to last visible item
+            const items = container.querySelectorAll(".mx_item");
+            // Should focus on the last visible item
+            const lastIndex = items.length - 1;
+            expect(items[lastIndex]).toHaveAttribute("tabindex", "0");
+            // Check that other items are not focused
+            for (let i = 0; i < lastIndex; i++) {
+                expect(items[i]).toHaveAttribute("tabindex", "-1");
+            }
+        });
+
+        it("should handle PageDown key navigation", () => {
+            renderListViewWithHeight();
+            const container = screen.getByRole("grid");
+
+            // First focus on the list (starts at first item)
+            fireEvent.focus(container);
+
+            // Then press PageDown to jump down by viewport size
+            fireEvent.keyDown(container, { code: "PageDown" });
+
+            // Verify focus moved down
+            const items = container.querySelectorAll(".mx_item");
+            // PageDown should move to the last visible item since we only have 4 items
+            const lastIndex = items.length - 1;
+            expect(items[lastIndex]).toHaveAttribute("tabindex", "0");
+            expect(items[0]).toHaveAttribute("tabindex", "-1");
+        });
+
+        it("should handle PageUp key navigation", () => {
+            renderListViewWithHeight();
+            const container = screen.getByRole("grid");
+
+            // First focus and navigate to last item to have something to page up from
+            fireEvent.focus(container);
+            fireEvent.keyDown(container, { code: "End" });
+
+            // Then press PageUp to jump up by viewport size
+            fireEvent.keyDown(container, { code: "PageUp" });
+
+            // Verify focus moved up
+            const items = container.querySelectorAll(".mx_item");
+            // PageUp should move back to the first item since we only have 4 items
+            expect(items[0]).toHaveAttribute("tabindex", "0");
+            const lastIndex = items.length - 1;
+            expect(items[lastIndex]).toHaveAttribute("tabindex", "-1");
+        });
+
+        it("should not handle keyboard navigation when modifier keys are pressed", () => {
+            renderListViewWithHeight();
+            const container = screen.getByRole("grid");
+
+            fireEvent.focus(container);
+
+            // Store initial state - first item should be focused
+            const initialItems = container.querySelectorAll(".mx_item");
+            expect(initialItems[0]).toHaveAttribute("tabindex", "0");
+            expect(initialItems[2]).toHaveAttribute("tabindex", "-1");
+
+            // Test ArrowDown with Ctrl modifier - should NOT navigate
+            fireEvent.keyDown(container, { code: "ArrowDown", ctrlKey: true });
+
+            let items = container.querySelectorAll(".mx_item");
+            expect(items[0]).toHaveAttribute("tabindex", "0"); // Should still be on first item
+            expect(items[2]).toHaveAttribute("tabindex", "-1"); // Should not have moved to third item
+
+            // Test ArrowDown with Alt modifier - should NOT navigate
+            fireEvent.keyDown(container, { code: "ArrowDown", altKey: true });
+
+            items = container.querySelectorAll(".mx_item");
+            expect(items[0]).toHaveAttribute("tabindex", "0"); // Should still be on first item
+            expect(items[2]).toHaveAttribute("tabindex", "-1"); // Should not have moved to third item
+
+            // Test ArrowDown with Shift modifier - should NOT navigate
+            fireEvent.keyDown(container, { code: "ArrowDown", shiftKey: true });
+
+            items = container.querySelectorAll(".mx_item");
+            expect(items[0]).toHaveAttribute("tabindex", "0"); // Should still be on first item
+            expect(items[2]).toHaveAttribute("tabindex", "-1"); // Should not have moved to third item
+
+            // Test ArrowDown with Meta/Cmd modifier - should NOT navigate
+            fireEvent.keyDown(container, { code: "ArrowDown", metaKey: true });
+
+            items = container.querySelectorAll(".mx_item");
+            expect(items[0]).toHaveAttribute("tabindex", "0"); // Should still be on first item
+            expect(items[2]).toHaveAttribute("tabindex", "-1"); // Should not have moved to third item
+
+            // Test normal ArrowDown without modifiers - SHOULD navigate
+            fireEvent.keyDown(container, { code: "ArrowDown" });
+
+            items = container.querySelectorAll(".mx_item");
+            expect(items[0]).toHaveAttribute("tabindex", "-1"); // Should have moved from first item
+            expect(items[2]).toHaveAttribute("tabindex", "0"); // Should have moved to third item (skipping separator)
+        });
+
+        it("should skip non-focusable items when navigating down", async () => {
+            // Create items where every other item is not focusable
+            const mixedItems = [
+                { id: "1", name: "Item 1", isFocusable: true },
+                { id: "2", name: "Item 2", isFocusable: false },
+                { id: "3", name: "Item 3", isFocusable: true },
+                SEPARATOR_ITEM,
+                { id: "4", name: "Item 4", isFocusable: true },
+            ];
+
+            mockIsItemFocusable.mockImplementation((item: TestItemWithSeparator) => {
+                if (item === SEPARATOR_ITEM) return false;
+                return (item as TestItem).isFocusable !== false;
+            });
+
+            renderListViewWithHeight({ items: mixedItems });
+            const container = screen.getByRole("grid");
+
+            fireEvent.focus(container);
+            fireEvent.keyDown(container, { code: "ArrowDown" });
+
+            // Verify it skipped the non-focusable item at index 1
+            // and went directly to the focusable item at index 2
+            const items = container.querySelectorAll(".mx_item");
+            expect(items[2]).toHaveAttribute("tabindex", "0"); // Item 3 is focused
+            expect(items[0]).toHaveAttribute("tabindex", "-1"); // Item 1 is not focused
+            expect(items[1]).toHaveAttribute("tabindex", "-1"); // Item 2 (non-focusable) is not focused
+        });
+
+        it("should skip non-focusable items when navigating up", () => {
+            const mixedItems = [
+                { id: "1", name: "Item 1", isFocusable: true },
+                SEPARATOR_ITEM,
+                { id: "2", name: "Item 2", isFocusable: false },
+                { id: "3", name: "Item 3", isFocusable: true },
+            ];
+
+            mockIsItemFocusable.mockImplementation((item: TestItemWithSeparator) => {
+                if (item === SEPARATOR_ITEM) return false;
+                return (item as TestItem).isFocusable !== false;
+            });
+
+            renderListViewWithHeight({ items: mixedItems });
+            const container = screen.getByRole("grid");
+
+            // Focus and go to last item first, then navigate up
+            fireEvent.focus(container);
+            fireEvent.keyDown(container, { code: "End" });
+            fireEvent.keyDown(container, { code: "ArrowUp" });
+
+            // Verify it skipped non-focusable items
+            // and went to the first focusable item
+            const items = container.querySelectorAll(".mx_item");
+            expect(items[0]).toHaveAttribute("tabindex", "0"); // Item 1 is focused
+            expect(items[3]).toHaveAttribute("tabindex", "-1"); // Item 3 is not focused anymore
+        });
+    });
+
+    describe("Focus Management", () => {
+        it("should focus first item when list gains focus for the first time", () => {
+            renderListViewWithHeight();
+            const container = screen.getByRole("grid");
+
+            // Initial focus should go to first item
+            fireEvent.focus(container);
+
+            // Verify first item gets focus
+            const items = container.querySelectorAll(".mx_item");
+            expect(items[0]).toHaveAttribute("tabindex", "0");
+            // Other items should not be focused
+            for (let i = 1; i < items.length; i++) {
+                expect(items[i]).toHaveAttribute("tabindex", "-1");
+            }
+        });
+
+        it("should restore last focused item when regaining focus", () => {
+            renderListViewWithHeight();
+            const container = screen.getByRole("grid");
+
+            // Focus and navigate to simulate previous usage
+            fireEvent.focus(container);
+            fireEvent.keyDown(container, { code: "ArrowDown" });
+
+            // Verify item 2 is focused
+            let items = container.querySelectorAll(".mx_item");
+            expect(items[2]).toHaveAttribute("tabindex", "0"); // ArrowDown skips to item 2
+
+            // Simulate blur by focusing elsewhere
+            fireEvent.blur(container);
+
+            // Regain focus should restore last position
+            fireEvent.focus(container);
+
+            // Verify focus is restored to the previously focused item
+            items = container.querySelectorAll(".mx_item");
+            expect(items[2]).toHaveAttribute("tabindex", "0"); // Should still be item 2
+        });
+
+        it("should not interfere with focus if item is already focused", () => {
+            renderListViewWithHeight();
+            const container = screen.getByRole("grid");
+
+            // Focus once
+            fireEvent.focus(container);
+
+            // Focus again when already focused
+            fireEvent.focus(container);
+
+            expect(container).toBeInTheDocument();
+        });
+
+        it("should not scroll to top when clicking an item after manual scroll", () => {
+            // Create a larger list to enable meaningful scrolling
+            const largerItems = Array.from({ length: 50 }, (_, i) => ({
+                id: `item-${i}`,
+                name: `Item ${i}`,
+            }));
+
+            const mockOnClick = jest.fn();
+
+            mockGetItemComponent.mockImplementation(
+                (
+                    index: number,
+                    item: TestItemWithSeparator,
+                    context: any,
+                    onFocus: (item: TestItemWithSeparator, e: React.FocusEvent) => void,
+                ) => {
+                    const itemKey = typeof item === "string" ? item : item.id;
+                    const isFocused = context.tabIndexKey === itemKey;
+                    return (
+                        <div
+                            className="mx_item"
+                            data-testid={`row-${index}`}
+                            tabIndex={isFocused ? 0 : -1}
+                            onClick={() => mockOnClick(item)}
+                            onFocus={(e) => onFocus(item, e)}
+                        >
+                            {item === SEPARATOR_ITEM ? "---" : (item as TestItem).name}
+                        </div>
+                    );
+                },
+            );
+
+            const { container } = renderListViewWithHeight({ items: largerItems });
+            const listContainer = screen.getByRole("grid");
+
+            // Step 1: Focus the list initially (this sets tabIndexKey to first item: "item-0")
+            fireEvent.focus(listContainer);
+
+            // Verify first item is focused initially and tabIndexKey is set to first item
+            let items = container.querySelectorAll(".mx_item");
+            expect(items[0]).toHaveAttribute("tabindex", "0");
+            expect(items[0]).toHaveAttribute("data-testid", "row-0");
+
+            // Step 2: Simulate manual scrolling (mouse wheel, scroll bar drag, etc.)
+            // This changes which items are visible but DOES NOT change tabIndexKey
+            // tabIndexKey should still point to "item-0" but "item-0" is no longer visible
+            fireEvent.scroll(listContainer, { target: { scrollTop: 300 } });
+
+            // Step 3: After scrolling, different items should now be visible
+            // but tabIndexKey should still point to "item-0" (which is no longer visible)
+            items = container.querySelectorAll(".mx_item");
+
+            // Verify that item-0 is no longer in the DOM (because it's scrolled out of view)
+            const item0 = container.querySelector("[data-testid='row-0']");
+            expect(item0).toBeNull();
+
+            // Find a visible item to click on (should be items from further down the list)
+            const visibleItems = container.querySelectorAll(".mx_item");
+            expect(visibleItems.length).toBeGreaterThan(0);
+            const clickTargetItem = visibleItems[0]; // Click on the first visible item
+
+            // Click on the visible item
+            fireEvent.click(clickTargetItem);
+
+            // The click should trigger the onFocus callback, which updates the tabIndexKey
+            // This simulates the real user interaction where clicking an item focuses it
+            fireEvent.focus(clickTargetItem);
+
+            // Verify the click was handled
+            expect(mockOnClick).toHaveBeenCalled();
+
+            // With the fix applied: the clicked item should become focused (tabindex="0")
+            // This validates that the fix prevents unwanted scrolling back to the top
+            expect(clickTargetItem).toHaveAttribute("tabindex", "0");
+
+            // The key validation: ensure we haven't scrolled back to the top
+            // item-0 should still not be visible (if the fix is working)
+            const item0AfterClick = container.querySelector("[data-testid='row-0']");
+            expect(item0AfterClick).toBeNull();
+        });
+    });
+
+    describe("Accessibility", () => {
+        it("should set correct ARIA attributes", () => {
+            renderListViewWithHeight();
+            const container = screen.getByRole("grid");
+
+            expect(container).toHaveAttribute("role", "grid");
+            expect(container).toHaveAttribute("aria-rowcount", "4");
+            expect(container).toHaveAttribute("aria-colcount", "1");
+        });
+
+        it("should update aria-rowcount when items change", () => {
+            const { rerender } = renderListViewWithHeight();
+            let container = screen.getByRole("grid");
+            expect(container).toHaveAttribute("aria-rowcount", "4");
+
+            // Update with fewer items
+            const fewerItems = [
+                { id: "1", name: "Item 1" },
+                { id: "2", name: "Item 2" },
+            ];
+            rerender(
+                getListViewComponent({
+                    ...defaultProps,
+                    items: fewerItems,
+                }),
+            );
+
+            container = screen.getByRole("grid");
+            expect(container).toHaveAttribute("aria-rowcount", "2");
+        });
+
+        it("should handle custom ARIA label", () => {
+            renderListViewWithHeight({ "aria-label": "Custom list label" });
+            const container = screen.getByRole("grid");
+
+            expect(container).toHaveAttribute("aria-label", "Custom list label");
+        });
+    });
+});
diff --git a/test/unit-tests/components/views/voip/CallView-test.tsx b/test/unit-tests/components/views/voip/CallView-test.tsx
index ca6a50b418..ba8e9b619f 100644
--- a/test/unit-tests/components/views/voip/CallView-test.tsx
+++ b/test/unit-tests/components/views/voip/CallView-test.tsx
@@ -18,7 +18,6 @@ import {
 } from "matrix-js-sdk/src/matrix";
 import { Widget } from "matrix-widget-api";
 
-import type { ClientWidgetApi } from "matrix-widget-api";
 import {
     stubClient,
     mkRoomMember,
@@ -32,6 +31,8 @@ import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
 import { CallView as _CallView } from "../../../../../src/components/views/voip/CallView";
 import { WidgetMessagingStore } from "../../../../../src/stores/widgets/WidgetMessagingStore";
 import { CallStore } from "../../../../../src/stores/CallStore";
+import DMRoomMap from "../../../../../src/utils/DMRoomMap";
+import { type WidgetMessaging } from "../../../../../src/stores/widgets/WidgetMessaging";
 
 const CallView = wrapInMatrixClientContext(_CallView);
 
@@ -50,6 +51,7 @@ describe("CallView", () => {
 
         stubClient();
         client = mocked(MatrixClientPeg.safeGet());
+        DMRoomMap.makeShared(client);
 
         room = new Room("!1:example.org", client, "@alice:example.org", {
             pendingEventOrdering: PendingEventOrdering.Detached,
@@ -71,8 +73,11 @@ describe("CallView", () => {
 
         widget = new Widget(call.widget);
         WidgetMessagingStore.instance.storeMessaging(widget, room.roomId, {
+            on: () => {},
+            off: () => {},
             stop: () => {},
-        } as unknown as ClientWidgetApi);
+            embedUrl: "https://example.org",
+        } as unknown as WidgetMessaging);
     });
 
     afterEach(() => {
@@ -82,13 +87,13 @@ describe("CallView", () => {
         client.reEmitter.stopReEmitting(room, [RoomStateEvent.Events]);
     });
 
-    const renderView = async (skipLobby = false, role: string | undefined = undefined): Promise<void> => {
-        render(<CallView room={room} resizing={false} skipLobby={skipLobby} role={role} onClose={() => {}} />);
+    const renderView = async (role: string | undefined = undefined): Promise<void> => {
+        render(<CallView room={room} resizing={false} role={role} onClose={() => {}} />);
         await act(() => Promise.resolve()); // Let effects settle
     };
 
     it("accepts an accessibility role", async () => {
-        await renderView(undefined, "main");
+        await renderView("main");
         screen.getByRole("main");
     });
 
@@ -97,9 +102,4 @@ describe("CallView", () => {
         await renderView();
         expect(cleanSpy).toHaveBeenCalled();
     });
-
-    it("updates the call's skipLobby parameter", async () => {
-        await renderView(true);
-        expect(call.widget.data?.skipLobby).toBe(true);
-    });
 });
diff --git a/test/unit-tests/components/views/voip/LegacyCallView-test.tsx b/test/unit-tests/components/views/voip/LegacyCallView-test.tsx
index ee1f4fe326..08f757067d 100644
--- a/test/unit-tests/components/views/voip/LegacyCallView-test.tsx
+++ b/test/unit-tests/components/views/voip/LegacyCallView-test.tsx
@@ -8,9 +8,12 @@ Please see LICENSE files in the repository root for full details.
 import React from "react";
 import { render } from "jest-matrix-react";
 import { type MatrixCall } from "matrix-js-sdk/src/matrix";
+import { type CallFeed } from "matrix-js-sdk/src/webrtc/callFeed";
+import { SDPStreamMetadataPurpose } from "matrix-js-sdk/src/webrtc/callEventTypes";
 
 import LegacyCallView from "../../../../../src/components/views/voip/LegacyCallView";
 import { stubClient } from "../../../../test-utils";
+import DMRoomMap from "../../../../../src/utils/DMRoomMap";
 
 describe("LegacyCallView", () => {
     it("should exit full screen on unmount", () => {
@@ -32,9 +35,70 @@ describe("LegacyCallView", () => {
             isScreensharing: jest.fn().mockReturnValue(false),
         } as unknown as MatrixCall;
 
-        const { unmount } = render(<LegacyCallView call={call} />);
+        const { unmount } = render(<LegacyCallView call={call} sidebarShown={false} />);
         expect(document.exitFullscreen).not.toHaveBeenCalled();
         unmount();
         expect(document.exitFullscreen).toHaveBeenCalled();
     });
+
+    it("should show/hide the sidebar based on the sidebarShown prop", async () => {
+        stubClient();
+
+        const call = {
+            roomId: "test-room",
+            on: jest.fn(),
+            removeListener: jest.fn(),
+            getFeeds: jest.fn().mockReturnValue(
+                [{ local: true }, { local: false }, { local: true, screenshare: true }].map(
+                    (x, i) =>
+                        ({
+                            stream: { id: "test-" + i },
+                            addListener: jest.fn(),
+                            removeListener: jest.fn(),
+                            getMember: jest.fn(),
+                            isAudioMuted: jest.fn().mockReturnValue(true),
+                            isVideoMuted: jest.fn().mockReturnValue(true),
+                            isLocal: jest.fn().mockReturnValue(x.local),
+                            purpose: x.screenshare && SDPStreamMetadataPurpose.Screenshare,
+                        }) as unknown as CallFeed,
+                ),
+            ),
+            isLocalOnHold: jest.fn().mockReturnValue(false),
+            isRemoteOnHold: jest.fn().mockReturnValue(false),
+            isMicrophoneMuted: jest.fn().mockReturnValue(true),
+            isLocalVideoMuted: jest.fn().mockReturnValue(true),
+            isScreensharing: jest.fn().mockReturnValue(true),
+            noIncomingFeeds: jest.fn().mockReturnValue(false),
+            opponentSupportsSDPStreamMetadata: jest.fn().mockReturnValue(true),
+        } as unknown as MatrixCall;
+        DMRoomMap.setShared({
+            getUserIdForRoomId: jest.fn().mockReturnValue("test-user"),
+        } as unknown as DMRoomMap);
+
+        const { container, rerender } = render(<LegacyCallView call={call} sidebarShown={true} />);
+        expect(container.querySelector(".mx_LegacyCallViewSidebar")).toBeTruthy();
+        rerender(<LegacyCallView call={call} sidebarShown={true} />);
+        expect(container.querySelector(".mx_LegacyCallViewSidebar")).toBeTruthy();
+    });
+
+    it("should not show the sidebar button in picture-in-picture mode", async () => {
+        stubClient();
+
+        const call = {
+            on: jest.fn(),
+            removeListener: jest.fn(),
+            getFeeds: jest.fn().mockReturnValue([]),
+            isLocalOnHold: jest.fn().mockReturnValue(false),
+            isRemoteOnHold: jest.fn().mockReturnValue(false),
+            isMicrophoneMuted: jest.fn().mockReturnValue(false),
+            isLocalVideoMuted: jest.fn().mockReturnValue(false),
+            isScreensharing: jest.fn().mockReturnValue(false),
+        } as unknown as MatrixCall;
+        DMRoomMap.setShared({
+            getUserIdForRoomId: jest.fn().mockReturnValue("test-user"),
+        } as unknown as DMRoomMap);
+
+        const { container } = render(<LegacyCallView call={call} sidebarShown={false} pipMode={true} />);
+        expect(container.querySelector(".mx_LegacyCallViewButtons_button_sidebar")).toBeFalsy();
+    });
 });
diff --git a/test/unit-tests/components/views/voip/LegacyCallView/__snapshots__/LegacyCallViewButtons-test.tsx.snap b/test/unit-tests/components/views/voip/LegacyCallView/__snapshots__/LegacyCallViewButtons-test.tsx.snap
index c773177bd2..a470199a8f 100644
--- a/test/unit-tests/components/views/voip/LegacyCallView/__snapshots__/LegacyCallViewButtons-test.tsx.snap
+++ b/test/unit-tests/components/views/voip/LegacyCallView/__snapshots__/LegacyCallViewButtons-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`LegacyCallViewButtons should render the buttons 1`] = `
 <div>
diff --git a/test/unit-tests/components/views/voip/LegacyCallViewForRoom-test.tsx b/test/unit-tests/components/views/voip/LegacyCallViewForRoom-test.tsx
new file mode 100644
index 0000000000..2739c31257
--- /dev/null
+++ b/test/unit-tests/components/views/voip/LegacyCallViewForRoom-test.tsx
@@ -0,0 +1,111 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { fireEvent, render, waitFor } from "jest-matrix-react";
+import { MatrixCall } from "matrix-js-sdk/src/webrtc/call";
+import { CallEventHandlerEvent } from "matrix-js-sdk/src/webrtc/callEventHandler";
+
+import LegacyCallView from "../../../../../src/components/views/voip/LegacyCallView";
+import LegacyCallViewForRoom from "../../../../../src/components/views/voip/LegacyCallViewForRoom";
+import { mkStubRoom, stubClient } from "../../../../test-utils";
+import DMRoomMap from "../../../../../src/utils/DMRoomMap";
+import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
+import LegacyCallHandler from "../../../../../src/LegacyCallHandler";
+import { SDKContext, SdkContextClass } from "../../../../../src/contexts/SDKContext";
+
+jest.mock("../../../../../src/components/views/voip/LegacyCallView", () => jest.fn(() => "LegacyCallView"));
+
+describe("LegacyCallViewForRoom", () => {
+    const LegacyCallViewMock = LegacyCallView as unknown as jest.Mock;
+    let sdkContext: SdkContextClass;
+
+    beforeEach(() => {
+        stubClient();
+        sdkContext = new SdkContextClass();
+        LegacyCallViewMock.mockClear();
+    });
+
+    it("should remember sidebar state, defaulting to shown", async () => {
+        const callHandler = new LegacyCallHandler();
+        callHandler.start();
+        jest.spyOn(LegacyCallHandler, "instance", "get").mockImplementation(() => callHandler);
+
+        const call = new MatrixCall({
+            client: MatrixClientPeg.safeGet(),
+            roomId: "test-room",
+        });
+        DMRoomMap.setShared({
+            getUserIdForRoomId: jest.fn().mockReturnValue("test-user"),
+        } as unknown as DMRoomMap);
+
+        const room = mkStubRoom(call.roomId, "room", MatrixClientPeg.safeGet());
+        MatrixClientPeg.safeGet().getRoom = jest.fn().mockReturnValue(room);
+        const cli = MatrixClientPeg.safeGet();
+        cli.emit(CallEventHandlerEvent.Incoming, call);
+
+        const { rerender } = render(<LegacyCallViewForRoom roomId={call.roomId} />);
+
+        let props = LegacyCallViewMock.mock.lastCall![0];
+        expect(props.sidebarShown).toBeTruthy(); // Sidebar defaults to shown
+
+        props.setSidebarShown(false); // Hide the sidebar
+
+        rerender(<LegacyCallViewForRoom roomId={call.roomId} />);
+
+        console.log(LegacyCallViewMock.mock);
+
+        props = LegacyCallViewMock.mock.lastCall![0];
+        expect(props.sidebarShown).toBeFalsy();
+
+        rerender(<div> </div>); // Destroy the LegacyCallViewForRoom and LegacyCallView
+        LegacyCallViewMock.mockClear(); // Drop stored LegacyCallView props
+
+        rerender(<LegacyCallViewForRoom roomId={call.roomId} />);
+
+        props = LegacyCallViewMock.mock.lastCall![0];
+        expect(props.sidebarShown).toBeFalsy(); // Value was remembered
+    });
+
+    it("should notify on resize start events", async () => {
+        const call = new MatrixCall({
+            client: MatrixClientPeg.safeGet(),
+            roomId: "test-room",
+        });
+
+        const callHandler = {
+            getCallForRoom: jest.fn().mockReturnValue(call),
+            isCallSidebarShown: jest.fn().mockReturnValue(true),
+            addListener: jest.fn(),
+            removeListener: jest.fn(),
+        };
+        jest.spyOn(LegacyCallHandler, "instance", "get").mockImplementation(
+            () => callHandler as unknown as LegacyCallHandler,
+        );
+
+        jest.spyOn(sdkContext.resizeNotifier, "startResizing");
+        jest.spyOn(sdkContext.resizeNotifier, "stopResizing");
+        jest.spyOn(sdkContext.resizeNotifier, "notifyTimelineHeightChanged");
+
+        const { container } = render(<LegacyCallViewForRoom roomId={call.roomId} />, {
+            wrapper: ({ children }) => <SDKContext.Provider value={sdkContext}>{children}</SDKContext.Provider>,
+        });
+
+        const resizer = container.querySelector(".mx_LegacyCallViewForRoom_ResizeHandle");
+        await waitFor(() => {
+            expect(resizer).toBeInTheDocument();
+        });
+
+        fireEvent.mouseDown(resizer!);
+        fireEvent.mouseMove(resizer!, { clientY: 100 });
+        fireEvent.mouseUp(resizer!);
+
+        expect(sdkContext.resizeNotifier.startResizing).toHaveBeenCalled();
+        expect(sdkContext.resizeNotifier.stopResizing).toHaveBeenCalled();
+        expect(sdkContext.resizeNotifier.notifyTimelineHeightChanged).toHaveBeenCalled();
+    });
+});
diff --git a/test/unit-tests/createRoom-test.ts b/test/unit-tests/createRoom-test.ts
index c75bebc0fb..04f7101ff9 100644
--- a/test/unit-tests/createRoom-test.ts
+++ b/test/unit-tests/createRoom-test.ts
@@ -1,4 +1,5 @@
 /*
+Copyright 2025 Element Creations Ltd.
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
@@ -7,17 +8,38 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { mocked, type Mocked } from "jest-mock";
-import { type MatrixClient, type Device, Preset, RoomType } from "matrix-js-sdk/src/matrix";
+import {
+    type MatrixClient,
+    type Device,
+    Preset,
+    RoomType,
+    JoinRule,
+    RoomVersionStability,
+} from "matrix-js-sdk/src/matrix";
 import { type CryptoApi } from "matrix-js-sdk/src/crypto-api";
 import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
+import { act } from "jest-matrix-react";
 
-import { stubClient, setupAsyncStoreWithClient, mockPlatformPeg, getMockClientWithEventEmitter } from "../test-utils";
+import {
+    stubClient,
+    setupAsyncStoreWithClient,
+    mockPlatformPeg,
+    getMockClientWithEventEmitter,
+    mkRoom,
+} from "../test-utils";
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
 import WidgetStore from "../../src/stores/WidgetStore";
 import WidgetUtils from "../../src/utils/WidgetUtils";
 import { JitsiCall, ElementCall } from "../../src/models/Call";
-import createRoom, { checkUserIsAllowedToChangeEncryption, canEncryptToAllUsers } from "../../src/createRoom";
+import createRoom, {
+    checkUserIsAllowedToChangeEncryption,
+    canEncryptToAllUsers,
+    waitForRoomEncryption,
+} from "../../src/createRoom";
 import SettingsStore from "../../src/settings/SettingsStore";
+import { ElementCallMemberEventType } from "../../src/call-types";
+import DMRoomMap from "../../src/utils/DMRoomMap";
+import { PreferredRoomVersions } from "../../src/utils/PreferredRoomVersions";
 
 describe("createRoom", () => {
     mockPlatformPeg();
@@ -26,23 +48,230 @@ describe("createRoom", () => {
     beforeEach(() => {
         stubClient();
         client = mocked(MatrixClientPeg.safeGet());
+        DMRoomMap.makeShared(client);
     });
 
     afterEach(() => jest.clearAllMocks());
 
+    it("creates a private room", async () => {
+        await createRoom(client, { createOpts: { preset: Preset.PrivateChat } });
+
+        expect(client.createRoom).toHaveBeenCalledWith({
+            preset: "private_chat",
+            visibility: "private",
+            initial_state: [{ state_key: "", type: "m.room.guest_access", content: { guest_access: "can_join" } }],
+        });
+    });
+
+    it("creates a private room with encryption", async () => {
+        await createRoom(client, { createOpts: { preset: Preset.PrivateChat }, encryption: true });
+
+        expect(client.createRoom).toHaveBeenCalledWith({
+            preset: "private_chat",
+            visibility: "private",
+            initial_state: [
+                { state_key: "", type: "m.room.guest_access", content: { guest_access: "can_join" } },
+                {
+                    state_key: "",
+                    type: "m.room.encryption",
+                    content: {
+                        algorithm: "m.megolm.v1.aes-sha2",
+                    },
+                },
+            ],
+        });
+    });
+
+    it("creates a private room with state event encryption", async () => {
+        // When we create a room with state encryption and details like name,
+        // topic, avatar
+        const oldCreateRoom = await createRoomWithStateEncryption(client, {
+            name: "Super-Secret Super-colliding Super Room",
+            topic: "super **Topic**",
+            avatar: "http://example.com/myavatar.png",
+        });
+
+        // Then it is created with the right m.room.encryption event
+        expect(oldCreateRoom).toHaveBeenCalledWith({
+            preset: "private_chat",
+            visibility: "private",
+            initial_state: [
+                { state_key: "", type: "m.room.guest_access", content: { guest_access: "can_join" } },
+                {
+                    state_key: "",
+                    type: "m.room.encryption",
+                    content: {
+                        "algorithm": "m.megolm.v1.aes-sha2",
+                        "io.element.msc4362.encrypt_state_events": true,
+                    },
+                },
+                // Room name is NOT included, since it needs to be encrypted.
+            ],
+        });
+
+        // And the room name, topic and avatar are set later
+        expect(client.setRoomName).toHaveBeenCalledWith("!1:example.org", "Super-Secret Super-colliding Super Room");
+
+        expect(client.setRoomTopic).toHaveBeenCalledWith(
+            "!1:example.org",
+            "super **Topic**",
+            "super <strong>Topic</strong>",
+        );
+
+        expect(client.sendStateEvent).toHaveBeenCalledWith(
+            "!1:example.org",
+            "m.room.avatar",
+            { url: "http://example.com/myavatar.png" },
+            "",
+        );
+    });
+
+    it("creates a private room with state event encryption - file avatar", async () => {
+        // When we create a room with state encryption and a file avatar
+        client.uploadContent.mockResolvedValue({ content_uri: "mxc://foo.png" });
+        const oldCreateRoom = await createRoomWithStateEncryption(client, {
+            avatar: new File([], "myfile.png"),
+        });
+
+        // Then it is created with the right m.room.encryption event
+        expect(oldCreateRoom).toHaveBeenCalledWith({
+            preset: "private_chat",
+            visibility: "private",
+            initial_state: [
+                { state_key: "", type: "m.room.guest_access", content: { guest_access: "can_join" } },
+                {
+                    state_key: "",
+                    type: "m.room.encryption",
+                    content: {
+                        "algorithm": "m.megolm.v1.aes-sha2",
+                        "io.element.msc4362.encrypt_state_events": true,
+                    },
+                },
+                // Room name is NOT included, since it needs to be encrypted.
+            ],
+        });
+
+        // And the avatar is set later
+        expect(client.sendStateEvent).toHaveBeenCalledWith(
+            "!1:example.org",
+            "m.room.avatar",
+            { url: "mxc://foo.png" },
+            "",
+        );
+    });
+
+    it("creates a private room with state event encryption - no details", async () => {
+        // When we create a room with state encryption and no further room
+        // details
+        const oldCreateRoom = await createRoomWithStateEncryption(client, {});
+
+        // Then it is created with the right m.room.encryption event
+        expect(oldCreateRoom).toHaveBeenCalledWith({
+            preset: "private_chat",
+            visibility: "private",
+            initial_state: [
+                { state_key: "", type: "m.room.guest_access", content: { guest_access: "can_join" } },
+                {
+                    state_key: "",
+                    type: "m.room.encryption",
+                    content: {
+                        "algorithm": "m.megolm.v1.aes-sha2",
+                        "io.element.msc4362.encrypt_state_events": true,
+                    },
+                },
+                // Room name is NOT included, since it needs to be encrypted.
+            ],
+        });
+
+        // And the room name, topic and avatar were not set since we didn't
+        // supply them
+        expect(client.setRoomName).not.toHaveBeenCalled();
+        expect(client.setRoomTopic).not.toHaveBeenCalled();
+        expect(client.sendStateEvent).not.toHaveBeenCalled();
+    });
+
+    it("cancels room creation if we time out before getting state events", async () => {
+        // We are not testing createRoom here, just waitForRoomEncryption, which is used
+        // inside. This allows us to pass in a shorter waitTime.
+
+        // Create a mock room that provides the needed methods
+        const { room_id: roomId } = await client.createRoom({});
+        const room = client.getRoom(roomId)!;
+        room.getLiveTimeline = jest
+            .fn()
+            .mockReturnValue({ getState: jest.fn().mockReturnValue({ on: jest.fn(), off: jest.fn() }) });
+
+        // Call waitForRoomEncryption with a small timeout ans expect an error
+        const error = new Error("Timed out while waiting for room to enable encryption");
+        await expect(waitForRoomEncryption(room, 1)).rejects.toThrow(error);
+    });
+
+    it("creates a private room in a space", async () => {
+        const roomId = await createRoom(client, { roomType: RoomType.Space });
+        const parentSpace = client.getRoom(roomId!)!;
+        client.createRoom.mockClear();
+
+        await createRoom(client, { parentSpace, createOpts: { preset: Preset.PrivateChat } });
+
+        expect(client.createRoom).toHaveBeenCalledWith({
+            preset: "private_chat",
+            visibility: "private",
+            initial_state: [
+                { state_key: "", type: "m.room.guest_access", content: { guest_access: "can_join" } },
+                { type: "m.space.parent", state_key: parentSpace.roomId, content: { canonical: true, via: [] } },
+            ],
+        });
+    });
+
+    it("creates a public room", async () => {
+        await createRoom(client, { createOpts: { preset: Preset.PublicChat } });
+
+        expect(client.createRoom).toHaveBeenCalledWith({
+            preset: "public_chat",
+            visibility: "private",
+            initial_state: [{ state_key: "", type: "m.room.guest_access", content: { guest_access: "can_join" } }],
+        });
+    });
+
+    it("creates a public room with a topic", async () => {
+        await createRoom(client, { createOpts: { preset: Preset.PublicChat }, topic: "My topic" });
+
+        expect(client.createRoom).toHaveBeenCalledWith({
+            preset: "public_chat",
+            visibility: "private",
+            topic: "My topic",
+            initial_state: [{ state_key: "", type: "m.room.guest_access", content: { guest_access: "can_join" } }],
+        });
+    });
+
+    it("creates a public room in a space", async () => {
+        const roomId = await createRoom(client, { roomType: RoomType.Space });
+        const parentSpace = client.getRoom(roomId!)!;
+        client.createRoom.mockClear();
+
+        await createRoom(client, { parentSpace, createOpts: { preset: Preset.PublicChat } });
+
+        expect(client.createRoom).toHaveBeenCalledWith({
+            preset: "public_chat",
+            visibility: "private",
+            initial_state: [
+                { state_key: "", type: "m.room.guest_access", content: { guest_access: "can_join" } },
+                { type: "m.space.parent", state_key: parentSpace.roomId, content: { canonical: true, via: [] } },
+            ],
+        });
+    });
+
     it("sets up Jitsi video rooms correctly", async () => {
         setupAsyncStoreWithClient(WidgetStore.instance, client);
         jest.spyOn(WidgetUtils, "waitForRoomWidget").mockResolvedValue();
         const createCallSpy = jest.spyOn(JitsiCall, "create");
 
-        const userId = client.getUserId()!;
-        const roomId = await createRoom(client, { roomType: RoomType.ElementVideo });
+        await createRoom(client, { roomType: RoomType.ElementVideo });
 
         const [
             [
                 {
                     power_level_content_override: {
-                        users: { [userId]: userPower },
                         events: {
                             "im.vector.modular.widgets": widgetPower,
                             [JitsiCall.MEMBER_EVENT_TYPE]: callMemberPower,
@@ -52,46 +281,30 @@ describe("createRoom", () => {
             ],
         ] = client.createRoom.mock.calls as any; // no good type
 
-        // We should have had enough power to be able to set up the widget
-        expect(userPower).toBeGreaterThanOrEqual(widgetPower);
         // and should have actually set it up
         expect(createCallSpy).toHaveBeenCalled();
 
         // All members should be able to update their connected devices
         expect(callMemberPower).toEqual(0);
         // widget should be immutable for admins
-        expect(widgetPower).toBeGreaterThan(100);
-        // and we should have been reset back to admin
-        expect(client.setPowerLevel).toHaveBeenCalledWith(roomId, userId, 100);
+        expect(widgetPower).toEqual(100);
     });
 
     it("sets up Element video rooms correctly", async () => {
-        const userId = client.getUserId()!;
         const createCallSpy = jest.spyOn(ElementCall, "create");
         const callMembershipSpy = jest.spyOn(MatrixRTCSession, "callMembershipsForRoom");
         callMembershipSpy.mockReturnValue([]);
 
-        const roomId = await createRoom(client, { roomType: RoomType.UnstableCall });
+        await createRoom(client, { roomType: RoomType.UnstableCall });
 
-        const userPower = client.createRoom.mock.calls[0][0].power_level_content_override?.users?.[userId];
-        const callPower =
-            client.createRoom.mock.calls[0][0].power_level_content_override?.events?.[ElementCall.CALL_EVENT_TYPE.name];
         const callMemberPower =
-            client.createRoom.mock.calls[0][0].power_level_content_override?.events?.[
-                ElementCall.MEMBER_EVENT_TYPE.name
-            ];
+            client.createRoom.mock.calls[0][0].power_level_content_override?.events?.[ElementCallMemberEventType.name];
 
-        // We should have had enough power to be able to set up the call
-        expect(userPower).toBeGreaterThanOrEqual(callPower!);
         // and should have actually set it up
         expect(createCallSpy).toHaveBeenCalled();
 
         // All members should be able to update their connected devices
         expect(callMemberPower).toEqual(0);
-        // call should be immutable for admins
-        expect(callPower).toBeGreaterThan(100);
-        // and we should have been reset back to admin
-        expect(client.setPowerLevel).toHaveBeenCalledWith(roomId, userId, 100);
     });
 
     it("doesn't create calls in non-video-rooms", async () => {
@@ -111,14 +324,9 @@ describe("createRoom", () => {
 
         await createRoom(client, {});
 
-        const callPower =
-            client.createRoom.mock.calls[0][0].power_level_content_override?.events?.[ElementCall.CALL_EVENT_TYPE.name];
         const callMemberPower =
-            client.createRoom.mock.calls[0][0].power_level_content_override?.events?.[
-                ElementCall.MEMBER_EVENT_TYPE.name
-            ];
+            client.createRoom.mock.calls[0][0].power_level_content_override?.events?.[ElementCallMemberEventType.name];
 
-        expect(callPower).toBe(100);
         expect(callMemberPower).toBe(0);
     });
 
@@ -148,6 +356,80 @@ describe("createRoom", () => {
             }),
         );
     });
+
+    describe("room versions", () => {
+        afterEach(() => {
+            jest.clearAllMocks();
+        });
+        it("should use the correct room version for knocking when default does not support it", async () => {
+            client.getCapabilities.mockResolvedValue({
+                "m.room_versions": {
+                    default: "1",
+                    available: {
+                        [PreferredRoomVersions.KnockRooms]: RoomVersionStability.Stable,
+                        "1": RoomVersionStability.Stable,
+                    },
+                },
+            });
+            await createRoom(client, { joinRule: JoinRule.Knock });
+            expect(client.createRoom).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    room_version: PreferredRoomVersions.KnockRooms,
+                }),
+            );
+        });
+        it("should use the default room version for knocking when default supports it", async () => {
+            client.getCapabilities.mockResolvedValue({
+                "m.room_versions": {
+                    default: "12",
+                    available: {
+                        [PreferredRoomVersions.KnockRooms]: RoomVersionStability.Stable,
+                        "12": RoomVersionStability.Stable,
+                    },
+                },
+            });
+            await createRoom(client, { joinRule: JoinRule.Knock });
+            expect(client.createRoom).toHaveBeenCalledWith(
+                expect.not.objectContaining({
+                    room_version: expect.anything(),
+                }),
+            );
+        });
+        it("should use the correct room version for restricted join rules when default does not support it", async () => {
+            client.getCapabilities.mockResolvedValue({
+                "m.room_versions": {
+                    default: "1",
+                    available: {
+                        [PreferredRoomVersions.RestrictedRooms]: RoomVersionStability.Stable,
+                        "1": RoomVersionStability.Stable,
+                    },
+                },
+            });
+            await createRoom(client, { parentSpace: mkRoom(client, "!parent"), joinRule: JoinRule.Restricted });
+            expect(client.createRoom).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    room_version: PreferredRoomVersions.RestrictedRooms,
+                }),
+            );
+        });
+        it("should use the default room version for restricted join rules when default supports it", async () => {
+            client.getCapabilities.mockResolvedValue({
+                "m.room_versions": {
+                    default: "12",
+                    available: {
+                        [PreferredRoomVersions.RestrictedRooms]: RoomVersionStability.Stable,
+                        "12": RoomVersionStability.Stable,
+                    },
+                },
+            });
+            await createRoom(client, { parentSpace: mkRoom(client, "!parent"), joinRule: JoinRule.Restricted });
+            expect(client.createRoom).toHaveBeenCalledWith(
+                expect.not.objectContaining({
+                    room_version: expect.anything(),
+                }),
+            );
+        });
+    });
 });
 
 describe("canEncryptToAllUsers", () => {
@@ -264,3 +546,42 @@ describe("checkUserIsAllowedToChangeEncryption()", () => {
         );
     });
 });
+
+interface RoomDetails {
+    name?: string;
+    topic?: string;
+    avatar?: string | File;
+}
+
+/**
+ * Call createRoom passing in stateEncryption: true, and set up the returned
+ * room to return true when hasEncryptionStateEvent is called, to avoid
+ * createRoom stalling forever waiting for an m.room.encryption event to arrive.
+ */
+async function createRoomWithStateEncryption(client: MatrixClient, roomDetails: RoomDetails) {
+    const oldCreateRoom = client.createRoom;
+
+    // @ts-ignore Replacing createRoom
+    client.createRoom = async (options) => {
+        const { room_id: roomId } = await oldCreateRoom(options);
+        const room = client.getRoom(roomId);
+        room!.hasEncryptionStateEvent = () => true;
+        return {
+            room_id: roomId,
+        };
+    };
+
+    // When we create a room asking for state encryption
+    await act(
+        async () =>
+            await createRoom(client, {
+                createOpts: {
+                    preset: Preset.PrivateChat,
+                },
+                encryption: true,
+                stateEncryption: true,
+                ...roomDetails,
+            }),
+    );
+    return oldCreateRoom;
+}
diff --git a/test/unit-tests/editor/__snapshots__/deserialize-test.ts.snap b/test/unit-tests/editor/__snapshots__/deserialize-test.ts.snap
index 3a0d20713d..887f5a5f13 100644
--- a/test/unit-tests/editor/__snapshots__/deserialize-test.ts.snap
+++ b/test/unit-tests/editor/__snapshots__/deserialize-test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`editor/deserialize html messages escapes angle brackets 1`] = `
 [
diff --git a/test/unit-tests/events/EventTileFactory-test.ts b/test/unit-tests/events/EventTileFactory-test.ts
index 6a4b5fa355..b1ff4c57bf 100644
--- a/test/unit-tests/events/EventTileFactory-test.ts
+++ b/test/unit-tests/events/EventTileFactory-test.ts
@@ -13,10 +13,13 @@ import {
     JSONEventFactory,
     MessageEventFactory,
     pickFactory,
+    renderTile,
     RoomCreateEventFactory,
 } from "../../../src/events/EventTileFactory";
 import SettingsStore from "../../../src/settings/SettingsStore";
 import { createTestClient, mkEvent } from "../../test-utils";
+import { TimelineRenderingType } from "../../../src/contexts/RoomContext";
+import { ModuleApi } from "../../../src/modules/Api";
 
 const roomId = "!room:example.com";
 
@@ -205,3 +208,54 @@ describe("pickFactory", () => {
         });
     });
 });
+
+describe("renderTile", () => {
+    let client: MatrixClient;
+
+    beforeEach(() => {
+        client = createTestClient();
+    });
+
+    it("rendering a tile defers to the module API", () => {
+        ModuleApi.instance.customComponents.renderMessage = jest.fn();
+
+        const messageEvent = mkEvent({
+            event: true,
+            type: EventType.RoomMessage,
+            user: client.getUserId()!,
+            room: roomId,
+            content: {
+                msgtype: MsgType.Text,
+            },
+        });
+
+        renderTile(TimelineRenderingType.Room, { mxEvent: messageEvent, showHiddenEvents: false }, client);
+
+        expect(ModuleApi.instance.customComponents.renderMessage).toHaveBeenCalledWith(
+            {
+                mxEvent: messageEvent,
+            },
+            expect.any(Function),
+        );
+    });
+
+    it("rendering a tile for a message of unknown type defers to the module API", () => {
+        ModuleApi.instance.customComponents.renderMessage = jest.fn();
+
+        const messageEvent = mkEvent({
+            event: true,
+            type: "weird.type",
+            user: client.getUserId()!,
+            room: roomId,
+            content: {
+                msgtype: MsgType.Text,
+            },
+        });
+
+        renderTile(TimelineRenderingType.Room, { mxEvent: messageEvent, showHiddenEvents: false }, client);
+
+        expect(ModuleApi.instance.customComponents.renderMessage).toHaveBeenCalledWith({
+            mxEvent: messageEvent,
+        });
+    });
+});
diff --git a/test/unit-tests/favicon-test.ts b/test/unit-tests/favicon-test.ts
index 8972861773..32c1ea9966 100644
--- a/test/unit-tests/favicon-test.ts
+++ b/test/unit-tests/favicon-test.ts
@@ -14,6 +14,8 @@ jest.useFakeTimers();
 
 describe("Favicon", () => {
     beforeEach(() => {
+        jest.restoreAllMocks();
+        document.getElementsByTagName("head")[0]?.remove();
         const head = document.createElement("head");
         window.document.documentElement.prepend(head);
     });
@@ -50,4 +52,40 @@ describe("Favicon", () => {
         const newLink = window.document.querySelector("link");
         expect(originalLink).not.toStrictEqual(newLink);
     });
+
+    it("should default to 144px", () => {
+        const head = document.getElementsByTagName("head")[0];
+        const link = document.createElement("link");
+        link.rel = "icon";
+        link.href = "favicon.png";
+        head.appendChild(link);
+
+        const spy = jest.spyOn(document, "createElement");
+        const favicon = new Favicon();
+        jest.runAllTimers();
+
+        const img = spy.mock.results[0].value;
+        img.onload();
+
+        expect(favicon["canvas"].height).toBe(144);
+    });
+
+    it("should use the size of the last favicon", () => {
+        const head = document.getElementsByTagName("head")[0];
+        const link = document.createElement("link");
+        link.rel = "icon";
+        link.sizes = "512x512";
+        link.href = "favicon.png";
+        head.appendChild(link);
+
+        const spy = jest.spyOn(document, "createElement");
+        const favicon = new Favicon();
+        jest.runAllTimers();
+
+        const img = spy.mock.results[0].value;
+        img.height = 512;
+        img.onload();
+
+        expect(favicon["canvas"].height).toBe(512);
+    });
 });
diff --git a/test/unit-tests/hooks/useMediaVisible-test.tsx b/test/unit-tests/hooks/useMediaVisible-test.tsx
index d8f71b764a..c7513f80df 100644
--- a/test/unit-tests/hooks/useMediaVisible-test.tsx
+++ b/test/unit-tests/hooks/useMediaVisible-test.tsx
@@ -6,7 +6,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { act, renderHook, waitFor } from "jest-matrix-react";
-import { JoinRule, type MatrixClient, type Room } from "matrix-js-sdk/src/matrix";
+import { JoinRule, MatrixEvent, type MatrixClient, type Room } from "matrix-js-sdk/src/matrix";
 
 import { useMediaVisible } from "../../../src/hooks/useMediaVisible";
 import { createTestClient, mkStubRoom, withClientContextRenderOptions } from "../../test-utils";
@@ -22,8 +22,18 @@ describe("useMediaVisible", () => {
     let room: Room;
     const mediaPreviewConfig: MediaPreviewConfig = MediaPreviewConfigController.default;
 
-    function render() {
-        return renderHook(() => useMediaVisible(EVENT_ID, ROOM_ID), withClientContextRenderOptions(matrixClient));
+    function render({ sender }: { sender?: string } = {}) {
+        return renderHook(
+            () =>
+                useMediaVisible(
+                    new MatrixEvent({
+                        event_id: EVENT_ID,
+                        room_id: ROOM_ID,
+                        sender,
+                    }),
+                ),
+            withClientContextRenderOptions(matrixClient),
+        );
     }
     beforeEach(() => {
         matrixClient = createTestClient();
@@ -42,53 +52,62 @@ describe("useMediaVisible", () => {
         jest.restoreAllMocks();
     });
 
-    it("should display media by default", async () => {
-        const { result } = render();
-        expect(result.current[0]).toEqual(true);
+    it("should display media by default", () => {
+        const [visible] = render().result.current;
+        expect(visible).toEqual(true);
     });
 
-    it("should hide media when media previews are Off", async () => {
+    it("should hide media when media previews are Off", () => {
         mediaPreviewConfig.media_previews = MediaPreviewValue.Off;
-        const { result } = render();
-        expect(result.current[0]).toEqual(false);
+        const [visible] = render().result.current;
+        expect(visible).toEqual(false);
+    });
+
+    it("should always show media sent by us", () => {
+        mediaPreviewConfig.media_previews = MediaPreviewValue.Off;
+        const [visible] = render({ sender: matrixClient.getUserId()! }).result.current;
+        expect(visible).toEqual(true);
     });
 
     it.each([[JoinRule.Invite], [JoinRule.Knock], [JoinRule.Restricted]])(
         "should display media when media previews are Private and the join rule is %s",
-        async (rule) => {
+        (rule) => {
             mediaPreviewConfig.media_previews = MediaPreviewValue.Private;
             room.currentState.getJoinRule = jest.fn().mockReturnValue(rule);
-            const { result } = render();
-            expect(result.current[0]).toEqual(true);
+            const [visible] = render().result.current;
+            expect(visible).toEqual(true);
         },
     );
 
     it.each([[JoinRule.Public], ["anything_else"]])(
         "should hide media when media previews are Private and the join rule is %s",
-        async (rule) => {
+        (rule) => {
             mediaPreviewConfig.media_previews = MediaPreviewValue.Private;
             room.currentState.getJoinRule = jest.fn().mockReturnValue(rule);
-            const { result } = render();
-            expect(result.current[0]).toEqual(false);
+            const [visible] = render().result.current;
+            expect(visible).toEqual(false);
         },
     );
 
     it("should hide media after function is called", async () => {
         const { result } = render();
         expect(result.current[0]).toEqual(true);
+        expect(result.current[1]).toBeDefined();
         act(() => {
-            result.current[1](false);
+            result.current[1]!(false);
         });
         await waitFor(() => {
             expect(result.current[0]).toEqual(false);
         });
     });
+
     it("should show media after function is called", async () => {
         mediaPreviewConfig.media_previews = MediaPreviewValue.Off;
         const { result } = render();
         expect(result.current[0]).toEqual(false);
+        expect(result.current[1]).toBeDefined();
         act(() => {
-            result.current[1](true);
+            result.current[1]!(true);
         });
         await waitFor(() => {
             expect(result.current[0]).toEqual(true);
diff --git a/test/unit-tests/indexing/EventIndex-test.ts b/test/unit-tests/indexing/EventIndex-test.ts
new file mode 100644
index 0000000000..3e33beaf3b
--- /dev/null
+++ b/test/unit-tests/indexing/EventIndex-test.ts
@@ -0,0 +1,186 @@
+/*
+Copyright 2025 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { type Mocked } from "jest-mock";
+import {
+    Direction,
+    type MatrixClient,
+    type IEvent,
+    MatrixEvent,
+    type Room,
+    ClientEvent,
+    SyncState,
+} from "matrix-js-sdk/src/matrix";
+
+import EventIndex from "../../../src/indexing/EventIndex.ts";
+import { emitPromise, getMockClientWithEventEmitter, mockClientMethodsRooms, mockPlatformPeg } from "../../test-utils";
+import type BaseEventIndexManager from "../../../src/indexing/BaseEventIndexManager.ts";
+import { type ICrawlerCheckpoint } from "../../../src/indexing/BaseEventIndexManager.ts";
+import SettingsStore from "../../../src/settings/SettingsStore.ts";
+
+afterEach(() => {
+    jest.restoreAllMocks();
+});
+
+describe("EventIndex", () => {
+    it("crawls through the loaded checkpoints", async () => {
+        const mockIndexingManager = {
+            loadCheckpoints: jest.fn(),
+            removeCrawlerCheckpoint: jest.fn(),
+            isEventIndexEmpty: jest.fn().mockResolvedValue(false),
+        } as any as Mocked<BaseEventIndexManager>;
+        mockPlatformPeg({ getEventIndexingManager: () => mockIndexingManager });
+
+        const room1 = { roomId: "!room1:id" } as any as Room;
+        const room2 = { roomId: "!room2:id" } as any as Room;
+        const mockClient = getMockClientWithEventEmitter({
+            getEventMapper: () => (obj: Partial<IEvent>) => new MatrixEvent(obj),
+            createMessagesRequest: jest.fn(),
+            ...mockClientMethodsRooms([room1, room2]),
+        });
+
+        jest.spyOn(SettingsStore, "getValueAt").mockImplementation((_level, settingName): any => {
+            if (settingName === "crawlerSleepTime") return 0;
+            return undefined;
+        });
+
+        mockIndexingManager.loadCheckpoints.mockResolvedValue([
+            { roomId: "!room1:id", token: "token1", direction: Direction.Backward } as ICrawlerCheckpoint,
+            { roomId: "!room2:id", token: "token2", direction: Direction.Forward } as ICrawlerCheckpoint,
+        ]);
+
+        const indexer = new EventIndex();
+        await indexer.init();
+        let changedCheckpointPromise = emitPromise(indexer, "changedCheckpoint") as Promise<Room>;
+
+        indexer.startCrawler();
+
+        // Mock out the /messags request, and wait for the crawler to hit the first room
+        const mock1 = mockCreateMessagesRequest(mockClient);
+        let changedCheckpoint = await changedCheckpointPromise;
+        expect(changedCheckpoint.roomId).toEqual("!room1:id");
+
+        await mock1.called;
+        expect(mockClient.createMessagesRequest).toHaveBeenCalledWith("!room1:id", "token1", 100, "b");
+
+        // Continue, and wait for the crawler to hit the second room
+        changedCheckpointPromise = emitPromise(indexer, "changedCheckpoint") as Promise<Room>;
+        mock1.resolve({ chunk: [] });
+        changedCheckpoint = await changedCheckpointPromise;
+        expect(changedCheckpoint.roomId).toEqual("!room2:id");
+
+        // Mock out the /messages request again, and wait for it to be called
+        const mock2 = mockCreateMessagesRequest(mockClient);
+        await mock2.called;
+        expect(mockClient.createMessagesRequest).toHaveBeenCalledWith("!room2:id", "token2", 100, "f");
+    });
+
+    it("adds checkpoints for the encrypted rooms after the first sync", async () => {
+        const mockIndexingManager = {
+            loadCheckpoints: jest.fn().mockResolvedValue([]),
+            isEventIndexEmpty: jest.fn().mockResolvedValue(true),
+            addCrawlerCheckpoint: jest.fn(),
+            removeCrawlerCheckpoint: jest.fn(),
+            commitLiveEvents: jest.fn(),
+        } as any as Mocked<BaseEventIndexManager>;
+        mockPlatformPeg({ getEventIndexingManager: () => mockIndexingManager });
+
+        const room1 = {
+            roomId: "!room1:id",
+            getLiveTimeline: () => ({
+                getPaginationToken: () => "token1",
+            }),
+        } as any as Room;
+        const room2 = {
+            roomId: "!room2:id",
+            getLiveTimeline: () => ({
+                getPaginationToken: () => "token2",
+            }),
+        } as any as Room;
+        const mockCrypto = {
+            isEncryptionEnabledInRoom: jest.fn().mockResolvedValue(true),
+        };
+        const mockClient = getMockClientWithEventEmitter({
+            getEventMapper: () => (obj: Partial<IEvent>) => new MatrixEvent(obj),
+            createMessagesRequest: jest.fn(),
+            getCrypto: () => mockCrypto as any,
+            ...mockClientMethodsRooms([room1, room2]),
+        });
+
+        const commitLiveEventsCalled = Promise.withResolvers<void>();
+        mockIndexingManager.commitLiveEvents.mockImplementation(async () => {
+            commitLiveEventsCalled.resolve();
+        });
+
+        const indexer = new EventIndex();
+        await indexer.init();
+
+        // During the first sync, some events are added to the index, meaning that `isEventIndexEmpty` will now be false.
+        mockIndexingManager.isEventIndexEmpty.mockResolvedValue(false);
+
+        // The first sync completes:
+        mockClient.emit(ClientEvent.Sync, SyncState.Syncing, null, {});
+
+        // Wait for `commitLiveEvents` to be called, by which time the checkpoints should have been added.
+        await commitLiveEventsCalled.promise;
+        expect(mockIndexingManager.addCrawlerCheckpoint).toHaveBeenCalledTimes(4);
+        expect(mockIndexingManager.addCrawlerCheckpoint).toHaveBeenCalledWith({
+            roomId: "!room1:id",
+            token: "token1",
+            direction: Direction.Backward,
+            fullCrawl: true,
+        });
+        expect(mockIndexingManager.addCrawlerCheckpoint).toHaveBeenCalledWith({
+            roomId: "!room1:id",
+            token: "token1",
+            direction: Direction.Forward,
+        });
+        expect(mockIndexingManager.addCrawlerCheckpoint).toHaveBeenCalledWith({
+            roomId: "!room2:id",
+            token: "token2",
+            direction: Direction.Backward,
+            fullCrawl: true,
+        });
+        expect(mockIndexingManager.addCrawlerCheckpoint).toHaveBeenCalledWith({
+            roomId: "!room2:id",
+            token: "token2",
+            direction: Direction.Forward,
+        });
+    });
+});
+
+/**
+ * Mock out the `createMessagesRequest` method on the client, with an implementation that will block until a resolver is called.
+ *
+ * @returns An object with the following properties:
+ *  * `called`: A promise that resolves when `createMessagesRequest` is called.
+ *  * `resolve`: A function that can be called to allow `createMessagesRequest` to complete.
+ */
+function mockCreateMessagesRequest(mockClient: Mocked<MatrixClient>): {
+    called: Promise<void>;
+    resolve: (result: any) => void;
+} {
+    const messagesCalledPromise = Promise.withResolvers<void>();
+    const messagesResultPromise = Promise.withResolvers();
+    mockClient.createMessagesRequest.mockImplementationOnce(() => {
+        messagesCalledPromise.resolve();
+        return messagesResultPromise.promise as any;
+    });
+    return {
+        called: messagesCalledPromise.promise,
+        resolve: messagesResultPromise.resolve,
+    };
+}
diff --git a/test/unit-tests/languageHandler-test.tsx b/test/unit-tests/languageHandler-test.tsx
index c69eefd85c..de1a629608 100644
--- a/test/unit-tests/languageHandler-test.tsx
+++ b/test/unit-tests/languageHandler-test.tsx
@@ -301,7 +301,7 @@ describe("languageHandler JSX", function () {
         it("translates a string to german", async () => {
             await setLanguage("de");
             const translated = _t(basicString);
-            expect(translated).toBe("Räume");
+            expect(translated).toBe("Chats");
         });
 
         it.each(testCasesEn)("%s", (_d, translationString, variables, tags, result) => {
diff --git a/test/unit-tests/models/Call-test.ts b/test/unit-tests/models/Call-test.ts
index de5c42fc9c..e26ae85fa4 100644
--- a/test/unit-tests/models/Call-test.ts
+++ b/test/unit-tests/models/Call-test.ts
@@ -11,12 +11,9 @@ import { mocked } from "jest-mock";
 import { waitFor } from "jest-matrix-react";
 import {
     RoomType,
-    Room,
+    type Room,
     RoomEvent,
     MatrixEvent,
-    RoomStateEvent,
-    PendingEventOrdering,
-    type IContent,
     type MatrixClient,
     type IMyDevice,
     type RoomMember,
@@ -39,10 +36,9 @@ import {
     ConnectionState,
     JitsiCall,
     ElementCall,
+    ElementCallIntent,
 } from "../../../src/models/Call";
-import { stubClient, mkEvent, mkRoomMember, setupAsyncStoreWithClient, mockPlatformPeg } from "../../test-utils";
-import MediaDeviceHandler, { MediaDeviceKindEnum } from "../../../src/MediaDeviceHandler";
-import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
+import { cleanUpClientRoomAndStores, enableCalls, mockPlatformPeg, setUpClientRoomAndStores } from "../../test-utils";
 import WidgetStore from "../../../src/stores/WidgetStore";
 import { WidgetMessagingStore } from "../../../src/stores/widgets/WidgetMessagingStore";
 import ActiveWidgetStore, { ActiveWidgetStoreEvent } from "../../../src/stores/ActiveWidgetStore";
@@ -51,133 +47,68 @@ import SettingsStore from "../../../src/settings/SettingsStore";
 import { Anonymity, PosthogAnalytics } from "../../../src/PosthogAnalytics";
 import { type SettingKey } from "../../../src/settings/Settings.tsx";
 import SdkConfig from "../../../src/SdkConfig.ts";
+import DMRoomMap from "../../../src/utils/DMRoomMap.ts";
+import { WidgetMessagingEvent, type WidgetMessaging } from "../../../src/stores/widgets/WidgetMessaging.ts";
 
-jest.spyOn(MediaDeviceHandler, "getDevices").mockResolvedValue({
-    [MediaDeviceKindEnum.AudioInput]: [
-        { deviceId: "1", groupId: "1", kind: "audioinput", label: "Headphones", toJSON: () => {} },
-    ],
-    [MediaDeviceKindEnum.VideoInput]: [
-        { deviceId: "2", groupId: "2", kind: "videoinput", label: "Built-in webcam", toJSON: () => {} },
-    ],
-    [MediaDeviceKindEnum.AudioOutput]: [],
-});
-jest.spyOn(MediaDeviceHandler, "getAudioInput").mockReturnValue("1");
-jest.spyOn(MediaDeviceHandler, "getVideoInput").mockReturnValue("2");
-
-const enabledSettings = new Set(["feature_group_calls", "feature_video_rooms", "feature_element_call_video_rooms"]);
-jest.spyOn(SettingsStore, "getValue").mockImplementation(
-    (settingName): any => enabledSettings.has(settingName) || undefined,
-);
-
-const setUpClientRoomAndStores = (): {
-    client: Mocked<MatrixClient>;
-    room: Room;
-    alice: RoomMember;
-    bob: RoomMember;
-    carol: RoomMember;
-} => {
-    stubClient();
-    const client = mocked<MatrixClient>(MatrixClientPeg.safeGet());
-
-    const room = new Room("!1:example.org", client, "@alice:example.org", {
-        pendingEventOrdering: PendingEventOrdering.Detached,
-    });
-
-    const alice = mkRoomMember(room.roomId, "@alice:example.org");
-    const bob = mkRoomMember(room.roomId, "@bob:example.org");
-    const carol = mkRoomMember(room.roomId, "@carol:example.org");
-    jest.spyOn(room, "getMember").mockImplementation((userId) => {
-        switch (userId) {
-            case alice.userId:
-                return alice;
-            case bob.userId:
-                return bob;
-            case carol.userId:
-                return carol;
-            default:
-                return null;
-        }
-    });
-
-    jest.spyOn(room, "getMyMembership").mockReturnValue(KnownMembership.Join);
-
-    client.getRoom.mockImplementation((roomId) => (roomId === room.roomId ? room : null));
-    client.getRoom.mockImplementation((roomId) => (roomId === room.roomId ? room : null));
-    client.matrixRTC.getRoomSession.mockImplementation((roomId) => {
-        const session = new EventEmitter() as MatrixRTCSession;
-        session.memberships = [];
-        return session;
-    });
-    client.getRooms.mockReturnValue([room]);
-    client.getUserId.mockReturnValue(alice.userId);
-    client.getDeviceId.mockReturnValue("alices_device");
-    client.reEmitter.reEmit(room, [RoomStateEvent.Events]);
-    client.sendStateEvent.mockImplementation(async (roomId, eventType, content, stateKey = "") => {
-        if (roomId !== room.roomId) throw new Error("Unknown room");
-        const event = mkEvent({
-            event: true,
-            type: eventType,
-            room: roomId,
-            user: alice.userId,
-            skey: stateKey,
-            content: content as IContent,
-        });
-        room.addLiveEvents([event], { addToState: true });
-        return { event_id: event.getId()! };
-    });
-
-    setupAsyncStoreWithClient(WidgetStore.instance, client);
-    setupAsyncStoreWithClient(WidgetMessagingStore.instance, client);
-
-    return { client, room, alice, bob, carol };
-};
-
-const cleanUpClientRoomAndStores = (client: MatrixClient, room: Room) => {
-    client.reEmitter.stopReEmitting(room, [RoomStateEvent.Events]);
-};
+const { enabledSettings } = enableCalls();
 
 const setUpWidget = (
     call: Call,
-): {
-    widget: Widget;
-    messaging: Mocked<ClientWidgetApi>;
-    audioMutedSpy: jest.SpyInstance<boolean, []>;
-    videoMutedSpy: jest.SpyInstance<boolean, []>;
-} => {
+): { widget: Widget; messaging: Mocked<WidgetMessaging>; widgetApi: Mocked<ClientWidgetApi> } => {
     call.widget.data = { ...call.widget, skipLobby: true };
     const widget = new Widget(call.widget);
 
-    const eventEmitter = new EventEmitter();
-    const messaging = {
-        on: eventEmitter.on.bind(eventEmitter),
-        off: eventEmitter.off.bind(eventEmitter),
-        once: eventEmitter.once.bind(eventEmitter),
-        emit: eventEmitter.emit.bind(eventEmitter),
-        stop: jest.fn(),
-        transport: {
+    const widgetApi = new (class extends EventEmitter {
+        transport = {
             send: jest.fn(),
             reply: jest.fn(),
-        },
-    } as unknown as Mocked<ClientWidgetApi>;
+        };
+    })() as unknown as Mocked<ClientWidgetApi>;
+    const messaging = new (class extends EventEmitter {
+        stop = jest.fn();
+        widgetApi = widgetApi;
+    })() as unknown as Mocked<WidgetMessaging>;
     WidgetMessagingStore.instance.storeMessaging(widget, call.roomId, messaging);
 
-    const audioMutedSpy = jest.spyOn(MediaDeviceHandler, "startWithAudioMuted", "get");
-    const videoMutedSpy = jest.spyOn(MediaDeviceHandler, "startWithVideoMuted", "get");
-
-    return { widget, messaging, audioMutedSpy, videoMutedSpy };
+    return { widget, messaging, widgetApi };
 };
 
-const cleanUpCallAndWidget = (
-    call: Call,
-    widget: Widget,
-    audioMutedSpy: jest.SpyInstance<boolean, []>,
-    videoMutedSpy: jest.SpyInstance<boolean, []>,
-) => {
+async function connect(call: Call, widgetApi: Mocked<ClientWidgetApi>, startWidget = true): Promise<void> {
+    async function sessionConnect() {
+        await new Promise<void>((r) => {
+            setTimeout(() => r(), 400);
+        });
+        widgetApi.emit(`action:${ElementWidgetActions.JoinCall}`, new CustomEvent("widgetapirequest", {}));
+    }
+    async function runTimers() {
+        jest.advanceTimersByTime(500);
+        jest.advanceTimersByTime(500);
+    }
+    sessionConnect();
+    await Promise.all([...(startWidget ? [call.start()] : []), runTimers()]);
+}
+
+async function disconnect(call: Call, widgetApi: Mocked<ClientWidgetApi>): Promise<void> {
+    async function sessionDisconnect() {
+        await new Promise<void>((r) => {
+            setTimeout(() => r(), 400);
+        });
+        widgetApi.emit(`action:${ElementWidgetActions.HangupCall}`, new CustomEvent("widgetapirequest", {}));
+    }
+    async function runTimers() {
+        jest.advanceTimersByTime(500);
+        jest.advanceTimersByTime(500);
+    }
+    sessionDisconnect();
+    const promise = call.disconnect();
+    runTimers();
+    await promise;
+}
+
+const cleanUpCallAndWidget = (call: Call, widget: Widget) => {
     call.destroy();
     jest.clearAllMocks();
     WidgetMessagingStore.instance.stopMessaging(widget, call.roomId);
-    audioMutedSpy.mockRestore();
-    videoMutedSpy.mockRestore();
 };
 
 describe("JitsiCall", () => {
@@ -220,9 +151,8 @@ describe("JitsiCall", () => {
     describe("instance in a video room", () => {
         let call: JitsiCall;
         let widget: Widget;
-        let messaging: Mocked<ClientWidgetApi>;
-        let audioMutedSpy: jest.SpyInstance<boolean, []>;
-        let videoMutedSpy: jest.SpyInstance<boolean, []>;
+        let messaging: Mocked<WidgetMessaging>;
+        let widgetApi: Mocked<ClientWidgetApi>;
 
         beforeEach(async () => {
             jest.useFakeTimers();
@@ -233,16 +163,16 @@ describe("JitsiCall", () => {
             if (maybeCall === null) throw new Error("Failed to create call");
             call = maybeCall;
 
-            ({ widget, messaging, audioMutedSpy, videoMutedSpy } = setUpWidget(call));
+            ({ widget, messaging, widgetApi } = setUpWidget(call));
 
-            mocked(messaging.transport).send.mockImplementation(async (action, data): Promise<any> => {
+            mocked(widgetApi.transport).send.mockImplementation(async (action, data): Promise<any> => {
                 if (action === ElementWidgetActions.JoinCall) {
-                    messaging.emit(
+                    widgetApi.emit(
                         `action:${ElementWidgetActions.JoinCall}`,
                         new CustomEvent("widgetapirequest", { detail: { data } }),
                     );
                 } else if (action === ElementWidgetActions.HangupCall) {
-                    messaging.emit(
+                    widgetApi.emit(
                         `action:${ElementWidgetActions.HangupCall}`,
                         new CustomEvent("widgetapirequest", { detail: { data } }),
                     );
@@ -251,110 +181,44 @@ describe("JitsiCall", () => {
             });
         });
 
-        afterEach(() => cleanUpCallAndWidget(call, widget, audioMutedSpy, videoMutedSpy));
+        afterEach(() => cleanUpCallAndWidget(call, widget));
 
-        it("connects muted", async () => {
+        it("connects", async () => {
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
-            audioMutedSpy.mockReturnValue(true);
-            videoMutedSpy.mockReturnValue(true);
-
-            await call.start();
+            await connect(call, widgetApi);
             expect(call.connectionState).toBe(ConnectionState.Connected);
-            expect(messaging.transport.send).toHaveBeenCalledWith(ElementWidgetActions.JoinCall, {
-                audioInput: null,
-                videoInput: null,
-            });
         });
 
-        it("connects unmuted", async () => {
-            expect(call.connectionState).toBe(ConnectionState.Disconnected);
-            audioMutedSpy.mockReturnValue(false);
-            videoMutedSpy.mockReturnValue(false);
-
-            await call.start();
-            expect(call.connectionState).toBe(ConnectionState.Connected);
-            expect(messaging.transport.send).toHaveBeenCalledWith(ElementWidgetActions.JoinCall, {
-                audioInput: "Headphones",
-                videoInput: "Built-in webcam",
-            });
-        });
-
-        it("waits for messaging when connecting", async () => {
+        it("waits for messaging when starting", async () => {
             // Temporarily remove the messaging to simulate connecting while the
             // widget is still initializing
             WidgetMessagingStore.instance.stopMessaging(widget, room.roomId);
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
 
-            const connect = call.start();
+            const startup = call.start();
             WidgetMessagingStore.instance.storeMessaging(widget, room.roomId, messaging);
-            await connect;
+            await startup;
+            await connect(call, widgetApi, false);
             expect(call.connectionState).toBe(ConnectionState.Connected);
         });
 
-        it("doesn't stop messaging when connecting", async () => {
-            // Temporarily remove the messaging to simulate connecting while the
-            // widget is still initializing
-            jest.useFakeTimers();
-            const oldSendMock = messaging.transport.send;
-            mocked(messaging.transport).send.mockImplementation(async (action: string): Promise<any> => {
-                if (action === ElementWidgetActions.JoinCall) {
-                    await new Promise((resolve) => setTimeout(resolve, 100));
-                    messaging.emit(
-                        `action:${ElementWidgetActions.JoinCall}`,
-                        new CustomEvent("widgetapirequest", { detail: {} }),
-                    );
-                }
-            });
-            expect(call.connectionState).toBe(ConnectionState.Disconnected);
-
-            const connect = call.start();
-            async function runTimers() {
-                jest.advanceTimersByTime(500);
-                jest.advanceTimersByTime(1000);
-            }
-            async function runStopMessaging() {
-                await new Promise((resolve) => setTimeout(resolve, 1000));
-                WidgetMessagingStore.instance.stopMessaging(widget, room.roomId);
-            }
-            runStopMessaging();
-            runTimers();
-            let connectError;
-            try {
-                await connect;
-            } catch (e) {
-                console.log(e);
-                connectError = e;
-            }
-            expect(connectError).toBeDefined();
-            // const connect2 = await connect;
-            // expect(connect2).toThrow();
-            messaging.transport.send = oldSendMock;
-            jest.useRealTimers();
-        });
-
-        it("fails to connect if the widget returns an error", async () => {
-            mocked(messaging.transport).send.mockRejectedValue(new Error("never!!1! >:("));
-            await expect(call.start()).rejects.toBeDefined();
-        });
-
         it("fails to disconnect if the widget returns an error", async () => {
-            await call.start();
-            mocked(messaging.transport).send.mockRejectedValue(new Error("never!!1! >:("));
+            await connect(call, widgetApi);
+            mocked(widgetApi.transport).send.mockRejectedValue(new Error("never!"));
             await expect(call.disconnect()).rejects.toBeDefined();
         });
 
         it("handles remote disconnection", async () => {
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
 
-            await call.start();
+            await connect(call, widgetApi);
             expect(call.connectionState).toBe(ConnectionState.Connected);
 
             const callback = jest.fn();
 
             call.on(CallEvent.ConnectionState, callback);
 
-            messaging.emit(`action:${ElementWidgetActions.HangupCall}`, new CustomEvent("widgetapirequest", {}));
-            messaging.emit(`action:${ElementWidgetActions.Close}`, new CustomEvent("widgetapirequest", {}));
+            widgetApi.emit(`action:${ElementWidgetActions.HangupCall}`, new CustomEvent("widgetapirequest", {}));
             await waitFor(() => {
                 expect(callback).toHaveBeenNthCalledWith(1, ConnectionState.Disconnected, ConnectionState.Connected);
             });
@@ -364,14 +228,14 @@ describe("JitsiCall", () => {
 
         it("disconnects", async () => {
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
-            await call.start();
+            await connect(call, widgetApi);
             expect(call.connectionState).toBe(ConnectionState.Connected);
             await call.disconnect();
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
         });
 
         it("disconnects when we leave the room", async () => {
-            await call.start();
+            await connect(call, widgetApi);
             expect(call.connectionState).toBe(ConnectionState.Connected);
             room.emit(RoomEvent.MyMembership, room, KnownMembership.Leave);
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
@@ -379,14 +243,14 @@ describe("JitsiCall", () => {
 
         it("reconnects after disconnect in video rooms", async () => {
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
-            await call.start();
+            await connect(call, widgetApi);
             expect(call.connectionState).toBe(ConnectionState.Connected);
             await call.disconnect();
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
         });
 
         it("remains connected if we stay in the room", async () => {
-            await call.start();
+            await connect(call, widgetApi);
             expect(call.connectionState).toBe(ConnectionState.Connected);
             room.emit(RoomEvent.MyMembership, room, KnownMembership.Join);
             expect(call.connectionState).toBe(ConnectionState.Connected);
@@ -412,7 +276,7 @@ describe("JitsiCall", () => {
 
             // Now, stub out client.sendStateEvent so we can test our local echo
             client.sendStateEvent.mockReset();
-            await call.start();
+            await connect(call, widgetApi);
             expect(call.participants).toEqual(
                 new Map([
                     [alice, new Set(["alices_device"])],
@@ -425,8 +289,8 @@ describe("JitsiCall", () => {
         });
 
         it("updates room state when connecting and disconnecting", async () => {
+            await connect(call, widgetApi);
             const now1 = Date.now();
-            await call.start();
             await waitFor(
                 () =>
                     expect(
@@ -453,7 +317,7 @@ describe("JitsiCall", () => {
         });
 
         it("repeatedly updates room state while connected", async () => {
-            await call.start();
+            await connect(call, widgetApi);
             await waitFor(
                 () =>
                     expect(client.sendStateEvent).toHaveBeenLastCalledWith(
@@ -483,7 +347,7 @@ describe("JitsiCall", () => {
             const onConnectionState = jest.fn();
             call.on(CallEvent.ConnectionState, onConnectionState);
 
-            await call.start();
+            await connect(call, widgetApi);
             await call.disconnect();
             expect(onConnectionState.mock.calls).toEqual([
                 [ConnectionState.Connected, ConnectionState.Disconnected],
@@ -498,7 +362,7 @@ describe("JitsiCall", () => {
             const onParticipants = jest.fn();
             call.on(CallEvent.Participants, onParticipants);
 
-            await call.start();
+            await connect(call, widgetApi);
             await call.disconnect();
             expect(onParticipants.mock.calls).toEqual([
                 [new Map([[alice, new Set(["alices_device"])]]), new Map()],
@@ -511,11 +375,11 @@ describe("JitsiCall", () => {
         });
 
         it("switches to spotlight layout when the widget becomes a PiP", async () => {
-            await call.start();
+            await connect(call, widgetApi);
             ActiveWidgetStore.instance.emit(ActiveWidgetStoreEvent.Undock);
-            expect(messaging.transport.send).toHaveBeenCalledWith(ElementWidgetActions.SpotlightLayout, {});
+            expect(widgetApi.transport.send).toHaveBeenCalledWith(ElementWidgetActions.SpotlightLayout, {});
             ActiveWidgetStore.instance.emit(ActiveWidgetStoreEvent.Dock);
-            expect(messaging.transport.send).toHaveBeenCalledWith(ElementWidgetActions.TileLayout, {});
+            expect(widgetApi.transport.send).toHaveBeenCalledWith(ElementWidgetActions.TileLayout, {});
         });
 
         describe("clean", () => {
@@ -555,7 +419,7 @@ describe("JitsiCall", () => {
             });
 
             it("doesn't clean up valid devices", async () => {
-                await call.start();
+                await connect(call, widgetApi);
                 await client.sendStateEvent(
                     room.roomId,
                     JitsiCall.MEMBER_EVENT_TYPE,
@@ -615,55 +479,14 @@ describe("ElementCall", () => {
     let client: Mocked<MatrixClient>;
     let room: Room;
     let alice: RoomMember;
-
+    let roomSession: Mocked<MatrixRTCSession>;
     function setRoomMembers(memberIds: string[]) {
         jest.spyOn(room, "getJoinedMembers").mockReturnValue(memberIds.map((id) => ({ userId: id }) as RoomMember));
     }
 
-    const callConnectProcedure = async (call: ElementCall, startWidget = true): Promise<void> => {
-        async function sessionConnect() {
-            await new Promise<void>((r) => {
-                setTimeout(() => r(), 400);
-            });
-            client.matrixRTC.emit(MatrixRTCSessionManagerEvents.SessionStarted, call.roomId, {
-                sessionId: undefined,
-            } as unknown as MatrixRTCSession);
-            call.session?.emit(
-                MatrixRTCSessionEvent.MembershipsChanged,
-                [],
-                [{ sender: client.getUserId() } as CallMembership],
-            );
-        }
-        async function runTimers() {
-            jest.advanceTimersByTime(500);
-            jest.advanceTimersByTime(500);
-        }
-        sessionConnect();
-        await Promise.all([...(startWidget ? [call.start()] : []), runTimers()]);
-    };
-    const callDisconnectionProcedure: (call: ElementCall) => Promise<void> = async (call) => {
-        async function sessionDisconnect() {
-            await new Promise<void>((r) => {
-                setTimeout(() => r(), 400);
-            });
-            client.matrixRTC.emit(MatrixRTCSessionManagerEvents.SessionStarted, call.roomId, {
-                sessionId: undefined,
-            } as unknown as MatrixRTCSession);
-            call.session?.emit(MatrixRTCSessionEvent.MembershipsChanged, [], []);
-        }
-        async function runTimers() {
-            jest.advanceTimersByTime(500);
-            jest.advanceTimersByTime(500);
-        }
-        sessionDisconnect();
-        const promise = call.disconnect();
-        runTimers();
-        await promise;
-    };
-
     beforeEach(() => {
         jest.useFakeTimers();
-        ({ client, room, alice } = setUpClientRoomAndStores());
+        ({ client, room, alice, roomSession } = setUpClientRoomAndStores());
         SdkConfig.reset();
     });
 
@@ -674,6 +497,17 @@ describe("ElementCall", () => {
     });
 
     describe("get", () => {
+        let getUserIdForRoomIdSpy: jest.SpyInstance;
+
+        beforeEach(() => {
+            getUserIdForRoomIdSpy = jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId");
+        });
+
+        afterEach(() => {
+            Call.get(room)?.destroy();
+            getUserIdForRoomIdSpy.mockRestore();
+        });
+
         it("finds no calls", () => {
             expect(Call.get(room)).toBeNull();
         });
@@ -681,7 +515,6 @@ describe("ElementCall", () => {
         it("finds calls", async () => {
             ElementCall.create(room);
             expect(Call.get(room)).toBeInstanceOf(ElementCall);
-            Call.get(room)?.destroy();
         });
 
         it("should use element call URL from developer settings if present", async () => {
@@ -698,19 +531,13 @@ describe("ElementCall", () => {
             const call = ElementCall.get(room);
             expect(call?.widget.url.startsWith("https://call.element.dev/")).toBeTruthy();
             SettingsStore.getValue = originalGetValue;
-            call?.destroy();
         });
 
         it("finds ongoing calls that are created by the session manager", async () => {
             // There is an existing session created by another user in this room.
-            client.matrixRTC.getRoomSession.mockReturnValue({
-                on: (ev: any, fn: any) => {},
-                off: (ev: any, fn: any) => {},
-                memberships: [{ fakeVal: "fake membership" }],
-            } as unknown as MatrixRTCSession);
+            roomSession.memberships.push({} as CallMembership);
             const call = Call.get(room);
             if (!(call instanceof ElementCall)) throw new Error("Failed to create call");
-            call.destroy();
         });
 
         it("passes font settings through widget URL", async () => {
@@ -742,6 +569,96 @@ describe("ElementCall", () => {
             SettingsStore.getValue = originalGetValue;
         });
 
+        describe("Echo cancellation & Noise Suppression", () => {
+            it("passes echo cancellation settings through widget URL if needed", async () => {
+                const originalGetValue = SettingsStore.getValue;
+                SettingsStore.getValue = (
+                    name: SettingKey,
+                    roomId: string | null = null,
+                    excludeDefault = false,
+                ): any => {
+                    switch (name) {
+                        case "webrtc_audio_echoCancellation":
+                            return false;
+                    }
+                };
+                ElementCall.create(room);
+                const call = Call.get(room);
+                if (!(call instanceof ElementCall)) throw new Error("Failed to create call");
+
+                const urlParams = new URLSearchParams(new URL(call.widget.url).hash.slice(1));
+                expect(urlParams.get("echoCancellation")).toBe("false");
+
+                SettingsStore.getValue = originalGetValue;
+            });
+
+            it("does not pass echo cancellation settings through widget URL if not needed", async () => {
+                const originalGetValue = SettingsStore.getValue;
+                SettingsStore.getValue = (
+                    name: SettingKey,
+                    roomId: string | null = null,
+                    excludeDefault = false,
+                ): any => {
+                    switch (name) {
+                        case "webrtc_audio_echoCancellation":
+                            return true;
+                    }
+                };
+                ElementCall.create(room);
+                const call = Call.get(room);
+                if (!(call instanceof ElementCall)) throw new Error("Failed to create call");
+
+                const urlParams = new URLSearchParams(new URL(call.widget.url).hash.slice(1));
+                expect(urlParams.get("echoCancellation")).toBeNull();
+
+                SettingsStore.getValue = originalGetValue;
+            });
+
+            it("passes noise suppression settings through widget URL if needed", async () => {
+                const originalGetValue = SettingsStore.getValue;
+                SettingsStore.getValue = (
+                    name: SettingKey,
+                    roomId: string | null = null,
+                    excludeDefault = false,
+                ): any => {
+                    switch (name) {
+                        case "webrtc_audio_noiseSuppression":
+                            return false;
+                    }
+                };
+                ElementCall.create(room);
+                const call = Call.get(room);
+                if (!(call instanceof ElementCall)) throw new Error("Failed to create call");
+
+                const urlParams = new URLSearchParams(new URL(call.widget.url).hash.slice(1));
+                expect(urlParams.get("noiseSuppression")).toBe("false");
+
+                SettingsStore.getValue = originalGetValue;
+            });
+
+            it("does not pass noise suppression settings through widget URL if not needed", async () => {
+                const originalGetValue = SettingsStore.getValue;
+                SettingsStore.getValue = (
+                    name: SettingKey,
+                    roomId: string | null = null,
+                    excludeDefault = false,
+                ): any => {
+                    switch (name) {
+                        case "webrtc_audio_noiseSuppression":
+                            return true;
+                    }
+                };
+                ElementCall.create(room);
+                const call = Call.get(room);
+                if (!(call instanceof ElementCall)) throw new Error("Failed to create call");
+
+                const urlParams = new URLSearchParams(new URL(call.widget.url).hash.slice(1));
+                expect(urlParams.get("noiseSuppression")).toBeNull();
+
+                SettingsStore.getValue = originalGetValue;
+            });
+        });
+
         it("passes ICE fallback preference through widget URL", async () => {
             // Test with the preference set to false
             ElementCall.create(room);
@@ -772,7 +689,6 @@ describe("ElementCall", () => {
             const urlParams2 = new URLSearchParams(new URL(call2.widget.url).hash.slice(1));
             expect(urlParams2.has("allowIceFallback")).toBe(true);
 
-            call2.destroy();
             SettingsStore.getValue = originalGetValue;
         });
 
@@ -799,7 +715,6 @@ describe("ElementCall", () => {
             expect(urlParams.get("posthogUserId")).toBe("123456789987654321");
             expect(urlParams.get("posthogApiHost")).toBe("https://posthog");
             expect(urlParams.get("posthogApiKey")).toBe("DEADBEEF");
-            call.destroy();
         });
 
         it("does not pass analyticsID if `pseudonymousAnalyticsOptIn` set to false", async () => {
@@ -817,30 +732,6 @@ describe("ElementCall", () => {
 
             const urlParams = new URLSearchParams(new URL(call.widget.url).hash.slice(1));
             expect(urlParams.get("analyticsID")).toBeFalsy();
-            call.destroy();
-        });
-
-        it("passes feature_allow_screen_share_only_mode setting to allowVoipWithNoMedia url param", async () => {
-            // Now test with the preference set to true
-            const originalGetValue = SettingsStore.getValue;
-            SettingsStore.getValue = (name: SettingKey, roomId: string | null = null, excludeDefault = false): any => {
-                switch (name) {
-                    case "feature_allow_screen_share_only_mode":
-                        return true;
-                    default:
-                        return excludeDefault
-                            ? originalGetValue(name, roomId, excludeDefault)
-                            : originalGetValue(name, roomId, excludeDefault);
-                }
-            };
-            ElementCall.create(room);
-            const call = Call.get(room);
-            if (!(call instanceof ElementCall)) throw new Error("Failed to create call");
-
-            const urlParams = new URLSearchParams(new URL(call.widget.url).hash.slice(1));
-            expect(urlParams.get("allowVoipWithNoMedia")).toBe("true");
-            SettingsStore.getValue = originalGetValue;
-            call.destroy();
         });
 
         it("passes empty analyticsID if the id is not in the account data", async () => {
@@ -857,98 +748,190 @@ describe("ElementCall", () => {
             const urlParams = new URLSearchParams(new URL(call.widget.url).hash.slice(1));
             expect(urlParams.get("analyticsID")).toBeFalsy();
         });
+
+        it("requests correct intent in DMs", async () => {
+            getUserIdForRoomIdSpy.mockImplementation((roomId: string) =>
+                room.roomId === roomId ? "any-user" : undefined,
+            );
+            ElementCall.create(room);
+            const call = Call.get(room);
+            if (!(call instanceof ElementCall)) throw new Error("Failed to create call");
+
+            const urlParams = new URLSearchParams(new URL(call.widget.url).hash.slice(1));
+            expect(urlParams.get("intent")).toBe(ElementCallIntent.StartCallDM);
+        });
+
+        it("requests correct intent when answering DMs", async () => {
+            roomSession.getOldestMembership.mockReturnValue({} as CallMembership);
+            getUserIdForRoomIdSpy.mockImplementation((roomId: string) =>
+                room.roomId === roomId ? "any-user" : undefined,
+            );
+            ElementCall.create(room);
+            const call = Call.get(room);
+            if (!(call instanceof ElementCall)) throw new Error("Failed to create call");
+
+            const urlParams = new URLSearchParams(new URL(call.widget.url).hash.slice(1));
+            expect(urlParams.get("intent")).toBe(ElementCallIntent.JoinExistingDM);
+        });
+
+        it("requests correct intent when creating a non-DM call", async () => {
+            roomSession.getOldestMembership.mockReturnValue(undefined);
+            ElementCall.create(room);
+            const call = Call.get(room);
+            if (!(call instanceof ElementCall)) throw new Error("Failed to create call");
+
+            const urlParams = new URLSearchParams(new URL(call.widget.url).hash.slice(1));
+            expect(urlParams.get("intent")).toBe(ElementCallIntent.StartCall);
+        });
+
+        it("requests correct intent when joining a non-DM call", async () => {
+            roomSession.getOldestMembership.mockReturnValue({} as CallMembership);
+            ElementCall.create(room);
+            const call = Call.get(room);
+            if (!(call instanceof ElementCall)) throw new Error("Failed to create call");
+
+            const urlParams = new URLSearchParams(new URL(call.widget.url).hash.slice(1));
+            expect(urlParams.get("intent")).toBe(ElementCallIntent.JoinExisting);
+        });
     });
 
     describe("instance in a non-video room", () => {
         let call: ElementCall;
         let widget: Widget;
-        let messaging: Mocked<ClientWidgetApi>;
-        let audioMutedSpy: jest.SpyInstance<boolean, []>;
-        let videoMutedSpy: jest.SpyInstance<boolean, []>;
+        let messaging: Mocked<WidgetMessaging>;
+        let widgetApi: Mocked<ClientWidgetApi>;
 
         beforeEach(async () => {
             jest.useFakeTimers();
             jest.setSystemTime(0);
 
-            ElementCall.create(room, true);
+            ElementCall.create(room);
             const maybeCall = ElementCall.get(room);
             if (maybeCall === null) throw new Error("Failed to create call");
             call = maybeCall;
 
-            ({ widget, messaging, audioMutedSpy, videoMutedSpy } = setUpWidget(call));
+            ({ widget, messaging, widgetApi } = setUpWidget(call));
         });
 
-        afterEach(() => cleanUpCallAndWidget(call, widget, audioMutedSpy, videoMutedSpy));
+        afterEach(() => cleanUpCallAndWidget(call, widget));
+
         // TODO refactor initial device configuration to use the EW settings.
         // Add tests for passing EW device configuration to the widget.
-        it("waits for messaging when connecting", async () => {
+
+        it("waits for messaging when starting (widget API available immediately)", async () => {
             // Temporarily remove the messaging to simulate connecting while the
             // widget is still initializing
-
             WidgetMessagingStore.instance.stopMessaging(widget, room.roomId);
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
 
-            const connect = callConnectProcedure(call);
+            const startup = call.start({});
             WidgetMessagingStore.instance.storeMessaging(widget, room.roomId, messaging);
-            await connect;
+            await startup;
+            await connect(call, widgetApi, false);
             expect(call.connectionState).toBe(ConnectionState.Connected);
         });
 
+        it("waits for messaging when starting (widget API started asynchronously)", async () => {
+            // Temporarily remove the messaging to simulate connecting while the
+            // widget is still initializing
+            WidgetMessagingStore.instance.stopMessaging(widget, room.roomId);
+            // Also remove the widget API from said messaging until later
+            let storedWidgetApi: Mocked<ClientWidgetApi> | null = null;
+            Object.defineProperty(messaging, "widgetApi", {
+                get() {
+                    return storedWidgetApi;
+                },
+            });
+            expect(call.connectionState).toBe(ConnectionState.Disconnected);
+
+            const startup = call.start({});
+            WidgetMessagingStore.instance.storeMessaging(widget, room.roomId, messaging);
+            // Yield the event loop to the Call.start promise, then simulate the
+            // widget API being started asynchronously
+            await Promise.resolve();
+            storedWidgetApi = widgetApi;
+            messaging.emit(WidgetMessagingEvent.Start, storedWidgetApi);
+            await startup;
+            await connect(call, widgetApi, false);
+            expect(call.connectionState).toBe(ConnectionState.Connected);
+        });
+
+        it("waits for messaging when starting (even if messaging is replaced during startup)", async () => {
+            const firstMessaging = messaging;
+            // Entirely remove the widget API from this first messaging
+            Object.defineProperty(firstMessaging, "widgetApi", {
+                get() {
+                    return null;
+                },
+            });
+            expect(call.connectionState).toBe(ConnectionState.Disconnected);
+
+            const startup = call.start({});
+            // Now imagine that the messaging gets abandoned and replaced by an
+            // entirely new messaging object
+            ({ widget, messaging, widgetApi } = setUpWidget(call));
+            WidgetMessagingStore.instance.storeMessaging(widget, room.roomId, messaging);
+            await startup;
+            await connect(call, widgetApi, false);
+            expect(call.connectionState).toBe(ConnectionState.Connected);
+            expect(firstMessaging.listenerCount(WidgetMessagingEvent.Start)).toBe(0); // No leaks
+        });
+
         it("fails to disconnect if the widget returns an error", async () => {
-            await callConnectProcedure(call);
-            mocked(messaging.transport).send.mockRejectedValue(new Error("never!!1! >:("));
+            await connect(call, widgetApi);
+            mocked(widgetApi.transport).send.mockRejectedValue(new Error("never!!1! >:("));
             await expect(call.disconnect()).rejects.toBeDefined();
         });
 
         it("handles remote disconnection", async () => {
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
 
-            await callConnectProcedure(call);
+            await connect(call, widgetApi);
             expect(call.connectionState).toBe(ConnectionState.Connected);
 
-            messaging.emit(`action:${ElementWidgetActions.HangupCall}`, new CustomEvent("widgetapirequest", {}));
-            messaging.emit(`action:${ElementWidgetActions.Close}`, new CustomEvent("widgetapirequest", {}));
+            widgetApi.emit(`action:${ElementWidgetActions.HangupCall}`, new CustomEvent("widgetapirequest", {}));
+            widgetApi.emit(`action:${ElementWidgetActions.Close}`, new CustomEvent("widgetapirequest", {}));
             await waitFor(() => expect(call.connectionState).toBe(ConnectionState.Disconnected), { interval: 5 });
         });
 
         it("disconnects", async () => {
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
-            await callConnectProcedure(call);
+            await connect(call, widgetApi);
             expect(call.connectionState).toBe(ConnectionState.Connected);
-            await callDisconnectionProcedure(call);
+            await disconnect(call, widgetApi);
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
         });
 
         it("disconnects when we leave the room", async () => {
-            await callConnectProcedure(call);
+            await connect(call, widgetApi);
             expect(call.connectionState).toBe(ConnectionState.Connected);
             room.emit(RoomEvent.MyMembership, room, KnownMembership.Leave);
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
         });
 
         it("remains connected if we stay in the room", async () => {
-            await callConnectProcedure(call);
+            await connect(call, widgetApi);
             expect(call.connectionState).toBe(ConnectionState.Connected);
             room.emit(RoomEvent.MyMembership, room, KnownMembership.Join);
             expect(call.connectionState).toBe(ConnectionState.Connected);
         });
 
         it("disconnects if the widget dies", async () => {
-            await callConnectProcedure(call);
+            await connect(call, widgetApi);
             expect(call.connectionState).toBe(ConnectionState.Connected);
             WidgetMessagingStore.instance.stopMessaging(widget, room.roomId);
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
         });
 
         it("acknowledges mute_device widget action", async () => {
-            await callConnectProcedure(call);
+            await connect(call, widgetApi);
             const preventDefault = jest.fn();
             const mockEv = {
                 preventDefault,
                 detail: { video_enabled: false },
             };
-            messaging.emit(`action:${ElementWidgetActions.DeviceMute}`, mockEv);
-            expect(messaging.transport.reply).toHaveBeenCalledWith({ video_enabled: false }, {});
+            widgetApi.emit(`action:${ElementWidgetActions.DeviceMute}`, mockEv);
+            expect(widgetApi.transport.reply).toHaveBeenCalledWith({ video_enabled: false }, {});
             expect(preventDefault).toHaveBeenCalled();
         });
 
@@ -957,8 +940,8 @@ describe("ElementCall", () => {
             const onConnectionState = jest.fn();
             call.on(CallEvent.ConnectionState, onConnectionState);
 
-            await callConnectProcedure(call);
-            await callDisconnectionProcedure(call);
+            await connect(call, widgetApi);
+            await disconnect(call, widgetApi);
             expect(onConnectionState.mock.calls).toEqual([
                 [ConnectionState.Connected, ConnectionState.Disconnected],
                 [ConnectionState.Disconnecting, ConnectionState.Connected],
@@ -980,10 +963,10 @@ describe("ElementCall", () => {
         });
 
         it("ends the call immediately if the session ended", async () => {
-            await callConnectProcedure(call);
+            await connect(call, widgetApi);
             const onDestroy = jest.fn();
             call.on(CallEvent.Destroy, onDestroy);
-            await callDisconnectionProcedure(call);
+            await disconnect(call, widgetApi);
             // this will be called automatically
             // disconnect -> widget sends state event -> session manager notices no-one left
             client.matrixRTC.emit(
@@ -1019,39 +1002,12 @@ describe("ElementCall", () => {
             roomSpy.mockRestore();
             addWidgetSpy.mockRestore();
         });
-
-        it("sends notify event on connect in a room with more than two members", async () => {
-            const sendEventSpy = jest.spyOn(room.client, "sendEvent");
-            ElementCall.create(room);
-            await callConnectProcedure(Call.get(room) as ElementCall);
-            expect(sendEventSpy).toHaveBeenCalledWith("!1:example.org", "org.matrix.msc4075.call.notify", {
-                "application": "m.call",
-                "call_id": "",
-                "m.mentions": { room: true, user_ids: [] },
-                "notify_type": "notify",
-            });
-        });
-        it("sends ring on create in a DM (two participants) room", async () => {
-            setRoomMembers(["@user:example.com", "@user2:example.com"]);
-
-            const sendEventSpy = jest.spyOn(room.client, "sendEvent");
-            ElementCall.create(room);
-            await callConnectProcedure(Call.get(room) as ElementCall);
-            expect(sendEventSpy).toHaveBeenCalledWith("!1:example.org", "org.matrix.msc4075.call.notify", {
-                "application": "m.call",
-                "call_id": "",
-                "m.mentions": { room: true, user_ids: [] },
-                "notify_type": "ring",
-            });
-        });
     });
 
     describe("instance in a video room", () => {
         let call: ElementCall;
         let widget: Widget;
-        let messaging: Mocked<ClientWidgetApi>;
-        let audioMutedSpy: jest.SpyInstance<boolean, []>;
-        let videoMutedSpy: jest.SpyInstance<boolean, []>;
+        let widgetApi: Mocked<ClientWidgetApi>;
 
         beforeEach(async () => {
             jest.useFakeTimers();
@@ -1064,64 +1020,29 @@ describe("ElementCall", () => {
             if (maybeCall === null) throw new Error("Failed to create call");
             call = maybeCall;
 
-            ({ widget, messaging, audioMutedSpy, videoMutedSpy } = setUpWidget(call));
+            ({ widget, widgetApi } = setUpWidget(call));
         });
 
-        afterEach(() => cleanUpCallAndWidget(call, widget, audioMutedSpy, videoMutedSpy));
+        afterEach(() => cleanUpCallAndWidget(call, widget));
 
         it("doesn't end the call when the last participant leaves", async () => {
-            await callConnectProcedure(call);
+            await connect(call, widgetApi);
             const onDestroy = jest.fn();
             call.on(CallEvent.Destroy, onDestroy);
-            await callDisconnectionProcedure(call);
+            await disconnect(call, widgetApi);
             expect(onDestroy).not.toHaveBeenCalled();
             call.off(CallEvent.Destroy, onDestroy);
         });
 
-        it("connect to call with ongoing session", async () => {
-            // Mock membership getter used by `roomSessionForRoom`.
-            // This makes sure the roomSession will not be empty.
-            jest.spyOn(MatrixRTCSession, "callMembershipsForRoom").mockImplementation(() => [
-                { fakeVal: "fake membership", getMsUntilExpiry: () => 1000 } as unknown as CallMembership,
-            ]);
-            // Create ongoing session
-            const roomSession = MatrixRTCSession.roomSessionForRoom(client, room);
-            const roomSessionEmitSpy = jest.spyOn(roomSession, "emit");
-
-            // Make sure the created session ends up in the call.
-            // `getActiveRoomSession` will be used during `call.connect`
-            // `getRoomSession` will be used during `Call.get`
-            client.matrixRTC.getActiveRoomSession.mockImplementation(() => {
-                return roomSession;
-            });
-            client.matrixRTC.getRoomSession.mockImplementation(() => {
-                return roomSession;
-            });
-
-            ElementCall.create(room);
-            const call = Call.get(room);
-            if (!(call instanceof ElementCall)) throw new Error("Failed to create call");
-            expect(call.session).toBe(roomSession);
-            await callConnectProcedure(call);
-            expect(roomSessionEmitSpy).toHaveBeenCalledWith(
-                "memberships_changed",
-                [],
-                [{ sender: "@alice:example.org" }],
-            );
-            expect(call.connectionState).toBe(ConnectionState.Connected);
-            call.destroy();
-        });
-
         it("handles remote disconnection and reconnect right after", async () => {
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
-            await callConnectProcedure(call);
+            await connect(call, widgetApi);
             expect(call.connectionState).toBe(ConnectionState.Connected);
 
-            messaging.emit(`action:${ElementWidgetActions.HangupCall}`, new CustomEvent("widgetapirequest", {}));
-            messaging.emit(`action:${ElementWidgetActions.Close}`, new CustomEvent("widgetapirequest", {}));
+            widgetApi.emit(`action:${ElementWidgetActions.HangupCall}`, new CustomEvent("widgetapirequest", {}));
             // We should now be able to reconnect without manually starting the widget
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
-            await callConnectProcedure(call, false);
+            await connect(call, widgetApi, false);
             await waitFor(() => expect(call.connectionState).toBe(ConnectionState.Connected), { interval: 5 });
         });
     });
diff --git a/test/unit-tests/models/LocalRoom-test.ts b/test/unit-tests/models/LocalRoom-test.ts
index 64e3f51240..26d4845c6c 100644
--- a/test/unit-tests/models/LocalRoom-test.ts
+++ b/test/unit-tests/models/LocalRoom-test.ts
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { type MatrixClient } from "matrix-js-sdk/src/matrix";
+import { Direction, EventType, type MatrixClient, MatrixEvent } from "matrix-js-sdk/src/matrix";
 
 import { LocalRoom, LocalRoomState, LOCAL_ROOM_ID_PREFIX } from "../../../src/models/LocalRoom";
 import { createTestClient } from "../../test-utils";
@@ -79,4 +79,26 @@ describe("LocalRoom", () => {
             });
         });
     });
+
+    it("should return false for isEncryptionEnabled with no state", () => {
+        expect(room.isEncryptionEnabled()).toBe(false);
+    });
+
+    it("should return true for isEncryptionEnabled with an encryption state event", () => {
+        const encryptionEvent = new MatrixEvent({
+            type: EventType.RoomEncryption,
+            state_key: "",
+            content: {
+                algorithm: "m.megolm.v1.aes-sha2",
+            },
+            sender: "@test:localhost",
+            room_id: room.roomId,
+            event_id: "$test:localhost",
+        });
+
+        const roomState = room.getLiveTimeline().getState(Direction.Forward);
+        roomState?.setStateEvents([encryptionEvent]);
+
+        expect(room.isEncryptionEnabled()).toBe(true);
+    });
 });
diff --git a/test/unit-tests/modules/AccountDataApi-test.ts b/test/unit-tests/modules/AccountDataApi-test.ts
new file mode 100644
index 0000000000..d7b72d7bce
--- /dev/null
+++ b/test/unit-tests/modules/AccountDataApi-test.ts
@@ -0,0 +1,72 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { ClientEvent } from "matrix-js-sdk/src/matrix";
+
+import { AccountDataApi } from "../../../src/modules/AccountDataApi";
+import { mkEvent, stubClient } from "../../test-utils/test-utils";
+
+describe("AccountDataApi", () => {
+    describe("AccountDataWatchable", () => {
+        it("should return content of account data event on get()", () => {
+            const cli = stubClient();
+            const api = new AccountDataApi();
+            // Mock cli to return a event
+            const content = { foo: "bar" };
+            const event = mkEvent({ content, type: "m.test", user: "@foobar:matrix.org", event: true });
+            cli.getAccountData = () => event;
+            expect(api.get("m.test").value).toStrictEqual(content);
+        });
+
+        it("should update value on event", () => {
+            const cli = stubClient();
+            const api = new AccountDataApi();
+            // Mock cli to return a event
+            const content = { foo: "bar" };
+            const event = mkEvent({ content, type: "m.test", user: "@foobar:matrix.org", event: true });
+            cli.getAccountData = () => event;
+
+            const watchable = api.get("m.test");
+            expect(watchable.value).toStrictEqual(content);
+
+            const fn = jest.fn();
+            watchable.watch(fn);
+
+            // Let's say that the account data event changed
+            const event2 = mkEvent({
+                content: { foo: "abc" },
+                type: "m.test",
+                user: "@foobar:matrix.org",
+                event: true,
+            });
+            cli.emit(ClientEvent.AccountData, event2);
+            // Watchable value should have been updated
+            expect(watchable.value).toStrictEqual({ foo: "abc" });
+            // Watched callbacks should be called
+            expect(fn).toHaveBeenCalledTimes(1);
+
+            // Make sure unwatch removed the event listener
+            cli.off = jest.fn();
+            watchable.unwatch(fn);
+            expect(cli.off).toHaveBeenCalledTimes(1);
+        });
+    });
+
+    it("should set account data via js-sdk on set()", async () => {
+        const cli = stubClient();
+        const api = new AccountDataApi();
+        await api.set("m.test", { foo: "bar" });
+        expect(cli.setAccountData).toHaveBeenCalledTimes(1);
+    });
+
+    it("should delete account data via js-sdk on set()", async () => {
+        const cli = stubClient();
+        const api = new AccountDataApi();
+        await api.delete("m.test");
+        expect(cli.deleteAccountData).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/test/unit-tests/modules/Auth-test.ts b/test/unit-tests/modules/Auth-test.ts
new file mode 100644
index 0000000000..b5d66010a6
--- /dev/null
+++ b/test/unit-tests/modules/Auth-test.ts
@@ -0,0 +1,30 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import defaultDispatcher from "../../../src/dispatcher/dispatcher.ts";
+import { overwriteAccountAuth } from "../../../src/modules/Auth.ts";
+
+describe("overwriteAccountAuth", () => {
+    it("should call overwrite login with accountInfo", () => {
+        const spy = jest.spyOn(defaultDispatcher, "dispatch");
+
+        const accountInfo = {
+            userId: "@user:server.com",
+            deviceId: "DEVICEID",
+            accessToken: "TOKEN",
+            homeserverUrl: "https://server.com",
+        };
+        overwriteAccountAuth(accountInfo);
+        expect(spy).toHaveBeenCalledWith(
+            {
+                action: "overwrite_login",
+                credentials: expect.objectContaining(accountInfo),
+            },
+            true,
+        );
+    });
+});
diff --git a/test/unit-tests/modules/BuiltinsApi-test.tsx b/test/unit-tests/modules/BuiltinsApi-test.tsx
new file mode 100644
index 0000000000..e84263aa4d
--- /dev/null
+++ b/test/unit-tests/modules/BuiltinsApi-test.tsx
@@ -0,0 +1,69 @@
+/*
+Copyright 2025 Element Creations Ltd.
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { render } from "jest-matrix-react";
+
+import { ElementWebBuiltinsApi } from "../../../src/modules/BuiltinsApi.tsx";
+import { stubClient } from "../../test-utils/test-utils";
+
+const Avatar: React.FC<{ room: { roomId: string }; size: string }> = ({ room, size }) => {
+    return (
+        <div>
+            Avatar, {room.roomId}, {size}
+        </div>
+    );
+};
+
+describe("ElementWebBuiltinsApi", () => {
+    it("returns the RoomView component thats been set", () => {
+        const builtinsApi = new ElementWebBuiltinsApi();
+        const sentinel = {};
+        builtinsApi.setComponents({ roomView: sentinel, roomAvatar: Avatar } as any);
+        expect(builtinsApi.getRoomViewComponent()).toBe(sentinel);
+    });
+
+    it("returns rendered RoomView component", () => {
+        const builtinsApi = new ElementWebBuiltinsApi();
+        const RoomView = () => <div>hello world</div>;
+        builtinsApi.setComponents({ roomView: RoomView, roomAvatar: Avatar } as any);
+        const { container } = render(<> {builtinsApi.renderRoomView("!foo:m.org")}</>);
+        expect(container).toHaveTextContent("hello world");
+    });
+
+    it("returns rendered RoomAvatar component", () => {
+        stubClient();
+        const builtinsApi = new ElementWebBuiltinsApi();
+        builtinsApi.setComponents({ roomView: {}, roomAvatar: Avatar } as any);
+        const { container } = render(<> {builtinsApi.renderRoomAvatar("!foo:m.org", "50")}</>);
+        expect(container).toHaveTextContent("Avatar");
+        expect(container).toHaveTextContent("!foo:m.org");
+        expect(container).toHaveTextContent("50");
+    });
+
+    it("returns rendered NotificationDecoration component", () => {
+        stubClient();
+        const builtinsApi = new ElementWebBuiltinsApi();
+        const NotificationDecoration = () => <div>notification decoration</div>;
+        builtinsApi.setComponents({
+            roomView: {},
+            roomAvatar: Avatar,
+            notificationDecoration: NotificationDecoration,
+        } as any);
+        const { container } = render(<> {builtinsApi.renderNotificationDecoration("!foo:m.org")}</>);
+        expect(container).toHaveTextContent("notification decoration");
+    });
+
+    it("should throw error if called before components are set", () => {
+        stubClient();
+        const builtinsApi = new ElementWebBuiltinsApi();
+        expect(() => builtinsApi.renderRoomAvatar("!foo:m.org")).toThrow("No RoomAvatar component has been set");
+        expect(() => builtinsApi.renderRoomView("!foo:m.org")).toThrow("No RoomView component has been set");
+        expect(() => builtinsApi.renderNotificationDecoration("!foo:m.org")).toThrow(
+            "No NotificationDecoration component has been set",
+        );
+    });
+});
diff --git a/test/unit-tests/modules/ClientApi-test.ts b/test/unit-tests/modules/ClientApi-test.ts
new file mode 100644
index 0000000000..22f55d7d37
--- /dev/null
+++ b/test/unit-tests/modules/ClientApi-test.ts
@@ -0,0 +1,20 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { ClientApi } from "../../../src/modules/ClientApi";
+import { Room } from "../../../src/modules/models/Room";
+import { stubClient } from "../../test-utils/test-utils";
+
+describe("ClientApi", () => {
+    it("should return module room from getRoom()", () => {
+        stubClient();
+        const client = new ClientApi();
+        const moduleRoom = client.getRoom("!foo:matrix.org");
+        expect(moduleRoom).toBeInstanceOf(Room);
+        expect(moduleRoom?.id).toStrictEqual("!foo:matrix.org");
+    });
+});
diff --git a/test/unit-tests/modules/Dialog-test.tsx b/test/unit-tests/modules/Dialog-test.tsx
new file mode 100644
index 0000000000..e3f285a48c
--- /dev/null
+++ b/test/unit-tests/modules/Dialog-test.tsx
@@ -0,0 +1,23 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import React from "react";
+import { screen } from "jest-matrix-react";
+
+import { openDialog } from "../../../src/modules/Dialog.tsx";
+
+describe("openDialog", () => {
+    it("should open a dialog with the expected title", async () => {
+        const Dialog = () => <>Dialog Content</>;
+
+        const title = "Test Dialog";
+        openDialog({ title }, Dialog, {});
+
+        await expect(screen.findByText("Test Dialog")).resolves.toBeInTheDocument();
+        expect(screen.getByText("Dialog Content")).toBeInTheDocument();
+    });
+});
diff --git a/test/unit-tests/modules/Navigation-test.ts b/test/unit-tests/modules/Navigation-test.ts
new file mode 100644
index 0000000000..ee0a70e9cf
--- /dev/null
+++ b/test/unit-tests/modules/Navigation-test.ts
@@ -0,0 +1,61 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import * as navigator from "../../../src/utils/permalinks/navigator";
+import { NavigationApi } from "../../../src/modules/Navigation.ts";
+import defaultDispatcher from "../../../src/dispatcher/dispatcher.ts";
+
+describe("NavigationApi", () => {
+    const api = new NavigationApi();
+
+    describe("toMatrixToLink", () => {
+        it.each([
+            ["roomId", "https://matrix.to/#/!roomId:server.com"],
+            ["roomAlias", "https://matrix.to/#/#alias:server.com"],
+            ["user", "https://matrix.to/#/@user:server.com"],
+        ])("should call navigateToPermalink with the correct parameters for %s", async (_type, link) => {
+            const spy = jest.spyOn(navigator, "navigateToPermalink");
+
+            await api.toMatrixToLink(link);
+            expect(spy).toHaveBeenCalledWith(link);
+        });
+
+        it("should set auto_join to true when join=true", async () => {
+            const link = "https://matrix.to/#/#alias:server.com?via=server.com";
+            const spy = jest.spyOn(defaultDispatcher, "dispatch");
+
+            await api.toMatrixToLink(link, true);
+            expect(spy).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    action: "view_room",
+                    room_alias: "#alias:server.com",
+                    auto_join: true,
+                }),
+            );
+        });
+
+        it("should dispatch correct action on openRoom", () => {
+            const spy = jest.spyOn(defaultDispatcher, "dispatch");
+            // Non alias
+            api.openRoom("!foo:m.org");
+            expect(spy).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    action: "view_room",
+                    room_id: "!foo:m.org",
+                }),
+            );
+            // Alias
+            api.openRoom("#bar:m.org");
+            expect(spy).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    action: "view_room",
+                    room_alias: "#bar:m.org",
+                }),
+            );
+        });
+    });
+});
diff --git a/test/unit-tests/modules/ProxiedModuleApi-test.tsx b/test/unit-tests/modules/ProxiedModuleApi-test.tsx
index 4a325050ec..bb21f35397 100644
--- a/test/unit-tests/modules/ProxiedModuleApi-test.tsx
+++ b/test/unit-tests/modules/ProxiedModuleApi-test.tsx
@@ -24,6 +24,7 @@ import defaultDispatcher from "../../../src/dispatcher/dispatcher";
 import { Action } from "../../../src/dispatcher/actions";
 import WidgetStore, { type IApp } from "../../../src/stores/WidgetStore";
 import { Container, WidgetLayoutStore } from "../../../src/stores/widgets/WidgetLayoutStore";
+import * as navigator from "../../../src/utils/permalinks/navigator.ts";
 
 describe("ProxiedApiModule", () => {
     afterEach(() => {
@@ -361,4 +362,30 @@ describe("ProxiedApiModule", () => {
             expect(WidgetLayoutStore.instance.moveToContainer).toHaveBeenCalledWith(room, app, Container.Top);
         });
     });
+
+    describe("navigatePermalink", () => {
+        const api = new ProxiedModuleApi();
+
+        it("should call navigateToPermalink with the correct parameters", async () => {
+            const link = "https://matrix.to/#/!roomId:server.com";
+            const spy = jest.spyOn(navigator, "navigateToPermalink");
+
+            await api.navigatePermalink(link);
+            expect(spy).toHaveBeenCalledWith(link);
+        });
+
+        it("should set auto_join to true when join=true", async () => {
+            const link = "https://matrix.to/#/#alias:server.com";
+            const spy = jest.spyOn(defaultDispatcher, "dispatch");
+
+            await api.navigatePermalink(link, true);
+            expect(spy).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    action: "view_room",
+                    room_alias: "#alias:server.com",
+                    auto_join: true,
+                }),
+            );
+        });
+    });
 });
diff --git a/test/unit-tests/modules/StoresApi-test.ts b/test/unit-tests/modules/StoresApi-test.ts
new file mode 100644
index 0000000000..ba8a0c83da
--- /dev/null
+++ b/test/unit-tests/modules/StoresApi-test.ts
@@ -0,0 +1,84 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { waitFor } from "jest-matrix-react";
+
+import { type RoomListStoreApi, StoresApi } from "../../../src/modules/StoresApi";
+import RoomListStoreV3, {
+    LISTS_LOADED_EVENT,
+    LISTS_UPDATE_EVENT,
+} from "../../../src/stores/room-list-v3/RoomListStoreV3";
+import { mkRoom, stubClient } from "../../test-utils/test-utils";
+import { Room } from "../../../src/modules/models/Room";
+import {} from "../../../src/stores/room-list/algorithms/Algorithm";
+
+describe("StoresApi", () => {
+    describe("RoomListStoreApi", () => {
+        it("should return promise that resolves when RLS is ready", async () => {
+            jest.spyOn(RoomListStoreV3.instance, "isLoadingRooms", "get").mockReturnValue(true);
+            const store = new StoresApi();
+            let hasResolved = false;
+            // The following async function will set hasResolved to false
+            // only when waitForReady resolves.
+            (async () => {
+                await store.roomListStore.waitForReady();
+                hasResolved = true;
+            })();
+            // Shouldn't have resolved yet.
+            expect(hasResolved).toStrictEqual(false);
+
+            // Wait for the module to load so that we can test the listener.
+            await (store.roomListStore as RoomListStoreApi).moduleLoadPromise;
+            // Emit the loaded event.
+            RoomListStoreV3.instance.emit(LISTS_LOADED_EVENT);
+            // Should resolve now.
+            await waitFor(() => {
+                expect(hasResolved).toStrictEqual(true);
+            });
+        });
+
+        describe("getRooms()", () => {
+            it("should return rooms from RLS", async () => {
+                const cli = stubClient();
+                const room1 = mkRoom(cli, "!foo1:m.org");
+                const room2 = mkRoom(cli, "!foo2:m.org");
+                const room3 = mkRoom(cli, "!foo3:m.org");
+                jest.spyOn(RoomListStoreV3.instance, "getSortedRooms").mockReturnValue([room1, room2, room3]);
+                jest.spyOn(RoomListStoreV3.instance, "isLoadingRooms", "get").mockReturnValue(false);
+
+                const store = new StoresApi();
+                await store.roomListStore.waitForReady();
+                const watchable = store.roomListStore.getRooms();
+                expect(watchable.value).toHaveLength(3);
+                expect(watchable.value[0]).toBeInstanceOf(Room);
+            });
+
+            it("should update from RLS", async () => {
+                const cli = stubClient();
+                const room1 = mkRoom(cli, "!foo1:m.org");
+                const room2 = mkRoom(cli, "!foo2:m.org");
+                const rooms = [room1, room2];
+
+                jest.spyOn(RoomListStoreV3.instance, "getSortedRooms").mockReturnValue(rooms);
+                jest.spyOn(RoomListStoreV3.instance, "isLoadingRooms", "get").mockReturnValue(false);
+
+                const store = new StoresApi();
+                await store.roomListStore.waitForReady();
+                const watchable = store.roomListStore.getRooms();
+                const fn = jest.fn();
+                watchable.watch(fn);
+                expect(watchable.value).toHaveLength(2);
+
+                const room3 = mkRoom(cli, "!foo3:m.org");
+                rooms.push(room3);
+                RoomListStoreV3.instance.emit(LISTS_UPDATE_EVENT);
+                expect(fn).toHaveBeenCalledTimes(1);
+                expect(watchable.value).toHaveLength(3);
+            });
+        });
+    });
+});
diff --git a/test/unit-tests/modules/__snapshots__/ModuleComponents-test.tsx.snap b/test/unit-tests/modules/__snapshots__/ModuleComponents-test.tsx.snap
index 12ee4e3708..aca4f2c294 100644
--- a/test/unit-tests/modules/__snapshots__/ModuleComponents-test.tsx.snap
+++ b/test/unit-tests/modules/__snapshots__/ModuleComponents-test.tsx.snap
@@ -1,17 +1,28 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`Module Components should override the factory for a ModuleSpinner 1`] = `
 <DocumentFragment>
   <div
     class="mx_Spinner"
   >
-    <div
+    <svg
       aria-label="Loading…"
-      class="mx_Spinner_icon"
+      class="_icon_11k6c_18"
       data-testid="spinner"
+      fill="currentColor"
+      height="1em"
       role="progressbar"
       style="width: 32px; height: 32px;"
-    />
+      viewBox="0 0 24 24"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        clip-rule="evenodd"
+        d="M12 4.031a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10a1 1 0 1 1 0 2"
+        fill-rule="evenodd"
+      />
+    </svg>
   </div>
 </DocumentFragment>
 `;
diff --git a/test/unit-tests/modules/components/ModuleNotificationDecoration-test.tsx b/test/unit-tests/modules/components/ModuleNotificationDecoration-test.tsx
new file mode 100644
index 0000000000..65df1af1f7
--- /dev/null
+++ b/test/unit-tests/modules/components/ModuleNotificationDecoration-test.tsx
@@ -0,0 +1,33 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+import React from "react";
+import { render, screen } from "jest-matrix-react";
+
+import type { Room } from "matrix-js-sdk/src/matrix";
+import { ModuleNotificationDecoration } from "../../../../src/modules/components/ModuleNotificationDecoration";
+import { mkStubRoom, stubClient } from "../../../test-utils";
+import { NotificationLevel } from "../../../../src/stores/notifications/NotificationLevel";
+import { RoomNotificationStateStore } from "../../../../src/stores/notifications/RoomNotificationStateStore";
+import { RoomNotificationState } from "../../../../src/stores/notifications/RoomNotificationState";
+
+class MockedNotificationState extends RoomNotificationState {
+    public constructor(room: Room, level: NotificationLevel, count: number) {
+        super(room, false);
+        this._level = level;
+        this._count = count;
+    }
+}
+
+it("Should be able to render component just with room as prop", () => {
+    const cli = stubClient();
+    const room = mkStubRoom("!foo:matrix.org", "Foo Room", cli);
+    jest.spyOn(RoomNotificationStateStore.instance, "getRoomState").mockReturnValue(
+        new MockedNotificationState(room, NotificationLevel.Notification, 5),
+    );
+    render(<ModuleNotificationDecoration room={room} />);
+    expect(screen.getByTestId("notification-decoration")).toBeInTheDocument();
+});
diff --git a/test/unit-tests/modules/models/Room-test.ts b/test/unit-tests/modules/models/Room-test.ts
new file mode 100644
index 0000000000..d149c8cdf0
--- /dev/null
+++ b/test/unit-tests/modules/models/Room-test.ts
@@ -0,0 +1,50 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { Room } from "../../../../src/modules/models/Room";
+import { mkRoom, stubClient } from "../../../test-utils";
+
+describe("Room", () => {
+    it("should return id from sdk room", () => {
+        const cli = stubClient();
+        const sdkRoom = mkRoom(cli, "!foo:m.org");
+        const room = new Room(sdkRoom);
+        expect(room.id).toStrictEqual("!foo:m.org");
+    });
+
+    it("should return last timestamp from sdk room", () => {
+        const cli = stubClient();
+        const sdkRoom = mkRoom(cli, "!foo:m.org");
+        const room = new Room(sdkRoom);
+        expect(room.getLastActiveTimestamp()).toStrictEqual(sdkRoom.getLastActiveTimestamp());
+    });
+
+    describe("watchableName", () => {
+        it("should return name from sdkRoom", () => {
+            const cli = stubClient();
+            const sdkRoom = mkRoom(cli, "!foo:m.org");
+            sdkRoom.name = "Foo Name";
+            const room = new Room(sdkRoom);
+            expect(room.name.value).toStrictEqual("Foo Name");
+        });
+
+        it("should add/remove event listener on sdk room", () => {
+            const cli = stubClient();
+            const sdkRoom = mkRoom(cli, "!foo:m.org");
+            sdkRoom.name = "Foo Name";
+
+            const room = new Room(sdkRoom);
+            const fn = jest.fn();
+
+            room.name.watch(fn);
+            expect(sdkRoom.on).toHaveBeenCalledTimes(1);
+
+            room.name.unwatch(fn);
+            expect(sdkRoom.off).toHaveBeenCalledTimes(1);
+        });
+    });
+});
diff --git a/test/unit-tests/renderer/__snapshots__/link-tooltip-test.tsx.snap b/test/unit-tests/renderer/__snapshots__/link-tooltip-test.tsx.snap
index 9abf48919c..e4a72ab6c8 100644
--- a/test/unit-tests/renderer/__snapshots__/link-tooltip-test.tsx.snap
+++ b/test/unit-tests/renderer/__snapshots__/link-tooltip-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`link-tooltip does nothing for empty element 1`] = `
 <DocumentFragment>
@@ -14,7 +14,7 @@ exports[`link-tooltip wraps single anchor 1`] = `
     
                 
     <span
-      aria-labelledby="«r0»"
+      aria-labelledby="_r_0_"
       tabindex="0"
     >
       <a
diff --git a/test/unit-tests/renderer/__snapshots__/pill-test.tsx.snap b/test/unit-tests/renderer/__snapshots__/pill-test.tsx.snap
index 8154467c7e..a2f21d6ece 100644
--- a/test/unit-tests/renderer/__snapshots__/pill-test.tsx.snap
+++ b/test/unit-tests/renderer/__snapshots__/pill-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`keyword pills should do nothing for empty element 1`] = `
 <DocumentFragment>
@@ -48,7 +48,7 @@ exports[`mention pills should pillify @room 1`] = `
         >
           <span
             aria-hidden="true"
-            class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
             data-color="4"
             data-testid="avatar-img"
             data-type="round"
@@ -81,7 +81,7 @@ exports[`mention pills should pillify @room in an intentional mentions world 1`]
         >
           <span
             aria-hidden="true"
-            class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+            class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55"
             data-color="4"
             data-testid="avatar-img"
             data-type="round"
diff --git a/test/unit-tests/settings/SettingsStore-test.ts b/test/unit-tests/settings/SettingsStore-test.ts
index e2f7d845d2..0987569bb9 100644
--- a/test/unit-tests/settings/SettingsStore-test.ts
+++ b/test/unit-tests/settings/SettingsStore-test.ts
@@ -14,7 +14,7 @@ import SdkConfig from "../../../src/SdkConfig";
 import { SettingLevel } from "../../../src/settings/SettingLevel";
 import SettingsStore from "../../../src/settings/SettingsStore";
 import { mkStubRoom, mockPlatformPeg, stubClient } from "../../test-utils";
-import { type SettingKey } from "../../../src/settings/Settings.tsx";
+import { SETTINGS, type SettingKey } from "../../../src/settings/Settings.tsx";
 import MatrixClientBackedController from "../../../src/settings/controllers/MatrixClientBackedController.ts";
 
 const TEST_DATA = [
@@ -55,6 +55,7 @@ describe("SettingsStore", () => {
 
     beforeEach(() => {
         SdkConfig.reset();
+        SettingsStore.reset();
     });
 
     describe("getValueAt", () => {
@@ -82,6 +83,16 @@ describe("SettingsStore", () => {
         });
     });
 
+    describe("exportForRageshake", () => {
+        it("should not export settings marked as non-exportable", async () => {
+            await SettingsStore.setValue("userTimezone", null, SettingLevel.DEVICE, "Europe/London");
+            const values = JSON.parse(SettingsStore.exportForRageshake()) as Record<SettingKey, unknown>;
+            for (const exportedKey of Object.keys(values) as SettingKey[]) {
+                expect(SETTINGS[exportedKey].shouldExportToRageshake).not.toEqual(false);
+            }
+        });
+    });
+
     describe("runMigrations", () => {
         let client: MatrixClient;
         let room: Room;
diff --git a/test/unit-tests/settings/controllers/BlockInvitesConfigController-test.ts b/test/unit-tests/settings/controllers/BlockInvitesConfigController-test.ts
new file mode 100644
index 0000000000..368d4a3032
--- /dev/null
+++ b/test/unit-tests/settings/controllers/BlockInvitesConfigController-test.ts
@@ -0,0 +1,100 @@
+/*
+Copyright 2024 New Vector Ltd.
+Copyright 2023 The Matrix.org Foundation C.I.C.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type MatrixClient, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { mocked } from "jest-mock";
+
+import { SETTINGS } from "../../../../src/settings/Settings";
+import { stubClient } from "../../../test-utils";
+import MatrixClientBackedController from "../../../../src/settings/controllers/MatrixClientBackedController";
+import { SettingLevel } from "../../../../src/settings/SettingLevel.ts";
+
+describe("BlockInvitesConfigController", () => {
+    describe("When server does not support MSC4380", () => {
+        let cli: MatrixClient;
+        beforeEach(() => {
+            cli = stubClient();
+            cli.doesServerSupportUnstableFeature = jest.fn(async () => false);
+            MatrixClientBackedController.matrixClient = cli;
+        });
+
+        test("settingDisabled() should give a message", () => {
+            const controller = SETTINGS.blockInvites.controller!;
+            expect(controller.settingDisabled).toEqual("Your server does not implement this feature.");
+        });
+    });
+
+    describe("When server supports MSC4380", () => {
+        let cli: MatrixClient;
+        beforeEach(async () => {
+            cli = stubClient();
+            cli.doesServerSupportUnstableFeature = jest.fn(async (feature) => {
+                return feature == "org.matrix.msc4380";
+            });
+            MatrixClientBackedController.matrixClient = cli;
+        });
+
+        test("settingDisabled() should be false", () => {
+            const controller = SETTINGS.blockInvites.controller!;
+            expect(controller.settingDisabled).toEqual(false);
+        });
+
+        describe("getValueOverride()", () => {
+            it("should return true when invites are blocked", async () => {
+                const controller = SETTINGS.blockInvites.controller!;
+
+                mockAccountData(cli, { default_action: "block" });
+                expect(controller.getValueOverride(SettingLevel.DEVICE, null, null, null)).toEqual(true);
+            });
+
+            it("should return false when invites are not blocked", async () => {
+                const controller = SETTINGS.blockInvites.controller!;
+
+                mockAccountData(cli, { default_action: {} });
+                expect(controller.getValueOverride(SettingLevel.DEVICE, null, null, null)).toEqual(false);
+            });
+        });
+
+        describe("beforeChange()", () => {
+            it("should set the account data when the value is enabled", async () => {
+                const controller = SETTINGS.blockInvites.controller!;
+                await controller.beforeChange(SettingLevel.DEVICE, null, true);
+                expect(cli.setAccountData).toHaveBeenCalledTimes(1);
+                expect(cli.setAccountData).toHaveBeenCalledWith("org.matrix.msc4380.invite_permission_config", {
+                    default_action: "block",
+                });
+            });
+
+            it("should set the account data when the value is disabled", async () => {
+                const controller = SETTINGS.blockInvites.controller!;
+                await controller.beforeChange(SettingLevel.DEVICE, null, false);
+                expect(cli.setAccountData).toHaveBeenCalledTimes(1);
+                expect(cli.setAccountData).toHaveBeenCalledWith("org.matrix.msc4380.invite_permission_config", {
+                    default_action: "allow",
+                });
+            });
+        });
+    });
+});
+
+/**
+ * Add a mock implementation for {@link MatrixClient.getAccountData} which will return the given data
+ * in respomsnse to any request for `org.matrix.msc4380.invite_permission_config`.
+ */
+function mockAccountData(cli: MatrixClient, mockAccountData: object) {
+    mocked(cli.getAccountData).mockImplementation((eventType) => {
+        if (eventType == "org.matrix.msc4380.invite_permission_config") {
+            return new MatrixEvent({
+                type: "org.matrix.msc4380.invite_permission_config",
+                content: mockAccountData,
+            });
+        } else {
+            return undefined;
+        }
+    });
+}
diff --git a/test/unit-tests/settings/controllers/InviteRulesConfigController-test.ts b/test/unit-tests/settings/controllers/InviteRulesConfigController-test.ts
new file mode 100644
index 0000000000..516b1641f5
--- /dev/null
+++ b/test/unit-tests/settings/controllers/InviteRulesConfigController-test.ts
@@ -0,0 +1,156 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { MatrixEvent } from "matrix-js-sdk/src/matrix";
+
+import MatrixClientBackedController from "../../../../src/settings/controllers/MatrixClientBackedController";
+import InviteRulesConfigController from "../../../../src/settings/controllers/InviteRulesConfigController";
+import { SettingLevel } from "../../../../src/settings/SettingLevel";
+import { getMockClientWithEventEmitter, mockClientMethodsServer } from "../../../test-utils";
+import { INVITE_RULES_ACCOUNT_DATA_TYPE, type InviteConfigAccountData } from "../../../../src/@types/invite-rules";
+
+describe("InviteRulesConfigController", () => {
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it("gets the default settings when none are specified.", () => {
+        const controller = new InviteRulesConfigController();
+
+        MatrixClientBackedController.matrixClient = getMockClientWithEventEmitter({
+            ...mockClientMethodsServer(),
+            getAccountData: jest.fn().mockReturnValue(null),
+        });
+
+        const value = controller.getValueOverride(SettingLevel.ACCOUNT);
+        expect(value).toEqual(InviteRulesConfigController.default);
+    });
+
+    it("gets the default settings when the setting is empty.", () => {
+        const controller = new InviteRulesConfigController();
+
+        MatrixClientBackedController.matrixClient = getMockClientWithEventEmitter({
+            ...mockClientMethodsServer(),
+            getAccountData: jest
+                .fn()
+                .mockReturnValue(new MatrixEvent({ type: INVITE_RULES_ACCOUNT_DATA_TYPE, content: {} })),
+        });
+
+        const value = controller.getValueOverride(SettingLevel.ACCOUNT);
+        expect(value).toEqual(InviteRulesConfigController.default);
+    });
+
+    it.each<InviteConfigAccountData>([{ blocked_users: ["foo_bar"] }, { blocked_users: [] }, {}])(
+        "calculates blockAll to be false",
+        (content: InviteConfigAccountData) => {
+            const controller = new InviteRulesConfigController();
+
+            MatrixClientBackedController.matrixClient = getMockClientWithEventEmitter({
+                ...mockClientMethodsServer(),
+                getAccountData: jest.fn().mockReturnValue(
+                    new MatrixEvent({
+                        type: INVITE_RULES_ACCOUNT_DATA_TYPE,
+                        content,
+                    }),
+                ),
+            });
+
+            const globalValue = controller.getValueOverride(SettingLevel.ACCOUNT);
+            expect(globalValue.allBlocked).toEqual(false);
+        },
+    );
+
+    it.each<InviteConfigAccountData>([
+        { blocked_users: ["*"] },
+        { blocked_users: ["*", "bob"] },
+        { allowed_users: ["*"], blocked_users: ["*"] },
+    ])("calculates blockAll to be true", (content: InviteConfigAccountData) => {
+        const controller = new InviteRulesConfigController();
+
+        MatrixClientBackedController.matrixClient = getMockClientWithEventEmitter({
+            ...mockClientMethodsServer(),
+            getAccountData: jest.fn().mockReturnValue(
+                new MatrixEvent({
+                    type: INVITE_RULES_ACCOUNT_DATA_TYPE,
+                    content,
+                }),
+            ),
+        });
+
+        const globalValue = controller.getValueOverride(SettingLevel.ACCOUNT);
+        expect(globalValue.allBlocked).toEqual(true);
+    });
+
+    it("sets the account data correctly for blockAll = true", async () => {
+        const controller = new InviteRulesConfigController();
+        const client = (MatrixClientBackedController.matrixClient = getMockClientWithEventEmitter({
+            ...mockClientMethodsServer(),
+            getAccountData: jest.fn().mockReturnValue(
+                new MatrixEvent({
+                    type: INVITE_RULES_ACCOUNT_DATA_TYPE,
+                    content: {
+                        existing_content: {},
+                        allowed_servers: ["*"],
+                    },
+                }),
+            ),
+            setAccountData: jest.fn(),
+        }));
+
+        expect(await controller.beforeChange(SettingLevel.ACCOUNT, null, { allBlocked: true })).toBe(true);
+        expect(client.setAccountData).toHaveBeenCalledWith(INVITE_RULES_ACCOUNT_DATA_TYPE, {
+            existing_content: {},
+            allowed_servers: ["*"],
+            blocked_users: ["*"],
+        });
+    });
+
+    it("sets the account data correctly for blockAll = false", async () => {
+        const controller = new InviteRulesConfigController();
+        const client = (MatrixClientBackedController.matrixClient = getMockClientWithEventEmitter({
+            ...mockClientMethodsServer(),
+            getAccountData: jest.fn().mockReturnValue(
+                new MatrixEvent({
+                    type: INVITE_RULES_ACCOUNT_DATA_TYPE,
+                    content: {
+                        existing_content: {},
+                        allowed_servers: ["*"],
+                        blocked_users: ["extra_user", "*"],
+                    },
+                }),
+            ),
+            setAccountData: jest.fn(),
+        }));
+
+        expect(await controller.beforeChange(SettingLevel.ACCOUNT, null, { allBlocked: false })).toBe(true);
+        expect(client.setAccountData).toHaveBeenCalledWith(INVITE_RULES_ACCOUNT_DATA_TYPE, {
+            existing_content: {},
+            allowed_servers: ["*"],
+            blocked_users: ["extra_user"],
+        });
+    });
+    it.each([true, false])("ignores a no-op when allBlocked = %s", async (allBlocked) => {
+        const controller = new InviteRulesConfigController();
+        const client = (MatrixClientBackedController.matrixClient = getMockClientWithEventEmitter({
+            ...mockClientMethodsServer(),
+            getAccountData: jest.fn().mockReturnValue(
+                new MatrixEvent({
+                    type: INVITE_RULES_ACCOUNT_DATA_TYPE,
+                    content: {
+                        existing_content: {},
+                        allowed_servers: ["*"],
+                        blocked_users: allBlocked ? ["*"] : [],
+                    },
+                }),
+            ),
+            setAccountData: jest.fn(),
+        }));
+
+        expect(await controller.beforeChange(SettingLevel.ACCOUNT, null, { allBlocked })).toBe(false);
+        expect(client.setAccountData).not.toHaveBeenCalled();
+    });
+});
diff --git a/test/unit-tests/settings/controllers/ThemeController-test.ts b/test/unit-tests/settings/controllers/ThemeController-test.ts
index c8eb607898..4cce1d85ed 100644
--- a/test/unit-tests/settings/controllers/ThemeController-test.ts
+++ b/test/unit-tests/settings/controllers/ThemeController-test.ts
@@ -14,11 +14,6 @@ import { DEFAULT_THEME } from "../../../../src/theme";
 describe("ThemeController", () => {
     jest.spyOn(SettingsStore, "getValue").mockReturnValue([]);
 
-    afterEach(() => {
-        // reset
-        ThemeController.isLogin = false;
-    });
-
     it("returns null when calculatedValue is falsy", () => {
         const controller = new ThemeController();
 
@@ -32,16 +27,6 @@ describe("ThemeController", () => {
         ).toEqual(null);
     });
 
-    it("returns light when login flag is set", () => {
-        const controller = new ThemeController();
-
-        ThemeController.isLogin = true;
-
-        expect(controller.getValueOverride(SettingLevel.ACCOUNT, "$room:server", "dark", SettingLevel.ACCOUNT)).toEqual(
-            "light",
-        );
-    });
-
     it("returns default theme when value is not a valid theme", () => {
         const controller = new ThemeController();
 
diff --git a/test/unit-tests/settings/watchers/FontWatcher-test.tsx b/test/unit-tests/settings/watchers/FontWatcher-test.tsx
index e208498449..40a34b0328 100644
--- a/test/unit-tests/settings/watchers/FontWatcher-test.tsx
+++ b/test/unit-tests/settings/watchers/FontWatcher-test.tsx
@@ -131,8 +131,8 @@ describe("FontWatcher", function () {
         it("should migrate from V1 font size to V3", async () => {
             await SettingsStore.setValue("baseFontSize", null, SettingLevel.DEVICE, 13);
             await watcher!.start();
-            // 13px (V1 font size) + 5px (V1 offset) + 1px (root font size increase) - 14px (default browser font size) = 5px
-            expect(SettingsStore.getValue("fontSizeDelta")).toBe(5);
+            // 13px (V1 font size) + 5px (V1 offset) + 1px (root font size increase) - 16px (default browser font size) = 3px
+            expect(SettingsStore.getValue("fontSizeDelta")).toBe(3);
             // baseFontSize should be cleared
             expect(SettingsStore.getValue("baseFontSize")).toBe(0);
         });
@@ -140,8 +140,8 @@ describe("FontWatcher", function () {
         it("should migrate from V2 font size to V3 using browser font size", async () => {
             await SettingsStore.setValue("baseFontSizeV2", null, SettingLevel.DEVICE, 18);
             await watcher!.start();
-            // 18px - 14px (default browser font size) = 2px
-            expect(SettingsStore.getValue("fontSizeDelta")).toBe(4);
+            // 18px - 16px (default browser font size) = 2px
+            expect(SettingsStore.getValue("fontSizeDelta")).toBe(2);
             // baseFontSize should be cleared
             expect(SettingsStore.getValue("baseFontSizeV2")).toBe(0);
         });
diff --git a/test/unit-tests/stores/BreadcrumbsStore-test.ts b/test/unit-tests/stores/BreadcrumbsStore-test.ts
index 66cd88f41e..71ae11831d 100644
--- a/test/unit-tests/stores/BreadcrumbsStore-test.ts
+++ b/test/unit-tests/stores/BreadcrumbsStore-test.ts
@@ -112,7 +112,7 @@ describe("BreadcrumbsStore", () => {
             await dispatchJoinRoom(room.roomId);
 
             // We pass the value of the dynamic predecessor setting through
-            expect(client.getRoomUpgradeHistory).toHaveBeenCalledWith(room.roomId, false, false);
+            expect(client.getRoomUpgradeHistory).toHaveBeenCalledWith(room.roomId, true, false);
         });
     });
 
@@ -134,7 +134,7 @@ describe("BreadcrumbsStore", () => {
             await dispatchJoinRoom(room.roomId);
 
             // We pass the value of the dynamic predecessor setting through
-            expect(client.getRoomUpgradeHistory).toHaveBeenCalledWith(room.roomId, false, true);
+            expect(client.getRoomUpgradeHistory).toHaveBeenCalledWith(room.roomId, true, true);
         });
     });
 
diff --git a/test/unit-tests/stores/CallStore-test.ts b/test/unit-tests/stores/CallStore-test.ts
new file mode 100644
index 0000000000..30f42757e2
--- /dev/null
+++ b/test/unit-tests/stores/CallStore-test.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { type CallMembership, MatrixRTCSessionManagerEvents } from "matrix-js-sdk/src/matrixrtc";
+
+import { ElementCall } from "../../../src/models/Call";
+import { CallStore } from "../../../src/stores/CallStore";
+import {
+    setUpClientRoomAndStores,
+    cleanUpClientRoomAndStores,
+    setupAsyncStoreWithClient,
+    enableCalls,
+} from "../../test-utils";
+
+enableCalls();
+
+test("CallStore constructs one call for one MatrixRTC session", () => {
+    const { client, room } = setUpClientRoomAndStores();
+    try {
+        setupAsyncStoreWithClient(CallStore.instance, client);
+        const getSpy = jest.spyOn(ElementCall, "get");
+
+        // Simulate another user starting a new MatrixRTC session
+        const session = client.matrixRTC.getRoomSession(room);
+        session.memberships.push({} as CallMembership);
+        client.matrixRTC.emit(MatrixRTCSessionManagerEvents.SessionStarted, room.roomId, session);
+
+        expect(getSpy).toHaveBeenCalledTimes(1);
+        expect(getSpy).toHaveReturnedWith(expect.any(ElementCall));
+        expect(CallStore.instance.getCall(room.roomId)).not.toBe(null);
+    } finally {
+        cleanUpClientRoomAndStores(client, room);
+    }
+});
diff --git a/test/unit-tests/stores/MultiRoomViewStore-test.ts b/test/unit-tests/stores/MultiRoomViewStore-test.ts
new file mode 100644
index 0000000000..429ec3c08a
--- /dev/null
+++ b/test/unit-tests/stores/MultiRoomViewStore-test.ts
@@ -0,0 +1,101 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { MultiRoomViewStore } from "../../../src/stores/MultiRoomViewStore";
+import { RoomViewStore } from "../../../src/stores/RoomViewStore";
+import { Action } from "../../../src/dispatcher/actions";
+import type { MatrixDispatcher } from "../../../src/dispatcher/dispatcher";
+import { TestSdkContext } from "../TestSdkContext";
+
+jest.mock("../../../src/stores/RoomViewStore");
+
+describe("MultiRoomViewStore", () => {
+    let multiRoomViewStore: MultiRoomViewStore;
+    let mockDispatcher: MatrixDispatcher;
+    let mockSdkContext: TestSdkContext;
+    let mockRoomViewStore: jest.Mocked<RoomViewStore>;
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+
+        // Create mock dispatcher
+        mockDispatcher = {
+            dispatch: jest.fn(),
+            register: jest.fn(),
+            unregister: jest.fn(),
+        } as unknown as MatrixDispatcher;
+
+        // Create mock SDK context
+        mockSdkContext = new TestSdkContext();
+
+        // Create mock RoomViewStore instance
+        mockRoomViewStore = {
+            viewRoom: jest.fn(),
+            dispose: jest.fn(),
+        } as any;
+
+        (RoomViewStore as jest.MockedClass<typeof RoomViewStore>).mockImplementation(() => mockRoomViewStore as any);
+
+        // Create the MultiRoomViewStore instance
+        multiRoomViewStore = new MultiRoomViewStore(mockDispatcher, mockSdkContext);
+    });
+
+    describe("getRoomViewStoreForRoom", () => {
+        it("should create a new RoomViewStore for a room that doesn't exist in cache", () => {
+            const roomId = "!room1:example.com";
+
+            const result = multiRoomViewStore.getRoomViewStoreForRoom(roomId);
+
+            expect(RoomViewStore).toHaveBeenCalledWith(mockDispatcher, mockSdkContext, roomId);
+            expect(mockRoomViewStore.viewRoom).toHaveBeenCalledWith({
+                action: Action.ViewRoom,
+                room_id: roomId,
+                metricsTrigger: undefined,
+            });
+            expect(result).toBe(mockRoomViewStore);
+        });
+
+        it("should return existing RoomViewStore for a room that exists in cache", () => {
+            const roomId = "!room1:example.com";
+
+            // First call creates the store
+            const firstResult = multiRoomViewStore.getRoomViewStoreForRoom(roomId);
+
+            jest.clearAllMocks();
+
+            // Should return the same store
+            const secondResult = multiRoomViewStore.getRoomViewStoreForRoom(roomId);
+
+            expect(RoomViewStore).not.toHaveBeenCalled();
+            expect(mockRoomViewStore.viewRoom).toHaveBeenCalledWith({
+                action: Action.ViewRoom,
+                room_id: roomId,
+                metricsTrigger: undefined,
+            });
+            expect(secondResult).toBe(firstResult);
+            expect(secondResult).toBe(mockRoomViewStore);
+        });
+    });
+
+    describe("removeRoomViewStore", () => {
+        it("should remove an existing RoomViewStore from cache", () => {
+            const roomId = "!room1:example.com";
+
+            multiRoomViewStore.getRoomViewStoreForRoom(roomId);
+            multiRoomViewStore.removeRoomViewStore(roomId);
+
+            // New store should be created now
+            jest.clearAllMocks();
+            (RoomViewStore as jest.MockedClass<typeof RoomViewStore>).mockImplementation(
+                () => mockRoomViewStore as any,
+            );
+
+            multiRoomViewStore.getRoomViewStoreForRoom(roomId);
+            expect(RoomViewStore).toHaveBeenCalledWith(mockDispatcher, mockSdkContext, roomId);
+        });
+    });
+});
diff --git a/test/unit-tests/stores/ReleaseAnnouncementStore-test.tsx b/test/unit-tests/stores/ReleaseAnnouncementStore-test.tsx
index a902616673..7a7a735c9a 100644
--- a/test/unit-tests/stores/ReleaseAnnouncementStore-test.tsx
+++ b/test/unit-tests/stores/ReleaseAnnouncementStore-test.tsx
@@ -11,8 +11,10 @@ import { mocked } from "jest-mock";
 import SettingsStore, { type CallbackFn } from "../../../src/settings/SettingsStore";
 import { type Feature, ReleaseAnnouncementStore } from "../../../src/stores/ReleaseAnnouncementStore";
 import { type SettingLevel } from "../../../src/settings/SettingLevel";
+import ToastStore from "../../../src/stores/ToastStore";
 
 jest.mock("../../../src/settings/SettingsStore");
+jest.mock("../../../src/stores/ToastStore");
 
 describe("ReleaseAnnouncementStore", () => {
     let releaseAnnouncementStore: ReleaseAnnouncementStore;
@@ -48,6 +50,11 @@ describe("ReleaseAnnouncementStore", () => {
             return "watcherId";
         });
 
+        mocked(ToastStore.sharedInstance).mockReturnValue({
+            on: jest.fn(),
+            getToasts: jest.fn().mockReturnValue([]),
+        } as any);
+
         releaseAnnouncementStore = new ReleaseAnnouncementStore();
     });
 
@@ -110,12 +117,18 @@ describe("ReleaseAnnouncementStore", () => {
 
     it("should listen to release announcement data changes in the store", async () => {
         const secondStore = new ReleaseAnnouncementStore();
-        expect(secondStore.getReleaseAnnouncement()).toBe("pinningMessageList");
+        expect(secondStore.getReleaseAnnouncement()).toBe("_test_dummy1");
 
         const promise = listenReleaseAnnouncementChanged();
         await secondStore.nextReleaseAnnouncement();
 
-        expect(await promise).toBe(null);
-        expect(releaseAnnouncementStore.getReleaseAnnouncement()).toBe(null);
+        expect(await promise).toBe("_test_dummy2");
+        expect(releaseAnnouncementStore.getReleaseAnnouncement()).toBe("_test_dummy2");
+    });
+
+    it("should return null when there are toasts on screen", async () => {
+        mocked(ToastStore.sharedInstance().getToasts).mockReturnValue([{} as any]);
+
+        expect(releaseAnnouncementStore.getReleaseAnnouncement()).toBeNull();
     });
 });
diff --git a/test/unit-tests/stores/RoomViewStore-test.ts b/test/unit-tests/stores/RoomViewStore-test.ts
index 71bc57160d..2f7c666895 100644
--- a/test/unit-tests/stores/RoomViewStore-test.ts
+++ b/test/unit-tests/stores/RoomViewStore-test.ts
@@ -18,6 +18,7 @@ import EventEmitter from "events";
 import { RoomViewStore } from "../../../src/stores/RoomViewStore";
 import { Action } from "../../../src/dispatcher/actions";
 import {
+    flushPromises,
     getMockClientWithEventEmitter,
     setupAsyncStoreWithClient,
     untilDispatch,
@@ -43,6 +44,9 @@ import { type IApp } from "../../../src/utils/WidgetUtils-types";
 import { CallStore } from "../../../src/stores/CallStore";
 import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
 import MediaDeviceHandler, { MediaDeviceKindEnum } from "../../../src/MediaDeviceHandler";
+import { storeRoomAliasInCache } from "../../../src/RoomAliasCache.ts";
+import { type Call } from "../../../src/models/Call.ts";
+import { ModuleApi } from "../../../src/modules/Api";
 
 jest.mock("../../../src/Modal");
 
@@ -142,16 +146,6 @@ describe("RoomViewStore", function () {
     const room2 = new Room(roomId2, mockClient, userId);
     getRooms.mockReturnValue([room, room2]);
 
-    const viewCall = async (): Promise<void> => {
-        dis.dispatch<ViewRoomPayload>({
-            action: Action.ViewRoom,
-            room_id: roomId,
-            view_call: true,
-            metricsTrigger: undefined,
-        });
-        await untilDispatch(Action.ViewRoom, dis);
-    };
-
     const dispatchPromptAskToJoin = async () => {
         dis.dispatch({ action: Action.PromptAskToJoin });
         await untilDispatch(Action.PromptAskToJoin, dis);
@@ -199,6 +193,12 @@ describe("RoomViewStore", function () {
         // @ts-expect-error
         MockPosthogAnalytics.instance = stores._PosthogAnalytics;
         stores._SpaceStore = new MockSpaceStore();
+        // Add activeSpace property to the mock
+        Object.defineProperty(stores._SpaceStore, "activeSpace", {
+            value: null,
+            writable: true,
+            configurable: true,
+        });
         roomViewStore = new RoomViewStore(dis, stores);
         stores._RoomViewStore = roomViewStore;
     });
@@ -211,6 +211,22 @@ describe("RoomViewStore", function () {
         expect(roomViewStore.isJoining()).toBe(true);
     });
 
+    it("can be used to view a room by alias with auto_join", async () => {
+        const alias = "#alias12345:server";
+        storeRoomAliasInCache(alias, roomId, ["server1"]);
+        dis.dispatch({ action: Action.ViewRoom, room_alias: alias, auto_join: true }, true);
+        await expect(untilDispatch(Action.ViewRoom, dis)).resolves.toEqual(
+            expect.objectContaining({
+                action: Action.ViewRoom,
+                room_id: roomId,
+                auto_join: true,
+            }),
+        );
+        await untilDispatch(Action.JoinRoomReady, dis);
+        expect(mockClient.joinRoom).toHaveBeenCalledWith(alias, { viaServers: ["server1"] });
+        expect(roomViewStore.isJoining()).toBe(true);
+    });
+
     it("can auto-join a room", async () => {
         dis.dispatch({ action: Action.ViewRoom, room_id: roomId, auto_join: true });
         await untilDispatch(Action.JoinRoomReady, dis);
@@ -333,6 +349,37 @@ describe("RoomViewStore", function () {
         },
     );
 
+    it("does not change room when replying to event in a room displayed in module", async () => {
+        // Spy on dispatch to check later if ViewRoom was dispatched
+        jest.spyOn(dis, "dispatch");
+
+        // Set up current room
+        dis.dispatch({ action: Action.ViewRoom, room_id: roomId });
+        await untilDispatch(Action.ActiveRoomChanged, dis);
+        expect(roomViewStore.getRoomId()).toEqual(roomId);
+
+        ModuleApi.instance.extras.getVisibleRoomBySpaceKey("space1", () => [roomId, roomId2]);
+        // @ts-ignore
+        stores.spaceStore.activeSpace = "space1";
+
+        // Create reply event for roomId2 (which is displayed in module)
+        const replyToEvent = {
+            getRoomId: () => roomId2,
+        };
+
+        // Dispatch reply_to_event - should not change room since roomId2 is in module
+        dis.dispatch({ action: "reply_to_event", event: replyToEvent, context: TimelineRenderingType.Room });
+        await flushPromises();
+
+        // Room should remain the same (roomId), not change to roomId2
+        expect(dis.dispatch).not.toHaveBeenCalledWith({
+            action: Action.ViewRoom,
+            room_id: roomId2,
+            replyingToEvent: replyToEvent,
+            metricsTrigger: undefined,
+        });
+    });
+
     it("removes the roomId on ViewHomePage", async () => {
         dis.dispatch({ action: Action.ViewRoom, room_id: roomId });
         await untilDispatch(Action.ActiveRoomChanged, dis);
@@ -344,8 +391,37 @@ describe("RoomViewStore", function () {
     });
 
     it("when viewing a call without a broadcast, it should not raise an error", async () => {
+        const call = { presented: false } as Call;
+        const getCallSpy = jest.spyOn(CallStore.instance, "getCall").mockReturnValue(call);
         await setupAsyncStoreWithClient(CallStore.instance, MatrixClientPeg.safeGet());
-        await viewCall();
+
+        dis.dispatch<ViewRoomPayload>({
+            action: Action.ViewRoom,
+            room_id: roomId,
+            view_call: true,
+            metricsTrigger: undefined,
+        });
+        await untilDispatch(Action.ViewRoom, dis);
+
+        expect(getCallSpy).toHaveBeenCalledWith(roomId);
+        expect(call.presented).toEqual(true);
+    });
+
+    it("implicitly views an active call", async () => {
+        const call = { presented: false } as Call;
+        jest.spyOn(CallStore.instance, "getCall").mockReturnValue(call);
+        jest.spyOn(CallStore.instance, "getActiveCall").mockImplementation((rId) => (rId === roomId ? call : null));
+        await setupAsyncStoreWithClient(CallStore.instance, MatrixClientPeg.safeGet());
+
+        // View the room without explicitly setting view_call to true
+        dis.dispatch<ViewRoomPayload>({
+            action: Action.ViewRoom,
+            room_id: roomId,
+            metricsTrigger: undefined,
+        });
+        await untilDispatch(Action.ViewRoom, dis);
+
+        expect(call.presented).toEqual(true);
     });
 
     it("should display an error message when the room is unreachable via the roomId", async () => {
@@ -422,8 +498,8 @@ describe("RoomViewStore", function () {
     });
 
     describe("Action.JoinRoom", () => {
-        it("dispatches Action.JoinRoomError and Action.AskToJoin when the join fails", async () => {
-            const err = new MatrixError();
+        it("dispatches Action.JoinRoomError and Action.AskToJoin when the join fails with 403", async () => {
+            const err = new MatrixError({}, 403);
 
             jest.spyOn(dis, "dispatch");
             jest.spyOn(mockClient, "joinRoom").mockRejectedValueOnce(err);
@@ -440,6 +516,17 @@ describe("RoomViewStore", function () {
             });
             expect(mocked(dis.dispatch).mock.calls[2][0]).toEqual({ action: "prompt_ask_to_join" });
         });
+
+        it("sets 'acceptSharedHistory' if that option is enabled", async () => {
+            jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName, roomId, value) => {
+                return settingName === "feature_share_history_on_invite"; // this is enabled, everything else is disabled.
+            });
+
+            dis.dispatch({ action: Action.ViewRoom, room_id: roomId });
+            dis.dispatch({ action: Action.JoinRoom });
+            await untilDispatch(Action.JoinRoomReady, dis);
+            expect(mockClient.joinRoom).toHaveBeenCalledWith(roomId, { acceptSharedHistory: true, viaServers: [] });
+        });
     });
 
     describe("Action.JoinRoomError", () => {
diff --git a/test/unit-tests/stores/SpaceStore-test.ts b/test/unit-tests/stores/SpaceStore-test.ts
index 6b6b6c1bc1..fc05cf5fed 100644
--- a/test/unit-tests/stores/SpaceStore-test.ts
+++ b/test/unit-tests/stores/SpaceStore-test.ts
@@ -41,6 +41,7 @@ import RoomListStore from "../../../src/stores/room-list/RoomListStore";
 import { DefaultTagID } from "../../../src/stores/room-list/models";
 import { RoomNotificationStateStore } from "../../../src/stores/notifications/RoomNotificationStateStore";
 import { NotificationLevel } from "../../../src/stores/notifications/NotificationLevel";
+import { storeRoomAliasInCache } from "../../../src/RoomAliasCache.ts";
 
 jest.useFakeTimers();
 
@@ -1217,6 +1218,15 @@ describe("SpaceStore", () => {
             viewRoom(room1);
             expect(store.activeSpace).toBe(MetaSpace.Home);
         });
+
+        it("should check alias cache if switching to a room by alias", async () => {
+            viewRoom(room2);
+            storeRoomAliasInCache("#alias:server", room3, []);
+
+            store.setActiveSpace(space2, false);
+            defaultDispatcher.dispatch({ action: Action.ViewRoom, room_alias: "#alias:server" }, true);
+            expect(store.activeSpace).toBe(space1);
+        });
     });
 
     describe("traverseSpace", () => {
diff --git a/test/unit-tests/stores/WidgetLayoutStore-test.ts b/test/unit-tests/stores/WidgetLayoutStore-test.ts
index 1b5748f3a8..982c65e210 100644
--- a/test/unit-tests/stores/WidgetLayoutStore-test.ts
+++ b/test/unit-tests/stores/WidgetLayoutStore-test.ts
@@ -14,6 +14,7 @@ import { Container, WidgetLayoutStore } from "../../../src/stores/widgets/Widget
 import { stubClient } from "../../test-utils";
 import defaultDispatcher from "../../../src/dispatcher/dispatcher";
 import SettingsStore from "../../../src/settings/SettingsStore";
+import { Action } from "../../../src/dispatcher/actions.ts";
 
 // setup test env values
 const roomId = "!room:server";
@@ -196,12 +197,7 @@ describe("WidgetLayoutStore", () => {
 
     it("should clear the layout if the client is not viable", () => {
         store.recalculateRoom(mockRoom);
-        defaultDispatcher.dispatch(
-            {
-                action: "on_client_not_viable",
-            },
-            true,
-        );
+        defaultDispatcher.dispatch({ action: Action.ClientNotViable }, true);
 
         expect(store.getContainerWidgets(mockRoom, Container.Top)).toEqual([]);
         expect(store.getContainerWidgets(mockRoom, Container.Center)).toEqual([]);
diff --git a/test/unit-tests/stores/__snapshots__/RoomViewStore-test.ts.snap b/test/unit-tests/stores/__snapshots__/RoomViewStore-test.ts.snap
index 77ee50df5b..3379087e76 100644
--- a/test/unit-tests/stores/__snapshots__/RoomViewStore-test.ts.snap
+++ b/test/unit-tests/stores/__snapshots__/RoomViewStore-test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`RoomViewStore should display an error message when the room is unreachable via the roomId 1`] = `
 {
diff --git a/test/unit-tests/stores/room-list-v3/RoomListStoreV3-test.ts b/test/unit-tests/stores/room-list-v3/RoomListStoreV3-test.ts
index 0c0cdfc091..2d7dd4459c 100644
--- a/test/unit-tests/stores/room-list-v3/RoomListStoreV3-test.ts
+++ b/test/unit-tests/stores/room-list-v3/RoomListStoreV3-test.ts
@@ -7,6 +7,7 @@ Please see LICENSE files in the repository root for full details.
 
 import { EventType, KnownMembership, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
+import { mocked } from "jest-mock";
 
 import type { MatrixClient } from "matrix-js-sdk/src/matrix";
 import type { RoomNotificationState } from "../../../../src/stores/notifications/RoomNotificationState";
@@ -28,6 +29,7 @@ import SettingsStore from "../../../../src/settings/SettingsStore";
 import * as utils from "../../../../src/utils/notifications";
 import * as roomMute from "../../../../src/stores/room-list/utils/roomMute";
 import { Action } from "../../../../src/dispatcher/actions";
+import { SettingLevel } from "../../../../src/settings/SettingLevel.ts";
 
 describe("RoomListStoreV3", () => {
     async function getRoomListStore() {
@@ -197,6 +199,9 @@ describe("RoomListStoreV3", () => {
             const oldRoom = rooms[32];
             // Create a new room with a predecessor event that points to oldRoom
             const newRoom = new Room("!foonew:matrix.org", client, client.getSafeUserId(), {});
+            mocked(client.getRoomUpgradeHistory).mockImplementation((roomId) =>
+                roomId === newRoom.roomId ? [oldRoom, newRoom] : [],
+            );
             const createWithPredecessor = new MatrixEvent({
                 type: EventType.RoomCreate,
                 sender: "@foo:foo.org",
@@ -214,7 +219,6 @@ describe("RoomListStoreV3", () => {
             dispatcher.dispatch(
                 {
                     action: "MatrixActions.Room.myMembership",
-                    oldMembership: KnownMembership.Invite,
                     membership: KnownMembership.Join,
                     room: newRoom,
                 },
@@ -227,6 +231,40 @@ describe("RoomListStoreV3", () => {
             expect(roomIds).toContain(newRoom.roomId);
         });
 
+        it("should not remove predecessor room based on non-reciprocated relationship", async () => {
+            const { store, rooms, client, dispatcher } = await getRoomListStore();
+            const oldRoom = rooms[32];
+            // Create a new room with a predecessor event that points to oldRoom, but oldRoom does not point back
+            const newRoom = new Room("!nefarious:matrix.org", client, client.getSafeUserId(), {});
+            const createWithPredecessor = new MatrixEvent({
+                type: EventType.RoomCreate,
+                sender: "@foo:foo.org",
+                room_id: newRoom.roomId,
+                content: {
+                    predecessor: { room_id: oldRoom.roomId, event_id: "tombstone_event_id" },
+                },
+                event_id: "$create",
+                state_key: "",
+            });
+            upsertRoomStateEvents(newRoom, [createWithPredecessor]);
+
+            const fn = jest.fn();
+            store.on(LISTS_UPDATE_EVENT, fn);
+            dispatcher.dispatch(
+                {
+                    action: "MatrixActions.Room.myMembership",
+                    membership: KnownMembership.Join,
+                    room: newRoom,
+                },
+                true,
+            );
+
+            expect(fn).toHaveBeenCalled();
+            const roomIds = store.getSortedRooms().map((r) => r.roomId);
+            expect(roomIds).toContain(oldRoom.roomId);
+            expect(roomIds).toContain(newRoom.roomId);
+        });
+
         it("Rooms are re-inserted on m.direct event", async () => {
             const { store, dispatcher, client } = await getRoomListStore();
 
@@ -460,7 +498,7 @@ describe("RoomListStoreV3", () => {
                 store.on(LISTS_UPDATE_EVENT, fn);
 
                 // The rooms which belong to the space should not be shown
-                const result = store.getSortedRoomsInActiveSpace().map((r) => r.roomId);
+                const result = store.getSortedRoomsInActiveSpace().rooms.map((r) => r.roomId);
                 for (const id of roomIds) {
                     expect(result).not.toContain(id);
                 }
@@ -469,7 +507,7 @@ describe("RoomListStoreV3", () => {
                 jest.spyOn(SpaceStore.instance, "activeSpace", "get").mockImplementation(() => spaceRoom.roomId);
                 SpaceStore.instance.emit(UPDATE_SELECTED_SPACE);
                 expect(fn).toHaveBeenCalled();
-                const result2 = store.getSortedRoomsInActiveSpace().map((r) => r.roomId);
+                const result2 = store.getSortedRoomsInActiveSpace().rooms.map((r) => r.roomId);
                 for (const id of roomIds) {
                     expect(result2).toContain(id);
                 }
@@ -492,7 +530,7 @@ describe("RoomListStoreV3", () => {
                 await store.start();
 
                 // Sorted, filtered rooms should be 8, 27 and 75
-                const result = store.getSortedRoomsInActiveSpace([FilterKey.FavouriteFilter]);
+                const result = store.getSortedRoomsInActiveSpace([FilterKey.FavouriteFilter]).rooms;
                 expect(result).toHaveLength(3);
                 for (const i of [8, 27, 75]) {
                     expect(result).toContain(rooms[i]);
@@ -527,7 +565,7 @@ describe("RoomListStoreV3", () => {
                 expect(fn).toHaveBeenCalled();
 
                 // Sorted, filtered rooms should be 27 and 75
-                const result = store.getSortedRoomsInActiveSpace([FilterKey.FavouriteFilter]);
+                const result = store.getSortedRoomsInActiveSpace([FilterKey.FavouriteFilter]).rooms;
                 expect(result).toHaveLength(2);
                 for (const i of [8, 75]) {
                     expect(result).toContain(rooms[i]);
@@ -552,7 +590,7 @@ describe("RoomListStoreV3", () => {
                 await store.start();
 
                 // Should only give us rooms at index 8 and 27
-                const result = store.getSortedRoomsInActiveSpace([FilterKey.UnreadFilter]);
+                const result = store.getSortedRoomsInActiveSpace([FilterKey.UnreadFilter]).rooms;
                 expect(result).toHaveLength(2);
                 for (const i of [8, 27]) {
                     expect(result).toContain(rooms[i]);
@@ -569,7 +607,7 @@ describe("RoomListStoreV3", () => {
                 await store.start();
 
                 // Since there's no unread yet, we expect zero results
-                let result = store.getSortedRoomsInActiveSpace([FilterKey.UnreadFilter]);
+                let result = store.getSortedRoomsInActiveSpace([FilterKey.UnreadFilter]).rooms;
                 expect(result).toHaveLength(0);
 
                 // Mock so that room at index 8 is marked as unread
@@ -584,7 +622,7 @@ describe("RoomListStoreV3", () => {
                 );
 
                 // Now we expect room at index 8 to show as unread
-                result = store.getSortedRoomsInActiveSpace([FilterKey.UnreadFilter]);
+                result = store.getSortedRoomsInActiveSpace([FilterKey.UnreadFilter]).rooms;
                 expect(result).toHaveLength(1);
                 expect(result).toContain(rooms[8]);
             });
@@ -607,14 +645,14 @@ describe("RoomListStoreV3", () => {
                 await store.start();
 
                 // Should only give us rooms at index 8 and 27
-                const peopleRooms = store.getSortedRoomsInActiveSpace([FilterKey.PeopleFilter]);
+                const peopleRooms = store.getSortedRoomsInActiveSpace([FilterKey.PeopleFilter]).rooms;
                 expect(peopleRooms).toHaveLength(2);
                 for (const i of [8, 27]) {
                     expect(peopleRooms).toContain(rooms[i]);
                 }
 
                 // Rest are normal rooms
-                const nonDms = store.getSortedRoomsInActiveSpace([FilterKey.RoomsFilter]);
+                const nonDms = store.getSortedRoomsInActiveSpace([FilterKey.RoomsFilter]).rooms;
                 expect(nonDms).toHaveLength(3);
                 for (const i of [6, 13, 75]) {
                     expect(nonDms).toContain(rooms[i]);
@@ -638,7 +676,7 @@ describe("RoomListStoreV3", () => {
                 const store = new RoomListStoreV3Class(dispatcher);
                 await store.start();
 
-                const result = store.getSortedRoomsInActiveSpace([FilterKey.InvitesFilter]);
+                const result = store.getSortedRoomsInActiveSpace([FilterKey.InvitesFilter]).rooms;
                 expect(result).toHaveLength(5);
                 for (const room of invitedRooms) {
                     expect(result).toContain(room);
@@ -663,7 +701,7 @@ describe("RoomListStoreV3", () => {
                 await store.start();
 
                 // Should only give us rooms at index 8 and 27
-                const result = store.getSortedRoomsInActiveSpace([FilterKey.MentionsFilter]);
+                const result = store.getSortedRoomsInActiveSpace([FilterKey.MentionsFilter]).rooms;
                 expect(result).toHaveLength(2);
                 for (const i of [8, 27]) {
                     expect(result).toContain(rooms[i]);
@@ -685,7 +723,7 @@ describe("RoomListStoreV3", () => {
                 await store.start();
 
                 // Sorted, filtered rooms should be 8, 27 and 75
-                const result = store.getSortedRoomsInActiveSpace([FilterKey.LowPriorityFilter]);
+                const result = store.getSortedRoomsInActiveSpace([FilterKey.LowPriorityFilter]).rooms;
                 expect(result).toHaveLength(3);
                 for (const i of [8, 27, 75]) {
                     expect(result).toContain(rooms[i]);
@@ -713,10 +751,42 @@ describe("RoomListStoreV3", () => {
                 await store.start();
 
                 // Should give us only room at 8 since that's the only room which matches both filters
-                const result = store.getSortedRoomsInActiveSpace([FilterKey.UnreadFilter, FilterKey.FavouriteFilter]);
+                const result = store.getSortedRoomsInActiveSpace([
+                    FilterKey.UnreadFilter,
+                    FilterKey.FavouriteFilter,
+                ]).rooms;
                 expect(result).toHaveLength(1);
                 expect(result).toContain(rooms[8]);
             });
+
+            it("should update filters on membership change", async () => {
+                await SettingsStore.setValue("feature_ask_to_join", null, SettingLevel.DEVICE, true);
+                const { store, client, dispatcher } = await getRoomListStore();
+                const room = new Room("!fooknock:matrix.org", client, client.getSafeUserId(), {});
+
+                room.getMyMembership = jest.fn().mockReturnValue(KnownMembership.Knock);
+                dispatcher.dispatch(
+                    {
+                        action: "MatrixActions.Room.myMembership",
+                        membership: KnownMembership.Knock,
+                        room,
+                    },
+                    true,
+                );
+                expect(store.getSortedRoomsInActiveSpace([FilterKey.InvitesFilter]).rooms).not.toContain(room);
+
+                room.getMyMembership = jest.fn().mockReturnValue(KnownMembership.Invite);
+                dispatcher.dispatch(
+                    {
+                        action: "MatrixActions.Room.myMembership",
+                        oldMembership: KnownMembership.Knock,
+                        membership: KnownMembership.Invite,
+                        room,
+                    },
+                    true,
+                );
+                expect(store.getSortedRoomsInActiveSpace([FilterKey.InvitesFilter]).rooms).toContain(room);
+            });
         });
     });
 
@@ -798,4 +868,53 @@ describe("RoomListStoreV3", () => {
             expect(store.getSortedRooms()[34]).toEqual(unmutedRoom);
         });
     });
+
+    describe("Low priority rooms", () => {
+        async function getRoomListStoreWithRooms() {
+            const client = stubClient();
+            const rooms = getMockedRooms(client);
+
+            // Let's say that rooms 34, 84, 64, 14, 57 are low priority
+            const lowPriorityIndices = [34, 84, 64, 14, 57];
+            const lowPriorityRooms = lowPriorityIndices.map((i) => rooms[i]);
+            for (const room of lowPriorityRooms) {
+                room.tags[DefaultTagID.LowPriority] = {};
+            }
+
+            // Let's say that rooms 14, 57, 65, 78, 82, 5, 36 are muted
+            const mutedIndices = [14, 57, 65, 78, 82, 5, 36];
+            const mutedRooms = mutedIndices.map((i) => rooms[i]);
+            jest.spyOn(RoomNotificationStateStore.instance, "getRoomState").mockImplementation((room) => {
+                const state = {
+                    muted: mutedRooms.includes(room),
+                } as unknown as RoomNotificationState;
+                return state;
+            });
+
+            client.getVisibleRooms = jest.fn().mockReturnValue(rooms);
+            jest.spyOn(AsyncStoreWithClient.prototype, "matrixClient", "get").mockReturnValue(client);
+            const store = new RoomListStoreV3Class(dispatcher);
+            await store.start();
+
+            // We expect the following order: Low Priority -> Low Priority & Muted -> Muted
+            const expectedRoomIds = [84, 64, 34, 57, 14, 82, 78, 65, 36, 5].map((i) => rooms[i].roomId);
+
+            return {
+                client,
+                rooms,
+                expectedRoomIds,
+                store,
+                dispatcher,
+            };
+        }
+
+        it("Low priority rooms are pushed to the bottom of the list just before muted rooms", async () => {
+            const { store, expectedRoomIds } = await getRoomListStoreWithRooms();
+            const result = store
+                .getSortedRooms()
+                .slice(90)
+                .map((r) => r.roomId);
+            expect(result).toEqual(expectedRoomIds);
+        });
+    });
 });
diff --git a/test/unit-tests/stores/room-list/RoomListStore-test.ts b/test/unit-tests/stores/room-list/RoomListStore-test.ts
index d1ab2e7183..f6e1700ae3 100644
--- a/test/unit-tests/stores/room-list/RoomListStore-test.ts
+++ b/test/unit-tests/stores/room-list/RoomListStore-test.ts
@@ -115,6 +115,10 @@ describe("RoomListStore", () => {
         // Given a store we can spy on
         const { store, handleRoomUpdate } = createStore();
 
+        mocked(client.getRoomUpgradeHistory).mockImplementation((roomId) =>
+            roomId === roomWithCreatePredecessor.roomId ? [oldRoom, roomWithCreatePredecessor] : [],
+        );
+
         // When we tell it we joined a new room that has an old room as
         // predecessor in the create event
         const payload = {
diff --git a/test/unit-tests/stores/room-list/SpaceWatcher-test.ts b/test/unit-tests/stores/room-list/SpaceWatcher-test.ts
index fdb2d4cb49..4f0c7ee118 100644
--- a/test/unit-tests/stores/room-list/SpaceWatcher-test.ts
+++ b/test/unit-tests/stores/room-list/SpaceWatcher-test.ts
@@ -136,29 +136,8 @@ describe("SpaceWatcher", () => {
         expect(filter).toBeNull();
     });
 
-    it("removes filter for favourites -> all transition", async () => {
-        await setShowAllRooms(true);
-        new SpaceWatcher(mockRoomListStore);
-
-        SpaceStore.instance.setActiveSpace(MetaSpace.Favourites);
-        expect(filter).toBeInstanceOf(SpaceFilterCondition);
-        expect(filter!["space"]).toBe(MetaSpace.Favourites);
-        SpaceStore.instance.setActiveSpace(MetaSpace.Home);
-
-        expect(filter).toBeNull();
-    });
-
-    it("removes filter for people -> all transition", async () => {
-        await setShowAllRooms(true);
-        new SpaceWatcher(mockRoomListStore);
-
-        SpaceStore.instance.setActiveSpace(MetaSpace.People);
-        expect(filter).toBeInstanceOf(SpaceFilterCondition);
-        expect(filter!["space"]).toBe(MetaSpace.People);
-        SpaceStore.instance.setActiveSpace(MetaSpace.Home);
-
-        expect(filter).toBeNull();
-    });
+    // The new room list is now forced on, which removes the favourites and people meta spaces.
+    // So no need to test these transitions any more.
 
     it("removes filter for orphans -> all transition", async () => {
         await setShowAllRooms(true);
@@ -198,19 +177,6 @@ describe("SpaceWatcher", () => {
         expect(filter!["space"]).toBe(MetaSpace.Orphans);
     });
 
-    it("updates filter correctly for orphans -> people transition", async () => {
-        await setShowAllRooms(false);
-        SpaceStore.instance.setActiveSpace(MetaSpace.Orphans);
-
-        new SpaceWatcher(mockRoomListStore);
-        expect(filter).toBeInstanceOf(SpaceFilterCondition);
-        expect(filter!["space"]).toBe(MetaSpace.Orphans);
-        SpaceStore.instance.setActiveSpace(MetaSpace.People);
-
-        expect(filter).toBeInstanceOf(SpaceFilterCondition);
-        expect(filter!["space"]).toBe(MetaSpace.People);
-    });
-
     it("updates filter correctly for space -> space transition", async () => {
         await setShowAllRooms(false);
         SpaceStore.instance.setActiveSpace(space1);
diff --git a/test/unit-tests/stores/room-list/algorithms/Algorithm-test.ts b/test/unit-tests/stores/room-list/algorithms/Algorithm-test.ts
index 4294f82af2..893a13adfc 100644
--- a/test/unit-tests/stores/room-list/algorithms/Algorithm-test.ts
+++ b/test/unit-tests/stores/room-list/algorithms/Algorithm-test.ts
@@ -12,7 +12,6 @@ import { KnownMembership } from "matrix-js-sdk/src/types";
 import { Widget } from "matrix-widget-api";
 
 import type { MatrixClient } from "matrix-js-sdk/src/matrix";
-import type { ClientWidgetApi } from "matrix-widget-api";
 import {
     stubClient,
     setupAsyncStoreWithClient,
@@ -28,6 +27,8 @@ import "../../../../../src/stores/room-list/RoomListStore"; // must be imported
 import { Algorithm } from "../../../../../src/stores/room-list/algorithms/Algorithm";
 import { CallStore } from "../../../../../src/stores/CallStore";
 import { WidgetMessagingStore } from "../../../../../src/stores/widgets/WidgetMessagingStore";
+import { ConnectionState } from "../../../../../src/models/Call";
+import { type WidgetMessaging } from "../../../../../src/stores/widgets/WidgetMessaging";
 
 describe("Algorithm", () => {
     useMockedCalls();
@@ -83,17 +84,17 @@ describe("Algorithm", () => {
 
         MockedCall.create(roomWithCall, "1");
         const call = CallStore.instance.getCall(roomWithCall.roomId);
-        if (call === null) throw new Error("Failed to create call");
+        if (!(call instanceof MockedCall)) throw new Error("Failed to create call");
 
         const widget = new Widget(call.widget);
         WidgetMessagingStore.instance.storeMessaging(widget, roomWithCall.roomId, {
             stop: () => {},
-        } as unknown as ClientWidgetApi);
+        } as unknown as WidgetMessaging);
 
         // End of setup
 
         expect(algorithm.getOrderedRooms()[DefaultTagID.Untagged]).toEqual([room, roomWithCall]);
-        await call.start();
+        call.setConnectionState(ConnectionState.Connected);
         expect(algorithm.getOrderedRooms()[DefaultTagID.Untagged]).toEqual([roomWithCall, room]);
         await call.disconnect();
         expect(algorithm.getOrderedRooms()[DefaultTagID.Untagged]).toEqual([room, roomWithCall]);
diff --git a/test/unit-tests/stores/widgets/StopGapWidgetDriver-test.ts b/test/unit-tests/stores/widgets/ElementWidgetDriver-test.ts
similarity index 82%
rename from test/unit-tests/stores/widgets/StopGapWidgetDriver-test.ts
rename to test/unit-tests/stores/widgets/ElementWidgetDriver-test.ts
index e08a83dd02..0f3602bd3a 100644
--- a/test/unit-tests/stores/widgets/StopGapWidgetDriver-test.ts
+++ b/test/unit-tests/stores/widgets/ElementWidgetDriver-test.ts
@@ -27,7 +27,6 @@ import {
     SimpleObservable,
     OpenIDRequestState,
     type IOpenIDUpdate,
-    UpdateDelayedEventAction,
 } from "matrix-widget-api";
 import {
     type ApprovalOpts,
@@ -37,7 +36,7 @@ import {
 
 import { SdkContextClass } from "../../../../src/contexts/SDKContext";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
-import { StopGapWidgetDriver } from "../../../../src/stores/widgets/StopGapWidgetDriver";
+import { ElementWidgetDriver } from "../../../../src/stores/widgets/ElementWidgetDriver";
 import { mkEvent, stubClient } from "../../../test-utils";
 import { ModuleRunner } from "../../../../src/modules/ModuleRunner";
 import dis from "../../../../src/dispatcher/dispatcher";
@@ -45,12 +44,11 @@ import Modal from "../../../../src/Modal";
 import SettingsStore from "../../../../src/settings/SettingsStore";
 import { WidgetType } from "../../../../src/widgets/WidgetType.ts";
 
-describe("StopGapWidgetDriver", () => {
+describe("ElementWidgetDriver", () => {
     let client: MockedObject<MatrixClient>;
 
     const mkDefaultDriver = (): WidgetDriver =>
-        new StopGapWidgetDriver(
-            [],
+        new ElementWidgetDriver(
             new Widget({
                 id: "test",
                 creatorUserId: "@alice:example.org",
@@ -74,8 +72,7 @@ describe("StopGapWidgetDriver", () => {
     });
 
     it("auto-approves capabilities of virtual Element Call widgets", async () => {
-        const driver = new StopGapWidgetDriver(
-            [],
+        const driver = new ElementWidgetDriver(
             new Widget({
                 id: "group_call",
                 creatorUserId: "@alice:example.org",
@@ -92,19 +89,26 @@ describe("StopGapWidgetDriver", () => {
             "m.always_on_screen",
             "town.robin.msc3846.turn_servers",
             "org.matrix.msc2762.timeline:!1:example.org",
+            "org.matrix.msc2762.send.event:org.matrix.msc4075.call.notify",
+            "org.matrix.msc2762.send.event:org.matrix.msc4075.rtc.notification",
             "org.matrix.msc2762.send.event:org.matrix.rageshake_request",
             "org.matrix.msc2762.receive.event:org.matrix.rageshake_request",
             "org.matrix.msc2762.send.event:m.reaction",
             "org.matrix.msc2762.receive.event:m.reaction",
             "org.matrix.msc2762.send.event:m.room.redaction",
             "org.matrix.msc2762.receive.event:m.room.redaction",
+            "org.matrix.msc2762.send.event:io.element.call.reaction",
+            "org.matrix.msc2762.receive.event:io.element.call.reaction",
             "org.matrix.msc2762.receive.state_event:m.room.create",
+            "org.matrix.msc2762.receive.state_event:m.room.name",
             "org.matrix.msc2762.receive.state_event:m.room.member",
             "org.matrix.msc2762.receive.state_event:org.matrix.msc3401.call",
             "org.matrix.msc2762.send.state_event:org.matrix.msc3401.call.member#@alice:example.org",
             "org.matrix.msc2762.receive.state_event:org.matrix.msc3401.call.member",
             `org.matrix.msc2762.send.state_event:org.matrix.msc3401.call.member#_@alice:example.org_${client.deviceId}`,
             `org.matrix.msc2762.send.state_event:org.matrix.msc3401.call.member#@alice:example.org_${client.deviceId}`,
+            `org.matrix.msc2762.send.state_event:org.matrix.msc3401.call.member#_@alice:example.org_${client.deviceId}_m.call`,
+            `org.matrix.msc2762.send.state_event:org.matrix.msc3401.call.member#@alice:example.org_${client.deviceId}_m.call`,
             "org.matrix.msc3819.send.to_device:m.call.invite",
             "org.matrix.msc3819.receive.to_device:m.call.invite",
             "org.matrix.msc3819.send.to_device:m.call.candidates",
@@ -127,6 +131,17 @@ describe("StopGapWidgetDriver", () => {
             "org.matrix.msc3819.receive.to_device:m.call.replaces",
             "org.matrix.msc4157.send.delayed_event",
             "org.matrix.msc4157.update_delayed_event",
+            "org.matrix.msc4354.send_sticky_event",
+            // RTC decline events (send/receive, unstable/stable)
+            "org.matrix.msc2762.send.event:org.matrix.msc4310.rtc.decline",
+            "org.matrix.msc2762.send.event:m.rtc.decline",
+            "org.matrix.msc2762.receive.event:org.matrix.msc4310.rtc.decline",
+            "org.matrix.msc2762.receive.event:m.rtc.decline",
+            // RTC member events (send/receive, unstable/stable)
+            "org.matrix.msc2762.receive.event:org.matrix.msc4143.rtc.member",
+            "org.matrix.msc2762.receive.event:m.rtc.member",
+            "org.matrix.msc2762.send.event:m.rtc.member",
+            "org.matrix.msc2762.send.event:org.matrix.msc4143.rtc.member",
         ]);
 
         const approvedCapabilities = await driver.validateCapabilities(requestedCapabilities);
@@ -542,23 +557,117 @@ describe("StopGapWidgetDriver", () => {
             driver = mkDefaultDriver();
         });
 
-        it("updates delayed events", async () => {
-            client._unstable_updateDelayedEvent.mockResolvedValue({});
-            for (const action of [
-                UpdateDelayedEventAction.Cancel,
-                UpdateDelayedEventAction.Restart,
-                UpdateDelayedEventAction.Send,
-            ]) {
-                await expect(driver.updateDelayedEvent("id", action)).resolves.toBeUndefined();
-                expect(client._unstable_updateDelayedEvent).toHaveBeenCalledWith("id", action);
-            }
+        it("can cancel scheduled delayed events", async () => {
+            client._unstable_cancelScheduledDelayedEvent.mockResolvedValue({});
+            await expect(driver.cancelScheduledDelayedEvent("id")).resolves.toBeUndefined();
+            expect(client._unstable_cancelScheduledDelayedEvent).toHaveBeenCalledWith("id");
         });
 
-        it("fails to update delayed events", async () => {
+        it("can restart scheduled delayed events", async () => {
+            client._unstable_restartScheduledDelayedEvent.mockResolvedValue({});
+            await expect(driver.restartScheduledDelayedEvent("id")).resolves.toBeUndefined();
+            expect(client._unstable_restartScheduledDelayedEvent).toHaveBeenCalledWith("id");
+        });
+
+        it("can send scheduled delayed events", async () => {
+            client._unstable_sendScheduledDelayedEvent.mockResolvedValue({});
+            await expect(driver.sendScheduledDelayedEvent("id")).resolves.toBeUndefined();
+            expect(client._unstable_sendScheduledDelayedEvent).toHaveBeenCalledWith("id");
+        });
+
+        it("fails to cancel scheduled delayed events", async () => {
+            const errorMessage = "Cannot cancel this delayed event";
+            client._unstable_cancelScheduledDelayedEvent.mockRejectedValue(new Error(errorMessage));
+            await expect(driver.cancelScheduledDelayedEvent("id")).rejects.toThrow(errorMessage);
+        });
+
+        it("fails to restart scheduled delayed events", async () => {
             const errorMessage = "Cannot restart this delayed event";
-            client._unstable_updateDelayedEvent.mockRejectedValue(new Error(errorMessage));
-            await expect(driver.updateDelayedEvent("id", UpdateDelayedEventAction.Restart)).rejects.toThrow(
-                errorMessage,
+            client._unstable_restartScheduledDelayedEvent.mockRejectedValue(new Error(errorMessage));
+            await expect(driver.restartScheduledDelayedEvent("id")).rejects.toThrow(errorMessage);
+        });
+
+        it("fails to send scheduled delayed events", async () => {
+            const errorMessage = "Cannot send this delayed event";
+            client._unstable_sendScheduledDelayedEvent.mockRejectedValue(new Error(errorMessage));
+            await expect(driver.sendScheduledDelayedEvent("id")).rejects.toThrow(errorMessage);
+        });
+    });
+
+    describe("sendStickyEvent", () => {
+        let driver: WidgetDriver;
+        const roomId = "!this-room-id";
+
+        beforeEach(() => {
+            driver = mkDefaultDriver();
+        });
+
+        it("sends sticky message events", async () => {
+            client._unstable_sendStickyEvent.mockResolvedValue({
+                event_id: "id",
+            });
+
+            await expect(driver.sendStickyEvent(2000, EventType.RoomMessage, {})).resolves.toEqual({
+                roomId,
+                eventId: "id",
+            });
+
+            expect(client._unstable_sendStickyEvent).toHaveBeenCalledWith(
+                roomId,
+                2000,
+                null,
+                EventType.RoomMessage,
+                {},
+            );
+        });
+    });
+
+    describe("sendDelayedStickyEvent", () => {
+        let driver: WidgetDriver;
+        const roomId = "!this-room-id";
+
+        beforeEach(() => {
+            driver = mkDefaultDriver();
+        });
+
+        it("sends delayed sticky message events", async () => {
+            client._unstable_sendStickyDelayedEvent.mockResolvedValue({
+                delay_id: "id",
+            });
+
+            await expect(driver.sendDelayedStickyEvent(1000, null, 2000, EventType.RoomMessage, {})).resolves.toEqual({
+                roomId,
+                delayId: "id",
+            });
+
+            expect(client._unstable_sendStickyDelayedEvent).toHaveBeenCalledWith(
+                roomId,
+                2000,
+                { delay: 1000 },
+                null,
+                EventType.RoomMessage,
+                {},
+            );
+        });
+        it("sends child action delayed sticky message events", async () => {
+            client._unstable_sendStickyDelayedEvent.mockResolvedValue({
+                delay_id: "id-child",
+            });
+
+            await expect(
+                driver.sendDelayedStickyEvent(null, "id-parent", 2000, EventType.RoomMessage, {}),
+            ).resolves.toEqual({
+                roomId,
+                delayId: "id-child",
+            });
+
+            expect(client._unstable_sendStickyDelayedEvent).toHaveBeenCalledWith(
+                roomId,
+                2000,
+                { parent_delay_id: "id-parent" },
+                null,
+                EventType.RoomMessage,
+                {},
             );
         });
     });
diff --git a/test/unit-tests/stores/widgets/StopGapWidget-test.ts b/test/unit-tests/stores/widgets/StopGapWidget-test.ts
deleted file mode 100644
index d61070b1e4..0000000000
--- a/test/unit-tests/stores/widgets/StopGapWidget-test.ts
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2022 The Matrix.org Foundation C.I.C
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-import { mocked, type MockedFunction, type MockedObject } from "jest-mock";
-import { findLast, last } from "lodash";
-import {
-    MatrixEvent,
-    type MatrixClient,
-    ClientEvent,
-    type EventTimeline,
-    EventType,
-    MatrixEventEvent,
-    RoomStateEvent,
-    type RoomState,
-} from "matrix-js-sdk/src/matrix";
-import { ClientWidgetApi, WidgetApiFromWidgetAction } from "matrix-widget-api";
-import { waitFor } from "jest-matrix-react";
-import { type Optional } from "matrix-events-sdk";
-
-import { stubClient, mkRoom, mkEvent } from "../../../test-utils";
-import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
-import { StopGapWidget } from "../../../../src/stores/widgets/StopGapWidget";
-import ActiveWidgetStore from "../../../../src/stores/ActiveWidgetStore";
-import SettingsStore from "../../../../src/settings/SettingsStore";
-import defaultDispatcher from "../../../../src/dispatcher/dispatcher";
-import { Action } from "../../../../src/dispatcher/actions";
-import { SdkContextClass } from "../../../../src/contexts/SDKContext";
-import { UPDATE_EVENT } from "../../../../src/stores/AsyncStore";
-
-jest.mock("matrix-widget-api", () => ({
-    ...jest.requireActual("matrix-widget-api"),
-    ClientWidgetApi: (jest.createMockFromModule("matrix-widget-api") as any).ClientWidgetApi,
-}));
-
-describe("StopGapWidget", () => {
-    let client: MockedObject<MatrixClient>;
-    let widget: StopGapWidget;
-    let messaging: MockedObject<ClientWidgetApi>;
-
-    beforeEach(() => {
-        stubClient();
-        client = mocked(MatrixClientPeg.safeGet());
-
-        widget = new StopGapWidget({
-            app: {
-                id: "test",
-                creatorUserId: "@alice:example.org",
-                type: "example",
-                url: "https://example.org?user-id=$matrix_user_id&device-id=$org.matrix.msc3819.matrix_device_id&base-url=$org.matrix.msc4039.matrix_base_url&theme=$org.matrix.msc2873.client_theme",
-                roomId: "!1:example.org",
-            },
-            room: mkRoom(client, "!1:example.org"),
-            userId: "@alice:example.org",
-            creatorUserId: "@alice:example.org",
-            waitForIframeLoad: true,
-            userWidget: false,
-        });
-        // Start messaging without an iframe, since ClientWidgetApi is mocked
-        widget.startMessaging(null as unknown as HTMLIFrameElement);
-        messaging = mocked(last(mocked(ClientWidgetApi).mock.instances)!);
-        messaging.feedStateUpdate.mockResolvedValue();
-    });
-
-    afterEach(() => {
-        widget.stopMessaging();
-    });
-
-    it("should replace parameters in widget url template", () => {
-        const originGetValue = SettingsStore.getValue;
-        const spy = jest.spyOn(SettingsStore, "getValue").mockImplementation((setting) => {
-            if (setting === "theme") return "my-theme-for-testing";
-            return originGetValue(setting);
-        });
-        expect(widget.embedUrl).toBe(
-            "https://example.org/?user-id=%40userId%3Amatrix.org&device-id=ABCDEFGHI&base-url=https%3A%2F%2Fmatrix-client.matrix.org&theme=my-theme-for-testing&widgetId=test&parentUrl=http%3A%2F%2Flocalhost%2F",
-        );
-        spy.mockClear();
-    });
-
-    it("feeds incoming to-device messages to the widget", async () => {
-        const event = mkEvent({
-            event: true,
-            type: "org.example.foo",
-            user: "@alice:example.org",
-            content: { hello: "world" },
-        });
-
-        client.emit(ClientEvent.ToDeviceEvent, event);
-        await Promise.resolve(); // flush promises
-        expect(messaging.feedToDevice).toHaveBeenCalledWith(event.getEffectiveEvent(), false);
-    });
-
-    it("feeds incoming state updates to the widget", () => {
-        const event = mkEvent({
-            event: true,
-            type: "org.example.foo",
-            skey: "",
-            user: "@alice:example.org",
-            content: { hello: "world" },
-            room: "!1:example.org",
-        });
-
-        client.emit(RoomStateEvent.Events, event, {} as unknown as RoomState, null);
-        expect(messaging.feedStateUpdate).toHaveBeenCalledWith(event.getEffectiveEvent());
-    });
-
-    it("informs widget of theme changes", () => {
-        let theme = "light";
-        const settingsSpy = jest
-            .spyOn(SettingsStore, "getValue")
-            .mockImplementation((name) => (name === "theme" ? theme : null));
-        try {
-            // Indicate that the widget is ready
-            findLast(messaging.once.mock.calls, ([eventName]) => eventName === "ready")![1]();
-
-            // Now change the theme
-            theme = "dark";
-            defaultDispatcher.dispatch({ action: Action.RecheckTheme }, true);
-            expect(messaging.updateTheme).toHaveBeenLastCalledWith({ name: "dark" });
-        } finally {
-            settingsSpy.mockRestore();
-        }
-    });
-
-    describe("feed event", () => {
-        let event1: MatrixEvent;
-        let event2: MatrixEvent;
-
-        beforeEach(() => {
-            event1 = mkEvent({
-                event: true,
-                id: "$event-id1",
-                type: "org.example.foo",
-                user: "@alice:example.org",
-                content: { hello: "world" },
-                room: "!1:example.org",
-            });
-
-            event2 = mkEvent({
-                event: true,
-                id: "$event-id2",
-                type: "org.example.foo",
-                user: "@alice:example.org",
-                content: { hello: "world" },
-                room: "!1:example.org",
-            });
-
-            const room = mkRoom(client, "!1:example.org");
-            client.getRoom.mockImplementation((roomId) => (roomId === "!1:example.org" ? room : null));
-            room.getLiveTimeline.mockReturnValue({
-                getEvents: (): MatrixEvent[] => [event1, event2],
-            } as unknown as EventTimeline);
-
-            messaging.feedEvent.mockResolvedValue();
-        });
-
-        it("feeds incoming event to the widget", async () => {
-            client.emit(ClientEvent.Event, event1);
-            expect(messaging.feedEvent).toHaveBeenCalledWith(event1.getEffectiveEvent());
-
-            client.emit(ClientEvent.Event, event2);
-            expect(messaging.feedEvent).toHaveBeenCalledTimes(2);
-            expect(messaging.feedEvent).toHaveBeenLastCalledWith(event2.getEffectiveEvent());
-        });
-
-        it("should not feed incoming event to the widget if seen already", async () => {
-            client.emit(ClientEvent.Event, event1);
-            expect(messaging.feedEvent).toHaveBeenCalledWith(event1.getEffectiveEvent());
-
-            client.emit(ClientEvent.Event, event2);
-            expect(messaging.feedEvent).toHaveBeenCalledTimes(2);
-            expect(messaging.feedEvent).toHaveBeenLastCalledWith(event2.getEffectiveEvent());
-
-            client.emit(ClientEvent.Event, event1);
-            expect(messaging.feedEvent).toHaveBeenCalledTimes(2);
-            expect(messaging.feedEvent).toHaveBeenLastCalledWith(event2.getEffectiveEvent());
-        });
-
-        it("feeds decrypted events asynchronously", async () => {
-            const event1Encrypted = new MatrixEvent({
-                event_id: event1.getId(),
-                type: EventType.RoomMessageEncrypted,
-                sender: event1.sender?.userId,
-                room_id: event1.getRoomId(),
-                content: {},
-            });
-            const decryptingSpy1 = jest.spyOn(event1Encrypted, "isBeingDecrypted").mockReturnValue(true);
-            client.emit(ClientEvent.Event, event1Encrypted);
-            const event2Encrypted = new MatrixEvent({
-                event_id: event2.getId(),
-                type: EventType.RoomMessageEncrypted,
-                sender: event2.sender?.userId,
-                room_id: event2.getRoomId(),
-                content: {},
-            });
-            const decryptingSpy2 = jest.spyOn(event2Encrypted, "isBeingDecrypted").mockReturnValue(true);
-            client.emit(ClientEvent.Event, event2Encrypted);
-            expect(messaging.feedEvent).not.toHaveBeenCalled();
-
-            // "Decrypt" the events, but in reverse order; first event 2…
-            event2Encrypted.event.type = event2.getType();
-            event2Encrypted.event.content = event2.getContent();
-            decryptingSpy2.mockReturnValue(false);
-            client.emit(MatrixEventEvent.Decrypted, event2Encrypted);
-            expect(messaging.feedEvent).toHaveBeenCalledTimes(1);
-            expect(messaging.feedEvent).toHaveBeenLastCalledWith(event2Encrypted.getEffectiveEvent());
-            // …then event 1
-            event1Encrypted.event.type = event1.getType();
-            event1Encrypted.event.content = event1.getContent();
-            decryptingSpy1.mockReturnValue(false);
-            client.emit(MatrixEventEvent.Decrypted, event1Encrypted);
-            // The events should be fed in that same order so that event 2
-            // doesn't have to be blocked on the decryption of event 1 (or
-            // worse, dropped)
-            expect(messaging.feedEvent).toHaveBeenCalledTimes(2);
-            expect(messaging.feedEvent).toHaveBeenLastCalledWith(event1Encrypted.getEffectiveEvent());
-        });
-
-        it("should not feed incoming event if not in timeline", () => {
-            const event = mkEvent({
-                event: true,
-                id: "$event-id",
-                type: "org.example.foo",
-                user: "@alice:example.org",
-                content: {
-                    hello: "world",
-                },
-                room: "!1:example.org",
-            });
-
-            client.emit(ClientEvent.Event, event);
-            expect(messaging.feedEvent).toHaveBeenCalledWith(event.getEffectiveEvent());
-        });
-
-        it("feeds incoming event that is not in timeline but relates to unknown parent to the widget", async () => {
-            const event = mkEvent({
-                event: true,
-                id: "$event-idRelation",
-                type: "org.example.foo",
-                user: "@alice:example.org",
-                content: {
-                    "hello": "world",
-                    "m.relates_to": {
-                        event_id: "$unknown-parent",
-                        rel_type: "m.reference",
-                    },
-                },
-                room: "!1:example.org",
-            });
-
-            client.emit(ClientEvent.Event, event1);
-            expect(messaging.feedEvent).toHaveBeenCalledWith(event1.getEffectiveEvent());
-
-            client.emit(ClientEvent.Event, event);
-            expect(messaging.feedEvent).toHaveBeenCalledTimes(2);
-            expect(messaging.feedEvent).toHaveBeenLastCalledWith(event.getEffectiveEvent());
-
-            client.emit(ClientEvent.Event, event1);
-            expect(messaging.feedEvent).toHaveBeenCalledTimes(2);
-            expect(messaging.feedEvent).toHaveBeenLastCalledWith(event.getEffectiveEvent());
-        });
-    });
-});
-
-describe("StopGapWidget with stickyPromise", () => {
-    let client: MockedObject<MatrixClient>;
-    let widget: StopGapWidget;
-    let messaging: MockedObject<ClientWidgetApi>;
-
-    beforeEach(() => {
-        stubClient();
-        client = mocked(MatrixClientPeg.safeGet());
-    });
-
-    afterEach(() => {
-        widget.stopMessaging();
-    });
-    it("should wait for the sticky promise to resolve before starting messaging", async () => {
-        jest.useFakeTimers();
-        const getStickyPromise = async () => {
-            return new Promise<void>((resolve) => {
-                setTimeout(() => {
-                    resolve();
-                }, 1000);
-            });
-        };
-        widget = new StopGapWidget({
-            app: {
-                id: "test",
-                creatorUserId: "@alice:example.org",
-                type: "example",
-                url: "https://example.org?user-id=$matrix_user_id&device-id=$org.matrix.msc3819.matrix_device_id&base-url=$org.matrix.msc4039.matrix_base_url",
-                roomId: "!1:example.org",
-            },
-            room: mkRoom(client, "!1:example.org"),
-            userId: "@alice:example.org",
-            creatorUserId: "@alice:example.org",
-            waitForIframeLoad: true,
-            userWidget: false,
-            stickyPromise: getStickyPromise,
-        });
-
-        const setPersistenceSpy = jest.spyOn(ActiveWidgetStore.instance, "setWidgetPersistence");
-
-        // Start messaging without an iframe, since ClientWidgetApi is mocked
-        widget.startMessaging(null as unknown as HTMLIFrameElement);
-        const emitSticky = async () => {
-            messaging = mocked(last(mocked(ClientWidgetApi).mock.instances)!);
-            messaging?.hasCapability.mockReturnValue(true);
-            // messaging.transport.reply will be called but transport is undefined in this test environment
-            // This just makes sure the call doesn't throw
-            Object.defineProperty(messaging, "transport", { value: { reply: () => {} } });
-            messaging.on.mock.calls.find(([event, listener]) => {
-                if (event === `action:${WidgetApiFromWidgetAction.UpdateAlwaysOnScreen}`) {
-                    listener({ preventDefault: () => {}, detail: { data: { value: true } } });
-                    return true;
-                }
-            });
-        };
-        await emitSticky();
-        expect(setPersistenceSpy).not.toHaveBeenCalled();
-        // Advance the fake timer so that the sticky promise resolves
-        jest.runAllTimers();
-        // Use a real timer and wait for the next tick so the sticky promise can resolve
-        jest.useRealTimers();
-
-        waitFor(() => expect(setPersistenceSpy).toHaveBeenCalled(), { interval: 5 });
-    });
-});
-
-describe("StopGapWidget as an account widget", () => {
-    let widget: StopGapWidget;
-    let messaging: MockedObject<ClientWidgetApi>;
-    let getRoomId: MockedFunction<() => Optional<string>>;
-
-    beforeEach(() => {
-        stubClient();
-        // I give up, getting the return type of spyOn right is hopeless
-        getRoomId = jest.spyOn(SdkContextClass.instance.roomViewStore, "getRoomId") as unknown as MockedFunction<
-            () => Optional<string>
-        >;
-        getRoomId.mockReturnValue("!1:example.org");
-
-        widget = new StopGapWidget({
-            app: {
-                id: "test",
-                creatorUserId: "@alice:example.org",
-                type: "example",
-                url: "https://example.org?user-id=$matrix_user_id&device-id=$org.matrix.msc3819.matrix_device_id&base-url=$org.matrix.msc4039.matrix_base_url&theme=$org.matrix.msc2873.client_theme",
-                roomId: "!1:example.org",
-            },
-            userId: "@alice:example.org",
-            creatorUserId: "@alice:example.org",
-            waitForIframeLoad: true,
-            userWidget: false,
-        });
-        // Start messaging without an iframe, since ClientWidgetApi is mocked
-        widget.startMessaging(null as unknown as HTMLIFrameElement);
-        messaging = mocked(last(mocked(ClientWidgetApi).mock.instances)!);
-    });
-
-    afterEach(() => {
-        widget.stopMessaging();
-        getRoomId.mockRestore();
-    });
-
-    it("updates viewed room", () => {
-        expect(messaging.setViewedRoomId).toHaveBeenCalledTimes(1);
-        expect(messaging.setViewedRoomId).toHaveBeenLastCalledWith("!1:example.org");
-        getRoomId.mockReturnValue("!2:example.org");
-        SdkContextClass.instance.roomViewStore.emit(UPDATE_EVENT);
-        expect(messaging.setViewedRoomId).toHaveBeenCalledTimes(2);
-        expect(messaging.setViewedRoomId).toHaveBeenLastCalledWith("!2:example.org");
-    });
-});
diff --git a/test/unit-tests/stores/widgets/WidgetMessaging-test.ts b/test/unit-tests/stores/widgets/WidgetMessaging-test.ts
new file mode 100644
index 0000000000..eb66502fda
--- /dev/null
+++ b/test/unit-tests/stores/widgets/WidgetMessaging-test.ts
@@ -0,0 +1,689 @@
+/*
+Copyright 2024 New Vector Ltd.
+Copyright 2022 The Matrix.org Foundation C.I.C
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { mocked, type MockedFunction, type MockedObject } from "jest-mock";
+import { findLast, last } from "lodash";
+import {
+    MatrixEvent,
+    type MatrixClient,
+    ClientEvent,
+    type EventTimeline,
+    EventType,
+    MatrixEventEvent,
+    RoomStateEvent,
+    type RoomState,
+    type Room,
+} from "matrix-js-sdk/src/matrix";
+import {
+    ClientWidgetApi,
+    type IModalWidgetOpenRequest,
+    type IStickerActionRequest,
+    type IStickyActionRequest,
+    type IWidgetApiRequest,
+    MatrixCapabilities,
+    WidgetApiDirection,
+    WidgetApiFromWidgetAction,
+} from "matrix-widget-api";
+import { waitFor } from "jest-matrix-react";
+
+import { stubClient, mkRoom, mkEvent } from "../../../test-utils";
+import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
+import { ElementWidget, WidgetMessaging } from "../../../../src/stores/widgets/WidgetMessaging";
+import ActiveWidgetStore from "../../../../src/stores/ActiveWidgetStore";
+import SettingsStore from "../../../../src/settings/SettingsStore";
+import defaultDispatcher from "../../../../src/dispatcher/dispatcher";
+import { Action } from "../../../../src/dispatcher/actions";
+import { SdkContextClass } from "../../../../src/contexts/SDKContext";
+import { UPDATE_EVENT } from "../../../../src/stores/AsyncStore";
+import { type IApp } from "../../../../src/utils/WidgetUtils-types";
+import { ModalWidgetStore } from "../../../../src/stores/ModalWidgetStore";
+import { ElementWidgetActions, type IViewRoomApiRequest } from "../../../../src/stores/widgets/ElementWidgetActions";
+import { ElementWidgetCapabilities } from "../../../../src/stores/widgets/ElementWidgetCapabilities";
+import { WidgetType } from "../../../../src/widgets/WidgetType";
+import { IntegrationManagers } from "../../../../src/integrations/IntegrationManagers";
+import { type IntegrationManagerInstance } from "../../../../src/integrations/IntegrationManagerInstance";
+
+jest.mock("matrix-widget-api", () => ({
+    ...jest.requireActual("matrix-widget-api"),
+    ClientWidgetApi: (jest.createMockFromModule("matrix-widget-api") as any).ClientWidgetApi,
+}));
+
+const originGetValue = SettingsStore.getValue;
+
+describe("WidgetMessaging", () => {
+    let client: MockedObject<MatrixClient>;
+    let widget: WidgetMessaging;
+    let messaging: MockedObject<ClientWidgetApi>;
+
+    beforeEach(() => {
+        stubClient();
+        client = mocked(MatrixClientPeg.safeGet());
+
+        const app: IApp = {
+            id: "test",
+            creatorUserId: "@alice:example.org",
+            type: "example",
+            url: "https://example.org?user-id=$matrix_user_id&device-id=$org.matrix.msc3819.matrix_device_id&base-url=$org.matrix.msc4039.matrix_base_url&theme=$org.matrix.msc2873.client_theme",
+            roomId: "!1:example.org",
+        };
+        widget = new WidgetMessaging(new ElementWidget(app), {
+            app,
+            room: mkRoom(client, "!1:example.org"),
+            userId: "@alice:example.org",
+            creatorUserId: "@alice:example.org",
+            waitForIframeLoad: true,
+            userWidget: false,
+        });
+        // Start messaging without an iframe, since ClientWidgetApi is mocked
+        widget.start(null as unknown as HTMLIFrameElement);
+        messaging = mocked(last(mocked(ClientWidgetApi).mock.instances)!);
+        messaging.feedStateUpdate.mockResolvedValue();
+    });
+
+    afterEach(() => {
+        widget.stop();
+    });
+
+    it("should replace parameters in widget url template", () => {
+        const spy = jest.spyOn(SettingsStore, "getValue").mockImplementation((setting) => {
+            if (setting === "theme") return "my-theme-for-testing";
+            return originGetValue(setting);
+        });
+        expect(widget.embedUrl).toBe(
+            "https://example.org/?user-id=%40userId%3Amatrix.org&device-id=ABCDEFGHI&base-url=https%3A%2F%2Fmatrix-client.matrix.org&theme=my-theme-for-testing&widgetId=test&parentUrl=http%3A%2F%2Flocalhost%2F",
+        );
+        spy.mockClear();
+    });
+
+    it("should replace parameters in widget url template for popout", () => {
+        const spy = jest.spyOn(SettingsStore, "getValue").mockImplementation((setting) => {
+            if (setting === "theme") return "my-theme-for-testing";
+            return originGetValue(setting);
+        });
+        expect(widget.popoutUrl).toBe(
+            "https://example.org/?user-id=%40userId%3Amatrix.org&device-id=ABCDEFGHI&base-url=https%3A%2F%2Fmatrix-client.matrix.org&theme=my-theme-for-testing",
+        );
+        spy.mockClear();
+    });
+
+    it("feeds incoming to-device messages to the widget", async () => {
+        const receivedToDevice = {
+            message: {
+                type: "org.example.foo",
+                sender: "@alice:example.org",
+                content: {
+                    hello: "world",
+                },
+            },
+            encryptionInfo: null,
+        };
+
+        client.emit(ClientEvent.ReceivedToDeviceMessage, receivedToDevice);
+        await Promise.resolve(); // flush promises
+        expect(messaging.feedToDevice).toHaveBeenCalledWith(receivedToDevice.message, false);
+    });
+
+    it("feeds incoming encrypted to-device messages to the widget", async () => {
+        const receivedToDevice = {
+            message: {
+                type: "org.example.foo",
+                sender: "@alice:example.org",
+                content: {
+                    hello: "world",
+                },
+            },
+            encryptionInfo: {
+                senderVerified: false,
+                sender: "@alice:example.org",
+                senderCurve25519KeyBase64: "",
+                senderDevice: "ABCDEFGHI",
+            },
+        };
+
+        client.emit(ClientEvent.ReceivedToDeviceMessage, receivedToDevice);
+        await Promise.resolve(); // flush promises
+        expect(messaging.feedToDevice).toHaveBeenCalledWith(receivedToDevice.message, true);
+    });
+
+    it("feeds incoming state updates to the widget", () => {
+        const event = mkEvent({
+            event: true,
+            type: "org.example.foo",
+            skey: "",
+            user: "@alice:example.org",
+            content: { hello: "world" },
+            room: "!1:example.org",
+        });
+
+        client.emit(RoomStateEvent.Events, event, {} as unknown as RoomState, null);
+        expect(messaging.feedStateUpdate).toHaveBeenCalledWith(event.getEffectiveEvent());
+    });
+
+    it("informs widget of theme changes", () => {
+        let theme = "light";
+        const settingsSpy = jest
+            .spyOn(SettingsStore, "getValue")
+            .mockImplementation((name) => (name === "theme" ? theme : null));
+        try {
+            // Indicate that the widget is ready
+            findLast(messaging.once.mock.calls, ([eventName]) => eventName === "ready")![1]();
+
+            // Now change the theme
+            theme = "dark";
+            defaultDispatcher.dispatch({ action: Action.RecheckTheme }, true);
+            expect(messaging.updateTheme).toHaveBeenLastCalledWith({ name: "dark" });
+        } finally {
+            settingsSpy.mockRestore();
+        }
+    });
+
+    describe("feed event", () => {
+        let event1: MatrixEvent;
+        let event2: MatrixEvent;
+
+        beforeEach(() => {
+            event1 = mkEvent({
+                event: true,
+                id: "$event-id1",
+                type: "org.example.foo",
+                user: "@alice:example.org",
+                content: { hello: "world" },
+                room: "!1:example.org",
+            });
+
+            event2 = mkEvent({
+                event: true,
+                id: "$event-id2",
+                type: "org.example.foo",
+                user: "@alice:example.org",
+                content: { hello: "world" },
+                room: "!1:example.org",
+            });
+
+            const room = mkRoom(client, "!1:example.org");
+            client.getRoom.mockImplementation((roomId) => (roomId === "!1:example.org" ? room : null));
+            room.getLiveTimeline.mockReturnValue({
+                getEvents: (): MatrixEvent[] => [event1, event2],
+            } as unknown as EventTimeline);
+
+            messaging.feedEvent.mockResolvedValue();
+        });
+
+        it("feeds incoming event to the widget", async () => {
+            client.emit(ClientEvent.Event, event1);
+            expect(messaging.feedEvent).toHaveBeenCalledWith(event1.getEffectiveEvent());
+
+            client.emit(ClientEvent.Event, event2);
+            expect(messaging.feedEvent).toHaveBeenCalledTimes(2);
+            expect(messaging.feedEvent).toHaveBeenLastCalledWith(event2.getEffectiveEvent());
+        });
+
+        it("should not feed incoming event to the widget if seen already", async () => {
+            client.emit(ClientEvent.Event, event1);
+            expect(messaging.feedEvent).toHaveBeenCalledWith(event1.getEffectiveEvent());
+
+            client.emit(ClientEvent.Event, event2);
+            expect(messaging.feedEvent).toHaveBeenCalledTimes(2);
+            expect(messaging.feedEvent).toHaveBeenLastCalledWith(event2.getEffectiveEvent());
+
+            client.emit(ClientEvent.Event, event1);
+            expect(messaging.feedEvent).toHaveBeenCalledTimes(2);
+            expect(messaging.feedEvent).toHaveBeenLastCalledWith(event2.getEffectiveEvent());
+        });
+
+        it("feeds decrypted events asynchronously", async () => {
+            const event1Encrypted = new MatrixEvent({
+                event_id: event1.getId(),
+                type: EventType.RoomMessageEncrypted,
+                sender: event1.sender?.userId,
+                room_id: event1.getRoomId(),
+                content: {},
+            });
+            const decryptingSpy1 = jest.spyOn(event1Encrypted, "isBeingDecrypted").mockReturnValue(true);
+            client.emit(ClientEvent.Event, event1Encrypted);
+            const event2Encrypted = new MatrixEvent({
+                event_id: event2.getId(),
+                type: EventType.RoomMessageEncrypted,
+                sender: event2.sender?.userId,
+                room_id: event2.getRoomId(),
+                content: {},
+            });
+            const decryptingSpy2 = jest.spyOn(event2Encrypted, "isBeingDecrypted").mockReturnValue(true);
+            client.emit(ClientEvent.Event, event2Encrypted);
+            expect(messaging.feedEvent).not.toHaveBeenCalled();
+
+            // "Decrypt" the events, but in reverse order; first event 2…
+            event2Encrypted.event.type = event2.getType();
+            event2Encrypted.event.content = event2.getContent();
+            decryptingSpy2.mockReturnValue(false);
+            client.emit(MatrixEventEvent.Decrypted, event2Encrypted);
+            expect(messaging.feedEvent).toHaveBeenCalledTimes(1);
+            expect(messaging.feedEvent).toHaveBeenLastCalledWith(event2Encrypted.getEffectiveEvent());
+            // …then event 1
+            event1Encrypted.event.type = event1.getType();
+            event1Encrypted.event.content = event1.getContent();
+            decryptingSpy1.mockReturnValue(false);
+            client.emit(MatrixEventEvent.Decrypted, event1Encrypted);
+            // The events should be fed in that same order so that event 2
+            // doesn't have to be blocked on the decryption of event 1 (or
+            // worse, dropped)
+            expect(messaging.feedEvent).toHaveBeenCalledTimes(2);
+            expect(messaging.feedEvent).toHaveBeenLastCalledWith(event1Encrypted.getEffectiveEvent());
+        });
+
+        it("should not feed incoming event if not in timeline", () => {
+            const event = mkEvent({
+                event: true,
+                id: "$event-id",
+                type: "org.example.foo",
+                user: "@alice:example.org",
+                content: {
+                    hello: "world",
+                },
+                room: "!1:example.org",
+            });
+
+            client.emit(ClientEvent.Event, event);
+            expect(messaging.feedEvent).toHaveBeenCalledWith(event.getEffectiveEvent());
+        });
+
+        it("feeds incoming event that is not in timeline but relates to unknown parent to the widget", async () => {
+            const event = mkEvent({
+                event: true,
+                id: "$event-idRelation",
+                type: "org.example.foo",
+                user: "@alice:example.org",
+                content: {
+                    "hello": "world",
+                    "m.relates_to": {
+                        event_id: "$unknown-parent",
+                        rel_type: "m.reference",
+                    },
+                },
+                room: "!1:example.org",
+            });
+
+            client.emit(ClientEvent.Event, event1);
+            expect(messaging.feedEvent).toHaveBeenCalledWith(event1.getEffectiveEvent());
+
+            client.emit(ClientEvent.Event, event);
+            expect(messaging.feedEvent).toHaveBeenCalledTimes(2);
+            expect(messaging.feedEvent).toHaveBeenLastCalledWith(event.getEffectiveEvent());
+
+            client.emit(ClientEvent.Event, event1);
+            expect(messaging.feedEvent).toHaveBeenCalledTimes(2);
+            expect(messaging.feedEvent).toHaveBeenLastCalledWith(event.getEffectiveEvent());
+        });
+    });
+});
+
+describe("WidgetMessaging with stickyPromise", () => {
+    let client: MockedObject<MatrixClient>;
+    let widget: WidgetMessaging;
+    let messaging: MockedObject<ClientWidgetApi>;
+
+    beforeEach(() => {
+        stubClient();
+        client = mocked(MatrixClientPeg.safeGet());
+    });
+
+    afterEach(() => {
+        widget.stop();
+    });
+    it("should wait for the sticky promise to resolve before starting messaging", async () => {
+        jest.useFakeTimers();
+        const getStickyPromise = async () => {
+            return new Promise<void>((resolve) => {
+                setTimeout(() => {
+                    resolve();
+                }, 1000);
+            });
+        };
+        const app: IApp = {
+            id: "test",
+            creatorUserId: "@alice:example.org",
+            type: "example",
+            url: "https://example.org?user-id=$matrix_user_id&device-id=$org.matrix.msc3819.matrix_device_id&base-url=$org.matrix.msc4039.matrix_base_url",
+            roomId: "!1:example.org",
+        };
+        widget = new WidgetMessaging(new ElementWidget(app), {
+            app,
+            room: mkRoom(client, "!1:example.org"),
+            userId: "@alice:example.org",
+            creatorUserId: "@alice:example.org",
+            waitForIframeLoad: true,
+            userWidget: false,
+            stickyPromise: getStickyPromise,
+        });
+
+        const setPersistenceSpy = jest.spyOn(ActiveWidgetStore.instance, "setWidgetPersistence");
+
+        // Start messaging without an iframe, since ClientWidgetApi is mocked
+        widget.start(null as unknown as HTMLIFrameElement);
+        const emitSticky = async () => {
+            messaging = mocked(last(mocked(ClientWidgetApi).mock.instances)!);
+            messaging?.hasCapability.mockReturnValue(true);
+            // messaging.transport.reply will be called but transport is undefined in this test environment
+            // This just makes sure the call doesn't throw
+            Object.defineProperty(messaging, "transport", { value: { reply: () => {} } });
+            messaging.on.mock.calls.find(([event, listener]) => {
+                if (event === `action:${WidgetApiFromWidgetAction.UpdateAlwaysOnScreen}`) {
+                    listener({ preventDefault: () => {}, detail: { data: { value: true } } });
+                    return true;
+                }
+            });
+        };
+        await emitSticky();
+        expect(setPersistenceSpy).not.toHaveBeenCalled();
+        // Advance the fake timer so that the sticky promise resolves
+        jest.runAllTimers();
+        // Use a real timer and wait for the next tick so the sticky promise can resolve
+        jest.useRealTimers();
+
+        waitFor(() => expect(setPersistenceSpy).toHaveBeenCalled(), { interval: 5 });
+    });
+});
+
+describe("WidgetMessaging as an account widget", () => {
+    let widget: WidgetMessaging;
+    let messaging: MockedObject<ClientWidgetApi>;
+    let getRoomId: MockedFunction<() => string | null>;
+
+    beforeEach(() => {
+        stubClient();
+        // I give up, getting the return type of spyOn right is hopeless
+        getRoomId = jest.spyOn(SdkContextClass.instance.roomViewStore, "getRoomId") as unknown as MockedFunction<
+            () => string | null
+        >;
+        getRoomId.mockReturnValue("!1:example.org");
+
+        const app: IApp = {
+            id: "test",
+            creatorUserId: "@alice:example.org",
+            type: "example",
+            url: "https://example.org?user-id=$matrix_user_id&device-id=$org.matrix.msc3819.matrix_device_id&base-url=$org.matrix.msc4039.matrix_base_url&theme=$org.matrix.msc2873.client_theme",
+            roomId: "!1:example.org",
+        };
+        widget = new WidgetMessaging(new ElementWidget(app), {
+            app,
+            userId: "@alice:example.org",
+            creatorUserId: "@alice:example.org",
+            waitForIframeLoad: true,
+            userWidget: false,
+        });
+        // Start messaging without an iframe, since ClientWidgetApi is mocked
+        widget.start(null as unknown as HTMLIFrameElement);
+        messaging = mocked(last(mocked(ClientWidgetApi).mock.instances)!);
+    });
+
+    afterEach(() => {
+        widget.stop();
+        getRoomId.mockRestore();
+    });
+
+    it("updates viewed room", () => {
+        expect(messaging.setViewedRoomId).toHaveBeenCalledTimes(1);
+        expect(messaging.setViewedRoomId).toHaveBeenLastCalledWith("!1:example.org");
+        getRoomId.mockReturnValue("!2:example.org");
+        SdkContextClass.instance.roomViewStore.emit(UPDATE_EVENT);
+        expect(messaging.setViewedRoomId).toHaveBeenCalledTimes(2);
+        expect(messaging.setViewedRoomId).toHaveBeenLastCalledWith("!2:example.org");
+    });
+});
+
+function createTransportEvent<T extends IWidgetApiRequest>(data: T["data"]): CustomEvent<T> {
+    // Not the complete CustomEvent but good nuff.
+    return {
+        preventDefault: () => {},
+        detail: {
+            action: WidgetApiFromWidgetAction.OpenModalWidget,
+            data: data,
+            api: WidgetApiDirection.FromWidget,
+            requestId: "12345",
+            widgetId: "test",
+        },
+    } as unknown as CustomEvent;
+}
+
+describe("WidgetMessaging action handling", () => {
+    let widget: WidgetMessaging;
+    let messaging: MockedObject<ClientWidgetApi>;
+    let actionFns: Record<string, (ev: any) => void>;
+
+    beforeEach(() => {
+        const client = stubClient();
+
+        const app: IApp = {
+            id: "test",
+            creatorUserId: "@alice:example.org",
+            type: "example",
+            url: "https://example.org?user-id=$matrix_user_id&device-id=$org.matrix.msc3819.matrix_device_id&base-url=$org.matrix.msc4039.matrix_base_url&theme=$org.matrix.msc2873.client_theme",
+            roomId: "!1:example.org",
+        };
+        widget = new WidgetMessaging(new ElementWidget(app), {
+            app,
+            room: mkRoom(client, "!1:example.org"),
+            userId: "@alice:example.org",
+            creatorUserId: "@alice:example.org",
+            waitForIframeLoad: true,
+            userWidget: false,
+        });
+        // Start messaging without an iframe, since ClientWidgetApi is mocked
+        widget.start(null as unknown as HTMLIFrameElement);
+        messaging = mocked(last(mocked(ClientWidgetApi).mock.instances)!);
+        Object.defineProperty(messaging, "transport", { value: { reply: jest.fn() } });
+        actionFns = Object.fromEntries(messaging.on.mock.calls as any);
+    });
+
+    afterEach(() => {
+        widget.stop();
+        jest.resetAllMocks();
+    });
+
+    describe("open modal widget", () => {
+        beforeEach(() => {
+            // Trivial mock of ModalWidgetStore
+            let hasModal = false;
+            jest.spyOn(ModalWidgetStore.instance, "openModalWidget").mockImplementation(() => {
+                if (hasModal) {
+                    throw Error("Modal already in view");
+                }
+                hasModal = true;
+            });
+            jest.spyOn(ModalWidgetStore.instance, "canOpenModalWidget").mockImplementation(() => !hasModal);
+            jest.spyOn(ModalWidgetStore.instance, "closeModalWidget").mockImplementation(() => {
+                if (!hasModal) {
+                    throw Error("No modal in view");
+                }
+                hasModal = false;
+            });
+        });
+
+        it("handles an open modal request", () => {
+            const ev = createTransportEvent<IModalWidgetOpenRequest>({ type: "foo", url: "bar" });
+            actionFns[`action:${WidgetApiFromWidgetAction.OpenModalWidget}`](ev);
+            expect(messaging.transport.reply).toHaveBeenCalledWith(ev.detail, {});
+        });
+
+        it("responds with an error if a modal is already open", () => {
+            const ev = createTransportEvent<IModalWidgetOpenRequest>({ type: "foo", url: "bar" });
+            actionFns[`action:${WidgetApiFromWidgetAction.OpenModalWidget}`](ev);
+            expect(messaging.transport.reply).toHaveBeenCalledWith(ev.detail, {});
+            messaging.transport.reply.mockReset();
+            actionFns[`action:${WidgetApiFromWidgetAction.OpenModalWidget}`](ev);
+            expect(messaging.transport.reply).toHaveBeenCalledWith(ev.detail, {
+                error: { message: "Unable to open modal at this time" },
+            });
+        });
+    });
+
+    describe("view room", () => {
+        afterEach(() => {
+            jest.resetAllMocks();
+        });
+        it("errors on invalid room", () => {
+            const ev = createTransportEvent<IViewRoomApiRequest>({ room_id: null } as any);
+            actionFns[`action:${ElementWidgetActions.ViewRoom}`](ev);
+            expect(messaging.transport.reply).toHaveBeenCalledWith(ev.detail, {
+                error: { message: "Room ID not supplied." },
+            });
+        });
+        it("errors on missing permissions", () => {
+            const ev = createTransportEvent<IViewRoomApiRequest>({ room_id: "!foo:example.org" } as any);
+            actionFns[`action:${ElementWidgetActions.ViewRoom}`](ev);
+            expect(messaging.transport.reply).toHaveBeenCalledWith(ev.detail, {
+                error: { message: "This widget does not have permission for this action (denied)." },
+            });
+        });
+        it("handles room change", async () => {
+            const ev = createTransportEvent<IViewRoomApiRequest>({ room_id: "!foo:example.org" } as any);
+            messaging.hasCapability.mockImplementation(
+                (capability) => capability === ElementWidgetCapabilities.CanChangeViewedRoom,
+            );
+            const dispatch = (defaultDispatcher.dispatch = jest.fn());
+            actionFns[`action:${ElementWidgetActions.ViewRoom}`](ev);
+            expect(messaging.transport.reply).toHaveBeenCalledWith(ev.detail, {});
+            expect(dispatch).toHaveBeenCalledWith({
+                action: "view_room",
+                metricsTrigger: "Widget",
+                room_id: "!foo:example.org",
+            });
+        });
+    });
+
+    describe("always on screen", () => {
+        let setWidgetPersistence: jest.SpyInstance<void, Parameters<ActiveWidgetStore["setWidgetPersistence"]>>;
+        beforeEach(() => {
+            setWidgetPersistence = jest.spyOn(ActiveWidgetStore.instance, "setWidgetPersistence");
+        });
+
+        it("does nothing if the widget does not have permission", () => {
+            const ev = createTransportEvent<IStickyActionRequest>({ value: true });
+            actionFns[`action:${WidgetApiFromWidgetAction.UpdateAlwaysOnScreen}`](ev);
+            // Currently there is no error response for this.
+            expect(messaging.transport.reply).not.toHaveBeenCalled();
+        });
+
+        it("handles setting a widget as sticky", () => {
+            messaging.hasCapability.mockImplementation(
+                (capability) => capability === MatrixCapabilities.AlwaysOnScreen,
+            );
+            const ev = createTransportEvent<IStickyActionRequest>({ value: true });
+            actionFns[`action:${WidgetApiFromWidgetAction.UpdateAlwaysOnScreen}`](ev);
+            expect(messaging.transport.reply).toHaveBeenCalledWith(ev.detail, {});
+            expect(setWidgetPersistence).toHaveBeenCalledTimes(1);
+        });
+
+        it("handles setting a widget as unsticky", () => {
+            messaging.hasCapability.mockImplementation(
+                (capability) => capability === MatrixCapabilities.AlwaysOnScreen,
+            );
+            const evOpen = createTransportEvent<IStickyActionRequest>({ value: true });
+            actionFns[`action:${WidgetApiFromWidgetAction.UpdateAlwaysOnScreen}`](evOpen);
+            expect(messaging.transport.reply).toHaveBeenCalledWith(evOpen.detail, {});
+            expect(setWidgetPersistence).toHaveBeenCalledTimes(1);
+            messaging.transport.reply.mockReset();
+            const evClose = createTransportEvent<IStickyActionRequest>({ value: false });
+            actionFns[`action:${WidgetApiFromWidgetAction.UpdateAlwaysOnScreen}`](evClose);
+            expect(messaging.transport.reply).toHaveBeenCalledWith(evClose.detail, {});
+            expect(setWidgetPersistence).toHaveBeenCalledTimes(2);
+        });
+    });
+
+    describe("send sticker", () => {
+        it("does nothing if the widget does not have permission", () => {
+            const ev = createTransportEvent<IStickerActionRequest>({ name: "foo", content: { url: "bar" } });
+            actionFns[`action:${WidgetApiFromWidgetAction.SendSticker}`](ev);
+            // Currently there is no error response for this.
+            expect(messaging.transport.reply).not.toHaveBeenCalled();
+        });
+
+        it("handles setting a widget as sticky", () => {
+            messaging.hasCapability.mockImplementation(
+                (capability) => capability === MatrixCapabilities.StickerSending,
+            );
+            const ev = createTransportEvent<IStickerActionRequest>({ name: "foo", content: { url: "bar" } });
+            const dispatch = (defaultDispatcher.dispatch = jest.fn());
+            actionFns[`action:${WidgetApiFromWidgetAction.SendSticker}`](ev);
+            expect(messaging.transport.reply).toHaveBeenCalledWith(ev.detail, {});
+            expect(dispatch).toHaveBeenCalledWith({
+                action: "m.sticker",
+                data: { content: { url: "bar" }, name: "foo" },
+                widgetId: "test",
+            });
+        });
+    });
+});
+
+describe("WidgetMessaging action handling for stickerpicker", () => {
+    let widget: WidgetMessaging;
+    let messaging: MockedObject<ClientWidgetApi>;
+    let actionFns: Record<string, (ev: any) => void>;
+    let room: Room;
+
+    beforeEach(() => {
+        const client = mocked(stubClient());
+        room = mkRoom(client, "!1:example.org");
+        client.getRoom.mockImplementation((roomId) => (roomId === room.roomId ? room : null));
+        const getRoomId = jest.spyOn(SdkContextClass.instance.roomViewStore, "getRoomId") as unknown as MockedFunction<
+            () => string | null
+        >;
+        getRoomId.mockReturnValue(room.roomId);
+        const app: IApp = {
+            id: "test",
+            creatorUserId: "@alice:example.org",
+            type: WidgetType.STICKERPICKER.preferred,
+            url: "https://example.org?user-id=$matrix_user_id&device-id=$org.matrix.msc3819.matrix_device_id&base-url=$org.matrix.msc4039.matrix_base_url&theme=$org.matrix.msc2873.client_theme",
+            roomId: room.roomId,
+        };
+        widget = new WidgetMessaging(new ElementWidget(app), {
+            app,
+            room,
+            userId: "@alice:example.org",
+            creatorUserId: "@alice:example.org",
+            waitForIframeLoad: true,
+            userWidget: false,
+        });
+        // Start messaging without an iframe, since ClientWidgetApi is mocked
+        widget.start(null as unknown as HTMLIFrameElement);
+        messaging = mocked(last(mocked(ClientWidgetApi).mock.instances)!);
+        Object.defineProperty(messaging, "transport", { value: { reply: jest.fn() } });
+        actionFns = Object.fromEntries(messaging.on.mock.calls as any);
+    });
+
+    afterEach(() => {
+        widget.stop();
+        jest.resetAllMocks();
+    });
+
+    describe("open integrations manager", () => {
+        let openIntegrationManager: jest.SpyInstance<void, Parameters<IntegrationManagerInstance["open"]>>;
+        beforeEach(() => {
+            // Trivial mock of ModalWidgetStore
+            openIntegrationManager = jest.fn();
+            const inst = IntegrationManagers.sharedInstance();
+            jest.spyOn(inst, "getPrimaryManager").mockImplementation(
+                () =>
+                    ({
+                        open: openIntegrationManager,
+                    }) as any,
+            );
+        });
+
+        it("open the integration manager", () => {
+            const ev = createTransportEvent<IWidgetApiRequest>({ integType: "my_integ_type", integId: "my_integ_id" });
+            const dispatch = (defaultDispatcher.dispatch = jest.fn());
+            actionFns[`action:${ElementWidgetActions.OpenIntegrationManager}`](ev);
+            expect(dispatch).toHaveBeenCalledWith({
+                action: "stickerpicker_close",
+            });
+            expect(messaging.transport.reply).toHaveBeenCalledWith(ev.detail, {});
+            expect(openIntegrationManager).toHaveBeenCalledWith(room, `type_my_integ_type`, "my_integ_id");
+        });
+    });
+});
diff --git a/test/unit-tests/stores/widgets/WidgetPermissionStore-test.ts b/test/unit-tests/stores/widgets/WidgetPermissionStore-test.ts
index 81c7f35e7b..b0ebf2b23b 100644
--- a/test/unit-tests/stores/widgets/WidgetPermissionStore-test.ts
+++ b/test/unit-tests/stores/widgets/WidgetPermissionStore-test.ts
@@ -16,7 +16,7 @@ import { TestSdkContext } from "../../TestSdkContext";
 import { type SettingLevel } from "../../../../src/settings/SettingLevel";
 import { SdkContextClass } from "../../../../src/contexts/SDKContext";
 import { stubClient } from "../../../test-utils";
-import { StopGapWidgetDriver } from "../../../../src/stores/widgets/StopGapWidgetDriver";
+import { ElementWidgetDriver } from "../../../../src/stores/widgets/ElementWidgetDriver";
 import { WidgetType } from "../../../../src/widgets/WidgetType.ts";
 
 jest.mock("../../../../src/settings/SettingsStore");
@@ -93,7 +93,7 @@ describe("WidgetPermissionStore", () => {
         expect(store2).toStrictEqual(store);
     });
     it("auto-approves OIDC requests for element-call", async () => {
-        new StopGapWidgetDriver([], elementCallWidget, WidgetKind.Room, true, roomId);
+        new ElementWidgetDriver(elementCallWidget, WidgetKind.Room, true, roomId);
         expect(widgetPermissionStore.getOIDCState(elementCallWidget, WidgetKind.Room, roomId)).toEqual(
             OIDCState.Allowed,
         );
diff --git a/test/unit-tests/submit-rageshake-test.ts b/test/unit-tests/submit-rageshake-test.ts
index 4eda347a98..f31102e3ba 100644
--- a/test/unit-tests/submit-rageshake-test.ts
+++ b/test/unit-tests/submit-rageshake-test.ts
@@ -22,6 +22,7 @@ import { collectBugReport } from "../../src/rageshake/submit-rageshake";
 import SettingsStore from "../../src/settings/SettingsStore";
 import { type ConsoleLogger } from "../../src/rageshake/rageshake";
 import { type FeatureSettingKey, type SettingKey } from "../../src/settings/Settings.tsx";
+import { SettingLevel } from "../../src/settings/SettingLevel.ts";
 
 describe("Rageshakes", () => {
     const RUST_CRYPTO_VERSION = "Rust SDK 0.7.0 (691ec63), Vodozemac 0.5.0";
@@ -35,6 +36,8 @@ describe("Rageshakes", () => {
             onlyData: true,
         },
     );
+    let windowSpy: jest.SpyInstance;
+    let mockWindow: Mocked<Window>;
 
     beforeEach(() => {
         mockClient = getMockClientWithEventEmitter({
@@ -50,30 +53,24 @@ describe("Rageshakes", () => {
             ed25519: "",
             curve25519: "",
         });
+        mockWindow = {
+            matchMedia: jest.fn().mockReturnValue({ matches: false }),
+            navigator: {
+                userAgent: "",
+            },
+        } as unknown as Mocked<Window>;
+        // @ts-ignore - We just need partial mock
+        windowSpy = jest.spyOn(global, "window", "get").mockReturnValue(mockWindow);
 
         fetchMock.restore();
         fetchMock.catch(404);
     });
 
+    afterEach(() => {
+        windowSpy.mockRestore();
+    });
+
     describe("Basic Information", () => {
-        let mockWindow: Mocked<Window>;
-        let windowSpy: jest.SpyInstance;
-
-        beforeEach(() => {
-            mockWindow = {
-                matchMedia: jest.fn().mockReturnValue({ matches: false }),
-                navigator: {
-                    userAgent: "",
-                },
-            } as unknown as Mocked<Window>;
-            // @ts-ignore - We just need partial mock
-            windowSpy = jest.spyOn(global, "window", "get").mockReturnValue(mockWindow);
-        });
-
-        afterEach(() => {
-            windowSpy.mockRestore();
-        });
-
         it("should include app version", async () => {
             mockPlatformPeg({ getAppVersion: jest.fn().mockReturnValue("1.11.58") });
 
@@ -376,6 +373,10 @@ describe("Rageshakes", () => {
     describe("Settings Store", () => {
         const mockSettingsStore = mocked(SettingsStore);
 
+        afterEach(() => {
+            jest.restoreAllMocks();
+        });
+
         it("should collect labs from settings store", async () => {
             const someFeatures = [
                 "feature_video_rooms",
@@ -430,6 +431,7 @@ describe("Rageshakes", () => {
 
         afterEach(() => {
             navigatorSpy.mockRestore();
+            SettingsStore.reset();
         });
 
         it("should collect navigator storage persisted", async () => {
@@ -488,6 +490,7 @@ describe("Rageshakes", () => {
         };
         const disabledFeatures = ["cssanimations", "d0", "d1"];
         const mockWindow = {
+            matchMedia: jest.fn().mockReturnValue({ matches: false }),
             Modernizr: {
                 ...allFeatures,
             },
@@ -503,20 +506,16 @@ describe("Rageshakes", () => {
     });
 
     it("should collect localstorage settings", async () => {
-        const localSettings = {
-            language: "fr",
-            showHiddenEventsInTimeline: true,
-            activeCallRoomIds: [],
-        };
-
-        const spy = jest.spyOn(window.localStorage.__proto__, "getItem").mockImplementation((key) => {
-            return JSON.stringify(localSettings);
-        });
+        await SettingsStore.setValue("language", null, SettingLevel.DEVICE, "fr");
+        await SettingsStore.setValue("showHiddenEventsInTimeline", null, SettingLevel.DEVICE, true);
+        await SettingsStore.setValue("userTimezone", null, SettingLevel.DEVICE, "Europe/London");
+        await SettingsStore.setValue("activeCallRoomIds", null, SettingLevel.DEVICE, []);
 
         const formData = await collectBugReport();
-        expect(formData.get("mx_local_settings")).toBe(JSON.stringify(localSettings));
-
-        spy.mockRestore();
+        const settingDataJSON = formData.get("mx_local_settings");
+        expect(settingDataJSON).not.toBeNull();
+        const settingsData = JSON.parse(settingDataJSON as string);
+        expect(settingsData.showHiddenEventsInTimeline).toEqual(true);
     });
 
     it("should collect logs", async () => {
@@ -525,25 +524,16 @@ describe("Rageshakes", () => {
             consume: jest.fn(),
             warn: jest.fn(),
         } as unknown as Mocked<ConsoleLogger>;
+        mockConsoleLogger.flush.mockReturnValue("line 1\nline 2\n");
 
-        // @ts-ignore - mock the console logger
+        const prevLogger = global.mx_rage_logger;
         global.mx_rage_logger = mockConsoleLogger;
-
-        // @ts-ignore
-        mockConsoleLogger.flush.mockReturnValue([
-            {
-                id: "instance-0",
-                line: "line 1",
-            },
-            {
-                id: "instance-1",
-                line: "line 2",
-            },
-        ]);
-
-        const formData = await collectBugReport({ sendLogs: true });
-
-        expect(formData.get("compressed-log")).toBeDefined();
+        try {
+            const formData = await collectBugReport({ sendLogs: true });
+            expect(formData.get("compressed-log")).toBeDefined();
+        } finally {
+            global.mx_rage_logger = prevLogger;
+        }
     });
 
     describe("A-Element-R label", () => {
diff --git a/test/unit-tests/theme-test.ts b/test/unit-tests/theme-test.ts
index b9c7e9341c..d9622b5c0d 100644
--- a/test/unit-tests/theme-test.ts
+++ b/test/unit-tests/theme-test.ts
@@ -22,6 +22,12 @@ describe("theme", () => {
         let spyQuerySelectorAll: jest.MockInstance<NodeListOf<Element>, [selectors: string]>;
         let spyClassList: jest.SpyInstance<void, string[], any>;
 
+        beforeAll(() => {
+            const meta = document.createElement("meta");
+            meta.name = "theme-color";
+            document.head.appendChild(meta);
+        });
+
         beforeEach(() => {
             const styles = ["light", "dark", "light-custom", "dark-custom"].map(
                 (theme) =>
diff --git a/test/unit-tests/toasts/IncomingCallToast-test.tsx b/test/unit-tests/toasts/IncomingCallToast-test.tsx
index f73a24dc44..c5d973ea2e 100644
--- a/test/unit-tests/toasts/IncomingCallToast-test.tsx
+++ b/test/unit-tests/toasts/IncomingCallToast-test.tsx
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import { render, screen, cleanup, fireEvent, waitFor } from "jest-matrix-react";
-import { mocked, type Mocked } from "jest-mock";
+import { type Mock, mocked, type Mocked } from "jest-mock";
 import {
     Room,
     RoomStateEvent,
@@ -16,9 +16,13 @@ import {
     MatrixEventEvent,
     type MatrixClient,
     type RoomMember,
+    EventType,
+    RoomEvent,
+    type IRoomTimelineData,
+    type ISendEventResponse,
 } from "matrix-js-sdk/src/matrix";
-import { type ClientWidgetApi, Widget } from "matrix-widget-api";
-import { type ICallNotifyContent } from "matrix-js-sdk/src/matrixrtc";
+import { Widget } from "matrix-widget-api";
+import { type IRTCNotificationContent } from "matrix-js-sdk/src/matrixrtc";
 
 import {
     useMockedCalls,
@@ -27,6 +31,7 @@ import {
     mkRoomMember,
     setupAsyncStoreWithClient,
     resetAsyncStoreWithClient,
+    mkEvent,
 } from "../../test-utils";
 import defaultDispatcher from "../../../src/dispatcher/dispatcher";
 import { Action } from "../../../src/dispatcher/actions";
@@ -35,15 +40,22 @@ import { CallStore } from "../../../src/stores/CallStore";
 import { WidgetMessagingStore } from "../../../src/stores/widgets/WidgetMessagingStore";
 import DMRoomMap from "../../../src/utils/DMRoomMap";
 import ToastStore from "../../../src/stores/ToastStore";
-import { getIncomingCallToastKey, IncomingCallToast } from "../../../src/toasts/IncomingCallToast";
+import {
+    getIncomingCallToastKey,
+    getNotificationEventSendTs,
+    IncomingCallToast,
+} from "../../../src/toasts/IncomingCallToast";
 import LegacyCallHandler, { AudioID } from "../../../src/LegacyCallHandler";
+import { CallEvent } from "../../../src/models/Call";
+import { type WidgetMessaging } from "../../../src/stores/widgets/WidgetMessaging";
 
 describe("IncomingCallToast", () => {
     useMockedCalls();
 
     let client: Mocked<MatrixClient>;
     let room: Room;
-    let notifyContent: ICallNotifyContent;
+    let notificationEvent: MatrixEvent;
+
     let alice: RoomMember;
     let bob: RoomMember;
     let call: MockedCall;
@@ -64,10 +76,23 @@ describe("IncomingCallToast", () => {
         document.body.appendChild(audio);
 
         room = new Room("!1:example.org", client, "@alice:example.org");
-        notifyContent = {
-            call_id: "",
-            getRoomId: () => room.roomId,
-        } as unknown as ICallNotifyContent;
+        const ts = Date.now();
+        const notificationContent = {
+            "notification_type": "notification",
+            "m.relation": { rel_type: "m.reference", event_id: "$memberEventId" },
+            "m.mentions": { user_ids: [], room: true },
+            "lifetime": 3000,
+            "sender_ts": ts,
+        } as unknown as IRTCNotificationContent;
+        notificationEvent = mkEvent({
+            type: EventType.RTCNotification,
+            user: "@userId:matrix.org",
+            content: notificationContent,
+            room: room.roomId,
+            ts,
+            id: "$notificationEventId",
+            event: true,
+        });
         alice = mkRoomMember(room.roomId, "@alice:example.org");
         bob = mkRoomMember(room.roomId, "@bob:example.org");
 
@@ -89,7 +114,7 @@ describe("IncomingCallToast", () => {
         widget = new Widget(call.widget);
         WidgetMessagingStore.instance.storeMessaging(widget, room.roomId, {
             stop: () => {},
-        } as unknown as ClientWidgetApi);
+        } as unknown as WidgetMessaging);
 
         jest.spyOn(DMRoomMap, "shared").mockReturnValue(dmRoomMap);
         jest.spyOn(ToastStore, "sharedInstance").mockReturnValue(toastStore);
@@ -104,8 +129,12 @@ describe("IncomingCallToast", () => {
     });
 
     const renderToast = () => {
-        call.event.getContent = () => notifyContent as any;
-        render(<IncomingCallToast notifyEvent={call.event} />);
+        call.event.getContent = () =>
+            ({
+                call_id: "",
+                getRoomId: () => room.roomId,
+            }) as any;
+        render(<IncomingCallToast notificationEvent={notificationEvent} />);
     };
 
     it("correctly shows all the information", () => {
@@ -124,14 +153,13 @@ describe("IncomingCallToast", () => {
     });
 
     it("start ringing on ring notify event", () => {
-        call.event.getContent = () =>
-            ({
-                ...notifyContent,
-                notify_type: "ring",
-            }) as any;
+        const oldContent = notificationEvent.getContent() as IRTCNotificationContent;
+        (notificationEvent as unknown as { getContent: () => IRTCNotificationContent }).getContent = () => {
+            return { ...oldContent, notification_type: "ring" } as IRTCNotificationContent;
+        };
 
         const playMock = jest.spyOn(LegacyCallHandler.instance, "play");
-        render(<IncomingCallToast notifyEvent={call.event} />);
+        render(<IncomingCallToast notificationEvent={notificationEvent} />);
         expect(playMock).toHaveBeenCalled();
     });
 
@@ -143,15 +171,45 @@ describe("IncomingCallToast", () => {
         screen.getByText("Video");
 
         screen.getByRole("button", { name: "Join" });
+        screen.getByRole("button", { name: "Decline" });
         screen.getByRole("button", { name: "Close" });
     });
 
-    it("joins the call and closes the toast", async () => {
+    it("opens the call directly and closes the toast when pressing on the join button", async () => {
         renderToast();
 
         const dispatcherSpy = jest.fn();
         const dispatcherRef = defaultDispatcher.register(dispatcherSpy);
 
+        // click on the avatar (which is the example used for pressing on any area other than the buttons)
+        fireEvent.click(screen.getByRole("button", { name: "Join" }));
+        await waitFor(() =>
+            expect(dispatcherSpy).toHaveBeenCalledWith({
+                action: Action.ViewRoom,
+                room_id: room.roomId,
+                skipLobby: true,
+                view_call: true,
+                voiceOnly: false,
+            }),
+        );
+        await waitFor(() =>
+            expect(toastStore.dismissToast).toHaveBeenCalledWith(
+                getIncomingCallToastKey(notificationEvent.getId()!, room.roomId),
+            ),
+        );
+
+        defaultDispatcher.unregister(dispatcherRef);
+    });
+
+    it("opens the call lobby and closes the toast when configured like that", async () => {
+        renderToast();
+
+        const dispatcherSpy = jest.fn();
+        const dispatcherRef = defaultDispatcher.register(dispatcherSpy);
+
+        fireEvent.click(screen.getByRole("switch", {}));
+
+        // click on the avatar (which is the example used for pressing on any area other than the buttons)
         fireEvent.click(screen.getByRole("button", { name: "Join" }));
         await waitFor(() =>
             expect(dispatcherSpy).toHaveBeenCalledWith({
@@ -159,16 +217,18 @@ describe("IncomingCallToast", () => {
                 room_id: room.roomId,
                 skipLobby: false,
                 view_call: true,
+                voiceOnly: false,
             }),
         );
         await waitFor(() =>
             expect(toastStore.dismissToast).toHaveBeenCalledWith(
-                getIncomingCallToastKey(notifyContent.call_id, room.roomId),
+                getIncomingCallToastKey(notificationEvent.getId()!, room.roomId),
             ),
         );
 
         defaultDispatcher.unregister(dispatcherRef);
     });
+
     it("Dismiss toast if user starts call and skips lobby when using shift key click", async () => {
         renderToast();
 
@@ -182,11 +242,33 @@ describe("IncomingCallToast", () => {
                 room_id: room.roomId,
                 skipLobby: true,
                 view_call: true,
+                voiceOnly: false,
             }),
         );
         await waitFor(() =>
             expect(toastStore.dismissToast).toHaveBeenCalledWith(
-                getIncomingCallToastKey(notifyContent.call_id, room.roomId),
+                getIncomingCallToastKey(notificationEvent.getId()!, room.roomId),
+            ),
+        );
+
+        defaultDispatcher.unregister(dispatcherRef);
+    });
+
+    it("Dismiss toast if user joins with a remote device", async () => {
+        renderToast();
+
+        const dispatcherSpy = jest.fn();
+        const dispatcherRef = defaultDispatcher.register(dispatcherSpy);
+
+        call.emit(
+            CallEvent.Participants,
+            new Map([[mkRoomMember(room.roomId, "@userId:matrix.org"), new Set(["a"])]]),
+            new Map(),
+        );
+
+        await waitFor(() =>
+            expect(toastStore.dismissToast).toHaveBeenCalledWith(
+                getIncomingCallToastKey(notificationEvent.getId()!, room.roomId),
             ),
         );
 
@@ -202,7 +284,7 @@ describe("IncomingCallToast", () => {
         fireEvent.click(screen.getByRole("button", { name: "Close" }));
         await waitFor(() =>
             expect(toastStore.dismissToast).toHaveBeenCalledWith(
-                getIncomingCallToastKey(notifyContent.call_id, room.roomId),
+                getIncomingCallToastKey(notificationEvent.getId()!, room.roomId),
             ),
         );
 
@@ -220,7 +302,7 @@ describe("IncomingCallToast", () => {
 
         await waitFor(() =>
             expect(toastStore.dismissToast).toHaveBeenCalledWith(
-                getIncomingCallToastKey(notifyContent.call_id, room.roomId),
+                getIncomingCallToastKey(notificationEvent.getId()!, room.roomId),
             ),
         );
     });
@@ -233,7 +315,7 @@ describe("IncomingCallToast", () => {
 
         await waitFor(() =>
             expect(toastStore.dismissToast).toHaveBeenCalledWith(
-                getIncomingCallToastKey(notifyContent.call_id, room.roomId),
+                getIncomingCallToastKey(notificationEvent.getId()!, room.roomId),
             ),
         );
     });
@@ -244,8 +326,136 @@ describe("IncomingCallToast", () => {
 
         await waitFor(() =>
             expect(toastStore.dismissToast).toHaveBeenCalledWith(
-                getIncomingCallToastKey(notifyContent.call_id, room.roomId),
+                getIncomingCallToastKey(notificationEvent.getId()!, room.roomId),
             ),
         );
     });
+
+    it("closes toast when a decline event was received", async () => {
+        (toastStore.dismissToast as Mock).mockReset();
+        renderToast();
+
+        room.emit(
+            RoomEvent.Timeline,
+            mkEvent({
+                user: "@userId:matrix.org",
+                type: EventType.RTCDecline,
+                content: { "m.relates_to": { event_id: notificationEvent.getId()!, rel_type: "m.reference" } },
+                event: true,
+            }),
+            room,
+            undefined,
+            false,
+            {} as unknown as IRoomTimelineData,
+        );
+
+        await waitFor(() =>
+            expect(toastStore.dismissToast).toHaveBeenCalledWith(
+                getIncomingCallToastKey(notificationEvent.getId()!, room.roomId),
+            ),
+        );
+    });
+
+    it("does not close toast when a decline event for another user was received", async () => {
+        (toastStore.dismissToast as Mock).mockReset();
+        renderToast();
+
+        room.emit(
+            RoomEvent.Timeline,
+            mkEvent({
+                user: "@userIdNotMe:matrix.org",
+                type: EventType.RTCDecline,
+                content: { "m.relates_to": { event_id: notificationEvent.getId()!, rel_type: "m.reference" } },
+                event: true,
+            }),
+            room,
+            undefined,
+            false,
+            {} as unknown as IRoomTimelineData,
+        );
+
+        await waitFor(() =>
+            expect(toastStore.dismissToast).not.toHaveBeenCalledWith(
+                getIncomingCallToastKey(notificationEvent.getId()!, room.roomId),
+            ),
+        );
+    });
+
+    it("does not close toast when a decline event for another notification Event was received", async () => {
+        (toastStore.dismissToast as Mock).mockReset();
+        renderToast();
+
+        room.emit(
+            RoomEvent.Timeline,
+            mkEvent({
+                user: "@userId:matrix.org",
+                type: EventType.RTCDecline,
+                content: { "m.relates_to": { event_id: "$otherNotificationEventRelation", rel_type: "m.reference" } },
+                event: true,
+            }),
+            room,
+            undefined,
+            false,
+            {} as unknown as IRoomTimelineData,
+        );
+
+        await waitFor(() =>
+            expect(toastStore.dismissToast).not.toHaveBeenCalledWith(
+                getIncomingCallToastKey(notificationEvent.getId()!, room.roomId),
+            ),
+        );
+    });
+
+    it("sends a decline event when clicking the decline button and only dismiss after sending", async () => {
+        (toastStore.dismissToast as Mock).mockReset();
+
+        renderToast();
+
+        const { promise, resolve } = Promise.withResolvers<ISendEventResponse>();
+        client.sendRtcDecline.mockImplementation(() => {
+            return promise;
+        });
+
+        fireEvent.click(screen.getByRole("button", { name: "Decline" }));
+
+        expect(toastStore.dismissToast).not.toHaveBeenCalledWith(
+            getIncomingCallToastKey(notificationEvent.getId()!, room.roomId),
+        );
+        expect(client.sendRtcDecline).toHaveBeenCalledWith("!1:example.org", "$notificationEventId");
+
+        resolve({ event_id: "$declineEventId" });
+
+        await waitFor(() =>
+            expect(toastStore.dismissToast).toHaveBeenCalledWith(
+                getIncomingCallToastKey(notificationEvent.getId()!, room.roomId),
+            ),
+        );
+    });
+
+    it("getNotificationEventSendTs returns the correct ts", () => {
+        const eventOriginServerTs = mkEvent({
+            user: "@userId:matrix.org",
+            type: EventType.RTCNotification,
+            content: {
+                "m.relates_to": { event_id: notificationEvent.getId()!, rel_type: "m.reference" },
+                "sender_ts": 222_000,
+            },
+            event: true,
+            ts: 1111,
+        });
+
+        const eventSendTs = mkEvent({
+            user: "@userId:matrix.org",
+            type: EventType.RTCNotification,
+            content: {
+                "m.relates_to": { event_id: notificationEvent.getId()!, rel_type: "m.reference" },
+                "sender_ts": 2222,
+            },
+            event: true,
+            ts: 1111,
+        });
+
+        expect(getNotificationEventSendTs(eventOriginServerTs)).toBe(1111);
+        expect(getNotificationEventSendTs(eventSendTs)).toBe(2222);
+    });
 });
diff --git a/test/unit-tests/toasts/SetupEncryptionToast-test.tsx b/test/unit-tests/toasts/SetupEncryptionToast-test.tsx
index eb584aafd9..c96e5c1673 100644
--- a/test/unit-tests/toasts/SetupEncryptionToast-test.tsx
+++ b/test/unit-tests/toasts/SetupEncryptionToast-test.tsx
@@ -1,4 +1,5 @@
 /*
+Copyright 2025 Element Creations Ltd.
 Copyright 2024 New Vector Ltd.
 
 SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
@@ -6,16 +7,21 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
-import { render, screen } from "jest-matrix-react";
+import { act, render, screen } from "jest-matrix-react";
+import { mocked, type Mocked } from "jest-mock";
 import userEvent from "@testing-library/user-event";
+import { type MatrixClient } from "matrix-js-sdk/src/matrix";
+import { type CryptoApi } from "matrix-js-sdk/src/crypto-api";
 
 import * as SecurityManager from "../../../src/SecurityManager";
 import ToastContainer from "../../../src/components/structures/ToastContainer";
-import { Kind, showToast } from "../../../src/toasts/SetupEncryptionToast";
+import { showToast } from "../../../src/toasts/SetupEncryptionToast";
 import dis from "../../../src/dispatcher/dispatcher";
 import DeviceListener from "../../../src/DeviceListener";
 import Modal from "../../../src/Modal";
 import ConfirmKeyStorageOffDialog from "../../../src/components/views/dialogs/ConfirmKeyStorageOffDialog";
+import SetupEncryptionDialog from "../../../src/components/views/dialogs/security/SetupEncryptionDialog";
+import { stubClient } from "../../test-utils";
 
 jest.mock("../../../src/dispatcher/dispatcher", () => ({
     dispatch: jest.fn(),
@@ -31,32 +37,89 @@ describe("SetupEncryptionToast", () => {
 
     describe("Set up recovery", () => {
         it("should render the toast", async () => {
-            showToast(Kind.SET_UP_RECOVERY);
+            act(() => showToast("set_up_recovery"));
 
             expect(await screen.findByRole("heading", { name: "Set up recovery" })).toBeInTheDocument();
         });
 
-        it("should dismiss the toast when 'not now' button clicked", async () => {
+        it("should dismiss the toast when 'Dismiss' button clicked, and remember it", async () => {
+            jest.spyOn(DeviceListener.sharedInstance(), "recordRecoveryDisabled");
             jest.spyOn(DeviceListener.sharedInstance(), "dismissEncryptionSetup");
 
-            showToast(Kind.SET_UP_RECOVERY);
+            act(() => showToast("set_up_recovery"));
 
             const user = userEvent.setup();
-            await user.click(await screen.findByRole("button", { name: "Not now" }));
+            await user.click(await screen.findByRole("button", { name: "Dismiss" }));
 
+            expect(DeviceListener.sharedInstance().recordRecoveryDisabled).toHaveBeenCalled();
             expect(DeviceListener.sharedInstance().dismissEncryptionSetup).toHaveBeenCalled();
         });
     });
 
     describe("Key storage out of sync", () => {
+        let client: Mocked<MatrixClient>;
+
+        beforeEach(() => {
+            client = mocked(stubClient());
+            mocked(client.getCrypto).mockReturnValue({
+                getSessionBackupPrivateKey: jest.fn().mockResolvedValue(null),
+                resetKeyBackup: jest.fn(),
+                checkKeyBackupAndEnable: jest.fn(),
+                loadSessionBackupPrivateKeyFromSecretStorage: jest.fn(),
+            } as unknown as CryptoApi);
+        });
+
         it("should render the toast", async () => {
-            showToast(Kind.KEY_STORAGE_OUT_OF_SYNC);
+            act(() => showToast("key_storage_out_of_sync"));
 
             await expect(screen.findByText("Your key storage is out of sync.")).resolves.toBeInTheDocument();
         });
 
-        it("should open settings to the reset flow when 'forgot recovery key' clicked", async () => {
-            showToast(Kind.KEY_STORAGE_OUT_OF_SYNC);
+        it("should reset key backup if needed", async () => {
+            showToast("key_storage_out_of_sync");
+
+            jest.spyOn(SecurityManager, "accessSecretStorage").mockImplementation(
+                async (func = async (): Promise<void> => {}) => {
+                    return await func();
+                },
+            );
+
+            jest.spyOn(DeviceListener.sharedInstance(), "keyStorageOutOfSyncNeedsBackupReset").mockResolvedValue(true);
+
+            const user = userEvent.setup();
+            await user.click(await screen.findByText("Enter recovery key"));
+
+            expect(client.getCrypto()!.resetKeyBackup).toHaveBeenCalled();
+        });
+
+        it("should not reset key backup if not needed", async () => {
+            showToast("key_storage_out_of_sync");
+
+            jest.spyOn(SecurityManager, "accessSecretStorage").mockImplementation(
+                async (func = async (): Promise<void> => {}) => {
+                    return await func();
+                },
+            );
+
+            jest.spyOn(DeviceListener.sharedInstance(), "keyStorageOutOfSyncNeedsBackupReset").mockResolvedValue(false);
+            // if the backup key is stored in 4S
+            client.isKeyBackupKeyStored.mockResolvedValue({});
+
+            const user = userEvent.setup();
+            await user.click(await screen.findByText("Enter recovery key"));
+
+            // we shouldn't have reset the key backup, but should have fetched
+            // the key from 4S
+            expect(client.getCrypto()!.resetKeyBackup).not.toHaveBeenCalled();
+            expect(client.getCrypto()!.loadSessionBackupPrivateKeyFromSecretStorage).toHaveBeenCalled();
+        });
+
+        it("should open settings to the reset flow when 'forgot recovery key' clicked and identity reset needed", async () => {
+            act(() => showToast("key_storage_out_of_sync"));
+
+            jest.spyOn(DeviceListener.sharedInstance(), "keyStorageOutOfSyncNeedsCrossSigningReset").mockResolvedValue(
+                true,
+            );
 
             const user = userEvent.setup();
             await user.click(await screen.findByText("Forgot recovery key?"));
@@ -68,12 +131,33 @@ describe("SetupEncryptionToast", () => {
             });
         });
 
-        it("should open settings to the reset flow when recovering fails", async () => {
+        it("should open settings to the change recovery key flow when 'forgot recovery key' clicked and identity reset not needed", async () => {
+            act(() => showToast("key_storage_out_of_sync"));
+
+            jest.spyOn(DeviceListener.sharedInstance(), "keyStorageOutOfSyncNeedsCrossSigningReset").mockResolvedValue(
+                false,
+            );
+
+            const user = userEvent.setup();
+            await user.click(await screen.findByText("Forgot recovery key?"));
+
+            expect(dis.dispatch).toHaveBeenCalledWith({
+                action: "view_user_settings",
+                initialTabId: "USER_ENCRYPTION_TAB",
+                props: { initialEncryptionState: "change_recovery_key" },
+            });
+        });
+
+        it("should open settings to the reset flow when recovering fails and identity reset needed", async () => {
             jest.spyOn(SecurityManager, "accessSecretStorage").mockImplementation(async () => {
                 throw new Error("Something went wrong while recovering!");
             });
 
-            showToast(Kind.KEY_STORAGE_OUT_OF_SYNC);
+            jest.spyOn(DeviceListener.sharedInstance(), "keyStorageOutOfSyncNeedsCrossSigningReset").mockResolvedValue(
+                true,
+            );
+
+            act(() => showToast("key_storage_out_of_sync"));
 
             const user = userEvent.setup();
             await user.click(await screen.findByText("Enter recovery key"));
@@ -84,11 +168,32 @@ describe("SetupEncryptionToast", () => {
                 props: { initialEncryptionState: "reset_identity_sync_failed" },
             });
         });
+
+        it("should open settings to the change recovery key flow when recovering fails and identity reset not needed", async () => {
+            jest.spyOn(SecurityManager, "accessSecretStorage").mockImplementation(async () => {
+                throw new Error("Something went wrong while recovering!");
+            });
+
+            jest.spyOn(DeviceListener.sharedInstance(), "keyStorageOutOfSyncNeedsCrossSigningReset").mockResolvedValue(
+                false,
+            );
+
+            act(() => showToast("key_storage_out_of_sync"));
+
+            const user = userEvent.setup();
+            await user.click(await screen.findByText("Enter recovery key"));
+
+            expect(dis.dispatch).toHaveBeenCalledWith({
+                action: "view_user_settings",
+                initialTabId: "USER_ENCRYPTION_TAB",
+                props: { initialEncryptionState: "change_recovery_key" },
+            });
+        });
     });
 
     describe("Turn on key storage", () => {
         it("should render the toast", async () => {
-            showToast(Kind.TURN_ON_KEY_STORAGE);
+            act(() => showToast("turn_on_key_storage"));
 
             await expect(screen.findByText("Turn on key storage")).resolves.toBeInTheDocument();
             await expect(screen.findByRole("button", { name: "Dismiss" })).resolves.toBeInTheDocument();
@@ -98,7 +203,7 @@ describe("SetupEncryptionToast", () => {
         it("should open settings to the Encryption tab when 'Continue' clicked", async () => {
             jest.spyOn(DeviceListener.sharedInstance(), "recordKeyBackupDisabled");
 
-            showToast(Kind.TURN_ON_KEY_STORAGE);
+            act(() => showToast("turn_on_key_storage"));
 
             const user = userEvent.setup();
             await user.click(await screen.findByRole("button", { name: "Continue" }));
@@ -120,7 +225,7 @@ describe("SetupEncryptionToast", () => {
             });
 
             // When we show the toast, and click Dismiss
-            showToast(Kind.TURN_ON_KEY_STORAGE);
+            act(() => showToast("turn_on_key_storage"));
 
             const user = userEvent.setup();
             await user.click(await screen.findByRole("button", { name: "Dismiss" }));
@@ -136,4 +241,65 @@ describe("SetupEncryptionToast", () => {
             expect(DeviceListener.sharedInstance().recordKeyBackupDisabled).toHaveBeenCalledTimes(1);
         });
     });
+
+    describe("Verify this session", () => {
+        it("should render the toast", async () => {
+            act(() => showToast("verify_this_session"));
+
+            await expect(screen.findByText("Verify this session")).resolves.toBeInTheDocument();
+            await expect(screen.findByRole("button", { name: "Later" })).resolves.toBeInTheDocument();
+            await expect(screen.findByRole("button", { name: "Verify" })).resolves.toBeInTheDocument();
+        });
+
+        it("should dismiss the toast when 'Later' button clicked, and remember it", async () => {
+            jest.spyOn(DeviceListener.sharedInstance(), "dismissEncryptionSetup");
+
+            act(() => showToast("verify_this_session"));
+
+            const user = userEvent.setup();
+            await user.click(await screen.findByRole("button", { name: "Later" }));
+
+            expect(DeviceListener.sharedInstance().dismissEncryptionSetup).toHaveBeenCalled();
+        });
+
+        it("should open the verification dialog when 'Verify' clicked", async () => {
+            jest.spyOn(Modal, "createDialog");
+
+            // When we show the toast, and click Verify
+            act(() => showToast("verify_this_session"));
+
+            const user = userEvent.setup();
+            await user.click(await screen.findByRole("button", { name: "Verify" }));
+
+            // Then the dialog was opened
+            expect(Modal.createDialog).toHaveBeenCalledWith(SetupEncryptionDialog, {}, undefined, false, true);
+        });
+    });
+
+    describe("Identity needs reset", () => {
+        it("should render the toast", async () => {
+            act(() => showToast("identity_needs_reset"));
+
+            await expect(screen.findByText("Your key storage is out of sync.")).resolves.toBeInTheDocument();
+            await expect(
+                screen.findByText(
+                    "You have to reset your cryptographic identity in order to ensure access to your message history",
+                ),
+            ).resolves.toBeInTheDocument();
+            await expect(screen.findByRole("button", { name: "Continue with reset" })).resolves.toBeInTheDocument();
+        });
+
+        it("should open settings to the reset flow when 'Continue with reset' clicked", async () => {
+            act(() => showToast("identity_needs_reset"));
+
+            const user = userEvent.setup();
+            await user.click(await screen.findByText("Continue with reset"));
+
+            expect(dis.dispatch).toHaveBeenCalledWith({
+                action: "view_user_settings",
+                initialTabId: "USER_ENCRYPTION_TAB",
+                props: { initialEncryptionState: "reset_identity_cant_recover" },
+            });
+        });
+    });
 });
diff --git a/test/unit-tests/toasts/__snapshots__/IncomingLegacyCallToast-test.tsx.snap b/test/unit-tests/toasts/__snapshots__/IncomingLegacyCallToast-test.tsx.snap
index 55252462bd..03c4f2e3b1 100644
--- a/test/unit-tests/toasts/__snapshots__/IncomingLegacyCallToast-test.tsx.snap
+++ b/test/unit-tests/toasts/__snapshots__/IncomingLegacyCallToast-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<IncomingLegacyCallToast /> renders disabled silenced button when call is forced to silent 1`] = `
 <div
diff --git a/test/unit-tests/toasts/__snapshots__/UnverifiedSessionToast-test.tsx.snap b/test/unit-tests/toasts/__snapshots__/UnverifiedSessionToast-test.tsx.snap
index 1fac6059cc..ab34e13fda 100644
--- a/test/unit-tests/toasts/__snapshots__/UnverifiedSessionToast-test.tsx.snap
+++ b/test/unit-tests/toasts/__snapshots__/UnverifiedSessionToast-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`UnverifiedSessionToast when rendering the toast should render as expected 1`] = `
 <body>
@@ -8,8 +8,20 @@ exports[`UnverifiedSessionToast when rendering the toast should render as expect
       role="alert"
     >
       <div
-        class="mx_Toast_toast mx_Toast_hasIcon mx_Toast_icon_verification_warning"
+        class="mx_Toast_toast mx_Toast_hasIcon"
       >
+        <svg
+          color="var(--cpd-color-icon-critical-primary)"
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12 17q.424 0 .713-.288A.97.97 0 0 0 13 16a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 15a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 16q0 .424.287.712.288.288.713.288m0-4q.424 0 .713-.287A.97.97 0 0 0 13 12V8a.97.97 0 0 0-.287-.713A.97.97 0 0 0 12 7a.97.97 0 0 0-.713.287A.97.97 0 0 0 11 8v4q0 .424.287.713.288.287.713.287m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22"
+          />
+        </svg>
         <div
           class="mx_Toast_title"
         >
@@ -50,7 +62,7 @@ exports[`UnverifiedSessionToast when rendering the toast should render as expect
               class="mx_Toast_buttons"
             >
               <button
-                class="_button_vczzf_8 _destructive_vczzf_107"
+                class="_button_187yx_8 _destructive_187yx_107"
                 data-kind="secondary"
                 data-size="sm"
                 role="button"
@@ -59,7 +71,7 @@ exports[`UnverifiedSessionToast when rendering the toast should render as expect
                 No
               </button>
               <button
-                class="_button_vczzf_8"
+                class="_button_187yx_8"
                 data-kind="primary"
                 data-size="sm"
                 role="button"
diff --git a/test/unit-tests/utils/MediaEventHelper-test.ts b/test/unit-tests/utils/MediaEventHelper-test.ts
new file mode 100644
index 0000000000..803924f74c
--- /dev/null
+++ b/test/unit-tests/utils/MediaEventHelper-test.ts
@@ -0,0 +1,40 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { MatrixEvent } from "matrix-js-sdk/src/matrix";
+
+import { MediaEventHelper } from "../../../src/utils/MediaEventHelper.ts";
+import { stubClient } from "../../test-utils";
+
+describe("MediaEventHelper", () => {
+    it("should set the mime type on the blob based on the event metadata", async () => {
+        stubClient();
+
+        const event = new MatrixEvent({
+            type: "m.room.message",
+            content: {
+                msgtype: "m.image",
+                body: "image.png",
+                info: {
+                    mimetype: "image/png",
+                    size: 1234,
+                    w: 100,
+                    h: 100,
+                    thumbnail_info: {
+                        mimetype: "image/png",
+                    },
+                    thumbnail_url: "mxc://matrix.org/thumbnail",
+                },
+                url: "mxc://matrix.org/abcdef",
+            },
+        });
+        const helper = new MediaEventHelper(event);
+
+        const blob = await helper.thumbnailBlob.value;
+        expect(blob?.type).toBe(event.getContent().info.thumbnail_info?.mimetype);
+    });
+});
diff --git a/test/unit-tests/utils/MultiInviter-test.ts b/test/unit-tests/utils/MultiInviter-test.ts
index 998334c9af..b898ea2a24 100644
--- a/test/unit-tests/utils/MultiInviter-test.ts
+++ b/test/unit-tests/utils/MultiInviter-test.ts
@@ -15,7 +15,7 @@ import Modal, { type ComponentType, type ComponentProps } from "../../../src/Mod
 import SettingsStore from "../../../src/settings/SettingsStore";
 import MultiInviter, { type CompletionStates } from "../../../src/utils/MultiInviter";
 import * as TestUtilsMatrix from "../../test-utils";
-import type AskInviteAnywayDialog from "../../../src/components/views/dialogs/AskInviteAnywayDialog";
+import AskInviteAnywayDialog from "../../../src/components/views/dialogs/AskInviteAnywayDialog";
 import ConfirmUserActionDialog from "../../../src/components/views/dialogs/ConfirmUserActionDialog";
 
 const ROOMID = "!room:server";
@@ -24,10 +24,14 @@ const MXID1 = "@user1:server";
 const MXID2 = "@user2:server";
 const MXID3 = "@user3:server";
 
-const MXID_PROFILE_STATES: Record<string, Promise<any>> = {
-    [MXID1]: Promise.resolve({}),
-    [MXID2]: Promise.reject(new MatrixError({ errcode: "M_FORBIDDEN" })),
-    [MXID3]: Promise.reject(new MatrixError({ errcode: "M_NOT_FOUND" })),
+const MXID_PROFILE_STATES: Record<string, () => {}> = {
+    [MXID1]: () => ({}),
+    [MXID2]: () => {
+        throw new MatrixError({ errcode: "M_FORBIDDEN" });
+    },
+    [MXID3]: () => {
+        throw new MatrixError({ errcode: "M_NOT_FOUND" });
+    },
 };
 
 jest.mock("../../../src/Modal", () => ({
@@ -51,11 +55,12 @@ const mockPromptBeforeInviteUnknownUsers = (value: boolean) => {
 };
 
 const mockCreateTrackedDialog = (callbackName: "onInviteAnyways" | "onGiveUp") => {
-    mocked(Modal.createDialog).mockImplementation(
-        (Element: ComponentType, props?: ComponentProps<ComponentType>): any => {
+    mocked(Modal.createDialog).mockImplementation((Element: ComponentType, props?: ComponentProps<ComponentType>) => {
+        if (Element === AskInviteAnywayDialog) {
             (props as ComponentProps<typeof AskInviteAnywayDialog>)[callbackName]();
-        },
-    );
+        }
+        return { close: jest.fn(), finished: new Promise(() => {}) };
+    });
 };
 
 const expectAllInvitedResult = (result: CompletionStates) => {
@@ -72,6 +77,7 @@ describe("MultiInviter", () => {
 
     beforeEach(() => {
         jest.resetAllMocks();
+        mocked(Modal.createDialog).mockReturnValue({ close: jest.fn(), finished: new Promise(() => {}) });
 
         TestUtilsMatrix.stubClient();
         client = MatrixClientPeg.safeGet() as jest.Mocked<MatrixClient>;
@@ -80,8 +86,10 @@ describe("MultiInviter", () => {
         client.invite.mockResolvedValue({});
 
         client.getProfileInfo = jest.fn();
-        client.getProfileInfo.mockImplementation((userId: string) => {
-            return MXID_PROFILE_STATES[userId] || Promise.reject();
+        client.getProfileInfo.mockImplementation(async (userId: string) => {
+            const m = MXID_PROFILE_STATES[userId];
+            if (m) return m();
+            throw new Error();
         });
         client.unban = jest.fn();
 
@@ -89,6 +97,22 @@ describe("MultiInviter", () => {
     });
 
     describe("invite", () => {
+        it("should show a progress dialog while the invite happens", async () => {
+            const mockModalHandle = { close: jest.fn(), finished: new Promise<[]>(() => {}) };
+            mocked(Modal.createDialog).mockReturnValue(mockModalHandle);
+
+            const invitePromise = Promise.withResolvers<{}>();
+            client.invite.mockReturnValue(invitePromise.promise);
+
+            const resultPromise = inviter.invite([MXID1]);
+            expect(Modal.createDialog).toHaveBeenCalledTimes(1);
+            expect(mockModalHandle.close).not.toHaveBeenCalled();
+
+            invitePromise.resolve({});
+            await resultPromise;
+            expect(mockModalHandle.close).toHaveBeenCalled();
+        });
+
         describe("with promptBeforeInviteUnknownUsers = false", () => {
             beforeEach(() => mockPromptBeforeInviteUnknownUsers(false));
 
@@ -96,9 +120,9 @@ describe("MultiInviter", () => {
                 const result = await inviter.invite([MXID1, MXID2, MXID3]);
 
                 expect(client.invite).toHaveBeenCalledTimes(3);
-                expect(client.invite).toHaveBeenNthCalledWith(1, ROOMID, MXID1, undefined);
-                expect(client.invite).toHaveBeenNthCalledWith(2, ROOMID, MXID2, undefined);
-                expect(client.invite).toHaveBeenNthCalledWith(3, ROOMID, MXID3, undefined);
+                expect(client.invite).toHaveBeenNthCalledWith(1, ROOMID, MXID1, {});
+                expect(client.invite).toHaveBeenNthCalledWith(2, ROOMID, MXID2, {});
+                expect(client.invite).toHaveBeenNthCalledWith(3, ROOMID, MXID3, {});
 
                 expectAllInvitedResult(result);
             });
@@ -114,9 +138,9 @@ describe("MultiInviter", () => {
                     const result = await inviter.invite([MXID1, MXID2, MXID3]);
 
                     expect(client.invite).toHaveBeenCalledTimes(3);
-                    expect(client.invite).toHaveBeenNthCalledWith(1, ROOMID, MXID1, undefined);
-                    expect(client.invite).toHaveBeenNthCalledWith(2, ROOMID, MXID2, undefined);
-                    expect(client.invite).toHaveBeenNthCalledWith(3, ROOMID, MXID3, undefined);
+                    expect(client.invite).toHaveBeenNthCalledWith(1, ROOMID, MXID1, {});
+                    expect(client.invite).toHaveBeenNthCalledWith(2, ROOMID, MXID2, {});
+                    expect(client.invite).toHaveBeenNthCalledWith(3, ROOMID, MXID3, {});
 
                     expectAllInvitedResult(result);
                 });
@@ -129,7 +153,7 @@ describe("MultiInviter", () => {
                     const result = await inviter.invite([MXID1, MXID2, MXID3]);
 
                     expect(client.invite).toHaveBeenCalledTimes(1);
-                    expect(client.invite).toHaveBeenNthCalledWith(1, ROOMID, MXID1, undefined);
+                    expect(client.invite).toHaveBeenNthCalledWith(1, ROOMID, MXID1, {});
 
                     // The resolved state is 'invited' for all users.
                     // With the above client expectations, the test ensures that only the first user is invited.
@@ -231,5 +255,15 @@ describe("MultiInviter", () => {
                 `"This space is unfederated. You cannot invite people from external servers."`,
             );
         });
+
+        it("should set shareEncryptedHistory if that setting is enabled", async () => {
+            mocked(SettingsStore.getValue).mockImplementation((settingName, roomId, value) => {
+                return settingName === "feature_share_history_on_invite"; // this is enabled, everything else is disabled.
+            });
+            await inviter.invite([MXID1]);
+
+            expect(client.invite).toHaveBeenCalledTimes(1);
+            expect(client.invite).toHaveBeenNthCalledWith(1, ROOMID, MXID1, { shareEncryptedHistory: true });
+        });
     });
 });
diff --git a/test/unit-tests/utils/__snapshots__/AutoDiscoveryUtils-test.tsx.snap b/test/unit-tests/utils/__snapshots__/AutoDiscoveryUtils-test.tsx.snap
index b53de96973..8556db8ba8 100644
--- a/test/unit-tests/utils/__snapshots__/AutoDiscoveryUtils-test.tsx.snap
+++ b/test/unit-tests/utils/__snapshots__/AutoDiscoveryUtils-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`AutoDiscoveryUtils authComponentStateForError should return expected error for the registration page 1`] = `
 {
diff --git a/test/unit-tests/utils/__snapshots__/ErrorUtils-test.ts.snap b/test/unit-tests/utils/__snapshots__/ErrorUtils-test.ts.snap
index 572c14f91c..6c8cc750b8 100644
--- a/test/unit-tests/utils/__snapshots__/ErrorUtils-test.ts.snap
+++ b/test/unit-tests/utils/__snapshots__/ErrorUtils-test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`messageForConnectionError should match snapshot for ConnectionError 1`] = `
 <DocumentFragment>
@@ -12,9 +12,21 @@ exports[`messageForConnectionError should match snapshot for ConnectionError 1`]
         target="_blank"
       >
         homeserver's SSL certificate
-        <i
+        <svg
           class="mx_ExternalLink_icon"
-        />
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+          />
+          <path
+            d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+          />
+        </svg>
       </a>
        is trusted, and that a browser extension is not blocking requests.
     </span>
diff --git a/test/unit-tests/utils/__snapshots__/FormattingUtils-test.tsx.snap b/test/unit-tests/utils/__snapshots__/FormattingUtils-test.tsx.snap
index 464963c1ef..92baf3ce34 100644
--- a/test/unit-tests/utils/__snapshots__/FormattingUtils-test.tsx.snap
+++ b/test/unit-tests/utils/__snapshots__/FormattingUtils-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`FormattingUtils formatList should return expected sentence in ReactNode when given 2 React children 1`] = `
 <React.Fragment>
diff --git a/test/unit-tests/utils/__snapshots__/MessageDiffUtils-test.tsx.snap b/test/unit-tests/utils/__snapshots__/MessageDiffUtils-test.tsx.snap
index 8a03710e19..1c25d3b3a6 100644
--- a/test/unit-tests/utils/__snapshots__/MessageDiffUtils-test.tsx.snap
+++ b/test/unit-tests/utils/__snapshots__/MessageDiffUtils-test.tsx.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`editBodyDiffToHtml deduplicates diff steps 1`] = `
 <div>
diff --git a/test/unit-tests/utils/__snapshots__/createVoiceMessageContent-test.ts.snap b/test/unit-tests/utils/__snapshots__/createVoiceMessageContent-test.ts.snap
index 6ab97e6374..0263ed07ab 100644
--- a/test/unit-tests/utils/__snapshots__/createVoiceMessageContent-test.ts.snap
+++ b/test/unit-tests/utils/__snapshots__/createVoiceMessageContent-test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`createVoiceMessageContent should create a voice message content 1`] = `
 {
diff --git a/test/unit-tests/utils/device/parseUserAgent-test.ts b/test/unit-tests/utils/device/parseUserAgent-test.ts
index 7ed2af4682..87f27031cb 100644
--- a/test/unit-tests/utils/device/parseUserAgent-test.ts
+++ b/test/unit-tests/utils/device/parseUserAgent-test.ts
@@ -125,7 +125,7 @@ describe("parseUserAgent()", () => {
         const testCases: TestCase[] = userAgents.map((userAgent, index) => [userAgent, results[index]]);
 
         describe(`on platform ${platform}`, () => {
-            it.each(testCases)("should parse the user agent correctly -  %s", (userAgent, expectedResult) => {
+            it.each(testCases)("should parse the user agent correctly - %s", (userAgent, expectedResult) => {
                 expect(parseUserAgent(userAgent)).toEqual(expectedResult);
             });
         });
diff --git a/test/unit-tests/utils/exportUtils/HTMLExport-test.ts b/test/unit-tests/utils/exportUtils/HTMLExport-test.ts
index 6415efaf1d..0ef71463bb 100644
--- a/test/unit-tests/utils/exportUtils/HTMLExport-test.ts
+++ b/test/unit-tests/utils/exportUtils/HTMLExport-test.ts
@@ -23,6 +23,7 @@ import {
 import fetchMock from "fetch-mock-jest";
 import escapeHtml from "escape-html";
 import { type RelationsContainer } from "matrix-js-sdk/src/models/relations-container";
+import { mocked } from "jest-mock";
 
 import { filterConsole, mkReaction, mkStubRoom, REPEATABLE_DATE, stubClient } from "../../../test-utils";
 import { ExportType, type IExportOptions } from "../../../../src/utils/exportUtils/exportUtils";
@@ -30,8 +31,11 @@ import SdkConfig from "../../../../src/SdkConfig";
 import HTMLExporter from "../../../../src/utils/exportUtils/HtmlExport";
 import DMRoomMap from "../../../../src/utils/DMRoomMap";
 import { mediaFromMxc } from "../../../../src/customisations/Media";
+import SettingsStore from "../../../../src/settings/SettingsStore";
+import { SdkContextClass } from "../../../../src/contexts/SDKContext.ts";
 
 jest.mock("jszip");
+jest.mock("../../../../src/settings/SettingsStore");
 
 const EVENT_MESSAGE: IRoomEvent = {
     event_id: "$1",
@@ -72,6 +76,20 @@ const EVENT_ATTACHMENT_MALFORMED: IRoomEvent = {
     },
 };
 
+const EVENT_MENTION: IRoomEvent = {
+    event_id: "$4",
+    type: EventType.RoomMessage,
+    sender: "@bob:example.com",
+    origin_server_ts: 0,
+    content: {
+        "msgtype": "m.text",
+        "body": "Message Alex",
+        "format": "org.matrix.custom.html",
+        "formatted_body": 'Message <a href="https://matrix.to/#/@alex:example.org">@alex:example.org</a>',
+        "m.mentions": { user_ids: ["@alex:example.org"] },
+    },
+};
+
 describe("HTMLExport", () => {
     let client: jest.Mocked<MatrixClient>;
     let room: Room;
@@ -88,14 +106,23 @@ describe("HTMLExport", () => {
     );
 
     beforeEach(() => {
+        jest.clearAllMocks();
         jest.useFakeTimers();
         jest.setSystemTime(REPEATABLE_DATE);
 
         client = stubClient() as jest.Mocked<MatrixClient>;
+        SdkContextClass.instance.client = client;
         DMRoomMap.makeShared(client);
 
         room = new Room("!myroom:example.org", client, "@me:example.org");
         client.getRoom.mockReturnValue(room);
+
+        // Set up a default mock that uses the actual SettingsStore implementation
+        const actualSettingsStore = jest.requireActual("../../../../src/settings/SettingsStore").default;
+        mocked(SettingsStore).getValue.mockImplementation((name: any, roomId?: any, excludeDefault?: any): any => {
+            // Default to the real implementation
+            return actualSettingsStore.getValue(name, roomId, excludeDefault);
+        });
     });
 
     function mockMessages(...events: IRoomEvent[]): void {
@@ -104,8 +131,8 @@ describe("HTMLExport", () => {
             const chunk = events.slice(from, limit);
             return Promise.resolve({
                 chunk,
-                from: from.toString(),
-                to: (from + limit).toString(),
+                start: from.toString(),
+                end: (from + limit).toString(),
             });
         });
     }
@@ -419,6 +446,36 @@ describe("HTMLExport", () => {
         expect(text).toBe(attachmentBody);
     });
 
+    it("should handle attachments with identical names and dates", async () => {
+        mockMessages(EVENT_MESSAGE, EVENT_ATTACHMENT, EVENT_ATTACHMENT);
+
+        const exporter = new HTMLExporter(
+            room,
+            ExportType.LastNMessages,
+            {
+                attachmentsIncluded: true,
+                maxSize: 1_024 * 1_024,
+                numberOfMessages: 40,
+            },
+            () => {},
+        );
+
+        await exporter.export();
+
+        const files = getFiles(exporter);
+
+        // There should be 5 files: 2 attachments, 1 html file, 1 css file and 1 js file
+        expect(Object.keys(files)).toHaveLength(5);
+
+        // Ensure that the attachment is present
+        const file = files[Object.keys(files).find((k) => k.endsWith(".txt"))!];
+        expect(file).not.toBeUndefined();
+
+        // Ensure that the duplicate attachment has been uniquely named
+        const duplicateFile = files[Object.keys(files).find((k) => k.endsWith("(1).txt"))!];
+        expect(duplicateFile).not.toBeUndefined();
+    });
+
     it("should handle when attachment cannot be fetched", async () => {
         mockMessages(EVENT_MESSAGE, EVENT_ATTACHMENT_MALFORMED, EVENT_ATTACHMENT);
         const attachmentBody = "Lorem ipsum dolor sit amet";
@@ -645,4 +702,53 @@ describe("HTMLExport", () => {
         const file = getMessageFile(exporter);
         expect(await file.text()).toContain(reaction.getContent()["m.relates_to"]?.key);
     });
+
+    it("should not crash when jump to date flag is enabled", async () => {
+        // Override just the feature flag for this specific test
+        const originalMock = mocked(SettingsStore).getValue.getMockImplementation();
+
+        mocked(SettingsStore).getValue.mockImplementation((name: any, roomId?: any, excludeDefault?: any): any => {
+            if (name === "feature_jump_to_date") {
+                return true;
+            }
+            // Fallback to the default mock implementation set in beforeEach
+            return originalMock!(name, roomId, excludeDefault);
+        });
+
+        mockMessages(EVENT_MESSAGE);
+        const exporter = new HTMLExporter(
+            room,
+            ExportType.LastNMessages,
+            {
+                attachmentsIncluded: false,
+                maxSize: 1_024 * 1_024,
+                numberOfMessages: 40,
+            },
+            () => {},
+        );
+
+        await exporter.export();
+
+        const file = getMessageFile(exporter);
+        expect(file).not.toBeUndefined();
+    });
+
+    it("should not crash when exporting mentions", async () => {
+        mockMessages(EVENT_MESSAGE, EVENT_MENTION);
+        const exporter = new HTMLExporter(
+            room,
+            ExportType.LastNMessages,
+            {
+                attachmentsIncluded: false,
+                maxSize: 1_024 * 1_024,
+                numberOfMessages: 40,
+            },
+            () => {},
+        );
+
+        await exporter.export();
+
+        const file = getMessageFile(exporter);
+        expect(file).not.toBeUndefined();
+    });
 });
diff --git a/test/unit-tests/utils/exportUtils/__snapshots__/HTMLExport-test.ts.snap b/test/unit-tests/utils/exportUtils/__snapshots__/HTMLExport-test.ts.snap
index 56cc1d0f27..550d25ea7d 100644
--- a/test/unit-tests/utils/exportUtils/__snapshots__/HTMLExport-test.ts.snap
+++ b/test/unit-tests/utils/exportUtils/__snapshots__/HTMLExport-test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`HTMLExport should export 1`] = `
 "
@@ -17,8 +17,8 @@ exports[`HTMLExport should export 1`] = `
                     <div class="mx_MatrixChat_wrapper" aria-hidden="false">
                         <div class="mx_MatrixChat">
                         <main class="mx_RoomView">
-                            <div class="mx_Flex mx_RoomHeader light-panel">
-                                <span role="presentation" title="!myroom:example.org" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size:32px">!</span>
+                            <div class="mx_RoomHeader light-panel">
+                                <span role="presentation" title="!myroom:example.org" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size:32px">!</span>
                                 <div class="mx_RoomHeader_infoWrapper">
                                     <div
                                         dir="auto"
@@ -51,13 +51,13 @@ exports[`HTMLExport should export 1`] = `
                                         role="list"
                                     >
                                     <div class="mx_NewRoomIntro">
-                                            <span role="presentation" title="!myroom:example.org" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size:32px">!</span>
+                                            <span role="presentation" title="!myroom:example.org" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size:32px">!</span>
                                             <h2> !myroom:example.org </h2>
                                             <p>  created this room. <br/><br/> <p><span>This is the start of export of <strong>!myroom:example.org</strong>. Exported by <a href="https://matrix.to/#/%40userId%3Amatrix.org" target="_blank" rel="noopener noreferrer"><strong>@userId:matrix.org</strong></a> at 11/17/2022.</span></p> </p>
                                             <br/>
                                             <p>  </p>
                                         </div>
-                                    <li><div class="mx_TimelineSeparator" role="separator" aria-label="Thu, Jan 1, 1970"><hr role="none"/><div class="mx_DateSeparator_dateContent"><h2 class="mx_DateSeparator_dateHeading" aria-hidden="true">Thu, Jan 1, 1970</h2></div><hr role="none"/></div></li><div class="mx_Export_EventWrapper" id="49"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="49" data-layout="group" data-self="false" data-event-id="49" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color4 mx_DisambiguatedProfile_displayName" dir="auto">@user49:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user49:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="4" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/49" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #49</div></div></div></li></div><div class="mx_Export_EventWrapper" id="48"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="48" data-layout="group" data-self="false" data-event-id="48" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color3 mx_DisambiguatedProfile_displayName" dir="auto">@user48:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user48:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="3" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/48" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #48</div></div></div></li></div><div class="mx_Export_EventWrapper" id="47"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="47" data-layout="group" data-self="false" data-event-id="47" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color2 mx_DisambiguatedProfile_displayName" dir="auto">@user47:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user47:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/47" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #47</div></div></div></li></div><div class="mx_Export_EventWrapper" id="46"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="46" data-layout="group" data-self="false" data-event-id="46" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user46:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user46:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/46" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #46</div></div></div></li></div><div class="mx_Export_EventWrapper" id="45"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="45" data-layout="group" data-self="false" data-event-id="45" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user45:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user45:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/45" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #45</div></div></div></li></div><div class="mx_Export_EventWrapper" id="44"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="44" data-layout="group" data-self="false" data-event-id="44" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color5 mx_DisambiguatedProfile_displayName" dir="auto">@user44:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user44:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="5" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/44" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #44</div></div></div></li></div><div class="mx_Export_EventWrapper" id="43"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="43" data-layout="group" data-self="false" data-event-id="43" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color4 mx_DisambiguatedProfile_displayName" dir="auto">@user43:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user43:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="4" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/43" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #43</div></div></div></li></div><div class="mx_Export_EventWrapper" id="42"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="42" data-layout="group" data-self="false" data-event-id="42" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color3 mx_DisambiguatedProfile_displayName" dir="auto">@user42:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user42:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="3" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/42" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #42</div></div></div></li></div><div class="mx_Export_EventWrapper" id="41"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="41" data-layout="group" data-self="false" data-event-id="41" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color2 mx_DisambiguatedProfile_displayName" dir="auto">@user41:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user41:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/41" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #41</div></div></div></li></div><div class="mx_Export_EventWrapper" id="40"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="40" data-layout="group" data-self="false" data-event-id="40" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user40:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user40:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/40" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #40</div></div></div></li></div><div class="mx_Export_EventWrapper" id="39"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="39" data-layout="group" data-self="false" data-event-id="39" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color3 mx_DisambiguatedProfile_displayName" dir="auto">@user39:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user39:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="3" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/39" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #39</div></div></div></li></div><div class="mx_Export_EventWrapper" id="38"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="38" data-layout="group" data-self="false" data-event-id="38" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color2 mx_DisambiguatedProfile_displayName" dir="auto">@user38:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user38:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/38" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #38</div></div></div></li></div><div class="mx_Export_EventWrapper" id="37"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="37" data-layout="group" data-self="false" data-event-id="37" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user37:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user37:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/37" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #37</div></div></div></li></div><div class="mx_Export_EventWrapper" id="36"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="36" data-layout="group" data-self="false" data-event-id="36" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user36:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user36:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/36" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #36</div></div></div></li></div><div class="mx_Export_EventWrapper" id="35"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="35" data-layout="group" data-self="false" data-event-id="35" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color5 mx_DisambiguatedProfile_displayName" dir="auto">@user35:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user35:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="5" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/35" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #35</div></div></div></li></div><div class="mx_Export_EventWrapper" id="34"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="34" data-layout="group" data-self="false" data-event-id="34" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color4 mx_DisambiguatedProfile_displayName" dir="auto">@user34:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user34:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="4" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/34" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #34</div></div></div></li></div><div class="mx_Export_EventWrapper" id="33"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="33" data-layout="group" data-self="false" data-event-id="33" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color3 mx_DisambiguatedProfile_displayName" dir="auto">@user33:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user33:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="3" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/33" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #33</div></div></div></li></div><div class="mx_Export_EventWrapper" id="32"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="32" data-layout="group" data-self="false" data-event-id="32" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color2 mx_DisambiguatedProfile_displayName" dir="auto">@user32:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user32:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/32" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #32</div></div></div></li></div><div class="mx_Export_EventWrapper" id="31"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="31" data-layout="group" data-self="false" data-event-id="31" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user31:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user31:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/31" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #31</div></div></div></li></div><div class="mx_Export_EventWrapper" id="30"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="30" data-layout="group" data-self="false" data-event-id="30" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user30:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user30:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/30" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #30</div></div></div></li></div><div class="mx_Export_EventWrapper" id="29"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="29" data-layout="group" data-self="false" data-event-id="29" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color2 mx_DisambiguatedProfile_displayName" dir="auto">@user29:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user29:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/29" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #29</div></div></div></li></div><div class="mx_Export_EventWrapper" id="28"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="28" data-layout="group" data-self="false" data-event-id="28" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user28:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user28:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/28" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #28</div></div></div></li></div><div class="mx_Export_EventWrapper" id="27"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="27" data-layout="group" data-self="false" data-event-id="27" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user27:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user27:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/27" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #27</div></div></div></li></div><div class="mx_Export_EventWrapper" id="26"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="26" data-layout="group" data-self="false" data-event-id="26" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color5 mx_DisambiguatedProfile_displayName" dir="auto">@user26:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user26:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="5" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/26" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #26</div></div></div></li></div><div class="mx_Export_EventWrapper" id="25"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="25" data-layout="group" data-self="false" data-event-id="25" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color4 mx_DisambiguatedProfile_displayName" dir="auto">@user25:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user25:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="4" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/25" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #25</div></div></div></li></div><div class="mx_Export_EventWrapper" id="24"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="24" data-layout="group" data-self="false" data-event-id="24" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color3 mx_DisambiguatedProfile_displayName" dir="auto">@user24:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user24:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="3" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/24" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #24</div></div></div></li></div><div class="mx_Export_EventWrapper" id="23"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="23" data-layout="group" data-self="false" data-event-id="23" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color2 mx_DisambiguatedProfile_displayName" dir="auto">@user23:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user23:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/23" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #23</div></div></div></li></div><div class="mx_Export_EventWrapper" id="22"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="22" data-layout="group" data-self="false" data-event-id="22" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user22:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user22:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/22" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #22</div></div></div></li></div><div class="mx_Export_EventWrapper" id="21"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="21" data-layout="group" data-self="false" data-event-id="21" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user21:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user21:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/21" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #21</div></div></div></li></div><div class="mx_Export_EventWrapper" id="20"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="20" data-layout="group" data-self="false" data-event-id="20" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color5 mx_DisambiguatedProfile_displayName" dir="auto">@user20:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user20:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="5" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/20" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #20</div></div></div></li></div><div class="mx_Export_EventWrapper" id="19"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="19" data-layout="group" data-self="false" data-event-id="19" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user19:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user19:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/19" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #19</div></div></div></li></div><div class="mx_Export_EventWrapper" id="18"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="18" data-layout="group" data-self="false" data-event-id="18" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user18:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user18:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/18" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #18</div></div></div></li></div><div class="mx_Export_EventWrapper" id="17"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="17" data-layout="group" data-self="false" data-event-id="17" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color5 mx_DisambiguatedProfile_displayName" dir="auto">@user17:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user17:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="5" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/17" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #17</div></div></div></li></div><div class="mx_Export_EventWrapper" id="16"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="16" data-layout="group" data-self="false" data-event-id="16" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color4 mx_DisambiguatedProfile_displayName" dir="auto">@user16:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user16:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="4" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/16" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #16</div></div></div></li></div><div class="mx_Export_EventWrapper" id="15"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="15" data-layout="group" data-self="false" data-event-id="15" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color3 mx_DisambiguatedProfile_displayName" dir="auto">@user15:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user15:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="3" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/15" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #15</div></div></div></li></div><div class="mx_Export_EventWrapper" id="14"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="14" data-layout="group" data-self="false" data-event-id="14" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color2 mx_DisambiguatedProfile_displayName" dir="auto">@user14:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user14:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/14" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #14</div></div></div></li></div><div class="mx_Export_EventWrapper" id="13"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="13" data-layout="group" data-self="false" data-event-id="13" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user13:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user13:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/13" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #13</div></div></div></li></div><div class="mx_Export_EventWrapper" id="12"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="12" data-layout="group" data-self="false" data-event-id="12" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user12:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user12:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/12" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #12</div></div></div></li></div><div class="mx_Export_EventWrapper" id="11"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="11" data-layout="group" data-self="false" data-event-id="11" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color5 mx_DisambiguatedProfile_displayName" dir="auto">@user11:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user11:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="5" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/11" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #11</div></div></div></li></div><div class="mx_Export_EventWrapper" id="10"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="10" data-layout="group" data-self="false" data-event-id="10" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color4 mx_DisambiguatedProfile_displayName" dir="auto">@user10:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user10:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="4" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/10" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #10</div></div></div></li></div><div class="mx_Export_EventWrapper" id="9"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="9" data-layout="group" data-self="false" data-event-id="9" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user9:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user9:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/9" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #9</div></div></div></li></div><div class="mx_Export_EventWrapper" id="8"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="8" data-layout="group" data-self="false" data-event-id="8" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color5 mx_DisambiguatedProfile_displayName" dir="auto">@user8:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user8:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="5" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/8" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #8</div></div></div></li></div><div class="mx_Export_EventWrapper" id="7"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="7" data-layout="group" data-self="false" data-event-id="7" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color4 mx_DisambiguatedProfile_displayName" dir="auto">@user7:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user7:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="4" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/7" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #7</div></div></div></li></div><div class="mx_Export_EventWrapper" id="6"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="6" data-layout="group" data-self="false" data-event-id="6" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color3 mx_DisambiguatedProfile_displayName" dir="auto">@user6:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user6:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="3" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/6" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #6</div></div></div></li></div><div class="mx_Export_EventWrapper" id="5"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="5" data-layout="group" data-self="false" data-event-id="5" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color2 mx_DisambiguatedProfile_displayName" dir="auto">@user5:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user5:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/5" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #5</div></div></div></li></div><div class="mx_Export_EventWrapper" id="4"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="4" data-layout="group" data-self="false" data-event-id="4" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user4:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user4:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/4" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #4</div></div></div></li></div><div class="mx_Export_EventWrapper" id="3"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="3" data-layout="group" data-self="false" data-event-id="3" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user3:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user3:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/3" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #3</div></div></div></li></div><div class="mx_Export_EventWrapper" id="2"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="2" data-layout="group" data-self="false" data-event-id="2" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color5 mx_DisambiguatedProfile_displayName" dir="auto">@user2:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user2:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="5" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/2" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #2</div></div></div></li></div><div class="mx_Export_EventWrapper" id="1"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="1" data-layout="group" data-self="false" data-event-id="1" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color4 mx_DisambiguatedProfile_displayName" dir="auto">@user1:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user1:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="4" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/1" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #1</div></div></div></li></div><div class="mx_Export_EventWrapper" id="0"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="0" data-layout="group" data-self="false" data-event-id="0" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color3 mx_DisambiguatedProfile_displayName" dir="auto">@user0:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user0:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="3" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" style="--cpd-avatar-size: 30px;">u</button></div><div class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/0" aria-label="00:00"><span class="mx_MessageTimestamp" aria-hidden="true" aria-live="off">00:00</span></a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #0</div></div></div><div class="mx_EventTile_footer"><div class="mx_ReactionsRow" role="toolbar" aria-label="Reactions"><div aria-label="@user0:example.com reacted with 🙃" tabindex="0" role="button" aria-disabled="true" disabled="" class="mx_AccessibleButton mx_ReactionsRowButton mx_AccessibleButton_disabled"><span class="mx_ReactionsRowButton_content" aria-hidden="true">🙃</span><span class="mx_ReactionsRowButton_count" aria-hidden="true">1</span></div></div></div></li></div>
+                                    <li><div class="mx_TimelineSeparator" role="separator" aria-label="Thu, Jan 1, 1970"><hr role="none"/><div class="mx_DateSeparator_dateContent"><h2 class="mx_DateSeparator_dateHeading" aria-hidden="true">Thu, Jan 1, 1970</h2></div><hr role="none"/></div></li><div class="mx_Export_EventWrapper" id="49"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="49" data-layout="group" data-self="false" data-event-id="49" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color4 mx_DisambiguatedProfile_displayName" dir="auto">@user49:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user49:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="4" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="1" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/49" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #49</div></div></div></li></div><div class="mx_Export_EventWrapper" id="48"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="48" data-layout="group" data-self="false" data-event-id="48" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color3 mx_DisambiguatedProfile_displayName" dir="auto">@user48:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user48:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="3" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="2" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/48" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #48</div></div></div></li></div><div class="mx_Export_EventWrapper" id="47"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="47" data-layout="group" data-self="false" data-event-id="47" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color2 mx_DisambiguatedProfile_displayName" dir="auto">@user47:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user47:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="3" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/47" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #47</div></div></div></li></div><div class="mx_Export_EventWrapper" id="46"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="46" data-layout="group" data-self="false" data-event-id="46" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user46:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user46:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="4" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/46" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #46</div></div></div></li></div><div class="mx_Export_EventWrapper" id="45"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="45" data-layout="group" data-self="false" data-event-id="45" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user45:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user45:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="5" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/45" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #45</div></div></div></li></div><div class="mx_Export_EventWrapper" id="44"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="44" data-layout="group" data-self="false" data-event-id="44" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color5 mx_DisambiguatedProfile_displayName" dir="auto">@user44:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user44:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="5" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="6" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/44" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #44</div></div></div></li></div><div class="mx_Export_EventWrapper" id="43"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="43" data-layout="group" data-self="false" data-event-id="43" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color4 mx_DisambiguatedProfile_displayName" dir="auto">@user43:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user43:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="4" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="7" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/43" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #43</div></div></div></li></div><div class="mx_Export_EventWrapper" id="42"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="42" data-layout="group" data-self="false" data-event-id="42" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color3 mx_DisambiguatedProfile_displayName" dir="auto">@user42:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user42:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="3" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="8" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/42" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #42</div></div></div></li></div><div class="mx_Export_EventWrapper" id="41"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="41" data-layout="group" data-self="false" data-event-id="41" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color2 mx_DisambiguatedProfile_displayName" dir="auto">@user41:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user41:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="9" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/41" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #41</div></div></div></li></div><div class="mx_Export_EventWrapper" id="40"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="40" data-layout="group" data-self="false" data-event-id="40" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user40:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user40:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="10" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/40" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #40</div></div></div></li></div><div class="mx_Export_EventWrapper" id="39"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="39" data-layout="group" data-self="false" data-event-id="39" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color3 mx_DisambiguatedProfile_displayName" dir="auto">@user39:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user39:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="3" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="11" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/39" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #39</div></div></div></li></div><div class="mx_Export_EventWrapper" id="38"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="38" data-layout="group" data-self="false" data-event-id="38" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color2 mx_DisambiguatedProfile_displayName" dir="auto">@user38:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user38:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="12" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/38" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #38</div></div></div></li></div><div class="mx_Export_EventWrapper" id="37"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="37" data-layout="group" data-self="false" data-event-id="37" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user37:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user37:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="13" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/37" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #37</div></div></div></li></div><div class="mx_Export_EventWrapper" id="36"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="36" data-layout="group" data-self="false" data-event-id="36" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user36:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user36:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="14" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/36" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #36</div></div></div></li></div><div class="mx_Export_EventWrapper" id="35"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="35" data-layout="group" data-self="false" data-event-id="35" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color5 mx_DisambiguatedProfile_displayName" dir="auto">@user35:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user35:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="5" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="15" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/35" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #35</div></div></div></li></div><div class="mx_Export_EventWrapper" id="34"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="34" data-layout="group" data-self="false" data-event-id="34" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color4 mx_DisambiguatedProfile_displayName" dir="auto">@user34:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user34:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="4" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="16" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/34" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #34</div></div></div></li></div><div class="mx_Export_EventWrapper" id="33"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="33" data-layout="group" data-self="false" data-event-id="33" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color3 mx_DisambiguatedProfile_displayName" dir="auto">@user33:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user33:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="3" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="17" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/33" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #33</div></div></div></li></div><div class="mx_Export_EventWrapper" id="32"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="32" data-layout="group" data-self="false" data-event-id="32" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color2 mx_DisambiguatedProfile_displayName" dir="auto">@user32:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user32:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="18" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/32" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #32</div></div></div></li></div><div class="mx_Export_EventWrapper" id="31"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="31" data-layout="group" data-self="false" data-event-id="31" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user31:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user31:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="19" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/31" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #31</div></div></div></li></div><div class="mx_Export_EventWrapper" id="30"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="30" data-layout="group" data-self="false" data-event-id="30" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user30:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user30:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="20" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/30" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #30</div></div></div></li></div><div class="mx_Export_EventWrapper" id="29"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="29" data-layout="group" data-self="false" data-event-id="29" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color2 mx_DisambiguatedProfile_displayName" dir="auto">@user29:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user29:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="21" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/29" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #29</div></div></div></li></div><div class="mx_Export_EventWrapper" id="28"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="28" data-layout="group" data-self="false" data-event-id="28" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user28:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user28:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="22" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/28" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #28</div></div></div></li></div><div class="mx_Export_EventWrapper" id="27"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="27" data-layout="group" data-self="false" data-event-id="27" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user27:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user27:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="23" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/27" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #27</div></div></div></li></div><div class="mx_Export_EventWrapper" id="26"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="26" data-layout="group" data-self="false" data-event-id="26" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color5 mx_DisambiguatedProfile_displayName" dir="auto">@user26:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user26:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="5" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="24" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/26" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #26</div></div></div></li></div><div class="mx_Export_EventWrapper" id="25"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="25" data-layout="group" data-self="false" data-event-id="25" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color4 mx_DisambiguatedProfile_displayName" dir="auto">@user25:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user25:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="4" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="25" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/25" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #25</div></div></div></li></div><div class="mx_Export_EventWrapper" id="24"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="24" data-layout="group" data-self="false" data-event-id="24" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color3 mx_DisambiguatedProfile_displayName" dir="auto">@user24:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user24:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="3" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="26" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/24" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #24</div></div></div></li></div><div class="mx_Export_EventWrapper" id="23"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="23" data-layout="group" data-self="false" data-event-id="23" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color2 mx_DisambiguatedProfile_displayName" dir="auto">@user23:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user23:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="27" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/23" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #23</div></div></div></li></div><div class="mx_Export_EventWrapper" id="22"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="22" data-layout="group" data-self="false" data-event-id="22" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user22:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user22:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="28" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/22" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #22</div></div></div></li></div><div class="mx_Export_EventWrapper" id="21"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="21" data-layout="group" data-self="false" data-event-id="21" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user21:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user21:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="29" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/21" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #21</div></div></div></li></div><div class="mx_Export_EventWrapper" id="20"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="20" data-layout="group" data-self="false" data-event-id="20" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color5 mx_DisambiguatedProfile_displayName" dir="auto">@user20:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user20:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="5" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="30" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/20" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #20</div></div></div></li></div><div class="mx_Export_EventWrapper" id="19"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="19" data-layout="group" data-self="false" data-event-id="19" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user19:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user19:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="31" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/19" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #19</div></div></div></li></div><div class="mx_Export_EventWrapper" id="18"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="18" data-layout="group" data-self="false" data-event-id="18" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user18:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user18:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="32" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/18" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #18</div></div></div></li></div><div class="mx_Export_EventWrapper" id="17"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="17" data-layout="group" data-self="false" data-event-id="17" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color5 mx_DisambiguatedProfile_displayName" dir="auto">@user17:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user17:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="5" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="33" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/17" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #17</div></div></div></li></div><div class="mx_Export_EventWrapper" id="16"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="16" data-layout="group" data-self="false" data-event-id="16" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color4 mx_DisambiguatedProfile_displayName" dir="auto">@user16:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user16:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="4" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="34" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/16" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #16</div></div></div></li></div><div class="mx_Export_EventWrapper" id="15"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="15" data-layout="group" data-self="false" data-event-id="15" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color3 mx_DisambiguatedProfile_displayName" dir="auto">@user15:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user15:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="3" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="35" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/15" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #15</div></div></div></li></div><div class="mx_Export_EventWrapper" id="14"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="14" data-layout="group" data-self="false" data-event-id="14" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color2 mx_DisambiguatedProfile_displayName" dir="auto">@user14:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user14:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="36" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/14" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #14</div></div></div></li></div><div class="mx_Export_EventWrapper" id="13"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="13" data-layout="group" data-self="false" data-event-id="13" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user13:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user13:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="37" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/13" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #13</div></div></div></li></div><div class="mx_Export_EventWrapper" id="12"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="12" data-layout="group" data-self="false" data-event-id="12" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user12:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user12:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="38" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/12" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #12</div></div></div></li></div><div class="mx_Export_EventWrapper" id="11"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="11" data-layout="group" data-self="false" data-event-id="11" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color5 mx_DisambiguatedProfile_displayName" dir="auto">@user11:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user11:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="5" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="39" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/11" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #11</div></div></div></li></div><div class="mx_Export_EventWrapper" id="10"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="10" data-layout="group" data-self="false" data-event-id="10" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color4 mx_DisambiguatedProfile_displayName" dir="auto">@user10:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user10:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="4" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="40" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/10" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #10</div></div></div></li></div><div class="mx_Export_EventWrapper" id="9"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="9" data-layout="group" data-self="false" data-event-id="9" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user9:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user9:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="41" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/9" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #9</div></div></div></li></div><div class="mx_Export_EventWrapper" id="8"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="8" data-layout="group" data-self="false" data-event-id="8" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color5 mx_DisambiguatedProfile_displayName" dir="auto">@user8:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user8:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="5" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="42" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/8" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #8</div></div></div></li></div><div class="mx_Export_EventWrapper" id="7"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="7" data-layout="group" data-self="false" data-event-id="7" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color4 mx_DisambiguatedProfile_displayName" dir="auto">@user7:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user7:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="4" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="43" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/7" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #7</div></div></div></li></div><div class="mx_Export_EventWrapper" id="6"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="6" data-layout="group" data-self="false" data-event-id="6" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color3 mx_DisambiguatedProfile_displayName" dir="auto">@user6:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user6:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="3" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="44" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/6" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #6</div></div></div></li></div><div class="mx_Export_EventWrapper" id="5"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="5" data-layout="group" data-self="false" data-event-id="5" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color2 mx_DisambiguatedProfile_displayName" dir="auto">@user5:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user5:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="2" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="45" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/5" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #5</div></div></div></li></div><div class="mx_Export_EventWrapper" id="4"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="4" data-layout="group" data-self="false" data-event-id="4" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color1 mx_DisambiguatedProfile_displayName" dir="auto">@user4:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user4:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="1" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="46" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/4" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #4</div></div></div></li></div><div class="mx_Export_EventWrapper" id="3"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="3" data-layout="group" data-self="false" data-event-id="3" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color6 mx_DisambiguatedProfile_displayName" dir="auto">@user3:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user3:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="6" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="47" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/3" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #3</div></div></div></li></div><div class="mx_Export_EventWrapper" id="2"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="2" data-layout="group" data-self="false" data-event-id="2" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color5 mx_DisambiguatedProfile_displayName" dir="auto">@user2:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user2:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="5" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="48" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/2" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #2</div></div></div></li></div><div class="mx_Export_EventWrapper" id="1"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="1" data-layout="group" data-self="false" data-event-id="1" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color4 mx_DisambiguatedProfile_displayName" dir="auto">@user1:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user1:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="4" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="49" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/1" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #1</div></div></div></li></div><div class="mx_Export_EventWrapper" id="0"><li class="mx_EventTile" tabindex="-1" aria-live="off" aria-atomic="true" data-scroll-tokens="0" data-layout="group" data-self="false" data-event-id="0" data-has-reply="false"><div class="mx_DisambiguatedProfile"><span class="mx_Username_color3 mx_DisambiguatedProfile_displayName" dir="auto">@user0:example.com</span></div><div class="mx_EventTile_avatar"><button role="button" aria-label="Profile picture" title="@user0:example.com" aria-live="off" data-testid="avatar-img" data-type="round" data-color="3" class="_avatar_zysgz_8 mx_BaseAvatar _avatar-imageless_zysgz_55" style="--cpd-avatar-size: 30px;">u</button></div><div id="50" class="mx_EventTile_line"><a href="https://matrix.to/#/!myroom:example.org/0" class="mx_MessageTimestamp" aria-live="off">00:00</a><div class="mx_MTextBody mx_EventTile_content"><div class="mx_EventTile_body translate" dir="auto">Message #0</div></div></div><div class="mx_EventTile_footer"><div class="mx_ReactionsRow" role="toolbar" aria-label="Reactions"><div aria-label="@user0:example.com reacted with 🙃" tabindex="0" role="button" aria-disabled="true" disabled="" class="mx_AccessibleButton mx_ReactionsRowButton mx_AccessibleButton_disabled"><span class="mx_ReactionsRowButton_content" aria-hidden="true">🙃</span><span class="mx_ReactionsRowButton_count" aria-hidden="true">1</span></div></div></div></li></div>
                                     </ol>
                                     </div>
                                 </div>
diff --git a/test/unit-tests/utils/exportUtils/__snapshots__/JSONExport-test.ts.snap b/test/unit-tests/utils/exportUtils/__snapshots__/JSONExport-test.ts.snap
index 5f0d78cc58..b8d2c3ce18 100644
--- a/test/unit-tests/utils/exportUtils/__snapshots__/JSONExport-test.ts.snap
+++ b/test/unit-tests/utils/exportUtils/__snapshots__/JSONExport-test.ts.snap
@@ -1,3 +1,3 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`JSONExport should have a Matrix-branded destination file name 1`] = `"matrix - My  Test  Room Welcome - Chat Export - 2022-11-17T16-58-32.517Z.json"`;
diff --git a/test/unit-tests/utils/exportUtils/__snapshots__/PlainTextExport-test.ts.snap b/test/unit-tests/utils/exportUtils/__snapshots__/PlainTextExport-test.ts.snap
index ebee2957b7..de3cff0d55 100644
--- a/test/unit-tests/utils/exportUtils/__snapshots__/PlainTextExport-test.ts.snap
+++ b/test/unit-tests/utils/exportUtils/__snapshots__/PlainTextExport-test.ts.snap
@@ -1,3 +1,3 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`PlainTextExport should have a Matrix-branded destination file name 1`] = `"matrix - My  Test  Room Welcome - Chat Export - 2022-11-17T16-58-32.517Z.txt"`;
diff --git a/test/unit-tests/utils/leave-behaviour-test.ts b/test/unit-tests/utils/leave-behaviour-test.ts
index 23be7fef98..9da796a3a5 100644
--- a/test/unit-tests/utils/leave-behaviour-test.ts
+++ b/test/unit-tests/utils/leave-behaviour-test.ts
@@ -129,7 +129,7 @@ describe("leaveRoomBehaviour", () => {
 
         it("Passes through the dynamic predecessor setting", async () => {
             await leaveRoomBehaviour(client, room.roomId);
-            expect(client.getRoomUpgradeHistory).toHaveBeenCalledWith(room.roomId, false, false);
+            expect(client.getRoomUpgradeHistory).toHaveBeenCalledWith(room.roomId, true, false);
         });
     });
 
@@ -143,7 +143,7 @@ describe("leaveRoomBehaviour", () => {
 
         it("Passes through the dynamic predecessor setting", async () => {
             await leaveRoomBehaviour(client, room.roomId);
-            expect(client.getRoomUpgradeHistory).toHaveBeenCalledWith(room.roomId, false, true);
+            expect(client.getRoomUpgradeHistory).toHaveBeenCalledWith(room.roomId, true, true);
         });
     });
 });
diff --git a/test/unit-tests/utils/messages-test.ts b/test/unit-tests/utils/messages-test.ts
new file mode 100644
index 0000000000..12d0242e3c
--- /dev/null
+++ b/test/unit-tests/utils/messages-test.ts
@@ -0,0 +1,194 @@
+/*
+Copyright 2024 New Vector Ltd.
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type IContent } from "matrix-js-sdk/src/matrix";
+
+import { attachMentions } from "../../../src/utils/messages";
+import EditorModel from "../../../src/editor/model";
+import { mkEvent } from "../../test-utils";
+import { createPartCreator } from "../editor/mock";
+
+describe("attachMentions", () => {
+    const partsCreator = createPartCreator();
+
+    it("no mentions", () => {
+        const model = new EditorModel([], partsCreator);
+        const content: IContent = {};
+        attachMentions("@alice:test", content, model, undefined);
+        expect(content).toEqual({
+            "m.mentions": {},
+        });
+    });
+
+    it("test user mentions", () => {
+        const model = new EditorModel([partsCreator.userPill("Bob", "@bob:test")], partsCreator);
+        const content: IContent = {};
+        attachMentions("@alice:test", content, model, undefined);
+        expect(content).toEqual({
+            "m.mentions": { user_ids: ["@bob:test"] },
+        });
+    });
+
+    it("test reply", () => {
+        // Replying to an event adds the sender to the list of mentioned users.
+        const model = new EditorModel([], partsCreator);
+        let replyToEvent = mkEvent({
+            type: "m.room.message",
+            user: "@bob:test",
+            room: "!abc:test",
+            content: { "m.mentions": {} },
+            event: true,
+        });
+        let content: IContent = {};
+        attachMentions("@alice:test", content, model, replyToEvent);
+        expect(content).toEqual({
+            "m.mentions": { user_ids: ["@bob:test"] },
+        });
+
+        // It no longer adds any other mentioned users
+        replyToEvent = mkEvent({
+            type: "m.room.message",
+            user: "@bob:test",
+            room: "!abc:test",
+            content: { "m.mentions": { user_ids: ["@alice:test", "@charlie:test"] } },
+            event: true,
+        });
+        content = {};
+        attachMentions("@alice:test", content, model, replyToEvent);
+        expect(content).toEqual({
+            "m.mentions": { user_ids: ["@bob:test"] },
+        });
+    });
+
+    it("test room mention", () => {
+        const model = new EditorModel([partsCreator.atRoomPill("@room")], partsCreator);
+        const content: IContent = {};
+        attachMentions("@alice:test", content, model, undefined);
+        expect(content).toEqual({
+            "m.mentions": { room: true },
+        });
+    });
+
+    it("test reply to room mention", () => {
+        // Replying to a room mention shouldn't automatically be a room mention.
+        const model = new EditorModel([], partsCreator);
+        const replyToEvent = mkEvent({
+            type: "m.room.message",
+            user: "@alice:test",
+            room: "!abc:test",
+            content: { "m.mentions": { room: true } },
+            event: true,
+        });
+        const content: IContent = {};
+        attachMentions("@alice:test", content, model, replyToEvent);
+        expect(content).toEqual({
+            "m.mentions": {},
+        });
+    });
+
+    it("test broken mentions", () => {
+        // Replying to a room mention shouldn't automatically be a room mention.
+        const model = new EditorModel([], partsCreator);
+        const replyToEvent = mkEvent({
+            type: "m.room.message",
+            user: "@alice:test",
+            room: "!abc:test",
+            // @ts-ignore - Purposefully testing invalid data.
+            content: { "m.mentions": { user_ids: "@bob:test" } },
+            event: true,
+        });
+        const content: IContent = {};
+        attachMentions("@alice:test", content, model, replyToEvent);
+        expect(content).toEqual({
+            "m.mentions": {},
+        });
+    });
+
+    describe("attachMentions with edit", () => {
+        it("no mentions", () => {
+            const model = new EditorModel([], partsCreator);
+            const content: IContent = { "m.new_content": {} };
+            const prevContent: IContent = {};
+            attachMentions("@alice:test", content, model, undefined, prevContent);
+            expect(content).toEqual({
+                "m.mentions": {},
+                "m.new_content": { "m.mentions": {} },
+            });
+        });
+
+        it("mentions do not propagate", () => {
+            const model = new EditorModel([], partsCreator);
+            const content: IContent = { "m.new_content": {} };
+            const prevContent: IContent = {
+                "m.mentions": { user_ids: ["@bob:test"], room: true },
+            };
+            attachMentions("@alice:test", content, model, undefined, prevContent);
+            expect(content).toEqual({
+                "m.mentions": {},
+                "m.new_content": { "m.mentions": {} },
+            });
+        });
+
+        it("test user mentions", () => {
+            const model = new EditorModel([partsCreator.userPill("Bob", "@bob:test")], partsCreator);
+            const content: IContent = { "m.new_content": {} };
+            const prevContent: IContent = {};
+            attachMentions("@alice:test", content, model, undefined, prevContent);
+            expect(content).toEqual({
+                "m.mentions": { user_ids: ["@bob:test"] },
+                "m.new_content": { "m.mentions": { user_ids: ["@bob:test"] } },
+            });
+        });
+
+        it("test prev user mentions", () => {
+            const model = new EditorModel([partsCreator.userPill("Bob", "@bob:test")], partsCreator);
+            const content: IContent = { "m.new_content": {} };
+            const prevContent: IContent = { "m.mentions": { user_ids: ["@bob:test"] } };
+            attachMentions("@alice:test", content, model, undefined, prevContent);
+            expect(content).toEqual({
+                "m.mentions": {},
+                "m.new_content": { "m.mentions": { user_ids: ["@bob:test"] } },
+            });
+        });
+
+        it("test room mention", () => {
+            const model = new EditorModel([partsCreator.atRoomPill("@room")], partsCreator);
+            const content: IContent = { "m.new_content": {} };
+            const prevContent: IContent = {};
+            attachMentions("@alice:test", content, model, undefined, prevContent);
+            expect(content).toEqual({
+                "m.mentions": { room: true },
+                "m.new_content": { "m.mentions": { room: true } },
+            });
+        });
+
+        it("test prev room mention", () => {
+            const model = new EditorModel([partsCreator.atRoomPill("@room")], partsCreator);
+            const content: IContent = { "m.new_content": {} };
+            const prevContent: IContent = { "m.mentions": { room: true } };
+            attachMentions("@alice:test", content, model, undefined, prevContent);
+            expect(content).toEqual({
+                "m.mentions": {},
+                "m.new_content": { "m.mentions": { room: true } },
+            });
+        });
+
+        it("test broken mentions", () => {
+            // Replying to a room mention shouldn't automatically be a room mention.
+            const model = new EditorModel([], partsCreator);
+            const content: IContent = { "m.new_content": {} };
+            // @ts-ignore - Purposefully testing invalid data.
+            const prevContent: IContent = { "m.mentions": { user_ids: "@bob:test" } };
+            attachMentions("@alice:test", content, model, undefined, prevContent);
+            expect(content).toEqual({
+                "m.mentions": {},
+                "m.new_content": { "m.mentions": {} },
+            });
+        });
+    });
+});
diff --git a/test/unit-tests/utils/permalinks/Permalinks-test.ts b/test/unit-tests/utils/permalinks/Permalinks-test.ts
index fcb7d3257f..4f96e6c41f 100644
--- a/test/unit-tests/utils/permalinks/Permalinks-test.ts
+++ b/test/unit-tests/utils/permalinks/Permalinks-test.ts
@@ -334,6 +334,33 @@ describe("Permalinks", function () {
         expect(creator.serverCandidates![0]).toEqual("evilcorp.com");
     });
 
+    it("should handle when ACL allow is not an array", function () {
+        const roomId = "!fake:example.org";
+        const room = mockRoom(roomId, [makeMemberWithPL(roomId, "@alice:goodcorp.com", 100)], {
+            deny: ["*.evilcorp.com"],
+            allow: "not-an-array" as any, // Test malformed data
+        });
+        const creator = new RoomPermalinkCreator(room);
+        creator.load();
+        // Should fall back to default behavior (no allowed servers list = allow none)
+        expect(creator.serverCandidates).toBeTruthy();
+        expect(creator.serverCandidates!.length).toBe(0);
+    });
+
+    it("should handle when ACL deny is not an array", function () {
+        const roomId = "!fake:example.org";
+        const room = mockRoom(roomId, [makeMemberWithPL(roomId, "@alice:goodcorp.com", 100)], {
+            deny: "not-an-array" as any, // Test malformed data
+            allow: ["*"],
+        });
+        const creator = new RoomPermalinkCreator(room);
+        creator.load();
+        // Should not crash and still allow the server
+        expect(creator.serverCandidates).toBeTruthy();
+        expect(creator.serverCandidates!.length).toBe(1);
+        expect(creator.serverCandidates![0]).toEqual("goodcorp.com");
+    });
+
     it("should generate an event permalink for room IDs with no candidate servers", function () {
         const room = mockRoom("!somewhere:example.org", []);
         const creator = new RoomPermalinkCreator(room);
diff --git a/test/unit-tests/vector/__snapshots__/init-test.ts.snap b/test/unit-tests/vector/__snapshots__/init-test.ts.snap
index 83306782d0..6d10481476 100644
--- a/test/unit-tests/vector/__snapshots__/init-test.ts.snap
+++ b/test/unit-tests/vector/__snapshots__/init-test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`showError should match snapshot 1`] = `
 <div
@@ -102,11 +102,11 @@ exports[`showIncompatibleBrowser should match snapshot 1`] = `
         </span>
       </p>
       <div
-        class="mx_Flex mx_ErrorView_buttons"
+        class="_flex_4dswl_9 mx_ErrorView_flexContainer mx_ErrorView_buttons"
         style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-4x); --mx-flex-wrap: nowrap;"
       >
         <button
-          class="_button_vczzf_8 _has-icon_vczzf_57"
+          class="_button_187yx_8 _has-icon_187yx_57"
           data-kind="secondary"
           data-size="sm"
           role="button"
@@ -130,7 +130,7 @@ exports[`showIncompatibleBrowser should match snapshot 1`] = `
           Learn more
         </button>
         <button
-          class="_button_vczzf_8"
+          class="_button_187yx_8"
           data-kind="primary"
           data-size="sm"
           role="button"
@@ -141,7 +141,7 @@ exports[`showIncompatibleBrowser should match snapshot 1`] = `
       </div>
     </div>
     <div
-      class="_separator_7ckbw_8"
+      class="_separator_cqpyv_8"
       data-kind="primary"
       data-orientation="horizontal"
       role="separator"
@@ -152,67 +152,116 @@ exports[`showIncompatibleBrowser should match snapshot 1`] = `
       Use Element Desktop instead
     </h2>
     <div
-      class="mx_Flex"
+      class="_flex_4dswl_9 mx_ErrorView_flexContainer"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-4x); --mx-flex-wrap: nowrap;"
     >
       <a
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="secondary"
         data-size="lg"
         href="https://packages.element.io/desktop/install/macos/Element.dmg"
         role="link"
         tabindex="0"
       >
-        <div
+        <svg
           aria-hidden="true"
+          fill="currentColor"
           height="20"
+          viewBox="0 0 24 24"
           width="20"
-        />
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            clip-rule="evenodd"
+            d="M16.099 2.4a4.1 4.1 0 0 1-1.057 3.074c-.747.862-1.878 1.358-3.07 1.347-.075-1.081.315-2.146 1.085-2.96.78-.825 1.866-1.346 3.042-1.461m3.767 6.54c-1.37.783-2.213 2.163-2.234 3.657.002 1.69 1.092 3.215 2.768 3.873a9.4 9.4 0 0 1-1.44 2.723c-.848 1.178-1.737 2.329-3.149 2.35-.67.015-1.124-.165-1.596-.351-.493-.195-1.006-.398-1.809-.398-.851 0-1.388.21-1.905.412-.447.174-.88.343-1.49.367-1.343.046-2.37-1.258-3.25-2.425-1.756-2.383-3.124-6.716-1.29-9.664.861-1.437 2.471-2.349 4.241-2.402.763-.015 1.494.258 2.136.497.49.183.928.347 1.286.347.315 0 .74-.157 1.237-.34.78-.288 1.737-.64 2.71-.545 1.514.044 2.917.748 3.785 1.9"
+            fill-rule="evenodd"
+          />
+        </svg>
         Mac
       </a>
       <a
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="secondary"
         data-size="lg"
         href="https://packages.element.io/desktop/install/win32/x64/Element%20Setup.exe"
         role="link"
         tabindex="0"
       >
-        <div
+        <svg
           aria-hidden="true"
+          fill="currentColor"
           height="20"
+          viewBox="0 0 24 24"
           width="20"
-        />
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12.589 2.4H21.6v9.011h-9.011zM2.4 12.588h9.011v9.011H2.4zM2.4 2.4h9.011v9.011H2.4zm10.189 10.188H21.6v9.011h-9.011z"
+          />
+        </svg>
         Windows (64-bit)
       </a>
       <a
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="secondary"
         data-size="lg"
         href="https://packages.element.io/desktop/install/win32/arm64/Element%20Setup.exe"
         role="link"
         tabindex="0"
       >
-        <div
+        <svg
           aria-hidden="true"
+          fill="currentColor"
           height="20"
+          viewBox="0 0 24 24"
           width="20"
-        />
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12.589 2.4H21.6v9.011h-9.011zM2.4 12.588h9.011v9.011H2.4zM2.4 2.4h9.011v9.011H2.4zm10.189 10.188H21.6v9.011h-9.011z"
+          />
+        </svg>
         Windows (ARM 64-bit)
       </a>
       <a
-        class="_button_vczzf_8 _has-icon_vczzf_57"
+        class="_button_187yx_8 _has-icon_187yx_57"
         data-kind="secondary"
         data-size="lg"
         href="https://element.io/download#linux"
         role="link"
         tabindex="0"
       >
-        <div
+        <svg
           aria-hidden="true"
+          fill="currentColor"
           height="20"
+          viewBox="0 0 24 24"
           width="20"
-        />
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <g
+            clip-path="url(#a)"
+          >
+            <path
+              d="M13.206 20.644a2.7 2.7 0 0 1-1.097.248 2.8 2.8 0 0 1-1.567-.495c-.153.38-.392.723-.7 1a2.8 2.8 0 0 1-1.078.604h6.141a2.8 2.8 0 0 1-.99-.51 2.8 2.8 0 0 1-.709-.847M6.71 16.673a.2.2 0 0 0 .067-.03q.056-.49.13-.94c-.01-.169.017-.338.08-.495.348-1.904.834-3.24 1.504-4.052a.13.13 0 0 1 .18-.018.123.123 0 0 1 .018.174 4 4 0 0 0-.203.272q-.764 1.113-1.199 3.389h.03a.6.6 0 0 1 .166 0c.198.042.508.203.985.67.061-2.72 1.661-4.913 3.642-4.913 1.748 0 3.208 1.715 3.556 3.997a1.7 1.7 0 0 1 .762-.742.8.8 0 0 1 .254-.047 7.5 7.5 0 0 0-.948-2.342 4 4 0 0 0-.2-.272.12.12 0 0 1-.03-.09.12.12 0 0 1 .048-.083.13.13 0 0 1 .092-.028.13.13 0 0 1 .085.045c.508.624.93 1.557 1.245 2.822.678.247.696 1.361.71 2.267 0 .43 0 .877.105.99.104.114.325.09.635-.04.036-.393.053-.742.063-1.036v-1.082c0-2.475-3.266-6.755-3.266-6.755l-.378-3.218c0-2.953-2.733-2.926-2.733-2.926s-2.743-.027-2.743 2.914l-.365 3.23s-3.267 4.277-3.267 6.755v.31s-.012.299 0 .767v.227c.414.154.839.315.976.28m5.388-10.41c.761.068 1.975.247 2.031.613.04.282-.429.822-.523.926-.195.215-.876.92-1.49.92-.615 0-1.296-.705-1.49-.92-.093-.104-.563-.644-.525-.926.046-.374 1.273-.545 1.996-.614"
+            />
+            <path
+              d="M12.111 8.475c.333 0 .843-.33 1.298-.837.348-.384.475-.666.465-.73-.064-.127-.894-.317-1.778-.401-.856.084-1.687.274-1.75.406.091.275.252.523.467.722.457.51.965.84 1.298.84m.684 10.664c-.292-2.607-.023-3.146.206-3.324a.42.42 0 0 1 .4-.057c.23.11.431.271.587.47.287.304.488.495.674.391.131-.077.32-.495.507-.879.097-.205.196-.425.305-.636-.254-2.33-1.65-4.126-3.355-4.126-1.872 0-3.393 2.166-3.393 4.827v.096c.31.317.68.743 1.133 1.3q.266.328.487.685a2.7 2.7 0 0 1 .29 2.258c.426.312.943.485 1.476.495.341-.002.679-.073.99-.21a2.6 2.6 0 0 1-.16-.46 7 7 0 0 1-.147-.83"
+            />
+            <path
+              d="M9.651 17.35c-.355-.44-.657-.789-.916-1.071l-.13-.139-.132-.138c-.587-.594-.897-.758-1.06-.785a.2.2 0 0 0-.068 0 .15.15 0 0 0-.114.082v.017a.9.9 0 0 0-.058.406v.327c.034.25-.019.505-.15.723a.4.4 0 0 1-.087.071l-.053.032a.6.6 0 0 1-.107.043H6.75c-.211.037-.554-.084-.988-.248l-.127-.05c-.544-.21-1.179-.452-1.644-.452a.63.63 0 0 0-.553.232c-.34.495.421 1.273 1.036 1.901.378.389.675.693.708.921.059.42-.393.582-.792.725a1.5 1.5 0 0 0-.564.278c-.06.069-.058.116-.045.15.055.191.507.61 2.897 1.285q.398.112.806.178c.49.073.992.01 1.448-.182a2.64 2.64 0 0 0 1.13-.902q.165-.245.271-.522l.05-.121c0-.042.024-.09.037-.131a2.48 2.48 0 0 0-.293-1.98 7 7 0 0 0-.475-.65m9.618-.17c-.212.02-.418.084-.604.186l-.277.117c-.305.113-.61.168-.807-.095a.6.6 0 0 1-.094-.227 3.6 3.6 0 0 1-.056-.592v-.322c0-.72-.026-1.586-.373-1.925a.5.5 0 0 0-.255-.14h-.038a.5.5 0 0 0-.254.035c-.3.12-.56.496-.79.936l-.109.215-.117.248-.104.225c-.223.495-.398.874-.601.99-.376.216-.704-.13-.991-.438a1.5 1.5 0 0 0-.48-.4.2.2 0 0 0-.076-.016q-.048 0-.084.03c-.158.124-.384.69-.112 3.104q.044.4.137.792.052.207.137.404.027.056.056.111c.02.037.033.074.054.111.208.377.51.696.879.928a2.66 2.66 0 0 0 2.504.171c.398-.18.743-.454 1.003-.8a7 7 0 0 0 .45-.675c1.218-2.116 1.241-2.722 1.147-2.896a.15.15 0 0 0-.144-.077"
+            />
+          </g>
+          <defs>
+            <clippath
+              id="a"
+            >
+              <path
+                d="M3.167 2.19H20.5V22H3.165z"
+              />
+            </clippath>
+          </defs>
+        </svg>
         Linux
       </a>
     </div>
@@ -222,7 +271,7 @@ exports[`showIncompatibleBrowser should match snapshot 1`] = `
       Or use our mobile app
     </h2>
     <div
-      class="mx_Flex"
+      class="_flex_4dswl_9 mx_ErrorView_flexContainer"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-6x); --mx-flex-wrap: nowrap;"
     >
       <a
diff --git a/test/unit-tests/vector/init-test.ts b/test/unit-tests/vector/init-test.ts
index 7f7d760360..22e3b75ae9 100644
--- a/test/unit-tests/vector/init-test.ts
+++ b/test/unit-tests/vector/init-test.ts
@@ -1,3 +1,8 @@
+/**
+ * @jest-environment jsdom
+ * @jest-environment-options {"url": "https://app.element.io/?loginToken=123&state=abc&code=xyz&no_universal_links&something_else=value"}
+ */
+
 /*
 Copyright 2024 New Vector Ltd.
 
@@ -42,11 +47,27 @@ describe("showError", () => {
 describe("loadApp", () => {
     beforeEach(setUpMatrixChatDiv);
 
-    it("should set window.matrixChat to the MatrixChat instance", async () => {
+    beforeEach(async () => {
         fetchMock.get("https://matrix.org/_matrix/client/versions", { versions: ["v1.6"] });
         SdkConfig.put({ default_server_config: { "m.homeserver": { base_url: "https://matrix.org" } } });
+    });
 
+    it("should set window.matrixChat to the MatrixChat instance", async () => {
         await loadApp({});
         await waitFor(() => expect(window.matrixChat).toBeInstanceOf(MatrixChat));
     });
+
+    it("should pass onTokenLoginCompleted which strips searchParams to MatrixChat", async () => {
+        const spy = jest.spyOn(window.history, "replaceState");
+
+        await loadApp({});
+        await waitFor(() => expect(window.matrixChat).toBeInstanceOf(MatrixChat));
+        window.matrixChat!.props.onTokenLoginCompleted();
+
+        expect(spy).toHaveBeenCalledWith(
+            null,
+            "",
+            expect.stringContaining("https://app.element.io/?something_else=value"),
+        );
+    });
 });
diff --git a/test/unit-tests/vector/platform/ElectronPlatform-test.ts b/test/unit-tests/vector/platform/ElectronPlatform-test.ts
index c4fda4a20f..83f6984197 100644
--- a/test/unit-tests/vector/platform/ElectronPlatform-test.ts
+++ b/test/unit-tests/vector/platform/ElectronPlatform-test.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 New Vector Ltd.
+Copyright 2024-2025 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
 SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
@@ -8,7 +8,8 @@ Please see LICENSE files in the repository root for full details.
 
 import { logger } from "matrix-js-sdk/src/logger";
 import { MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
-import { mocked } from "jest-mock";
+import { mocked, type MockedObject } from "jest-mock";
+import { waitFor } from "jest-matrix-react";
 
 import { UpdateCheckStatus } from "../../../../src/BasePlatform";
 import { Action } from "../../../../src/dispatcher/actions";
@@ -19,24 +20,31 @@ import Modal from "../../../../src/Modal";
 import DesktopCapturerSourcePicker from "../../../../src/components/views/elements/DesktopCapturerSourcePicker";
 import ElectronPlatform from "../../../../src/vector/platform/ElectronPlatform";
 import { setupLanguageMock } from "../../../setup/setupLanguage";
+import { stubClient } from "../../../test-utils";
+import ToastStore from "../../../../src/stores/ToastStore.ts";
 
 jest.mock("../../../../src/rageshake/rageshake", () => ({
     flush: jest.fn(),
 }));
 
 describe("ElectronPlatform", () => {
+    const initialiseValues = jest.fn().mockReturnValue({
+        protocol: "io.element.desktop",
+        sessionId: "session-id",
+        config: { _config: true },
+        supportedSettings: { setting1: false, setting2: true },
+        supportsBadgeOverlay: false,
+    });
     const defaultUserAgent =
         "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 " +
         "(KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36";
     const mockElectron = {
         on: jest.fn(),
         send: jest.fn(),
-        initialise: jest.fn().mockResolvedValue({
-            protocol: "io.element.desktop",
-            sessionId: "session-id",
-            config: { _config: true },
-        }),
-    };
+        initialise: initialiseValues,
+        setSettingValue: jest.fn().mockResolvedValue(undefined),
+        getSettingValue: jest.fn().mockResolvedValue(undefined),
+    } as unknown as MockedObject<Electron>;
 
     const dispatchSpy = jest.spyOn(dispatcher, "dispatch");
     const dispatchFireSpy = jest.spyOn(dispatcher, "fire");
@@ -120,6 +128,30 @@ describe("ElectronPlatform", () => {
         expect(plat.ipc.call).toHaveBeenCalledWith("callDisplayMediaCallback", "source");
     });
 
+    it("should show a toast when showToast is fired", async () => {
+        new ElectronPlatform();
+        dispatcher.dispatch(
+            {
+                action: Action.ClientStarted,
+            },
+            true,
+        );
+        const spy = jest.spyOn(ToastStore.sharedInstance(), "addOrReplaceToast");
+
+        const [event, handler] = getElectronEventHandlerCall("showToast")!;
+        handler({} as any, { title: "title", description: "description" });
+
+        expect(event).toBeTruthy();
+        await waitFor(() =>
+            expect(spy).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    title: "title",
+                    props: expect.objectContaining({ description: "description" }),
+                }),
+            ),
+        );
+    });
+
     describe("updates", () => {
         it("dispatches on check updates action", () => {
             new ElectronPlatform();
@@ -318,4 +350,184 @@ describe("ElectronPlatform", () => {
             );
         });
     });
+
+    describe("authenticated media", () => {
+        it("should respond to relevant ipc requests", async () => {
+            const cli = stubClient();
+            mocked(cli.getAccessToken).mockReturnValue("access_token");
+            mocked(cli.getHomeserverUrl).mockReturnValue("homeserver_url");
+            mocked(cli.getVersions).mockResolvedValue({
+                versions: ["v1.1"],
+                unstable_features: {},
+            });
+
+            new ElectronPlatform();
+
+            const userAccessTokenCall = mockElectron.on.mock.calls.find((call) => call[0] === "userAccessToken");
+            userAccessTokenCall![1]({} as any);
+            const userAccessTokenResponse = mockElectron.send.mock.calls.find((call) => call[0] === "userAccessToken");
+            expect(userAccessTokenResponse![1]).toBe("access_token");
+
+            const homeserverUrlCall = mockElectron.on.mock.calls.find((call) => call[0] === "homeserverUrl");
+            homeserverUrlCall![1]({} as any);
+            const homeserverUrlResponse = mockElectron.send.mock.calls.find((call) => call[0] === "homeserverUrl");
+            expect(homeserverUrlResponse![1]).toBe("homeserver_url");
+
+            const serverSupportedVersionsCall = mockElectron.on.mock.calls.find(
+                (call) => call[0] === "serverSupportedVersions",
+            );
+            await (serverSupportedVersionsCall![1]({} as any) as unknown as Promise<unknown>);
+            const serverSupportedVersionsResponse = mockElectron.send.mock.calls.find(
+                (call) => call[0] === "serverSupportedVersions",
+            );
+            expect(serverSupportedVersionsResponse![1]).toEqual({ versions: ["v1.1"], unstable_features: {} });
+        });
+    });
+
+    describe("settings", () => {
+        let platform: ElectronPlatform;
+        beforeAll(async () => {
+            window.electron = mockElectron;
+            platform = new ElectronPlatform();
+            await platform.getConfig(); // await init
+        });
+
+        it("supportsSetting should return true for the platform", () => {
+            expect(platform.supportsSetting()).toBe(true);
+        });
+
+        it("supportsSetting should return true for available settings", () => {
+            expect(platform.supportsSetting("setting2")).toBe(true);
+        });
+
+        it("supportsSetting should return false for unavailable settings", () => {
+            expect(platform.supportsSetting("setting1")).toBe(false);
+        });
+
+        it("should read setting value over ipc", async () => {
+            mockElectron.getSettingValue.mockResolvedValue("value");
+            await expect(platform.getSettingValue("setting2")).resolves.toEqual("value");
+            expect(mockElectron.getSettingValue).toHaveBeenCalledWith("setting2");
+        });
+
+        it("should write setting value over ipc", async () => {
+            await platform.setSettingValue("setting2", "newValue");
+            expect(mockElectron.setSettingValue).toHaveBeenCalledWith("setting2", "newValue");
+        });
+    });
+
+    it("should forward call_state dispatcher events via ipc", async () => {
+        new ElectronPlatform();
+
+        dispatcher.dispatch(
+            {
+                action: "call_state",
+                state: "connected",
+            },
+            true,
+        );
+
+        const ipcMessage = mockElectron.send.mock.calls.find((call) => call[0] === "app_onAction");
+        expect(ipcMessage![1]).toEqual({
+            action: "call_state",
+            state: "connected",
+        });
+    });
+
+    describe("Notification overlay badges", () => {
+        beforeEach(() => {
+            initialiseValues.mockReturnValue({
+                protocol: "io.element.desktop",
+                sessionId: "session-id",
+                config: { _config: true },
+                supportsBadgeOverlay: true,
+            });
+        });
+
+        afterEach(() => {
+            jest.clearAllMocks();
+        });
+
+        it("should send a badge with a notification count", async () => {
+            const platform = new ElectronPlatform();
+            await platform.initialised;
+            platform.setNotificationCount(1);
+            // Badges are sent asynchronously
+            await waitFor(() => {
+                const ipcMessage = mockElectron.send.mock.lastCall;
+                expect(ipcMessage?.[1]).toEqual(1);
+                expect(ipcMessage?.[2] instanceof ArrayBuffer).toEqual(true);
+            });
+        });
+
+        it("should update badge and skip duplicates", async () => {
+            const platform = new ElectronPlatform();
+            await platform.initialised;
+            platform.setNotificationCount(1);
+            platform.setNotificationCount(1); // Test that duplicates do not fire.
+            platform.setNotificationCount(2);
+            // Badges are sent asynchronously
+            await waitFor(() => {
+                const [ipcMessageA, ipcMessageB] = mockElectron.send.mock.calls.filter(
+                    (call) => call[0] === "setBadgeCount",
+                );
+
+                expect(ipcMessageA?.[1]).toEqual(1);
+                expect(ipcMessageA?.[2] instanceof ArrayBuffer).toEqual(true);
+
+                expect(ipcMessageB?.[1]).toEqual(2);
+                expect(ipcMessageB?.[2] instanceof ArrayBuffer).toEqual(true);
+            });
+        });
+        it("should remove badge when notification count zeros", async () => {
+            const platform = new ElectronPlatform();
+            await platform.initialised;
+            platform.setNotificationCount(1);
+            platform.setNotificationCount(0); // Test that duplicates do not fire.
+            // Badges are sent asynchronously
+            await waitFor(() => {
+                const [ipcMessageB, ipcMessageA] = mockElectron.send.mock.calls.filter(
+                    (call) => call[0] === "setBadgeCount",
+                );
+
+                expect(ipcMessageA?.[1]).toEqual(1);
+                expect(ipcMessageA?.[2] instanceof ArrayBuffer).toEqual(true);
+
+                expect(ipcMessageB?.[1]).toEqual(0);
+                expect(ipcMessageB?.[2]).toBeNull();
+            });
+        });
+        it("should show an error badge when the application errors", async () => {
+            const platform = new ElectronPlatform();
+            await platform.initialised;
+            platform.setErrorStatus(true);
+            // Badges are sent asynchronously
+            await waitFor(() => {
+                const ipcMessage = mockElectron.send.mock.calls.find((call) => call[0] === "setBadgeCount");
+
+                expect(ipcMessage?.[1]).toEqual(0);
+                expect(ipcMessage?.[2] instanceof ArrayBuffer).toEqual(true);
+                expect(ipcMessage?.[3]).toEqual(true);
+            });
+        });
+        it("should restore after error is resolved", async () => {
+            const platform = new ElectronPlatform();
+            await platform.initialised;
+            platform.setErrorStatus(true);
+            platform.setErrorStatus(false);
+            // Badges are sent asynchronously
+            await waitFor(() => {
+                const [ipcMessageB, ipcMessageA] = mockElectron.send.mock.calls.filter(
+                    (call) => call[0] === "setBadgeCount",
+                );
+
+                expect(ipcMessageA?.[1]).toEqual(0);
+                expect(ipcMessageA?.[2] instanceof ArrayBuffer).toEqual(true);
+                expect(ipcMessageA?.[3]).toEqual(true);
+
+                expect(ipcMessageB?.[1]).toEqual(0);
+                expect(ipcMessageB?.[2]).toBeNull();
+            });
+        });
+    });
 });
diff --git a/test/unit-tests/vector/platform/WebPlatform-test.ts b/test/unit-tests/vector/platform/WebPlatform-test.ts
index 7c1048fe05..f07a0f5533 100644
--- a/test/unit-tests/vector/platform/WebPlatform-test.ts
+++ b/test/unit-tests/vector/platform/WebPlatform-test.ts
@@ -15,6 +15,7 @@ import { setupLanguageMock } from "../../../setup/setupLanguage";
 import ToastStore from "../../../../src/stores/ToastStore.ts";
 import defaultDispatcher from "../../../../src/dispatcher/dispatcher.ts";
 import { emitPromise } from "../../../test-utils";
+import { Action } from "../../../../src/dispatcher/actions.ts";
 
 fetchMock.config.overwriteRoutes = true;
 
@@ -49,7 +50,7 @@ describe("WebPlatform", () => {
             };
             new WebPlatform();
 
-            defaultDispatcher.dispatch({ action: "client_started" });
+            defaultDispatcher.dispatch({ action: Action.ClientStarted });
             await emitPromise(ToastStore.sharedInstance(), "update");
             const toasts = ToastStore.sharedInstance().getToasts();
             expect(toasts).toHaveLength(1);
diff --git a/test/viewmodels/audio/AudioPlayerViewModel-test.tsx b/test/viewmodels/audio/AudioPlayerViewModel-test.tsx
new file mode 100644
index 0000000000..4fc10fe596
--- /dev/null
+++ b/test/viewmodels/audio/AudioPlayerViewModel-test.tsx
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { type ChangeEvent, type KeyboardEvent as ReactKeyboardEvent } from "react";
+import { waitFor } from "@testing-library/dom";
+
+import { type Playback, PlaybackState } from "../../../src/audio/Playback";
+import { AudioPlayerViewModel } from "../../../src/viewmodels/audio/AudioPlayerViewModel";
+import { MockedPlayback } from "../../unit-tests/audio/MockedPlayback";
+
+describe("AudioPlayerViewModel", () => {
+    let playback: Playback;
+    beforeEach(() => {
+        playback = new MockedPlayback(PlaybackState.Decoding, 50, 10) as unknown as Playback;
+    });
+
+    it("should return the snapshot", () => {
+        const vm = new AudioPlayerViewModel({ playback, mediaName: "mediaName" });
+        expect(vm.getSnapshot()).toMatchObject({
+            mediaName: "mediaName",
+            sizeBytes: 8000,
+            playbackState: "decoding",
+            durationSeconds: 50,
+            playedSeconds: 10,
+            percentComplete: 20,
+            error: false,
+        });
+    });
+
+    it("should toggle the playback state", async () => {
+        const vm = new AudioPlayerViewModel({ playback, mediaName: "mediaName" });
+
+        await vm.togglePlay();
+        expect(playback.toggle).toHaveBeenCalled();
+    });
+
+    it("should move the playback on seekbar change", async () => {
+        const vm = new AudioPlayerViewModel({ playback, mediaName: "mediaName" });
+        await vm.onSeekbarChange({ target: { value: "20" } } as ChangeEvent<HTMLInputElement>);
+        expect(playback.skipTo).toHaveBeenCalledWith(10); // 20% of 50 seconds
+    });
+
+    it("should has error=true when playback.prepare fails", async () => {
+        jest.spyOn(playback, "prepare").mockRejectedValue(new Error("Failed to prepare playback"));
+        const vm = new AudioPlayerViewModel({ playback, mediaName: "mediaName" });
+        await waitFor(() => expect(vm.getSnapshot().error).toBe(true));
+    });
+
+    it("should handle key down events", () => {
+        const vm = new AudioPlayerViewModel({ playback, mediaName: "mediaName" });
+        let event = new KeyboardEvent("keydown", { key: " " }) as unknown as ReactKeyboardEvent<HTMLDivElement>;
+        vm.onKeyDown(event);
+        expect(playback.toggle).toHaveBeenCalled();
+
+        event = new KeyboardEvent("keydown", { key: "ArrowLeft" }) as unknown as ReactKeyboardEvent<HTMLDivElement>;
+        vm.onKeyDown(event);
+        expect(playback.skipTo).toHaveBeenCalledWith(10 - 5); // 5 seconds back
+
+        event = new KeyboardEvent("keydown", { key: "ArrowRight" }) as unknown as ReactKeyboardEvent<HTMLDivElement>;
+        vm.onKeyDown(event);
+        expect(playback.skipTo).toHaveBeenCalledWith(10 + 5); // 5 seconds forward
+    });
+
+    it("should update snapshot when setProps is called with new mediaName", () => {
+        const vm = new AudioPlayerViewModel({ playback, mediaName: "oldName" });
+        expect(vm.getSnapshot().mediaName).toBe("oldName");
+
+        vm.setProps({ mediaName: "newName" });
+        expect(vm.getSnapshot().mediaName).toBe("newName");
+    });
+});
diff --git a/test/viewmodels/event-tiles/TextualEventViewModel-test.ts b/test/viewmodels/event-tiles/TextualEventViewModel-test.ts
new file mode 100644
index 0000000000..735ecd2542
--- /dev/null
+++ b/test/viewmodels/event-tiles/TextualEventViewModel-test.ts
@@ -0,0 +1,35 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/matrix";
+
+import { TextualEventViewModel } from "../../../src/viewmodels/event-tiles/TextualEventViewModel";
+import { stubClient } from "../../test-utils";
+
+jest.mock("../../../src/TextForEvent.tsx", () => ({
+    textForEvent: jest.fn().mockReturnValue("Test Message"),
+}));
+
+describe("TextualEventViewModel", () => {
+    it("should update when the sentinel updates", () => {
+        const fakeEvent = new MatrixEvent({});
+        stubClient();
+
+        const vm = new TextualEventViewModel({
+            showHiddenEvents: false,
+            mxEvent: fakeEvent,
+        });
+
+        const cb = jest.fn();
+
+        vm.subscribe(cb);
+
+        fakeEvent.emit(MatrixEventEvent.SentinelUpdated);
+
+        expect(cb).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/test/viewmodels/room-list/RoomListSearchViewModel-test.ts b/test/viewmodels/room-list/RoomListSearchViewModel-test.ts
new file mode 100644
index 0000000000..ac0eb0775a
--- /dev/null
+++ b/test/viewmodels/room-list/RoomListSearchViewModel-test.ts
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { mocked } from "jest-mock";
+
+import { RoomListSearchViewModel } from "../../../src/viewmodels/room-list/RoomListSearchViewModel";
+import { MetaSpace } from "../../../src/stores/spaces";
+import { shouldShowComponent } from "../../../src/customisations/helpers/UIComponents";
+import defaultDispatcher from "../../../src/dispatcher/dispatcher";
+import { Action } from "../../../src/dispatcher/actions";
+import LegacyCallHandler, { LegacyCallHandlerEvent } from "../../../src/LegacyCallHandler";
+
+jest.mock("../../../src/customisations/helpers/UIComponents", () => ({
+    shouldShowComponent: jest.fn(),
+}));
+
+jest.mock("../../../src/PosthogTrackers", () => ({
+    trackInteraction: jest.fn(),
+}));
+
+describe("RoomListSearchViewModel", () => {
+    beforeEach(() => {
+        mocked(shouldShowComponent).mockReturnValue(true);
+        jest.spyOn(LegacyCallHandler.instance, "getSupportsPstnProtocol").mockReturnValue(false);
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    describe("snapshot", () => {
+        it("should show explore button in Home space when UIComponent.ExploreRooms is enabled", () => {
+            mocked(shouldShowComponent).mockReturnValue(true);
+            const vm = new RoomListSearchViewModel({ activeSpace: MetaSpace.Home });
+
+            expect(vm.getSnapshot().displayExploreButton).toBe(true);
+        });
+
+        it("should hide explore button when not in Home space", () => {
+            mocked(shouldShowComponent).mockReturnValue(true);
+            const vm = new RoomListSearchViewModel({ activeSpace: MetaSpace.VideoRooms });
+
+            expect(vm.getSnapshot().displayExploreButton).toBe(false);
+        });
+
+        it("should hide explore button when UIComponent.ExploreRooms is disabled", () => {
+            mocked(shouldShowComponent).mockReturnValue(false);
+            const vm = new RoomListSearchViewModel({ activeSpace: MetaSpace.Home });
+
+            expect(vm.getSnapshot().displayExploreButton).toBe(false);
+        });
+
+        it("should show dial button when PSTN protocol is supported", () => {
+            jest.spyOn(LegacyCallHandler.instance, "getSupportsPstnProtocol").mockReturnValue(true);
+            const vm = new RoomListSearchViewModel({ activeSpace: MetaSpace.Home });
+
+            expect(vm.getSnapshot().displayDialButton).toBe(true);
+        });
+
+        it("should hide dial button when PSTN protocol is not supported", () => {
+            jest.spyOn(LegacyCallHandler.instance, "getSupportsPstnProtocol").mockReturnValue(false);
+            const vm = new RoomListSearchViewModel({ activeSpace: MetaSpace.Home });
+
+            expect(vm.getSnapshot().displayDialButton).toBe(false);
+        });
+    });
+
+    describe("actions", () => {
+        it("should fire OpenSpotlight action when onSearchClick is called", () => {
+            const fireSpy = jest.spyOn(defaultDispatcher, "fire");
+            const vm = new RoomListSearchViewModel({ activeSpace: MetaSpace.Home });
+
+            vm.onSearchClick();
+            expect(fireSpy).toHaveBeenCalledWith(Action.OpenSpotlight);
+        });
+
+        it("should fire OpenDialPad action when onDialPadClick is called", () => {
+            const fireSpy = jest.spyOn(defaultDispatcher, "fire");
+            const vm = new RoomListSearchViewModel({ activeSpace: MetaSpace.Home });
+
+            vm.onDialPadClick();
+            expect(fireSpy).toHaveBeenCalledWith(Action.OpenDialPad);
+        });
+
+        it("should fire ViewRoomDirectory action and track interaction when onExploreClick is called", () => {
+            const fireSpy = jest.spyOn(defaultDispatcher, "fire");
+            const vm = new RoomListSearchViewModel({ activeSpace: MetaSpace.Home });
+
+            const mockEvent = {} as React.MouseEvent<HTMLButtonElement>;
+            vm.onExploreClick(mockEvent);
+
+            expect(fireSpy).toHaveBeenCalledWith(Action.ViewRoomDirectory);
+        });
+    });
+
+    it("should update snapshot when PSTN protocol support changes", () => {
+        jest.spyOn(LegacyCallHandler.instance, "getSupportsPstnProtocol").mockReturnValue(false);
+        const vm = new RoomListSearchViewModel({ activeSpace: MetaSpace.Home });
+
+        expect(vm.getSnapshot().displayDialButton).toBe(false);
+
+        // Simulate PSTN protocol support change
+        jest.spyOn(LegacyCallHandler.instance, "getSupportsPstnProtocol").mockReturnValue(true);
+        LegacyCallHandler.instance.emit(LegacyCallHandlerEvent.ProtocolSupport);
+
+        expect(vm.getSnapshot().displayDialButton).toBe(true);
+
+        vm.dispose();
+    });
+});
diff --git a/tsconfig.json b/tsconfig.json
index 41534bc523..620a0e484c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,7 +18,8 @@
         "lib": ["es2022", "es2024.promise", "dom", "dom.iterable"],
         "strict": true,
         "paths": {
-            "jest-matrix-react": ["./test/test-utils/jest-matrix-react"]
+            "jest-matrix-react": ["./test/test-utils/jest-matrix-react"],
+            "rollup/parseAst": ["./node_modules/rollup/dist/parseAst"]
         }
     },
     "include": [
@@ -27,12 +28,7 @@
         "./src/**/*.tsx",
         "./test/**/*.ts",
         "./test/**/*.tsx",
-        "./scripts/*.ts"
-    ],
-    "ts-node": {
-        "files": true,
-        "moduleTypes": {
-            "*": "cjs"
-        }
-    }
+        "./scripts/*.ts",
+        "./declaration.d.ts"
+    ]
 }
diff --git a/tsconfig.module_system.json b/tsconfig.module_system.json
index dec7ca9e50..99d6a36ce9 100644
--- a/tsconfig.module_system.json
+++ b/tsconfig.module_system.json
@@ -1,6 +1,7 @@
 {
     "extends": "./tsconfig.json",
     "compilerOptions": {
+        "allowImportingTsExtensions": true,
         "jsx": "preserve",
         "declaration": false,
         "outDir": "./lib/module_system",
diff --git a/webpack.config.js b/webpack.config.js
index ff58632f43..2e4493f2b3 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,3 +1,10 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
 /* eslint-disable quote-props */
 
 const dotenv = require("dotenv");
@@ -207,13 +214,15 @@ module.exports = (env, argv) => {
                     __dirname,
                     "node_modules/@matrix-org/react-sdk-module-api",
                 ),
-                // and matrix-events-sdk & matrix-widget-api
-                "matrix-events-sdk": path.resolve(__dirname, "node_modules/matrix-events-sdk"),
+                // and matrix-widget-api
                 "matrix-widget-api": path.resolve(__dirname, "node_modules/matrix-widget-api"),
                 "oidc-client-ts": path.resolve(__dirname, "node_modules/oidc-client-ts"),
 
                 // Define a variable so the i18n stuff can load
                 "$webapp": path.resolve(__dirname, "webapp"),
+
+                // Make shared-components imports resolve to EW counterpart
+                "counterpart": path.resolve(__dirname, "node_modules/counterpart"),
             },
             fallback: {
                 // Mock out the NodeFS module: The opus decoder imports this wrongly.
@@ -265,6 +274,10 @@ module.exports = (env, argv) => {
                         // our own source needs babel-ing
                         if (f.startsWith(path.resolve(__dirname, "src"))) return true;
 
+                        // We import the typescript source directly from shared-components
+                        // to avoid having to build as we dev, so include them too.
+                        if (f.startsWith(path.resolve(__dirname, "packages", "shared-components"))) return true;
+
                         // we use the original source files of js-sdk, so we need to
                         // run them through babel. Because the path tested is the resolved, absolute
                         // path, these could be anywhere thanks to yarn link. We must also not
@@ -680,6 +693,12 @@ module.exports = (env, argv) => {
                         context: path.resolve(__dirname, "node_modules/@element-hq/element-call-embedded/dist"),
                         to: path.join(__dirname, "webapp", "widgets", "element-call"),
                     },
+                    // Mobile guide assets
+                    {
+                        from: "assets/**",
+                        context: path.resolve(__dirname, "src/vector/mobile_guide"),
+                        to: "mobile_guide",
+                    },
                 ],
             }),
 
@@ -772,6 +791,8 @@ module.exports = (env, argv) => {
 function getAssetOutputPath(url, resourcePath) {
     const isKaTeX = resourcePath.includes("KaTeX");
     const isFontSource = resourcePath.includes("@fontsource");
+    const mobileGuideAssetsPath = path.join("mobile_guide", "assets");
+    const isMobileGuide = resourcePath.includes(mobileGuideAssetsPath);
     // `res` is the parent dir for our own assets in various layers
     // `dist` is the parent dir for KaTeX assets
     // `files` is the parent dir for @fontsource assets
@@ -805,6 +826,11 @@ function getAssetOutputPath(url, resourcePath) {
         outputDir = "fonts";
     }
 
+    if (isMobileGuide) {
+        // Specific handling for the mobile guide assets, as they live alongside the page sources.
+        outputDir = mobileGuideAssetsPath;
+    }
+
     if (isKaTeX) {
         // Add a clearly named directory segment, rather than leaving the KaTeX
         // assets loose in each asset type directory.
diff --git a/yarn.lock b/yarn.lock
index 5fa4383e57..3d7c3ec0e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15,43 +15,29 @@
   integrity sha512-tPglwCr8Mm8SWzwnVewwFmqRx91F0WvMsM0BRAqH4CLalyGndm53Xvp+UcUSzswpk1wkjIDYI7RyEhWMLyPkig==
 
 "@adobe/css-tools@^4.4.0":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.4.0.tgz#728c484f4e10df03d5a3acd0d8adcbbebff8ad63"
-  integrity sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ==
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.4.4.tgz#2856c55443d3d461693f32d2b96fb6ea92e1ffa9"
+  integrity sha512-Elp+iwUx5rN5+Y8xLt5/GRoG20WGoDCQ/1Fb+1LiGtvwbDavuSk0jhD/eZdckHAuzcDzccnkv+rEjyWfRx18gg==
 
-"@ampproject/remapping@^2.2.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
-  integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
+"@asamuzakjp/css-color@^3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@asamuzakjp/css-color/-/css-color-3.2.0.tgz#cc42f5b85c593f79f1fa4f25d2b9b321e61d1794"
+  integrity sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.3.5"
-    "@jridgewell/trace-mapping" "^0.3.24"
+    "@csstools/css-calc" "^2.1.3"
+    "@csstools/css-color-parser" "^3.0.9"
+    "@csstools/css-parser-algorithms" "^3.0.4"
+    "@csstools/css-tokenizer" "^3.0.3"
+    lru-cache "^10.4.3"
 
 "@axe-core/playwright@^4.10.1":
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/@axe-core/playwright/-/playwright-4.10.1.tgz#c811ba8bfa244833cce422c4131e0043828c42cc"
-  integrity sha512-EV5t39VV68kuAfMKqb/RL+YjYKhfuGim9rgIaQ6Vntb2HgaCaau0h98Y3WEUqW1+PbdzxDtDNjFAipbtZuBmEA==
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/@axe-core/playwright/-/playwright-4.11.0.tgz#64beab80764c1f3f0ec4ac21f9b2c2d7df508958"
+  integrity sha512-70vBT/Ylqpm65RQz2iCG2o0JJCEG/WCNyefTr2xcOcr1CoSee60gNQYUMZZ7YukoKkFLv26I/jjlsvwwp532oQ==
   dependencies:
-    axe-core "~4.10.2"
+    axe-core "~4.11.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.26.2":
-  version "7.26.2"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
-  integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.25.9"
-    js-tokens "^4.0.0"
-    picocolors "^1.0.0"
-
-"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.25.7":
-  version "7.25.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.25.7.tgz#438f2c524071531d643c6f0188e1e28f130cebc7"
-  integrity sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==
-  dependencies:
-    "@babel/highlight" "^7.25.7"
-    picocolors "^1.0.0"
-
-"@babel/code-frame@^7.27.1":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.27.1.tgz#200f715e66d52a23b221a9435534a91cc13ad5be"
   integrity sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==
@@ -60,26 +46,26 @@
     js-tokens "^4.0.0"
     picocolors "^1.1.1"
 
-"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.27.2":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.27.3.tgz#cc49c2ac222d69b889bf34c795f537c0c6311111"
-  integrity sha512-V42wFfx1ymFte+ecf6iXghnnP8kWTO+ZLXIyZq+1LAXHHvTZdVxicn4yiVYdYMGaCO3tmqub11AorKkv+iodqw==
+"@babel/compat-data@^7.27.2", "@babel/compat-data@^7.27.7", "@babel/compat-data@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.28.5.tgz#a8a4962e1567121ac0b3b487f52107443b455c7f"
+  integrity sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==
 
-"@babel/core@^7.0.0", "@babel/core@^7.11.6", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.18.5", "@babel/core@^7.21.3", "@babel/core@^7.23.9", "@babel/core@^7.24.4":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.27.3.tgz#d7d05502bccede3cab36373ed142e6a1df554c2f"
-  integrity sha512-hyrN8ivxfvJ4i0fIJuV4EOlV0WDMz5Ui4StRTgVaAvWeiRCilXgwVvxJKtFQ3TKtHgJscB2YiXKGNJuVwhQMtA==
+"@babel/core@^7.0.0", "@babel/core@^7.12.10", "@babel/core@^7.18.5", "@babel/core@^7.21.3", "@babel/core@^7.23.9", "@babel/core@^7.24.4", "@babel/core@^7.27.4", "@babel/core@^7.28.0":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.5.tgz#4c81b35e51e1b734f510c99b07dfbc7bbbb48f7e"
+  integrity sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==
   dependencies:
-    "@ampproject/remapping" "^2.2.0"
     "@babel/code-frame" "^7.27.1"
-    "@babel/generator" "^7.27.3"
+    "@babel/generator" "^7.28.5"
     "@babel/helper-compilation-targets" "^7.27.2"
-    "@babel/helper-module-transforms" "^7.27.3"
-    "@babel/helpers" "^7.27.3"
-    "@babel/parser" "^7.27.3"
+    "@babel/helper-module-transforms" "^7.28.3"
+    "@babel/helpers" "^7.28.4"
+    "@babel/parser" "^7.28.5"
     "@babel/template" "^7.27.2"
-    "@babel/traverse" "^7.27.3"
-    "@babel/types" "^7.27.3"
+    "@babel/traverse" "^7.28.5"
+    "@babel/types" "^7.28.5"
+    "@jridgewell/remapping" "^2.3.5"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -87,9 +73,9 @@
     semver "^6.3.1"
 
 "@babel/eslint-parser@^7.12.10":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.27.1.tgz#e146fb2facef62c6c5d1a6fd07cfd79ee9f7b0f1"
-  integrity sha512-q8rjOuadH0V6Zo4XLMkJ3RMQ9MSBqwaDByyYB0izsYdaIWGNLmEblbCOf1vyFHICcg16CD7Fsi51vcQnYxmt6Q==
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.28.5.tgz#0b8883a4a1c2cbed7b3cd9d7765d80e8f480b9ae"
+  integrity sha512-fcdRcWahONYo+JRnJg1/AekOacGvKx12Gu0qXJXFi2WBqQA1i7+O5PaxRB7kxE/Op94dExnCiiar6T09pvdHpA==
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
     eslint-visitor-keys "^2.1.0"
@@ -102,46 +88,25 @@
   dependencies:
     eslint-rule-composer "^0.3.0"
 
-"@babel/generator@^7.25.7", "@babel/generator@^7.7.2":
-  version "7.25.7"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.7.tgz#de86acbeb975a3e11ee92dd52223e6b03b479c56"
-  integrity sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==
+"@babel/generator@^7.27.5", "@babel/generator@^7.28.3", "@babel/generator@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.5.tgz#712722d5e50f44d07bc7ac9fe84438742dd61298"
+  integrity sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==
   dependencies:
-    "@babel/types" "^7.25.7"
-    "@jridgewell/gen-mapping" "^0.3.5"
-    "@jridgewell/trace-mapping" "^0.3.25"
+    "@babel/parser" "^7.28.5"
+    "@babel/types" "^7.28.5"
+    "@jridgewell/gen-mapping" "^0.3.12"
+    "@jridgewell/trace-mapping" "^0.3.28"
     jsesc "^3.0.2"
 
-"@babel/generator@^7.26.10", "@babel/generator@^7.27.0":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.27.0.tgz#764382b5392e5b9aff93cadb190d0745866cbc2c"
-  integrity sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==
-  dependencies:
-    "@babel/parser" "^7.27.0"
-    "@babel/types" "^7.27.0"
-    "@jridgewell/gen-mapping" "^0.3.5"
-    "@jridgewell/trace-mapping" "^0.3.25"
-    jsesc "^3.0.2"
-
-"@babel/generator@^7.27.3":
+"@babel/helper-annotate-as-pure@^7.27.1", "@babel/helper-annotate-as-pure@^7.27.3":
   version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.27.3.tgz#ef1c0f7cfe3b5fc8cbb9f6cc69f93441a68edefc"
-  integrity sha512-xnlJYj5zepml8NXtjkG0WquFUv8RskFqyFcVgTBp5k+NaA/8uw/K+OSVf8AMGw5e9HKP2ETd5xpK5MLZQD6b4Q==
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz#f31fd86b915fc4daf1f3ac6976c59be7084ed9c5"
+  integrity sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==
   dependencies:
-    "@babel/parser" "^7.27.3"
     "@babel/types" "^7.27.3"
-    "@jridgewell/gen-mapping" "^0.3.5"
-    "@jridgewell/trace-mapping" "^0.3.25"
-    jsesc "^3.0.2"
 
-"@babel/helper-annotate-as-pure@^7.25.9", "@babel/helper-annotate-as-pure@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.1.tgz#4345d81a9a46a6486e24d069469f13e60445c05d"
-  integrity sha512-WnuuDILl9oOBbKnb4L+DyODx7iC47XfzmNCpTttFsSp6hTG7XZxu60+4IO+2/hPfcGOoKbFiwoI/+zwARbNQow==
-  dependencies:
-    "@babel/types" "^7.27.1"
-
-"@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.27.1", "@babel/helper-compilation-targets@^7.27.2":
+"@babel/helper-compilation-targets@^7.27.1", "@babel/helper-compilation-targets@^7.27.2":
   version "7.27.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz#46a0f6efab808d51d29ce96858dd10ce8732733d"
   integrity sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==
@@ -153,66 +118,63 @@
     semver "^6.3.1"
 
 "@babel/helper-create-class-features-plugin@^7.18.6":
-  version "7.26.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.26.9.tgz#d6f83e3039547fbb39967e78043cd3c8b7820c71"
-  integrity sha512-ubbUqCofvxPRurw5L8WTsCLSkQiVpov4Qx0WMA+jUN+nXBK8ADPlJO1grkFw5CWKC5+sZSOfuGMdX1aI1iT9Sg==
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.3.tgz#3e747434ea007910c320c4d39a6b46f20f371d46"
+  integrity sha512-V9f6ZFIYSLNEbuGA/92uOvYsGCJNsuA8ESZ4ldc09bWk/j8H8TKiPw8Mk1eG6olpnO0ALHJmYfZvF4MEE4gajg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    "@babel/helper-member-expression-to-functions" "^7.25.9"
-    "@babel/helper-optimise-call-expression" "^7.25.9"
-    "@babel/helper-replace-supers" "^7.26.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
-    "@babel/traverse" "^7.26.9"
-    semver "^6.3.1"
-
-"@babel/helper-create-class-features-plugin@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.1.tgz#5bee4262a6ea5ddc852d0806199eb17ca3de9281"
-  integrity sha512-QwGAmuvM17btKU5VqXfb+Giw4JcN0hjuufz3DYnpeVDvZLAObloM77bhMXiqry3Iio+Ai4phVRDwl6WU10+r5A==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.27.1"
+    "@babel/helper-annotate-as-pure" "^7.27.3"
     "@babel/helper-member-expression-to-functions" "^7.27.1"
     "@babel/helper-optimise-call-expression" "^7.27.1"
     "@babel/helper-replace-supers" "^7.27.1"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
-    "@babel/traverse" "^7.27.1"
+    "@babel/traverse" "^7.28.3"
+    semver "^6.3.1"
+
+"@babel/helper-create-class-features-plugin@^7.27.1", "@babel/helper-create-class-features-plugin@^7.28.3", "@babel/helper-create-class-features-plugin@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.5.tgz#472d0c28028850968979ad89f173594a6995da46"
+  integrity sha512-q3WC4JfdODypvxArsJQROfupPBq9+lMwjKq7C33GhbFYJsufD0yd/ziwD+hJucLeWsnFPWZjsU2DNFqBPE7jwQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.27.3"
+    "@babel/helper-member-expression-to-functions" "^7.28.5"
+    "@babel/helper-optimise-call-expression" "^7.27.1"
+    "@babel/helper-replace-supers" "^7.27.1"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
+    "@babel/traverse" "^7.28.5"
     semver "^6.3.1"
 
 "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.27.1.tgz#05b0882d97ba1d4d03519e4bce615d70afa18c53"
-  integrity sha512-uVDC72XVf8UbrH5qQTc18Agb8emwjTiZrQE11Nv3CuBEZmVvTwwE9CBUEvHku06gQCAyYf8Nv6ja1IN+6LMbxQ==
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.28.5.tgz#7c1ddd64b2065c7f78034b25b43346a7e19ed997"
+  integrity sha512-N1EhvLtHzOvj7QQOUCCS3NrPJP8c5W6ZXCHDn7Yialuy1iu4r5EmIYkXlKNqT99Ciw+W0mDqWoR6HWMZlFP3hw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.27.1"
-    regexpu-core "^6.2.0"
+    "@babel/helper-annotate-as-pure" "^7.27.3"
+    regexpu-core "^6.3.1"
     semver "^6.3.1"
 
-"@babel/helper-define-polyfill-provider@^0.6.3", "@babel/helper-define-polyfill-provider@^0.6.4":
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.4.tgz#15e8746368bfa671785f5926ff74b3064c291fab"
-  integrity sha512-jljfR1rGnXXNWnmQg2K3+bvhkxB51Rl32QRaOTuwwjviGrHzIbSc8+x9CpraDtbT7mfyjXObULP4w/adunNwAw==
+"@babel/helper-define-polyfill-provider@^0.6.5":
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.5.tgz#742ccf1cb003c07b48859fc9fa2c1bbe40e5f753"
+  integrity sha512-uJnGFcPsWQK8fvjgGP5LZUZZsYGIoPeRjSF5PGwrelYgq7Q15/Ft9NGFp1zglwgIv//W0uG4BevRuSJRyylZPg==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.22.6"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    debug "^4.1.1"
+    "@babel/helper-compilation-targets" "^7.27.2"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    debug "^4.4.1"
     lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
+    resolve "^1.22.10"
 
-"@babel/helper-member-expression-to-functions@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz#9dfffe46f727005a5ea29051ac835fb735e4c1a3"
-  integrity sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==
-  dependencies:
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
+"@babel/helper-globals@^7.28.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.28.0.tgz#b9430df2aa4e17bc28665eadeae8aa1d985e6674"
+  integrity sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==
 
-"@babel/helper-member-expression-to-functions@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.27.1.tgz#ea1211276be93e798ce19037da6f06fbb994fa44"
-  integrity sha512-E5chM8eWjTp/aNoVpcbfM7mLxu9XGLWYise2eBKGQomAk/Mb4XoxyqXTZbuTohbsl8EKqdlMhnDI2CCLfcs9wA==
+"@babel/helper-member-expression-to-functions@^7.27.1", "@babel/helper-member-expression-to-functions@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.28.5.tgz#f3e07a10be37ed7a63461c63e6929575945a6150"
+  integrity sha512-cwM7SBRZcPCLgl8a7cY0soT1SptSzAlMH39vwiRpOQkJlh53r5hdHwLSCZpQdVLT39sZt+CRpNwYG4Y2v77atg==
   dependencies:
-    "@babel/traverse" "^7.27.1"
-    "@babel/types" "^7.27.1"
+    "@babel/traverse" "^7.28.5"
+    "@babel/types" "^7.28.5"
 
 "@babel/helper-module-imports@^7.27.1":
   version "7.27.1"
@@ -222,30 +184,14 @@
     "@babel/traverse" "^7.27.1"
     "@babel/types" "^7.27.1"
 
-"@babel/helper-module-transforms@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.27.1.tgz#e1663b8b71d2de948da5c4fb2a20ca4f3ec27a6f"
-  integrity sha512-9yHn519/8KvTU5BjTVEEeIM3w9/2yXNKoD82JifINImhpKkARMJKPP59kLo+BafpdN5zgNeIcS4jsGDmd3l58g==
+"@babel/helper-module-transforms@^7.27.1", "@babel/helper-module-transforms@^7.28.3":
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz#a2b37d3da3b2344fe085dab234426f2b9a2fa5f6"
+  integrity sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==
   dependencies:
     "@babel/helper-module-imports" "^7.27.1"
     "@babel/helper-validator-identifier" "^7.27.1"
-    "@babel/traverse" "^7.27.1"
-
-"@babel/helper-module-transforms@^7.27.3":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz#db0bbcfba5802f9ef7870705a7ef8788508ede02"
-  integrity sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.27.1"
-    "@babel/helper-validator-identifier" "^7.27.1"
-    "@babel/traverse" "^7.27.3"
-
-"@babel/helper-optimise-call-expression@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz#3324ae50bae7e2ab3c33f60c9a877b6a0146b54e"
-  integrity sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==
-  dependencies:
-    "@babel/types" "^7.25.9"
+    "@babel/traverse" "^7.28.3"
 
 "@babel/helper-optimise-call-expression@^7.27.1":
   version "7.27.1"
@@ -254,7 +200,7 @@
   dependencies:
     "@babel/types" "^7.27.1"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.27.1":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz#ddb2f876534ff8013e6c2b299bf4d39b3c51d44c"
   integrity sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==
@@ -273,15 +219,6 @@
     "@babel/helper-wrap-function" "^7.27.1"
     "@babel/traverse" "^7.27.1"
 
-"@babel/helper-replace-supers@^7.26.5":
-  version "7.26.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz#6cb04e82ae291dae8e72335dfe438b0725f14c8d"
-  integrity sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.25.9"
-    "@babel/helper-optimise-call-expression" "^7.25.9"
-    "@babel/traverse" "^7.26.5"
-
 "@babel/helper-replace-supers@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.27.1.tgz#b1ed2d634ce3bdb730e4b52de30f8cccfd692bc0"
@@ -291,14 +228,6 @@
     "@babel/helper-optimise-call-expression" "^7.27.1"
     "@babel/traverse" "^7.27.1"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz#0b2e1b62d560d6b1954893fd2b705dc17c91f0c9"
-  integrity sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==
-  dependencies:
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
-
 "@babel/helper-skip-transparent-expression-wrappers@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz#62bb91b3abba8c7f1fec0252d9dbea11b3ee7a56"
@@ -307,93 +236,76 @@
     "@babel/traverse" "^7.27.1"
     "@babel/types" "^7.27.1"
 
-"@babel/helper-string-parser@^7.25.7":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c"
-  integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==
-
-"@babel/helper-string-parser@^7.25.9", "@babel/helper-string-parser@^7.27.1":
+"@babel/helper-string-parser@^7.25.7", "@babel/helper-string-parser@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687"
   integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==
 
-"@babel/helper-validator-identifier@^7.24.7", "@babel/helper-validator-identifier@^7.25.7":
+"@babel/helper-validator-identifier@^7.24.7":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7"
   integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==
 
-"@babel/helper-validator-identifier@^7.25.9", "@babel/helper-validator-identifier@^7.27.1":
+"@babel/helper-validator-identifier@^7.25.7":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz#a7054dcc145a967dd4dc8fee845a57c1316c9df8"
   integrity sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==
 
+"@babel/helper-validator-identifier@^7.27.1", "@babel/helper-validator-identifier@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4"
+  integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==
+
 "@babel/helper-validator-option@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz#fa52f5b1e7db1ab049445b421c4471303897702f"
   integrity sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==
 
 "@babel/helper-wrap-function@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.27.1.tgz#b88285009c31427af318d4fe37651cd62a142409"
-  integrity sha512-NFJK2sHUvrjo8wAU/nQTWU890/zB2jj0qBcCbZbbf+005cAsv6tMjXz31fBign6M5ov1o0Bllu+9nbqkfsjjJQ==
-  dependencies:
-    "@babel/template" "^7.27.1"
-    "@babel/traverse" "^7.27.1"
-    "@babel/types" "^7.27.1"
-
-"@babel/helpers@^7.27.3":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.27.3.tgz#387d65d279290e22fe7a47a8ffcd2d0c0184edd0"
-  integrity sha512-h/eKy9agOya1IGuLaZ9tEUgz+uIRXcbtOhRtUyyMf8JFmn1iT13vnl/IGVWSkdOCG/pC57U4S1jnAabAavTMwg==
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.28.3.tgz#fe4872092bc1438ffd0ce579e6f699609f9d0a7a"
+  integrity sha512-zdf983tNfLZFletc0RRXYrHrucBEg95NIFMkn6K9dbeMYnsgHaSBGcQqdsCSStG2PYwRre0Qc2NNSCXbG+xc6g==
   dependencies:
     "@babel/template" "^7.27.2"
-    "@babel/types" "^7.27.3"
+    "@babel/traverse" "^7.28.3"
+    "@babel/types" "^7.28.2"
 
-"@babel/highlight@^7.25.7":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.25.9.tgz#8141ce68fc73757946f983b343f1231f4691acc6"
-  integrity sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==
+"@babel/helpers@^7.28.4":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.28.4.tgz#fe07274742e95bdf7cf1443593eeb8926ab63827"
+  integrity sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.25.9"
-    chalk "^2.4.2"
-    js-tokens "^4.0.0"
-    picocolors "^1.0.0"
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.28.4"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.5", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.25.7":
+"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.24.4", "@babel/parser@^7.27.2", "@babel/parser@^7.28.4", "@babel/parser@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.5.tgz#0b0225ee90362f030efd644e8034c99468893b08"
+  integrity sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==
+  dependencies:
+    "@babel/types" "^7.28.5"
+
+"@babel/parser@^7.18.5":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.4.tgz#da25d4643532890932cc03f7705fe19637e03fa8"
+  integrity sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==
+  dependencies:
+    "@babel/types" "^7.28.4"
+
+"@babel/parser@^7.23.9":
   version "7.25.8"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.8.tgz#f6aaf38e80c36129460c1657c0762db584c9d5e2"
   integrity sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==
   dependencies:
     "@babel/types" "^7.25.8"
 
-"@babel/parser@^7.24.4":
-  version "7.26.10"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.10.tgz#e9bdb82f14b97df6569b0b038edd436839c57749"
-  integrity sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==
-  dependencies:
-    "@babel/types" "^7.26.10"
-
-"@babel/parser@^7.26.10", "@babel/parser@^7.27.0":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.27.0.tgz#3d7d6ee268e41d2600091cbd4e145ffee85a44ec"
-  integrity sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==
-  dependencies:
-    "@babel/types" "^7.27.0"
-
-"@babel/parser@^7.27.2", "@babel/parser@^7.27.3":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.27.3.tgz#1b7533f0d908ad2ac545c4d05cbe2fb6dc8cfaaf"
-  integrity sha512-xyYxRj6+tLNDTWi0KCBcZ9V7yg3/lwL9DWh9Uwh/RIVlIfFidggcgxKX3GCXwCiswwcGRawBKbEg2LG/Y8eJhw==
-  dependencies:
-    "@babel/types" "^7.27.3"
-
-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz#61dd8a8e61f7eb568268d1b5f129da3eee364bf9"
-  integrity sha512-QPG3C9cCVRQLxAVwmefEmwdTanECuUBMQZ/ym5kiw3XKCGA7qkuQLcjWWHcrD/GKbn/WmJwaezfuuAOcyKlRPA==
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.28.5.tgz#fbde57974707bbfa0376d34d425ff4fa6c732421"
+  integrity sha512-87GDMS3tsmMSi/3bWOte1UblL+YUTFMV8SZPZ2eSEL17s74Cw/l63rR6NmGVKMYW2GYi85nE+/d6Hw5N0bEk2Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
-    "@babel/traverse" "^7.27.1"
+    "@babel/traverse" "^7.28.5"
 
 "@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.27.1":
   version "7.27.1"
@@ -418,18 +330,18 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
     "@babel/plugin-transform-optional-chaining" "^7.27.1"
 
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.27.1.tgz#bb1c25af34d75115ce229a1de7fa44bf8f955670"
-  integrity sha512-6BpaYGDavZqkI6yT+KSPdpZFfpnd68UKXbcjI9pJ13pvHhPrCKWOOLp+ysvMeA+DxnhuPpgIaRpxRxo5A9t5jw==
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.28.3":
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.28.3.tgz#373f6e2de0016f73caf8f27004f61d167743742a"
+  integrity sha512-b6YTX108evsvE4YgWyQ921ZAFFQm3Bn+CA3+ZXlNVnPhx+UfsVURoPjfGAPCjBgrqo30yX/C2nZGX96DxvR9Iw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
-    "@babel/traverse" "^7.27.1"
+    "@babel/traverse" "^7.28.3"
 
 "@babel/plugin-proposal-decorators@^7.25.9":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.27.1.tgz#3686f424b2f8b2fee7579aa4df133a4f5244a596"
-  integrity sha512-DTxe4LBPrtFdsWzgpmbBKevg3e9PBy+dXRt19kSbucbZvL2uqtdqwwpluL1jfxYE0wIDTFp1nTy/q6gNLsxXrg==
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.28.0.tgz#419c8acc31088e05a774344c021800f7ddc39bf0"
+  integrity sha512-zOiZqvANjWDUaUS9xMxbMcK/Zccztbe/6ikvUXaG9nsPH3w6qh5UaPGAnirI/WhIbZ8m3OHU0ReyPrknG+ZKeg==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.27.1"
     "@babel/helper-plugin-utils" "^7.27.1"
@@ -539,13 +451,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-syntax-jsx@^7.7.2":
-  version "7.25.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.7.tgz#5352d398d11ea5e7ef330c854dea1dae0bf18165"
-  integrity sha512-ruZOnKO+ajVL/MVx+PwNBPOkrnXTXoWMtte1MBpegfCArhqOe3Bj52avVj1huLLxNKYKXYaSxZ2F+woK1ekXfw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.25.7"
-
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
@@ -609,13 +514,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-syntax-typescript@^7.7.2":
-  version "7.25.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.7.tgz#bfc05b0cc31ebd8af09964650cee723bb228108b"
-  integrity sha512-rR+5FDjpCHqqZN2bzZm18bVYGaejGq5ZkpVCJLXor/+zlSrSoc4KWcHI0URVWjl/68Dyr1uwZUz/1njycEAv9g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.25.7"
-
 "@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
@@ -631,14 +529,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-async-generator-functions@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.27.1.tgz#ca433df983d68e1375398e7ca71bf2a4f6fd89d7"
-  integrity sha512-eST9RrwlpaoJBDHShc+DS2SG4ATTi2MYNb4OxYkf3n+7eb49LWpnS+HSpVfW4x927qQwgk8A2hGNVaajAEw0EA==
+"@babel/plugin-transform-async-generator-functions@^7.28.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.28.0.tgz#1276e6c7285ab2cd1eccb0bc7356b7a69ff842c2"
+  integrity sha512-BEOdvX4+M765icNPZeidyADIvQ1m1gmunXufXxvRESy/jNNyfovIqUyE7MVgGBjWktCoJlzvFA1To2O4ymIO3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/helper-remap-async-to-generator" "^7.27.1"
-    "@babel/traverse" "^7.27.1"
+    "@babel/traverse" "^7.28.0"
 
 "@babel/plugin-transform-async-to-generator@^7.27.1":
   version "7.27.1"
@@ -656,10 +554,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-block-scoping@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.27.1.tgz#bc0dbe8ac6de5602981ba58ef68c6df8ef9bfbb3"
-  integrity sha512-QEcFlMl9nGTgh1rn2nIeU5bkfb9BAjaQcWbiP4LvKxUot52ABcTkpcyJ7f2Q2U2RuQ84BNLgts3jRme2dTx6Fw==
+"@babel/plugin-transform-block-scoping@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.5.tgz#e0d3af63bd8c80de2e567e690a54e84d85eb16f6"
+  integrity sha512-45DmULpySVvmq9Pj3X9B+62Xe+DJGov27QravQJU1LLcapR6/10i+gYVAucGGJpHBp5mYxIMK4nDAT/QDLr47g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
@@ -671,25 +569,25 @@
     "@babel/helper-create-class-features-plugin" "^7.27.1"
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-class-static-block@^7.26.0", "@babel/plugin-transform-class-static-block@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.27.1.tgz#7e920d5625b25bbccd3061aefbcc05805ed56ce4"
-  integrity sha512-s734HmYU78MVzZ++joYM+NkJusItbdRcbm+AGRgJCt3iA+yux0QpD9cBVdz3tKyrjVYWRl7j0mHSmv4lhV0aoA==
+"@babel/plugin-transform-class-static-block@^7.26.0", "@babel/plugin-transform-class-static-block@^7.28.3":
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.3.tgz#d1b8e69b54c9993bc558203e1f49bfc979bfd852"
+  integrity sha512-LtPXlBbRoc4Njl/oh1CeD/3jC+atytbnf/UqLoqTDcEYGUPj022+rvfkbDYieUrSj3CaV4yHDByPE+T2HwfsJg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.27.1"
+    "@babel/helper-create-class-features-plugin" "^7.28.3"
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-classes@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.27.1.tgz#03bb04bea2c7b2f711f0db7304a8da46a85cced4"
-  integrity sha512-7iLhfFAubmpeJe/Wo2TVuDrykh/zlWXLzPNdL0Jqn/Xu8R3QQ8h9ff8FQoISZOsw74/HFqFI7NX63HN7QFIHKA==
+"@babel/plugin-transform-classes@^7.28.4":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.4.tgz#75d66175486788c56728a73424d67cbc7473495c"
+  integrity sha512-cFOlhIYPBv/iBoc+KS3M6et2XPtbT2HiCRfBXWtfpc9OAyostldxIf9YAYB6ypURBBbx+Qv6nyrLzASfJe+hBA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.27.1"
-    "@babel/helper-compilation-targets" "^7.27.1"
+    "@babel/helper-annotate-as-pure" "^7.27.3"
+    "@babel/helper-compilation-targets" "^7.27.2"
+    "@babel/helper-globals" "^7.28.0"
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/helper-replace-supers" "^7.27.1"
-    "@babel/traverse" "^7.27.1"
-    globals "^11.1.0"
+    "@babel/traverse" "^7.28.4"
 
 "@babel/plugin-transform-computed-properties@^7.27.1":
   version "7.27.1"
@@ -699,19 +597,13 @@
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/template" "^7.27.1"
 
-"@babel/plugin-transform-destructuring@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.27.1.tgz#d5916ef7089cb254df0418ae524533c1b72ba656"
-  integrity sha512-ttDCqhfvpE9emVkXbPD8vyxxh4TWYACVybGkDj+oReOGwnp066ITEivDlLwe0b1R0+evJ13IXQuLNB5w1fhC5Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.27.1"
-
-"@babel/plugin-transform-destructuring@^7.27.3":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.27.3.tgz#3cc8299ed798d9a909f8d66ddeb40849ec32e3b0"
-  integrity sha512-s4Jrok82JpiaIprtY2nHsYmrThKvvwgHwjgd7UMiYhZaN0asdXNLr0y+NjTfkA7SyQE5i2Fb7eawUOZmLvyqOA==
+"@babel/plugin-transform-destructuring@^7.28.0", "@babel/plugin-transform-destructuring@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.5.tgz#b8402764df96179a2070bb7b501a1586cf8ad7a7"
+  integrity sha512-Kl9Bc6D0zTUcFUvkNuQh4eGXPKKNDOJQXVyyM4ZAQPMveniJdxi8XMJwLo+xSoW3MIq81bD33lcUe9kZpl0MCw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/traverse" "^7.28.5"
 
 "@babel/plugin-transform-dotall-regex@^7.27.1":
   version "7.27.1"
@@ -743,10 +635,18 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-exponentiation-operator@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.27.1.tgz#fc497b12d8277e559747f5a3ed868dd8064f83e1"
-  integrity sha512-uspvXnhHvGKf2r4VVtBpeFnuDWsJLQ6MF6lGJLC89jBR1uoVeqM416AZtTuhTezOfgHicpJQmoD5YUakO/YmXQ==
+"@babel/plugin-transform-explicit-resource-management@^7.28.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-explicit-resource-management/-/plugin-transform-explicit-resource-management-7.28.0.tgz#45be6211b778dbf4b9d54c4e8a2b42fa72e09a1a"
+  integrity sha512-K8nhUcn3f6iB+P3gwCv/no7OdzOZQcKchW6N389V6PD8NUWKZHzndOd9sPDVbMoBsbmjMqlB4L9fm+fEFNVlwQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/plugin-transform-destructuring" "^7.28.0"
+
+"@babel/plugin-transform-exponentiation-operator@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.28.5.tgz#7cc90a8170e83532676cfa505278e147056e94fe"
+  integrity sha512-D4WIMaFtwa2NizOp+dnoFjRez/ClKiC2BqqImwKd1X28nqBtZEyCYJ2ozQrrzlxAFrcrjxo39S6khe9RNDlGzw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
@@ -788,10 +688,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-logical-assignment-operators@^7.20.7", "@babel/plugin-transform-logical-assignment-operators@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.27.1.tgz#890cb20e0270e0e5bebe3f025b434841c32d5baa"
-  integrity sha512-SJvDs5dXxiae4FbSL1aBJlG4wvl594N6YEVVn9e3JGulwioy6z3oPjx/sQBO3Y4NwUu5HNix6KJ3wBZoewcdbw==
+"@babel/plugin-transform-logical-assignment-operators@^7.20.7", "@babel/plugin-transform-logical-assignment-operators@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.28.5.tgz#d028fd6db8c081dee4abebc812c2325e24a85b0e"
+  integrity sha512-axUuqnUTBuXyHGcJEVVh9pORaN6wC5bYfE7FGzPiaWa3syib9m7g+/IT/4VgCOe2Upef43PHzeAvcrVek6QuuA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
@@ -818,15 +718,15 @@
     "@babel/helper-module-transforms" "^7.27.1"
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-modules-systemjs@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.27.1.tgz#00e05b61863070d0f3292a00126c16c0e024c4ed"
-  integrity sha512-w5N1XzsRbc0PQStASMksmUeqECuzKuTJer7kFagK8AXgpCMkeDMO5S+aaFb7A51ZYDF7XI34qsTX+fkHiIm5yA==
+"@babel/plugin-transform-modules-systemjs@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.28.5.tgz#7439e592a92d7670dfcb95d0cbc04bd3e64801d2"
+  integrity sha512-vn5Jma98LCOeBy/KpeQhXcV2WZgaRUtjwQmjoBuLNlOmkg0fB5pdvYVeWRYI69wWKwK2cD1QbMiUQnoujWvrew==
   dependencies:
-    "@babel/helper-module-transforms" "^7.27.1"
+    "@babel/helper-module-transforms" "^7.28.3"
     "@babel/helper-plugin-utils" "^7.27.1"
-    "@babel/helper-validator-identifier" "^7.27.1"
-    "@babel/traverse" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.28.5"
+    "@babel/traverse" "^7.28.5"
 
 "@babel/plugin-transform-modules-umd@^7.27.1":
   version "7.27.1"
@@ -865,15 +765,16 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-object-rest-spread@^7.12.1", "@babel/plugin-transform-object-rest-spread@^7.27.2":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.27.3.tgz#ce130aa73fef828bc3e3e835f9bc6144be3eb1c0"
-  integrity sha512-7ZZtznF9g4l2JCImCo5LNKFHB5eXnN39lLtLY5Tg+VkR0jwOt7TBciMckuiQIOIW7L5tkQOCh3bVGYeXgMx52Q==
+"@babel/plugin-transform-object-rest-spread@^7.12.1", "@babel/plugin-transform-object-rest-spread@^7.28.4":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.4.tgz#9ee1ceca80b3e6c4bac9247b2149e36958f7f98d"
+  integrity sha512-373KA2HQzKhQCYiRVIRr+3MjpCObqzDlyrM6u4I201wL8Mp2wHf7uB8GhDwis03k2ti8Zr65Zyyqs1xOxUF/Ew==
   dependencies:
     "@babel/helper-compilation-targets" "^7.27.2"
     "@babel/helper-plugin-utils" "^7.27.1"
-    "@babel/plugin-transform-destructuring" "^7.27.3"
-    "@babel/plugin-transform-parameters" "^7.27.1"
+    "@babel/plugin-transform-destructuring" "^7.28.0"
+    "@babel/plugin-transform-parameters" "^7.27.7"
+    "@babel/traverse" "^7.28.4"
 
 "@babel/plugin-transform-object-super@^7.27.1":
   version "7.27.1"
@@ -890,18 +791,18 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-optional-chaining@^7.12.7", "@babel/plugin-transform-optional-chaining@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz#874ce3c4f06b7780592e946026eb76a32830454f"
-  integrity sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==
+"@babel/plugin-transform-optional-chaining@^7.12.7", "@babel/plugin-transform-optional-chaining@^7.27.1", "@babel/plugin-transform-optional-chaining@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.28.5.tgz#8238c785f9d5c1c515a90bf196efb50d075a4b26"
+  integrity sha512-N6fut9IZlPnjPwgiQkXNhb+cT8wQKFlJNqcZkWlcTqkcqx6/kU4ynGmLFoa4LViBSirn05YAwk+sQBbPfxtYzQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
 
-"@babel/plugin-transform-parameters@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.1.tgz#80334b54b9b1ac5244155a0c8304a187a618d5a7"
-  integrity sha512-018KRk76HWKeZ5l4oTj2zPpSh+NbGdt0st5S6x0pga6HgrjBOJb24mMDHorFopOOd6YHkLgOZ+zaCjZGPO4aKg==
+"@babel/plugin-transform-parameters@^7.27.7":
+  version "7.27.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.7.tgz#1fd2febb7c74e7d21cf3b05f7aebc907940af53a"
+  integrity sha512-qBkYTYCb76RRxUM6CcZA5KRu8K4SM8ajzVeUgVdMVO9NN9uI/GaVmBg/WKJJGnNokV9SY8FxNOVWGXzqzUidBg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
@@ -936,10 +837,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.25.7"
 
-"@babel/plugin-transform-react-display-name@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.27.1.tgz#43af31362d71f7848cfac0cbc212882b1a16e80f"
-  integrity sha512-p9+Vl3yuHPmkirRrg021XiP+EETmPMQTLr6Ayjj85RLNEbb3Eya/4VI0vAdzQG9SEAl2Lnt7fy5lZyMzjYoZQQ==
+"@babel/plugin-transform-react-display-name@^7.28.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.28.0.tgz#6f20a7295fea7df42eb42fed8f896813f5b934de"
+  integrity sha512-D6Eujc2zMxKjfa4Zxl4GHMsmhKKZ9VpcqIchJLvwTxad9zWIYulwYItBovpDOoNLISpcZSXoDJ5gaGbQUDqViA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
@@ -969,10 +870,10 @@
     "@babel/helper-annotate-as-pure" "^7.27.1"
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-regenerator@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.27.1.tgz#0a471df9213416e44cd66bf67176b66f65768401"
-  integrity sha512-B19lbbL7PMrKr52BNPjCqg1IyNUIjTcxKj8uX9zHO+PmWN93s19NDr/f69mIkEp2x9nmDJ08a7lgHaTTzvW7mw==
+"@babel/plugin-transform-regenerator@^7.28.4":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.4.tgz#9d3fa3bebb48ddd0091ce5729139cd99c67cea51"
+  integrity sha512-+ZEdQlBoRg9m2NnzvEeLgtvBMO4tkFBw5SQIUgLICgTrumLoU7lr+Oghi6km2PFj+dbUt2u1oby2w3BDO9YQnA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
@@ -992,15 +893,15 @@
     "@babel/helper-plugin-utils" "^7.27.1"
 
 "@babel/plugin-transform-runtime@^7.12.10":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.27.3.tgz#ad35f1eff5ba18a5e23f7270e939fb5a59d3ec0b"
-  integrity sha512-bA9ZL5PW90YwNgGfjg6U+7Qh/k3zCEQJ06BFgAGRp/yMjw9hP9UGbGPtx3KSOkHGljEPCCxaE+PH4fUR2h1sDw==
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.28.5.tgz#ae3e21fbefe2831ebac04dfa6b463691696afe17"
+  integrity sha512-20NUVgOrinudkIBzQ2bNxP08YpKprUkRTiRSd2/Z5GOdPImJGkoN4Z7IQe1T5AdyKI1i5L6RBmluqdSzvaq9/w==
   dependencies:
     "@babel/helper-module-imports" "^7.27.1"
     "@babel/helper-plugin-utils" "^7.27.1"
-    babel-plugin-polyfill-corejs2 "^0.4.10"
-    babel-plugin-polyfill-corejs3 "^0.11.0"
-    babel-plugin-polyfill-regenerator "^0.6.1"
+    babel-plugin-polyfill-corejs2 "^0.4.14"
+    babel-plugin-polyfill-corejs3 "^0.13.0"
+    babel-plugin-polyfill-regenerator "^0.6.5"
     semver "^6.3.1"
 
 "@babel/plugin-transform-shorthand-properties@^7.27.1":
@@ -1039,13 +940,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-typescript@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.27.1.tgz#d3bb65598bece03f773111e88cc4e8e5070f1140"
-  integrity sha512-Q5sT5+O4QUebHdbwKedFBEwRLb02zJ7r4A5Gg2hUoLuU3FjdMcyqcywqUrLCaDsFCxzokf7u9kuy7qz51YUuAg==
+"@babel/plugin-transform-typescript@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.28.5.tgz#441c5f9a4a1315039516c6c612fc66d5f4594e72"
+  integrity sha512-x2Qa+v/CuEoX7Dr31iAfr0IhInrVOWZU/2vJMJ00FOR/2nM0BcBEclpaf9sWCDc+v5e9dMrhSH8/atq/kX7+bA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.27.1"
-    "@babel/helper-create-class-features-plugin" "^7.27.1"
+    "@babel/helper-annotate-as-pure" "^7.27.3"
+    "@babel/helper-create-class-features-plugin" "^7.28.5"
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
     "@babel/plugin-syntax-typescript" "^7.27.1"
@@ -1082,62 +983,63 @@
     "@babel/helper-plugin-utils" "^7.27.1"
 
 "@babel/preset-env@^7.12.11", "@babel/preset-env@^7.20.2":
-  version "7.27.2"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.27.2.tgz#106e6bfad92b591b1f6f76fd4cf13b7725a7bf9a"
-  integrity sha512-Ma4zSuYSlGNRlCLO+EAzLnCmJK2vdstgv+n7aUP+/IKZrOfWHOJVdSJtuub8RzHTj3ahD37k5OKJWvzf16TQyQ==
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.28.5.tgz#82dd159d1563f219a1ce94324b3071eb89e280b0"
+  integrity sha512-S36mOoi1Sb6Fz98fBfE+UZSpYw5mJm0NUHtIKrOuNcqeFauy1J6dIvXm2KRVKobOSaGq4t/hBXdN4HGU3wL9Wg==
   dependencies:
-    "@babel/compat-data" "^7.27.2"
+    "@babel/compat-data" "^7.28.5"
     "@babel/helper-compilation-targets" "^7.27.2"
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/helper-validator-option" "^7.27.1"
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.27.1"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.28.5"
     "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.27.1"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.27.1"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.27.1"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.27.1"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.28.3"
     "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-import-assertions" "^7.27.1"
     "@babel/plugin-syntax-import-attributes" "^7.27.1"
     "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
     "@babel/plugin-transform-arrow-functions" "^7.27.1"
-    "@babel/plugin-transform-async-generator-functions" "^7.27.1"
+    "@babel/plugin-transform-async-generator-functions" "^7.28.0"
     "@babel/plugin-transform-async-to-generator" "^7.27.1"
     "@babel/plugin-transform-block-scoped-functions" "^7.27.1"
-    "@babel/plugin-transform-block-scoping" "^7.27.1"
+    "@babel/plugin-transform-block-scoping" "^7.28.5"
     "@babel/plugin-transform-class-properties" "^7.27.1"
-    "@babel/plugin-transform-class-static-block" "^7.27.1"
-    "@babel/plugin-transform-classes" "^7.27.1"
+    "@babel/plugin-transform-class-static-block" "^7.28.3"
+    "@babel/plugin-transform-classes" "^7.28.4"
     "@babel/plugin-transform-computed-properties" "^7.27.1"
-    "@babel/plugin-transform-destructuring" "^7.27.1"
+    "@babel/plugin-transform-destructuring" "^7.28.5"
     "@babel/plugin-transform-dotall-regex" "^7.27.1"
     "@babel/plugin-transform-duplicate-keys" "^7.27.1"
     "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.27.1"
     "@babel/plugin-transform-dynamic-import" "^7.27.1"
-    "@babel/plugin-transform-exponentiation-operator" "^7.27.1"
+    "@babel/plugin-transform-explicit-resource-management" "^7.28.0"
+    "@babel/plugin-transform-exponentiation-operator" "^7.28.5"
     "@babel/plugin-transform-export-namespace-from" "^7.27.1"
     "@babel/plugin-transform-for-of" "^7.27.1"
     "@babel/plugin-transform-function-name" "^7.27.1"
     "@babel/plugin-transform-json-strings" "^7.27.1"
     "@babel/plugin-transform-literals" "^7.27.1"
-    "@babel/plugin-transform-logical-assignment-operators" "^7.27.1"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.28.5"
     "@babel/plugin-transform-member-expression-literals" "^7.27.1"
     "@babel/plugin-transform-modules-amd" "^7.27.1"
     "@babel/plugin-transform-modules-commonjs" "^7.27.1"
-    "@babel/plugin-transform-modules-systemjs" "^7.27.1"
+    "@babel/plugin-transform-modules-systemjs" "^7.28.5"
     "@babel/plugin-transform-modules-umd" "^7.27.1"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.27.1"
     "@babel/plugin-transform-new-target" "^7.27.1"
     "@babel/plugin-transform-nullish-coalescing-operator" "^7.27.1"
     "@babel/plugin-transform-numeric-separator" "^7.27.1"
-    "@babel/plugin-transform-object-rest-spread" "^7.27.2"
+    "@babel/plugin-transform-object-rest-spread" "^7.28.4"
     "@babel/plugin-transform-object-super" "^7.27.1"
     "@babel/plugin-transform-optional-catch-binding" "^7.27.1"
-    "@babel/plugin-transform-optional-chaining" "^7.27.1"
-    "@babel/plugin-transform-parameters" "^7.27.1"
+    "@babel/plugin-transform-optional-chaining" "^7.28.5"
+    "@babel/plugin-transform-parameters" "^7.27.7"
     "@babel/plugin-transform-private-methods" "^7.27.1"
     "@babel/plugin-transform-private-property-in-object" "^7.27.1"
     "@babel/plugin-transform-property-literals" "^7.27.1"
-    "@babel/plugin-transform-regenerator" "^7.27.1"
+    "@babel/plugin-transform-regenerator" "^7.28.4"
     "@babel/plugin-transform-regexp-modifiers" "^7.27.1"
     "@babel/plugin-transform-reserved-words" "^7.27.1"
     "@babel/plugin-transform-shorthand-properties" "^7.27.1"
@@ -1150,10 +1052,10 @@
     "@babel/plugin-transform-unicode-regex" "^7.27.1"
     "@babel/plugin-transform-unicode-sets-regex" "^7.27.1"
     "@babel/preset-modules" "0.1.6-no-external-plugins"
-    babel-plugin-polyfill-corejs2 "^0.4.10"
-    babel-plugin-polyfill-corejs3 "^0.11.0"
-    babel-plugin-polyfill-regenerator "^0.6.1"
-    core-js-compat "^3.40.0"
+    babel-plugin-polyfill-corejs2 "^0.4.14"
+    babel-plugin-polyfill-corejs3 "^0.13.0"
+    babel-plugin-polyfill-regenerator "^0.6.5"
+    core-js-compat "^3.43.0"
     semver "^6.3.1"
 
 "@babel/preset-modules@0.1.6-no-external-plugins":
@@ -1166,34 +1068,34 @@
     esutils "^2.0.2"
 
 "@babel/preset-react@^7.12.10", "@babel/preset-react@^7.18.6":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.27.1.tgz#86ea0a5ca3984663f744be2fd26cb6747c3fd0ec"
-  integrity sha512-oJHWh2gLhU9dW9HHr42q0cI0/iHHXTLGe39qvpAZZzagHy0MzYLCnCVV0symeRvzmjHyVU7mw2K06E6u/JwbhA==
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.28.5.tgz#6fcc0400fa79698433d653092c3919bb4b0878d9"
+  integrity sha512-Z3J8vhRq7CeLjdC58jLv4lnZ5RKFUJWqH5emvxmv9Hv3BD1T9R/Im713R4MTKwvFaV74ejZ3sM01LyEKk4ugNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/helper-validator-option" "^7.27.1"
-    "@babel/plugin-transform-react-display-name" "^7.27.1"
+    "@babel/plugin-transform-react-display-name" "^7.28.0"
     "@babel/plugin-transform-react-jsx" "^7.27.1"
     "@babel/plugin-transform-react-jsx-development" "^7.27.1"
     "@babel/plugin-transform-react-pure-annotations" "^7.27.1"
 
 "@babel/preset-typescript@^7.12.7", "@babel/preset-typescript@^7.21.0":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.27.1.tgz#190742a6428d282306648a55b0529b561484f912"
-  integrity sha512-l7WfQfX0WK4M0v2RudjuQK4u99BS6yLHYEmdtVPP7lKV013zr9DygFuWNlnbvQ9LR+LS0Egz/XAvGx5U9MX0fQ==
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.28.5.tgz#540359efa3028236958466342967522fd8f2a60c"
+  integrity sha512-+bQy5WOI2V6LJZpPVxY+yp66XdZ2yifu0Mc1aP5CQKgjn4QM5IN2i5fAZ4xKop47pr8rpVhiAeu+nDQa12C8+g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/helper-validator-option" "^7.27.1"
     "@babel/plugin-syntax-jsx" "^7.27.1"
     "@babel/plugin-transform-modules-commonjs" "^7.27.1"
-    "@babel/plugin-transform-typescript" "^7.27.1"
+    "@babel/plugin-transform-typescript" "^7.28.5"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.9", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.3.tgz#10491113799fb8d77e1d9273384d5d68deeea8f6"
-  integrity sha512-7EYtGezsdiDMyY80+65EzwiGmcJqpmcZCojSXaRgdrBaGtWTgDZKq69cPIVped6MkIM78cTQ2GOiEYjwOlG4xw==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.9", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326"
+  integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==
 
-"@babel/template@^7.25.7", "@babel/template@^7.27.1", "@babel/template@^7.27.2", "@babel/template@^7.3.3":
+"@babel/template@^7.27.1", "@babel/template@^7.27.2":
   version "7.27.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
   integrity sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==
@@ -1202,68 +1104,41 @@
     "@babel/parser" "^7.27.2"
     "@babel/types" "^7.27.1"
 
-"@babel/template@^7.26.9", "@babel/template@^7.27.0":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.0.tgz#b253e5406cc1df1c57dcd18f11760c2dbf40c0b4"
-  integrity sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==
-  dependencies:
-    "@babel/code-frame" "^7.26.2"
-    "@babel/parser" "^7.27.0"
-    "@babel/types" "^7.27.0"
-
 "@babel/traverse@^7.18.5":
-  version "7.25.7"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.7.tgz#83e367619be1cab8e4f2892ef30ba04c26a40fa8"
-  integrity sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==
-  dependencies:
-    "@babel/code-frame" "^7.25.7"
-    "@babel/generator" "^7.25.7"
-    "@babel/parser" "^7.25.7"
-    "@babel/template" "^7.25.7"
-    "@babel/types" "^7.25.7"
-    debug "^4.3.1"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.25.9", "@babel/traverse@^7.26.5":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.27.0.tgz#11d7e644779e166c0442f9a07274d02cd91d4a70"
-  integrity sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==
-  dependencies:
-    "@babel/code-frame" "^7.26.2"
-    "@babel/generator" "^7.27.0"
-    "@babel/parser" "^7.27.0"
-    "@babel/template" "^7.27.0"
-    "@babel/types" "^7.27.0"
-    debug "^4.3.1"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.26.9":
-  version "7.26.10"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.10.tgz#43cca33d76005dbaa93024fae536cc1946a4c380"
-  integrity sha512-k8NuDrxr0WrPH5Aupqb2LCVURP/S0vBEn5mK6iH+GIYob66U5EtoZvcdudR2jQ4cmTwhEwW1DLB+Yyas9zjF6A==
-  dependencies:
-    "@babel/code-frame" "^7.26.2"
-    "@babel/generator" "^7.26.10"
-    "@babel/parser" "^7.26.10"
-    "@babel/template" "^7.26.9"
-    "@babel/types" "^7.26.10"
-    debug "^4.3.1"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.27.1", "@babel/traverse@^7.27.3":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.27.3.tgz#8b62a6c2d10f9d921ba7339c90074708509cffae"
-  integrity sha512-lId/IfN/Ye1CIu8xG7oKBHXd2iNb2aW1ilPszzGcJug6M8RCKfVNcYhpI5+bMvFYjK7lXIM0R+a+6r8xhHp2FQ==
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.4.tgz#8d456101b96ab175d487249f60680221692b958b"
+  integrity sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==
   dependencies:
     "@babel/code-frame" "^7.27.1"
-    "@babel/generator" "^7.27.3"
-    "@babel/parser" "^7.27.3"
+    "@babel/generator" "^7.28.3"
+    "@babel/helper-globals" "^7.28.0"
+    "@babel/parser" "^7.28.4"
     "@babel/template" "^7.27.2"
-    "@babel/types" "^7.27.3"
+    "@babel/types" "^7.28.4"
     debug "^4.3.1"
-    globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.25.8", "@babel/types@^7.3.3":
+"@babel/traverse@^7.27.1", "@babel/traverse@^7.28.0", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.4", "@babel/traverse@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.5.tgz#450cab9135d21a7a2ca9d2d35aa05c20e68c360b"
+  integrity sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.28.5"
+    "@babel/helper-globals" "^7.28.0"
+    "@babel/parser" "^7.28.5"
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.28.5"
+    debug "^4.3.1"
+
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.28.2", "@babel/types@^7.28.4", "@babel/types@^7.28.5", "@babel/types@^7.4.4":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.5.tgz#10fc405f60897c35f07e85493c932c7b5ca0592b"
+  integrity sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==
+  dependencies:
+    "@babel/helper-string-parser" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.28.5"
+
+"@babel/types@^7.21.3":
   version "7.25.8"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.8.tgz#5cf6037258e8a9bcad533f4979025140cb9993e1"
   integrity sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==
@@ -1272,34 +1147,10 @@
     "@babel/helper-validator-identifier" "^7.25.7"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.25.7":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.0.tgz#deabd08d6b753bc8e0f198f8709fb575e31774ff"
-  integrity sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==
-  dependencies:
-    "@babel/helper-string-parser" "^7.25.9"
-    "@babel/helper-validator-identifier" "^7.25.9"
-
-"@babel/types@^7.25.9", "@babel/types@^7.4.4":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.27.1.tgz#9defc53c16fc899e46941fc6901a9eea1c9d8560"
-  integrity sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==
-  dependencies:
-    "@babel/helper-string-parser" "^7.27.1"
-    "@babel/helper-validator-identifier" "^7.27.1"
-
-"@babel/types@^7.26.10", "@babel/types@^7.27.0":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.27.0.tgz#ef9acb6b06c3173f6632d993ecb6d4ae470b4559"
-  integrity sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==
-  dependencies:
-    "@babel/helper-string-parser" "^7.25.9"
-    "@babel/helper-validator-identifier" "^7.25.9"
-
-"@babel/types@^7.27.1", "@babel/types@^7.27.3":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.27.3.tgz#c0257bedf33aad6aad1f406d35c44758321eb3ec"
-  integrity sha512-Y1GkI4ktrtvmawoSq+4FCVHNryea6uR+qUQy0AGxLSsjCX0nVmkYQMBLHDkXZuo5hGx7eYdnIaslsdBFm7zbUw==
+"@babel/types@^7.25.8":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.4.tgz#0a4e618f4c60a7cd6c11cb2d48060e4dbe38ac3a"
+  integrity sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==
   dependencies:
     "@babel/helper-string-parser" "^7.27.1"
     "@babel/helper-validator-identifier" "^7.27.1"
@@ -1314,22 +1165,33 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@casualbot/jest-sonar-reporter@2.2.7":
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/@casualbot/jest-sonar-reporter/-/jest-sonar-reporter-2.2.7.tgz#3cc14c64f5d8ab5e9163b03b9cd2e07456432ed0"
-  integrity sha512-iswhPNodtcOQzfXR3TkD0A/8yHr5fnC86Ryt5UAqrJWfMI8mPZ9mpjykHnibbf91SjNtELv7ApZtha0bdWOmoQ==
+"@cacheable/memory@^2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@cacheable/memory/-/memory-2.0.6.tgz#de6679d26ffcfa1674c4bb40b97815b0f67839d5"
+  integrity sha512-7e8SScMocHxcAb8YhtkbMhGG+EKLRIficb1F5sjvhSYsWTZGxvg4KIDp8kgxnV2PUJ3ddPe6J9QESjKvBWRDkg==
+  dependencies:
+    "@cacheable/utils" "^2.3.2"
+    "@keyv/bigmap" "^1.3.0"
+    hookified "^1.13.0"
+    keyv "^5.5.4"
+
+"@cacheable/utils@^2.3.2":
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/@cacheable/utils/-/utils-2.3.2.tgz#8d76faef710840c391a1a35183967028c0c521f0"
+  integrity sha512-8kGE2P+HjfY8FglaOiW+y8qxcaQAfAhVML+i66XJR3YX5FtyDqn6Txctr3K2FrbxLKixRRYYBWMbuGciOhYNDg==
+  dependencies:
+    hashery "^1.2.0"
+    keyv "^5.5.4"
+
+"@casualbot/jest-sonar-reporter@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@casualbot/jest-sonar-reporter/-/jest-sonar-reporter-2.5.0.tgz#1c5efc189d57422300034b3551287321ac4d093f"
+  integrity sha512-2/kaSndRYHPqxrnWLszHCzKD5kkmoDq9X54x68ghSxLWzLDEwKzTRiJcRsjRHtqOeMJmwf0EgS/nuv/1BDGI8g==
   dependencies:
     mkdirp "1.0.4"
     uuid "8.3.2"
     xml "1.0.1"
 
-"@cspotcode/source-map-support@^0.8.0":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
-  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
-  dependencies:
-    "@jridgewell/trace-mapping" "0.3.9"
-
 "@csstools/cascade-layer-name-parser@^2.0.4":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-2.0.4.tgz#64d128529397aa1e1c986f685713363b262b81b1"
@@ -1340,11 +1202,21 @@
   resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-5.0.1.tgz#829f1c76f5800b79c51c709e2f36821b728e0e10"
   integrity sha512-MKtmkA0BX87PKaO1NFRTFH+UnkgnmySQOvNxJubsadusqPEC2aJ9MOQiMceZJJ6oitUl/i0L6u0M1IrmAOmgBA==
 
+"@csstools/color-helpers@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-5.1.0.tgz#106c54c808cabfd1ab4c602d8505ee584c2996ef"
+  integrity sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==
+
 "@csstools/css-calc@^2.1.1":
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.1.tgz#a7dbc66627f5cf458d42aed14bda0d3860562383"
   integrity sha512-rL7kaUnTkL9K+Cvo2pnCieqNpTKgQzy5f+N+5Iuko9HAoasP+xgprVh7KN/MaJVvVL1l0EzQq2MoqBHKSrDrag==
 
+"@csstools/css-calc@^2.1.3", "@csstools/css-calc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.4.tgz#8473f63e2fcd6e459838dd412401d5948f224c65"
+  integrity sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==
+
 "@csstools/css-color-parser@^3.0.7":
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.0.7.tgz#442d61d58e54ad258d52c309a787fceb33906484"
@@ -1353,20 +1225,33 @@
     "@csstools/color-helpers" "^5.0.1"
     "@csstools/css-calc" "^2.1.1"
 
-"@csstools/css-parser-algorithms@^3.0.4":
+"@csstools/css-color-parser@^3.0.9":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz#4e386af3a99dd36c46fef013cfe4c1c341eed6f0"
+  integrity sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==
+  dependencies:
+    "@csstools/color-helpers" "^5.1.0"
+    "@csstools/css-calc" "^2.1.4"
+
+"@csstools/css-parser-algorithms@^3.0.4", "@csstools/css-parser-algorithms@^3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz#5755370a9a29abaec5515b43c8b3f2cf9c2e3076"
+  integrity sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==
+
+"@csstools/css-syntax-patches-for-csstree@^1.0.19":
+  version "1.0.20"
+  resolved "https://registry.yarnpkg.com/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.20.tgz#b14db34a759b3446b01d7981b4765f92b2d420ae"
+  integrity sha512-8BHsjXfSciZxjmHQOuVdW2b8WLUPts9a+mfL13/PzEviufUEW2xnvQuOlKs9dRBHgRqJ53SF/DUoK9+MZk72oQ==
+
+"@csstools/css-tokenizer@^3.0.3", "@csstools/css-tokenizer@^3.0.4":
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz#74426e93bd1c4dcab3e441f5cc7ba4fb35d94356"
-  integrity sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==
+  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz#333fedabc3fd1a8e5d0100013731cf19e6a8c5d3"
+  integrity sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==
 
-"@csstools/css-tokenizer@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz#a5502c8539265fecbd873c1e395a890339f119c2"
-  integrity sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==
-
-"@csstools/media-query-list-parser@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.2.tgz#e80e17eba1693fceafb8d6f2cfc68c0e7a9ab78a"
-  integrity sha512-EUos465uvVvMJehckATTlNqGj4UJWkTmdWuDMjqvSUkjGpmOyFZBVwb4knxCm/k2GMTXY+c/5RkdndzFYWeX5A==
+"@csstools/media-query-list-parser@^4.0.2", "@csstools/media-query-list-parser@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.3.tgz#7aec77bcb89c2da80ef207e73f474ef9e1b3cdf1"
+  integrity sha512-HAYH7d3TLRHDOUQK4mZKf9k9Ph/m8Akstg66ywKR4SFAigjs3yBiUeZtFxywiTm5moZMAp/5W/ZuFnNXXYLuuQ==
 
 "@csstools/postcss-cascade-layers@^5.0.1":
   version "5.0.1"
@@ -1662,34 +1547,206 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz#f13c7c205915eb91ae54c557f5e92bddd8be0e83"
   integrity sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==
 
-"@dual-bundle/import-meta-resolve@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz#519c1549b0e147759e7825701ecffd25e5819f7b"
-  integrity sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==
+"@dual-bundle/import-meta-resolve@^4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.2.1.tgz#cd0b25b3808cd9e684cd6cd549bbf8e1dcf05ee7"
+  integrity sha512-id+7YRUgoUX6CgV0DtuhirQWodeeA7Lf4i2x71JS/vtA5pRb/hIGWlw+G6MeXvsM+MXrz0VAydTGElX1rAfgPg==
 
-"@element-hq/element-call-embedded@0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@element-hq/element-call-embedded/-/element-call-embedded-0.12.0.tgz#654da28610c758c6d1164bbfe61007a636357cca"
-  integrity sha512-p/ZymzOqrF5WDnt7ZIkpdtQwzUcwchykIGcU9quU1YkAwOCnGwqCwGmgG0YAvPEhqWAb4DVJ4qHL0ZZ+WqxAtQ==
+"@element-hq/element-call-embedded@0.16.3":
+  version "0.16.3"
+  resolved "https://registry.yarnpkg.com/@element-hq/element-call-embedded/-/element-call-embedded-0.16.3.tgz#2da120fd581534f7905f12415f8bcbcaa54785c0"
+  integrity sha512-OViKJonDaDNVBUW9WdV9mk78/Ruh34C7XsEgt3O8D9z+64C39elbIgllHSoH5S12IRlv9RYrrV37FZLo6QWsDQ==
 
-"@element-hq/element-web-module-api@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@element-hq/element-web-module-api/-/element-web-module-api-1.0.0.tgz#df09108b0346a44ad2898c603d1a6cda5f50d80b"
-  integrity sha512-FYId5tYgaKvpqAXRXqs0pY4+7/A09bEl1mCxFqlS9jlZOCjlMZVvZuv8spbY8ZN9HaMvuVmx9J00Fn2gCJd0TQ==
+"@element-hq/element-web-module-api@1.9.0", "@element-hq/element-web-module-api@^1.8.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@element-hq/element-web-module-api/-/element-web-module-api-1.9.0.tgz#2e4fcc8809418c8670d4f0576bc4a9a235bc6c50"
+  integrity sha512-Ao/V9w+wysZK4bh61LlKlznF10n2ZbD6KcUI46/zUMttXbmJn3ahvbzhEpwYcD+Cjy3ag5ycxLIIGkKV/fncXg==
 
-"@element-hq/element-web-playwright-common@^1.1.5":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@element-hq/element-web-playwright-common/-/element-web-playwright-common-1.2.0.tgz#63808520825899701d9359001430e91b0ca6d1e0"
-  integrity sha512-I+W+0PThZkwwfP03xT19q6C0jrMqSimD+6QjsKV+DdwJyoJrFfhHD10jil8dWelDMwrhyfk+qLiu6Go7UDgaog==
+"@element-hq/element-web-playwright-common@^2.0.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@element-hq/element-web-playwright-common/-/element-web-playwright-common-2.1.0.tgz#86e8a5632f8cc8bb393a1ec1b793a6278cd5b2c7"
+  integrity sha512-Ah9aioownR5OxAX7IDzys7wqyFmojruqgiRr2oUTLbPA5Y6jUSKWdAu5AqGvi+PYr0kG6zQfdsruhe5FXW9YuQ==
   dependencies:
     "@axe-core/playwright" "^4.10.1"
     "@testcontainers/postgresql" "^11.0.0"
+    glob "^11.1.0"
     lodash-es "^4.17.21"
     mailpit-api "^1.2.0"
     strip-ansi "^7.1.0"
     testcontainers "^11.0.0"
     yaml "^2.7.0"
 
+"@element-hq/web-shared-components@link:packages/shared-components":
+  version "0.0.0"
+  uid ""
+
+"@emnapi/core@^1.4.3":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.7.0.tgz#135de4e8858763989112281bdf38ca02439db7c3"
+  integrity sha512-pJdKGq/1iquWYtv1RRSljZklxHCOCAJFJrImO5ZLKPJVJlVUcs8yFwNQlqS0Lo8xT1VAXXTCZocF9n26FWEKsw==
+  dependencies:
+    "@emnapi/wasi-threads" "1.1.0"
+    tslib "^2.4.0"
+
+"@emnapi/core@^1.7.1":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.7.1.tgz#3a79a02dbc84f45884a1806ebb98e5746bdfaac4"
+  integrity sha512-o1uhUASyo921r2XtHYOHy7gdkGLge8ghBEQHMWmyJFoXlpU58kIrhhN3w26lpQb6dspetweapMn2CSNwQ8I4wg==
+  dependencies:
+    "@emnapi/wasi-threads" "1.1.0"
+    tslib "^2.4.0"
+
+"@emnapi/runtime@^1.4.3":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.7.0.tgz#d7ef3832df8564fe5903bf0567aedbd19538ecbe"
+  integrity sha512-oAYoQnCYaQZKVS53Fq23ceWMRxq5EhQsE0x0RdQ55jT7wagMu5k+fS39v1fiSLrtrLQlXwVINenqhLMtTrV/1Q==
+  dependencies:
+    tslib "^2.4.0"
+
+"@emnapi/runtime@^1.7.1":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.7.1.tgz#a73784e23f5d57287369c808197288b52276b791"
+  integrity sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA==
+  dependencies:
+    tslib "^2.4.0"
+
+"@emnapi/wasi-threads@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz#60b2102fddc9ccb78607e4a3cf8403ea69be41bf"
+  integrity sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==
+  dependencies:
+    tslib "^2.4.0"
+
+"@esbuild/aix-ppc64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz#521cbd968dcf362094034947f76fa1b18d2d403c"
+  integrity sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==
+
+"@esbuild/android-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz#61ea550962d8aa12a9b33194394e007657a6df57"
+  integrity sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==
+
+"@esbuild/android-arm@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.27.2.tgz#554887821e009dd6d853f972fde6c5143f1de142"
+  integrity sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==
+
+"@esbuild/android-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.27.2.tgz#a7ce9d0721825fc578f9292a76d9e53334480ba2"
+  integrity sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==
+
+"@esbuild/darwin-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz#2cb7659bd5d109803c593cfc414450d5430c8256"
+  integrity sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==
+
+"@esbuild/darwin-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz#e741fa6b1abb0cd0364126ba34ca17fd5e7bf509"
+  integrity sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==
+
+"@esbuild/freebsd-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz#2b64e7116865ca172d4ce034114c21f3c93e397c"
+  integrity sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==
+
+"@esbuild/freebsd-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz#e5252551e66f499e4934efb611812f3820e990bb"
+  integrity sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==
+
+"@esbuild/linux-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz#dc4acf235531cd6984f5d6c3b13dbfb7ddb303cb"
+  integrity sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==
+
+"@esbuild/linux-arm@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz#56a900e39240d7d5d1d273bc053daa295c92e322"
+  integrity sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==
+
+"@esbuild/linux-ia32@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz#d4a36d473360f6870efcd19d52bbfff59a2ed1cc"
+  integrity sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==
+
+"@esbuild/linux-loong64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz#fcf0ab8c3eaaf45891d0195d4961cb18b579716a"
+  integrity sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==
+
+"@esbuild/linux-mips64el@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz#598b67d34048bb7ee1901cb12e2a0a434c381c10"
+  integrity sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==
+
+"@esbuild/linux-ppc64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz#3846c5df6b2016dab9bc95dde26c40f11e43b4c0"
+  integrity sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==
+
+"@esbuild/linux-riscv64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz#173d4475b37c8d2c3e1707e068c174bb3f53d07d"
+  integrity sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==
+
+"@esbuild/linux-s390x@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz#f7a4790105edcab8a5a31df26fbfac1aa3dacfab"
+  integrity sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==
+
+"@esbuild/linux-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz#2ecc1284b1904aeb41e54c9ddc7fcd349b18f650"
+  integrity sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==
+
+"@esbuild/netbsd-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz#e2863c2cd1501845995cb11adf26f7fe4be527b0"
+  integrity sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==
+
+"@esbuild/netbsd-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz#93f7609e2885d1c0b5a1417885fba8d1fcc41272"
+  integrity sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==
+
+"@esbuild/openbsd-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz#a1985604a203cdc325fd47542e106fafd698f02e"
+  integrity sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==
+
+"@esbuild/openbsd-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz#8209e46c42f1ffbe6e4ef77a32e1f47d404ad42a"
+  integrity sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==
+
+"@esbuild/openharmony-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz#8fade4441893d9cc44cbd7dcf3776f508ab6fb2f"
+  integrity sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==
+
+"@esbuild/sunos-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz#980d4b9703a16f0f07016632424fc6d9a789dfc2"
+  integrity sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==
+
+"@esbuild/win32-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz#1c09a3633c949ead3d808ba37276883e71f6111a"
+  integrity sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==
+
+"@esbuild/win32-ia32@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz#1b1e3a63ad4bef82200fef4e369e0fff7009eee5"
+  integrity sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==
+
+"@esbuild/win32-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz#9e585ab6086bef994c6e8a5b3a0481219ada862b"
+  integrity sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==
+
 "@eslint-community/eslint-utils@^4.2.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
@@ -1697,24 +1754,17 @@
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/eslint-utils@^4.4.0":
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.6.1.tgz#e4c58fdcf0696e7a5f19c30201ed43123ab15abc"
-  integrity sha512-KTsJMmobmbrFLe3LDh0PC2FXpcSYJt/MLjlkh/9LEnmKYLSYmT/0EW9JWANjeoemiuZrmogti0tW5Ch+qNUYDw==
-  dependencies:
-    eslint-visitor-keys "^3.4.3"
-
-"@eslint-community/eslint-utils@^4.7.0":
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz#607084630c6c033992a082de6e6fbc1a8b52175a"
-  integrity sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==
+"@eslint-community/eslint-utils@^4.4.0", "@eslint-community/eslint-utils@^4.7.0", "@eslint-community/eslint-utils@^4.9.0":
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz#7308df158e064f0dd8b8fdb58aa14fa2a7f913b3"
+  integrity sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==
   dependencies:
     eslint-visitor-keys "^3.4.3"
 
 "@eslint-community/regexpp@^4.10.0":
-  version "4.12.1"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
-  integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
+  version "4.12.2"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz#bccdf615bcf7b6e8db830ec0b8d21c9a25de597b"
+  integrity sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==
 
 "@eslint-community/regexpp@^4.6.1":
   version "4.11.1"
@@ -1741,59 +1791,59 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
   integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
 
-"@floating-ui/core@^1.6.0":
-  version "1.6.8"
-  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.8.tgz#aa43561be075815879305965020f492cdb43da12"
-  integrity sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==
+"@floating-ui/core@^1.7.3":
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.7.3.tgz#462d722f001e23e46d86fd2bd0d21b7693ccb8b7"
+  integrity sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==
   dependencies:
-    "@floating-ui/utils" "^0.2.8"
+    "@floating-ui/utils" "^0.2.10"
 
-"@floating-ui/dom@^1.0.0":
-  version "1.6.11"
-  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.11.tgz#8631857838d34ee5712339eb7cbdfb8ad34da723"
-  integrity sha512-qkMCxSR24v2vGkhYDo/UzxfJN3D4syqSjyuTFz6C7XcpU1pASPRieNI0Kj5VP3/503mOfYiGY891ugBX1GlABQ==
+"@floating-ui/dom@^1.7.4":
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.7.4.tgz#ee667549998745c9c3e3e84683b909c31d6c9a77"
+  integrity sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==
   dependencies:
-    "@floating-ui/core" "^1.6.0"
-    "@floating-ui/utils" "^0.2.8"
+    "@floating-ui/core" "^1.7.3"
+    "@floating-ui/utils" "^0.2.10"
 
-"@floating-ui/react-dom@^2.0.0", "@floating-ui/react-dom@^2.1.2":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.1.2.tgz#a1349bbf6a0e5cb5ded55d023766f20a4d439a31"
-  integrity sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==
+"@floating-ui/react-dom@^2.0.0", "@floating-ui/react-dom@^2.1.6":
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.1.6.tgz#189f681043c1400561f62972f461b93f01bf2231"
+  integrity sha512-4JX6rEatQEvlmgU80wZyq9RT96HZJa88q8hp0pBd+LrczeDI4o6uA2M+uvxngVHo4Ihr8uibXxH6+70zhAFrVw==
   dependencies:
-    "@floating-ui/dom" "^1.0.0"
+    "@floating-ui/dom" "^1.7.4"
 
 "@floating-ui/react@^0.27.0":
-  version "0.27.0"
-  resolved "https://registry.yarnpkg.com/@floating-ui/react/-/react-0.27.0.tgz#e0931fd09374ab4b8ce1a1af5cb44d1ccd1bb95a"
-  integrity sha512-WLEksq7fJapXSJbmfiyq9pAW0a7ZFMEJToFE4oTDESxGjoa+nZu3YMjmZE2KvoUtQhqOK2yMMfWQFZyeWD0wGQ==
+  version "0.27.16"
+  resolved "https://registry.yarnpkg.com/@floating-ui/react/-/react-0.27.16.tgz#6e485b5270b7a3296fdc4d0faf2ac9abf955a2f7"
+  integrity sha512-9O8N4SeG2z++TSM8QA/KTeKFBVCNEz/AGS7gWPJf6KFRzmRWixFRnCnkPHRDwSVZW6QPDO6uT0P2SpWNKCc9/g==
   dependencies:
-    "@floating-ui/react-dom" "^2.1.2"
-    "@floating-ui/utils" "^0.2.8"
+    "@floating-ui/react-dom" "^2.1.6"
+    "@floating-ui/utils" "^0.2.10"
     tabbable "^6.0.0"
 
-"@floating-ui/utils@^0.2.8":
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.8.tgz#21a907684723bbbaa5f0974cf7730bd797eb8e62"
-  integrity sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==
+"@floating-ui/utils@^0.2.10":
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.10.tgz#a2a1e3812d14525f725d011a73eceb41fef5bc1c"
+  integrity sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==
 
-"@fontsource/inconsolata@^5":
-  version "5.2.5"
-  resolved "https://registry.yarnpkg.com/@fontsource/inconsolata/-/inconsolata-5.2.5.tgz#8f220d83567dc27b7b54fd583044cb2ebbbd2759"
-  integrity sha512-OvzkZY5qYghv/jEV6cfGZzFhdFTvSnU+ExPC7WcZ7w8PdRhtiu/SpcBWOBt+3LXgS0n9qyepgq4zZmxlDTlGGQ==
+"@fontsource/fira-code@^5":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@fontsource/fira-code/-/fira-code-5.2.7.tgz#9ecbd909d53e7196a5d895b601747fe34491fc6a"
+  integrity sha512-tnB9NNund9TwIym8/7DMJe573nlPEQb+fKUV5GL8TBYXjIhDvL0D7mgmNVNQUPhXp+R7RylQeiBdkA4EbOHPGQ==
 
 "@fontsource/inter@^5":
-  version "5.2.5"
-  resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-5.2.5.tgz#69efffe6ccfae138cbe1806f41daa39cef986b59"
-  integrity sha512-kbsPKj0S4p44JdYRFiW78Td8Ge2sBVxi/PIBwmih+RpSXUdvS9nbs1HIiuUSPtRMi14CqLEZ/fbk7dj7vni1Sg==
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-5.2.8.tgz#10c95d877d972c7de5bd4592309d42fb6a5e1a5b"
+  integrity sha512-P6r5WnJoKiNVV+zvW2xM13gNdFhAEpQ9dQJHt3naLvfg+LkF2ldgSLiF4T41lf1SQCM9QmkqPTn4TH568IRagg==
 
-"@formatjs/ecma402-abstract@2.3.4":
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-2.3.4.tgz#e90c5a846ba2b33d92bc400fdd709da588280fbc"
-  integrity sha512-qrycXDeaORzIqNhBOx0btnhpD1c+/qFIHAN9znofuMJX6QBwtbrmlpWfD4oiUUD2vJUOIYFA/gYtg2KAMGG7sA==
+"@formatjs/ecma402-abstract@2.3.6":
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-2.3.6.tgz#d6ca9d3579054fe1e1a0a0b5e872e0d64922e4e1"
+  integrity sha512-HJnTFeRM2kVFVr5gr5kH1XP6K0JcJtE7Lzvtr3FS/so5f1kpsqqqxy5JF+FRaO6H2qmcMfAUIox7AJteieRtVw==
   dependencies:
     "@formatjs/fast-memoize" "2.2.7"
-    "@formatjs/intl-localematcher" "0.6.1"
+    "@formatjs/intl-localematcher" "0.6.2"
     decimal.js "^10.4.3"
     tslib "^2.8.0"
 
@@ -1804,78 +1854,28 @@
   dependencies:
     tslib "^2.8.0"
 
-"@formatjs/intl-localematcher@0.6.1":
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.6.1.tgz#25dc30675320bf65a9d7f73876fc1e4064c0e299"
-  integrity sha512-ePEgLgVCqi2BBFnTMWPfIghu6FkbZnnBVhO2sSxvLfrdFw7wCHAHiDoM2h4NRgjbaY7+B7HgOLZGkK187pZTZg==
+"@formatjs/intl-localematcher@0.6.2":
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.6.2.tgz#e9ebe0b4082d7d48e5b2d753579fb7ece4eaefea"
+  integrity sha512-XOMO2Hupl0wdd172Y06h6kLpBz6Dv+J4okPLl4LPtzbr8f66WbIoy4ev98EBuZ6ZK4h5ydTN6XneT4QVpD7cdA==
   dependencies:
     tslib "^2.8.0"
 
 "@formatjs/intl-segmenter@^11.5.7":
-  version "11.7.10"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-segmenter/-/intl-segmenter-11.7.10.tgz#31308d6d3a22f240f744b76fc5217fec464cf107"
-  integrity sha512-P938HeVcdhFFShvBEZWlQF1t6ES9CnwPgeGboLspc0p5q9rCjQ6atNEkLZoDjes0MKAWbgJzTsPjNjTh4ggqoA==
+  version "11.7.12"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-segmenter/-/intl-segmenter-11.7.12.tgz#eed3e2166a342495dd823b59781560d379d28d6c"
+  integrity sha512-3QefVKh5HvaKU80lAFmqUsWmKYWcpiDymsc0HwFvhuVl0dAnMhtbNmzMN50UiC7ZsnbybelNGrm9GZPp4kbbZA==
   dependencies:
-    "@formatjs/ecma402-abstract" "2.3.4"
-    "@formatjs/intl-localematcher" "0.6.1"
+    "@formatjs/ecma402-abstract" "2.3.6"
+    "@formatjs/intl-localematcher" "0.6.2"
     tslib "^2.8.0"
 
-"@giphy/colors@*":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@giphy/colors/-/colors-1.0.1.tgz#0451377909293d7a019e1fe2aca7e6b9326988b8"
-  integrity sha512-CMUY2UR8Ujl/wTRVjwu9spss6Cf2qkQNATKfoWCTWQp7CXdSfPWUDepp0c0/F0n7lYphLFvD9qzOC4NSdBt7nw==
-
-"@giphy/js-analytics@*":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@giphy/js-analytics/-/js-analytics-5.0.0.tgz#6cde6bdca17dbee910e21a206415965a6ce49493"
-  integrity sha512-jBZG6OqyMWB6meLi8Sz3iLplXYnhkbj+DJhS4ChmRX8Y6UA7i5dbbsUN/So1s7tTjhZOvu0rxA6rWJE73S1FvQ==
-  dependencies:
-    "@giphy/js-types" "*"
-    "@giphy/js-util" "*"
-    append-query "^2.1.0"
-    throttle-debounce "^3.0.1"
-
-"@giphy/js-fetch-api@*", "@giphy/js-fetch-api@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@giphy/js-fetch-api/-/js-fetch-api-5.6.0.tgz#5658c18f67fcb9ad0ddad21acd5ad5392ed3aaf9"
-  integrity sha512-hKZ7XZWGSzR29ISW1f6LWeVZ7GgWwhVuZprPMj3nrhHT6RkmkKghIP/yXKpWyhfTyAVgjeNGq0T/fAmGNKRvGQ==
-  dependencies:
-    "@giphy/js-types" "*"
-    "@giphy/js-util" "*"
-
-"@giphy/js-types@*":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@giphy/js-types/-/js-types-5.1.0.tgz#af7c7d3b8190bf89e25da0e693935871b2c53b0b"
-  integrity sha512-BZYCDtYNRR7cUWkbDLB4wmm3qmWMsVCQdUiBNOfmZ3yAazCgygKJoDI/5Rq4CK5MBaOc5LVdF8viC2WtoBdaPA==
-
-"@giphy/js-util@*":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@giphy/js-util/-/js-util-5.2.0.tgz#864b8495daa1e5cef773bf6bb80488558c4e04fe"
-  integrity sha512-Qt7pGh2cqiNmXLeWAgb459wK8+BuMLtIxTfg4ZksnPHPsLthiHT9hhzs2QhqUh7Pp/HOq+Cbv2etGDfnq+xiKA==
-  dependencies:
-    "@giphy/js-types" "*"
-    uuid "^9.0.0"
-
-"@giphy/react-components@^10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@giphy/react-components/-/react-components-10.0.1.tgz#1b8e82ac8bcc1f6a34c5cf2cf2e37393fcff2400"
-  integrity sha512-JFAkB45zTLhen2mmO+mApJtjEr4OVPLXYByDSN1FJQNgKc6xJ86Hk5+YOHNXuXa1NLXtGBlvXUAcz3oxKyfgHw==
-  dependencies:
-    "@giphy/colors" "*"
-    "@giphy/js-analytics" "*"
-    "@giphy/js-fetch-api" "*"
-    "@giphy/js-types" "*"
-    "@giphy/js-util" "*"
-    intersection-observer "^0.12.2"
-    react-use "17.6.0"
-    throttle-debounce "^3.0.1"
-
 "@grpc/grpc-js@^1.11.1":
-  version "1.13.4"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.13.4.tgz#922fbc496e229c5fa66802d2369bf181c1df1c5a"
-  integrity sha512-GsFaMXCkMqkKIvwCQjCrwH+GHbPKBjhwo/8ZuUkWHqbI73Kky9I+pQltrlT0+MWpedCoosda53lgjYfyEPgxBg==
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.14.2.tgz#d245069181a1a8057abd35522d6052482730cf19"
+  integrity sha512-QzVUtEFyu05UNx2xr0fCQmStUO17uVQhGNowtxs00IgTZT6/W2PBLfUkj30s0FKJ29VtTa3ArVNIhNP6akQhqA==
   dependencies:
-    "@grpc/proto-loader" "^0.7.13"
+    "@grpc/proto-loader" "^0.8.0"
     "@js-sdsl/ordered-map" "^4.4.2"
 
 "@grpc/proto-loader@^0.7.13":
@@ -1888,6 +1888,16 @@
     protobufjs "^7.2.5"
     yargs "^17.7.2"
 
+"@grpc/proto-loader@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.8.0.tgz#b6c324dd909c458a0e4aa9bfd3d69cf78a4b9bd8"
+  integrity sha512-rc1hOQtjIWGxcxpb9aHAfLpIctjEnsDehj0DAiVfBlmT84uvR0uUtN2hEi/ecvWVjXUGf5qPF4qEgiLOx1YIMQ==
+  dependencies:
+    lodash.camelcase "^4.3.0"
+    long "^5.0.0"
+    protobufjs "^7.5.3"
+    yargs "^17.7.2"
+
 "@humanwhocodes/config-array@^0.13.0":
   version "0.13.0"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
@@ -1907,6 +1917,18 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
   integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
+"@isaacs/balanced-match@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz#3081dadbc3460661b751e7591d7faea5df39dd29"
+  integrity sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==
+
+"@isaacs/brace-expansion@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz#4b3dabab7d8e75a429414a96bd67bf4c1d13e0f3"
+  integrity sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==
+  dependencies:
+    "@isaacs/balanced-match" "^4.0.1"
+
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
@@ -1935,239 +1957,283 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jest/console@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.7.0.tgz#cd4822dbdb84529265c5a2bdb529a3c9cc950ffc"
-  integrity sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==
+"@jest/console@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-30.2.0.tgz#c52fcd5b58fdd2e8eb66b2fd8ae56f2f64d05b28"
+  integrity sha512-+O1ifRjkvYIkBqASKWgLxrpEhQAAE7hY77ALLUufSk5717KfOShg6IbqLmdsLMPdUiFvA2kTs0R7YZy+l0IzZQ==
   dependencies:
-    "@jest/types" "^29.6.3"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
-    chalk "^4.0.0"
-    jest-message-util "^29.7.0"
-    jest-util "^29.7.0"
+    chalk "^4.1.2"
+    jest-message-util "30.2.0"
+    jest-util "30.2.0"
     slash "^3.0.0"
 
-"@jest/core@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.7.0.tgz#b6cccc239f30ff36609658c5a5e2291757ce448f"
-  integrity sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==
+"@jest/core@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-30.2.0.tgz#813d59faa5abd5510964a8b3a7b17cc77b775275"
+  integrity sha512-03W6IhuhjqTlpzh/ojut/pDB2LPRygyWX8ExpgHtQA8H/3K7+1vKmcINx5UzeOX1se6YEsBsOHQ1CRzf3fOwTQ==
   dependencies:
-    "@jest/console" "^29.7.0"
-    "@jest/reporters" "^29.7.0"
-    "@jest/test-result" "^29.7.0"
-    "@jest/transform" "^29.7.0"
-    "@jest/types" "^29.6.3"
+    "@jest/console" "30.2.0"
+    "@jest/pattern" "30.0.1"
+    "@jest/reporters" "30.2.0"
+    "@jest/test-result" "30.2.0"
+    "@jest/transform" "30.2.0"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.9"
-    jest-changed-files "^29.7.0"
-    jest-config "^29.7.0"
-    jest-haste-map "^29.7.0"
-    jest-message-util "^29.7.0"
-    jest-regex-util "^29.6.3"
-    jest-resolve "^29.7.0"
-    jest-resolve-dependencies "^29.7.0"
-    jest-runner "^29.7.0"
-    jest-runtime "^29.7.0"
-    jest-snapshot "^29.7.0"
-    jest-util "^29.7.0"
-    jest-validate "^29.7.0"
-    jest-watcher "^29.7.0"
-    micromatch "^4.0.4"
-    pretty-format "^29.7.0"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
+    ci-info "^4.2.0"
+    exit-x "^0.2.2"
+    graceful-fs "^4.2.11"
+    jest-changed-files "30.2.0"
+    jest-config "30.2.0"
+    jest-haste-map "30.2.0"
+    jest-message-util "30.2.0"
+    jest-regex-util "30.0.1"
+    jest-resolve "30.2.0"
+    jest-resolve-dependencies "30.2.0"
+    jest-runner "30.2.0"
+    jest-runtime "30.2.0"
+    jest-snapshot "30.2.0"
+    jest-util "30.2.0"
+    jest-validate "30.2.0"
+    jest-watcher "30.2.0"
+    micromatch "^4.0.8"
+    pretty-format "30.2.0"
     slash "^3.0.0"
-    strip-ansi "^6.0.0"
 
-"@jest/environment@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7"
-  integrity sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==
+"@jest/diff-sequences@30.0.1":
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/diff-sequences/-/diff-sequences-30.0.1.tgz#0ededeae4d071f5c8ffe3678d15f3a1be09156be"
+  integrity sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==
+
+"@jest/environment-jsdom-abstract@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment-jsdom-abstract/-/environment-jsdom-abstract-30.2.0.tgz#1313f9b3b509c31298c241203161b36622865181"
+  integrity sha512-kazxw2L9IPuZpQ0mEt9lu9Z98SqR74xcagANmMBU16X0lS23yPc0+S6hGLUz8kVRlomZEs/5S/Zlpqwf5yu6OQ==
   dependencies:
-    "@jest/fake-timers" "^29.7.0"
-    "@jest/types" "^29.6.3"
+    "@jest/environment" "30.2.0"
+    "@jest/fake-timers" "30.2.0"
+    "@jest/types" "30.2.0"
+    "@types/jsdom" "^21.1.7"
     "@types/node" "*"
-    jest-mock "^29.7.0"
+    jest-mock "30.2.0"
+    jest-util "30.2.0"
 
-"@jest/expect-utils@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.7.0.tgz#023efe5d26a8a70f21677d0a1afc0f0a44e3a1c6"
-  integrity sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==
+"@jest/environment@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-30.2.0.tgz#1e673cdb8b93ded707cf6631b8353011460831fa"
+  integrity sha512-/QPTL7OBJQ5ac09UDRa3EQes4gt1FTEG/8jZ/4v5IVzx+Cv7dLxlVIvfvSVRiiX2drWyXeBjkMSR8hvOWSog5g==
   dependencies:
-    jest-get-type "^29.6.3"
-
-"@jest/expect@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.7.0.tgz#76a3edb0cb753b70dfbfe23283510d3d45432bf2"
-  integrity sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==
-  dependencies:
-    expect "^29.7.0"
-    jest-snapshot "^29.7.0"
-
-"@jest/fake-timers@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.7.0.tgz#fd91bf1fffb16d7d0d24a426ab1a47a49881a565"
-  integrity sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==
-  dependencies:
-    "@jest/types" "^29.6.3"
-    "@sinonjs/fake-timers" "^10.0.2"
+    "@jest/fake-timers" "30.2.0"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
-    jest-message-util "^29.7.0"
-    jest-mock "^29.7.0"
-    jest-util "^29.7.0"
+    jest-mock "30.2.0"
 
-"@jest/globals@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.7.0.tgz#8d9290f9ec47ff772607fa864ca1d5a2efae1d4d"
-  integrity sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==
+"@jest/expect-utils@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-30.2.0.tgz#4f95413d4748454fdb17404bf1141827d15e6011"
+  integrity sha512-1JnRfhqpD8HGpOmQp180Fo9Zt69zNtC+9lR+kT7NVL05tNXIi+QC8Csz7lfidMoVLPD3FnOtcmp0CEFnxExGEA==
   dependencies:
-    "@jest/environment" "^29.7.0"
-    "@jest/expect" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    jest-mock "^29.7.0"
+    "@jest/get-type" "30.1.0"
 
-"@jest/reporters@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.7.0.tgz#04b262ecb3b8faa83b0b3d321623972393e8f4c7"
-  integrity sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==
+"@jest/expect@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-30.2.0.tgz#9a5968499bb8add2bbb09136f69f7df5ddbf3185"
+  integrity sha512-V9yxQK5erfzx99Sf+7LbhBwNWEZ9eZay8qQ9+JSC0TrMR1pMDHLMY+BnVPacWU6Jamrh252/IKo4F1Xn/zfiqA==
+  dependencies:
+    expect "30.2.0"
+    jest-snapshot "30.2.0"
+
+"@jest/fake-timers@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-30.2.0.tgz#0941ddc28a339b9819542495b5408622dc9e94ec"
+  integrity sha512-HI3tRLjRxAbBy0VO8dqqm7Hb2mIa8d5bg/NJkyQcOk7V118ObQML8RC5luTF/Zsg4474a+gDvhce7eTnP4GhYw==
+  dependencies:
+    "@jest/types" "30.2.0"
+    "@sinonjs/fake-timers" "^13.0.0"
+    "@types/node" "*"
+    jest-message-util "30.2.0"
+    jest-mock "30.2.0"
+    jest-util "30.2.0"
+
+"@jest/get-type@30.1.0":
+  version "30.1.0"
+  resolved "https://registry.yarnpkg.com/@jest/get-type/-/get-type-30.1.0.tgz#4fcb4dc2ebcf0811be1c04fd1cb79c2dba431cbc"
+  integrity sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==
+
+"@jest/globals@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-30.2.0.tgz#2f4b696d5862664b89c4ee2e49ae24d2bb7e0988"
+  integrity sha512-b63wmnKPaK+6ZZfpYhz9K61oybvbI1aMcIs80++JI1O1rR1vaxHUCNqo3ITu6NU0d4V34yZFoHMn/uoKr/Rwfw==
+  dependencies:
+    "@jest/environment" "30.2.0"
+    "@jest/expect" "30.2.0"
+    "@jest/types" "30.2.0"
+    jest-mock "30.2.0"
+
+"@jest/pattern@30.0.1":
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/pattern/-/pattern-30.0.1.tgz#d5304147f49a052900b4b853dedb111d080e199f"
+  integrity sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==
+  dependencies:
+    "@types/node" "*"
+    jest-regex-util "30.0.1"
+
+"@jest/reporters@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-30.2.0.tgz#a36b28fcbaf0c4595250b108e6f20e363348fd91"
+  integrity sha512-DRyW6baWPqKMa9CzeiBjHwjd8XeAyco2Vt8XbcLFjiwCOEKOvy82GJ8QQnJE9ofsxCMPjH4MfH8fCWIHHDKpAQ==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^29.7.0"
-    "@jest/test-result" "^29.7.0"
-    "@jest/transform" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    "@jridgewell/trace-mapping" "^0.3.18"
+    "@jest/console" "30.2.0"
+    "@jest/test-result" "30.2.0"
+    "@jest/transform" "30.2.0"
+    "@jest/types" "30.2.0"
+    "@jridgewell/trace-mapping" "^0.3.25"
     "@types/node" "*"
-    chalk "^4.0.0"
-    collect-v8-coverage "^1.0.0"
-    exit "^0.1.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
+    chalk "^4.1.2"
+    collect-v8-coverage "^1.0.2"
+    exit-x "^0.2.2"
+    glob "^10.3.10"
+    graceful-fs "^4.2.11"
     istanbul-lib-coverage "^3.0.0"
     istanbul-lib-instrument "^6.0.0"
     istanbul-lib-report "^3.0.0"
-    istanbul-lib-source-maps "^4.0.0"
+    istanbul-lib-source-maps "^5.0.0"
     istanbul-reports "^3.1.3"
-    jest-message-util "^29.7.0"
-    jest-util "^29.7.0"
-    jest-worker "^29.7.0"
+    jest-message-util "30.2.0"
+    jest-util "30.2.0"
+    jest-worker "30.2.0"
     slash "^3.0.0"
-    string-length "^4.0.1"
-    strip-ansi "^6.0.0"
+    string-length "^4.0.2"
     v8-to-istanbul "^9.0.1"
 
-"@jest/schemas@^29.6.3":
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
-  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
+"@jest/schemas@30.0.5":
+  version "30.0.5"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-30.0.5.tgz#7bdf69fc5a368a5abdb49fd91036c55225846473"
+  integrity sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==
   dependencies:
-    "@sinclair/typebox" "^0.27.8"
+    "@sinclair/typebox" "^0.34.0"
 
-"@jest/source-map@^29.6.3":
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.6.3.tgz#d90ba772095cf37a34a5eb9413f1b562a08554c4"
-  integrity sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==
+"@jest/snapshot-utils@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/snapshot-utils/-/snapshot-utils-30.2.0.tgz#387858eb90c2f98f67bff327435a532ac5309fbe"
+  integrity sha512-0aVxM3RH6DaiLcjj/b0KrIBZhSX1373Xci4l3cW5xiUWPctZ59zQ7jj4rqcJQ/Z8JuN/4wX3FpJSa3RssVvCug==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.18"
-    callsites "^3.0.0"
-    graceful-fs "^4.2.9"
+    "@jest/types" "30.2.0"
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
+    natural-compare "^1.4.0"
 
-"@jest/test-result@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.7.0.tgz#8db9a80aa1a097bb2262572686734baed9b1657c"
-  integrity sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==
+"@jest/source-map@30.0.1":
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-30.0.1.tgz#305ebec50468f13e658b3d5c26f85107a5620aaa"
+  integrity sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==
   dependencies:
-    "@jest/console" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    collect-v8-coverage "^1.0.0"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    callsites "^3.1.0"
+    graceful-fs "^4.2.11"
 
-"@jest/test-sequencer@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz#6cef977ce1d39834a3aea887a1726628a6f072ce"
-  integrity sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==
+"@jest/test-result@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-30.2.0.tgz#9c0124377fb7996cdffb86eda3dbc56eacab363d"
+  integrity sha512-RF+Z+0CCHkARz5HT9mcQCBulb1wgCP3FBvl9VFokMX27acKphwyQsNuWH3c+ojd1LeWBLoTYoxF0zm6S/66mjg==
   dependencies:
-    "@jest/test-result" "^29.7.0"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^29.7.0"
+    "@jest/console" "30.2.0"
+    "@jest/types" "30.2.0"
+    "@types/istanbul-lib-coverage" "^2.0.6"
+    collect-v8-coverage "^1.0.2"
+
+"@jest/test-sequencer@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-30.2.0.tgz#bf0066bc72e176d58f5dfa7f212b6e7eee44f221"
+  integrity sha512-wXKgU/lk8fKXMu/l5Hog1R61bL4q5GCdT6OJvdAFz1P+QrpoFuLU68eoKuVc4RbrTtNnTL5FByhWdLgOPSph+Q==
+  dependencies:
+    "@jest/test-result" "30.2.0"
+    graceful-fs "^4.2.11"
+    jest-haste-map "30.2.0"
     slash "^3.0.0"
 
-"@jest/transform@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.7.0.tgz#df2dd9c346c7d7768b8a06639994640c642e284c"
-  integrity sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==
+"@jest/transform@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-30.2.0.tgz#54bef1a4510dcbd58d5d4de4fe2980a63077ef2a"
+  integrity sha512-XsauDV82o5qXbhalKxD7p4TZYYdwcaEXC77PPD2HixEFF+6YGppjrAAQurTl2ECWcEomHBMMNS9AH3kcCFx8jA==
   dependencies:
-    "@babel/core" "^7.11.6"
-    "@jest/types" "^29.6.3"
-    "@jridgewell/trace-mapping" "^0.3.18"
-    babel-plugin-istanbul "^6.1.1"
-    chalk "^4.0.0"
+    "@babel/core" "^7.27.4"
+    "@jest/types" "30.2.0"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    babel-plugin-istanbul "^7.0.1"
+    chalk "^4.1.2"
     convert-source-map "^2.0.0"
     fast-json-stable-stringify "^2.1.0"
-    graceful-fs "^4.2.9"
-    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"
+    graceful-fs "^4.2.11"
+    jest-haste-map "30.2.0"
+    jest-regex-util "30.0.1"
+    jest-util "30.2.0"
+    micromatch "^4.0.8"
+    pirates "^4.0.7"
     slash "^3.0.0"
-    write-file-atomic "^4.0.2"
+    write-file-atomic "^5.0.1"
 
-"@jest/types@^29.6.3":
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
-  integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
+"@jest/types@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-30.2.0.tgz#1c678a7924b8f59eafd4c77d56b6d0ba976d62b8"
+  integrity sha512-H9xg1/sfVvyfU7o3zMfBEjQ1gcsdeTMgqHoYdN79tuLqfTtuu7WckRA1R5whDwOzxaZAeMKTYWqP+WCAi0CHsg==
   dependencies:
-    "@jest/schemas" "^29.6.3"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
+    "@jest/pattern" "30.0.1"
+    "@jest/schemas" "30.0.5"
+    "@types/istanbul-lib-coverage" "^2.0.6"
+    "@types/istanbul-reports" "^3.0.4"
     "@types/node" "*"
-    "@types/yargs" "^17.0.8"
-    chalk "^4.0.0"
+    "@types/yargs" "^17.0.33"
+    chalk "^4.1.2"
 
-"@jridgewell/gen-mapping@^0.3.5":
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz#4f0e06362e01362f823d348f1872b08f666d8142"
-  integrity sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==
+"@joshwooding/vite-plugin-react-docgen-typescript@0.6.1":
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/@joshwooding/vite-plugin-react-docgen-typescript/-/vite-plugin-react-docgen-typescript-0.6.1.tgz#f630b93ed13d5d07483c0ead42db793053b364a9"
+  integrity sha512-J4BaTocTOYFkMHIra1JDWrMWpNmBl4EkplIwHEsV8aeUOtdWjwSnln9U7twjMFTAEB7mptNtSKyVi1Y2W9sDJw==
   dependencies:
-    "@jridgewell/set-array" "^1.2.1"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
+    glob "^10.0.0"
+    magic-string "^0.30.0"
+    react-docgen-typescript "^2.2.2"
+
+"@jridgewell/gen-mapping@^0.3.12", "@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.13"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f"
+  integrity sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.5.0"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0":
+"@jridgewell/remapping@^2.3.5":
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/remapping/-/remapping-2.3.5.tgz#375c476d1972947851ba1e15ae8f123047445aa1"
+  integrity sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
+"@jridgewell/resolve-uri@^3.1.0":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
   integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
 
-"@jridgewell/set-array@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
-  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
-
 "@jridgewell/source-map@^0.3.3":
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a"
-  integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==
+  version "0.3.11"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.11.tgz#b21835cbd36db656b857c2ad02ebd413cc13a9ba"
+  integrity sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
 
-"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
-  integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
+"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15", "@jridgewell/sourcemap-codec@^1.5.0", "@jridgewell/sourcemap-codec@^1.5.5":
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba"
+  integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==
 
-"@jridgewell/trace-mapping@0.3.9":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
-  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+"@jridgewell/trace-mapping@^0.3.12":
   version "0.3.25"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
   integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
@@ -2175,6 +2241,14 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
+"@jridgewell/trace-mapping@^0.3.23", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.28":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0"
+  integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
 "@js-sdsl/ordered-map@^4.4.2":
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz#9299f82874bab9e4c7f9c48d865becbfe8d6907c"
@@ -2196,16 +2270,22 @@
     thingies "^1.20.0"
 
 "@jsonjoy.com/util@^1.1.2", "@jsonjoy.com/util@^1.3.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@jsonjoy.com/util/-/util-1.5.0.tgz#6008e35b9d9d8ee27bc4bfaa70c8cbf33a537b4c"
-  integrity sha512-ojoNsrIuPI9g6o8UxhraZQSyF2ByJanAY4cTFbc8Mf2AXEF4aQRGY1dJxyJpuyav8r9FGflEt/Ff3u5Nt6YMPA==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/util/-/util-1.6.0.tgz#23991b2fe12cb3a006573d9dc97c768d3ed2c9f1"
+  integrity sha512-sw/RMbehRhN68WRtcKCpQOPfnH6lLP4GJfqzi3iYej8tnzpZUDr6UkZYJjcjjC0FWEJOJbyM3PTIwxucUmDG2A==
 
-"@keyv/serialize@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@keyv/serialize/-/serialize-1.0.3.tgz#e0fe3710e2a379cb0490cd41e5a5ffa2bab58bf6"
-  integrity sha512-qnEovoOp5Np2JDGonIDL6Ayihw0RhnRh6vxPuHo4RDn1UOzwEo4AeIfpL6UGIrsceWrCMiVPgwRjbHu4vYFc3g==
+"@keyv/bigmap@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@keyv/bigmap/-/bigmap-1.3.0.tgz#f06d9bb38488a59f012cd2758e6f429dfd312fb5"
+  integrity sha512-KT01GjzV6AQD5+IYrcpoYLkCu1Jod3nau1Z7EsEuViO3TZGRacSbO9MfHmbJ1WaOXFtWLxPVj169cn2WNKPkIg==
   dependencies:
-    buffer "^6.0.3"
+    hashery "^1.2.0"
+    hookified "^1.13.0"
+
+"@keyv/serialize@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@keyv/serialize/-/serialize-1.1.1.tgz#0c01dd3a3483882af7cf3878d4e71d505c81fc4a"
+  integrity sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==
 
 "@leichtgewicht/ip-codec@^2.0.1":
   version "2.0.5"
@@ -2225,37 +2305,39 @@
   resolved "https://registry.yarnpkg.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz#ce56e539f83552b58d10d672ea4d6fc9adc7b234"
   integrity sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==
 
-"@mapbox/point-geometry@0.1.0", "@mapbox/point-geometry@^0.1.0", "@mapbox/point-geometry@~0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz#8a83f9335c7860effa2eeeca254332aa0aeed8f2"
-  integrity sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ==
+"@mapbox/point-geometry@^1.1.0", "@mapbox/point-geometry@~1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@mapbox/point-geometry/-/point-geometry-1.1.0.tgz#3328fb54b3a1273bc619bf0a6baad8de37181749"
+  integrity sha512-YGcBz1cg4ATXDCM/71L9xveh4dynfGmcLDqufR+nQQy3fKwsAZsWd/x4621/6uJaeB9mwOHE6hPeDgXz9uViUQ==
 
-"@mapbox/tiny-sdf@^2.0.6":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-2.0.6.tgz#9a1d33e5018093e88f6a4df2343e886056287282"
-  integrity sha512-qMqa27TLw+ZQz5Jk+RcwZGH7BQf5G/TrutJhspsca/3SHwmgKQ1iq+d3Jxz5oysPVYTGP6aXxCo5Lk9Er6YBAA==
+"@mapbox/tiny-sdf@^2.0.7":
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-2.0.7.tgz#0d67d65a43195003b282764f2297c619736bbc6e"
+  integrity sha512-25gQLQMcpivjOSA40g3gO6qgiFPDpWRoMfd+G/GoppPIeP6JDaMMkMrEJnMZhKyyS6iKwVt5YKu02vCUyJM3Ug==
 
 "@mapbox/unitbezier@^0.0.1":
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@mapbox/unitbezier/-/unitbezier-0.0.1.tgz#d32deb66c7177e9e9dfc3bbd697083e2e657ff01"
   integrity sha512-nMkuDXFv60aBr9soUG5q+GvZYL+2KZHVvsqFCzqnkGEf46U2fvmytHaEVc1/YZbiLn8X+eR3QzX1+dwDO1lxlw==
 
-"@mapbox/vector-tile@^1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz#d3a74c90402d06e89ec66de49ec817ff53409666"
-  integrity sha512-MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw==
+"@mapbox/vector-tile@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@mapbox/vector-tile/-/vector-tile-2.0.4.tgz#59c5ca80a84c210e61226367b0f9c8fd1737a437"
+  integrity sha512-AkOLcbgGTdXScosBWwmmD7cDlvOjkg/DetGva26pIRiZPdeJYjYKarIlb4uxVzi6bwHO6EWH82eZ5Nuv4T5DUg==
   dependencies:
-    "@mapbox/point-geometry" "~0.1.0"
+    "@mapbox/point-geometry" "~1.1.0"
+    "@types/geojson" "^7946.0.16"
+    pbf "^4.0.1"
 
 "@mapbox/whoots-js@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe"
   integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==
 
-"@maplibre/maplibre-gl-style-spec@^23.2.2":
-  version "23.2.2"
-  resolved "https://registry.yarnpkg.com/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-23.2.2.tgz#9030560d2b92c33132a7cea1d537a154d7674580"
-  integrity sha512-kLcVlItPCULc20SM6pSVA7u8nST9xmQA8d7utc9j3KB0Tf/xhM4GgCn/QsZcmlbN/wW0ujyomDrvZ3/LbwvAmw==
+"@maplibre/maplibre-gl-style-spec@^24.3.1":
+  version "24.4.0"
+  resolved "https://registry.yarnpkg.com/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-24.4.0.tgz#370eb9b7bcb868b021e91822ee27ee3491bd2cbf"
+  integrity sha512-VVuNV2Yf0+yQoth4qbdIPE0qKS6nIG5Atki9BVHZ7R7+0lZyxqxwrh0XVNA5YkuKuytFg/1i3VMyJQnp2EtOqw==
   dependencies:
     "@mapbox/jsonlint-lines-primitives" "~2.0.2"
     "@mapbox/unitbezier" "^0.0.1"
@@ -2265,28 +2347,43 @@
     rw "^1.3.3"
     tinyqueue "^3.0.0"
 
-"@matrix-org/analytics-events@^0.29.2":
-  version "0.29.2"
-  resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.29.2.tgz#20d9877f11d5e411f1610f396f9e490673d6da50"
-  integrity sha512-kpCdf6DBxgE7MbBbYr7FvahrktHHtiph3QN10I6nBAAPQ+hmR3aZHBECxjxLQ9RxvtBF9nlKK4bgy2YrNp6j3A==
-
-"@matrix-org/emojibase-bindings@^1.3.4":
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/@matrix-org/emojibase-bindings/-/emojibase-bindings-1.3.4.tgz#b0dad8e8b8bbe433e419b59e38f933bcdaf9c271"
-  integrity sha512-+nhBg0dxjy3U4/Tn6WIsnzqiqazc0pfStc2dkSBxDnc4xnimDB6vcIad53fUIsl7SeT50ake0hhnBJs0ZDDk6Q==
+"@maplibre/mlt@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@maplibre/mlt/-/mlt-1.1.2.tgz#4d0c8e74287ffe32f2a58bc68320c985cae80b7c"
+  integrity sha512-SQKdJ909VGROkA6ovJgtHNs9YXV4YXUPS+VaZ50I2Mt951SLlUm2Cv34x5Xwc1HiFlsd3h2Yrs5cn7xzqBmENw==
   dependencies:
-    emojibase "^15.3.1"
-    emojibase-data "^15.3.1"
+    "@mapbox/point-geometry" "^1.1.0"
 
-"@matrix-org/matrix-sdk-crypto-wasm@^14.0.1":
-  version "14.0.1"
-  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-14.0.1.tgz#e258ef84bcc7889f0e7eb3a7dbecf0830a6dd606"
-  integrity sha512-CgLpHs6nTw5pjSsMBi9xbQnBXf2l8YhImQP9cv8nbGSCYdYjFI0FilMXffzjWV5HThpNHri/3pF20ahZtuS3VA==
+"@maplibre/vt-pbf@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@maplibre/vt-pbf/-/vt-pbf-4.1.0.tgz#117c95b113e67aeacdf69443a631bb92d431d191"
+  integrity sha512-9LjFAoWtxdGRns8RK9vG3Fcw/fb3eHMxvAn2jffwn3jnVO1k49VOv6+FEza70rK7WzF8GnBiKa0K39RyfevKUw==
+  dependencies:
+    "@mapbox/point-geometry" "^1.1.0"
+    "@mapbox/vector-tile" "^2.0.4"
+    "@types/geojson-vt" "3.2.5"
+    "@types/supercluster" "^7.1.3"
+    geojson-vt "^4.0.2"
+    pbf "^4.0.1"
+    supercluster "^8.0.1"
 
-"@matrix-org/olm@3.2.15":
-  version "3.2.15"
-  resolved "https://registry.yarnpkg.com/@matrix-org/olm/-/olm-3.2.15.tgz#55f3c1b70a21bbee3f9195cecd6846b1083451ec"
-  integrity sha512-S7lOrndAK9/8qOtaTq/WhttJC/o4GAzdfK0MUPpo8ApzsJEC0QjtwrkC3KBXdFP1cD1MXi/mlKR7aaoVMKgs6Q==
+"@matrix-org/analytics-events@^0.30.0":
+  version "0.30.0"
+  resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.30.0.tgz#67e87e56518fec5330978bf1fcc8d7bb66cdd9d1"
+  integrity sha512-RYIgYdYIvJoTzWaTeqskNGYt6w+6wKP43xMcfpdTKhDm/o2s4keuzRnRG9Qkfg10/3dGOjYCPfH78cXPKDzxeg==
+
+"@matrix-org/emojibase-bindings@^1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@matrix-org/emojibase-bindings/-/emojibase-bindings-1.5.0.tgz#b1e9fd567341e4eeaba4e2864ee431916ffc88f7"
+  integrity sha512-+W9/ow2Z3iQa7ZOF698PBhwNcgGkn36B5Sr8VDPx8N8CH7+Uw+7TrtbtKPZVdgf4m/THmgmfX40jS5YDBsLaYg==
+  dependencies:
+    emojibase "^17.0.0"
+    emojibase-data "^17.0.0"
+
+"@matrix-org/matrix-sdk-crypto-wasm@^16.0.0":
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-16.0.0.tgz#6cd8cde24a9b374d9d1da3a768becbfc346de37e"
+  integrity sha512-c+0eu/ckG+ik62CaOFvHAulJlspw2CBKcLrWbiEQsXv4J3PC4xaaDI5VHFAl7FDU+U9Ww2DDNTieszCh4Lk0/Q==
 
 "@matrix-org/react-sdk-module-api@^2.4.0":
   version "2.5.0"
@@ -2296,18 +2393,27 @@
     "@babel/runtime" "^7.17.9"
 
 "@matrix-org/spec@^1.7.0":
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/@matrix-org/spec/-/spec-1.14.0.tgz#cedc4f9cc86c9e623ccd4f643629bac97bc0fed2"
-  integrity sha512-UI4kY6WXniRV++ZeMesmCvZMH8lANLc12rnca1/M+nkPgJgU9GQd5X9ezFoOLabG6tGdEUPPKr5/S2EP1FdGLA==
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@matrix-org/spec/-/spec-1.16.0.tgz#c88f4ed521e4c0bd3a4c108bcaf13f25173a0fdc"
+  integrity sha512-xUKHkwGXXISMCfTrx6JW6uGEK5O8IeZVOjBm7FX1h/ihpK6l50nlSIMRYdtz4V6q3pvOVBOCft4hPYTJVeTZDA==
 
-"@napi-rs/wasm-runtime@^0.2.9":
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.10.tgz#f3b7109419c6670000b2401e0c778b98afc25f84"
-  integrity sha512-bCsCyeZEwVErsGmyPNSzwfwFn4OdxBj0mmv6hOFucB/k81Ojdu68RbZdxYsRQUPc9l6SU5F/cG+bXgWs3oUgsQ==
+"@napi-rs/wasm-runtime@^0.2.11":
+  version "0.2.12"
+  resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz#3e78a8b96e6c33a6c517e1894efbd5385a7cb6f2"
+  integrity sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==
   dependencies:
     "@emnapi/core" "^1.4.3"
     "@emnapi/runtime" "^1.4.3"
-    "@tybys/wasm-util" "^0.9.0"
+    "@tybys/wasm-util" "^0.10.0"
+
+"@napi-rs/wasm-runtime@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.0.tgz#c0180393d7862cff0d412e3e1a7c3bd5ea6d9b2f"
+  integrity sha512-Fq6DJW+Bb5jaWE69/qOE0D1TUN9+6uWhCeZpdnSBk14pjLcCWR7Q8n49PTSPHazM37JqrsdpEthXy2xn6jWWiA==
+  dependencies:
+    "@emnapi/core" "^1.7.1"
+    "@emnapi/runtime" "^1.7.1"
+    "@tybys/wasm-util" "^0.10.1"
 
 "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
   version "5.1.1-v1"
@@ -2337,72 +2443,107 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@oxc-resolver/binding-darwin-arm64@9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-9.0.2.tgz#345ff11258dbec11d333bf088a79b864f5f03ec5"
-  integrity sha512-MVyRgP2gzJJtAowjG/cHN3VQXwNLWnY+FpOEsyvDepJki1SdAX/8XDijM1yN6ESD1kr9uhBKjGelC6h3qtT+rA==
+"@oxc-resolver/binding-android-arm-eabi@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-android-arm-eabi/-/binding-android-arm-eabi-11.15.0.tgz#ac132226c0d637f212abfdc253e6ce3e7de5e9bf"
+  integrity sha512-Q+lWuFfq7whNelNJIP1dhXaVz4zO9Tu77GcQHyxDWh3MaCoO2Bisphgzmsh4ZoUe2zIchQh6OvQL99GlWHg9Tw==
 
-"@oxc-resolver/binding-darwin-x64@9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-9.0.2.tgz#cd19f263a31b601356002ebd2eb8dda193753704"
-  integrity sha512-7kV0EOFEZ3sk5Hjy4+bfA6XOQpCwbDiDkkHN4BHHyrBHsXxUR05EcEJPPL1WjItefg+9+8hrBmoK0xRoDs41+A==
+"@oxc-resolver/binding-android-arm64@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-android-arm64/-/binding-android-arm64-11.15.0.tgz#1c12444b34ea736098a309ac5c643b4da57f2544"
+  integrity sha512-vbdBttesHR0W1oJaxgWVTboyMUuu+VnPsHXJ6jrXf4czELzB6GIg5DrmlyhAmFBhjwov+yJH/DfTnHS+2sDgOw==
 
-"@oxc-resolver/binding-freebsd-x64@9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-9.0.2.tgz#e6e0b9b9409cb4eb71307ca880f1d868cce88c94"
-  integrity sha512-6OvkEtRXrt8sJ4aVfxHRikjain9nV1clIsWtJ1J3J8NG1ZhjyJFgT00SCvqxbK+pzeWJq6XzHyTCN78ML+lY2w==
+"@oxc-resolver/binding-darwin-arm64@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-11.15.0.tgz#e1cc90578c142fa83f261b15643822b0f2992d9f"
+  integrity sha512-R67lsOe1UzNjqVBCwCZX1rlItTsj/cVtBw4Uy19CvTicqEWvwaTn8t34zLD75LQwDDPCY3C8n7NbD+LIdw+ZoA==
 
-"@oxc-resolver/binding-linux-arm-gnueabihf@9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-9.0.2.tgz#e4ef8e0a831fa05101ca8fc0501cd7b536093e66"
-  integrity sha512-aYpNL6o5IRAUIdoweW21TyLt54Hy/ZS9tvzNzF6ya1ckOQ8DLaGVPjGpmzxdNja9j/bbV6aIzBH7lNcBtiOTkQ==
+"@oxc-resolver/binding-darwin-x64@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-11.15.0.tgz#ee5746cbfd4a27795758eed89ba77951de52672f"
+  integrity sha512-77mya5F8WV0EtCxI0MlVZcqkYlaQpfNwl/tZlfg4jRsoLpFbaTeWv75hFm6TE84WULVlJtSgvf7DhoWBxp9+ZQ==
 
-"@oxc-resolver/binding-linux-arm64-gnu@9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-9.0.2.tgz#c95345cf91b9597a469a8d3028d0b182e2e22055"
-  integrity sha512-RGFW4vCfKMFEIzb9VCY0oWyyY9tR1/o+wDdNePhiUXZU4SVniRPQaZ1SJ0sUFI1k25pXZmzQmIP6cBmazi/Dew==
+"@oxc-resolver/binding-freebsd-x64@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-11.15.0.tgz#5c621ed31913f9e7dd1a9bc11e8edbda7943d5b3"
+  integrity sha512-X1Sz7m5PC+6D3KWIDXMUtux+0Imj6HfHGdBStSvgdI60OravzI1t83eyn6eN0LPTrynuPrUgjk7tOnOsBzSWHw==
 
-"@oxc-resolver/binding-linux-arm64-musl@9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-9.0.2.tgz#d968aadd446a6c1d729764f3ddd0e1b66e3ec53f"
-  integrity sha512-lxx/PibBfzqYvut2Y8N2D0Ritg9H8pKO+7NUSJb9YjR/bfk2KRmP8iaUz3zB0JhPtf/W3REs65oKpWxgflGToA==
+"@oxc-resolver/binding-linux-arm-gnueabihf@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-11.15.0.tgz#b25b6d0598d1b9343d42c2a82abb98e5f035291e"
+  integrity sha512-L1x/wCaIRre+18I4cH/lTqSAymlV0k4HqfSYNNuI9oeL28Ks86lI6O5VfYL6sxxWYgjuWB98gNGo7tq7d4GarQ==
 
-"@oxc-resolver/binding-linux-riscv64-gnu@9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-9.0.2.tgz#698f364bf15489e69c8441c842a09a468c7389ca"
-  integrity sha512-yD28ptS/OuNhwkpXRPNf+/FvrO7lwURLsEbRVcL1kIE0GxNJNMtKgIE4xQvtKDzkhk6ZRpLho5VSrkkF+3ARTQ==
+"@oxc-resolver/binding-linux-arm-musleabihf@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-11.15.0.tgz#79a9844b1b5cb90868c89c0c8c2f986888597c44"
+  integrity sha512-abGXd/zMGa0tH8nKlAXdOnRy4G7jZmkU0J85kMKWns161bxIgGn/j7zxqh3DKEW98wAzzU9GofZMJ0P5YCVPVw==
 
-"@oxc-resolver/binding-linux-s390x-gnu@9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-9.0.2.tgz#dfcbf0531f0ade1197275f40e6f8900635af187c"
-  integrity sha512-WBwEJdspoga2w+aly6JVZeHnxuPVuztw3fPfWrei2P6rNM5hcKxBGWKKT6zO1fPMCB4sdDkFohGKkMHVV1eryQ==
+"@oxc-resolver/binding-linux-arm64-gnu@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-11.15.0.tgz#d14505c8d307c4ba185371e0b593a3cddc17462b"
+  integrity sha512-SVjjjtMW66Mza76PBGJLqB0KKyFTBnxmtDXLJPbL6ZPGSctcXVmujz7/WAc0rb9m2oV0cHQTtVjnq6orQnI/jg==
 
-"@oxc-resolver/binding-linux-x64-gnu@9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-9.0.2.tgz#73f7157f3b052c44c206b672b970da060125c533"
-  integrity sha512-a2z3/cbOOTUq0UTBG8f3EO/usFcdwwXnCejfXv42HmV/G8GjrT4fp5+5mVDoMByH3Ce3iVPxj1LmS6OvItKMYQ==
+"@oxc-resolver/binding-linux-arm64-musl@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-11.15.0.tgz#9c622c8bfd6219d5c15c6d86acff03a4ba361e1b"
+  integrity sha512-JDv2/AycPF2qgzEiDeMJCcSzKNDm3KxNg0KKWipoKEMDFqfM7LxNwwSVyAOGmrYlE4l3dg290hOMsr9xG7jv9g==
 
-"@oxc-resolver/binding-linux-x64-musl@9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-9.0.2.tgz#2b047ce69cb7fa1900174d43e4a7b6027146a449"
-  integrity sha512-bHZF+WShYQWpuswB9fyxcgMIWVk4sZQT0wnwpnZgQuvGTZLkYJ1JTCXJMtaX5mIFHf69ngvawnwPIUA4Feil0g==
+"@oxc-resolver/binding-linux-ppc64-gnu@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-11.15.0.tgz#ff048ae000d24292719cd3843ea0aec72cc145d1"
+  integrity sha512-zbu9FhvBLW4KJxo7ElFvZWbSt4vP685Qc/Gyk/Ns3g2gR9qh2qWXouH8PWySy+Ko/qJ42+HJCLg+ZNcxikERfg==
 
-"@oxc-resolver/binding-wasm32-wasi@9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-9.0.2.tgz#df8eab1815ae0da0c70f0f9dda4bcd84c70d7024"
-  integrity sha512-I5cSgCCh5nFozGSHz+PjIOfrqW99eUszlxKLgoNNzQ1xQ2ou9ZJGzcZ94BHsM9SpyYHLtgHljmOZxCT9bgxYNA==
+"@oxc-resolver/binding-linux-riscv64-gnu@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-11.15.0.tgz#07a20bbecda282e95131385575733638b8c6af86"
+  integrity sha512-Kfleehe6B09C2qCnyIU01xLFqFXCHI4ylzkicfX/89j+gNHh9xyNdpEvit88Kq6i5tTGdavVnM6DQfOE2qNtlg==
+
+"@oxc-resolver/binding-linux-riscv64-musl@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-11.15.0.tgz#249c2d83f8312dc21c4cc573e80c9b5004246995"
+  integrity sha512-J7LPiEt27Tpm8P+qURDwNc8q45+n+mWgyys4/V6r5A8v5gDentHRGUx3iVk5NxdKhgoGulrzQocPTZVosq25Eg==
+
+"@oxc-resolver/binding-linux-s390x-gnu@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-11.15.0.tgz#c0d6d35c103cd6e2533191670c6df170a1db4d12"
+  integrity sha512-+8/d2tAScPjVJNyqa7GPGnqleTB/XW9dZJQ2D/oIM3wpH3TG+DaFEXBbk4QFJ9K9AUGBhvQvWU2mQyhK/yYn3Q==
+
+"@oxc-resolver/binding-linux-x64-gnu@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-11.15.0.tgz#06786bd80fe48d136b12dd9e595797434f7ecf5b"
+  integrity sha512-xtvSzH7Nr5MCZI2FKImmOdTl9kzuQ51RPyLh451tvD2qnkg3BaqI9Ox78bTk57YJhlXPuxWSOL5aZhKAc9J6qg==
+
+"@oxc-resolver/binding-linux-x64-musl@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-11.15.0.tgz#e9721f74f26a91f7ed8908a7841d810980b75775"
+  integrity sha512-14YL1zuXj06+/tqsuUZuzL0T425WA/I4nSVN1kBXeC5WHxem6lQ+2HGvG+crjeJEqHgZUT62YIgj88W+8E7eyg==
+
+"@oxc-resolver/binding-openharmony-arm64@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-openharmony-arm64/-/binding-openharmony-arm64-11.15.0.tgz#6379b02f89425d425a1409aa26f3c5426e2ca924"
+  integrity sha512-/7Qli+1Wk93coxnrQaU8ySlICYN8HsgyIrzqjgIkQEpI//9eUeaeIHZptNl2fMvBGeXa7k2QgLbRNaBRgpnvMw==
+
+"@oxc-resolver/binding-wasm32-wasi@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-11.15.0.tgz#2c3733bb66e5c6a134ac9df4bcca14672728709c"
+  integrity sha512-q5rn2eIMQLuc/AVGR2rQKb2EVlgreATGG8xXg8f4XbbYCVgpxaq+dgMbiPStyNywW1MH8VU2T09UEm30UtOQvg==
   dependencies:
-    "@napi-rs/wasm-runtime" "^0.2.9"
+    "@napi-rs/wasm-runtime" "^1.1.0"
 
-"@oxc-resolver/binding-win32-arm64-msvc@9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-9.0.2.tgz#9530c2e08ebb5d02870b004135ef0b4438a620b7"
-  integrity sha512-5IhoOpPr38YWDWRCA5kP30xlUxbIJyLAEsAK7EMyUgqygBHEYLkElaKGgS0X5jRXUQ6l5yNxuW73caogb2FYaw==
+"@oxc-resolver/binding-win32-arm64-msvc@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-11.15.0.tgz#f64132dd86f82d2580325886f1aeedeb72235c98"
+  integrity sha512-yCAh2RWjU/8wWTxQDgGPgzV9QBv0/Ojb5ej1c/58iOjyTuy/J1ZQtYi2SpULjKmwIxLJdTiCHpMilauWimE31w==
 
-"@oxc-resolver/binding-win32-x64-msvc@9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-9.0.2.tgz#15dc9cecd2e89bbcad07247477fc04dd8c3ffbbe"
-  integrity sha512-Qc40GDkaad9rZksSQr2l/V9UubigIHsW69g94Gswc2sKYB3XfJXfIfyV8WTJ67u6ZMXsZ7BH1msSC6Aen75mCg==
+"@oxc-resolver/binding-win32-ia32-msvc@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-11.15.0.tgz#b09e3c03e4f9a920efbd61600ebcdd29632e19e5"
+  integrity sha512-lmXKb6lvA6M6QIbtYfgjd+AryJqExZVSY2bfECC18OPu7Lv1mHFF171Mai5l9hG3r4IhHPPIwT10EHoilSCYeA==
+
+"@oxc-resolver/binding-win32-x64-msvc@11.15.0":
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-11.15.0.tgz#c8014e1fb466a9778a67a323b73cfbf86c709dc8"
+  integrity sha512-HZsfne0s/tGOcJK9ZdTGxsNU2P/dH0Shf0jqrPvsC6wX0Wk+6AyhSpHFLQCnLOuFQiHHU0ePfM8iYsoJb5hHpQ==
 
 "@peculiar/asn1-schema@^2.3.13", "@peculiar/asn1-schema@^2.3.8":
   version "2.3.13"
@@ -2436,18 +2577,30 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@playwright/test@1.52.0", "@playwright/test@^1.50.1":
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.52.0.tgz#267ec595b43a8f4fa5e444ea503689629e91a5b8"
-  integrity sha512-uh6W7sb55hl7D6vsAeA+V2p5JnlAqzhqFyF0VcJkKZXkgnFcVG9PziERRHQfPLfNGx1C292a4JqbWzhR8L4R1g==
+"@pkgr/core@^0.2.9":
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.2.9.tgz#d229a7b7f9dac167a156992ef23c7f023653f53b"
+  integrity sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==
+
+"@playwright/test@1.57.0":
+  version "1.57.0"
+  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.57.0.tgz#a14720ffa9ed7ef7edbc1f60784fc6134acbb003"
+  integrity sha512-6TyEnHgd6SArQO8UO2OMTxshln3QMWBtPGrOCgs3wVEmQmwyuNtB10IZMfmYDE0riwNR1cu4q+pPcxMVtaG3TA==
   dependencies:
-    playwright "1.52.0"
+    playwright "1.57.0"
 
 "@polka/url@^1.0.0-next.24":
   version "1.0.0-next.28"
   resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.28.tgz#d45e01c4a56f143ee69c54dd6b12eade9e270a73"
   integrity sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==
 
+"@posthog/core@1.7.1":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@posthog/core/-/core-1.7.1.tgz#ec45a3b13acbe4fbf453625c83bcd38da21beeb7"
+  integrity sha512-kjK0eFMIpKo9GXIbts8VtAknsoZ18oZorANdtuTj1CbgS28t4ZVq//HAWhnxEuXRTrtkd+SUJ6Ux3j2Af8NCuA==
+  dependencies:
+    cross-spawn "^7.0.6"
+
 "@principalstudio/html-webpack-inject-preload@^1.2.7":
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/@principalstudio/html-webpack-inject-preload/-/html-webpack-inject-preload-1.2.7.tgz#0c1f0b32a34d814b36ce84111f89990441cc64e8"
@@ -2506,396 +2659,408 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
 
-"@radix-ui/primitive@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.1.0.tgz#42ef83b3b56dccad5d703ae8c42919a68798bbe2"
-  integrity sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==
+"@radix-ui/primitive@1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.1.3.tgz#e2dbc13bdc5e4168f4334f75832d7bdd3e2de5ba"
+  integrity sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==
 
-"@radix-ui/react-arrow@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-arrow/-/react-arrow-1.1.0.tgz#744f388182d360b86285217e43b6c63633f39e7a"
-  integrity sha512-FmlW1rCg7hBpEBwFbjHwCW6AmWLQM6g/v0Sn8XbP9NvmSZ2San1FpQeyPtufzOMSIx7Y4dzjlHoifhp+7NkZhw==
+"@radix-ui/react-arrow@1.1.7":
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-arrow/-/react-arrow-1.1.7.tgz#e14a2657c81d961598c5e72b73dd6098acc04f09"
+  integrity sha512-F+M1tLhO+mlQaOWspE8Wstg+z6PwxwRd8oQ8IXceWz92kfAmalTRf0EjrouQeo7QssEPfCn05B4Ihs1K9WQ/7w==
   dependencies:
-    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-primitive" "2.1.3"
 
-"@radix-ui/react-collection@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-1.1.0.tgz#f18af78e46454a2360d103c2251773028b7724ed"
-  integrity sha512-GZsZslMJEyo1VKm5L1ZJY8tGDxZNPAoUeQUIbKeJfoi7Q4kmig5AsgLMYYuyYbfjd8fBmFORAIwYAkXMnXZgZw==
+"@radix-ui/react-collection@1.1.7":
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-1.1.7.tgz#d05c25ca9ac4695cc19ba91f42f686e3ea2d9aec"
+  integrity sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw==
   dependencies:
-    "@radix-ui/react-compose-refs" "1.1.0"
-    "@radix-ui/react-context" "1.1.0"
-    "@radix-ui/react-primitive" "2.0.0"
-    "@radix-ui/react-slot" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.2"
+    "@radix-ui/react-context" "1.1.2"
+    "@radix-ui/react-primitive" "2.1.3"
+    "@radix-ui/react-slot" "1.2.3"
 
-"@radix-ui/react-compose-refs@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.0.tgz#656432461fc8283d7b591dcf0d79152fae9ecc74"
-  integrity sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==
+"@radix-ui/react-compose-refs@1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz#a2c4c47af6337048ee78ff6dc0d090b390d2bb30"
+  integrity sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==
 
-"@radix-ui/react-context-menu@^2.2.1":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-context-menu/-/react-context-menu-2.2.2.tgz#efcddc559fc3011721b65148f062d04027f76c7a"
-  integrity sha512-99EatSTpW+hRYHt7m8wdDlLtkmTovEe8Z/hnxUPV+SKuuNL5HWNhQI4QSdjZqNSgXHay2z4M3Dym73j9p2Gx5Q==
+"@radix-ui/react-context-menu@^2.2.16":
+  version "2.2.16"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-context-menu/-/react-context-menu-2.2.16.tgz#e7bf94a457b68af08f24ad696949144530faab50"
+  integrity sha512-O8morBEW+HsVG28gYDZPTrT9UUovQUlJue5YO836tiTJhuIWBm/zQHc7j388sHWtdH/xUZurK9olD2+pcqx5ww==
   dependencies:
-    "@radix-ui/primitive" "1.1.0"
-    "@radix-ui/react-context" "1.1.1"
-    "@radix-ui/react-menu" "2.1.2"
-    "@radix-ui/react-primitive" "2.0.0"
-    "@radix-ui/react-use-callback-ref" "1.1.0"
-    "@radix-ui/react-use-controllable-state" "1.1.0"
+    "@radix-ui/primitive" "1.1.3"
+    "@radix-ui/react-context" "1.1.2"
+    "@radix-ui/react-menu" "2.1.16"
+    "@radix-ui/react-primitive" "2.1.3"
+    "@radix-ui/react-use-callback-ref" "1.1.1"
+    "@radix-ui/react-use-controllable-state" "1.2.2"
 
-"@radix-ui/react-context@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.1.0.tgz#6df8d983546cfd1999c8512f3a8ad85a6e7fcee8"
-  integrity sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==
-
-"@radix-ui/react-context@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.1.1.tgz#82074aa83a472353bb22e86f11bcbd1c61c4c71a"
-  integrity sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==
+"@radix-ui/react-context@1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.1.2.tgz#61628ef269a433382c364f6f1e3788a6dc213a36"
+  integrity sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==
 
 "@radix-ui/react-dialog@^1.1.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.1.2.tgz#d9345575211d6f2d13e209e84aec9a8584b54d6c"
-  integrity sha512-Yj4dZtqa2o+kG61fzB0H2qUvmwBA2oyQroGLyNtBj1beo1khoQ3q1a2AO8rrQYjd8256CO9+N8L9tvsS+bnIyA==
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.1.15.tgz#1de3d7a7e9a17a9874d29c07f5940a18a119b632"
+  integrity sha512-TCglVRtzlffRNxRMEyR36DGBLJpeusFcgMVD9PZEzAKnUs1lKCgX5u9BmC2Yg+LL9MgZDugFFs1Vl+Jp4t/PGw==
   dependencies:
-    "@radix-ui/primitive" "1.1.0"
-    "@radix-ui/react-compose-refs" "1.1.0"
-    "@radix-ui/react-context" "1.1.1"
-    "@radix-ui/react-dismissable-layer" "1.1.1"
-    "@radix-ui/react-focus-guards" "1.1.1"
-    "@radix-ui/react-focus-scope" "1.1.0"
-    "@radix-ui/react-id" "1.1.0"
-    "@radix-ui/react-portal" "1.1.2"
-    "@radix-ui/react-presence" "1.1.1"
-    "@radix-ui/react-primitive" "2.0.0"
-    "@radix-ui/react-slot" "1.1.0"
-    "@radix-ui/react-use-controllable-state" "1.1.0"
-    aria-hidden "^1.1.1"
-    react-remove-scroll "2.6.0"
+    "@radix-ui/primitive" "1.1.3"
+    "@radix-ui/react-compose-refs" "1.1.2"
+    "@radix-ui/react-context" "1.1.2"
+    "@radix-ui/react-dismissable-layer" "1.1.11"
+    "@radix-ui/react-focus-guards" "1.1.3"
+    "@radix-ui/react-focus-scope" "1.1.7"
+    "@radix-ui/react-id" "1.1.1"
+    "@radix-ui/react-portal" "1.1.9"
+    "@radix-ui/react-presence" "1.1.5"
+    "@radix-ui/react-primitive" "2.1.3"
+    "@radix-ui/react-slot" "1.2.3"
+    "@radix-ui/react-use-controllable-state" "1.2.2"
+    aria-hidden "^1.2.4"
+    react-remove-scroll "^2.6.3"
 
-"@radix-ui/react-direction@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-direction/-/react-direction-1.1.0.tgz#a7d39855f4d077adc2a1922f9c353c5977a09cdc"
-  integrity sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==
-
-"@radix-ui/react-dismissable-layer@1.1.1":
+"@radix-ui/react-direction@1.1.1":
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.1.tgz#cbdcb739c5403382bdde5f9243042ba643883396"
-  integrity sha512-QSxg29lfr/xcev6kSz7MAlmDnzbP1eI/Dwn3Tp1ip0KT5CUELsxkekFEMVBEoykI3oV39hKT4TKZzBNMbcTZYQ==
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-direction/-/react-direction-1.1.1.tgz#39e5a5769e676c753204b792fbe6cf508e550a14"
+  integrity sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==
+
+"@radix-ui/react-dismissable-layer@1.1.11":
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.11.tgz#e33ab6f6bdaa00f8f7327c408d9f631376b88b37"
+  integrity sha512-Nqcp+t5cTB8BinFkZgXiMJniQH0PsUt2k51FUhbdfeKvc4ACcG2uQniY/8+h1Yv6Kza4Q7lD7PQV0z0oicE0Mg==
   dependencies:
-    "@radix-ui/primitive" "1.1.0"
-    "@radix-ui/react-compose-refs" "1.1.0"
-    "@radix-ui/react-primitive" "2.0.0"
-    "@radix-ui/react-use-callback-ref" "1.1.0"
-    "@radix-ui/react-use-escape-keydown" "1.1.0"
+    "@radix-ui/primitive" "1.1.3"
+    "@radix-ui/react-compose-refs" "1.1.2"
+    "@radix-ui/react-primitive" "2.1.3"
+    "@radix-ui/react-use-callback-ref" "1.1.1"
+    "@radix-ui/react-use-escape-keydown" "1.1.1"
 
 "@radix-ui/react-dropdown-menu@^2.1.1":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.2.tgz#acc49577130e3c875ef0133bd1e271ea3392d924"
-  integrity sha512-GVZMR+eqK8/Kes0a36Qrv+i20bAPXSn8rCBTHx30w+3ECnR5o3xixAlqcVaYvLeyKUsm0aqyhWfmUcqufM8nYA==
+  version "2.1.16"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.16.tgz#5ee045c62bad8122347981c479d92b1ff24c7254"
+  integrity sha512-1PLGQEynI/3OX/ftV54COn+3Sud/Mn8vALg2rWnBLnRaGtJDduNW/22XjlGgPdpcIbiQxjKtb7BkcjP00nqfJw==
   dependencies:
-    "@radix-ui/primitive" "1.1.0"
-    "@radix-ui/react-compose-refs" "1.1.0"
-    "@radix-ui/react-context" "1.1.1"
-    "@radix-ui/react-id" "1.1.0"
-    "@radix-ui/react-menu" "2.1.2"
-    "@radix-ui/react-primitive" "2.0.0"
-    "@radix-ui/react-use-controllable-state" "1.1.0"
+    "@radix-ui/primitive" "1.1.3"
+    "@radix-ui/react-compose-refs" "1.1.2"
+    "@radix-ui/react-context" "1.1.2"
+    "@radix-ui/react-id" "1.1.1"
+    "@radix-ui/react-menu" "2.1.16"
+    "@radix-ui/react-primitive" "2.1.3"
+    "@radix-ui/react-use-controllable-state" "1.2.2"
 
-"@radix-ui/react-focus-guards@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz#8635edd346304f8b42cae86b05912b61aef27afe"
-  integrity sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==
+"@radix-ui/react-focus-guards@1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.3.tgz#2a5669e464ad5fde9f86d22f7fdc17781a4dfa7f"
+  integrity sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw==
 
-"@radix-ui/react-focus-scope@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.0.tgz#ebe2891a298e0a33ad34daab2aad8dea31caf0b2"
-  integrity sha512-200UD8zylvEyL8Bx+z76RJnASR2gRMuxlgFCPAe/Q/679a/r0eK3MBVYMb7vZODZcffZBdob1EGnky78xmVvcA==
+"@radix-ui/react-focus-scope@1.1.7":
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.7.tgz#dfe76fc103537d80bf42723a183773fd07bfb58d"
+  integrity sha512-t2ODlkXBQyn7jkl6TNaw/MtVEVvIGelJDCG41Okq/KwUsJBwQ4XVZsHAVUkK4mBv3ewiAS3PGuUWuY2BoK4ZUw==
   dependencies:
-    "@radix-ui/react-compose-refs" "1.1.0"
-    "@radix-ui/react-primitive" "2.0.0"
-    "@radix-ui/react-use-callback-ref" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.2"
+    "@radix-ui/react-primitive" "2.1.3"
+    "@radix-ui/react-use-callback-ref" "1.1.1"
 
 "@radix-ui/react-form@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-form/-/react-form-0.1.0.tgz#7111a6aa54a2bde0d11fb72643f9ffc871ac58ad"
-  integrity sha512-1/oVYPDjbFILOLIarcGcMKo+y6SbTVT/iUKVEw59CF4offwZgBgC3ZOeSBewjqU0vdA6FWTPWTN63obj55S/tQ==
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-form/-/react-form-0.1.8.tgz#daec0fde305a70edf1a97b932b5e02a4cbf5b68e"
+  integrity sha512-QM70k4Zwjttifr5a4sZFts9fn8FzHYvQ5PiB19O2HsYibaHSVt9fH9rzB0XZo/YcM+b7t/p7lYCT/F5eOeF5yQ==
   dependencies:
-    "@radix-ui/primitive" "1.1.0"
-    "@radix-ui/react-compose-refs" "1.1.0"
-    "@radix-ui/react-context" "1.1.0"
-    "@radix-ui/react-id" "1.1.0"
-    "@radix-ui/react-label" "2.1.0"
-    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/primitive" "1.1.3"
+    "@radix-ui/react-compose-refs" "1.1.2"
+    "@radix-ui/react-context" "1.1.2"
+    "@radix-ui/react-id" "1.1.1"
+    "@radix-ui/react-label" "2.1.7"
+    "@radix-ui/react-primitive" "2.1.3"
 
-"@radix-ui/react-id@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-id/-/react-id-1.1.0.tgz#de47339656594ad722eb87f94a6b25f9cffae0ed"
-  integrity sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==
+"@radix-ui/react-id@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-id/-/react-id-1.1.1.tgz#1404002e79a03fe062b7e3864aa01e24bd1471f7"
+  integrity sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==
   dependencies:
-    "@radix-ui/react-use-layout-effect" "1.1.0"
+    "@radix-ui/react-use-layout-effect" "1.1.1"
 
-"@radix-ui/react-label@2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-label/-/react-label-2.1.0.tgz#3aa2418d70bb242be37c51ff5e51a2adcbc372e3"
-  integrity sha512-peLblDlFw/ngk3UWq0VnYaOLy6agTZZ+MUO/WhVfm14vJGML+xH4FAl2XQGLqdefjNb7ApRg6Yn7U42ZhmYXdw==
+"@radix-ui/react-label@2.1.7":
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-label/-/react-label-2.1.7.tgz#ad959ff9c6e4968d533329eb95696e1ba8ad72ab"
+  integrity sha512-YT1GqPSL8kJn20djelMX7/cTRp/Y9w5IZHvfxQTVHrOqa2yMl7i/UfMqKRU5V7mEyKTrUVgJXhNQPVCG8PBLoQ==
   dependencies:
-    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-primitive" "2.1.3"
 
-"@radix-ui/react-menu@2.1.2":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-menu/-/react-menu-2.1.2.tgz#91f6815845a4298dde775563ed2d80b7ad667899"
-  integrity sha512-lZ0R4qR2Al6fZ4yCCZzu/ReTFrylHFxIqy7OezIpWF4bL0o9biKo0pFIvkaew3TyZ9Fy5gYVrR5zCGZBVbO1zg==
+"@radix-ui/react-menu@2.1.16":
+  version "2.1.16"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-menu/-/react-menu-2.1.16.tgz#528a5a973c3a7413d3d49eb9ccd229aa52402911"
+  integrity sha512-72F2T+PLlphrqLcAotYPp0uJMr5SjP5SL01wfEspJbru5Zs5vQaSHb4VB3ZMJPimgHHCHG7gMOeOB9H3Hdmtxg==
   dependencies:
-    "@radix-ui/primitive" "1.1.0"
-    "@radix-ui/react-collection" "1.1.0"
-    "@radix-ui/react-compose-refs" "1.1.0"
-    "@radix-ui/react-context" "1.1.1"
-    "@radix-ui/react-direction" "1.1.0"
-    "@radix-ui/react-dismissable-layer" "1.1.1"
-    "@radix-ui/react-focus-guards" "1.1.1"
-    "@radix-ui/react-focus-scope" "1.1.0"
-    "@radix-ui/react-id" "1.1.0"
-    "@radix-ui/react-popper" "1.2.0"
-    "@radix-ui/react-portal" "1.1.2"
-    "@radix-ui/react-presence" "1.1.1"
-    "@radix-ui/react-primitive" "2.0.0"
-    "@radix-ui/react-roving-focus" "1.1.0"
-    "@radix-ui/react-slot" "1.1.0"
-    "@radix-ui/react-use-callback-ref" "1.1.0"
-    aria-hidden "^1.1.1"
-    react-remove-scroll "2.6.0"
+    "@radix-ui/primitive" "1.1.3"
+    "@radix-ui/react-collection" "1.1.7"
+    "@radix-ui/react-compose-refs" "1.1.2"
+    "@radix-ui/react-context" "1.1.2"
+    "@radix-ui/react-direction" "1.1.1"
+    "@radix-ui/react-dismissable-layer" "1.1.11"
+    "@radix-ui/react-focus-guards" "1.1.3"
+    "@radix-ui/react-focus-scope" "1.1.7"
+    "@radix-ui/react-id" "1.1.1"
+    "@radix-ui/react-popper" "1.2.8"
+    "@radix-ui/react-portal" "1.1.9"
+    "@radix-ui/react-presence" "1.1.5"
+    "@radix-ui/react-primitive" "2.1.3"
+    "@radix-ui/react-roving-focus" "1.1.11"
+    "@radix-ui/react-slot" "1.2.3"
+    "@radix-ui/react-use-callback-ref" "1.1.1"
+    aria-hidden "^1.2.4"
+    react-remove-scroll "^2.6.3"
 
-"@radix-ui/react-popper@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-popper/-/react-popper-1.2.0.tgz#a3e500193d144fe2d8f5d5e60e393d64111f2a7a"
-  integrity sha512-ZnRMshKF43aBxVWPWvbj21+7TQCvhuULWJ4gNIKYpRlQt5xGRhLx66tMp8pya2UkGHTSlhpXwmjqltDYHhw7Vg==
+"@radix-ui/react-popper@1.2.8":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-popper/-/react-popper-1.2.8.tgz#a79f39cdd2b09ab9fb50bf95250918422c4d9602"
+  integrity sha512-0NJQ4LFFUuWkE7Oxf0htBKS6zLkkjBH+hM1uk7Ng705ReR8m/uelduy1DBo0PyBXPKVnBA6YBlU94MBGXrSBCw==
   dependencies:
     "@floating-ui/react-dom" "^2.0.0"
-    "@radix-ui/react-arrow" "1.1.0"
-    "@radix-ui/react-compose-refs" "1.1.0"
-    "@radix-ui/react-context" "1.1.0"
-    "@radix-ui/react-primitive" "2.0.0"
-    "@radix-ui/react-use-callback-ref" "1.1.0"
-    "@radix-ui/react-use-layout-effect" "1.1.0"
-    "@radix-ui/react-use-rect" "1.1.0"
-    "@radix-ui/react-use-size" "1.1.0"
-    "@radix-ui/rect" "1.1.0"
+    "@radix-ui/react-arrow" "1.1.7"
+    "@radix-ui/react-compose-refs" "1.1.2"
+    "@radix-ui/react-context" "1.1.2"
+    "@radix-ui/react-primitive" "2.1.3"
+    "@radix-ui/react-use-callback-ref" "1.1.1"
+    "@radix-ui/react-use-layout-effect" "1.1.1"
+    "@radix-ui/react-use-rect" "1.1.1"
+    "@radix-ui/react-use-size" "1.1.1"
+    "@radix-ui/rect" "1.1.1"
 
-"@radix-ui/react-portal@1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.1.2.tgz#51eb46dae7505074b306ebcb985bf65cc547d74e"
-  integrity sha512-WeDYLGPxJb/5EGBoedyJbT0MpoULmwnIPMJMSldkuiMsBAv7N1cRdsTWZWht9vpPOiN3qyiGAtbK2is47/uMFg==
+"@radix-ui/react-portal@1.1.9":
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.1.9.tgz#14c3649fe48ec474ac51ed9f2b9f5da4d91c4472"
+  integrity sha512-bpIxvq03if6UNwXZ+HTK71JLh4APvnXntDc6XOX8UVq4XQOVl7lwok0AvIl+b8zgCw3fSaVTZMpAPPagXbKmHQ==
   dependencies:
-    "@radix-ui/react-primitive" "2.0.0"
-    "@radix-ui/react-use-layout-effect" "1.1.0"
+    "@radix-ui/react-primitive" "2.1.3"
+    "@radix-ui/react-use-layout-effect" "1.1.1"
 
-"@radix-ui/react-presence@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-1.1.1.tgz#98aba423dba5e0c687a782c0669dcd99de17f9b1"
-  integrity sha512-IeFXVi4YS1K0wVZzXNrbaaUvIJ3qdY+/Ih4eHFhWA9SwGR9UDX7Ck8abvL57C4cv3wwMvUE0OG69Qc3NCcTe/A==
+"@radix-ui/react-presence@1.1.5":
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-1.1.5.tgz#5d8f28ac316c32f078afce2996839250c10693db"
+  integrity sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ==
   dependencies:
-    "@radix-ui/react-compose-refs" "1.1.0"
-    "@radix-ui/react-use-layout-effect" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.2"
+    "@radix-ui/react-use-layout-effect" "1.1.1"
 
-"@radix-ui/react-primitive@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-2.0.0.tgz#fe05715faa9203a223ccc0be15dc44b9f9822884"
-  integrity sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==
+"@radix-ui/react-primitive@2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz#db9b8bcff49e01be510ad79893fb0e4cda50f1bc"
+  integrity sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==
   dependencies:
-    "@radix-ui/react-slot" "1.1.0"
+    "@radix-ui/react-slot" "1.2.3"
 
 "@radix-ui/react-progress@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-progress/-/react-progress-1.1.0.tgz#28c267885ec154fc557ec7a66cb462787312f7e2"
-  integrity sha512-aSzvnYpP725CROcxAOEBVZZSIQVQdHgBr2QQFKySsaD14u8dNT0batuXI+AAGDdAHfXH8rbnHmjYFqVJ21KkRg==
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-progress/-/react-progress-1.1.7.tgz#a2b76398b3f24b6bd5e37f112b1e30fbedd4f38e"
+  integrity sha512-vPdg/tF6YC/ynuBIJlk1mm7Le0VgW6ub6J2UWnTQ7/D23KXcPI1qy+0vBkgKgd38RCMJavBXpB83HPNFMTb0Fg==
   dependencies:
-    "@radix-ui/react-context" "1.1.0"
-    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-context" "1.1.2"
+    "@radix-ui/react-primitive" "2.1.3"
 
-"@radix-ui/react-roving-focus@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.0.tgz#b30c59daf7e714c748805bfe11c76f96caaac35e"
-  integrity sha512-EA6AMGeq9AEeQDeSH0aZgG198qkfHSbvWTf1HvoDmOB5bBG/qTxjYMWUKMnYiV6J/iP/J8MEFSuB2zRU2n7ODA==
+"@radix-ui/react-roving-focus@1.1.11":
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.11.tgz#ef54384b7361afc6480dcf9907ef2fedb5080fd9"
+  integrity sha512-7A6S9jSgm/S+7MdtNDSb+IU859vQqJ/QAtcYQcfFC6W8RS4IxIZDldLR0xqCFZ6DCyrQLjLPsxtTNch5jVA4lA==
   dependencies:
-    "@radix-ui/primitive" "1.1.0"
-    "@radix-ui/react-collection" "1.1.0"
-    "@radix-ui/react-compose-refs" "1.1.0"
-    "@radix-ui/react-context" "1.1.0"
-    "@radix-ui/react-direction" "1.1.0"
-    "@radix-ui/react-id" "1.1.0"
-    "@radix-ui/react-primitive" "2.0.0"
-    "@radix-ui/react-use-callback-ref" "1.1.0"
-    "@radix-ui/react-use-controllable-state" "1.1.0"
+    "@radix-ui/primitive" "1.1.3"
+    "@radix-ui/react-collection" "1.1.7"
+    "@radix-ui/react-compose-refs" "1.1.2"
+    "@radix-ui/react-context" "1.1.2"
+    "@radix-ui/react-direction" "1.1.1"
+    "@radix-ui/react-id" "1.1.1"
+    "@radix-ui/react-primitive" "2.1.3"
+    "@radix-ui/react-use-callback-ref" "1.1.1"
+    "@radix-ui/react-use-controllable-state" "1.2.2"
 
 "@radix-ui/react-separator@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-separator/-/react-separator-1.1.0.tgz#ee0f4d86003b0e3ea7bc6ccab01ea0adee32663e"
-  integrity sha512-3uBAs+egzvJBDZAzvb/n4NxxOYpnspmWxO2u5NbZ8Y6FM/NdrGSF9bop3Cf6F6C71z1rTSn8KV0Fo2ZVd79lGA==
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-separator/-/react-separator-1.1.7.tgz#a18bd7fd07c10fda1bba14f2a3032e7b1a2b3470"
+  integrity sha512-0HEb8R9E8A+jZjvmFCy/J4xhbXy3TV+9XSnGJ3KvTtjlIUy/YQ/p6UYZvi7YbeoeXdyU9+Y3scizK6hkY37baA==
   dependencies:
-    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-primitive" "2.1.3"
 
-"@radix-ui/react-slot@1.1.0", "@radix-ui/react-slot@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.1.0.tgz#7c5e48c36ef5496d97b08f1357bb26ed7c714b84"
-  integrity sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==
+"@radix-ui/react-slot@1.2.3", "@radix-ui/react-slot@^1.1.0":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.2.3.tgz#502d6e354fc847d4169c3bc5f189de777f68cfe1"
+  integrity sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==
   dependencies:
-    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.2"
 
-"@radix-ui/react-use-callback-ref@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz#bce938ca413675bc937944b0d01ef6f4a6dc5bf1"
-  integrity sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==
+"@radix-ui/react-use-callback-ref@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz#62a4dba8b3255fdc5cc7787faeac1c6e4cc58d40"
+  integrity sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==
 
-"@radix-ui/react-use-controllable-state@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz#1321446857bb786917df54c0d4d084877aab04b0"
-  integrity sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==
+"@radix-ui/react-use-controllable-state@1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.2.tgz#905793405de57d61a439f4afebbb17d0645f3190"
+  integrity sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==
   dependencies:
-    "@radix-ui/react-use-callback-ref" "1.1.0"
+    "@radix-ui/react-use-effect-event" "0.0.2"
+    "@radix-ui/react-use-layout-effect" "1.1.1"
 
-"@radix-ui/react-use-escape-keydown@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz#31a5b87c3b726504b74e05dac1edce7437b98754"
-  integrity sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==
+"@radix-ui/react-use-effect-event@0.0.2":
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.2.tgz#090cf30d00a4c7632a15548512e9152217593907"
+  integrity sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==
   dependencies:
-    "@radix-ui/react-use-callback-ref" "1.1.0"
+    "@radix-ui/react-use-layout-effect" "1.1.1"
 
-"@radix-ui/react-use-layout-effect@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz#3c2c8ce04827b26a39e442ff4888d9212268bd27"
-  integrity sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==
-
-"@radix-ui/react-use-rect@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-rect/-/react-use-rect-1.1.0.tgz#13b25b913bd3e3987cc9b073a1a164bb1cf47b88"
-  integrity sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==
+"@radix-ui/react-use-escape-keydown@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.1.tgz#b3fed9bbea366a118f40427ac40500aa1423cc29"
+  integrity sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==
   dependencies:
-    "@radix-ui/rect" "1.1.0"
+    "@radix-ui/react-use-callback-ref" "1.1.1"
 
-"@radix-ui/react-use-size@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-size/-/react-use-size-1.1.0.tgz#b4dba7fbd3882ee09e8d2a44a3eed3a7e555246b"
-  integrity sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==
+"@radix-ui/react-use-layout-effect@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz#0c4230a9eed49d4589c967e2d9c0d9d60a23971e"
+  integrity sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==
+
+"@radix-ui/react-use-rect@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-rect/-/react-use-rect-1.1.1.tgz#01443ca8ed071d33023c1113e5173b5ed8769152"
+  integrity sha512-QTYuDesS0VtuHNNvMh+CjlKJ4LJickCMUAqjlE3+j8w+RlRpwyX3apEQKGFzbZGdo7XNG1tXa+bQqIE7HIXT2w==
   dependencies:
-    "@radix-ui/react-use-layout-effect" "1.1.0"
+    "@radix-ui/rect" "1.1.1"
 
-"@radix-ui/rect@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/rect/-/rect-1.1.0.tgz#f817d1d3265ac5415dadc67edab30ae196696438"
-  integrity sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==
+"@radix-ui/react-use-size@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-size/-/react-use-size-1.1.1.tgz#6de276ffbc389a537ffe4316f5b0f24129405b37"
+  integrity sha512-ewrXRDTAqAXlkl6t/fkXWNAhFX9I+CkKlw6zjEwk86RSPKwZr3xpBRso655aqYafwtnbpHLj6toFzmd6xdVptQ==
+  dependencies:
+    "@radix-ui/react-use-layout-effect" "1.1.1"
 
-"@rrweb/types@^2.0.0-alpha.18":
-  version "2.0.0-alpha.18"
-  resolved "https://registry.yarnpkg.com/@rrweb/types/-/types-2.0.0-alpha.18.tgz#e1d9af844cebbf30a2be8808f6cf64f5df3e7f50"
-  integrity sha512-iMH3amHthJZ9x3gGmBPmdfim7wLGygC2GciIkw2A6SO8giSn8PHYtRT8OKNH4V+k3SZ6RSnYHcTQxBA7pSWZ3Q==
+"@radix-ui/rect@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/rect/-/rect-1.1.1.tgz#78244efe12930c56fd255d7923865857c41ac8cb"
+  integrity sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==
+
+"@rollup/pluginutils@^5.0.2":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.3.0.tgz#57ba1b0cbda8e7a3c597a4853c807b156e21a7b4"
+  integrity sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    estree-walker "^2.0.2"
+    picomatch "^4.0.2"
 
 "@rtsao/scc@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
   integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
 
-"@sentry-internal/browser-utils@9.23.0":
-  version "9.23.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-9.23.0.tgz#19cd82bc42654883190423126e666c6e5db66b43"
-  integrity sha512-hyN2Q6mh7ggw8sDVHeRyWz5LR6gjvf8zHSzQnMaF7QkeSyaeGM/SVSL4ODwqR9TRH7U2ku6nZFMbKhaBPV+Hfg==
+"@sentry-internal/browser-utils@10.29.0":
+  version "10.29.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-10.29.0.tgz#37cdf31e273c60417570f358a1198ff88baca93b"
+  integrity sha512-M3kycMY6f3KY9a8jDYac+yG0E3ZgWVWSxlOEC5MhYyX+g7mqxkwrb3LFQyuxSm/m+CCgMTCaPOOaB2twXP6EQg==
   dependencies:
-    "@sentry/core" "9.23.0"
+    "@sentry/core" "10.29.0"
 
-"@sentry-internal/feedback@9.23.0":
-  version "9.23.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-9.23.0.tgz#088c52187cb1a9bb0b22c3df14a6d0b8fafec0e4"
-  integrity sha512-Xf+KqV69TBiPo1gk2EsU6O/dumuTMxWOF52uVWJddQYI3pQTU5DqSeoZ5AY76bIIhV9n6AEFDGqNPXmuj4Acrw==
+"@sentry-internal/feedback@10.29.0":
+  version "10.29.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-10.29.0.tgz#c63236f3a8adb15f691f8ab4a429a190ed60a572"
+  integrity sha512-Y7IRsNeS99cEONu1mZWZc3HvbjNnu59Hgymm0swFFKbdgbCgdT6l85kn2oLsuq4Ew8Dw/pL/Sgpwsl9UgYFpUg==
   dependencies:
-    "@sentry/core" "9.23.0"
+    "@sentry/core" "10.29.0"
 
-"@sentry-internal/replay-canvas@9.23.0":
-  version "9.23.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-9.23.0.tgz#7e384e8ab50d99d363c5e01cd255e04af1b9623b"
-  integrity sha512-cYlw5svJjyPequm0PJjFGLpee86L1NieONEHlujOXkIG6IEriiorMm+8bNpGsHRuyvg41B+4P/YmcQAGtEGxXg==
+"@sentry-internal/replay-canvas@10.29.0":
+  version "10.29.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-10.29.0.tgz#f3fd56f40ef8b9c7b7d38e591c2e7f1b098d0ff2"
+  integrity sha512-typY4JrpAQQGPuSyd/BD8+nNCbvTV2UVvKzr+iKgI0m1qc4Dz8tHZ4Nfais2Z8eYn/pL1kqVQN5ERTmJoYFdIw==
   dependencies:
-    "@sentry-internal/replay" "9.23.0"
-    "@sentry/core" "9.23.0"
+    "@sentry-internal/replay" "10.29.0"
+    "@sentry/core" "10.29.0"
 
-"@sentry-internal/replay@9.23.0":
-  version "9.23.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-9.23.0.tgz#6b1369a8712323666fd04a4f86d3ab8865ff4f37"
-  integrity sha512-0/q15tvSboaK7/05BFQhs71bqgHKejJoDJgXmH0lySqgsRh/S18867ZxQNiuYhuVt337h07u1QaCyjnNJKHfuA==
+"@sentry-internal/replay@10.29.0":
+  version "10.29.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-10.29.0.tgz#f21e6933f47ddbab2c303a462d9b5317794b20e0"
+  integrity sha512-45NVw9PwB9TQ8z+xJ6G6Za+wmQ1RTA35heBSzR6U4bknj8LmA04k2iwnobvxCBEQXeLfcJEO1vFgagMoqMZMBw==
   dependencies:
-    "@sentry-internal/browser-utils" "9.23.0"
-    "@sentry/core" "9.23.0"
+    "@sentry-internal/browser-utils" "10.29.0"
+    "@sentry/core" "10.29.0"
 
-"@sentry/babel-plugin-component-annotate@3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-3.5.0.tgz#1b0d01f903b725da876117d551610085c3dd21c7"
-  integrity sha512-s2go8w03CDHbF9luFGtBHKJp4cSpsQzNVqgIa9Pfa4wnjipvrK6CxVT4icpLA3YO6kg5u622Yoa5GF3cJdippw==
+"@sentry/babel-plugin-component-annotate@4.6.1":
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-4.6.1.tgz#94eec0293be8289daa574e18783e64d29203c236"
+  integrity sha512-aSIk0vgBqv7PhX6/Eov+vlI4puCE0bRXzUG5HdCsHBpAfeMkI8Hva6kSOusnzKqs8bf04hU7s3Sf0XxGTj/1AA==
 
-"@sentry/browser@^9.0.0":
-  version "9.23.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-9.23.0.tgz#8fdc4e393c8b893ca467d577bb7b11d038650641"
-  integrity sha512-QRkNxWys8e088260vByztoTsEVZ0W6v/XnZfKT6wkPPGn0aFeOrg/xjgxfI8D5huqZCxT28Cf23akOOly4FXjg==
+"@sentry/browser@^10.0.0":
+  version "10.29.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-10.29.0.tgz#4d7d7289960526fa2fb43d1b3d750d357d47139c"
+  integrity sha512-XdbyIR6F4qoR9Z1JCWTgunVcTJjS9p2Th+v4wYs4ME+ZdLC4tuKKmRgYg3YdSIWCn1CBfIgdI6wqETSf7H6Njw==
   dependencies:
-    "@sentry-internal/browser-utils" "9.23.0"
-    "@sentry-internal/feedback" "9.23.0"
-    "@sentry-internal/replay" "9.23.0"
-    "@sentry-internal/replay-canvas" "9.23.0"
-    "@sentry/core" "9.23.0"
+    "@sentry-internal/browser-utils" "10.29.0"
+    "@sentry-internal/feedback" "10.29.0"
+    "@sentry-internal/replay" "10.29.0"
+    "@sentry-internal/replay-canvas" "10.29.0"
+    "@sentry/core" "10.29.0"
 
-"@sentry/bundler-plugin-core@3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-3.5.0.tgz#b62af5be1b1a862e7062181655829c556c7d7c0b"
-  integrity sha512-zDzPrhJqAAy2VzV4g540qAZH4qxzisstK2+NIJPZUUKztWRWUV2cMHsyUtdctYgloGkLyGpZJBE3RE6dmP/xqQ==
+"@sentry/bundler-plugin-core@4.6.1":
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-4.6.1.tgz#d6013e6233bf663114f581bbd3c3a380ff9311d4"
+  integrity sha512-WPeRbnMXm927m4Kr69NTArPfI+p5/34FHftdCRI3LFPMyhZDzz6J3wLy4hzaVUgmMf10eLzmq2HGEMvpQmdynA==
   dependencies:
     "@babel/core" "^7.18.5"
-    "@sentry/babel-plugin-component-annotate" "3.5.0"
-    "@sentry/cli" "2.42.2"
+    "@sentry/babel-plugin-component-annotate" "4.6.1"
+    "@sentry/cli" "^2.57.0"
     dotenv "^16.3.1"
     find-up "^5.0.0"
-    glob "^9.3.2"
+    glob "^10.5.0"
     magic-string "0.30.8"
     unplugin "1.0.1"
 
-"@sentry/cli-darwin@2.42.2":
-  version "2.42.2"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.42.2.tgz#a32a4f226e717122b37d9969e8d4d0e14779f720"
-  integrity sha512-GtJSuxER7Vrp1IpxdUyRZzcckzMnb4N5KTW7sbTwUiwqARRo+wxS+gczYrS8tdgtmXs5XYhzhs+t4d52ITHMIg==
+"@sentry/cli-darwin@2.58.3":
+  version "2.58.3"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.58.3.tgz#dfe75ef716276a23accfc917228f84777964ef37"
+  integrity sha512-4bnI5e07cVkG3DdTPpBJcoRjwHvf8GPCY/vBH6gGTrM+cXxGgk7jiZpkblq1ZvpW5H51mFjiO5qqMO7GNjstQA==
 
-"@sentry/cli-linux-arm64@2.42.2":
-  version "2.42.2"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.42.2.tgz#1c06c83ff21f51ec23acf5be3b1f8c7553bf86b1"
-  integrity sha512-BOxzI7sgEU5Dhq3o4SblFXdE9zScpz6EXc5Zwr1UDZvzgXZGosUtKVc7d1LmkrHP8Q2o18HcDWtF3WvJRb5Zpw==
+"@sentry/cli-linux-arm64@2.58.3":
+  version "2.58.3"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.58.3.tgz#be87630b46090215f1afe10100ec511de6878d6e"
+  integrity sha512-xpn94gpy8U+JwsY4Eamlx/gNXh5YiZTmA1XT73kOUBrLs+e+qwQh6gfnzGxx7wdX9x+CJooTw8rwP4unisGALQ==
 
-"@sentry/cli-linux-arm@2.42.2":
-  version "2.42.2"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.42.2.tgz#00cadc359ae3c051efb3e63873c033c61dbd1ca1"
-  integrity sha512-7udCw+YL9lwq+9eL3WLspvnuG+k5Icg92YE7zsteTzWLwgPVzaxeZD2f8hwhsu+wmL+jNqbpCRmktPteh3i2mg==
+"@sentry/cli-linux-arm@2.58.3":
+  version "2.58.3"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.58.3.tgz#2da8a797731b4a1ebf21d7a082a44aa7c84578c5"
+  integrity sha512-33mlrULHtxK5rjzO7YJDtXyOeMTpkZOgfcQqcjyxeDY91jSCXE0EhlBV6SGCKqvahmvh9RUgINLkQO+qc2OjDg==
 
-"@sentry/cli-linux-i686@2.42.2":
-  version "2.42.2"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.42.2.tgz#3b817b715dd806c20dfbffd539725ad8089c310a"
-  integrity sha512-Sw/dQp5ZPvKnq3/y7wIJyxTUJYPGoTX/YeMbDs8BzDlu9to2LWV3K3r7hE7W1Lpbaw4tSquUHiQjP5QHCOS7aQ==
+"@sentry/cli-linux-i686@2.58.3":
+  version "2.58.3"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.58.3.tgz#a52d0ad62a074e12fd332b3aec71ca69045dabfc"
+  integrity sha512-Z4qWllBAPa0Z3nO3cvw9bTIfASxo5EYjnid7MvWB99TKUTdd2+YCIJ9rP9UadZqvOE9AekF+DHdh35j9E1urOQ==
 
-"@sentry/cli-linux-x64@2.42.2":
-  version "2.42.2"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.42.2.tgz#ddf906bc3071cc79ce6e633eddcb76bb9068e688"
-  integrity sha512-mU4zUspAal6TIwlNLBV5oq6yYqiENnCWSxtSQVzWs0Jyq97wtqGNG9U+QrnwjJZ+ta/hvye9fvL2X25D/RxHQw==
+"@sentry/cli-linux-x64@2.58.3":
+  version "2.58.3"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.58.3.tgz#f7bcba26dbe259dec618a95f1726aa7453dad20b"
+  integrity sha512-i68RTLedYzxZ+wdh9JS8aeMCWbnJq4xYa3Rmib2lrQ9AvScBLJlFbafjYnZUy9PWiqc78PFJc5gLefPRDpIexw==
 
-"@sentry/cli-win32-i686@2.42.2":
-  version "2.42.2"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.42.2.tgz#9036085c7c6ce455ad45fda411c55ff39c06eb95"
-  integrity sha512-iHvFHPGqgJMNqXJoQpqttfsv2GI3cGodeTq4aoVLU/BT3+hXzbV0x1VpvvEhncJkDgDicJpFLM8sEPHb3b8abw==
+"@sentry/cli-win32-arm64@2.58.3":
+  version "2.58.3"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-arm64/-/cli-win32-arm64-2.58.3.tgz#cf1e04b00d043503a26f3d816e9572eaa652b0fc"
+  integrity sha512-en2uDEi+NLEVCfTvuivKxUSSe2jp3iKtSRFSONSRMc0p7O6SlGYflPZCVIGPXQWKSNYXdQINbefQND4d5bPzsQ==
 
-"@sentry/cli-win32-x64@2.42.2":
-  version "2.42.2"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.42.2.tgz#7d6464b63f32c9f97fff428f246b1f039b402233"
-  integrity sha512-vPPGHjYoaGmfrU7xhfFxG7qlTBacroz5NdT+0FmDn6692D8IvpNXl1K+eV3Kag44ipJBBeR8g1HRJyx/F/9ACw==
+"@sentry/cli-win32-i686@2.58.3":
+  version "2.58.3"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.58.3.tgz#b93e795c7e4351a256fd7a0f84e6c39cf60cfe08"
+  integrity sha512-dYWNuE+FtZXpT4aqW68/4ah2WAAz//QSQxxpuTBAQ+Wui26Mp30q5nJdYOzAckdSF8yVKjIHB0NLuIYZYHijyQ==
 
-"@sentry/cli@2.42.2":
-  version "2.42.2"
-  resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.42.2.tgz#8173df4d057d600a9ef0cf1e9b42b0c6607b46e4"
-  integrity sha512-spb7S/RUumCGyiSTg8DlrCX4bivCNmU/A1hcfkwuciTFGu8l5CDc2I6jJWWZw8/0enDGxuj5XujgXvU5tr4bxg==
+"@sentry/cli-win32-x64@2.58.3":
+  version "2.58.3"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.58.3.tgz#ac2a7c0785977713f77dad3a138faa61bb4094a0"
+  integrity sha512-D1qkHE2Mkfu9w1zyZt8M/V+yqoycJFEtp4hCv/HtLhExNtZYrdjf8LHzR0tUvEBS4Y1aw4wbox+Wh8ToOhcXbQ==
+
+"@sentry/cli@^2.57.0":
+  version "2.58.3"
+  resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.58.3.tgz#2ac2b0ab9556e694d6e9cf7f56559e0c3f2a99bf"
+  integrity sha512-3eGF2ijOuON6wbr3OrQ48+nUTLwFLOGeTixJX9GJ36aYovFnF+FvjxIvtjnWgLUgwGu33PQFGzK7S2HridVJXQ==
   dependencies:
     https-proxy-agent "^5.0.0"
     node-fetch "^2.6.7"
@@ -2903,57 +3068,114 @@
     proxy-from-env "^1.1.0"
     which "^2.0.2"
   optionalDependencies:
-    "@sentry/cli-darwin" "2.42.2"
-    "@sentry/cli-linux-arm" "2.42.2"
-    "@sentry/cli-linux-arm64" "2.42.2"
-    "@sentry/cli-linux-i686" "2.42.2"
-    "@sentry/cli-linux-x64" "2.42.2"
-    "@sentry/cli-win32-i686" "2.42.2"
-    "@sentry/cli-win32-x64" "2.42.2"
+    "@sentry/cli-darwin" "2.58.3"
+    "@sentry/cli-linux-arm" "2.58.3"
+    "@sentry/cli-linux-arm64" "2.58.3"
+    "@sentry/cli-linux-i686" "2.58.3"
+    "@sentry/cli-linux-x64" "2.58.3"
+    "@sentry/cli-win32-arm64" "2.58.3"
+    "@sentry/cli-win32-i686" "2.58.3"
+    "@sentry/cli-win32-x64" "2.58.3"
 
-"@sentry/core@9.23.0":
-  version "9.23.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-9.23.0.tgz#96a514cc9d8ac043dea0a4648ed1205c25ff5ae5"
-  integrity sha512-9846pn/BvASGgl7WsnKY4xry98WreP9ToeLfCQTQOf+pNfD/qNPn1/0xPInGni3LVMAXRtfHHMPm2Ghz255N7A==
+"@sentry/core@10.29.0":
+  version "10.29.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-10.29.0.tgz#8783db0969224f48ea46e3c3212289d5dbd6ef38"
+  integrity sha512-olQ2DU9dA/Bwsz3PtA9KNXRMqBWRQSkPw+MxwWEoU1K1qtiM9L0j6lbEFb5iSY3d7WYD5MB+1d5COugjSBrHtw==
 
-"@sentry/webpack-plugin@^3.0.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-3.5.0.tgz#cde95534f1e945a4002d47465aeda01d382cd279"
-  integrity sha512-xvclj0QY2HyU7uJLzOlHSrZQBDwfnGKJxp8mmlU4L7CwmK+8xMCqlO7tYZoqE4K/wU3c2xpXql70x8qmvNMxzQ==
+"@sentry/webpack-plugin@^4.0.0":
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-4.6.1.tgz#8041ef27f302c3f63902bc4bb01e2ee53ea94c15"
+  integrity sha512-CJgT/t2pQWsPsMx9VJ86goU/orCQhL2HhDj5ZYBol6fPPoEGeTqKOPCnv/xsbCAfGSp1uHpyRLTA/Gx96u7VVA==
   dependencies:
-    "@sentry/bundler-plugin-core" "3.5.0"
+    "@sentry/bundler-plugin-core" "4.6.1"
     unplugin "1.0.1"
     uuid "^9.0.0"
 
-"@sinclair/typebox@^0.27.8":
-  version "0.27.8"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
-  integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
+"@sinclair/typebox@^0.34.0":
+  version "0.34.41"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.34.41.tgz#aa51a6c1946df2c5a11494a2cdb9318e026db16c"
+  integrity sha512-6gS8pZzSXdyRHTIqoqSVknxolr1kzfy4/CeDnrzsVz8TTIWUbOBr6gnzOmTYJ3eXQNh4IYHIGi5aIL7sOZ2G/g==
 
-"@sinonjs/commons@^3.0.0":
+"@sinonjs/commons@^3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd"
   integrity sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/fake-timers@^10.0.2":
-  version "10.3.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66"
-  integrity sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==
+"@sinonjs/fake-timers@^13.0.0":
+  version "13.0.5"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz#36b9dbc21ad5546486ea9173d6bea063eb1717d5"
+  integrity sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==
   dependencies:
-    "@sinonjs/commons" "^3.0.0"
+    "@sinonjs/commons" "^3.0.1"
 
-"@stylistic/eslint-plugin@^4.0.0":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin/-/eslint-plugin-4.4.0.tgz#e1a3c9fd7109411d32dc0bcb575d2b4066fbbc63"
-  integrity sha512-bIh/d9X+OQLCAMdhHtps+frvyjvAM4B1YlSJzcEEhl7wXLIqPar3ngn9DrHhkBOrTA/z9J0bUMtctAspe0dxdQ==
+"@storybook/builder-vite@10.1.5":
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/@storybook/builder-vite/-/builder-vite-10.1.5.tgz#27b11a0fb583e342cd041ea1eded7d012a0c278a"
+  integrity sha512-5alpNa+TQXK1zp9MeovUK/yIUkZqpIFUScUer6cYgidI96Boovn7OXt5oXQ8CqqpzuEtgCvz44TzCmgZoGv41g==
   dependencies:
-    "@typescript-eslint/utils" "^8.32.1"
-    eslint-visitor-keys "^4.2.0"
-    espree "^10.3.0"
+    "@storybook/csf-plugin" "10.1.5"
+    "@vitest/mocker" "3.2.4"
+    ts-dedent "^2.0.0"
+
+"@storybook/csf-plugin@10.1.5":
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-10.1.5.tgz#8d147fa82c19e348991bbad88c1af8ef56a9d2a3"
+  integrity sha512-v+D7PVRkNUHznfoQg8yqpLWZIIbPddqHDSi1oBGdegF0Kv/lVsGqTZGRLroApsMu7BLwLhpcMID6ofxlfftWKg==
+  dependencies:
+    unplugin "^2.3.5"
+
+"@storybook/global@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@storybook/global/-/global-5.0.0.tgz#b793d34b94f572c1d7d9e0f44fac4e0dbc9572ed"
+  integrity sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==
+
+"@storybook/icons@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@storybook/icons/-/icons-2.0.1.tgz#1bd351db1d33bfccbbafa7b64fb413168f1a6616"
+  integrity sha512-/smVjw88yK3CKsiuR71vNgWQ9+NuY2L+e8X7IMrFjexjm6ZR8ULrV2DRkTA61aV6ryefslzHEGDInGpnNeIocg==
+
+"@storybook/react-dom-shim@10.1.5":
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-10.1.5.tgz#e39c169b093594de88dcb0c59b797ec23028ef0c"
+  integrity sha512-CsXcq26wINUgYP8KnfSuS60B10/Ag34YdcnWIEl9hM5UtTQ65WYJ9fVFqpzfnQrkpgRMd7iQjtmUhCe+4umnHg==
+
+"@storybook/react-vite@^10.0.7":
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/@storybook/react-vite/-/react-vite-10.1.5.tgz#9da7bbb0b860526da51fa3d50993934b593588b3"
+  integrity sha512-27RiCVw5QZ/f9fXS8sGaPHuWkbHSoS66ifeakxHgbkbIXjVI4M6pWB7NUj49MwU1YUMOpB0T8KasvyMZzv/UPA==
+  dependencies:
+    "@joshwooding/vite-plugin-react-docgen-typescript" "0.6.1"
+    "@rollup/pluginutils" "^5.0.2"
+    "@storybook/builder-vite" "10.1.5"
+    "@storybook/react" "10.1.5"
+    empathic "^2.0.0"
+    magic-string "^0.30.0"
+    react-docgen "^8.0.0"
+    resolve "^1.22.8"
+    tsconfig-paths "^4.2.0"
+
+"@storybook/react@10.1.5":
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-10.1.5.tgz#0f6a1ec5c4338d3604d6e957d0f53f7ddf9a2e6a"
+  integrity sha512-M8fR7WVs79fPJHwRZxkz4XzIfzs/bN0heWdZX0D4iRjeIcY4nLM/tyalCcQDrGgrSJbgAAf4xd7KXaZzaZSAqA==
+  dependencies:
+    "@storybook/global" "^5.0.0"
+    "@storybook/react-dom-shim" "10.1.5"
+    react-docgen "^8.0.2"
+
+"@stylistic/eslint-plugin@^5.0.0":
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin/-/eslint-plugin-5.6.1.tgz#98e1371757881eecce69b1ec497ef6fc7d6470c9"
+  integrity sha512-JCs+MqoXfXrRPGbGmho/zGS/jMcn3ieKl/A8YImqib76C8kjgZwq5uUFzc30lJkMvcchuRn6/v8IApLxli3Jyw==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.9.0"
+    "@typescript-eslint/types" "^8.47.0"
+    eslint-visitor-keys "^4.2.1"
+    espree "^10.4.0"
     estraverse "^5.3.0"
-    picomatch "^4.0.2"
+    picomatch "^4.0.3"
 
 "@svgr/babel-plugin-add-jsx-attribute@8.0.0":
   version "8.0.0"
@@ -3062,37 +3284,36 @@
     "@svgr/plugin-svgo" "8.1.0"
 
 "@testcontainers/postgresql@^11.0.0":
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/@testcontainers/postgresql/-/postgresql-11.0.0.tgz#6590f2398fae2d9ad78a748e92b89053d2380f56"
-  integrity sha512-cw2vIz5MS1AjXkxcPmOQh0NRdh7p6frSLOkjsBFuR5lUo3qnV3LmvCfanyRzgXs5aHGJLwc0mlQNfXnKedBF6Q==
+  version "11.9.0"
+  resolved "https://registry.yarnpkg.com/@testcontainers/postgresql/-/postgresql-11.9.0.tgz#9009e28208c4134c4cd6614827fa98614ea1d494"
+  integrity sha512-beLyLdLygFllktviM132Xd6tQ4i5FnuyZP+4BQEjUb5sJYHYnIrV/ZBzRRflIlF8gugt1GXgudkmr/HxM9vtKw==
   dependencies:
-    testcontainers "^11.0.0"
+    testcontainers "^11.9.0"
 
 "@testing-library/dom@^10.4.0":
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-10.4.0.tgz#82a9d9462f11d240ecadbf406607c6ceeeff43a8"
-  integrity sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==
+  version "10.4.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-10.4.1.tgz#d444f8a889e9a46e9a3b4f3b88e0fcb3efb6cf95"
+  integrity sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/runtime" "^7.12.5"
     "@types/aria-query" "^5.0.1"
     aria-query "5.3.0"
-    chalk "^4.1.0"
     dom-accessibility-api "^0.5.9"
     lz-string "^1.5.0"
+    picocolors "1.1.1"
     pretty-format "^27.0.2"
 
-"@testing-library/jest-dom@^6.4.8":
-  version "6.6.3"
-  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-6.6.3.tgz#26ba906cf928c0f8172e182c6fe214eb4f9f2bd2"
-  integrity sha512-IteBhl4XqYNkM54f4ejhLRJiZNqcSCoXUOG2CPK7qbD322KjQozM4kHQOfkG2oln9b9HTYqs+Sae8vBATubxxA==
+"@testing-library/jest-dom@^6.4.8", "@testing-library/jest-dom@^6.6.3":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-6.9.1.tgz#7613a04e146dd2976d24ddf019730d57a89d56c2"
+  integrity sha512-zIcONa+hVtVSSep9UT3jZ5rizo2BsxgyDYU7WFD5eICBE7no3881HGeb/QkGfsJs6JTkY1aQhT7rIPC7e+0nnA==
   dependencies:
     "@adobe/css-tools" "^4.4.0"
     aria-query "^5.0.0"
-    chalk "^3.0.0"
     css.escape "^1.5.1"
     dom-accessibility-api "^0.6.3"
-    lodash "^4.17.21"
+    picocolors "^1.1.1"
     redent "^3.0.0"
 
 "@testing-library/react@^16.0.0":
@@ -3102,45 +3323,20 @@
   dependencies:
     "@babel/runtime" "^7.12.5"
 
-"@testing-library/user-event@^14.5.2":
+"@testing-library/user-event@^14.5.2", "@testing-library/user-event@^14.6.1":
   version "14.6.1"
   resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.6.1.tgz#13e09a32d7a8b7060fe38304788ebf4197cd2149"
   integrity sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw==
 
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
 "@trysound/sax@0.2.0":
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
   integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
 
-"@tsconfig/node10@^1.0.7":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2"
-  integrity sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==
-
-"@tsconfig/node12@^1.0.7":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
-  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
-
-"@tsconfig/node14@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
-  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
-
-"@tsconfig/node16@^1.0.2":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
-  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
-
-"@tybys/wasm-util@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.9.0.tgz#3e75eb00604c8d6db470bf18c37b7d984a0e3355"
-  integrity sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==
+"@tybys/wasm-util@^0.10.0", "@tybys/wasm-util@^0.10.1":
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.1.tgz#ecddd3205cf1e2d5274649ff0eedd2991ed7f414"
+  integrity sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==
   dependencies:
     tslib "^2.4.0"
 
@@ -3149,7 +3345,7 @@
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.4.tgz#1a31c3d378850d2778dabb6374d036dcba4ba708"
   integrity sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==
 
-"@types/babel__core@^7.1.14":
+"@types/babel__core@^7.20.5":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
   integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==
@@ -3161,9 +3357,9 @@
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.6.8"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.8.tgz#f836c61f48b1346e7d2b0d93c6dacc5b9535d3ab"
-  integrity sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==
+  version "7.27.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.27.0.tgz#b5819294c51179957afaec341442f9341e4108a9"
+  integrity sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==
   dependencies:
     "@babel/types" "^7.0.0"
 
@@ -3175,17 +3371,17 @@
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.20.6"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.6.tgz#8dc9f0ae0f202c08d8d4dab648912c8d6038e3f7"
-  integrity sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==
+"@types/babel__traverse@*", "@types/babel__traverse@^7.20.7":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.28.0.tgz#07d713d6cce0d265c9849db0cbe62d3f61f36f74"
+  integrity sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==
   dependencies:
-    "@babel/types" "^7.20.7"
+    "@babel/types" "^7.28.2"
 
 "@types/body-parser@*":
-  version "1.19.5"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4"
-  integrity sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==
+  version "1.19.6"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.6.tgz#1859bebb8fd7dac9918a45d54c1971ab8b5af474"
+  integrity sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==
   dependencies:
     "@types/connect" "*"
     "@types/node" "*"
@@ -3197,10 +3393,18 @@
   dependencies:
     "@types/node" "*"
 
+"@types/chai@^5.2.2":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-5.2.3.tgz#8e9cd9e1c3581fa6b341a5aed5588eb285be0b4a"
+  integrity sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==
+  dependencies:
+    "@types/deep-eql" "*"
+    assertion-error "^2.0.1"
+
 "@types/commonmark@^0.27.4":
-  version "0.27.9"
-  resolved "https://registry.yarnpkg.com/@types/commonmark/-/commonmark-0.27.9.tgz#2d2d42e72127c84525fbbc87aaefb5a43e1129d7"
-  integrity sha512-d3+57WgyPCcIc6oshmcPkmP4+JqRRot9eeZLsBsutWtIxwWivpoyc2wEcolOp8MyO3ZWN846mMdoR02kdHSMCw==
+  version "0.27.10"
+  resolved "https://registry.yarnpkg.com/@types/commonmark/-/commonmark-0.27.10.tgz#79b1cc817a9d2e28cf875a19ef5002ca25aa4e09"
+  integrity sha512-iEZobUnvlM+UX5fXWCmC4eQXwCs01Z8Xa1W0VjiWUF/XsNy4BHtskqJ9MyLZVMHbA0ezhyonCDqz3hMvsCm6Hg==
 
 "@types/connect-history-api-fallback@^1.5.4":
   version "1.5.4"
@@ -3217,15 +3421,25 @@
   dependencies:
     "@types/node" "*"
 
+"@types/content-type@^1.1.9":
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/@types/content-type/-/content-type-1.1.9.tgz#a0240a8141b33549ac0ca6847f4b801580012bca"
+  integrity sha512-Hq9IMnfekuOCsEmYl4QX2HBrT+XsfXiupfrLLY8Dcf3Puf4BkBOxSbWYTITSOQAhJoYPBez+b4MJRpIYL65z8A==
+
 "@types/counterpart@^0.18.1":
   version "0.18.4"
   resolved "https://registry.yarnpkg.com/@types/counterpart/-/counterpart-0.18.4.tgz#e3e331b7e0d5496873d417839f3b2bbcf555bb73"
   integrity sha512-aqBg5oAGo/qh/+wxUfuMadDu2WO0MEWOblyzwaM1Ske2xilUxBfgPqapAFVAfrVTDMVwa0UMarzGot8m64IAzA==
 
 "@types/css-tree@^2.3.8":
-  version "2.3.10"
-  resolved "https://registry.yarnpkg.com/@types/css-tree/-/css-tree-2.3.10.tgz#b96abb37c1b51b03fe16054c186130c6ab69fef7"
-  integrity sha512-WcaBazJ84RxABvRttQjjFWgTcHvZR9jGr0Y3hccPkHjFyk/a3N8EuxjKr+QfrwjoM5b1yI1Uj1i7EzOAAwBwag==
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/@types/css-tree/-/css-tree-2.3.11.tgz#c9457a54fe8ea02d2d72ddc864c1b9c5625f10d0"
+  integrity sha512-aEokibJOI77uIlqoBOkVbaQGC9zII0A+JH1kcTNKW2CwyYWD8KM6qdo+4c77wD3wZOQfJuNWAr9M4hdk+YhDIg==
+
+"@types/deep-eql@*":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/deep-eql/-/deep-eql-4.0.2.tgz#334311971d3a07121e7eb91b684a605e7eea9cbd"
+  integrity sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==
 
 "@types/diff-match-patch@^1.0.32":
   version "1.0.36"
@@ -3240,15 +3454,20 @@
     "@types/node" "*"
     "@types/ssh2" "*"
 
-"@types/dockerode@^3.3.39":
-  version "3.3.39"
-  resolved "https://registry.yarnpkg.com/@types/dockerode/-/dockerode-3.3.39.tgz#629adef5db9b3bb955423db1ccd586ee2b36e2e7"
-  integrity sha512-uMPmxehH6ofeYjaslASPtjvyH8FRJdM9fZ+hjhGzL4Jq3bGjr9D7TKmp9soSwgFncNk0HOwmyBxjqOb3ikjjsA==
+"@types/dockerode@^3.3.47":
+  version "3.3.47"
+  resolved "https://registry.yarnpkg.com/@types/dockerode/-/dockerode-3.3.47.tgz#cf8c6b4efcd0bb28b0e6009e613e7faab1b96e75"
+  integrity sha512-ShM1mz7rCjdssXt7Xz0u1/R2BJC7piWa3SJpUBiVjCf2A3XNn4cP6pUVaD8bLanpPVVn4IKzJuw3dOvkJ8IbYw==
   dependencies:
     "@types/docker-modem" "*"
     "@types/node" "*"
     "@types/ssh2" "*"
 
+"@types/doctrine@^0.0.9":
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/@types/doctrine/-/doctrine-0.0.9.tgz#d86a5f452a15e3e3113b99e39616a9baa0f9863f"
+  integrity sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==
+
 "@types/escape-html@^1.0.1":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@types/escape-html/-/escape-html-1.0.4.tgz#dc7c166b76c7b03b27e32f80edf01d91eb5d9af2"
@@ -3270,17 +3489,17 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*", "@types/estree@^1.0.6":
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.7.tgz#4158d3105276773d5b7695cd4834b1722e4f37a8"
-  integrity sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==
+"@types/estree@*", "@types/estree@^1.0.0", "@types/estree@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.8.tgz#958b91c991b1867ced318bedea0e215ee050726e"
+  integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==
 
 "@types/events@^3.0.0":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.3.tgz#a8ef894305af28d1fc6d2dfdfc98e899591ea529"
   integrity sha512-trOc4AAUThEz9hapPtSd7wf5tiQKvTtu5b371UxXdTuqzIh0ArcRspRP0i0Viu+LXstIQ1z96t1nsPxT9ol01g==
 
-"@types/express-serve-static-core@*", "@types/express-serve-static-core@^5.0.0":
+"@types/express-serve-static-core@*":
   version "5.0.6"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-5.0.6.tgz#41fec4ea20e9c7b22f024ab88a95c6bb288f51b8"
   integrity sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==
@@ -3300,19 +3519,29 @@
     "@types/range-parser" "*"
     "@types/send" "*"
 
+"@types/express-serve-static-core@^5.0.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-5.1.0.tgz#74f47555b3d804b54cb7030e6f9aa0c7485cfc5b"
+  integrity sha512-jnHMsrd0Mwa9Cf4IdOzbz543y4XJepXrbia2T4b6+spXC2We3t1y6K44D3mR8XMFSXMCf3/l7rCgddfx7UNVBA==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+    "@types/send" "*"
+
 "@types/express@*", "@types/express@^5.0.0":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-5.0.2.tgz#7be9e337a5745d6b43ef5b0c352dad94a7f0c256"
-  integrity sha512-BtjL3ZwbCQriyb0DGw+Rt12qAXPiBTPs815lsUvtt1Grk0vLRMZNMUZ741d5rjk+UQOxfDiBZ3dxpX00vSkK3g==
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-5.0.6.tgz#2d724b2c990dcb8c8444063f3580a903f6d500cc"
+  integrity sha512-sKYVuV7Sv9fbPIt/442koC7+IIwK5olP1KWeD88e/idgoJqDm3JV/YUiPwkoKK92ylff2MGxSz1CSjsXelx0YA==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^5.0.0"
-    "@types/serve-static" "*"
+    "@types/serve-static" "^2"
 
 "@types/express@^4.17.21":
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d"
-  integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==
+  version "4.17.23"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.23.tgz#35af3193c640bfd4d7fe77191cd0ed411a433bef"
+  integrity sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.33"
@@ -3341,13 +3570,6 @@
   resolved "https://registry.yarnpkg.com/@types/glob-to-regexp/-/glob-to-regexp-0.4.4.tgz#409e71290253203185b1ea8a3d6ea406a4bdc902"
   integrity sha512-nDKoaKJYbnn1MZxUY0cA1bPmmgZbg0cTq7Rh13d0KWYNOiKbqoR+2d89SnRPszGh7ROzSwZ/GOjZ4jPbmmZ6Eg==
 
-"@types/graceful-fs@^4.1.3":
-  version "4.1.9"
-  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.9.tgz#2a06bc0f68a20ab37b3e36aa238be6abdf49e8b4"
-  integrity sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==
-  dependencies:
-    "@types/node" "*"
-
 "@types/hoist-non-react-statics@^3.3.0":
   version "3.3.5"
   resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494"
@@ -3362,9 +3584,9 @@
   integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==
 
 "@types/http-errors@*":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f"
-  integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.5.tgz#5b749ab2b16ba113423feb1a64a95dcd30398472"
+  integrity sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==
 
 "@types/http-proxy@^1.17.8":
   version "1.17.16"
@@ -3373,7 +3595,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.1", "@types/istanbul-lib-coverage@^2.0.6":
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
   integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
@@ -3385,35 +3607,30 @@
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
-"@types/istanbul-reports@^3.0.0":
+"@types/istanbul-reports@^3.0.4":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54"
   integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@29.5.12":
-  version "29.5.12"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.12.tgz#7f7dc6eb4cf246d2474ed78744b05d06ce025544"
-  integrity sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==
+"@types/jest@30.0.0":
+  version "30.0.0"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-30.0.0.tgz#5e85ae568006712e4ad66f25433e9bdac8801f1d"
+  integrity sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA==
   dependencies:
-    expect "^29.0.0"
-    pretty-format "^29.0.0"
+    expect "^30.0.0"
+    pretty-format "^30.0.0"
 
 "@types/jitsi-meet@^2.0.2":
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/@types/jitsi-meet/-/jitsi-meet-2.0.5.tgz#bab7ae7272b369a9d34df7b915742d9d47fb9dbb"
   integrity sha512-rlYDoTolCfuvgU/Zg936+jIJHvMSXIH2l9bHkBVH3J3WzSECwsVu9LbhUc5FTXtFy1uENXwTxVVtQqCs7WiDkA==
 
-"@types/js-cookie@^2.2.6":
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.7.tgz#226a9e31680835a6188e887f3988e60c04d3f6a3"
-  integrity sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA==
-
-"@types/jsdom@^20.0.0":
-  version "20.0.1"
-  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.1.tgz#07c14bc19bd2f918c1929541cdaacae894744808"
-  integrity sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==
+"@types/jsdom@^21.1.7":
+  version "21.1.7"
+  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-21.1.7.tgz#9edcb09e0b07ce876e7833922d3274149c898cfa"
+  integrity sha512-yOriVnggzrnQ3a9OKOCxaVuSug3w3/SbOj5i7VwXWZEyUNl3bLF9V3MfxGbZKuwqJOQyRfqXyROBB1CoZLFWzA==
   dependencies:
     "@types/node" "*"
     "@types/tough-cookie" "*"
@@ -3440,23 +3657,9 @@
   integrity sha512-HMwFiRujE5PjrgwHQ25+bsLJgowjGjm5Z8FVSf0N6PwgJrwxH0QxzHYDcKsTfV3wva0vzrpqMTJS2jXPr5BMEQ==
 
 "@types/lodash@^4.14.168":
-  version "4.17.17"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.17.tgz#fb85a04f47e9e4da888384feead0de05f7070355"
-  integrity sha512-RRVJ+J3J+WmyOTqnz3PiBLA501eKwXl2noseKOrNo/6+XEHjTAxO4xHvxQB6QuNm+s4WRbn6rSiap8+EA+ykFQ==
-
-"@types/mapbox__point-geometry@*", "@types/mapbox__point-geometry@^0.1.4":
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.4.tgz#0ef017b75eedce02ff6243b4189210e2e6d5e56d"
-  integrity sha512-mUWlSxAmYLfwnRBmgYV86tgYmMIICX4kza8YnE/eIlywGe2XoOxlpVnXWwir92xRLjwyarqwpu2EJKD2pk0IUA==
-
-"@types/mapbox__vector-tile@^1.3.4":
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.4.tgz#ad757441ef1d34628d9e098afd9c91423c1f8734"
-  integrity sha512-bpd8dRn9pr6xKvuEBQup8pwQfD4VUyqO/2deGjfpe6AwC8YRlyEipvefyRJUSiCJTZuCb8Pl1ciVV5ekqJ96Bg==
-  dependencies:
-    "@types/geojson" "*"
-    "@types/mapbox__point-geometry" "*"
-    "@types/pbf" "*"
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.21.tgz#b806831543d696b14f8112db600ea9d3a1df6ea4"
+  integrity sha512-FOvQ0YPD5NOfPgMzJihoT+Za5pdkDJWcbpuj1DjaKZIr/gxodQjY/uWEFlTNqW2ugXHUiL8lRQgw63dzKHZdeQ==
 
 "@types/mime@^1":
   version "1.3.5"
@@ -3474,12 +3677,12 @@
   integrity sha512-yslwR0zZ3zAT1qXcCPxIcD23CZ6W6nKsl6JufSJHAmdwOBuYwCVJkaMsEo9yzxGV7ATfoX8S+RgtnajOEtKxYA==
 
 "@types/node-fetch@^2.6.2":
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.12.tgz#8ab5c3ef8330f13100a7479e2cd56d3386830a03"
-  integrity sha512-8nneRWKCg3rMtF69nLQJnOYUcbafYeFSjqkw3jCRLsqkWFlHaoQrr5mXmofFGOx3DKn7UfmBMyov8ySvLRVldA==
+  version "2.6.13"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.13.tgz#e0c9b7b5edbdb1b50ce32c127e85e880872d56ee"
+  integrity sha512-QGpRVpzSaUs30JBSGPjOg4Uveu384erbHBoT1zeONvyCfwQxIkUshLAOqN/k9EjGviPRmWTTe6aH2qySWKTVSw==
   dependencies:
     "@types/node" "*"
-    form-data "^4.0.0"
+    form-data "^4.0.4"
 
 "@types/node-forge@^1.3.0":
   version "1.3.11"
@@ -3488,49 +3691,46 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*", "@types/node@>=13.7.0":
-  version "22.15.23"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.15.23.tgz#a0b7c03f951f1ffe381a6a345c68d80e48043dd0"
-  integrity sha512-7Ec1zaFPF4RJ0eXu1YT/xgiebqwqoJz8rYPDi/O2BcZ++Wpt0Kq9cl0eg6NN6bYbPnR67ZLo7St5Q3UK0SnARw==
+"@types/node@*":
+  version "25.0.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-25.0.0.tgz#c0e0022c3c7b41635c49322e6b3a0279fffa7d62"
+  integrity sha512-rl78HwuZlaDIUSeUKkmogkhebA+8K1Hy7tddZuJ3D0xV8pZSfsYGTsliGUol1JPzu9EKnTxPC4L1fiWouStRew==
   dependencies:
-    undici-types "~6.21.0"
+    undici-types "~7.16.0"
 
 "@types/node@18", "@types/node@^18.11.18":
-  version "18.19.105"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.105.tgz#44bae77ea9832da4357e1d35df37cb86927e1405"
-  integrity sha512-a+DrwD2VyzqQR2W0EVF8EaCh6Em4ilQAYLEPZnMNkQHXR7ziWW7RUhZMWZAgRpkDDAdUIcJOXSPJT/zBEwz3sA==
+  version "18.19.130"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.130.tgz#da4c6324793a79defb7a62cba3947ec5add00d59"
+  integrity sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==
   dependencies:
     undici-types "~5.26.4"
 
+"@types/node@>=13.7.0":
+  version "24.10.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.10.2.tgz#82a57476a19647d8f2c7750d0924788245e39b26"
+  integrity sha512-WOhQTZ4G8xZ1tjJTvKOpyEVSGgOTvJAfDK3FNFgELyaTpzhdgHVHeqW8V+UJvzF5BT+/B54T/1S2K6gd9c7bbA==
+  dependencies:
+    undici-types "~7.16.0"
+
 "@types/normalize-package-data@^2.4.0":
   version "2.4.4"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
   integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==
 
 "@types/pako@^2.0.0":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@types/pako/-/pako-2.0.3.tgz#b6993334f3af27c158f3fe0dfeeba987c578afb1"
-  integrity sha512-bq0hMV9opAcrmE0Byyo0fY3Ew4tgOevJmQ9grUhpXQhYfyLJ1Kqg3P33JT5fdbT2AjeAjR51zqqVjAL/HMkx7Q==
-
-"@types/pbf@*", "@types/pbf@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@types/pbf/-/pbf-3.0.5.tgz#a9495a58d8c75be4ffe9a0bd749a307715c07404"
-  integrity sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/pako/-/pako-2.0.4.tgz#c3575ef8125e176c345fa0e7b301c1db41170c15"
+  integrity sha512-VWDCbrLeVXJM9fihYodcLiIv0ku+AlOa/TQ1SvYOaBuyrSKgEcro95LJyIsJ4vSo6BXIxOKxiJAat04CmST9Fw==
 
 "@types/png-chunks-extract@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@types/png-chunks-extract/-/png-chunks-extract-1.0.2.tgz#31dd8d74d6ba879ace317c1e042dcdabc6300d6e"
   integrity sha512-z6djfFIbrrddtunoMJBOPlyZrnmeuG1kkvHUNi2QfpOb+JMMLuLliHHTmMyRi7k7LiTAut0HbdGCF6ibDtQAHQ==
 
-"@types/prop-types@*":
-  version "15.7.14"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.14.tgz#1433419d73b2a7ebfc6918dcefd2ec0d5cd698f2"
-  integrity sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==
-
 "@types/qrcode@^1.3.5":
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.5.5.tgz#993ff7c6b584277eee7aac0a20861eab682f9dac"
-  integrity sha512-CdfBi/e3Qk+3Z/fXYShipBT13OJ2fDO2Q2w5CIP5anLTLIndQG9z6P1cnm+8zCWSpm5dnxMFd/uREtb0EXuQzg==
+  version "1.5.6"
+  resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.5.6.tgz#07c33cb9ec0ad88be4636e636e28e54d99b65f42"
+  integrity sha512-te7NQcV2BOvdj2b1hCAHzAoMNuj65kNBMz0KBaxM6c3VGBOhU0dURQKOtH8CFNI/dsKkwlv32p26qYQTWoB5bw==
   dependencies:
     "@types/node" "*"
 
@@ -3551,10 +3751,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-dom@19.1.5":
-  version "19.1.5"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.1.5.tgz#cdfe2c663742887372f54804b16e8dbc26bd794a"
-  integrity sha512-CMCjrWucUBZvohgZxkjd6S9h0nZxXjzus6yDfUb+xLxYM7VvjKNH1tQrE9GWLql1XoOP4/Ds3bwFqShHUYraGg==
+"@types/react-dom@19.2.3":
+  version "19.2.3"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.2.3.tgz#c1e305d15a52a3e508d54dca770d202cb63abf2c"
+  integrity sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==
 
 "@types/react-redux@^7.1.20":
   version "7.1.34"
@@ -3571,25 +3771,17 @@
   resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.12.tgz#b5d76568485b02a307238270bfe96cb51ee2a044"
   integrity sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==
 
-"@types/react-virtualized@^9.21.30":
-  version "9.22.2"
-  resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.22.2.tgz#97674f050a85d0f7aab827b3d894f3f1b237922a"
-  integrity sha512-0Eg/ME3OHYWGxs+/n4VelfYrhXssireZaa1Uqj5SEkTpSaBu5ctFGOCVxcOqpGXRiEdrk/7uho9tlZaryCIjHA==
+"@types/react@*", "@types/react@19.2.7":
+  version "19.2.7"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.2.7.tgz#84e62c0f23e8e4e5ac2cadcea1ffeacccae7f62f"
+  integrity sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==
   dependencies:
-    "@types/prop-types" "*"
-    "@types/react" "*"
+    csstype "^3.2.2"
 
-"@types/react@*", "@types/react@19.1.6":
-  version "19.1.6"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.1.6.tgz#dee39f3e1e9a7d693f156a5840570b6d57f325ea"
-  integrity sha512-JeG0rEWak0N6Itr6QUx+X60uQmN+5t3j9r/OVDtWzFXKaj6kD1BwJzOksD0FF6iWxZlbE1kB0q9vtnU2ekqa1Q==
-  dependencies:
-    csstype "^3.0.2"
-
-"@types/retry@0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
-  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
+"@types/resolve@^1.20.2":
+  version "1.20.6"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.6.tgz#e6e60dad29c2c8c206c026e6dd8d6d1bdda850b8"
+  integrity sha512-A4STmOXPhMUtHH+S6ymgE2GiBSMqf4oTvcQZMcHzokuTLVYzXTB8ttjcgxOVaAp2lGwEdzZ0J+cRbbeevQj1UQ==
 
 "@types/retry@0.12.2":
   version "0.12.2"
@@ -3603,20 +3795,32 @@
   dependencies:
     htmlparser2 "^8.0.0"
 
+"@types/sdp-transform@^2.4.10":
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/@types/sdp-transform/-/sdp-transform-2.15.0.tgz#f59a33ec631374794c2affc4c63ef60613285983"
+  integrity sha512-ikIFF0EaYt/2XetIYYVeMj6SB52oVXFasJUXDzWHgzNJS5ep2Pbsu7f8f3Za+dEie8HQtt3Zr9mHYBpWT0XgxQ==
+
 "@types/seedrandom@^3.0.8":
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-3.0.8.tgz#61cc8ed88f93a3c31289c295e6df8ca40be42bdf"
   integrity sha512-TY1eezMU2zH2ozQoAFAQFOPpvP15g+ZgSfTZt31AUUH/Rxtnz3H+A/Sv1Snw2/amp//omibc+AEkTaA8KUeOLQ==
 
 "@types/semver@^7.5.8":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.7.0.tgz#64c441bdae033b378b6eef7d0c3d77c329b9378e"
-  integrity sha512-k107IF4+Xr7UHjwDc7Cfd6PRQfbdkiRabXGRjo07b4WyPahFBZCZ1sE+BNxYIJPPg73UkfOsVOLwqVc/6ETrIA==
+  version "7.7.1"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.7.1.tgz#3ce3af1a5524ef327d2da9e4fd8b6d95c8d70528"
+  integrity sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==
 
 "@types/send@*":
-  version "0.17.4"
-  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a"
-  integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-1.2.1.tgz#6a784e45543c18c774c049bff6d3dbaf045c9c74"
+  integrity sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/send@<1":
+  version "0.17.6"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.6.tgz#aeb5385be62ff58a52cd5459daa509ae91651d25"
+  integrity sha512-Uqt8rPBE8SY0RK8JB1EzVOIZ32uqy8HwdxCnoCOsYrvnswqmFZ/k+9Ikidlk/ImhsdvBsloHbAlewb2IEBV/Og==
   dependencies:
     "@types/mime" "^1"
     "@types/node" "*"
@@ -3628,14 +3832,22 @@
   dependencies:
     "@types/express" "*"
 
-"@types/serve-static@*", "@types/serve-static@^1.15.5":
-  version "1.15.7"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.7.tgz#22174bbd74fb97fe303109738e9b5c2f3064f714"
-  integrity sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==
+"@types/serve-static@*", "@types/serve-static@^2":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-2.2.0.tgz#d4a447503ead0d1671132d1ab6bd58b805d8de6a"
+  integrity sha512-8mam4H1NHLtu7nmtalF7eyBH14QyOASmcxHhSfEoRyr0nP/YdoesEtU+uSRvMe96TW/HPTtkoKqQLl53N7UXMQ==
   dependencies:
     "@types/http-errors" "*"
     "@types/node" "*"
-    "@types/send" "*"
+
+"@types/serve-static@^1.15.5":
+  version "1.15.10"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.10.tgz#768169145a778f8f5dfcb6360aead414a3994fee"
+  integrity sha512-tRs1dB+g8Itk72rlSI2ZrW6vZg0YrLI81iQSTkMmOqnqCaNr/8Ek4VwWcN5vZgCYWbg/JJSGBlUaYGAOP73qBw==
+  dependencies:
+    "@types/http-errors" "*"
+    "@types/node" "*"
+    "@types/send" "<1"
 
 "@types/sockjs@^0.3.36":
   version "0.3.36"
@@ -3645,9 +3857,9 @@
     "@types/node" "*"
 
 "@types/ssh2-streams@*":
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/@types/ssh2-streams/-/ssh2-streams-0.1.12.tgz#e68795ba2bf01c76b93f9c9809e1f42f0eaaec5f"
-  integrity sha512-Sy8tpEmCce4Tq0oSOYdfqaBpA3hDM8SoxoFh5vzFsu2oL+znzGz8oVWW7xb4K920yYMUY+PIG31qZnFMfPWNCg==
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/@types/ssh2-streams/-/ssh2-streams-0.1.13.tgz#f8d34a22be50fb8dbafbb2bbc289add0d22daa51"
+  integrity sha512-faHyY3brO9oLEA0QlcO8N2wT7R0+1sHWZvQ+y3rMLwdY1ZyS1z0W3t65j9PqT4HmQ6ALzNe7RZlNuCNE0wBSWA==
   dependencies:
     "@types/node" "*"
 
@@ -3666,16 +3878,11 @@
     "@types/node" "*"
     "@types/ssh2-streams" "*"
 
-"@types/stack-utils@^2.0.0":
+"@types/stack-utils@^2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
   integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
 
-"@types/stylis@4.2.5":
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/@types/stylis/-/stylis-4.2.5.tgz#1daa6456f40959d06157698a653a9ab0a70281df"
-  integrity sha512-1Xve+NMN7FWjY14vLoY5tL3BVEQ/n42YLwaqJIPYhotZ9uBHt87VceMwWQpzmdEt2TNXIorIFG+YeCUUW7RInw==
-
 "@types/supercluster@^7.1.3":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@types/supercluster/-/supercluster-7.1.3.tgz#1a1bc2401b09174d9c9e44124931ec7874a72b27"
@@ -3698,11 +3905,6 @@
   resolved "https://registry.yarnpkg.com/@types/ua-parser-js/-/ua-parser-js-0.7.39.tgz#832c58e460c9435e4e34bb866e85e9146e12cdbb"
   integrity sha512-P/oDfpofrdtF5xw433SPALpdSchtJmY7nsJItf8h3KXqOslkbySh8zq4dSWXH2oTjRvJ5PczVEoCZPow6GicLg==
 
-"@types/uuid@^10.0.0":
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-10.0.0.tgz#e9c07fe50da0f53dc24970cca94d619ff03f6f6d"
-  integrity sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==
-
 "@types/ws@^8.5.10":
   version "8.18.1"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.18.1.tgz#48464e4bf2ddfd17db13d845467f6070ffea4aa9"
@@ -3715,172 +3917,293 @@
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
   integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
 
-"@types/yargs@^17.0.8":
-  version "17.0.33"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.33.tgz#8c32303da83eec050a84b3c7ae7b9f922d13e32d"
-  integrity sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==
+"@types/yargs@^17.0.33":
+  version "17.0.35"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.35.tgz#07013e46aa4d7d7d50a49e15604c1c5340d4eb24"
+  integrity sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==
   dependencies:
     "@types/yargs-parser" "*"
 
 "@typescript-eslint/eslint-plugin@^8.19.0":
-  version "8.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.33.0.tgz#51ed03649575ba51bcee7efdbfd85283249b5447"
-  integrity sha512-CACyQuqSHt7ma3Ns601xykeBK/rDeZa3w6IS6UtMQbixO5DWy+8TilKkviGDH6jtWCo8FGRKEK5cLLkPvEammQ==
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.49.0.tgz#8ed8736b8415a9193989220eadb6031dbcd2260a"
+  integrity sha512-JXij0vzIaTtCwu6SxTh8qBc66kmf1xs7pI4UOiMDFVct6q86G0Zs7KRcEoJgY3Cav3x5Tq0MF5jwgpgLqgKG3A==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "8.33.0"
-    "@typescript-eslint/type-utils" "8.33.0"
-    "@typescript-eslint/utils" "8.33.0"
-    "@typescript-eslint/visitor-keys" "8.33.0"
-    graphemer "^1.4.0"
+    "@typescript-eslint/scope-manager" "8.49.0"
+    "@typescript-eslint/type-utils" "8.49.0"
+    "@typescript-eslint/utils" "8.49.0"
+    "@typescript-eslint/visitor-keys" "8.49.0"
     ignore "^7.0.0"
     natural-compare "^1.4.0"
     ts-api-utils "^2.1.0"
 
 "@typescript-eslint/parser@^8.19.0":
-  version "8.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.33.0.tgz#8e523c2b447ad7cd6ac91b719d8b37449481784d"
-  integrity sha512-JaehZvf6m0yqYp34+RVnihBAChkqeH+tqqhS0GuX1qgPpwLvmTPheKEs6OeCK6hVJgXZHJ2vbjnC9j119auStQ==
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.49.0.tgz#0ede412d59e99239b770f0f08c76c42fba717fa2"
+  integrity sha512-N9lBGA9o9aqb1hVMc9hzySbhKibHmB+N3IpoShyV6HyQYRGIhlrO5rQgttypi+yEeKsKI4idxC8Jw6gXKD4THA==
   dependencies:
-    "@typescript-eslint/scope-manager" "8.33.0"
-    "@typescript-eslint/types" "8.33.0"
-    "@typescript-eslint/typescript-estree" "8.33.0"
-    "@typescript-eslint/visitor-keys" "8.33.0"
+    "@typescript-eslint/scope-manager" "8.49.0"
+    "@typescript-eslint/types" "8.49.0"
+    "@typescript-eslint/typescript-estree" "8.49.0"
+    "@typescript-eslint/visitor-keys" "8.49.0"
     debug "^4.3.4"
 
-"@typescript-eslint/project-service@8.33.0":
-  version "8.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.33.0.tgz#71f37ef9010de47bf20963914743c5cbef851e08"
-  integrity sha512-d1hz0u9l6N+u/gcrk6s6gYdl7/+pp8yHheRTqP6X5hVDKALEaTn8WfGiit7G511yueBEL3OpOEpD+3/MBdoN+A==
+"@typescript-eslint/project-service@8.48.0":
+  version "8.48.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.48.0.tgz#c21f6f897fbc4e61c7b1e20906ea1d59594ccc2d"
+  integrity sha512-Ne4CTZyRh1BecBf84siv42wv5vQvVmgtk8AuiEffKTUo3DrBaGYZueJSxxBZ8fjk/N3DrgChH4TOdIOwOwiqqw==
   dependencies:
-    "@typescript-eslint/tsconfig-utils" "^8.33.0"
-    "@typescript-eslint/types" "^8.33.0"
+    "@typescript-eslint/tsconfig-utils" "^8.48.0"
+    "@typescript-eslint/types" "^8.48.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@8.23.0":
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.23.0.tgz#ee3bb7546421ca924b9b7a8b62a77d388193ddec"
-  integrity sha512-OGqo7+dXHqI7Hfm+WqkZjKjsiRtFUQHPdGMXzk5mYXhJUedO7e/Y7i8AK3MyLMgZR93TX4bIzYrfyVjLC+0VSw==
+"@typescript-eslint/project-service@8.49.0":
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.49.0.tgz#ce220525c88cb2d23792b391c07e14cb9697651a"
+  integrity sha512-/wJN0/DKkmRUMXjZUXYZpD1NEQzQAAn9QWfGwo+Ai8gnzqH7tvqS7oNVdTjKqOcPyVIdZdyCMoqN66Ia789e7g==
   dependencies:
-    "@typescript-eslint/types" "8.23.0"
-    "@typescript-eslint/visitor-keys" "8.23.0"
+    "@typescript-eslint/tsconfig-utils" "^8.49.0"
+    "@typescript-eslint/types" "^8.49.0"
+    debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@8.33.0":
-  version "8.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.33.0.tgz#459cf0c49d410800b1a023b973c62d699b09bf4c"
-  integrity sha512-LMi/oqrzpqxyO72ltP+dBSP6V0xiUb4saY7WLtxSfiNEBI8m321LLVFU9/QDJxjDQG9/tjSqKz/E3380TEqSTw==
+"@typescript-eslint/scope-manager@8.48.0":
+  version "8.48.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.48.0.tgz#8306afdf409364d4e434813f0df9a8557ddff751"
+  integrity sha512-uGSSsbrtJrLduti0Q1Q9+BF1/iFKaxGoQwjWOIVNJv0o6omrdyR8ct37m4xIl5Zzpkp69Kkmvom7QFTtue89YQ==
   dependencies:
-    "@typescript-eslint/types" "8.33.0"
-    "@typescript-eslint/visitor-keys" "8.33.0"
+    "@typescript-eslint/types" "8.48.0"
+    "@typescript-eslint/visitor-keys" "8.48.0"
 
-"@typescript-eslint/tsconfig-utils@8.33.0", "@typescript-eslint/tsconfig-utils@^8.33.0":
-  version "8.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.33.0.tgz#316adab038bbdc43e448781d5a816c2973eab73e"
-  integrity sha512-sTkETlbqhEoiFmGr1gsdq5HyVbSOF0145SYDJ/EQmXHtKViCaGvnyLqWFFHtEXoS0J1yU8Wyou2UGmgW88fEug==
-
-"@typescript-eslint/type-utils@8.33.0":
-  version "8.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.33.0.tgz#f06124b2d6db8a51b24990cb123c9543af93fef5"
-  integrity sha512-lScnHNCBqL1QayuSrWeqAL5GmqNdVUQAAMTaCwdYEdWfIrSrOGzyLGRCHXcCixa5NK6i5l0AfSO2oBSjCjf4XQ==
+"@typescript-eslint/scope-manager@8.49.0":
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.49.0.tgz#a3496765b57fb48035d671174552e462e5bffa63"
+  integrity sha512-npgS3zi+/30KSOkXNs0LQXtsg9ekZ8OISAOLGWA/ZOEn0ZH74Ginfl7foziV8DT+D98WfQ5Kopwqb/PZOaIJGg==
   dependencies:
-    "@typescript-eslint/typescript-estree" "8.33.0"
-    "@typescript-eslint/utils" "8.33.0"
+    "@typescript-eslint/types" "8.49.0"
+    "@typescript-eslint/visitor-keys" "8.49.0"
+
+"@typescript-eslint/tsconfig-utils@8.48.0", "@typescript-eslint/tsconfig-utils@^8.48.0":
+  version "8.48.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.48.0.tgz#05cf091cd9f24a8e047783ff979136df6cf1be04"
+  integrity sha512-WNebjBdFdyu10sR1M4OXTt2OkMd5KWIL+LLfeH9KhgP+jzfDV/LI3eXzwJ1s9+Yc0Kzo2fQCdY/OpdusCMmh6w==
+
+"@typescript-eslint/tsconfig-utils@8.49.0", "@typescript-eslint/tsconfig-utils@^8.49.0":
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.49.0.tgz#857777c8e35dd1e564505833d8043f544442fbf4"
+  integrity sha512-8prixNi1/6nawsRYxet4YOhnbW+W9FK/bQPxsGB1D3ZrDzbJ5FXw5XmzxZv82X3B+ZccuSxo/X8q9nQ+mFecWA==
+
+"@typescript-eslint/type-utils@8.49.0":
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.49.0.tgz#d8118a0c1896a78a22f01d3c176e9945409b085b"
+  integrity sha512-KTExJfQ+svY8I10P4HdxKzWsvtVnsuCifU5MvXrRwoP2KOlNZ9ADNEWWsQTJgMxLzS5VLQKDjkCT/YzgsnqmZg==
+  dependencies:
+    "@typescript-eslint/types" "8.49.0"
+    "@typescript-eslint/typescript-estree" "8.49.0"
+    "@typescript-eslint/utils" "8.49.0"
     debug "^4.3.4"
     ts-api-utils "^2.1.0"
 
-"@typescript-eslint/types@8.23.0":
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.23.0.tgz#3355f6bcc5ebab77ef6dcbbd1113ec0a683a234a"
-  integrity sha512-1sK4ILJbCmZOTt9k4vkoulT6/y5CHJ1qUYxqpF1K/DBAd8+ZUL4LlSCxOssuH5m4rUaaN0uS0HlVPvd45zjduQ==
+"@typescript-eslint/types@8.48.0", "@typescript-eslint/types@^8.47.0", "@typescript-eslint/types@^8.48.0":
+  version "8.48.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.48.0.tgz#f0dc5cf27217346e9b0d90556911e01d90d0f2a5"
+  integrity sha512-cQMcGQQH7kwKoVswD1xdOytxQR60MWKM1di26xSUtxehaDs/32Zpqsu5WJlXTtTTqyAVK8R7hvsUnIXRS+bjvA==
 
-"@typescript-eslint/types@8.33.0", "@typescript-eslint/types@^8.33.0":
-  version "8.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.33.0.tgz#02a7dbba611a8abf1ad2a9e00f72f7b94b5ab0ee"
-  integrity sha512-DKuXOKpM5IDT1FA2g9x9x1Ug81YuKrzf4mYX8FAVSNu5Wo/LELHWQyM1pQaDkI42bX15PWl0vNPt1uGiIFUOpg==
+"@typescript-eslint/types@8.49.0", "@typescript-eslint/types@^8.49.0":
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.49.0.tgz#c1bd3ebf956d9e5216396349ca23c58d74f06aee"
+  integrity sha512-e9k/fneezorUo6WShlQpMxXh8/8wfyc+biu6tnAqA81oWrEic0k21RHzP9uqqpyBBeBKu4T+Bsjy9/b8u7obXQ==
 
-"@typescript-eslint/typescript-estree@8.23.0":
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.23.0.tgz#f633ef08efa656e386bc44b045ffcf9537cc6924"
-  integrity sha512-LcqzfipsB8RTvH8FX24W4UUFk1bl+0yTOf9ZA08XngFwMg4Kj8A+9hwz8Cr/ZS4KwHrmo9PJiLZkOt49vPnuvQ==
+"@typescript-eslint/typescript-estree@8.48.0":
+  version "8.48.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.48.0.tgz#38b340524ce34ce0e46ca541a86cf6cad8872e5b"
+  integrity sha512-ljHab1CSO4rGrQIAyizUS6UGHHCiAYhbfcIZ1zVJr5nMryxlXMVWS3duFPSKvSUbFPwkXMFk1k0EMIjub4sRRQ==
   dependencies:
-    "@typescript-eslint/types" "8.23.0"
-    "@typescript-eslint/visitor-keys" "8.23.0"
+    "@typescript-eslint/project-service" "8.48.0"
+    "@typescript-eslint/tsconfig-utils" "8.48.0"
+    "@typescript-eslint/types" "8.48.0"
+    "@typescript-eslint/visitor-keys" "8.48.0"
     debug "^4.3.4"
-    fast-glob "^3.3.2"
-    is-glob "^4.0.3"
-    minimatch "^9.0.4"
-    semver "^7.6.0"
-    ts-api-utils "^2.0.1"
-
-"@typescript-eslint/typescript-estree@8.33.0":
-  version "8.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.33.0.tgz#abcc1d3db75a8e9fd2e274ee8c4099fa2399abfd"
-  integrity sha512-vegY4FQoB6jL97Tu/lWRsAiUUp8qJTqzAmENH2k59SJhw0Th1oszb9Idq/FyyONLuNqT1OADJPXfyUNOR8SzAQ==
-  dependencies:
-    "@typescript-eslint/project-service" "8.33.0"
-    "@typescript-eslint/tsconfig-utils" "8.33.0"
-    "@typescript-eslint/types" "8.33.0"
-    "@typescript-eslint/visitor-keys" "8.33.0"
-    debug "^4.3.4"
-    fast-glob "^3.3.2"
-    is-glob "^4.0.3"
     minimatch "^9.0.4"
     semver "^7.6.0"
+    tinyglobby "^0.2.15"
     ts-api-utils "^2.1.0"
 
-"@typescript-eslint/utils@8.33.0", "@typescript-eslint/utils@^8.32.1":
-  version "8.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.33.0.tgz#574ad5edee371077b9e28ca6fb804f2440f447c1"
-  integrity sha512-lPFuQaLA9aSNa7D5u2EpRiqdAUhzShwGg/nhpBlc4GR6kcTABttCuyjFs8BcEZ8VWrjCBof/bePhP3Q3fS+Yrw==
+"@typescript-eslint/typescript-estree@8.49.0":
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.49.0.tgz#99c5a53275197ccb4e849786dad68344e9924135"
+  integrity sha512-jrLdRuAbPfPIdYNppHJ/D0wN+wwNfJ32YTAm10eJVsFmrVpXQnDWBn8niCSMlWjvml8jsce5E/O+86IQtTbJWA==
+  dependencies:
+    "@typescript-eslint/project-service" "8.49.0"
+    "@typescript-eslint/tsconfig-utils" "8.49.0"
+    "@typescript-eslint/types" "8.49.0"
+    "@typescript-eslint/visitor-keys" "8.49.0"
+    debug "^4.3.4"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    tinyglobby "^0.2.15"
+    ts-api-utils "^2.1.0"
+
+"@typescript-eslint/utils@8.49.0":
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.49.0.tgz#43b3b91d30afd6f6114532cf0b228f1790f43aff"
+  integrity sha512-N3W7rJw7Rw+z1tRsHZbK395TWSYvufBXumYtEGzypgMUthlg0/hmCImeA8hgO2d2G4pd7ftpxxul2J8OdtdaFA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.7.0"
-    "@typescript-eslint/scope-manager" "8.33.0"
-    "@typescript-eslint/types" "8.33.0"
-    "@typescript-eslint/typescript-estree" "8.33.0"
+    "@typescript-eslint/scope-manager" "8.49.0"
+    "@typescript-eslint/types" "8.49.0"
+    "@typescript-eslint/typescript-estree" "8.49.0"
 
-"@typescript-eslint/utils@^6.0.0 || ^7.0.0 || ^8.0.0":
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.23.0.tgz#b269cbdc77129fd6e0e600b168b5ef740a625554"
-  integrity sha512-uB/+PSo6Exu02b5ZEiVtmY6RVYO7YU5xqgzTIVZwTHvvK3HsL8tZZHFaTLFtRG3CsV4A5mhOv+NZx5BlhXPyIA==
+"@typescript-eslint/utils@^8.0.0":
+  version "8.48.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.48.0.tgz#c1196befb664f50be10692c781c7fc7624c1a5f9"
+  integrity sha512-yTJO1XuGxCsSfIVt1+1UrLHtue8xz16V8apzPYI06W0HbEbEWHxHXgZaAgavIkoh+GeV6hKKd5jm0sS6OYxWXQ==
   dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "8.23.0"
-    "@typescript-eslint/types" "8.23.0"
-    "@typescript-eslint/typescript-estree" "8.23.0"
+    "@eslint-community/eslint-utils" "^4.7.0"
+    "@typescript-eslint/scope-manager" "8.48.0"
+    "@typescript-eslint/types" "8.48.0"
+    "@typescript-eslint/typescript-estree" "8.48.0"
 
-"@typescript-eslint/visitor-keys@8.23.0":
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.23.0.tgz#40405fd26a61d23f5f4c2ed0f016a47074781df8"
-  integrity sha512-oWWhcWDLwDfu++BGTZcmXWqpwtkwb5o7fxUIGksMQQDSdPW9prsSnfIOZMlsj4vBOSrcnjIUZMiIjODgGosFhQ==
+"@typescript-eslint/visitor-keys@8.48.0":
+  version "8.48.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.48.0.tgz#6b07ef5661a85d08b01fbe4b8310a7311a6471af"
+  integrity sha512-T0XJMaRPOH3+LBbAfzR2jalckP1MSG/L9eUtY0DEzUyVaXJ/t6zN0nR7co5kz0Jko/nkSYCBRkz1djvjajVTTg==
   dependencies:
-    "@typescript-eslint/types" "8.23.0"
-    eslint-visitor-keys "^4.2.0"
+    "@typescript-eslint/types" "8.48.0"
+    eslint-visitor-keys "^4.2.1"
 
-"@typescript-eslint/visitor-keys@8.33.0":
-  version "8.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.33.0.tgz#fbae16fd3594531f8cad95d421125d634e9974fe"
-  integrity sha512-7RW7CMYoskiz5OOGAWjJFxgb7c5UNjTG292gYhWeOAcFmYCtVCSqjqSBj5zMhxbXo2JOW95YYrUWJfU0zrpaGQ==
+"@typescript-eslint/visitor-keys@8.49.0":
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.49.0.tgz#8e450cc502c0d285cad9e84d400cf349a85ced6c"
+  integrity sha512-LlKaciDe3GmZFphXIc79THF/YYBugZ7FS1pO581E/edlVVNbZKDy93evqmrfQ9/Y4uN0vVhX4iuchq26mK/iiA==
   dependencies:
-    "@typescript-eslint/types" "8.33.0"
-    eslint-visitor-keys "^4.2.0"
+    "@typescript-eslint/types" "8.49.0"
+    eslint-visitor-keys "^4.2.1"
 
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
-"@vector-im/compound-design-tokens@^4.0.0":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-4.0.2.tgz#27363d26446eaa21880ab126fa51fec112e6fd86"
-  integrity sha512-y13bhPyJ5OzbGRl21F6+Y2adrjyK+mu67yKTx+o8MfmIpJzMSn4KkHZtcujMquWSh0e5ZAufsnk4VYvxbSpr1A==
+"@ungap/structured-clone@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8"
+  integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==
 
-"@vector-im/compound-web@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-7.11.0.tgz#b7c466e64089320b41f8eaf6f2b30950e9692ca2"
-  integrity sha512-lRxXUOQJHdBswhykpNs/J/cBW4fPY1qbwyDexlWxX5zCVAYiuMCWo2tI+Y7/SK4tNbDr7nwoTDRh4H9CO1L5LQ==
+"@unrs/resolver-binding-android-arm-eabi@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz#9f5b04503088e6a354295e8ea8fe3cb99e43af81"
+  integrity sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==
+
+"@unrs/resolver-binding-android-arm64@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz#7414885431bd7178b989aedc4d25cccb3865bc9f"
+  integrity sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==
+
+"@unrs/resolver-binding-darwin-arm64@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz#b4a8556f42171fb9c9f7bac8235045e82aa0cbdf"
+  integrity sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==
+
+"@unrs/resolver-binding-darwin-x64@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz#fd4d81257b13f4d1a083890a6a17c00de571f0dc"
+  integrity sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==
+
+"@unrs/resolver-binding-freebsd-x64@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz#d2513084d0f37c407757e22f32bd924a78cfd99b"
+  integrity sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==
+
+"@unrs/resolver-binding-linux-arm-gnueabihf@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz#844d2605d057488d77fab09705f2866b86164e0a"
+  integrity sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==
+
+"@unrs/resolver-binding-linux-arm-musleabihf@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz#204892995cefb6bd1d017d52d097193bc61ddad3"
+  integrity sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==
+
+"@unrs/resolver-binding-linux-arm64-gnu@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz#023eb0c3aac46066a10be7a3f362e7b34f3bdf9d"
+  integrity sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==
+
+"@unrs/resolver-binding-linux-arm64-musl@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz#9e6f9abb06424e3140a60ac996139786f5d99be0"
+  integrity sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==
+
+"@unrs/resolver-binding-linux-ppc64-gnu@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz#b111417f17c9d1b02efbec8e08398f0c5527bb44"
+  integrity sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==
+
+"@unrs/resolver-binding-linux-riscv64-gnu@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz#92ffbf02748af3e99873945c9a8a5ead01d508a9"
+  integrity sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==
+
+"@unrs/resolver-binding-linux-riscv64-musl@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz#0bec6f1258fc390e6b305e9ff44256cb207de165"
+  integrity sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==
+
+"@unrs/resolver-binding-linux-s390x-gnu@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz#577843a084c5952f5906770633ccfb89dac9bc94"
+  integrity sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==
+
+"@unrs/resolver-binding-linux-x64-gnu@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz#36fb318eebdd690f6da32ac5e0499a76fa881935"
+  integrity sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==
+
+"@unrs/resolver-binding-linux-x64-musl@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz#bfb9af75f783f98f6a22c4244214efe4df1853d6"
+  integrity sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==
+
+"@unrs/resolver-binding-wasm32-wasi@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz#752c359dd875684b27429500d88226d7cc72f71d"
+  integrity sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==
+  dependencies:
+    "@napi-rs/wasm-runtime" "^0.2.11"
+
+"@unrs/resolver-binding-win32-arm64-msvc@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz#ce5735e600e4c2fbb409cd051b3b7da4a399af35"
+  integrity sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==
+
+"@unrs/resolver-binding-win32-ia32-msvc@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz#72fc57bc7c64ec5c3de0d64ee0d1810317bc60a6"
+  integrity sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==
+
+"@unrs/resolver-binding-win32-x64-msvc@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz#538b1e103bf8d9864e7b85cc96fa8d6fb6c40777"
+  integrity sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==
+
+"@vector-im/compound-design-tokens@6.4.3":
+  version "6.4.3"
+  resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-6.4.3.tgz#f8a98308650e841ffba6ca0820055e2bfe2b8af1"
+  integrity sha512-Zyqag2QCAfpRipLHSX/LEXj6OGFgBpilMQvNdr3a0iXeGASfkM3HZGid077kMRp9lvyHiQfPIs1BdllENwDSNQ==
+
+"@vector-im/compound-design-tokens@^6.3.0":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-6.4.1.tgz#b3356300136b974104b4fb818969350c7686f5ae"
+  integrity sha512-JhrxnzohxGILrc+IZWoMXcpGHinnJlR2HSCKfypEjPDDF5TOB8HQYTqd5ALAPlob8QZU3N2ghnCF7d0f2LmTxg==
+
+"@vector-im/compound-web@^8.3.1":
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-8.3.1.tgz#09cad1c236e89a6d867a674602f9c74628cde000"
+  integrity sha512-VMAHVbpzUK6OQCX+gIm58ESvL6cYzLmr0vz0YBKJ5WoYJxu4/JrAfQ5+2mGn3fufF5Oqy3qBRzlHveFxv7Ij9A==
   dependencies:
     "@floating-ui/react" "^0.27.0"
-    "@radix-ui/react-context-menu" "^2.2.1"
+    "@radix-ui/react-context-menu" "^2.2.16"
     "@radix-ui/react-dropdown-menu" "^2.1.1"
     "@radix-ui/react-form" "^0.1.0"
     "@radix-ui/react-progress" "^1.1.0"
@@ -3889,16 +4212,59 @@
     classnames "^2.5.1"
     vaul "^1.0.0"
 
-"@vector-im/matrix-wysiwyg-wasm@link:../../../../Library/Caches/Yarn/v6/npm-@vector-im-matrix-wysiwyg-2.38.3-cc54d8b3e9472bcd8e622126ba364ee31952cd8a-integrity/node_modules/bindings/wysiwyg-wasm":
+"@vector-im/matrix-wysiwyg-wasm@link:../../../.cache/yarn/v6/npm-@vector-im-matrix-wysiwyg-2.40.0-53c9ca5ea907d91e4515da64f20a82e5586b882c-integrity/node_modules/bindings/wysiwyg-wasm":
   version "0.0.0"
   uid ""
 
-"@vector-im/matrix-wysiwyg@2.38.3":
-  version "2.38.3"
-  resolved "https://registry.yarnpkg.com/@vector-im/matrix-wysiwyg/-/matrix-wysiwyg-2.38.3.tgz#cc54d8b3e9472bcd8e622126ba364ee31952cd8a"
-  integrity sha512-fqo8P55Vc/t0vxpFar9RDJN5gKEjJmzrLo+O4piDbFda6VrRoqrWAtiu0Au0g6B4hRDPKIuFupk8v9Ja7q8Hvg==
+"@vector-im/matrix-wysiwyg@2.40.0":
+  version "2.40.0"
+  resolved "https://registry.yarnpkg.com/@vector-im/matrix-wysiwyg/-/matrix-wysiwyg-2.40.0.tgz#53c9ca5ea907d91e4515da64f20a82e5586b882c"
+  integrity sha512-8LRFLs5PEKYs4lOL7aJ4lL/hGCrvEvOYkCR3JggXYXDVMtX4LmfdlKYucSAe98pCmqAAbLRvlRcR1bTOYvM8ug==
   dependencies:
-    "@vector-im/matrix-wysiwyg-wasm" "link:../../../../Library/Caches/Yarn/v6/npm-@vector-im-matrix-wysiwyg-2.38.3-cc54d8b3e9472bcd8e622126ba364ee31952cd8a-integrity/node_modules/bindings/wysiwyg-wasm"
+    "@vector-im/matrix-wysiwyg-wasm" "link:../../../.cache/yarn/v6/npm-@vector-im-matrix-wysiwyg-2.40.0-53c9ca5ea907d91e4515da64f20a82e5586b882c-integrity/node_modules/bindings/wysiwyg-wasm"
+
+"@vitest/expect@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-3.2.4.tgz#8362124cd811a5ee11c5768207b9df53d34f2433"
+  integrity sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==
+  dependencies:
+    "@types/chai" "^5.2.2"
+    "@vitest/spy" "3.2.4"
+    "@vitest/utils" "3.2.4"
+    chai "^5.2.0"
+    tinyrainbow "^2.0.0"
+
+"@vitest/mocker@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/mocker/-/mocker-3.2.4.tgz#4471c4efbd62db0d4fa203e65cc6b058a85cabd3"
+  integrity sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==
+  dependencies:
+    "@vitest/spy" "3.2.4"
+    estree-walker "^3.0.3"
+    magic-string "^0.30.17"
+
+"@vitest/pretty-format@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/pretty-format/-/pretty-format-3.2.4.tgz#3c102f79e82b204a26c7a5921bf47d534919d3b4"
+  integrity sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==
+  dependencies:
+    tinyrainbow "^2.0.0"
+
+"@vitest/spy@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-3.2.4.tgz#cc18f26f40f3f028da6620046881f4e4518c2599"
+  integrity sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==
+  dependencies:
+    tinyspy "^4.0.3"
+
+"@vitest/utils@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-3.2.4.tgz#c0813bc42d99527fb8c5b138c7a88516bca46fea"
+  integrity sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==
+  dependencies:
+    "@vitest/pretty-format" "3.2.4"
+    loupe "^3.1.4"
+    tinyrainbow "^2.0.0"
 
 "@webassemblyjs/ast@1.14.1", "@webassemblyjs/ast@^1.14.1":
   version "1.14.1"
@@ -4036,11 +4402,6 @@
   resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-3.0.1.tgz#bd8b1f824d57e30faa19eb78e4c0951056f72f00"
   integrity sha512-sbgw03xQaCLiT6gcY/6u3qBDn01CWw/nbaXl3gTdTFuJJ75Gffv3E3DBpgvY2fkkrdS1fpjaXNOmJlnbtKauKg==
 
-"@xobotyi/scrollbar-width@^1.9.5":
-  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/@xobotyi/scrollbar-width/-/scrollbar-width-1.9.5.tgz#80224a6919272f405b87913ca13b92929bdf3c4d"
-  integrity sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ==
-
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -4073,11 +4434,6 @@
   resolved "https://registry.yarnpkg.com/@zxcvbn-ts/language-en/-/language-en-3.0.2.tgz#162ada6b2b556444efd5a7700e70845cfde6d6ec"
   integrity sha512-Zp+zL+I6Un2Bj0tRXNs6VUBq3Djt+hwTwUz4dkt2qgsQz47U0/XthZ4ULrT/RxjwJRl5LwiaKOOZeOtmixHnjg==
 
-abab@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
-  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
-
 abort-controller@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
@@ -4101,35 +4457,32 @@ accepts@~1.3.4, accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-globals@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3"
-  integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==
-  dependencies:
-    acorn "^8.1.0"
-    acorn-walk "^8.0.2"
+acorn-import-phases@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz#16eb850ba99a056cb7cbfe872ffb8972e18c8bd7"
+  integrity sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^8.0.0, acorn-walk@^8.0.2, acorn-walk@^8.1.1:
+acorn-walk@^8.0.0:
   version "8.3.4"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.4.tgz#794dd169c3977edf4ba4ea47583587c5866236b7"
   integrity sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==
   dependencies:
     acorn "^8.11.0"
 
-acorn@^8.0.4, acorn@^8.1.0, acorn@^8.11.0, acorn@^8.9.0:
+acorn@^8.0.4, acorn@^8.11.0, acorn@^8.9.0:
   version "8.13.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.13.0.tgz#2a30d670818ad16ddd6a35d3842dacec9e5d7ca3"
   integrity sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==
 
-acorn@^8.14.0, acorn@^8.4.1, acorn@^8.8.1, acorn@^8.8.2:
-  version "8.14.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.1.tgz#721d5dc10f7d5b5609a891773d47731796935dfb"
-  integrity sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==
+acorn@^8.15.0, acorn@^8.8.1:
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
+  integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
 
 agent-base@6:
   version "6.0.2"
@@ -4138,6 +4491,11 @@ agent-base@6:
   dependencies:
     debug "4"
 
+agent-base@^7.1.0, agent-base@^7.1.2:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.4.tgz#e3cd76d4c548ee895d3c3fd8dc1f6c5b9032e7a8"
+  integrity sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==
+
 ajv-formats@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
@@ -4182,7 +4540,7 @@ another-json@^0.2.0:
   resolved "https://registry.yarnpkg.com/another-json/-/another-json-0.2.0.tgz#b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"
   integrity sha512-/Ndrl68UQLhnCdsAzEXLMFuOR546o2qbYRqCglaNHbjXrwG1ayTcdwr3zkSGOGtGXDyR5X9nCFfnyG2AFJIsqg==
 
-ansi-escapes@^4.2.1:
+ansi-escapes@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
@@ -4190,9 +4548,9 @@ ansi-escapes@^4.2.1:
     type-fest "^0.21.3"
 
 ansi-escapes@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-7.0.0.tgz#00fc19f491bbb18e1d481b97868204f92109bfe7"
-  integrity sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-7.2.0.tgz#31b25afa3edd3efc09d98c2fee831d460ff06b49"
+  integrity sha512-g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw==
   dependencies:
     environment "^1.0.0"
 
@@ -4207,16 +4565,9 @@ ansi-regex@^5.0.1:
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-regex@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.1.0.tgz#95ec409c69619d6cb1b8b34f14b660ef28ebd654"
-  integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==
-
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1"
+  integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==
 
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
@@ -4225,17 +4576,17 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-ansi-styles@^5.0.0:
+ansi-styles@^5.0.0, ansi-styles@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-ansi-styles@^6.0.0, ansi-styles@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
-  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+ansi-styles@^6.2.1:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041"
+  integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==
 
-anymatch@^3.0.3, anymatch@~3.1.2:
+anymatch@^3.1.3, anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
   integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
@@ -4243,13 +4594,6 @@ anymatch@^3.0.3, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-append-query@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/append-query/-/append-query-2.1.1.tgz#0682e8c3ad6f2fa01e78153c4c73a6283d2a88f6"
-  integrity sha512-adm0E8o1o7ay+HbkWvGIpNNeciLB/rxJ0heThHuzSSVq5zcdQ5/ZubFnUoY0imFmk6gZVghSpwoubLVtwi9EHQ==
-  dependencies:
-    extend "^3.0.2"
-
 archiver-utils@^5.0.0, archiver-utils@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-5.0.2.tgz#63bc719d951803efc72cf961a56ef810760dd14d"
@@ -4276,11 +4620,6 @@ archiver@^7.0.1:
     tar-stream "^3.0.0"
     zip-stream "^6.0.1"
 
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -4293,10 +4632,10 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-aria-hidden@^1.1.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.2.4.tgz#b78e383fdbc04d05762c78b4a25a501e736c4522"
-  integrity sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==
+aria-hidden@^1.2.4:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.2.6.tgz#73051c9b088114c795b1ea414e9c0fff874ffc1a"
+  integrity sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==
   dependencies:
     tslib "^2.0.0"
 
@@ -4325,17 +4664,19 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
-array-includes@^3.1.6, array-includes@^3.1.8:
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d"
-  integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==
+array-includes@^3.1.6, array-includes@^3.1.8, array-includes@^3.1.9:
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.9.tgz#1f0ccaa08e90cdbc3eb433210f903ad0f17c3f3a"
+  integrity sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==
   dependencies:
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
     define-properties "^1.2.1"
-    es-abstract "^1.23.2"
-    es-object-atoms "^1.0.0"
-    get-intrinsic "^1.2.4"
-    is-string "^1.0.7"
+    es-abstract "^1.24.0"
+    es-object-atoms "^1.1.1"
+    get-intrinsic "^1.3.0"
+    is-string "^1.1.1"
+    math-intrinsics "^1.1.0"
 
 array-union@^2.1.0:
   version "2.1.0"
@@ -4354,19 +4695,20 @@ array.prototype.findlast@^1.2.5:
     es-object-atoms "^1.0.0"
     es-shim-unscopables "^1.0.2"
 
-array.prototype.findlastindex@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d"
-  integrity sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==
+array.prototype.findlastindex@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz#cfa1065c81dcb64e34557c9b81d012f6a421c564"
+  integrity sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==
   dependencies:
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
     define-properties "^1.2.1"
-    es-abstract "^1.23.2"
+    es-abstract "^1.23.9"
     es-errors "^1.3.0"
-    es-object-atoms "^1.0.0"
-    es-shim-unscopables "^1.0.2"
+    es-object-atoms "^1.1.1"
+    es-shim-unscopables "^1.1.0"
 
-array.prototype.flat@^1.3.1:
+array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz#534aaf9e6e8dd79fb6b9a9917f839ef1ec63afe5"
   integrity sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==
@@ -4376,16 +4718,6 @@ array.prototype.flat@^1.3.1:
     es-abstract "^1.23.5"
     es-shim-unscopables "^1.0.2"
 
-array.prototype.flat@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
-  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    es-shim-unscopables "^1.0.0"
-
 array.prototype.flatmap@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
@@ -4446,11 +4778,23 @@ asn1js@^3.0.5:
     pvutils "^1.1.3"
     tslib "^2.4.0"
 
+assertion-error@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-2.0.1.tgz#f641a196b335690b1070bf00b6e7593fec190bf7"
+  integrity sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==
+
 ast-types-flow@^0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.8.tgz#0a85e1c92695769ac13a428bb653e7538bea27d6"
   integrity sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==
 
+ast-types@^0.16.1:
+  version "0.16.1"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.16.1.tgz#7a9da1617c9081bc121faafe91711b4c8bb81da2"
+  integrity sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==
+  dependencies:
+    tslib "^2.0.1"
+
 astral-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
@@ -4476,11 +4820,6 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
-at-least-node@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
-  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
-
 autoprefixer@^10.4.19:
   version "10.4.20"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.20.tgz#5caec14d43976ef42e32dcb4bd62878e96be5b3b"
@@ -4510,18 +4849,18 @@ axe-core@^4.10.0:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.2.tgz#85228e3e1d8b8532a27659b332e39b7fa0e022df"
   integrity sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==
 
-axe-core@~4.10.2:
-  version "4.10.3"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.3.tgz#04145965ac7894faddbac30861e5d8f11bfd14fc"
-  integrity sha512-Xm7bpRXnDSX2YE2YFfBk2FnF0ep6tmG7xPh8iHee8MIcrgq762Nkce856dYtJYLkuIoYZvGfTs/PbZhideTcEg==
+axe-core@~4.11.0:
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.11.0.tgz#16f74d6482e343ff263d4f4503829e9ee91a86b6"
+  integrity sha512-ilYanEU8vxxBexpJd8cWM4ElSQq4QctCLKih0TSfjIfCQTeyH/6zVrmIJfLPrKTKJRbiG+cfnZbQIjAlJmF1jQ==
 
-axios@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.9.0.tgz#25534e3b72b54540077d33046f77e3b8d7081901"
-  integrity sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==
+axios@^1.12.1:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.13.2.tgz#9ada120b7b5ab24509553ec3e40123521117f687"
+  integrity sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==
   dependencies:
     follow-redirects "^1.15.6"
-    form-data "^4.0.0"
+    form-data "^4.0.4"
     proxy-from-env "^1.1.0"
 
 axobject-query@^4.1.0:
@@ -4530,21 +4869,21 @@ axobject-query@^4.1.0:
   integrity sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==
 
 b4a@^1.6.4:
-  version "1.6.7"
-  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.7.tgz#a99587d4ebbfbd5a6e3b21bdb5d5fa385767abe4"
-  integrity sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.7.3.tgz#24cf7ccda28f5465b66aec2bac69e32809bf112f"
+  integrity sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q==
 
-babel-jest@^29.0.0, babel-jest@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
-  integrity sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==
+babel-jest@30.2.0, babel-jest@^30.0.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-30.2.0.tgz#fd44a1ec9552be35ead881f7381faa7d8f3b95ac"
+  integrity sha512-0YiBEOxWqKkSQWL9nNGGEgndoeL0ZpWrbLMNL5u/Kaxrli3Eaxlt3ZtIDktEvXt4L/R9r3ODr2zKwGM/2BjxVw==
   dependencies:
-    "@jest/transform" "^29.7.0"
-    "@types/babel__core" "^7.1.14"
-    babel-plugin-istanbul "^6.1.1"
-    babel-preset-jest "^29.6.3"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
+    "@jest/transform" "30.2.0"
+    "@types/babel__core" "^7.20.5"
+    babel-plugin-istanbul "^7.0.1"
+    babel-preset-jest "30.2.0"
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
     slash "^3.0.0"
 
 babel-loader@^10.0.0:
@@ -4554,60 +4893,57 @@ babel-loader@^10.0.0:
   dependencies:
     find-up "^5.0.0"
 
-babel-plugin-istanbul@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
-  integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
+babel-plugin-istanbul@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.1.tgz#d8b518c8ea199364cf84ccc82de89740236daf92"
+  integrity sha512-D8Z6Qm8jCvVXtIRkBnqNHX0zJ37rQcFJ9u8WOS6tkYOsRdHBzypCstaxWiu5ZIlqQtviRYbgnRLSoCEvjqcqbA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@istanbuljs/load-nyc-config" "^1.0.0"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-instrument "^5.0.4"
+    "@istanbuljs/schema" "^0.1.3"
+    istanbul-lib-instrument "^6.0.2"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^29.6.3:
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz#aadbe943464182a8922c3c927c3067ff40d24626"
-  integrity sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==
+babel-plugin-jest-hoist@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.2.0.tgz#94c250d36b43f95900f3a219241e0f4648191ce2"
+  integrity sha512-ftzhzSGMUnOzcCXd6WHdBGMyuwy15Wnn0iyyWGKgBDLxf9/s5ABuraCSpBX2uG0jUg4rqJnxsLc5+oYBqoxVaA==
   dependencies:
-    "@babel/template" "^7.3.3"
-    "@babel/types" "^7.3.3"
-    "@types/babel__core" "^7.1.14"
-    "@types/babel__traverse" "^7.0.6"
+    "@types/babel__core" "^7.20.5"
 
 babel-plugin-jsx-remove-data-test-id@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-jsx-remove-data-test-id/-/babel-plugin-jsx-remove-data-test-id-3.0.0.tgz#15c95f97ce0ff60d72b29e403bde245f86393288"
   integrity sha512-E4uM/LIUizjy2Z5tVAfa8pSXsYgoKWJ97kzuEMfsIxSLSNDWsAhgFVPkgNuakViX5dkNjw1DKIi0VpWP6djqbw==
 
-babel-plugin-polyfill-corejs2@^0.4.10:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.13.tgz#7d445f0e0607ebc8fb6b01d7e8fb02069b91dd8b"
-  integrity sha512-3sX/eOms8kd3q2KZ6DAhKPc0dgm525Gqq5NtWKZ7QYYZEv57OQ54KtblzJzH1lQF/eQxO8KjWGIK9IPUJNus5g==
+babel-plugin-polyfill-corejs2@^0.4.14:
+  version "0.4.14"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.14.tgz#8101b82b769c568835611542488d463395c2ef8f"
+  integrity sha512-Co2Y9wX854ts6U8gAAPXfn0GmAyctHuK8n0Yhfjd6t30g7yvKjspvvOo9yG+z52PZRgFErt7Ka2pYnXCjLKEpg==
   dependencies:
-    "@babel/compat-data" "^7.22.6"
-    "@babel/helper-define-polyfill-provider" "^0.6.4"
+    "@babel/compat-data" "^7.27.7"
+    "@babel/helper-define-polyfill-provider" "^0.6.5"
     semver "^6.3.1"
 
-babel-plugin-polyfill-corejs3@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.11.1.tgz#4e4e182f1bb37c7ba62e2af81d8dd09df31344f6"
-  integrity sha512-yGCqvBT4rwMczo28xkH/noxJ6MZ4nJfkVYdoDaC/utLtWrXxv27HVrzAeSbqR8SxDsp46n0YF47EbHoixy6rXQ==
+babel-plugin-polyfill-corejs3@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.13.0.tgz#bb7f6aeef7addff17f7602a08a6d19a128c30164"
+  integrity sha512-U+GNwMdSFgzVmfhNm8GJUX88AadB3uo9KpJqS3FaqNIPKgySuvMb+bHPsOmmuWyIcuqZj/pzt1RUIUZns4y2+A==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.6.3"
-    core-js-compat "^3.40.0"
+    "@babel/helper-define-polyfill-provider" "^0.6.5"
+    core-js-compat "^3.43.0"
 
-babel-plugin-polyfill-regenerator@^0.6.1:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.4.tgz#428c615d3c177292a22b4f93ed99e358d7906a9b"
-  integrity sha512-7gD3pRadPrbjhjLyxebmx/WrFYcuSjZ0XbdUujQMZ/fcE9oeewk2U/7PCvez84UeuK3oSjmPZ0Ch0dlupQvGzw==
+babel-plugin-polyfill-regenerator@^0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.5.tgz#32752e38ab6f6767b92650347bf26a31b16ae8c5"
+  integrity sha512-ISqQ2frbiNU9vIJkzg7dlPpznPZ4jOiUQ1uSmB0fEHeowtN3COYRsXr/xexn64NpU13P06jc/L5TgiJXOgrbEg==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.6.4"
+    "@babel/helper-define-polyfill-provider" "^0.6.5"
 
-babel-preset-current-node-syntax@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz#9a929eafece419612ef4ae4f60b1862ebad8ef30"
-  integrity sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==
+babel-preset-current-node-syntax@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz#20730d6cdc7dda5d89401cab10ac6a32067acde6"
+  integrity sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==
   dependencies:
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-bigint" "^7.8.3"
@@ -4625,13 +4961,13 @@ babel-preset-current-node-syntax@^1.0.0:
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
 
-babel-preset-jest@^29.6.3:
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz#fa05fa510e7d493896d7b0dd2033601c840f171c"
-  integrity sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==
+babel-preset-jest@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-30.2.0.tgz#04717843e561347781d6d7f69c81e6bcc3ed11ce"
+  integrity sha512-US4Z3NOieAQumwFnYdUWKvUKh8+YSnS/gB3t6YBiz0bskpu7Pine8pPCheNxlPEW4wnUkma2a94YuW2q3guvCQ==
   dependencies:
-    babel-plugin-jest-hoist "^29.6.3"
-    babel-preset-current-node-syntax "^1.0.0"
+    babel-plugin-jest-hoist "30.2.0"
+    babel-preset-current-node-syntax "^1.2.0"
 
 balanced-match@^1.0.0:
   version "1.0.2"
@@ -4643,24 +4979,26 @@ balanced-match@^2.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9"
   integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==
 
-bare-events@^2.2.0, bare-events@^2.5.4:
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.5.4.tgz#16143d435e1ed9eafd1ab85f12b89b3357a41745"
-  integrity sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==
+bare-events@^2.5.4, bare-events@^2.7.0:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.8.2.tgz#7b3e10bd8e1fc80daf38bb516921678f566ab89f"
+  integrity sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==
 
 bare-fs@^4.0.1:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-4.1.5.tgz#1d06c076e68cc8bf97010d29af9e3ac3808cdcf7"
-  integrity sha512-1zccWBMypln0jEE05LzZt+V/8y8AQsQQqxtklqaIyg5nu6OAYFhZxPXinJTSG+kU5qyNmeLgcn9AW7eHiCHVLA==
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-4.5.2.tgz#d80ff8a9177e0db4818e7ba44b9302c0cf0788af"
+  integrity sha512-veTnRzkb6aPHOvSKIOy60KzURfBdUflr5VReI+NSaPL6xf+XLdONQgZgpYvUuZLVQ8dCqxpBAudaOM1+KpAUxw==
   dependencies:
     bare-events "^2.5.4"
     bare-path "^3.0.0"
     bare-stream "^2.6.4"
+    bare-url "^2.2.2"
+    fast-fifo "^1.3.2"
 
 bare-os@^3.0.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/bare-os/-/bare-os-3.6.1.tgz#9921f6f59edbe81afa9f56910658422c0f4858d4"
-  integrity sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/bare-os/-/bare-os-3.6.2.tgz#b3c4f5ad5e322c0fd0f3c29fc97d19009e2796e5"
+  integrity sha512-T+V1+1srU2qYNBmJCXZkUY5vQ0B4FSlL3QDROnKQYOqeiQR8UbjNHlPa+TIbM4cuidiN9GaTaOZgSEgsvPbh5A==
 
 bare-path@^3.0.0:
   version "3.0.0"
@@ -4670,12 +5008,19 @@ bare-path@^3.0.0:
     bare-os "^3.0.1"
 
 bare-stream@^2.6.4:
-  version "2.6.5"
-  resolved "https://registry.yarnpkg.com/bare-stream/-/bare-stream-2.6.5.tgz#bba8e879674c4c27f7e27805df005c15d7a2ca07"
-  integrity sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/bare-stream/-/bare-stream-2.7.0.tgz#5b9e7dd0a354d06e82d6460c426728536c35d789"
+  integrity sha512-oyXQNicV1y8nc2aKffH+BUHFRXmx6VrPzlnaEvMhram0nPBrKcEdcyBg5r08D0i8VxngHFAiVyn1QKXpSG0B8A==
   dependencies:
     streamx "^2.21.0"
 
+bare-url@^2.2.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/bare-url/-/bare-url-2.3.2.tgz#4aef382efa662b2180a6fe4ca07a71b39bdf7ca3"
+  integrity sha512-ZMq4gd9ngV5aTMa5p9+UfY0b3skwhHELaDkhEHetMdX0LRkW9kzaym4oo/Eh+Ghm0CCDuMTsRIGM/ytUc1ZYmw==
+  dependencies:
+    bare-path "^3.0.0"
+
 base-x@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/base-x/-/base-x-5.0.1.tgz#16bf35254be1df8aca15e36b7c1dda74b2aa6b03"
@@ -4691,6 +5036,11 @@ base64-js@^1.3.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
+baseline-browser-mapping@^2.9.0:
+  version "2.9.6"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.9.6.tgz#82de0f7ee5860df86d60daf0d9524ae7227eeee7"
+  integrity sha512-v9BVVpOTLB59C9E7aSnmIF8h7qRsFpx+A2nugVMTszEOMcfjlZMsXRm4LF23I3Z9AJxc8ANpIvzbzONoX9VJlg==
+
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
@@ -4764,20 +5114,20 @@ body-parser@1.20.3:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
-body-parser@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-2.2.0.tgz#f7a9656de305249a715b549b7b8fd1ab9dfddcfa"
-  integrity sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==
+body-parser@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-2.2.1.tgz#6df606b0eb0a6e3f783dde91dde182c24c82438c"
+  integrity sha512-nfDwkulwiZYQIGwxdy0RUmowMhKcFVcYXUU7m4QlKYim1rUtg83xm2yjZ40QjDuc291AJjjeSc9b++AWHSgSHw==
   dependencies:
     bytes "^3.1.2"
     content-type "^1.0.5"
-    debug "^4.4.0"
+    debug "^4.4.3"
     http-errors "^2.0.0"
-    iconv-lite "^0.6.3"
+    iconv-lite "^0.7.0"
     on-finished "^2.4.1"
     qs "^6.14.0"
-    raw-body "^3.0.0"
-    type-is "^2.0.0"
+    raw-body "^3.0.1"
+    type-is "^2.0.1"
 
 bonjour-service@^1.2.1:
   version "1.3.0"
@@ -4793,17 +5143,17 @@ boolbase@^1.0.0:
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
 brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
+  integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
 brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
+  integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==
   dependencies:
     balanced-match "^1.0.0"
 
@@ -4814,15 +5164,16 @@ braces@^3.0.3, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.0.0, browserslist@^4.23.1, browserslist@^4.23.2, browserslist@^4.23.3, browserslist@^4.24.0, browserslist@^4.24.3, browserslist@^4.24.4:
-  version "4.25.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.25.0.tgz#986aa9c6d87916885da2b50d8eb577ac8d133b2c"
-  integrity sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==
+browserslist@^4.0.0, browserslist@^4.23.1, browserslist@^4.23.2, browserslist@^4.23.3, browserslist@^4.24.0, browserslist@^4.24.3, browserslist@^4.26.3, browserslist@^4.27.0:
+  version "4.28.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.1.tgz#7f534594628c53c63101079e27e40de490456a95"
+  integrity sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==
   dependencies:
-    caniuse-lite "^1.0.30001718"
-    electron-to-chromium "^1.5.160"
-    node-releases "^2.0.19"
-    update-browserslist-db "^1.1.3"
+    baseline-browser-mapping "^2.9.0"
+    caniuse-lite "^1.0.30001759"
+    electron-to-chromium "^1.5.263"
+    node-releases "^2.0.27"
+    update-browserslist-db "^1.2.0"
 
 bs58@^6.0.0:
   version "6.0.0"
@@ -4865,9 +5216,9 @@ buffer@^6.0.3:
     ieee754 "^1.2.1"
 
 buildcheck@~0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.6.tgz#89aa6e417cfd1e2196e3f8fe915eb709d2fe4238"
-  integrity sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.7.tgz#07a5e76c10ead8fa67d9e4c587b68f49e8f29d61"
+  integrity sha512-lHblz4ahamxpTmnsk+MNTRWsjYKv965MwOrSJyeD588rR3Jcu7swE+0wN5F+PbL5cjgu/9ObkhfzEPuofEMwLA==
 
 builtin-modules@^3.3.0:
   version "3.3.0"
@@ -4886,28 +5237,23 @@ byline@^5.0.0:
   resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
   integrity sha512-s6webAy+R4SR8XVuJWt2V2rGvhnrhxN+9S15GNuTK3wKPOXFF6RNc+8ug2XhH+2s4f+uudG4kUVYmYOQWL2g0Q==
 
-bytes@3.1.2, bytes@^3.1.2:
+bytes@3.1.2, bytes@^3.1.2, bytes@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-cacheable@^1.8.9:
-  version "1.8.10"
-  resolved "https://registry.yarnpkg.com/cacheable/-/cacheable-1.8.10.tgz#c1b36260240d812912a6d3503da3a6e00166f75c"
-  integrity sha512-0ZnbicB/N2R6uziva8l6O6BieBklArWyiGx4GkwAhLKhSHyQtRfM9T1nx7HHuHDKkYB/efJQhz3QJ6x/YqoZzA==
+cacheable@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/cacheable/-/cacheable-2.3.0.tgz#4b4737cfff71df9834d8be75284860bf3abc85ec"
+  integrity sha512-HHiAvOBmlcR2f3SQ7kdlYD8+AUJG+wlFZ/Ze8tl1Vzvz0MdOh8IYA/EFU4ve8t1/sZ0j4MGi7ST5MoTwHessQA==
   dependencies:
-    hookified "^1.8.1"
-    keyv "^5.3.2"
+    "@cacheable/memory" "^2.0.6"
+    "@cacheable/utils" "^2.3.2"
+    hookified "^1.13.0"
+    keyv "^5.5.4"
+    qified "^0.5.2"
 
-call-bind-apply-helpers@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz#32e5892e6361b29b0b545ba6f7763378daca2840"
-  integrity sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==
-  dependencies:
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-
-call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
+call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
   integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
@@ -4925,7 +5271,7 @@ call-bind@^1.0.2, call-bind@^1.0.7, call-bind@^1.0.8:
     get-intrinsic "^1.2.4"
     set-function-length "^1.2.2"
 
-call-bound@^1.0.2:
+call-bound@^1.0.2, call-bound@^1.0.3, call-bound@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
   integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
@@ -4933,15 +5279,7 @@ call-bound@^1.0.2:
     call-bind-apply-helpers "^1.0.2"
     get-intrinsic "^1.3.0"
 
-call-bound@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.3.tgz#41cfd032b593e39176a71533ab4f384aa04fd681"
-  integrity sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==
-  dependencies:
-    call-bind-apply-helpers "^1.0.1"
-    get-intrinsic "^1.2.6"
-
-callsites@^3.0.0:
+callsites@^3.0.0, callsites@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
@@ -4964,16 +5302,11 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.2.0:
+camelcase@^6.2.0, camelcase@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-camelize@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.1.tgz#89b7e16884056331a35d6b5ad064332c91daa6c3"
-  integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==
-
 caniuse-api@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
@@ -4984,34 +5317,23 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@1.0.30001720, caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001718:
-  version "1.0.30001720"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001720.tgz#c138cb6026d362be9d8d7b0e4bcd0183a850edfd"
-  integrity sha512-Ec/2yV2nNPwb4DnTANEV99ZWwm3ZWfdlfkQbWSDDt+PsXEVYwlhPH8tdMaPunYTKKmz7AnHi2oNEi1GcmKCD8g==
+caniuse-lite@1.0.30001759, caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001759:
+  version "1.0.30001759"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001759.tgz#d569e7b010372c6b0ca3946e30dada0a2e9d5006"
+  integrity sha512-Pzfx9fOKoKvevQf8oCXoyNRQ5QyxJj+3O0Rqx2V5oxT61KGx8+n6hV/IUyJeifUci2clnmmKVpvtiqRzgiWjSw==
 
-chalk@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3"
-  integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==
-
-chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+chai@^5.2.0:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-5.3.3.tgz#dd3da955e270916a4bd3f625f4b919996ada7e06"
+  integrity sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==
   dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
+    assertion-error "^2.0.1"
+    check-error "^2.1.1"
+    deep-eql "^5.0.1"
+    loupe "^3.1.0"
+    pathval "^2.0.0"
 
-chalk@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
-  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2:
+chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -5019,16 +5341,21 @@ chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.4.1.tgz#1b48bf0963ec158dce2aacf69c093ae2dd2092d8"
-  integrity sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==
+chalk@5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3"
+  integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==
 
 char-regex@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
+check-error@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-2.1.1.tgz#87eb876ae71ee388fa0471fe423f494be1d96ccc"
+  integrity sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==
+
 chokidar@^3.5.3, chokidar@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
@@ -5044,12 +5371,12 @@ chokidar@^3.5.3, chokidar@^3.6.0:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chokidar@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.3.tgz#7be37a4c03c9aee1ecfe862a4a23b2c70c205d30"
-  integrity sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==
+chokidar@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-5.0.0.tgz#949c126a9238a80792be9a0265934f098af369a5"
+  integrity sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==
   dependencies:
-    readdirp "^4.0.1"
+    readdirp "^5.0.0"
 
 chownr@^1.1.1:
   version "1.1.4"
@@ -5061,7 +5388,7 @@ chrome-trace-event@^1.0.2:
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz#05bffd7ff928465093314708c93bdfa9bd1f0f5b"
   integrity sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==
 
-ci-info@^3.2.0, ci-info@^3.7.0:
+ci-info@^3.7.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
   integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
@@ -5071,10 +5398,15 @@ ci-info@^4.0.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.1.0.tgz#92319d2fa29d2620180ea5afed31f589bc98cf83"
   integrity sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==
 
-cjs-module-lexer@^1.0.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz#707413784dbb3a72aa11c2f2b042a0bef4004170"
-  integrity sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==
+ci-info@^4.2.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.3.1.tgz#355ad571920810b5623e11d40232f443f16f1daa"
+  integrity sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==
+
+cjs-module-lexer@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-2.1.1.tgz#bff23b0609cc9afa428bd35f1918f7d03b448562"
+  integrity sha512-+CmxIZ/L2vNcEfvNtLdU0ZQ6mbq3FZnwAP2PPTiKP+1QOoKwlKlPgb8UKV0Dds7QVaMnHm+FwSft2VB0s/SLjQ==
 
 classnames@^2.2.6, classnames@^2.5.1:
   version "2.5.1"
@@ -5102,13 +5434,13 @@ cli-cursor@^5.0.0:
   dependencies:
     restore-cursor "^5.0.0"
 
-cli-truncate@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-4.0.0.tgz#6cc28a2924fee9e25ce91e973db56c7066e6172a"
-  integrity sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==
+cli-truncate@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-5.1.1.tgz#455476face9904d94b7d11e98d9adbca15292ea5"
+  integrity sha512-SroPvNHxUnk+vIW/dOSfNqdy1sPEFkrTk6TUtqLCnBlo3N7TNYYkzzN7uSD6+jVjrdO4+p8nH7JzH6cIvUem6A==
   dependencies:
-    slice-ansi "^5.0.0"
-    string-width "^7.0.0"
+    slice-ansi "^7.1.0"
+    string-width "^8.0.0"
 
 cliui@^6.0.0:
   version "6.0.0"
@@ -5137,27 +5469,22 @@ clone-deep@^4.0.1:
     kind-of "^6.0.2"
     shallow-clone "^3.0.0"
 
-clsx@^1.0.4:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
-  integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
+clone-regexp@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-3.0.0.tgz#c6dd5c6b85482306778f3dc4ac2bb967079069c2"
+  integrity sha512-ujdnoq2Kxb8s3ItNBtnYeXdm07FcU0u8ARAT1lQ2YdMwQC+cdiXX8KoqMVuglztILivceTtp4ivqGSmEmhBUJw==
+  dependencies:
+    is-regexp "^3.0.0"
 
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
-collect-v8-coverage@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
-  integrity sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
+collect-v8-coverage@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.3.tgz#cc1f01eb8d02298cbc9a437c74c70ab4e5210b80"
+  integrity sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==
 
 color-convert@^2.0.1:
   version "2.0.1"
@@ -5166,11 +5493,6 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
-
 color-name@^1.1.4, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
@@ -5193,15 +5515,20 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-11.1.0.tgz#62fdce76006a68e5c1ab3314dc92e800eb83d906"
+  integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==
+
 commander@^12.1.0:
   version "12.1.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3"
   integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==
 
-commander@^14.0.0:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-14.0.0.tgz#f244fc74a92343514e56229f16ef5c5e22ced5e9"
-  integrity sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA==
+commander@^14.0.2:
+  version "14.0.2"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-14.0.2.tgz#b71fd37fe4069e4c3c7c13925252ada4eba14e8e"
+  integrity sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==
 
 commander@^2.20.0:
   version "2.20.3"
@@ -5264,17 +5591,16 @@ concat-map@0.0.1:
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 concurrently@^9.0.0:
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-9.1.2.tgz#22d9109296961eaee773e12bfb1ce9a66bc9836c"
-  integrity sha512-H9MWcoPsYddwbOGM6difjVwVZHl63nwMEwDJG/L7VGtuaJhb12h2caPG2tVPWs7emuYix252iGfqOyrz1GczTQ==
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-9.2.1.tgz#248ea21b95754947be2dad9c3e4b60f18ca4e44f"
+  integrity sha512-fsfrO0MxV64Znoy8/l1vVIjjHa29SZyyqPgQBwhiDcaW8wJc2W3XWVOGx4M3oJBnv/zdUZIIp1gDeS98GzP8Ng==
   dependencies:
-    chalk "^4.1.2"
-    lodash "^4.17.21"
-    rxjs "^7.8.1"
-    shell-quote "^1.8.1"
-    supports-color "^8.1.1"
-    tree-kill "^1.2.2"
-    yargs "^17.7.2"
+    chalk "4.1.2"
+    rxjs "7.8.2"
+    shell-quote "1.8.3"
+    supports-color "8.1.1"
+    tree-kill "1.2.2"
+    yargs "17.7.2"
 
 connect-history-api-fallback@^2.0.0:
   version "2.0.0"
@@ -5289,17 +5615,20 @@ content-disposition@0.5.4:
     safe-buffer "5.2.1"
 
 content-disposition@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-1.0.0.tgz#844426cb398f934caefcbb172200126bc7ceace2"
-  integrity sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==
-  dependencies:
-    safe-buffer "5.2.1"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-1.0.1.tgz#a8b7bbeb2904befdfb6787e5c0c086959f605f9b"
+  integrity sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==
 
 content-type@^1.0.4, content-type@^1.0.5, content-type@~1.0.4, content-type@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
   integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
 
+convert-hrtime@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/convert-hrtime/-/convert-hrtime-5.0.0.tgz#f2131236d4598b95de856926a67100a0a97e9fa3"
+  integrity sha512-lOETlkIeYSJWcbbcvjRKGxVMXJR+8+OQb/mTPbA4ObPMytYIsUbuOE0Jzy60hjARYszq1id0j8KgVhC+WGZVTg==
+
 convert-source-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
@@ -5325,17 +5654,10 @@ cookie@^0.7.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7"
   integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==
 
-copy-to-clipboard@^3.3.1:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0"
-  integrity sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==
-  dependencies:
-    toggle-selection "^1.0.6"
-
 copy-webpack-plugin@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-13.0.0.tgz#793342576eed76fdbc7936b873eae17aa7a7d9a3"
-  integrity sha512-FgR/h5a6hzJqATDGd9YG41SeDViH+0bkHn6WNXCi5zKAZkeESeSxLySSsFLHqLEVCh0E+rITmCf0dusXWYukeQ==
+  version "13.0.1"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-13.0.1.tgz#fba18c22bcab3633524e1b652580ff4489eddc0d"
+  integrity sha512-J+YV3WfhY6W/Xf9h+J1znYuqTye2xkBUIGyTPWuBAT27qajBa5mR4f8WBmfDY3YjRftT2kqZZiLi1qf0H+UOFw==
   dependencies:
     glob-parent "^6.0.1"
     normalize-path "^3.0.0"
@@ -5350,17 +5672,17 @@ core-js-compat@^3.38.1:
   dependencies:
     browserslist "^4.24.3"
 
-core-js-compat@^3.40.0:
-  version "3.42.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.42.0.tgz#ce19c29706ee5806e26d3cb3c542d4cfc0ed51bb"
-  integrity sha512-bQasjMfyDGyaeWKBIu33lHh9qlSR0MFE/Nmc6nMjf/iU9b3rSMdAYz1Baxrv4lPdGUsTqZudHA4jIGSJy0SWZQ==
+core-js-compat@^3.43.0:
+  version "3.46.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.46.0.tgz#0c87126a19a1af00371e12b02a2b088a40f3c6f7"
+  integrity sha512-p9hObIIEENxSV8xIu+V68JjSeARg6UVMG5mR+JEUguG3sI6MsiS1njz2jHmyJDvA+8jX/sytkBHup6kxhM9law==
   dependencies:
-    browserslist "^4.24.4"
+    browserslist "^4.26.3"
 
 core-js@^3.0.0, core-js@^3.38.1:
-  version "3.42.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.42.0.tgz#edbe91f78ac8cfb6df8d997e74d368a68082fe37"
-  integrity sha512-Sz4PP4ZA+Rq4II21qkNqOEDTDrCvcANId3xpIgB34NDkWc3UduWj2dqEtN9yZIq8Dk3HyPI33x9sqqU5C8sr0g==
+  version "3.47.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.47.0.tgz#436ef07650e191afeb84c24481b298bd60eb4a17"
+  integrity sha512-c3Q2VVkGAUyupsjRnaNX6u8Dq2vAdzm9iuPj5FW0fRxzlxgq9Q39MDq10IvmQSpLgHQNyQzQmOo6bgGHmH3NNg==
 
 core-util-is@~1.0.0:
   version "1.0.3"
@@ -5424,28 +5746,10 @@ crc32-stream@^6.0.0:
     crc-32 "^1.2.0"
     readable-stream "^4.0.0"
 
-create-jest@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320"
-  integrity sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==
-  dependencies:
-    "@jest/types" "^29.6.3"
-    chalk "^4.0.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.9"
-    jest-config "^29.7.0"
-    jest-util "^29.7.0"
-    prompts "^2.0.1"
-
-create-require@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
-  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
-
-cronstrue@^2.41.0:
-  version "2.61.0"
-  resolved "https://registry.yarnpkg.com/cronstrue/-/cronstrue-2.61.0.tgz#97c79c77045c052afb44cb9f5f8eaf54398094f2"
-  integrity sha512-ootN5bvXbIQI9rW94+QsXN5eROtXWwew6NkdGxIRpS/UFWRggL0G5Al7a9GTBFEsuvVhJ2K3CntIIVt7L2ILhA==
+cronstrue@^3.0.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/cronstrue/-/cronstrue-3.9.0.tgz#a3c3ae3e218235a123c80de8db95a93e45a9d8ba"
+  integrity sha512-T3S35zmD0Ai2B4ko6+mEM+k9C6tipe2nB9RLiGT6QL2Wn0Vsn2cCZAC8Oeuf4CaE00GZWVdpYitbpWCNlIWqdA==
 
 cross-spawn@^7.0.2:
   version "7.0.5"
@@ -5479,15 +5783,10 @@ css-box-model@^1.2.0:
   dependencies:
     tiny-invariant "^1.0.6"
 
-css-color-keywords@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05"
-  integrity sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==
-
 css-declaration-sorter@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-7.2.0.tgz#6dec1c9523bc4a643e088aab8f09e67a54961024"
-  integrity sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow==
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-7.3.0.tgz#edc45c36bcdfea0788b1d4452829f142ef1c4a4a"
+  integrity sha512-LQF6N/3vkAMYF4xoHLJfG718HRJh34Z8BnNhd6bosOMIVjMlhuZK5++oZa3uYAgrI5+7x2o27gUqTR2U/KjUOQ==
 
 css-functions-list@^3.2.3:
   version "3.2.3"
@@ -5503,13 +5802,6 @@ css-has-pseudo@^7.0.2:
     postcss-selector-parser "^7.0.0"
     postcss-value-parser "^4.2.0"
 
-css-in-js-utils@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-3.1.0.tgz#640ae6a33646d401fc720c54fc61c42cd76ae2bb"
-  integrity sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A==
-  dependencies:
-    hyphenate-style-name "^1.0.3"
-
 css-loader@^7.0.0:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-7.1.2.tgz#64671541c6efe06b0e22e750503106bdd86880f8"
@@ -5525,13 +5817,13 @@ css-loader@^7.0.0:
     semver "^7.5.4"
 
 css-minimizer-webpack-plugin@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-7.0.2.tgz#aa1b01c6033f5b2f86ddb60c1f5bddd012b50cac"
-  integrity sha512-nBRWZtI77PBZQgcXMNqiIXVshiQOVLGSf2qX/WZfG8IQfMbeHUMXaBWQmiiSTmPJUflQxHjZjzAmuyO7tpL2Jg==
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-7.0.3.tgz#2da02f79ed5af0f81ac67a39a39bc430c75a0d0d"
+  integrity sha512-O99EbZ3P9YqfjWPvaL5Ndr54hP1V1N9IRKDLzKpEm1cw5eYF5KTFvz63Wm/AGDz841ceGmLvU1rdN8LrElMIiQ==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.25"
     cssnano "^7.0.4"
-    jest-worker "^29.7.0"
+    jest-worker "^30.0.5"
     postcss "^8.4.40"
     schema-utils "^4.2.0"
     serialize-javascript "^6.0.2"
@@ -5553,9 +5845,9 @@ css-select@^4.1.3:
     nth-check "^2.0.1"
 
 css-select@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6"
-  integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.2.2.tgz#01b6e8d163637bb2dd6c982ca4ed65863682786e"
+  integrity sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==
   dependencies:
     boolbase "^1.0.0"
     css-what "^6.1.0"
@@ -5563,23 +5855,6 @@ css-select@^5.1.0:
     domutils "^3.0.1"
     nth-check "^2.0.1"
 
-css-to-react-native@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.2.0.tgz#cdd8099f71024e149e4f6fe17a7d46ecd55f1e32"
-  integrity sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==
-  dependencies:
-    camelize "^1.0.0"
-    css-color-keywords "^1.0.0"
-    postcss-value-parser "^4.0.2"
-
-css-tree@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
-  integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==
-  dependencies:
-    mdn-data "2.0.14"
-    source-map "^0.6.1"
-
 css-tree@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
@@ -5605,9 +5880,9 @@ css-tree@~2.2.0:
     source-map-js "^1.0.1"
 
 css-what@^6.0.1, css-what@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
-  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.2.2.tgz#cdcc8f9b6977719fdfbd1de7aec24abf756b9dea"
+  integrity sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==
 
 css.escape@^1.5.1:
   version "1.5.1"
@@ -5629,54 +5904,54 @@ cssfontparser@^1.2.1:
   resolved "https://registry.yarnpkg.com/cssfontparser/-/cssfontparser-1.2.1.tgz#f4022fc8f9700c68029d542084afbaf425a3f3e3"
   integrity sha512-6tun4LoZnj7VN6YeegOVb67KBX/7JJsqvj+pv3ZA7F878/eN33AbGa5b/S/wXxS/tcp8nc40xRUrsPlxIyNUPg==
 
-cssnano-preset-default@^7.0.6:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-7.0.6.tgz#0220fa7507478369aa2a226bac03e1204cd024c1"
-  integrity sha512-ZzrgYupYxEvdGGuqL+JKOY70s7+saoNlHSCK/OGn1vB2pQK8KSET8jvenzItcY+kA7NoWvfbb/YhlzuzNKjOhQ==
+cssnano-preset-default@^7.0.10:
+  version "7.0.10"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-7.0.10.tgz#4fb6ee962c0852a03084e8c7a4b60fb0e2db45e0"
+  integrity sha512-6ZBjW0Lf1K1Z+0OKUAUpEN62tSXmYChXWi2NAA0afxEVsj9a+MbcB1l5qel6BHJHmULai2fCGRthCeKSFbScpA==
   dependencies:
-    browserslist "^4.23.3"
+    browserslist "^4.27.0"
     css-declaration-sorter "^7.2.0"
-    cssnano-utils "^5.0.0"
-    postcss-calc "^10.0.2"
-    postcss-colormin "^7.0.2"
-    postcss-convert-values "^7.0.4"
-    postcss-discard-comments "^7.0.3"
-    postcss-discard-duplicates "^7.0.1"
-    postcss-discard-empty "^7.0.0"
-    postcss-discard-overridden "^7.0.0"
-    postcss-merge-longhand "^7.0.4"
-    postcss-merge-rules "^7.0.4"
-    postcss-minify-font-values "^7.0.0"
-    postcss-minify-gradients "^7.0.0"
-    postcss-minify-params "^7.0.2"
-    postcss-minify-selectors "^7.0.4"
-    postcss-normalize-charset "^7.0.0"
-    postcss-normalize-display-values "^7.0.0"
-    postcss-normalize-positions "^7.0.0"
-    postcss-normalize-repeat-style "^7.0.0"
-    postcss-normalize-string "^7.0.0"
-    postcss-normalize-timing-functions "^7.0.0"
-    postcss-normalize-unicode "^7.0.2"
-    postcss-normalize-url "^7.0.0"
-    postcss-normalize-whitespace "^7.0.0"
-    postcss-ordered-values "^7.0.1"
-    postcss-reduce-initial "^7.0.2"
-    postcss-reduce-transforms "^7.0.0"
-    postcss-svgo "^7.0.1"
-    postcss-unique-selectors "^7.0.3"
+    cssnano-utils "^5.0.1"
+    postcss-calc "^10.1.1"
+    postcss-colormin "^7.0.5"
+    postcss-convert-values "^7.0.8"
+    postcss-discard-comments "^7.0.5"
+    postcss-discard-duplicates "^7.0.2"
+    postcss-discard-empty "^7.0.1"
+    postcss-discard-overridden "^7.0.1"
+    postcss-merge-longhand "^7.0.5"
+    postcss-merge-rules "^7.0.7"
+    postcss-minify-font-values "^7.0.1"
+    postcss-minify-gradients "^7.0.1"
+    postcss-minify-params "^7.0.5"
+    postcss-minify-selectors "^7.0.5"
+    postcss-normalize-charset "^7.0.1"
+    postcss-normalize-display-values "^7.0.1"
+    postcss-normalize-positions "^7.0.1"
+    postcss-normalize-repeat-style "^7.0.1"
+    postcss-normalize-string "^7.0.1"
+    postcss-normalize-timing-functions "^7.0.1"
+    postcss-normalize-unicode "^7.0.5"
+    postcss-normalize-url "^7.0.1"
+    postcss-normalize-whitespace "^7.0.1"
+    postcss-ordered-values "^7.0.2"
+    postcss-reduce-initial "^7.0.5"
+    postcss-reduce-transforms "^7.0.1"
+    postcss-svgo "^7.1.0"
+    postcss-unique-selectors "^7.0.4"
 
-cssnano-utils@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-5.0.0.tgz#b53a0343dd5d21012911882db6ae7d2eae0e3687"
-  integrity sha512-Uij0Xdxc24L6SirFr25MlwC2rCFX6scyUmuKpzI+JQ7cyqDEwD42fJ0xfB3yLfOnRDU5LKGgjQ9FA6LYh76GWQ==
+cssnano-utils@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-5.0.1.tgz#f529e9aa0d7930512ca45b9e2ddb8d6b9092eb30"
+  integrity sha512-ZIP71eQgG9JwjVZsTPSqhc6GHgEr53uJ7tK5///VfyWj6Xp2DBmixWHqJgPno+PqATzn48pL42ww9x5SSGmhZg==
 
 cssnano@^7.0.4:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-7.0.6.tgz#63d54fd42bc017f6aaed69e47d9aaef85b7850ec"
-  integrity sha512-54woqx8SCbp8HwvNZYn68ZFAepuouZW4lTwiMVnBErM3VkO7/Sd4oTOt3Zz3bPx3kxQ36aISppyXj2Md4lg8bw==
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-7.1.2.tgz#a8a533a8f509d74b2d22e73d80ec1294f65fdc70"
+  integrity sha512-HYOPBsNvoiFeR1eghKD5C3ASm64v9YVyJB4Ivnl2gqKoQYvjjN/G0rztvKQq8OxocUtC6sjqY8jwYngIB4AByA==
   dependencies:
-    cssnano-preset-default "^7.0.6"
-    lilconfig "^3.1.2"
+    cssnano-preset-default "^7.0.10"
+    lilconfig "^3.1.3"
 
 csso@^5.0.5:
   version "5.0.5"
@@ -5685,28 +5960,24 @@ csso@^5.0.5:
   dependencies:
     css-tree "~2.2.0"
 
-cssom@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
-  integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==
-
-cssom@~0.3.6:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
-  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
-
-cssstyle@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
-  integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
+cssstyle@^4.2.1:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.6.0.tgz#ea18007024e3167f4f105315f3ec2d982bf48ed9"
+  integrity sha512-2z+rWdzbbSZv6/rhtvzvqeZQHrBaqgogqt85sqFNbabZOuFbCVFb8kPeEtZjiKkbrm395irpNKiYeFeLiQnFPg==
   dependencies:
-    cssom "~0.3.6"
+    "@asamuzakjp/css-color" "^3.2.0"
+    rrweb-cssom "^0.8.0"
 
-csstype@3.1.3, csstype@^3.0.2, csstype@^3.1.2:
+csstype@^3.0.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
   integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
+csstype@^3.2.2:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.2.3.tgz#ec48c0f3e993e50648c86da559e2610995cf989a"
+  integrity sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==
+
 cuint@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
@@ -5717,14 +5988,13 @@ damerau-levenshtein@^1.0.8:
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
 
-data-urls@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143"
-  integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==
+data-urls@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-5.0.0.tgz#2f76906bce1824429ffecb6920f45a0b30f00dde"
+  integrity sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==
   dependencies:
-    abab "^2.0.6"
-    whatwg-mimetype "^3.0.0"
-    whatwg-url "^11.0.0"
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.0.0"
 
 data-view-buffer@^1.0.2:
   version "1.0.2"
@@ -5770,10 +6040,10 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4, debug@^4.3.5, debug@^4.4.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b"
-  integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4, debug@^4.3.5, debug@^4.4.0, debug@^4.4.1, debug@^4.4.3:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
+  integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
   dependencies:
     ms "^2.1.3"
 
@@ -5791,32 +6061,25 @@ debug@^4.3.2:
   dependencies:
     ms "^2.1.3"
 
-debug@^4.3.7, debug@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
-  integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
-  dependencies:
-    ms "^2.1.3"
-
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
-decimal.js@^10.4.2:
-  version "10.4.3"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
-  integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
+decimal.js@^10.4.3, decimal.js@^10.5.0:
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.6.0.tgz#e649a43e3ab953a72192ff5983865e509f37ed9a"
+  integrity sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==
 
-decimal.js@^10.4.3:
-  version "10.5.0"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.5.0.tgz#0f371c7cf6c4898ce0afb09836db73cd82010f22"
-  integrity sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==
+dedent@^1.6.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.7.0.tgz#c1f9445335f0175a96587be245a282ff451446ca"
+  integrity sha512-HGFtf8yhuhGhqO07SV79tRp+br4MnbdjeVxotpn1QBl30pcLLCQjX5b2295ll0fv8RKDKsmWYrl05usHM9CewQ==
 
-dedent@^1.0.0:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.3.tgz#99aee19eb9bae55a67327717b6e848d0bf777e5a"
-  integrity sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==
+deep-eql@^5.0.1:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-5.0.2.tgz#4b756d8d770a9257300825d52a2c2cff99c3a341"
+  integrity sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==
 
 deep-is@^0.1.3:
   version "0.1.4"
@@ -5829,14 +6092,14 @@ deepmerge@^4.2.2, deepmerge@^4.3.1:
   integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
 
 default-browser-id@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-5.0.0.tgz#a1d98bf960c15082d8a3fa69e83150ccccc3af26"
-  integrity sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-5.0.1.tgz#f7a7ccb8f5104bf8e0f71ba3b1ccfa5eafdb21e8"
+  integrity sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==
 
 default-browser@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-5.2.1.tgz#7b7ba61204ff3e425b556869ae6d3e9d9f1712cf"
-  integrity sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-5.4.0.tgz#b55cf335bb0b465dd7c961a02cd24246aa434287"
+  integrity sha512-XDuvSq38Hr1MdN47EDvYtx3U0MTqpCEn+F6ft8z2vYDzMrvQhVp0ui9oQdqW3MvK3vqUETglt1tVGgjLuJ5izg==
   dependencies:
     bundle-name "^4.1.0"
     default-browser-id "^5.0.0"
@@ -5869,7 +6132,7 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
-depd@2.0.0, depd@^2.0.0:
+depd@2.0.0, depd@^2.0.0, depd@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
@@ -5889,7 +6152,7 @@ destroy@1.2.0:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
-detect-newline@^3.0.0:
+detect-newline@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
@@ -5905,25 +6168,15 @@ detect-node@^2.0.4:
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
 diff-dom@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/diff-dom/-/diff-dom-5.2.0.tgz#bc6756e0dca58bc7565579daf566ce6b259821bf"
-  integrity sha512-+FEFvDJljxPBz9ddkxCpn7I/5SFFYYfvqcS63zE+Aw+3TgTyHAI1RGXEBGLfrkbVQTYCSpvc0nxNNMyNBA60tQ==
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/diff-dom/-/diff-dom-5.2.1.tgz#4b299744f144da8708f273d0a6fb7d4942b4745c"
+  integrity sha512-G6WquwIa/XOxiYDYRMxfJj+c+a6LXMv7zgXoAQ3eRjTYkc8Lc4Aq97krTu/B15r243FR7dyeSxDenzKtO6sbfA==
 
 diff-match-patch@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz#abb584d5f10cd1196dfc55aa03701592ae3f7b37"
   integrity sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==
 
-diff-sequences@^29.6.3:
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
-  integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
-
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
 dijkstrajs@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz#4c8dbdea1f0f6478bff94d9c49c784d623e4fc23"
@@ -5943,10 +6196,10 @@ dns-packet@^5.2.2:
   dependencies:
     "@leichtgewicht/ip-codec" "^2.0.1"
 
-docker-compose@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-1.2.0.tgz#e4c30afdd1a111b47e87d97754baa304302586fc"
-  integrity sha512-wIU1eHk3Op7dFgELRdmOYlPYS4gP8HhH1ZmZa13QZF59y0fblzFDFmKPhyc05phCy2hze9OEvNZAsoljrs+72w==
+docker-compose@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-1.3.0.tgz#6da4bb9d542b4cce6474aa3146a909eda5d23623"
+  integrity sha512-7Gevk/5eGD50+eMD+XDnFnOrruFkL0kSd7jEG4cjmqweDSUhB7i0g8is/nBdVpl+Bx338SqIB2GLKm32M+Vs6g==
   dependencies:
     yaml "^2.2.2"
 
@@ -5960,17 +6213,17 @@ docker-modem@^5.0.6:
     split-ca "^1.0.1"
     ssh2 "^1.15.0"
 
-dockerode@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/dockerode/-/dockerode-4.0.6.tgz#e53978605346afaaed940a72e24d4e8490d52437"
-  integrity sha512-FbVf3Z8fY/kALB9s+P9epCpWhfi/r0N2DgYYcYpsAUlaTxPjdsitsFobnltb+lyCgAIvf9C+4PSWlTnHlJMf1w==
+dockerode@^4.0.9:
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/dockerode/-/dockerode-4.0.9.tgz#15b32000edad25520be6fafa9ad6bc4529b06be7"
+  integrity sha512-iND4mcOWhPaCNh54WmK/KoSb35AFqPAUWFMffTQcp52uQt36b5uNwEJTSXntJZBbeGad72Crbi/hvDIv6us/6Q==
   dependencies:
     "@balena/dockerignore" "^1.0.2"
     "@grpc/grpc-js" "^1.11.1"
     "@grpc/proto-loader" "^0.7.13"
     docker-modem "^5.0.6"
     protobufjs "^7.3.2"
-    tar-fs "~2.1.2"
+    tar-fs "^2.1.4"
     uuid "^10.0.0"
 
 doctrine@^2.1.0:
@@ -6004,7 +6257,7 @@ dom-converter@^0.2.0:
   dependencies:
     utila "~0.4"
 
-dom-helpers@^5.0.1, dom-helpers@^5.1.3:
+dom-helpers@^5.0.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902"
   integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==
@@ -6035,13 +6288,6 @@ domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
   integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
 
-domexception@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
-  integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==
-  dependencies:
-    webidl-conversions "^7.0.0"
-
 domhandler@5.0.3, domhandler@^5.0.2, domhandler@^5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
@@ -6082,10 +6328,15 @@ dot-case@^3.0.4:
     no-case "^3.0.4"
     tslib "^2.0.3"
 
-dotenv@^16.0.2, dotenv@^16.3.1:
-  version "16.5.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.5.0.tgz#092b49f25f808f020050051d1ff258e404c78692"
-  integrity sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==
+dotenv@^16.3.1:
+  version "16.6.1"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.6.1.tgz#773f0e69527a8315c7285d5ee73c4459d20a8020"
+  integrity sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==
+
+dotenv@^17.0.0:
+  version "17.2.3"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-17.2.3.tgz#ad995d6997f639b11065f419a22fabf567cdb9a2"
+  integrity sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==
 
 dunder-proto@^1.0.0, dunder-proto@^1.0.1:
   version "1.0.1"
@@ -6096,15 +6347,10 @@ dunder-proto@^1.0.0, dunder-proto@^1.0.1:
     es-errors "^1.3.0"
     gopd "^1.2.0"
 
-duplexer@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
-earcut@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/earcut/-/earcut-3.0.1.tgz#f60b3f671c5657cca9d3e131c5527c5dde00ef38"
-  integrity sha512-0l1/0gOjESMeQyYaK5IDiPNvFeu93Z/cO0TjZh9eZ1vyCtZnA7KMZ8rQggpsJHIbGSdrqYq9OhuveadOVHCshw==
+earcut@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/earcut/-/earcut-3.0.2.tgz#d478a29aaf99acf418151493048aa197d0512248"
+  integrity sha512-X7hshQbLyMJ/3RPhyObLARM2sNxxmRALLKx1+NVFFnQ9gKzmCrxm9+uLIAdBcvc8FNLpctqlQ2V6AE92Ol9UDQ==
 
 eastasianwidth@^0.2.0:
   version "0.2.0"
@@ -6123,21 +6369,16 @@ ejs@^3.1.8:
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.5.160:
-  version "1.5.161"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.161.tgz#650376bd3be7ff8e581031409fc2d4f150620b12"
-  integrity sha512-hwtetwfKNZo/UlwHIVBlKZVdy7o8bIZxxKs0Mv/ROPiQQQmDgdm5a+KvKtBsxM8ZjFzTaCeLoodZ8jiBE3o9rA==
+electron-to-chromium@^1.5.263:
+  version "1.5.267"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.267.tgz#5d84f2df8cdb6bfe7e873706bb21bd4bfb574dc7"
+  integrity sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==
 
 emittery@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
   integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
 
-emoji-regex@^10.3.0:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.4.0.tgz#03553afea80b3975749cfcb36f776ca268e413d4"
-  integrity sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==
-
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -6148,26 +6389,31 @@ emoji-regex@^9.2.2:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
-emojibase-data@^15.3.1:
-  version "15.3.2"
-  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-15.3.2.tgz#2742246bfe14f16a7829b42ca156dec09934cf85"
-  integrity sha512-TpDyTDDTdqWIJixV5sTA6OQ0P0JfIIeK2tFRR3q56G9LK65ylAZ7z3KyBXokpvTTJ+mLUXQXbLNyVkjvnTLE+A==
+emojibase-data@^17.0.0:
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-17.0.0.tgz#5816fba6395da6b567fbd54b029ca6b5de2d9255"
+  integrity sha512-Yvgb5AWoHViHV/gq1qr5ZAarcBip+B27/ZLRsUJkbgAEaLlZ/fof9g882LTpmEpyhBNEC0m2SEmItljHsTygjA==
 
-emojibase-regex@15.3.2:
-  version "15.3.2"
-  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-15.3.2.tgz#5175231715b86d4b437754527288844a6c29318f"
-  integrity sha512-ue6BVeb2qu33l97MkxcOoyMJlg6Tug3eTv2z1at+M9TjvlWKvdmAPvZIDG1JbT2RH3FSyJNLucO5K5H/yxT03w==
+emojibase-regex@^17.0.0:
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-17.0.0.tgz#9133e627e0884f494000e7a51c2d963482cb9b45"
+  integrity sha512-iWlqiz2l2zNf2lDqgN/7qjqKHVUX6H4D+8F5vDZkgjyWyRFXcA5K4rxkoTl7AJmyjHnoytw0m/do2SrGByui+g==
 
-emojibase@^15.3.1:
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/emojibase/-/emojibase-15.3.1.tgz#7f6ff5482486f23e59a457de64e974bd35f3c9a3"
-  integrity sha512-GNsjHnG2J3Ktg684Fs/vZR/6XpOSkZPMAv85EHrr6br2RN2cJNwdS4am/3YSK3y+/gOv2kmoK3GGdahXdMxg2g==
+emojibase@^17.0.0:
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/emojibase/-/emojibase-17.0.0.tgz#711350fe0f2862945fecd06147370623874ba15e"
+  integrity sha512-bXdpf4HPY3p41zK5swVKZdC/VynsMZ4LoLxdYDE+GucqkFwzcM1GVc4ODfYAlwoKaf2U2oNNUoOO78N96ovpBA==
 
 emojis-list@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
+empathic@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/empathic/-/empathic-2.0.0.tgz#71d3c2b94fad49532ef98a6c34be0386659f6131"
+  integrity sha512-i6UzDscO/XfAcNYD75CfICkmfLedpyPDdozrLMmQc5ORaQcdMoc21OnlEylMIqI7U8eniKrPMxxtj8k0vhmJhA==
+
 encodeurl@^2.0.0, encodeurl@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
@@ -6179,16 +6425,16 @@ encodeurl@~1.0.2:
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
 end-of-stream@^1.1.0, end-of-stream@^1.4.1:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.5.tgz#7344d711dea40e0b74abc2ed49778743ccedb08c"
+  integrity sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.17.1:
-  version "5.18.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz#728ab082f8b7b6836de51f1637aab5d3b9568faf"
-  integrity sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==
+enhanced-resolve@^5.17.3:
+  version "5.18.3"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz#9b5f4c5c076b8787c78fe540392ce76a88855b44"
+  integrity sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -6204,9 +6450,9 @@ entities@^4.2.0, entities@^4.4.0, entities@^4.5.0:
   integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
 entities@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-6.0.0.tgz#09c9e29cb79b0a6459a9b9db9efb418ac5bb8e51"
-  integrity sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-6.0.1.tgz#c28c34a43379ca7f61d074130b2f5f7020a30694"
+  integrity sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==
 
 entities@~3.0.1:
   version "3.0.1"
@@ -6229,20 +6475,73 @@ environment@^1.0.0:
   integrity sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==
 
 error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.4.tgz#b3a8d8bb6f92eecc1629e3e27d3c8607a8a32414"
+  integrity sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==
   dependencies:
     is-arrayish "^0.2.1"
 
-error-stack-parser@^2.0.6:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286"
-  integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==
+es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23.5, es-abstract@^1.23.6, es-abstract@^1.23.9, es-abstract@^1.24.0:
+  version "1.24.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.0.tgz#c44732d2beb0acc1ed60df840869e3106e7af328"
+  integrity sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==
   dependencies:
-    stackframe "^1.3.4"
+    array-buffer-byte-length "^1.0.2"
+    arraybuffer.prototype.slice "^1.0.4"
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
+    data-view-buffer "^1.0.2"
+    data-view-byte-length "^1.0.2"
+    data-view-byte-offset "^1.0.1"
+    es-define-property "^1.0.1"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.1.1"
+    es-set-tostringtag "^2.1.0"
+    es-to-primitive "^1.3.0"
+    function.prototype.name "^1.1.8"
+    get-intrinsic "^1.3.0"
+    get-proto "^1.0.1"
+    get-symbol-description "^1.1.0"
+    globalthis "^1.0.4"
+    gopd "^1.2.0"
+    has-property-descriptors "^1.0.2"
+    has-proto "^1.2.0"
+    has-symbols "^1.1.0"
+    hasown "^2.0.2"
+    internal-slot "^1.1.0"
+    is-array-buffer "^3.0.5"
+    is-callable "^1.2.7"
+    is-data-view "^1.0.2"
+    is-negative-zero "^2.0.3"
+    is-regex "^1.2.1"
+    is-set "^2.0.3"
+    is-shared-array-buffer "^1.0.4"
+    is-string "^1.1.1"
+    is-typed-array "^1.1.15"
+    is-weakref "^1.1.1"
+    math-intrinsics "^1.1.0"
+    object-inspect "^1.13.4"
+    object-keys "^1.1.1"
+    object.assign "^4.1.7"
+    own-keys "^1.0.1"
+    regexp.prototype.flags "^1.5.4"
+    safe-array-concat "^1.1.3"
+    safe-push-apply "^1.0.0"
+    safe-regex-test "^1.1.0"
+    set-proto "^1.0.0"
+    stop-iteration-iterator "^1.1.0"
+    string.prototype.trim "^1.2.10"
+    string.prototype.trimend "^1.0.9"
+    string.prototype.trimstart "^1.0.8"
+    typed-array-buffer "^1.0.3"
+    typed-array-byte-length "^1.0.3"
+    typed-array-byte-offset "^1.0.4"
+    typed-array-length "^1.0.7"
+    unbox-primitive "^1.1.0"
+    which-typed-array "^1.1.19"
 
-es-abstract@^1.17.5, es-abstract@^1.22.1, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23.5, es-abstract@^1.23.6, es-abstract@^1.23.9:
+es-abstract@^1.22.1:
   version "1.23.9"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.9.tgz#5b45994b7de78dada5c1bebf1379646b32b9d606"
   integrity sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==
@@ -6353,13 +6652,20 @@ es-set-tostringtag@^2.0.3, es-set-tostringtag@^2.1.0:
     has-tostringtag "^1.0.2"
     hasown "^2.0.2"
 
-es-shim-unscopables@^1.0.0, es-shim-unscopables@^1.0.2:
+es-shim-unscopables@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763"
   integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==
   dependencies:
     hasown "^2.0.0"
 
+es-shim-unscopables@^1.0.2, es-shim-unscopables@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz#438df35520dac5d105f3943d927549ea3b00f4b5"
+  integrity sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==
+  dependencies:
+    hasown "^2.0.2"
+
 es-to-primitive@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz#96c89c82cc49fd8794a24835ba3e1ff87f214e18"
@@ -6369,6 +6675,38 @@ es-to-primitive@^1.3.0:
     is-date-object "^1.0.5"
     is-symbol "^1.0.4"
 
+"esbuild@^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0 || ^0.26.0 || ^0.27.0":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.27.2.tgz#d83ed2154d5813a5367376bb2292a9296fc83717"
+  integrity sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==
+  optionalDependencies:
+    "@esbuild/aix-ppc64" "0.27.2"
+    "@esbuild/android-arm" "0.27.2"
+    "@esbuild/android-arm64" "0.27.2"
+    "@esbuild/android-x64" "0.27.2"
+    "@esbuild/darwin-arm64" "0.27.2"
+    "@esbuild/darwin-x64" "0.27.2"
+    "@esbuild/freebsd-arm64" "0.27.2"
+    "@esbuild/freebsd-x64" "0.27.2"
+    "@esbuild/linux-arm" "0.27.2"
+    "@esbuild/linux-arm64" "0.27.2"
+    "@esbuild/linux-ia32" "0.27.2"
+    "@esbuild/linux-loong64" "0.27.2"
+    "@esbuild/linux-mips64el" "0.27.2"
+    "@esbuild/linux-ppc64" "0.27.2"
+    "@esbuild/linux-riscv64" "0.27.2"
+    "@esbuild/linux-s390x" "0.27.2"
+    "@esbuild/linux-x64" "0.27.2"
+    "@esbuild/netbsd-arm64" "0.27.2"
+    "@esbuild/netbsd-x64" "0.27.2"
+    "@esbuild/openbsd-arm64" "0.27.2"
+    "@esbuild/openbsd-x64" "0.27.2"
+    "@esbuild/openharmony-arm64" "0.27.2"
+    "@esbuild/sunos-x64" "0.27.2"
+    "@esbuild/win32-arm64" "0.27.2"
+    "@esbuild/win32-ia32" "0.27.2"
+    "@esbuild/win32-x64" "0.27.2"
+
 escalade@^3.1.1, escalade@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
@@ -6394,26 +6732,15 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-escodegen@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17"
-  integrity sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^5.2.0"
-    esutils "^2.0.2"
-  optionalDependencies:
-    source-map "~0.6.1"
-
 eslint-config-google@^0.14.0:
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz#4f5f8759ba6e11b424294a219dbfa18c508bcc1a"
   integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==
 
 eslint-config-prettier@^10.0.0:
-  version "10.1.5"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.1.5.tgz#00c18d7225043b6fbce6a665697377998d453782"
-  integrity sha512-zc1UmCpNltmVY34vuLRV61r1K27sWuX39E+uyUnY8xS2Bex88VV9cugG+UZbRSRGtGyFboj+D8JODyme1plMpw==
+  version "10.1.8"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.1.8.tgz#15734ce4af8c2778cc32f0b01b37b0b5cd1ecb97"
+  integrity sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==
 
 eslint-import-resolver-node@^0.3.9:
   version "0.3.9"
@@ -6424,49 +6751,49 @@ eslint-import-resolver-node@^0.3.9:
     is-core-module "^2.13.0"
     resolve "^1.22.4"
 
-eslint-module-utils@^2.12.0:
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz#fe4cfb948d61f49203d7b08871982b65b9af0b0b"
-  integrity sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==
+eslint-module-utils@^2.12.1:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz#f76d3220bfb83c057651359295ab5854eaad75ff"
+  integrity sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==
   dependencies:
     debug "^3.2.7"
 
-eslint-plugin-deprecate@0.8.5:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-deprecate/-/eslint-plugin-deprecate-0.8.5.tgz#3297e2f0535e01af4ffbebda74824a951d3f073b"
-  integrity sha512-nBH14smi2O1qsQY/deVf1xg1XPMB5ADPPcXWpUDp5ptGrWuNGD7Ghe0mIQKmsoFr6VjjDxJZ5tt78hb5GaCScA==
+eslint-plugin-deprecate@0.8.7:
+  version "0.8.7"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-deprecate/-/eslint-plugin-deprecate-0.8.7.tgz#256783c785ea8f87a64ce23bf7de7e78064a6a22"
+  integrity sha512-G+xyAozC3M+lwZUmLU69N1GkcB1hkmzvTSbKsbSzMlqH0NpFwgosSE7pv58EBEqndeniNJpuReymK7xqAGXhWg==
 
 eslint-plugin-import@^2.25.4:
-  version "2.31.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz#310ce7e720ca1d9c0bb3f69adfd1c6bdd7d9e0e7"
-  integrity sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==
+  version "2.32.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz#602b55faa6e4caeaa5e970c198b5c00a37708980"
+  integrity sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==
   dependencies:
     "@rtsao/scc" "^1.1.0"
-    array-includes "^3.1.8"
-    array.prototype.findlastindex "^1.2.5"
-    array.prototype.flat "^1.3.2"
-    array.prototype.flatmap "^1.3.2"
+    array-includes "^3.1.9"
+    array.prototype.findlastindex "^1.2.6"
+    array.prototype.flat "^1.3.3"
+    array.prototype.flatmap "^1.3.3"
     debug "^3.2.7"
     doctrine "^2.1.0"
     eslint-import-resolver-node "^0.3.9"
-    eslint-module-utils "^2.12.0"
+    eslint-module-utils "^2.12.1"
     hasown "^2.0.2"
-    is-core-module "^2.15.1"
+    is-core-module "^2.16.1"
     is-glob "^4.0.3"
     minimatch "^3.1.2"
     object.fromentries "^2.0.8"
     object.groupby "^1.0.3"
-    object.values "^1.2.0"
+    object.values "^1.2.1"
     semver "^6.3.1"
-    string.prototype.trimend "^1.0.8"
+    string.prototype.trimend "^1.0.9"
     tsconfig-paths "^3.15.0"
 
-eslint-plugin-jest@^28.0.0:
-  version "28.11.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-28.11.0.tgz#2641ecb4411941bbddb3d7cf8a8ff1163fbb510e"
-  integrity sha512-QAfipLcNCWLVocVbZW8GimKn5p5iiMcgGbRzz8z/P5q7xw+cNEpYqyzFMtIF/ZgF2HLOyy+dYBut+DoYolvqig==
+eslint-plugin-jest@^29.0.0:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-29.2.1.tgz#e56c5f79b6475dafa551ce8e762ac25d4bd21ea4"
+  integrity sha512-0WLIezrIxitUGbjMIGwznVzSIp0uFJV0PZ2fiSvpyVcxe+QMXKUt7MRhUpzdbctnnLwiOTOFkACplgB0wAglFw==
   dependencies:
-    "@typescript-eslint/utils" "^6.0.0 || ^7.0.0 || ^8.0.0"
+    "@typescript-eslint/utils" "^8.0.0"
 
 eslint-plugin-jsx-a11y@^6.5.1:
   version "6.10.2"
@@ -6489,15 +6816,15 @@ eslint-plugin-jsx-a11y@^6.5.1:
     safe-regex-test "^1.0.3"
     string.prototype.includes "^2.0.1"
 
-eslint-plugin-matrix-org@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-matrix-org/-/eslint-plugin-matrix-org-2.1.0.tgz#9053726119f107154f5210665c2f84219425c190"
-  integrity sha512-YjVQ0qunzVV34tpUchLWhOrOalGfRLm0tclS4dPYnXS8Ui+p12o/YtRHt+26Mg5tJ0QH76HsGC0LJKLVLNoqfg==
+eslint-plugin-matrix-org@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-matrix-org/-/eslint-plugin-matrix-org-3.0.0.tgz#0e5eaa556b6780dcd616b1381baec252df78b56d"
+  integrity sha512-xOPMeyLxOgoB2SsPhJmIc+drorZmXozSBo3X9whk/62DvbVpJcnththOCGx8ljYScADLb+baNOeN+wKZqwkldw==
 
 eslint-plugin-react-compiler@^19.0.0-beta-df7b47d-20241124:
-  version "19.0.0-beta-e552027-20250112"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-compiler/-/eslint-plugin-react-compiler-19.0.0-beta-e552027-20250112.tgz#f4ad9cebe47615ebf6097a8084a30d761ee164f4"
-  integrity sha512-VjkIXHouCYyJHgk5HmZ1LH+fAK5CX+ULRX9iNYtwYJ+ljbivFhIT+JJyxNT/USQpCeS2Dt5ahjFeeMv0RRwTww==
+  version "19.0.0-beta-ebf51a3-20250411"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-compiler/-/eslint-plugin-react-compiler-19.0.0-beta-ebf51a3-20250411.tgz#39dccdffed99a331b0d4b7fb39bd0efcb29f0672"
+  integrity sha512-R7ncuwbCPFAoeMlS56DGGSJFxmRtlWafYH/iWyep5Ks0RaPqTCL4k5gA87axUBBcITsaIgUGkbqAxDxl8Xfm5A==
   dependencies:
     "@babel/core" "^7.24.4"
     "@babel/parser" "^7.24.4"
@@ -6506,15 +6833,21 @@ eslint-plugin-react-compiler@^19.0.0-beta-df7b47d-20241124:
     zod "^3.22.4"
     zod-validation-error "^3.0.3"
 
-eslint-plugin-react-hooks@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.2.0.tgz#1be0080901e6ac31ce7971beed3d3ec0a423d9e3"
-  integrity sha512-+f15FfK64YQwZdJNELETdn5ibXEUQmW1DZL6KXhNnc2heoy/sg9VJJeT7n8TlMWouzWqSWavFkIhHyIbIAEapg==
+eslint-plugin-react-hooks@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-7.0.1.tgz#66e258db58ece50723ef20cc159f8aa908219169"
+  integrity sha512-O0d0m04evaNzEPoSW+59Mezf8Qt0InfgGIBJnpC0h3NH/WjUAR7BIKUfysC6todmtiZ/A0oUVS8Gce0WhBrHsA==
+  dependencies:
+    "@babel/core" "^7.24.4"
+    "@babel/parser" "^7.24.4"
+    hermes-parser "^0.25.1"
+    zod "^3.25.0 || ^4.0.0"
+    zod-validation-error "^3.5.0 || ^4.0.0"
 
 eslint-plugin-react@^7.28.0:
-  version "7.37.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.4.tgz#1b6c80b6175b6ae4b26055ae4d55d04c414c7181"
-  integrity sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==
+  version "7.37.5"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz#2975511472bdda1b272b34d779335c9b0e877065"
+  integrity sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==
   dependencies:
     array-includes "^3.1.8"
     array.prototype.findlast "^1.2.5"
@@ -6526,7 +6859,7 @@ eslint-plugin-react@^7.28.0:
     hasown "^2.0.2"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
     minimatch "^3.1.2"
-    object.entries "^1.1.8"
+    object.entries "^1.1.9"
     object.fromentries "^2.0.8"
     object.values "^1.2.1"
     prop-types "^15.8.1"
@@ -6588,10 +6921,10 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint-visitor-keys@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45"
-  integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
+eslint-visitor-keys@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz#4cfea60fe7dd0ad8e816e1ed026c1d5251b512c1"
+  integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==
 
 eslint@8.57.1:
   version "8.57.1"
@@ -6637,14 +6970,14 @@ eslint@8.57.1:
     strip-ansi "^6.0.1"
     text-table "^0.2.0"
 
-espree@^10.3.0:
-  version "10.3.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-10.3.0.tgz#29267cf5b0cb98735b65e64ba07e0ed49d1eed8a"
-  integrity sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==
+espree@^10.4.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.4.0.tgz#d54f4949d4629005a1fa168d937c3ff1f7e2a837"
+  integrity sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==
   dependencies:
-    acorn "^8.14.0"
+    acorn "^8.15.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^4.2.0"
+    eslint-visitor-keys "^4.2.1"
 
 espree@^9.6.0, espree@^9.6.1:
   version "9.6.1"
@@ -6655,7 +6988,7 @@ espree@^9.6.0, espree@^9.6.1:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.4.1"
 
-esprima@^4.0.0, esprima@^4.0.1:
+esprima@^4.0.0, esprima@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -6684,6 +7017,18 @@ estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
+estree-walker@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
+
+estree-walker@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.3.tgz#67c3e549ec402a487b4fc193d1953a524752340d"
+  integrity sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==
+  dependencies:
+    "@types/estree" "^1.0.0"
+
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -6709,6 +7054,13 @@ eventemitter3@^5.0.1:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4"
   integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==
 
+events-universal@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/events-universal/-/events-universal-1.0.1.tgz#b56a84fd611b6610e0a2d0f09f80fdf931e2dfe6"
+  integrity sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==
+  dependencies:
+    bare-events "^2.7.0"
+
 events@^3.2.0, events@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
@@ -6721,7 +7073,7 @@ except@^0.1.3:
   dependencies:
     indexof "0.0.1"
 
-execa@^5.0.0:
+execa@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
@@ -6736,21 +7088,22 @@ execa@^5.0.0:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
-exit@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
+exit-x@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/exit-x/-/exit-x-0.2.2.tgz#1f9052de3b8d99a696b10dad5bced9bdd5c3aa64"
+  integrity sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==
 
-expect@^29.0.0, expect@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc"
-  integrity sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==
+expect@30.2.0, expect@^30.0.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-30.2.0.tgz#d4013bed267013c14bc1199cec8aa57cee9b5869"
+  integrity sha512-u/feCi0GPsI+988gU2FLcsHyAHTU0MX1Wg68NhAnN7z/+C5wqG+CY8J53N9ioe8RXgaoz0nBR/TYMf3AycUuPw==
   dependencies:
-    "@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"
+    "@jest/expect-utils" "30.2.0"
+    "@jest/get-type" "30.1.0"
+    jest-matcher-utils "30.2.0"
+    jest-message-util "30.2.0"
+    jest-mock "30.2.0"
+    jest-util "30.2.0"
 
 express@^4.21.2:
   version "4.21.2"
@@ -6790,17 +7143,18 @@ express@^4.21.2:
     vary "~1.1.2"
 
 express@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/express/-/express-5.1.0.tgz#d31beaf715a0016f0d53f47d3b4d7acf28c75cc9"
-  integrity sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-5.2.1.tgz#8f21d15b6d327f92b4794ecf8cb08a72f956ac04"
+  integrity sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==
   dependencies:
     accepts "^2.0.0"
-    body-parser "^2.2.0"
+    body-parser "^2.2.1"
     content-disposition "^1.0.0"
     content-type "^1.0.5"
     cookie "^0.7.1"
     cookie-signature "^1.2.1"
     debug "^4.4.0"
+    depd "^2.0.0"
     encodeurl "^2.0.0"
     escape-html "^1.0.3"
     etag "^1.8.1"
@@ -6822,15 +7176,15 @@ express@^5.0.0:
     type-is "^2.0.1"
     vary "^1.1.2"
 
-extend@^3.0.0, extend@^3.0.2:
+extend@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 fake-indexeddb@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/fake-indexeddb/-/fake-indexeddb-6.0.1.tgz#03937a9065c2ea09733e2147a473c904411b6f2c"
-  integrity sha512-He2AjQGHe46svIFq5+L2Nx/eHDTI1oKgoevBP+TthnjymXiKkeJQ3+ITeWey99Y5+2OaPFbI1qEsx/5RsGtWnQ==
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/fake-indexeddb/-/fake-indexeddb-6.2.5.tgz#74285b6821467d6c102af092f0a4517ad5521613"
+  integrity sha512-CGnyrvbhPlWYMngksqrSSUT1BAVP49dZocrHuK0SvtR0D5TMs5wP0o3j7jexDJW01KSadjBp1M/71o/KR3nD1w==
 
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
@@ -6842,7 +7196,7 @@ fast-fifo@^1.2.0, fast-fifo@^1.3.2:
   resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
   integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
 
-fast-glob@^3.2.9, fast-glob@^3.3.2, fast-glob@^3.3.3:
+fast-glob@^3.2.9, fast-glob@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818"
   integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==
@@ -6863,26 +7217,16 @@ fast-levenshtein@^2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
-fast-shallow-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fast-shallow-equal/-/fast-shallow-equal-1.0.0.tgz#d4dcaf6472440dcefa6f88b98e3251e27f25628b"
-  integrity sha512-HPtaa38cPgWvaCFmRNhlc6NG7pv6NUHqjPgVAkWGoB9mQMwYB27/K0CvOM5Czy+qpT3e8XJ6Q4aPAnzpNpzNaw==
-
 fast-uri@^3.0.1:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.6.tgz#88f130b77cfaea2378d56bf970dea21257a68748"
-  integrity sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.0.tgz#66eecff6c764c0df9b762e62ca7edcfb53b4edfa"
+  integrity sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==
 
 fastest-levenshtein@1.0.16, fastest-levenshtein@^1.0.12, fastest-levenshtein@^1.0.16:
   version "1.0.16"
   resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
   integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
 
-fastest-stable-stringify@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/fastest-stable-stringify/-/fastest-stable-stringify-2.0.2.tgz#3757a6774f6ec8de40c4e86ec28ea02417214c76"
-  integrity sha512-bijHueCGd0LqqNK9b5oCMHc0MluJAx0cwqASgbWMvkO01lCYgIhacVRLcaDz3QnyYIRNJRDwMb41VuT6pHJ91Q==
-
 fastq@^1.6.0:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.19.1.tgz#d50eaba803c8846a883c16492821ebcd2cda55f5"
@@ -6897,29 +7241,24 @@ faye-websocket@^0.11.3:
   dependencies:
     websocket-driver ">=0.5.1"
 
-fb-watchman@^2.0.0:
+fb-watchman@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
   integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
   dependencies:
     bser "2.1.1"
 
-fd-package-json@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fd-package-json/-/fd-package-json-1.2.0.tgz#4f218bb8ff65c21011d1f4f17cb3d0c9e72f8da7"
-  integrity sha512-45LSPmWf+gC5tdCQMNH4s9Sr00bIkiD9aN7dc5hqkrEw1geRYyDQS1v1oMHAW3ysfxfndqGsrDREHHjNNbKUfA==
+fd-package-json@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fd-package-json/-/fd-package-json-2.0.0.tgz#03f53ce5a0af552c2f4faf703a24e526310a2411"
+  integrity sha512-jKmm9YtsNXN789RS/0mSzOC1NUq9mkVd65vbSSVsKdjGvYXBuE4oWe2QOEoFeRmJg+lPuZxpmrfFclNhoRMneQ==
   dependencies:
-    walk-up-path "^3.0.1"
+    walk-up-path "^4.0.0"
 
-fdir@^6.4.0:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.2.tgz#ddaa7ce1831b161bc3657bb99cb36e1622702689"
-  integrity sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==
-
-fdir@^6.4.3:
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.3.tgz#011cdacf837eca9b811c89dbb902df714273db72"
-  integrity sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==
+fdir@^6.4.4, fdir@^6.5.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350"
+  integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==
 
 fetch-mock-jest@^1.5.1:
   version "1.5.1"
@@ -6949,12 +7288,12 @@ fflate@^0.4.8:
   resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.4.8.tgz#f90b82aefbd8ac174213abb338bd7ef848f0f5ae"
   integrity sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==
 
-file-entry-cache@^10.0.8:
-  version "10.0.8"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-10.0.8.tgz#2b7a32c40615c4a6b59c385fb059a2762faf9624"
-  integrity sha512-FGXHpfmI4XyzbLd3HQ8cbUcsFGohJpZtmQRHr8z8FxxtCe2PcpgIlVLwIgunqjvRmXypBETvwhV4ptJizA+Y1Q==
+file-entry-cache@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-11.1.1.tgz#728918c624dbeb09372276837ea0c413ec78806b"
+  integrity sha512-TPVFSDE7q91Dlk1xpFLvFllf8r0HyOMOlnWy7Z2HBku5H3KhIeOGInexrIeg2D64DosVB/JXkrrk6N/7Wriq4A==
   dependencies:
-    flat-cache "^6.1.8"
+    flat-cache "^6.1.19"
 
 file-entry-cache@^6.0.1:
   version "6.0.1"
@@ -6988,10 +7327,10 @@ filelist@^1.0.4:
   dependencies:
     minimatch "^5.0.1"
 
-filesize@10.1.6:
-  version "10.1.6"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-10.1.6.tgz#31194da825ac58689c0bce3948f33ce83aabd361"
-  integrity sha512-sJslQKU2uM33qH5nqewAwVB2QgR6w1aMNsYUp3aN5rMRyXEwJGmZvaWzeJFNTOXWlHQyBFCWrdj3fV/fsTOX8w==
+filesize@11.0.13:
+  version "11.0.13"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-11.0.13.tgz#8e61c5c4e8d7463c71d573c4f8051fb1ba4ff883"
+  integrity sha512-mYJ/qXKvREuO0uH8LTQJ6v7GsUvVOguqxg2VTwQUkyTPXXRRWPdjuUPVqdBrJQhvci48OHlNGRnux+Slr2Rnvw==
 
 fill-range@^7.1.1:
   version "7.1.1"
@@ -7014,9 +7353,9 @@ finalhandler@1.3.1:
     unpipe "~1.0.0"
 
 finalhandler@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-2.1.0.tgz#72306373aa89d05a8242ed569ed86a1bff7c561f"
-  integrity sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-2.1.1.tgz#a2c517a6559852bcdb06d1f8bd7f51b68fad8099"
+  integrity sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==
   dependencies:
     debug "^4.4.0"
     encodeurl "^2.0.0"
@@ -7057,14 +7396,14 @@ flat-cache@^3.0.4:
     keyv "^4.5.3"
     rimraf "^3.0.2"
 
-flat-cache@^6.1.8:
-  version "6.1.8"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-6.1.8.tgz#968fb89b19df488fe60f346857ffc54b8dd0ba14"
-  integrity sha512-R6MaD3nrJAtO7C3QOuS79ficm2pEAy++TgEUD8ii1LVlbcgZ9DtASLkt9B+RZSFCzm7QHDMlXPsqqB6W2Pfr1Q==
+flat-cache@^6.1.19:
+  version "6.1.19"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-6.1.19.tgz#20e5b201c9b181a7b773b3b150108932077d2bbf"
+  integrity sha512-l/K33newPTZMTGAnnzaiqSl6NnH7Namh8jBNjrgjprWxGmZUuxx/sJNIRaijOh3n7q7ESbhNZC+pvVZMFdeU4A==
   dependencies:
-    cacheable "^1.8.9"
+    cacheable "^2.2.0"
     flatted "^3.3.3"
-    hookified "^1.8.1"
+    hookified "^1.13.0"
 
 flat@^5.0.2:
   version "5.0.2"
@@ -7088,15 +7427,20 @@ focus-lock@^1.3.6:
   dependencies:
     tslib "^2.0.3"
 
-follow-redirects@^1.0.0, follow-redirects@^1.15.6:
+follow-redirects@^1.0.0:
   version "1.15.9"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
   integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
 
-for-each@^0.3.3:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.4.tgz#814517ffc303d1399b2564d8165318e735d0341c"
-  integrity sha512-kKaIINnFpzW6ffJNDjjyjrk21BkDx38c0xa/klsT8VzLCaMEefv4ZTacrcVR4DmgTeBra++jMDAfS/tS799YDw==
+follow-redirects@^1.15.6:
+  version "1.15.11"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
+  integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
+
+for-each@^0.3.3, for-each@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.5.tgz#d650688027826920feeb0af747ee7b9421a41d47"
+  integrity sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==
   dependencies:
     is-callable "^1.2.7"
 
@@ -7105,7 +7449,7 @@ foreachasync@^3.0.0:
   resolved "https://registry.yarnpkg.com/foreachasync/-/foreachasync-3.0.0.tgz#5502987dc8714be3392097f32e0071c9dee07cf6"
   integrity sha512-J+ler7Ta54FwwNcx6wQRDhTIbNeyDcARMkOcguEqnEdtm0jKvN3Li3PDAb2Du3ubJYEWfYL83XMROXdsXAXycw==
 
-foreground-child@^3.1.0:
+foreground-child@^3.1.0, foreground-child@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
   integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==
@@ -7113,22 +7457,23 @@ foreground-child@^3.1.0:
     cross-spawn "^7.0.6"
     signal-exit "^4.0.1"
 
-form-data@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.2.tgz#35cabbdd30c3ce73deb2c42d3c8d3ed9ca51794c"
-  integrity sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==
+form-data@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
+  integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
     es-set-tostringtag "^2.1.0"
+    hasown "^2.0.2"
     mime-types "^2.1.12"
 
-formatly@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/formatly/-/formatly-0.2.3.tgz#30c4d3605c4f66d97a97a7dafbd9bb4a2467b26f"
-  integrity sha512-WH01vbXEjh9L3bqn5V620xUAWs32CmK4IzWRRY6ep5zpa/mrisL4d9+pRVuETORVDTQw8OycSO1WC68PL51RaA==
+formatly@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/formatly/-/formatly-0.3.0.tgz#5bb3b4e692f5a8c74ad8fe26154dd0a74aac6819"
+  integrity sha512-9XNj/o4wrRFyhSMJOvsuyMwy8aUfBaZ1VrqHVfohyXf0Sw0e+yfKG+xZaY3arGCOMdwFsqObtzVOc1gU9KiT9w==
   dependencies:
-    fd-package-json "^1.2.0"
+    fd-package-json "^2.0.0"
 
 forwarded@0.2.0:
   version "0.2.0"
@@ -7155,12 +7500,11 @@ fs-constants@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
-fs-extra@^9.0.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
-  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
+fs-extra@^10.0.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
   dependencies:
-    at-least-node "^1.0.0"
     graceful-fs "^4.2.0"
     jsonfile "^6.0.1"
     universalify "^2.0.0"
@@ -7180,7 +7524,7 @@ fsevents@2.3.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
-fsevents@^2.3.2, fsevents@~2.3.2:
+fsevents@^2.3.3, fsevents@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
@@ -7190,6 +7534,11 @@ function-bind@^1.1.2:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
+function-timeout@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/function-timeout/-/function-timeout-0.1.1.tgz#6bf71d3d24c894d43b2bec312cabb8c5add2e9da"
+  integrity sha512-0NVVC0TaP7dSTvn1yMiy6d6Q8gifzbvQafO46RtLG/kHJUBNd+pVRGOBoK44wNBvtSPUJRfdVvkFdD3p0xvyZg==
+
 function.prototype.name@^1.1.6, function.prototype.name@^1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz#e68e1df7b259a5c949eeef95cdbde53edffabb78"
@@ -7207,6 +7556,11 @@ functions-have-names@^1.2.3:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
+generator-function@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/generator-function/-/generator-function-2.0.1.tgz#0e75dd410d1243687a0ba2e951b94eedb8f737a2"
+  integrity sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==
+
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -7222,28 +7576,12 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-east-asian-width@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz#21b4071ee58ed04ee0db653371b55b4299875389"
-  integrity sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==
+get-east-asian-width@^1.3.0, get-east-asian-width@^1.3.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz#9bc4caa131702b4b61729cb7e42735bc550c9ee6"
+  integrity sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==
 
-get-intrinsic@^1.2.4, get-intrinsic@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.7.tgz#dcfcb33d3272e15f445d15124bc0a216189b9044"
-  integrity sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==
-  dependencies:
-    call-bind-apply-helpers "^1.0.1"
-    es-define-property "^1.0.1"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.0.0"
-    function-bind "^1.1.2"
-    get-proto "^1.0.0"
-    gopd "^1.2.0"
-    has-symbols "^1.1.0"
-    hasown "^2.0.2"
-    math-intrinsics "^1.1.0"
-
-get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.3.0:
+get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.2.7, get-intrinsic@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
   integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
@@ -7301,10 +7639,10 @@ github-markdown-css@^5.5.1:
   resolved "https://registry.yarnpkg.com/github-markdown-css/-/github-markdown-css-5.8.1.tgz#2a53cf17f0c9bde5ff9e83710a3310a02f5278a7"
   integrity sha512-8G+PFvqigBQSWLQjyzgpa2ThD9bo7+kDsriUIidGcRhXgmcaAWUIpCZf8DavJgc+xifjbCG+GvMyWr0XMXmc7g==
 
-gl-matrix@^3.4.3:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.4.3.tgz#fc1191e8320009fd4d20e9339595c6041ddc22c9"
-  integrity sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==
+gl-matrix@^3.4.4:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.4.4.tgz#7789ee4982f62c7a7af447ee488f3bd6b0c77003"
+  integrity sha512-latSnyDNt/8zYUB6VIJ6PCh2jBjJX6gnDsoCZ7LyW7GkqrD51EWwa9qCoGixj8YqBtETQK/xY7OmpTF8xz1DdQ==
 
 glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
@@ -7325,7 +7663,19 @@ glob-to-regexp@^0.4.0, glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^10.0.0:
+glob@^10.0.0, glob@^10.5.0:
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.5.0.tgz#8ec0355919cd3338c28428a23d4f24ecc5fe738c"
+  integrity sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
+    path-scurry "^1.11.1"
+
+glob@^10.3.10:
   version "10.4.5"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
   integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
@@ -7337,18 +7687,27 @@ glob@^10.0.0:
     package-json-from-dist "^1.0.0"
     path-scurry "^1.11.1"
 
-glob@^11.0.0:
-  version "11.0.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.2.tgz#3261e3897bbc603030b041fd77ba636022d51ce0"
-  integrity sha512-YT7U7Vye+t5fZ/QMkBFrTJ7ZQxInIUjwyAjVj84CYXqgBdv30MFUPGnBR6sQaVq6Is15wYJUsnzTuWaGRBhBAQ==
+glob@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-11.1.0.tgz#4f826576e4eb99c7dad383793d2f9f08f67e50a6"
+  integrity sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==
   dependencies:
-    foreground-child "^3.1.0"
-    jackspeak "^4.0.1"
-    minimatch "^10.0.0"
+    foreground-child "^3.3.1"
+    jackspeak "^4.1.1"
+    minimatch "^10.1.1"
     minipass "^7.1.2"
     package-json-from-dist "^1.0.0"
     path-scurry "^2.0.0"
 
+glob@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-13.0.0.tgz#9d9233a4a274fc28ef7adce5508b7ef6237a1be3"
+  integrity sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==
+  dependencies:
+    minimatch "^10.1.1"
+    minipass "^7.1.2"
+    path-scurry "^2.0.0"
+
 glob@^7.1.3, glob@^7.1.4:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -7361,16 +7720,6 @@ glob@^7.1.3, glob@^7.1.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^9.3.2:
-  version "9.3.5"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-9.3.5.tgz#ca2ed8ca452781a3009685607fdf025a899dfe21"
-  integrity sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    minimatch "^8.0.2"
-    minipass "^4.2.4"
-    path-scurry "^1.6.1"
-
 global-modules@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
@@ -7387,20 +7736,6 @@ global-prefix@^3.0.0:
     kind-of "^6.0.2"
     which "^1.3.1"
 
-global-prefix@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-4.0.0.tgz#e9cc79aab9be1d03287e156a3f912dd0895463ed"
-  integrity sha512-w0Uf9Y9/nyHinEk5vMJKRie+wa4kR5hmDbEhGGds/kG1PwGLLHKRoNMeJOyCQjjBkANlnScqgzcFwGHgmgLkVA==
-  dependencies:
-    ini "^4.1.3"
-    kind-of "^6.0.3"
-    which "^4.0.0"
-
-globals@^11.1.0:
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
-  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-
 globals@^13.19.0:
   version "13.24.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
@@ -7443,7 +7778,7 @@ gopd@^1.0.1, gopd@^1.2.0:
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
   integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -7453,28 +7788,21 @@ graphemer@^1.4.0:
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
   integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
-gzip-size@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
-  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
-  dependencies:
-    duplexer "^0.1.2"
-
 handle-thing@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
+harmony-reflect@^1.4.6:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710"
+  integrity sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g==
+
 has-bigints@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.1.0.tgz#28607e965ac967e03cd2a2c70a2636a1edad49fe"
   integrity sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==
 
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
-
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
@@ -7506,6 +7834,13 @@ has-tostringtag@^1.0.0, has-tostringtag@^1.0.2:
   dependencies:
     has-symbols "^1.0.3"
 
+hashery@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/hashery/-/hashery-1.3.0.tgz#2af169f1698efc92bf9235c4880eec92cc5b5107"
+  integrity sha512-fWltioiy5zsSAs9ouEnvhsVJeAXRybGCNNv0lvzpzNOSDbULXRy7ivFWwCCv4I5Am6kSo75hmbsCduOoc2/K4w==
+  dependencies:
+    hookified "^1.13.0"
+
 hasown@^2.0.0, hasown@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
@@ -7542,10 +7877,10 @@ hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   dependencies:
     react-is "^16.7.0"
 
-hookified@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/hookified/-/hookified-1.8.2.tgz#b365a89dfce3da43e790673a6a97d3b896ae5fa7"
-  integrity sha512-5nZbBNP44sFCDjSoB//0N7m508APCgbQ4mGGo1KJGBYyCKNHfry1Pvd0JVHZIxjdnqn8nFRBAN/eFB6Rk/4w5w==
+hookified@^1.13.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/hookified/-/hookified-1.14.0.tgz#815ca3b9f3e77c782f583bf3974e966df7a9fd7b"
+  integrity sha512-pi1ynXIMFx/uIIwpWJ/5CEtOHLGtnUB0WhGeeYT+fKcQ+WCQbm3/rrkAXnpfph++PgepNqPdTC2WTj8A6k6zoQ==
 
 hosted-git-info@^2.1.4:
   version "2.8.9"
@@ -7562,20 +7897,20 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
-html-dom-parser@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/html-dom-parser/-/html-dom-parser-5.1.1.tgz#9efb2cfa055f6a71de1bb2f07c5b019db5004f9e"
-  integrity sha512-+o4Y4Z0CLuyemeccvGN4bAO20aauB2N9tFEAep5x4OW34kV4PTarBHm6RL02afYt2BMKcr0D2Agep8S3nJPIBg==
+html-dom-parser@5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/html-dom-parser/-/html-dom-parser-5.1.2.tgz#0fceac1b8e7d917de6e883991b7d71f0b3fd63b9"
+  integrity sha512-9nD3Rj3/FuQt83AgIa1Y3ruzspwFFA54AJbQnohXN+K6fL1/bhcDQJJY5Ne4L4A163ADQFVESd/0TLyNoV0mfg==
   dependencies:
     domhandler "5.0.3"
     htmlparser2 "10.0.0"
 
-html-encoding-sniffer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"
-  integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==
+html-encoding-sniffer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz#696df529a7cfd82446369dc5193e590a3735b448"
+  integrity sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==
   dependencies:
-    whatwg-encoding "^2.0.0"
+    whatwg-encoding "^3.1.1"
 
 html-entities@^2.0.0:
   version "2.6.0"
@@ -7601,14 +7936,14 @@ html-minifier-terser@^6.0.2:
     terser "^5.10.0"
 
 html-react-parser@^5.2.2:
-  version "5.2.5"
-  resolved "https://registry.yarnpkg.com/html-react-parser/-/html-react-parser-5.2.5.tgz#4a0d62c129d5d5c63cc49f986c946552d737190c"
-  integrity sha512-bRPdv8KTqG9CEQPMNGksDqmbiRfVQeOidry8pVetdh/1jQ1Edx4KX5m0lWvDD89Pt4CqTYjK1BLz6NoNVxN/Uw==
+  version "5.2.10"
+  resolved "https://registry.yarnpkg.com/html-react-parser/-/html-react-parser-5.2.10.tgz#e149447000b044e2828547fa13b9926761420896"
+  integrity sha512-DjOLloguuDA+Ed7Q7PKhvMQmCl2+Yk/pfvvca68fvn15QFBbL4uHGxXwoXQ4sqS0UyuRH2lJb0S8yZCL3lvehQ==
   dependencies:
     domhandler "5.0.3"
-    html-dom-parser "5.1.1"
+    html-dom-parser "5.1.2"
     react-property "2.0.2"
-    style-to-js "1.1.16"
+    style-to-js "1.1.21"
 
 html-tags@^3.3.1:
   version "3.3.1"
@@ -7616,9 +7951,9 @@ html-tags@^3.3.1:
   integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==
 
 html-webpack-plugin@^5.5.3:
-  version "5.6.3"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.6.3.tgz#a31145f0fee4184d53a794f9513147df1e653685"
-  integrity sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg==
+  version "5.6.5"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.6.5.tgz#d57defb83cabbf29bf56b2d4bf10b67b650066be"
+  integrity sha512-4xynFbKNNk+WlzXeQQ+6YYsH2g7mpfPszQZUi3ovKlj+pDmngQ7vRXjrrmGROabmKwyQkcgcX5hqfOwHbFmK5g==
   dependencies:
     "@types/html-minifier-terser" "^6.0.0"
     html-minifier-terser "^6.0.2"
@@ -7661,7 +7996,7 @@ http-deceiver@^1.2.7:
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
   integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==
 
-http-errors@2.0.0, http-errors@^2.0.0:
+http-errors@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
   integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
@@ -7672,6 +8007,17 @@ http-errors@2.0.0, http-errors@^2.0.0:
     statuses "2.0.1"
     toidentifier "1.0.1"
 
+http-errors@^2.0.0, http-errors@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.1.tgz#36d2f65bc909c8790018dd36fb4d93da6caae06b"
+  integrity sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==
+  dependencies:
+    depd "~2.0.0"
+    inherits "~2.0.4"
+    setprototypeof "~1.2.0"
+    statuses "~2.0.2"
+    toidentifier "~1.0.1"
+
 http-errors@~1.6.2:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
@@ -7683,20 +8029,19 @@ http-errors@~1.6.2:
     statuses ">= 1.4.0 < 2"
 
 http-parser-js@>=0.5.1:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.9.tgz#b817b3ca0edea6236225000d795378707c169cec"
-  integrity sha512-n1XsPy3rXVxlqxVioEWdC+0+M+SQw0DpJynwtOPo1X+ZlvdzTLtDBIJJlDQTnwZIFJrZSzSGmIOUdP8tu+SgLw==
+  version "0.5.10"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.10.tgz#b3277bd6d7ed5588e20ea73bf724fcbe44609075"
+  integrity sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==
 
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+http-proxy-agent@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
   dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
+    agent-base "^7.1.0"
+    debug "^4.3.4"
 
-http-proxy-middleware@^2.0.7:
+http-proxy-middleware@^2.0.9:
   version "2.0.9"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz#e9e63d68afaa4eee3d147f39149ab84c0c2815ef"
   integrity sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==
@@ -7716,7 +8061,7 @@ http-proxy@^1.18.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
+https-proxy-agent@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
   integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
@@ -7724,6 +8069,14 @@ https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
     agent-base "6"
     debug "4"
 
+https-proxy-agent@^7.0.6:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9"
+  integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==
+  dependencies:
+    agent-base "^7.1.2"
+    debug "4"
+
 human-signals@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
@@ -7739,11 +8092,6 @@ hyperdyperid@^1.2.0:
   resolved "https://registry.yarnpkg.com/hyperdyperid/-/hyperdyperid-1.2.0.tgz#59668d323ada92228d2a869d3e474d5a33b69e6b"
   integrity sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==
 
-hyphenate-style-name@^1.0.3:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz#1797bf50369588b47b72ca6d5e65374607cf4436"
-  integrity sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==
-
 iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -7758,12 +8106,26 @@ iconv-lite@0.6.3, iconv-lite@^0.6.3:
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
+iconv-lite@^0.7.0, iconv-lite@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.7.0.tgz#c50cd80e6746ca8115eb98743afa81aa0e147a3e"
+  integrity sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 icss-utils@^5.0.0, icss-utils@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
-ieee754@^1.1.12, ieee754@^1.1.13, ieee754@^1.2.1:
+identity-obj-proxy@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz#94d2bda96084453ef36fbc5aaec37e0f79f1fc14"
+  integrity sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA==
+  dependencies:
+    harmony-reflect "^1.4.6"
+
+ieee754@^1.1.13, ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
@@ -7773,10 +8135,10 @@ ignore@^5.2.0:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
   integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
-ignore@^7.0.0, ignore@^7.0.3:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-7.0.4.tgz#a12c70d0f2607c5bf508fb65a40c75f037d7a078"
-  integrity sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A==
+ignore@^7.0.0, ignore@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-7.0.5.tgz#4cb5f6cd7d4c7ab0365738c7aea888baa6d7efd9"
+  integrity sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==
 
 immediate@~3.0.5:
   version "3.0.6"
@@ -7799,7 +8161,7 @@ import-fresh@^3.3.0:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-local@^3.0.2:
+import-local@^3.0.2, import-local@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.2.0.tgz#c3d5c745798c02a6f8b897726aba5100186ee260"
   integrity sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==
@@ -7830,7 +8192,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -7845,22 +8207,10 @@ ini@^1.3.5:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-ini@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.3.tgz#4c359675a6071a46985eb39b14e4a2c0ec98a795"
-  integrity sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==
-
-inline-style-parser@0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.2.4.tgz#f4af5fe72e612839fcd453d989a586566d695f22"
-  integrity sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==
-
-inline-style-prefixer@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-7.0.1.tgz#9310f3cfa2c6f3901d1480f373981c02691781e8"
-  integrity sha512-lhYo5qNTQp3EvSSp3sRvXMbVQTLrvGV6DycRMJ5dm2BLMiJ30wpXKdDdgX+GmJZ5uQMucwRKHamXSst3Sj/Giw==
-  dependencies:
-    css-in-js-utils "^3.1.0"
+inline-style-parser@0.2.7:
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.2.7.tgz#b1fc68bfc0313b8685745e4464e37f9376b9c909"
+  integrity sha512-Nb2ctOyNR8DqQoR0OwRG95uNWIC0C1lCgf5Naz5H6Ji72KZ8OcFZLz2P5sNgwlyoJ8Yif11oMuYs5pBQa86csA==
 
 internal-slot@^1.1.0:
   version "1.1.0"
@@ -7876,22 +8226,10 @@ interpret@^3.1.1:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
   integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
 
-intersection-observer@^0.12.2:
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.12.2.tgz#4a45349cc0cd91916682b1f44c28d7ec737dc375"
-  integrity sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg==
-
-invariant@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
-  dependencies:
-    loose-envify "^1.0.0"
-
-ip-regex@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5"
-  integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==
+ip-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-5.0.0.tgz#cd313b2ae9c80c07bd3851e12bf4fa4dc5480632"
+  integrity sha512-fOCG6lhoKKakwv+C6KdsOnGvgXnmgfmp0myi3bcNwj3qfwPAxRKWEuFhvEFF7ceYIz6+1jRZ+yguLFAmUNPEfw==
 
 ipaddr.js@1.9.1:
   version "1.9.1"
@@ -7951,11 +8289,11 @@ is-binary-path@~2.1.0:
     binary-extensions "^2.0.0"
 
 is-boolean-object@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.1.tgz#c20d0c654be05da4fbc23c562635c019e93daf89"
-  integrity sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng==
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.2.tgz#7067f47709809a393c71ff5bb3e135d8a9215d9e"
+  integrity sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==
   dependencies:
-    call-bound "^1.0.2"
+    call-bound "^1.0.3"
     has-tostringtag "^1.0.2"
 
 is-buffer@^2.0.5:
@@ -7975,20 +8313,13 @@ is-callable@^1.2.7:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-core-module@^2.13.0, is-core-module@^2.16.0:
+is-core-module@^2.13.0, is-core-module@^2.16.0, is-core-module@^2.16.1:
   version "2.16.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
   integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
   dependencies:
     hasown "^2.0.2"
 
-is-core-module@^2.15.1:
-  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37"
-  integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==
-  dependencies:
-    hasown "^2.0.2"
-
 is-data-view@^1.0.1, is-data-view@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.2.tgz#bae0a41b9688986c2188dda6657e56b8f9e63b8e"
@@ -8033,30 +8364,26 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-fullwidth-code-point@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88"
-  integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==
-
 is-fullwidth-code-point@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz#9609efced7c2f97da7b60145ef481c787c7ba704"
-  integrity sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz#046b2a6d4f6b156b2233d3207d4b5a9783999b98"
+  integrity sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==
   dependencies:
-    get-east-asian-width "^1.0.0"
+    get-east-asian-width "^1.3.1"
 
-is-generator-fn@^2.0.0:
+is-generator-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
 is-generator-function@^1.0.10:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.0.tgz#bf3eeda931201394f57b5dba2800f91a238309ca"
-  integrity sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.2.tgz#ae3b61e3d5ea4e4839b90bad22b02335051a17d5"
+  integrity sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==
   dependencies:
-    call-bound "^1.0.3"
-    get-proto "^1.0.0"
+    call-bound "^1.0.4"
+    generator-function "^2.0.0"
+    get-proto "^1.0.1"
     has-tostringtag "^1.0.2"
     safe-regex-test "^1.1.0"
 
@@ -8081,23 +8408,34 @@ is-inside-container@^1.0.0:
   dependencies:
     is-docker "^3.0.0"
 
-is-ip@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-ip/-/is-ip-3.1.0.tgz#2ae5ddfafaf05cb8008a62093cf29734f657c5d8"
-  integrity sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==
+is-ip@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/is-ip/-/is-ip-5.0.1.tgz#bec44442c823e591aa6f4d6fb9081d6a9be17e44"
+  integrity sha512-FCsGHdlrOnZQcp0+XT5a+pYowf33itBalCl+7ovNXC/7o5BhIpG14M3OrpPPdBSIQJCm+0M5+9mO7S9VVTTCFw==
   dependencies:
-    ip-regex "^4.0.0"
+    ip-regex "^5.0.0"
+    super-regex "^0.2.0"
 
 is-map@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
   integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==
 
+is-negative-zero@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
+  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
+
 is-network-error@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-network-error/-/is-network-error-1.1.0.tgz#d26a760e3770226d11c169052f266a4803d9c997"
   integrity sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g==
 
+is-network-error@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/is-network-error/-/is-network-error-1.3.0.tgz#2ce62cbca444abd506f8a900f39d20b898d37512"
+  integrity sha512-6oIwpsgRfnDiyEDLMay/GqCl3HoAtH5+RUKW29gYkL0QA+ipzpDLA16yQs7/RHCSu+BwgbJaOUqa4A99qNVQVw==
+
 is-number-object@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.1.tgz#144b21e95a1bc148205dcc2814a9134ec41b2541"
@@ -8153,6 +8491,11 @@ is-regex@^1.2.1:
     has-tostringtag "^1.0.2"
     hasown "^2.0.2"
 
+is-regexp@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-3.1.0.tgz#0235eab9cda5b83f96ac4a263d8c32c9d5ad7422"
+  integrity sha512-rbku49cWloU5bSMI+zaRaXdQHXnthP6DZ/vLnfdSKyL4zUzuWnomtOEiZZOd+ioQ+avFo/qau3KPTc7Fjy1uPA==
+
 is-set@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d"
@@ -8170,7 +8513,7 @@ is-stream@^2.0.0, is-stream@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
-is-string@^1.0.7, is-string@^1.1.1:
+is-string@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.1.1.tgz#92ea3f3d5c5b6e039ca8677e5ac8d07ea773cbb9"
   integrity sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==
@@ -8211,7 +8554,7 @@ is-weakmap@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd"
   integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==
 
-is-weakref@^1.0.2, is-weakref@^1.1.0:
+is-weakref@^1.0.2, is-weakref@^1.1.0, is-weakref@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.1.1.tgz#eea430182be8d64174bd96bffbc46f21bf3f9293"
   integrity sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==
@@ -8255,11 +8598,6 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-isexe@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d"
-  integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==
-
 isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
@@ -8270,18 +8608,7 @@ istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
   integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
 
-istanbul-lib-instrument@^5.0.4:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
-  integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
-  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"
-
-istanbul-lib-instrument@^6.0.0:
+istanbul-lib-instrument@^6.0.0, istanbul-lib-instrument@^6.0.2:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz#fa15401df6c15874bcb2105f773325d78c666765"
   integrity sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==
@@ -8301,14 +8628,14 @@ istanbul-lib-report@^3.0.0:
     make-dir "^4.0.0"
     supports-color "^7.1.0"
 
-istanbul-lib-source-maps@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
-  integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
+istanbul-lib-source-maps@^5.0.0:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz#acaef948df7747c8eb5fbf1265cb980f6353a441"
+  integrity sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.23"
     debug "^4.1.1"
     istanbul-lib-coverage "^3.0.0"
-    source-map "^0.6.1"
 
 istanbul-reports@^3.1.3:
   version "3.1.7"
@@ -8339,10 +8666,10 @@ jackspeak@^3.1.2:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
-jackspeak@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-4.1.0.tgz#c489c079f2b636dc4cbe9b0312a13ff1282e561b"
-  integrity sha512-9DDdhb5j6cpeitCbvLO7n7J4IxnbM6hoF6O1g4HQ5TfhvvKN8ywDM7668ZhMHRqVmxqhps/F6syWK2KcPxYlkw==
+jackspeak@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-4.1.1.tgz#96876030f450502047fc7e8c7fcf8ce8124e43ae"
+  integrity sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==
   dependencies:
     "@isaacs/cliui" "^8.0.2"
 
@@ -8364,207 +8691,200 @@ jest-canvas-mock@^2.5.2:
     cssfontparser "^1.2.1"
     moo-color "^1.0.2"
 
-jest-changed-files@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.7.0.tgz#1c06d07e77c78e1585d020424dedc10d6e17ac3a"
-  integrity sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==
+jest-changed-files@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-30.2.0.tgz#602266e478ed554e1e1469944faa7efd37cee61c"
+  integrity sha512-L8lR1ChrRnSdfeOvTrwZMlnWV8G/LLjQ0nG9MBclwWZidA2N5FviRki0Bvh20WRMOX31/JYvzdqTJrk5oBdydQ==
   dependencies:
-    execa "^5.0.0"
-    jest-util "^29.7.0"
+    execa "^5.1.1"
+    jest-util "30.2.0"
     p-limit "^3.1.0"
 
-jest-circus@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.7.0.tgz#b6817a45fcc835d8b16d5962d0c026473ee3668a"
-  integrity sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==
+jest-circus@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-30.2.0.tgz#98b8198b958748a2f322354311023d1d02e7603f"
+  integrity sha512-Fh0096NC3ZkFx05EP2OXCxJAREVxj1BcW/i6EWqqymcgYKWjyyDpral3fMxVcHXg6oZM7iULer9wGRFvfpl+Tg==
   dependencies:
-    "@jest/environment" "^29.7.0"
-    "@jest/expect" "^29.7.0"
-    "@jest/test-result" "^29.7.0"
-    "@jest/types" "^29.6.3"
+    "@jest/environment" "30.2.0"
+    "@jest/expect" "30.2.0"
+    "@jest/test-result" "30.2.0"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
-    chalk "^4.0.0"
+    chalk "^4.1.2"
     co "^4.6.0"
-    dedent "^1.0.0"
-    is-generator-fn "^2.0.0"
-    jest-each "^29.7.0"
-    jest-matcher-utils "^29.7.0"
-    jest-message-util "^29.7.0"
-    jest-runtime "^29.7.0"
-    jest-snapshot "^29.7.0"
-    jest-util "^29.7.0"
+    dedent "^1.6.0"
+    is-generator-fn "^2.1.0"
+    jest-each "30.2.0"
+    jest-matcher-utils "30.2.0"
+    jest-message-util "30.2.0"
+    jest-runtime "30.2.0"
+    jest-snapshot "30.2.0"
+    jest-util "30.2.0"
     p-limit "^3.1.0"
-    pretty-format "^29.7.0"
-    pure-rand "^6.0.0"
+    pretty-format "30.2.0"
+    pure-rand "^7.0.0"
     slash "^3.0.0"
-    stack-utils "^2.0.3"
+    stack-utils "^2.0.6"
 
-jest-cli@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.7.0.tgz#5592c940798e0cae677eec169264f2d839a37995"
-  integrity sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==
+jest-cli@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-30.2.0.tgz#1780f8e9d66bf84a10b369aea60aeda7697dcc67"
+  integrity sha512-Os9ukIvADX/A9sLt6Zse3+nmHtHaE6hqOsjQtNiugFTbKRHYIYtZXNGNK9NChseXy7djFPjndX1tL0sCTlfpAA==
   dependencies:
-    "@jest/core" "^29.7.0"
-    "@jest/test-result" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    chalk "^4.0.0"
-    create-jest "^29.7.0"
-    exit "^0.1.2"
-    import-local "^3.0.2"
-    jest-config "^29.7.0"
-    jest-util "^29.7.0"
-    jest-validate "^29.7.0"
-    yargs "^17.3.1"
+    "@jest/core" "30.2.0"
+    "@jest/test-result" "30.2.0"
+    "@jest/types" "30.2.0"
+    chalk "^4.1.2"
+    exit-x "^0.2.2"
+    import-local "^3.2.0"
+    jest-config "30.2.0"
+    jest-util "30.2.0"
+    jest-validate "30.2.0"
+    yargs "^17.7.2"
 
-jest-config@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.7.0.tgz#bcbda8806dbcc01b1e316a46bb74085a84b0245f"
-  integrity sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==
+jest-config@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-30.2.0.tgz#29df8c50e2ad801cc59c406b50176c18c362a90b"
+  integrity sha512-g4WkyzFQVWHtu6uqGmQR4CQxz/CH3yDSlhzXMWzNjDx843gYjReZnMRanjRCq5XZFuQrGDxgUaiYWE8BRfVckA==
   dependencies:
-    "@babel/core" "^7.11.6"
-    "@jest/test-sequencer" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    babel-jest "^29.7.0"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    deepmerge "^4.2.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    jest-circus "^29.7.0"
-    jest-environment-node "^29.7.0"
-    jest-get-type "^29.6.3"
-    jest-regex-util "^29.6.3"
-    jest-resolve "^29.7.0"
-    jest-runner "^29.7.0"
-    jest-util "^29.7.0"
-    jest-validate "^29.7.0"
-    micromatch "^4.0.4"
+    "@babel/core" "^7.27.4"
+    "@jest/get-type" "30.1.0"
+    "@jest/pattern" "30.0.1"
+    "@jest/test-sequencer" "30.2.0"
+    "@jest/types" "30.2.0"
+    babel-jest "30.2.0"
+    chalk "^4.1.2"
+    ci-info "^4.2.0"
+    deepmerge "^4.3.1"
+    glob "^10.3.10"
+    graceful-fs "^4.2.11"
+    jest-circus "30.2.0"
+    jest-docblock "30.2.0"
+    jest-environment-node "30.2.0"
+    jest-regex-util "30.0.1"
+    jest-resolve "30.2.0"
+    jest-runner "30.2.0"
+    jest-util "30.2.0"
+    jest-validate "30.2.0"
+    micromatch "^4.0.8"
     parse-json "^5.2.0"
-    pretty-format "^29.7.0"
+    pretty-format "30.2.0"
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
-jest-diff@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
-  integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==
+jest-diff@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-30.2.0.tgz#e3ec3a6ea5c5747f605c9e874f83d756cba36825"
+  integrity sha512-dQHFo3Pt4/NLlG5z4PxZ/3yZTZ1C7s9hveiOj+GCN+uT109NC2QgsoVZsVOAvbJ3RgKkvyLGXZV9+piDpWbm6A==
   dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^29.6.3"
-    jest-get-type "^29.6.3"
-    pretty-format "^29.7.0"
+    "@jest/diff-sequences" "30.0.1"
+    "@jest/get-type" "30.1.0"
+    chalk "^4.1.2"
+    pretty-format "30.2.0"
 
-jest-docblock@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.7.0.tgz#8fddb6adc3cdc955c93e2a87f61cfd350d5d119a"
-  integrity sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==
+jest-docblock@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-30.2.0.tgz#42cd98d69f887e531c7352309542b1ce4ee10256"
+  integrity sha512-tR/FFgZKS1CXluOQzZvNH3+0z9jXr3ldGSD8bhyuxvlVUwbeLOGynkunvlTMxchC5urrKndYiwCFC0DLVjpOCA==
   dependencies:
-    detect-newline "^3.0.0"
+    detect-newline "^3.1.0"
 
-jest-each@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.7.0.tgz#162a9b3f2328bdd991beaabffbb74745e56577d1"
-  integrity sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==
+jest-each@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-30.2.0.tgz#39e623ae71641c2ac3ee69b3ba3d258fce8e768d"
+  integrity sha512-lpWlJlM7bCUf1mfmuqTA8+j2lNURW9eNafOy99knBM01i5CQeY5UH1vZjgT9071nDJac1M4XsbyI44oNOdhlDQ==
   dependencies:
-    "@jest/types" "^29.6.3"
-    chalk "^4.0.0"
-    jest-get-type "^29.6.3"
-    jest-util "^29.7.0"
-    pretty-format "^29.7.0"
+    "@jest/get-type" "30.1.0"
+    "@jest/types" "30.2.0"
+    chalk "^4.1.2"
+    jest-util "30.2.0"
+    pretty-format "30.2.0"
 
-jest-environment-jsdom@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz#d206fa3551933c3fd519e5dfdb58a0f5139a837f"
-  integrity sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==
+jest-environment-jsdom@^30.0.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-30.2.0.tgz#e95e0921ed22be974f1d8a324766d12b1844cb2c"
+  integrity sha512-zbBTiqr2Vl78pKp/laGBREYzbZx9ZtqPjOK4++lL4BNDhxRnahg51HtoDrk9/VjIy9IthNEWdKVd7H5bqBhiWQ==
   dependencies:
-    "@jest/environment" "^29.7.0"
-    "@jest/fake-timers" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    "@types/jsdom" "^20.0.0"
+    "@jest/environment" "30.2.0"
+    "@jest/environment-jsdom-abstract" "30.2.0"
+    "@types/jsdom" "^21.1.7"
     "@types/node" "*"
-    jest-mock "^29.7.0"
-    jest-util "^29.7.0"
-    jsdom "^20.0.0"
+    jsdom "^26.1.0"
 
-jest-environment-node@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.7.0.tgz#0b93e111dda8ec120bc8300e6d1fb9576e164376"
-  integrity sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==
+jest-environment-node@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-30.2.0.tgz#3def7980ebd2fd86e74efd4d2e681f55ab38da0f"
+  integrity sha512-ElU8v92QJ9UrYsKrxDIKCxu6PfNj4Hdcktcn0JX12zqNdqWHB0N+hwOnnBBXvjLd2vApZtuLUGs1QSY+MsXoNA==
   dependencies:
-    "@jest/environment" "^29.7.0"
-    "@jest/fake-timers" "^29.7.0"
-    "@jest/types" "^29.6.3"
+    "@jest/environment" "30.2.0"
+    "@jest/fake-timers" "30.2.0"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
-    jest-mock "^29.7.0"
-    jest-util "^29.7.0"
+    jest-mock "30.2.0"
+    jest-util "30.2.0"
+    jest-validate "30.2.0"
 
-jest-get-type@^29.6.3:
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
-  integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
-
-jest-haste-map@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.7.0.tgz#3c2396524482f5a0506376e6c858c3bbcc17b104"
-  integrity sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==
+jest-haste-map@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-30.2.0.tgz#808e3889f288603ac70ff0ac047598345a66022e"
+  integrity sha512-sQA/jCb9kNt+neM0anSj6eZhLZUIhQgwDt7cPGjumgLM4rXsfb9kpnlacmvZz3Q5tb80nS+oG/if+NBKrHC+Xw==
   dependencies:
-    "@jest/types" "^29.6.3"
-    "@types/graceful-fs" "^4.1.3"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
-    anymatch "^3.0.3"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.2.9"
-    jest-regex-util "^29.6.3"
-    jest-util "^29.7.0"
-    jest-worker "^29.7.0"
-    micromatch "^4.0.4"
+    anymatch "^3.1.3"
+    fb-watchman "^2.0.2"
+    graceful-fs "^4.2.11"
+    jest-regex-util "30.0.1"
+    jest-util "30.2.0"
+    jest-worker "30.2.0"
+    micromatch "^4.0.8"
     walker "^1.0.8"
   optionalDependencies:
-    fsevents "^2.3.2"
+    fsevents "^2.3.3"
 
-jest-leak-detector@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz#5b7ec0dadfdfec0ca383dc9aa016d36b5ea4c728"
-  integrity sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==
+jest-leak-detector@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-30.2.0.tgz#292fdca7b7c9cf594e1e570ace140b01d8beb736"
+  integrity sha512-M6jKAjyzjHG0SrQgwhgZGy9hFazcudwCNovY/9HPIicmNSBuockPSedAP9vlPK6ONFJ1zfyH/M2/YYJxOz5cdQ==
   dependencies:
-    jest-get-type "^29.6.3"
-    pretty-format "^29.7.0"
+    "@jest/get-type" "30.1.0"
+    pretty-format "30.2.0"
 
-jest-matcher-utils@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz#ae8fec79ff249fd592ce80e3ee474e83a6c44f12"
-  integrity sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==
+jest-matcher-utils@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-30.2.0.tgz#69a0d4c271066559ec8b0d8174829adc3f23a783"
+  integrity sha512-dQ94Nq4dbzmUWkQ0ANAWS9tBRfqCrn0bV9AMYdOi/MHW726xn7eQmMeRTpX2ViC00bpNaWXq+7o4lIQ3AX13Hg==
   dependencies:
-    chalk "^4.0.0"
-    jest-diff "^29.7.0"
-    jest-get-type "^29.6.3"
-    pretty-format "^29.7.0"
+    "@jest/get-type" "30.1.0"
+    chalk "^4.1.2"
+    jest-diff "30.2.0"
+    pretty-format "30.2.0"
 
-jest-message-util@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3"
-  integrity sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==
+jest-message-util@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-30.2.0.tgz#fc97bf90d11f118b31e6131e2b67fc4f39f92152"
+  integrity sha512-y4DKFLZ2y6DxTWD4cDe07RglV88ZiNEdlRfGtqahfbIjfsw1nMCPx49Uev4IA/hWn3sDKyAnSPwoYSsAEdcimw==
   dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@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.7.0"
+    "@babel/code-frame" "^7.27.1"
+    "@jest/types" "30.2.0"
+    "@types/stack-utils" "^2.0.3"
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
+    micromatch "^4.0.8"
+    pretty-format "30.2.0"
     slash "^3.0.0"
-    stack-utils "^2.0.3"
+    stack-utils "^2.0.6"
 
-jest-mock@^29.6.2, jest-mock@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347"
-  integrity sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==
+jest-mock@30.2.0, jest-mock@^30.0.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-30.2.0.tgz#69f991614eeb4060189459d3584f710845bff45e"
+  integrity sha512-JNNNl2rj4b5ICpmAcq+WbLH83XswjPbjH4T7yvGzfAGCPh1rw+xVNbtk+FnRslvt9lkCcdn9i1oAoKUuFsOxRw==
   dependencies:
-    "@jest/types" "^29.6.3"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
-    jest-util "^29.7.0"
+    jest-util "30.2.0"
 
-jest-pnp-resolver@^1.2.2:
+jest-pnp-resolver@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
   integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
@@ -8574,152 +8894,164 @@ jest-raw-loader@^1.0.1:
   resolved "https://registry.yarnpkg.com/jest-raw-loader/-/jest-raw-loader-1.0.1.tgz#ce9f56d54650f157c4a7d16d224ba5d613bcd626"
   integrity sha512-g9oaAjeC4/rIJk1Wd3RxVbOfMizowM7LSjEJqa4R9qDX0OjQNABXOhH+GaznUp+DjTGVPi2vPPbQXyX87DOnYg==
 
-jest-regex-util@^29.6.3:
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.6.3.tgz#4a556d9c776af68e1c5f48194f4d0327d24e8a52"
-  integrity sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==
+jest-regex-util@30.0.1:
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-30.0.1.tgz#f17c1de3958b67dfe485354f5a10093298f2a49b"
+  integrity sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==
 
-jest-resolve-dependencies@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz#1b04f2c095f37fc776ff40803dc92921b1e88428"
-  integrity sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==
+jest-resolve-dependencies@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-30.2.0.tgz#3370e2c0b49cc560f6a7e8ec3a59dd99525e1a55"
+  integrity sha512-xTOIGug/0RmIe3mmCqCT95yO0vj6JURrn1TKWlNbhiAefJRWINNPgwVkrVgt/YaerPzY3iItufd80v3lOrFJ2w==
   dependencies:
-    jest-regex-util "^29.6.3"
-    jest-snapshot "^29.7.0"
+    jest-regex-util "30.0.1"
+    jest-snapshot "30.2.0"
 
-jest-resolve@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.7.0.tgz#64d6a8992dd26f635ab0c01e5eef4399c6bcbc30"
-  integrity sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==
+jest-resolve@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-30.2.0.tgz#2e2009cbd61e8f1f003355d5ec87225412cebcd7"
+  integrity sha512-TCrHSxPlx3tBY3hWNtRQKbtgLhsXa1WmbJEqBlTBrGafd5fiQFByy2GNCEoGR+Tns8d15GaL9cxEzKOO3GEb2A==
   dependencies:
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^29.7.0"
-    jest-pnp-resolver "^1.2.2"
-    jest-util "^29.7.0"
-    jest-validate "^29.7.0"
-    resolve "^1.20.0"
-    resolve.exports "^2.0.0"
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
+    jest-haste-map "30.2.0"
+    jest-pnp-resolver "^1.2.3"
+    jest-util "30.2.0"
+    jest-validate "30.2.0"
     slash "^3.0.0"
+    unrs-resolver "^1.7.11"
 
-jest-runner@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.7.0.tgz#809af072d408a53dcfd2e849a4c976d3132f718e"
-  integrity sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==
+jest-runner@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-30.2.0.tgz#c62b4c3130afa661789705e13a07bdbcec26a114"
+  integrity sha512-PqvZ2B2XEyPEbclp+gV6KO/F1FIFSbIwewRgmROCMBo/aZ6J1w8Qypoj2pEOcg3G2HzLlaP6VUtvwCI8dM3oqQ==
   dependencies:
-    "@jest/console" "^29.7.0"
-    "@jest/environment" "^29.7.0"
-    "@jest/test-result" "^29.7.0"
-    "@jest/transform" "^29.7.0"
-    "@jest/types" "^29.6.3"
+    "@jest/console" "30.2.0"
+    "@jest/environment" "30.2.0"
+    "@jest/test-result" "30.2.0"
+    "@jest/transform" "30.2.0"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
-    chalk "^4.0.0"
+    chalk "^4.1.2"
     emittery "^0.13.1"
-    graceful-fs "^4.2.9"
-    jest-docblock "^29.7.0"
-    jest-environment-node "^29.7.0"
-    jest-haste-map "^29.7.0"
-    jest-leak-detector "^29.7.0"
-    jest-message-util "^29.7.0"
-    jest-resolve "^29.7.0"
-    jest-runtime "^29.7.0"
-    jest-util "^29.7.0"
-    jest-watcher "^29.7.0"
-    jest-worker "^29.7.0"
+    exit-x "^0.2.2"
+    graceful-fs "^4.2.11"
+    jest-docblock "30.2.0"
+    jest-environment-node "30.2.0"
+    jest-haste-map "30.2.0"
+    jest-leak-detector "30.2.0"
+    jest-message-util "30.2.0"
+    jest-resolve "30.2.0"
+    jest-runtime "30.2.0"
+    jest-util "30.2.0"
+    jest-watcher "30.2.0"
+    jest-worker "30.2.0"
     p-limit "^3.1.0"
     source-map-support "0.5.13"
 
-jest-runtime@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.7.0.tgz#efecb3141cf7d3767a3a0cc8f7c9990587d3d817"
-  integrity sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==
+jest-runtime@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-30.2.0.tgz#395ea792cde048db1b0cd1a92dc9cb9f1921bf8a"
+  integrity sha512-p1+GVX/PJqTucvsmERPMgCPvQJpFt4hFbM+VN3n8TMo47decMUcJbt+rgzwrEme0MQUA/R+1de2axftTHkKckg==
   dependencies:
-    "@jest/environment" "^29.7.0"
-    "@jest/fake-timers" "^29.7.0"
-    "@jest/globals" "^29.7.0"
-    "@jest/source-map" "^29.6.3"
-    "@jest/test-result" "^29.7.0"
-    "@jest/transform" "^29.7.0"
-    "@jest/types" "^29.6.3"
+    "@jest/environment" "30.2.0"
+    "@jest/fake-timers" "30.2.0"
+    "@jest/globals" "30.2.0"
+    "@jest/source-map" "30.0.1"
+    "@jest/test-result" "30.2.0"
+    "@jest/transform" "30.2.0"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
-    chalk "^4.0.0"
-    cjs-module-lexer "^1.0.0"
-    collect-v8-coverage "^1.0.0"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^29.7.0"
-    jest-message-util "^29.7.0"
-    jest-mock "^29.7.0"
-    jest-regex-util "^29.6.3"
-    jest-resolve "^29.7.0"
-    jest-snapshot "^29.7.0"
-    jest-util "^29.7.0"
+    chalk "^4.1.2"
+    cjs-module-lexer "^2.1.0"
+    collect-v8-coverage "^1.0.2"
+    glob "^10.3.10"
+    graceful-fs "^4.2.11"
+    jest-haste-map "30.2.0"
+    jest-message-util "30.2.0"
+    jest-mock "30.2.0"
+    jest-regex-util "30.0.1"
+    jest-resolve "30.2.0"
+    jest-snapshot "30.2.0"
+    jest-util "30.2.0"
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
-jest-snapshot@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.7.0.tgz#c2c574c3f51865da1bb329036778a69bf88a6be5"
-  integrity sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==
+jest-snapshot@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-30.2.0.tgz#266fbbb4b95fc4665ce6f32f1f38eeb39f4e26d0"
+  integrity sha512-5WEtTy2jXPFypadKNpbNkZ72puZCa6UjSr/7djeecHWOu7iYhSXSnHScT8wBz3Rn8Ena5d5RYRcsyKIeqG1IyA==
   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/types" "^7.3.3"
-    "@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.7.0"
-    graceful-fs "^4.2.9"
-    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.7.0"
-    semver "^7.5.3"
+    "@babel/core" "^7.27.4"
+    "@babel/generator" "^7.27.5"
+    "@babel/plugin-syntax-jsx" "^7.27.1"
+    "@babel/plugin-syntax-typescript" "^7.27.1"
+    "@babel/types" "^7.27.3"
+    "@jest/expect-utils" "30.2.0"
+    "@jest/get-type" "30.1.0"
+    "@jest/snapshot-utils" "30.2.0"
+    "@jest/transform" "30.2.0"
+    "@jest/types" "30.2.0"
+    babel-preset-current-node-syntax "^1.2.0"
+    chalk "^4.1.2"
+    expect "30.2.0"
+    graceful-fs "^4.2.11"
+    jest-diff "30.2.0"
+    jest-matcher-utils "30.2.0"
+    jest-message-util "30.2.0"
+    jest-util "30.2.0"
+    pretty-format "30.2.0"
+    semver "^7.7.2"
+    synckit "^0.11.8"
 
-jest-util@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
-  integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
+jest-util@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-30.2.0.tgz#5142adbcad6f4e53c2776c067a4db3c14f913705"
+  integrity sha512-QKNsM0o3Xe6ISQU869e+DhG+4CK/48aHYdJZGlFQVTjnbvgpcKyxpzk29fGiO7i/J8VENZ+d2iGnSsvmuHywlA==
   dependencies:
-    "@jest/types" "^29.6.3"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    graceful-fs "^4.2.9"
-    picomatch "^2.2.3"
+    chalk "^4.1.2"
+    ci-info "^4.2.0"
+    graceful-fs "^4.2.11"
+    picomatch "^4.0.2"
 
-jest-validate@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.7.0.tgz#7bf705511c64da591d46b15fce41400d52147d9c"
-  integrity sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==
+jest-validate@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-30.2.0.tgz#273eaaed4c0963b934b5b31e96289edda6e0a2ef"
+  integrity sha512-FBGWi7dP2hpdi8nBoWxSsLvBFewKAg0+uSQwBaof4Y4DPgBabXgpSYC5/lR7VmnIlSpASmCi/ntRWPbv7089Pw==
   dependencies:
-    "@jest/types" "^29.6.3"
-    camelcase "^6.2.0"
-    chalk "^4.0.0"
-    jest-get-type "^29.6.3"
+    "@jest/get-type" "30.1.0"
+    "@jest/types" "30.2.0"
+    camelcase "^6.3.0"
+    chalk "^4.1.2"
     leven "^3.1.0"
-    pretty-format "^29.7.0"
+    pretty-format "30.2.0"
 
-jest-watcher@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.7.0.tgz#7810d30d619c3a62093223ce6bb359ca1b28a2f2"
-  integrity sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==
+jest-watcher@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-30.2.0.tgz#f9c055de48e18c979e7756a3917e596e2d69b07b"
+  integrity sha512-PYxa28dxJ9g777pGm/7PrbnMeA0Jr7osHP9bS7eJy9DuAjMgdGtxgf0uKMyoIsTWAkIbUW5hSDdJ3urmgXBqxg==
   dependencies:
-    "@jest/test-result" "^29.7.0"
-    "@jest/types" "^29.6.3"
+    "@jest/test-result" "30.2.0"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
     emittery "^0.13.1"
-    jest-util "^29.7.0"
-    string-length "^4.0.1"
+    jest-util "30.2.0"
+    string-length "^4.0.2"
+
+jest-worker@30.2.0, jest-worker@^30.0.5:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-30.2.0.tgz#fd5c2a36ff6058ec8f74366ec89538cc99539d26"
+  integrity sha512-0Q4Uk8WF7BUwqXHuAjc23vmopWJw5WH7w2tqBoUOZpOjW/ZnR44GXXd1r82RvnmI2GZge3ivrYXk/BE2+VtW2g==
+  dependencies:
+    "@types/node" "*"
+    "@ungap/structured-clone" "^1.3.0"
+    jest-util "30.2.0"
+    merge-stream "^2.0.0"
+    supports-color "^8.1.1"
 
 jest-worker@^27.4.5:
   version "27.5.1"
@@ -8730,50 +9062,35 @@ jest-worker@^27.4.5:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest-worker@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.7.0.tgz#acad073acbbaeb7262bd5389e1bcf43e10058d4a"
-  integrity sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==
+jest@^30.0.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-30.2.0.tgz#9f0a71e734af968f26952b5ae4b724af82681630"
+  integrity sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==
   dependencies:
-    "@types/node" "*"
-    jest-util "^29.7.0"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
-jest@^29.6.2:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-29.7.0.tgz#994676fc24177f088f1c5e3737f5697204ff2613"
-  integrity sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==
-  dependencies:
-    "@jest/core" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    import-local "^3.0.2"
-    jest-cli "^29.7.0"
+    "@jest/core" "30.2.0"
+    "@jest/types" "30.2.0"
+    import-local "^3.2.0"
+    jest-cli "30.2.0"
 
 jiti@^1.20.0:
   version "1.21.6"
   resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.6.tgz#6c7f7398dd4b3142767f9a168af2f317a428d268"
   integrity sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==
 
-jiti@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.4.2.tgz#d19b7732ebb6116b06e2038da74a55366faef560"
-  integrity sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==
-
-js-cookie@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
-  integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==
+jiti@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.6.1.tgz#178ef2fc9a1a594248c20627cd820187a4d78d92"
+  integrity sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-xxhash@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-xxhash/-/js-xxhash-4.0.0.tgz#866b003c06ba39bebc9e4a47d2756abfef06606c"
-  integrity sha512-3Q2eIqG6s1KEBBmkj9tGM9lef8LJbuRyTVBdI3GpTnrvtytunjLPO0wqABp5qhtMzfA32jYn1FlnIV7GH1RAHQ==
+js-xxhash@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/js-xxhash/-/js-xxhash-5.0.1.tgz#35135863425169a42a2defe4741a60aeec3008e6"
+  integrity sha512-OGuTCR9wqYqF2FrhjtGb6fx8Rm1jzhdpUEsY2sLkXbNYLzOS+XWcYT4KTUL7vnaRTmBuGuVpW1AK2zzxjgZXGg==
 
 js-yaml@^3.13.1:
   version "3.14.1"
@@ -8783,46 +9100,40 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+js-yaml@^4.1.0, js-yaml@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b"
+  integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==
   dependencies:
     argparse "^2.0.1"
 
-jsdom@^20.0.0:
-  version "20.0.3"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db"
-  integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==
+jsdom@^26.1.0:
+  version "26.1.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-26.1.0.tgz#ab5f1c1cafc04bd878725490974ea5e8bf0c72b3"
+  integrity sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==
   dependencies:
-    abab "^2.0.6"
-    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.4.2"
-    domexception "^4.0.0"
-    escodegen "^2.0.0"
-    form-data "^4.0.0"
-    html-encoding-sniffer "^3.0.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.1"
+    cssstyle "^4.2.1"
+    data-urls "^5.0.0"
+    decimal.js "^10.5.0"
+    html-encoding-sniffer "^4.0.0"
+    http-proxy-agent "^7.0.2"
+    https-proxy-agent "^7.0.6"
     is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.2"
-    parse5 "^7.1.1"
+    nwsapi "^2.2.16"
+    parse5 "^7.2.1"
+    rrweb-cssom "^0.8.0"
     saxes "^6.0.0"
     symbol-tree "^3.2.4"
-    tough-cookie "^4.1.2"
-    w3c-xmlserializer "^4.0.0"
+    tough-cookie "^5.1.1"
+    w3c-xmlserializer "^5.0.0"
     webidl-conversions "^7.0.0"
-    whatwg-encoding "^2.0.0"
-    whatwg-mimetype "^3.0.0"
-    whatwg-url "^11.0.0"
-    ws "^8.11.0"
-    xml-name-validator "^4.0.0"
+    whatwg-encoding "^3.1.1"
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.1.1"
+    ws "^8.18.0"
+    xml-name-validator "^5.0.0"
 
-jsesc@^3.0.2:
+jsesc@^3.0.2, jsesc@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d"
   integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==
@@ -8832,11 +9143,6 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
-jsesc@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e"
-  integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==
-
 json-buffer@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
@@ -8863,12 +9169,12 @@ json-stable-stringify-without-jsonify@^1.0.1:
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 json-stable-stringify@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.2.1.tgz#addb683c2b78014d0b78d704c2fcbdf0695a60e2"
-  integrity sha512-Lp6HbbBgosLmJbjx0pBLbgvx68FaFU1sdkmBuckmhhJ88kL13OA51CDtR2yJB50eCNMH9wRqtQNNiAqQH4YXnA==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.3.0.tgz#8903cfac42ea1a0f97f35d63a4ce0518f0cc6a70"
+  integrity sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg==
   dependencies:
     call-bind "^1.0.8"
-    call-bound "^1.0.3"
+    call-bound "^1.0.4"
     isarray "^2.0.5"
     jsonify "^0.0.1"
     object-keys "^1.1.1"
@@ -8885,15 +9191,15 @@ json5@^1.0.2:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.2.3:
+json5@^2.1.2, json5@^2.2.2, json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
 jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.2.0.tgz#7c265bd1b65de6977478300087c99f1c84383f62"
+  integrity sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==
   dependencies:
     universalify "^2.0.0"
   optionalDependencies:
@@ -8940,9 +9246,9 @@ jwt-decode@4.0.0, jwt-decode@^4.0.0:
   integrity sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==
 
 katex@^0.16.0:
-  version "0.16.22"
-  resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.22.tgz#d2b3d66464b1e6d69e6463b28a86ced5a02c5ccd"
-  integrity sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==
+  version "0.16.27"
+  resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.27.tgz#4ecf6f620e0ca1c1a5de722e85fcdcec49086a48"
+  integrity sha512-aeQoDkuRWSqQN6nSvVCEFvfXdqo1OQiCmmW1kc9xSdjutPv7BGO7pqY9sQRJpMOGrEdfDgF2TfRXe5eUAD2Waw==
   dependencies:
     commander "^8.3.0"
 
@@ -8958,14 +9264,14 @@ keyv@^4.5.3:
   dependencies:
     json-buffer "3.0.1"
 
-keyv@^5.3.2:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-5.3.3.tgz#ec2d723fbd7b908de5ee7f56b769d46dbbeaf8ba"
-  integrity sha512-Rwu4+nXI9fqcxiEHtbkvoes2X+QfkTRo1TMkPfwzipGsJlJO/z69vqB4FNl9xJ3xCpAcbkvmEabZfPzrwN3+gQ==
+keyv@^5.5.4:
+  version "5.5.5"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-5.5.5.tgz#a975b32fc03e300a0e443c705b103d8b05220834"
+  integrity sha512-FA5LmZVF1VziNc0bIdCSA1IoSVnDCqE8HJIZZv2/W8YmoAM50+tnUgJR/gQZwEeIMleuIOnRnHA/UaZRNeV4iQ==
   dependencies:
-    "@keyv/serialize" "^1.0.3"
+    "@keyv/serialize" "^1.1.1"
 
-kind-of@^6.0.2, kind-of@^6.0.3:
+kind-of@^6.0.2:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -8977,34 +9283,28 @@ klaw-sync@^6.0.0:
   dependencies:
     graceful-fs "^4.1.11"
 
-kleur@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
-  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
-
 knip@^5.36.2:
-  version "5.59.0"
-  resolved "https://registry.yarnpkg.com/knip/-/knip-5.59.0.tgz#f2f035d06f68b42fef7555c9ff800262c63572f7"
-  integrity sha512-fpkvLIcw2xqcisJpFZRt/BG2rol1znSwzUB5AR6uj+tTgurC1iUEudx8mSlaxsLaeWx5zvHmlW0dlfq7CfKWJQ==
+  version "5.73.3"
+  resolved "https://registry.yarnpkg.com/knip/-/knip-5.73.3.tgz#a92c5df99e59291043249006a9d036ca4b6a43f5"
+  integrity sha512-676xuqNQidE9yZeUUX7lJeZ0d1N7QBTbmO1J0p+SyuXlbpdE4pd8Ql3WVMvrvaaaG2z/+3ExeFNm0Q9mVIjuKw==
   dependencies:
     "@nodelib/fs.walk" "^1.2.3"
     fast-glob "^3.3.3"
-    formatly "^0.2.3"
-    jiti "^2.4.2"
-    js-yaml "^4.1.0"
+    formatly "^0.3.0"
+    jiti "^2.6.0"
+    js-yaml "^4.1.1"
     minimist "^1.2.8"
-    oxc-resolver "^9.0.2"
-    picocolors "^1.1.0"
+    oxc-resolver "^11.15.0"
+    picocolors "^1.1.1"
     picomatch "^4.0.1"
-    smol-toml "^1.3.1"
-    strip-json-comments "5.0.1"
-    zod "^3.22.4"
-    zod-validation-error "^3.0.3"
+    smol-toml "^1.5.2"
+    strip-json-comments "5.0.3"
+    zod "^4.1.11"
 
-known-css-properties@^0.36.0:
-  version "0.36.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.36.0.tgz#5c4365f3c9549ca2e813d2e729e6c47ef6a6cb60"
-  integrity sha512-A+9jP+IUmuQsNdsLdcg6Yt7voiMF/D4K83ew0OpJtpu+l34ef7LaohWV0Rc6KNvzw6ZDizkqfyB5JznZnzuKQA==
+known-css-properties@^0.37.0:
+  version "0.37.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.37.0.tgz#10ebe49b9dbb6638860ff8a002fb65a053f4aec5"
+  integrity sha512-JCDrsP4Z1Sb9JwG0aJ8Eo2r7k4Ou5MwmThS/6lcIe1ICyb7UBJKGRIUUdqc2ASdE/42lgz6zFUnzAIhtXnBVrQ==
 
 language-subtag-registry@^0.3.20:
   version "0.3.23"
@@ -9053,7 +9353,7 @@ lie@~3.3.0:
   dependencies:
     immediate "~3.0.5"
 
-lilconfig@^3.1.2, lilconfig@^3.1.3:
+lilconfig@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.3.tgz#a1bcfd6257f9585bf5ae14ceeebb7b559025e4c4"
   integrity sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==
@@ -9063,6 +9363,11 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
+linkify-html@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/linkify-html/-/linkify-html-4.3.2.tgz#ef84b39828c66170221af1a49a042c7993bd4543"
+  integrity sha512-RozNgrfSFrNQlprJSZIN7lF+ZVPj5Pz8POQcu1PYGAUhL9tKtvtWcOXOmlXjuGGEWHtC6gt6Q2U4+VUq9ELmng==
+
 linkify-it@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
@@ -9070,53 +9375,50 @@ linkify-it@^4.0.1:
   dependencies:
     uc.micro "^1.0.1"
 
-linkify-react@4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/linkify-react/-/linkify-react-4.3.1.tgz#0655632d654a881e54d955ec12b1ab817d879f50"
-  integrity sha512-w8ahBdCwF9C/doS4V3nE93QF1oyORmosvi8UEUbpHYws077eGzhkxUzJQcE2/SU5Q2K7SD80M4ybwwZGHErx5Q==
+linkify-react@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/linkify-react/-/linkify-react-4.3.2.tgz#8d47fb0ad96ab5b38c07bfbebdcbc57794430693"
+  integrity sha512-mi744h1hf+WDsr+paJgSBBgYNLMWNSHyM9V9LVUo03RidNGdw1VpI7Twnt+K3pEh3nIzB4xiiAgZxpd61ItKpQ==
 
-linkify-string@4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/linkify-string/-/linkify-string-4.3.1.tgz#d6f8b7166d588a64943e3bb23302ce44047f61a2"
-  integrity sha512-1AnH52wZwuJi+skG/9dUphhQEUblVGSf0ntkM8z21RS9bF7xR0qPpqnNTyCo2Obqs5MR5wi8y5wOLPoBbzxm2w==
+linkify-string@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/linkify-string/-/linkify-string-4.3.2.tgz#535f7a3c25a8c83b862aa3263d6cb09fd4e4b3f4"
+  integrity sha512-JqBuQpSa+CSj2tskIII70SKOjPfjXwDFyjRRNFTrlg76gp2nap36xeRj/cWaXxukqBNrxM+L07XyKRsUtH/DpQ==
 
-linkifyjs@4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.3.1.tgz#1f246ebf4be040002accd1f4535b6af7c7e37898"
-  integrity sha512-DRSlB9DKVW04c4SUdGvKK5FR6be45lTU9M76JnngqPeeGDqPwYc0zdUErtsNVMtxPXgUWV4HbXbnC4sNyBxkYg==
+linkifyjs@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.3.2.tgz#d97eb45419aabf97ceb4b05a7adeb7b8c8ade2b1"
+  integrity sha512-NT1CJtq3hHIreOianA8aSXn6Cw0JzYOuDQbOrSPe7gqFnCpKP++MQe3ODgO3oh2GJFORkAAdqredOa60z63GbA==
 
 lint-staged@^16.0.0:
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-16.1.0.tgz#06807ef3dbbade9e4e3416897aac0ac5b99a2377"
-  integrity sha512-HkpQh69XHxgCjObjejBT3s2ILwNjFx8M3nw+tJ/ssBauDlIpkx2RpqWSi1fBgkXLSSXnbR3iEq1NkVtpvV+FLQ==
+  version "16.2.7"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-16.2.7.tgz#c4a635960c17b52fe774f1f40aee8ce1bd86531f"
+  integrity sha512-lDIj4RnYmK7/kXMya+qJsmkRFkGolciXjrsZ6PC25GdTfWOAWetR0ZbsNXRAj1EHHImRSalc+whZFg56F5DVow==
   dependencies:
-    chalk "^5.4.1"
-    commander "^14.0.0"
-    debug "^4.4.1"
-    lilconfig "^3.1.3"
-    listr2 "^8.3.3"
+    commander "^14.0.2"
+    listr2 "^9.0.5"
     micromatch "^4.0.8"
-    nano-spawn "^1.0.2"
+    nano-spawn "^2.0.0"
     pidtree "^0.6.0"
     string-argv "^0.3.2"
-    yaml "^2.8.0"
+    yaml "^2.8.1"
 
-listr2@^8.3.3:
-  version "8.3.3"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-8.3.3.tgz#815fc8f738260ff220981bf9e866b3e11e8121bf"
-  integrity sha512-LWzX2KsqcB1wqQ4AHgYb4RsDXauQiqhjLk+6hjbaeHG4zpjjVAB6wC/gz6X0l+Du1cN3pUB5ZlrvTbhGSNnUQQ==
+listr2@^9.0.5:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-9.0.5.tgz#92df7c4416a6da630eb9ef46da469b70de97b316"
+  integrity sha512-ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==
   dependencies:
-    cli-truncate "^4.0.0"
+    cli-truncate "^5.0.0"
     colorette "^2.0.20"
     eventemitter3 "^5.0.1"
     log-update "^6.1.0"
     rfdc "^1.4.1"
     wrap-ansi "^9.0.0"
 
-loader-runner@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
-  integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
+loader-runner@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.1.tgz#6c76ed29b0ccce9af379208299f07f876de737e3"
+  integrity sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==
 
 loader-utils@^2.0.0:
   version "2.0.4"
@@ -9217,13 +9519,18 @@ long@^5.2.0:
   resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
   integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
 
-loose-envify@^1.0.0, loose-envify@^1.4.0:
+loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
+loupe@^3.1.0, loupe@^3.1.4:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/loupe/-/loupe-3.2.1.tgz#0095cf56dc5b7a9a7c08ff5b1a8796ec8ad17e76"
+  integrity sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==
+
 lower-case@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
@@ -9231,15 +9538,15 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
-lru-cache@^10.2.0:
+lru-cache@^10.2.0, lru-cache@^10.4.3:
   version "10.4.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
   integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
 
 lru-cache@^11.0.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.1.0.tgz#afafb060607108132dbc1cf8ae661afb69486117"
-  integrity sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A==
+  version "11.2.4"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.2.4.tgz#ecb523ebb0e6f4d837c807ad1abaea8e0619770d"
+  integrity sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -9260,12 +9567,19 @@ magic-string@0.30.8:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.15"
 
-mailpit-api@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/mailpit-api/-/mailpit-api-1.4.0.tgz#881b473434b86c13ff85c3d92e9474daf4376135"
-  integrity sha512-A7hMRDQGo0jf1HZM06tw8dSgT2cYEev7lh1ehUXDWIBWXuK+Rq6HHCCQz624uAFYWEngmt4RGG1kMGGUC7iY6A==
+magic-string@^0.30.0, magic-string@^0.30.17:
+  version "0.30.21"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.21.tgz#56763ec09a0fa8091df27879fd94d19078c00d91"
+  integrity sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==
   dependencies:
-    axios "^1.9.0"
+    "@jridgewell/sourcemap-codec" "^1.5.5"
+
+mailpit-api@^1.2.0:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/mailpit-api/-/mailpit-api-1.5.4.tgz#b53e0d437c3a2dcd22a20db9dcadc99ffb3b789d"
+  integrity sha512-Zz7qrNHF7p67sDn7VzBmP3Djk7eJNcBRiwCKeiWl5ADRou14++wvP1Mq9XD6sLyU5sQ/tgo3rXbmwTbNx1uY0A==
+  dependencies:
+    axios "^1.12.1"
 
 make-dir@^4.0.0:
   version "4.0.0"
@@ -9274,11 +9588,6 @@ make-dir@^4.0.0:
   dependencies:
     semver "^7.5.3"
 
-make-error@^1.1.1:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-
 makeerror@1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
@@ -9287,36 +9596,33 @@ makeerror@1.0.12:
     tmpl "1.0.5"
 
 maplibre-gl@^5.0.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-5.5.0.tgz#0a295a634e745a5c31848ac7198893da417d09ae"
-  integrity sha512-p8AOPuzzqn1ZA9gcXxKw0IED715we/2Owa/YUr6PANmgMvNMe/JG+V/C1hRra43Wm62Biz+Aa8AgbOLJimA8tA==
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-5.14.0.tgz#4354d460e3bc5c11fbc5c5ae358dbe4561271720"
+  integrity sha512-O2ok6N/bQ9NA9nJ22r/PRQQYkUe9JwfDMjBPkQ+8OwsVH4TpA5skIAM2wc0k+rni5lVbAVONVyBvgi1rF2vEPA==
   dependencies:
     "@mapbox/geojson-rewind" "^0.5.2"
     "@mapbox/jsonlint-lines-primitives" "^2.0.2"
-    "@mapbox/point-geometry" "^0.1.0"
-    "@mapbox/tiny-sdf" "^2.0.6"
+    "@mapbox/point-geometry" "^1.1.0"
+    "@mapbox/tiny-sdf" "^2.0.7"
     "@mapbox/unitbezier" "^0.0.1"
-    "@mapbox/vector-tile" "^1.3.1"
+    "@mapbox/vector-tile" "^2.0.4"
     "@mapbox/whoots-js" "^3.1.0"
-    "@maplibre/maplibre-gl-style-spec" "^23.2.2"
+    "@maplibre/maplibre-gl-style-spec" "^24.3.1"
+    "@maplibre/mlt" "^1.1.2"
+    "@maplibre/vt-pbf" "^4.1.0"
     "@types/geojson" "^7946.0.16"
     "@types/geojson-vt" "3.2.5"
-    "@types/mapbox__point-geometry" "^0.1.4"
-    "@types/mapbox__vector-tile" "^1.3.4"
-    "@types/pbf" "^3.0.5"
     "@types/supercluster" "^7.1.3"
-    earcut "^3.0.1"
+    earcut "^3.0.2"
     geojson-vt "^4.0.2"
-    gl-matrix "^3.4.3"
-    global-prefix "^4.0.0"
+    gl-matrix "^3.4.4"
     kdbush "^4.0.2"
     murmurhash-js "^1.0.0"
-    pbf "^3.3.0"
-    potpack "^2.0.0"
+    pbf "^4.0.1"
+    potpack "^2.1.0"
     quickselect "^3.0.0"
     supercluster "^8.0.1"
     tinyqueue "^3.0.0"
-    vt-pbf "^3.1.3"
 
 markdown-it@^13.0.2:
   version "13.0.2"
@@ -9350,29 +9656,28 @@ matrix-events-sdk@0.0.1:
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "37.6.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c35c7d1a3be073e0922cf28f13225805fc2a78f8"
+  version "39.4.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/633a5a8848524c08d9548c37d768459b1a7097fe"
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-wasm" "^14.0.1"
-    "@matrix-org/olm" "3.2.15"
+    "@matrix-org/matrix-sdk-crypto-wasm" "^16.0.0"
     another-json "^0.2.0"
     bs58 "^6.0.0"
     content-type "^1.0.4"
     jwt-decode "^4.0.0"
     loglevel "^1.9.2"
     matrix-events-sdk "0.0.1"
-    matrix-widget-api "^1.10.0"
+    matrix-widget-api "^1.14.0"
     oidc-client-ts "^3.0.1"
-    p-retry "4"
-    sdp-transform "^2.14.1"
+    p-retry "7"
+    sdp-transform "^3.0.0"
     unhomoglyph "^1.0.6"
-    uuid "11"
+    uuid "13"
 
-matrix-web-i18n@^3.2.1:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/matrix-web-i18n/-/matrix-web-i18n-3.3.0.tgz#a9f9d87d18ef96f75171883abbf201952cbfbe22"
-  integrity sha512-bJPJrBGrCdslkf2wMVHWyZlAEx9zSKnOsJ9rILaaEy195yyNLpXrYoyRIXEk8YWsdwtaK1ImE+r/Gh43J/I4ow==
+matrix-web-i18n@^3.2.1, matrix-web-i18n@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/matrix-web-i18n/-/matrix-web-i18n-3.4.0.tgz#2f088a2ec2cb4598092b7e9dd2f24f65d820df0e"
+  integrity sha512-8Bftf3LkACR6oy0iXYuIsDuvHjoJoOCWA+gDuy/lvyPwEpwViMs3XP5mJsXla+51SZEULZRUUtTreufH6xVA8g==
   dependencies:
     "@babel/parser" "^7.18.5"
     "@babel/traverse" "^7.18.5"
@@ -9380,19 +9685,14 @@ matrix-web-i18n@^3.2.1:
     minimist "^1.2.8"
     walk "^2.3.15"
 
-matrix-widget-api@^1.10.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-1.13.1.tgz#5b1caeed2fc58148bcd2984e0546d2d06a1713ad"
-  integrity sha512-mkOHUVzaN018TCbObfGOSaMW2GoUxOfcxNNlTVx5/HeMk3OSQPQM0C9oEME5Liiv/dBUoSrEB64V8wF7e/gb1w==
+matrix-widget-api@^1.10.0, matrix-widget-api@^1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-1.15.0.tgz#a508f72a5993a95382bdf890bd9e54525295b321"
+  integrity sha512-Yu9rX9wyF3A1sqviKgiYHz8aGgL3HhJe9OXKi/lccr1eZnNb6y+ELdbshTjs+VLKM4rkTWt6CE3THsw3f/CZhg==
   dependencies:
     "@types/events" "^3.0.0"
     events "^3.2.0"
 
-mdn-data@2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
-  integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
-
 mdn-data@2.0.28:
   version "2.0.28"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba"
@@ -9408,10 +9708,10 @@ mdn-data@2.12.2:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.12.2.tgz#9ae6c41a9e65adf61318b32bff7b64fbfb13f8cf"
   integrity sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==
 
-mdn-data@^2.21.0:
-  version "2.21.0"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.21.0.tgz#f3a495e8b1e60cb4fbeaf9136aefba2f987a56e1"
-  integrity sha512-+ZKPQezM5vYJIkCxaC+4DTnRrVZR1CgsKLu5zsQERQx6Tea8Y+wMx5A24rq8A8NepCeatIQufVAekKNgiBMsGQ==
+mdn-data@^2.25.0:
+  version "2.25.0"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.25.0.tgz#d45610fae17b222d600bbef3136bd6155ac9cc16"
+  integrity sha512-T2LPsjgUE/tgMmRXREVmwsux89DwWfNjiynOeXuLd2mX6jphGQ2YE3Ukz7LQ2VOFKiVZU/Ee1GqzHiipZCjymw==
 
 mdurl@^1.0.1, mdurl@~1.0.1:
   version "1.0.1"
@@ -9429,9 +9729,9 @@ media-typer@^1.1.0:
   integrity sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==
 
 memfs@^4.6.0:
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-4.17.0.tgz#a3c4b5490b9b1e7df5d433adc163e08208ce7ca2"
-  integrity sha512-4eirfZ7thblFmqFjywlTmuWVSvccHAJbn1r8qQLzmTO11qcqpohOjmY2mFce6x7x7WtskzRqApPD0hv+Oa74jg==
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-4.17.2.tgz#1f71a6d85c8c53b4f1b388234ed981a690c7e227"
+  integrity sha512-NgYhCOWgovOXSzvYgUW0LQ7Qy72rWQMGGFJDoWg4G30RHd3z77VbYdtJ4fembJXBy8pMIUA31XNAupobOQlwdg==
   dependencies:
     "@jsonjoy.com/json-pack" "^1.0.3"
     "@jsonjoy.com/util" "^1.3.0"
@@ -9478,7 +9778,7 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.8:
+micromatch@^4.0.2, micromatch@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -9504,9 +9804,9 @@ mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17,
     mime-db "1.52.0"
 
 mime-types@^3.0.0, mime-types@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-3.0.1.tgz#b1d94d6997a9b32fd69ebaed0db73de8acb519ce"
-  integrity sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-3.0.2.tgz#39002d4182575d5af036ffa118100f2524b2e2ab"
+  integrity sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==
   dependencies:
     mime-db "^1.54.0"
 
@@ -9516,9 +9816,9 @@ mime@1.6.0:
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^4.0.4:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-4.0.7.tgz#0b7a98b08c63bd3c10251e797d67840c9bde9f13"
-  integrity sha512-2OfDPL+e03E0LrXaGYOtTFIYhiuzep94NSsuhrNULq+stylcJedcHdzHtz0atMUuGwJfFYs0YL5xeC/Ca2x0eQ==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-4.1.0.tgz#ec55df7aa21832a36d44f0bbee5c04639b27802f"
+  integrity sha512-X5ju04+cAzsojXKes0B/S4tcYtFAJ6tTMuSPBEn9CPGlrWr8Fiw7qYeLT0XyH80HSoAoqWCaz+MWKh22P7G1cw==
 
 mimic-fn@^2.1.0:
   version "2.1.0"
@@ -9548,12 +9848,12 @@ minimalistic-assert@^1.0.0:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimatch@^10.0.0:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.1.tgz#ce0521856b453c86e25f2c4c0d03e6ff7ddc440b"
-  integrity sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==
+minimatch@^10.1.1:
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.1.1.tgz#e6e61b9b0c1dcab116b5a7d1458e8b6ae9e73a55"
+  integrity sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==
   dependencies:
-    brace-expansion "^2.0.1"
+    "@isaacs/brace-expansion" "^5.0.0"
 
 minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
@@ -9569,13 +9869,6 @@ minimatch@^5.0.1, minimatch@^5.1.0:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^8.0.2:
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-8.0.4.tgz#847c1b25c014d4e9a7f68aaf63dedd668a626229"
-  integrity sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==
-  dependencies:
-    brace-expansion "^2.0.1"
-
 minimatch@^9.0.4:
   version "9.0.5"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
@@ -9588,11 +9881,6 @@ minimist@^1.2.0, minimist@^1.2.6, minimist@^1.2.8, minimist@~1.2.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
-minipass@^4.2.4:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a"
-  integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==
-
 "minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
@@ -9663,20 +9951,30 @@ murmurhash-js@^1.0.0:
   resolved "https://registry.yarnpkg.com/murmurhash-js/-/murmurhash-js-1.0.0.tgz#b06278e21fc6c37fa5313732b0412bcb6ae15f51"
   integrity sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==
 
-nan@^2.19.0, nan@^2.20.0:
-  version "2.22.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.2.tgz#6b504fd029fb8f38c0990e52ad5c26772fdacfbb"
-  integrity sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==
+nan@^2.19.0, nan@^2.23.0:
+  version "2.24.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.24.0.tgz#a8919b36e692aa5b260831910e4f81419fc0a283"
+  integrity sha512-Vpf9qnVW1RaDkoNKFUvfxqAbtI8ncb8OJlqZ9wwpXzWPEsvsB1nvdUi6oYrHIkQ1Y/tMDnr1h4nczS0VB9Xykg==
+
+nano-spawn@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/nano-spawn/-/nano-spawn-2.0.0.tgz#f1250434c09ae18870d4f729fc54b406cf85a3e1"
+  integrity sha512-tacvGzUY5o2D8CBh2rrwxyNojUsZNU2zjNTzKQrkgGJQTbGAfArVWXSKMBokBeeg6C7OLRGUEyoFlYbfeWQIqw==
+
+nanoid@^3.3.11:
+  version "3.3.11"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
+  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
 
 nanoid@^3.3.7:
   version "3.3.8"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
   integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
 
-nanoid@^3.3.8:
-  version "3.3.11"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
-  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
+napi-postinstall@^0.3.0:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/napi-postinstall/-/napi-postinstall-0.3.4.tgz#7af256d6588b5f8e952b9190965d6b019653bbb9"
+  integrity sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -9719,19 +10017,19 @@ node-fetch@^2.6.7:
     whatwg-url "^5.0.0"
 
 node-forge@^1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
-  integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.2.tgz#d0d2659a26eef778bf84d73e7f55c08144ee7750"
+  integrity sha512-6xKiQ+cph9KImrRh0VsjH2d8/GXA4FIMlgU4B757iI1ApvcyA9VlouP0yZJha01V+huImO+kKMU7ih+2+E14fw==
 
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
-node-releases@^2.0.19:
-  version "2.0.19"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314"
-  integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==
+node-releases@^2.0.27:
+  version "2.0.27"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.27.tgz#eedca519205cf20f650f61d56b070db111231e4e"
+  integrity sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==
 
 normalize-package-data@^2.5.0:
   version "2.5.0"
@@ -9767,17 +10065,17 @@ nth-check@^2.0.1:
   dependencies:
     boolbase "^1.0.0"
 
-nwsapi@^2.2.2:
-  version "2.2.13"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.13.tgz#e56b4e98960e7a040e5474536587e599c4ff4655"
-  integrity sha512-cTGB9ptp9dY9A5VbMSe7fQBcl/tt22Vcqdq8+eN93rblOuE0aCFu4aZ2vMwct/2t+lFnosm8RkQW1I0Omb1UtQ==
+nwsapi@^2.2.16:
+  version "2.2.22"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.22.tgz#109f9530cda6c156d6a713cdf5939e9f0de98b9d"
+  integrity sha512-ujSMe1OWVn55euT1ihwCI1ZcAaAU3nxUiDwfDQldc51ZXaB9m2AyOn6/jh1BLe2t/G8xd6uKG1UBF2aZJeg2SQ==
 
 object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-inspect@^1.13.3:
+object-inspect@^1.13.3, object-inspect@^1.13.4:
   version "1.13.4"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
   integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
@@ -9799,14 +10097,15 @@ object.assign@^4.1.4, object.assign@^4.1.7:
     has-symbols "^1.1.0"
     object-keys "^1.1.1"
 
-object.entries@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.8.tgz#bffe6f282e01f4d17807204a24f8edd823599c41"
-  integrity sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==
+object.entries@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.9.tgz#e4770a6a1444afb61bd39f984018b5bede25f8b3"
+  integrity sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==
   dependencies:
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
     define-properties "^1.2.1"
-    es-object-atoms "^1.0.0"
+    es-object-atoms "^1.1.1"
 
 object.fromentries@^2.0.8:
   version "2.0.8"
@@ -9837,24 +10136,15 @@ object.values@^1.1.6, object.values@^1.2.1:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-object.values@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b"
-  integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-object-atoms "^1.0.0"
-
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
-oidc-client-ts@3.2.1, oidc-client-ts@^3.0.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/oidc-client-ts/-/oidc-client-ts-3.2.1.tgz#d71d899dc0cddd11a8b84e41265fd79d7e0f152a"
-  integrity sha512-hS5AJ5s/x4bXhHvNJT1v+GGvzHUwdRWqNQQbSrp10L1IRmzfRGKQ3VWN3dstJb+oF3WtAyKezwD2+dTEIyBiAA==
+oidc-client-ts@3.4.1, oidc-client-ts@^3.0.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/oidc-client-ts/-/oidc-client-ts-3.4.1.tgz#7cad95ba7213cb93b7c141965ce03ad658baa30f"
+  integrity sha512-jNdst/U28Iasukx/L5MP6b274Vr7ftQs6qAhPBCvz6Wt5rPCA+Q/tUmCzfCHHWweWw5szeMy2Gfrm1rITwUKrw==
   dependencies:
     jwt-decode "^4.0.0"
 
@@ -9892,15 +10182,25 @@ onetime@^7.0.0:
     mimic-function "^5.0.0"
 
 open@^10.0.3:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-10.1.0.tgz#a7795e6e5d519abe4286d9937bb24b51122598e1"
-  integrity sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-10.1.2.tgz#d5df40984755c9a9c3c93df8156a12467e882925"
+  integrity sha512-cxN6aIDPz6rm8hbebcP7vrQNhvRcveZoJU72Y7vskh4oIm+BZwBECnx5nTmrlres1Qapvx27Qo1Auukpf8PKXw==
   dependencies:
     default-browser "^5.2.1"
     define-lazy-prop "^3.0.0"
     is-inside-container "^1.0.0"
     is-wsl "^3.1.0"
 
+open@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-10.2.0.tgz#b9d855be007620e80b6fb05fac98141fe62db73c"
+  integrity sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==
+  dependencies:
+    default-browser "^5.2.1"
+    define-lazy-prop "^3.0.0"
+    is-inside-container "^1.0.0"
+    wsl-utils "^0.1.0"
+
 open@^7.4.2:
   version "7.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
@@ -9931,11 +10231,6 @@ opus-recorder@^8.0.3:
   resolved "https://registry.yarnpkg.com/opus-recorder/-/opus-recorder-8.0.5.tgz#06d3e32e15da57ebc3f57e41b93033475fcb4e3e"
   integrity sha512-tBRXc9Btds7i3bVfA7d5rekAlyOcfsivt5vSIXHxRV1Oa+s6iXFW8omZ0Lm3ABWotVcEyKt96iIIUcgbV07YOw==
 
-os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
-
 own-keys@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/own-keys/-/own-keys-1.0.1.tgz#e4006910a2bf913585289676eebd6f390cf51358"
@@ -9945,24 +10240,31 @@ own-keys@^1.0.1:
     object-keys "^1.1.1"
     safe-push-apply "^1.0.0"
 
-oxc-resolver@^9.0.2:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/oxc-resolver/-/oxc-resolver-9.0.2.tgz#0a86ee1e26f6c3f5f2af73dece276f8f588d4ef8"
-  integrity sha512-w838ygc1p7rF+7+h5vR9A+Y9Fc4imy6C3xPthCMkdFUgFvUWkmABeNB8RBDQ6+afk44Q60/UMMQ+gfDUW99fBA==
+oxc-resolver@^11.15.0:
+  version "11.15.0"
+  resolved "https://registry.yarnpkg.com/oxc-resolver/-/oxc-resolver-11.15.0.tgz#fcb2fadda0a04460e6ef50bb60abace2b7937510"
+  integrity sha512-Hk2J8QMYwmIO9XTCUiOH00+Xk2/+aBxRUnhrSlANDyCnLYc32R1WSIq1sU2yEdlqd53FfMpPEpnBYIKQMzliJw==
   optionalDependencies:
-    "@oxc-resolver/binding-darwin-arm64" "9.0.2"
-    "@oxc-resolver/binding-darwin-x64" "9.0.2"
-    "@oxc-resolver/binding-freebsd-x64" "9.0.2"
-    "@oxc-resolver/binding-linux-arm-gnueabihf" "9.0.2"
-    "@oxc-resolver/binding-linux-arm64-gnu" "9.0.2"
-    "@oxc-resolver/binding-linux-arm64-musl" "9.0.2"
-    "@oxc-resolver/binding-linux-riscv64-gnu" "9.0.2"
-    "@oxc-resolver/binding-linux-s390x-gnu" "9.0.2"
-    "@oxc-resolver/binding-linux-x64-gnu" "9.0.2"
-    "@oxc-resolver/binding-linux-x64-musl" "9.0.2"
-    "@oxc-resolver/binding-wasm32-wasi" "9.0.2"
-    "@oxc-resolver/binding-win32-arm64-msvc" "9.0.2"
-    "@oxc-resolver/binding-win32-x64-msvc" "9.0.2"
+    "@oxc-resolver/binding-android-arm-eabi" "11.15.0"
+    "@oxc-resolver/binding-android-arm64" "11.15.0"
+    "@oxc-resolver/binding-darwin-arm64" "11.15.0"
+    "@oxc-resolver/binding-darwin-x64" "11.15.0"
+    "@oxc-resolver/binding-freebsd-x64" "11.15.0"
+    "@oxc-resolver/binding-linux-arm-gnueabihf" "11.15.0"
+    "@oxc-resolver/binding-linux-arm-musleabihf" "11.15.0"
+    "@oxc-resolver/binding-linux-arm64-gnu" "11.15.0"
+    "@oxc-resolver/binding-linux-arm64-musl" "11.15.0"
+    "@oxc-resolver/binding-linux-ppc64-gnu" "11.15.0"
+    "@oxc-resolver/binding-linux-riscv64-gnu" "11.15.0"
+    "@oxc-resolver/binding-linux-riscv64-musl" "11.15.0"
+    "@oxc-resolver/binding-linux-s390x-gnu" "11.15.0"
+    "@oxc-resolver/binding-linux-x64-gnu" "11.15.0"
+    "@oxc-resolver/binding-linux-x64-musl" "11.15.0"
+    "@oxc-resolver/binding-openharmony-arm64" "11.15.0"
+    "@oxc-resolver/binding-wasm32-wasi" "11.15.0"
+    "@oxc-resolver/binding-win32-arm64-msvc" "11.15.0"
+    "@oxc-resolver/binding-win32-ia32-msvc" "11.15.0"
+    "@oxc-resolver/binding-win32-x64-msvc" "11.15.0"
 
 p-limit@^2.2.0:
   version "2.3.0"
@@ -9992,13 +10294,12 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
-p-retry@4:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
-  integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==
+p-retry@7:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-7.0.0.tgz#38dbee20149d94680fe0a022405839d995f95e7b"
+  integrity sha512-3BgO9rjULJYyr0Y0pcsG7FZ+7JB/hfOODO8kx9ppumiO5jprUF92WK/Y7Q0xppZtq4VhTcPiVq7qWLQfIV5aKQ==
   dependencies:
-    "@types/retry" "0.12.0"
-    retry "^0.13.1"
+    is-network-error "^1.1.0"
 
 p-retry@^6.2.0:
   version "6.2.1"
@@ -10014,7 +10315,7 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-package-json-from-dist@^1.0.0:
+package-json-from-dist@^1.0.0, package-json-from-dist@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505"
   integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==
@@ -10059,13 +10360,20 @@ parse-srcset@^1.0.2:
   resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
   integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==
 
-parse5@^7.0.0, parse5@^7.1.1:
+parse5@^7.0.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.2.0.tgz#8a0591ce9b7c5e2027173ab737d4d3fc3d826fab"
   integrity sha512-ZkDsAOcxsUMZ4Lz5fVciOehNcJ+Gb8gTzcA4yl3wnc273BAybYWrQ+Ks/OjCjSEpjvQkDSeZbybK9qj2VHHdGA==
   dependencies:
     entities "^4.5.0"
 
+parse5@^7.2.1:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.3.0.tgz#d7e224fa72399c7a175099f45fc2ad024b05ec05"
+  integrity sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==
+  dependencies:
+    entities "^6.0.0"
+
 parseurl@^1.3.3, parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -10079,25 +10387,24 @@ pascal-case@^3.1.2:
     no-case "^3.0.4"
     tslib "^2.0.3"
 
-patch-package@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-8.0.0.tgz#d191e2f1b6e06a4624a0116bcb88edd6714ede61"
-  integrity sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==
+patch-package@^8.0.0, patch-package@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-8.0.1.tgz#79d02f953f711e06d1f8949c8a13e5d3d7ba1a60"
+  integrity sha512-VsKRIA8f5uqHQ7NGhwIna6Bx6D9s/1iXlA1hthBVBEbkq+t4kXD0HHt+rJhf/Z+Ci0F/HCB2hvn0qLdLG+Qxlw==
   dependencies:
     "@yarnpkg/lockfile" "^1.1.0"
     chalk "^4.1.2"
     ci-info "^3.7.0"
     cross-spawn "^7.0.3"
     find-yarn-workspace-root "^2.0.0"
-    fs-extra "^9.0.0"
+    fs-extra "^10.0.0"
     json-stable-stringify "^1.0.2"
     klaw-sync "^6.0.0"
     minimist "^1.2.6"
     open "^7.4.2"
-    rimraf "^2.6.3"
     semver "^7.5.3"
     slash "^2.0.0"
-    tmp "^0.0.33"
+    tmp "^0.2.4"
     yaml "^2.2.2"
 
 path-exists@^4.0.0:
@@ -10120,7 +10427,7 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-scurry@^1.11.1, path-scurry@^1.6.1:
+path-scurry@^1.11.1:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
   integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
@@ -10129,9 +10436,9 @@ path-scurry@^1.11.1, path-scurry@^1.6.1:
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
 path-scurry@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-2.0.0.tgz#9f052289f23ad8bf9397a2a0425e7b8615c58580"
-  integrity sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-2.0.1.tgz#4b6572376cfd8b811fca9cd1f5c24b3cbac0fe10"
+  integrity sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==
   dependencies:
     lru-cache "^11.0.0"
     minipass "^7.1.2"
@@ -10147,37 +10454,41 @@ path-to-regexp@^2.2.1:
   integrity sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==
 
 path-to-regexp@^8.0.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-8.2.0.tgz#73990cc29e57a3ff2a0d914095156df5db79e8b4"
-  integrity sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-8.3.0.tgz#aa818a6981f99321003a08987d3cec9c3474cd1f"
+  integrity sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==
 
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-pbf@^3.2.1, pbf@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/pbf/-/pbf-3.3.0.tgz#1790f3d99118333cc7f498de816028a346ef367f"
-  integrity sha512-XDF38WCH3z5OV/OVa8GKUNtLAyneuzbCisx7QUCF8Q6Nutx0WnJrQe5O+kOtBlLfRNUws98Y58Lblp+NJG5T4Q==
+pathval@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-2.0.1.tgz#8855c5a2899af072d6ac05d11e46045ad0dc605d"
+  integrity sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==
+
+pbf@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pbf/-/pbf-4.0.1.tgz#ad9015e022b235dcdbe05fc468a9acadf483f0d4"
+  integrity sha512-SuLdBvS42z33m8ejRbInMapQe8n0D3vN/Xd5fmWM3tufNgRQFBpaW2YVJxQZV4iPNqb0vEFvssMEo5w9c6BTIA==
   dependencies:
-    ieee754 "^1.1.12"
     resolve-protobuf-schema "^2.1.0"
 
-picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0, picocolors@^1.1.1:
+picocolors@1.1.1, picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0, picocolors@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-picomatch@^4.0.1, picomatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab"
-  integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==
+picomatch@^4.0.1, picomatch@^4.0.2, picomatch@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.3.tgz#796c76136d1eead715db1e7bad785dedd695a042"
+  integrity sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==
 
 pidtree@^0.6.0:
   version "0.6.0"
@@ -10189,10 +10500,10 @@ pify@^2.3.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
-pirates@^4.0.4:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
-  integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
+pirates@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.7.tgz#643b4a18c4257c8a65104b73f3049ce9a0a15e22"
+  integrity sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==
 
 pkg-dir@^4.2.0:
   version "4.2.0"
@@ -10201,17 +10512,17 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-playwright-core@1.52.0, playwright-core@^1.51.0:
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.52.0.tgz#238f1f0c3edd4ebba0434ce3f4401900319a3dca"
-  integrity sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==
+playwright-core@1.57.0, playwright-core@^1.51.0:
+  version "1.57.0"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.57.0.tgz#3dcc9a865af256fa9f0af0d67fc8dd54eecaebf5"
+  integrity sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==
 
-playwright@1.52.0:
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.52.0.tgz#26cb9a63346651e1c54c8805acfd85683173d4bd"
-  integrity sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==
+playwright@1.57.0:
+  version "1.57.0"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.57.0.tgz#74d1dacff5048dc40bf4676940b1901e18ad0f46"
+  integrity sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==
   dependencies:
-    playwright-core "1.52.0"
+    playwright-core "1.57.0"
   optionalDependencies:
     fsevents "2.3.2"
 
@@ -10238,9 +10549,9 @@ pngjs@^5.0.0:
   integrity sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==
 
 possible-typed-array-names@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
-  integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae"
+  integrity sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==
 
 postcss-attribute-case-insensitive@^7.0.1:
   version "7.0.1"
@@ -10249,7 +10560,7 @@ postcss-attribute-case-insensitive@^7.0.1:
   dependencies:
     postcss-selector-parser "^7.0.0"
 
-postcss-calc@^10.0.2:
+postcss-calc@^10.1.1:
   version "10.1.1"
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-10.1.1.tgz#52b385f2e628239686eb6e3a16207a43f36064ca"
   integrity sha512-NYEsLHh8DgG/PRH2+G9BTuUdtf9ViS+vdoQ0YA5OQdGsfN4ztiwtDWNtBl9EKeqNMFnIu8IKZ0cLxEQ5r5KVMw==
@@ -10291,22 +10602,22 @@ postcss-color-rebeccapurple@^10.0.0:
     "@csstools/utilities" "^2.0.0"
     postcss-value-parser "^4.2.0"
 
-postcss-colormin@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-7.0.2.tgz#6f3c53c13158168669f45adc3926f35cb240ef8e"
-  integrity sha512-YntRXNngcvEvDbEjTdRWGU606eZvB5prmHG4BF0yLmVpamXbpsRJzevyy6MZVyuecgzI2AWAlvFi8DAeCqwpvA==
+postcss-colormin@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-7.0.5.tgz#0c7526289ab3f0daf96a376fd7430fae7258d5cf"
+  integrity sha512-ekIBP/nwzRWhEMmIxHHbXHcMdzd1HIUzBECaj5KEdLz9DVP2HzT065sEhvOx1dkLjYW7jyD0CngThx6bpFi2fA==
   dependencies:
-    browserslist "^4.23.3"
+    browserslist "^4.27.0"
     caniuse-api "^3.0.0"
     colord "^2.9.3"
     postcss-value-parser "^4.2.0"
 
-postcss-convert-values@^7.0.4:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-7.0.4.tgz#fc13ecedded6365f3c794b502dbcf77d298da12c"
-  integrity sha512-e2LSXPqEHVW6aoGbjV9RsSSNDO3A0rZLCBxN24zvxF25WknMPpX8Dm9UxxThyEbaytzggRuZxaGXqaOhxQ514Q==
+postcss-convert-values@^7.0.8:
+  version "7.0.8"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-7.0.8.tgz#0c599dc29891d47d7b4d6db399c402cf3ba8efc3"
+  integrity sha512-+XNKuPfkHTCEo499VzLMYn94TiL3r9YqRE3Ty+jP7UX4qjewUONey1t7CG21lrlTLN07GtGM8MqFVp86D4uKJg==
   dependencies:
-    browserslist "^4.23.3"
+    browserslist "^4.27.0"
     postcss-value-parser "^4.2.0"
 
 postcss-custom-media@^11.0.5:
@@ -10347,27 +10658,27 @@ postcss-dir-pseudo-class@^9.0.1:
   dependencies:
     postcss-selector-parser "^7.0.0"
 
-postcss-discard-comments@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-7.0.3.tgz#9c414e8ee99d3514ad06a3465ccc20ec1dbce780"
-  integrity sha512-q6fjd4WU4afNhWOA2WltHgCbkRhZPgQe7cXF74fuVB/ge4QbM9HEaOIzGSiMvM+g/cOsNAUGdf2JDzqA2F8iLA==
+postcss-discard-comments@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-7.0.5.tgz#0a95aa4d229a021bc441861d4773d57145ee15dd"
+  integrity sha512-IR2Eja8WfYgN5n32vEGSctVQ1+JARfu4UH8M7bgGh1bC+xI/obsPJXaBpQF7MAByvgwZinhpHpdrmXtvVVlKcQ==
   dependencies:
-    postcss-selector-parser "^6.1.2"
+    postcss-selector-parser "^7.1.0"
 
-postcss-discard-duplicates@^7.0.1:
+postcss-discard-duplicates@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-7.0.2.tgz#9cf3e659d4f94b046eef6f93679490c0250a8e4e"
+  integrity sha512-eTonaQvPZ/3i1ASDHOKkYwAybiM45zFIc7KXils4mQmHLqIswXD9XNOKEVxtTFnsmwYzF66u4LMgSr0abDlh5w==
+
+postcss-discard-empty@^7.0.1:
   version "7.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-7.0.1.tgz#f87f2fe47d8f01afb1e98361c1db3ce1e8afd1a3"
-  integrity sha512-oZA+v8Jkpu1ct/xbbrntHRsfLGuzoP+cpt0nJe5ED2FQF8n8bJtn7Bo28jSmBYwqgqnqkuSXJfSUEE7if4nClQ==
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-7.0.1.tgz#b6c57e8b5c69023169abea30dceb93f98a2ffd9f"
+  integrity sha512-cFrJKZvcg/uxB6Ijr4l6qmn3pXQBna9zyrPC+sK0zjbkDUZew+6xDltSF7OeB7rAtzaaMVYSdbod+sZOCWnMOg==
 
-postcss-discard-empty@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-7.0.0.tgz#218829d1ef0a5d5142dd62f0aa60e00e599d2033"
-  integrity sha512-e+QzoReTZ8IAwhnSdp/++7gBZ/F+nBq9y6PomfwORfP7q9nBpK5AMP64kOt0bA+lShBFbBDcgpJ3X4etHg4lzA==
-
-postcss-discard-overridden@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-7.0.0.tgz#b123ea51e3d4e1d0a254cf71eaff1201926d319c"
-  integrity sha512-GmNAzx88u3k2+sBTZrJSDauR0ccpE24omTQCVmaTTZFz1du6AasspjaUPMJ2ud4RslZpoFKyf+6MSPETLojc6w==
+postcss-discard-overridden@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-7.0.1.tgz#bd9c9bc5e4548d3b6e67e7f8d64f2c9d745ae2a0"
+  integrity sha512-7c3MMjjSZ/qYrx3uc1940GSOzN1Iqjtlqe8uoSg+qdVPYyRb0TILSqqmtlSFuE4mTDECwsm397Ya7iXGzfF7lg==
 
 postcss-double-position-gradients@^6.0.0:
   version "6.0.0"
@@ -10472,66 +10783,66 @@ postcss-media-query-parser@^0.2.3:
   resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
   integrity sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==
 
-postcss-merge-longhand@^7.0.4:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-7.0.4.tgz#a52d0662b4b29420f3b64a8d5b0ac5133d8db776"
-  integrity sha512-zer1KoZA54Q8RVHKOY5vMke0cCdNxMP3KBfDerjH/BYHh4nCIh+1Yy0t1pAEQF18ac/4z3OFclO+ZVH8azjR4A==
+postcss-merge-longhand@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-7.0.5.tgz#e1b126e92f583815482e8b1e82c47d2435a20421"
+  integrity sha512-Kpu5v4Ys6QI59FxmxtNB/iHUVDn9Y9sYw66D6+SZoIk4QTz1prC4aYkhIESu+ieG1iylod1f8MILMs1Em3mmIw==
   dependencies:
     postcss-value-parser "^4.2.0"
-    stylehacks "^7.0.4"
+    stylehacks "^7.0.5"
 
-postcss-merge-rules@^7.0.4:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-7.0.4.tgz#648cc864d3121e6ec72c2a4f08df1cc801e60ce8"
-  integrity sha512-ZsaamiMVu7uBYsIdGtKJ64PkcQt6Pcpep/uO90EpLS3dxJi6OXamIobTYcImyXGoW0Wpugh7DSD3XzxZS9JCPg==
+postcss-merge-rules@^7.0.7:
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-7.0.7.tgz#f49537e5029ce0e655c2f31fdb205f14575c7334"
+  integrity sha512-njWJrd/Ms6XViwowaaCc+/vqhPG3SmXn725AGrnl+BgTuRPEacjiLEaGq16J6XirMJbtKkTwnt67SS+e2WGoew==
   dependencies:
-    browserslist "^4.23.3"
+    browserslist "^4.27.0"
     caniuse-api "^3.0.0"
-    cssnano-utils "^5.0.0"
-    postcss-selector-parser "^6.1.2"
+    cssnano-utils "^5.0.1"
+    postcss-selector-parser "^7.1.0"
 
-postcss-minify-font-values@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-7.0.0.tgz#d16a75a2548e000779566b3568fc874ee5d0aa17"
-  integrity sha512-2ckkZtgT0zG8SMc5aoNwtm5234eUx1GGFJKf2b1bSp8UflqaeFzR50lid4PfqVI9NtGqJ2J4Y7fwvnP/u1cQog==
+postcss-minify-font-values@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-7.0.1.tgz#6fb4770131b31fd5a2014bd84e32f386a3406664"
+  integrity sha512-2m1uiuJeTplll+tq4ENOQSzB8LRnSUChBv7oSyFLsJRtUgAAJGP6LLz0/8lkinTgxrmJSPOEhgY1bMXOQ4ZXhQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-minify-gradients@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-7.0.0.tgz#f6d84456e6d49164a55d0e45bb1b1809c6cf0959"
-  integrity sha512-pdUIIdj/C93ryCHew0UgBnL2DtUS3hfFa5XtERrs4x+hmpMYGhbzo6l/Ir5de41O0GaKVpK1ZbDNXSY6GkXvtg==
+postcss-minify-gradients@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-7.0.1.tgz#933cb642dd00df397237c17194f37dcbe4cad739"
+  integrity sha512-X9JjaysZJwlqNkJbUDgOclyG3jZEpAMOfof6PUZjPnPrePnPG62pS17CjdM32uT1Uq1jFvNSff9l7kNbmMSL2A==
   dependencies:
     colord "^2.9.3"
-    cssnano-utils "^5.0.0"
+    cssnano-utils "^5.0.1"
     postcss-value-parser "^4.2.0"
 
-postcss-minify-params@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-7.0.2.tgz#264a76e25f202d8b5ca5290569c0e8c3ac599dfe"
-  integrity sha512-nyqVLu4MFl9df32zTsdcLqCFfE/z2+f8GE1KHPxWOAmegSo6lpV2GNy5XQvrzwbLmiU7d+fYay4cwto1oNdAaQ==
+postcss-minify-params@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-7.0.5.tgz#4a0d15e312252e41d0c8504227d43538e3f607a2"
+  integrity sha512-FGK9ky02h6Ighn3UihsyeAH5XmLEE2MSGH5Tc4tXMFtEDx7B+zTG6hD/+/cT+fbF7PbYojsmmWjyTwFwW1JKQQ==
   dependencies:
-    browserslist "^4.23.3"
-    cssnano-utils "^5.0.0"
+    browserslist "^4.27.0"
+    cssnano-utils "^5.0.1"
     postcss-value-parser "^4.2.0"
 
-postcss-minify-selectors@^7.0.4:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-7.0.4.tgz#2b69c99ec48a1c223fce4840609d9c53340a11f5"
-  integrity sha512-JG55VADcNb4xFCf75hXkzc1rNeURhlo7ugf6JjiiKRfMsKlDzN9CXHZDyiG6x/zGchpjQS+UAgb1d4nqXqOpmA==
+postcss-minify-selectors@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-7.0.5.tgz#d8c89eeeb208705ab4127a464d1f54a3bc22cae3"
+  integrity sha512-x2/IvofHcdIrAm9Q+p06ZD1h6FPcQ32WtCRVodJLDR+WMn8EVHI1kvLxZuGKz/9EY5nAmI6lIQIrpo4tBy5+ug==
   dependencies:
     cssesc "^3.0.0"
-    postcss-selector-parser "^6.1.2"
+    postcss-selector-parser "^7.1.0"
 
-postcss-mixins@^11.0.0:
-  version "11.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-mixins/-/postcss-mixins-11.0.3.tgz#edae34c010a3b42d94207309fe38683404e79575"
-  integrity sha512-HZa6DHlN7uCkp7GTFNvhpyK/Gi9+vrVG7FPl2oQdj+sXUuYo4ri9OsWBseTnvnLfWxRWOq8/VwcHcixtZPrRRg==
+postcss-mixins@^12.0.0:
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-mixins/-/postcss-mixins-12.0.0.tgz#1eeb8a7313a45d0b707a294640c612cc70a336d9"
+  integrity sha512-br7vXwoA5niiQAW3BLgd66xoGie/JJ1O4k7uLDbb+fbdYFXouxAjppIkBZDpPtSIzx63WeVXRGEYStSYa5kQmw==
   dependencies:
     postcss-js "^4.0.1"
     postcss-simple-vars "^7.0.1"
-    sugarss "^4.0.1"
-    tinyglobby "^0.2.7"
+    sugarss "^5.0.0"
+    tinyglobby "^0.2.14"
 
 postcss-modules-extract-imports@^3.1.0:
   version "3.1.0"
@@ -10577,65 +10888,65 @@ postcss-nesting@^13.0.1:
     "@csstools/selector-specificity" "^5.0.0"
     postcss-selector-parser "^7.0.0"
 
-postcss-normalize-charset@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-7.0.0.tgz#92244ae73c31bf8f8885d5f16ff69e857ac6c001"
-  integrity sha512-ABisNUXMeZeDNzCQxPxBCkXexvBrUHV+p7/BXOY+ulxkcjUZO0cp8ekGBwvIh2LbCwnWbyMPNJVtBSdyhM2zYQ==
+postcss-normalize-charset@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-7.0.1.tgz#bccc3f7c5f4440883608eea8b444c8f41ce55ff6"
+  integrity sha512-sn413ofhSQHlZFae//m9FTOfkmiZ+YQXsbosqOWRiVQncU2BA3daX3n0VF3cG6rGLSFVc5Di/yns0dFfh8NFgQ==
 
-postcss-normalize-display-values@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-7.0.0.tgz#01fb50e5e97ef8935363629bea5a6d3b3aac1342"
-  integrity sha512-lnFZzNPeDf5uGMPYgGOw7v0BfB45+irSRz9gHQStdkkhiM0gTfvWkWB5BMxpn0OqgOQuZG/mRlZyJxp0EImr2Q==
+postcss-normalize-display-values@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-7.0.1.tgz#feb40277d89a7f677b67a84cac999f0306e38235"
+  integrity sha512-E5nnB26XjSYz/mGITm6JgiDpAbVuAkzXwLzRZtts19jHDUBFxZ0BkXAehy0uimrOjYJbocby4FVswA/5noOxrQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-positions@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-7.0.0.tgz#4eebd7c9d3dde40c97b8047cad38124fc844c463"
-  integrity sha512-I0yt8wX529UKIGs2y/9Ybs2CelSvItfmvg/DBIjTnoUSrPxSV7Z0yZ8ShSVtKNaV/wAY+m7bgtyVQLhB00A1NQ==
+postcss-normalize-positions@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-7.0.1.tgz#c771c0d33034455205f060b999d8557c2308d22c"
+  integrity sha512-pB/SzrIP2l50ZIYu+yQZyMNmnAcwyYb9R1fVWPRxm4zcUFCY2ign7rcntGFuMXDdd9L2pPNUgoODDk91PzRZuQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-repeat-style@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-7.0.0.tgz#0cb784655d5714d29bd3bda6dee2fb628aa7227b"
-  integrity sha512-o3uSGYH+2q30ieM3ppu9GTjSXIzOrRdCUn8UOMGNw7Af61bmurHTWI87hRybrP6xDHvOe5WlAj3XzN6vEO8jLw==
+postcss-normalize-repeat-style@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-7.0.1.tgz#05fe4d838eedbd996436c5cab78feef9bb1ae57b"
+  integrity sha512-NsSQJ8zj8TIDiF0ig44Byo3Jk9e4gNt9x2VIlJudnQQ5DhWAHJPF4Tr1ITwyHio2BUi/I6Iv0HRO7beHYOloYQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-string@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-7.0.0.tgz#a119d3e63a9614570d8413d572fb9fc8c6a64e8c"
-  integrity sha512-w/qzL212DFVOpMy3UGyxrND+Kb0fvCiBBujiaONIihq7VvtC7bswjWgKQU/w4VcRyDD8gpfqUiBQ4DUOwEJ6Qg==
+postcss-normalize-string@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-7.0.1.tgz#0f111e7b5dfb6de6ab19f09d9e1c16fabeee232f"
+  integrity sha512-QByrI7hAhsoze992kpbMlJSbZ8FuCEc1OT9EFbZ6HldXNpsdpZr+YXC5di3UEv0+jeZlHbZcoCADgb7a+lPmmQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-timing-functions@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-7.0.0.tgz#99d0ee8c4b23b7f4355fafb91385833b9b07108b"
-  integrity sha512-tNgw3YV0LYoRwg43N3lTe3AEWZ66W7Dh7lVEpJbHoKOuHc1sLrzMLMFjP8SNULHaykzsonUEDbKedv8C+7ej6g==
+postcss-normalize-timing-functions@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-7.0.1.tgz#7b645a36f113fec49d95d56386c9980316c71216"
+  integrity sha512-bHifyuuSNdKKsnNJ0s8fmfLMlvsQwYVxIoUBnowIVl2ZAdrkYQNGVB4RxjfpvkMjipqvbz0u7feBZybkl/6NJg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-unicode@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-7.0.2.tgz#095f8d36ea29adfdf494069c1de101112992a713"
-  integrity sha512-ztisabK5C/+ZWBdYC+Y9JCkp3M9qBv/XFvDtSw0d/XwfT3UaKeW/YTm/MD/QrPNxuecia46vkfEhewjwcYFjkg==
+postcss-normalize-unicode@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-7.0.5.tgz#d47a3cc40529d7eeb18d7f7a8a215c38c54455cd"
+  integrity sha512-X6BBwiRxVaFHrb2WyBMddIeB5HBjJcAaUHyhLrM2FsxSq5TFqcHSsK7Zu1otag+o0ZphQGJewGH1tAyrD0zX1Q==
   dependencies:
-    browserslist "^4.23.3"
+    browserslist "^4.27.0"
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-url@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-7.0.0.tgz#c88cb7cf8952d3ff631e4eba924e7b060ca802f6"
-  integrity sha512-+d7+PpE+jyPX1hDQZYG+NaFD+Nd2ris6r8fPTBAjE8z/U41n/bib3vze8x7rKs5H1uEw5ppe9IojewouHk0klQ==
+postcss-normalize-url@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-7.0.1.tgz#d6471a22b6747ce93d7038c16eb9f1ba8b307e25"
+  integrity sha512-sUcD2cWtyK1AOL/82Fwy1aIVm/wwj5SdZkgZ3QiUzSzQQofrbq15jWJ3BA7Z+yVRwamCjJgZJN0I9IS7c6tgeQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-whitespace@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-7.0.0.tgz#46b025f0bea72139ddee63015619b0c21cebd845"
-  integrity sha512-37/toN4wwZErqohedXYqWgvcHUGlT8O/m2jVkAfAe9Bd4MzRqlBmXrJRePH0e9Wgnz2X7KymTgTOaaFizQe3AQ==
+postcss-normalize-whitespace@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-7.0.1.tgz#ab8e9ff1f3213f3f3851c0a7d0e4ce4716777cea"
+  integrity sha512-vsbgFHMFQrJBJKrUFJNZ2pgBeBkC2IvvoHjz1to0/0Xk7sII24T0qFOiJzG6Fu3zJoq/0yI4rKWi7WhApW+EFA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -10644,12 +10955,12 @@ postcss-opacity-percentage@^3.0.0:
   resolved "https://registry.yarnpkg.com/postcss-opacity-percentage/-/postcss-opacity-percentage-3.0.0.tgz#0b0db5ed5db5670e067044b8030b89c216e1eb0a"
   integrity sha512-K6HGVzyxUxd/VgZdX04DCtdwWJ4NGLG212US4/LA1TLAbHgmAsTWVR86o+gGIbFtnTkfOpb9sCRBx8K7HO66qQ==
 
-postcss-ordered-values@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-7.0.1.tgz#8b4b5b8070ca7756bd49f07d5edf274b8f6782e0"
-  integrity sha512-irWScWRL6nRzYmBOXReIKch75RRhNS86UPUAxXdmW/l0FcAsg0lvAXQCby/1lymxn/o0gVa6Rv/0f03eJOwHxw==
+postcss-ordered-values@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-7.0.2.tgz#0e803fbb9601e254270481772252de9a8c905f48"
+  integrity sha512-AMJjt1ECBffF7CEON/Y0rekRLS6KsePU6PRP08UqYW4UGFRnTXNrByUzYK1h8AC7UWTZdQ9O3Oq9kFIhm0SFEw==
   dependencies:
-    cssnano-utils "^5.0.0"
+    cssnano-utils "^5.0.1"
     postcss-value-parser "^4.2.0"
 
 postcss-overflow-shorthand@^6.0.0:
@@ -10747,18 +11058,18 @@ postcss-pseudo-class-any-link@^10.0.1:
   dependencies:
     postcss-selector-parser "^7.0.0"
 
-postcss-reduce-initial@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-7.0.2.tgz#3dc085347a5943e18547d4b0aa5bd4ff5a93b2c5"
-  integrity sha512-pOnu9zqQww7dEKf62Nuju6JgsW2V0KRNBHxeKohU+JkHd/GAH5uvoObqFLqkeB2n20mr6yrlWDvo5UBU5GnkfA==
+postcss-reduce-initial@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-7.0.5.tgz#cf74bb747dfa003cd3d5372081f6157e6d8e1545"
+  integrity sha512-RHagHLidG8hTZcnr4FpyMB2jtgd/OcyAazjMhoy5qmWJOx1uxKh4ntk0Pb46ajKM0rkf32lRH4C8c9qQiPR6IA==
   dependencies:
-    browserslist "^4.23.3"
+    browserslist "^4.27.0"
     caniuse-api "^3.0.0"
 
-postcss-reduce-transforms@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-7.0.0.tgz#0386080a14e5faad9f8eda33375b79fe7c4f9677"
-  integrity sha512-pnt1HKKZ07/idH8cpATX/ujMbtOGhUfE+m8gbqwJE05aTaNw8gbo34a2e3if0xc0dlu75sUOiqvwCGY3fzOHew==
+postcss-reduce-transforms@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-7.0.1.tgz#f87111264b0dfa07e1f708d7e6401578707be5d6"
+  integrity sha512-MhyEbfrm+Mlp/36hvZ9mT9DaO7dbncU0CvWI8V93LRkY6IYlu38OPg3FObnuKTUxJ4qA8HpurdQOo5CyqqO76g==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -10789,7 +11100,7 @@ postcss-selector-not@^8.0.1:
   dependencies:
     postcss-selector-parser "^7.0.0"
 
-postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.1.2:
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
   version "6.1.2"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de"
   integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==
@@ -10797,18 +11108,10 @@ postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-selector-parser@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz#41bd8b56f177c093ca49435f65731befe25d6b9c"
-  integrity sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==
-  dependencies:
-    cssesc "^3.0.0"
-    util-deprecate "^1.0.2"
-
-postcss-selector-parser@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz#4d6af97eba65d73bc4d84bcb343e865d7dd16262"
-  integrity sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==
+postcss-selector-parser@^7.0.0, postcss-selector-parser@^7.1.0, postcss-selector-parser@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz#e75d2e0d843f620e5df69076166f4e16f891cb9f"
+  integrity sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
@@ -10818,22 +11121,22 @@ postcss-simple-vars@^7.0.1:
   resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-7.0.1.tgz#836b3097a54dcd13dbd3c36a5dbdd512fad2954c"
   integrity sha512-5GLLXaS8qmzHMOjVxqkk1TZPf1jMqesiI7qLhnlyERalG0sMbHIbJqrcnrpmZdKCLglHnRHoEBB61RtGTsj++A==
 
-postcss-svgo@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-7.0.1.tgz#2b63571d8e9568384df334bac9917baff4d23f58"
-  integrity sha512-0WBUlSL4lhD9rA5k1e5D8EN5wCEyZD6HJk0jIvRxl+FDVOMlJ7DePHYWGGVc5QRqrJ3/06FTXM0bxjmJpmTPSA==
+postcss-svgo@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-7.1.0.tgz#7eb6764a643ac2699bf56eef6d2676d428ed4542"
+  integrity sha512-KnAlfmhtoLz6IuU3Sij2ycusNs4jPW+QoFE5kuuUOK8awR6tMxZQrs5Ey3BUz7nFCzT3eqyFgqkyrHiaU2xx3w==
   dependencies:
     postcss-value-parser "^4.2.0"
-    svgo "^3.3.2"
+    svgo "^4.0.0"
 
-postcss-unique-selectors@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-7.0.3.tgz#483fc11215b23d517d5d9bbe5833d9915619ca33"
-  integrity sha512-J+58u5Ic5T1QjP/LDV9g3Cx4CNOgB5vz+kM6+OxHHhFACdcDeKhBXjQmB7fnIZM12YSTvsL0Opwco83DmacW2g==
+postcss-unique-selectors@^7.0.4:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-7.0.4.tgz#625ad1c808bdf322fab6c027ae8d4f2637140995"
+  integrity sha512-pmlZjsmEAG7cHd7uK3ZiNSW6otSZ13RHuZ/4cDN/bVglS5EpF2r2oxY99SuOHa8m7AWoBCelTS3JPpzsIs8skQ==
   dependencies:
-    postcss-selector-parser "^6.1.2"
+    postcss-selector-parser "^7.1.0"
 
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
@@ -10847,15 +11150,6 @@ postcss@8.4.46:
     picocolors "^1.1.0"
     source-map-js "^1.2.1"
 
-postcss@8.4.49:
-  version "8.4.49"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
-  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
-  dependencies:
-    nanoid "^3.3.7"
-    picocolors "^1.1.1"
-    source-map-js "^1.2.1"
-
 postcss@^8.3.11, postcss@^8.4.33:
   version "8.4.47"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365"
@@ -10865,29 +11159,30 @@ postcss@^8.3.11, postcss@^8.4.33:
     picocolors "^1.1.0"
     source-map-js "^1.2.1"
 
-postcss@^8.4.40, postcss@^8.5.3:
-  version "8.5.3"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.3.tgz#1463b6f1c7fb16fe258736cba29a2de35237eafb"
-  integrity sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==
+postcss@^8.4.40, postcss@^8.5.6:
+  version "8.5.6"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.6.tgz#2825006615a619b4f62a9e7426cc120b349a8f3c"
+  integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==
   dependencies:
-    nanoid "^3.3.8"
+    nanoid "^3.3.11"
     picocolors "^1.1.1"
     source-map-js "^1.2.1"
 
-posthog-js@1.248.1:
-  version "1.248.1"
-  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.248.1.tgz#7d45bbf8af1fd1092871ee0b0a062dc0a1907aec"
-  integrity sha512-2KBbvvLbiNqQdoEgjczZJ7im5QT8zi0Q29a8AmfXs0UGyaYxmgqPCrE1elQmGBuAm1S3T+Xw2D6Ff0VQPXE6Rw==
+posthog-js@1.302.2:
+  version "1.302.2"
+  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.302.2.tgz#149ab7d511106541d7056bf239094c425fb4ef0a"
+  integrity sha512-4voih22zQe7yHA7DynlQ3B7kgzJOaKIjzV7K3jJ2Qf+UDXd1ZgO7xYmLWYVtuKEvD1OXHbKk/fPhUTZeHEWpBw==
   dependencies:
+    "@posthog/core" "1.7.1"
     core-js "^3.38.1"
     fflate "^0.4.8"
     preact "^10.19.3"
     web-vitals "^4.2.4"
 
-potpack@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/potpack/-/potpack-2.0.0.tgz#61f4dd2dc4b3d5e996e3698c0ec9426d0e169104"
-  integrity sha512-Q+/tYsFU9r7xoOJ+y/ZTtdVQwTWfzjbiXBDMM/JKUux3+QPP02iUuIoeBQ+Ot6oEDlC+/PGjB/5A3K7KKb7hcw==
+potpack@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/potpack/-/potpack-2.1.0.tgz#fe548e2f9061e9937f17191c1ab6dd98ca30e02f"
+  integrity sha512-pcaShQc1Shq0y+E7GqJqvZj8DTthWV1KeHGdi0Z6IAin2Oi3JnLCOfwnCo84qc+HAp52wT9nK9H7FAJp5a44GQ==
 
 preact@^10.19.3:
   version "10.24.3"
@@ -10899,10 +11194,10 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prettier@3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.5.3.tgz#4fc2ce0d657e7a02e602549f053b239cb7dfe1b5"
-  integrity sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==
+prettier@3.7.4:
+  version "3.7.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.7.4.tgz#d2f8335d4b1cec47e1c8098645411b0c9dff9c0f"
+  integrity sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==
 
 prettier@^2.6.2:
   version "2.8.8"
@@ -10917,6 +11212,15 @@ pretty-error@^4.0.0:
     lodash "^4.17.20"
     renderkid "^3.0.0"
 
+pretty-format@30.2.0, pretty-format@^30.0.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-30.2.0.tgz#2d44fe6134529aed18506f6d11509d8a62775ebe"
+  integrity sha512-9uBdv/B4EefsuAL+pWqueZyZS2Ba+LxfFeQ9DN14HU4bN8bhaxKdkpjpB6fs9+pSjIBu+FXQHImEg8j/Lw0+vA==
+  dependencies:
+    "@jest/schemas" "30.0.5"
+    ansi-styles "^5.2.0"
+    react-is "^18.3.1"
+
 pretty-format@^27.0.2:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
@@ -10926,15 +11230,6 @@ pretty-format@^27.0.2:
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
-pretty-format@^29.0.0, pretty-format@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
-  integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
-  dependencies:
-    "@jest/schemas" "^29.6.3"
-    ansi-styles "^5.0.0"
-    react-is "^18.0.0"
-
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -10950,14 +11245,6 @@ progress@^2.0.3:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-prompts@^2.0.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
-  integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
-  dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.5"
-
 prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
@@ -10983,10 +11270,10 @@ properties-reader@^2.3.0:
   dependencies:
     mkdirp "^1.0.4"
 
-protobufjs@^7.2.5, protobufjs@^7.3.2:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.4.0.tgz#7efe324ce9b3b61c82aae5de810d287bc08a248a"
-  integrity sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==
+protobufjs@^7.2.5, protobufjs@^7.3.2, protobufjs@^7.5.3:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.5.4.tgz#885d31fe9c4b37f25d1bb600da30b1c5b37d286a"
+  integrity sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -11019,28 +11306,23 @@ proxy-from-env@^1.1.0:
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
-psl@^1.1.33:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
-  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
-
 pump@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.2.tgz#836f3edd6bc2ee599256c924ffe0d88573ddcbf8"
-  integrity sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.3.tgz#151d979f1a29668dc0025ec589a455b53282268d"
+  integrity sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode@^2.1.0, punycode@^2.1.1:
+punycode@^2.1.0, punycode@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
-pure-rand@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.1.0.tgz#d173cf23258231976ccbdb05247c9787957604f2"
-  integrity sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==
+pure-rand@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-7.0.1.tgz#6f53a5a9e3e4a47445822af96821ca509ed37566"
+  integrity sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==
 
 pvtsutils@^1.3.2, pvtsutils@^1.3.5:
   version "1.3.5"
@@ -11054,6 +11336,13 @@ pvutils@^1.1.3:
   resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.1.3.tgz#f35fc1d27e7cd3dfbd39c0826d173e806a03f5a3"
   integrity sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==
 
+qified@^0.5.2:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/qified/-/qified-0.5.3.tgz#2d01866eb99c8de3a18965a4a809d9349e26210a"
+  integrity sha512-kXuQdQTB6oN3KhI6V4acnBSZx8D2I4xzZvn9+wFLLFCoBNQY/sFnCW6c43OL7pOQ2HvGV4lnWIXNmgfp7cTWhQ==
+  dependencies:
+    hookified "^1.13.0"
+
 qrcode@1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.4.tgz#5cb81d86eb57c675febb08cf007fff963405da88"
@@ -11082,11 +11371,6 @@ querystring@^0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd"
   integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==
 
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
-
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -11124,15 +11408,15 @@ raw-body@2.5.2:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-raw-body@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-3.0.0.tgz#25b3476f07a51600619dae3fe82ddc28a36e5e0f"
-  integrity sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==
+raw-body@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-3.0.2.tgz#3e3ada5ae5568f9095d84376fd3a49b8fb000a51"
+  integrity sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==
   dependencies:
-    bytes "3.1.2"
-    http-errors "2.0.0"
-    iconv-lite "0.6.3"
-    unpipe "1.0.0"
+    bytes "~3.1.2"
+    http-errors "~2.0.1"
+    iconv-lite "~0.7.0"
+    unpipe "~1.0.0"
 
 raw-loader@^4.0.2:
   version "4.0.2"
@@ -11166,23 +11450,44 @@ react-blurhash@^0.3.0:
   integrity sha512-XlKr4Ns1iYFRnk6DkAblNbAwN/bTJvxTVoxMvmTcURdc5oLoXZwqAF9N3LZUh/HT+QFlq5n6IS6VsDGsviYAiQ==
 
 react-clientside-effect@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.7.tgz#78eb62e3be36208d4d8d5b2668ae630a32deca73"
-  integrity sha512-gce9m0Pk/xYYMEojRI9bgvqQAkl6hm7ozQvqWPyQx+kULiatdHgkNM1QG4DQRx5N9BAzWSCJmt9mMV8/KsdgVg==
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.8.tgz#0b90a9d7b2a1823a3a10ed1ea3f651f7e0301cb7"
+  integrity sha512-ma2FePH0z3px2+WOu6h+YycZcEvFmmxIlAb62cF52bG86eMySciO/EQZeQMXd07kPCYB0a1dWDT5J+KE9mCDUw==
   dependencies:
     "@babel/runtime" "^7.12.13"
 
-react-dom@^19.0.0:
-  version "19.1.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.1.0.tgz#133558deca37fa1d682708df8904b25186793623"
-  integrity sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==
+react-docgen-typescript@^2.2.2:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/react-docgen-typescript/-/react-docgen-typescript-2.4.0.tgz#033428b4a6a639d050ac8baf2a5195c596521713"
+  integrity sha512-ZtAp5XTO5HRzQctjPU0ybY0RRCQO19X/8fxn3w7y2VVTUbGHDKULPTL4ky3vB05euSgG5NpALhEhDPvQ56wvXg==
+
+react-docgen@^8.0.0, react-docgen@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-8.0.2.tgz#450efcac75813e3d614d7bd15eb4066e2e7bcbf5"
+  integrity sha512-+NRMYs2DyTP4/tqWz371Oo50JqmWltR1h2gcdgUMAWZJIAvrd0/SqlCfx7tpzpl/s36rzw6qH2MjoNrxtRNYhA==
   dependencies:
-    scheduler "^0.26.0"
+    "@babel/core" "^7.28.0"
+    "@babel/traverse" "^7.28.0"
+    "@babel/types" "^7.28.2"
+    "@types/babel__core" "^7.20.5"
+    "@types/babel__traverse" "^7.20.7"
+    "@types/doctrine" "^0.0.9"
+    "@types/resolve" "^1.20.2"
+    doctrine "^3.0.0"
+    resolve "^1.22.1"
+    strip-indent "^4.0.0"
+
+react-dom@^19.0.0:
+  version "19.2.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.2.1.tgz#ce3527560bda4f997e47d10dab754825b3061f59"
+  integrity sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg==
+  dependencies:
+    scheduler "^0.27.0"
 
 react-focus-lock@^2.5.1:
-  version "2.13.6"
-  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.13.6.tgz#29751bf2e4e30f6248673cd87a347c74ff2af672"
-  integrity sha512-ehylFFWyYtBKXjAO9+3v8d0i+cnc1trGS0vlTGhzFW1vbFXVUTmR8s2tt/ZQG8x5hElg6rhENlLG1H3EZK0Llg==
+  version "2.13.7"
+  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.13.7.tgz#2f51ad417e4212a9f7bdd87da092aa2ad0536d5a"
+  integrity sha512-20lpZHEQrXPb+pp1tzd4ULL6DyO5D2KnR0G69tTDdydrmNhU7pdFmbQUYVyHUgp+xN29IuFR0PVuhOmvaZL9Og==
   dependencies:
     "@babel/runtime" "^7.0.0"
     focus-lock "^1.3.6"
@@ -11191,10 +11496,10 @@ react-focus-lock@^2.5.1:
     use-callback-ref "^1.3.3"
     use-sidecar "^1.1.3"
 
-react-is@19.1.0, react-is@^17.0.1, react-is@^18.0.0:
-  version "19.1.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-19.1.0.tgz#805bce321546b7e14c084989c77022351bbdd11b"
-  integrity sha512-Oe56aUPnkHyyDxxkvqtd7KkdQP5uIUfHxd5XTb3wE9d/kRnZLmKbDB0GWk919tdQ+mxxPtG6EAs6RMT6i1qtHg==
+react-is@19.2.1, react-is@^17.0.1, react-is@^18.3.1:
+  version "19.2.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-19.2.1.tgz#712fa6ee30c8398dc34260017325dad92b9224c5"
+  integrity sha512-L7BnWgRbMwzMAubQcS7sXdPdNLmKlucPlopgAzx7FtYbksWZgEWiuYM5x9T6UqS2Ne0rsgQTq5kY2SGqpzUkYA==
 
 react-is@^16.13.1, react-is@^16.7.0:
   version "16.13.1"
@@ -11206,10 +11511,10 @@ react-is@^17.0.2:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
-react-lifecycles-compat@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
-  integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
+react-merge-refs@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/react-merge-refs/-/react-merge-refs-3.0.2.tgz#483b4e8029f89d805c4e55c8d22e9b8f77e3b58e"
+  integrity sha512-MSZAfwFfdbEvwkKWP5EI5chuLYnNUxNS7vyS0i1Jp+wtd8J4Ga2ddzhaE68aMol2Z4vCnRM/oGOo1a3V75UPlw==
 
 react-property@2.0.2:
   version "2.0.2"
@@ -11228,37 +11533,36 @@ react-redux@^7.2.0:
     prop-types "^15.7.2"
     react-is "^17.0.2"
 
-react-remove-scroll-bar@^2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.6.tgz#3e585e9d163be84a010180b18721e851ac81a29c"
-  integrity sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==
+react-remove-scroll-bar@^2.3.7:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.8.tgz#99c20f908ee467b385b68a3469b4a3e750012223"
+  integrity sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==
   dependencies:
-    react-style-singleton "^2.2.1"
+    react-style-singleton "^2.2.2"
     tslib "^2.0.0"
 
-react-remove-scroll@2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.6.0.tgz#fb03a0845d7768a4f1519a99fdb84983b793dc07"
-  integrity sha512-I2U4JVEsQenxDAKaVa3VZ/JeJZe0/2DxPWL8Tj8yLKctQJQiZM52pn/GWFpSp8dftjM3pSAHVJZscAnC/y+ySQ==
+react-remove-scroll@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.7.1.tgz#d2101d414f6d81d7d3bf033f3c1cb4785789f753"
+  integrity sha512-HpMh8+oahmIdOuS5aFKKY6Pyog+FNaZV/XyJOq7b4YFwsFHe5yYfdbIalI4k3vU2nSDql7YskmUseHsRrJqIPA==
   dependencies:
-    react-remove-scroll-bar "^2.3.6"
-    react-style-singleton "^2.2.1"
+    react-remove-scroll-bar "^2.3.7"
+    react-style-singleton "^2.2.3"
     tslib "^2.1.0"
-    use-callback-ref "^1.3.0"
-    use-sidecar "^1.1.2"
+    use-callback-ref "^1.3.3"
+    use-sidecar "^1.1.3"
 
 react-string-replace@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/react-string-replace/-/react-string-replace-1.1.1.tgz#8413a598c60e397fe77df3464f2889f00ba25989"
   integrity sha512-26TUbLzLfHQ5jO5N7y3Mx88eeKo0Ml0UjCQuX4BMfOd/JX+enQqlKpL1CZnmjeBRvQE8TR+ds9j1rqx9CxhKHQ==
 
-react-style-singleton@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.2.1.tgz#f99e420492b2d8f34d38308ff660b60d0b1205b4"
-  integrity sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==
+react-style-singleton@^2.2.2, react-style-singleton@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.2.3.tgz#4265608be69a4d70cfe3047f2c6c88b2c3ace388"
+  integrity sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==
   dependencies:
     get-nonce "^1.0.0"
-    invariant "^2.2.4"
     tslib "^2.0.0"
 
 react-transition-group@^4.4.1:
@@ -11271,47 +11575,15 @@ react-transition-group@^4.4.1:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react-universal-interface@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/react-universal-interface/-/react-universal-interface-0.6.2.tgz#5e8d438a01729a4dbbcbeeceb0b86be146fe2b3b"
-  integrity sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw==
-
-react-use@17.6.0:
-  version "17.6.0"
-  resolved "https://registry.yarnpkg.com/react-use/-/react-use-17.6.0.tgz#2101a3a79dc965a25866b21f5d6de4b128488a14"
-  integrity sha512-OmedEScUMKFfzn1Ir8dBxiLLSOzhKe/dPZwVxcujweSj45aNM7BEGPb9BEVIgVEqEXx6f3/TsXzwIktNgUR02g==
-  dependencies:
-    "@types/js-cookie" "^2.2.6"
-    "@xobotyi/scrollbar-width" "^1.9.5"
-    copy-to-clipboard "^3.3.1"
-    fast-deep-equal "^3.1.3"
-    fast-shallow-equal "^1.0.0"
-    js-cookie "^2.2.1"
-    nano-css "^5.6.2"
-    react-universal-interface "^0.6.2"
-    resize-observer-polyfill "^1.5.1"
-    screenfull "^5.1.0"
-    set-harmonic-interval "^1.0.1"
-    throttle-debounce "^3.0.1"
-    ts-easing "^0.2.0"
-    tslib "^2.1.0"
-
-react-virtualized@^9.22.5:
-  version "9.22.6"
-  resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.22.6.tgz#3ae2aa69eca61cf3af332e2f9d6b4aa5638786d5"
-  integrity sha512-U5j7KuUQt3AaMatlMJ0UJddqSiX+Km0YJxSqbAzIiGw5EmNz0khMyqP2hzgu4+QUtm+QPIrxzUX4raJxmVJnHg==
-  dependencies:
-    "@babel/runtime" "^7.7.2"
-    clsx "^1.0.4"
-    dom-helpers "^5.1.3"
-    loose-envify "^1.4.0"
-    prop-types "^15.7.2"
-    react-lifecycles-compat "^3.0.4"
+react-virtuoso@^4.14.0:
+  version "4.17.0"
+  resolved "https://registry.yarnpkg.com/react-virtuoso/-/react-virtuoso-4.17.0.tgz#e81f2da99792cfd9317e910b243d847ebeb09248"
+  integrity sha512-od3pi2v13v31uzn5zPXC2u3ouISFCVhjFVFch2VvS2Cx7pWA2F1aJa3XhNTN2F07M3lhfnMnsmGeH+7wZICr7w==
 
 react@^19.0.0:
-  version "19.1.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-19.1.0.tgz#926864b6c48da7627f004795d6cce50e90793b75"
-  integrity sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==
+  version "19.2.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-19.2.1.tgz#8600fa205e58e2e807f6ef431c9f6492591a2700"
+  integrity sha512-DGrYcCWK7tvYMnWh79yrPHt+vdx9tY+1gPZa7nJQtO/p8bLTDaHp4dzwEhQB7pZ4Xe3ok4XKuEPrVuc+wlpkmw==
 
 read-cache@^1.0.0:
   version "1.0.0"
@@ -11379,10 +11651,10 @@ readdir-glob@^1.1.2:
   dependencies:
     minimatch "^5.1.0"
 
-readdirp@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.1.1.tgz#bd115327129672dc47f87408f05df9bd9ca3ef55"
-  integrity sha512-h80JrZu/MHUZCyHu5ciuoI0+WxsCxzxJTILn6Fs8rxSnFPh+UVHYfeIxK1nVGugMqkfC4vJcBOYbkfkwYK0+gw==
+readdirp@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-5.0.0.tgz#fbf1f71a727891d685bb1786f9ba74084f6e2f91"
+  integrity sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==
 
 readdirp@~3.6.0:
   version "3.6.0"
@@ -11391,6 +11663,17 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
+recast@^0.23.5:
+  version "0.23.11"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.11.tgz#8885570bb28cf773ba1dc600da7f502f7883f73f"
+  integrity sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==
+  dependencies:
+    ast-types "^0.16.1"
+    esprima "~4.0.0"
+    source-map "~0.6.1"
+    tiny-invariant "^1.3.3"
+    tslib "^2.0.1"
+
 rechoir@^0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"
@@ -11432,10 +11715,10 @@ reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9:
     get-proto "^1.0.1"
     which-builtin-type "^1.2.1"
 
-regenerate-unicode-properties@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz#626e39df8c372338ea9b8028d1f99dc3fd9c3db0"
-  integrity sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==
+regenerate-unicode-properties@^10.2.2:
+  version "10.2.2"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.2.tgz#aa113812ba899b630658c7623466be71e1f86f66"
+  integrity sha512-m03P+zhBeQd1RGnYxrGyDAPpWX/epKirLrp8e3qevZdVkKtnCrjjWczIbYc8+xd6vcTStVlqfycTx1KR4LOr0g==
   dependencies:
     regenerate "^1.4.2"
 
@@ -11449,7 +11732,7 @@ regexp-tree@^0.1.27:
   resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.27.tgz#2198f0ef54518ffa743fe74d983b56ffd631b6cd"
   integrity sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==
 
-regexp.prototype.flags@^1.5.3:
+regexp.prototype.flags@^1.5.3, regexp.prototype.flags@^1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19"
   integrity sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==
@@ -11461,17 +11744,17 @@ regexp.prototype.flags@^1.5.3:
     gopd "^1.2.0"
     set-function-name "^2.0.2"
 
-regexpu-core@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.2.0.tgz#0e5190d79e542bf294955dccabae04d3c7d53826"
-  integrity sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==
+regexpu-core@^6.3.1:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.4.0.tgz#3580ce0c4faedef599eccb146612436b62a176e5"
+  integrity sha512-0ghuzq67LI9bLXpOX/ISfve/Mq33a4aFRzoQYhnnok1JOFpmE/A2TBGkNVenOGEeSBCjIiWcc6MVOG5HEQv0sA==
   dependencies:
     regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.2.0"
+    regenerate-unicode-properties "^10.2.2"
     regjsgen "^0.8.0"
-    regjsparser "^0.12.0"
+    regjsparser "^0.13.0"
     unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.1.0"
+    unicode-match-property-value-ecmascript "^2.2.1"
 
 regjsgen@^0.8.0:
   version "0.8.0"
@@ -11485,12 +11768,12 @@ regjsparser@^0.10.0:
   dependencies:
     jsesc "~0.5.0"
 
-regjsparser@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.12.0.tgz#0e846df6c6530586429377de56e0475583b088dc"
-  integrity sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==
+regjsparser@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.13.0.tgz#01f8351335cf7898d43686bc74d2dd71c847ecc0"
+  integrity sha512-NZQZdC5wOE/H3UT28fVGL+ikOZcEzfMGk/c3iN9UGxzWHMa1op7274oyiUVrAG4B2EuFhus8SvkaYnhvW92p9Q==
   dependencies:
-    jsesc "~3.0.2"
+    jsesc "~3.1.0"
 
 relateurl@^0.2.7:
   version "0.2.7"
@@ -11533,11 +11816,6 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
-resize-observer-polyfill@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
-  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
-
 resolve-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -11562,12 +11840,7 @@ resolve-protobuf-schema@^2.1.0:
   dependencies:
     protocol-buffers-schema "^3.3.1"
 
-resolve.exports@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
-  integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==
-
-resolve@^1.1.7, resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.4, resolve@^1.22.8:
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.20.0:
   version "1.22.8"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
   integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
@@ -11576,7 +11849,16 @@ resolve@^1.1.7, resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.4, resolve@^1.22
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^1.14.2:
+resolve@^1.22.1, resolve@^1.22.10, resolve@^1.22.8:
+  version "1.22.11"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262"
+  integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==
+  dependencies:
+    is-core-module "^2.16.1"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+resolve@^1.22.4:
   version "1.22.10"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39"
   integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==
@@ -11627,13 +11909,6 @@ rfdc@^1.4.1:
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca"
   integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==
 
-rimraf@^2.6.3:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -11642,12 +11917,12 @@ rimraf@^3.0.2:
     glob "^7.1.3"
 
 rimraf@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-6.0.1.tgz#ffb8ad8844dd60332ab15f52bc104bc3ed71ea4e"
-  integrity sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-6.1.2.tgz#9a0f3cea2ab853e81291127422116ecf2a86ae89"
+  integrity sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==
   dependencies:
-    glob "^11.0.0"
-    package-json-from-dist "^1.0.0"
+    glob "^13.0.0"
+    package-json-from-dist "^1.0.1"
 
 router@^2.2.0:
   version "2.2.0"
@@ -11660,17 +11935,15 @@ router@^2.2.0:
     parseurl "^1.3.3"
     path-to-regexp "^8.0.0"
 
-rtl-css-js@^1.16.1:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.16.1.tgz#4b48b4354b0ff917a30488d95100fbf7219a3e80"
-  integrity sha512-lRQgou1mu19e+Ya0LsTvKrVJ5TYUbqCVPAiImX3UfLTenarvPUl1QFdvu5Z3PYmHT9RCcwIfbjRQBntExyj3Zg==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
+rrweb-cssom@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz#3021d1b4352fbf3b614aaeed0bc0d5739abe0bc2"
+  integrity sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==
 
 run-applescript@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-7.0.0.tgz#e5a553c2bffd620e169d276c1cd8f1b64778fbeb"
-  integrity sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-7.1.0.tgz#2e9e54c4664ec3106c5b5630e249d3d6595c4911"
+  integrity sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==
 
 run-parallel@^1.1.9:
   version "1.2.0"
@@ -11684,10 +11957,10 @@ rw@^1.3.3:
   resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
   integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==
 
-rxjs@^7.8.1:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
-  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
+rxjs@7.8.2:
+  version "7.8.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.2.tgz#955bc473ed8af11a002a2be52071bf475638607b"
+  integrity sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==
   dependencies:
     tslib "^2.1.0"
 
@@ -11753,6 +12026,11 @@ sanitize-html@2.17.0:
     parse-srcset "^1.0.2"
     postcss "^8.3.11"
 
+sax@^1.4.1:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.3.tgz#fcebae3b756cdc8428321805f4b70f16ec0ab5db"
+  integrity sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ==
+
 saxes@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
@@ -11760,10 +12038,10 @@ saxes@^6.0.0:
   dependencies:
     xmlchars "^2.2.0"
 
-scheduler@^0.26.0:
-  version "0.26.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.26.0.tgz#4ce8a8c2a2095f13ea11bf9a445be50c555d6337"
-  integrity sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==
+scheduler@^0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.27.0.tgz#0c4ef82d67d1e5c1e359e8fc76d3a87f045fe5bd"
+  integrity sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==
 
 schema-utils@^3.0.0:
   version "3.3.0"
@@ -11774,20 +12052,30 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-schema-utils@^4.0.0, schema-utils@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.3.0.tgz#3b669f04f71ff2dfb5aba7ce2d5a9d79b35622c0"
-  integrity sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==
+schema-utils@^4.0.0:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.3.2.tgz#0c10878bf4a73fd2b1dfd14b9462b26788c806ae"
+  integrity sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==
   dependencies:
     "@types/json-schema" "^7.0.9"
     ajv "^8.9.0"
     ajv-formats "^2.1.1"
     ajv-keywords "^5.1.0"
 
-sdp-transform@^2.14.1:
-  version "2.14.2"
-  resolved "https://registry.yarnpkg.com/sdp-transform/-/sdp-transform-2.14.2.tgz#d2cee6a1f7abe44e6332ac6cbb94e8600f32d813"
-  integrity sha512-icY6jVao7MfKCieyo1AyxFYm1baiM+fA00qW/KrNNVlkxHAd34riEKuEkUe4bBb3gJwLJZM+xT60Yj1QL8rHiA==
+schema-utils@^4.2.0, schema-utils@^4.3.0, schema-utils@^4.3.3:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.3.3.tgz#5b1850912fa31df90716963d45d9121fdfc09f46"
+  integrity sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    ajv "^8.9.0"
+    ajv-formats "^2.1.1"
+    ajv-keywords "^5.1.0"
+
+sdp-transform@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/sdp-transform/-/sdp-transform-3.0.0.tgz#863dd2d781c468d7d6a2f9c70fedcf0538f3e76c"
+  integrity sha512-gfYVRGxjHkGF2NPeUWHw5u6T/KGFtS5/drPms73gaSuMaVHKCY3lpLnGDfswVQO0kddeePoti09AwhYP4zA8dQ==
 
 seedrandom@^3.0.5:
   version "3.0.5"
@@ -11812,15 +12100,15 @@ selfsigned@^2.4.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@^6.3.0, semver@^6.3.1:
+semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3:
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
-  integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
+semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2, semver@^7.6.3, semver@^7.7.2:
+  version "7.7.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
+  integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
 
 send@0.19.0:
   version "0.19.0"
@@ -11925,11 +12213,6 @@ set-function-name@^2.0.2:
     functions-have-names "^1.2.3"
     has-property-descriptors "^1.0.2"
 
-set-harmonic-interval@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-harmonic-interval/-/set-harmonic-interval-1.0.1.tgz#e1773705539cdfb80ce1c3d99e7f298bb3995249"
-  integrity sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g==
-
 set-proto@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/set-proto/-/set-proto-1.0.0.tgz#0760dbcff30b2d7e801fd6e19983e56da337565e"
@@ -11949,7 +12232,7 @@ setprototypeof@1.1.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
-setprototypeof@1.2.0:
+setprototypeof@1.2.0, setprototypeof@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
@@ -11961,11 +12244,6 @@ shallow-clone@^3.0.0:
   dependencies:
     kind-of "^6.0.2"
 
-shallowequal@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
-  integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
-
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -11978,10 +12256,10 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.2.tgz#d2d83e057959d53ec261311e9e9b8f51dcb2934a"
-  integrity sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==
+shell-quote@1.8.3, shell-quote@^1.8.1:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.3.tgz#55e40ef33cf5c689902353a3d8cd1a6725f08b4b"
+  integrity sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==
 
 side-channel-list@^1.0.0:
   version "1.0.0"
@@ -12023,7 +12301,7 @@ side-channel@^1.0.6, side-channel@^1.1.0:
     side-channel-map "^1.0.1"
     side-channel-weakmap "^1.0.2"
 
-signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
+signal-exit@^3.0.2, signal-exit@^3.0.3:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -12042,11 +12320,6 @@ sirv@^2.0.3:
     mrmime "^2.0.0"
     totalist "^3.0.0"
 
-sisteransi@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
-  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
-
 slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
@@ -12066,26 +12339,18 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
-slice-ansi@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a"
-  integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==
-  dependencies:
-    ansi-styles "^6.0.0"
-    is-fullwidth-code-point "^4.0.0"
-
 slice-ansi@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-7.1.0.tgz#cd6b4655e298a8d1bdeb04250a433094b347b9a9"
-  integrity sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-7.1.2.tgz#adf7be70aa6d72162d907cd0e6d5c11f507b5403"
+  integrity sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==
   dependencies:
     ansi-styles "^6.2.1"
     is-fullwidth-code-point "^5.0.0"
 
-smol-toml@^1.3.1:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/smol-toml/-/smol-toml-1.3.4.tgz#4ec76e0e709f586bc50ba30eb79024173c2b2221"
-  integrity sha512-UOPtVuYkzYGee0Bd2Szz8d2G3RfMfJ2t3qVdZUAozZyAk+a0Sxa+QKix0YCwjL/A1RR0ar44nCxaoN9FxdJGwA==
+smol-toml@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/smol-toml/-/smol-toml-1.5.2.tgz#70d4324d47b7cccbc67d611829c9b3f6d528b02f"
+  integrity sha512-QlaZEqcAH3/RtNyet1IPIYPsEWAaYyXXv1Krsi+1L/QHppjX4Ifm8MQsBISz9vE8cHicIq3clogsheili5vhaQ==
 
 snake-case@^3.0.4:
   version "3.0.4"
@@ -12133,12 +12398,7 @@ source-map-support@~0.5.20:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@0.5.6:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-  integrity sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==
-
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
+source-map@^0.6.0, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -12216,53 +12476,24 @@ ssh-remote-port-forward@^1.0.4:
     ssh2 "^1.4.0"
 
 ssh2@^1.15.0, ssh2@^1.4.0:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.16.0.tgz#79221d40cbf4d03d07fe881149de0a9de928c9f0"
-  integrity sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.17.0.tgz#dc686e8e3abdbd4ad95d46fa139615903c12258c"
+  integrity sha512-wPldCk3asibAjQ/kziWQQt1Wh3PgDFpC0XpwclzKcdT1vql6KeYxf5LIt4nlFkUeR8WuphYMKqUA56X4rjbfgQ==
   dependencies:
     asn1 "^0.2.6"
     bcrypt-pbkdf "^1.0.2"
   optionalDependencies:
     cpu-features "~0.0.10"
-    nan "^2.20.0"
+    nan "^2.23.0"
 
-stack-generator@^2.0.5:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.10.tgz#8ae171e985ed62287d4f1ed55a1633b3fb53bb4d"
-  integrity sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ==
-  dependencies:
-    stackframe "^1.3.4"
-
-stack-utils@^2.0.3:
+stack-utils@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
   integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
   dependencies:
     escape-string-regexp "^2.0.0"
 
-stackframe@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
-  integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
-
-stacktrace-gps@^3.0.4:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz#0c40b24a9b119b20da4525c398795338966a2fb0"
-  integrity sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==
-  dependencies:
-    source-map "0.5.6"
-    stackframe "^1.3.4"
-
-stacktrace-js@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/stacktrace-js/-/stacktrace-js-2.0.2.tgz#4ca93ea9f494752d55709a081d400fdaebee897b"
-  integrity sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==
-  dependencies:
-    error-stack-parser "^2.0.6"
-    stack-generator "^2.0.5"
-    stacktrace-gps "^3.0.4"
-
-statuses@2.0.1, statuses@^2.0.1:
+statuses@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
   integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
@@ -12272,22 +12503,52 @@ statuses@2.0.1, statuses@^2.0.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-streamx@^2.15.0, streamx@^2.21.0:
-  version "2.22.0"
-  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.22.0.tgz#cd7b5e57c95aaef0ff9b2aef7905afa62ec6e4a7"
-  integrity sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==
+statuses@^2.0.1, statuses@~2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.2.tgz#8f75eecef765b5e1cfcdc080da59409ed424e382"
+  integrity sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==
+
+stop-iteration-iterator@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz#f481ff70a548f6124d0312c3aa14cbfa7aa542ad"
+  integrity sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==
   dependencies:
+    es-errors "^1.3.0"
+    internal-slot "^1.1.0"
+
+storybook@^10.0.7:
+  version "10.1.10"
+  resolved "https://registry.yarnpkg.com/storybook/-/storybook-10.1.10.tgz#9023e063f97cb2c38b4520e03d49336bcbf6661f"
+  integrity sha512-oK0t0jEogiKKfv5Z1ao4Of99+xWw1TMUGuGRYDQS4kp2yyBsJQEgu7NI7OLYsCDI6gzt5p3RPtl1lqdeVLUi8A==
+  dependencies:
+    "@storybook/global" "^5.0.0"
+    "@storybook/icons" "^2.0.0"
+    "@testing-library/jest-dom" "^6.6.3"
+    "@testing-library/user-event" "^14.6.1"
+    "@vitest/expect" "3.2.4"
+    "@vitest/spy" "3.2.4"
+    esbuild "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0 || ^0.26.0 || ^0.27.0"
+    open "^10.2.0"
+    recast "^0.23.5"
+    semver "^7.6.2"
+    use-sync-external-store "^1.5.0"
+    ws "^8.18.0"
+
+streamx@^2.15.0, streamx@^2.21.0:
+  version "2.23.0"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.23.0.tgz#7d0f3d00d4a6c5de5728aecd6422b4008d66fd0b"
+  integrity sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==
+  dependencies:
+    events-universal "^1.0.0"
     fast-fifo "^1.3.2"
     text-decoder "^1.1.0"
-  optionalDependencies:
-    bare-events "^2.2.0"
 
 string-argv@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
   integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
 
-string-length@^4.0.1:
+string-length@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
   integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
@@ -12295,7 +12556,16 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -12313,13 +12583,12 @@ string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-string-width@^7.0.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-7.2.0.tgz#b5bb8e2165ce275d4d43476dd2700ad9091db6dc"
-  integrity sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==
+string-width@^8.0.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-8.1.0.tgz#9e9fb305174947cf45c30529414b5da916e9e8d1"
+  integrity sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==
   dependencies:
-    emoji-regex "^10.3.0"
-    get-east-asian-width "^1.0.0"
+    get-east-asian-width "^1.3.0"
     strip-ansi "^7.1.0"
 
 string.prototype.includes@^2.0.1:
@@ -12371,7 +12640,7 @@ string.prototype.trim@^1.2.10:
     es-object-atoms "^1.0.0"
     has-property-descriptors "^1.0.2"
 
-string.prototype.trimend@^1.0.8, string.prototype.trimend@^1.0.9:
+string.prototype.trimend@^1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz#62e2731272cd285041b36596054e9f66569b6942"
   integrity sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==
@@ -12404,7 +12673,14 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -12412,9 +12688,9 @@ string_decoder@~1.1.1:
     ansi-regex "^5.0.1"
 
 strip-ansi@^7.0.1, strip-ansi@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
-  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba"
+  integrity sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==
   dependencies:
     ansi-regex "^6.0.1"
 
@@ -12440,77 +12716,67 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-strip-json-comments@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-5.0.1.tgz#0d8b7d01b23848ed7dbdf4baaaa31a8250d8cfa0"
-  integrity sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==
+strip-indent@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-4.1.1.tgz#aba13de189d4ad9a17f6050e76554ac27585c7af"
+  integrity sha512-SlyRoSkdh1dYP0PzclLE7r0M9sgbFKKMFXpFRUMNuKhQSbC6VQIGzq3E0qsfvGJaUFJPGv6Ws1NZ/haTAjfbMA==
+
+strip-json-comments@5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-5.0.3.tgz#b7304249dd402ee67fd518ada993ab3593458bcf"
+  integrity sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==
 
 strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-style-to-js@1.1.16:
-  version "1.1.16"
-  resolved "https://registry.yarnpkg.com/style-to-js/-/style-to-js-1.1.16.tgz#e6bd6cd29e250bcf8fa5e6591d07ced7575dbe7a"
-  integrity sha512-/Q6ld50hKYPH3d/r6nr117TZkHR0w0kGGIVfpG9N6D8NymRPM9RqCUv4pRpJ62E5DqOYx2AFpbZMyCPnjQCnOw==
+style-to-js@1.1.21:
+  version "1.1.21"
+  resolved "https://registry.yarnpkg.com/style-to-js/-/style-to-js-1.1.21.tgz#2908941187f857e79e28e9cd78008b9a0b3e0e8d"
+  integrity sha512-RjQetxJrrUJLQPHbLku6U/ocGtzyjbJMP9lCNK7Ag0CNh690nSH8woqWH9u16nMjYBAok+i7JO1NP2pOy8IsPQ==
   dependencies:
-    style-to-object "1.0.8"
+    style-to-object "1.0.14"
 
-style-to-object@1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-1.0.8.tgz#67a29bca47eaa587db18118d68f9d95955e81292"
-  integrity sha512-xT47I/Eo0rwJmaXC4oilDGDWLohVhR6o/xAQcPQN8q6QBuZVL8qMYL85kLmST5cPjAorwvqIA4qXTRQoYHaL6g==
+style-to-object@1.0.14:
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-1.0.14.tgz#1d22f0e7266bb8c6d8cae5caf4ec4f005e08f611"
+  integrity sha512-LIN7rULI0jBscWQYaSswptyderlarFkjQ+t79nzty8tcIAceVomEVlLzH5VP4Cmsv6MtKhs7qaAiwlcp+Mgaxw==
   dependencies:
-    inline-style-parser "0.2.4"
+    inline-style-parser "0.2.7"
 
-styled-components@^6.1.17:
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-6.1.17.tgz#59032edd7efa59e114ddbc41165f0984d0fa4fb7"
-  integrity sha512-97D7DwWanI7nN24v0D4SvbfjLE9656umNSJZkBkDIWL37aZqG/wRQ+Y9pWtXyBIM/NSfcBzHLErEsqHmJNSVUg==
+stylehacks@^7.0.5:
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-7.0.7.tgz#12b0dd1eceee4d564aae6da0632804ef0004a5be"
+  integrity sha512-bJkD0JkEtbRrMFtwgpJyBbFIwfDDONQ1Ov3sDLZQP8HuJ73kBOyx66H4bOcAbVWmnfLdvQ0AJwXxOMkpujcO6g==
   dependencies:
-    "@emotion/is-prop-valid" "1.2.2"
-    "@emotion/unitless" "0.8.1"
-    "@types/stylis" "4.2.5"
-    css-to-react-native "3.2.0"
-    csstype "3.1.3"
-    postcss "8.4.49"
-    shallowequal "1.1.0"
-    stylis "4.3.2"
-    tslib "2.6.2"
+    browserslist "^4.27.0"
+    postcss-selector-parser "^7.1.0"
 
-stylehacks@^7.0.4:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-7.0.4.tgz#9c21f7374f4bccc0082412b859b3c89d77d3277c"
-  integrity sha512-i4zfNrGMt9SB4xRK9L83rlsFCgdGANfeDAYacO1pkqcE7cRHPdWHwnKZVz7WY17Veq/FvyYsRAU++Ga+qDFIww==
+stylelint-config-recommended@^17.0.0:
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-17.0.0.tgz#4f77c70609b2d7093cc60bb48adfabdde434aa5d"
+  integrity sha512-WaMSdEiPfZTSFVoYmJbxorJfA610O0tlYuU2aEwY33UQhSPgFbClrVJYWvy3jGJx+XW37O+LyNLiZOEXhKhJmA==
+
+stylelint-config-standard@^39.0.0:
+  version "39.0.1"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-39.0.1.tgz#dcd1c28400added09e566e85ffe8d480ae2531a2"
+  integrity sha512-b7Fja59EYHRNOTa3aXiuWnhUWXFU2Nfg6h61bLfAb5GS5fX3LMUD0U5t4S8N/4tpHQg3Acs2UVPR9jy2l1g/3A==
   dependencies:
-    browserslist "^4.23.3"
-    postcss-selector-parser "^6.1.2"
-
-stylelint-config-recommended@^16.0.0:
-  version "16.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-16.0.0.tgz#0221f19902816fe7d53d9a01eb0be4cc7b4fe80a"
-  integrity sha512-4RSmPjQegF34wNcK1e1O3Uz91HN8P1aFdFzio90wNK9mjgAI19u5vsU868cVZboKzCaa5XbpvtTzAAGQAxpcXA==
-
-stylelint-config-standard@^38.0.0:
-  version "38.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-38.0.0.tgz#9d673ec1f35d7569476ee4b0582e7dd5faebf036"
-  integrity sha512-uj3JIX+dpFseqd/DJx8Gy3PcRAJhlEZ2IrlFOc4LUxBX/PNMEQ198x7LCOE2Q5oT9Vw8nyc4CIL78xSqPr6iag==
-  dependencies:
-    stylelint-config-recommended "^16.0.0"
+    stylelint-config-recommended "^17.0.0"
 
 stylelint-scss@^6.0.0:
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-6.12.0.tgz#38cf41c3b8a76f34cd7267e4c30e7e66d35619c2"
-  integrity sha512-U7CKhi1YNkM1pXUXl/GMUXi8xKdhl4Ayxdyceie1nZ1XNIdaUgMV6OArpooWcDzEggwgYD0HP/xIgVJo9a655w==
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-6.13.0.tgz#0bffc5a2408b14097ce92bde54ff5ba6838c8bf5"
+  integrity sha512-kZPwFUJkfup2gP1enlrS2h9U5+T5wFoqzJ1n/56AlpwSj28kmFe7ww/QFydvPsg5gLjWchAwWWBLtterynZrOw==
   dependencies:
     css-tree "^3.0.1"
     is-plain-object "^5.0.0"
-    known-css-properties "^0.36.0"
-    mdn-data "^2.21.0"
+    known-css-properties "^0.37.0"
+    mdn-data "^2.25.0"
     postcss-media-query-parser "^0.2.3"
     postcss-resolve-nested-selector "^0.1.6"
-    postcss-selector-parser "^7.1.0"
+    postcss-selector-parser "^7.1.1"
     postcss-value-parser "^4.2.0"
 
 stylelint-value-no-unknown-custom-properties@^6.0.1:
@@ -12521,39 +12787,40 @@ stylelint-value-no-unknown-custom-properties@^6.0.1:
     postcss-value-parser "^4.2.0"
     resolve "^1.22.8"
 
-stylelint@^16.13.0:
-  version "16.19.1"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.19.1.tgz#486b95fa7518a3077ee2802bc6dda2174bc097bb"
-  integrity sha512-C1SlPZNMKl+d/C867ZdCRthrS+6KuZ3AoGW113RZCOL0M8xOGpgx7G70wq7lFvqvm4dcfdGFVLB/mNaLFChRKw==
+stylelint@^16.23.0:
+  version "16.26.1"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.26.1.tgz#7048accf9c3990dc074dff13c6f3cdc35c780c95"
+  integrity sha512-v20V59/crfc8sVTAtge0mdafI3AdnzQ2KsWe6v523L4OA1bJO02S7MO2oyXDCS6iWb9ckIPnqAFVItqSBQr7jw==
   dependencies:
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/media-query-list-parser" "^4.0.2"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-syntax-patches-for-csstree" "^1.0.19"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/media-query-list-parser" "^4.0.3"
     "@csstools/selector-specificity" "^5.0.0"
-    "@dual-bundle/import-meta-resolve" "^4.1.0"
+    "@dual-bundle/import-meta-resolve" "^4.2.1"
     balanced-match "^2.0.0"
     colord "^2.9.3"
     cosmiconfig "^9.0.0"
     css-functions-list "^3.2.3"
     css-tree "^3.1.0"
-    debug "^4.3.7"
+    debug "^4.4.3"
     fast-glob "^3.3.3"
     fastest-levenshtein "^1.0.16"
-    file-entry-cache "^10.0.8"
+    file-entry-cache "^11.1.1"
     global-modules "^2.0.0"
     globby "^11.1.0"
     globjoin "^0.1.4"
     html-tags "^3.3.1"
-    ignore "^7.0.3"
+    ignore "^7.0.5"
     imurmurhash "^0.1.4"
     is-plain-object "^5.0.0"
-    known-css-properties "^0.36.0"
+    known-css-properties "^0.37.0"
     mathml-tag-names "^2.1.3"
     meow "^13.2.0"
     micromatch "^4.0.8"
     normalize-path "^3.0.0"
     picocolors "^1.1.1"
-    postcss "^8.5.3"
+    postcss "^8.5.6"
     postcss-resolve-nested-selector "^0.1.6"
     postcss-safe-parser "^7.0.1"
     postcss-selector-parser "^7.1.0"
@@ -12565,20 +12832,19 @@ stylelint@^16.13.0:
     table "^6.9.0"
     write-file-atomic "^5.0.1"
 
-stylis@4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.2.tgz#8f76b70777dd53eb669c6f58c997bf0a9972e444"
-  integrity sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg==
+sugarss@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-5.0.0.tgz#a97ddc1b5a1598ba283a10b8d73da56a3848fe36"
+  integrity sha512-3//knMoF9btXcxHTbMRckIYjkEzSZ6pZjiaZ3wM6OIpUtQ06Uwqc0XgAr6jf+U74cLLTV/BEgmHWoeXPC+NhdQ==
 
-stylis@^4.3.0:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.6.tgz#7c7b97191cb4f195f03ecab7d52f7902ed378320"
-  integrity sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==
-
-sugarss@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-4.0.1.tgz#128a783ed71ee0fc3b489ce1f7d5a89bc1e24383"
-  integrity sha512-WCjS5NfuVJjkQzK10s8WOBY+hhDxxNt/N6ZaGwxFZ+wN3/lKKFSaaKUNecULcTTvE4urLcKaZFQD8vO0mOZujw==
+super-regex@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/super-regex/-/super-regex-0.2.0.tgz#dc1e071e55cdcf56930eb6271f73653a655b2642"
+  integrity sha512-WZzIx3rC1CvbMDloLsVw0lkZVKJWbrkJ0k1ghKFmcnPrW1+jWbgTkTEWVtD9lMdmI4jZEz40+naBxl1dCUhXXw==
+  dependencies:
+    clone-regexp "^3.0.0"
+    function-timeout "^0.1.0"
+    time-span "^5.1.0"
 
 supercluster@^8.0.1:
   version "8.0.1"
@@ -12587,12 +12853,12 @@ supercluster@^8.0.1:
   dependencies:
     kdbush "^4.0.2"
 
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.1:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
   dependencies:
-    has-flag "^3.0.0"
+    has-flag "^4.0.0"
 
 supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.2.0"
@@ -12601,13 +12867,6 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^8.0.0, supports-color@^8.1.1:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
-  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
-  dependencies:
-    has-flag "^4.0.0"
-
 supports-hyperlinks@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-3.2.0.tgz#b8e485b179681dea496a1e7abdf8985bd3145461"
@@ -12631,7 +12890,7 @@ svg-tags@^1.0.0:
   resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
   integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==
 
-svgo@^3.0.2, svgo@^3.3.2:
+svgo@^3.0.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.3.2.tgz#ad58002652dffbb5986fc9716afe52d869ecbda8"
   integrity sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==
@@ -12644,11 +12903,31 @@ svgo@^3.0.2, svgo@^3.3.2:
     csso "^5.0.5"
     picocolors "^1.0.0"
 
+svgo@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-4.0.0.tgz#17e0fa2eaccf429e0ec0d2179169abde9ba8ad3d"
+  integrity sha512-VvrHQ+9uniE+Mvx3+C9IEe/lWasXCU0nXMY2kZeLrHNICuRiC8uMPyM14UEaMOFA5mhyQqEkB02VoQ16n3DLaw==
+  dependencies:
+    commander "^11.1.0"
+    css-select "^5.1.0"
+    css-tree "^3.0.1"
+    css-what "^6.1.0"
+    csso "^5.0.5"
+    picocolors "^1.1.1"
+    sax "^1.4.1"
+
 symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
+synckit@^0.11.8:
+  version "0.11.11"
+  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.11.tgz#c0b619cf258a97faa209155d9cd1699b5c998cb0"
+  integrity sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==
+  dependencies:
+    "@pkgr/core" "^0.2.9"
+
 tabbable@^6.0.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97"
@@ -12665,20 +12944,30 @@ table@^6.9.0:
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
 
-tapable@^2.0.0, tapable@^2.2.1:
+tapable@^2.0.0, tapable@^2.2.0, tapable@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.3.0.tgz#7e3ea6d5ca31ba8e078b560f0d83ce9a14aa8be6"
+  integrity sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==
+
+tapable@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tapable@^2.1.1, tapable@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.2.tgz#ab4984340d30cb9989a490032f086dbb8b56d872"
-  integrity sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==
+tar-fs@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.4.tgz#800824dbf4ef06ded9afea4acafe71c67c76b930"
+  integrity sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==
+  dependencies:
+    chownr "^1.1.1"
+    mkdirp-classic "^0.5.2"
+    pump "^3.0.0"
+    tar-stream "^2.1.4"
 
-tar-fs@^3.0.9:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.9.tgz#d570793c6370d7078926c41fa422891566a0b617"
-  integrity sha512-XF4w9Xp+ZQgifKakjZYmFdkLoSWd34VGKcsTCwlNWM7QG3ZbaxnTsaBwnjFZqHRf/rROxaR8rXnbtwdvaDI+lA==
+tar-fs@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.1.1.tgz#4f164e59fb60f103d472360731e8c6bb4a7fe9ef"
+  integrity sha512-LZA0oaPOc2fVo82Txf3gw+AkEd38szODlptMYejQUhndHMLQ9M059uXR+AfS7DNo0NpINvSqDsvyaCrBVkptWg==
   dependencies:
     pump "^3.0.0"
     tar-stream "^3.1.5"
@@ -12686,16 +12975,6 @@ tar-fs@^3.0.9:
     bare-fs "^4.0.1"
     bare-path "^3.0.0"
 
-tar-fs@~2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.3.tgz#fb3b8843a26b6f13a08e606f7922875eb1fbbf92"
-  integrity sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==
-  dependencies:
-    chownr "^1.1.1"
-    mkdirp-classic "^0.5.2"
-    pump "^3.0.0"
-    tar-stream "^2.1.4"
-
 tar-js@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/tar-js/-/tar-js-0.3.0.tgz#6949aabfb0ba18bb1562ae51a439fd0f30183a17"
@@ -12734,9 +13013,9 @@ temporal-spec@0.3.0:
   integrity sha512-n+noVpIqz4hYgFSMOSiINNOUOMFtV5cZQNCmmszA6GiVFVRt3G7AqVyhXjhCSmowvQn+NsGn+jMDMKJYHd3bSQ==
 
 terser-webpack-plugin@^5.3.11, terser-webpack-plugin@^5.3.9:
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz#9031d48e57ab27567f02ace85c7d690db66c3e06"
-  integrity sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==
+  version "5.3.15"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.15.tgz#0a26860b765eaffa8e840170aabc5b3a3f6f6bb9"
+  integrity sha512-PGkOdpRFK+rb1TzVz+msVhw4YMRT9txLF4kRqvJhGhCM324xuR3REBSHALN+l+sAhKUmz0aotnjp5D+P83mLhQ==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.25"
     jest-worker "^27.4.5"
@@ -12744,23 +13023,13 @@ terser-webpack-plugin@^5.3.11, terser-webpack-plugin@^5.3.9:
     serialize-javascript "^6.0.2"
     terser "^5.31.1"
 
-terser@^5.10.0:
-  version "5.36.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.36.0.tgz#8b0dbed459ac40ff7b4c9fd5a3a2029de105180e"
-  integrity sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==
+terser@^5.10.0, terser@^5.31.1:
+  version "5.44.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.44.1.tgz#e391e92175c299b8c284ad6ded609e37303b0a9c"
+  integrity sha512-t/R3R/n0MSwnnazuPpPNVO60LX0SKL45pyl9YlvxIdkH0Of7D5qM2EVe+yASRIlY5pZ73nclYJfNANGWPwFDZw==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
-    acorn "^8.8.2"
-    commander "^2.20.0"
-    source-map-support "~0.5.20"
-
-terser@^5.31.1:
-  version "5.40.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.40.0.tgz#839a80db42bfee8340085f44ea99b5cba36c55c8"
-  integrity sha512-cfeKl/jjwSR5ar7d0FGmave9hFGJT8obyo0z+CrQOylLDbk7X81nPU6vq9VORa5jU30SkDnT2FXjLbR8HLP+xA==
-  dependencies:
-    "@jridgewell/source-map" "^0.3.3"
-    acorn "^8.14.0"
+    acorn "^8.15.0"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
@@ -12773,26 +13042,26 @@ test-exclude@^6.0.0:
     glob "^7.1.4"
     minimatch "^3.0.4"
 
-testcontainers@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/testcontainers/-/testcontainers-11.0.0.tgz#248d8e59b922c993da378e6ef8bb018c0fc29330"
-  integrity sha512-8zY2V+eovC6aylgMqMR3A7H+un2gqpqepbvBCnjo7QP2fpI0pJZhSus+A5TckHpF2CR2d1Zj/IQ5rNPW/HjS6g==
+testcontainers@^11.0.0, testcontainers@^11.9.0:
+  version "11.10.0"
+  resolved "https://registry.yarnpkg.com/testcontainers/-/testcontainers-11.10.0.tgz#879b445b763aa357a862770334943d75f2a60159"
+  integrity sha512-8hwK2EnrOZfrHPpDC7CPe03q7H8Vv8j3aXdcmFFyNV8dzpBzgZYmqyDtduJ8YQ5kbzj+A+jUXMQ6zI8B5U3z+g==
   dependencies:
     "@balena/dockerignore" "^1.0.2"
-    "@types/dockerode" "^3.3.39"
+    "@types/dockerode" "^3.3.47"
     archiver "^7.0.1"
     async-lock "^1.4.1"
     byline "^5.0.0"
-    debug "^4.4.1"
-    docker-compose "^1.2.0"
-    dockerode "^4.0.6"
+    debug "^4.4.3"
+    docker-compose "^1.3.0"
+    dockerode "^4.0.9"
     get-port "^7.1.0"
     proper-lockfile "^4.1.2"
     properties-reader "^2.3.0"
     ssh-remote-port-forward "^1.0.4"
-    tar-fs "^3.0.9"
-    tmp "^0.2.3"
-    undici "^7.10.0"
+    tar-fs "^3.1.1"
+    tmp "^0.2.5"
+    undici "^7.16.0"
 
 text-decoder@^1.1.0:
   version "1.2.3"
@@ -12811,53 +13080,70 @@ thingies@^1.20.0:
   resolved "https://registry.yarnpkg.com/thingies/-/thingies-1.21.0.tgz#e80fbe58fd6fdaaab8fad9b67bd0a5c943c445c1"
   integrity sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==
 
-throttle-debounce@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb"
-  integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==
-
 thunky@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
   integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
-tiny-invariant@^1.0.6:
+time-span@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/time-span/-/time-span-5.1.0.tgz#80c76cf5a0ca28e0842d3f10a4e99034ce94b90d"
+  integrity sha512-75voc/9G4rDIJleOo4jPvN4/YC4GRZrY8yy1uU4lwrB3XEQbWve8zXoO5No4eFrGcTAMYyoY67p8jRQdtA1HbA==
+  dependencies:
+    convert-hrtime "^5.0.0"
+
+tiny-invariant@^1.0.6, tiny-invariant@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
   integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==
 
-tinyglobby@^0.2.12:
-  version "0.2.12"
-  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.12.tgz#ac941a42e0c5773bd0b5d08f32de82e74a1a61b5"
-  integrity sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==
+tinyglobby@^0.2.12, tinyglobby@^0.2.14:
+  version "0.2.14"
+  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.14.tgz#5280b0cf3f972b050e74ae88406c0a6a58f4079d"
+  integrity sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==
   dependencies:
-    fdir "^6.4.3"
+    fdir "^6.4.4"
     picomatch "^4.0.2"
 
-tinyglobby@^0.2.7:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.9.tgz#6baddd1b0fe416403efb0dd40442c7d7c03c1c66"
-  integrity sha512-8or1+BGEdk1Zkkw2ii16qSS7uVrQJPre5A9o/XkWPATkk23FZh/15BKFxPnlTy6vkljZxLqYCzzBMj30ZrSvjw==
+tinyglobby@^0.2.15:
+  version "0.2.15"
+  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.15.tgz#e228dd1e638cea993d2fdb4fcd2d4602a79951c2"
+  integrity sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==
   dependencies:
-    fdir "^6.4.0"
-    picomatch "^4.0.2"
+    fdir "^6.5.0"
+    picomatch "^4.0.3"
 
 tinyqueue@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-3.0.0.tgz#101ea761ccc81f979e29200929e78f1556e3661e"
   integrity sha512-gRa9gwYU3ECmQYv3lslts5hxuIa90veaEcxDYuu3QGOIAEM2mOZkVHp48ANJuu1CURtRdHKUBY5Lm1tHV+sD4g==
 
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
+tinyrainbow@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tinyrainbow/-/tinyrainbow-2.0.0.tgz#9509b2162436315e80e3eee0fcce4474d2444294"
+  integrity sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==
 
-tmp@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
-  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
+tinyspy@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-4.0.4.tgz#d77a002fb53a88aa1429b419c1c92492e0c81f78"
+  integrity sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==
+
+tldts-core@^6.1.86:
+  version "6.1.86"
+  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.86.tgz#a93e6ed9d505cb54c542ce43feb14c73913265d8"
+  integrity sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==
+
+tldts@^6.1.32:
+  version "6.1.86"
+  resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.86.tgz#087e0555b31b9725ee48ca7e77edc56115cd82f7"
+  integrity sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==
+  dependencies:
+    tldts-core "^6.1.86"
+
+tmp@^0.2.4, tmp@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.5.tgz#b06bcd23f0f3c8357b426891726d16015abfd8f8"
+  integrity sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==
 
 tmpl@1.0.5:
   version "1.0.5"
@@ -12876,12 +13162,7 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-toggle-selection@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
-  integrity sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==
-
-toidentifier@1.0.1:
+toidentifier@1.0.1, toidentifier@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
@@ -12891,15 +13172,12 @@ totalist@^3.0.0:
   resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
   integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
 
-tough-cookie@^4.1.2:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
-  integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==
+tough-cookie@^5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-5.1.2.tgz#66d774b4a1d9e12dc75089725af3ac75ec31bed7"
+  integrity sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==
   dependencies:
-    psl "^1.1.33"
-    punycode "^2.1.1"
-    universalify "^0.2.0"
-    url-parse "^1.5.3"
+    tldts "^6.1.32"
 
 tr46@^1.0.1:
   version "1.0.1"
@@ -12908,12 +13186,12 @@ tr46@^1.0.1:
   dependencies:
     punycode "^2.1.0"
 
-tr46@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
-  integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
+tr46@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.1.1.tgz#96ae867cddb8fdb64a49cc3059a8d428bcf238ca"
+  integrity sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==
   dependencies:
-    punycode "^2.1.1"
+    punycode "^2.3.1"
 
 tr46@~0.0.3:
   version "0.0.3"
@@ -12921,11 +13199,11 @@ tr46@~0.0.3:
   integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
 tree-dump@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/tree-dump/-/tree-dump-1.0.2.tgz#c460d5921caeb197bde71d0e9a7b479848c5b8ac"
-  integrity sha512-dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/tree-dump/-/tree-dump-1.0.3.tgz#2f0e42e77354714418ed7ab44291e435ccdb0f80"
+  integrity sha512-il+Cv80yVHFBwokQSfd4bldvr1Md951DpgAGfmhydt04L+YzHgubm2tQ7zueWDcGENKHq0ZvGFR/hjvNXilHEg==
 
-tree-kill@^1.2.2:
+tree-kill@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
@@ -12937,34 +13215,15 @@ truncate-utf8-bytes@^1.0.0:
   dependencies:
     utf8-byte-length "^1.0.1"
 
-ts-api-utils@^2.0.1, ts-api-utils@^2.1.0:
+ts-api-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.1.0.tgz#595f7094e46eed364c13fd23e75f9513d29baf91"
   integrity sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==
 
-ts-easing@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/ts-easing/-/ts-easing-0.2.0.tgz#c8a8a35025105566588d87dbda05dd7fbfa5a4ec"
-  integrity sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==
-
-ts-node@^10.9.1:
-  version "10.9.2"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
-  integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
-  dependencies:
-    "@cspotcode/source-map-support" "^0.8.0"
-    "@tsconfig/node10" "^1.0.7"
-    "@tsconfig/node12" "^1.0.7"
-    "@tsconfig/node14" "^1.0.0"
-    "@tsconfig/node16" "^1.0.2"
-    acorn "^8.4.1"
-    acorn-walk "^8.1.1"
-    arg "^4.1.0"
-    create-require "^1.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    v8-compile-cache-lib "^3.0.1"
-    yn "3.1.1"
+ts-dedent@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.2.0.tgz#39e4bd297cd036292ae2394eb3412be63f563bb5"
+  integrity sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==
 
 tsconfig-paths@^3.15.0:
   version "3.15.0"
@@ -12976,7 +13235,16 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.8.0:
+tsconfig-paths@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
+  integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
+  dependencies:
+    json5 "^2.2.2"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
+tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.8.0:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
@@ -13023,7 +13291,7 @@ type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-type-is@^2.0.0, type-is@^2.0.1:
+type-is@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-2.0.1.tgz#64f6cf03f92fce4015c2b224793f6bdd4b068c97"
   integrity sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==
@@ -13090,7 +13358,7 @@ typescript@5.8.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.3.tgz#92f8a3e5e3cf497356f4178c34cd65a7f5e8440e"
   integrity sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==
 
-ua-parser-js@^1.0.2:
+ua-parser-js@1.0.40:
   version "1.0.40"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.40.tgz#ac6aff4fd8ea3e794a6aa743ec9c2fc29e75b675"
   integrity sha512-z6PJ8Lml+v3ichVojCiB8toQJBuwR42ySM4ezjXIqXK3M0HczmKQ3LF4rhU55PfD99KEEXQG6yb7iOMyvYuHew==
@@ -13120,15 +13388,15 @@ undici-types@~5.26.4:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-undici-types@~6.21.0:
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
-  integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
+undici-types@~7.16.0:
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46"
+  integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==
 
-undici@^7.10.0:
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-7.10.0.tgz#8ae17a976acc6593b13c9ff3342840bea9b24670"
-  integrity sha512-u5otvFBOBZvmdjWLVW+5DAc9Nkq8f24g0O9oY7qw2JVIF1VocIFoyz9JFkuVOS2j41AufeO0xnlweJ2RLT8nGw==
+undici@^7.16.0:
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-7.16.0.tgz#cb2a1e957726d458b536e3f076bf51f066901c1a"
+  integrity sha512-QEg3HPMll0o3t2ourKwOeUAZ159Kn9mx5pnzHRQO8+Wixmh88YdZRiIwat0iNzNNXn0yoEtXJqFpyW7eM8BV7g==
 
 unhomoglyph@^1.0.6:
   version "1.0.6"
@@ -13148,20 +13416,15 @@ unicode-match-property-ecmascript@^2.0.0:
     unicode-canonical-property-names-ecmascript "^2.0.0"
     unicode-property-aliases-ecmascript "^2.0.0"
 
-unicode-match-property-value-ecmascript@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz#a0401aee72714598f739b68b104e4fe3a0cb3c71"
-  integrity sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==
+unicode-match-property-value-ecmascript@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.1.tgz#65a7adfad8574c219890e219285ce4c64ed67eaa"
+  integrity sha512-JQ84qTuMg4nVkx8ga4A16a1epI9H6uTXAknqxkGF/aFfRLw1xC/Bp24HNLaZhHSkWd3+84t8iXnp1J0kYcZHhg==
 
 unicode-property-aliases-ecmascript@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
-  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
-
-universalify@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
-  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.2.0.tgz#301d4f8a43d2b75c97adfad87c9dd5350c9475d1"
+  integrity sha512-hpbDzxUY9BFwX+UeBnxv3Sh1q7HFxj48DTmXchNgRa46lO8uj3/1iEn3MiNUYTg1g9ctIqXCCERn8gYZhHC5lQ==
 
 universalify@^2.0.0:
   version "2.0.1"
@@ -13183,10 +13446,47 @@ unplugin@1.0.1:
     webpack-sources "^3.2.3"
     webpack-virtual-modules "^0.5.0"
 
-update-browserslist-db@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz#348377dd245216f9e7060ff50b15a1b740b75420"
-  integrity sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==
+unplugin@^2.3.5:
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-2.3.11.tgz#411e020dd2ba90e2fbe1e7bd63a5a399e6ee3b54"
+  integrity sha512-5uKD0nqiYVzlmCRs01Fhs2BdkEgBS3SAVP6ndrBsuK42iC2+JHyxM05Rm9G8+5mkmRtzMZGY8Ct5+mliZxU/Ww==
+  dependencies:
+    "@jridgewell/remapping" "^2.3.5"
+    acorn "^8.15.0"
+    picomatch "^4.0.3"
+    webpack-virtual-modules "^0.6.2"
+
+unrs-resolver@^1.7.11:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/unrs-resolver/-/unrs-resolver-1.11.1.tgz#be9cd8686c99ef53ecb96df2a473c64d304048a9"
+  integrity sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==
+  dependencies:
+    napi-postinstall "^0.3.0"
+  optionalDependencies:
+    "@unrs/resolver-binding-android-arm-eabi" "1.11.1"
+    "@unrs/resolver-binding-android-arm64" "1.11.1"
+    "@unrs/resolver-binding-darwin-arm64" "1.11.1"
+    "@unrs/resolver-binding-darwin-x64" "1.11.1"
+    "@unrs/resolver-binding-freebsd-x64" "1.11.1"
+    "@unrs/resolver-binding-linux-arm-gnueabihf" "1.11.1"
+    "@unrs/resolver-binding-linux-arm-musleabihf" "1.11.1"
+    "@unrs/resolver-binding-linux-arm64-gnu" "1.11.1"
+    "@unrs/resolver-binding-linux-arm64-musl" "1.11.1"
+    "@unrs/resolver-binding-linux-ppc64-gnu" "1.11.1"
+    "@unrs/resolver-binding-linux-riscv64-gnu" "1.11.1"
+    "@unrs/resolver-binding-linux-riscv64-musl" "1.11.1"
+    "@unrs/resolver-binding-linux-s390x-gnu" "1.11.1"
+    "@unrs/resolver-binding-linux-x64-gnu" "1.11.1"
+    "@unrs/resolver-binding-linux-x64-musl" "1.11.1"
+    "@unrs/resolver-binding-wasm32-wasi" "1.11.1"
+    "@unrs/resolver-binding-win32-arm64-msvc" "1.11.1"
+    "@unrs/resolver-binding-win32-ia32-msvc" "1.11.1"
+    "@unrs/resolver-binding-win32-x64-msvc" "1.11.1"
+
+update-browserslist-db@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.2.2.tgz#cfb4358afa08b3d5731a2ecd95eebf4ddef8033e"
+  integrity sha512-E85pfNzMQ9jpKkA7+TJAi4TJN+tBCuWh5rUcS/sv6cFi+1q9LYDwDI5dpUL0u/73EElyQ8d3TEaeW4sPedBqYA==
   dependencies:
     escalade "^3.2.0"
     picocolors "^1.1.1"
@@ -13198,21 +13498,6 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-url-parse@^1.5.3:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
-  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
-use-callback-ref@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.3.2.tgz#6134c7f6ff76e2be0b56c809b17a650c942b1693"
-  integrity sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==
-  dependencies:
-    tslib "^2.0.0"
-
 use-callback-ref@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.3.3.tgz#98d9fab067075841c5b2c6852090d5d0feabe2bf"
@@ -13225,7 +13510,7 @@ use-memo-one@^1.1.1:
   resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
   integrity sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==
 
-use-sidecar@^1.1.2, use-sidecar@^1.1.3:
+use-sidecar@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.1.3.tgz#10e7fd897d130b896e2c546c63a5e8233d00efdb"
   integrity sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==
@@ -13233,6 +13518,11 @@ use-sidecar@^1.1.2, use-sidecar@^1.1.3:
     detect-node-es "^1.1.0"
     tslib "^2.0.0"
 
+use-sync-external-store@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz#b174bfa65cb2b526732d9f2ac0a408027876f32d"
+  integrity sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==
+
 utf8-byte-length@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz#f9f63910d15536ee2b2d5dd4665389715eac5c1e"
@@ -13264,10 +13554,10 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
-uuid@11, uuid@^11.0.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-11.1.0.tgz#9549028be1753bb934fc96e2bca09bb4105ae912"
-  integrity sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==
+uuid@13, uuid@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-13.0.0.tgz#263dc341b19b4d755eb8fe36b78d95a6b65707e8"
+  integrity sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==
 
 uuid@8.3.2, uuid@^8.3.2:
   version "8.3.2"
@@ -13284,11 +13574,6 @@ uuid@^9.0.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
   integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
 
-v8-compile-cache-lib@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
-  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
-
 v8-to-istanbul@^9.0.1:
   version "9.3.0"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz#b9572abfa62bd556c16d75fdebc1a411d5ff3175"
@@ -13312,32 +13597,23 @@ vary@^1.1.2, vary@~1.1.2:
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
 vaul@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vaul/-/vaul-1.1.0.tgz#7da4bc965e0b184ada632f1208096b0f5575d920"
-  integrity sha512-YhO/bikcauk48hzhMhvIvT+U87cuCbNbKk9fF4Ou5UkI9t2KkBMernmdP37pCzF15hrv55fcny1YhexK8h6GVQ==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vaul/-/vaul-1.1.2.tgz#c959f8b9dc2ed4f7d99366caee433fbef91f5ba9"
+  integrity sha512-ZFkClGpWyI2WUQjdLJ/BaGuV6AVQiJ3uELGk3OYtP+B6yCO7Cmn9vPFXVJkRaGkOJu3m8bQMgtyzNHixULceQA==
   dependencies:
     "@radix-ui/react-dialog" "^1.1.1"
 
-vt-pbf@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.3.tgz#68fd150756465e2edae1cc5c048e063916dcfaac"
-  integrity sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==
+w3c-xmlserializer@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz#f925ba26855158594d907313cedd1476c5967f6c"
+  integrity sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==
   dependencies:
-    "@mapbox/point-geometry" "0.1.0"
-    "@mapbox/vector-tile" "^1.3.1"
-    pbf "^3.2.1"
+    xml-name-validator "^5.0.0"
 
-w3c-xmlserializer@^4.0.0:
+walk-up-path@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
-  integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
-  dependencies:
-    xml-name-validator "^4.0.0"
-
-walk-up-path@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-3.0.1.tgz#c8d78d5375b4966c717eb17ada73dbd41490e886"
-  integrity sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==
+  resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-4.0.0.tgz#590666dcf8146e2d72318164f1f2ac6ef51d4198"
+  integrity sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A==
 
 walk@^2.3.15:
   version "2.3.15"
@@ -13353,7 +13629,7 @@ walker@^1.0.8:
   dependencies:
     makeerror "1.0.12"
 
-watchpack@^2.4.1:
+watchpack@^2.4.4:
   version "2.4.4"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.4.tgz#473bda72f0850453da6425081ea46fc0d7602947"
   integrity sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==
@@ -13369,9 +13645,9 @@ wbuf@^1.1.0, wbuf@^1.7.3:
     minimalistic-assert "^1.0.0"
 
 web-streams-polyfill@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-4.1.0.tgz#3ba095d0eb3ef6377cd126e8354b2cdba286e0d3"
-  integrity sha512-A7Jxrg7+eV+eZR/CIdESDnRGFb6/bcKukGvJBB5snI6cw3is1c2qamkYstC1bY1p08TyMRlN9eTMkxmnKJBPBw==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-4.2.0.tgz#93295e67af95889a1e044a6beff1366c82720650"
+  integrity sha512-0rYDzGOh9EZpig92umN5g5D/9A1Kff7k0/mzPSSCY8jEQeYkgRMoY7LhbXtUCWzLCMX0TUE9aoHkjFNB7D9pfA==
 
 web-vitals@^4.2.4:
   version "4.2.4"
@@ -13404,10 +13680,10 @@ webidl-conversions@^7.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
   integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
-webpack-bundle-analyzer@^4.8.0:
-  version "4.10.2"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz#633af2862c213730be3dbdf40456db171b60d5bd"
-  integrity sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==
+webpack-bundle-analyzer@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-5.0.1.tgz#51bd8cc3bd991b70d5e6d54937827f01fe859633"
+  integrity sha512-PUp3YFOHysSw8t+13rcF+8o5SGaP/AZ5KnIF3qJfFodv4xJkmixnfcyy+LOwNadpzvyrEKpaMlewAG2sFUfdpw==
   dependencies:
     "@discoveryjs/json-ext" "0.5.7"
     acorn "^8.0.4"
@@ -13415,7 +13691,6 @@ webpack-bundle-analyzer@^4.8.0:
     commander "^7.2.0"
     debounce "^1.2.1"
     escape-string-regexp "^4.0.0"
-    gzip-size "^6.0.0"
     html-escaper "^2.0.2"
     opener "^1.5.2"
     picocolors "^1.0.0"
@@ -13454,9 +13729,9 @@ webpack-dev-middleware@^7.4.2:
     schema-utils "^4.0.0"
 
 webpack-dev-server@^5.0.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.2.1.tgz#049072d6e19cbda8cf600b9e364e6662d61218ba"
-  integrity sha512-ml/0HIj9NLpVKOMq+SuBPLHcmbG+TGIjXRHsYfZwocUBIqEvws8NnS/V9AFQ5FKP+tgn5adwVwRrTEpGL33QFQ==
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.2.2.tgz#96a143d50c58fef0c79107e61df911728d7ceb39"
+  integrity sha512-QcQ72gh8a+7JO63TAx/6XZf/CWhgMzu5m0QirvPfGvptOusAxG12w2+aua1Jkjr7hzaWDnJ2n6JFeexMHI+Zjg==
   dependencies:
     "@types/bonjour" "^3.5.13"
     "@types/connect-history-api-fallback" "^1.5.4"
@@ -13474,7 +13749,7 @@ webpack-dev-server@^5.0.0:
     connect-history-api-fallback "^2.0.0"
     express "^4.21.2"
     graceful-fs "^4.2.6"
-    http-proxy-middleware "^2.0.7"
+    http-proxy-middleware "^2.0.9"
     ipaddr.js "^2.1.0"
     launch-editor "^2.6.1"
     open "^10.0.3"
@@ -13503,10 +13778,10 @@ webpack-retry-chunk-load-plugin@^3.1.1:
   dependencies:
     prettier "^2.6.2"
 
-webpack-sources@^3.2.3:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.3.0.tgz#8d3449f1ed3f254e722a529a0a344a37d2d17048"
-  integrity sha512-77R0RDmJfj9dyv5p3bM5pOHa+X8/ZkO9c7kpDstigkC4nIDobadsfSGCwB4bKhMVxqAok8tajaoR8rirM7+VFQ==
+webpack-sources@^3.2.3, webpack-sources@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.3.3.tgz#d4bf7f9909675d7a070ff14d0ef2a4f3c982c723"
+  integrity sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==
 
 webpack-version-file-plugin@^0.5.0:
   version "0.5.0"
@@ -13522,35 +13797,41 @@ webpack-virtual-modules@^0.5.0:
   resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz#362f14738a56dae107937ab98ea7062e8bdd3b6c"
   integrity sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==
 
+webpack-virtual-modules@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz#057faa9065c8acf48f24cb57ac0e77739ab9a7e8"
+  integrity sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==
+
 webpack@^5.89.0:
-  version "5.99.9"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.99.9.tgz#d7de799ec17d0cce3c83b70744b4aedb537d8247"
-  integrity sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==
+  version "5.103.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.103.0.tgz#17a7c5a5020d5a3a37c118d002eade5ee2c6f3da"
+  integrity sha512-HU1JOuV1OavsZ+mfigY0j8d1TgQgbZ6M+J75zDkpEAwYeXjWSqrGJtgnPblJjd/mAyTNQ7ygw0MiKOn6etz8yw==
   dependencies:
     "@types/eslint-scope" "^3.7.7"
-    "@types/estree" "^1.0.6"
+    "@types/estree" "^1.0.8"
     "@types/json-schema" "^7.0.15"
     "@webassemblyjs/ast" "^1.14.1"
     "@webassemblyjs/wasm-edit" "^1.14.1"
     "@webassemblyjs/wasm-parser" "^1.14.1"
-    acorn "^8.14.0"
-    browserslist "^4.24.0"
+    acorn "^8.15.0"
+    acorn-import-phases "^1.0.3"
+    browserslist "^4.26.3"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.17.1"
+    enhanced-resolve "^5.17.3"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.2.11"
     json-parse-even-better-errors "^2.3.1"
-    loader-runner "^4.2.0"
+    loader-runner "^4.3.1"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^4.3.2"
-    tapable "^2.1.1"
+    schema-utils "^4.3.3"
+    tapable "^2.3.0"
     terser-webpack-plugin "^5.3.11"
-    watchpack "^2.4.1"
-    webpack-sources "^3.2.3"
+    watchpack "^2.4.4"
+    webpack-sources "^3.3.3"
 
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
@@ -13571,24 +13852,24 @@ what-input@^5.2.10:
   resolved "https://registry.yarnpkg.com/what-input/-/what-input-5.2.12.tgz#6eb5b5d39ebff4e2273df8bf69d8d2fc9a6e060a"
   integrity sha512-3yrSa7nGSXGJS6wZeSkO6VNm95pB1mZ9i3wFzC1hhY7mn4/afue/MvXz04OXNdBC8bfo4AB4RRd3Dem9jXM58Q==
 
-whatwg-encoding@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
-  integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==
+whatwg-encoding@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz#d0f4ef769905d426e1688f3e34381a99b60b76e5"
+  integrity sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==
   dependencies:
     iconv-lite "0.6.3"
 
-whatwg-mimetype@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
-  integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
+whatwg-mimetype@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz#bc1bf94a985dc50388d54a9258ac405c3ca2fc0a"
+  integrity sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==
 
-whatwg-url@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
-  integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
+whatwg-url@^14.0.0, whatwg-url@^14.1.1:
+  version "14.2.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-14.2.0.tgz#4ee02d5d725155dae004f6ae95c73e7ef5d95663"
+  integrity sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==
   dependencies:
-    tr46 "^3.0.0"
+    tr46 "^5.1.0"
     webidl-conversions "^7.0.0"
 
 whatwg-url@^5.0.0:
@@ -13653,7 +13934,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
   integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
 
-which-typed-array@^1.1.14, which-typed-array@^1.1.16, which-typed-array@^1.1.18:
+which-typed-array@^1.1.14:
   version "1.1.18"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.18.tgz#df2389ebf3fbb246a71390e90730a9edb6ce17ad"
   integrity sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==
@@ -13665,6 +13946,19 @@ which-typed-array@^1.1.14, which-typed-array@^1.1.16, which-typed-array@^1.1.18:
     gopd "^1.2.0"
     has-tostringtag "^1.0.2"
 
+which-typed-array@^1.1.16, which-typed-array@^1.1.18, which-typed-array@^1.1.19:
+  version "1.1.19"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz#df03842e870b6b88e117524a4b364b6fc689f956"
+  integrity sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==
+  dependencies:
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
+    for-each "^0.3.5"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
+    has-tostringtag "^1.0.2"
+
 which-typed-array@^1.1.2:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
@@ -13690,13 +13984,6 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-which@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a"
-  integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==
-  dependencies:
-    isexe "^3.1.1"
-
 wildcard@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
@@ -13707,7 +13994,16 @@ word-wrap@^1.2.5:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^6.2.0, wrap-ansi@^7.0.0, wrap-ansi@^8.1.0, wrap-ansi@^9.0.0, "wrap-ansi@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^6.2.0, wrap-ansi@^7.0.0, wrap-ansi@^8.1.0, wrap-ansi@^9.0.0, "wrap-ansi@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -13721,14 +14017,6 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
-  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
-  dependencies:
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.7"
-
 write-file-atomic@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7"
@@ -13742,20 +14030,22 @@ ws@^7.3.1:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
   integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
-ws@^8.11.0:
-  version "8.18.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
-  integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
-
 ws@^8.18.0:
-  version "8.18.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.1.tgz#ea131d3784e1dfdff91adb0a4a116b127515e3cb"
-  integrity sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==
+  version "8.18.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472"
+  integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==
 
-xml-name-validator@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
-  integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
+wsl-utils@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/wsl-utils/-/wsl-utils-0.1.0.tgz#8783d4df671d4d50365be2ee4c71917a0557baab"
+  integrity sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==
+  dependencies:
+    is-wsl "^3.1.0"
+
+xml-name-validator@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz#82be9b957f7afdacf961e5980f1bf227c0bf7673"
+  integrity sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==
 
 xml@1.0.1:
   version "1.0.1"
@@ -13789,10 +14079,10 @@ yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
-yaml@^2.2.2, yaml@^2.3.3, yaml@^2.7.0, yaml@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.0.tgz#15f8c9866211bdc2d3781a0890e44d4fa1a5fff6"
-  integrity sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==
+yaml@^2.2.2, yaml@^2.3.3, yaml@^2.7.0, yaml@^2.8.1:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.2.tgz#5694f25eca0ce9c3e7a9d9e00ce0ddabbd9e35c5"
+  integrity sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==
 
 yargs-parser@^18.1.2:
   version "18.1.3"
@@ -13807,6 +14097,19 @@ yargs-parser@^21.1.1:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
+yargs@17.7.2, yargs@^17.7.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yargs@^15.3.1, yargs@^15.4.1:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
@@ -13824,24 +14127,6 @@ yargs@^15.3.1, yargs@^15.4.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
-yargs@^17.3.1, yargs@^17.7.2:
-  version "17.7.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
-  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
-yn@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
-  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
-
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
@@ -13857,11 +14142,26 @@ zip-stream@^6.0.1:
     readable-stream "^4.0.0"
 
 zod-validation-error@^3.0.3:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/zod-validation-error/-/zod-validation-error-3.4.1.tgz#fb0a64f15d90f4aafe9ccc804331853609aad408"
-  integrity sha512-1KP64yqDPQ3rupxNv7oXhf7KdhHHgaqbKuspVoiN93TT0xrBjql+Svjkdjq/Qh/7GSMmgQs3AfvBT0heE35thw==
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/zod-validation-error/-/zod-validation-error-3.5.3.tgz#85ba33290200d8db9f043621e284f40dddefb7e5"
+  integrity sha512-OT5Y8lbUadqVZCsnyFaTQ4/O2mys4tj7PqhdbBCp7McPwvIEKfPtdA6QfPeFQK2/Rz5LgwmAXRJTugBNBi0btw==
+
+"zod-validation-error@^3.5.0 || ^4.0.0":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/zod-validation-error/-/zod-validation-error-4.0.2.tgz#bc605eba49ce0fcd598c127fee1c236be3f22918"
+  integrity sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ==
 
 zod@^3.22.4:
-  version "3.25.36"
-  resolved "https://registry.yarnpkg.com/zod/-/zod-3.25.36.tgz#e5ae0fb7803662b8a21d9a1e282e7d5b8ff57726"
-  integrity sha512-eRFS3i8T0IrpGdL8HQyqFAugGOn7jOjyGgGdtv5NY4Wkhi7lJDk732bNZ609YMIGFbLoaj6J69O1Mura23gfIw==
+  version "3.25.76"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.25.76.tgz#26841c3f6fd22a6a2760e7ccb719179768471e34"
+  integrity sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==
+
+"zod@^3.25.0 || ^4.0.0":
+  version "4.1.12"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-4.1.12.tgz#64f1ea53d00eab91853195653b5af9eee68970f0"
+  integrity sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ==
+
+zod@^4.1.11:
+  version "4.1.13"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-4.1.13.tgz#93699a8afe937ba96badbb0ce8be6033c0a4b6b1"
+  integrity sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig==